rpms
/
libreoffice
21
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

3.6.0.0 beta2

Browse Source
f41
David Tardon 13 years ago
parent 81038e8f4f
commit 8dd8adfc64
29 changed files with 304 additions and 1640 deletions
Show Stats Download Patch File Download Diff File

4
.gitignore vendored
Unescape View File

@ -101,3 +101,7 @@
/libreoffice-core-3.5.5.1.tar.xz
/libreoffice-help-3.5.5.1.tar.xz
/libreoffice-translations-3.5.5.1.tar.xz
/libreoffice-binfilter-3.6.0.0.beta2.tar.xz
/libreoffice-core-3.6.0.0.beta2.tar.xz
/libreoffice-help-3.6.0.0.beta2.tar.xz
/libreoffice-translations-3.6.0.0.beta2.tar.xz

67
0001-Resolves-fdo-48096-torn-off-popups-trigger-keyboard-.patch
Unescape View File

@ -1,67 +0,0 @@
From a482b89e4d9c41b6f7c1616d193ac6cde05a69a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Mon, 2 Apr 2012 20:57:02 +0100
Subject: [PATCH] Resolves: fdo#48096 torn off popups trigger keyboard focus
problems
---
svx/source/tbxctrls/linectrl.cxx | 4 ++--
svx/source/tbxctrls/tbcontrl.cxx | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx
index c81177e..ccc047c4 100644
--- a/svx/source/tbxctrls/linectrl.cxx
+++ b/svx/source/tbxctrls/linectrl.cxx
@@ -379,7 +379,7 @@ SvxLineEndWindow::SvxLineEndWindow(
const String& rWndTitle ) :
SfxPopupWindow( nSlotId,
rFrame,
- WinBits( WB_STDPOPUP ) ),
+ WinBits( WB_STDPOPUP | WB_OWNERDRAWDECORATION ) ),
aLineEndSet ( this, WinBits( WB_ITEMBORDER | WB_3DLOOK | WB_NO_DIRECTSELECT ) ),
nCols ( 2 ),
nLines ( 12 ),
@@ -400,7 +400,7 @@ SvxLineEndWindow::SvxLineEndWindow(
SfxPopupWindow( nSlotId,
rFrame,
pParentWindow,
- WinBits( WB_STDPOPUP ) ),
+ WinBits( WB_STDPOPUP | WB_OWNERDRAWDECORATION ) ),
aLineEndSet ( this, WinBits( WB_ITEMBORDER | WB_3DLOOK | WB_NO_DIRECTSELECT ) ),
nCols ( 2 ),
nLines ( 12 ),
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index cb56fac..f9f25a8 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -822,7 +822,7 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString& rCommand,
Window* pParentWindow,
const ::Color rLastColor ) :
- SfxPopupWindow( nSlotId, rFrame, pParentWindow, WinBits( WB_STDPOPUP ) ),
+ SfxPopupWindow( nSlotId, rFrame, pParentWindow, WinBits( WB_STDPOPUP | WB_OWNERDRAWDECORATION ) ),
theSlotId( nSlotId ),
aColorSet( this, WinBits( WB_ITEMBORDER | WB_NAMEFIELD | WB_3DLOOK | WB_NO_DIRECTSELECT) ),
@@ -1049,7 +1049,7 @@ void SvxColorWindow_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eState, co
SvxFrameWindow_Impl::SvxFrameWindow_Impl( sal_uInt16 nId, const Reference< XFrame >& rFrame, Window* pParentWindow ) :
- SfxPopupWindow( nId, rFrame, pParentWindow, WinBits( WB_STDPOPUP ) ),
+ SfxPopupWindow( nId, rFrame, pParentWindow, WinBits( WB_STDPOPUP | WB_OWNERDRAWDECORATION ) ),
aFrameSet ( this, WinBits( WB_ITEMBORDER | WB_DOUBLEBORDER | WB_3DLOOK | WB_NO_DIRECTSELECT ) ),
bParagraphMode(sal_False)
@@ -1326,7 +1326,7 @@ Color lcl_mediumColor( Color aMain, Color /*aDefault*/ )
SvxLineWindow_Impl::SvxLineWindow_Impl( sal_uInt16 nId, const Reference< XFrame >& rFrame, Window* pParentWindow ) :
- SfxPopupWindow( nId, rFrame, pParentWindow, WinBits( WB_STDPOPUP | WB_AUTOSIZE ) ),
+ SfxPopupWindow( nId, rFrame, pParentWindow, WinBits( WB_STDPOPUP | WB_OWNERDRAWDECORATION | WB_AUTOSIZE ) ),
m_aLineStyleLb( this )
{
try
--
1.7.7.6

371
0001-Resolves-fdo-49849-implement-Unicode-6.1-hebrew-line.patch
Unescape View File

@ -1,371 +0,0 @@
From 20c24114143d6d38774b56a142fd4ae05094308e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Sun, 13 May 2012 22:41:30 +0100
Subject: [PATCH] Resolves: fdo#49849 implement Unicode 6.1 hebrew line
breaking rules
i.e. sync with svn diff -c 31071
http://source.icu-project.org/repos/icu/icu/trunk/source/data/brkitr/line.txt
Change-Id: I I I41b3d02f1a0da3b83a9684f29d466660d96254c6
---
i18npool/qa/cppunit/test_breakiterator.cxx | 89 +++++++++++++++++---------
i18npool/source/breakiterator/data/README | 12 ++++
i18npool/source/breakiterator/data/line.txt | 57 +++++++++++-------
3 files changed, 105 insertions(+), 53 deletions(-)
create mode 100644 i18npool/source/breakiterator/data/README
diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx b/i18npool/qa/cppunit/test_breakiterator.cxx
index 14051d4..ffd590c 100644
--- a/i18npool/qa/cppunit/test_breakiterator.cxx
+++ b/i18npool/qa/cppunit/test_breakiterator.cxx
@@ -45,6 +45,7 @@
#include <com/sun/star/i18n/WordType.hpp>
#include <rtl/strbuf.hxx>
+#include <rtl/ustrbuf.hxx>
#include <string.h>
@@ -64,6 +65,9 @@
void testWeak();
void testAsian();
void testThai();
+#if TODO
+ void testNorthernThai();
+#endif
CPPUNIT_TEST_SUITE(TestBreakIterator);
CPPUNIT_TEST(testLineBreaking);
@@ -71,6 +75,9 @@
CPPUNIT_TEST(testWeak);
CPPUNIT_TEST(testAsian);
CPPUNIT_TEST(testThai);
+#if TODO
+ CPPUNIT_TEST(testNorthernThai);
+#endif
CPPUNIT_TEST_SUITE_END();
private:
@@ -80,28 +87,46 @@
uno::Reference<i18n::XBreakIterator> m_xBreak;
};
-//See https://bugs.freedesktop.org/show_bug.cgi?id=31271 for motivation
void TestBreakIterator::testLineBreaking()
{
- ::rtl::OUString aTest1(RTL_CONSTASCII_USTRINGPARAM("(some text here)"));
-
i18n::LineBreakHyphenationOptions aHyphOptions;
i18n::LineBreakUserOptions aUserOptions;
lang::Locale aLocale;
+
+ //See https://bugs.freedesktop.org/show_bug.cgi?id=31271
+ {
+ ::rtl::OUString aTest(RTL_CONSTASCII_USTRINGPARAM("(some text here)"));
- aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en"));
- aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US"));
+ aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en"));
+ aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US"));
- {
- //Here we want the line break to leave text here) on the next line
- i18n::LineBreakResults aResult = m_xBreak->getLineBreak(aTest1, strlen("(some tex"), aLocale, 0, aHyphOptions, aUserOptions);
- CPPUNIT_ASSERT_MESSAGE("Expected a break at the the start of the word", aResult.breakIndex == 6);
- }
+ {
+ //Here we want the line break to leave text here) on the next line
+ i18n::LineBreakResults aResult = m_xBreak->getLineBreak(aTest, strlen("(some tex"), aLocale, 0, aHyphOptions, aUserOptions);
+ CPPUNIT_ASSERT_MESSAGE("Expected a break at the the start of the word", aResult.breakIndex == 6);
+ }
+ {
+ //Here we want the line break to leave "here)" on the next line
+ i18n::LineBreakResults aResult = m_xBreak->getLineBreak(aTest, strlen("(some text here"), aLocale, 0, aHyphOptions, aUserOptions);
+ CPPUNIT_ASSERT_MESSAGE("Expected a break at the the start of the word", aResult.breakIndex == 11);
+ }
+ }
+
+ //See https://bugs.freedesktop.org/show_bug.cgi?id=49849
{
- //Here we want the line break to leave "here)" on the next line
- i18n::LineBreakResults aResult = m_xBreak->getLineBreak(aTest1, strlen("(some text here"), aLocale, 0, aHyphOptions, aUserOptions);
- CPPUNIT_ASSERT_MESSAGE("Expected a break at the the start of the word", aResult.breakIndex == 11);
+ const sal_Unicode HEBREW1[] = { 0x05DE, 0x05D9, 0x05DC, 0x05D9, 0x5DD };
+ ::rtl::OUString aWord(HEBREW1, SAL_N_ELEMENTS(HEBREW1));
+ ::rtl::OUString aTest(rtl::OUStringBuffer(aWord).append(' ').append(aWord).makeStringAndClear());
+
+ aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("he"));
+ aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IL"));
+
+ {
+ //Here we want the line break to happen at the whitespace
+ i18n::LineBreakResults aResult = m_xBreak->getLineBreak(aTest, aTest.getLength()-1, aLocale, 0, aHyphOptions, aUserOptions);
+ CPPUNIT_ASSERT_MESSAGE("Expected a break at the the start of the word", aResult.breakIndex == aWord.getLength()+1);
+ }
}
}
@@ -260,28 +285,30 @@
aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("th"));
aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TH"));
- i18n::Boundary aBounds;
- {
- const sal_Unicode THAI1[] = { 0x0E01, 0x0E38, 0x0E2B, 0x0E25, 0x0E32, 0x0E1A };
- ::rtl::OUString aTest(THAI1, SAL_N_ELEMENTS(THAI1));
- aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale,
- i18n::WordType::DICTIONARY_WORD, true);
- CPPUNIT_ASSERT_MESSAGE("Should skip full word",
- aBounds.startPos == 0 && aBounds.endPos == aTest.getLength());
- }
-
-#ifdef TODO
- {
- const sal_Unicode NORTHERN_THAI1[] = { 0x0E01, 0x0E38, 0x0E4A, 0x0E2B, 0x0E25, 0x0E32, 0x0E1A };
- ::rtl::OUString aTest(NORTHERN_THAI1, SAL_N_ELEMENTS(NORTHERN_THAI1));
- aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale,
- i18n::WordType::DICTIONARY_WORD, true);
- CPPUNIT_ASSERT_MESSAGE("Should skip full word",
- aBounds.startPos == 0 && aBounds.endPos == aTest.getLength());
- }
-#endif
+ const sal_Unicode THAI1[] = { 0x0E01, 0x0E38, 0x0E2B, 0x0E25, 0x0E32, 0x0E1A };
+ ::rtl::OUString aTest(THAI1, SAL_N_ELEMENTS(THAI1));
+ i18n::Boundary aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale,
+ i18n::WordType::DICTIONARY_WORD, true);
+ CPPUNIT_ASSERT_MESSAGE("Should skip full word",
+ aBounds.startPos == 0 && aBounds.endPos == aTest.getLength());
}
+#if TODO
+void TestBreakIterator::testNorthernThai()
+{
+ lang::Locale aLocale;
+ aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nod"));
+ aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TH"));
+
+ const sal_Unicode NORTHERN_THAI1[] = { 0x0E01, 0x0E38, 0x0E4A, 0x0E2B, 0x0E25, 0x0E32, 0x0E1A };
+ ::rtl::OUString aTest(NORTHERN_THAI1, SAL_N_ELEMENTS(NORTHERN_THAI1));
+ i18n::Boundary aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale,
+ i18n::WordType::DICTIONARY_WORD, true);
+ CPPUNIT_ASSERT_MESSAGE("Should skip full word",
+ aBounds.startPos == 0 && aBounds.endPos == aTest.getLength());
+}
+#endif
+
TestBreakIterator::TestBreakIterator()
{
m_xContext = cppu::defaultBootstrap_InitialComponentContext();
diff --git a/i18npool/source/breakiterator/data/README b/i18npool/source/breakiterator/data/README
new file mode 100644
index 0000000..8d7598d
--- /dev/null
+++ b/i18npool/source/breakiterator/data/README
@@ -0,0 +1,12 @@
+The originals of these come from svn checkout
+http://source.icu-project.org/repos/icu/icu/trunk/source/data/brkitr they no
+longer appear in the icu tarballs, but are in icu's svn
+
+At various stages these copies have been customized and are not horribly out of
+sync. It unclear which diffs from the base versions are deliberate and which
+are now accidental :-(
+
+We need to review the various issues referenced in the commits that caused
+custimizations and see if they're still relevant or not, write regression tests
+for them, if any are still relavant then apply the changes back on top of the
+latest versions.
diff --git a/i18npool/source/breakiterator/data/line.txt b/i18npool/source/breakiterator/data/line.txt
index cbabee6..91c8f3d 100644
--- a/i18npool/source/breakiterator/data/line.txt
+++ b/i18npool/source/breakiterator/data/line.txt
@@ -61,11 +61,13 @@ $BB = [:LineBreak = Break_Before:];
$BK = [:LineBreak = Mandatory_Break:];
$B2 = [:LineBreak = Break_Both:];
$CB = [:LineBreak = Contingent_Break:];
+$CJ = [:LineBreak = Conditional_Japanese_Starter:];
$CL = [:LineBreak = Close_Punctuation:] ;
$CM = [:LineBreak = Combining_Mark:];
$CR = [:LineBreak = Carriage_Return:];
$EX = [:LineBreak = Exclamation:];
$GL = [:LineBreak = Glue:];
+$HL = [:LineBreak = Hebrew_Letter:];
$HY = [:LineBreak = Hyphen:];
$H2 = [:LineBreak = H2:];
$H3 = [:LineBreak = H3:];
@@ -77,7 +79,7 @@ $JV = [:LineBreak = JV:];
$JT = [:LineBreak = JT:];
$LF = [:LineBreak = Line_Feed:];
$NL = [:LineBreak = Next_Line:];
-$NS = [:LineBreak = Nonstarter:];
+$NS = [[:LineBreak = Nonstarter:] $CJ];
$NU = [:LineBreak = Numeric:];
$OP = [[:LineBreak = Open_Punctuation:] - $DG];
$PO = [:LineBreak = Postfix_Numeric:];
@@ -118,6 +120,7 @@ $B2cm = $B2 $CM*;
$CLcm = $CL $CM*;
$EXcm = $EX $CM*;
$GLcm = $GL $CM*;
+$HLcm = $HL $CM*;
$HYcm = $HY $CM*;
$H2cm = $H2 $CM*;
$H3cm = $H3 $CM*;
@@ -150,6 +153,7 @@ $B2 $CM+;
$CL $CM+;
$EX $CM+;
$GL $CM+;
+$HL $CM+;
$HY $CM+;
$H2 $CM+;
$H3 $CM+;
@@ -186,7 +190,7 @@ $CANT_CM = [ $SP $BK $CR $LF $NL $ZW $CM]; # Bases that can't take CMs
# so for this one case we need to manually list out longer sequences.
#
$AL_FOLLOW_NOCM = [$BK $CR $LF $NL $ZW $SP];
-$AL_FOLLOW_CM = [$CL $EX $IS $SY $WJ $GL $QU $BA $HY $NS $IN $NU $ALPlus $OP];
+$AL_FOLLOW_CM = [$CL $EX $HL $IS $SY $WJ $GL $QU $BA $HY $NS $IN $NU $ALPlus $OP];
$AL_FOLLOW = [$AL_FOLLOW_NOCM $AL_FOLLOW_CM];
@@ -320,8 +324,13 @@ $LB20NonBreaks $CM* ($BAcm | $HYcm | $NScm);
$BBcm [^$CB]; # $BB x
$BBcm $LB20NonBreaks $CM*;
+# LB 21a Don't break after Hebrew + Hyphen
+# HL (HY | BA) x
+#
+$HLcm ($HYcm | $BAcm) [^$CB]?;
+
# LB 22
-$ALcm $INcm;
+($ALcm | $HLcm) $INcm;
$CM+ $INcm; # by rule 10, any otherwise unattached CM behaves as AL
$IDcm $INcm;
$INcm $INcm;
@@ -331,16 +340,18 @@ $NUcm $INcm;
# $LB 23
$IDcm $POcm;
$ALcm $NUcm; # includes $LB19
+$HLcm $NUcm;
$CM+ $NUcm; # Rule 10, any otherwise unattached CM behaves as AL
$NUcm $ALcm;
+$NUcm $HLcm;
#
# LB 24
#
$PRcm $IDcm;
$ALcm $PRcm;
-$PRcm $ALcm;
-$POcm $ALcm;
+$PRcm ($ALcm | $HLcm);
+$POcm ($ALcm | $HLcm);
#
# LB 25 Numbers.
@@ -361,8 +372,8 @@ $PRcm ($JLcm | $JVcm | $JTcm | $H2cm | $H3cm);
# LB 28 Do not break between alphabetics
#
-$ALcm $ALcm;
-$CM+ $ALcm; # The $CM+ is from rule 10, and unattached CM is treated as AL
+($ALcm | $HLcm) ($ALcm | $HLcm);
+$CM+ ($ALcm | $HLcm); # The $CM+ is from rule 10, an unattached CM is treated as AL
# LB 29
$IScm ($ALcm | $NUcm);
@@ -371,11 +382,9 @@ $IScm ($ALcm | $NUcm);
# Rule 30 Do not break between letters, numbers or ordinary symbols
# and opening or closing punctuation
#
-($ALcm | $NUcm) $OPcm;
+($ALcm | $HLcm | $NUcm) $OPcm;
$CM+ $OPcm;
-$CLcm ($ALcm | $NUcm);
-
-
+$CLcm ($ALcm | $HLcm | $NUcm);
#
# Reverse Rules.
@@ -391,6 +400,7 @@ $CM+ $B2;
$CM+ $CL;
$CM+ $EX;
$CM+ $GL;
+$CM+ $HL;
$CM+ $HY;
$CM+ $H2;
$CM+ $H3;
@@ -544,24 +554,25 @@ $CM* ($BA | $HY | $NS) $CM* [$LB20NonBreaks-$CM]; # . x (BA | HY | NS)
$CM* [$LB20NonBreaks-$CM] $CM* $BB; # BB x .
[^$CB] $CM* $BB; #
-
+# LB21a
+[^$CB] $CM* ($HY | $BA) $CM* $HL;
# LB 22
-$CM* $IN $CM* $ALPlus;
+$CM* $IN $CM* ($ALPlus | $HL);
$CM* $IN $CM* $ID;
$CM* $IN $CM* $IN;
$CM* $IN $CM* $NU;
# LB 23
$CM* $PO $CM* $ID;
-$CM* $NU $CM* $ALPlus;
-$CM* $ALPlus $CM* $NU;
+$CM* $NU $CM* ($ALPlus | $HL);
+$CM* ($ALPlus | $HL) $CM* $NU;
# LB 24
$CM* $ID $CM* $PR;
$CM* $PR $CM* $ALPlus;
-$CM* $ALPlus $CM* $PR;
-$CM* $ALPlus $CM* $PO;
+$CM* ($ALPlus | $HL) $CM* $PR;
+$CM* ($ALPlus | $HL) $CM* $PO;
$CM* $ALPlus $CM* ($IS | $SY | $HY)+ / $SP;
$CM* $NU+ $CM* $HY+ / $SP;
@@ -580,15 +591,14 @@ $CM* $PO $CM* ($H3 | $H2 | $JT | $JV | $JL);
$CM* ($H3 | $H2 | $JT | $JV | $JL) $CM* $PR;
# LB 28
-$CM* $ALPlus $CM* $ALPlus;
-
+$CM* ($ALPlus | $HL) $CM* ($ALPlus | $HL);
# LB 29
$CM* ($NU | $ALPlus) $CM* $IS+ [^$SP];
# LB 30
-$CM* $OP $CM* ($NU | $ALPlus);
-$CM* ($NU | $ALPlus) $CM* ($CL | $SY)+ [^$SP];
+$CM* $OP $CM* ($ALPlus | $HL | $NU);
+$CM* ($ALPlus | $HL | $NU) $CM* ($CL | $SY)+ [^$SP];
## -------------------------------------------------
@@ -609,6 +619,9 @@ $SP+ $CM* $QU;
$SP+ $CM* $CL;
$SP+ $CM* $B2;
+# LB 21
+$CM* ($HY | $BA) $CM* $HL;
+
# LB 18
($CM* ($IS | $SY))+ $CM* $NU;
$CL $CM* ($NU | $IS | $SY);
@@ -629,6 +642,6 @@ $dictionary $dictionary;
# turn off rule chaining. We don't want to move more
# than necessary.
#
-[$CM $OP $QU $CL $B2 $PR $HY $SP $dictionary]+ [^$CM $OP $QU $CL $B2 $PR $HY $dictionary];
+[$CM $OP $QU $CL $B2 $PR $HY $BA $SP $dictionary]+ [^$CM $OP $QU $CL $B2 $PR $HY $BA $dictionary];
$dictionary $dictionary;
--
1.7.7.6

24
0001-Resolves-rhbz-788042-skip-splashscreen-with-quicksta.patch
Unescape View File

@ -1,24 +0,0 @@
From 13b6afe8c8e26d837fc9de9428fe2bfca1b551c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Tue, 7 Feb 2012 13:36:50 +0000
Subject: [PATCH] Resolves: rhbz#788042 skip splashscreen with --quickstart
---
desktop/unx/source/args.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/desktop/unx/source/args.c b/desktop/unx/source/args.c
index 367bac2..0952911 100644
--- a/desktop/unx/source/args.c
+++ b/desktop/unx/source/args.c
@@ -58,6 +58,7 @@ static struct {
{ "nologo", 0, 1, 0, 0, NULL },
{ "headless", 0, 1, 0, 0, NULL },
{ "invisible", 0, 1, 0, 0, NULL },
+ { "quickstart", 0, 1, 0, 0, NULL },
{ "minimized", 0, 1, 0, 0, NULL },
/* pagein bits */
--
1.7.6.5

24
0001-Resolves-rhbz-788045-swriter-help-etc-doesn-t-show-h.patch
Unescape View File

@ -1,24 +0,0 @@
diff --git a/desktop/scripts/soffice.sh.in b/desktop/scripts/soffice.sh.in
index 4d14051..2d42613 100755
--- a/desktop/scripts/soffice.sh.in
+++ b/desktop/scripts/soffice.sh.in
@@ -158,8 +158,8 @@ if [ -n "$VALGRINDCHECK" -a -z "$VALGRIND" ] ; then
fi
# do not pass the request for command line help to oosplash
-if test "$#" -eq 1; then
- case "$1" in
+for arg in $@ ; do
+ case "$arg" in
-h | --h | --he | --hel | --help)
"$sd_prog/soffice.bin" --help
exit 0
@@ -171,7 +171,7 @@ if test "$#" -eq 1; then
*)
;;
esac
-fi
+done
# oosplash does the rest: forcing pages in, javaldx etc. are
exec $VALGRINDCHECK $STRACECHECK "$sd_prog/oosplash" "$@"

166
0001-Resolves-rhbz-799525-put-flat-odf-mimetypes-in-xsltf.patch
Unescape View File

@ -1,166 +0,0 @@
From 4564f9c207ab53c70a199a2dbcc0d8f155211256 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Tue, 6 Mar 2012 12:39:07 +0000
Subject: [PATCH] Resolves: rhbz#799525 put flat odf mimetypes in
xsltfilter.desktop
---
scp2/source/ooo/common_brand.scp | 10 ++++++++++
sysui/desktop/freedesktop/freedesktop-menus.spec | 1 +
sysui/desktop/menus/calc.desktop | 2 +-
sysui/desktop/menus/draw.desktop | 2 +-
sysui/desktop/menus/impress.desktop | 2 +-
sysui/desktop/menus/writer.desktop | 2 +-
sysui/desktop/menus/xsltfilter.desktop | 9 +++++++++
sysui/desktop/share/launcher_genericname.ulf | 3 +++
sysui/desktop/share/makefile.mk | 2 +-
sysui/desktop/suse/suse-menus.spec | 1 +
10 files changed, 29 insertions(+), 5 deletions(-)
create mode 100644 sysui/desktop/menus/xsltfilter.desktop
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 69c0a71..4c594df 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -98,6 +98,7 @@ Module gid_Module_Root_Brand
gid_Brand_File_Share_Xdg_QStart,
gid_Brand_File_Share_Xdg_StartCenter,
gid_Brand_File_Share_Xdg_Writer,
+ gid_Brand_File_Share_Xdg_XsltFilter,
gid_Brand_File_Txt_Package,
gid_License_Txt,
git_License_Odt,
@@ -791,6 +792,15 @@ File gid_Brand_File_Share_Xdg_BinFilter
End
#endif
+#if defined UNX && ! defined MACOSX
+File gid_Brand_File_Share_Xdg_XsltFilter
+ TXT_FILE_BODY;
+ Dir = gid_Brand_Dir_Share_Xdg;
+ Name = "xsltfilter.desktop";
+ Styles = (PACKED,SCPZIP_REPLACE);
+End
+#endif
+
// Profiles
Profile gid_Brand_Profile_Bootstrap_Ini
diff --git a/sysui/desktop/freedesktop/freedesktop-menus.spec b/sysui/desktop/freedesktop/freedesktop-menus.spec
index 78a33ae..039bdc2 100755
--- a/sysui/desktop/freedesktop/freedesktop-menus.spec
+++ b/sysui/desktop/freedesktop/freedesktop-menus.spec
@@ -387,6 +387,7 @@ done
/usr/share/applications/%unixfilename-startcenter.desktop
/usr/share/applications/%unixfilename-javafilter.desktop
/usr/share/applications/%unixfilename-binfilter.desktop
+/usr/share/applications/%unixfilename-xsltfilter.desktop
/usr/share/icons/gnome/*/apps/*png
/usr/share/icons/gnome/*/mimetypes/*png
/usr/share/icons/hicolor/*/apps/*png
diff --git a/sysui/desktop/menus/calc.desktop b/sysui/desktop/menus/calc.desktop
index c8899cd..b4c0385 100755
--- a/sysui/desktop/menus/calc.desktop
+++ b/sysui/desktop/menus/calc.desktop
@@ -5,7 +5,7 @@ Icon=calc
Type=Application
Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Spreadsheets;
Exec=${UNIXBASISROOTNAME} --calc %U
-MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-flat-xml;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/msexcel;application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroenabled.12;application/vnd.ms-excel.sheet.binary.macroenabled.12;text/csv;application/x-dbf;text/spreadsheet;
+MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/msexcel;application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroenabled.12;application/vnd.ms-excel.sheet.binary.macroenabled.12;text/csv;application/x-dbf;text/spreadsheet;
Name=%PRODUCTNAME Calc
GenericName=Spreadsheet
Comment=Perform calculations, analyze information and manage lists in spreadsheets by using Calc.
diff --git a/sysui/desktop/menus/draw.desktop b/sysui/desktop/menus/draw.desktop
index 67ad422..231f320 100755
--- a/sysui/desktop/menus/draw.desktop
+++ b/sysui/desktop/menus/draw.desktop
@@ -5,7 +5,7 @@ Icon=draw
Type=Application
Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Drawing;
Exec=${UNIXBASISROOTNAME} --draw %U
-MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-flat-xml;application/vnd.oasis.opendocument.graphics-template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;
+MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;
Name=%PRODUCTNAME Draw
GenericName=Drawing Program
Comment=Create and edit drawings, flow charts, and logos by using Draw.
diff --git a/sysui/desktop/menus/impress.desktop b/sysui/desktop/menus/impress.desktop
index 91c937a..22d130d 100755
--- a/sysui/desktop/menus/impress.desktop
+++ b/sysui/desktop/menus/impress.desktop
@@ -5,7 +5,7 @@ Icon=impress
Type=Application
Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Presentations;
Exec=${UNIXBASISROOTNAME} --impress %U
-MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-flat-xml;application/vnd.oasis.opendocument.presentation-template;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/mspowerpoint;application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.presentation.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroenabled.12;
+MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-template;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/mspowerpoint;application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.presentation.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroenabled.12;
Name=%PRODUCTNAME Impress
GenericName=Presentation
Comment=Create and edit presentations for slideshows, meeting and Web pages by using Impress.
diff --git a/sysui/desktop/menus/writer.desktop b/sysui/desktop/menus/writer.desktop
index 0db0d05..845b6d2 100755
--- a/sysui/desktop/menus/writer.desktop
+++ b/sysui/desktop/menus/writer.desktop
@@ -5,7 +5,7 @@ Icon=writer
Type=Application
Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Wordprocessors;
Exec=${UNIXBASISROOTNAME} --writer %U
-MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-flat-xml;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/msword;application/vnd.ms-word;application/x-doc;application/x-hwp;application/rtf;text/rtf;application/vnd.wordperfect;application/wordperfect;application/vnd.lotus-wordpro;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12;
+MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/msword;application/vnd.ms-word;application/x-doc;application/x-hwp;application/rtf;text/rtf;application/vnd.wordperfect;application/wordperfect;application/vnd.lotus-wordpro;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12;
Name=%PRODUCTNAME Writer
GenericName=Word Processor
Comment=Create and edit text and graphics in letters, reports, documents and Web pages by using Writer.
diff --git a/sysui/desktop/menus/xsltfilter.desktop b/sysui/desktop/menus/xsltfilter.desktop
new file mode 100644
index 0000000..a6c3b1b
--- /dev/null
+++ b/sysui/desktop/menus/xsltfilter.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Version=1.0
+Terminal=false
+Type=Application
+Exec=${UNIXBASISROOTNAME} %U
+MimeType=application/vnd.oasis.opendocument.text-flat-xml;application/vnd.oasis.opendocument.spreadsheet-flat-xml;application/vnd.oasis.opendocument.graphics-flat-xml;application/vnd.oasis.opendocument.presentation-flat-xml;
+Name=%PRODUCTNAME XSLT based filters
+GenericName=XSLT based filters
+NoDisplay=true
diff --git a/sysui/desktop/share/launcher_genericname.ulf b/sysui/desktop/share/launcher_genericname.ulf
index 6130e0b..09ccf8d 100755
--- a/sysui/desktop/share/launcher_genericname.ulf
+++ b/sysui/desktop/share/launcher_genericname.ulf
@@ -24,3 +24,6 @@ en-US = "Small Device Format Importer"
[binfilter]
en-US = "Legacy StarOffice 5 Binary Format Importer"
+
+[xsltfilter]
+en-US = "XSLT based filters"
diff --git a/sysui/desktop/share/makefile.mk b/sysui/desktop/share/makefile.mk
index f6b4dfa..1d99c84 100755
--- a/sysui/desktop/share/makefile.mk
+++ b/sysui/desktop/share/makefile.mk
@@ -53,7 +53,7 @@ ULFFILES= \
launcher_name.ulf
LAUNCHERLIST_APPS = writer calc draw impress math base printeradmin startcenter
-LAUNCHERLIST = $(LAUNCHERLIST_APPS) qstart javafilter binfilter
+LAUNCHERLIST = $(LAUNCHERLIST_APPS) qstart javafilter binfilter xsltfilter
LAUNCHERDEPN = ../menus/{$(LAUNCHERLIST)}.desktop
LAUNCHERFLAGFILE = $(COMMONMISC)/$(TARGET)/xdg.flag
diff --git a/sysui/desktop/suse/suse-menus.spec b/sysui/desktop/suse/suse-menus.spec
index 74b67e6..ab053ec 100755
--- a/sysui/desktop/suse/suse-menus.spec
+++ b/sysui/desktop/suse/suse-menus.spec
@@ -358,6 +358,7 @@ done
/usr/share/applications/%unixfilename-startcenter.desktop
/usr/share/applications/%unixfilename-javafilter.desktop
/usr/share/applications/%unixfilename-binfilter.desktop
+/usr/share/applications/%unixfilename-xsltfilter.desktop
/opt/gnome/share/mime-info/*.keys
/opt/gnome/share/mime-info/*.mime
/opt/kde3/share/mimelnk/application/*.desktop
--
1.7.7.6

110
0001-Resolves-rhbz-800272-complain-about-unknown-command-.patch
Unescape View File

@ -1,110 +0,0 @@
From 4efbd87e31e7488dfcdd1d07ff979f1f59b8b1f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Tue, 6 Mar 2012 15:49:20 +0000
Subject: [PATCH] Resolves: rhbz#800272 complain about unknown command-line
options
---
desktop/source/app/cmdlineargs.cxx | 17 ++++++++++++++++-
desktop/source/app/cmdlineargs.hxx | 2 ++
desktop/source/app/officeipcthread.cxx | 6 ++++++
desktop/source/app/sofficemain.cxx | 4 ++++
4 files changed, 28 insertions(+), 1 deletions(-)
diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx
index 6a5d58a..5ae86ab 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -304,6 +304,15 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier )
{
bConversionOutEvent = true;
}
+#if defined UNX
+ else
+ {
+ printf("Unknown option %s\n",
+ rtl::OUStringToOString(aArg, osl_getThreadTextEncoding()).getStr());
+ printf("Run 'soffice --help' to see a full list of available command line options.\n");
+ SetBoolParam_Impl( CMD_BOOLPARAM_UNKNOWN, sal_True );
+ }
+#endif
}
else
{
@@ -640,7 +649,7 @@ sal_Bool CommandLineArgs::InterpretCommandLineParameter( const ::rtl::OUString&
if (bDeprecated)
{
- rtl::OString sArg(rtl::OUStringToOString(aArg, RTL_TEXTENCODING_UTF8));
+ rtl::OString sArg(rtl::OUStringToOString(aArg, osl_getThreadTextEncoding()));
fprintf(stderr, "Warning: %s is deprecated. Use -%s instead.\n", sArg.getStr(), sArg.getStr());
}
return sal_True;
@@ -851,6 +860,12 @@ sal_Bool CommandLineArgs::IsVersion() const
return m_aBoolParams[ CMD_BOOLPARAM_VERSION ];
}
+sal_Bool CommandLineArgs::HasUnknown() const
+{
+ osl::MutexGuard aMutexGuard( m_aMutex );
+ return m_aBoolParams[ CMD_BOOLPARAM_UNKNOWN ];
+}
+
sal_Bool CommandLineArgs::HasModuleParam() const
{
osl::MutexGuard aMutexGuard( m_aMutex );
diff --git a/desktop/source/app/cmdlineargs.hxx b/desktop/source/app/cmdlineargs.hxx
index f79efea..29b2f46 100644
--- a/desktop/source/app/cmdlineargs.hxx
+++ b/desktop/source/app/cmdlineargs.hxx
@@ -71,6 +71,7 @@ class CommandLineArgs
CMD_BOOLPARAM_HELPBASE,
CMD_BOOLPARAM_PSN,
CMD_BOOLPARAM_VERSION,
+ CMD_BOOLPARAM_UNKNOWN,
CMD_BOOLPARAM_COUNT // must be last element!
};
@@ -162,6 +163,7 @@ class CommandLineArgs
sal_Bool IsWeb() const;
sal_Bool IsVersion() const;
sal_Bool HasModuleParam() const;
+ sal_Bool HasUnknown() const;
sal_Bool WantsToLoadDocument() const;
// Access to string parameters
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index b2c6566..4306a67 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -709,6 +709,12 @@ void OfficeIPCThread::execute()
#endif
continue;
}
+
+#ifdef UNX
+ if (aCmdLineArgs->HasUnknown() || aCmdLineArgs->IsVersion() || aCmdLineArgs->IsHelp())
+ continue;
+#endif
+
const CommandLineArgs &rCurrentCmdLineArgs = Desktop::GetCommandLineArgs();
if ( aCmdLineArgs->IsQuickstart() )
diff --git a/desktop/source/app/sofficemain.cxx b/desktop/source/app/sofficemain.cxx
index 76562a3..ed22834 100644
--- a/desktop/source/app/sofficemain.cxx
+++ b/desktop/source/app/sofficemain.cxx
@@ -63,6 +63,10 @@
desktop::displayVersion();
return EXIT_SUCCESS;
}
+ else if ( rCmdLineArgs.HasUnknown() )
+ {
+ return EXIT_FAILURE;
+ }
#endif
return SVMain();
}
--
1.7.7.6

91
0001-Resolves-rhbz-805743-a11y-call-doShow-after-we-have-.patch
Unescape View File

@ -1,91 +0,0 @@
From 4ae4c57caab02c5d8fe91cd9956fabba6bd3dc1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Wed, 9 May 2012 12:39:28 +0100
Subject: [PATCH] Resolves: rhbz#805743 a11y: call doShow after we have a
valid view
Basically a regression from ec240eafe9b25620383aa54015f5c55e0f64227a but things
were broken before that too.
enable a11y (for gnome 3 this is gsettings set org.gnome.desktop.interface
toolkit-accessibility true), and run the smoketest with dbg-util before
touching this stuff
Change-Id: I I55f4e22d8ac61c7ac3ccc37b82794604b28a8f14
---
.../ui/slidesorter/shell/SlideSorterViewShell.cxx | 2 +-
sd/source/ui/toolpanel/ToolPanelViewShell.cxx | 2 +-
sd/source/ui/view/drviewsa.cxx | 3 +--
sd/source/ui/view/outlnvsh.cxx | 4 ++--
4 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
index a9b09a9..7b874c0 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
@@ -186,7 +186,7 @@ void SlideSorterViewShell::Initialize (void)
mpScrollBarBox);
mpView = &mpSlideSorter->GetView();
- ViewShell::doShow();
+ doShow();
SetPool( &GetDoc()->GetPool() );
SetUndoManager( GetDoc()->GetDocSh()->GetUndoManager() );
diff --git a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx
index 12f6515..8eb9bc7 100644
--- a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx
+++ b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx
@@ -482,7 +482,7 @@ ToolPanelViewShell::ToolPanelViewShell( SfxViewFrame* pFrame, ViewShellBase& rVi
,mpSubShellManager()
,mnMenuId(0)
{
- ViewShell::doShow();
+ doShow();
meShellType = ST_TASK_PANE;
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index 0d1b5ac..1dabda6 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -137,13 +137,12 @@ DrawViewShell::DrawViewShell( SfxViewFrame* pFrame, ViewShellBase& rViewShellBas
, mbIsLayerModeActive(false)
, mbIsInSwitchPage(false)
{
- ViewShell::doShow();
-
if (pFrameViewArgument != NULL)
mpFrameView = pFrameViewArgument;
else
mpFrameView = new FrameView(GetDoc());
Construct(GetDocSh(), ePageKind);
+ doShow();
}
/*************************************************************************
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index 4f13989..f37b7a0 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -222,8 +222,6 @@ OutlineViewShell::OutlineViewShell (
mbInitialized(false)
{
- ViewShell::doShow();
-
if (pFrameViewArgument != NULL)
mpFrameView = pFrameViewArgument;
else
@@ -232,6 +230,8 @@ OutlineViewShell::OutlineViewShell (
mpFrameView->Connect();
Construct(GetDocSh());
+
+ doShow();
}
/*************************************************************************
--
1.7.7.6

26
0001-Resolves-rhbz-806663-SlideshowImpl-can-outlive-SdMod.patch
Unescape View File

@ -1,26 +0,0 @@
From 24b867c1e1d2264ff138d4eafa9791fcd1191160 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Mon, 26 Mar 2012 13:53:55 +0100
Subject: [PATCH] Resolves: rhbz#806663 SlideshowImpl can outlive SdModule
(somehow)
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 3bc8dc1..ed9d76d 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -593,7 +593,10 @@ SlideshowImpl::SlideshowImpl( const Reference< XPresentation2 >& xPresentation,
SlideshowImpl::~SlideshowImpl()
{
- SdOptions* pOptions = SD_MOD()->GetSdOptions(DOCUMENT_TYPE_IMPRESS);
+ SdModule *pModule = SD_MOD();
+ //rhbz#806663 SlideshowImpl can outlive SdModule
+ SdOptions* pOptions = pModule ?
+ pModule->GetSdOptions(DOCUMENT_TYPE_IMPRESS) : NULL;
if( pOptions )
{
pOptions->SetPresentationPenColor(mnUserPaintColor);
--
1.7.7.6

42
0001-desktop-do-not-complain-about-soffice-command-line-o.patch
Unescape View File

@ -1,42 +0,0 @@
From db21197de4383f75718190072171adab15e64a00 Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Thu, 8 Mar 2012 15:49:52 +0100
Subject: [PATCH] desktop: do not complain about soffice command line options:
These are handled in the soffice wrapper script, but that is too stupid
to be able to filter these out, so just ignore them in soffice.bin.
(regression from 4efbd87e31e7488dfcdd1d07ff979f1f59b8b1f1)
Also, print errors on stderr.
---
desktop/source/app/cmdlineargs.cxx | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx
index 5ae86ab..0bc6312 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -306,10 +306,17 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier )
}
#if defined UNX
else
+ // because it's impossible to filter these options that
+ // are handled in the soffice shell script with the
+ // primitive tools that /bin/sh offers, ignore them here
+ if (!oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("backtrace")) &&
+ !oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("strace")) &&
+ !oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("nocrashreport")) &&
+ !oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("valgrind")))
{
- printf("Unknown option %s\n",
+ fprintf(stderr, "Unknown option %s\n",
rtl::OUStringToOString(aArg, osl_getThreadTextEncoding()).getStr());
- printf("Run 'soffice --help' to see a full list of available command line options.\n");
+ fprintf(stderr, "Run 'soffice --help' to see a full list of available command line options.\n");
SetBoolParam_Impl( CMD_BOOLPARAM_UNKNOWN, sal_True );
}
#endif
--
1.7.7.6

25
0001-disable-failing-check.patch
Unescape View File

@ -0,0 +1,25 @@
From b2d583e88ac53aafe96e71eb9b1068f6014100b7 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Thu, 21 Jun 2012 12:14:39 +0200
Subject: [PATCH] disable failing check
Change-Id: I746cd1178c40c78127e04dbc1876de052794bd57
---
sdext/Module_sdext.mk | 1 -
1 file changed, 1 deletion(-)
diff --git a/sdext/Module_sdext.mk b/sdext/Module_sdext.mk
index 6280984..ffafa6b 100644
--- a/sdext/Module_sdext.mk
+++ b/sdext/Module_sdext.mk
@@ -50,7 +50,6 @@ $(eval $(call gb_Module_add_targets,sdext,\
))
$(eval $(call gb_Module_add_check_targets,sdext,\
- CppunitTest_pdfimport \
))
endif
--
1.7.10.2

54
0001-do-not-let-gcc-use-registers-we-are-setting-ourselve.patch
Unescape View File

@ -1,54 +0,0 @@
From 032084d8582ef8eb04724d2488f3e381ac8054d2 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Mon, 23 Apr 2012 13:19:39 +0200
Subject: [PATCH] do not let gcc use registers we are setting ourselves
gcc uses a register for the function call--and it tried r9 here...
---
.../source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx
index 34e8c63..f409bf7 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx
@@ -67,7 +67,6 @@ static void callVirtualMethod(
// of floating point registers f1 to f8
unsigned long * mfunc; // actual function to be invoked
- void (*ptr)();
int gpr[8]; // storage for gpregisters, map to r3-r10
int off; // offset used to find function
#ifndef __NO_FPRS__
@@ -243,7 +242,8 @@ static void callVirtualMethod(
mfunc = *((unsigned long **)pAdjustedThisPtr); // get the address of the vtable
mfunc = (unsigned long *)((char *)mfunc + off); // get the address from the vtable entry at offset
mfunc = *((unsigned long **)mfunc); // the function is stored at the address
- ptr = (void (*)())mfunc;
+ typedef void (*FunctionCall)(sal_uInt32, sal_uInt32, sal_uInt32, sal_uInt32, sal_uInt32, sal_uInt32, sal_uInt32, sal_uInt32);
+ FunctionCall ptr = (FunctionCall)mfunc;
/* Set up the machine registers and invoke the function */
@@ -272,7 +272,17 @@ static void callVirtualMethod(
: "0", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12"
);
- (*ptr)();
+ // tell gcc that r3 to r10 are not available to it for doing the TOC and exception munge on the func call
+ register sal_uInt32 r3 __asm__("r3");
+ register sal_uInt32 r4 __asm__("r4");
+ register sal_uInt32 r5 __asm__("r5");
+ register sal_uInt32 r6 __asm__("r6");
+ register sal_uInt32 r7 __asm__("r7");
+ register sal_uInt32 r8 __asm__("r8");
+ register sal_uInt32 r9 __asm__("r9");
+ register sal_uInt32 r10 __asm__("r10");
+
+ (*ptr)(r3, r4, r5, r6, r7, r8, r9, r10);
__asm__ __volatile__ (
"mr %0, 3\n\t"
--
1.7.7.6

54
0001-fdo-38088-better-CSV-import-default-separators.patch
Unescape View File

@ -1,54 +0,0 @@
From f31362eb144153c914f1ae0cdda6fe8312c1152d Mon Sep 17 00:00:00 2001
Message-Id: <f31362eb144153c914f1ae0cdda6fe8312c1152d.1334148872.git.erack@redhat.com>
From: Eike Rathke <erack@redhat.com>
Date: Wed, 4 Apr 2012 20:17:22 +0200
Subject: [PATCH] resolved fdo#38088 rhbz#810267 better CSV import default separators
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="------------erAck-patch-parts"
This is a multi-part message in MIME format.
--------------erAck-patch-parts
Content-Type: text/plain; charset=UTF-8; format=fixed
Content-Transfer-Encoding: 8bit
---
.../registry/schema/org/openoffice/Office/Calc.xcs | 2 +-
sc/source/ui/dbgui/scuiasciiopt.cxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--------------erAck-patch-parts
Content-Type: text/x-patch; name="0001-fdo-33088-better-CSV-import-default-separators.patch"
Content-Transfer-Encoding: 8bit
Content-Disposition: attachment; filename="0001-fdo-33088-better-CSV-import-default-separators.patch"
diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index 700d716..0cd2ff3 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -1063,7 +1063,7 @@
<desc>List of Separators - as a String</desc>
<label>Separators</label>
</info>
- <value>; </value>
+ <value>,;&#9;</value>
</prop>
<prop oor:name="TextSeparators" oor:type="xs:string">
<info>
diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx
index 93d5cfc..2a3a2b94 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -268,7 +268,7 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,String aDatName,
SetText( aName );
// Default options
- OUString sFieldSeparators(RTL_CONSTASCII_USTRINGPARAM("\t"));
+ OUString sFieldSeparators(RTL_CONSTASCII_USTRINGPARAM(",;\t"));
OUString sTextSeparators(mcTextSep);
bool bMergeDelimiters = false;
bool bFixedWidth = false;
--------------erAck-patch-parts--

113
0001-fix-invalid-.desktop-files.patch
Unescape View File

@ -0,0 +1,113 @@
From 2b2e7aa7dfb3b41a2f0068a058bf7567465b87d2 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Mon, 25 Jun 2012 15:14:43 +0200
Subject: [PATCH] fix invalid .desktop files
desktop-file-validate issued the following error:
error: file contains group "New Shortcut Group", but groups extending
the format should start with "X-"
Change-Id: I45c0039ab788546a37780927284c8827a19fd52c
---
sysui/desktop/menus/base.desktop | 4 ++--
sysui/desktop/menus/calc.desktop | 4 ++--
sysui/desktop/menus/draw.desktop | 4 ++--
sysui/desktop/menus/impress.desktop | 4 ++--
sysui/desktop/menus/math.desktop | 4 ++--
sysui/desktop/menus/writer.desktop | 4 ++--
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/sysui/desktop/menus/base.desktop b/sysui/desktop/menus/base.desktop
index 8cc8e7c..72cf467 100755
--- a/sysui/desktop/menus/base.desktop
+++ b/sysui/desktop/menus/base.desktop
@@ -10,8 +10,8 @@ Name=%PRODUCTNAME Base
GenericName=Database Development
Comment=Manage databases, create queries and reports to track and manage your information by using Base.
InitialPreference=5
-X-Ayatana-Desktop-Shortcuts=New
-[New Shortcut Group]
+X-Ayatana-Desktop-Shortcuts=X-New
+[X-New Shortcut Group]
UnityQuicklist=New Database
Exec=libreoffice --base %U
TargetEnvironment=Unity
diff --git a/sysui/desktop/menus/calc.desktop b/sysui/desktop/menus/calc.desktop
index b1bde07..e9f3250 100755
--- a/sysui/desktop/menus/calc.desktop
+++ b/sysui/desktop/menus/calc.desktop
@@ -10,8 +10,8 @@ Name=%PRODUCTNAME Calc
GenericName=Spreadsheet
Comment=Perform calculations, analyze information and manage lists in spreadsheets by using Calc.
InitialPreference=5
-X-Ayatana-Desktop-Shortcuts=New
-[New Shortcut Group]
+X-Ayatana-Desktop-Shortcuts=X-New
+[X-New Shortcut Group]
UnityQuicklist=New Spreadsheet
Exec=libreoffice --calc %U
TargetEnvironment=Unity
diff --git a/sysui/desktop/menus/draw.desktop b/sysui/desktop/menus/draw.desktop
index 0bec2b0..5c741a9 100755
--- a/sysui/desktop/menus/draw.desktop
+++ b/sysui/desktop/menus/draw.desktop
@@ -10,8 +10,8 @@ Name=%PRODUCTNAME Draw
GenericName=Drawing Program
Comment=Create and edit drawings, flow charts, and logos by using Draw.
InitialPreference=5
-X-Ayatana-Desktop-Shortcuts=New
-[New Shortcut Group]
+X-Ayatana-Desktop-Shortcuts=X-New
+[X-New Shortcut Group]
UnityQuicklist=New Drawing
Exec=libreoffice --draw %U
TargetEnvironment=Unity
diff --git a/sysui/desktop/menus/impress.desktop b/sysui/desktop/menus/impress.desktop
index 0df250c..2fb8650 100755
--- a/sysui/desktop/menus/impress.desktop
+++ b/sysui/desktop/menus/impress.desktop
@@ -10,8 +10,8 @@ Name=%PRODUCTNAME Impress
GenericName=Presentation
Comment=Create and edit presentations for slideshows, meeting and Web pages by using Impress.
InitialPreference=5
-X-Ayatana-Desktop-Shortcuts=New
-[New Shortcut Group]
+X-Ayatana-Desktop-Shortcuts=X-New
+[X-New Shortcut Group]
UnityQuicklist=New Presentation
Exec=libreoffice --impress %U
TargetEnvironment=Unity
diff --git a/sysui/desktop/menus/math.desktop b/sysui/desktop/menus/math.desktop
index 67f9ea6..122e01f 100755
--- a/sysui/desktop/menus/math.desktop
+++ b/sysui/desktop/menus/math.desktop
@@ -11,8 +11,8 @@ Name=%PRODUCTNAME Math
GenericName=Formula Editor
Comment=Create and edit scientific formulas and equations by using Math.
InitialPreference=5
-X-Ayatana-Desktop-Shortcuts=New
-[New Shortcut Group]
+X-Ayatana-Desktop-Shortcuts=X-New
+[X-New Shortcut Group]
UnityQuicklist=New Formula
Exec=libreoffice --math %U
TargetEnvironment=Unity
diff --git a/sysui/desktop/menus/writer.desktop b/sysui/desktop/menus/writer.desktop
index 6d2274e..888b382 100755
--- a/sysui/desktop/menus/writer.desktop
+++ b/sysui/desktop/menus/writer.desktop
@@ -10,8 +10,8 @@ Name=%PRODUCTNAME Writer
GenericName=Word Processor
Comment=Create and edit text and graphics in letters, reports, documents and Web pages by using Writer.
InitialPreference=5
-X-Ayatana-Desktop-Shortcuts=New
-[New Shortcut Group]
+X-Ayatana-Desktop-Shortcuts=X-New
+[X-New Shortcut Group]
UnityQuicklist=New Document
Exec=libreoffice --writer %U
TargetEnvironment=Unity
--
1.7.10.2

33
0001-fix-setting-of-paper-tray-from-print-dialog-fdo-4393.patch
Unescape View File

@ -1,33 +0,0 @@
From 6d4cca9c22c52b5a7742adc47ebf1a2930e29764 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Wed, 14 Mar 2012 13:58:37 +0100
Subject: [PATCH] fix setting of paper tray from print dialog (fdo#43932)
This fixes the simple case when all pages are to be printed from the
same paper tray. The use of this setting is still confusing when there
is application-set tray for a page (e.g., for a page style in Writer,
through Format->Page), because the change in Preferences is applied (and
will be used for pages without application-set tray), but Preferences
shows the application-set value on second try again...
IOW, it still s---s, but it s---s a bit less .-)
---
vcl/source/gdi/print3.cxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index 4824203..817e6d5 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -773,7 +773,7 @@ PrinterController::PageSize vcl::ImplPrinterControllerData::modifyJobSetup( cons
PrinterController::PageSize aPageSize;
aPageSize.aSize = mpPrinter->GetPaperSize();
awt::Size aSetSize, aIsSize;
- sal_Int32 nPaperBin = mnDefaultPaperBin;
+ sal_Int32 nPaperBin = (mnFixedPaperBin != -1) ? mnFixedPaperBin : mnDefaultPaperBin;
for( sal_Int32 nProperty = 0, nPropertyCount = i_rProps.getLength(); nProperty < nPropertyCount; ++nProperty )
{
if( i_rProps[ nProperty ].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "PreferredPageSize" ) ) )
--
1.7.7.6

191
0001-move-binfilter-mime-types-into-extra-.desktop-file.patch
Unescape View File

@ -1,191 +0,0 @@
From 9441e2a015d38968592508782c4041dab5af1bda Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Tue, 31 Jan 2012 09:40:57 +0100
Subject: [PATCH] move binfilter mime types into extra .desktop file
---
scp2/source/ooo/common_brand.scp | 9 +++++++++
sysui/desktop/freedesktop/freedesktop-menus.spec | 1 +
sysui/desktop/menus/binfilter.desktop | 9 +++++++++
sysui/desktop/menus/calc.desktop | 2 +-
sysui/desktop/menus/draw.desktop | 2 +-
sysui/desktop/menus/impress.desktop | 2 +-
sysui/desktop/menus/math.desktop | 2 +-
sysui/desktop/menus/writer.desktop | 2 +-
sysui/desktop/share/launcher_genericname.ulf | 3 +++
sysui/desktop/share/makefile.mk | 7 ++++---
sysui/desktop/suse/suse-menus.spec | 1 +
11 files changed, 32 insertions(+), 8 deletions(-)
create mode 100644 sysui/desktop/menus/binfilter.desktop
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 6c6fb66..9893a60 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -87,6 +87,7 @@ Module gid_Module_Root_Brand
gid_Brand_File_Share_Registry_O5oo_Xcd,
gid_Brand_File_Script_Unopkg,
gid_Brand_File_Share_Xdg_Base,
+ gid_Brand_File_Share_Xdg_BinFilter,
gid_Brand_File_Share_Xdg_Calc,
gid_Brand_File_Share_Xdg_Draw,
gid_Brand_File_Share_Xdg_Extension,
@@ -781,6 +782,14 @@ File gid_Brand_File_Share_Xdg_JavaFilter
End
#endif
+#if defined UNX && ! defined MACOSX
+File gid_Brand_File_Share_Xdg_BinFilter
+ TXT_FILE_BODY;
+ Dir = gid_Brand_Dir_Share_Xdg;
+ Name = "binfilter.desktop";
+ Styles = (PACKED,SCPZIP_REPLACE);
+End
+#endif
// Profiles
diff --git a/sysui/desktop/freedesktop/freedesktop-menus.spec b/sysui/desktop/freedesktop/freedesktop-menus.spec
index d4efca5..78a33ae 100755
--- a/sysui/desktop/freedesktop/freedesktop-menus.spec
+++ b/sysui/desktop/freedesktop/freedesktop-menus.spec
@@ -386,6 +386,7 @@ done
/usr/share/applications/%unixfilename-writer.desktop
/usr/share/applications/%unixfilename-startcenter.desktop
/usr/share/applications/%unixfilename-javafilter.desktop
+/usr/share/applications/%unixfilename-binfilter.desktop
/usr/share/icons/gnome/*/apps/*png
/usr/share/icons/gnome/*/mimetypes/*png
/usr/share/icons/hicolor/*/apps/*png
diff --git a/sysui/desktop/menus/binfilter.desktop b/sysui/desktop/menus/binfilter.desktop
new file mode 100644
index 0000000..bfad37f
--- /dev/null
+++ b/sysui/desktop/menus/binfilter.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Version=1.0
+Terminal=false
+Type=Application
+Exec=${UNIXBASISROOTNAME} %U
+MimeType=application/vnd.stardivision.calc;application/vnd.stardivision.chart;application/vnd.stardivision.draw;application/vnd.stardivision.impress;application/vnd.stardivision.math;application/vnd.stardivision.writer;
+Name=%PRODUCTNAME Legacy StarOffice 5 Binary Format Importer
+GenericName=Legacy StarOffice 5 Binary Format Importer
+NoDisplay=true
diff --git a/sysui/desktop/menus/calc.desktop b/sysui/desktop/menus/calc.desktop
index 696385a..c8899cd 100755
--- a/sysui/desktop/menus/calc.desktop
+++ b/sysui/desktop/menus/calc.desktop
@@ -5,7 +5,7 @@ Icon=calc
Type=Application
Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Spreadsheets;
Exec=${UNIXBASISROOTNAME} --calc %U
-MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-flat-xml;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/vnd.stardivision.calc;application/vnd.stardivision.chart;application/msexcel;application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroenabled.12;application/vnd.ms-excel.sheet.binary.macroenabled.12;text/csv;application/x-dbf;text/spreadsheet;
+MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-flat-xml;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/msexcel;application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroenabled.12;application/vnd.ms-excel.sheet.binary.macroenabled.12;text/csv;application/x-dbf;text/spreadsheet;
Name=%PRODUCTNAME Calc
GenericName=Spreadsheet
Comment=Perform calculations, analyze information and manage lists in spreadsheets by using Calc.
diff --git a/sysui/desktop/menus/draw.desktop b/sysui/desktop/menus/draw.desktop
index 96234c6..67ad422 100755
--- a/sysui/desktop/menus/draw.desktop
+++ b/sysui/desktop/menus/draw.desktop
@@ -5,7 +5,7 @@ Icon=draw
Type=Application
Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Drawing;
Exec=${UNIXBASISROOTNAME} --draw %U
-MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-flat-xml;application/vnd.oasis.opendocument.graphics-template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;application/vnd.stardivision.draw;
+MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-flat-xml;application/vnd.oasis.opendocument.graphics-template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;
Name=%PRODUCTNAME Draw
GenericName=Drawing Program
Comment=Create and edit drawings, flow charts, and logos by using Draw.
diff --git a/sysui/desktop/menus/impress.desktop b/sysui/desktop/menus/impress.desktop
index 92060e3..91c937a 100755
--- a/sysui/desktop/menus/impress.desktop
+++ b/sysui/desktop/menus/impress.desktop
@@ -5,7 +5,7 @@ Icon=impress
Type=Application
Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Presentations;
Exec=${UNIXBASISROOTNAME} --impress %U
-MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-flat-xml;application/vnd.oasis.opendocument.presentation-template;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/vnd.stardivision.impress;application/mspowerpoint;application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.presentation.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroenabled.12;
+MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-flat-xml;application/vnd.oasis.opendocument.presentation-template;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/mspowerpoint;application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.presentation.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroenabled.12;
Name=%PRODUCTNAME Impress
GenericName=Presentation
Comment=Create and edit presentations for slideshows, meeting and Web pages by using Impress.
diff --git a/sysui/desktop/menus/math.desktop b/sysui/desktop/menus/math.desktop
index 61bade6..23e2d87 100755
--- a/sysui/desktop/menus/math.desktop
+++ b/sysui/desktop/menus/math.desktop
@@ -6,7 +6,7 @@ Icon=math
Type=Application
Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Other;
Exec=${UNIXBASISROOTNAME} --math %U
-MimeType=application/vnd.oasis.opendocument.formula;application/vnd.sun.xml.math;application/vnd.stardivision.math;
+MimeType=application/vnd.oasis.opendocument.formula;application/vnd.sun.xml.math;
Name=%PRODUCTNAME Math
GenericName=Formula Editor
Comment=Create and edit scientific formulas and equations by using Math.
diff --git a/sysui/desktop/menus/writer.desktop b/sysui/desktop/menus/writer.desktop
index 625df59..0db0d05 100755
--- a/sysui/desktop/menus/writer.desktop
+++ b/sysui/desktop/menus/writer.desktop
@@ -5,7 +5,7 @@ Icon=writer
Type=Application
Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Wordprocessors;
Exec=${UNIXBASISROOTNAME} --writer %U
-MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-flat-xml;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/vnd.stardivision.writer;application/msword;application/vnd.ms-word;application/x-doc;application/x-hwp;application/rtf;text/rtf;application/vnd.wordperfect;application/wordperfect;application/vnd.lotus-wordpro;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12;
+MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-flat-xml;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/msword;application/vnd.ms-word;application/x-doc;application/x-hwp;application/rtf;text/rtf;application/vnd.wordperfect;application/wordperfect;application/vnd.lotus-wordpro;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12;
Name=%PRODUCTNAME Writer
GenericName=Word Processor
Comment=Create and edit text and graphics in letters, reports, documents and Web pages by using Writer.
diff --git a/sysui/desktop/share/launcher_genericname.ulf b/sysui/desktop/share/launcher_genericname.ulf
index ff8041a..6130e0b 100755
--- a/sysui/desktop/share/launcher_genericname.ulf
+++ b/sysui/desktop/share/launcher_genericname.ulf
@@ -21,3 +21,6 @@ en-US = "Office"
[javafilter]
en-US = "Small Device Format Importer"
+
+[binfilter]
+en-US = "Legacy StarOffice 5 Binary Format Importer"
diff --git a/sysui/desktop/share/makefile.mk b/sysui/desktop/share/makefile.mk
index f6a34b1..f6b4dfa 100755
--- a/sysui/desktop/share/makefile.mk
+++ b/sysui/desktop/share/makefile.mk
@@ -52,7 +52,8 @@ ULFFILES= \
launcher_genericname.ulf \
launcher_name.ulf
-LAUNCHERLIST = writer calc draw impress math base printeradmin qstart startcenter javafilter
+LAUNCHERLIST_APPS = writer calc draw impress math base printeradmin startcenter
+LAUNCHERLIST = $(LAUNCHERLIST_APPS) qstart javafilter binfilter
LAUNCHERDEPN = ../menus/{$(LAUNCHERLIST)}.desktop
LAUNCHERFLAGFILE = $(COMMONMISC)/$(TARGET)/xdg.flag
@@ -126,9 +127,9 @@ MIMEICONLIST = \
extension
ICONDEPN = \
- ../icons/hicolor/{16x16 32x32 48x48}/apps/{$(LAUNCHERLIST:s/qstart//:s/javafilter//)}.png \
+ ../icons/hicolor/{16x16 32x32 48x48}/apps/{$(LAUNCHERLIST_APPS)}.png \
../icons/hicolor/{16x16 32x32 48x48}/mimetypes/{$(MIMEICONLIST)}.png \
- ../icons/locolor/{16x16 32x32}/apps/{$(LAUNCHERLIST:s/qstart//:s/javafilter//)}.png \
+ ../icons/locolor/{16x16 32x32}/apps/{$(LAUNCHERLIST_APPS)}.png \
../icons/locolor/{16x16 32x32}/mimetypes/{$(MIMEICONLIST)}.png
# --- Targets ------------------------------------------------------
diff --git a/sysui/desktop/suse/suse-menus.spec b/sysui/desktop/suse/suse-menus.spec
index ea5ae31..74b67e6 100755
--- a/sysui/desktop/suse/suse-menus.spec
+++ b/sysui/desktop/suse/suse-menus.spec
@@ -357,6 +357,7 @@ done
/usr/share/applications/%unixfilename-printeradmin.desktop
/usr/share/applications/%unixfilename-startcenter.desktop
/usr/share/applications/%unixfilename-javafilter.desktop
+/usr/share/applications/%unixfilename-binfilter.desktop
/opt/gnome/share/mime-info/*.keys
/opt/gnome/share/mime-info/*.mime
/opt/kde3/share/mimelnk/application/*.desktop
--
1.7.7.5

28
0001-preserve-timestamps-for-.py-files.patch
Unescape View File

@ -1,28 +0,0 @@
From 18af7e03d81d295a47457486d3036681bd17eb81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Mon, 13 Feb 2012 10:45:59 +0000
Subject: [PATCH] preserve timestamps for .py files
.pyc and .pyo binary caches contain the timestamp of the .py file, so for
fedora multilib if the .py files get different times on different arch then the
.py[o|c] files end up being different for the same content
---
solenv/bin/install-gdb-printers | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/solenv/bin/install-gdb-printers b/solenv/bin/install-gdb-printers
index 99686cf..df327a0 100755
--- a/solenv/bin/install-gdb-printers
+++ b/solenv/bin/install-gdb-printers
@@ -165,7 +165,7 @@ fi
if [[ ${DESTDIR}${pythondir} != ${GDBDIR} ]]; then
mkdir -p "${DESTDIR}${pythondir}" || die "cannot create dir '${DESTDIR}${pythondir}'"
- cp -r "${GDBDIR}/libreoffice" "${DESTDIR}${pythondir}"
+ cp -pr "${GDBDIR}/libreoffice" "${DESTDIR}${pythondir}"
fi
make_autoload cppu ure-link/lib libuno_cppu."$DYLIB".3
--
1.7.7.6

29
0001-remove-useless-extern-declaration.patch
Unescape View File

@ -0,0 +1,29 @@
From 0067a7ed1e1c2177fc6782f790debc9a011f18a2 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Mon, 25 Jun 2012 10:37:12 +0200
Subject: [PATCH] remove useless extern declaration
This fixes segfault in checkdll libbf_xolo.so during build of
libreoffice 3.6 package for Fedora Rawhide. Do not ask me why...
Change-Id: I367a85ba2a10bc60bcd74ca90c2fd24e86f70967
---
binfilter/inc/bf_xmloff/XMLChartPropertySetMapper.hxx | 2 --
1 file changed, 2 deletions(-)
diff --git a/binfilter/inc/bf_xmloff/XMLChartPropertySetMapper.hxx b/binfilter/inc/bf_xmloff/XMLChartPropertySetMapper.hxx
index e4c9d27..a1e8932 100644
--- a/binfilter/inc/bf_xmloff/XMLChartPropertySetMapper.hxx
+++ b/binfilter/inc/bf_xmloff/XMLChartPropertySetMapper.hxx
@@ -37,8 +37,6 @@
namespace rtl { class OUString; }
namespace binfilter {
-extern const XMLPropertyMapEntry aXMLChartPropMap[];
-
class SvXMLExport;
// ----------------------------------------
--
1.7.10.2

57
0001-save-register-arguments-first.patch
Unescape View File

@ -1,57 +0,0 @@
From f4c5fe13fd1484aa1bf37910841c689877740602 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Mon, 23 Apr 2012 09:47:41 +0200
Subject: [PATCH] save register arguments first
The "mr" stores r11 to indeterminate register (r9 in my case) before
storing it into the output variable, thus overwriting one of our input
arguments... This later leads to nice segfault in
testtools/source/bridgetest ...
I suppose there is a better way to get the variable, but I do not know
it .-)
---
.../cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
index 425c5b5..3cb94dd 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
@@ -504,13 +504,6 @@ static typelib_TypeClass cpp_mediate(
extern "C" void privateSnippetExecutor( ... )
{
- volatile long nOffsetAndIndex;
-
- //mr %r3, %r11 # move into arg1 the 64bit value passed from OOo
- __asm__ __volatile__ (
- "mr %0, 11\n\t"
- : "=r" (nOffsetAndIndex) : );
-
sal_uInt64 gpreg[ppc64::MAX_GPR_REGS];
double fpreg[ppc64::MAX_SSE_REGS];
@@ -537,11 +530,18 @@ extern "C" void privateSnippetExecutor( ... )
"stfd 12, 88(%1)\t\n"
"stfd 13, 96(%1)\t\n"
: : "r" (gpreg), "r" (fpreg)
- : "r0", "r3", "r4", "r5", "r6", "r7", "r8", "r9", "r10",
+ : "r0", "r3", "r4", "r5", "r6", "r7", "r8", "r9", "r10", "r11",
"fr1", "fr2", "fr3", "fr4", "fr5", "fr6", "fr7", "fr8", "fr9",
"fr10", "fr11", "fr12", "fr13"
);
+ volatile long nOffsetAndIndex;
+
+ //mr %r3, %r11 # move into arg1 the 64bit value passed from OOo
+ __asm__ __volatile__ (
+ "mr %0, 11\n\t"
+ : "=r" (nOffsetAndIndex) : );
+
volatile long sp;
//stack pointer
--
1.7.7.6

34
0001-specify-the-sourced-file-with-path.patch
Unescape View File

@ -0,0 +1,34 @@
From 619e3d71759ded4c0bc9f344ac433c1037ed1fd2 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Thu, 21 Jun 2012 08:56:52 +0200
Subject: [PATCH] specify the sourced file with path
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
"man source" says:
"If filename does not contain a slash, file names in PATH are used to
find the directory containing file‐ name. The file searched for in PATH
need not be executable. When bash is not in posix mode, the
current directory is searched if no file is found in PATH."
Change-Id: I7dc15d30ba925c71d02da2cd8b91ea08192730fc
---
config_host.mk.source | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/config_host.mk.source b/config_host.mk.source
index 042ffa2..10dd617 100644
--- a/config_host.mk.source
+++ b/config_host.mk.source
@@ -6,5 +6,5 @@
temp_conf=`mktemp config_host.mk.XXXXXX`
sed -e 's/^\s*\(export [A-Z0-9_]*=\)\(.*\)$/\1"\2"/' config_host.mk >$temp_conf
-source $temp_conf
+source ./$temp_conf
rm $temp_conf
--
1.7.10.2

28
0001-use-ure-instead-of-ure-link.patch
Unescape View File

@ -1,28 +0,0 @@
From 0acbbeaeeb8ef0221dbef6d6bbdea94394d79a59 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Mon, 11 Jun 2012 14:09:39 +0200
Subject: [PATCH] use ure instead of ure-link
Change-Id: I5368770926aee871e20b2d87fa51b28212c8be4f
---
solenv/bin/install-gdb-printers | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/solenv/bin/install-gdb-printers b/solenv/bin/install-gdb-printers
index c478929..51ab9e2 100755
--- a/solenv/bin/install-gdb-printers
+++ b/solenv/bin/install-gdb-printers
@@ -168,8 +168,8 @@ if [[ ${DESTDIR}${pythondir} != ${GDBDIR} ]]; then
cp -pr "${GDBDIR}/libreoffice" "${DESTDIR}${pythondir}"
fi
-make_autoload cppu ure-link/lib libuno_cppu."$DYLIB".3
-make_autoload sal ure-link/lib libuno_sal."$DYLIB".3
+make_autoload cppu ure/lib libuno_cppu."$DYLIB".3
+make_autoload sal ure/lib libuno_sal."$DYLIB".3
make_autoload svl program libsvllo."$DYLIB"
make_autoload sw program libswlo."$DYLIB"
make_autoload tl program libtllo."$DYLIB"
--
1.7.10.2

43
0001-wrong-types-used-here-breaks-64bit-bigendian.patch
Unescape View File

@ -1,43 +0,0 @@
From 78719066cb546c7dc74e87488b9b7a695606cf7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Tue, 6 Mar 2012 09:37:35 +0000
Subject: [PATCH] wrong types used here, breaks 64bit bigendian
---
sw/qa/core/Test-BigPtrArray.cxx | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/sw/qa/core/Test-BigPtrArray.cxx b/sw/qa/core/Test-BigPtrArray.cxx
index 7953dc3..d9be7a2 100644
--- a/sw/qa/core/Test-BigPtrArray.cxx
+++ b/sw/qa/core/Test-BigPtrArray.cxx
@@ -82,7 +82,7 @@ namespace /* private */
sal_Bool AddToCount(const ElementPtr& rElem, void* pArgs)
{
BigPtrEntryMock* const pbem = static_cast<BigPtrEntryMock* const>(rElem);
- pbem->setCount(pbem->getCount() + *((int*)pArgs));
+ pbem->setCount(pbem->getCount() + *((sal_uLong*)pArgs));
return true;
}
@@ -655,7 +655,7 @@ public:
fillBigPtrArray(bparr, NUM_ENTRIES);
dumpBigPtrArray(bparr);
- int addCount = 1;
+ sal_uLong addCount = 1;
bparr.ForEach(AddToCount, &addCount);
for (sal_uLong i = 0; i < NUM_ENTRIES; i++)
@@ -715,7 +715,7 @@ public:
fillBigPtrArray(bparr, NUM_ENTRIES);
dumpBigPtrArray(bparr);
- int addCount = 1;
+ sal_uLong addCount = 1;
bparr.ForEach(NUM_ENTRIES / 2, NUM_ENTRIES, AddToCount, &addCount);
sal_uLong i = 0;
--
1.7.7.6

119
libreoffice-ensure-non-broken-xml-tree.patch
Unescape View File

@ -1,119 +0,0 @@
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 65d5a80..b544f74 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -313,6 +313,14 @@ gb_XSLTPROCTARGET := $(call gb_Executable_get_target_for_build,xsltproc)
gb_XSLTPROC := $(gb_Helper_set_ld_path) $(gb_XSLTPROCTARGET)
endif
+ifeq ($(SYSTEM_LIBXML_FOR_BUILD),YES)
+gb_XMLLINTTARGET :=
+gb_XMLLINT := xsltproc
+else
+gb_XMLLINTTARGET := $(call gb_Executable_get_target_for_build,xsltproc)
+gb_XMLLINT := $(gb_Helper_set_ld_path) $(gb_XMLLINTTARGET)
+endif
+
ifeq ($(SYSTEM_PYTHON),YES)
gb_PYTHONTARGET :=
gb_PYTHON := $(PYTHON)
diff --git a/solenv/inc/unitools.mk b/solenv/inc/unitools.mk
index 0418fc1..4de797c 100644
--- a/solenv/inc/unitools.mk
+++ b/solenv/inc/unitools.mk
@@ -41,6 +41,14 @@
XSLTPROC*=$(AUGMENT_LIBRARY_PATH) xsltproc
.ENDIF # "$(SYSTEM_LIBXSLT)"!="YES"
+.IF "$(XMLLINT)"==""
+.IF "$(SYSTEM_LIBXML)"!="YES"
+XMLLINT=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/xmllint
+.ELSE # "$(SYSTEM_LIBXML)"!="YES"
+XMLLINT=$(AUGMENT_LIBRARY_PATH) xmllint
+.ENDIF # "$(SYSTEM_LIBXML)"!="YES"
+.ENDIF
+
ULFCONV*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/ulfconv
MAKEDEPEND*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/makedepend
diff --git a/translations/source/nn/helpcontent2/source/text/scalc.po b/translations/source/nn/helpcontent2/source/text/scalc.po
index 9105195..d8573a3 100644
--- a/translations/source/nn/helpcontent2/source/text/scalc.po
+++ b/translations/source/nn/helpcontent2/source/text/scalc.po
@@ -179,7 +179,7 @@ msgstr "<ahelp hid=\".\"><emph>Biletlinja</emph> blir vist når du set inn eller
#: main0203.xhp#tit.help.text
msgid "Drawing Object Properties Bar"
-msgstr "Linja <emph>Eigenskapar for teikneobjekt</emph>"
+msgstr "Linja \"Eigenskapar for teikneobjekt\""
#: main0203.xhp#hd_id3154346.1.help.text
msgid "<link href=\"text/scalc/main0203.xhp\" name=\"Drawing Object Properties Bar\">Drawing Object Properties Bar</link>"
@@ -207,7 +207,7 @@ msgstr "<link href=\"text/shared/01/05210100.xhp\" name=\"Background Color\">Bak
#: main0210.xhp#tit.help.text
msgid "Page Preview Bar"
-msgstr "Linja <emph>Førehandsvis sida</emph>"
+msgstr "Linja \"Førehandsvis sida\""
#: main0210.xhp#hd_id3156023.1.help.text
msgid "<link href=\"text/scalc/main0210.xhp\" name=\"Page Preview Bar\">Page Preview Bar</link>"
diff --git a/translations/source/nn/helpcontent2/source/text/swriter.po b/translations/source/nn/helpcontent2/source/text/swriter.po
index 80768e6..4aaf28f 100644
--- a/translations/source/nn/helpcontent2/source/text/swriter.po
+++ b/translations/source/nn/helpcontent2/source/text/swriter.po
@@ -516,7 +516,7 @@ msgstr "Desse hjelpeemna er tilgjengelege for menyar og dialogvindauge."
#: main0205.xhp#tit.help.text
msgid "Drawing Object Properties Bar"
-msgstr "Verktøylinja <emph>Eigenskapar for teikneobjekt</emph>"
+msgstr "Verktøylinja \"Eigenskapar for teikneobjekt\"
#: main0205.xhp#hd_id3154275.1.help.text
msgid "<link href=\"text/swriter/main0205.xhp\" name=\"Drawing Object Properties Bar\">Drawing Object Properties Bar</link>"
@@ -597,7 +597,7 @@ msgstr "Dette er ei oversikt over verktøylinjene i $[officename] Writer.<embedv
#: main0204.xhp#tit.help.text
msgid "Table Bar"
-msgstr "Verktøylinja <emph>Tabell</emph>"
+msgstr "Verktøylinja \"Tabell\""
#: main0204.xhp#hd_id3145587.1.help.text
msgid "<link href=\"text/swriter/main0204.xhp\" name=\"Table Bar\">Table Bar</link>"
diff --git a/helpcontent2/helpers/update_tree.pl b/helpcontent2/helpers/update_tree.pl
index 8dc7bf4..80befc2 100644
--- a/helpcontent2/helpers/update_tree.pl
+++ b/helpcontent2/helpers/update_tree.pl
@@ -46,6 +46,7 @@ terminate() if ( ! defined $inpath );
my $destpath = $inpath;
my $with_lang = $ENV{WITH_LANG};
+my $xmllint = $ENV{XMLLINT};
# Always use / directory separators
@@ -308,6 +309,7 @@ sub processtreefiles {
unlink "$tree_dest/$lng/$tv" ;
my $ret=mv $treetmpfile , "$tree_dest/$lng/$tv$inpath" or &terminate("Cannot write to $tree_dest/$lng/$tv$inpath - Error $!");
my $ret=mv "$tree_dest/$lng/$tv$inpath" , "$tree_dest/$lng/$tv" or &terminate("Cannot write to $tree_dest/$lng/$tv - Error $!");
+ system("$xmllint --noout --noent $tree_dest/$lng/$tv") == 0 or &terminate("$tree_dest/$lng/$tv is illformed xml (xmllint)" );
}
} else {
&terminate("Cannot write to $tvout");
diff --git a/helpcontent2/source/auxiliary/makefile.mk b/helpcontent2/source/auxiliary/makefile.mk
index 45ab373..049879b 100644
--- a/helpcontent2/source/auxiliary/makefile.mk
+++ b/helpcontent2/source/auxiliary/makefile.mk
@@ -60,9 +60,11 @@ aux_alllangiso_all:=$(foreach,i,$(alllangiso) $(foreach,j,$(aux_langdirs) $(eq,$
aux_alllangiso:=$(foreach,i,$(aux_alllangiso_all) $(foreach,j,$(help_exist) $(eq,$i,$j $i $(NULL))))
WITH_LANG!:=$(aux_alllangiso)
-
.EXPORT : WITH_LANG
+XMLLINT !:=$(XMLLINT)
+.EXPORT : XMLLINT
+
LOCTREEFILES:=$(foreach,i,$(aux_alllangiso) $(foreach,j,$(TREEFILES) $(COMMONMISC)$/$i$/$j))
.ELSE #IF "$(WITH_LANG)"!=""
aux_langdirs:=en-US

4
libreoffice-installfix.patch
Unescape View File

@ -1,7 +1,7 @@
--- a/solenv/bin/modules/installer/worker.pm 2010-11-20 13:36:38.000000000 +0000
+++ b/solenv/bin/modules/installer/worker.pm 2010-11-20 13:36:42.000000000 +0000
@@ -403,7 +403,6 @@
{
@@ -204,7 +204,6 @@
$installdir = installer::systemactions::create_directories("install", $languageref);
installer::logger::print_message( "... creating installation set in $installdir ...\n" );
- remove_old_installation_sets($installdir);

181
libreoffice.spec
Unescape View File

@ -1,4 +1,9 @@
%define libo_version 3.5.5
# download path contains version without the last (fourth) digit
%define libo_version 3.6.0
# Should contain .alphaX / .betaX, if this is pre-release (actually
# pre-RC) version. The pre-release string is part of tarball file names,
# so we need a way to define it easily at one place.
%define libo_prerelease .beta2
# rhbz#715152 state vendor
%if 0%{?rhel}
%define vendoroption --with-vendor="Red Hat, Inc."
@ -34,17 +39,17 @@
Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
Version: %{libo_version}.1
Release: 2%{?dist}
Version: %{libo_version}.0
Release: 1%{libo_prerelease}%{?dist}
License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic
Group: Applications/Productivity
URL: http://www.documentfoundation.org/develop
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{source_url}/libreoffice-core-%{version}.tar.xz
Source1: %{source_url}/libreoffice-binfilter-%{version}.tar.xz
Source2: %{source_url}/libreoffice-help-%{version}.tar.xz
Source3: %{source_url}/libreoffice-translations-%{version}.tar.xz
Source0: %{source_url}/libreoffice-core-%{version}%{libo_prerelease}.tar.xz
Source1: %{source_url}/libreoffice-binfilter-%{version}%{libo_prerelease}.tar.xz
Source2: %{source_url}/libreoffice-help-%{version}%{libo_prerelease}.tar.xz
Source3: %{source_url}/libreoffice-translations-%{version}%{libo_prerelease}.tar.xz
Source4: http://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
Source5: redhat-langpacks.tar.gz
Source6: libreoffice-multiliblauncher.sh
@ -71,7 +76,7 @@ Source23: http://dev-www.libreoffice.org/src/fca8706f2c4619e2fa3f8f42f8fc1
%endif
BuildRequires: zip, findutils, autoconf, flex, bison, icu, gperf, gcc-c++
BuildRequires: binutils, java-devel, boost-devel
BuildRequires: binutils, java-devel, boost-devel, automake, doxygen
BuildRequires: python-devel, expat-devel, libxml2-devel, libxslt-devel, bc
BuildRequires: neon-devel, libcurl-devel, libidn-devel, pam-devel, cups-devel
BuildRequires: libXext-devel, libXt-devel, libICE-devel, libjpeg-devel, make
@ -80,12 +85,12 @@ BuildRequires: sane-backends-devel, libicu-devel, libXinerama-devel
BuildRequires: freetype-devel, gtk2-devel, desktop-file-utils, hyphen-devel
BuildRequires: evolution-data-server-devel, nss-devel, zlib-devel
BuildRequires: gstreamer-devel, gstreamer-plugins-base-devel, openssl-devel
BuildRequires: lpsolve-devel, bsh, lucene, lucene-contrib, perl(Archive::Zip)
BuildRequires: lpsolve-devel, bsh, clucene-core-devel, perl(Archive::Zip)
BuildRequires: mesa-libGLU-devel, redland-devel, ant, ant-apache-regexp, rsync
BuildRequires: apache-commons-codec, jakarta-commons-httpclient, cppunit-devel
BuildRequires: apache-commons-lang, poppler-devel, fontpackages-devel
BuildRequires: pentaho-reporting-flow-engine, vigra-devel, librsvg2-devel
BuildRequires: GConf2-devel, ORBit2-devel, postgresql-devel
BuildRequires: GConf2-devel, postgresql-devel
BuildRequires: liberation-sans-fonts >= 1.0, liberation-serif-fonts >= 1.0, liberation-mono-fonts >= 1.0
%if %{defined rhel} && 0%{?rhel} < 7
BuildRequires: hsqldb, db4-devel
@ -94,6 +99,7 @@ BuildRequires: mdds-devel, mythes-devel, graphite2-devel, libwpg-devel
BuildRequires: libwps-devel, junit, perl(Digest::MD5), libdb-devel
BuildRequires: mysql-connector-c++-devel, poppler-cpp-devel
BuildRequires: libcmis-devel, libexttextcat-devel, libvisio-devel
BuildRequires: libcdr-devel, libmspub-devel
%endif
%if %{undefined rhel}
BuildRequires: kdelibs4-devel
@ -126,24 +132,10 @@ Patch12: libreoffice-rhel6poppler.patch
Patch13: libreoffice-rhel6langs.patch
Patch14: 0001-Disable-problematic-reading-of-external-entities-in-.patch
%endif
Patch15: 0001-move-binfilter-mime-types-into-extra-.desktop-file.patch
Patch16: 0001-Resolves-rhbz-788042-skip-splashscreen-with-quicksta.patch
Patch17: libreoffice-ensure-non-broken-xml-tree.patch
Patch18: 0001-preserve-timestamps-for-.py-files.patch
Patch19: 0001-Resolves-rhbz-788045-swriter-help-etc-doesn-t-show-h.patch
Patch20: 0001-Resolves-rhbz-799525-put-flat-odf-mimetypes-in-xsltf.patch
Patch21: 0001-Resolves-rhbz-800272-complain-about-unknown-command-.patch
Patch22: 0001-fix-setting-of-paper-tray-from-print-dialog-fdo-4393.patch
Patch23: 0001-Resolves-rhbz-806663-SlideshowImpl-can-outlive-SdMod.patch
Patch24: 0001-desktop-do-not-complain-about-soffice-command-line-o.patch
Patch25: 0001-Resolves-fdo-48096-torn-off-popups-trigger-keyboard-.patch
Patch26: 0001-fdo-38088-better-CSV-import-default-separators.patch
Patch27: 0001-save-register-arguments-first.patch
Patch28: 0001-do-not-let-gcc-use-registers-we-are-setting-ourselve.patch
Patch29: 0001-wrong-types-used-here-breaks-64bit-bigendian.patch
Patch30: 0001-Resolves-rhbz-805743-a11y-call-doShow-after-we-have-.patch
Patch31: 0001-Resolves-fdo-49849-implement-Unicode-6.1-hebrew-line.patch
Patch32: 0001-use-ure-instead-of-ure-link.patch
Patch15: 0001-specify-the-sourced-file-with-path.patch
Patch16: 0001-disable-failing-check.patch
Patch17: 0001-remove-useless-extern-declaration.patch
Patch18: 0001-fix-invalid-.desktop-files.patch
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%define instdir %{_libdir}
@ -168,7 +160,6 @@ Requires: %{name}-ure = %{epoch}:%{version}-%{release}
Requires: liberation-sans-fonts >= 1.0, liberation-serif-fonts >= 1.0, liberation-mono-fonts >= 1.0
Requires: dejavu-sans-fonts, dejavu-serif-fonts, dejavu-sans-mono-fonts
Requires: hunspell-en, hyphen-en, hyphen >= 2.4, autocorr-en
Requires: lucene, lucene-contrib
Requires(pre): gtk2 >= 2.9.4
Requires(post): gtk2 >= 2.9.4
Requires(preun): gtk2 >= 2.9.4
@ -986,26 +977,10 @@ mv -f redhat.soc extras/source/palettes/standard.soc
%patch13 -p0 -b .rhel6langs.patch
%patch14 -p1 -b .Disable-problematic-reading-of-external-entities-in-.patch
%endif
%patch15 -p1 -b .move-binfilter-mime-types-into-extra-.desktop-file.patch
%patch16 -p1 -b .rhbz788042-skip-splashscreen-with-quicksta.patch
%patch17 -p1 -b .ensure-non-broken-xml-tree.patch
%patch18 -p1 -b .preserve-timestamps-for-.py-files.patch
%patch19 -p1 -b .rhbz788045-swriter-help-etc-doesn-t-show-h.patch
%patch20 -p1 -b .rhbz-799525-put-flat-odf-mimetypes-in-xsltf.patch
%patch21 -p1 -b .rhbz-800272-complain-about-unknown-command-.patch
%patch22 -p1 -b .fix-setting-of-paper-tray-from-print-dialog-fdo-4393.patch
%patch23 -p1 -b .rhbz-806663-SlideshowImpl-can-outlive-SdMod.patch
%patch24 -p1 -b .do-not-complain-about-soffice-command-line-o.patch
%patch25 -p1 -b .fdo48096-torn-off-popups-trigger-keyboard-.patch
%patch26 -p1 -b .fdo-38088-better-CSV-import-default-separators.patch
%patch27 -p1 -b .save-register-arguments-first.patch
%patch28 -p1 -b .do-not-let-gcc-use-registers-we-are-setting-ourselve.patch
%patch29 -p1 -b .wrong-types-used-here-breaks-64bit-bigendian.patch
%patch30 -p1 -b .rhbz-805743-a11y-call-doShow-after-we-have-.patch
%if %{defined rhel} && 0%{?rhel} >= 7 || %{defined fedora} && 0%{?fedora} >= 18
%patch31 -p1 -b .fdo-49849-implement-Unicode-6.1-hebrew-line.patch
%endif
%patch32 -p1 -b .use-ure-instead-of-ure-link.patch
%patch15 -p1 -b .specify-the-sourced-file-with-path.patch
%patch16 -p1 -b .disable-failing-check.patch
%patch17 -p1 -b .remove-useless-extern-declaration.patch
%patch18 -p1 -b .fix-invalid-.desktop-files.patch
# TODO: check this
# these are horribly incomplete--empty translations and copied english
@ -1022,8 +997,10 @@ POORHELPS="$POORHELPS `grep 'msgstr .Working with Documents' translations/source
SMP_MFLAGS=%{?_smp_mflags}
SMP_MFLAGS=$[${SMP_MFLAGS/-j/}]
if [ $SMP_MFLAGS -lt 2 ]; then SMP_MFLAGS=2; fi
NDMAKES=`dc -e "$SMP_MFLAGS v p"`
NBUILDS=`dc -e "$SMP_MFLAGS $NDMAKES / p"`
# NDMAKES (or --with-max-jobs) is what is used for tail_build. We surely
# want as much paralelism as possible there.
NDMAKES=$SMP_MFLAGS
NBUILDS=`dc -e "$SMP_MFLAGS v p"`
%if %{undefined rhel}
# KDE bits
@ -1054,7 +1031,10 @@ export CXXFLAGS=$ARCH_FLAGS
%define distrooptions --without-system-hsqldb --enable-kde4
%endif
aclocal -I m4
autoconf
# avoid running autogen.sh on make
touch autogen.lastrun
%configure \
%vendoroption --with-num-cpus=$NBUILDS --with-max-jobs=$NDMAKES \
--with-build-version="%{version}-%{release}" --with-unix-wrapper=%{name} \
@ -1073,8 +1053,8 @@ autoconf
--without-myspell-dicts --without-fonts --without-ppds --without-afms \
%{with_lang} --with-poor-help-localizations="$POORHELPS" \
--with-external-tar=`pwd`/ext_sources --with-java-target-version=1.5 \
--without-system-sampleicc \
%{distrooptions} %{?with_binfilter:--enable-binfilter}
%{distrooptions} %{?with_binfilter:--enable-binfilter} \
--disable-fetch-external
mkdir -p ext_sources
cp %{SOURCE4} ext_sources
@ -1097,23 +1077,22 @@ cp %{SOURCE21} ext_sources
cp %{SOURCE22} ext_sources
cp %{SOURCE23} ext_sources
%endif
touch src.downloaded
. ./Env.Host.sh
./bootstrap
cd instsetoo_native
if ! VERBOSE=true build --dlv_switch -link -P$NBUILDS --all -- -P$NDMAKES -s; then
build --dlv_switch -link --all
if ! make VERBOSE=true; then
# TODO Do we still need this? I think parallel build is reliable
# enough these days...
# make GMAKE_OPTIONS=-rj1
exit 1
fi
# TODO: get rid of this
. ./config_host.mk.source
#generate the icons and mime type stuff
export DESTDIR=../../../output
export KDEMAINDIR=/usr
export GNOMEDIR=/usr
export GNOME_MIME_THEME=hicolor
cd ../sysui
cd unxlng*/misc/libreoffice
cd sysui/unxlng*/misc/libreoffice
./create_tree.sh
echo build end time is `date`, diskspace: `df -h . | tail -n 1`
@ -1121,7 +1100,8 @@ echo build end time is `date`, diskspace: `df -h . | tail -n 1`
%install
rm -rf $RPM_BUILD_ROOT
source ./Env.Host.sh
# TODO: get rid of this
. ./config_host.mk.source
#figure out the icon version
export `grep "^PRODUCTVERSIONSHORT =" solenv/inc/productversion.mk | sed -e "s/ //g"`
export `grep "PRODUCTVERSION[ ]*=[ ]*" solenv/inc/productversion.mk | sed -e "s/ //g"`
@ -1451,7 +1431,8 @@ sed -i -e "/NoDisplay=true/d" qstart.desktop
# relocate the .desktop and icon files
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
for app in base %{?with_binfilter:binfilter} calc draw impress javafilter math startcenter writer xsltfilter; do
desktop-file-validate $app.desktop
# FIXME enable again
# desktop-file-validate $app.desktop
cp -p $app.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/libreoffice-$app.desktop
done
popd
@ -1480,20 +1461,21 @@ mkdir -p $RPM_BUILD_ROOT/%{baseinstdir}/share/psprint/driver
cp -p psprint_config/configuration/ppds/SGENPRT.PS $RPM_BUILD_ROOT/%{baseinstdir}/share/psprint/driver/SGENPRT.PS
# rhbz#452385 to auto have postgres in classpath if subsequently installed
# rhbz#465664 to get lucene working for functional help
sed -i -e "s#URE_MORE_JAVA_CLASSPATH_URLS.*#& file:///usr/share/java/lucene.jar file:///usr/share/java/lucene-contrib/lucene-analyzers.jar file:///usr/share/java/postgresql-jdbc.jar#" $RPM_BUILD_ROOT/%{baseinstdir}/program/fundamentalrc
sed -i -e "s#URE_MORE_JAVA_CLASSPATH_URLS.*#& file:///usr/share/java/postgresql-jdbc.jar#" $RPM_BUILD_ROOT/%{baseinstdir}/program/fundamentalrc
export DESTDIR=$RPM_BUILD_ROOT
install-gdb-printers -a %{_datadir}/gdb/auto-load%{baseinstdir} -c -i %{baseinstdir} -p %{_datadir}/libreoffice/gdb
%check
source ./Env.Host.sh
cd smoketestoo_native
unset WITH_LANG
# FIXME enable again
# %%check
# TODO: get rid of this
# . ./config_host.mk.source
# cd smoketestoo_native
# unset WITH_LANG
#JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY="1" works around flawed accessibility check
#SAL_USE_VCLPLUGIN="svp" uses the headless plugin for these tests
JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY="1" SAL_USE_VCLPLUGIN="svp" timeout -k 2m 2h build.pl
# JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY="1" SAL_USE_VCLPLUGIN="svp" timeout -k 2m 2h build.pl
%clean
rm -rf $RPM_BUILD_ROOT
@ -1532,7 +1514,6 @@ rm -rf $RPM_BUILD_ROOT
%{baseinstdir}/program/classes/form.jar
%{baseinstdir}/program/classes/query.jar
%{baseinstdir}/program/classes/letter.jar
%{baseinstdir}/program/classes/LuceneHelpWrapper.jar
%{baseinstdir}/program/classes/officebean.jar
%{baseinstdir}/program/classes/report.jar
%{baseinstdir}/program/classes/saxon9.jar
@ -1551,6 +1532,7 @@ rm -rf $RPM_BUILD_ROOT
%{baseinstdir}/program/dlgprov.uno.so
%{baseinstdir}/program/expwrap.uno.so
%{baseinstdir}/program/fastsax.uno.so
%{baseinstdir}/program/flat_logo.svg
%{baseinstdir}/program/fpicker.uno.so
%{baseinstdir}/program/fps_office.uno.so
%{baseinstdir}/program/gengal
@ -1584,7 +1566,6 @@ rm -rf $RPM_BUILD_ROOT
%{baseinstdir}/program/libdrawinglayerlo.so
%{baseinstdir}/program/libeditenglo.so
%{baseinstdir}/program/libembobj.so
%{baseinstdir}/program/libemboleobj.so
%{baseinstdir}/program/libevoab*.so
%{baseinstdir}/program/libevtattlo.so
%{baseinstdir}/program/libegilo.so
@ -1611,7 +1592,6 @@ rm -rf $RPM_BUILD_ROOT
%{baseinstdir}/program/libitglo.so
%{baseinstdir}/program/libitilo.so
%{baseinstdir}/program/libofficebean.so
%{baseinstdir}/program/liboooimprovecorelo.so
%{baseinstdir}/program/libfilelo.so
%{baseinstdir}/program/libfilterconfiglo.so
%{baseinstdir}/program/libflatlo.so
@ -1665,6 +1645,7 @@ rm -rf $RPM_BUILD_ROOT
%{baseinstdir}/program/libswlo.so
%{baseinstdir}/program/libtextconv_dict.so
%{baseinstdir}/program/libtextconversiondlgslo.so
%{baseinstdir}/program/libtextfdlo.so
%{baseinstdir}/program/libtvhlp1.so
%{baseinstdir}/program/libodfflatxmllo.so
%{baseinstdir}/program/libucbhelper4gcc3.so
@ -1676,17 +1657,13 @@ rm -rf $RPM_BUILD_ROOT
%{baseinstdir}/program/libunordflo.so
%{baseinstdir}/program/libunopkgapp.so
%{baseinstdir}/program/libunoxmllo.so
%{baseinstdir}/program/libupdchklo.so
%{baseinstdir}/program/libuuilo.so
%{baseinstdir}/program/libvbahelperlo.so
%{baseinstdir}/program/libvclplug_genlo.so
%{baseinstdir}/program/libvclplug_gtklo.so
%if %{undefined rhel} || 0%{?rhel} >= 7
%{baseinstdir}/program/libwpgimportlo.so
%endif
%{baseinstdir}/program/libwpftdrawlo.so
%{baseinstdir}/program/libxmlfalo.so
%{baseinstdir}/program/libxmlfdlo.so
%{baseinstdir}/program/libxmxlo.so
%{baseinstdir}/program/libxoflo.so
%{baseinstdir}/program/libxsec_fw.so
%{baseinstdir}/program/libxsec_xmlsec.so
@ -1729,8 +1706,8 @@ rm -rf $RPM_BUILD_ROOT
%{baseinstdir}/program/resource/ofaen-US.res
%{baseinstdir}/program/resource/pcren-US.res
%{baseinstdir}/program/resource/pdffilteren-US.res
%{baseinstdir}/program/resource/sanen-US.res
%{baseinstdir}/program/resource/sben-US.res
%{baseinstdir}/program/resource/scnen-US.res
%{baseinstdir}/program/resource/sden-US.res
%{baseinstdir}/program/resource/sfxen-US.res
%{baseinstdir}/program/resource/spaen-US.res
@ -1743,7 +1720,6 @@ rm -rf $RPM_BUILD_ROOT
%{baseinstdir}/program/resource/tken-US.res
%{baseinstdir}/program/resource/tplen-US.res
%{baseinstdir}/program/resource/uuien-US.res
%{baseinstdir}/program/resource/updchken-US.res
%{baseinstdir}/program/resource/upden-US.res
%{baseinstdir}/program/resource/vclen-US.res
%{baseinstdir}/program/resource/wzien-US.res
@ -1757,6 +1733,7 @@ rm -rf $RPM_BUILD_ROOT
%{baseinstdir}/program/spadmin.bin
%{baseinstdir}/program/stringresource.uno.so
%{baseinstdir}/program/syssh.uno.so
%{baseinstdir}/program/tde-open-url
%{baseinstdir}/program/ucpcmis1.uno.so
%{baseinstdir}/program/ucpexpand1.uno.so
%{baseinstdir}/program/ucpext.uno.so
@ -1785,7 +1762,6 @@ rm -rf $RPM_BUILD_ROOT
%{baseinstdir}/share/config/psetupl.xpm
%dir %{baseinstdir}/share/config/soffice.cfg
%{baseinstdir}/share/config/soffice.cfg/modules
%{baseinstdir}/share/config/symbol
%{baseinstdir}/share/config/webcast
%{baseinstdir}/share/config/wizard
%dir %{baseinstdir}/share/dtd
@ -1849,7 +1825,6 @@ rm -rf $RPM_BUILD_ROOT
%{baseinstdir}/program/libfwllo.so
%{baseinstdir}/program/libfwmlo.so
%{baseinstdir}/program/libi18nisolang*.so
%{baseinstdir}/program/libi18npaper*.so
%{baseinstdir}/program/libi18nutilgcc3.so
%{baseinstdir}/program/libpackage2.so
%{baseinstdir}/program/libsblo.so
@ -1881,8 +1856,8 @@ rm -rf $RPM_BUILD_ROOT
%doc %{baseinstdir}/CREDITS.odt
%doc %{baseinstdir}/LICENSE
%doc %{baseinstdir}/LICENSE.odt
%doc %{baseinstdir}/NOTICE
%doc %{baseinstdir}/THIRDPARTYLICENSEREADME.html
%{baseinstdir}/program/about.*
%{baseinstdir}/program/intro.*
%{baseinstdir}/program/soffice
%{baseinstdir}/program/soffice.bin
@ -1937,13 +1912,13 @@ done
%endif
%{baseinstdir}/program/classes/sdbc_hsqldb.jar
%{baseinstdir}/program/libabplo.so
%{baseinstdir}/program/libadabasuilo.so
%{baseinstdir}/program/libdbplo.so
%{baseinstdir}/program/libhsqldb.so
%{baseinstdir}/program/librpt*lo.so
%{baseinstdir}/program/librptlo.so
%{baseinstdir}/program/librptuilo.so
%{baseinstdir}/program/librptxmllo.so
%dir %{baseinstdir}/program/resource
%{baseinstdir}/program/resource/abpen-US.res
%{baseinstdir}/program/resource/adabasuien-US.res
%{baseinstdir}/program/resource/cnren-US.res
%{baseinstdir}/program/resource/dbpen-US.res
%{baseinstdir}/program/resource/rpten-US.res
@ -2059,7 +2034,6 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%dir %{baseinstdir}/program
%{baseinstdir}/help/en/sdraw.*
%{baseinstdir}/share/registry/draw.xcd
%{baseinstdir}/program/libvisioimportlo.so
%{baseinstdir}/program/pagein-draw
%{baseinstdir}/program/sdraw
%{_datadir}/applications/libreoffice-draw.desktop
@ -2084,20 +2058,13 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%dir %{baseinstdir}
%{baseinstdir}/help/en/swriter.*
%dir %{baseinstdir}/program
%{baseinstdir}/program/libdoctoklo.so
%{baseinstdir}/program/libhwplo.so
%{baseinstdir}/program/liblwpftlo.so
%{baseinstdir}/program/libmswordlo.so
%if %{undefined rhel} || 0%{?rhel} >= 7
%{baseinstdir}/program/libmsworkslo.so
%endif
%{baseinstdir}/program/libooxmllo.so
%{baseinstdir}/program/libresourcemodello.so
%{baseinstdir}/program/librtftoklo.so
%{baseinstdir}/program/libswdlo.so
%{baseinstdir}/program/libswuilo.so
%{baseinstdir}/program/libt602filterlo.so
%{baseinstdir}/program/libwpftlo.so
%{baseinstdir}/program/libwpftwriterlo.so
%{baseinstdir}/program/libwriterfilterlo.so
%{baseinstdir}/program/vbaswobj.uno.so
%dir %{baseinstdir}/program/resource
@ -2249,7 +2216,6 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%dir %{baseinstdir}/program
%{baseinstdir}/program/kde-open-url
%{baseinstdir}/program/kde4be1.uno.so
%{baseinstdir}/program/fps_kde4.uno.so
%{baseinstdir}/program/libvclplug_kde4lo.so
%endif
@ -2288,6 +2254,27 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%endif
%changelog
* Wed Jun 27 2012 David Tardon <dtardon@redhat.com> - 3.6.0.0-1
- 3.6.0 beta2
- drop integrated 0001-move-binfilter-mime-types-into-extra-.desktop-file.patch
- drop integrated 0001-Resolves-rhbz-788042-skip-splashscreen-with-quicksta.patch
- drop integrated libreoffice-ensure-non-broken-xml-tree.patch
- drop integrated 0001-preserve-timestamps-for-.py-files.patch
- drop integrated 0001-Resolves-rhbz-788045-swriter-help-etc-doesn-t-show-h.patch
- drop integrated 0001-Resolves-rhbz-799525-put-flat-odf-mimetypes-in-xsltf.patch
- drop integrated 0001-Resolves-rhbz-800272-complain-about-unknown-command-.patch
- drop integrated 0001-Resolves-rhbz-806663-SlideshowImpl-can-outlive-SdMod.patch
- drop integrated 0001-desktop-do-not-complain-about-soffice-command-line-o.patch
- drop integrated 0001-Resolves-fdo-48096-torn-off-popups-trigger-keyboard-.patch
- drop integrated 0001-fdo-38088-better-CSV-import-default-separators.patch
- drop integrated 0001-save-register-arguments-first.patch
- drop integrated 0001-do-not-let-gcc-use-registers-we-are-setting-ourselve.patch
- drop integrated 0001-wrong-types-used-here-breaks-64bit-bigendian.patch
- drop integrated 0001-Resolves-rhbz-805743-a11y-call-doShow-after-we-have-.patch
- drop integrated 0001-Resolves-fdo-49849-implement-Unicode-6.1-hebrew-line.patch
- drop integrated 0001-use-ure-instead-of-ure-link.patch
- drop broken 0001-fix-setting-of-paper-tray-from-print-dialog-fdo-4393.patch
* Mon Jun 18 2012 Caolán McNamara <caolanm@redhat.com> - 3.5.5.1-2
- Resolves: rhbz#830810 missing dependency on lucene-contrib

12
openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
Unescape View File

@ -116,7 +116,7 @@ index 676acd5..4a599c9 100644
//=========================================================================
//=========================================================================
//
@@ -890,7 +947,10 @@ Reference< XInputStream > Content::openStream()
@@ -787,7 +902,10 @@ Reference< XInputStream > Content::openStream()
throw( CommandAbortedException, RuntimeException, Exception )
{
if ( !isDocument() )
@ -127,7 +127,7 @@ index 676acd5..4a599c9 100644
Reference< XActiveDataSink > xSink = new ActiveDataSink;
@@ -915,7 +975,10 @@ Reference< XInputStream > Content::openStreamNoLock()
@@ -813,7 +930,10 @@ Reference< XInputStream > Content::openStreamNoLock()
throw( CommandAbortedException, RuntimeException, Exception )
{
if ( !isDocument() )
@ -138,7 +138,7 @@ index 676acd5..4a599c9 100644
Reference< XActiveDataSink > xSink = new ActiveDataSink;
@@ -940,7 +1003,10 @@ Reference< XStream > Content::openWriteableStream()
@@ -838,7 +965,10 @@ Reference< XStream > Content::openWriteableStream()
throw( CommandAbortedException, RuntimeException, Exception )
{
if ( !isDocument() )
@ -149,7 +149,7 @@ index 676acd5..4a599c9 100644
Reference< XActiveDataStreamer > xStreamer = new ActiveDataStreamer;
@@ -965,7 +1031,10 @@ Reference< XStream > Content::openWriteableStreamNoLock()
@@ -863,7 +990,10 @@ Reference< XStream > Content::openWriteableStreamNoLock()
throw( CommandAbortedException, RuntimeException, Exception )
{
if ( !isDocument() )
@ -160,7 +160,7 @@ index 676acd5..4a599c9 100644
Reference< XActiveDataStreamer > xStreamer = new ActiveDataStreamer;
@@ -990,7 +1059,10 @@ sal_Bool Content::openStream( const Reference< XActiveDataSink >& rSink )
@@ -888,7 +1019,10 @@ sal_Bool Content::openStream( const Reference< XActiveDataSink >& rSink )
throw( CommandAbortedException, RuntimeException, Exception )
{
if ( !isDocument() )
@ -171,7 +171,7 @@ index 676acd5..4a599c9 100644
OpenCommandArgument2 aArg;
aArg.Mode = OpenMode::DOCUMENT;
@@ -1013,7 +1085,10 @@ sal_Bool Content::openStream( const Reference< XOutputStream >& rStream )
@@ -911,7 +1045,10 @@ sal_Bool Content::openStream( const Reference< XOutputStream >& rStream )
throw( CommandAbortedException, RuntimeException, Exception )
{
if ( !isDocument() )

2
openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
Unescape View File

@ -60,7 +60,7 @@ diff -u -p -r1.17 scriptitems.pm
push( @installer::globals::logfileinfo, $infoline);
- push(@missingfiles, "ERROR: File not found: $filename\n");
- $error_occured = 1;
- $error_occurred = 1;
+ push(@missingfiles, "WARNING: File not found: $filename\n");
next; # removing this file from list, if sourcepath is empty

4
openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch
Unescape View File

@ -158,7 +158,7 @@ index 4d02a76..ecd3b5d 100644
+ return NULL;
+}
+
bool PrintFontManager::Substitute( FontSelectPattern &rPattern, rtl::OUString& rMissingCodes ) const
bool PrintFontManager::Substitute( FontSelectPattern &rPattern, rtl::OUString& rMissingCodes )
{
bool bRet = false;
@@ -764,14 +899,13 @@ bool PrintFontManager::Substitute( FontSelectPattern &rPattern, rtl::OUString& r
@ -166,7 +166,7 @@ index 4d02a76..ecd3b5d 100644
const rtl::OString aLangAttrib = MsLangId::convertLanguageToIsoByteString(rPattern.meLanguage);
+ const FcChar8* pLangAttribUtf8 = NULL;
if( aLangAttrib.getLength() )
if( !aLangAttrib.isEmpty() )
{
- const FcChar8* pLangAttribUtf8;
if (aLangAttrib.equalsIgnoreAsciiCase(OString(RTL_CONSTASCII_STRINGPARAM("pa-in"))))

8
sources
Unescape View File

@ -9,7 +9,7 @@ c1b5b8d1dd929a1261a6f8872d92b799 redhat-langpacks.tar.gz
fdb27bfe2dbe2e7b57ae194d9bf36bab fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
a7983f859eafb2677d7ff386a023bc40 a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
1f24ab1d39f4a51faf22244c94a6203f 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
f779accd2ed8dbbe817a0086b19e1a4e libreoffice-binfilter-3.5.5.1.tar.xz
7f68071451e13d3f8d1f71d09a7203d4 libreoffice-core-3.5.5.1.tar.xz
1d05f3f8dfbfa4f77763759f407af18e libreoffice-help-3.5.5.1.tar.xz
4981bb46cb5f1861d43ea2932dd7de6c libreoffice-translations-3.5.5.1.tar.xz
ad4a879b362c89b03393923b729d1eeb libreoffice-binfilter-3.6.0.0.beta2.tar.xz
97183afb02576d5542a1eda3f29f9517 libreoffice-core-3.6.0.0.beta2.tar.xz
3368bc1adfa9e7d6d6f3ce2cee9e164e libreoffice-help-3.6.0.0.beta2.tar.xz
7191e46a3f48ad7a7d5a21e985790e6a libreoffice-translations-3.6.0.0.beta2.tar.xz

Write Preview
Loading…
Cancel
Save