rpms/openoffice.org/devel workspace.cmcfixes51.patch, NONE, 1.1 workspace.hb12.patch, NONE, 1.1 workspace.locales31.patch, NONE, 1.1 workspace.mba31issues01.patch, NONE, 1.1 workspace.mhu17.patch, NONE, 1.1 workspace.sb101.patch, NONE, 1.1 workspace.sjfixes12.patch, NONE, 1.1 openoffice.org.spec, 1.1707, 1.1708 openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch, 1.2, NONE openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch, 1.6, NONE openoffice.org-3.0.0.ooo86142.serbiannumbering.patch, 1.1, NONE openoffice.org-3.0.0.ooo90653.pyuno.debugging.spew.patch, 1.1, NONE openoffice.org-3.0.0.ooo93419.svx.ref_deref.before.ctored.patch, 1.2, NONE openoffice.org-3.0.0.ooo93942.svx.accessibity-loops.patch, 1.1, NONE openoffice.org-3.0.0.ooo93949.sw.better_rtf_encodings.patch, 1.1, NONE openoffice.org-3.0.0.ooo94659.sal.magazine.patch, 1.2, NONE openoffice.org-3.0.0.ooo95533.sw.safertableexport.patch, 1.1, NONE openoffice.org-3.0.0.ooo95908.pyuno.debugging.spew.patch, 1.1, NONE openoffice.org-3.0.0.ooo96203.sfx2.3layer-qstart.patch, 1.2, NONE
Caolan McNamara
caolanm at fedoraproject.org
Fri Dec 5 13:39:44 UTC 2008
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18844
Modified Files:
openoffice.org.spec
Added Files:
workspace.cmcfixes51.patch workspace.hb12.patch
workspace.locales31.patch workspace.mba31issues01.patch
workspace.mhu17.patch workspace.sb101.patch
workspace.sjfixes12.patch
Removed Files:
openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch
Tag: openoffice_org-3_0_0-0_0_23_2_fc10
openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch
No tag
openoffice.org-3.0.0.ooo86142.serbiannumbering.patch
openoffice.org-3.0.0.ooo90653.pyuno.debugging.spew.patch
openoffice.org-3.0.0.ooo93419.svx.ref_deref.before.ctored.patch
openoffice.org-3.0.0.ooo93942.svx.accessibity-loops.patch
openoffice.org-3.0.0.ooo93949.sw.better_rtf_encodings.patch
openoffice.org-3.0.0.ooo94659.sal.magazine.patch
openoffice.org-3.0.0.ooo95533.sw.safertableexport.patch
openoffice.org-3.0.0.ooo95908.pyuno.debugging.spew.patch
openoffice.org-3.0.0.ooo96203.sfx2.3layer-qstart.patch
Log Message:
review of where we're at to see what needs poking upstream
workspace.cmcfixes51.patch:
--- NEW FILE workspace.cmcfixes51.patch ---
Index: source/appl/shutdownicon.cxx
===================================================================
RCS file: /cvs/framework/sfx2/source/appl/shutdownicon.cxx,v
retrieving revision 1.64
diff -u -r1.64 shutdownicon.cxx
--- openoffice.org.orig/sfx2/source/appl/shutdownicon.cxx 22 Jul 2008 17:51:23 -0000 1.64
+++ openoffice.org/sfx2/source/appl/shutdownicon.cxx 14 Nov 2008 09:08:28 -0000
@@ -63,10 +63,11 @@
#include <tools/urlobj.hxx>
#include <osl/security.hxx>
#include <osl/file.hxx>
-#include <unotools/bootstrap.hxx>
+#include <rtl/bootstrap.hxx>
#include <tools/link.hxx>
#ifdef UNX // need symlink
#include <unistd.h>
+#include <errno.h>
#endif
#include "sfxresid.hxx"
@@ -83,6 +84,8 @@ using namespace ::vos;
using namespace ::rtl;
using namespace ::sfx2;
+extern "C" { static void SAL_CALL thisModule() {} }
+
class SfxNotificationListener_Impl : public cppu::WeakImplHelper1< XDispatchResultListener >
{
public:
@@ -142,7 +145,7 @@ bool ShutdownIcon::LoadModule( osl::Modu
oslGenericFunction pTmpInit = NULL;
oslGenericFunction pTmpDeInit = NULL;
- if ( pPlugin->load( OUString (RTL_CONSTASCII_USTRINGPARAM( STRING( PLUGIN_NAME ) ) ) ) )
+ if ( pPlugin->loadRelative( &thisModule, OUString (RTL_CONSTASCII_USTRINGPARAM( STRING( PLUGIN_NAME ) ) ) ) )
{
pTmpInit = pPlugin->getFunctionSymbol(
OUString( RTL_CONSTASCII_USTRINGPARAM( "plugin_init_sys_tray" ) ) );
@@ -826,8 +827,8 @@
#else // UNX
getDotAutostart( true );
- OUString aPath;
- ::utl::Bootstrap::locateBaseInstallation(aPath);
+ OUString aPath = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR"));
+ ::rtl::Bootstrap::expandMacros(aPath);
OUString aDesktopFile;
::osl::File::getSystemPathFromFileURL( aPath, aDesktopFile );
@@ -837,7 +838,12 @@
osl_getThreadTextEncoding() );
OString aShortcutUnx = OUStringToOString( aShortcut,
osl_getThreadTextEncoding() );
- symlink( aDesktopFileUnx, aShortcutUnx );
+
+ if ((0 != symlink(aDesktopFileUnx, aShortcutUnx)) && (errno == EEXIST))
+ {
+ unlink(aShortcutUnx);
+ symlink(aDesktopFileUnx, aShortcutUnx);
+ }
ShutdownIcon *pIcon = ShutdownIcon::createInstance();
if( pIcon )
workspace.hb12.patch:
--- NEW FILE workspace.hb12.patch ---
Index: source/filter/ww8/wrtw8nds.cxx
===================================================================
RCS file: /cvs/sw/sw/source/filter/ww8/wrtw8nds.cxx,v
retrieving revision 1.109
diff -u -r1.109 wrtw8nds.cxx
--- openoffice.org.orig/sw/source/filter/ww8/wrtw8nds.cxx 8 Jul 2008 08:29:15 -0000 1.109
+++ openoffice.org/sw/source/filter/ww8/wrtw8nds.cxx 28 Oct 2008 09:47:19 -0000
@@ -2239,6 +2239,12 @@
{
ASSERT( nColCnt < rCols.Count(), "Leaving table" );
+ if (nColCnt >= rCols.Count())
+ {
+ //Doomage, row wider than table
+ break;
+ }
+
SwWriteTableCell* pCell = rCells[nBox];
const bool bProcessCoveredCell = bNewTableModel && 0 == pCell->GetRowSpan();
Index: source/filter/ww8/writerwordglue.cxx
===================================================================
RCS file: /cvs/sw/sw/source/filter/ww8/writerwordglue.cxx,v
retrieving revision 1.25.126.1
diff -u -r1.25.126.1 writerwordglue.cxx
--- openoffice.org.orig/sw/source/filter/ww8/writerwordglue.cxx 17 Jan 2008 16:06:53 -0000 1.25.126.1
+++ openoffice.org/sw/source/filter/ww8/writerwordglue.cxx 16 Sep 2008 10:31:12 -0000
@@ -821,15 +823,18 @@
{
sal_uInt8 nRet =
rtl_getBestWindowsCharsetFromTextEncoding(eTextEncoding);
- if (eTextEncoding == RTL_TEXTENCODING_UCS2)
- {
- ASSERT(nRet != 0x80, "This method may be redundant");
- nRet = 0x80;
- }
- else if (eTextEncoding == RTL_TEXTENCODING_DONTKNOW)
+ switch (eTextEncoding)
{
- ASSERT(nRet != 0x80, "This method may be redundant");
- nRet = 0x80;
+ case RTL_TEXTENCODING_DONTKNOW:
+ case RTL_TEXTENCODING_UCS2:
+ case RTL_TEXTENCODING_UTF7:
+ case RTL_TEXTENCODING_UTF8:
+ case RTL_TEXTENCODING_JAVA_UTF8:
+ ASSERT(nRet != 0x80, "This method may be redundant");
+ nRet = 0x80;
+ break;
+ default:
+ break;
}
return nRet;
}
workspace.locales31.patch:
--- NEW FILE workspace.locales31.patch ---
Index: i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
===================================================================
RCS file: /cvs/l10n/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx,v
retrieving revision 1.28
diff -u -r1.28 defaultnumberingprovider.cxx
--- openoffice.org.orig/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx 13 Nov 2007 14:32:47 -0000 1.28
+++ openoffice.org/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx 15 Feb 2008 05:14:16 -0000
@@ -166,6 +166,22 @@
0x0449, 0x044B, 0x044D, 0x044E, 0x044F
};
+// Serbian Cyrillic upper letters
+static sal_Unicode table_CyrillicUpperLetter_sr[] = {
+ 0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0402, 0x0415, 0x0416,
+ 0x0417, 0x0418, 0x0408, 0x041A, 0x041B, 0x0409, 0x041C, 0x041D,
+ 0x040A, 0x041E, 0x041F, 0x0420, 0x0421, 0x0422, 0x040B, 0x0423,
+ 0x0424, 0x0425, 0x0426, 0x0427, 0x040F, 0x0428
+};
+
+// Serbian cyrillic lower letters
+static sal_Unicode table_CyrillicLowerLetter_sr[] = {
+ 0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0452, 0x0435, 0x0436,
+ 0x0437, 0x0438, 0x0458, 0x043A, 0x043B, 0x0459, 0x043C, 0x043D,
+ 0x045A, 0x043E, 0x043F, 0x0440, 0x0441, 0x0442, 0x045B, 0x0443,
+ 0x0444, 0x0445, 0x0446, 0x0447, 0x045F, 0x0448
+};
+
static sal_Unicode table_Alphabet_fa[] = {
0x0622, 0x0628, 0x067E, 0x062A, 0x062B, 0x062C, 0x0686, 0x062D,
0x062E, 0x062F, 0x0630, 0x0631, 0x0632, 0x0698, 0x0633, 0x0634,
@@ -623,6 +639,32 @@
sizeof(table_CyrillicLowerLetter_ru[0]), number-1,
result); // 1=>a, 2=>b, ..., 27=>z, 28=>aa, 29=>bb, ...
break;
+ case CHARS_CYRILLIC_UPPER_LETTER_SR:
+ lcl_formatChars2( table_CyrillicUpperLetter_sr,
+ table_CyrillicLowerLetter_sr,
+ sizeof(table_CyrillicLowerLetter_sr) /
+ sizeof(table_CyrillicLowerLetter_sr[0]), number-1,
+ result); // 1=>a, 2=>b, ..., 27=>z, 28=>Aa, 29=>Ab, ...
+ break;
+ case CHARS_CYRILLIC_LOWER_LETTER_SR:
+ lcl_formatChars( table_CyrillicLowerLetter_sr,
+ sizeof(table_CyrillicLowerLetter_sr) /
+ sizeof(table_CyrillicLowerLetter_sr[0]), number-1,
+ result); // 1=>a, 2=>b, ..., 27=>z, 28=>aa, 29=>ab, ...
+ break;
+ case CHARS_CYRILLIC_UPPER_LETTER_N_SR:
+ lcl_formatChars3( table_CyrillicUpperLetter_sr,
+ table_CyrillicLowerLetter_sr,
+ sizeof(table_CyrillicLowerLetter_sr) /
+ sizeof(table_CyrillicLowerLetter_sr[0]), number-1,
+ result); // 1=>a, 2=>b, ..., 27=>z, 28=>Aa, 29=>Bb, ...
+ break;
+ case CHARS_CYRILLIC_LOWER_LETTER_N_SR:
+ lcl_formatChars1( table_CyrillicLowerLetter_sr,
+ sizeof(table_CyrillicLowerLetter_sr) /
+ sizeof(table_CyrillicLowerLetter_sr[0]), number-1,
+ result); // 1=>a, 2=>b, ..., 27=>z, 28=>aa, 29=>bb, ...
+ break;
case CHARS_PERSIAN:
lcl_formatChars(table_Alphabet_fa, sizeof(table_Alphabet_fa) / sizeof(sal_Unicode), number - 1, result);
break;
@@ -708,6 +750,10 @@
{style::NumberingType::CHARS_CYRILLIC_LOWER_LETTER_RU, S_CYR_A ", " S_CYR_B ", .., " S_CYR_A S_CYR_A ", " S_CYR_A S_CYR_B ", ... (ru)", LANG_ALL},
{style::NumberingType::CHARS_CYRILLIC_UPPER_LETTER_N_RU, C_CYR_A ", " C_CYR_B ", .., " C_CYR_A S_CYR_A ", " C_CYR_B S_CYR_B ", ... (ru)", LANG_ALL},
{style::NumberingType::CHARS_CYRILLIC_LOWER_LETTER_N_RU, S_CYR_A ", " S_CYR_B ", .., " S_CYR_A S_CYR_A ", " S_CYR_B S_CYR_B ", ... (ru)", LANG_ALL},
+ {style::NumberingType::CHARS_CYRILLIC_UPPER_LETTER_SR, C_CYR_A ", " C_CYR_B ", .., " C_CYR_A S_CYR_A ", " C_CYR_A S_CYR_B ", ... (sr)", LANG_ALL},
+ {style::NumberingType::CHARS_CYRILLIC_LOWER_LETTER_SR, S_CYR_A ", " S_CYR_B ", .., " S_CYR_A S_CYR_A ", " S_CYR_A S_CYR_B ", ... (sr)", LANG_ALL},
+ {style::NumberingType::CHARS_CYRILLIC_UPPER_LETTER_N_SR, C_CYR_A ", " C_CYR_B ", .., " C_CYR_A S_CYR_A ", " C_CYR_B S_CYR_B ", ... (sr)", LANG_ALL},
+ {style::NumberingType::CHARS_CYRILLIC_LOWER_LETTER_N_SR, S_CYR_A ", " S_CYR_B ", .., " S_CYR_A S_CYR_A ", " S_CYR_B S_CYR_B ", ... (sr)", LANG_ALL},
{style::NumberingType::CHARS_PERSIAN, NULL, LANG_CTL},
};
static const sal_Int32 nSupported_NumberingTypes = sizeof(aSupportedTypes) / sizeof(Supported_NumberingType);
Index: offapi/com/sun/star/style/NumberingType.idl
===================================================================
RCS file: /cvs/api/offapi/com/sun/star/style/NumberingType.idl,v
retrieving revision 1.17
diff -u -r1.17 NumberingType.idl
--- openoffice.org.orig/offapi/com/sun/star/style/NumberingType.idl 13 Nov 2007 14:30:30 -0000 1.17
+++ openoffice.org/offapi/com/sun/star/style/NumberingType.idl 15 Feb 2008 05:14:42 -0000
@@ -396,6 +396,66 @@
const short CHARS_CYRILLIC_LOWER_LETTER_N_RU = 45;
//-------------------------------------------------------------------------
+ /** Numbering in Serbian Cyrillic alphabet upper case letters
+
+ @since OOo 2.4.0
+ */
+ /*
+ CYRILLIC CAPITAL LETTER A , CYRILLIC CAPITAL LETTER BE ,
+ CYRILLIC CAPITAL LETTER VE , CYRILLIC CAPITAL LETTER GHE , ... ,
+ CYRILLIC CAPITAL LETTER A CYRILLIC SMALL LETTER A ,
+ CYRILLIC CAPITAL LETTER A CYRILLIC SMALL LETTER BE ,
+ CYRILLIC CAPITAL LETTER A CYRILLIC SMALL LETTER VE , ...
+ CYRILLIC CAPITAL LETTER A CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER A ,
+ CYRILLIC CAPITAL LETTER A CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER BE
+ */
+ const short CHARS_CYRILLIC_UPPER_LETTER_SR = 47;
+
+ //-------------------------------------------------------------------------
+ /** Numbering in Russian Serbian alphabet lower case letters
+
+ @since OOo 2.4.0
+ */
+ /*
+ CYRILLIC SMALL LETTER A , CYRILLIC SMALL LETTER BE ,
+ CYRILLIC SMALL LETTER VE , CYRILLIC SMALL LETTER GHE , ... ,
+ CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER A ,
+ CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER BE ,
+ CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER VE , ...
+ CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER A ,
+ CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER BE
+ */
+ const short CHARS_CYRILLIC_LOWER_LETTER_SR = 48;
+
+ //-------------------------------------------------------------------------
+ /** Numbering in Serbian Cyrillic alphabet upper case letters
+
+ @since OOo 2.4.0
+ */
+ /*
+ CYRILLIC CAPITAL LETTER A , CYRILLIC CAPITAL LETTER BE , ... ,
+ CYRILLIC CAPITAL LETTER A CYRILLIC SMALL LETTER A ,
+ CYRILLIC CAPITAL LETTER BE CYRILLIC SMALL LETTER BE ,
+ CYRILLIC CAPITAL LETTER VE CYRILLIC SMALL LETTER VE , ...
+ CYRILLIC CAPITAL LETTER A CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER A , ...
+ */
+ const short CHARS_CYRILLIC_UPPER_LETTER_N_SR = 49;
+
+ //-------------------------------------------------------------------------
+ /** Numbering in Serbian Cyrillic alphabet upper case letters
+
+ @since OOo 2.4.0
+ */
+ /*
+ CYRILLIC SMALL LETTER A , CYRILLIC SMALL LETTER BE , ... ,
+ CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER A ,
+ CYRILLIC SMALL LETTER BE CYRILLIC SMALL LETTER BE ,
+ CYRILLIC SMALL LETTER VE CYRILLIC SMALL LETTER VE , ...
+ CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER A CYRILLIC SMALL LETTER A , ...
+ */
+ const short CHARS_CYRILLIC_LOWER_LETTER_N_SR = 50;
+
+ //-------------------------------------------------------------------------
/** Numbering in Persian alphabet letters (aa, be, pe, te, ...)
@since OOo 2.4
Index: svx/source/dialog/numpages.src
===================================================================
RCS file: /cvs/graphics/svx/source/dialog/numpages.src,v
retrieving revision 1.62
diff -u -r1.62 numpages.src
--- openoffice.org.orig/svx/source/dialog/numpages.src 27 Jun 2007 17:23:30 -0000 1.62
+++ openoffice.org/svx/source/dialog/numpages.src 15 Feb 2008 05:16:13 -0000
@@ -216,6 +216,10 @@
< "а, б, .., аа, аб, ... (Russian)" ; 43 /*CHARS_CYRILLIC_LOWER_LETTER_RU */; > ;
< "Ð, Б, .., Ðа, Бб, ... (Russian)" ; 44 /*CHARS_CYRILLIC_UPPER_LETTER_N_RU */; > ;
< "а, б, .., аа, бб, ... (Russian)" ; 45 /*CHARS_CYRILLIC_LOWER_LETTER_N_RU */; > ;
+ < "Ð, Б, .., Ðа, Ðб, ... (Serbian)" ; 47 /*CHARS_CYRILLIC_UPPER_LETTER_SR */; > ;
+ < "а, б, .., аа, аб, ... (Serbian)" ; 48 /*CHARS_CYRILLIC_LOWER_LETTER_SR */; > ;
+ < "Ð, Б, .., Ðа, Бб, ... (Serbian)" ; 49 /*CHARS_CYRILLIC_UPPER_LETTER_N_SR */; > ;
+ < "а, б, .., аа, бб, ... (Serbian)" ; 50 /*CHARS_CYRILLIC_LOWER_LETTER_N_SR */; > ;
};
};
Index: sw/source/ui/misc/numberingtypelistbox.src
===================================================================
RCS file: /cvs/sw/sw/source/ui/misc/numberingtypelistbox.src,v
retrieving revision 1.19
diff -u -r1.19 numberingtypelistbox.src
--- openoffice.org.orig/sw/source/ui/misc/numberingtypelistbox.src 19 Apr 2007 13:21:04 -0000 1.19
+++ openoffice.org/sw/source/ui/misc/numberingtypelistbox.src 15 Feb 2008 05:16:22 -0000
@@ -61,6 +61,10 @@
< "а, б, .., аа, аб, ... (Russian)" ; 43 /*CHARS_CYRILLIC_LOWER_LETTER_RU */; > ;
< "Ð, Б, .., Ðа, Бб, ... (Russian)" ; 44 /*CHARS_CYRILLIC_UPPER_LETTER_N_RU */; > ;
< "а, б, .., аа, бб, ... (Russian)" ; 45 /*CHARS_CYRILLIC_LOWER_LETTER_N_RU */; > ;
+ < "Ð, Б, .., Ðа, Ðб, ... (Serbian)" ; 47 /*CHARS_CYRILLIC_UPPER_LETTER_SR */; > ;
+ < "а, б, .., аа, аб, ... (Serbian)" ; 48 /*CHARS_CYRILLIC_LOWER_LETTER_SR */; > ;
+ < "Ð, Б, .., Ðа, Бб, ... (Serbian)" ; 49 /*CHARS_CYRILLIC_UPPER_LETTER_N_SR */; > ;
+ < "а, б, .., аа, бб, ... (Serbian)" ; 50 /*CHARS_CYRILLIC_LOWER_LETTER_N_SR */; > ;
};
};
};
Index: writerfilter/source/dmapper/DomainMapper_Impl.cxx
===================================================================
RCS file: /cvs/sw/writerfilter/source/dmapper/DomainMapper_Impl.cxx,v
retrieving revision 1.21
diff -u -r1.21 DomainMapper_Impl.cxx
--- openoffice.org.orig/writerfilter/source/dmapper/DomainMapper_Impl.cxx 29 Oct 2007 15:28:37 -0000 1.21
+++ openoffice.org/writerfilter/source/dmapper/DomainMapper_Impl.cxx 15 Feb 2008 05:16:48 -0000
@@ -1027,7 +1027,11 @@
CHARS_CYRILLIC_UPPER_LETTER_RU
CHARS_CYRILLIC_LOWER_LETTER_RU
CHARS_CYRILLIC_UPPER_LETTER_N_RU
- CHARS_CYRILLIC_LOWER_LETTER_N_RU*/
+ CHARS_CYRILLIC_LOWER_LETTER_N_RU
+ CHARS_CYRILLIC_UPPER_LETTER_SR
+ CHARS_CYRILLIC_LOWER_LETTER_SR
+ CHARS_CYRILLIC_UPPER_LETTER_N_SR
+ CHARS_CYRILLIC_LOWER_LETTER_N_SR*/
};
for( sal_uInt32 nNum = 0; nNum < sizeof(aNumberingPairs)/sizeof( NumberingPairs ); ++nNum)
Index: sh_RS.xml
===================================================================
RCS file: /cvs/l10n/i18npool/source/localedata/data/sh_RS.xml,v
retrieving revision 1.2
diff -u -r1.2 sh_RS.xml
--- openoffice.org.orig/i18npool/source/localedata/data/sh_RS.xml 13 Nov 2007 14:35:55 -0000 1.2
+++ openoffice.org/i18npool/source/localedata/data/sh_RS.xml 31 Mar 2008 17:33:14 -0000
@@ -210,72 +224,6 @@
<quarter4Abbreviation>K4</quarter4Abbreviation>
</ReservedWords>
</LC_MISC>
- <LC_NumberingLevel>
- <NumberingLevel NumType="4" Prefix=" " Suffix=")"/>
- <NumberingLevel NumType="4" Prefix=" " Suffix="."/>
- <NumberingLevel NumType="4" Prefix="(" Suffix="."/>
- <NumberingLevel NumType="2" Prefix=" " Suffix="."/>
- <NumberingLevel NumType="0" Prefix=" " Suffix=")"/>
- <NumberingLevel NumType="1" Prefix=" " Suffix=")"/>
- <NumberingLevel NumType="1" Prefix="(" Suffix=")"/>
- <NumberingLevel NumType="3" Prefix=" " Suffix="."/>
- </LC_NumberingLevel>
- <LC_OutLineNumberingLevel>
- <OutlineStyle>
- <OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="1" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="1" Suffix=")" BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0"/>
- </OutlineStyle>
- <OutlineStyle>
- <OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="1" Suffix=")" BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0"/>
- </OutlineStyle>
- <OutlineStyle>
- <OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix="(" NumType="1" Suffix=")" BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="3" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="0" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="6" Suffix="." BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0"/>
- </OutlineStyle>
- <OutlineStyle>
- <OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0"/>
- </OutlineStyle>
- <OutlineStyle>
- <OutLineNumberingLevel Prefix=" " NumType="2" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="0" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="3" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="1" Suffix=")" BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0"/>
- </OutlineStyle>
- <OutlineStyle>
- <OutLineNumberingLevel Prefix=" " NumType="0" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="2" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="1" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="3" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0"/>
- </OutlineStyle>
- <OutlineStyle>
- <OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" " BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" " BulletChar="0020" BulletFontName="" ParentNumbering="1" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" " BulletChar="0020" BulletFontName="" ParentNumbering="2" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" " BulletChar="0020" BulletFontName="" ParentNumbering="3" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="4" Suffix=" " BulletChar="0020" BulletFontName="" ParentNumbering="4" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0"/>
- </OutlineStyle>
- <OutlineStyle>
- <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="27A2" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="E006" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=")" BulletChar="E004" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0"/>
- </OutlineStyle>
- </LC_OutLineNumberingLevel>
+ <LC_NumberingLevel ref="sr_RS"/>
+ <LC_OutLineNumberingLevel ref="sr_RS"/>
</Locale>
Index: sr_RS.xml
===================================================================
RCS file: /cvs/l10n/i18npool/source/localedata/data/sr_RS.xml,v
retrieving revision 1.2
diff -u -r1.2 sr_RS.xml
--- openoffice.org.orig/i18npool/source/localedata/data/sr_RS.xml 13 Nov 2007 14:37:09 -0000 1.2
+++ openoffice.org/i18npool/source/localedata/data/sr_RS.xml 31 Mar 2008 17:33:19 -0000
@@ -350,35 +364,35 @@
</ReservedWords>
</LC_MISC>
<LC_NumberingLevel>
- <NumberingLevel NumType="4" Prefix=" " Suffix=")"/>
<NumberingLevel NumType="4" Prefix=" " Suffix="."/>
- <NumberingLevel NumType="4" Prefix="(" Suffix="."/>
- <NumberingLevel NumType="2" Prefix=" " Suffix="."/>
+ <NumberingLevel NumType="4" Prefix=" " Suffix=")"/>
+ <NumberingLevel NumType="2" Prefix=" " Suffix=""/>
+ <NumberingLevel NumType="3" Prefix=" " Suffix=""/>
+ <NumberingLevel NumType="47" Prefix=" " Suffix=")"/>
+ <NumberingLevel NumType="48" Prefix=" " Suffix=")"/>
<NumberingLevel NumType="0" Prefix=" " Suffix=")"/>
<NumberingLevel NumType="1" Prefix=" " Suffix=")"/>
- <NumberingLevel NumType="1" Prefix="(" Suffix=")"/>
- <NumberingLevel NumType="3" Prefix=" " Suffix="."/>
</LC_NumberingLevel>
<LC_OutLineNumberingLevel>
<OutlineStyle>
<OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0"/>
<OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="1" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="1" Suffix=")" BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0"/>
+ <OutLineNumberingLevel Prefix=" " NumType="48" Suffix=")" BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0"/>
<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0"/>
<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0"/>
</OutlineStyle>
<OutlineStyle>
<OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="1" Suffix=")" BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0"/>
+ <OutLineNumberingLevel Prefix=" " NumType="48" Suffix=")" BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0"/>
<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0"/>
<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0"/>
<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0"/>
</OutlineStyle>
<OutlineStyle>
<OutLineNumberingLevel Prefix=" " NumType="4" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix="(" NumType="1" Suffix=")" BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0"/>
+ <OutLineNumberingLevel Prefix="(" NumType="48" Suffix=")" BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0"/>
<OutLineNumberingLevel Prefix=" " NumType="3" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="0" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0"/>
+ <OutLineNumberingLevel Prefix=" " NumType="47" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0"/>
<OutLineNumberingLevel Prefix=" " NumType="6" Suffix="." BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0"/>
</OutlineStyle>
<OutlineStyle>
@@ -390,13 +404,13 @@
</OutlineStyle>
<OutlineStyle>
<OutLineNumberingLevel Prefix=" " NumType="2" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="0" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0"/>
+ <OutLineNumberingLevel Prefix=" " NumType="47" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0"/>
<OutLineNumberingLevel Prefix=" " NumType="3" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0"/>
- <OutLineNumberingLevel Prefix=" " NumType="1" Suffix=")" BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0"/>
+ <OutLineNumberingLevel Prefix=" " NumType="48" Suffix=")" BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0"/>
<OutLineNumberingLevel Prefix=" " NumType="6" Suffix=" " BulletChar="2022" BulletFontName="StarSymbol" ParentNumbering="0" LeftMargin="200" SymbolTextDistance="50" FirstLineOffset="0"/>
</OutlineStyle>
<OutlineStyle>
- <OutLineNumberingLevel Prefix=" " NumType="0" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0"/>
+ <OutLineNumberingLevel Prefix=" " NumType="47" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="0" SymbolTextDistance="50" FirstLineOffset="0"/>
<OutLineNumberingLevel Prefix=" " NumType="2" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="50" SymbolTextDistance="50" FirstLineOffset="0"/>
<OutLineNumberingLevel Prefix=" " NumType="1" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="100" SymbolTextDistance="50" FirstLineOffset="0"/>
<OutLineNumberingLevel Prefix=" " NumType="3" Suffix="." BulletChar="0020" BulletFontName="" ParentNumbering="0" LeftMargin="150" SymbolTextDistance="50" FirstLineOffset="0"/>
workspace.mba31issues01.patch:
--- NEW FILE workspace.mba31issues01.patch ---
Index: source/appl/appopen.cxx
===================================================================
RCS file: /cvs/framework/sfx2/source/appl/appopen.cxx,v
retrieving revision 1.116
diff -u -r1.116 appopen.cxx
--- openoffice.org.orig/sfx2/source/appl/appopen.cxx 26 Nov 2007 16:46:28 -0000 1.116
+++ openoffice.org/sfx2/source/appl/appopen.cxx 27 Mar 2008 09:17:09 -0000
@@ -1206,32 +1206,13 @@
::rtl::OUString::createFromAscii( "com.sun.star.system.SystemShellExecute" )), UNO_QUERY );
if ( xSystemShellExecute.is() )
{
- if ( aINetProtocol == INET_PROT_FTP ||
- aINetProtocol == INET_PROT_HTTP ||
- aINetProtocol == INET_PROT_HTTPS )
+ if ( aINetProtocol == INET_PROT_MAILTO )
{
- try
- {
- // start browser
- ::rtl::OUString aURLString( aURL.Complete );
- xSystemShellExecute->execute( aURLString, ::rtl::OUString(), SystemShellExecuteFlags::DEFAULTS );
- }
- catch ( ::com::sun::star::lang::IllegalArgumentException& )
- {
- vos::OGuard aGuard( Application::GetSolarMutex() );
- Window *pWindow = SFX_APP()->GetTopWindow();
- ErrorBox( pWindow, SfxResId( MSG_ERR_NO_WEBBROWSER_FOUND )).Execute();
- }
- catch ( ::com::sun::star::system::SystemShellExecuteException& )
- {
- vos::OGuard aGuard( Application::GetSolarMutex() );
- Window *pWindow = SFX_APP()->GetTopWindow();
- ErrorBox( pWindow, SfxResId( MSG_ERR_NO_WEBBROWSER_FOUND )).Execute();
- }
-
- return;
+ // don't dispatch mailto hyperlink to desktop dispatcher
+ rReq.RemoveItem( SID_TARGETNAME );
+ rReq.AppendItem( SfxStringItem( SID_TARGETNAME, String::CreateFromAscii("_self") ) );
}
- else if ( aINetProtocol == INET_PROT_FILE )
+ else if ( aINetProtocol != INET_PROT_VND_SUN_STAR_HELP )
{
BOOL bLoadInternal = FALSE;
@@ -1276,12 +1257,6 @@
if ( !bLoadInternal )
return;
}
- else if ( aINetProtocol == INET_PROT_MAILTO )
- {
- // don't dispatch mailto hyperlink to desktop dispatcher
- rReq.RemoveItem( SID_TARGETNAME );
- rReq.AppendItem( SfxStringItem( SID_TARGETNAME, String::CreateFromAscii("_self") ) );
- }
}
}
else
workspace.mhu17.patch:
--- NEW FILE workspace.mhu17.patch ---
Index: alloc_cache.h
===================================================================
RCS file: /cvs/porting/sal/rtl/source/alloc_cache.h,v
retrieving revision 1.3
retrieving revision 1.3.50.1
diff -u -r1.3 -r1.3.50.1
--- openoffice.org.orig/sal/rtl/source/alloc_cache.h 10 Apr 2008 12:01:34 -0000 1.3
+++ openoffice.org/sal/rtl/source/alloc_cache.h 6 Oct 2008 10:43:46 -0000 1.3.50.1
@@ -86,7 +86,7 @@
/** rtl_cache_magazine_type
* @internal
*/
-#define RTL_CACHE_MAGAZINE_SIZE 64
+#define RTL_CACHE_MAGAZINE_SIZE 61
typedef struct rtl_cache_magazine_st rtl_cache_magazine_type;
struct rtl_cache_magazine_st
workspace.sb101.patch:
--- NEW FILE workspace.sb101.patch ---
Index: source/loader/pythonloader.py
===================================================================
RCS file: /cvs/udk/pyuno/source/loader/pythonloader.py,v
retrieving revision 1.7
diff -u -r1.7 pythonloader.py
--- openoffice.org.orig/pyuno/source/loader/pythonloader.py 20 May 2008 14:32:42 -0000 1.7
+++ openoffice.org/pyuno/source/loader/pythonloader.py 6 Nov 2008 08:35:03 -0000
@@ -38,7 +38,7 @@
from com.sun.star.lang import XServiceInfo
MODULE_PROTOCOL = "vnd.openoffice.pymodule:"
-DEBUG = 1
+DEBUG = 0
g_supportedServices = "com.sun.star.loader.Python", # referenced by the native C++ loader !
g_implementationName = "org.openoffice.comp.pyuno.Loader" # referenced by the native C++ loader !
workspace.sjfixes12.patch:
--- NEW FILE workspace.sjfixes12.patch ---
Index: source/ui/accessibility/AccessibleDocumentViewBase.cxx
===================================================================
RCS file: /cvs/graphics/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx,v
retrieving revision 1.32
diff -u -r1.32 AccessibleDocumentViewBase.cxx
--- openoffice.org.orig/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx 7 Jul 2008 14:20:57 -0000 1.32
+++ openoffice.org/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx 16 Sep 2008 08:02:46 -0000
@@ -74,8 +74,6 @@
namespace accessibility {
-static SfxViewFrame* mpViewFrame = NULL;
-
//===== internal ============================================================
AccessibleDocumentViewBase::AccessibleDocumentViewBase (
::sd::Window* pSdWindow,
@@ -103,8 +102,6 @@
maShapeTreeInfo.SetViewForwarder (&maViewForwarder);
mxWindow = ::VCLUnoHelper::GetInterface (pSdWindow);
-
- mpViewFrame = pViewShell->GetViewFrame();
}
@@ -149,13 +147,20 @@
OUString (RTL_CONSTASCII_USTRINGPARAM("")),
static_cast<beans::XPropertyChangeListener*>(this));
+ // Register this object as dispose event listener at the controller.
+ if (mxController.is())
+ mxController->addEventListener (
+ static_cast<awt::XWindowListener*>(this));
+
// Register at VCL Window to be informed of activated and deactivated
// OLE objects.
Window* pWindow = maShapeTreeInfo.GetWindow();
- if (pWindow != NULL)
+ if (pWindow)
{
- pWindow->AddChildEventListener (LINK(
- this, AccessibleDocumentViewBase, WindowChildEventListener));
+ maWindowLink = LINK(
+ this, AccessibleDocumentViewBase, WindowChildEventListener);
+
+ pWindow->AddChildEventListener (maWindowLink);
USHORT nCount = pWindow->GetChildCount();
for (sal_uInt16 i=0; i<nCount; i++)
@@ -191,12 +196,10 @@
Window* pWindow = maShapeTreeInfo.GetWindow();
Window* pDyingWindow = static_cast<Window*>(
pWindowEvent->GetWindow());
- if (pWindow==pDyingWindow && pWindow!=NULL)
+ if (pWindow==pDyingWindow && pWindow!=NULL && maWindowLink.IsSet())
{
- pWindow->RemoveChildEventListener (LINK(
- this,
- AccessibleDocumentViewBase,
- WindowChildEventListener));
+ pWindow->RemoveChildEventListener (maWindowLink);
+ maWindowLink = Link();
}
}
break;
@@ -542,8 +545,57 @@
return aTypeList;
}
+void AccessibleDocumentViewBase::impl_dispose()
+{
+ // Unregister from VCL Window.
+ if (maWindowLink.IsSet())
+ {
+ Window* pWindow = maShapeTreeInfo.GetWindow();
+ if (pWindow)
+ pWindow->RemoveChildEventListener (maWindowLink);
+ maWindowLink = Link();
+ }
+ else
+ {
+ DBG_ASSERT (pWindow, "AccessibleDocumentViewBase::disposing");
+ }
+ // Unregister from window.
+ if (mxWindow.is())
+ {
+ mxWindow->removeWindowListener (this);
+ mxWindow->removeFocusListener (this);
+ mxWindow = NULL;
+ }
+
+ // Unregister form the model.
+ if (mxModel.is())
+ mxModel->removeEventListener (
+ static_cast<awt::XWindowListener*>(this));
+
+ // Unregister from the controller.
+ if (mxController.is())
+ {
+ uno::Reference<beans::XPropertySet> xSet (mxController, uno::UNO_QUERY);
+ if (xSet.is())
+ xSet->removePropertyChangeListener (
+ OUString (RTL_CONSTASCII_USTRINGPARAM("")),
+ static_cast<beans::XPropertyChangeListener*>(this));
+
+ mxController->removeEventListener (
+ static_cast<awt::XWindowListener*>(this));
+ }
+
+ // Propagate change of controller down the shape tree.
+ maShapeTreeInfo.SetControllerBroadcaster (NULL);
+ // Reset the model reference.
+ mxModel = NULL;
+ // Reset the model reference.
+ mxController = NULL;
+
+ maShapeTreeInfo.SetDocumentWindow (NULL);
+}
//===== XEventListener ======================================================
@@ -560,32 +612,10 @@
{
// Paranoia. Can this really happen?
}
- else if (rEventObject.Source == mxModel)
+ else if (rEventObject.Source == mxModel || rEventObject.Source == mxController)
{
::osl::Guard< ::osl::Mutex> aGuard (::osl::Mutex::getGlobalMutex());
-
- mxModel->removeEventListener (
- static_cast<awt::XWindowListener*>(this));
-
- // Reset the model reference.
- mxModel = NULL;
-
- // Propagate change of controller down the shape tree.
- maShapeTreeInfo.SetControllerBroadcaster (NULL);
- }
- else if (rEventObject.Source == mxController)
- {
- ::osl::Guard< ::osl::Mutex> aGuard (::osl::Mutex::getGlobalMutex());
-
- // Unregister as property change listener at the controller.
- uno::Reference<beans::XPropertySet> xSet (mxController,uno::UNO_QUERY);
- if (xSet.is())
- xSet->removePropertyChangeListener (
- OUString (RTL_CONSTASCII_USTRINGPARAM("")),
- static_cast<beans::XPropertyChangeListener*>(this));
-
- // Reset the model reference.
- mxController = NULL;
+ impl_dispose();
}
}
@@ -688,36 +718,7 @@
// This method is called from the component helper base class while disposing.
void SAL_CALL AccessibleDocumentViewBase::disposing (void)
{
- // Unregister from VCL Window.
- Window* pWindow = maShapeTreeInfo.GetWindow();
- if (pWindow != NULL)
- {
- pWindow->RemoveChildEventListener (LINK(
- this, AccessibleDocumentViewBase, WindowChildEventListener));
- }
- else
- {
- DBG_ASSERT (pWindow, "AccessibleDocumentViewBase::disposing");
- }
-
- // Unregister from window.
- if (mxWindow.is())
- {
- mxWindow->removeWindowListener (this);
- mxWindow->removeFocusListener (this);
- }
-
- // Unregister form the model.
- if (mxModel.is())
- mxModel->removeEventListener (
- static_cast<awt::XWindowListener*>(this));
-
- // Unregister from the controller.
- uno::Reference<beans::XPropertySet> xSet (mxController, uno::UNO_QUERY);
- if (xSet.is())
- xSet->removePropertyChangeListener (
- OUString (RTL_CONSTASCII_USTRINGPARAM("")),
- static_cast<beans::XPropertyChangeListener*>(this));
+ impl_dispose();
AccessibleContextBase::disposing ();
}
Index: source/ui/accessibility/AccessibleDrawDocumentView.cxx
===================================================================
RCS file: /cvs/graphics/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx,v
retrieving revision 1.30
diff -u -r1.30 AccessibleDrawDocumentView.cxx
--- openoffice.org.orig/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx 7 Jul 2008 14:21:10 -0000 1.30
+++ openoffice.org/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx 16 Sep 2008 08:02:46 -0000
@@ -664,6 +666,16 @@
}
+void AccessibleDrawDocumentView::impl_dispose()
+{
+ if (mpChildrenManager != NULL)
+ {
+ delete mpChildrenManager;
+ mpChildrenManager = NULL;
+ }
+
+ AccessibleDocumentViewBase::impl_dispose();
+}
/** This method is called from the component helper base class while
Index: source/ui/inc/AccessibleDocumentViewBase.hxx
===================================================================
RCS file: /cvs/graphics/sd/source/ui/inc/AccessibleDocumentViewBase.hxx,v
retrieving revision 1.13
diff -u -r1.13 AccessibleDocumentViewBase.hxx
--- openoffice.org.orig/sd/source/ui/inc/AccessibleDocumentViewBase.hxx 10 Apr 2008 20:33:06 -0000 1.13
+++ openoffice.org/sd/source/ui/inc/AccessibleDocumentViewBase.hxx 16 Sep 2008 08:02:47 -0000
@@ -257,7 +257,6 @@
throw (::com::sun::star::uno::RuntimeException);
private:
-
// return the member maMutex;
virtual ::osl::Mutex&
implGetMutex();
@@ -306,6 +305,8 @@
::com::sun::star::accessibility::XAccessible>
mxAccessibleOLEObject;
+ Link maWindowLink;
+
// This method is called from the component helper base class while
// disposing.
virtual void SAL_CALL disposing (void);
@@ -362,6 +363,8 @@
virtual void SetAccessibleOLEObject (
const ::com::sun::star::uno::Reference <
::com::sun::star::accessibility::XAccessible>& xOLEObject);
+
+ virtual void impl_dispose();
};
} // end of namespace accessibility
Index: source/ui/inc/AccessibleDrawDocumentView.hxx
===================================================================
RCS file: /cvs/graphics/sd/source/ui/inc/AccessibleDrawDocumentView.hxx,v
retrieving revision 1.12
diff -u -r1.12 AccessibleDrawDocumentView.hxx
--- openoffice.org.orig/sd/source/ui/inc/AccessibleDrawDocumentView.hxx 10 Apr 2008 20:33:23 -0000 1.12
+++ openoffice.org/sd/source/ui/inc/AccessibleDrawDocumentView.hxx 16 Sep 2008 08:02:47 -0000
@@ -164,6 +164,8 @@
change event indicating that it has lost the focus.
*/
virtual void Deactivated (void);
+
+ virtual void impl_dispose();
};
} // end of namespace accessibility
Index: source/ui/unoidl/DrawController.cxx
===================================================================
RCS file: /cvs/graphics/sd/source/ui/unoidl/DrawController.cxx,v
retrieving revision 1.27
diff -u -r1.27 DrawController.cxx
--- openoffice.org.orig/sd/source/ui/unoidl/DrawController.cxx 7 Jul 2008 14:22:34 -0000 1.27
+++ openoffice.org/sd/source/ui/unoidl/DrawController.cxx 16 Sep 2008 08:02:48 -0000
@@ -316,8 +316,8 @@
const Reference< view::XSelectionChangeListener >& xListener )
throw(RuntimeException)
{
- if( mbDisposing )
- throw lang::DisposedException();
+ if( rBHelper.bDisposed )
+ throw lang::DisposedException();
BroadcastHelperOwner::maBroadcastHelper.removeListener (saSelectionTypeIdentifier, xListener);
}
Index: source/accessibility/ChildrenManagerImpl.cxx
===================================================================
RCS file: /cvs/graphics/svx/source/accessibility/ChildrenManagerImpl.cxx,v
retrieving revision 1.41
diff -u -r1.41 ChildrenManagerImpl.cxx
--- openoffice.org.orig/svx/source/accessibility/ChildrenManagerImpl.cxx 24 Jun 2008 16:38:48 -0000 1.41
+++ openoffice.org/svx/source/accessibility/ChildrenManagerImpl.cxx 16 Sep 2008 08:13:52 -0000
@@ -45,6 +45,8 @@
#include <rtl/ustring.hxx>
#include <tools/debug.hxx>
+#include <stdio.h>
+
using namespace ::com::sun::star;
using namespace ::com::sun::star::accessibility;
using ::com::sun::star::uno::Reference;
@@ -77,7 +79,8 @@
mxParent (rxParent),
maShapeTreeInfo (rShapeTreeInfo),
mrContext (rContext),
- mnNewNameIndex(1)
+ mnNewNameIndex(1),
+ mpFocusedShape(NULL)
{
}
@@ -95,12 +98,19 @@
void ChildrenManagerImpl::Init (void)
{
+
// Register as view::XSelectionChangeListener.
+ Reference<frame::XController> xController(maShapeTreeInfo.GetController());
Reference<view::XSelectionSupplier> xSelectionSupplier (
- maShapeTreeInfo.GetController(), uno::UNO_QUERY);
+ xController, uno::UNO_QUERY);
if (xSelectionSupplier.is())
+ {
+ xController->addEventListener(
+ static_cast<document::XEventListener*>(this));
+
xSelectionSupplier->addSelectionChangeListener (
static_cast<view::XSelectionChangeListener*>(this));
+ }
// Register at model as document::XEventListener.
if (maShapeTreeInfo.GetModelBroadcaster().is())
@@ -217,26 +227,46 @@
Rectangle aVisibleArea = maShapeTreeInfo.GetViewForwarder()->GetVisibleArea();
// 1. Create a local list of visible shapes.
- ChildDescriptorListType aNewChildList;
- CreateListOfVisibleShapes (aNewChildList);
-
- // 2. Find all shapes in the current list that are not in the new list,
- // send appropriate events and remove the accessible shape.
- RemoveNonVisibleChildren (aNewChildList);
+ ChildDescriptorListType aChildList;
+ CreateListOfVisibleShapes (aChildList);
- // 3. Merge the information that is already known about the visible
+ // 2. Merge the information that is already known about the visible
// shapes from the current list into the new list.
- MergeAccessibilityInformation (aNewChildList);
+ MergeAccessibilityInformation (aChildList);
- // 4. Replace the current list of visible shapes with the new one. Do
+ // 3. Replace the current list of visible shapes with the new one. Do
// the same with the visible area.
{
::osl::MutexGuard aGuard (maMutex);
- adjustIndexInParentOfShapes(aNewChildList);
+ adjustIndexInParentOfShapes(aChildList);
// Use swap to copy the contents of the new list in constant time.
- maVisibleChildren.swap (aNewChildList);
- aNewChildList.clear();
+ maVisibleChildren.swap (aChildList);
+
+ // aChildList now contains all the old children, while maVisibleChildren
+ // contains all the current children
+
+ // 4. Find all shapes in the old list that are not in the current list,
+ // send appropriate events and remove the accessible shape.
+ //
+ // Do this *after* we have set our new list of children, because
+ // removing a child may cause
+ //
+ // ChildDescriptor::disposeAccessibleObject -->
+ // AccessibleContextBase::CommitChange -->
+ // AtkListener::notifyEvent ->
+ // AtkListener::handleChildRemoved ->
+ // AtkListener::updateChildList
+ // AccessibleDrawDocumentView::getAccessibleChildCount ->
+ // ChildrenManagerImpl::GetChildCount ->
+ // maVisibleChildren.size()
+ //
+ // to be fired, and so the operations will take place on
+ // the list we are trying to replace
+ //
+ RemoveNonVisibleChildren (maVisibleChildren, aChildList);
+
+ aChildList.clear();
maVisibleArea = aVisibleArea;
}
@@ -318,15 +348,15 @@
void ChildrenManagerImpl::RemoveNonVisibleChildren (
- ChildDescriptorListType& raNewChildList)
+ const ChildDescriptorListType& rNewChildList, ChildDescriptorListType& rOldChildList)
{
// Iterate over list of formerly visible children and remove those that
// are not visible anymore, i.e. member of the new list of visible
// children.
- ChildDescriptorListType::iterator I, aEnd = maVisibleChildren.end();
- for (I=maVisibleChildren.begin(); I != aEnd; ++I)
+ ChildDescriptorListType::iterator I, aEnd = rOldChildList.end();
+ for (I=rOldChildList.begin(); I != aEnd; ++I)
{
- if (::std::find(raNewChildList.begin(), raNewChildList.end(), *I) == raNewChildList.end())
+ if (::std::find(rNewChildList.begin(), rNewChildList.end(), *I) == rNewChildList.end())
{
// The child is disposed when there is a UNO shape from which
// the accessible shape can be created when the shape becomes
@@ -573,12 +603,14 @@
{
// Remember the current broadcasters and exchange the shape tree info.
Reference<document::XEventBroadcaster> xCurrentBroadcaster;
+ Reference<frame::XController> xCurrentController;
Reference<view::XSelectionSupplier> xCurrentSelectionSupplier;
{
::osl::MutexGuard aGuard (maMutex);
xCurrentBroadcaster = maShapeTreeInfo.GetModelBroadcaster();
+ xCurrentController = maShapeTreeInfo.GetController();
xCurrentSelectionSupplier = Reference<view::XSelectionSupplier> (
- maShapeTreeInfo.GetController(), uno::UNO_QUERY);
+ xCurrentController, uno::UNO_QUERY);
maShapeTreeInfo = rShapeTreeInfo;
}
@@ -597,19 +629,30 @@
}
// Move registration to new selection supplier.
+ Reference<frame::XController> xNewController(maShapeTreeInfo.GetController());
Reference<view::XSelectionSupplier> xNewSelectionSupplier (
- maShapeTreeInfo.GetController(), uno::UNO_QUERY);
+ xNewController, uno::UNO_QUERY);
if (xNewSelectionSupplier != xCurrentSelectionSupplier)
{
// Register at new broadcaster.
if (xNewSelectionSupplier.is())
+ {
+ xNewController->addEventListener(
+ static_cast<document::XEventListener*>(this));
+
xNewSelectionSupplier->addSelectionChangeListener (
static_cast<view::XSelectionChangeListener*>(this));
+ }
// Unregister at old broadcaster.
if (xCurrentSelectionSupplier.is())
+ {
xCurrentSelectionSupplier->removeSelectionChangeListener (
static_cast<view::XSelectionChangeListener*>(this));
+
+ xCurrentController->removeEventListener(
+ static_cast<document::XEventListener*>(this));
+ }
}
}
@@ -622,22 +665,13 @@
ChildrenManagerImpl::disposing (const lang::EventObject& rEventObject)
throw (uno::RuntimeException)
{
- if (rEventObject.Source == maShapeTreeInfo.GetModelBroadcaster())
- {
- maShapeTreeInfo.SetModelBroadcaster (NULL);
- // The disposing of a model should be handled elsewhere. But to be
- // on the safe side we remove all of our children.
- ClearAccessibleShapeList ();
- SetShapeList (NULL);
- }
-
- else if (rEventObject.Source
- == Reference<view::XSelectionSupplier> (
- maShapeTreeInfo.GetController(), uno::UNO_QUERY))
+ if (
+ rEventObject.Source == maShapeTreeInfo.GetModelBroadcaster() ||
+ rEventObject.Source == maShapeTreeInfo.GetController()
+ )
{
- maShapeTreeInfo.SetController (NULL);
+ impl_dispose();
}
-
// Handle disposing UNO shapes.
else
{
@@ -694,29 +728,47 @@
}
+void ChildrenManagerImpl::impl_dispose()
+{
+ Reference<frame::XController> xController(maShapeTreeInfo.GetController());
+ // Remove from broadcasters.
+ try {
+ Reference<view::XSelectionSupplier> xSelectionSupplier (
+ xController, uno::UNO_QUERY);
+ if (xSelectionSupplier.is())
+ {
+ xSelectionSupplier->removeSelectionChangeListener (
+ static_cast<view::XSelectionChangeListener*>(this));
+ }
+ }
+ catch( uno::RuntimeException&) { }
+ try {
+ if (xController.is())
+ xController->removeEventListener(
+ static_cast<document::XEventListener*>(this));
+ } catch( uno::RuntimeException&) { }
-void SAL_CALL ChildrenManagerImpl::disposing (void)
-{
- try
- {
- // Remove from broadcasters.
- Reference<view::XSelectionSupplier> xSelectionSupplier (
- maShapeTreeInfo.GetController(), uno::UNO_QUERY);
- if (xSelectionSupplier.is())
- xSelectionSupplier->removeSelectionChangeListener (
- static_cast<view::XSelectionChangeListener*>(this));
-
- if (maShapeTreeInfo.GetModelBroadcaster().is())
- maShapeTreeInfo.GetModelBroadcaster()->removeEventListener (
- static_cast<document::XEventListener*>(this));
- }
- catch( uno::RuntimeException& )
- {
- // our XSelectionSupplier may be already disposed
- }
+ maShapeTreeInfo.SetController (NULL);
+
+ try {
+ // Remove from broadcaster.
+ if (maShapeTreeInfo.GetModelBroadcaster().is())
+ maShapeTreeInfo.GetModelBroadcaster()->removeEventListener (
+ static_cast<document::XEventListener*>(this));
+ maShapeTreeInfo.SetModelBroadcaster (NULL);
+ }
+ catch( uno::RuntimeException& ) { }
ClearAccessibleShapeList ();
+ SetShapeList (NULL);
+}
+
+
+
+void SAL_CALL ChildrenManagerImpl::disposing (void)
+{
+ impl_dispose();
}
Index: source/accessibility/ChildrenManagerImpl.hxx
===================================================================
RCS file: /cvs/graphics/svx/source/accessibility/ChildrenManagerImpl.hxx,v
retrieving revision 1.24
diff -u -r1.24 ChildrenManagerImpl.hxx
--- openoffice.org.orig/svx/source/accessibility/ChildrenManagerImpl.hxx 24 Jun 2008 16:39:05 -0000 1.24
+++ openoffice.org/svx/source/accessibility/ChildrenManagerImpl.hxx 16 Sep 2008 08:13:52 -0000
@@ -378,6 +378,7 @@
::com::sun::star::accessibility::XAccessible>& xChild) const
throw (::com::sun::star::uno::RuntimeException);
+ void impl_dispose();
private:
/** Names of new accessible objects are disambiguated with this index.
It gets increased every time a new object is created and (at the
@@ -406,14 +407,18 @@
*/
void CreateListOfVisibleShapes (ChildDescriptorListType& raChildList);
- /** From the internal list of (former) visible shapes remove those that
- are not member of the given list. Send appropriate events for every
+ /** From the old list of (former) visible shapes remove those that
+ are not member of the new list. Send appropriate events for every
such shape.
- @param raChildList
- The new list of visible children against which the internal one
+ @param raNewChildList
+ The new list of visible children against which the old one
+ is compared.
+ @param raOldChildList
+ The old list of visible children against which the new one
is compared.
*/
- void RemoveNonVisibleChildren (ChildDescriptorListType& raChildList);
+ void RemoveNonVisibleChildren (const ChildDescriptorListType& raNewChildList,
+ ChildDescriptorListType& raOldChildList);
/** Merge the information that is already known about the visible shapes
from the current list into the new list.
@@ -548,7 +553,7 @@
descriptor may be based on a UNO shape or, already, on an accessible
shape.
*/
- inline bool operator == (const ChildDescriptor& aDescriptor)
+ inline bool operator == (const ChildDescriptor& aDescriptor) const
{
return (this == &aDescriptor || (mxShape.get() == aDescriptor.mxShape.get() ) && ( mxShape.is() || mxAccessibleShape.get() == aDescriptor.mxAccessibleShape.get()));
}
@@ -557,7 +562,7 @@
to put child descriptors in some STL containers. The ordering itself is
not so important, its 'features' are not used.
*/
- inline bool operator < (const ChildDescriptor& aDescriptor)
+ inline bool operator < (const ChildDescriptor& aDescriptor) const
{
return (mxShape.get() < aDescriptor.mxShape.get());
}
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1707
retrieving revision 1.1708
diff -u -r1.1707 -r1.1708
--- openoffice.org.spec 4 Dec 2008 23:05:34 -0000 1.1707
+++ openoffice.org.spec 5 Dec 2008 13:39:42 -0000 1.1708
@@ -98,38 +98,36 @@
Patch25: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
Patch26: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch
Patch27: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
-Patch28: openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch
+Patch28: workspace.mba31issues01.patch
Patch29: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
Patch30: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
Patch31: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
Patch32: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch
Patch33: openoffice.org-3.0.0.ooo48400.svx.fixspelling.patch
-Patch34: openoffice.org-3.0.0.ooo86142.serbiannumbering.patch
+Patch34: workspace.locales31.patch
Patch35: openoffice.org-3.0.0.ooo91904.sd.wrongindex.patch
Patch36: workspace.fpicker8.patch
Patch37: workspace.cmcfixes49.patch
Patch38: openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch
-Patch39: openoffice.org-3.0.0.ooo93419.svx.ref_deref.before.ctored.patch
-Patch40: workspace.cmcfixes50.patch
-Patch41: openoffice.org-3.0.0.ooo93515.vcl.jrb-frames.patch
-Patch42: openoffice.org-3.0.0.ooo93942.svx.accessibity-loops.patch
-Patch43: openoffice.org-3.0.0.ooo93949.sw.better_rtf_encodings.patch
-Patch44: workspace.vcl94.patch
-Patch45: workspace.vcl95.patch
-Patch46: openoffice.org-3.0.0.ooo94938.unopkg.handleexception.patch
-Patch47: openoffice.org-3.0.0.ooo94659.sal.magazine.patch
-Patch48: openoffice.org-3.0.0.ooo95018.sal.fdwarnings.patch
-Patch49: openoffice.org-3.0.0.ooo95318.system-showicons.patch
-Patch50: workspace.vcl96.patch
-Patch51: openoffice.org-3.0.0.ooo95533.sw.safertableexport.patch
-Patch52: workspace.fwk92.patch
-Patch53: openoffice.org-3.0.0.ooo95834.dontset-nonfunctional-forward.patch
-Patch54: openoffice.org-3.0.0.ooo90653.pyuno.debugging.spew.patch
-Patch55: openoffice.org-3.0.0.ooo90072.sw.undo-longtext.patch
-Patch56: openoffice.org-3.0.0.ooo96203.sfx2.3layer-qstart.patch
-Patch57: openoffice.org-3.0.0.ooo96279.swext.mediawiki.proxies.patch
-Patch58: openoffice.org-3.0.0.ooo96391.sw.prefsalwaysmodified.patch
-Patch59: openoffice.org-3.0.1.ooo96906.ucb.symlinks.and.size.patch
+Patch39: workspace.cmcfixes50.patch
+Patch40: openoffice.org-3.0.0.ooo93515.vcl.jrb-frames.patch
+Patch41: workspace.sjfixes12.patch
+Patch42: workspace.vcl94.patch
+Patch43: workspace.vcl95.patch
+Patch44: openoffice.org-3.0.0.ooo94938.unopkg.handleexception.patch
+Patch45: workspace.mhu17.patch
+Patch46: openoffice.org-3.0.0.ooo95018.sal.fdwarnings.patch
+Patch47: openoffice.org-3.0.0.ooo95318.system-showicons.patch
+Patch48: workspace.vcl96.patch
+Patch49: workspace.hb12.patch
+Patch50: workspace.fwk92.patch
+Patch51: openoffice.org-3.0.0.ooo95834.dontset-nonfunctional-forward.patch
+Patch52: workspace.sb101.patch
+Patch53: openoffice.org-3.0.0.ooo90072.sw.undo-longtext.patch
+Patch54: workspace.cmcfixes51.patch
+Patch55: openoffice.org-3.0.0.ooo96279.swext.mediawiki.proxies.patch
+Patch56: openoffice.org-3.0.0.ooo96391.sw.prefsalwaysmodified.patch
+Patch57: openoffice.org-3.0.1.ooo96906.ucb.symlinks.and.size.patch
%define instdir %{_libdir}
%define baseinstdir %{instdir}/openoffice.org
@@ -1352,38 +1350,36 @@
%patch25 -p1 -b .rh133741.alwaysgtk.vcl.patch
%patch26 -p1 -b .ooo85921.sd.editmasterundermouse.patch
%patch27 -p1 -b .ooo86080.unopkg.bodge.patch
-%patch28 -p1 -b .ooo87490.sfx2.allprotocols.urlopen.patch
+%patch28 -p1 -b .workspace.mba31issues01.patch
%patch29 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
%patch30 -p1 -b .ooo88341.sc.verticalboxes.patch
%patch31 -p1 -b .gccXXXXX.solenv.javaregistration.patch
%patch32 -p1 -b .ooo87970.vcl.samenamesubs.patch
%patch33 -p1 -b .ooo48400.svx.fixspelling.patch
-%patch34 -p1 -b .ooo86142.serbiannumbering.patch
+%patch34 -p1 -b .workspace.locales31.patch
%patch35 -p1 -b .ooo91904.sd.wrongindex.patch
%patch36 -p1 -b .workspace.fpicker8.patch
%patch37 -p0 -b .workspace.cmcfixes49.patch
%patch38 -p1 -b .ooo91924.svx.consistentordering.patch
-%patch39 -p1 -b .ooo93419.svx.ref_deref.before.ctored.patch
-%patch40 -p1 -b .workspace.cmcfixes50.patch
-%patch41 -p1 -b .ooo93515.vcl.jrb-frames.patch
-%patch42 -p1 -b .ooo93942.svx.accessibity-loops.patch
-%patch43 -p1 -b .ooo93949.sw.better_rtf_encodings.patch
-%patch44 -p1 -b .workspace.vcl94.patch
-%patch45 -p1 -b .workspace.vcl95.patch
-%patch46 -p1 -b .ooo94938.unopkg.handleexception.patch
-%patch47 -p1 -b .ooo94659.sal.magazine.patch
-%patch48 -p1 -b .ooo95018.sal.fdwarnings.patch
-%patch49 -p1 -b .ooo95318.system-showicons.patch
-%patch50 -p1 -b .workspace.vcl96.patch
-%patch51 -p1 -b .ooo95533.sw.safertableexport.patch
-%patch52 -p1 -b .workspace.fwk92.patch
-%patch53 -p1 -b .ooo95834.dontset-nonfunctional-forward.patch
-%patch54 -p1 -b .ooo90653.pyuno.debugging.spew.patch
-%patch55 -p1 -b .ooo90072.sw.undo-longtext.patch
-%patch56 -p1 -b .ooo96203.sfx2.3layer-qstart.patch
-%patch57 -p1 -b .ooo96279.swext.mediawiki.proxies.patch
-%patch58 -p1 -b .ooo96391.sw.prefsalwaysmodified.patch
-%patch59 -p1 -b .ooo96906.ucb.symlinks.and.size.patch
+%patch39 -p1 -b .workspace.cmcfixes50.patch
+%patch40 -p1 -b .ooo93515.vcl.jrb-frames.patch
+%patch41 -p1 -b .workspace.sjfixes12.patch
+%patch42 -p1 -b .workspace.vcl94.patch
+%patch43 -p1 -b .workspace.vcl95.patch
+%patch44 -p1 -b .ooo94938.unopkg.handleexception.patch
+%patch45 -p1 -b .workspace.mhu17.patch
+%patch46 -p1 -b .ooo95018.sal.fdwarnings.patch
+%patch47 -p1 -b .ooo95318.system-showicons.patch
+%patch48 -p1 -b .workspace.vcl96.patch
+%patch49 -p1 -b .workspace.hb12.patch
+%patch50 -p1 -b .workspace.fwk92.patch
+%patch51 -p1 -b .ooo95834.dontset-nonfunctional-forward.patch
+%patch52 -p1 -b .workspace.sb101.patch
+%patch53 -p1 -b .ooo90072.sw.undo-longtext.patch
+%patch54 -p1 -b .workspace.cmcfixes51.patch
+%patch55 -p1 -b .ooo96279.swext.mediawiki.proxies.patch
+%patch56 -p1 -b .ooo96391.sw.prefsalwaysmodified.patch
+%patch57 -p1 -b .ooo96906.ucb.symlinks.and.size.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3750,8 +3746,22 @@
unopkg list --shared > /dev/null 2>&1 || :
%changelog
-* Thu Dec 04 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-12.3
+* Fri Dec 05 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-12.3
- add openoffice.org-3.0.1.ooo96906.ucb.symlinks.and.size.patch
+- rename openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch to
+ upstream workspace.mba31issues01.patch
+- rename openoffice.org-3.0.0.ooo96203.sfx2.3layer-qstart.patch to
+ upstream workspace.cmcfixes51.patch
+- rename openoffice.org-3.0.0.ooo90653.pyuno.debugging.spew.patch to
+ upstream workspace.sb101.patch
+- rename openoffice.org-3.0.0.ooo95533.sw.safertableexport.patch and
+ openoffice.org-3.0.0.ooo93949.sw.better_rtf_encodings.patch to
+ upstream workspace.hb12.patch
+- rename openoffice.org-3.0.0.ooo94659.sal.magazine.patch to
+ upstream workspace.mhu17.patch
+- drop integrated openoffice.org-3.0.0.ooo93942.svx.accessibity-loops.patch to
+- rename openoffice.org-3.0.0.ooo86142.serbiannumbering.patch to
+ upstream workspace.locales31.patch
* Mon Dec 01 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-12.2
- Resolves: rhbz#474058 messy patch
--- openoffice.org-2.4.0.ooo87490.sfx2.allprotocols.urlopen.patch DELETED ---
--- openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch DELETED ---
--- openoffice.org-3.0.0.ooo86142.serbiannumbering.patch DELETED ---
--- openoffice.org-3.0.0.ooo90653.pyuno.debugging.spew.patch DELETED ---
--- openoffice.org-3.0.0.ooo93419.svx.ref_deref.before.ctored.patch DELETED ---
--- openoffice.org-3.0.0.ooo93942.svx.accessibity-loops.patch DELETED ---
--- openoffice.org-3.0.0.ooo93949.sw.better_rtf_encodings.patch DELETED ---
--- openoffice.org-3.0.0.ooo94659.sal.magazine.patch DELETED ---
--- openoffice.org-3.0.0.ooo95533.sw.safertableexport.patch DELETED ---
--- openoffice.org-3.0.0.ooo95908.pyuno.debugging.spew.patch DELETED ---
--- openoffice.org-3.0.0.ooo96203.sfx2.3layer-qstart.patch DELETED ---
More information about the fedora-extras-commits
mailing list