rpms/openoffice.org/devel openoffice.org-3.3.0.ooo113117.extensions.broken.scanner.shutdown.patch, NONE, 1.1 openoffice.org-3.3.0.ooo74188.indiccursor.editeng.patch, NONE, 1.1 openoffice.org-3.3.0.oooXXXXX.afms.buildtype.patch, NONE, 1.1 openoffice.org-3.3.0.oooXXXXX.offapi.weirdness.patch, NONE, 1.1 workspace.native317.patch, NONE, 1.1 workspace.sb126.patch, NONE, 1.1 workspace.sb128.patch, 1.2, 1.3 ooo-build.ooo2497.filter.svg.patch, 1.6, 1.7 ooo-build.ooo68717.gstreamer.video.patch, 1.5, 1.6 openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch, 1.14, 1.15 openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch, 1.3, 1.4 openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch, 1.4, 1.5 openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch, 1.8, 1.9 openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch, 1.2, 1.3 openoffice.org-3.1.0.ooo101274.opening-a-directory.patch, 1.2, 1.3 openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch, 1.4, 1.5 openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch, 1.7, 1.8 openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch, 1.4, 1.5 openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch, 1.1, 1.2 openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch, 1.3, 1.4 openoffice.org-3.2.0.ooo108846.sfx2.qstartfixes.patch, 1.1, 1.2 openoffice.org-3.3.0.ooo107490.cppu.lifecycle.patch, 1.3, 1.4 openoffice.org-3.3.0.ooo108246.svx.hide-sql-group-when-inactive.patch, 1.1, 1.2 openoffice.org-3.3.0.ooo111699.svx.nullfield.patch, 1.1, 1.2 openoffice.org.spec, 1.2272, 1.2273 sources, 1.403, 1.404 workspace.gtk3.patch, 1.5, 1.6 workspace.srb1.patch, 1.2, 1.3 workspace.sw33bf06.patch, 1.2, 1.3 workspace.writerfilter08.patch, 1.2, 1.3 openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch, 1.2, NONE openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch, 1.12, NONE openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch, 1.4, NONE openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch, 1.1, NONE openoffice.org-3.1.1.ooo109280.sal.justcoredump.patch, 1.1, NONE openoffice.org-3.2.0.ooo47279.sd.objectsave.safe.patch, 1.1, NONE openoffice.org-3.3.0.ooo111446.writerfilter.avoidcrash.patch, 1.1, NONE workspace.calc53.patch, 1.2, NONE workspace.chart47.patch, 1.1, NONE workspace.cmcfixes64.patch, 1.1, NONE workspace.cmcfixes67.patch, 1.7, NONE workspace.cmcfixes70.patch, 1.2, NONE workspace.cmcfixes75.patch, 1.1, NONE workspace.dr73.patch, 1.1, NONE workspace.extras330.patch, 1.1, NONE workspace.fchints01.patch, 1.4, NONE workspace.fwk139.patch, 1.1, NONE workspace.gsminhibit.patch, 1.1, NONE workspace.gtkfpicker9.patch, 1.1, NONE workspace.hb33patches1.patch, 1.1, NONE workspace.impress188.patch, 1.1, NONE workspace.koheicsvimport.patch, 1.1, NONE workspace.locales33a.patch, 1.3, NONE workspace.mba33issues01.patch, 1.1, NONE workspace.odfmetadata4.patch, 1.1, NONE workspace.os140.patch, 1.1, NONE workspace.printerpullpages.patch, 1.1, NONE workspace.pythonssldedux.patch, 1.1, NONE workspace.s390xport02.patch, 1.3, NONE workspace.sdfindall.patch, 1.1, NONE workspace.slideshow1.patch, 1.3, NONE workspace.sw33bf02.patch, 1.1, NONE workspace.sw33bf03.patch, 1.2, NONE workspace.sw33bf04.patch, 1.3, NONE workspace.thbfixes10.patch, 1.1, NONE workspace.tl80.patch, 1.5, NONE workspace.vcl106.patch, 1.6, NONE workspace.vcl107.patch, 1.3, NONE workspace.vcl108.patch, 1.5, NONE workspace.vcl111.patch, 1.4, NONE workspace.vcl112.patch, 1.1, NONE workspace.writerfilter07.patch, 1.2, NONE
Caolan McNamara
caolanm at fedoraproject.org
Tue Jul 13 10:16:58 UTC 2010
- Previous message: rpms/svnkit/devel svnkit-1.3.3-dependencies.patch, NONE, 1.1 svnkit-1.3.3-ISVNStatusFileProvider.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 svnkit.spec, 1.15, 1.16 svnkit-1.3.2-ISVNStatusFileProvider.patch, 1.1, NONE svnkit-1.3.2-dependencies.patch, 1.1, NONE
- Next message: rpms/maven-ejb-plugin/devel maven-ejb-plugin.spec,1.2,1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv21649
Modified Files:
ooo-build.ooo2497.filter.svg.patch
ooo-build.ooo68717.gstreamer.video.patch
openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch
openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch
openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch
openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch
openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch
openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch
openoffice.org-3.2.0.ooo108846.sfx2.qstartfixes.patch
openoffice.org-3.3.0.ooo107490.cppu.lifecycle.patch
openoffice.org-3.3.0.ooo108246.svx.hide-sql-group-when-inactive.patch
openoffice.org-3.3.0.ooo111699.svx.nullfield.patch
openoffice.org.spec sources workspace.gtk3.patch
workspace.srb1.patch workspace.sw33bf06.patch
workspace.writerfilter08.patch
Added Files:
openoffice.org-3.3.0.ooo113117.extensions.broken.scanner.shutdown.patch
openoffice.org-3.3.0.ooo74188.indiccursor.editeng.patch
openoffice.org-3.3.0.oooXXXXX.afms.buildtype.patch
openoffice.org-3.3.0.oooXXXXX.offapi.weirdness.patch
workspace.native317.patch workspace.sb126.patch
workspace.sb128.patch
Removed Files:
openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch
openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch
openoffice.org-3.1.1.ooo109280.sal.justcoredump.patch
openoffice.org-3.2.0.ooo47279.sd.objectsave.safe.patch
openoffice.org-3.3.0.ooo111446.writerfilter.avoidcrash.patch
workspace.calc53.patch workspace.chart47.patch
workspace.cmcfixes64.patch workspace.cmcfixes67.patch
workspace.cmcfixes70.patch workspace.cmcfixes75.patch
workspace.dr73.patch workspace.extras330.patch
workspace.fchints01.patch workspace.fwk139.patch
workspace.gsminhibit.patch workspace.gtkfpicker9.patch
workspace.hb33patches1.patch workspace.impress188.patch
workspace.koheicsvimport.patch workspace.locales33a.patch
workspace.mba33issues01.patch workspace.odfmetadata4.patch
workspace.os140.patch workspace.printerpullpages.patch
workspace.pythonssldedux.patch workspace.s390xport02.patch
workspace.sdfindall.patch workspace.slideshow1.patch
workspace.sw33bf02.patch workspace.sw33bf03.patch
workspace.sw33bf04.patch workspace.thbfixes10.patch
workspace.tl80.patch workspace.vcl106.patch
workspace.vcl107.patch workspace.vcl108.patch
workspace.vcl111.patch workspace.vcl112.patch
workspace.writerfilter07.patch
Log Message:
3.3.0 branch
openoffice.org-3.3.0.ooo113117.extensions.broken.scanner.shutdown.patch:
scanner.cxx | 3 +
scanner.hxx | 5 +-
scanunx.cxx | 101 +++++++++++++++++++++++++++++++++++++++---------------------
scanwin.cxx | 12 ++++---
4 files changed, 79 insertions(+), 42 deletions(-)
--- NEW FILE openoffice.org-3.3.0.ooo113117.extensions.broken.scanner.shutdown.patch ---
diff -ru extensions.orig/source/scanner/scanner.cxx extensions/source/scanner/scanner.cxx
--- extensions.orig/source/scanner/scanner.cxx 2010-07-12 20:17:35.000000000 +0100
+++ extensions/source/scanner/scanner.cxx 2010-07-13 10:17:25.000000000 +0100
@@ -43,13 +43,14 @@
ScannerManager::ScannerManager() :
mpData( NULL )
{
+ AcquireData();
}
// -----------------------------------------------------------------------------
ScannerManager::~ScannerManager()
{
- DestroyData();
+ ReleaseData();
}
// -----------------------------------------------------------------------------
diff -ru extensions.orig/source/scanner/scanner.hxx extensions/source/scanner/scanner.hxx
--- extensions.orig/source/scanner/scanner.hxx 2010-07-12 20:17:35.000000000 +0100
+++ extensions/source/scanner/scanner.hxx 2010-07-13 09:27:57.000000000 +0100
@@ -73,7 +73,8 @@
vos::OMutex maProtector;
void* mpData;
- void DestroyData();
+ void AcquireData();
+ void ReleaseData();
public:
@@ -105,7 +106,7 @@
void Unlock() { maProtector.release(); }
void* GetData() const { return mpData; }
- void SetData( void* pData ) { DestroyData(); mpData = pData; }
+ void SetData( void* pData ) { ReleaseData(); mpData = pData; }
};
// -----------------------------------------------------------------------------
diff -ru extensions.orig/source/scanner/scanunx.cxx extensions/source/scanner/scanunx.cxx
--- extensions.orig/source/scanner/scanunx.cxx 2010-07-12 20:17:35.000000000 +0100
+++ extensions/source/scanner/scanunx.cxx 2010-07-13 10:16:41.000000000 +0100
@@ -31,6 +31,7 @@
#include <sanedlg.hxx>
#include <vos/thread.hxx>
#include <tools/list.hxx>
+#include <boost/shared_ptr.hpp>
#if OSL_DEBUG_LEVEL > 1
#include <stdio.h>
@@ -113,12 +114,41 @@
vos::OMutex m_aProtector;
ScanError m_nError;
bool m_bBusy;
+
+ SaneHolder() : m_nError(ScanError_ScanErrorNone), m_bBusy(false) {}
};
-DECLARE_LIST( SaneHolderList, SaneHolder* )
+namespace
+{
+ typedef std::vector< boost::shared_ptr<SaneHolder> > sanevec;
+ class allSanes
+ {
+ private:
+ int mnRefCount;
+ public:
+ sanevec m_aSanes;
+ allSanes() : mnRefCount(0) {}
+ void acquire();
+ void release();
+ };
+
+ void allSanes::acquire()
+ {
+ ++mnRefCount;
+ }
+
+ void allSanes::release()
+ {
+ // was unused, now because of i99835: "Scanning interface not SANE API
+ // compliant" destroy all SaneHolder to get Sane Dtor called
+ --mnRefCount;
+ if (!mnRefCount)
+ m_aSanes.clear();
+ }
-static SaneHolderList allSanes;
-static vos::OMutex aSaneProtector;
+ struct theSaneProtector : public rtl::Static<vos::OMutex, theSaneProtector> {};
+ struct theSanes : public rtl::Static<allSanes, theSanes> {};
+}
// -----------------
// - ScannerThread -
@@ -126,7 +156,7 @@
class ScannerThread : public vos::OThread
{
- SaneHolder* m_pHolder;
+ boost::shared_ptr<SaneHolder> m_pHolder;
REF( com::sun::star::lang::XEventListener ) m_xListener;
ScannerManager* m_pManager; // just for the disposing call
@@ -134,7 +164,7 @@
virtual void run();
virtual void onTerminated() { delete this; }
public:
- ScannerThread( SaneHolder* pHolder,
+ ScannerThread( boost::shared_ptr<SaneHolder> pHolder,
const REF( com::sun::star::lang::XEventListener )& listener,
ScannerManager* pManager );
virtual ~ScannerThread();
@@ -143,7 +173,7 @@
// -----------------------------------------------------------------------------
ScannerThread::ScannerThread(
- SaneHolder* pHolder,
+ boost::shared_ptr<SaneHolder> pHolder,
const REF( com::sun::star::lang::XEventListener )& listener,
ScannerManager* pManager )
: m_pHolder( pHolder ), m_xListener( listener ), m_pManager( pManager )
@@ -192,16 +222,16 @@
// - ScannerManager -
// ------------------
-void ScannerManager::DestroyData()
+void ScannerManager::AcquireData()
{
- // was unused, now because of i99835: "Scanning interface not SANE API compliant"
- // delete all SaneHolder to get Sane Dtor called
- int i;
- for ( i = allSanes.Count(); i > 0; i-- )
- {
- SaneHolder *pSaneHolder = allSanes.GetObject(i-1);
- if ( pSaneHolder ) delete pSaneHolder;
- }
+ vos::OGuard aGuard( theSaneProtector::get() );
+ theSanes::get().acquire();
+}
+
+void ScannerManager::ReleaseData()
+{
+ vos::OGuard aGuard( theSaneProtector::get() );
+ theSanes::get().release();
}
// -----------------------------------------------------------------------------
@@ -224,17 +254,14 @@
SEQ( ScannerContext ) ScannerManager::getAvailableScanners() throw()
{
- vos::OGuard aGuard( aSaneProtector );
+ vos::OGuard aGuard( theSaneProtector::get() );
+ sanevec &rSanes = theSanes::get().m_aSanes;
- if( ! allSanes.Count() )
+ if( rSanes.empty() )
{
- SaneHolder* pSaneHolder = new SaneHolder;
- pSaneHolder->m_nError = ScanError_ScanErrorNone;
- pSaneHolder->m_bBusy = false;
+ boost::shared_ptr<SaneHolder> pSaneHolder(new SaneHolder);
if( Sane::IsSane() )
- allSanes.Insert( pSaneHolder );
- else
- delete pSaneHolder;
+ rSanes.push_back( pSaneHolder );
}
if( Sane::IsSane() )
@@ -252,20 +279,21 @@
BOOL ScannerManager::configureScanner( ScannerContext& scanner_context ) throw( ScannerException )
{
- vos::OGuard aGuard( aSaneProtector );
+ vos::OGuard aGuard( theSaneProtector::get() );
+ sanevec &rSanes = theSanes::get().m_aSanes;
#if OSL_DEBUG_LEVEL > 1
fprintf( stderr, "ScannerManager::configureScanner\n" );
#endif
- if( scanner_context.InternalData < 0 || (ULONG)scanner_context.InternalData >= allSanes.Count() )
+ if( scanner_context.InternalData < 0 || (ULONG)scanner_context.InternalData >= rSanes.size() )
throw ScannerException(
::rtl::OUString::createFromAscii( "Scanner does not exist" ),
REF( XScannerManager )( this ),
ScanError_InvalidContext
);
- SaneHolder* pHolder = allSanes.GetObject( scanner_context.InternalData );
+ boost::shared_ptr<SaneHolder> pHolder = rSanes[scanner_context.InternalData];
if( pHolder->m_bBusy )
throw ScannerException(
::rtl::OUString::createFromAscii( "Scanner is busy" ),
@@ -286,19 +314,20 @@
void ScannerManager::startScan( const ScannerContext& scanner_context,
const REF( com::sun::star::lang::XEventListener )& listener ) throw( ScannerException )
{
- vos::OGuard aGuard( aSaneProtector );
+ vos::OGuard aGuard( theSaneProtector::get() );
+ sanevec &rSanes = theSanes::get().m_aSanes;
#if OSL_DEBUG_LEVEL > 1
fprintf( stderr, "ScannerManager::startScan\n" );
#endif
- if( scanner_context.InternalData < 0 || (ULONG)scanner_context.InternalData >= allSanes.Count() )
+ if( scanner_context.InternalData < 0 || (ULONG)scanner_context.InternalData >= rSanes.size() )
throw ScannerException(
::rtl::OUString::createFromAscii( "Scanner does not exist" ),
REF( XScannerManager )( this ),
ScanError_InvalidContext
);
- SaneHolder* pHolder = allSanes.GetObject( scanner_context.InternalData );
+ boost::shared_ptr<SaneHolder> pHolder = rSanes[scanner_context.InternalData];
if( pHolder->m_bBusy )
throw ScannerException(
::rtl::OUString::createFromAscii( "Scanner is busy" ),
@@ -315,16 +344,17 @@
ScanError ScannerManager::getError( const ScannerContext& scanner_context ) throw( ScannerException )
{
- vos::OGuard aGuard( aSaneProtector );
+ vos::OGuard aGuard( theSaneProtector::get() );
+ sanevec &rSanes = theSanes::get().m_aSanes;
- if( scanner_context.InternalData < 0 || (ULONG)scanner_context.InternalData >= allSanes.Count() )
+ if( scanner_context.InternalData < 0 || (ULONG)scanner_context.InternalData >= rSanes.size() )
throw ScannerException(
::rtl::OUString::createFromAscii( "Scanner does not exist" ),
REF( XScannerManager )( this ),
ScanError_InvalidContext
);
- SaneHolder* pHolder = allSanes.GetObject( scanner_context.InternalData );
+ boost::shared_ptr<SaneHolder> pHolder = rSanes[scanner_context.InternalData];
return pHolder->m_nError;
}
@@ -333,15 +363,16 @@
REF( AWT::XBitmap ) ScannerManager::getBitmap( const ScannerContext& scanner_context ) throw( ScannerException )
{
- vos::OGuard aGuard( aSaneProtector );
+ vos::OGuard aGuard( theSaneProtector::get() );
+ sanevec &rSanes = theSanes::get().m_aSanes;
- if( scanner_context.InternalData < 0 || (ULONG)scanner_context.InternalData >= allSanes.Count() )
+ if( scanner_context.InternalData < 0 || (ULONG)scanner_context.InternalData >= rSanes.size() )
throw ScannerException(
::rtl::OUString::createFromAscii( "Scanner does not exist" ),
REF( XScannerManager )( this ),
ScanError_InvalidContext
);
- SaneHolder* pHolder = allSanes.GetObject( scanner_context.InternalData );
+ boost::shared_ptr<SaneHolder> pHolder = rSanes[scanner_context.InternalData];
vos::OGuard aProtGuard( pHolder->m_aProtector );
diff -ru extensions.orig/source/scanner/scanwin.cxx extensions/source/scanner/scanwin.cxx
--- extensions.orig/source/scanner/scanwin.cxx 2010-07-12 20:17:35.000000000 +0100
+++ extensions/source/scanner/scanwin.cxx 2010-07-13 09:28:40.000000000 +0100
@@ -887,7 +887,11 @@
// - ScannerManager -
// ------------------
-void ScannerManager::DestroyData()
+void ScannerManager::AcquireData()
+{
+}
+
+void ScannerManager::ReleaseData()
{
if( mpData )
{
@@ -979,7 +983,7 @@
}
GlobalUnlock( hDIB );
- DestroyData();
+ ReleaseData();
}
return aRet;
@@ -1009,7 +1013,7 @@
if( rContext.InternalData != 0 || rContext.ScannerName != ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TWAIN" ) ) )
throw ScannerException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Scanner does not exist" ) ), xThis, ScanError_InvalidContext );
- DestroyData();
+ ReleaseData();
return aTwain.SelectSource( *this );
}
@@ -1025,7 +1029,7 @@
if( rContext.InternalData != 0 || rContext.ScannerName != ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TWAIN" ) ) )
throw ScannerException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Scanner does not exist" ) ), xThis, ScanError_InvalidContext );
- DestroyData();
+ ReleaseData();
aTwain.PerformTransfer( *this, rxListener );
}
openoffice.org-3.3.0.ooo74188.indiccursor.editeng.patch:
impedit2.cxx | 20 +++++++++++++++++---
1 file changed, 17 insertions(+), 3 deletions(-)
--- NEW FILE openoffice.org-3.3.0.ooo74188.indiccursor.editeng.patch ---
diff -r 03068afc23c6 svx/source/editeng/impedit2.cxx
--- a/editeng/source/editeng/impedit2.cxx Sun Apr 25 15:43:24 2010 +0100
+++ b/editeng/source/editeng/impedit2.cxx Mon Apr 26 15:08:39 2010 +0100
@@ -4213,13 +4213,27 @@
long nPosInPortion = pLine->GetCharPosArray().GetObject( nPos );
#else
// #i74188# (positioning the cursor after deleting components of combined indic characters)
+ sal_uInt16 nStartCalc = 0;
+ for (sal_uInt16 i = 0; i < nTextPortion; ++i)
+ {
+ TextPortion *pTextPortion = pParaPortion->GetTextPortions().GetObject( i );
+ nStartCalc += pTextPortion->GetLen();
+ }
+
SvxFont aTmpFont( pParaPortion->GetNode()->GetCharAttribs().GetDefFont() );
+
+ GetRefDevice()->Push( PUSH_ALL );
+ ImplInitLayoutMode( GetRefDevice(), GetEditDoc().GetPos(pParaPortion->GetNode()), 0xFFFF );
+ ImplInitDigitMode( GetRefDevice(), 0, 0, 0, aTmpFont.GetLanguage() );
+ GetRefDevice()->SetMapMode( MAP_100TH_MM );
+
SeekCursor( pParaPortion->GetNode(), nPos+1, aTmpFont );
aTmpFont.SetPhysFont( GetRefDevice() );
- ImplInitDigitMode( GetRefDevice(), 0, 0, 0, aTmpFont.GetLanguage() );
- String sSegment(*pParaPortion->GetNode(), pLine->GetStart(), nPos+1);
+ String sSegment(*pParaPortion->GetNode(), pLine->GetStart()+nStartCalc, nPos+1-nStartCalc);
long nPosInPortion = aTmpFont.QuickGetTextSize( GetRefDevice(),
- sSegment, 0, nPos+1, NULL ).Width();
+ sSegment, 0, nPos+1-nStartCalc, NULL ).Width();
+
+ GetRefDevice()->Pop();
#endif
if ( !pPortion->IsRightToLeft() )
openoffice.org-3.3.0.oooXXXXX.afms.buildtype.patch:
configure.in | 22 ++++++++++++++++++++++
lingucomponent/prj/build.lst | 2 +-
psprint_config/prj/build.lst | 2 +-
solenv/config/sooo330.ini | 2 +-
4 files changed, 25 insertions(+), 3 deletions(-)
--- NEW FILE openoffice.org-3.3.0.oooXXXXX.afms.buildtype.patch ---
diff -ru solenv.orig/config/sooo330.ini solenv/config/sooo330.ini
--- solenv.orig/config/sooo330.ini 2010-07-07 12:31:13.000000000 +0100
+++ solenv/config/sooo330.ini 2010-07-07 12:32:23.000000000 +0100
@@ -8,7 +8,7 @@
BIG_SVX TRUE
BMP_WRITES_FLAG TRUE
BUILD_SPECIAL TRUE
- BUILD_TYPE SO OOo EXT BINFILTER MORE_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL HYPHEN MYTHES JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM ODK MSFONTEXTRACT MATHMLDTD BOOST MDDS EXPAT CRASHREP BERKELEYDB LIBXSLT SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTBUILDER SDEXT SWEXT XPDF LUCENE REDLAND SAXON WRITER2LATEX NSS L10N GRAPHITE MYSQLCPPCONN MYSQLC CPPUNIT
+ BUILD_TYPE SO OOo EXT BINFILTER MORE_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL HYPHEN MYTHES JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM ODK MSFONTEXTRACT MATHMLDTD BOOST MDDS EXPAT CRASHREP BERKELEYDB LIBXSLT SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTBUILDER SDEXT SWEXT XPDF LUCENE REDLAND SAXON WRITER2LATEX NSS L10N GRAPHITE MYSQLCPPCONN MYSQLC CPPUNIT AFMS LIBTEXTCAT
common_build TRUE
COMMON_OUTDIR common
CONFIG_PROJECT config_office
diff -ru psprint_config.orig/prj/build.lst psprint_config/prj/build.lst
--- psprint_config.orig/prj/build.lst 2010-07-07 12:31:07.000000000 +0100
+++ psprint_config/prj/build.lst 2010-07-07 12:31:25.000000000 +0100
@@ -1,4 +1,4 @@
-pc psprint_config : soltools afms NULL
+pc psprint_config : soltools AFMS:afms NULL
pc psprint_config usr1 - all pc_mkout NULL
pc psprint_config\configuration nmake - u pc_conf NULL
pc psprint_config\configuration\ppds nmake - u pc_ppds NULL
--- configure.in.orig 2010-07-07 12:32:33.000000000 +0100
+++ configure.in 2010-07-07 12:33:27.000000000 +0100
@@ -546,6 +546,9 @@
AC_ARG_WITH(system-lpsolve,
[ --with-system-lpsolve Use lpsolve already on system
],,)
+AC_ARG_WITH(system-libtextcat,
+[ --with-system-libtextcat Use libtextcat already on system
+],,)
AC_ARG_WITH(system-cppunit,
[ --with-system-cppunit Use cppunit already on system
],,)
@@ -5143,6 +5146,24 @@
fi
AC_SUBST(SYSTEM_LPSOLVE)
+dnl ===================================================================
+dnl Checking for libtextcat
+dnl ===================================================================
+AC_MSG_CHECKING([which libtextcat to use])
+if test -n "$with_system_libtextcat"; then
+ AC_MSG_RESULT([external])
+ SYSTEM_LIBTEXTCAT=YES
+ AC_CHECK_HEADER(libtextcat/textcat.h, [],
+ [ AC_MSG_ERROR(libtextcat headers not found.)], [])
+ AC_CHECK_LIB(textcat, special_textcat_Init, ,
+ [ AC_MSG_ERROR(libtextcat library not found or not suitable.)], [])
+else
+ AC_MSG_RESULT([internal])
+ SYSTEM_LIBTEXTCAT=NO
+ BUILD_TYPE="$BUILD_TYPE LIBTEXTCAT"
+fi
+AC_SUBST(SYSTEM_LIBTEXTCAT)
+
dnl ***************************************
dnl testing libc version for Linux...
dnl ***************************************
@@ -6525,6 +6546,7 @@
AC_MSG_CHECKING([whether to include AFMs])
if test "$with_afms" != "no"; then
AC_MSG_RESULT([yes])
+ BUILD_TYPE="$BUILD_TYPE AFMS"
else
AC_MSG_RESULT([no])
WITHOUT_AFMS=YES
--- lingucomponent/prj/build.lst 2010-07-08 10:36:22.000000000 +0100
+++ lingucomponent/prj/build.lst 2010-07-08 10:36:32.000000000 +0100
@@ -1,4 +1,4 @@
-lc lingucomponent : linguistic libtextcat svl HYPHEN:hyphen HUNSPELL:hunspell MYTHES:mythes NULL
+lc lingucomponent : linguistic LIBTEXTCAT:libtextcat svl HYPHEN:hyphen HUNSPELL:hunspell MYTHES:mythes NULL
lc lingucomponent usr1 - all lc_mkout NULL
lc lingucomponent\inc nmake - all lc_inc NULL
lc lingucomponent\source\lingutil nmake - all lc_util lc_inc NULL
openoffice.org-3.3.0.oooXXXXX.offapi.weirdness.patch:
form/runtime/XFormController.idl | 4
ucb/Content.idl | 530 ---------------------------------------
2 files changed, 534 deletions(-)
--- NEW FILE openoffice.org-3.3.0.oooXXXXX.offapi.weirdness.patch ---
--- offapi/com/sun/star/form/runtime/XFormController.idl 2010-07-05 13:19:36.000000000 +0100
+++ offapi/com/sun/star/form/runtime/XFormController.idl 2010-07-07 10:00:25.000000000 +0100
@@ -102,10 +102,6 @@
<p>Alternatively, you can prevent the check on a per-control basis, using the
<member>DataAwareControlModel::InputRequired</member> property of a single control model.</p>
- <p>If a control which the controller is responsible for supports the <type scope="com::sun::star::frame">XDispatchProviderInterception</type>
- interface, the controller registers a dispatch interceptor. Then, the control can try to delegate part of its
- functionality to the controller by querying the dispatch interceptor for it.</p>
-
<p>Below, there's a list of URLs which have a defined meaning - if an implementation supports one of them,
there must be a guaranteed semantices. However, concrete implementations may support an arbitrary sub or super
set of these URLs.</p>
--- offapi/com/sun/star/ucb/Content.idl 2010-07-05 13:19:36.000000000 +0100
+++ offapi/com/sun/star/ucb/Content.idl 2010-07-07 10:08:12.000000000 +0100
@@ -110,536 +110,6 @@
*/
interface com::sun::star::lang::XComponent;
- //-------------------------------------------------------------------------
- /** enables the caller to let the content execute commands.
-
- <p>It is strongly recommended that any implementation supports the
- improved <type>XCommandProcessor2</type> interface.</p>
-
- <p>Typical commands are "open", "delete", "getPropertyValues" and
- "setPropertyValues". Each content must support a set of standard
- commands and properties. Also there is a set of predefined optionally
- commands and properties. A content may define additional commands and
- properties. </p>
-
- <p>This interface is required. </p>
-
- <pre>
- =======================================================================
- Commands:
- =======================================================================
-
- [return type]
- [command name]
- [parameter type and name]
-
- -----------------------------------------------------------------------
- Mandatory commands:
- -----------------------------------------------------------------------
-
- // This command obtains an interface which allows to query
- // information on commands supported by a content.
- <type>XCommandInfo</type>
- getCommandInfo
- void
-
- // This command obtains an interface which allows to query
- // information on properties supported by a content.
- <type scope="com::sun::star::beans">XPropertySetInfo</type>
- getPropertySetInfo
- void
-
- // This command obtains property values from the content.
- // Note: The execution will not be aborted, if there are properties
- // requested, that are unknown to the content! The returned
- // row object must contain a NULL value in the corresponding
- // column instead.
- <type scope="com::sun::star::sdbc">XRow</type>
- getPropertyValues
- sequence< <type scope="com::sun::star::beans">Property</type> > aProps
-
- // This command sets property values of the content.
- // Note that setPropertyValues does not throw an exception in the case
- // that one or more of the requested property values cannot be set! The
- // implementation should set as much property values as possible. This
- // command returns a sequence< any > which has exactly the same number
- // of elements like the number of properties to set. Every sequence
- // element contains the status for a property. The first sequence
- // elements corresponds to the first element in the sequence of
- // <type scope="com::sun::star::beans">PropertyValue</type> passed as
- // command argument and so on. The exceptions will never be passed to
- // an Interaction Handler.
- //
- // An any containing:
- //
- // - No value indicates, that the property value was set successfully.
- // - <type scope="com::sun::star::beans">UnknownPropertyException</type>
- // indicates, that the property is not known to the content
- // implementation.
- // - <type scope="com::sun::star::beans">IllegalTypeException</type>
- // indicates, that the data type of the property value is not
- // acceptable.
- // - <type scope="com::sun::star::lang">IllegalAccessException</type>
- // indicates, that the property is constant
- // (<member scope="com::sun::star::beans">PropertyAttribute::READONLY</member>
- // is set).
- // - <type scope="com::sun::star::lang">IllegalArgumentException</type>
- // indicates, that the property value is not acceptable. For instance,
- // setting an empty title may be illegal.
- // - Any other execption derived from <type scope="com::sun::star::uno">Exception</type>
- // indicates, that the value was not set successfully. For example,
- // this can be a <type>InteractiveAugmentedIOException</type>
- // transporting the error code <member>IOErrorCode::ACCESS_DENIED</member>.
- //
- // If the value to set is equal to the current value, no exception must
- // be added to the returned sequence
- sequence< any >
- setPropertyValues
- sequence< <type scope="com::sun::star::beans">PropertyValue</type> > aValues
-
- -----------------------------------------------------------------------
- Optional commands:
- -----------------------------------------------------------------------
-
- // For folder objects, this command will return an implementation
- // of service <type>DynamicResultSet</type>.
- //
- // The <type>OpenCommandArgument2</type> members must be filled as follows:
- //
- // Mode : ALL or FOLDERS or DOCUMENTS. The implementation
- // of the open command MUST support all these modes!
- // Priority : can be set, but implementation may ignore the value
- // Sink : empty( ignored )
- // Properties : The properties for that the result set shall
- // contain the property values. The order of the
- // sequence is the same as the order of result set
- // columns. First element of sequence will be row
- // number one, second will be row number two, ...
- // SortingInfo : contains sort criteria, if result set shall
- // be sorted, otherwise it can be left empty.
- //
- // The exceution must be aborted by the implementation of this command
- // (by throwing a <type>CommandAbortedException</type>), if an
- // unsupported mode is requested.
- <type>XDynamicResultSet</type>
- <B>open</B>
- <type>OpenCommandArgument2</type> aOpenCommandArg
-
- // For non-folder objects, the <type>OpenCommandArgument2</type> struct
- // will be prefilled with a data sink object, which will be filled
- // with the content data.
- //
- // The <type>OpenCommandArgument2</type> members must be filled as follows:
- //
- // Mode : DOCUMENT or DOCUMENT_SHARE_DENY_NONE or
- // DOCUMENT_SHARE_DENY_WRITE. Support for DOCUMENT
- // is mandatory, all others are optional.
- // Priority : can be set, but implementation may ignore the value
- // Sink : a sink, where the implementation can put the
- // document data into.
- // Properties : empty ( ignored )
- // SortingInfo : empty ( ignored )
- //
- // The exceution must be aborted by the implementation of this command
- // (by throwing a <type>CommandAbortedException</type>), if an
- // unsupported mode is requested.
- void
- <B>open</B>
- <type>OpenCommandArgument2</type> aOpenCommandArg
-
- // This command triggers an update operation on a content. For example,
- // when "updating" a POP3-Inbox, the content for that box will get
- // and store all new objects on the appropriate server. The inserted
- // contents will be notified by calling
- // <member>XContentEventListener::contentEvent</member>.
- void
- <B>update</B>
- <type>OpenCommandArgument2</type> aOpenCommandArg
-
- // This command triggers a synchronization operation between locally
- // cached data and remote server's data. For example, when
- // "synchronizing" a POP3-Inbox the content for that box will get and
- // store all new objects and destroy all cached data for objects no
- // longer existing on the server. The inserted/deleted contents will
- // be notified by calling
- // <member>XContent::contentEvent</member>.
- void
- <B>synchronize</B>
- <type>OpenCommandArgument2</type> aOpenCommandArg
-
- // This command closes an object.
- void
- <B>close</B>
- void
-
- // This command deletes an object. If <TRUE/> is passed as parameter,
- // the object will be destroyed physically. Otherwise it will be put
- // into trash can, if such a service is available and the object to
- // be deleted supports the command "undelete".
- // On successful completion of this command, the deleted content
- // must propagate its deletion by notifying a <type>ContentEvent</type>
- // - <member>ContentAction::DELETED</member>. Additionally, the contents
- // parent must notify a <type>ContentEvent</type>
- // - <member>ContentAction::REMOVED</member>
- void
- <B>delete</B>
- boolean bDeletePhysically
-
- // This command restores an object previously deleted into trash. It
- // must be supported by objects which claim to be undeletable, but
- // should never be called directly.
- void
- <B>undelete</B>
- void
-
- // (1) This command inserts a new content. It commits the process of
- // creating a new content via executing the command "createNewContent"
- // and initializing it via setting properties, afterwards.
- // The command is not called on the content which created the new
- // content, because the new object already knows where it is to be
- // inserted (i.e. Calling createNewContent with the content type for a
- // message on a News Group creates a content which internally belongs
- // to the Outbox. Calling "insert" on that message will result in
- // posting the article to the appropriate News Group). Not calling
- // "insert" for the new content, i.e. because the user cancels writing
- // a new message, simply discards the new object. No extra call to
- // "delete" is necessary.
- // On successful completion of this command, the parent of the inserted
- // content must propagate the change by notifying a
- // <type>ContentEvent</type> - <member>ContentAction::INSERTED</member>.
- //
- // (2) Additionally this command can be called at any time to overwrite
- // the data of an existing content.
- void
- <B>insert</B>
- <type>InsertCommandArgument</type> aInsertCommandArg
-
- // This command searches for subcontents of a content matching the
- // given search criteria. The command will return an implemenation
- // of service <type>DynamicResultSet</type>.
- <type>XDynamicResultSet</type>
- <B>search</B>
- <type>SearchCommandArgument</type> aSearchCommandArg
-
- // <b>Important note:</b> A client that wants to transfer data should
- // not execute this command, but it should execute the command
- // "globalTransfer" at the <type>UniversalContentBroker</type>.
- // This command is able to transfer all kind of content
- // supported by that UCB.
- //
- // This command transfers (copies/moves) an object from one location
- // to another. It must be executed at the folder content representing
- // the destination of the transfer operation. Note that the
- // implementation need not(!) be able to handle any type of contents.
- // Generally, there are good chances that a transfer of a content will
- // succeed, if source and target folder have the same URL scheme.
- // But there is no guaranty for that. For instance, moving a message
- // from a folder on IMAP server A to a folder on IMAP server B may
- // fail, because the transfer command can't be implemented efficiently
- // for this scenario, because it is not directly supported by the IMAP
- // protocol. On the other hand, moving a message from one folder to
- // another folder on the same IMAP server should work, because it can
- // be implemeted efficiently. If an implementation is not able to
- // handle a given source URL, it should indicate this by issuing a
- // <type>InteractiveBadTransferURLException</type> interaction request.
- // Source and target folder may be the same when doing a move operation.
- //
- // Transfers without the transfer command can be done as follows:
- //
- // 1) Create a new content at the target folder
- // --> targetContent = target.execute( "createNewContent", type )
- // 2) Transfer data from source to target content
- // --> props = sourceContent.execute( "getPropertyValues", ... )
- // --> dataStream = sourceContent.execute( "open", ... )
- // --> targetContent.execute( "setPropertyValues", props )
- // 3) Insert ( commit ) the new content
- // --> targetContent.execute( "insert", dataStream )
- // 4) For move operations only: destroy the source content
- // sourceContent.execute( "delete", ... )
- //
- // This mechanism should work for all transfer operations, but generally
- // it's less efficient than the transfer command.
- void
- <B>transfer</B>
- <type>TransferInfo</type> aTransferInfo
-
- // This command obtains an exlusive write lock for the resource. The
- // lock is active until command "unlock" is executed or the OOo
- // session that obtained the lock ends or until the lock is released by
- // a third party (e.g. a system administrator).
- void
- <B>lock</B>
- void
- Exceptions: <type>InteractiveLockingLockedException</type>
- <type>InteractiveLockingLockExpiredException</type>
-
- // This command removes a lock obtained by executing the command "lock"
- // from the resource.
- void
- <B>unlock</B>
- void
- Exceptions: <type>InteractiveLockingNotLockedException</type>
- <type>InteractiveLockingLockExpiredException</type>
-
- // Note that <type>InteractiveLockingLockExpiredException</type> might
- // be raised by any command that requires a previously obtained lock.
-
- // This command creates a new non-persistent content of a given type.
- //
- // <p>Creation of a new (persistent) content:
- // <ol>
- // <li>creatabletypes = obtain "CreatableContentsInfo" property<br>
- // from creator
- // <li>choose a suitable type from creatabletypes
- // <li>newObject = execute command "createNewContent(type)" at<br>
- // creator
- // <li>initialize the new object (i.e. newObject.Property1 = ...)
- // <li>execute command "insert" at new content. This command
- // commits the data and makes the new content persistent.
- // </ol>
- //
- // This command must be supported by every Content that supports the
- // property "CreatableContentsInfo" if the returned property value
- // contains a non-empty sequence of creatable types.
- //
- // Note: This command is part of the replacement for the deprecated
- // interface <type>XContentCreator</type>.
- <type>XContent</type> >
- <B>createNewContent</B>
- <type>ContentInfo<type> contentinfo
-
- =======================================================================
- Properties:
- =======================================================================
-
- -----------------------------------------------------------------------
- Mandatory properties:
- -----------------------------------------------------------------------
-
- // contains a unique(!) type string for the content ( i.e.
- // "application/vnd.sun.star.hierarchy-link" ). This property is always
- // read-only. It does not contain the media type ( MIME types ) of the
- // content. Media types may be provided through the optional property
- // "MediaType".
- // The value of this property should match the information on creatable
- // contents given by UCB contents that implement the property
- // "CreatableContentsInfo".
- string ContentType
-
- // indicates, whether a content can contain other contents.
- boolean IsFolder
-
- // indicates, whether a content is a document. This means, the
- // content can dump itself into a data sink.
- boolean IsDocument
-
- // contains the title of an object (e.g. the subject of a message).
- string Title;
-
- -----------------------------------------------------------------------
- Optional properties:
- -----------------------------------------------------------------------
-
- // contains the interval for automatic updates of an object.
- // It is specified in seconds.
- long AutoUpdateInterval
-
- // contains the maximum number of network connections
- // allowed for one (internet) protocol at a time. (e.g. The HTTP
- // cache can be configured to use a maximum for the number of
- // connections used for browsing.)
- short ConnectionLimit
-
- // contains the current connection mode for the object.
- // (see <type>ConnectionMode</type>)
- short ConnectionMode
-
- // contains the date and time the object was created.
- <type scope"com::sun::star::util">DateTime</type> DateCreated
-
- // contains the date and time the object was last modified.
- <type scope"com::sun::star::util">DateTime</type> DateModified
-
- // contains the count of documents of a folder.
- long DocumentCount;
-
- // contains the count of marked documents within a folder.
- long DocumentCountMarked
-
- // contains a sequence of documemt header fields (i.e. header
- // fields of a MIME-message, or the document info of an
- // office document ). For some standard header fields there
- // are predefined separate properties, like "MessageTo".
- sequence< <type>DocumentHeaderField</type> > DocumentHeader
-
- // contains information about the way a folder stores the
- // contents of (remote) documents.
- <type>DocumentStoreMode</type> DocumentStoreMode
-
- // contains the count of subfolders of a folder.
- long FolderCount
-
- // contains the free space left on a storage device. It is
- specified in bytes.
- hyper FreeSpace
-
- // indicates whether a content has subcontents, which are documents.
- boolean HasDocuments
-
- // indicates whether a content has subcontents, which are folders.
- boolean HasFolders
-
- // indicates whether a content is "marked".
- boolean IsMarked
-
- // indicates whether a content has been "read".
- boolean IsRead;
-
- // indicates whether a content is read-only.
- boolean IsReadOnly
-
- // indicates whether a content is subscribed.
- boolean IsSubscribed
-
- // indicates whether the feature to store contents depending on
- // their age is active.
- boolean IsTimeLimitedStore;
-
- // indicates whether (sub)contents shall be automatically updated
- // everytime a (folder) content is opened. This property may be
- // used to control whether a folder content should read data only
- // from local cache when it is opened, or whether it should connect
- // to a server to obtain latest data.
- boolean UpdateOnOpen
-
- // contains the keywords of a document (e.g. the value
- // of the "keywords" header field of a news article).
- string Keywords
-
- // contains the media type ( MIME type ) of a content. It is highly
- // recommended to support this property if the content's implementation
- // can obtain the media type natively from its data source ( i.e.
- // HTTP servers provide media types for all their documents ).
- string MediaType
-
- // contains the BCC (blind carbon copy) receiver(s) of a message.
- string MessageBCC
-
- // contains the CC (carbon copy) receiver(s) of a message.
- string MessageCC
-
- // contains (the address of) the sender of a message.
- string MessageFrom
-
- // contains the ID of a message.
- string MessageId
-
- // contains the "In-Reply-To" field of a message.
- string MessageInReplyTo
-
- // contains the "Reply-To" field of a message.
- string MessageReplyTo
-
- // contains the recipient(s) of a message.
- string MessageTo
-
- // contains the name(s) of the newsgroup(s) into which a message
- // was posted.
- string NewsGroups
-
- // contains a password (e.g. needed to access a POP3-Server).
- string Password
-
- // contains a priority (i.e. of a message).
- <type>Priority</type> Priority
-
- // contains the "References" field of a news article.
- string References
-
- // contains the rules set for a content.
- <type>RuleSet</type> Rules
-
- // contains the count of seen/read subcontents of a folder content.
- long SeenCount
-
- // contains the base directory to use on a server. (e.g. Setting
- // the server base of an FTP-Account to "/pub/incoming"
- // will result in showing contents from that directory and not from
- // server's root directory)
- string ServerBase
-
- // contains a server name (e.g. The name of the server to use for
- // a POP3-Account).
- string ServerName
-
- // contains a numeric server port.
- short ServerPort
-
- // contains the size (usually in bytes) of an object.
- hyper Size
-
- // contains a size limit for an object. (e.g. One may specify the
- // maximum size of the HTTP-Cache)
- hyper SizeLimit
-
- // contains the count of subscribed contents of a folder.
- long SubscribedCount
-
- // contains the policy to use when synchronizing two objects.
- <type>SynchronizePolicy</type> SynchronizePolicy
-
- // contains information about the target frame to use when displaying
- // an object.
-
- <p>The value is a string containing three tokens, separated by ";"
- (A semicolon):<br/>
- <dl>
- <dt>1st token
- </dt><dd>Behavior on "select" ( single click )
- </dd><dt>2nd token
- </dt><dd>Behavior on "open" ( double click )
- </dd><dt>3rd token
- </dt><dd>Behavior on "open in new task" ( double click + CTRL key )
- </dd></dl>
- </p>
- <p> Each token may contain the following values:<br/>
- <dl>
- <dt>"_beamer"
- </dt><dd>Show in "Beamer"
- </dd><dt>"_top"
- </dt><dd>Show in current frame (replaces old)
- </dd><dt>"_blank"
- </dt><dd>Show in new task
- </dd></dl>
- </p>
- string TargetFrames
-
- // for contents that are links to other contents, contains the URL of
- // the target content
- string TargetURL
-
- // contains the value to use if the property "IsTimeLimitedStore" is set.
- short TimeLimitStore;
-
- // contains a user name. (e.g. the user name needed to access a
- // POP3-Account)
- string UserName
-
- // describes a verification policy.
- <type>VerificationMode</type> VerificationMode
-
- // contains the types of Contents a Content object can create via
- // command "createNewContent".
- //
- // If the property value can be a non-empty sequence, the Content must
- // also support command "createNewContent".
- //
- // Note: This property is part of the replacement for the deprecated
- // interface <type>XContentCreator</type>.
- sequence <type>ContentInfo</type> CreatableContentsInfo
-
- </pre>
- */
interface com::sun::star::ucb::XCommandProcessor;
//-------------------------------------------------------------------------
workspace.native317.patch:
configure.in | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- NEW FILE workspace.native317.patch ---
diff -r 85e7cfbbb08a -r 64d95e6661a5 configure.in
--- a/configure.in Tue Jun 29 15:31:44 2010 +0200
+++ b/configure.in Wed Jun 30 17:43:18 2010 +0200
@@ -3393,15 +3393,16 @@
fi
fi
AC_SUBST(BUILD_EPM)
- AC_SUBST(PKGFORMAT)
AC_SUBST(RPM)
AC_SUBST(DPKG)
AC_SUBST(PKGMK)
else
AC_MSG_RESULT([no])
EPM=NO
+ PKGFORMAT=native
fi
AC_SUBST(EPM)
+AC_SUBST(PKGFORMAT)
dnl ===================================================================
dnl Check for gperf
workspace.sb126.patch:
lbnames.h | 45 ---------------------------------------------
1 file changed, 45 deletions(-)
--- NEW FILE workspace.sb126.patch ---
# HG changeset patch
# User sb at openoffice.org
# Date 1277284020 -7200
# Node ID e7381920688b8c04ca4f007cec13eea6df6786a0
# Parent daa62d717a7a4bfb26d40f39b942ed9f8a0f9141
sb126: #i109853# no need to set CPPU_ENV in cppu/inc/uno/lbnames.h
diff -r daa62d717a7a -r e7381920688b cppu/inc/uno/lbnames.h
--- a/cppu/inc/uno/lbnames.h Wed Jun 23 10:45:22 2010 +0200
+++ b/cppu/inc/uno/lbnames.h Wed Jun 23 11:07:00 2010 +0200
@@ -29,49 +29,6 @@
#ifdef __cplusplus
-/* environment type names for supported compilers */
-#if defined (_MSC_VER)
-#if (_MSC_VER < 1000)
-#error "ms visual c++ version must be at least 4.2"
-#elif (_MSC_VER < 1100) // MSVC 4.x
-#pragma warning( disable: 4290 )
-#define TMP_CPPU_ENV msci
-#elif (_MSC_VER < 1600) // MSVC 5-9
-#define TMP_CPPU_ENV msci
-#else
-#error "ms visual c++ version must be between 4.2 and 9.x"
-#endif /* (_MSC_VER < 1000) */
-/* sunpro cc */
-#elif defined (__SUNPRO_CC)
-#if ((__SUNPRO_CC >= 0x5000 && __SUNPRO_CC < 0x6000) || (__SUNPRO_CC >= 0x500 && __SUNPRO_CC < 0x600))
-#define TMP_CPPU_ENV sunpro5
-#elif
-#error "sunpro cc version must be 5.x"
-provoking error here, because PP ignores #error
-#endif /* defined (__SUNPRO_CC) */
-/* g++ 2.x, 3.0 */
-#elif defined (__GNUC__)
-#if (__GNUC__ == 2 && __GNUC_MINOR__ == 91)
-#define TMP_CPPU_ENV gcc2
-#elif (__GNUC__ == 2 && __GNUC_MINOR__ == 95)
-#define TMP_CPPU_ENV gcc2
-#elif (__GNUC__ == 2)
-#error "Tested gcc 2 versions are 2.91 and 2.95. Patch uno/lbnames.h to try your gcc 2 version."
-#elif (__GNUC__ == 3 && __GNUC_MINOR__ <= 4)
-#define __CPPU_ENV gcc3
-#elif (__GNUC__ == 4 && __GNUC_MINOR__ <= 4)
-#define __CPPU_ENV gcc3
-#elif (__GNUC__ == 3)
-#error "Tested gcc 3 version is <= 3.4. Patch uno/lbnames.h to try your gcc 3 version."
-#else
-#error "Supported gcc majors are 2 , 3 and 4 <= 4.4. Unsupported gcc major version."
-#endif /* defined (__GNUC__) */
-#endif /* defined (_MSC_VER) */
-
-#if (! defined (CPPU_ENV) && defined (TMP_CPPU_ENV))
-#define CPPU_ENV TMP_CPPU_ENV
-#endif
-
#ifdef CPPU_ENV
#define CPPU_STRINGIFY_EX( x ) #x
@@ -87,8 +44,6 @@
#endif /* CPPU_ENV */
-#undef TMP_CPPU_ENV
-
#endif /* __cplusplus */
/** Environment type name for binary C UNO. */
workspace.sb128.patch:
smoketest.cxx | 44 +++++++++++++++++++++++++++++++++++++++-----
1 file changed, 39 insertions(+), 5 deletions(-)
Index: workspace.sb128.patch
===================================================================
RCS file: workspace.sb128.patch
diff -N workspace.sb128.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ workspace.sb128.patch 13 Jul 2010 10:16:55 -0000 1.3
@@ -0,0 +1,91 @@
+
+# HG changeset patch
+# User sb at openoffice.org
+# Date 1278483636 -7200
+# Node ID 5dc61b93c5ef2ed21e3d9532325b35a70fef18da
+# Parent cb53cd9871016271ae80b7157a276f751daf95f5
+sb128: #i112986# shifted relevant smoketest work to OOo main thread to work around potential deadlocks
+
+diff -r cb53cd987101 -r 5dc61b93c5ef smoketestoo_native/smoketest.cxx
+--- a/smoketestoo_native/smoketest.cxx Mon Jul 05 14:19:36 2010 +0200
++++ b/smoketestoo_native/smoketest.cxx Wed Jul 07 08:20:36 2010 +0200
+@@ -28,6 +28,8 @@
+ #include "sal/config.h"
+
+ #include "boost/noncopyable.hpp"
++#include "com/sun/star/awt/XCallback.hpp"
++#include "com/sun/star/awt/XRequestCallback.hpp"
+ #include "com/sun/star/beans/PropertyState.hpp"
+ #include "com/sun/star/beans/PropertyValue.hpp"
+ #include "com/sun/star/document/MacroExecMode.hpp"
+@@ -40,6 +42,7 @@
+ #include "com/sun/star/frame/XModel.hpp"
+ #include "com/sun/star/frame/XNotifyingDispatch.hpp"
+ #include "com/sun/star/lang/EventObject.hpp"
++#include "com/sun/star/uno/Any.hxx"
+ #include "com/sun/star/uno/Reference.hxx"
+ #include "com/sun/star/uno/RuntimeException.hpp"
+ #include "com/sun/star/uno/Sequence.hxx"
+@@ -94,6 +97,29 @@
+ result_->condition.set();
+ }
+
++class Callback: public cppu::WeakImplHelper1< css::awt::XCallback > {
++public:
++ Callback(
++ css::uno::Reference< css::frame::XNotifyingDispatch > const & dispatch,
++ css::util::URL const & url,
++ css::uno::Sequence< css::beans::PropertyValue > const & arguments,
++ css::uno::Reference< css::frame::XDispatchResultListener > const &
++ listener):
++ dispatch_(dispatch), url_(url), arguments_(arguments),
++ listener_(listener)
++ { OSL_ASSERT(dispatch.is()); }
++
++private:
++ virtual void SAL_CALL notify(css::uno::Any const &)
++ throw (css::uno::RuntimeException)
++ { dispatch_->dispatchWithNotification(url_, arguments_, listener_); }
++
++ css::uno::Reference< css::frame::XNotifyingDispatch > dispatch_;
++ css::util::URL url_;
++ css::uno::Sequence< css::beans::PropertyValue > arguments_;
++ css::uno::Reference< css::frame::XDispatchResultListener > listener_;
++};
++
+ class Test: public CppUnit::TestFixture {
+ public:
+ virtual void setUp();
+@@ -135,8 +161,7 @@
+ RTL_CONSTASCII_USTRINGPARAM(
+ "vnd.sun.star.script:Standard.Global.StartTestWithDefaultOptions?"
+ "language=Basic&location=document"));
+- Result result;
+- css::uno::Reference< css::frame::XNotifyingDispatch >(
++ css::uno::Reference< css::frame::XNotifyingDispatch > disp(
+ css::uno::Reference< css::frame::XDispatchProvider >(
+ css::uno::Reference< css::frame::XController >(
+ css::uno::Reference< css::frame::XModel >(
+@@ -154,9 +179,18 @@
+ css::uno::UNO_SET_THROW)->getFrame(),
+ css::uno::UNO_QUERY_THROW)->queryDispatch(
+ url, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_self")), 0),
+- css::uno::UNO_QUERY_THROW)->dispatchWithNotification(
+- url, css::uno::Sequence< css::beans::PropertyValue >(),
+- new Listener(&result));
++ css::uno::UNO_QUERY_THROW);
++ Result result;
++ // Shifted to main thread to work around potential deadlocks (i112867):
++ css::uno::Reference< css::awt::XRequestCallback >(
++ connection_.getFactory()->createInstance( //TODO: AsyncCallback ctor
++ rtl::OUString(
++ RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.AsyncCallback"))),
++ css::uno::UNO_QUERY_THROW)->addCallback(
++ new Callback(
++ disp, url, css::uno::Sequence< css::beans::PropertyValue >(),
++ new Listener(&result)),
++ css::uno::Any());
+ result.condition.wait();
+ CPPUNIT_ASSERT(result.success);
+ CPPUNIT_ASSERT_EQUAL(rtl::OUString(), result.result);
+
ooo-build.ooo2497.filter.svg.patch:
OOO310_m6/filter/source/config/fragments/fcfg_drawgraphics.mk | 1
OOO310_m6/filter/source/config/fragments/fcfg_internalgraphics.mk | 1
OOO310_m6/filter/source/config/fragments/filters/SVG___Scalable_Vector_Graphics.xcu | 13
OOO310_m6/filter/source/config/fragments/internalgraphicfilters/svg_Import.xcu | 10
OOO310_m6/filter/source/config/fragments/types/svg_Scalable_Vector_Graphics.xcu | 6
OOO310_m6/filter/source/svg/b2dellipse.cxx | 139
OOO310_m6/filter/source/svg/b2dellipse.hxx | 77
OOO310_m6/filter/source/svg/gentoken.pl | 58
OOO310_m6/filter/source/svg/gfxtypes.hxx | 343 +
OOO310_m6/filter/source/svg/makefile.mk | 49
OOO310_m6/filter/source/svg/parserfragments.cxx | 600 ++
OOO310_m6/filter/source/svg/parserfragments.hxx | 74
OOO310_m6/filter/source/svg/spirit_supplements.hxx | 115
OOO310_m6/filter/source/svg/svgfilter.cxx | 109
OOO310_m6/filter/source/svg/svgfilter.hxx | 46
OOO310_m6/filter/source/svg/svgimport.cxx | 197
OOO310_m6/filter/source/svg/svgreader.cxx | 2773 ++++++++++
OOO310_m6/filter/source/svg/svgreader.hxx | 43
OOO310_m6/filter/source/svg/test/makefile.mk | 115
OOO310_m6/filter/source/svg/test/odfserializer.cxx | 140
OOO310_m6/filter/source/svg/test/odfserializer.hxx | 31
OOO310_m6/filter/source/svg/test/parsertest.cxx | 210
OOO310_m6/filter/source/svg/test/svg2odf.cxx | 124
OOO310_m6/filter/source/svg/tokenmap.cxx | 62
OOO310_m6/filter/source/svg/tokenmap.hxx | 32
OOO310_m6/filter/source/svg/tokens.txt | 403 +
OOO310_m6/filter/source/svg/units.cxx | 99
OOO310_m6/filter/source/svg/units.hxx | 60
filter/source/svg/units.cxx | 27
openoffice.org/filter/source/svg/exports.map | 10
30 files changed, 5712 insertions(+), 255 deletions(-)
Index: ooo-build.ooo2497.filter.svg.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/ooo-build.ooo2497.filter.svg.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- ooo-build.ooo2497.filter.svg.patch 8 Mar 2010 12:49:39 -0000 1.6
+++ ooo-build.ooo2497.filter.svg.patch 13 Jul 2010 10:16:51 -0000 1.7
@@ -292,23 +292,19 @@ diff -ruN OOO310_m6.orig/filter/source/s
+//////////////////////////////////////////////////////////////////////////////
+
+#endif /* _BASEGFX_B2DELLIPSE_HXX */
-diff -ruN OOO310_m6.orig/filter/source/svg/exports.map OOO310_m6/filter/source/svg/exports.map
---- OOO310_m6.orig/filter/source/svg/exports.map 2009-03-17 14:58:30.000000000 +0000
-+++ OOO310_m6/filter/source/svg/exports.map 2009-03-17 14:59:37.000000000 +0000
-@@ -1,9 +1,10 @@
--PDFFILTER_1_0 {
-+SVGFILTER_1_0 {
- global:
- component_getImplementationEnvironment;
- component_getFactory;
- component_writeInfo;
+--- /dev/null
++++ openoffice.org/filter/source/svg/exports.map
+@@ -0,0 +1,10 @@
++UDK_3_0_0 {
++ global:
++ component_getImplementationEnvironment;
++ component_getFactory;
++ component_writeInfo;
+ GraphicImport;
-
- local:
- *;
--};
-\ No newline at end of file
-+};
++
++ local:
++ *;
++};
diff -ruN OOO310_m6.orig/filter/source/svg/gentoken.pl OOO310_m6/filter/source/svg/gentoken.pl
--- OOO310_m6.orig/filter/source/svg/gentoken.pl 1970-01-01 01:00:00.000000000 +0100
+++ OOO310_m6/filter/source/svg/gentoken.pl 2009-03-17 14:59:37.000000000 +0000
@@ -721,7 +717,7 @@ diff -ruN OOO310_m6.orig/filter/source/s
diff -ruN OOO310_m6.orig/filter/source/svg/makefile.mk OOO310_m6/filter/source/svg/makefile.mk
--- OOO310_m6.orig/filter/source/svg/makefile.mk 2009-03-17 14:58:30.000000000 +0000
+++ OOO310_m6/filter/source/svg/makefile.mk 2009-03-17 14:59:37.000000000 +0000
-@@ -30,25 +30,35 @@
+@@ -26,25 +26,35 @@
#*************************************************************************
PRJ=..$/..
@@ -764,18 +760,18 @@ diff -ruN OOO310_m6.orig/filter/source/s
.ENDIF
# --- Library -----------------------------------
-@@ -58,19 +68,17 @@
+@@ -54,26 +64,24 @@
SHL1STDLIBS=\
+ $(EDITENGLIB) \
$(SVXCORELIB) \
++ $(BASEGFXLIB) \
$(XMLOFFLIB) \
-- $(GOODIESLIB) \
-+ $(SVTOOLLIB) \
-+ $(BASEGFXLIB) \
+ $(SVTOOLLIB) \
$(VCLLIB) \
$(UNOTOOLSLIB) \
$(TOOLSLIB) \
$(COMPHELPERLIB) \
-+ $(SVTOOLLIB) \
++ $(SVTOOLLIB) \
$(CPPUHELPERLIB) \
$(CPPULIB) \
- $(SALLIB)
@@ -784,12 +780,19 @@ diff -ruN OOO310_m6.orig/filter/source/s
-SHL1STDLIBS+=\
- $(JVMACCESSLIB)
-.ENDIF
-+ $(SALLIB) \
-+ $(LIBXML)
++ $(SALLIB) \
++ $(LIBXML)
SHL1DEPN=
-@@ -84,3 +92,16 @@
+ SHL1IMPLIB= i$(SHL1TARGET)
+ SHL1LIBS= $(SLB)$/$(TARGET).lib
+-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
++SHL1VERSIONMAP=exports.map
+ SHL1DEF= $(MISC)$/$(SHL1TARGET).def
+
+ DEF1NAME=$(SHL1TARGET)
+@@ -81,3 +89,16 @@
# --- Targets ----------------------------------
.INCLUDE : target.mk
@@ -2153,7 +2156,7 @@ diff -ruN OOO310_m6.orig/filter/source/s
+#include <vcl/graph.hxx>
+#include <vcl/virdev.hxx>
+#include <vcl/gradient.hxx>
-+#include <svx/impgrf.hxx>
++#include <svtools/filter.hxx>
+#include <tools/zcodec.hxx>
+
+#include <boost/bind.hpp>
@@ -4387,7 +4390,7 @@ diff -ruN OOO310_m6.orig/filter/source/s
+ STREAM_READ);
+ USHORT nFormat = GRFILTER_FORMAT_DONTKNOW;
+ USHORT pDeterminedFormat = GRFILTER_FORMAT_DONTKNOW;
-+ GetGrfFilter()->ImportGraphic( aGraphic, String(), aSrc ,nFormat,&pDeterminedFormat );
++ GraphicFilter::GetGraphicFilter()->ImportGraphic( aGraphic, String(), aSrc ,nFormat,&pDeterminedFormat );
+
+ if (pDeterminedFormat == GRFILTER_FORMAT_DONTKNOW)
+ {
@@ -4430,7 +4433,7 @@ diff -ruN OOO310_m6.orig/filter/source/s
+ if (nStreamLen_)
+ {
+ pDest->Seek(0L);
-+ GetGrfFilter()->ImportGraphic( aGraphic, String(), *pDest ,nFormat,&pDeterminedFormat );
++ GraphicFilter::GetGraphicFilter()->ImportGraphic( aGraphic, String(), *pDest ,nFormat,&pDeterminedFormat );
+ }
+ }
+ delete pDest;
ooo-build.ooo68717.gstreamer.video.patch:
avmedia/prj/build.lst | 3
avmedia/source/gstreamer/ChangeLog | 112 +++
avmedia/source/gstreamer/exports.dxp | 4
avmedia/source/gstreamer/gstcommon.hxx | 83 ++
avmedia/source/gstreamer/gstframegrabber.cxx | 244 ++++++++
avmedia/source/gstreamer/gstframegrabber.hxx | 78 ++
avmedia/source/gstreamer/gstmanager.cxx | 114 +++
avmedia/source/gstreamer/gstmanager.hxx | 74 ++
avmedia/source/gstreamer/gstplayer.cxx | 628 ++++++++++++++++++++++
avmedia/source/gstreamer/gstplayer.hxx | 120 ++++
avmedia/source/gstreamer/gstuno.cxx | 111 +++
avmedia/source/gstreamer/gstwindow.cxx | 365 ++++++++++++
avmedia/source/gstreamer/gstwindow.hxx | 119 ++++
avmedia/source/gstreamer/makefile.mk | 85 ++
avmedia/source/inc/mediamisc.hxx | 4
avmedia/source/viewer/mediawindow.cxx | 3
avmedia/source/viewer/mediawindow_impl.cxx | 52 +
avmedia/source/viewer/mediawindow_impl.hxx | 8
com/sun/star/wizards/letter/LocaleCodes.java | 2
configure.in | 21
scp2/source/ooo/file_library_ooo.scp | 4
scp2/source/ooo/module_hidden_ooo.scp | 1
set_soenv.in | 1
slideshow/source/engine/shapes/viewmediashape.cxx | 38 +
slideshow/source/engine/shapes/viewmediashape.hxx | 7
solenv/inc/settings.mk | 4
source/gstreamer/gstplayer.cxx | 15
source/gstreamer/gstplayer.hxx | 1
svl/inc/svl/inettype.hxx | 4
svl/inc/svl/svl.hrc | 210 +++----
svl/source/misc/inettype.cxx | 5
svl/source/misc/mediatyp.src | 162 +++++
vcl/inc/vcl/salobj.hxx | 2
vcl/inc/vcl/syschild.hxx | 1
vcl/source/window/syschild.cxx | 6
vcl/unx/gtk/window/gtkobject.cxx | 8
vcl/unx/inc/plugins/gtk/gtkobject.hxx | 2
37 files changed, 2586 insertions(+), 115 deletions(-)
Index: ooo-build.ooo68717.gstreamer.video.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/ooo-build.ooo68717.gstreamer.video.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- ooo-build.ooo68717.gstreamer.video.patch 10 Jan 2010 14:21:16 -0000 1.5
+++ ooo-build.ooo68717.gstreamer.video.patch 13 Jul 2010 10:16:52 -0000 1.6
@@ -216,15 +216,15 @@ diff -rup avmedia-orig/source/viewer/med
"Quicktime Video", "mov",
--- configure.in.orig 2006-08-17 10:43:11.000000000 +0200
+++ configure.in 2006-08-17 10:48:43.000000000 +0200
-@@ -932,6 +932,7 @@
- linux-gnu*)
+@@ -953,6 +953,7 @@
+ linux-gnu*|k*bsd*-gnu*)
test_gtk=yes
test_cairo=yes
-+ build_gstreamer=yes
++ build_gstreamer=yes
test_kde=yes
test_kde4=yes
test_cups=yes
-@@ -5973,6 +5974,26 @@
+@@ -6172,6 +6173,26 @@
AC_SUBST(COMMONS_LOGGING_JAR)
dnl ===================================================================
@@ -429,488 +429,6 @@ diff -rup solenv-orig/inc/settings.mk so
.IF "$(ENABLE_LAYOUT)" == "TRUE"
CDEFS+=-DENABLE_LAYOUT=1
.ELSE # ENABLE_LAYOUT != TRUE
-diff -rup svtools-orig/inc/inettype.hxx svtools/inc/inettype.hxx
---- svtools-orig/inc/svtools/inettype.hxx 2006-09-21 11:40:23.000000000 +0200
-+++ svtools/inc/svtools/inettype.hxx 2006-09-21 11:44:50.000000000 +0200
-@@ -105,6 +105,7 @@
- #define CONTENT_TYPE_STR_AUDIO_AIFF "audio/aiff"
- #define CONTENT_TYPE_STR_AUDIO_BASIC "audio/basic"
- #define CONTENT_TYPE_STR_AUDIO_MIDI "audio/midi"
-+#define CONTENT_TYPE_STR_AUDIO_VORBIS "audio/vorbis"
- #define CONTENT_TYPE_STR_AUDIO_WAV "audio/wav"
- #define CONTENT_TYPE_STR_X_CNT_DOCUMENT ".chaos/document"
- #define CONTENT_TYPE_STR_X_CNT_FSYSBOX ".chaos/fsys-box"
-@@ -170,6 +171,7 @@
- #define CONTENT_TYPE_STR_TEXT_URL "text/x-url"
- #define CONTENT_TYPE_STR_TEXT_VCALENDAR "text/x-vCalendar"
- #define CONTENT_TYPE_STR_TEXT_VCARD "text/x-vCard"
-+#define CONTENT_TYPE_STR_VIDEO_THEORA "video/theora"
- #define CONTENT_TYPE_STR_VIDEO_VDO "video/vdo"
- #define CONTENT_TYPE_STR_VIDEO_MSVIDEO "video/x-msvideo"
- #define CONTENT_TYPE_STR_X_STARMAIL "x-starmail"
-@@ -243,6 +245,7 @@ enum INetContentType
- CONTENT_TYPE_AUDIO_AIFF,
- CONTENT_TYPE_AUDIO_BASIC,
- CONTENT_TYPE_AUDIO_MIDI,
-+ CONTENT_TYPE_AUDIO_VORBIS,
- CONTENT_TYPE_AUDIO_WAV,
- CONTENT_TYPE_IMAGE_GIF,
- CONTENT_TYPE_IMAGE_JPEG,
-@@ -254,6 +257,7 @@ enum INetContentType
- CONTENT_TYPE_TEXT_PLAIN,
- CONTENT_TYPE_TEXT_URL,
- CONTENT_TYPE_TEXT_VCARD,
-+ CONTENT_TYPE_VIDEO_THEORA,
- CONTENT_TYPE_VIDEO_VDO,
- CONTENT_TYPE_VIDEO_MSVIDEO,
- CONTENT_TYPE_X_CNT_MESSAGE,
-diff -rup svtools-orig/inc/svtools.hrc svtools/inc/svtools.hrc
---- svtools-orig/inc/svtools/svtools.hrc 2006-09-21 11:40:25.000000000 +0200
-+++ svtools/inc/svtools/svtools.hrc 2006-09-21 12:00:00.000000000 +0200
-@@ -151,110 +151,112 @@
- #define STR_SVT_MIMETYPE_APP_ZIP (STR_SVT_MIMETYPE_START+10)
- #define STR_SVT_MIMETYPE_AUDIO_AIFF (STR_SVT_MIMETYPE_START+11)
- #define STR_SVT_MIMETYPE_AUDIO_BASIC (STR_SVT_MIMETYPE_START+12)
--#define STR_SVT_MIMETYPE_AUDIO_MIDI (STR_SVT_MIMETYPE_START+13)
--#define STR_SVT_MIMETYPE_AUDIO_WAV (STR_SVT_MIMETYPE_START+14)
--#define STR_SVT_MIMETYPE_IMAGE_GIF (STR_SVT_MIMETYPE_START+15)
--#define STR_SVT_MIMETYPE_IMAGE_JPEG (STR_SVT_MIMETYPE_START+16)
--#define STR_SVT_MIMETYPE_IMAGE_PCX (STR_SVT_MIMETYPE_START+17)
--#define STR_SVT_MIMETYPE_IMAGE_BMP (STR_SVT_MIMETYPE_START+18)
--#define STR_SVT_MIMETYPE_TEXT_HTML (STR_SVT_MIMETYPE_START+19)
--#define STR_SVT_MIMETYPE_TEXT_PLAIN (STR_SVT_MIMETYPE_START+20)
--#define STR_SVT_MIMETYPE_TEXT_URL (STR_SVT_MIMETYPE_START+21)
--#define STR_SVT_MIMETYPE_TEXT_VCARD (STR_SVT_MIMETYPE_START+22)
--#define STR_SVT_MIMETYPE_VIDEO_VDO (STR_SVT_MIMETYPE_START+23)
--#define STR_SVT_MIMETYPE_VIDEO_MSVIDEO (STR_SVT_MIMETYPE_START+24)
--#define STR_SVT_MIMETYPE_X_STARMAIL (STR_SVT_MIMETYPE_START+25)
--#define STR_SVT_MIMETYPE_X_VRML (STR_SVT_MIMETYPE_START+26)
--#define STR_SVT_MIMETYPE_APP_STARHELP (STR_SVT_MIMETYPE_START+27)
--#define STR_SVT_MIMETYPE_APP_STARIMPRESS (STR_SVT_MIMETYPE_START+28)
--#define STR_SVT_MIMETYPE_APP_SCHED_CMB (STR_SVT_MIMETYPE_START+29)
--#define STR_SVT_MIMETYPE_APP_SCHED_EVT (STR_SVT_MIMETYPE_START+30)
--#define STR_SVT_MIMETYPE_APP_SCHED_TASK (STR_SVT_MIMETYPE_START+31)
--#define STR_SVT_MIMETYPE_APP_SCHED_TVIEW (STR_SVT_MIMETYPE_START+32)
--
--#define STR_SVT_MIMETYPE_CNT_MSG (STR_SVT_MIMETYPE_START+33)
--#define STR_SVT_MIMETYPE_CNT_DOCUMENT (STR_SVT_MIMETYPE_START+34)
--#define STR_SVT_MIMETYPE_CNT_POP3BOX (STR_SVT_MIMETYPE_START+35)
--#define STR_SVT_MIMETYPE_CNT_IMAPBOX (STR_SVT_MIMETYPE_START+36)
--#define STR_SVT_MIMETYPE_CNT_IMAPFLD (STR_SVT_MIMETYPE_START+37)
--#define STR_SVT_MIMETYPE_CNT_VIMBOX (STR_SVT_MIMETYPE_START+38)
--#define STR_SVT_MIMETYPE_CNT_VIMINBOX (STR_SVT_MIMETYPE_START+39)
--#define STR_SVT_MIMETYPE_CNT_BBBOX (STR_SVT_MIMETYPE_START+40)
--#define STR_SVT_MIMETYPE_CNT_VIM_BB (STR_SVT_MIMETYPE_START+41)
--#define STR_SVT_MIMETYPE_CNT_NEWSBOX (STR_SVT_MIMETYPE_START+42)
--#define STR_SVT_MIMETYPE_CNT_NEWSGRP (STR_SVT_MIMETYPE_START+43)
--#define STR_SVT_MIMETYPE_CNT_OUTBOX (STR_SVT_MIMETYPE_START+44)
--#define STR_SVT_MIMETYPE_CNT_FTPBOX (STR_SVT_MIMETYPE_START+45)
--#define STR_SVT_MIMETYPE_CNT_FTPFLD (STR_SVT_MIMETYPE_START+46)
--#define STR_SVT_MIMETYPE_CNT_FTPFILE (STR_SVT_MIMETYPE_START+47)
--#define STR_SVT_MIMETYPE_CNT_FTPLINK (STR_SVT_MIMETYPE_START+48)
--#define STR_SVT_MIMETYPE_CNT_HTTPBOX (STR_SVT_MIMETYPE_START+49)
--#define STR_SVT_MIMETYPE_CNT_FSYSBOX (STR_SVT_MIMETYPE_START+50)
--#define STR_SVT_MIMETYPE_CNT_FSYSFLD (STR_SVT_MIMETYPE_START+51)
--#define STR_SVT_MIMETYPE_CNT_FSYSFILE (STR_SVT_MIMETYPE_START+52)
--#define STR_SVT_MIMETYPE_CNT_FSYSURLFILE (STR_SVT_MIMETYPE_START+53)
--#define STR_SVT_MIMETYPE_CNT_PUBLBOX (STR_SVT_MIMETYPE_START+54)
--#define STR_SVT_MIMETYPE_CNT_SRCHBOX (STR_SVT_MIMETYPE_START+55)
--#define STR_SVT_MIMETYPE_CNT_SUBSCRBOX (STR_SVT_MIMETYPE_START+56)
--#define STR_SVT_MIMETYPE_CNT_BOOKMARK (STR_SVT_MIMETYPE_START+57)
--#define STR_SVT_MIMETYPE_CNT_CDF (STR_SVT_MIMETYPE_START+58)
--#define STR_SVT_MIMETYPE_CNT_CDFSUB (STR_SVT_MIMETYPE_START+59)
--#define STR_SVT_MIMETYPE_CNT_CDFITEM (STR_SVT_MIMETYPE_START+60)
--#define STR_SVT_MIMETYPE_CNT_STARCHANNEL (STR_SVT_MIMETYPE_START+61)
--#define STR_SVT_MIMETYPE_CNT_TRASHBOX (STR_SVT_MIMETYPE_START+62)
--#define STR_SVT_MIMETYPE_CNT_TRASH (STR_SVT_MIMETYPE_START+63)
--#define STR_SVT_MIMETYPE_CNT_REMOV_VOL (STR_SVT_MIMETYPE_START+64)
--#define STR_SVT_MIMETYPE_CNT_FIX_VOL (STR_SVT_MIMETYPE_START+65)
--#define STR_SVT_MIMETYPE_CNT_REM_VOL (STR_SVT_MIMETYPE_START+66)
--#define STR_SVT_MIMETYPE_CNT_RAM_VOL (STR_SVT_MIMETYPE_START+67)
--#define STR_SVT_MIMETYPE_CNT_CDROM (STR_SVT_MIMETYPE_START+68)
--#define STR_SVT_MIMETYPE_CNT_DISK_35 (STR_SVT_MIMETYPE_START+69)
--#define STR_SVT_MIMETYPE_CNT_DISK_525 (STR_SVT_MIMETYPE_START+70)
--#define STR_SVT_MIMETYPE_CNT_TAPEDRIVE (STR_SVT_MIMETYPE_START+71)
--#define STR_SVT_MIMETYPE_APP_GAL (STR_SVT_MIMETYPE_START+72)
--#define STR_SVT_MIMETYPE_APP_GAL_THEME (STR_SVT_MIMETYPE_START+73)
--#define STR_SVT_MIMETYPE_CNT_SEPARATOR (STR_SVT_MIMETYPE_START+74)
--#define STR_SVT_MIMETYPE_APP_STARW_GLOB (STR_SVT_MIMETYPE_START+75)
--#define STR_SVT_MIMETYPE_APP_SDM (STR_SVT_MIMETYPE_START+76)
--#define STR_SVT_MIMETYPE_APP_SMD (STR_SVT_MIMETYPE_START+77)
--#define STR_SVT_MIMETYPE_APP_STARW_WEB (STR_SVT_MIMETYPE_START+78)
--#define STR_SVT_MIMETYPE_SCHEDULE (STR_SVT_MIMETYPE_START+79)
--#define STR_SVT_MIMETYPE_SCHEDULE_EVT (STR_SVT_MIMETYPE_START+80)
--#define STR_SVT_MIMETYPE_SCHEDULE_TASK (STR_SVT_MIMETYPE_START+81)
--#define STR_SVT_MIMETYPE_SCHEDULE_FEVT (STR_SVT_MIMETYPE_START+82)
--#define STR_SVT_MIMETYPE_SCHEDULE_FTASK (STR_SVT_MIMETYPE_START+83)
--#define STR_SVT_MIMETYPE_FRAMESET (STR_SVT_MIMETYPE_START+84)
--#define STR_SVT_MIMETYPE_MACRO (STR_SVT_MIMETYPE_START+85)
--#define STR_SVT_MIMETYPE_CNT_SFSYSFOLDER (STR_SVT_MIMETYPE_START+86)
--#define STR_SVT_MIMETYPE_CNT_SFSYSFILE (STR_SVT_MIMETYPE_START+87)
--#define STR_SVT_MIMETYPE_APP_TEMPLATE (STR_SVT_MIMETYPE_START+88)
--#define STR_SVT_MIMETYPE_IMAGE_GENERIC (STR_SVT_MIMETYPE_START+89)
--#define STR_SVT_MIMETYPE_APP_MSEXCEL (STR_SVT_MIMETYPE_START+90)
--#define STR_SVT_MIMETYPE_APP_MSEXCEL_TEMPL (STR_SVT_MIMETYPE_START+91)
--#define STR_SVT_MIMETYPE_APP_MSPPOINT (STR_SVT_MIMETYPE_START+92)
--#define STR_SVT_MIMETYPE_TEXT_VCALENDAR (STR_SVT_MIMETYPE_START+93)
--#define STR_SVT_MIMETYPE_TEXT_ICALENDAR (STR_SVT_MIMETYPE_START+94)
--#define STR_SVT_MIMETYPE_TEXT_XMLICALENDAR (STR_SVT_MIMETYPE_START+95)
--#define STR_SVT_MIMETYPE_TEXT_CDE_CALENDAR_APP (STR_SVT_MIMETYPE_START+96)
--#define STR_SVT_MIMETYPE_INET_MSG_RFC822 (STR_SVT_MIMETYPE_START+97)
--#define STR_SVT_MIMETYPE_INET_MULTI_ALTERNATIVE (STR_SVT_MIMETYPE_START+98)
--#define STR_SVT_MIMETYPE_INET_MULTI_DIGEST (STR_SVT_MIMETYPE_START+99)
--#define STR_SVT_MIMETYPE_INET_MULTI_PARALLEL (STR_SVT_MIMETYPE_START+100)
--#define STR_SVT_MIMETYPE_INET_MULTI_RELATED (STR_SVT_MIMETYPE_START+101)
--#define STR_SVT_MIMETYPE_INET_MULTI_MIXED (STR_SVT_MIMETYPE_START+102)
--#define STR_SVT_MIMETYPE_APP_IMPRESSPACKED (STR_SVT_MIMETYPE_START+103)
--#define STR_SVT_MIMETYPE_APP_JAR (STR_SVT_MIMETYPE_START+104)
--#define STR_SVT_MIMETYPE_IMAGE_PNG (STR_SVT_MIMETYPE_START+105)
--#define STR_SVT_MIMETYPE_IMAGE_TIFF (STR_SVT_MIMETYPE_START+106)
--
--#define STR_SVT_MIMETYPE_APP_SXCALC (STR_SVT_MIMETYPE_START+107)
--#define STR_SVT_MIMETYPE_APP_SXCHART (STR_SVT_MIMETYPE_START+108)
--#define STR_SVT_MIMETYPE_APP_SXDRAW (STR_SVT_MIMETYPE_START+109)
--#define STR_SVT_MIMETYPE_APP_SXMATH (STR_SVT_MIMETYPE_START+110)
--#define STR_SVT_MIMETYPE_APP_SXWRITER (STR_SVT_MIMETYPE_START+111)
--#define STR_SVT_MIMETYPE_APP_SXIMPRESS (STR_SVT_MIMETYPE_START+112)
--#define STR_SVT_MIMETYPE_APP_SXGLOBAL (STR_SVT_MIMETYPE_START+113)
--#define STR_SVT_MIMETYPE_APP_SXIPACKED (STR_SVT_MIMETYPE_START+114)
-+#define STR_SVT_MIMETYPE_AUDIO_VORBIS (STR_SVT_MIMETYPE_START+13)
-+#define STR_SVT_MIMETYPE_AUDIO_MIDI (STR_SVT_MIMETYPE_START+14)
-+#define STR_SVT_MIMETYPE_AUDIO_WAV (STR_SVT_MIMETYPE_START+15)
-+#define STR_SVT_MIMETYPE_IMAGE_GIF (STR_SVT_MIMETYPE_START+16)
-+#define STR_SVT_MIMETYPE_IMAGE_JPEG (STR_SVT_MIMETYPE_START+17)
-+#define STR_SVT_MIMETYPE_IMAGE_PCX (STR_SVT_MIMETYPE_START+18)
-+#define STR_SVT_MIMETYPE_IMAGE_BMP (STR_SVT_MIMETYPE_START+19)
-+#define STR_SVT_MIMETYPE_TEXT_HTML (STR_SVT_MIMETYPE_START+20)
-+#define STR_SVT_MIMETYPE_TEXT_PLAIN (STR_SVT_MIMETYPE_START+21)
-+#define STR_SVT_MIMETYPE_TEXT_URL (STR_SVT_MIMETYPE_START+22)
-+#define STR_SVT_MIMETYPE_TEXT_VCARD (STR_SVT_MIMETYPE_START+23)
-+#define STR_SVT_MIMETYPE_VIDEO_THEORA (STR_SVT_MIMETYPE_START+24)
-+#define STR_SVT_MIMETYPE_VIDEO_VDO (STR_SVT_MIMETYPE_START+25)
-+#define STR_SVT_MIMETYPE_VIDEO_MSVIDEO (STR_SVT_MIMETYPE_START+26)
-+#define STR_SVT_MIMETYPE_X_STARMAIL (STR_SVT_MIMETYPE_START+27)
-+#define STR_SVT_MIMETYPE_X_VRML (STR_SVT_MIMETYPE_START+28)
-+#define STR_SVT_MIMETYPE_APP_STARHELP (STR_SVT_MIMETYPE_START+29)
-+#define STR_SVT_MIMETYPE_APP_STARIMPRESS (STR_SVT_MIMETYPE_START+30)
-+#define STR_SVT_MIMETYPE_APP_SCHED_CMB (STR_SVT_MIMETYPE_START+31)
-+#define STR_SVT_MIMETYPE_APP_SCHED_EVT (STR_SVT_MIMETYPE_START+32)
-+#define STR_SVT_MIMETYPE_APP_SCHED_TASK (STR_SVT_MIMETYPE_START+33)
-+#define STR_SVT_MIMETYPE_APP_SCHED_TVIEW (STR_SVT_MIMETYPE_START+34)
-+
-+#define STR_SVT_MIMETYPE_CNT_MSG (STR_SVT_MIMETYPE_START+35)
-+#define STR_SVT_MIMETYPE_CNT_DOCUMENT (STR_SVT_MIMETYPE_START+36)
-+#define STR_SVT_MIMETYPE_CNT_POP3BOX (STR_SVT_MIMETYPE_START+37)
-+#define STR_SVT_MIMETYPE_CNT_IMAPBOX (STR_SVT_MIMETYPE_START+38)
-+#define STR_SVT_MIMETYPE_CNT_IMAPFLD (STR_SVT_MIMETYPE_START+39)
-+#define STR_SVT_MIMETYPE_CNT_VIMBOX (STR_SVT_MIMETYPE_START+40)
-+#define STR_SVT_MIMETYPE_CNT_VIMINBOX (STR_SVT_MIMETYPE_START+41)
-+#define STR_SVT_MIMETYPE_CNT_BBBOX (STR_SVT_MIMETYPE_START+42)
-+#define STR_SVT_MIMETYPE_CNT_VIM_BB (STR_SVT_MIMETYPE_START+43)
-+#define STR_SVT_MIMETYPE_CNT_NEWSBOX (STR_SVT_MIMETYPE_START+44)
-+#define STR_SVT_MIMETYPE_CNT_NEWSGRP (STR_SVT_MIMETYPE_START+45)
-+#define STR_SVT_MIMETYPE_CNT_OUTBOX (STR_SVT_MIMETYPE_START+46)
-+#define STR_SVT_MIMETYPE_CNT_FTPBOX (STR_SVT_MIMETYPE_START+47)
-+#define STR_SVT_MIMETYPE_CNT_FTPFLD (STR_SVT_MIMETYPE_START+48)
-+#define STR_SVT_MIMETYPE_CNT_FTPFILE (STR_SVT_MIMETYPE_START+49)
-+#define STR_SVT_MIMETYPE_CNT_FTPLINK (STR_SVT_MIMETYPE_START+50)
-+#define STR_SVT_MIMETYPE_CNT_HTTPBOX (STR_SVT_MIMETYPE_START+51)
-+#define STR_SVT_MIMETYPE_CNT_FSYSBOX (STR_SVT_MIMETYPE_START+52)
-+#define STR_SVT_MIMETYPE_CNT_FSYSFLD (STR_SVT_MIMETYPE_START+53)
-+#define STR_SVT_MIMETYPE_CNT_FSYSFILE (STR_SVT_MIMETYPE_START+54)
-+#define STR_SVT_MIMETYPE_CNT_FSYSURLFILE (STR_SVT_MIMETYPE_START+55)
-+#define STR_SVT_MIMETYPE_CNT_PUBLBOX (STR_SVT_MIMETYPE_START+56)
-+#define STR_SVT_MIMETYPE_CNT_SRCHBOX (STR_SVT_MIMETYPE_START+57)
-+#define STR_SVT_MIMETYPE_CNT_SUBSCRBOX (STR_SVT_MIMETYPE_START+58)
-+#define STR_SVT_MIMETYPE_CNT_BOOKMARK (STR_SVT_MIMETYPE_START+59)
-+#define STR_SVT_MIMETYPE_CNT_CDF (STR_SVT_MIMETYPE_START+60)
-+#define STR_SVT_MIMETYPE_CNT_CDFSUB (STR_SVT_MIMETYPE_START+61)
-+#define STR_SVT_MIMETYPE_CNT_CDFITEM (STR_SVT_MIMETYPE_START+62)
-+#define STR_SVT_MIMETYPE_CNT_STARCHANNEL (STR_SVT_MIMETYPE_START+63)
-+#define STR_SVT_MIMETYPE_CNT_TRASHBOX (STR_SVT_MIMETYPE_START+64)
-+#define STR_SVT_MIMETYPE_CNT_TRASH (STR_SVT_MIMETYPE_START+65)
-+#define STR_SVT_MIMETYPE_CNT_REMOV_VOL (STR_SVT_MIMETYPE_START+66)
-+#define STR_SVT_MIMETYPE_CNT_FIX_VOL (STR_SVT_MIMETYPE_START+67)
-+#define STR_SVT_MIMETYPE_CNT_REM_VOL (STR_SVT_MIMETYPE_START+68)
-+#define STR_SVT_MIMETYPE_CNT_RAM_VOL (STR_SVT_MIMETYPE_START+69)
-+#define STR_SVT_MIMETYPE_CNT_CDROM (STR_SVT_MIMETYPE_START+70)
-+#define STR_SVT_MIMETYPE_CNT_DISK_35 (STR_SVT_MIMETYPE_START+71)
-+#define STR_SVT_MIMETYPE_CNT_DISK_525 (STR_SVT_MIMETYPE_START+72)
-+#define STR_SVT_MIMETYPE_CNT_TAPEDRIVE (STR_SVT_MIMETYPE_START+73)
-+#define STR_SVT_MIMETYPE_APP_GAL (STR_SVT_MIMETYPE_START+74)
-+#define STR_SVT_MIMETYPE_APP_GAL_THEME (STR_SVT_MIMETYPE_START+75)
-+#define STR_SVT_MIMETYPE_CNT_SEPARATOR (STR_SVT_MIMETYPE_START+76)
-+#define STR_SVT_MIMETYPE_APP_STARW_GLOB (STR_SVT_MIMETYPE_START+77)
-+#define STR_SVT_MIMETYPE_APP_SDM (STR_SVT_MIMETYPE_START+78)
-+#define STR_SVT_MIMETYPE_APP_SMD (STR_SVT_MIMETYPE_START+79)
-+#define STR_SVT_MIMETYPE_APP_STARW_WEB (STR_SVT_MIMETYPE_START+80)
-+#define STR_SVT_MIMETYPE_SCHEDULE (STR_SVT_MIMETYPE_START+81)
-+#define STR_SVT_MIMETYPE_SCHEDULE_EVT (STR_SVT_MIMETYPE_START+82)
-+#define STR_SVT_MIMETYPE_SCHEDULE_TASK (STR_SVT_MIMETYPE_START+83)
-+#define STR_SVT_MIMETYPE_SCHEDULE_FEVT (STR_SVT_MIMETYPE_START+84)
-+#define STR_SVT_MIMETYPE_SCHEDULE_FTASK (STR_SVT_MIMETYPE_START+85)
-+#define STR_SVT_MIMETYPE_FRAMESET (STR_SVT_MIMETYPE_START+86)
-+#define STR_SVT_MIMETYPE_MACRO (STR_SVT_MIMETYPE_START+87)
-+#define STR_SVT_MIMETYPE_CNT_SFSYSFOLDER (STR_SVT_MIMETYPE_START+88)
-+#define STR_SVT_MIMETYPE_CNT_SFSYSFILE (STR_SVT_MIMETYPE_START+89)
-+#define STR_SVT_MIMETYPE_APP_TEMPLATE (STR_SVT_MIMETYPE_START+90)
-+#define STR_SVT_MIMETYPE_IMAGE_GENERIC (STR_SVT_MIMETYPE_START+91)
-+#define STR_SVT_MIMETYPE_APP_MSEXCEL (STR_SVT_MIMETYPE_START+92)
-+#define STR_SVT_MIMETYPE_APP_MSEXCEL_TEMPL (STR_SVT_MIMETYPE_START+93)
-+#define STR_SVT_MIMETYPE_APP_MSPPOINT (STR_SVT_MIMETYPE_START+94)
-+#define STR_SVT_MIMETYPE_TEXT_VCALENDAR (STR_SVT_MIMETYPE_START+95)
-+#define STR_SVT_MIMETYPE_TEXT_ICALENDAR (STR_SVT_MIMETYPE_START+96)
-+#define STR_SVT_MIMETYPE_TEXT_XMLICALENDAR (STR_SVT_MIMETYPE_START+97)
-+#define STR_SVT_MIMETYPE_TEXT_CDE_CALENDAR_APP (STR_SVT_MIMETYPE_START+98)
-+#define STR_SVT_MIMETYPE_INET_MSG_RFC822 (STR_SVT_MIMETYPE_START+99)
-+#define STR_SVT_MIMETYPE_INET_MULTI_ALTERNATIVE (STR_SVT_MIMETYPE_START+100)
-+#define STR_SVT_MIMETYPE_INET_MULTI_DIGEST (STR_SVT_MIMETYPE_START+101)
-+#define STR_SVT_MIMETYPE_INET_MULTI_PARALLEL (STR_SVT_MIMETYPE_START+102)
-+#define STR_SVT_MIMETYPE_INET_MULTI_RELATED (STR_SVT_MIMETYPE_START+103)
-+#define STR_SVT_MIMETYPE_INET_MULTI_MIXED (STR_SVT_MIMETYPE_START+104)
-+#define STR_SVT_MIMETYPE_APP_IMPRESSPACKED (STR_SVT_MIMETYPE_START+105)
-+#define STR_SVT_MIMETYPE_APP_JAR (STR_SVT_MIMETYPE_START+106)
-+#define STR_SVT_MIMETYPE_IMAGE_PNG (STR_SVT_MIMETYPE_START+107)
-+#define STR_SVT_MIMETYPE_IMAGE_TIFF (STR_SVT_MIMETYPE_START+108)
-+
-+#define STR_SVT_MIMETYPE_APP_SXCALC (STR_SVT_MIMETYPE_START+109)
-+#define STR_SVT_MIMETYPE_APP_SXCHART (STR_SVT_MIMETYPE_START+110)
-+#define STR_SVT_MIMETYPE_APP_SXDRAW (STR_SVT_MIMETYPE_START+111)
-+#define STR_SVT_MIMETYPE_APP_SXMATH (STR_SVT_MIMETYPE_START+112)
-+#define STR_SVT_MIMETYPE_APP_SXWRITER (STR_SVT_MIMETYPE_START+113)
-+#define STR_SVT_MIMETYPE_APP_SXIMPRESS (STR_SVT_MIMETYPE_START+114)
-+#define STR_SVT_MIMETYPE_APP_SXGLOBAL (STR_SVT_MIMETYPE_START+115)
-+#define STR_SVT_MIMETYPE_APP_SXIPACKED (STR_SVT_MIMETYPE_START+116)
- #define STR_SVT_MIMETYPE_END (STR_SVT_MIMETYPE_APP_SXIPACKED)
-
- #define STR_SVT_PRNDLG_START (STR_SVT_MIMETYPE_END+1)
-diff -rup svtools-orig/source/misc1/inettype.cxx svtools/source/misc1/inettype.cxx
---- svtools-orig/source/misc1/inettype.cxx 2006-09-21 11:40:26.000000000 +0200
-+++ svtools/source/misc1/inettype.cxx 2006-09-21 11:48:11.000000000 +0200
-@@ -315,6 +315,7 @@ MediaTypeEntry const aStaticTypeNameMap[
- { CONTENT_TYPE_STR_AUDIO_AIFF, CONTENT_TYPE_AUDIO_AIFF, "aif" },
- { CONTENT_TYPE_STR_AUDIO_BASIC, CONTENT_TYPE_AUDIO_BASIC, "au" },
- { CONTENT_TYPE_STR_AUDIO_MIDI, CONTENT_TYPE_AUDIO_MIDI, "mid" },
-+ { CONTENT_TYPE_STR_AUDIO_VORBIS, CONTENT_TYPE_AUDIO_VORBIS, "ogg" },
- { CONTENT_TYPE_STR_AUDIO_WAV, CONTENT_TYPE_AUDIO_WAV, "wav" },
- { CONTENT_TYPE_STR_IMAGE_GENERIC, CONTENT_TYPE_IMAGE_GENERIC, "tmp" },
- { CONTENT_TYPE_STR_IMAGE_GIF, CONTENT_TYPE_IMAGE_GIF, "gif" },
-@@ -345,6 +346,7 @@ MediaTypeEntry const aStaticTypeNameMap[
- { CONTENT_TYPE_STR_TEXT_VCALENDAR, CONTENT_TYPE_TEXT_VCALENDAR,
- "vcs" },
- { CONTENT_TYPE_STR_TEXT_VCARD, CONTENT_TYPE_TEXT_VCARD, "vcf" },
-+ { CONTENT_TYPE_STR_VIDEO_THEORA, CONTENT_TYPE_VIDEO_THEORA, "ogg" },
- { CONTENT_TYPE_STR_VIDEO_VDO, CONTENT_TYPE_VIDEO_VDO, "vdo" },
- { CONTENT_TYPE_STR_VIDEO_MSVIDEO, CONTENT_TYPE_VIDEO_MSVIDEO, "avi" },
- { CONTENT_TYPE_STR_X_STARMAIL, CONTENT_TYPE_X_STARMAIL, "smd" },
-@@ -373,6 +375,7 @@ USHORT const aStaticResourceIDMap[CONTEN
- STR_SVT_MIMETYPE_AUDIO_AIFF, // CONTENT_TYPE_AUDIO_AIFF
- STR_SVT_MIMETYPE_AUDIO_BASIC, // CONTENT_TYPE_AUDIO_BASIC
- STR_SVT_MIMETYPE_AUDIO_MIDI, // CONTENT_TYPE_AUDIO_MIDI
-+ STR_SVT_MIMETYPE_AUDIO_VORBIS, // CONTENT_TYPE_AUDIO_VORBIS
- STR_SVT_MIMETYPE_AUDIO_WAV, // CONTENT_TYPE_AUDIO_WAV
- STR_SVT_MIMETYPE_IMAGE_GIF, // CONTENT_TYPE_IMAGE_GIF
- STR_SVT_MIMETYPE_IMAGE_JPEG, // CONTENT_TYPE_IMAGE_JPEG
-@@ -384,6 +387,7 @@ USHORT const aStaticResourceIDMap[CONTEN
- STR_SVT_MIMETYPE_TEXT_PLAIN, // CONTENT_TYPE_TEXT_PLAIN
- STR_SVT_MIMETYPE_TEXT_URL, // CONTENT_TYPE_TEXT_URL
- STR_SVT_MIMETYPE_TEXT_VCARD, // CONTENT_TYPE_TEXT_VCARD
-+ STR_SVT_MIMETYPE_VIDEO_THEORA, // CONTENT_TYPE_VIDEO_THEORA
- STR_SVT_MIMETYPE_VIDEO_VDO, // CONTENT_TYPE_VIDEO_VDO
- STR_SVT_MIMETYPE_VIDEO_MSVIDEO, // CONTENT_TYPE_VIDEO_MSVIDEO
- STR_SVT_MIMETYPE_CNT_MSG, // CONTENT_TYPE_X_CNT_MESSAGE
-@@ -519,6 +523,7 @@ MediaTypeEntry const aStaticExtensionMap
- { "met", CONTENT_TYPE_IMAGE_GENERIC, "" },
- { "mid", CONTENT_TYPE_AUDIO_MIDI, "" },
- { "midi", CONTENT_TYPE_AUDIO_MIDI, "" },
-+ { "ogg", CONTENT_TYPE_AUDIO_VORBIS, "" },
- { "pbm", CONTENT_TYPE_IMAGE_GENERIC, "" },
- { "pcd", CONTENT_TYPE_IMAGE_GENERIC, "" },
- { "pct", CONTENT_TYPE_IMAGE_GENERIC, "" },
-diff -rup svtools-orig/source/misc1/mediatyp.src svtools/source/misc1/mediatyp.src
---- svtools-orig/source/misc1/mediatyp.src 2006-09-21 11:40:26.000000000 +0200
-+++ svtools/source/misc1/mediatyp.src 2006-09-21 11:45:57.000000000 +0200
-@@ -113,6 +113,87 @@
- Text [ en-US ] = "Audio file" ;
- };
-
-+String STR_SVT_MIMETYPE_AUDIO_VORBIS
-+{
-+ Text [ de ] = "Audio-Datei" ;
-+ Text [ en-US ] = "Audio file" ;
-+ Text [ af ] = "Oudiolêer" ;
-+ Text [ ar ] = "ملف صوتي" ;
-+ Text [ as-IN ] = "অডিঅ' ফাইল" ;
-+ Text [ be-BY ] = "Гукавы файл" ;
-+ Text [ bg ] = "Аудиофайл" ;
-+ Text [ br ] = "Restr klev" ;
-+ Text [ bs ] = "Audio datoteka" ;
-+ Text [ ca ] = "Fitxer d'àudio" ;
-+ Text [ cs ] = "Zvukový soubor" ;
-+ Text [ cy ] = "Ffeil sain" ;
-+ Text [ da ] = "Lydfil" ;
-+ Text [ el ] = "Αρχείο ήχου" ;
-+ Text [ en-GB ] = "Audio file" ;
-+ Text [ en-ZA ] = "Audio file" ;
-+ Text [ eo ] = "Audio file" ;
-+ Text [ es ] = "Archivo audio" ;
-+ Text [ et ] = "Audiofail" ;
-+ Text [ fa ] = "پروندهی صوتی" ;
-+ Text [ fi ] = "Äänitiedosto" ;
-+ Text [ fr ] = "Fichier audio" ;
-+ Text [ ga ] = "Comhad fuaime" ;
-+ Text [ gu ] = "ઓડિયો ફાઈલ" ;
-+ Text [ gu-IN ] = "ઓડિયો ફાઈલ" ;
-+ Text [ he ] = "קובץ שמע" ;
-+ Text [ hi-IN ] = "Audio file" ;
-+ Text [ hr ] = "Zvučna datoteka" ;
-+ Text [ hu ] = "Hangfájl" ;
-+ Text [ it ] = "File audio" ;
-+ Text [ ja ] = "オーディオ ファイル" ;
-+ Text [ ka ] = "ხმოვანი ფაილი" ;
-+ Text [ km ] = "ឯកសារសម្លេង" ;
-+ Text [ ko ] = "오디오 파일" ;
-+ Text [ ku ] = "Pelgeha deng" ;
-+ Text [ lt ] = "Garso failas" ;
-+ Text [ mk ] = "Аудиодатотека" ;
-+ Text [ ml-IN ] = "ഓഡിയോ ഫയല്" ;
-+ Text [ mr-IN ] = "श्राव्य धारिका" ;
-+ Text [ nb ] = "Lydfil" ;
-+ Text [ ne ] = "अडियो फाइल" ;
-+ Text [ nl ] = "Audiobestand" ;
-+ Text [ nn ] = "Lydfil" ;
-+ Text [ nr ] = "Ifayili elilalelwako" ;
-+ Text [ ns ] = "Faele ya odiyo" ;
-+ Text [ or-IN ] = "ଅଡିଓ ଫାଇଲ" ;
-+ Text [ pa-IN ] = "ਆਡੀਓ ਫਾਇਲ" ;
-+ Text [ pl ] = "Plik dźwiękowy" ;
-+ Text [ pt ] = "Ficheiro áudio" ;
-+ Text [ pt-BR ] = "Arquivo de áudio" ;
-+ Text [ ru ] = "Аудио файл" ;
-+ Text [ rw ] = "Audio file" ;
-+ Text [ sh-YU ] = "Zvučna datoteka" ;
-+ Text [ sk ] = "Zvukový súbor" ;
-+ Text [ sl ] = "Zvočna datoteka" ;
-+ Text [ sr-CS ] = "Звучна датотека" ;
-+ Text [ ss ] = "I-Odiyofayela" ;
-+ Text [ st ] = "Audiyo faele" ;
-+ Text [ sv ] = "Audio-fil" ;
-+ Text [ sw-TZ ] = "Faili la kusikia" ;
-+ Text [ ta ] = "Audio file" ;
-+ Text [ ta-IN ] = "Audio file" ;
-+ Text [ te-IN ] = "శ్రవణ దస్త్రం" ;
-+ Text [ tg ] = "Аудио-дафтар" ;
-+ Text [ th ] = "Audio file" ;
-+ Text [ ti-ER ] = "ናይ ድምጺ ፋይል" ;
-+ Text [ tr ] = "Ses dosyası" ;
-+ Text [ ts ] = "Fayili ya Xitlanga-mpfumawulo" ;
-+ Text [ uk ] = "Audio file" ;
-+ Text [ ur-IN ] = "آڈیوفائل" ;
-+ Text [ ve ] = "Faela ya odio" ;
-+ Text [ vi ] = "Tập tin âm thanh" ;
-+ Text [ xh ] = "Ifayili Yokumanyelwayo" ;
-+ Text [ zh-CN ] = "声频文件" ;
-+ Text [ zh-TW ] = "聲頻檔案" ;
-+ Text [ zu ] = "Ifayela eliveza umsindo" ;
-+ Text [ x-comment ] = " ";
-+};
-+
- String STR_SVT_MIMETYPE_AUDIO_WAV
- {
- Text [ en-US ] = "Audio file" ;
-@@ -158,6 +239,87 @@
- Text [ en-US ] = "vCard file" ;
- };
-
-+String STR_SVT_MIMETYPE_VIDEO_THEORA
-+{
-+ Text [ de ] = "Video-Datei" ;
-+ Text [ en-US ] = "Video file" ;
-+ Text [ af ] = "Videolêer" ;
-+ Text [ ar ] = "ملف فيديو" ;
-+ Text [ as-IN ] = "ভিডিঅ' ফাইল" ;
-+ Text [ be-BY ] = "Файл відэа" ;
-+ Text [ bg ] = "Видеофайл" ;
-+ Text [ br ] = "Restr video" ;
-+ Text [ bs ] = "Video datoteka" ;
-+ Text [ ca ] = "Fitxer de vídeo" ;
-+ Text [ cs ] = "Video soubor" ;
-+ Text [ cy ] = "Ffeil fideo" ;
-+ Text [ da ] = "Video-fil" ;
-+ Text [ el ] = "Αρχείο Video" ;
-+ Text [ en-GB ] = "Video file" ;
-+ Text [ en-ZA ] = "Video file" ;
-+ Text [ eo ] = "Video file" ;
-+ Text [ es ] = "Archivo vídeo" ;
-+ Text [ et ] = "Videofail" ;
-+ Text [ fa ] = "پروندهی ویدئویی" ;
-+ Text [ fi ] = "Videotiedosto" ;
-+ Text [ fr ] = "Fichier vidéo" ;
-+ Text [ ga ] = "Físchomhad" ;
-+ Text [ gu ] = "વીડિયો ફાઈલ" ;
-+ Text [ gu-IN ] = "વીડિયો ફાઈલ" ;
-+ Text [ he ] = "קובץ וידיאו" ;
-+ Text [ hi-IN ] = "Video file" ;
-+ Text [ hr ] = "Video datoteka" ;
-+ Text [ hu ] = "Videofájl" ;
-+ Text [ it ] = "File video" ;
-+ Text [ ja ] = "ビデオ ファイル" ;
-+ Text [ ka ] = "ვიდეო ფაილი" ;
-+ Text [ km ] = "ឯកសារវីដេអូ" ;
-+ Text [ ko ] = "비디오 파일" ;
-+ Text [ ku ] = "Pelgeha vîdeo" ;
-+ Text [ lt ] = "Vaizdo failas" ;
-+ Text [ mk ] = "Видеодатотека" ;
-+ Text [ ml-IN ] = "വീഡിയോ ഫയല്" ;
-+ Text [ mr-IN ] = "चित्रमुद्रक धारिका" ;
-+ Text [ nb ] = "Videofil" ;
-+ Text [ ne ] = "भिडियो फाइल" ;
-+ Text [ nl ] = "Videobestand" ;
-+ Text [ nn ] = "Videofil" ;
-+ Text [ nr ] = "Ifayili levidiyo" ;
-+ Text [ ns ] = "Faele ya bidio" ;
-+ Text [ or-IN ] = "ଭିଡିଓ ଫାଇଲ" ;
-+ Text [ pa-IN ] = "ਵੀਡਿਓ ਫਾਇਲ" ;
-+ Text [ pl ] = "Plik filmowy" ;
-+ Text [ pt ] = "Ficheiro de vídeo" ;
-+ Text [ pt-BR ] = "Arquivo de vídeo" ;
-+ Text [ ru ] = "Файл видео" ;
-+ Text [ rw ] = "Video file" ;
-+ Text [ sh-YU ] = "Video datoteka" ;
-+ Text [ sk ] = "Video súbor" ;
-+ Text [ sl ] = "Video-datoteka" ;
-+ Text [ sr-CS ] = "Видео датотека" ;
-+ Text [ ss ] = "Ividiyofayela" ;
-+ Text [ st ] = "Bideo faele" ;
-+ Text [ sv ] = "Video-fil" ;
-+ Text [ sw-TZ ] = "Faili la video" ;
-+ Text [ ta ] = "Video file" ;
-+ Text [ ta-IN ] = "Video file" ;
-+ Text [ te-IN ] = "దృశ్య దస్త్రము" ;
-+ Text [ tg ] = "Видео-дафтар" ;
-+ Text [ th ] = "Video file" ;
-+ Text [ ti-ER ] = "ናይ ቪድዮ ፋይል" ;
-+ Text [ tr ] = "Görüntü dosyası" ;
-+ Text [ ts ] = "Fayili ya Vhidiyo" ;
-+ Text [ uk ] = "Video file" ;
-+ Text [ ur-IN ] = "وڈیوفائل" ;
-+ Text [ ve ] = "Faela ya vidio" ;
-+ Text [ vi ] = "Tập tin ảnh động" ;
-+ Text [ xh ] = "Ifayili yevidiyo" ;
-+ Text [ zh-CN ] = "影视文件" ;
-+ Text [ zh-TW ] = "視頻檔案" ;
-+ Text [ zu ] = "Ifayela levidiyo" ;
-+ Text [ x-comment ] = " ";
-+};
-+
- String STR_SVT_MIMETYPE_VIDEO_VDO
- {
- Text [ en-US ] = "Video file" ;
-Index: vcl/inc/salobj.hxx
-===================================================================
-RCS file: /cvs/gsl/vcl/inc/salobj.hxx,v
-retrieving revision 1.5
-diff -u -p -r1.5 salobj.hxx
--- vcl/inc/vcl/salobj.hxx 2 Nov 2005 13:28:47 -0000 1.5
+++ vcl/inc/vcl/salobj.hxx 5 Jan 2007 15:00:36 -0000
@@ -88,6 +88,8 @@
@@ -3165,117 +2683,583 @@ diff -u -p -r1.4 gtkobject.hxx
+
+.ENDIF
+
-+.INCLUDE : target.mk
-Index: com/sun/star/wizards/letter/LocaleCodes.java
-===================================================================
-RCS file: /cvs/installation/wizards/com/sun/star/wizards/letter/LocaleCodes.java,v
-retrieving revision 1.5
-diff -u -r1.5 LocaleCodes.java
---- wizards.orig/com/sun/star/wizards/letter/LocaleCodes.java 23 Nov 2007 16:52:56 -0000 1.5
-+++ wizards/com/sun/star/wizards/letter/LocaleCodes.java 5 Feb 2008 08:57:11 -0000
-@@ -45,7 +45,7 @@
- public LocaleCodes(XMultiServiceFactory xmsf)
- {
- super(xmsf, UNIT_NAME, MODULE_NAME);
-- allLanguageStrings = getStringList(16300); // STR_ARR_SVT_LANGUAGE_TABLE from svtools/source/misc/langtab.src
-+ allLanguageStrings = getStringList(16302); // STR_ARR_SVT_LANGUAGE_TABLE from svtools/source/misc/langtab.src
- }
-
- public String getLanguageString(String MSID)
-diff -ru /usr/src/redhat/BUILD/OOF680_m18/avmedia/source/gstreamer/gstplayer.cxx source/gstreamer/gstplayer.cxx
---- avmedia.orig/source/gstreamer/gstplayer.cxx 2007-08-07 19:50:02.000000000 +0100
-+++ avmedia/source/gstreamer/gstplayer.cxx 2007-08-07 17:14:52.000000000 +0100
-@@ -67,6 +67,7 @@
- mpPlaybin( NULL ),
- mbFakeVideo (sal_False ),
- mnUnmutedVolume( 0 ),
-+ mbPlayPending ( false ),
- mbMuted( false ),
- mbLooping( false ),
- mbInitialized( false ),
-@@ -140,6 +141,7 @@
- case GST_MESSAGE_EOS:
- //DBG( "EOS, reset state to NULL" );
- gst_element_set_state( mpPlaybin, GST_STATE_READY );
-+ mbPlayPending = false;
- break;
- case GST_MESSAGE_STATE_CHANGED:
- if( message->src == GST_OBJECT( mpPlaybin ) ) {
-@@ -151,6 +153,9 @@
- pendingstate == GST_STATE_VOID_PENDING &&
- mpXOverlay )
- gst_x_overlay_expose( mpXOverlay );
++.INCLUDE : target.mk
+Index: com/sun/star/wizards/letter/LocaleCodes.java
+===================================================================
+RCS file: /cvs/installation/wizards/com/sun/star/wizards/letter/LocaleCodes.java,v
+retrieving revision 1.5
+diff -u -r1.5 LocaleCodes.java
+--- wizards.orig/com/sun/star/wizards/letter/LocaleCodes.java 23 Nov 2007 16:52:56 -0000 1.5
++++ wizards/com/sun/star/wizards/letter/LocaleCodes.java 5 Feb 2008 08:57:11 -0000
+@@ -41,7 +41,7 @@
+ public LocaleCodes(XMultiServiceFactory xmsf)
+ {
+ super(xmsf, UNIT_NAME, MODULE_NAME);
+- allLanguageStrings = getStringList(16635); // STR_ARR_SVT_LANGUAGE_TABLE from svtools/source/misc/langtab.src
++ allLanguageStrings = getStringList(16635); // STR_ARR_SVT_LANGUAGE_TABLE from svtools/source/misc/langtab.src
+ }
+
+ public String getLanguageString(String MSID)
+diff -ru /usr/src/redhat/BUILD/OOF680_m18/avmedia/source/gstreamer/gstplayer.cxx source/gstreamer/gstplayer.cxx
+--- avmedia.orig/source/gstreamer/gstplayer.cxx 2007-08-07 19:50:02.000000000 +0100
++++ avmedia/source/gstreamer/gstplayer.cxx 2007-08-07 17:14:52.000000000 +0100
+@@ -67,6 +67,7 @@
+ mpPlaybin( NULL ),
+ mbFakeVideo (sal_False ),
+ mnUnmutedVolume( 0 ),
++ mbPlayPending ( false ),
+ mbMuted( false ),
+ mbLooping( false ),
+ mbInitialized( false ),
+@@ -140,6 +141,7 @@
+ case GST_MESSAGE_EOS:
+ //DBG( "EOS, reset state to NULL" );
+ gst_element_set_state( mpPlaybin, GST_STATE_READY );
++ mbPlayPending = false;
+ break;
+ case GST_MESSAGE_STATE_CHANGED:
+ if( message->src == GST_OBJECT( mpPlaybin ) ) {
+@@ -151,6 +153,9 @@
+ pendingstate == GST_STATE_VOID_PENDING &&
+ mpXOverlay )
+ gst_x_overlay_expose( mpXOverlay );
++
++ if (mbPlayPending)
++ mbPlayPending = ((newstate == GST_STATE_READY) || (newstate == GST_STATE_PAUSED));
+ }
+ default:
+ break;
+@@ -250,6 +255,7 @@
+
+ if( mpPlaybin != NULL ) {
+ gst_element_set_state( mpPlaybin, GST_STATE_NULL );
++ mbPlayPending = false;
+ g_object_unref( mpPlaybin );
+ }
+
+@@ -281,6 +287,7 @@
+ preparePlaybin( rURL, true );
+
+ gst_element_set_state( mpPlaybin, GST_STATE_PAUSED );
++ mbPlayPending = false;
+
+ bRet = true;
+ }
+@@ -305,6 +312,7 @@
+ if( mbInitialized && NULL != mpPlaybin )
+ {
+ gst_element_set_state( mpPlaybin, GST_STATE_PLAYING );
++ mbPlayPending = true;
+ }
+ }
+
+@@ -317,6 +325,7 @@
+ if( mpPlaybin )
+ gst_element_set_state( mpPlaybin, GST_STATE_PAUSED );
+
++ mbPlayPending = false;
+ DBG( "stop %p", mpPlaybin );
+ }
+
+@@ -325,10 +334,10 @@
+ sal_Bool SAL_CALL Player::isPlaying()
+ throw (uno::RuntimeException)
+ {
+- bool bRet = false;
++ bool bRet = mbPlayPending;
+
+ // return whether the pipeline is in PLAYING STATE or not
+- if( mbInitialized && mpPlaybin )
++ if( !mbPlayPending && mbInitialized && mpPlaybin )
+ {
+ bRet = GST_STATE_PLAYING == GST_STATE( mpPlaybin );
+ }
+diff -ru /usr/src/redhat/BUILD/OOF680_m18/avmedia/source/gstreamer/gstplayer.hxx source/gstreamer/gstplayer.hxx
+--- avmedia.orig/source/gstreamer/gstplayer.hxx 2007-08-07 19:50:02.000000000 +0100
++++ avmedia/source/gstreamer/gstplayer.hxx 2007-08-07 10:30:45.000000000 +0100
+@@ -101,6 +101,7 @@
+ sal_Bool mbFakeVideo;
+
+ gdouble mnUnmutedVolume;
++ sal_Bool mbPlayPending;
+ sal_Bool mbMuted;
+ sal_Bool mbLooping;
+ sal_Bool mbInitialized;
+diff -ru avmedia.orig/source/gstreamer/gstplayer.cxx avmedia/source/gstreamer/gstplayer.cxx
+--- avmedia.orig/source/gstreamer/gstplayer.cxx 2009-04-28 08:28:19.000000000 +0100
++++ avmedia/source/gstreamer/gstplayer.cxx 2009-04-28 09:11:50.000000000 +0100
+@@ -142,6 +142,8 @@
+ //DBG( "EOS, reset state to NULL" );
+ gst_element_set_state( mpPlaybin, GST_STATE_READY );
+ mbPlayPending = false;
++ if (mbLooping)
++ start();
+ break;
+ case GST_MESSAGE_STATE_CHANGED:
+ if( message->src == GST_OBJECT( mpPlaybin ) ) {
+--- svl/inc/svl/inettype.hxx
++++ svl/inc/svl/inettype.hxx
+@@ -90,6 +90,7 @@
+ #define CONTENT_TYPE_STR_AUDIO_AIFF "audio/aiff"
+ #define CONTENT_TYPE_STR_AUDIO_BASIC "audio/basic"
+ #define CONTENT_TYPE_STR_AUDIO_MIDI "audio/midi"
++#define CONTENT_TYPE_STR_AUDIO_VORBIS "audio/vorbis"
+ #define CONTENT_TYPE_STR_AUDIO_WAV "audio/wav"
+ #define CONTENT_TYPE_STR_X_CNT_DOCUMENT ".chaos/document"
+ #define CONTENT_TYPE_STR_X_CNT_FSYSBOX ".chaos/fsys-box"
+@@ -155,6 +156,7 @@
+ #define CONTENT_TYPE_STR_TEXT_URL "text/x-url"
+ #define CONTENT_TYPE_STR_TEXT_VCALENDAR "text/x-vCalendar"
+ #define CONTENT_TYPE_STR_TEXT_VCARD "text/x-vCard"
++#define CONTENT_TYPE_STR_VIDEO_THEORA "video/theora"
+ #define CONTENT_TYPE_STR_VIDEO_VDO "video/vdo"
+ #define CONTENT_TYPE_STR_VIDEO_MSVIDEO "video/x-msvideo"
+ #define CONTENT_TYPE_STR_X_STARMAIL "x-starmail"
+@@ -228,6 +230,7 @@
+ CONTENT_TYPE_AUDIO_AIFF,
+ CONTENT_TYPE_AUDIO_BASIC,
+ CONTENT_TYPE_AUDIO_MIDI,
++ CONTENT_TYPE_AUDIO_VORBIS,
+ CONTENT_TYPE_AUDIO_WAV,
+ CONTENT_TYPE_IMAGE_GIF,
+ CONTENT_TYPE_IMAGE_JPEG,
+@@ -239,6 +242,7 @@
+ CONTENT_TYPE_TEXT_PLAIN,
+ CONTENT_TYPE_TEXT_URL,
+ CONTENT_TYPE_TEXT_VCARD,
++ CONTENT_TYPE_VIDEO_THEORA,
+ CONTENT_TYPE_VIDEO_VDO,
+ CONTENT_TYPE_VIDEO_MSVIDEO,
+ CONTENT_TYPE_X_CNT_MESSAGE,
+--- svl/inc/svl/svl.hrc
++++ svl/inc/svl/svl.hrc
+@@ -46,110 +46,112 @@
+ #define STR_SVT_MIMETYPE_APP_ZIP (STR_SVT_MIMETYPE_START+10)
+ #define STR_SVT_MIMETYPE_AUDIO_AIFF (STR_SVT_MIMETYPE_START+11)
+ #define STR_SVT_MIMETYPE_AUDIO_BASIC (STR_SVT_MIMETYPE_START+12)
+-#define STR_SVT_MIMETYPE_AUDIO_MIDI (STR_SVT_MIMETYPE_START+13)
+-#define STR_SVT_MIMETYPE_AUDIO_WAV (STR_SVT_MIMETYPE_START+14)
+-#define STR_SVT_MIMETYPE_IMAGE_GIF (STR_SVT_MIMETYPE_START+15)
+-#define STR_SVT_MIMETYPE_IMAGE_JPEG (STR_SVT_MIMETYPE_START+16)
+-#define STR_SVT_MIMETYPE_IMAGE_PCX (STR_SVT_MIMETYPE_START+17)
+-#define STR_SVT_MIMETYPE_IMAGE_BMP (STR_SVT_MIMETYPE_START+18)
+-#define STR_SVT_MIMETYPE_TEXT_HTML (STR_SVT_MIMETYPE_START+19)
+-#define STR_SVT_MIMETYPE_TEXT_PLAIN (STR_SVT_MIMETYPE_START+20)
+-#define STR_SVT_MIMETYPE_TEXT_URL (STR_SVT_MIMETYPE_START+21)
+-#define STR_SVT_MIMETYPE_TEXT_VCARD (STR_SVT_MIMETYPE_START+22)
+-#define STR_SVT_MIMETYPE_VIDEO_VDO (STR_SVT_MIMETYPE_START+23)
+-#define STR_SVT_MIMETYPE_VIDEO_MSVIDEO (STR_SVT_MIMETYPE_START+24)
+-#define STR_SVT_MIMETYPE_X_STARMAIL (STR_SVT_MIMETYPE_START+25)
+-#define STR_SVT_MIMETYPE_X_VRML (STR_SVT_MIMETYPE_START+26)
+-#define STR_SVT_MIMETYPE_APP_STARHELP (STR_SVT_MIMETYPE_START+27)
+-#define STR_SVT_MIMETYPE_APP_STARIMPRESS (STR_SVT_MIMETYPE_START+28)
+-#define STR_SVT_MIMETYPE_APP_SCHED_CMB (STR_SVT_MIMETYPE_START+29)
+-#define STR_SVT_MIMETYPE_APP_SCHED_EVT (STR_SVT_MIMETYPE_START+30)
+-#define STR_SVT_MIMETYPE_APP_SCHED_TASK (STR_SVT_MIMETYPE_START+31)
+-#define STR_SVT_MIMETYPE_APP_SCHED_TVIEW (STR_SVT_MIMETYPE_START+32)
+-
+-#define STR_SVT_MIMETYPE_CNT_MSG (STR_SVT_MIMETYPE_START+33)
+-#define STR_SVT_MIMETYPE_CNT_DOCUMENT (STR_SVT_MIMETYPE_START+34)
+-#define STR_SVT_MIMETYPE_CNT_POP3BOX (STR_SVT_MIMETYPE_START+35)
+-#define STR_SVT_MIMETYPE_CNT_IMAPBOX (STR_SVT_MIMETYPE_START+36)
+-#define STR_SVT_MIMETYPE_CNT_IMAPFLD (STR_SVT_MIMETYPE_START+37)
+-#define STR_SVT_MIMETYPE_CNT_VIMBOX (STR_SVT_MIMETYPE_START+38)
+-#define STR_SVT_MIMETYPE_CNT_VIMINBOX (STR_SVT_MIMETYPE_START+39)
+-#define STR_SVT_MIMETYPE_CNT_BBBOX (STR_SVT_MIMETYPE_START+40)
+-#define STR_SVT_MIMETYPE_CNT_VIM_BB (STR_SVT_MIMETYPE_START+41)
+-#define STR_SVT_MIMETYPE_CNT_NEWSBOX (STR_SVT_MIMETYPE_START+42)
+-#define STR_SVT_MIMETYPE_CNT_NEWSGRP (STR_SVT_MIMETYPE_START+43)
+-#define STR_SVT_MIMETYPE_CNT_OUTBOX (STR_SVT_MIMETYPE_START+44)
+-#define STR_SVT_MIMETYPE_CNT_FTPBOX (STR_SVT_MIMETYPE_START+45)
+-#define STR_SVT_MIMETYPE_CNT_FTPFLD (STR_SVT_MIMETYPE_START+46)
+-#define STR_SVT_MIMETYPE_CNT_FTPFILE (STR_SVT_MIMETYPE_START+47)
+-#define STR_SVT_MIMETYPE_CNT_FTPLINK (STR_SVT_MIMETYPE_START+48)
+-#define STR_SVT_MIMETYPE_CNT_HTTPBOX (STR_SVT_MIMETYPE_START+49)
+-#define STR_SVT_MIMETYPE_CNT_FSYSBOX (STR_SVT_MIMETYPE_START+50)
+-#define STR_SVT_MIMETYPE_CNT_FSYSFLD (STR_SVT_MIMETYPE_START+51)
+-#define STR_SVT_MIMETYPE_CNT_FSYSFILE (STR_SVT_MIMETYPE_START+52)
+-#define STR_SVT_MIMETYPE_CNT_FSYSURLFILE (STR_SVT_MIMETYPE_START+53)
+-#define STR_SVT_MIMETYPE_CNT_PUBLBOX (STR_SVT_MIMETYPE_START+54)
+-#define STR_SVT_MIMETYPE_CNT_SRCHBOX (STR_SVT_MIMETYPE_START+55)
+-#define STR_SVT_MIMETYPE_CNT_SUBSCRBOX (STR_SVT_MIMETYPE_START+56)
+-#define STR_SVT_MIMETYPE_CNT_BOOKMARK (STR_SVT_MIMETYPE_START+57)
+-#define STR_SVT_MIMETYPE_CNT_CDF (STR_SVT_MIMETYPE_START+58)
+-#define STR_SVT_MIMETYPE_CNT_CDFSUB (STR_SVT_MIMETYPE_START+59)
+-#define STR_SVT_MIMETYPE_CNT_CDFITEM (STR_SVT_MIMETYPE_START+60)
+-#define STR_SVT_MIMETYPE_CNT_STARCHANNEL (STR_SVT_MIMETYPE_START+61)
+-#define STR_SVT_MIMETYPE_CNT_TRASHBOX (STR_SVT_MIMETYPE_START+62)
+-#define STR_SVT_MIMETYPE_CNT_TRASH (STR_SVT_MIMETYPE_START+63)
+-#define STR_SVT_MIMETYPE_CNT_REMOV_VOL (STR_SVT_MIMETYPE_START+64)
+-#define STR_SVT_MIMETYPE_CNT_FIX_VOL (STR_SVT_MIMETYPE_START+65)
+-#define STR_SVT_MIMETYPE_CNT_REM_VOL (STR_SVT_MIMETYPE_START+66)
+-#define STR_SVT_MIMETYPE_CNT_RAM_VOL (STR_SVT_MIMETYPE_START+67)
+-#define STR_SVT_MIMETYPE_CNT_CDROM (STR_SVT_MIMETYPE_START+68)
+-#define STR_SVT_MIMETYPE_CNT_DISK_35 (STR_SVT_MIMETYPE_START+69)
+-#define STR_SVT_MIMETYPE_CNT_DISK_525 (STR_SVT_MIMETYPE_START+70)
+-#define STR_SVT_MIMETYPE_CNT_TAPEDRIVE (STR_SVT_MIMETYPE_START+71)
+-#define STR_SVT_MIMETYPE_APP_GAL (STR_SVT_MIMETYPE_START+72)
+-#define STR_SVT_MIMETYPE_APP_GAL_THEME (STR_SVT_MIMETYPE_START+73)
+-#define STR_SVT_MIMETYPE_CNT_SEPARATOR (STR_SVT_MIMETYPE_START+74)
+-#define STR_SVT_MIMETYPE_APP_STARW_GLOB (STR_SVT_MIMETYPE_START+75)
+-#define STR_SVT_MIMETYPE_APP_SDM (STR_SVT_MIMETYPE_START+76)
+-#define STR_SVT_MIMETYPE_APP_SMD (STR_SVT_MIMETYPE_START+77)
+-#define STR_SVT_MIMETYPE_APP_STARW_WEB (STR_SVT_MIMETYPE_START+78)
+-#define STR_SVT_MIMETYPE_SCHEDULE (STR_SVT_MIMETYPE_START+79)
+-#define STR_SVT_MIMETYPE_SCHEDULE_EVT (STR_SVT_MIMETYPE_START+80)
+-#define STR_SVT_MIMETYPE_SCHEDULE_TASK (STR_SVT_MIMETYPE_START+81)
+-#define STR_SVT_MIMETYPE_SCHEDULE_FEVT (STR_SVT_MIMETYPE_START+82)
+-#define STR_SVT_MIMETYPE_SCHEDULE_FTASK (STR_SVT_MIMETYPE_START+83)
+-#define STR_SVT_MIMETYPE_FRAMESET (STR_SVT_MIMETYPE_START+84)
+-#define STR_SVT_MIMETYPE_MACRO (STR_SVT_MIMETYPE_START+85)
+-#define STR_SVT_MIMETYPE_CNT_SFSYSFOLDER (STR_SVT_MIMETYPE_START+86)
+-#define STR_SVT_MIMETYPE_CNT_SFSYSFILE (STR_SVT_MIMETYPE_START+87)
+-#define STR_SVT_MIMETYPE_APP_TEMPLATE (STR_SVT_MIMETYPE_START+88)
+-#define STR_SVT_MIMETYPE_IMAGE_GENERIC (STR_SVT_MIMETYPE_START+89)
+-#define STR_SVT_MIMETYPE_APP_MSEXCEL (STR_SVT_MIMETYPE_START+90)
+-#define STR_SVT_MIMETYPE_APP_MSEXCEL_TEMPL (STR_SVT_MIMETYPE_START+91)
+-#define STR_SVT_MIMETYPE_APP_MSPPOINT (STR_SVT_MIMETYPE_START+92)
+-#define STR_SVT_MIMETYPE_TEXT_VCALENDAR (STR_SVT_MIMETYPE_START+93)
+-#define STR_SVT_MIMETYPE_TEXT_ICALENDAR (STR_SVT_MIMETYPE_START+94)
+-#define STR_SVT_MIMETYPE_TEXT_XMLICALENDAR (STR_SVT_MIMETYPE_START+95)
+-#define STR_SVT_MIMETYPE_TEXT_CDE_CALENDAR_APP (STR_SVT_MIMETYPE_START+96)
+-#define STR_SVT_MIMETYPE_INET_MSG_RFC822 (STR_SVT_MIMETYPE_START+97)
+-#define STR_SVT_MIMETYPE_INET_MULTI_ALTERNATIVE (STR_SVT_MIMETYPE_START+98)
+-#define STR_SVT_MIMETYPE_INET_MULTI_DIGEST (STR_SVT_MIMETYPE_START+99)
+-#define STR_SVT_MIMETYPE_INET_MULTI_PARALLEL (STR_SVT_MIMETYPE_START+100)
+-#define STR_SVT_MIMETYPE_INET_MULTI_RELATED (STR_SVT_MIMETYPE_START+101)
+-#define STR_SVT_MIMETYPE_INET_MULTI_MIXED (STR_SVT_MIMETYPE_START+102)
+-#define STR_SVT_MIMETYPE_APP_IMPRESSPACKED (STR_SVT_MIMETYPE_START+103)
+-#define STR_SVT_MIMETYPE_APP_JAR (STR_SVT_MIMETYPE_START+104)
+-#define STR_SVT_MIMETYPE_IMAGE_PNG (STR_SVT_MIMETYPE_START+105)
+-#define STR_SVT_MIMETYPE_IMAGE_TIFF (STR_SVT_MIMETYPE_START+106)
+-
+-#define STR_SVT_MIMETYPE_APP_SXCALC (STR_SVT_MIMETYPE_START+107)
+-#define STR_SVT_MIMETYPE_APP_SXCHART (STR_SVT_MIMETYPE_START+108)
+-#define STR_SVT_MIMETYPE_APP_SXDRAW (STR_SVT_MIMETYPE_START+109)
+-#define STR_SVT_MIMETYPE_APP_SXMATH (STR_SVT_MIMETYPE_START+110)
+-#define STR_SVT_MIMETYPE_APP_SXWRITER (STR_SVT_MIMETYPE_START+111)
+-#define STR_SVT_MIMETYPE_APP_SXIMPRESS (STR_SVT_MIMETYPE_START+112)
+-#define STR_SVT_MIMETYPE_APP_SXGLOBAL (STR_SVT_MIMETYPE_START+113)
+-#define STR_SVT_MIMETYPE_APP_SXIPACKED (STR_SVT_MIMETYPE_START+114)
++#define STR_SVT_MIMETYPE_AUDIO_VORBIS (STR_SVT_MIMETYPE_START+13)
++#define STR_SVT_MIMETYPE_AUDIO_MIDI (STR_SVT_MIMETYPE_START+14)
++#define STR_SVT_MIMETYPE_AUDIO_WAV (STR_SVT_MIMETYPE_START+15)
++#define STR_SVT_MIMETYPE_IMAGE_GIF (STR_SVT_MIMETYPE_START+16)
++#define STR_SVT_MIMETYPE_IMAGE_JPEG (STR_SVT_MIMETYPE_START+17)
++#define STR_SVT_MIMETYPE_IMAGE_PCX (STR_SVT_MIMETYPE_START+18)
++#define STR_SVT_MIMETYPE_IMAGE_BMP (STR_SVT_MIMETYPE_START+19)
++#define STR_SVT_MIMETYPE_TEXT_HTML (STR_SVT_MIMETYPE_START+20)
++#define STR_SVT_MIMETYPE_TEXT_PLAIN (STR_SVT_MIMETYPE_START+21)
++#define STR_SVT_MIMETYPE_TEXT_URL (STR_SVT_MIMETYPE_START+22)
++#define STR_SVT_MIMETYPE_TEXT_VCARD (STR_SVT_MIMETYPE_START+23)
++#define STR_SVT_MIMETYPE_VIDEO_THEORA (STR_SVT_MIMETYPE_START+24)
++#define STR_SVT_MIMETYPE_VIDEO_VDO (STR_SVT_MIMETYPE_START+25)
++#define STR_SVT_MIMETYPE_VIDEO_MSVIDEO (STR_SVT_MIMETYPE_START+26)
++#define STR_SVT_MIMETYPE_X_STARMAIL (STR_SVT_MIMETYPE_START+27)
++#define STR_SVT_MIMETYPE_X_VRML (STR_SVT_MIMETYPE_START+28)
++#define STR_SVT_MIMETYPE_APP_STARHELP (STR_SVT_MIMETYPE_START+29)
++#define STR_SVT_MIMETYPE_APP_STARIMPRESS (STR_SVT_MIMETYPE_START+30)
++#define STR_SVT_MIMETYPE_APP_SCHED_CMB (STR_SVT_MIMETYPE_START+31)
++#define STR_SVT_MIMETYPE_APP_SCHED_EVT (STR_SVT_MIMETYPE_START+32)
++#define STR_SVT_MIMETYPE_APP_SCHED_TASK (STR_SVT_MIMETYPE_START+33)
++#define STR_SVT_MIMETYPE_APP_SCHED_TVIEW (STR_SVT_MIMETYPE_START+34)
++
++#define STR_SVT_MIMETYPE_CNT_MSG (STR_SVT_MIMETYPE_START+35)
++#define STR_SVT_MIMETYPE_CNT_DOCUMENT (STR_SVT_MIMETYPE_START+36)
++#define STR_SVT_MIMETYPE_CNT_POP3BOX (STR_SVT_MIMETYPE_START+37)
++#define STR_SVT_MIMETYPE_CNT_IMAPBOX (STR_SVT_MIMETYPE_START+38)
++#define STR_SVT_MIMETYPE_CNT_IMAPFLD (STR_SVT_MIMETYPE_START+39)
++#define STR_SVT_MIMETYPE_CNT_VIMBOX (STR_SVT_MIMETYPE_START+40)
++#define STR_SVT_MIMETYPE_CNT_VIMINBOX (STR_SVT_MIMETYPE_START+41)
++#define STR_SVT_MIMETYPE_CNT_BBBOX (STR_SVT_MIMETYPE_START+42)
++#define STR_SVT_MIMETYPE_CNT_VIM_BB (STR_SVT_MIMETYPE_START+43)
++#define STR_SVT_MIMETYPE_CNT_NEWSBOX (STR_SVT_MIMETYPE_START+44)
++#define STR_SVT_MIMETYPE_CNT_NEWSGRP (STR_SVT_MIMETYPE_START+45)
++#define STR_SVT_MIMETYPE_CNT_OUTBOX (STR_SVT_MIMETYPE_START+46)
++#define STR_SVT_MIMETYPE_CNT_FTPBOX (STR_SVT_MIMETYPE_START+47)
++#define STR_SVT_MIMETYPE_CNT_FTPFLD (STR_SVT_MIMETYPE_START+48)
++#define STR_SVT_MIMETYPE_CNT_FTPFILE (STR_SVT_MIMETYPE_START+49)
++#define STR_SVT_MIMETYPE_CNT_FTPLINK (STR_SVT_MIMETYPE_START+50)
++#define STR_SVT_MIMETYPE_CNT_HTTPBOX (STR_SVT_MIMETYPE_START+51)
++#define STR_SVT_MIMETYPE_CNT_FSYSBOX (STR_SVT_MIMETYPE_START+52)
++#define STR_SVT_MIMETYPE_CNT_FSYSFLD (STR_SVT_MIMETYPE_START+53)
++#define STR_SVT_MIMETYPE_CNT_FSYSFILE (STR_SVT_MIMETYPE_START+54)
++#define STR_SVT_MIMETYPE_CNT_FSYSURLFILE (STR_SVT_MIMETYPE_START+55)
++#define STR_SVT_MIMETYPE_CNT_PUBLBOX (STR_SVT_MIMETYPE_START+56)
++#define STR_SVT_MIMETYPE_CNT_SRCHBOX (STR_SVT_MIMETYPE_START+57)
++#define STR_SVT_MIMETYPE_CNT_SUBSCRBOX (STR_SVT_MIMETYPE_START+58)
++#define STR_SVT_MIMETYPE_CNT_BOOKMARK (STR_SVT_MIMETYPE_START+59)
++#define STR_SVT_MIMETYPE_CNT_CDF (STR_SVT_MIMETYPE_START+60)
++#define STR_SVT_MIMETYPE_CNT_CDFSUB (STR_SVT_MIMETYPE_START+61)
++#define STR_SVT_MIMETYPE_CNT_CDFITEM (STR_SVT_MIMETYPE_START+62)
++#define STR_SVT_MIMETYPE_CNT_STARCHANNEL (STR_SVT_MIMETYPE_START+63)
++#define STR_SVT_MIMETYPE_CNT_TRASHBOX (STR_SVT_MIMETYPE_START+64)
++#define STR_SVT_MIMETYPE_CNT_TRASH (STR_SVT_MIMETYPE_START+65)
++#define STR_SVT_MIMETYPE_CNT_REMOV_VOL (STR_SVT_MIMETYPE_START+66)
++#define STR_SVT_MIMETYPE_CNT_FIX_VOL (STR_SVT_MIMETYPE_START+67)
++#define STR_SVT_MIMETYPE_CNT_REM_VOL (STR_SVT_MIMETYPE_START+68)
++#define STR_SVT_MIMETYPE_CNT_RAM_VOL (STR_SVT_MIMETYPE_START+69)
++#define STR_SVT_MIMETYPE_CNT_CDROM (STR_SVT_MIMETYPE_START+70)
++#define STR_SVT_MIMETYPE_CNT_DISK_35 (STR_SVT_MIMETYPE_START+71)
++#define STR_SVT_MIMETYPE_CNT_DISK_525 (STR_SVT_MIMETYPE_START+72)
++#define STR_SVT_MIMETYPE_CNT_TAPEDRIVE (STR_SVT_MIMETYPE_START+73)
++#define STR_SVT_MIMETYPE_APP_GAL (STR_SVT_MIMETYPE_START+74)
++#define STR_SVT_MIMETYPE_APP_GAL_THEME (STR_SVT_MIMETYPE_START+75)
++#define STR_SVT_MIMETYPE_CNT_SEPARATOR (STR_SVT_MIMETYPE_START+76)
++#define STR_SVT_MIMETYPE_APP_STARW_GLOB (STR_SVT_MIMETYPE_START+77)
++#define STR_SVT_MIMETYPE_APP_SDM (STR_SVT_MIMETYPE_START+78)
++#define STR_SVT_MIMETYPE_APP_SMD (STR_SVT_MIMETYPE_START+79)
++#define STR_SVT_MIMETYPE_APP_STARW_WEB (STR_SVT_MIMETYPE_START+80)
++#define STR_SVT_MIMETYPE_SCHEDULE (STR_SVT_MIMETYPE_START+81)
++#define STR_SVT_MIMETYPE_SCHEDULE_EVT (STR_SVT_MIMETYPE_START+82)
++#define STR_SVT_MIMETYPE_SCHEDULE_TASK (STR_SVT_MIMETYPE_START+83)
++#define STR_SVT_MIMETYPE_SCHEDULE_FEVT (STR_SVT_MIMETYPE_START+84)
++#define STR_SVT_MIMETYPE_SCHEDULE_FTASK (STR_SVT_MIMETYPE_START+85)
++#define STR_SVT_MIMETYPE_FRAMESET (STR_SVT_MIMETYPE_START+86)
++#define STR_SVT_MIMETYPE_MACRO (STR_SVT_MIMETYPE_START+87)
++#define STR_SVT_MIMETYPE_CNT_SFSYSFOLDER (STR_SVT_MIMETYPE_START+88)
++#define STR_SVT_MIMETYPE_CNT_SFSYSFILE (STR_SVT_MIMETYPE_START+89)
++#define STR_SVT_MIMETYPE_APP_TEMPLATE (STR_SVT_MIMETYPE_START+90)
++#define STR_SVT_MIMETYPE_IMAGE_GENERIC (STR_SVT_MIMETYPE_START+91)
++#define STR_SVT_MIMETYPE_APP_MSEXCEL (STR_SVT_MIMETYPE_START+92)
++#define STR_SVT_MIMETYPE_APP_MSEXCEL_TEMPL (STR_SVT_MIMETYPE_START+93)
++#define STR_SVT_MIMETYPE_APP_MSPPOINT (STR_SVT_MIMETYPE_START+94)
++#define STR_SVT_MIMETYPE_TEXT_VCALENDAR (STR_SVT_MIMETYPE_START+95)
++#define STR_SVT_MIMETYPE_TEXT_ICALENDAR (STR_SVT_MIMETYPE_START+96)
++#define STR_SVT_MIMETYPE_TEXT_XMLICALENDAR (STR_SVT_MIMETYPE_START+97)
++#define STR_SVT_MIMETYPE_TEXT_CDE_CALENDAR_APP (STR_SVT_MIMETYPE_START+98)
++#define STR_SVT_MIMETYPE_INET_MSG_RFC822 (STR_SVT_MIMETYPE_START+99)
++#define STR_SVT_MIMETYPE_INET_MULTI_ALTERNATIVE (STR_SVT_MIMETYPE_START+100)
++#define STR_SVT_MIMETYPE_INET_MULTI_DIGEST (STR_SVT_MIMETYPE_START+101)
++#define STR_SVT_MIMETYPE_INET_MULTI_PARALLEL (STR_SVT_MIMETYPE_START+102)
++#define STR_SVT_MIMETYPE_INET_MULTI_RELATED (STR_SVT_MIMETYPE_START+103)
++#define STR_SVT_MIMETYPE_INET_MULTI_MIXED (STR_SVT_MIMETYPE_START+104)
++#define STR_SVT_MIMETYPE_APP_IMPRESSPACKED (STR_SVT_MIMETYPE_START+105)
++#define STR_SVT_MIMETYPE_APP_JAR (STR_SVT_MIMETYPE_START+106)
++#define STR_SVT_MIMETYPE_IMAGE_PNG (STR_SVT_MIMETYPE_START+107)
++#define STR_SVT_MIMETYPE_IMAGE_TIFF (STR_SVT_MIMETYPE_START+108)
+
-+ if (mbPlayPending)
-+ mbPlayPending = ((newstate == GST_STATE_READY) || (newstate == GST_STATE_PAUSED));
- }
- default:
- break;
-@@ -250,6 +255,7 @@
-
- if( mpPlaybin != NULL ) {
- gst_element_set_state( mpPlaybin, GST_STATE_NULL );
-+ mbPlayPending = false;
- g_object_unref( mpPlaybin );
- }
-
-@@ -281,6 +287,7 @@
- preparePlaybin( rURL, true );
-
- gst_element_set_state( mpPlaybin, GST_STATE_PAUSED );
-+ mbPlayPending = false;
-
- bRet = true;
- }
-@@ -305,6 +312,7 @@
- if( mbInitialized && NULL != mpPlaybin )
- {
- gst_element_set_state( mpPlaybin, GST_STATE_PLAYING );
-+ mbPlayPending = true;
- }
- }
-
-@@ -317,6 +325,7 @@
- if( mpPlaybin )
- gst_element_set_state( mpPlaybin, GST_STATE_PAUSED );
++#define STR_SVT_MIMETYPE_APP_SXCALC (STR_SVT_MIMETYPE_START+109)
++#define STR_SVT_MIMETYPE_APP_SXCHART (STR_SVT_MIMETYPE_START+110)
++#define STR_SVT_MIMETYPE_APP_SXDRAW (STR_SVT_MIMETYPE_START+111)
++#define STR_SVT_MIMETYPE_APP_SXMATH (STR_SVT_MIMETYPE_START+112)
++#define STR_SVT_MIMETYPE_APP_SXWRITER (STR_SVT_MIMETYPE_START+113)
++#define STR_SVT_MIMETYPE_APP_SXIMPRESS (STR_SVT_MIMETYPE_START+114)
++#define STR_SVT_MIMETYPE_APP_SXGLOBAL (STR_SVT_MIMETYPE_START+115)
++#define STR_SVT_MIMETYPE_APP_SXIPACKED (STR_SVT_MIMETYPE_START+116)
+ #define STR_SVT_MIMETYPE_END (STR_SVT_MIMETYPE_APP_SXIPACKED)
-+ mbPlayPending = false;
- DBG( "stop %p", mpPlaybin );
- }
+ #define STR_COLUM_DT_AUTO (STR_SVT_MIMETYPE_END+1)
+--- svl/source/misc/inettype.cxx
++++ svl/source/misc/inettype.cxx
+@@ -298,6 +298,7 @@
+ { CONTENT_TYPE_STR_AUDIO_AIFF, CONTENT_TYPE_AUDIO_AIFF, "aif" },
+ { CONTENT_TYPE_STR_AUDIO_BASIC, CONTENT_TYPE_AUDIO_BASIC, "au" },
+ { CONTENT_TYPE_STR_AUDIO_MIDI, CONTENT_TYPE_AUDIO_MIDI, "mid" },
++ { CONTENT_TYPE_STR_AUDIO_VORBIS, CONTENT_TYPE_AUDIO_VORBIS, "ogg" },
+ { CONTENT_TYPE_STR_AUDIO_WAV, CONTENT_TYPE_AUDIO_WAV, "wav" },
+ { CONTENT_TYPE_STR_IMAGE_GENERIC, CONTENT_TYPE_IMAGE_GENERIC, "tmp" },
+ { CONTENT_TYPE_STR_IMAGE_GIF, CONTENT_TYPE_IMAGE_GIF, "gif" },
+@@ -328,6 +329,7 @@
+ { CONTENT_TYPE_STR_TEXT_VCALENDAR, CONTENT_TYPE_TEXT_VCALENDAR,
+ "vcs" },
+ { CONTENT_TYPE_STR_TEXT_VCARD, CONTENT_TYPE_TEXT_VCARD, "vcf" },
++ { CONTENT_TYPE_STR_VIDEO_THEORA, CONTENT_TYPE_VIDEO_THEORA, "ogg" },
+ { CONTENT_TYPE_STR_VIDEO_VDO, CONTENT_TYPE_VIDEO_VDO, "vdo" },
+ { CONTENT_TYPE_STR_VIDEO_MSVIDEO, CONTENT_TYPE_VIDEO_MSVIDEO, "avi" },
+ { CONTENT_TYPE_STR_X_STARMAIL, CONTENT_TYPE_X_STARMAIL, "smd" },
+@@ -356,6 +358,7 @@
+ STR_SVT_MIMETYPE_AUDIO_AIFF, // CONTENT_TYPE_AUDIO_AIFF
+ STR_SVT_MIMETYPE_AUDIO_BASIC, // CONTENT_TYPE_AUDIO_BASIC
+ STR_SVT_MIMETYPE_AUDIO_MIDI, // CONTENT_TYPE_AUDIO_MIDI
++ STR_SVT_MIMETYPE_AUDIO_VORBIS, // CONTENT_TYPE_AUDIO_VORBIS
+ STR_SVT_MIMETYPE_AUDIO_WAV, // CONTENT_TYPE_AUDIO_WAV
+ STR_SVT_MIMETYPE_IMAGE_GIF, // CONTENT_TYPE_IMAGE_GIF
+ STR_SVT_MIMETYPE_IMAGE_JPEG, // CONTENT_TYPE_IMAGE_JPEG
+@@ -367,6 +370,7 @@
+ STR_SVT_MIMETYPE_TEXT_PLAIN, // CONTENT_TYPE_TEXT_PLAIN
+ STR_SVT_MIMETYPE_TEXT_URL, // CONTENT_TYPE_TEXT_URL
+ STR_SVT_MIMETYPE_TEXT_VCARD, // CONTENT_TYPE_TEXT_VCARD
++ STR_SVT_MIMETYPE_VIDEO_THEORA, // CONTENT_TYPE_VIDEO_THEORA
+ STR_SVT_MIMETYPE_VIDEO_VDO, // CONTENT_TYPE_VIDEO_VDO
+ STR_SVT_MIMETYPE_VIDEO_MSVIDEO, // CONTENT_TYPE_VIDEO_MSVIDEO
+ STR_SVT_MIMETYPE_CNT_MSG, // CONTENT_TYPE_X_CNT_MESSAGE
+@@ -502,6 +506,7 @@
+ { "met", CONTENT_TYPE_IMAGE_GENERIC, "" },
+ { "mid", CONTENT_TYPE_AUDIO_MIDI, "" },
+ { "midi", CONTENT_TYPE_AUDIO_MIDI, "" },
++ { "ogg", CONTENT_TYPE_AUDIO_VORBIS, "" },
+ { "pbm", CONTENT_TYPE_IMAGE_GENERIC, "" },
+ { "pcd", CONTENT_TYPE_IMAGE_GENERIC, "" },
+ { "pct", CONTENT_TYPE_IMAGE_GENERIC, "" },
+--- svl/source/misc/mediatyp.src
++++ svl/source/misc/mediatyp.src
+@@ -115,6 +115,168 @@
+ Text [ en-US ] = "Audio file" ;
+ };
-@@ -325,10 +334,10 @@
- sal_Bool SAL_CALL Player::isPlaying()
- throw (uno::RuntimeException)
++String STR_SVT_MIMETYPE_AUDIO_VORBIS
++{
++ Text [ de ] = "Audio-Datei" ;
++ Text [ en-US ] = "Audio file" ;
++ Text [ af ] = "Oudiolêer" ;
++ Text [ ar ] = "ملف صوتي" ;
++ Text [ as-IN ] = "অডিঅ' ফাইল" ;
++ Text [ be-BY ] = "Гукавы файл" ;
++ Text [ bg ] = "Аудиофайл" ;
++ Text [ br ] = "Restr klev" ;
++ Text [ bs ] = "Audio datoteka" ;
++ Text [ ca ] = "Fitxer d'àudio" ;
++ Text [ cs ] = "Zvukový soubor" ;
++ Text [ cy ] = "Ffeil sain" ;
++ Text [ da ] = "Lydfil" ;
++ Text [ el ] = "Αρχείο ήχου" ;
++ Text [ en-GB ] = "Audio file" ;
++ Text [ en-ZA ] = "Audio file" ;
++ Text [ eo ] = "Audio file" ;
++ Text [ es ] = "Archivo audio" ;
++ Text [ et ] = "Audiofail" ;
++ Text [ fa ] = "پروندهی صوتی" ;
++ Text [ fi ] = "Äänitiedosto" ;
++ Text [ fr ] = "Fichier audio" ;
++ Text [ ga ] = "Comhad fuaime" ;
++ Text [ gu ] = "ઓડિયો ફાઈલ" ;
++ Text [ gu-IN ] = "ઓડિયો ફાઈલ" ;
++ Text [ he ] = "קובץ שמע" ;
++ Text [ hi-IN ] = "Audio file" ;
++ Text [ hr ] = "Zvučna datoteka" ;
++ Text [ hu ] = "Hangfájl" ;
++ Text [ it ] = "File audio" ;
++ Text [ ja ] = "オーディオ ファイル" ;
++ Text [ ka ] = "ხმოვანი ფაილი" ;
++ Text [ km ] = "ឯកសារសម្លេង" ;
++ Text [ ko ] = "오디오 파일" ;
++ Text [ ku ] = "Pelgeha deng" ;
++ Text [ lt ] = "Garso failas" ;
++ Text [ mk ] = "Аудиодатотека" ;
++ Text [ ml-IN ] = "ഓഡിയോ ഫയല്" ;
++ Text [ mr-IN ] = "श्राव्य धारिका" ;
++ Text [ nb ] = "Lydfil" ;
++ Text [ ne ] = "अडियो फाइल" ;
++ Text [ nl ] = "Audiobestand" ;
++ Text [ nn ] = "Lydfil" ;
++ Text [ nr ] = "Ifayili elilalelwako" ;
++ Text [ ns ] = "Faele ya odiyo" ;
++ Text [ or-IN ] = "ଅଡିଓ ଫାଇଲ" ;
++ Text [ pa-IN ] = "ਆਡੀਓ ਫਾਇਲ" ;
++ Text [ pl ] = "Plik dźwiękowy" ;
++ Text [ pt ] = "Ficheiro áudio" ;
++ Text [ pt-BR ] = "Arquivo de áudio" ;
++ Text [ ru ] = "Аудио файл" ;
++ Text [ rw ] = "Audio file" ;
++ Text [ sh-YU ] = "Zvučna datoteka" ;
++ Text [ sk ] = "Zvukový súbor" ;
++ Text [ sl ] = "Zvočna datoteka" ;
++ Text [ sr-CS ] = "Звучна датотека" ;
++ Text [ ss ] = "I-Odiyofayela" ;
++ Text [ st ] = "Audiyo faele" ;
++ Text [ sv ] = "Audio-fil" ;
++ Text [ sw-TZ ] = "Faili la kusikia" ;
++ Text [ ta ] = "Audio file" ;
++ Text [ ta-IN ] = "Audio file" ;
++ Text [ te-IN ] = "శ్రవణ దస్త్రం" ;
++ Text [ tg ] = "Аудио-дафтар" ;
++ Text [ th ] = "Audio file" ;
++ Text [ ti-ER ] = "ናይ ድምጺ ፋይል" ;
++ Text [ tr ] = "Ses dosyası" ;
++ Text [ ts ] = "Fayili ya Xitlanga-mpfumawulo" ;
++ Text [ uk ] = "Audio file" ;
++ Text [ ur-IN ] = "آڈیوفائل" ;
++ Text [ ve ] = "Faela ya odio" ;
++ Text [ vi ] = "Tập tin âm thanh" ;
++ Text [ xh ] = "Ifayili Yokumanyelwayo" ;
++ Text [ zh-CN ] = "声频文件" ;
++ Text [ zh-TW ] = "聲頻檔案" ;
++ Text [ zu ] = "Ifayela eliveza umsindo" ;
++ Text [ x-comment ] = " ";
++};
++
++String STR_SVT_MIMETYPE_VIDEO_THEORA
++{
++ Text [ de ] = "Video-Datei" ;
++ Text [ en-US ] = "Video file" ;
++ Text [ af ] = "Videolêer" ;
++ Text [ ar ] = "ملف فيديو" ;
++ Text [ as-IN ] = "ভিডিঅ' ফাইল" ;
++ Text [ be-BY ] = "Файл відэа" ;
++ Text [ bg ] = "Видеофайл" ;
++ Text [ br ] = "Restr video" ;
++ Text [ bs ] = "Video datoteka" ;
++ Text [ ca ] = "Fitxer de vídeo" ;
++ Text [ cs ] = "Video soubor" ;
++ Text [ cy ] = "Ffeil fideo" ;
++ Text [ da ] = "Video-fil" ;
++ Text [ el ] = "Αρχείο Video" ;
++ Text [ en-GB ] = "Video file" ;
++ Text [ en-ZA ] = "Video file" ;
++ Text [ eo ] = "Video file" ;
++ Text [ es ] = "Archivo vídeo" ;
++ Text [ et ] = "Videofail" ;
++ Text [ fa ] = "پروندهی ویدئویی" ;
++ Text [ fi ] = "Videotiedosto" ;
++ Text [ fr ] = "Fichier vidéo" ;
++ Text [ ga ] = "Físchomhad" ;
++ Text [ gu ] = "વીડિયો ફાઈલ" ;
++ Text [ gu-IN ] = "વીડિયો ફાઈલ" ;
++ Text [ he ] = "קובץ וידיאו" ;
++ Text [ hi-IN ] = "Video file" ;
++ Text [ hr ] = "Video datoteka" ;
++ Text [ hu ] = "Videofájl" ;
++ Text [ it ] = "File video" ;
++ Text [ ja ] = "ビデオ ファイル" ;
++ Text [ ka ] = "ვიდეო ფაილი" ;
++ Text [ km ] = "ឯកសារវីដេអូ" ;
++ Text [ ko ] = "비디오 파일" ;
++ Text [ ku ] = "Pelgeha vîdeo" ;
++ Text [ lt ] = "Vaizdo failas" ;
++ Text [ mk ] = "Видеодатотека" ;
++ Text [ ml-IN ] = "വീഡിയോ ഫയല്" ;
++ Text [ mr-IN ] = "चित्रमुद्रक धारिका" ;
++ Text [ nb ] = "Videofil" ;
++ Text [ ne ] = "भिडियो फाइल" ;
++ Text [ nl ] = "Videobestand" ;
++ Text [ nn ] = "Videofil" ;
++ Text [ nr ] = "Ifayili levidiyo" ;
++ Text [ ns ] = "Faele ya bidio" ;
++ Text [ or-IN ] = "ଭିଡିଓ ଫାଇଲ" ;
++ Text [ pa-IN ] = "ਵੀਡਿਓ ਫਾਇਲ" ;
++ Text [ pl ] = "Plik filmowy" ;
++ Text [ pt ] = "Ficheiro de vídeo" ;
++ Text [ pt-BR ] = "Arquivo de vídeo" ;
++ Text [ ru ] = "Файл видео" ;
++ Text [ rw ] = "Video file" ;
++ Text [ sh-YU ] = "Video datoteka" ;
++ Text [ sk ] = "Video súbor" ;
++ Text [ sl ] = "Video-datoteka" ;
++ Text [ sr-CS ] = "Видео датотека" ;
++ Text [ ss ] = "Ividiyofayela" ;
++ Text [ st ] = "Bideo faele" ;
++ Text [ sv ] = "Video-fil" ;
++ Text [ sw-TZ ] = "Faili la video" ;
++ Text [ ta ] = "Video file" ;
++ Text [ ta-IN ] = "Video file" ;
++ Text [ te-IN ] = "దృశ్య దస్త్రము" ;
++ Text [ tg ] = "Видео-дафтар" ;
++ Text [ th ] = "Video file" ;
++ Text [ ti-ER ] = "ናይ ቪድዮ ፋይል" ;
++ Text [ tr ] = "Görüntü dosyası" ;
++ Text [ ts ] = "Fayili ya Vhidiyo" ;
++ Text [ uk ] = "Video file" ;
++ Text [ ur-IN ] = "وڈیوفائل" ;
++ Text [ ve ] = "Faela ya vidio" ;
++ Text [ vi ] = "Tập tin ảnh động" ;
++ Text [ xh ] = "Ifayili yevidiyo" ;
++ Text [ zh-CN ] = "影视文件" ;
++ Text [ zh-TW ] = "視頻檔案" ;
++ Text [ zu ] = "Ifayela levidiyo" ;
++ Text [ x-comment ] = " ";
++};
++
+ String STR_SVT_MIMETYPE_IMAGE_GIF
{
-- bool bRet = false;
-+ bool bRet = mbPlayPending;
-
- // return whether the pipeline is in PLAYING STATE or not
-- if( mbInitialized && mpPlaybin )
-+ if( !mbPlayPending && mbInitialized && mpPlaybin )
- {
- bRet = GST_STATE_PLAYING == GST_STATE( mpPlaybin );
- }
-diff -ru /usr/src/redhat/BUILD/OOF680_m18/avmedia/source/gstreamer/gstplayer.hxx source/gstreamer/gstplayer.hxx
---- avmedia.orig/source/gstreamer/gstplayer.hxx 2007-08-07 19:50:02.000000000 +0100
-+++ avmedia/source/gstreamer/gstplayer.hxx 2007-08-07 10:30:45.000000000 +0100
-@@ -101,6 +101,7 @@
- sal_Bool mbFakeVideo;
-
- gdouble mnUnmutedVolume;
-+ sal_Bool mbPlayPending;
- sal_Bool mbMuted;
- sal_Bool mbLooping;
- sal_Bool mbInitialized;
-diff -ru avmedia.orig/source/gstreamer/gstplayer.cxx avmedia/source/gstreamer/gstplayer.cxx
---- avmedia.orig/source/gstreamer/gstplayer.cxx 2009-04-28 08:28:19.000000000 +0100
-+++ avmedia/source/gstreamer/gstplayer.cxx 2009-04-28 09:11:50.000000000 +0100
-@@ -142,6 +142,8 @@
- //DBG( "EOS, reset state to NULL" );
- gst_element_set_state( mpPlaybin, GST_STATE_READY );
- mbPlayPending = false;
-+ if (mbLooping)
-+ start();
- break;
- case GST_MESSAGE_STATE_CHANGED:
- if( message->src == GST_OBJECT( mpPlaybin ) ) {
+ Text [ en-US ] = "Graphics" ;
openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch:
prj/build.lst | 2 -
scripts/soffice.sh | 12 +++--------
util/makefile.mk | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 59 insertions(+), 9 deletions(-)
Index: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch 1 Jan 2010 07:29:09 -0000 1.14
+++ openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch 13 Jul 2010 10:16:52 -0000 1.15
@@ -2,8 +2,8 @@ diff -r a92d0bd6747b desktop/prj/build.l
--- a/desktop/prj/build.lst Mon Dec 28 16:11:17 2009 +0100
+++ b/desktop/prj/build.lst Wed Dec 30 09:34:10 2009 +0100
@@ -1,4 +1,4 @@
--dt desktop : l10n sfx2 stoc uui BERKELEYDB:berkeleydb sysui SO:sysui_so BOOST:boost svx xmlhelp sal unoil officecfg NULL
-+dt desktop : l10n sfx2 stoc uui BERKELEYDB:berkeleydb sysui SO:sysui_so BOOST:boost svx xmlhelp sal unoil officecfg sc sd sw NULL
+-dt desktop : l10n sfx2 stoc BERKELEYDB:berkeleydb sysui SO:sysui_so BOOST:boost svx xmlhelp sal unoil officecfg offuh NULL
++dt desktop : l10n sfx2 stoc BERKELEYDB:berkeleydb sysui SO:sysui_so BOOST:boost svx xmlhelp sal unoil officecfg offuh sc sd sw NULL
dt desktop usr1 - all dt_mkout NULL
dt desktop\inc nmake - all dt_inc NULL
dt desktop\prj get - all dt_prj NULL
openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch:
extensions/source/abpilot/abspilot.cxx | 8 ---
openoffice.org/extras/source/database/makefile.mk | 4 -
openoffice.org/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu | 8 +++
openoffice.org/officecfg/registry/data/org/openoffice/Office/Writer.xcu | 26 ++++++++++
4 files changed, 38 insertions(+), 8 deletions(-)
Index: openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch 1 Sep 2008 12:09:07 -0000 1.3
+++ openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch 13 Jul 2010 10:16:52 -0000 1.4
@@ -1,6 +1,6 @@
--- openoffice.org/officecfg/registry/data/org/openoffice/Office/Writer.xcu.orig 2005-04-18 20:39:35.000000000 +0530
+++ openoffice.org/officecfg/registry/data/org/openoffice/Office/Writer.xcu 2005-05-10 17:30:14.000000000 +0530
-@@ -43,6 +43,32 @@
+@@ -40,6 +40,32 @@
<prop oor:name="IsHideEmptyParagraphs" >
<value>true</value>
</prop>
@@ -30,7 +30,7 @@
+ </node>
+ </node>
+ </node>
- <prop oor:name="EMailSupported" install:module="javamail">
+ <prop oor:name="EMailSupported">
<value>true</value>
</prop>
--- openoffice.org/extras/source/database/makefile.mk.bakj 2005-03-16 18:49:33.251075928 +0530
@@ -48,7 +48,7 @@
ZIP2LIST = biblio.dbf biblio.dbt
--- openoffice.org/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu.bakj 2005-03-16 18:51:43.777536725 +0530
+++ openoffice.org/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu 2005-03-16 18:52:51.471404727 +0530
-@@ -187,6 +187,14 @@
+@@ -153,6 +153,14 @@
</node>
</node>
<node oor:name="RegisteredNames">
@@ -60,7 +60,7 @@
+ <value>EvolutionLocal</value>
+ </prop>
+ </node>
- <node oor:name="Bibliography" oor:op="replace">
+ <node oor:name="org.openoffice.Bibliography" oor:op="replace">
<prop oor:name="Location" oor:type="xs:string">
<value>$(userurl)/database/biblio.odb</value>
--- openoffice.org.orig/extensions/source/abpilot/abspilot.cxx 19 Dec 2005 17:26:24 -0000 1.13
openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch:
openoffice.org.orig/sw/source/ui/inc/titlepage.hxx | 129 +++
openoffice.org/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu | 5
openoffice.org/sw/source/ui/misc/titlepage.cxx | 375 ++++++++++
openoffice.org/sw/source/ui/misc/titlepage.hrc | 58 +
openoffice.org/sw/source/ui/misc/titlepage.src | 260 ++++++
sw/inc/cmdid.h | 2
sw/inc/globals.hrc | 5
sw/inc/helpid.h | 1
sw/inc/rcid.hrc | 2
sw/inc/swabstdlg.hxx | 1
sw/sdi/_basesh.sdi | 6
sw/sdi/swriter.sdi | 25
sw/source/ui/dialog/swdlgfact.cxx | 9
sw/source/ui/dialog/swdlgfact.hxx | 1
sw/source/ui/inc/swmn_tmpl.hrc | 9
sw/source/ui/misc/makefile.mk | 4
sw/source/ui/shells/basesh.cxx | 8
sw/uiconfig/swriter/menubar/menubar.xml | 1
sw/util/makefile.mk | 1
19 files changed, 897 insertions(+), 5 deletions(-)
Index: openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch 10 Oct 2009 15:48:45 -0000 1.4
+++ openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch 13 Jul 2010 10:16:52 -0000 1.5
@@ -140,24 +140,6 @@ diff -u -r1.66 swriter.sdi
SfxVoidItem PageDown FN_PAGEDOWN
()
[
-Index: sdi/swslots.src
-===================================================================
-RCS file: /cvs/sw/sw/sdi/swslots.src,v
-retrieving revision 1.131
-diff -u -r1.131 swslots.src
---- openoffice.org.orig/sw/sdi/swslots.src 27 Jun 2007 13:16:20 -0000 1.131
-+++ openoffice.org/sw/sdi/swslots.src 10 Jul 2007 12:57:02 -0000
-@@ -307,6 +307,10 @@
- {
- Slotname [ en-US ] = "Page Settings";
- };
-+SfxSlotInfo FN_FORMAT_PAGE_DLG
-+{
-+ Slotname [ de ] = "~Title Page...";
-+};
- SfxSlotInfo FN_FORMAT_RESET
- {
- Slotname [ en-US ] = "Reset Font Attributes";
Index: source/ui/dialog/swdlgfact.cxx
===================================================================
RCS file: /cvs/sw/sw/source/ui/dialog/swdlgfact.cxx,v
@@ -280,14 +262,14 @@ retrieving revision 1.28
diff -u -r1.28 menubar.xml
--- openoffice.org.orig/sw/uiconfig/swriter/menubar/menubar.xml 29 May 2007 14:49:53 -0000 1.28
+++ openoffice.org/sw/uiconfig/swriter/menubar/menubar.xml 10 Jul 2007 13:13:00 -0000
-@@ -210,6 +210,7 @@
- <menu:menuitem menu:id=".uno:ParagraphDialog"/>
- <menu:menuitem menu:id=".uno:BulletsAndNumberingDialog"/>
- <menu:menuitem menu:id=".uno:PageDialog"/>
-+ <menu:menuitem menu:id=".uno:TitlePageDialog"/>
- <menu:menuseparator/>
- <menu:menu menu:id=".uno:TransliterateMenu">
- <menu:menupopup>
+@@ -217,6 +217,7 @@
+ <menu:menuitem menu:id=".uno:ParagraphDialog"/>
+ <menu:menuitem menu:id=".uno:BulletsAndNumberingDialog"/>
+ <menu:menuitem menu:id=".uno:PageDialog"/>
++ <menu:menuitem menu:id=".uno:TitlePageDialog"/>
+ <menu:menuseparator/>
+ <menu:menu menu:id=".uno:TransliterateMenu">
+ <menu:menupopup>
Index: util/makefile.mk
===================================================================
RCS file: /cvs/sw/sw/util/makefile.mk,v
@@ -715,7 +697,7 @@ diff -ru openoffice.org/officecfg/regist
+};
--- /dev/null 2008-10-28 16:28:18.200260089 +0000
+++ openoffice.org/sw/source/ui/misc/titlepage.cxx 2008-11-13 12:58:11.000000000 +0000
-@@ -0,0 +1,401 @@
+@@ -0,0 +1,375 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
@@ -758,41 +740,15 @@ diff -ru openoffice.org/officecfg/regist
+#undef SW_DLLIMPLEMENTATION
+#endif
+
-+#ifndef _SFXVIEWFRM_HXX //autogen
+#include <sfx2/viewfrm.hxx>
-+#endif
-+
-+#ifndef _SFXSTYLE_HXX //autogen
-+#include <svtools/style.hxx>
-+#endif
-+
-+#ifndef _SV_MSGBOX_HXX //autogen
+#include <vcl/msgbox.hxx>
-+#endif
-+
-+#ifndef _SWVIEW_HXX //autogen
+#include <view.hxx>
-+#endif
-+#ifndef _SWMODULE_HXX
+#include <swmodule.hxx>
-+#endif
-+#ifndef _WRTSH_HXX //autogen
+#include <wrtsh.hxx>
-+#endif
-+#ifndef _POOLFMT_HXX
+#include <poolfmt.hxx>
-+#endif
-+#ifndef _SWDOCSH_HXX //autogen
+#include <docsh.hxx>
-+#endif
-+
-+#ifndef _CHARFMT_HXX //autogen
+#include <charfmt.hxx>
-+#endif
-+
-+#ifndef _DOCSTYLE_HXX //autogen
+#include <docstyle.hxx>
-+#endif
+
+#include "fldbas.hxx"
+#include "lineinfo.hxx"
openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch:
unopkg.sh | 33 +++++++++++++++++++++++++++++++--
1 file changed, 31 insertions(+), 2 deletions(-)
Index: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch 12 Apr 2010 09:24:21 -0000 1.8
+++ openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch 13 Jul 2010 10:16:52 -0000 1.9
@@ -1,6 +1,6 @@
--- openoffice.org.orig/desktop/scripts/unopkg.sh 2008-01-14 15:55:26.000000000 +0000
+++ openoffice.org/desktop/scripts/unopkg.sh 2008-02-14 10:52:10.000000000 +0000
-@@ -47,6 +47,33 @@
+@@ -43,6 +43,33 @@
sd_prog=`pwd`
cd "$sd_cwd"
@@ -34,8 +34,8 @@
#collect all bootstrap variables specified on the command line
#so that they can be passed as arguments to javaldx later on
for arg in $@
-@@ -76,6 +99,8 @@
- export PATH
+@@ -71,6 +98,8 @@
+ # SAL_NO_XINITTHREADS=true; export SAL_NO_XINITTHREADS
# execute binary
-exec "$sd_prog/unopkg.bin" "$@" \
openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch:
fpicker/source/office/iodlg.src | 5 +
fpicker/source/unx/gnome/SalGtkFilePicker.cxx | 95 ++++++++++++++++++--------
fpicker/source/unx/gnome/SalGtkFilePicker.hxx | 6 +
fpicker/source/unx/gnome/resourceprovider.cxx | 3
fpicker/source/unx/gnome/resourceprovider.hxx | 1
svtools/inc/svtools/svtools.hrc | 1
6 files changed, 82 insertions(+), 29 deletions(-)
Index: openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch 14 Jan 2009 16:16:30 -0000 1.2
+++ openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch 13 Jul 2010 10:16:52 -0000 1.3
@@ -50,7 +50,7 @@ diff -ru fpicker.orig/source/unx/gnome/r
diff -ru fpicker.orig/source/unx/gnome/SalGtkFilePicker.cxx fpicker/source/unx/gnome/SalGtkFilePicker.cxx
--- openoffice.org.orig/fpicker/source/unx/gnome/SalGtkFilePicker.cxx 2009-01-14 11:56:02.000000000 +0000
+++ openoffice.org/fpicker/source/unx/gnome/SalGtkFilePicker.cxx 2009-01-14 15:42:05.000000000 +0000
-@@ -55,6 +55,7 @@
+@@ -52,6 +52,7 @@
#include <iostream>
#include <algorithm>
@@ -58,7 +58,7 @@ diff -ru fpicker.orig/source/unx/gnome/S
#include "resourceprovider.hxx"
#ifndef _SV_RC_H
#include <tools/rc.hxx>
-@@ -180,6 +181,7 @@
+@@ -181,6 +182,7 @@
mbPreviewState( sal_False ),
mHID_Preview( 0 ),
m_pPreview( NULL ),
@@ -66,7 +66,7 @@ diff -ru fpicker.orig/source/unx/gnome/S
m_PreviewImageWidth( 256 ),
m_PreviewImageHeight( 256 )
{
-@@ -689,7 +691,7 @@
+@@ -692,7 +694,7 @@
m_pFilterList = new FilterList;
// set the first filter to the current filter
@@ -75,7 +75,7 @@ diff -ru fpicker.orig/source/unx/gnome/S
m_aCurrentFilter = _rInitialCurrentFilter;
}
}
-@@ -713,7 +715,6 @@
+@@ -715,7 +717,6 @@
// append the filter
m_pFilterList->insert( m_pFilterList->end(), FilterEntry( aTitle, aFilter ) );
@@ -83,7 +83,7 @@ diff -ru fpicker.orig/source/unx/gnome/S
}
//-----------------------------------------------------------------------------------------
-@@ -778,7 +779,10 @@
+@@ -782,7 +783,10 @@
}
else if( GtkFileFilter *filter = gtk_file_chooser_get_filter(GTK_FILE_CHOOSER(m_pDialog)))
{
@@ -95,7 +95,7 @@ diff -ru fpicker.orig/source/unx/gnome/S
}
}
-@@ -945,9 +949,15 @@
+@@ -950,9 +954,15 @@
}
}
@@ -114,16 +114,16 @@ diff -ru fpicker.orig/source/unx/gnome/S
}
OSL_TRACE( "2: current filter is %s\n",
-@@ -1904,7 +1914,7 @@
+@@ -1917,7 +1927,7 @@
}
}
-int SalGtkFilePicker::implAddFilter( const OUString& rFilter, const OUString& rType )
-+GtkFileFilter * SalGtkFilePicker::implAddFilter( const OUString& rFilter, const OUString& rType )
++GtkFileFilter* SalGtkFilePicker::implAddFilter( const OUString& rFilter, const OUString& rType )
{
- GtkFileFilter *filter = gtk_file_filter_new();
+ GdkThreadLock aLock;
-@@ -1953,7 +1963,6 @@
+@@ -1968,7 +1978,6 @@
gtk_file_chooser_add_filter( GTK_FILE_CHOOSER( m_pDialog ), filter );
@@ -131,15 +131,14 @@ diff -ru fpicker.orig/source/unx/gnome/S
if (!bAllGlob)
{
GtkTreeIter iter;
-@@ -1964,27 +1973,66 @@
+@@ -1979,30 +1988,67 @@
2, aFilterName.getStr(),
3, OUStringToOString(rType, RTL_TEXTENCODING_UTF8).getStr(),
-1);
- nAdded = 1;
}
- return nAdded;
-+
-+ return filter;
++ return filter;
}
-int SalGtkFilePicker::implAddFilterGroup( const OUString& /*_rFilter*/, const Sequence< StringPair >& _rFilters )
@@ -159,6 +158,9 @@ diff -ru fpicker.orig/source/unx/gnome/S
void SalGtkFilePicker::SetFilters()
{
- OSL_TRACE( "start setting filters\n");
+-
+ GdkThreadLock aLock;
+
- int nAdded = 0;
+ if (!m_aInitialFilter.getLength())
+ m_aInitialFilter = m_aCurrentFilter;
@@ -206,7 +208,7 @@ diff -ru fpicker.orig/source/unx/gnome/S
if( m_pFilterList && !m_pFilterList->empty() )
{
for ( FilterList::iterator aListIter = m_pFilterList->begin();
-@@ -1998,30 +2046,27 @@
+@@ -2016,30 +2062,27 @@
UnoFilterList aSubFilters;
aListIter->getSubFilters( aSubFilters );
openoffice.org-3.1.0.ooo101274.opening-a-directory.patch:
comphelper/source/misc/stillreadwriteinteraction.cxx | 1
ucbhelper/source/client/content.cxx | 75 +++++++++++++++++++
2 files changed, 76 insertions(+)
Index: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.1.0.ooo101274.opening-a-directory.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- openoffice.org-3.1.0.ooo101274.opening-a-directory.patch 7 Aug 2009 13:58:22 -0000 1.2
+++ openoffice.org-3.1.0.ooo101274.opening-a-directory.patch 13 Jul 2010 10:16:52 -0000 1.3
@@ -2,7 +2,7 @@ Index: ucbhelper/source/client/content.c
===================================================================
--- ucbhelper/source/client/content.cxx (revision 270567)
+++ ucbhelper/source/client/content.cxx (working copy)
-@@ -42,6 +42,7 @@
+@@ -39,6 +39,7 @@
#include <cppuhelper/weak.hxx>
#include <cppuhelper/implbase1.hxx>
@@ -10,7 +10,7 @@ Index: ucbhelper/source/client/content.c
#include <com/sun/star/ucb/ContentCreationError.hpp>
#include <com/sun/star/ucb/XCommandEnvironment.hpp>
#include <com/sun/star/ucb/XCommandInfo.hpp>
-@@ -51,6 +52,8 @@
+@@ -48,6 +49,8 @@
#include <com/sun/star/ucb/ContentAction.hpp>
#include <com/sun/star/ucb/OpenCommandArgument2.hpp>
#include <com/sun/star/ucb/InsertCommandArgument.hpp>
@@ -19,7 +19,7 @@ Index: ucbhelper/source/client/content.c
#include <com/sun/star/ucb/GlobalTransferCommandArgument.hpp>
#include <com/sun/star/ucb/NameClash.hpp>
#include <com/sun/star/ucb/OpenMode.hpp>
-@@ -68,6 +71,8 @@
+@@ -65,6 +68,8 @@
#include <com/sun/star/sdbc/XRow.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <com/sun/star/beans/UnknownPropertyException.hpp>
@@ -28,19 +28,18 @@ Index: ucbhelper/source/client/content.c
#include <ucbhelper/macros.hxx>
#include <ucbhelper/content.hxx>
#include <ucbhelper/contentbroker.hxx>
-@@ -77,7 +82,11 @@
+@@ -72,6 +77,10 @@
+ #include <ucbhelper/activedatastreamer.hxx>
#include <ucbhelper/interactionrequest.hxx>
- #endif
#include <ucbhelper/cancelcommandexecution.hxx>
+#include <ucbhelper/fileidentifierconverter.hxx>
+#include <ucbhelper/simpleinteractionrequest.hxx>
-
-+#include <memory>
+
++#include <memory>
+
using namespace com::sun::star::container;
using namespace com::sun::star::beans;
- using namespace com::sun::star::io;
-@@ -377,6 +386,54 @@
+@@ -375,6 +384,54 @@
return Reference< XContent >();
}
@@ -95,81 +94,81 @@ Index: ucbhelper/source/client/content.c
//=========================================================================
//=========================================================================
//
-@@ -1188,7 +1245,10 @@
- throw( CommandAbortedException, RuntimeException, Exception )
+@@ -1186,7 +1243,10 @@
+ throw( CommandAbortedException, RuntimeException, Exception )
{
- if ( !isDocument() )
+ if ( !isDocument() )
+ {
+ lcl_displayMessage(m_xImpl->getEnvironment(), getURL());
- return Reference< XInputStream >();
+ return Reference< XInputStream >();
+ }
- Reference< XActiveDataSink > xSink = new ActiveDataSink;
+ Reference< XActiveDataSink > xSink = new ActiveDataSink;
-@@ -1213,7 +1273,10 @@
- throw( CommandAbortedException, RuntimeException, Exception )
+@@ -1211,7 +1271,10 @@
+ throw( CommandAbortedException, RuntimeException, Exception )
{
- if ( !isDocument() )
+ if ( !isDocument() )
+ {
+ lcl_displayMessage(m_xImpl->getEnvironment(), getURL());
- return Reference< XInputStream >();
+ return Reference< XInputStream >();
+ }
- Reference< XActiveDataSink > xSink = new ActiveDataSink;
+ Reference< XActiveDataSink > xSink = new ActiveDataSink;
-@@ -1238,7 +1301,10 @@
- throw( CommandAbortedException, RuntimeException, Exception )
+@@ -1236,7 +1299,10 @@
+ throw( CommandAbortedException, RuntimeException, Exception )
{
- if ( !isDocument() )
+ if ( !isDocument() )
+ {
+ lcl_displayMessage(m_xImpl->getEnvironment(), getURL());
- return Reference< XStream >();
+ return Reference< XStream >();
+ }
- Reference< XActiveDataStreamer > xStreamer = new ActiveDataStreamer;
+ Reference< XActiveDataStreamer > xStreamer = new ActiveDataStreamer;
-@@ -1263,7 +1329,10 @@
- throw( CommandAbortedException, RuntimeException, Exception )
+@@ -1261,7 +1327,10 @@
+ throw( CommandAbortedException, RuntimeException, Exception )
{
- if ( !isDocument() )
+ if ( !isDocument() )
+ {
+ lcl_displayMessage(m_xImpl->getEnvironment(), getURL());
- return Reference< XStream >();
+ return Reference< XStream >();
+ }
- Reference< XActiveDataStreamer > xStreamer = new ActiveDataStreamer;
+ Reference< XActiveDataStreamer > xStreamer = new ActiveDataStreamer;
-@@ -1288,7 +1357,10 @@
- throw( CommandAbortedException, RuntimeException, Exception )
+@@ -1286,7 +1355,10 @@
+ throw( CommandAbortedException, RuntimeException, Exception )
{
- if ( !isDocument() )
+ if ( !isDocument() )
+ {
+ lcl_displayMessage(m_xImpl->getEnvironment(), getURL());
- return sal_False;
+ return sal_False;
+ }
- OpenCommandArgument2 aArg;
- aArg.Mode = OpenMode::DOCUMENT;
-@@ -1311,7 +1383,10 @@
- throw( CommandAbortedException, RuntimeException, Exception )
+ OpenCommandArgument2 aArg;
+ aArg.Mode = OpenMode::DOCUMENT;
+@@ -1309,7 +1381,10 @@
+ throw( CommandAbortedException, RuntimeException, Exception )
{
- if ( !isDocument() )
+ if ( !isDocument() )
+ {
+ lcl_displayMessage(m_xImpl->getEnvironment(), getURL());
- return sal_False;
+ return sal_False;
+ }
- OpenCommandArgument2 aArg;
- aArg.Mode = OpenMode::DOCUMENT;
+ OpenCommandArgument2 aArg;
+ aArg.Mode = OpenMode::DOCUMENT;
Index: comphelper/source/misc/mediadescriptor.cxx
===================================================================
---- comphelper/source/misc/mediadescriptor.cxx (revision 270567)
-+++ comphelper/source/misc/mediadescriptor.cxx (working copy)
-@@ -728,6 +728,7 @@
- bAbort = (
- (exIO.Code == css::ucb::IOErrorCode_ACCESS_DENIED )
- || (exIO.Code == css::ucb::IOErrorCode_LOCKING_VIOLATION )
-+ || (exIO.Code == css::ucb::IOErrorCode_NO_FILE )
+--- comphelper/source/misc/stillreadwriteinteraction.cxx 2010-07-06 15:32:02.000000000 +0100
++++ comphelper/source/misc/stillreadwriteinteraction.cxx 2010-07-06 15:32:31.000000000 +0100
+@@ -103,6 +103,7 @@
+ bAbort = (
+ (exIO.Code == css::ucb::IOErrorCode_ACCESS_DENIED )
+ || (exIO.Code == css::ucb::IOErrorCode_LOCKING_VIOLATION )
++ || (exIO.Code == css::ucb::IOErrorCode_NO_FILE )
+ || (exIO.Code == css::ucb::IOErrorCode_NOT_EXISTING )
#ifdef MACOSX
- // this is a workaround for MAC, on this platform if the file is locked
- // the returned error code looks to be wrong
+ // this is a workaround for MAC, on this platform if the file is locked
openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch:
inc/document.hxx | 4
inc/drwlayer.hxx | 11
inc/userdat.hxx | 5
source/core/data/documen3.cxx | 4
source/core/data/drwlayer.cxx | 374 +++++++++++-------------
source/core/data/postit.cxx | 1
source/core/tool/detfunc.cxx | 5
source/filter/xml/XMLExportIterator.hxx | 2
source/filter/xml/XMLTableShapeImportHelper.cxx | 62 ++-
source/filter/xml/XMLTableShapeResizer.cxx | 298 ++-----------------
source/filter/xml/XMLTableShapeResizer.hxx | 37 --
source/filter/xml/xmlexprt.cxx | 60 ---
source/filter/xml/xmlimprt.cxx | 2
source/filter/xml/xmlsubti.cxx | 10
source/filter/xml/xmlsubti.hxx | 13
source/ui/Accessibility/AccessibleDocument.cxx | 32 --
source/ui/drawfunc/drawsh2.cxx | 2
source/ui/drawfunc/drawsh5.cxx | 10
source/ui/inc/drawview.hxx | 5
source/ui/unoobj/shapeuno.cxx | 63 +---
source/ui/view/drawvie3.cxx | 43 ++
source/ui/view/drawview.cxx | 39 --
22 files changed, 382 insertions(+), 700 deletions(-)
Index: openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch 22 Apr 2010 08:41:21 -0000 1.4
+++ openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch 13 Jul 2010 10:16:52 -0000 1.5
@@ -87,7 +87,7 @@ diff -ru sc.orig/source/core/data/docume
diff -ru sc.orig/source/core/data/drwlayer.cxx sc/source/core/data/drwlayer.cxx
--- sc.orig/source/core/data/drwlayer.cxx 2009-06-04 12:39:09.000000000 +0100
+++ sc/source/core/data/drwlayer.cxx 2009-06-05 12:28:12.000000000 +0100
-@@ -67,6 +67,9 @@
+@@ -68,6 +68,9 @@
#include <vcl/svapp.hxx>
#include <unotools/ucbstreamhelper.hxx>
@@ -97,7 +97,7 @@ diff -ru sc.orig/source/core/data/drwlay
#include "drwlayer.hxx"
#include "drawpage.hxx"
#include "global.hxx"
-@@ -524,7 +527,41 @@
+@@ -526,7 +529,41 @@
}
}
@@ -140,7 +140,7 @@ diff -ru sc.orig/source/core/data/drwlay
{
DBG_ASSERT( pDoc, "ScDrawLayer::RecalcPos - missing document" );
if( !pDoc )
-@@ -563,6 +600,8 @@
+@@ -565,6 +602,8 @@
if( bCircle )
{
@@ -149,7 +149,7 @@ diff -ru sc.orig/source/core/data/drwlay
Point aPos( pDoc->GetColOffset( nCol1, nTab1 ), pDoc->GetRowOffset( nRow1, nTab1 ) );
TwipsToMM( aPos.X() );
TwipsToMM( aPos.Y() );
-@@ -583,11 +622,18 @@
+@@ -585,11 +624,18 @@
{
if (bRecording)
AddCalcUndo( new SdrUndoGeoObj( *pObj ) );
@@ -168,8 +168,8 @@ diff -ru sc.orig/source/core/data/drwlay
+ aCalcPoly.append(basegfx::B2DPoint(aOrigEndPos.X(), aOrigEndPos.Y()));
//! nicht mehrere Undos fuer ein Objekt erzeugen (hinteres kann dann weggelassen werden)
- if( bValid1 )
-@@ -606,6 +652,8 @@
+ SCCOL nLastCol;
+@@ -610,6 +656,8 @@
{
if (bRecording)
AddCalcUndo( new SdrUndoGeoObj( *pObj ) );
@@ -178,7 +178,7 @@ diff -ru sc.orig/source/core/data/drwlay
pObj->SetPoint( aStartPos, 0 );
}
-@@ -620,6 +668,8 @@
+@@ -624,6 +672,8 @@
{
if (bRecording)
AddCalcUndo( new SdrUndoGeoObj( *pObj ) );
@@ -187,7 +187,7 @@ diff -ru sc.orig/source/core/data/drwlay
pObj->SetPoint( aEndPos, 1 );
}
}
-@@ -640,6 +690,8 @@
+@@ -644,6 +694,8 @@
{
if (bRecording)
AddCalcUndo( new SdrUndoGeoObj( *pObj ) );
@@ -196,7 +196,7 @@ diff -ru sc.orig/source/core/data/drwlay
pObj->SetPoint( aEndPos, 1 );
}
-@@ -656,45 +708,68 @@
+@@ -660,45 +712,68 @@
{
if (bRecording)
AddCalcUndo( new SdrUndoGeoObj( *pObj ) );
@@ -270,7 +270,7 @@ diff -ru sc.orig/source/core/data/drwlay
}
}
-@@ -869,151 +944,6 @@
+@@ -873,151 +948,6 @@
return pRet;
}
@@ -422,7 +422,7 @@ diff -ru sc.orig/source/core/data/drwlay
void ScDrawLayer::MoveArea( SCTAB nTab, SCCOL nCol1,SCROW nRow1, SCCOL nCol2,SCROW nRow2,
SCsCOL nDx,SCsROW nDy, BOOL bInsDel, bool bUpdateNoteCaptionPos )
{
-@@ -1055,11 +985,6 @@
+@@ -1059,11 +989,6 @@
aTopLeft.Y() += aMove.Y();
}
@@ -434,7 +434,7 @@ diff -ru sc.orig/source/core/data/drwlay
//
// Detektiv-Pfeile: Zellpositionen anpassen
//
-@@ -1097,8 +1022,6 @@
+@@ -1101,8 +1026,6 @@
aTopLeft.X() = -aTopLeft.X();
nDifTwips = -nDifTwips;
}
@@ -443,7 +443,7 @@ diff -ru sc.orig/source/core/data/drwlay
}
void ScDrawLayer::HeightChanged( SCTAB nTab, SCROW nRow, long nDifTwips )
-@@ -1129,8 +1052,6 @@
+@@ -1133,8 +1056,6 @@
MirrorRectRTL( aRect );
aTopLeft.X() = -aTopLeft.X();
}
@@ -452,7 +452,7 @@ diff -ru sc.orig/source/core/data/drwlay
}
BOOL ScDrawLayer::HasObjectsInRows( SCTAB nTab, SCROW nStartRow, SCROW nEndRow )
-@@ -1808,35 +1729,105 @@
+@@ -1846,35 +1767,105 @@
}
}
@@ -577,7 +577,7 @@ diff -ru sc.orig/source/core/data/drwlay
if( pObj && bCreate )
{
ScDrawObjData* pData = new ScDrawObjData;
-@@ -1873,15 +1864,7 @@
+@@ -1911,15 +1902,7 @@
ScIMapInfo* ScDrawLayer::GetIMapInfo( SdrObject* pObj ) // static
{
@@ -594,7 +594,7 @@ diff -ru sc.orig/source/core/data/drwlay
}
// static:
-@@ -1934,7 +1917,7 @@
+@@ -1972,7 +1955,7 @@
else if ( pObj->ISA( SdrOle2Obj ) ) // OLE-Objekt
{
// TODO/LEAN: working with visual area needs running state
@@ -603,7 +603,7 @@ diff -ru sc.orig/source/core/data/drwlay
bObjSupported = TRUE;
}
-@@ -1952,14 +1935,9 @@
+@@ -1990,14 +1973,9 @@
ScMacroInfo* ScDrawLayer::GetMacroInfo( SdrObject* pObj, BOOL bCreate ) // static
{
@@ -1698,7 +1698,13 @@ diff -ru sc.orig/source/ui/view/drawvie3
diff -ru sc.orig/source/ui/view/drawview.cxx sc/source/ui/view/drawview.cxx
--- sc.orig/source/ui/view/drawview.cxx 2009-06-04 12:39:41.000000000 +0100
+++ sc/source/ui/view/drawview.cxx 2009-06-04 12:40:23.000000000 +0100
-@@ -164,40 +164,11 @@
+@@ -155,46 +155,15 @@
+
+ void ScDrawView::AddCustomHdl()
+ {
+- BOOL bNegativePage = pDoc->IsNegativePage( nTab );
+-
+ const SdrMarkList &rMrkList = GetMarkedObjectList();
UINT32 nCount = rMrkList.GetMarkCount();
for(UINT32 nPos=0; nPos<nCount; nPos++ )
{
@@ -1730,7 +1736,7 @@ diff -ru sc.orig/source/ui/view/drawview
- if(nCol > 0)
- --nCol;
-
-- SCROW nRow = nPosY <= 0 ? 0 : pDoc->FastGetRowForHeight( nTab,
+- SCROW nRow = nPosY <= 0 ? 0 : pDoc->GetRowForHeight( nTab,
- (ULONG) nPosY);
- if(nRow > 0)
- --nRow;
openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch:
export/uof/odf2uof_text.xsl | 8 +-------
odf2xhtml/export/xhtml/body.xsl | 8 ++++----
2 files changed, 5 insertions(+), 11 deletions(-)
Index: openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch 27 Apr 2010 08:43:17 -0000 1.7
+++ openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch 13 Jul 2010 10:16:52 -0000 1.8
@@ -29,36 +29,6 @@ Index: filter/source/xslt/odf2xhtml/expo
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="$tabIndent"/>
-@@ -2869,4 +2869,4 @@
-
- <xsl:template match="math:annotation" mode="math"/>
-
--</xsl:stylesheet>
-\ No newline at end of file
-+</xsl:stylesheet>
-diff -ru filter.orig/source/xslt/export/spreadsheetml/formular.xsl filter/source/xslt/export/spreadsheetml/formular.xsl
---- filter.orig/source/xslt/export/spreadsheetml/formular.xsl 2009-04-24 09:31:14.000000000 +0100
-+++ filter/source/xslt/export/spreadsheetml/formular.xsl 2009-04-24 09:31:57.000000000 +0100
-@@ -381,7 +381,7 @@
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="$earlierCandidate" />
-- <xsl:variable name="parameterCandidate">
-+ <xsl:variable name="parameterCandidate2">
- <xsl:variable name="formularAfterCandidate" select="substring-after($expressionSuffix, $earlierCandidate)" />
- <xsl:variable name="parameterTillBracket" select="concat(substring-before($formularAfterCandidate,')'),')')" />
- <xsl:variable name="parameterTillComma" select="substring-before(substring-after($expressionSuffix, $parameterTillBracket),',')" />
-@@ -405,8 +405,8 @@
- <xsl:call-template name="getParameter">
- <xsl:with-param name="closingBracketCount" select="$closingBracketCount" />
- <xsl:with-param name="openingBracketCount" select="$openingBracketCount" />
-- <xsl:with-param name="parameterCandidate" select="$parameterCandidate" />
-- <xsl:with-param name="earlierCandidate" select="$parameterCandidate" />
-+ <xsl:with-param name="parameterCandidate" select="$parameterCandidate2" />
-+ <xsl:with-param name="earlierCandidate" select="$parameterCandidate2" />
- <xsl:with-param name="expressionSuffix" select="$expressionSuffix" />
- </xsl:call-template>
- </xsl:otherwise>
diff -ru filter.orig/source/xslt/export/uof/odf2uof_text.xsl filter/source/xslt/export/uof/odf2uof_text.xsl
--- filter.orig/source/xslt/export/uof/odf2uof_text.xsl 2009-04-24 09:31:14.000000000 +0100
+++ filter/source/xslt/export/uof/odf2uof_text.xsl 2009-04-24 09:32:29.000000000 +0100
openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch:
scriptitems.pm | 14 ++++++--------
simplepackage.pm | 2 +-
2 files changed, 7 insertions(+), 9 deletions(-)
Index: openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch 8 May 2010 12:51:04 -0000 1.4
+++ openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch 13 Jul 2010 10:16:52 -0000 1.5
@@ -51,3 +51,14 @@ diff -u -p -r1.17 scriptitems.pm
next; # removing this file from list, if sourcepath is empty
}
+--- openoffice.org.orig/solenv/bin/modules/installer/simplepackage.pm 2010-07-12 10:27:26.000000000 +0100
++++ openoffice.org/solenv/bin/modules/installer/simplepackage.pm 2010-07-12 10:27:54.000000000 +0100
+@@ -53,7 +53,7 @@
+ ( $installer::globals::packageformat eq "archive" ))
+ {
+ $installer::globals::is_simple_packager_project = 1;
+- $installer::globals::patch_user_dir = 1;
++ $installer::globals::patch_user_dir = 0;
+ }
+ elsif( $installer::globals::packageformat eq "dmg" )
+ {
openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch:
unx/source/fontmanager/fontconfig.cxx | 142 +++++++++++++++++++++++++++++++++-
util/makefile.mk | 1
2 files changed, 141 insertions(+), 2 deletions(-)
Index: openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch 10 Oct 2009 15:48:46 -0000 1.1
+++ openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch 13 Jul 2010 10:16:52 -0000 1.2
@@ -183,7 +183,7 @@ diff -ru vcl.orig/util/makefile.mk vcl/u
# libs for generic plugin
SHL2STDLIBS=\
$(VCLLIB)\
-+ $(I18NUTILLIB) \
++ $(I18NUTILLIB) \
$(I18NPAPERLIB) \
+ $(I18NISOLANGLIB) \
$(TOOLSLIB) \
- $(VOSLIB) \
openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch:
canvas/source/cairo/cairo_canvasfont.cxx | 5 +++
canvas/source/directx/dx_textlayout_drawhelper.cxx | 6 ++++
canvas/source/vcl/canvasfont.cxx | 5 +++
cppcanvas/inc/cppcanvas/renderer.hxx | 3 ++
cppcanvas/source/mtfrenderer/implrenderer.cxx | 10 ++++++-
drawinglayer/inc/drawinglayer/attribute/fontattribute.hxx | 2 +
drawinglayer/source/attribute/fontattribute.cxx | 20 +++++++++++---
drawinglayer/source/primitive2d/textlayoutdevice.cxx | 2 +
drawinglayer/source/processor2d/canvasprocessor.cxx | 5 +++
9 files changed, 53 insertions(+), 5 deletions(-)
Index: openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch 10 Oct 2009 15:48:46 -0000 1.3
+++ openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch 13 Jul 2010 10:16:52 -0000 1.4
@@ -2,15 +2,15 @@ Index: cppcanvas/source/mtfrenderer/impl
===================================================================
--- cppcanvas/source/mtfrenderer/implrenderer.cxx (revision 276100)
+++ cppcanvas/source/mtfrenderer/implrenderer.cxx (working copy)
-@@ -52,6 +52,7 @@
- #include <com/sun/star/rendering/XParametricPolyPolygon2DFactory.hpp>
+@@ -43,6 +43,7 @@
+ #include <com/sun/star/rendering/TexturingMode.hpp>
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/geometry/RealPoint2D.hpp>
+#include <com/sun/star/rendering/PanoseProportion.hpp>
#include <com/sun/star/rendering/ViewState.hpp>
#include <com/sun/star/rendering/RenderState.hpp>
#include <com/sun/star/rendering/XCanvasFont.hpp>
-@@ -956,6 +957,12 @@
+@@ -850,6 +851,12 @@
rParms.mrParms.maFontLetterForm.isValid() ?
rParms.mrParms.maFontLetterForm.getValue() :
(rFont.GetItalic() == ITALIC_NONE) ? 0 : 9;
@@ -23,7 +23,7 @@ Index: cppcanvas/source/mtfrenderer/impl
LanguageType aLang = rFont.GetLanguage();
aFontRequest.Locale = MsLangId::convertLanguageToLocale(aLang, false);
-@@ -3073,7 +3080,8 @@
+@@ -2967,7 +2974,8 @@
if( rParams.maFontName.isValid() ||
rParams.maFontWeight.isValid() ||
rParams.maFontLetterForm.isValid() ||
@@ -121,38 +121,38 @@ Index: drawinglayer/source/processor2d/c
===================================================================
--- drawinglayer/source/processor2d/canvasprocessor.cxx (revision 276100)
+++ drawinglayer/source/processor2d/canvasprocessor.cxx (working copy)
-@@ -64,6 +64,7 @@
- #include <drawinglayer/primitive2d/alphaprimitive2d.hxx>
+@@ -57,6 +57,7 @@
#include <basegfx/tuple/b2i64tuple.hxx>
#include <basegfx/range/b2irange.hxx>
-+#include <com/sun/star/rendering/PanoseProportion.hpp>
#include <com/sun/star/rendering/XIntegerReadOnlyBitmap.hpp>
++#include <com/sun/star/rendering/PanoseProportion.hpp>
#include <com/sun/star/rendering/CompositeOperation.hpp>
#include <com/sun/star/rendering/StrokeAttributes.hpp>
-@@ -1526,6 +1527,10 @@
- aFontRequest.FontDescription.IsVertical = rFontAttrs.getVertical() ? util::TriState_YES : util::TriState_NO;
+ #include <com/sun/star/rendering/PathJoinType.hpp>
+@@ -1517,6 +1518,10 @@
+ aFontRequest.FontDescription.IsVertical = rFontAttr.getVertical() ? util::TriState_YES : util::TriState_NO;
// TODO(F2): improve vclenum->panose conversion
- aFontRequest.FontDescription.FontDescription.Weight = static_cast< sal_uInt8 >(rFontAttrs.getWeight());
+ aFontRequest.FontDescription.FontDescription.Weight = static_cast< sal_uInt8 >(rFontAttr.getWeight());
+ aFontRequest.FontDescription.FontDescription.Proportion =
-+ rFontAttrs.getMonospaced()
++ rFontAttr.getMonospaced()
+ ? rendering::PanoseProportion::MONO_SPACED
+ : rendering::PanoseProportion::ANYTHING;
- aFontRequest.FontDescription.FontDescription.Letterform = rFontAttrs.getItalic() ? 9 : 0;
+ aFontRequest.FontDescription.FontDescription.Letterform = rFontAttr.getItalic() ? 9 : 0;
// init CellSize to 1.0, else a default font height will be used
Index: drawinglayer/source/primitive2d/textlayoutdevice.cxx
===================================================================
--- drawinglayer/source/primitive2d/textlayoutdevice.cxx (revision 276100)
+++ drawinglayer/source/primitive2d/textlayoutdevice.cxx (working copy)
-@@ -345,6 +345,7 @@
- aRetval.SetWeight(static_cast<FontWeight>(rFontAttributes.getWeight()));
- aRetval.SetItalic(rFontAttributes.getItalic() ? ITALIC_NORMAL : ITALIC_NONE);
- aRetval.SetOutline(rFontAttributes.getOutline());
-+ aRetval.SetPitch(rFontAttributes.getMonospaced() ? PITCH_FIXED : PITCH_VARIABLE);
+@@ -406,6 +406,7 @@
+ aRetval.SetWeight(static_cast<FontWeight>(rFontAttribute.getWeight()));
+ aRetval.SetItalic(rFontAttribute.getItalic() ? ITALIC_NORMAL : ITALIC_NONE);
+ aRetval.SetOutline(rFontAttribute.getOutline());
++ aRetval.SetPitch(rFontAttribute.getMonospaced() ? PITCH_FIXED : PITCH_VARIABLE);
aRetval.SetLanguage(MsLangId::convertLocaleToLanguage(rLocale));
#ifdef WIN32
-@@ -384,6 +385,7 @@
+@@ -445,6 +446,7 @@
RTL_TEXTENCODING_SYMBOL == rFont.GetCharSet(),
rFont.IsVertical(),
ITALIC_NONE != rFont.GetItalic(),
@@ -160,41 +160,25 @@ Index: drawinglayer/source/primitive2d/t
rFont.IsOutline(),
bRTL,
bBiDiStrong);
-Index: drawinglayer/source/primitive2d/textprimitive2d.cxx
-===================================================================
---- drawinglayer/source/primitive2d/textprimitive2d.cxx (revision 276100)
-+++ drawinglayer/source/primitive2d/textprimitive2d.cxx (working copy)
-@@ -63,7 +63,8 @@
- && getItalic() == rCompare.getItalic()
- && getOutline() == rCompare.getOutline()
- && getRTL() == rCompare.getRTL()
-- && getBiDiStrong() == rCompare.getBiDiStrong());
-+ && getBiDiStrong() == rCompare.getBiDiStrong()
-+ && getMonospaced() == rCompare.getMonospaced());
- }
- } // end of namespace primitive2d
- } // end of namespace drawinglayer
-Index: drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx
-===================================================================
---- drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx (revision 276100)
-+++ drawinglayer/inc/drawinglayer/primitive2d/textprimitive2d.hxx (working copy)
-@@ -75,6 +75,7 @@
+--- drawinglayer/source/attribute/fontattribute.cxx 2010-07-06 16:05:42.000000000 +0100
++++ drawinglayer/source/attribute/fontattribute.cxx 2010-07-06 16:06:02.000000000 +0100
+@@ -55,6 +55,7 @@
unsigned mbOutline : 1; // Outline Flag
unsigned mbRTL : 1; // RTL Flag
unsigned mbBiDiStrong : 1; // BiDi Flag
-+ unsigned mbMonospaced : 1;
- // TODO: pair kerning and CJK kerning
++ unsigned mbMonospaced : 1;
- public:
-@@ -85,6 +86,7 @@
- bool bSymbol = false,
- bool bVertical = false,
- bool bItalic = false,
-+ bool bMonospaced = false,
- bool bOutline = false,
- bool bRTL = false,
- bool bBiDiStrong = false)
-@@ -96,7 +98,8 @@
+ ImpFontAttribute(
+ const String& rFamilyName,
+@@ -63,6 +64,7 @@
+ bool bSymbol,
+ bool bVertical,
+ bool bItalic,
++ bool bMonospaced,
+ bool bOutline,
+ bool bRTL,
+ bool bBiDiStrong)
+@@ -75,7 +77,8 @@
mbItalic(bItalic),
mbOutline(bOutline),
mbRTL(bRTL),
@@ -204,11 +188,75 @@ Index: drawinglayer/inc/drawinglayer/pri
{
}
-@@ -113,6 +116,7 @@
+@@ -89,6 +92,7 @@
bool getOutline() const { return mbOutline; }
bool getRTL() const { return mbRTL; }
bool getBiDiStrong() const { return mbBiDiStrong; }
+ bool getMonospaced() const { return mbMonospaced; }
+
+ bool operator==(const ImpFontAttribute& rCompare) const
+ {
+@@ -100,7 +104,8 @@
+ && getItalic() == rCompare.getItalic()
+ && getOutline() == rCompare.getOutline()
+ && getRTL() == rCompare.getRTL()
+- && getBiDiStrong() == rCompare.getBiDiStrong());
++ && getBiDiStrong() == rCompare.getBiDiStrong()
++ && getMonospaced() == rCompare.getMonospaced());
+ }
+
+ static ImpFontAttribute* get_global_default()
+@@ -112,7 +117,7 @@
+ pDefault = new ImpFontAttribute(
+ String(), String(),
+ 0,
+- false, false, false, false, false, false);
++ false, false, false, false, false, false, false);
+
+ // never delete; start with RefCount 1, not 0
+ pDefault->mnRefCount++;
+@@ -129,11 +134,12 @@
+ bool bSymbol,
+ bool bVertical,
+ bool bItalic,
++ bool bMonospaced,
+ bool bOutline,
+ bool bRTL,
+ bool bBiDiStrong)
+ : mpFontAttribute(new ImpFontAttribute(
+- rFamilyName, rStyleName, nWeight, bSymbol, bVertical, bItalic, bOutline, bRTL, bBiDiStrong))
++ rFamilyName, rStyleName, nWeight, bSymbol, bVertical, bItalic, bMonospaced, bOutline, bRTL, bBiDiStrong))
+ {
+ }
+
+@@ -246,6 +252,12 @@
+ return mpFontAttribute->getBiDiStrong();
+ }
+
++ bool FontAttribute::getMonospaced() const
++ {
++ return mpFontAttribute->getMonospaced();
++ }
++
++
+ } // end of namespace attribute
+ } // end of namespace drawinglayer
+
+--- drawinglayer/inc/drawinglayer/attribute/fontattribute.hxx 2010-07-07 11:39:31.000000000 +0100
++++ drawinglayer/inc/drawinglayer/attribute/fontattribute.hxx 2010-07-07 11:44:38.000000000 +0100
+@@ -65,6 +65,7 @@
+ bool bSymbol = false,
+ bool bVertical = false,
+ bool bItalic = false,
++ bool bMonospaced = false,
+ bool bOutline = false,
+ bool bRTL = false,
+ bool bBiDiStrong = false);
+@@ -89,6 +90,7 @@
+ bool getOutline() const;
+ bool getRTL() const;
+ bool getBiDiStrong() const;
++ bool getMonospaced() const;
};
- } // end of namespace primitive2d
+ } // end of namespace attribute
} // end of namespace drawinglayer
openoffice.org-3.2.0.ooo108846.sfx2.qstartfixes.patch:
desktop/source/app/cmdlineargs.cxx | 2 +-
desktop/source/app/makefile.mk | 4 ++++
sfx2/source/appl/shutdownicon.cxx | 2 +-
sfx2/source/appl/shutdowniconunx.cxx | 9 +++++++--
4 files changed, 13 insertions(+), 4 deletions(-)
Index: openoffice.org-3.2.0.ooo108846.sfx2.qstartfixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.2.0.ooo108846.sfx2.qstartfixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openoffice.org-3.2.0.ooo108846.sfx2.qstartfixes.patch 2 Feb 2010 15:06:54 -0000 1.1
+++ openoffice.org-3.2.0.ooo108846.sfx2.qstartfixes.patch 13 Jul 2010 10:16:52 -0000 1.2
@@ -1,7 +1,7 @@
diff -r 3c24aa9a7810 desktop/source/app/cmdlineargs.cxx
--- a/desktop/source/app/cmdlineargs.cxx Sat Jan 23 16:31:03 2010 +0000
+++ b/desktop/source/app/cmdlineargs.cxx Tue Feb 02 13:59:39 2010 +0000
-@@ -387,7 +387,7 @@
+@@ -396,7 +396,7 @@
}
else if ( aArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "-quickstart" )) == sal_True )
{
@@ -9,13 +9,13 @@ diff -r 3c24aa9a7810 desktop/source/app/
+#if defined(ENABLE_QUICKSTART_APPLET)
SetBoolParam_Impl( CMD_BOOLPARAM_QUICKSTART, sal_True );
#endif
- return sal_True;
+ SetBoolParam_Impl( CMD_BOOLPARAM_NOQUICKSTART, sal_False );
diff -r 3c24aa9a7810 desktop/source/app/makefile.mk
--- a/desktop/source/app/makefile.mk Sat Jan 23 16:31:03 2010 +0000
+++ b/desktop/source/app/makefile.mk Tue Feb 02 13:59:39 2010 +0000
-@@ -44,6 +44,10 @@
- CFLAGS+=-DGNOME_VFS_ENABLED
- .ENDIF
+@@ -53,6 +53,10 @@
+ # DEPLOYMENTMISCLIB = -ldeploymentmisc$(DLLPOSTFIX)
+ # .ENDIF
+.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" || "$(GUIBASE)"=="aqua" || "$(ENABLE_SYSTRAY_GTK)"=="TRUE"
+CFLAGS+=-DENABLE_QUICKSTART_APPLET
openoffice.org-3.3.0.ooo107490.cppu.lifecycle.patch:
cppu/source/threadpool/jobqueue.cxx | 3 -
cppu/source/threadpool/jobqueue.hxx | 6 ++
cppu/source/threadpool/thread.cxx | 32 ++++++------
cppu/source/threadpool/thread.hxx | 5 +
cppu/source/threadpool/threadpool.cxx | 58 +++++++++++----------
cppu/source/threadpool/threadpool.hxx | 15 ++++-
cppu/source/uno/lbenv.cxx | 11 +++-
cppu/util/target.pmk | 9 ---
package/inc/ZipPackageFolder.hxx | 7 --
package/source/xstor/owriteablestream.cxx | 20 +------
package/source/xstor/xstorage.cxx | 20 +------
package/source/zippackage/ZipPackage.cxx | 16 +-----
package/source/zippackage/ZipPackageFolder.cxx | 15 +++--
package/source/zippackage/ZipPackageStream.cxx | 15 +++--
package/source/zippackage/ZipPackageStream.hxx | 6 --
sax/source/tools/fastserializer.cxx | 66 ++++++++++++-------------
16 files changed, 154 insertions(+), 150 deletions(-)
Index: openoffice.org-3.3.0.ooo107490.cppu.lifecycle.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.3.0.ooo107490.cppu.lifecycle.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- openoffice.org-3.3.0.ooo107490.cppu.lifecycle.patch 24 Jun 2010 15:57:55 -0000 1.3
+++ openoffice.org-3.3.0.ooo107490.cppu.lifecycle.patch 13 Jul 2010 10:16:52 -0000 1.4
@@ -626,7 +626,7 @@
- }
+ static const ::com::sun::star::uno::Sequence < sal_Int8 >& static_getImplementationId();
- void setPackageFormat_Impl( sal_Int16 nFormat ) { m_nFormat = nFormat; }
+ void setPackageFormat_Impl( sal_Int32 nFormat ) { m_nFormat = nFormat; }
void setRemoveOnInsertMode_Impl( sal_Bool bRemove ) { this->mbAllowRemoveOnInsert = bRemove; }
--- package/source/xstor/owriteablestream.cxx 2010-06-22 11:49:15.000000000 +0100
+++ package/source/xstor/owriteablestream.cxx 2010-06-22 12:13:20.000000000 +0100
@@ -746,7 +746,7 @@
sal_Int64 SAL_CALL ZipPackage::getSomething( const Sequence< sal_Int8 >& aIdentifier )
--- package/source/zippackage/ZipPackageFolder.cxx 2010-06-22 11:49:16.000000000 +0100
+++ package/source/zippackage/ZipPackageFolder.cxx 2010-06-22 12:50:00.000000000 +0100
-@@ -42,6 +42,7 @@
+@@ -43,6 +43,7 @@
#include <com/sun/star/io/XSeekable.hpp>
#include <EncryptedDataHeader.hxx>
#include <rtl/random.h>
@@ -754,7 +754,7 @@
#include <memory>
using namespace com::sun::star::packages::zip::ZipConstants;
-@@ -58,7 +59,7 @@
+@@ -59,7 +60,7 @@
using namespace ::com::sun::star;
using vos::ORef;
@@ -762,8 +762,8 @@
+namespace { struct lcl_CachedImplId : public rtl::Static< Sequence < sal_Int8 >, lcl_CachedImplId > {}; }
ZipPackageFolder::ZipPackageFolder ( const Reference< XMultiServiceFactory >& xFactory,
- sal_Int16 nFormat,
-@@ -79,10 +80,9 @@
+ sal_Int32 nFormat,
+@@ -80,10 +81,9 @@
aEntry.nCompressedSize = 0;
aEntry.nSize = 0;
aEntry.nOffset = -1;
@@ -777,7 +777,7 @@
}
-@@ -186,6 +186,11 @@
+@@ -187,6 +187,11 @@
rDest.nExtraLen = rSource.nExtraLen;
}
openoffice.org-3.3.0.ooo108246.svx.hide-sql-group-when-inactive.patch:
optcolor.cxx | 38 ++++++++++++++++++++++++++------------
1 file changed, 26 insertions(+), 12 deletions(-)
Index: openoffice.org-3.3.0.ooo108246.svx.hide-sql-group-when-inactive.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.3.0.ooo108246.svx.hide-sql-group-when-inactive.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openoffice.org-3.3.0.ooo108246.svx.hide-sql-group-when-inactive.patch 16 Jan 2010 09:16:09 -0000 1.1
+++ openoffice.org-3.3.0.ooo108246.svx.hide-sql-group-when-inactive.patch 13 Jul 2010 10:16:52 -0000 1.2
@@ -1,6 +1,6 @@
diff -r aa65062d8d37 svx/source/cui/optcolor.cxx
---- a/svx/source/cui/optcolor.cxx Mon Jan 11 19:41:39 2010 +0100
-+++ b/svx/source/cui/optcolor.cxx Sat Jan 16 10:03:24 2010 +0100
+--- a/cui/source/options/optcolor.cxx Mon Jan 11 19:41:39 2010 +0100
++++ b/cui/source/options/optcolor.cxx Sat Jan 16 10:03:24 2010 +0100
@@ -261,6 +261,9 @@
virtual void Command( const CommandEvent& rCEvt );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
openoffice.org-3.3.0.ooo111699.svx.nullfield.patch:
svdfppt.cxx | 4 ++++
1 file changed, 4 insertions(+)
Index: openoffice.org-3.3.0.ooo111699.svx.nullfield.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.3.0.ooo111699.svx.nullfield.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openoffice.org-3.3.0.ooo111699.svx.nullfield.patch 19 May 2010 08:38:08 -0000 1.1
+++ openoffice.org-3.3.0.ooo111699.svx.nullfield.patch 13 Jul 2010 10:16:52 -0000 1.2
@@ -1,5 +1,5 @@
---- svx.orig/source/svdraw/svdfppt.cxx 2010-05-19 09:10:44.000000000 +0100
-+++ svx/source/svdraw/svdfppt.cxx 2010-05-19 09:28:25.000000000 +0100
+--- filter/source/msfilter/svdfppt.cxx 2010-05-19 09:10:44.000000000 +0100
++++ filter/source/msfilter/svdfppt.cxx 2010-05-19 09:28:25.000000000 +0100
@@ -7120,6 +7120,10 @@
PPTCharPropSet* pCurrent = (PPTCharPropSet*)aCharPropList.GetObject( nIdx );
sal_Int32 nNextStringLen = pCurrent->maString.Len();
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2272
retrieving revision 1.2273
diff -u -p -r1.2272 -r1.2273
--- openoffice.org.spec 7 Jul 2010 08:20:09 -0000 1.2272
+++ openoffice.org.spec 13 Jul 2010 10:16:52 -0000 1.2273
@@ -1,6 +1,6 @@
-%define oootag OOO320
-%define ooomilestone 19
-%define rh_rpm_release 22
+%define oootag OOO330
+%define ooomilestone 0
+%define rh_rpm_release 1
# rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
%define __jar_repack %{nil}
@@ -32,7 +32,7 @@
Summary: OpenOffice.org comprehensive office suite
Name: openoffice.org
-Version: 3.2.1
+Version: 3.3.0
Release: %{ooomilestone}.%{rh_rpm_release}%{?dist}
Epoch: 1
License: LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and (CDDL or GPLv2) and Public Domain
@@ -48,10 +48,14 @@ Source5: http://tools.openoffice.
Source6: redhat-registry.tar.gz
Source7: redhat-langpacks.tar.gz
Source8: redhat-agreement.xsl
-Source9: openoffice.org-javafilter.desktop
-Source10: http://www.openoffice.org/nonav/issues/showattachment.cgi/65132/acor_ga-IE.dat
-Source11: openoffice.org-multiliblauncher.sh
-Source12: http://www.openoffice.org/nonav/issues/showattachment.cgi/66959/acor_lt.zip
+Source9: http://www.openoffice.org/nonav/issues/showattachment.cgi/66959/acor_lt.zip
+Source10: openoffice.org-multiliblauncher.sh
+Source11: http://hg.services.openoffice.org/binaries/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
+Source12: http://hg.services.openoffice.org/binaries/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
+Source13: http://hg.services.openoffice.org/binaries/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
+Source14: http://hg.services.openoffice.org/binaries/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
+Source15: http://hg.services.openoffice.org/binaries/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
+Source16: http://hg.services.openoffice.org/binaries/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
BuildRequires: zip, findutils, autoconf, flex, bison, icu, gperf, gcc-c++
BuildRequires: binutils, java-devel, boost-devel, zlib-devel, vigra-devel
BuildRequires: python-devel, expat-devel, libxml2-devel, libxslt-devel, bc
@@ -62,108 +66,71 @@ BuildRequires: db4-devel, sane-backends
BuildRequires: freetype-devel, gtk3-devel, desktop-file-utils, hyphen-devel
BuildRequires: evolution-data-server-devel, libtextcat-devel, nss-devel
BuildRequires: gstreamer-devel, gstreamer-plugins-base-devel, openssl-devel
-BuildRequires: lpsolve-devel, hsqldb, bsh, lucene, lucene-contrib
+BuildRequires: mdds-devel, lpsolve-devel, hsqldb, bsh, lucene, lucene-contrib
BuildRequires: mesa-libGLU-devel, redland-devel, ant, ant-apache-regexp
BuildRequires: jakarta-commons-codec, jakarta-commons-httpclient
BuildRequires: jakarta-commons-lang, poppler-devel, fontpackages-devel
-BuildRequires: pentaho-reporting-flow-engine, libXinerama-devel
+BuildRequires: pentaho-reporting-flow-engine, libXinerama-devel, mythes-devel
Patch1: openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch
Patch2: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
Patch3: openoffice.org-2.0.2.rh188467.printingdefaults.patch
-Patch4: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
-Patch5: workspace.printerpullpages.patch
-Patch6: ooo-build.ooo68717.gstreamer.video.patch
-Patch7: openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch
-Patch8: openoffice.org-2.3.0.ooo76649.httpencoding.patch
-Patch9: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
-Patch10: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
-Patch11: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
-Patch12: workspace.fchints01.patch
-Patch13: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch
-Patch14: openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch
-Patch15: openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch
-Patch16: openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
-Patch17: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
-Patch18: openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
-Patch19: ooo-build.ooo2497.filter.svg.patch
-Patch20: openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch
-Patch21: workspace.slideshow1.patch
-Patch22: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
-Patch23: openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
-Patch24: openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch
-Patch25: workspace.locales33a.patch
-Patch26: openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch
-Patch27: openoffice.org-3.1.0.ooo102142.sd.resleak.patch
-Patch28: workspace.sdfindall.patch
-Patch29: workspace.dr73.patch
-Patch30: openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch
-Patch31: openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch
-Patch32: openoffice.org-3.1.1.ooo109280.sal.justcoredump.patch
-Patch33: workspace.vcl106.patch
-Patch34: openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch
-Patch35: openoffice.org-3.2.0.ooo105827.filter.xpath-on-rtf-not-allowed.patch
-Patch36: workspace.gsminhibit.patch
-Patch37: workspace.vcl107.patch
-Patch38: workspace.hb33patches1.patch
-Patch39: workspace.cmcfixes67.patch
-Patch40: workspace.srb1.patch
-Patch41: workspace.thbfixes10.patch
-Patch42: workspace.vcl108.patch
-Patch43: workspace.pythonssldedux.patch
-Patch44: openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch
-Patch45: openoffice.org-3.2.0.ooo47279.sd.objectsave.safe.patch
-Patch46: workspace.sw33bf03.patch
-Patch47: workspace.writerfilter07.patch
-Patch48: openoffice.org-3.3.0.ooo108246.svx.hide-sql-group-when-inactive.patch
-Patch49: workspace.sw33bf02.patch
-Patch50: workspace.fwk139.patch
-Patch51: workspace.cmcfixes70.patch
-Patch52: workspace.s390xport02.patch
-Patch53: openoffice.org-3.3.0.ooo108637.sfx2.uisavedir.patch
-Patch54: openoffice.org-3.2.0.ooo108846.sfx2.qstartfixes.patch
-Patch55: workspace.calc53.patch
-Patch56: workspace.impress188.patch
-Patch57: openoffice.org-3.2.0.ooo95369.sw.sortedobjs.patch
-Patch58: workspace.koheicsvimport.patch
-Patch59: workspace.odfmetadata4.patch
-Patch60: workspace.tl80.patch
-Patch61: openoffice.org-3.2.0.ooo110142.svx.safercolornames.patch
-Patch62: workspace.vcl111.patch
-Patch63: workspace.sw33bf04.patch
-Patch64: workspace.mba33issues01.patch
-Patch65: openoffice.org-3.3.0.ooo111446.writerfilter.avoidcrash.patch
-Patch66: workspace.chart47.patch
-Patch67: openoffice.org-3.3.0.ooo111699.svx.nullfield.patch
-Patch68: openoffice.org-3.3.0.ooo111758.sd.xerror.patch
-Patch69: workspace.extras330.patch
-Patch70: openoffice.org-3.2.0.ooo111741.extras.malformed-xml-file.patch
-Patch71: workspace.cmcfixes64.patch
-Patch72: workspace.cmcfixes75.patch
-Patch73: workspace.writerfilter08.patch
-Patch74: openoffice.org-3.3.0.ooo112059.sw.avoid-null-ptr-deref.patch
-Patch75: workspace.os140.patch
-Patch76: workspace.vcl112.patch
-Patch77: openoffice.org-3.3.0.ooo107490.cppu.lifecycle.patch
-Patch78: openoffice.org-3.3.0.ooo100686.wizards.types.not.mediatypes.patch
-Patch79: workspace.vcl113.patch
-Patch80: workspace.tl81.patch
-Patch81: openoffice.org-3.3.0.ooo112384.sw.export.doc.styledoesntexist.patch
-Patch82: workspace.gtkfpicker9.patch
-Patch83: workspace.gtk3.patch
-Patch84: workspace.sw33bf06.patch
+Patch4: ooo-build.ooo68717.gstreamer.video.patch
+Patch5: openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch
+Patch6: openoffice.org-2.3.0.ooo76649.httpencoding.patch
+Patch7: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
+Patch8: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
+Patch9: openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch
+Patch10: openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
+Patch11: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
+Patch12: openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
+Patch13: ooo-build.ooo2497.filter.svg.patch
+Patch14: openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch
+Patch15: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
+Patch16: openoffice.org-3.1.0.ooo101354.filter.xhtml.do-not-label-list-headers.patch
+Patch17: openoffice.org-3.1.0.ooo101355.filter.no-variables-in-keys.patch
+Patch18: openoffice.org-3.1.0.ooo102061.sc.cellanchoring.patch
+Patch19: openoffice.org-3.1.0.ooo102142.sd.resleak.patch
+Patch20: openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch
+Patch21: openoffice.org-3.1.1.ooo105784.vcl.sniffscriptforsubs.patch
+Patch22: openoffice.org-3.2.0.ooo105827.filter.xpath-on-rtf-not-allowed.patch
+Patch23: workspace.srb1.patch
+Patch24: openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch
+Patch25: openoffice.org-3.3.0.ooo108246.svx.hide-sql-group-when-inactive.patch
+Patch26: openoffice.org-3.3.0.ooo108637.sfx2.uisavedir.patch
+Patch27: openoffice.org-3.2.0.ooo108846.sfx2.qstartfixes.patch
+Patch28: openoffice.org-3.2.0.ooo95369.sw.sortedobjs.patch
+Patch29: openoffice.org-3.3.0.ooo74188.indiccursor.editeng.patch
+Patch30: openoffice.org-3.2.0.ooo110142.svx.safercolornames.patch
+Patch31: openoffice.org-3.3.0.ooo111699.svx.nullfield.patch
+Patch32: openoffice.org-3.3.0.ooo111758.sd.xerror.patch
+Patch33: openoffice.org-3.2.0.ooo111741.extras.malformed-xml-file.patch
+Patch34: workspace.writerfilter08.patch
+Patch35: openoffice.org-3.3.0.ooo112059.sw.avoid-null-ptr-deref.patch
+Patch36: openoffice.org-3.3.0.ooo107490.cppu.lifecycle.patch
+Patch37: openoffice.org-3.3.0.ooo100686.wizards.types.not.mediatypes.patch
+Patch38: workspace.vcl113.patch
+Patch39: workspace.tl81.patch
+Patch40: openoffice.org-3.3.0.ooo112384.sw.export.doc.styledoesntexist.patch
+Patch41: workspace.gtk3.patch
+Patch42: workspace.sw33bf06.patch
+Patch43: workspace.sb128.patch
+Patch44: openoffice.org-3.3.0.oooXXXXX.offapi.weirdness.patch
+Patch45: openoffice.org-3.3.0.oooXXXXX.afms.buildtype.patch
+Patch46: workspace.native317.patch
+Patch47: workspace.sb126.patch
+Patch48: openoffice.org-3.3.0.ooo113117.extensions.broken.scanner.shutdown.patch
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%define instdir %{_libdir}
%define baseinstdir %{instdir}/openoffice.org
%define ureinstdir %{baseinstdir}/ure
-%define basisinstdir %{baseinstdir}/basis3.2
-%define sdkinstdir %{baseinstdir}/basis3.2/sdk
+%define basisinstdir %{baseinstdir}/basis3.3
+%define sdkinstdir %{baseinstdir}/basis3.3/sdk
%define oooinstdir %{instdir}/openoffice.org3
%define brinstdir %{instdir}/broffice.org3
%define fontname opensymbol
-%define OFFICEUPD 320
-%define UPD %nil
+%define OFFICEUPD 330
%define SOPOST l*
%description
@@ -1121,7 +1088,7 @@ Provides additional Slovenian translatio
Summary: Serbian language pack for OpenOffice.org
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: font(:lang=sr), hunspell-sr, hyphen-sr
+Requires: font(:lang=sr), hunspell-sr, hyphen-sr, autocorr-sr
Obsoletes: openoffice.org-langpack-sr_CS < 1:2.0.3
Obsoletes: openoffice.org2-langpack-sr_CS < 1:3.0.0
@@ -1588,6 +1555,14 @@ BuildArch: noarch
%description -n autocorr-sl
Rules for autocorrecting common Slovenian typing errors.
+%package -n autocorr-sr
+Summary: Serbian autocorrection rules
+Group: Applications/Text
+BuildArch: noarch
+
+%description -n autocorr-sr
+Rules for autocorrecting common Serbian typing errors.
+
%package -n autocorr-sv
Summary: Swedish autocorrection rules
Group: Applications/Text
@@ -1636,126 +1611,89 @@ cp -p %{SOURCE5} external/unowinreg/unow
%patch1 -p1 -b .rhXXXXXX.extensions.defaulttoevo2.patch
%patch2 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
%patch3 -p1
-%patch4 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
-%patch5 -p0 -b .workspace.printerpullpages.patch
-%patch6 -p0 -b .ooo68717.gstreamer.video.patch
-%patch7 -p1 -b .ooo7065.sw.titlepagedialog.patch
-%patch8 -p1 -b .ooo76649.httpencoding.patch
-%patch9 -p1 -b .ooo83878.unopkg.enablelinking.patch
-%patch10 -p1 -b .ooo86080.unopkg.bodge.patch
-%patch11 -p1 -b .ooo88341.sc.verticalboxes.patch
-%patch12 -p1 -b .workspace.fchints01.patch
-%patch13 -p1 -b .ooo87970.vcl.samenamesubs.patch
-%patch14 -p1 -b .ooo91924.svx.consistentordering.patch
-%patch15 -p1 -b .oooXXXXX.fpicker.allformatsonsave.patch
-%patch16 -p0 -b .ooo98137.filter.redeclared-variables.patch
-%patch17 -p0 -b .gccXXXXX.solenv.javaregistration.patch
-%patch18 -p1 -b .oooXXXXX.solenv.allowmissing.patch
-%patch19 -p1 -b .ooo2497.filter.svg.patch
-%patch20 -p1 -b .ooo61927.sw.ww6.unicodefontencoding.patch
-%patch21 -p1 -b .workspace.slideshow1.patch
-%patch22 -p0 -b .ooo101274.opening-a-directory.patch
-%patch23 -p0 -b .ooo101354.filter.xhtml.do-not-label-list-headers.patch
-%patch24 -p0 -b .ooo101355.filter.no-variables-in-keys.patch
-%patch25 -p1 -b .workspace.locales33a.patch
-%patch26 -p0 -b .ooo102061.sc.cellanchoring.patch
-%patch27 -p0 -b .ooo102142.sd.resleak.patch
-%patch28 -p0 -b .workspace.sdfindall.patch
-%patch29 -p0 -b .workspace.dr73.patch
-%patch30 -p0 -b .ooo104329.dbaccess.primarykeys.patch
-%patch31 -p0 -b .ooo64671.canvas.add-support-for-font-pitch.patch
-%patch32 -p1 -b .ooo109280.sal.justcoredump.patch
-%patch33 -p0 -b .workspace.vcl106.patch
-%patch34 -p0 -b .ooo105784.vcl.sniffscriptforsubs.patch
-%patch35 -p0 -b .ooo105827.filter.xpath-on-rtf-not-allowed.patch
-%patch36 -p1 -b .workspace.gsminhibit.patch
-%patch37 -p1 -b .workspace.vcl107.patch
-%patch38 -p0 -b .workspace.hb33patches1.patch
-%patch39 -p1 -b .workspace.cmcfixes67.patch
-%patch40 -p1 -b .workspace.srb1.patch
-%patch41 -p0 -b .workspace.thbfixes10.patch
-%patch42 -p0 -b .workspace.vcl108.patch
-%patch43 -p1 -b .workspace.pythonssldedux.patch
-%patch44 -p1 -b .ooo106502.svx.fixspelltimer.patch
-%patch45 -p0 -b .ooo47279.sd.objectsave.safe.patch
-%patch46 -p1 -b .workspace.sw33bf03.patch
-%patch47 -p0 -b .workspace.writerfilter07.patch
-%patch48 -p1 -b .ooo108246.svx.hide-sql-group-when-inactive.patch
-%patch49 -p1 -b .workspace.sw33bf02.patch
-%patch50 -p0 -b .workspace.fwk139.patch
-%patch51 -p1 -b .workspace.cmcfixes70.patch
-%patch52 -p1 -b .workspace.s390xport02.patch
-%patch53 -p1 -b .ooo108637.sfx2.uisavedir.patch
-%patch54 -p1 -b .ooo108846.sfx2.qstartfixes.patch
-%patch55 -p0 -b .workspace.calc53.patch
-%patch56 -p0 -b .workspace.impress188.patch
-%patch57 -p1 -b .ooo95369.sw.sortedobjs.patch
-%patch58 -p1 -b .workspace.koheicsvimport.patch
-%patch59 -p1 -b .workspace.odfmetadata4.patch
-%patch60 -p1 -b .workspace.tl80.patch
-%patch61 -p0 -b .ooo110142.svx.safercolornames.patch
-%patch62 -p1 -b .workspace.vcl111.patch
-%patch63 -p1 -b .workspace.sw33bf04.patch
-%patch64 -p1 -b .workspace.mba33issues01.patch
-%patch65 -p0 -b .ooo111446.writerfilter.avoidcrash.patch
-%patch66 -p0 -b .workspace.chart47.patch
-%patch67 -p0 -b .ooo111699.svx.nullfield.patch
-%patch68 -p0 -b .ooo111758.sd.xerror.patch
-%patch69 -p1 -b .workspace.extras330.patch
-%patch70 -p1 -b .ooo111741.extras.malformed-xml-file.patch
-%patch71 -p1 -b .workspace.cmcfixes64.patch
-%patch72 -p1 -b .workspace.cmcfixes75.patch
-%patch73 -p0 -b .workspace.writerfilter08.patch
-%patch74 -p1 -b .ooo112059.sw.avoid-null-ptr-deref.patch
-%patch75 -p1 -b .workspace.os140.patch
-%patch76 -p1 -b .workspace.vcl112.patch
-%patch77 -p0 -b .ooo107490.cppu.lifecycle.patch
-%patch78 -p0 -b .ooo100686.wizards.types.not.mediatypes.patch
-%patch79 -p0 -b .workspace.vcl113.patch
-%patch80 -p0 -b .workspace.tl81.patch
-%patch81 -p0 -b .ooo112384.sw.export.doc.styledoesntexist.patch
-%patch82 -p0 -b .workspace.gtkfpicker9.patch
-%patch83 -p0 -b .workspace.gtk3.patch
-%patch84 -p0 -b .workspace.sw33bf06.patch
+%patch4 -p0 -b .ooo68717.gstreamer.video.patch
+%patch5 -p1 -b .ooo7065.sw.titlepagedialog.patch
+#%patch6 -p1 -b .ooo76649.httpencoding.patch FIXME
+%patch7 -p1 -b .ooo86080.unopkg.bodge.patch
+%patch8 -p1 -b .ooo88341.sc.verticalboxes.patch
+%patch9 -p1 -b .oooXXXXX.fpicker.allformatsonsave.patch
+%patch10 -p0 -b .ooo98137.filter.redeclared-variables.patch
+%patch11 -p0 -b .gccXXXXX.solenv.javaregistration.patch
+%patch12 -p1 -b .oooXXXXX.solenv.allowmissing.patch
+%patch13 -p1 -b .ooo2497.filter.svg.patch
+%patch14 -p1 -b .ooo61927.sw.ww6.unicodefontencoding.patch
+%patch15 -p0 -b .ooo101274.opening-a-directory.patch
+%patch16 -p0 -b .ooo101354.filter.xhtml.do-not-label-list-headers.patch
+%patch17 -p0 -b .ooo101355.filter.no-variables-in-keys.patch
+%patch18 -p0 -b .ooo102061.sc.cellanchoring.patch
+%patch19 -p0 -b .ooo102142.sd.resleak.patch
+%patch20 -p0 -b .ooo64671.canvas.add-support-for-font-pitch.patch
+%patch21 -p0 -b .ooo105784.vcl.sniffscriptforsubs.patch
+%patch22 -p0 -b .ooo105827.filter.xpath-on-rtf-not-allowed.patch
+%patch23 -p1 -b .workspace.srb1.patch
+%patch24 -p1 -b .ooo106502.svx.fixspelltimer.patch
+%patch25 -p1 -b .ooo108246.svx.hide-sql-group-when-inactive.patch
+%patch26 -p1 -b .ooo108637.sfx2.uisavedir.patch
+%patch27 -p1 -b .ooo108846.sfx2.qstartfixes.patch
+%patch28 -p1 -b .ooo95369.sw.sortedobjs.patch
+%patch29 -p1 -b .ooo74188.indiccursor.editeng.patch
+%patch30 -p0 -b .ooo110142.svx.safercolornames.patch
+%patch31 -p0 -b .ooo111699.svx.nullfield.patch
+%patch32 -p0 -b .ooo111758.sd.xerror.patch
+%patch33 -p1 -b .ooo111741.extras.malformed-xml-file.patch
+%patch34 -p0 -b .workspace.writerfilter08.patch
+%patch35 -p1 -b .ooo112059.sw.avoid-null-ptr-deref.patch
+%patch36 -p0 -b .ooo107490.cppu.lifecycle.patch
+%patch37 -p0 -b .ooo100686.wizards.types.not.mediatypes.patch
+%patch38 -p0 -b .workspace.vcl113.patch
+%patch39 -p0 -b .workspace.tl81.patch
+%patch40 -p0 -b .ooo112384.sw.export.doc.styledoesntexist.patch
+%patch41 -p0 -b .workspace.gtk3.patch
+%patch42 -p0 -b .workspace.sw33bf06.patch
+%patch43 -p1 -b .workspace.sb128.patch
+%patch44 -p0 -b .oooXXXXX.offapi.weirdness.patch
+%patch45 -p0 -b .oooXXXXX.afms.buildtype.patch
+%patch46 -p1 -b .workspace.native317.patch
+%patch47 -p1 -b .workspace.sb126.patch
+%patch48 -p0 -b .ooo113117.extensions.broken.scanner.shutdown.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
#don't build localized helps which are poorly translated
POORHELPS=`find l10n/source -name localize.sdf -exec grep 'helpcontent2.*main.*Working With %PRODUCTNAME' {} \; | cut -f 10 | grep -v en-US | xargs`
-#kid translations are broken for the .desktop files at the moment
-#See ooo#107407
-rm -rf l10n/source/kid
-
autoconf
%configure \
--with-build-version="Ver: %{version}-%{release}" --with-unix-wrapper=%{name} \
- --with-use-shell=bash --disable-ldap --disable-epm --disable-qadevooo \
- --disable-fontooo --disable-mathmldtd --disable-Xaw --disable-gnome-vfs \
- --enable-gio --enable-symbols --enable-lockdown --enable-evolution2 \
- --enable-cairo --enable-dbus --enable-opengl --enable-vba \
- --enable-minimizer --enable-presenter-console --enable-pdfimport \
- --enable-wiki-publisher --enable-report-builder --with-system-jfreereport \
- --with-vba-package-format="builtin" --with-system-libs --with-system-headers \
- --with-system-mozilla --with-system-redland --with-system-dicts \
- --with-system-apache-commons \
+ --enable-symbols --disable-ldap --disable-epm --disable-mathmldtd \
+ --disable-Xaw --disable-gnome-vfs --enable-gio --enable-symbols \
+ --enable-lockdown --enable-evolution2 --enable-cairo --enable-dbus \
+ --enable-opengl --enable-vba --enable-minimizer --enable-presenter-console \
+ --enable-pdfimport --enable-wiki-publisher --enable-report-builder \
+ --with-system-jfreereport --with-vba-package-format="builtin" \
+ --with-system-libs --with-system-headers --with-system-mozilla \
+ --with-system-mythes --with-system-dicts --with-system-apache-commons \
+ --with-system-libtextcat --without-system-saxon \
--with-external-dict-dir=/usr/share/myspell --without-myspell-dicts \
- --without-system-mspack --without-fonts --without-agg --without-ppds \
- --without-afms %{stlflags} --with-lang="%{langpack_langs}" --without-system-saxon \
- --with-poor-help-localizations="$POORHELPS" \
+ --without-fonts --without-agg --without-ppds --without-afms %{stlflags} \
+ --with-lang="%{langpack_langs}" --with-poor-help-localizations="$POORHELPS" \
+ --with-external-tar=`pwd`/ext_sources \
--disable-graphite # for now
+mkdir -p ext_sources
+cp %{SOURCE11} ext_sources
+cp %{SOURCE12} ext_sources
+cp %{SOURCE13} ext_sources
+cp %{SOURCE14} ext_sources
+cp %{SOURCE15} ext_sources
+cp %{SOURCE16} ext_sources
+
./bootstrap
source ./Linux*Env.Set.sh
#unneccessary to build for both hash types
unset HAVE_LD_HASH_STYLE
-#faster build
-export nodep=true
-export NO_HIDS=true
#Set the "This product has been created by..." in Help->About
export OOO_VENDOR="Red Hat, Inc."
-#force linker
-export LINK=$CXX
#use the RPM_OPT_FLAGS but remove the OOo overridden ones
for i in $RPM_OPT_FLAGS; do
case "$i" in
@@ -1775,13 +1713,10 @@ DMAKE_SMP_MFLAGS=-P$DMAKE_SMP_MFLAGS
BUILD_SMP_MFLAGS=-P$BUILD_SMP_MFLAGS
#just in case you have a >16 proc box
export MAXPROCESSLIMIT=65535
-#get core dumps
-ulimit -c unlimited
-#build OOo, on failure make a stab at debugging the crash if any, and
-#rebuild un-parallel
+#build OOo, on failure make a stab at rebuilding un-parallel
cd instsetoo_native/util
-if ! build --dlv_switch -link --all $BUILD_SMP_MFLAGS -- $DMAKE_SMP_MFLAGS -s; then
+if ! VERBOSE=false build --dlv_switch -link --all $BUILD_SMP_MFLAGS -- $DMAKE_SMP_MFLAGS -s; then
build --dlv_switch -link --all
fi
@@ -1807,56 +1742,53 @@ source ./Linux*Env.Set.sh
#figure out the icon version
export `grep "^PRODUCTVERSIONSHORT =" sysui/desktop/productversion.mk | sed -e "s/ //g"`
export `grep "PRODUCTVERSION[ ]*=[ ]*" sysui/desktop/productversion.mk | sed -e "s/ //g"`
-unset HAVE_LD_HASH_STYLE
+#install
+cd instsetoo_native/util
+#direct install
+mkdir -p $RPM_BUILD_ROOT/%{instdir}
+export PKGFORMAT=installed
#don't duplicate english helpcontent about the place
unset DEFAULT_TO_ENGLISH_FOR_PACKING
-cd instsetoo_native/util
-#get an unpackaged raw install
-export PKGFORMATSWITCH="-simple $RPM_BUILD_ROOT/%{instdir}"
-export CLASSPATH=/usr/share/java/lucene.jar:/usr/share/java/lucene-contrib/lucene-analyzers.jar
%if %{langpacks}
-for attempt in 1 2 3 4 5 6 7 8 9 10; do
- echo Attempt $attempt
- if dmake broffice_pt-BR; then
- ok=true
- break
- else
- echo - ---dump log start---
- cat ../unx*.pro/BrOffice/logging/pt-BR/log_*_pt-BR.log
- echo - ---dump log end---
- export _MALLOC_CHECK=0
- ok=false
- fi
-done
+if dmake broffice_pt-BR; then
+ ok=true
+ break
+else
+ echo - ---dump log start---
+ cat ../unx*.pro/BrOffice/logging/pt-BR/log_*_pt-BR.log
+ echo - ---dump log end---
+ ok=false
+fi
if [ $ok == "false" ]; then
exit 1
fi
-rm -rf $RPM_BUILD_ROOT/%{ureinstdir}
-rm -rf $RPM_BUILD_ROOT/%{basisinstdir}
+mv ../unxlng*.pro/BrOffice/installed/install/pt-BR/broffice* $RPM_BUILD_ROOT/%{instdir}
+chmod -R +w $RPM_BUILD_ROOT/%{brinstdir}
%endif
-for attempt in 1 2 3 4 5 6 7 8 9 10; do
- echo Attempt $attempt
- if dmake openoffice_en-US; then
- ok=true
- break
- else
- echo - ---dump log start---
- cat ../unx*.pro/OpenOffice/logging/en-US/log_*_en-US.log
- echo - ---dump log end---
- export _MALLOC_CHECK=0
- ok=false
- fi
-done
+if dmake openoffice_en-US; then
+ ok=true
+ break
+else
+ echo - ---dump log start---
+ cat ../unx*.pro/OpenOffice/logging/en-US/log_*_en-US.log
+ echo - ---dump log end---
+ ok=false
+fi
if [ $ok == "false" ]; then
exit 1
fi
+mv ../unxlng*.pro/OpenOffice/installed/install/en-US/* $RPM_BUILD_ROOT/%{instdir}
chmod -R +w $RPM_BUILD_ROOT/%{baseinstdir} $RPM_BUILD_ROOT/%{oooinstdir}
#provide an owner for these dir
mkdir -p $RPM_BUILD_ROOT/%{baseinstdir}/extensions
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/openoffice.org/extensions
%if %{langpacks}
dmake ooolanguagepack
-chmod -R +w $RPM_BUILD_ROOT/%{brinstdir}
+rm -rf ../unxlngx6.pro/OpenOffice_languagepack/installed/install/log
+for langpack in ../unxlngx6.pro/OpenOffice_languagepack/installed/install/*; do
+cp -rp $langpack/* $RPM_BUILD_ROOT/%{instdir}
+rm -rf $langpack
+done
%endif
for file in swriter scalc simpress sdraw ; do
cp -f ../../desktop/$OUTPATH.pro/bin/$file $RPM_BUILD_ROOT/%{oooinstdir}/program/$file.bin
@@ -1879,9 +1811,9 @@ pushd $RPM_BUILD_ROOT/%{brinstdir}/share
ln -s %{baseinstdir}/share/uno_packages/cache cache
popd
%endif
-export PKGFORMATSWITCH="-simple $RPM_BUILD_ROOT/%{instdir}"
export WITH_LANG="en-US"
dmake sdkoo
+mv ../unxlng*.pro/OpenOffice_SDK/installed/install/en-US/openoffice.org/*/sdk $RPM_BUILD_ROOT/%{sdkinstdir}
cd ../../
# unpack report-builder extension
@@ -1998,10 +1930,8 @@ popd
#add our custom configuration options
#enable gtk file dialog as the default
rm -rf $RPM_BUILD_ROOT/%{basisinstdir}/share/registry/modules/org/openoffice/Office/Common/Common-UseOOoFileDialogs.xcu
-#remove dictooo stuff which we disabled in configure
-rm -rf $RPM_BUILD_ROOT/%{basisinstdir}/share/registry/modules/org/openoffice/Office/Common/Common-dicooo.xcu
#don't prompt user to register
-sed -i -e "s#>Patch.*# xsi:nil=\"true\"/>#g" $RPM_BUILD_ROOT/%{basisinstdir}/share/registry/data/org/openoffice/Office/Common.xcu
+sed -i -e "s#<value>Patch</value>#<value xsi:nil=\"true\"/>#g" $RPM_BUILD_ROOT/%{basisinstdir}/share/registry/main.xcd
#default autorecovery settings
#don't prompt user to agree to license
#system libtextcat fingerprint location
@@ -2041,10 +1971,8 @@ popd
#Set some aliases to canonical autocorrect language files for locales with matching languages
pushd $RPM_BUILD_ROOT/%{basisinstdir}/share/autocorr
-# ooo#105600
-cp -p %{SOURCE10} acor_ga-IE.dat
# ooo#108049
-cp -p %{SOURCE12} acor_lt-LT.dat
+cp -p %{SOURCE9} acor_lt-LT.dat
#en-ZA exists and has a good autocorrect file with two or three extras that make sense for South Africa
en_GB_aliases="en-AG en-AU en-BS en-BW en-BZ en-CA en-DK en-GH en-HK en-IE en-IN en-JM en-NG en-NZ en-SG en-TT"
@@ -2158,7 +2086,7 @@ while [ $i -lt ${#langpackdetails[@]} ];
sed -e "s/LANG/$lang/g" langpacks/openoffice.org.langpack-ctl.template >> $lang.filelist
fi
if [ "$type" = "ctl" ]; then
- rm -f $RPM_BUILD_ROOT/%{basisinstdir}/share/registry/modules/org/openoffice/Office/Common/Common-ctl_$lang.xcu
+ rm -f $RPM_BUILD_ROOT/%{basisinstdir}/share/registry/ctl_$lang.xcd
fi
i=$[i+1]
done
@@ -2264,18 +2192,18 @@ echo \#\!/bin/sh > $RPM_BUILD_ROOT/%{_bi
echo exec openoffice.org -base \"\$@\" >> $RPM_BUILD_ROOT/%{_bindir}/oobase
chmod a+x $RPM_BUILD_ROOT/%{_bindir}/oobase
-cp -f %{SOURCE11} $RPM_BUILD_ROOT/%{_bindir}/unopkg
+cp -f %{SOURCE10} $RPM_BUILD_ROOT/%{_bindir}/unopkg
sed -i -e "s/LAUNCHER/unopkg/g" $RPM_BUILD_ROOT/%{_bindir}/unopkg
sed -i -e "s/BRAND/openoffice.org3/g" $RPM_BUILD_ROOT/%{_bindir}/unopkg
chmod a+x $RPM_BUILD_ROOT/%{_bindir}/unopkg
-cp -f %{SOURCE11} $RPM_BUILD_ROOT/%{_bindir}/openoffice.org
+cp -f %{SOURCE10} $RPM_BUILD_ROOT/%{_bindir}/openoffice.org
sed -i -e "s/LAUNCHER/soffice/g" $RPM_BUILD_ROOT/%{_bindir}/openoffice.org
sed -i -e "s/BRAND/openoffice.org3/g" $RPM_BUILD_ROOT/%{_bindir}/openoffice.org
chmod a+x $RPM_BUILD_ROOT/%{_bindir}/openoffice.org
%if %{langpacks}
-cp -f %{SOURCE11} $RPM_BUILD_ROOT/%{_bindir}/broffice.org
+cp -f %{SOURCE10} $RPM_BUILD_ROOT/%{_bindir}/broffice.org
sed -i -e "s/LAUNCHER/soffice/g" $RPM_BUILD_ROOT/%{_bindir}/broffice.org
sed -i -e "s/BRAND/broffice.org3/g" $RPM_BUILD_ROOT/%{_bindir}/broffice.org
chmod a+x $RPM_BUILD_ROOT/%{_bindir}/broffice.org
@@ -2323,11 +2251,8 @@ cp -p impress.desktop $RPM_BUILD_ROOT/%{
cp -p writer.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-writer.desktop
cp -p math.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-math.desktop
cp -p draw.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-draw.desktop
+cp -p javafilter.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-javafilter.desktop
popd
-# rhbz#486062/ooo#109154 create a .desktop file that registers OOo as a handler for the javafilter formats
-# iff it is installed
-cp -p %{SOURCE9} $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-javafilter.desktop
-chmod 0644 $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-javafilter.desktop
pushd sysui/output/usr/share/
#get rid of the gnome icons and other unneeded files
rm -rf icons/gnome applications mime application-registry
@@ -2409,14 +2334,12 @@ cp -r psprint_config/configuration/ppds/
# 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/%{basisinstdir}/program/fundamentalbasisrc
-%check
-source ./Linux*Env.Set.sh
-cd smoketestoo_native
-#don't prompt user to register
-sed -i -e "s#\$ARGV\[4\];#0;#g" config.pl
-#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
+#%check
+#source ./Linux*Env.Set.sh
+#cd smoketestoo_native
+##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
%clean
rm -rf $RPM_BUILD_ROOT
@@ -2502,7 +2425,7 @@ rm -rf $RPM_BUILD_ROOT
%files langpack-ko_KR -f ko.filelist
%defattr(-,root,root,-)
-%{oooinstdir}/share/registry/modules/org/openoffice/Office/Common/Common-korea.xcu
+%{oooinstdir}/share/registry/korea.xcd
%files langpack-lt_LT -f lt.filelist
%defattr(-,root,root,-)
@@ -2671,7 +2594,6 @@ rm -rf $RPM_BUILD_ROOT
%{basisinstdir}/program/classes/XSLTFilter.jar
%{basisinstdir}/program/classes/XSLTValidate.jar
%{basisinstdir}/program/cmdmail.uno.so
-%{basisinstdir}/program/configmgrrc
%{basisinstdir}/program/deployment%{SOPOST}.uno.so
%{basisinstdir}/program/deploymentgui%{SOPOST}.uno.so
%{basisinstdir}/program/dlgprov%{SOPOST}.uno.so
@@ -2725,6 +2647,7 @@ rm -rf $RPM_BUILD_ROOT
%{basisinstdir}/program/libdict_ja.so
%{basisinstdir}/program/libdict_zh.so
%{basisinstdir}/program/libdrawinglayer%{SOPOST}.so
+%{basisinstdir}/program/libediteng%{SOPOST}.so
%{basisinstdir}/program/libeggtray%{SOPOST}.so
%{basisinstdir}/program/libembobj.so
%{basisinstdir}/program/libemboleobj.so
@@ -2773,6 +2696,8 @@ rm -rf $RPM_BUILD_ROOT
%{basisinstdir}/program/liblocaledata_others.so
%{basisinstdir}/program/libmcnttype.so
%{basisinstdir}/program/libmozbootstrap.so
+%{basisinstdir}/program/libmsfilter%{SOPOST}.so
+%{basisinstdir}/program/libmsforms%{SOPOST}.uno.so
%{basisinstdir}/program/libmysql%{SOPOST}.so
%{basisinstdir}/program/libodbc%{SOPOST}.so
%{basisinstdir}/program/libodbcbase%{SOPOST}.so
@@ -2801,11 +2726,9 @@ rm -rf $RPM_BUILD_ROOT
%{basisinstdir}/program/libsts%{SOPOST}.so
%{basisinstdir}/program/libsvx%{SOPOST}.so
%{basisinstdir}/program/libsvxcore%{SOPOST}.so
-%{basisinstdir}/program/libsvxmsfilter%{SOPOST}.so
%{basisinstdir}/program/libsw%{SOPOST}.so
%{basisinstdir}/program/libtextconv_dict.so
%{basisinstdir}/program/libtextconversiondlgs%{SOPOST}.so
-%{basisinstdir}/program/libtfu%{SOPOST}.so
%{basisinstdir}/program/libtvhlp1.so
%{basisinstdir}/program/libucbhelper4gcc3.so
%{basisinstdir}/program/libucpchelp1.so
@@ -2818,6 +2741,7 @@ rm -rf $RPM_BUILD_ROOT
%{basisinstdir}/program/libunoxml%{SOPOST}.so
%{basisinstdir}/program/libupdchk%{SOPOST}.so
%{basisinstdir}/program/libuui%{SOPOST}.so
+%{basisinstdir}/program/libvbahelper%{SOPOST}.so
%{basisinstdir}/program/libvclplug_gen%{SOPOST}.so
%{basisinstdir}/program/libvclplug_gtk%{SOPOST}.so
%{basisinstdir}/program/libxmlfa%{SOPOST}.so
@@ -2838,64 +2762,65 @@ rm -rf $RPM_BUILD_ROOT
%{basisinstdir}/program/pluginapp.bin
%{basisinstdir}/program/productregistration.uno.so
%dir %{basisinstdir}/program/resource
-%{basisinstdir}/program/resource/avmedia%{UPD}en-US.res
-%{basisinstdir}/program/resource/acc%{UPD}en-US.res
-%{basisinstdir}/program/resource/basctl%{UPD}en-US.res
-%{basisinstdir}/program/resource/bf_frm%{UPD}en-US.res
-%{basisinstdir}/program/resource/bf_ofa%{UPD}en-US.res
-%{basisinstdir}/program/resource/bf_sch%{UPD}en-US.res
-%{basisinstdir}/program/resource/bf_sd%{UPD}en-US.res
-%{basisinstdir}/program/resource/bf_svt%{UPD}en-US.res
-%{basisinstdir}/program/resource/bf_svx%{UPD}en-US.res
-%{basisinstdir}/program/resource/bib%{UPD}en-US.res
-%{basisinstdir}/program/resource/cal%{UPD}en-US.res
-%{basisinstdir}/program/resource/chartcontroller%{UPD}en-US.res
-%{basisinstdir}/program/resource/dba%{UPD}en-US.res
-%{basisinstdir}/program/resource/dbmm%{UPD}en-US.res
-%{basisinstdir}/program/resource/dbu%{UPD}en-US.res
-%{basisinstdir}/program/resource/dbw%{UPD}en-US.res
-%{basisinstdir}/program/resource/deployment%{UPD}en-US.res
-%{basisinstdir}/program/resource/deploymentgui%{UPD}en-US.res
-%{basisinstdir}/program/resource/dkt%{UPD}en-US.res
-%{basisinstdir}/program/resource/egi%{UPD}en-US.res
-%{basisinstdir}/program/resource/eme%{UPD}en-US.res
-%{basisinstdir}/program/resource/epb%{UPD}en-US.res
-%{basisinstdir}/program/resource/epg%{UPD}en-US.res
-%{basisinstdir}/program/resource/epp%{UPD}en-US.res
-%{basisinstdir}/program/resource/eps%{UPD}en-US.res
-%{basisinstdir}/program/resource/ept%{UPD}en-US.res
-%{basisinstdir}/program/resource/eur%{UPD}en-US.res
-%{basisinstdir}/program/resource/fps_office%{UPD}en-US.res
-%{basisinstdir}/program/resource/frm%{UPD}en-US.res
-%{basisinstdir}/program/resource/fwe%{UPD}en-US.res
-%{basisinstdir}/program/resource/gal%{UPD}en-US.res
-%{basisinstdir}/program/resource/imp%{UPD}en-US.res
-%{basisinstdir}/program/resource/ofa%{UPD}en-US.res
-%{basisinstdir}/program/resource/pcr%{UPD}en-US.res
-%{basisinstdir}/program/resource/pdffilter%{UPD}en-US.res
-%{basisinstdir}/program/resource/preload%{UPD}en-US.res
-%{basisinstdir}/program/resource/productregistration%{UPD}en-US.res
-%{basisinstdir}/program/resource/san%{UPD}en-US.res
-%{basisinstdir}/program/resource/sb%{UPD}en-US.res
-%{basisinstdir}/program/resource/sd%{UPD}en-US.res
-%{basisinstdir}/program/resource/sfx%{UPD}en-US.res
-%{basisinstdir}/program/resource/spa%{UPD}en-US.res
-%{basisinstdir}/program/resource/sdbt%{UPD}en-US.res
-%{basisinstdir}/program/resource/svs%{UPD}en-US.res
-%{basisinstdir}/program/resource/svt%{UPD}en-US.res
-%{basisinstdir}/program/resource/svx%{UPD}en-US.res
-%{basisinstdir}/program/resource/sw%{UPD}en-US.res
-%{basisinstdir}/program/resource/textconversiondlgs%{UPD}en-US.res
-%{basisinstdir}/program/resource/tfu%{UPD}en-US.res
-%{basisinstdir}/program/resource/tk%{UPD}en-US.res
-%{basisinstdir}/program/resource/tpl%{UPD}en-US.res
-%{basisinstdir}/program/resource/uui%{UPD}en-US.res
-%{basisinstdir}/program/resource/updchk%{UPD}en-US.res
-%{basisinstdir}/program/resource/upd%{UPD}en-US.res
-%{basisinstdir}/program/resource/vcl%{UPD}en-US.res
-%{basisinstdir}/program/resource/wzi%{UPD}en-US.res
-%{basisinstdir}/program/resource/xmlsec%{UPD}en-US.res
-%{basisinstdir}/program/resource/xsltdlg%{UPD}en-US.res
+%{basisinstdir}/program/resource/avmediaen-US.res
+%{basisinstdir}/program/resource/accen-US.res
+%{basisinstdir}/program/resource/basctlen-US.res
+%{basisinstdir}/program/resource/bf_frmen-US.res
+%{basisinstdir}/program/resource/bf_ofaen-US.res
+%{basisinstdir}/program/resource/bf_schen-US.res
+%{basisinstdir}/program/resource/bf_sden-US.res
+%{basisinstdir}/program/resource/bf_svten-US.res
+%{basisinstdir}/program/resource/bf_svxen-US.res
+%{basisinstdir}/program/resource/biben-US.res
+%{basisinstdir}/program/resource/calen-US.res
+%{basisinstdir}/program/resource/chartcontrolleren-US.res
+%{basisinstdir}/program/resource/cuien-US.res
+%{basisinstdir}/program/resource/dbaen-US.res
+%{basisinstdir}/program/resource/dbmmen-US.res
+%{basisinstdir}/program/resource/dbuen-US.res
+%{basisinstdir}/program/resource/dbwen-US.res
+%{basisinstdir}/program/resource/deploymenten-US.res
+%{basisinstdir}/program/resource/deploymentguien-US.res
+%{basisinstdir}/program/resource/dkten-US.res
+%{basisinstdir}/program/resource/editengen-US.res
+%{basisinstdir}/program/resource/egien-US.res
+%{basisinstdir}/program/resource/emeen-US.res
+%{basisinstdir}/program/resource/epben-US.res
+%{basisinstdir}/program/resource/epgen-US.res
+%{basisinstdir}/program/resource/eppen-US.res
+%{basisinstdir}/program/resource/epsen-US.res
+%{basisinstdir}/program/resource/epten-US.res
+%{basisinstdir}/program/resource/euren-US.res
+%{basisinstdir}/program/resource/fps_officeen-US.res
+%{basisinstdir}/program/resource/frmen-US.res
+%{basisinstdir}/program/resource/fween-US.res
+%{basisinstdir}/program/resource/galen-US.res
+%{basisinstdir}/program/resource/impen-US.res
+%{basisinstdir}/program/resource/ofaen-US.res
+%{basisinstdir}/program/resource/pcren-US.res
+%{basisinstdir}/program/resource/pdffilteren-US.res
+%{basisinstdir}/program/resource/preloaden-US.res
+%{basisinstdir}/program/resource/productregistrationen-US.res
+%{basisinstdir}/program/resource/sanen-US.res
+%{basisinstdir}/program/resource/sben-US.res
+%{basisinstdir}/program/resource/sden-US.res
+%{basisinstdir}/program/resource/sfxen-US.res
+%{basisinstdir}/program/resource/spaen-US.res
+%{basisinstdir}/program/resource/sdbten-US.res
+%{basisinstdir}/program/resource/svsen-US.res
+%{basisinstdir}/program/resource/svten-US.res
+%{basisinstdir}/program/resource/svxen-US.res
+%{basisinstdir}/program/resource/swen-US.res
+%{basisinstdir}/program/resource/textconversiondlgsen-US.res
+%{basisinstdir}/program/resource/tken-US.res
+%{basisinstdir}/program/resource/tplen-US.res
+%{basisinstdir}/program/resource/uuien-US.res
+%{basisinstdir}/program/resource/updchken-US.res
+%{basisinstdir}/program/resource/upden-US.res
+%{basisinstdir}/program/resource/vclen-US.res
+%{basisinstdir}/program/resource/wzien-US.res
+%{basisinstdir}/program/resource/xmlsecen-US.res
+%{basisinstdir}/program/resource/xsltdlgen-US.res
%{basisinstdir}/program/sax.uno.so
%{basisinstdir}/program/senddoc
%{basisinstdir}/program/services.rdb
@@ -2904,14 +2829,15 @@ rm -rf $RPM_BUILD_ROOT
%{basisinstdir}/program/libsofficeapp.so
%{basisinstdir}/program/spadmin.bin
%{basisinstdir}/program/stringresource%{SOPOST}.uno.so
-%{basisinstdir}/program/svtmisc.uno.so
%{basisinstdir}/program/syssh.uno.so
%{basisinstdir}/program/ucpexpand1.uno.so
+%{basisinstdir}/program/ucpext.uno.so
%{basisinstdir}/program/ucptdoc1.uno.so
%{basisinstdir}/program/unorc
%{basisinstdir}/program/updatefeed.uno.so
%{basisinstdir}/ure-link
%{basisinstdir}/program/uri-encode
+%{basisinstdir}/program/vbaevents%{SOPOST}.uno.so
%{basisinstdir}/program/vclcanvas.uno.so
%{basisinstdir}/program/versionrc
%{basisinstdir}/program/cairocanvas.uno.so
@@ -2926,12 +2852,12 @@ rm -rf $RPM_BUILD_ROOT
%{basisinstdir}/share/config/images_crystal.zip
%{basisinstdir}/share/config/images_hicontrast.zip
%{basisinstdir}/share/config/images_industrial.zip
+%{basisinstdir}/share/config/images_oxygen.zip
%{basisinstdir}/share/config/images_tango.zip
%{basisinstdir}/share/config/javasettingsunopkginstall.xml
%{basisinstdir}/share/config/psetup.xpm
%{basisinstdir}/share/config/psetupl.xpm
%dir %{basisinstdir}/share/config/soffice.cfg
-%{basisinstdir}/share/config/soffice.cfg/global
%{basisinstdir}/share/config/soffice.cfg/modules
%{basisinstdir}/share/config/symbol
%{basisinstdir}/share/config/webcast
@@ -2943,200 +2869,28 @@ rm -rf $RPM_BUILD_ROOT
%config %{basisinstdir}/share/psprint/psprint.conf
%{basisinstdir}/share/psprint/driver
%dir %{basisinstdir}/share/registry
-%dir %{basisinstdir}/share/registry/data
-%dir %{basisinstdir}/share/registry/data/org
-%dir %{basisinstdir}/share/registry/data/org/openoffice
-%{basisinstdir}/share/registry/data/org/openoffice/FirstStartWizard.xcu
-%{basisinstdir}/share/registry/data/org/openoffice/Inet.xcu
-%{basisinstdir}/share/registry/data/org/openoffice/LDAP.xcu.sample
-%{basisinstdir}/share/registry/data/org/openoffice/Setup.xcu
-%dir %{basisinstdir}/share/registry/data/org/openoffice/Office
-%{basisinstdir}/share/registry/data/org/openoffice/Office/Accelerators.xcu
-%{basisinstdir}/share/registry/data/org/openoffice/Office/Calc.xcu
-%{basisinstdir}/share/registry/data/org/openoffice/Office/Canvas.xcu
-%{basisinstdir}/share/registry/data/org/openoffice/Office/Common.xcu
-%{basisinstdir}/share/registry/data/org/openoffice/Office/DataAccess.xcu
-%{basisinstdir}/share/registry/data/org/openoffice/Office/Embedding.xcu
-%{basisinstdir}/share/registry/data/org/openoffice/Office/ExtensionManager.xcu
-%{basisinstdir}/share/registry/data/org/openoffice/Office/FormWizard.xcu
-%{basisinstdir}/share/registry/data/org/openoffice/Office/Histories.xcu
-%{basisinstdir}/share/registry/data/org/openoffice/Office/Impress.xcu
-%{basisinstdir}/share/registry/data/org/openoffice/Office/Jobs.xcu
-%{basisinstdir}/share/registry/data/org/openoffice/Office/Labels.xcu
-%{basisinstdir}/share/registry/data/org/openoffice/Office/Logging.xcu
-%{basisinstdir}/share/registry/data/org/openoffice/Office/Math.xcu
-%{basisinstdir}/share/registry/data/org/openoffice/Office/Paths.xcu
-%{basisinstdir}/share/registry/data/org/openoffice/Office/ProtocolHandler.xcu
-%{basisinstdir}/share/registry/data/org/openoffice/Office/SFX.xcu
-%{basisinstdir}/share/registry/data/org/openoffice/Office/Scripting.xcu
-%{basisinstdir}/share/registry/data/org/openoffice/Office/Security.xcu
-%{basisinstdir}/share/registry/data/org/openoffice/Office/TableWizard.xcu
-%{basisinstdir}/share/registry/data/org/openoffice/Office/UI.xcu
-%dir %{basisinstdir}/share/registry/data/org/openoffice/Office/UI
-%{basisinstdir}/share/registry/data/org/openoffice/Office/UI/BaseWindowState.xcu
-%{basisinstdir}/share/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu
-%{basisinstdir}/share/registry/data/org/openoffice/Office/UI/BasicIDEWindowState.xcu
-%{basisinstdir}/share/registry/data/org/openoffice/Office/UI/BibliographyCommands.xcu
-%{basisinstdir}/share/registry/data/org/openoffice/Office/UI/ChartCommands.xcu
-%{basisinstdir}/share/registry/data/org/openoffice/Office/UI/ChartWindowState.xcu
-%{basisinstdir}/share/registry/data/org/openoffice/Office/UI/Controller.xcu
-%{basisinstdir}/share/registry/data/org/openoffice/Office/UI/DbBrowserWindowState.xcu
-%{basisinstdir}/share/registry/data/org/openoffice/Office/UI/DbQueryWindowState.xcu
-%{basisinstdir}/share/registry/data/org/openoffice/Office/UI/DbRelationWindowState.xcu
-%{basisinstdir}/share/registry/data/org/openoffice/Office/UI/DbTableDataWindowState.xcu
-%{basisinstdir}/share/registry/data/org/openoffice/Office/UI/DbTableWindowState.xcu
-%{basisinstdir}/share/registry/data/org/openoffice/Office/UI/DbuCommands.xcu
-%{basisinstdir}/share/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
-%{basisinstdir}/share/registry/data/org/openoffice/Office/UI/Factories.xcu
-%{basisinstdir}/share/registry/data/org/openoffice/Office/UI/GenericCategories.xcu
-%{basisinstdir}/share/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
-%{basisinstdir}/share/registry/data/org/openoffice/Office/UI/StartModuleCommands.xcu
-%{basisinstdir}/share/registry/data/org/openoffice/Office/UI/StartModuleWindowState.xcu
-%{basisinstdir}/share/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu
-%{basisinstdir}/share/registry/data/org/openoffice/Office/Views.xcu
-%{basisinstdir}/share/registry/data/org/openoffice/Office/WebWizard.xcu
-%{basisinstdir}/share/registry/data/org/openoffice/Office/Writer.xcu
-%{basisinstdir}/share/registry/data/org/openoffice/TypeDetection
-%{basisinstdir}/share/registry/data/org/openoffice/UserProfile.xcu
-%{basisinstdir}/share/registry/data/org/openoffice/VCL.xcu
-%dir %{basisinstdir}/share/registry/data/org/openoffice/ucb
-%{basisinstdir}/share/registry/data/org/openoffice/ucb/Configuration.xcu
-%dir %{basisinstdir}/share/registry/ldap
-%{basisinstdir}/share/registry/ldap/oo-ad-ldap-attr.map
-%{basisinstdir}/share/registry/ldap/oo-ldap-attr.map
+%{basisinstdir}/share/registry/binfilter.xcd
+%{basisinstdir}/share/registry/gnome.xcd
+%{basisinstdir}/share/registry/lingucomponent.xcd
+%{basisinstdir}/share/registry/main.xcd
+%{basisinstdir}/share/registry/oo-ad-ldap.xcd.sample
+%{basisinstdir}/share/registry/oo-ldap.xcd.sample
+%{basisinstdir}/share/registry/Langpack-en-US.xcd
%dir %{basisinstdir}/share/registry/modules
%dir %{basisinstdir}/share/registry/modules/org
%dir %{basisinstdir}/share/registry/modules/org/openoffice
%dir %{basisinstdir}/share/registry/modules/org/openoffice/Office
-%{basisinstdir}/share/registry/modules/org/openoffice/Office/Accelerators
-%{basisinstdir}/share/registry/modules/org/openoffice/Office/Embedding
%dir %{basisinstdir}/share/registry/modules/org/openoffice/Office/Common
-%{basisinstdir}/share/registry/modules/org/openoffice/Office/Common/Common-survey.xcu
-%{basisinstdir}/share/registry/modules/org/openoffice/Office/Common/Common-unx.xcu
-%{basisinstdir}/share/registry/modules/org/openoffice/Office/DataAccess
-%dir %{basisinstdir}/share/registry/modules/org/openoffice/Office/Linguistic
-%{basisinstdir}/share/registry/modules/org/openoffice/Office/Linguistic/Linguistic-lingucomponent-hyphenator.xcu
-%{basisinstdir}/share/registry/modules/org/openoffice/Office/Linguistic/Linguistic-lingucomponent-spellchecker.xcu
-%{basisinstdir}/share/registry/modules/org/openoffice/Office/Linguistic/Linguistic-lingucomponent-thesaurus.xcu
+%{basisinstdir}/share/registry/modules/org/openoffice/Office/Common/NoSurveyAndSystemFpicker.xcu
%dir %{basisinstdir}/share/registry/modules/org/openoffice/Office/Paths
%{basisinstdir}/share/registry/modules/org/openoffice/Office/Paths/libtextcat.xcu
-%{basisinstdir}/share/registry/modules/org/openoffice/Office/Paths/Paths-unxwnt.xcu
%{basisinstdir}/share/registry/modules/org/openoffice/Office/Paths/SystemAutoCorrect.xcu
%dir %{basisinstdir}/share/registry/modules/org/openoffice/Office/Recovery
%{basisinstdir}/share/registry/modules/org/openoffice/Office/Recovery/AutoSaveRecovery.xcu
%dir %{basisinstdir}/share/registry/modules/org/openoffice/Setup
-%{basisinstdir}/share/registry/modules/org/openoffice/Setup/Langpack-en-US.xcu
%{basisinstdir}/share/registry/modules/org/openoffice/Setup/RegisterAndLicence.xcu
-%{basisinstdir}/share/registry/modules/org/openoffice/Setup/Setup-start.xcu
-%dir %{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection
-%dir %{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Filter
-%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_base_filters.xcu
-%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_chart_filters.xcu
-%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_chart_bf_filters.xcu
-%dir %{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/GraphicFilter
-%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/GraphicFilter/fcfg_internalgraphics_filters.xcu
-%dir %{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Misc
-%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Misc/fcfg_base_others.xcu
-%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Misc/fcfg_chart_others.xcu
-%dir %{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Types
-%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_base_types.xcu
-%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_chart_types.xcu
-%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_chart_bf_types.xcu
-%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_internalgraphics_types.xcu
-%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/UISort
-%dir %{basisinstdir}/share/registry/modules/org/openoffice/ucb
-%dir %{basisinstdir}/share/registry/modules/org/openoffice/ucb/Configuration
-%{basisinstdir}/share/registry/modules/org/openoffice/ucb/Configuration/Configuration-gio.xcu
%dir %{basisinstdir}/share/registry/res
-%{basisinstdir}/share/registry/res/en-US
-%dir %{basisinstdir}/share/registry/schema
-%dir %{basisinstdir}/share/registry/schema/org
-%dir %{basisinstdir}/share/registry/schema/org/openoffice
-%{basisinstdir}/share/registry/schema/org/openoffice/FirstStartWizard.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Inet.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/LDAP.xcs
-%dir %{basisinstdir}/share/registry/schema/org/openoffice/Office
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/Accelerators.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/Addons.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/CalcAddIns.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/Calc.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/Canvas.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/Chart.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/Commands.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/Common.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/Compatibility.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/DataAccess
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/DataAccess.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/Draw.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/Embedding.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/ExtendedColorScheme.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/ExtensionManager.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/Events.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/FormWizard.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/Histories.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/Impress.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/Java.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/Jobs.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/Labels.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/Linguistic.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/Logging.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/Math.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/OptionsDialog.xcs
-%dir %{basisinstdir}/share/registry/schema/org/openoffice/Office/OOoImprovement
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/OOoImprovement/Settings.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/Paths.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/ProtocolHandler.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/Recovery.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/SFX.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/Scripting.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/Security.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/Substitution.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/TabBrowse.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/TableWizard.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/TypeDetection.xcs
-%dir %{basisinstdir}/share/registry/schema/org/openoffice/Office/UI
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/UI.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/BaseWindowState.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/BasicIDECommands.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/BasicIDEWindowState.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/BibliographyCommands.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/BibliographyWindowState.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/Category.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/ChartCommands.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/ChartWindowState.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/Commands.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/Controller.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/DbBrowserWindowState.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/DbQueryWindowState.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/DbRelationWindowState.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/DbTableDataWindowState.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/DbTableWindowState.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/DbuCommands.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/DrawImpressCommands.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/Factories.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/GenericCategories.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/GenericCommands.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/GlobalSettings.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/MathWindowState.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/StartModuleCommands.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/StartModuleWindowState.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/WindowContentFactories.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/WindowState.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/XFormsWindowState.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/Views.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/WebWizard.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/Writer.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/WriterWeb.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Setup.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/System.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/TypeDetection
-%{basisinstdir}/share/registry/schema/org/openoffice/UserProfile.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/VCL.xcs
-%dir %{basisinstdir}/share/registry/schema/org/openoffice/ucb
-%{basisinstdir}/share/registry/schema/org/openoffice/ucb/Configuration.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/ucb/Hierarchy.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/ucb/InteractionHandler.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/ucb/Store.xcs
+%{basisinstdir}/share/registry/res/fcfg_langpack_en-US.xcd
%dir %{basisinstdir}/share/template
%{basisinstdir}/share/template/en-US
%{basisinstdir}/share/template/wizard
@@ -3159,8 +2913,7 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/mime-info/openoffice.org.*
%{basisinstdir}/program/libxmlsecurity.so
%{_datadir}/mime/packages/openoffice.org.xml
-%{basisinstdir}/program/behelper.uno.so
-%{basisinstdir}/program/configmgr2.uno.so
+%{basisinstdir}/program/configmgr.uno.so
%{basisinstdir}/program/desktopbe1.uno.so
%{basisinstdir}/program/fsstorage.uno.so
%{basisinstdir}/program/gconfbe1.uno.so
@@ -3173,7 +2926,6 @@ rm -rf $RPM_BUILD_ROOT
%{basisinstdir}/program/libfwk%{SOPOST}.so
%{basisinstdir}/program/libfwl%{SOPOST}.so
%{basisinstdir}/program/libfwm%{SOPOST}.so
-%{basisinstdir}/program/libgo%{SOPOST}.so
%{basisinstdir}/program/libi18nisolang*.so
%{basisinstdir}/program/libi18npaper*.so
%{basisinstdir}/program/libi18nutilgcc3.so
@@ -3194,9 +2946,7 @@ rm -rf $RPM_BUILD_ROOT
%{basisinstdir}/program/libxcr%{SOPOST}.so
%{basisinstdir}/program/libxo%{SOPOST}.so
%{basisinstdir}/program/localebe1.uno.so
-%{basisinstdir}/program/sysmgr1.uno.so
%{basisinstdir}/program/ucpgio1.uno.so
-#vba
%{basisinstdir}/program/oovbaapi.rdb
#share unopkg
%dir %{oooinstdir}
@@ -3255,7 +3005,7 @@ fi
%{oooinstdir}/program/about.*
%{oooinstdir}/program/intro.*
%dir %{oooinstdir}/program/resource
-%{oooinstdir}/program/resource/ooo%{UPD}en-US.res
+%{oooinstdir}/program/resource/oooen-US.res
%{oooinstdir}/program/soffice
%{oooinstdir}/program/soffice.bin
%{oooinstdir}/program/sofficerc
@@ -3272,21 +3022,7 @@ fi
%{oooinstdir}/share/readme/README_en-US
%{oooinstdir}/share/readme/README_en-US.html
%dir %{oooinstdir}/share/registry
-%dir %{oooinstdir}/share/registry/data
-%dir %{oooinstdir}/share/registry/data/org
-%dir %{oooinstdir}/share/registry/data/org/openoffice
-%dir %{oooinstdir}/share/registry/data/org/openoffice/Office
-%{oooinstdir}/share/registry/data/org/openoffice/Office/Compatibility.xcu
-%dir %{oooinstdir}/share/registry/modules
-%dir %{oooinstdir}/share/registry/modules/org
-%dir %{oooinstdir}/share/registry/modules/org/openoffice
-%dir %{oooinstdir}/share/registry/modules/org/openoffice/Office
-%dir %{oooinstdir}/share/registry/modules/org/openoffice/Office/Common
-%{oooinstdir}/share/registry/modules/org/openoffice/Office/Common/Common-brand.xcu
-%dir %{oooinstdir}/share/registry/modules/org/openoffice/Office/UI
-%{oooinstdir}/share/registry/modules/org/openoffice/Office/UI/UI-brand.xcu
-%dir %{oooinstdir}/share/registry/modules/org/openoffice/Setup
-%{oooinstdir}/share/registry/modules/org/openoffice/Setup/Setup-brand.xcu
+%{oooinstdir}/share/registry/brand.xcd
%{oooinstdir}/share/xdg/
%{oooinstdir}/program/redirectrc
#launchers
@@ -3318,7 +3054,7 @@ update-desktop-database %{_datadir}/appl
%{brinstdir}/program/setuprc
%{brinstdir}/program/intro.*
%dir %{brinstdir}/program/resource
-%{brinstdir}/program/resource/ooo%{UPD}pt-BR.res
+%{brinstdir}/program/resource/ooopt-BR.res
%{brinstdir}/program/soffice
%{brinstdir}/program/soffice.bin
%{brinstdir}/program/sofficerc
@@ -3337,22 +3073,7 @@ update-desktop-database %{_datadir}/appl
%{brinstdir}/share/readme/LICENSE_pt-BR.html
%{brinstdir}/share/readme/README_pt-BR
%{brinstdir}/share/readme/README_pt-BR.html
-%dir %{brinstdir}/share/registry
-%dir %{brinstdir}/share/registry/data
-%dir %{brinstdir}/share/registry/data/org
-%dir %{brinstdir}/share/registry/data/org/openoffice
-%dir %{brinstdir}/share/registry/data/org/openoffice/Office
-%{brinstdir}/share/registry/data/org/openoffice/Office/Compatibility.xcu
-%dir %{brinstdir}/share/registry/modules
-%dir %{brinstdir}/share/registry/modules/org
-%dir %{brinstdir}/share/registry/modules/org/openoffice
-%dir %{brinstdir}/share/registry/modules/org/openoffice/Office
-%dir %{brinstdir}/share/registry/modules/org/openoffice/Office/Common
-%{brinstdir}/share/registry/modules/org/openoffice/Office/Common/Common-brand.xcu
-%dir %{brinstdir}/share/registry/modules/org/openoffice/Office/UI
-%{brinstdir}/share/registry/modules/org/openoffice/Office/UI/UI-brand.xcu
-%dir %{brinstdir}/share/registry/modules/org/openoffice/Setup
-%{brinstdir}/share/registry/modules/org/openoffice/Setup/Setup-brand.xcu
+%{brinstdir}/share/registry/brand.xcd
%{brinstdir}/share/uno_packages
%{brinstdir}/share/xdg/
%{brinstdir}/program/fundamentalrc
@@ -3406,29 +3127,15 @@ fi
%{basisinstdir}/program/libhsqldb.so
%{basisinstdir}/program/librpt*%{SOPOST}.so
%dir %{basisinstdir}/program/resource
-%{basisinstdir}/program/resource/abp%{UPD}en-US.res
-%{basisinstdir}/program/resource/adabasui%{UPD}en-US.res
-%{basisinstdir}/program/resource/cnr%{UPD}en-US.res
-%{basisinstdir}/program/resource/dbp%{UPD}en-US.res
-%{basisinstdir}/program/resource/rpt%{UPD}en-US.res
-%{basisinstdir}/program/resource/rptui%{UPD}en-US.res
-%{basisinstdir}/program/resource/sdbcl%{UPD}en-US.res
-%{basisinstdir}/program/resource/sdberr%{UPD}en-US.res
-%dir %{basisinstdir}/share/registry
-%dir %{basisinstdir}/share/registry/modules
-%dir %{basisinstdir}/share/registry/modules/org
-%dir %{basisinstdir}/share/registry/modules/org/openoffice
-%dir %{basisinstdir}/share/registry/modules/org/openoffice/Office
-%dir %{basisinstdir}/share/registry/modules/org/openoffice/Office/Common
-%{basisinstdir}/share/registry/modules/org/openoffice/Office/Common/Common-base.xcu
-%{basisinstdir}/share/registry/modules/org/openoffice/Setup/Setup-base.xcu
-%dir %{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection
-%dir %{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Filter
-%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_database_filters.xcu
-%dir %{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Misc
-%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Misc/fcfg_database_others.xcu
-%dir %{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Types
-%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_database_types.xcu
+%{basisinstdir}/program/resource/abpen-US.res
+%{basisinstdir}/program/resource/adabasuien-US.res
+%{basisinstdir}/program/resource/cnren-US.res
+%{basisinstdir}/program/resource/dbpen-US.res
+%{basisinstdir}/program/resource/rpten-US.res
+%{basisinstdir}/program/resource/rptuien-US.res
+%{basisinstdir}/program/resource/sdbclen-US.res
+%{basisinstdir}/program/resource/sdberren-US.res
+%{basisinstdir}/share/registry/base.xcd
%files base
%defattr(-,root,root,-)
@@ -3465,24 +3172,8 @@ update-desktop-database %{_datadir}/appl
%{_datadir}/openoffice.org/extensions/report-builder.oxt
%pre report-builder
-if [ $1 -gt 1 ]; then
- # Upgrade => deregister old extension
- unopkg remove --shared com.sun.reportdesigner > /dev/null 2>&1 || :
-fi
-
-%post report-builder
- # register extension
- unopkg add --shared --force --link %{_datadir}/openoffice.org/extensions/report-builder.oxt > /dev/null 2>&1 || :
-
-%preun report-builder
-if [ $1 -eq 0 ]; then
- # not upgrading => deregister
- unopkg remove --shared com.sun.reportdesigner > /dev/null 2>&1 || :
-fi
-
-%postun report-builder
- # clear disk cache
- unopkg list --shared > /dev/null 2>&1 || :
+# deregister old < 3.3. extension
+unopkg remove --shared com.sun.reportdesigner > /dev/null 2>&1 || :
%files bsh
%defattr(-,root,root,-)
@@ -3490,24 +3181,8 @@ fi
%{_datadir}/openoffice.org/extensions/ScriptProviderForBeanShell.zip
%pre bsh
-if [ $1 -gt 1 ]; then
- # Upgrade => deregister old extension
- unopkg remove --shared org.openoffice.legacy.ScriptProviderForBeanShell.zip > /dev/null 2>&1 || :
-fi
-
-%post bsh
- # register extension
- unopkg add --shared --force --link %{_datadir}/openoffice.org/extensions/ScriptProviderForBeanShell.zip > /dev/null 2>&1 || :
-
-%preun bsh
-if [ $1 -eq 0 ]; then
- # not upgrading => deregister
- unopkg remove --shared org.openoffice.legacy.ScriptProviderForBeanShell.zip > /dev/null 2>&1 || :
-fi
-
-%postun bsh
- # clear disk cache
- unopkg list --shared > /dev/null 2>&1 || :
+# deregister old < 3.3 extension
+unopkg remove --shared org.openoffice.legacy.ScriptProviderForBeanShell.zip > /dev/null 2>&1 || :
%files rhino
%defattr(-,root,root,-)
@@ -3516,24 +3191,8 @@ fi
%{_datadir}/openoffice.org/extensions/ScriptProviderForJavaScript.zip
%pre rhino
-if [ $1 -gt 1 ]; then
- # Upgrade => deregister old extension
- unopkg remove --shared org.openoffice.legacy.ScriptProviderForJavaScript.zip > /dev/null 2>&1 || :
-fi
-
-%post rhino
- # register extension
- unopkg add --shared --force --link %{_datadir}/openoffice.org/extensions/ScriptProviderForJavaScript.zip > /dev/null 2>&1 || :
-
-%preun rhino
-if [ $1 -eq 0 ]; then
- # not upgrading => deregister
- unopkg remove --shared org.openoffice.legacy.ScriptProviderForJavaScript.zip > /dev/null 2>&1 || :
-fi
-
-%postun rhino
- # clear disk cache
- unopkg list --shared > /dev/null 2>&1 || :
+# deregister old 3.3 extension
+unopkg remove --shared org.openoffice.legacy.ScriptProviderForJavaScript.zip > /dev/null 2>&1 || :
%files wiki-publisher
%defattr(-,root,root,-)
@@ -3541,24 +3200,8 @@ fi
%{_datadir}/openoffice.org/extensions/wiki-publisher.oxt
%pre wiki-publisher
-if [ $1 -gt 1 ]; then
- # Upgrade => deregister old extension
- unopkg remove --shared com.sun.wiki-publisher > /dev/null 2>&1 || :
-fi
-
-%post wiki-publisher
- # register extension
- unopkg add --shared --force --link %{_datadir}/openoffice.org/extensions/wiki-publisher.oxt > /dev/null 2>&1 || :
-
-%preun wiki-publisher
-if [ $1 -eq 0 ]; then
- # not upgrading => deregister
- unopkg remove --shared com.sun.wiki-publisher > /dev/null 2>&1 || :
-fi
-
-%postun wiki-publisher
- # clear disk cache
- unopkg list --shared > /dev/null 2>&1 || :
+# deregister old 3.3 extension
+unopkg remove --shared com.sun.wiki-publisher > /dev/null 2>&1 || :
%files ogltrans
%defattr(-,root,root,-)
@@ -3569,16 +3212,10 @@ fi
%dir %{basisinstdir}/share/config/soffice.cfg
%dir %{basisinstdir}/share/config/soffice.cfg/simpress
%{basisinstdir}/share/config/soffice.cfg/simpress/transitions-ogl.xml
-%dir %{basisinstdir}/share/registry
-%dir %{basisinstdir}/share/registry/modules
-%dir %{basisinstdir}/share/registry/modules/org
-%dir %{basisinstdir}/share/registry/modules/org/openoffice
-%dir %{basisinstdir}/share/registry/modules/org/openoffice/Office
-%dir %{basisinstdir}/share/registry/modules/org/openoffice/Office/Impress
-%{basisinstdir}/share/registry/modules/org/openoffice/Office/Impress/Impress-ogltrans.xcu
+%{basisinstdir}/share/registry/ogltrans.xcd
%pre ogltrans
-# deregister old extension if it is still there
+# deregister old < 3.3. extension if it is still there
unopkg remove --shared `grep -s identifier %{baseinstdir}/extensions/ogltrans.oxt/description.xml | cut -d '"' -f 2` > /dev/null 2>&1 || :
%files presentation-minimizer
@@ -3587,24 +3224,8 @@ unopkg remove --shared `grep -s identifi
%{baseinstdir}/extensions/presentation-minimizer.oxt
%pre presentation-minimizer
-if [ $1 -gt 1 ]; then
- # Upgrade => deregister old extension
- unopkg remove --shared `grep -s identifier %{baseinstdir}/extensions/presentation-minimizer.oxt/description.xml | cut -d '"' -f 2` > /dev/null 2>&1 || :
-fi
-
-%post presentation-minimizer
- # register extension
- unopkg add --shared --force --link %{baseinstdir}/extensions/presentation-minimizer.oxt > /dev/null 2>&1 || :
-
-%preun presentation-minimizer
-if [ $1 -eq 0 ]; then
- # not upgrading => deregister
- unopkg remove --shared `grep -s identifier %{baseinstdir}/extensions/presentation-minimizer.oxt/description.xml | cut -d '"' -f 2` > /dev/null 2>&1 || :
-fi
-
-%postun presentation-minimizer
- # clear disk cache
- unopkg list --shared > /dev/null 2>&1 || :
+# deregister old < 3.3 extension
+unopkg remove --shared `grep -s identifier %{baseinstdir}/extensions/presentation-minimizer.oxt/description.xml | cut -d '"' -f 2` > /dev/null 2>&1 || :
%files presenter-screen
%defattr(-,root,root,-)
@@ -3612,24 +3233,8 @@ fi
%{baseinstdir}/extensions/presenter-screen.oxt
%pre presenter-screen
-if [ $1 -gt 1 ]; then
- # Upgrade => deregister old extension
- unopkg remove --shared `grep -s identifier %{baseinstdir}/extensions/presenter-screen.oxt/description.xml | cut -d '"' -f 2` > /dev/null 2>&1 || :
-fi
-
-%post presenter-screen
- # register extension
- unopkg add --shared --force --link %{baseinstdir}/extensions/presenter-screen.oxt > /dev/null 2>&1 || :
-
-%preun presenter-screen
-if [ $1 -eq 0 ]; then
- # not upgrading => deregister
- unopkg remove --shared `grep -s identifier %{baseinstdir}/extensions/presenter-screen.oxt/description.xml | cut -d '"' -f 2` > /dev/null 2>&1 || :
-fi
-
-%postun presenter-screen
- # clear disk cache
- unopkg list --shared > /dev/null 2>&1 || :
+# deregister old < 3.3 extension
+unopkg remove --shared `grep -s identifier %{baseinstdir}/extensions/presenter-screen.oxt/description.xml | cut -d '"' -f 2` > /dev/null 2>&1 || :
%files pdfimport
%defattr(-,root,root,-)
@@ -3637,26 +3242,11 @@ fi
%{baseinstdir}/extensions/pdfimport.oxt
%pre pdfimport
-if [ $1 -gt 1 ]; then
- # Upgrade => deregister old extension
- unopkg remove --shared `grep -s identifier %{baseinstdir}/extensions/pdfimport.oxt/description.xml | cut -d '"' -f 2` > /dev/null 2>&1 || :
-fi
-
-%post pdfimport
- # register extension
- unopkg add --shared --force --link %{baseinstdir}/extensions/pdfimport.oxt > /dev/null 2>&1 || :
-
-%preun pdfimport
-if [ $1 -eq 0 ]; then
- # not upgrading => deregister
- unopkg remove --shared `grep -s identifier %{baseinstdir}/extensions/pdfimport.oxt/description.xml | cut -d '"' -f 2` > /dev/null 2>&1 || :
-fi
-
-%postun pdfimport
- # clear disk cache
- unopkg list --shared > /dev/null 2>&1 || :
+# Upgrade => deregister old < 3.3. extension
+unopkg remove --shared `grep -s identifier %{baseinstdir}/extensions/pdfimport.oxt/description.xml | cut -d '"' -f 2` > /dev/null 2>&1 || :
%_font_pkg -n %{fontname} opens___.ttf
+%doc solver/%{OFFICEUPD}/unxlng*/bin/ure/LICENSE
%dir %{_fontdir}
%files calc-core
@@ -3676,44 +3266,15 @@ fi
%{basisinstdir}/program/libscui%{SOPOST}.so
%{basisinstdir}/program/libsolver%{SOPOST}.so
%dir %{basisinstdir}/program/resource
-%{basisinstdir}/program/resource/analysis%{UPD}en-US.res
-%{basisinstdir}/program/resource/bf_sc%{UPD}en-US.res
-%{basisinstdir}/program/resource/date%{UPD}en-US.res
-%{basisinstdir}/program/resource/for%{UPD}en-US.res
-%{basisinstdir}/program/resource/forui%{UPD}en-US.res
-%{basisinstdir}/program/resource/sc%{UPD}en-US.res
-%{basisinstdir}/program/resource/solver%{UPD}en-US.res
-%dir %{basisinstdir}/share/registry
-%dir %{basisinstdir}/share/registry/data
-%dir %{basisinstdir}/share/registry/data/org
-%dir %{basisinstdir}/share/registry/data/org/openoffice
-%dir %{basisinstdir}/share/registry/data/org/openoffice/Office
-%dir %{basisinstdir}/share/registry/data/org/openoffice/Office/UI
-%{basisinstdir}/share/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
-%{basisinstdir}/share/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
-%dir %{basisinstdir}/share/registry/modules
-%dir %{basisinstdir}/share/registry/modules/org
-%dir %{basisinstdir}/share/registry/modules/org/openoffice
-%dir %{basisinstdir}/share/registry/modules/org/openoffice/Office
-%dir %{basisinstdir}/share/registry/modules/org/openoffice/Office/Common
-%{basisinstdir}/share/registry/modules/org/openoffice/Office/Common/Common-calc.xcu
-%{basisinstdir}/share/registry/modules/org/openoffice/Setup/Setup-calc.xcu
-%dir %{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection
-%dir %{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Filter
-%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_calc_filters.xcu
-%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_calc_bf_filters.xcu
-%dir %{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Types
-%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_calc_types.xcu
-%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_calc_bf_types.xcu
-%dir %{basisinstdir}/share/registry/schema
-%dir %{basisinstdir}/share/registry/schema/org
-%dir %{basisinstdir}/share/registry/schema/org/openoffice
-%dir %{basisinstdir}/share/registry/schema/org/openoffice/Office
-%dir %{basisinstdir}/share/registry/schema/org/openoffice/Office/UI
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/CalcCommands.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/CalcWindowState.xcs
-#vba
+%{basisinstdir}/program/resource/analysisen-US.res
+%{basisinstdir}/program/resource/bf_scen-US.res
+%{basisinstdir}/program/resource/dateen-US.res
+%{basisinstdir}/program/resource/foren-US.res
+%{basisinstdir}/program/resource/foruien-US.res
+%{basisinstdir}/program/resource/scen-US.res
+%{basisinstdir}/program/resource/solveren-US.res
%{basisinstdir}/program/libvbaobj%{SOPOST}.uno.so
+%{basisinstdir}/share/registry/calc.xcd
%files calc
%defattr(-,root,root,-)
@@ -3750,33 +3311,7 @@ update-desktop-database %{_datadir}/appl
%defattr(-,root,root,-)
%dir %{basisinstdir}
%{basisinstdir}/help/en/sdraw.*
-%dir %{basisinstdir}/share/registry
-%dir %{basisinstdir}/share/registry/data
-%dir %dir %{basisinstdir}/share/registry/data/org
-%dir %{basisinstdir}/share/registry/data/org/openoffice
-%dir %{basisinstdir}/share/registry/data/org/openoffice/Office
-%dir %{basisinstdir}/share/registry/data/org/openoffice/Office/UI
-%{basisinstdir}/share/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu
-%dir %{basisinstdir}/share/registry/modules
-%dir %{basisinstdir}/share/registry/modules/org
-%dir %{basisinstdir}/share/registry/modules/org/openoffice
-%dir %{basisinstdir}/share/registry/modules/org/openoffice/Office
-%dir %{basisinstdir}/share/registry/modules/org/openoffice/Office/Common
-%{basisinstdir}/share/registry/modules/org/openoffice/Office/Common/Common-draw.xcu
-%{basisinstdir}/share/registry/modules/org/openoffice/Setup/Setup-draw.xcu
-%dir %{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection
-%dir %{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Filter
-%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_draw_filters.xcu
-%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_draw_bf_filters.xcu
-%dir %{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Types
-%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_draw_types.xcu
-%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_draw_bf_types.xcu
-%dir %{basisinstdir}/share/registry/schema
-%dir %{basisinstdir}/share/registry/schema/org
-%dir %{basisinstdir}/share/registry/schema/org/openoffice
-%dir %{basisinstdir}/share/registry/schema/org/openoffice/Office
-%dir %{basisinstdir}/share/registry/schema/org/openoffice/Office/UI
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/DrawWindowState.xcs
+%{basisinstdir}/share/registry/draw.xcd
%files draw
%defattr(-,root,root,-)
@@ -3814,13 +3349,6 @@ update-desktop-database %{_datadir}/appl
%dir %{basisinstdir}
%dir %{basisinstdir}/program
%{basisinstdir}/program/mailmerge.py*
-%dir %{basisinstdir}/share/registry
-%dir %{basisinstdir}/share/registry/modules
-%dir %{basisinstdir}/share/registry/modules/org
-%dir %{basisinstdir}/share/registry/modules/org/openoffice
-%dir %{basisinstdir}/share/registry/modules/org/openoffice/Office
-%dir %{basisinstdir}/share/registry/modules/org/openoffice/Office/Writer
-%{basisinstdir}/share/registry/modules/org/openoffice/Office/Writer/Writer-javamail.xcu
%files writer-core
%defattr(-,root,root,-)
@@ -3835,57 +3363,17 @@ update-desktop-database %{_datadir}/appl
%{basisinstdir}/program/libt602filter%{SOPOST}.so
%{basisinstdir}/program/libwpft%{SOPOST}.so
%{basisinstdir}/program/libwriterfilter%{SOPOST}.so
+%{basisinstdir}/program/libvbaswobj%{SOPOST}.uno.so
%dir %{basisinstdir}/program/resource
-%{basisinstdir}/program/resource/bf_sw%{UPD}en-US.res
-%{basisinstdir}/program/resource/t602filter%{UPD}en-US.res
-%dir %{basisinstdir}/share/registry
-%dir %{basisinstdir}/share/registry/data
-%dir %{basisinstdir}/share/registry/data/org
-%dir %{basisinstdir}/share/registry/data/org/openoffice
-%dir %{basisinstdir}/share/registry/data/org/openoffice/Office
-%dir %{basisinstdir}/share/registry/data/org/openoffice/Office/UI
-%{basisinstdir}/share/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
-%{basisinstdir}/share/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu
-%{basisinstdir}/share/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
-%{basisinstdir}/share/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu
-%{basisinstdir}/share/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu
-%{basisinstdir}/share/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
+%{basisinstdir}/program/resource/bf_swen-US.res
+%{basisinstdir}/program/resource/t602filteren-US.res
%dir %{basisinstdir}/share/registry/modules
%dir %{basisinstdir}/share/registry/modules/org
%dir %{basisinstdir}/share/registry/modules/org/openoffice
%dir %{basisinstdir}/share/registry/modules/org/openoffice/Office
-%dir %{basisinstdir}/share/registry/modules/org/openoffice/Office/Common
-%{basisinstdir}/share/registry/modules/org/openoffice/Office/Common/Common-writer.xcu
-%{basisinstdir}/share/registry/modules/org/openoffice/Setup/Setup-writer.xcu
-%dir %{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection
-%dir %{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Filter
-%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_global_filters.xcu
-%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_global_bf_filters.xcu
-%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_web_filters.xcu
-%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_web_bf_filters.xcu
-%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_writer_filters.xcu
-%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_writer_bf_filters.xcu
-%dir %{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Types
-%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_global_types.xcu
-%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_global_bf_types.xcu
-%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_web_types.xcu
-%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_writer_types.xcu
-%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_web_bf_types.xcu
-%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_writer_bf_types.xcu
-%dir %{basisinstdir}/share/registry/modules/org/openoffice/Office
%dir %{basisinstdir}/share/registry/modules/org/openoffice/Office/Writer
%{basisinstdir}/share/registry/modules/org/openoffice/Office/Writer/TableNumberRecognition.xcu
-%dir %{basisinstdir}/share/registry/schema
-%dir %{basisinstdir}/share/registry/schema/org
-%dir %{basisinstdir}/share/registry/schema/org/openoffice
-%dir %{basisinstdir}/share/registry/schema/org/openoffice/Office
-%dir %{basisinstdir}/share/registry/schema/org/openoffice/Office/UI
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/WriterCommands.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/WriterFormWindowState.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/WriterGlobalWindowState.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/WriterReportWindowState.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/WriterWebWindowState.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/WriterWindowState.xcs
+%{basisinstdir}/share/registry/writer.xcd
%files writer
%defattr(-,root,root,-)
@@ -3928,35 +3416,7 @@ update-desktop-database %{_datadir}/appl
%dir %{basisinstdir}/share/config/soffice.cfg/simpress
%{basisinstdir}/share/config/soffice.cfg/simpress/effects.xml
%{basisinstdir}/share/config/soffice.cfg/simpress/transitions.xml
-%dir %{basisinstdir}/share/registry
-%dir %{basisinstdir}/share/registry/data
-%dir %{basisinstdir}/share/registry/data/org
-%dir %{basisinstdir}/share/registry/data/org/openoffice
-%dir %{basisinstdir}/share/registry/data/org/openoffice/Office
-%dir %{basisinstdir}/share/registry/data/org/openoffice/Office/UI
-%{basisinstdir}/share/registry/data/org/openoffice/Office/UI/Effects.xcu
-%{basisinstdir}/share/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
-%dir %{basisinstdir}/share/registry/modules
-%dir %{basisinstdir}/share/registry/modules/org
-%dir %{basisinstdir}/share/registry/modules/org/openoffice
-%dir %{basisinstdir}/share/registry/modules/org/openoffice/Office
-%dir %{basisinstdir}/share/registry/modules/org/openoffice/Office/Common
-%{basisinstdir}/share/registry/modules/org/openoffice/Office/Common/Common-impress.xcu
-%{basisinstdir}/share/registry/modules/org/openoffice/Setup/Setup-impress.xcu
-%dir %{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection
-%dir %{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Filter
-%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_impress_filters.xcu
-%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_impress_bf_filters.xcu
-%dir %{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Types
-%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_impress_types.xcu
-%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_impress_bf_types.xcu
-%dir %{basisinstdir}/share/registry/schema
-%dir %{basisinstdir}/share/registry/schema/org
-%dir %{basisinstdir}/share/registry/schema/org/openoffice
-%dir %{basisinstdir}/share/registry/schema/org/openoffice/Office
-%dir %{basisinstdir}/share/registry/schema/org/openoffice/Office/UI
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/Effects.xcs
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/ImpressWindowState.xcs
+%{basisinstdir}/share/registry/impress.xcd
%files impress
%defattr(-,root,root,-)
@@ -3998,38 +3458,15 @@ update-desktop-database %{_datadir}/appl
%{basisinstdir}/program/libsm%{SOPOST}.so
%{basisinstdir}/program/libsmd%{SOPOST}.so
%dir %{basisinstdir}/program/resource
-%{basisinstdir}/program/resource/bf_sm%{UPD}en-US.res
-%{basisinstdir}/program/resource/sm%{UPD}en-US.res
-%dir %{basisinstdir}/share/registry
-%dir %{basisinstdir}/share/registry/data
-%dir %{basisinstdir}/share/registry/data/org
-%dir %{basisinstdir}/share/registry/data/org/openoffice
-%dir %{basisinstdir}/share/registry/data/org/openoffice/Office
-%dir %{basisinstdir}/share/registry/data/org/openoffice/Office/UI
-%{basisinstdir}/share/registry/data/org/openoffice/Office/UI/MathCommands.xcu
-%{basisinstdir}/share/registry/data/org/openoffice/Office/UI/MathWindowState.xcu
+%{basisinstdir}/program/resource/bf_smen-US.res
+%{basisinstdir}/program/resource/smen-US.res
%dir %{basisinstdir}/share/registry/modules
%dir %{basisinstdir}/share/registry/modules/org
%dir %{basisinstdir}/share/registry/modules/org/openoffice
%dir %{basisinstdir}/share/registry/modules/org/openoffice/Office
-%dir %{basisinstdir}/share/registry/modules/org/openoffice/Office/Common
-%{basisinstdir}/share/registry/modules/org/openoffice/Office/Common/Common-math.xcu
%dir %{basisinstdir}/share/registry/modules/org/openoffice/Office/Math
%{basisinstdir}/share/registry/modules/org/openoffice/Office/Math/MathPrintOptions.xcu
-%{basisinstdir}/share/registry/modules/org/openoffice/Setup/Setup-math.xcu
-%dir %{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection
-%dir %{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Filter
-%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_math_filters.xcu
-%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_math_bf_filters.xcu
-%dir %{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Types
-%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_math_types.xcu
-%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_math_bf_types.xcu
-%dir %{basisinstdir}/share/registry/schema
-%dir %{basisinstdir}/share/registry/schema/org
-%dir %{basisinstdir}/share/registry/schema/org/openoffice
-%dir %{basisinstdir}/share/registry/schema/org/openoffice/Office
-%dir %{basisinstdir}/share/registry/schema/org/openoffice/Office/UI
-%{basisinstdir}/share/registry/schema/org/openoffice/Office/UI/MathCommands.xcs
+%{basisinstdir}/share/registry/math.xcd
%files math
%defattr(-,root,root,-)
@@ -4066,30 +3503,11 @@ update-desktop-database %{_datadir}/appl
%dir %{basisinstdir}/program
%{basisinstdir}/program/libflash%{SOPOST}.so
%{basisinstdir}/program/libsvgfilter%{SOPOST}.so
-%dir %{basisinstdir}/share/registry
-%dir %{basisinstdir}/share/registry/modules
-%dir %{basisinstdir}/share/registry/modules/org
-%dir %{basisinstdir}/share/registry/modules/org/openoffice
-%dir %{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection
-%dir %{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Filter
-%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_drawgraphics_filters.xcu
-%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_impressgraphics_filters.xcu
-%dir %{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Types
-%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_drawgraphics_types.xcu
-%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_impressgraphics_types.xcu
+%{basisinstdir}/share/registry/graphicfilter.xcd
%files xsltfilter
%defattr(-,root,root,-)
%dir %{basisinstdir}
-%dir %{basisinstdir}/share/registry
-%dir %{basisinstdir}/share/registry/modules
-%dir %{basisinstdir}/share/registry/modules/org
-%dir %{basisinstdir}/share/registry/modules/org/openoffice
-%dir %{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection
-%dir %{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Filter
-%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_xslt_filters.xcu
-%dir %{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Types
-%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_xslt_types.xcu
%dir %{basisinstdir}/share/xslt
%{basisinstdir}/share/xslt/docbook
%dir %{basisinstdir}/share/xslt/export
@@ -4097,6 +3515,7 @@ update-desktop-database %{_datadir}/appl
%{basisinstdir}/share/xslt/export/xhtml
%dir %{basisinstdir}/share/xslt/import
%{basisinstdir}/share/xslt/import/uof
+%{basisinstdir}/share/registry/xsltfilter.xcd
%files javafilter
%defattr(-,root,root,-)
@@ -4106,20 +3525,10 @@ update-desktop-database %{_datadir}/appl
%{basisinstdir}/program/classes/aportisdoc.jar
%{basisinstdir}/program/classes/pexcel.jar
%{basisinstdir}/program/classes/pocketword.jar
-%dir %{basisinstdir}/share/registry
-%dir %{basisinstdir}/share/registry/modules
-%dir %{basisinstdir}/share/registry/modules/org
-%dir %{basisinstdir}/share/registry/modules/org/openoffice
-%dir %{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection
-%dir %{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Filter
-%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_palm_filters.xcu
-%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_pocketexcel_filters.xcu
-%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_pocketword_filters.xcu
-%dir %{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Types
-%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_palm_types.xcu
-%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_pocketexcel_types.xcu
-%{basisinstdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_pocketword_types.xcu
%{_datadir}/applications/openoffice.org-javafilter.desktop
+%{basisinstdir}/share/registry/palm.xcd
+%{basisinstdir}/share/registry/pocketexcel.xcd
+%{basisinstdir}/share/registry/pocketword.xcd
%files testtools
%defattr(-,root,root,-)
@@ -4132,10 +3541,11 @@ update-desktop-database %{_datadir}/appl
%{basisinstdir}/program/testtoolrc
%{basisinstdir}/program/testtool.bin
%dir %{basisinstdir}/program/resource
-%{basisinstdir}/program/resource/stt%{UPD}en-US.res
+%{basisinstdir}/program/resource/stten-US.res
%files ure
%defattr(-,root,root,-)
+%doc solver/%{OFFICEUPD}/unxlng*/bin/ure/LICENSE
%dir %{baseinstdir}
%{ureinstdir}
%exclude %{ureinstdir}/lib/libsalalloc_malloc.so.3
@@ -4188,39 +3598,18 @@ update-desktop-database %{_datadir}/appl
%{basisinstdir}/program/pyuno.so
%dir %{basisinstdir}/share/Scripts
%{basisinstdir}/share/Scripts/python
-%dir %{basisinstdir}/share/registry
-%dir %{basisinstdir}/share/registry/modules
-%dir %{basisinstdir}/share/registry/modules/org
-%dir %{basisinstdir}/share/registry/modules/org/openoffice
-%dir %{basisinstdir}/share/registry/modules/org/openoffice/Office
-%dir %{basisinstdir}/share/registry/modules/org/openoffice/Office/Scripting
-%{basisinstdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
%{python_sitearch}/uno.py*
%{python_sitearch}/unohelper.py*
%{_datadir}/openoffice.org/extensions/ScriptProviderForPython.zip
+%{basisinstdir}/share/registry/pyuno.xcd
%pre pyuno
-if [ $1 -gt 1 ]; then
- # Upgrade => deregister old extension
- unopkg remove --shared org.openoffice.legacy.ScriptProviderForPython.zip > /dev/null 2>&1 || :
-fi
-
-%post pyuno
- # register extension
- unopkg add --shared --force --link %{_datadir}/openoffice.org/extensions/ScriptProviderForPython.zip > /dev/null 2>&1 || :
-
-%preun pyuno
-if [ $1 -eq 0 ]; then
- # not upgrading => deregister
- unopkg remove --shared org.openoffice.legacy.ScriptProviderForPython.zip > /dev/null 2>&1 || :
-fi
-
-%postun pyuno
- # clear disk cache
- unopkg list --shared > /dev/null 2>&1 || :
+# Upgrade => deregister old < 3.3 extension
+unopkg remove --shared org.openoffice.legacy.ScriptProviderForPython.zip > /dev/null 2>&1 || :
%files -n autocorr-en
%defattr(-,root,root,-)
+%doc solver/%{OFFICEUPD}/unxlng*/bin/ure/LICENSE
%dir %{_datadir}/autocorr
%{_datadir}/autocorr/acor_en-*
@@ -4228,149 +3617,231 @@ fi
%files -n autocorr-af
%defattr(-,root,root,-)
+%doc solver/%{OFFICEUPD}/unxlng*/bin/ure/LICENSE
%dir %{_datadir}/autocorr
%{_datadir}/autocorr/acor_af-*
%files -n autocorr-bg
%defattr(-,root,root,-)
+%doc solver/%{OFFICEUPD}/unxlng*/bin/ure/LICENSE
%dir %{_datadir}/autocorr
%{_datadir}/autocorr/acor_bg-*
%files -n autocorr-cs
%defattr(-,root,root,-)
+%doc solver/%{OFFICEUPD}/unxlng*/bin/ure/LICENSE
%dir %{_datadir}/autocorr
%{_datadir}/autocorr/acor_cs-*
%files -n autocorr-da
%defattr(-,root,root,-)
+%doc solver/%{OFFICEUPD}/unxlng*/bin/ure/LICENSE
%dir %{_datadir}/autocorr
%{_datadir}/autocorr/acor_da-*
%files -n autocorr-de
%defattr(-,root,root,-)
+%doc solver/%{OFFICEUPD}/unxlng*/bin/ure/LICENSE
%dir %{_datadir}/autocorr
%{_datadir}/autocorr/acor_de-*
%files -n autocorr-es
%defattr(-,root,root,-)
+%doc solver/%{OFFICEUPD}/unxlng*/bin/ure/LICENSE
%dir %{_datadir}/autocorr
%{_datadir}/autocorr/acor_es-*
%files -n autocorr-eu
%defattr(-,root,root,-)
+%doc solver/%{OFFICEUPD}/unxlng*/bin/ure/LICENSE
%dir %{_datadir}/autocorr
%{_datadir}/autocorr/acor_eu.dat
%files -n autocorr-fa
%defattr(-,root,root,-)
+%doc solver/%{OFFICEUPD}/unxlng*/bin/ure/LICENSE
%dir %{_datadir}/autocorr
%{_datadir}/autocorr/acor_fa-*
%files -n autocorr-fi
%defattr(-,root,root,-)
+%doc solver/%{OFFICEUPD}/unxlng*/bin/ure/LICENSE
%dir %{_datadir}/autocorr
%{_datadir}/autocorr/acor_fi-*
%files -n autocorr-fr
%defattr(-,root,root,-)
+%doc solver/%{OFFICEUPD}/unxlng*/bin/ure/LICENSE
%dir %{_datadir}/autocorr
%{_datadir}/autocorr/acor_fr-*
%files -n autocorr-ga
%defattr(-,root,root,-)
+%doc solver/%{OFFICEUPD}/unxlng*/bin/ure/LICENSE
%dir %{_datadir}/autocorr
%{_datadir}/autocorr/acor_ga-*
%files -n autocorr-hu
%defattr(-,root,root,-)
+%doc solver/%{OFFICEUPD}/unxlng*/bin/ure/LICENSE
%dir %{_datadir}/autocorr
%{_datadir}/autocorr/acor_hu-*
%files -n autocorr-it
%defattr(-,root,root,-)
+%doc solver/%{OFFICEUPD}/unxlng*/bin/ure/LICENSE
%dir %{_datadir}/autocorr
%{_datadir}/autocorr/acor_it-*
%files -n autocorr-ja
%defattr(-,root,root,-)
+%doc solver/%{OFFICEUPD}/unxlng*/bin/ure/LICENSE
%dir %{_datadir}/autocorr
%{_datadir}/autocorr/acor_ja-*
%files -n autocorr-ko
%defattr(-,root,root,-)
+%doc solver/%{OFFICEUPD}/unxlng*/bin/ure/LICENSE
%dir %{_datadir}/autocorr
%{_datadir}/autocorr/acor_ko-*
%files -n autocorr-lb
%defattr(-,root,root,-)
+%doc solver/%{OFFICEUPD}/unxlng*/bin/ure/LICENSE
%dir %{_datadir}/autocorr
%{_datadir}/autocorr/acor_lb-*
%files -n autocorr-lt
%defattr(-,root,root,-)
+%doc solver/%{OFFICEUPD}/unxlng*/bin/ure/LICENSE
%dir %{_datadir}/autocorr
%{_datadir}/autocorr/acor_lt-*
%files -n autocorr-nl
%defattr(-,root,root,-)
+%doc solver/%{OFFICEUPD}/unxlng*/bin/ure/LICENSE
%dir %{_datadir}/autocorr
%{_datadir}/autocorr/acor_nl-*
%files -n autocorr-mn
%defattr(-,root,root,-)
+%doc solver/%{OFFICEUPD}/unxlng*/bin/ure/LICENSE
%dir %{_datadir}/autocorr
%{_datadir}/autocorr/acor_mn-*
%files -n autocorr-pl
%defattr(-,root,root,-)
+%doc solver/%{OFFICEUPD}/unxlng*/bin/ure/LICENSE
%dir %{_datadir}/autocorr
%{_datadir}/autocorr/acor_pl-*
%files -n autocorr-pt
%defattr(-,root,root,-)
+%doc solver/%{OFFICEUPD}/unxlng*/bin/ure/LICENSE
%dir %{_datadir}/autocorr
%{_datadir}/autocorr/acor_pt-*
%files -n autocorr-ru
%defattr(-,root,root,-)
+%doc solver/%{OFFICEUPD}/unxlng*/bin/ure/LICENSE
%dir %{_datadir}/autocorr
%{_datadir}/autocorr/acor_ru-*
%files -n autocorr-sk
%defattr(-,root,root,-)
+%doc solver/%{OFFICEUPD}/unxlng*/bin/ure/LICENSE
%dir %{_datadir}/autocorr
%{_datadir}/autocorr/acor_sk-*
%files -n autocorr-sl
%defattr(-,root,root,-)
+%doc solver/%{OFFICEUPD}/unxlng*/bin/ure/LICENSE
%dir %{_datadir}/autocorr
%{_datadir}/autocorr/acor_sl-*
+%files -n autocorr-sr
+%defattr(-,root,root,-)
+%doc solver/%{OFFICEUPD}/unxlng*/bin/ure/LICENSE
+%dir %{_datadir}/autocorr
+%{_datadir}/autocorr/acor_sr-*
+%{_datadir}/autocorr/acor_sh-*
+
%files -n autocorr-sv
%defattr(-,root,root,-)
+%doc solver/%{OFFICEUPD}/unxlng*/bin/ure/LICENSE
%dir %{_datadir}/autocorr
%{_datadir}/autocorr/acor_sv-*
%files -n autocorr-tr
%defattr(-,root,root,-)
+%doc solver/%{OFFICEUPD}/unxlng*/bin/ure/LICENSE
%dir %{_datadir}/autocorr
%{_datadir}/autocorr/acor_tr-*
%files -n autocorr-vi
%defattr(-,root,root,-)
+%doc solver/%{OFFICEUPD}/unxlng*/bin/ure/LICENSE
%dir %{_datadir}/autocorr
%{_datadir}/autocorr/acor_vi-*
%files -n autocorr-zh
%defattr(-,root,root,-)
+%doc solver/%{OFFICEUPD}/unxlng*/bin/ure/LICENSE
%dir %{_datadir}/autocorr
%{_datadir}/autocorr/acor_zh-*
%endif
%changelog
-* Wed Jul 07 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.1-19.22
-- drop workspace.sb128.patch again... it doesn't apply to 3.2 (dtardon)
+* Tue Jul 13 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.3.0-0.1
+- first 3.3.0 milestone
+- drop integrated openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
+- drop integrated workspace.printerpullpages.patch
+- drop integrated workspace.fchints01.patch
+- drop integrated openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch
+- drop integrated workspace.slideshow1.patch
+- drop integrated workspace.locales33a.patch
+- drop integrated workspace.sdfindall.patch
+- drop integrated workspace.dr73.patch
+- drop integrated workspace.vcl107.patch
+- drop integrated openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch
+- drop integrated openoffice.org-3.1.1.ooo109280.sal.justcoredump.patch
+- drop integrated workspace.gsminhibit.patch
+- drop integrated workspace.hb33patches1.patch
+- drop integrated workspace.cmcfixes67.patch
+- drop integrated workspace.thbfixes10.patch
+- drop integrated workspace.vcl108.patch
+- drop integrated workspace.pythonssldedux.patch
+- drop integrated acor_ga-IE.dat
+- drop integrated openoffice.org-3.2.0.ooo47279.sd.objectsave.safe.patch
+- drop integrated workspace.sw33bf03.patch
+- drop integrated workspace.writerfilter07.patch
+- drop integrated workspace.sw33bf02.patch
+- drop integrated workspace.fwk139.patch
+- drop integrated workspace.cmcfixes70.patch
+- drop integrated workspace.s390xport02.patch
+- drop integrated workspace.calc53.patch
+- drop integrated workspace.impress188.patch
+- drop integrated workspace.koheicsvimport.patch
+- drop integrated workspace.odfmetadata4.patch
+- drop integrated workspace.tl80.patch
+- drop integrated workspace.vcl111.patch
+- drop integrated workspace.sw33bf04.patch
+- drop integrated workspace.mba33issues01.patch
+- drop integrated openoffice.org-3.3.0.ooo111446.writerfilter.avoidcrash.patch
+- drop integrated workspace.chart47.patch
+- drop integrated workspace.extras330.patch
+- drop integrated workspace.cmcfixes64.patch
+- drop integrated workspace.cmcfixes75.patch
+- drop integrated workspace.os140.patch
+- drop integrated workspace.vcl112.patch
+- drop integrated workspace.gtkfpicker9.patch
+- drop obsoleted openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch
+- drop obsoleted openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
+- add openoffice.org-3.3.0.ooo74188.indiccursor.editeng.patch
+- add workspace.native317.patch
+- add workspace.sb126.patch
+- Resolves: rhbz#613278 [abrt] crash in SANE shutdown (caolanm)
* Wed Jul 07 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.1-19.21
- add workspace.sb128.patch workaround deadlock in smoketest (dtardon)
@@ -5750,7 +5221,7 @@ fi
sal to delete softlinks (caolanm)
- add openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch to enable
linking to unpacked extensions already on the fs when registering (caolanm)
-==> makes extension rpm packaging non-wasteful and safe
+ ==> makes extension rpm packaging non-wasteful and safe
* Thu Nov 15 2007 Caolán McNamara <caolanm at redhat.com> - 1:2.3.1-9.2
- move from firefox to xulrunner
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/sources,v
retrieving revision 1.403
retrieving revision 1.404
diff -u -p -r1.403 -r1.404
--- sources 13 Jul 2010 09:51:45 -0000 1.403
+++ sources 13 Jul 2010 10:16:53 -0000 1.404
@@ -4,7 +4,7 @@ e3a0b76dcd876f3d721ee7183729153d unowin
b54bcc9fdb23389e961b281508d9110c documentation.openoffice.org-templates.tar.gz
1b4d9a03ebb4c864015620153afb77c6 Tigert-templates.tar.gz
f0cda31fe18bf9289629a321663031b8 redhat-templates.tar.gz
-39a2c59cfae4019eda4a63f414c0aa54 redhat-registry.tar.gz
8c994b7e7873b30d70dccc3918cdfbc0 acor_lt.zip
-4faf777a125dacf4726e355626c2cc39 redhat-langpacks.tar.gz
9696917af45aaad3693a2a5b1a840e5c OOO330_m0.tar.bz2
+20613b42d66eadc11c719374355f745c redhat-langpacks.tar.gz
+99bf42c02028cdaf6628356ca982bc65 redhat-registry.tar.gz
workspace.gtk3.patch:
configure.in | 6
source/appl/makefile.mk | 2
source/appl/shutdowniconunx.cxx | 22
source/eggtrayicon-impl.h | 2
source/eggtrayicon.c | 57
source/makefile.mk | 2
source/nsplugin/source/makefile.mk | 2
source/ooo/makefile.mk | 4
source/plugin/unx/npnapi.cxx | 5
source/plugin/util/makefile.pmk | 2
source/unx/gnome/SalGtkFilePicker.cxx | 6
source/unx/gnome/SalGtkPicker.cxx | 4
source/unx/gnome/makefile.mk | 6
unx/gtk/a11y/makefile.mk | 2
unx/gtk/app/gtkdata.cxx | 32
unx/gtk/app/makefile.mk | 2
unx/gtk/gdi/makefile.mk | 4
unx/gtk/gdi/salnativewidgets-gtk.cxx | 2316 +++++++++++++++++-----------------
unx/gtk/window/gtkframe.cxx | 99 -
unx/gtk/window/gtkobject.cxx | 9
unx/gtk/window/makefile.mk | 2
unx/inc/plugins/gtk/gtkdata.hxx | 35
unx/inc/plugins/gtk/gtkgdi.hxx | 16
unx/inc/saldisp.hxx | 4
unx/source/app/saldisp.cxx | 21
unx/source/app/salsys.cxx | 2
util/makefile.mk | 4
27 files changed, 1460 insertions(+), 1208 deletions(-)
View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.5 -r 1.6 workspace.gtk3.patchIndex: workspace.gtk3.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.gtk3.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- workspace.gtk3.patch 1 Jul 2010 13:14:16 -0000 1.5
+++ workspace.gtk3.patch 13 Jul 2010 10:16:54 -0000 1.6
@@ -22,7 +22,7 @@
SLOFILES=\
--- vcl.orig/unx/gtk/gdi/makefile.mk 2010-05-29 11:29:17.000000000 +0100
+++ vcl/unx/gtk/gdi/makefile.mk 2010-05-29 11:30:44.000000000 +0100
-@@ -47,7 +47,7 @@
+@@ -47,9 +47,11 @@
.IF "$(ENABLE_GTK)" != ""
@@ -30,35 +30,29 @@
+PKGCONFIG_MODULES=gtk+-3.0
.INCLUDE : pkg_config.mk
++CFLAGS+=-UGSEAL_ENABLE
++
SLOFILES=$(SLO)$/salnativewidgets-gtk.obj
+ EXCEPTIONSFILES=$(SLO)$/salnativewidgets-gtk.obj
+
--- vcl.orig/unx/gtk/window/gtkframe.cxx 2010-05-29 11:29:16.000000000 +0100
+++ vcl/unx/gtk/window/gtkframe.cxx 2010-05-29 12:02:19.000000000 +0100
-@@ -79,6 +79,24 @@
+@@ -79,6 +79,14 @@
#define GDK_META_MASK (1 << 28)
#endif
-+static bool gtk_widget_is_realized(GtkWidget *widget)
-+{
-+#if GTK_CHECK_VERSION(2,90,0)
-+ return gtk_widget_get_realized(widget);
-+#else
-+ return GTK_WIDGET_REALIZED(widget);
-+#endif
-+}
-+
-+static bool gtk_widget_is_mapped(GtkWidget *widget)
-+{
+#if GTK_CHECK_VERSION(2,90,0)
-+ return gtk_widget_get_mapped(widget);
++#define IS_WIDGET_REALIZED gtk_widget_get_realized
++#define IS_WIDGET_MAPPED gtk_widget_get_mapped
+#else
-+ return GTK_WIDGET_MAPPED(widget);
++#define IS_WIDGET_REALIZED GTK_WIDGET_REALIZED
++#define IS_WIDGET_MAPPED GTK_WIDGET_MAPPED
+#endif
-+}
+
using namespace com::sun::star;
int GtkSalFrame::m_nFloats = 0;
-@@ -433,7 +451,7 @@
+@@ -433,7 +441,7 @@
if( m_hBackgroundPixmap )
{
XSetWindowBackgroundPixmap( getDisplay()->GetDisplay(),
@@ -67,7 +61,7 @@
None );
XFreePixmap( getDisplay()->GetDisplay(), m_hBackgroundPixmap );
}
-@@ -591,7 +609,7 @@
+@@ -592,7 +600,7 @@
SalDisplay* pDisp = GetX11SalData()->GetDisplay();
m_aSystemData.nSize = sizeof( SystemChildData );
m_aSystemData.pDisplay = pDisp->GetDisplay();
@@ -76,7 +70,7 @@
m_aSystemData.pSalFrame = this;
m_aSystemData.pWidget = m_pWindow;
m_aSystemData.pVisual = pDisp->GetVisual( m_nScreen ).GetVisual();
-@@ -643,7 +661,7 @@
+@@ -644,7 +652,7 @@
* some paint issues
*/
XSetWindowBackgroundPixmap( getDisplay()->GetDisplay(),
@@ -85,7 +79,7 @@
m_hBackgroundPixmap );
}
-@@ -677,7 +695,7 @@
+@@ -678,7 +686,7 @@
else if( ! bBeforeRealize )
{
Display* pDisplay = GetX11SalData()->GetDisplay()->GetDisplay();
@@ -94,19 +88,16 @@
XWMHints* pHints = XGetWMHints( pDisplay, aWindow );
if( ! pHints )
{
-@@ -867,9 +885,9 @@
- {
- /* #i99360# ugly workaround an X11 library bug */
+@@ -863,7 +871,7 @@
nUserTime= getDisplay()->GetLastUserEventTime( true );
-- // nUserTime = gdk_x11_get_server_time(GTK_WIDGET (m_pWindow)->window);
-+ // nUserTime = gdk_x11_get_server_time(widget_get_window(GTK_WIDGET(m_pWindow)));
+ // nUserTime = gdk_x11_get_server_time(GTK_WIDGET (m_pWindow)->window);
}
- lcl_set_user_time(GTK_WIDGET(m_pWindow)->window, nUserTime);
+ lcl_set_user_time(widget_get_window(GTK_WIDGET(m_pWindow)), nUserTime);
}
if( bDecoHandling )
-@@ -923,7 +941,8 @@
+@@ -917,7 +925,8 @@
{
m_pWindow = gtk_plug_new( pSysData->aWindow );
m_bWindowIsGtkPlug = true;
@@ -116,7 +107,7 @@
gtk_widget_set_sensitive( m_pWindow, true );
}
else
-@@ -948,7 +967,7 @@
+@@ -942,7 +951,7 @@
if( ! m_bWindowIsGtkPlug )
{
XReparentWindow( getDisplay()->GetDisplay(),
@@ -125,12 +116,12 @@
(XLIB_Window)pSysData->aWindow,
0, 0 );
}
-@@ -982,14 +1001,14 @@
+@@ -976,14 +985,14 @@
if( nStyle != m_nExtStyle && ! isChild() )
{
m_nExtStyle = nStyle;
- if( GTK_WIDGET_REALIZED( m_pWindow ) )
-+ if( gtk_widget_is_realized( m_pWindow ) )
++ if( IS_WIDGET_REALIZED( m_pWindow ) )
{
XClassHint* pClass = XAllocClassHint();
rtl::OString aResHint = X11SalData::getFrameResName( m_nExtStyle );
@@ -142,7 +133,7 @@
pClass );
XFree( pClass );
}
-@@ -1013,7 +1032,7 @@
+@@ -1007,7 +1016,7 @@
if( ! m_aGraphics[i].pGraphics )
{
m_aGraphics[i].pGraphics = new GtkSalGraphics( m_pWindow );
@@ -151,56 +142,43 @@
}
return m_aGraphics[i].pGraphics;
}
-@@ -1314,7 +1333,7 @@
+@@ -1308,7 +1317,7 @@
setMinMaxSize();
// #i45160# switch to desktop where a dialog with parent will appear
- if( m_pParent && m_pParent->m_nWorkArea != m_nWorkArea && GTK_WIDGET_MAPPED(m_pParent->m_pWindow) )
-+ if( m_pParent && m_pParent->m_nWorkArea != m_nWorkArea && gtk_widget_is_mapped(m_pParent->m_pWindow) )
++ if( m_pParent && m_pParent->m_nWorkArea != m_nWorkArea && IS_WIDGET_MAPPED(m_pParent->m_pWindow) )
getDisplay()->getWMAdaptor()->switchToWorkArea( m_pParent->m_nWorkArea );
if( isFloatGrabWindow() &&
-@@ -1336,7 +1355,7 @@
- if( ! bNoActivate && (m_nStyle & (SAL_FRAME_STYLE_OWNERDRAWDECORATION|SAL_FRAME_STYLE_TOOLWINDOW)) == 0 )
- /* #i99360# ugly workaround an X11 library bug */
- nUserTime= getDisplay()->GetLastUserEventTime( true );
-- //nUserTime = gdk_x11_get_server_time(GTK_WIDGET (m_pWindow)->window);
-+ //nUserTime = gdk_x11_get_server_time(widget_get_window(GTK_WIDGET(m_pWindow)));
-
- //For these floating windows we don't want the main window to lose focus, and metacity has...
- // metacity-2.24.0/src/core/window.c
-@@ -1371,10 +1390,10 @@
- {
- /* #i99360# ugly workaround an X11 library bug */
+@@ -1363,7 +1372,7 @@
nUserTime= getDisplay()->GetLastUserEventTime( true );
-- //nUserTime = gdk_x11_get_server_time(GTK_WIDGET (m_pWindow)->window);
-+ //nUserTime = gdk_x11_get_server_time(widget_get_window(GTK_WIDGET(m_pWindow)));
+ //nUserTime = gdk_x11_get_server_time(GTK_WIDGET (m_pWindow)->window);
}
-
- lcl_set_user_time( GTK_WIDGET(m_pWindow)->window, nUserTime );
+ lcl_set_user_time( widget_get_window(GTK_WIDGET(m_pWindow)), nUserTime );
-
- gtk_widget_show( m_pWindow );
-
-@@ -1480,7 +1499,7 @@
+
+ if( bHack && ! bNoActivate && (m_nStyle & SAL_FRAME_STYLE_TOOLWINDOW) )
+ m_bSetFocusOnMap = true;
+@@ -1472,7 +1481,7 @@
{
m_aMaxSize = Size( nWidth, nHeight );
// Show does a setMinMaxSize
- if( GTK_WIDGET_MAPPED( m_pWindow ) )
-+ if( gtk_widget_is_mapped( m_pWindow ) )
++ if( IS_WIDGET_MAPPED( m_pWindow ) )
setMinMaxSize();
}
}
-@@ -1493,7 +1512,7 @@
[...3953 lines suppressed...]
+ gtk_container_forall(GTK_CONTAINER(child), get_combo_box_entry_arrow,
@@ -2429,19 +4256,18 @@
+ gWidgetData[nScreen].gComboBoxEntry_ButtonWidget = gWidgetData[nScreen].gDropdownWidget;
+ }
+ if (!gWidgetData[nScreen].gComboBoxEntry_ArrowWidget)
- {
-- gWidgetData[nScreen].gComboWidget = gtk_combo_new();
++ {
+ NWEnsureGTKArrow( nScreen );
+ gWidgetData[nScreen].gComboBoxEntry_ArrowWidget = gWidgetData[nScreen].gArrowWidget;
+ }
+ }
+}
-
-- // #i59129# Setting non-editable means it doesn't blink, so
-- // there are no timeouts running around to nobble us
-- gtk_editable_set_editable(GTK_EDITABLE(GTK_COMBO(gWidgetData[nScreen].gComboWidget)->entry), false);
++
+static void get_combo_box_inner_widgets(GtkWidget *widget, gpointer client_data)
-+{
+ {
+- if ( !gWidgetData[nScreen].gComboWidget )
+- {
+- gWidgetData[nScreen].gComboWidget = gtk_combo_new();
+ int nScreen = GPOINTER_TO_INT(client_data);
+ if (GTK_IS_TOGGLE_BUTTON(widget))
+ gWidgetData[nScreen].gComboBox_ButtonWidget = widget;
@@ -2453,7 +4279,10 @@
+ return;
+ gtk_widget_realize(widget);
+}
-+
+
+- // #i59129# Setting non-editable means it doesn't blink, so
+- // there are no timeouts running around to nobble us
+- gtk_editable_set_editable(GTK_EDITABLE(GTK_COMBO(gWidgetData[nScreen].gComboWidget)->entry), false);
+static void NWEnsureGTKComboBox( int nScreen )
+{
+ if ( !gWidgetData[nScreen].gComboBoxWidget )
@@ -2465,6 +4294,7 @@
- // does not do this for us in GtkCombo::gtk_widget_realize()
- gtk_widget_realize( GTK_COMBO(gWidgetData[nScreen].gComboWidget)->button );
- gtk_widget_realize( GTK_COMBO(gWidgetData[nScreen].gComboWidget)->entry );
+- }
+ NWAddWidgetToCacheWindow( gWidgetData[nScreen].gComboBoxWidget, nScreen );
+
+ gtk_container_forall(GTK_CONTAINER(gWidgetData[nScreen].gComboBoxWidget),
@@ -2475,7 +4305,7 @@
+ if (gWidgetData[nScreen].gComboBox_ButtonWidget)
+ {
+ //Dig around for the arrow
-+ GtkWidget *child = gtk_bin_get_child(GTK_BIN(gWidgetData[nScreen].gComboBox_ButtonWidget));
++ GtkWidget *child = GTK_BIN(gWidgetData[nScreen].gComboBox_ButtonWidget)->child;
+ if (GTK_IS_HBOX(child))
+ {
+ gtk_container_forall(GTK_CONTAINER(child), get_combo_box_inner_widgets,
@@ -2495,29 +4325,70 @@
+ NWEnsureGTKArrow( nScreen );
+ gWidgetData[nScreen].gComboBox_ArrowWidget = gWidgetData[nScreen].gArrowWidget;
+ }
- }
++ }
+ }
+
+ //-------------------------------------
+
+ static void NWEnsureGTKScrolledWindow( int nScreen )
+ {
+- if ( !gWidgetData[nScreen].gScrolledWindowWidget )
+- {
+- GtkAdjustment *hadj = GTK_ADJUSTMENT( gtk_adjustment_new(0, 0, 0, 0, 0, 0) );
+- GtkAdjustment *vadj = GTK_ADJUSTMENT( gtk_adjustment_new(0, 0, 0, 0, 0, 0) );
++ if ( !gWidgetData[nScreen].gScrolledWindowWidget )
++ {
++ GtkAdjustment *hadj = GTK_ADJUSTMENT( gtk_adjustment_new(0, 0, 0, 0, 0, 0) );
++ GtkAdjustment *vadj = GTK_ADJUSTMENT( gtk_adjustment_new(0, 0, 0, 0, 0, 0) );
+
+- gWidgetData[nScreen].gScrolledWindowWidget = gtk_scrolled_window_new( hadj, vadj );
+- NWAddWidgetToCacheWindow( gWidgetData[nScreen].gScrolledWindowWidget, nScreen );
+- }
++ gWidgetData[nScreen].gScrolledWindowWidget = gtk_scrolled_window_new( hadj, vadj );
++ NWAddWidgetToCacheWindow( gWidgetData[nScreen].gScrolledWindowWidget, nScreen );
++ }
}
-@@ -3844,13 +3964,13 @@
+ //-------------------------------------
+@@ -4002,7 +4090,7 @@
+ GtkReliefStyle aRelief = GTK_RELIEF_NORMAL;
+ gtk_widget_ensure_style( gWidgetData[nScreen].gToolbarWidget );
+ gtk_widget_style_get( gWidgetData[nScreen].gToolbarWidget,
+- "button_relief", &aRelief,
++ "button_relief", &aRelief,
(char *)NULL);
gtk_button_set_relief( GTK_BUTTON(gWidgetData[nScreen].gToolbarButtonWidget), aRelief );
-- GTK_WIDGET_UNSET_FLAGS( gWidgetData[nScreen].gToolbarButtonWidget, GTK_CAN_FOCUS );
-- GTK_WIDGET_UNSET_FLAGS( gWidgetData[nScreen].gToolbarButtonWidget, GTK_CAN_DEFAULT );
-+ widget_set_can_focus( gWidgetData[nScreen].gToolbarButtonWidget, false );
-+ widget_set_can_default( gWidgetData[nScreen].gToolbarButtonWidget, false );
- NWAddWidgetToCacheWindow( gWidgetData[nScreen].gToolbarButtonWidget, nScreen );
-
- gtk_button_set_relief( GTK_BUTTON(gWidgetData[nScreen].gToolbarToggleWidget), aRelief );
-- GTK_WIDGET_UNSET_FLAGS( gWidgetData[nScreen].gToolbarToggleWidget, GTK_CAN_FOCUS );
-- GTK_WIDGET_UNSET_FLAGS( gWidgetData[nScreen].gToolbarToggleWidget, GTK_CAN_DEFAULT );
-+ widget_set_can_focus( gWidgetData[nScreen].gToolbarToggleWidget, false );
-+ widget_set_can_default( gWidgetData[nScreen].gToolbarToggleWidget, false );
- NWAddWidgetToCacheWindow( gWidgetData[nScreen].gToolbarToggleWidget, nScreen );
- }
- if( ! gWidgetData[nScreen].gHandleBoxWidget )
-@@ -3951,3 +4071,5 @@
- NWAddWidgetToCacheWindow( gWidgetData[nScreen].gTreeView, nScreen );
+@@ -4101,7 +4189,7 @@
+ if( !gWidgetData[nScreen].gProgressBar )
+ {
+ gWidgetData[nScreen].gProgressBar = gtk_progress_bar_new ();
+- NWAddWidgetToCacheWindow( gWidgetData[nScreen].gProgressBar, nScreen );
++ NWAddWidgetToCacheWindow( gWidgetData[nScreen].gProgressBar, nScreen );
+ }
+ }
+
+@@ -4110,7 +4198,7 @@
+ if( !gWidgetData[nScreen].gTreeView )
+ {
+ gWidgetData[nScreen].gTreeView = gtk_tree_view_new ();
+- NWAddWidgetToCacheWindow( gWidgetData[nScreen].gTreeView, nScreen );
++ NWAddWidgetToCacheWindow( gWidgetData[nScreen].gTreeView, nScreen );
+ }
+ }
+
+@@ -4119,11 +4207,13 @@
+ if( !gWidgetData[nScreen].gHScale )
+ {
+ gWidgetData[nScreen].gHScale = gtk_hscale_new_with_range(0, 10, 1);
+- NWAddWidgetToCacheWindow( gWidgetData[nScreen].gHScale, nScreen );
++ NWAddWidgetToCacheWindow( gWidgetData[nScreen].gHScale, nScreen );
+ }
+ if( !gWidgetData[nScreen].gVScale )
+ {
+ gWidgetData[nScreen].gVScale = gtk_vscale_new_with_range(0, 10, 1);
+- NWAddWidgetToCacheWindow( gWidgetData[nScreen].gVScale, nScreen );
++ NWAddWidgetToCacheWindow( gWidgetData[nScreen].gVScale, nScreen );
}
}
+
@@ -2597,3 +4468,54 @@
XSync( pAppDisplay, False );
}
+--- vcl.orig/unx/inc/plugins/gtk/gtkdata.hxx 2010-07-07 10:20:34.000000000 +0100
++++ vcl/unx/inc/plugins/gtk/gtkdata.hxx 2010-07-07 11:15:19.000000000 +0100
+@@ -40,6 +40,39 @@
+
+ #include <list>
+
++inline GdkWindow * widget_get_window(GtkWidget *widget)
++{
++#if GTK_CHECK_VERSION(2,90,0)
++ return gtk_widget_get_window(widget);
++#else
++ return widget->window;
++#endif
++}
++
++inline void widget_set_can_focus(GtkWidget *widget, gboolean can_focus)
++{
++#if GTK_CHECK_VERSION(2,90,0)
++ return gtk_widget_set_can_focus(widget, can_focus);
++#else
++ if (can_focus)
++ GTK_WIDGET_SET_FLAGS( widget, GTK_CAN_FOCUS );
++ else
++ GTK_WIDGET_UNSET_FLAGS( widget, GTK_CAN_FOCUS );
++#endif
++}
++
++inline void widget_set_can_default(GtkWidget *widget, gboolean can_default)
++{
++#if GTK_CHECK_VERSION(2,90,0)
++ return gtk_widget_set_can_default(widget, can_default);
++#else
++ if (can_default)
++ GTK_WIDGET_SET_FLAGS( widget, GTK_CAN_DEFAULT );
++ else
++ GTK_WIDGET_UNSET_FLAGS( widget, GTK_CAN_DEFAULT );
++#endif
++}
++
+ class GtkData : public X11SalData
+ {
+ public:
+@@ -73,6 +106,8 @@
+ virtual long Dispatch( XEvent *pEvent );
+ virtual void initScreen( int nScreen ) const;
+
++ virtual int GetDefaultMonitorNumber() const;
++
+ static GdkFilterReturn filterGdkEvent( GdkXEvent* sys_event,
+ GdkEvent* event,
+ gpointer data );
workspace.srb1.patch:
InputRepositoryLoader.java | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
Index: workspace.srb1.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.srb1.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- workspace.srb1.patch 22 Apr 2010 08:41:27 -0000 1.2
+++ workspace.srb1.patch 13 Jul 2010 10:16:55 -0000 1.3
@@ -3,12 +3,12 @@ diff -r bec9b2b2628f -r 47329487e9cf rep
+++ b/reportbuilder/java/com/sun/star/report/pentaho/loader/InputRepositoryLoader.java Wed Nov 11 10:36:44 2009 +0100
@@ -35,6 +35,7 @@
- import com.sun.star.report.InputRepository;
import org.pentaho.reporting.libraries.resourceloader.ResourceData;
-+import org.pentaho.reporting.libraries.resourceloader.ResourceException;
import org.pentaho.reporting.libraries.resourceloader.ResourceKey;
++import org.pentaho.reporting.libraries.resourceloader.ResourceException;
import org.pentaho.reporting.libraries.resourceloader.ResourceKeyCreationException;
import org.pentaho.reporting.libraries.resourceloader.ResourceLoader;
+ import org.pentaho.reporting.libraries.resourceloader.ResourceLoadingException;
@@ -169,4 +170,19 @@
{
return resourceManager;
workspace.sw33bf06.patch:
core/objectpositioning/tocntntanchoredobjectposition.cxx | 8 +++++---
core/text/txttab.cxx | 4 ++++
filter/rtf/rtftbl.cxx | 6 +++++-
3 files changed, 14 insertions(+), 4 deletions(-)
Index: workspace.sw33bf06.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.sw33bf06.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- workspace.sw33bf06.patch 2 Jul 2010 14:54:46 -0000 1.2
+++ workspace.sw33bf06.patch 13 Jul 2010 10:16:55 -0000 1.3
@@ -2,20 +2,16 @@ diff -ru sw.orig/source/core/text/txttab
--- sw/source/core/text/txttab.cxx 2010-06-18 15:03:06.000000000 +0100
+++ sw/source/core/text/txttab.cxx 2010-06-18 15:30:19.000000000 +0100
@@ -194,6 +194,10 @@
- if ( nCount < 0 )
- nCount = 0;
+ }
+ SwTwips nCount = nSearchPos;
-+ //Minimum tab stop width is 1
-+ if (nDefTabDist <= 0)
-+ nDefTabDist = 1;
++ //Minimum tab stop width is 1
++ if (nDefTabDist <= 0)
++ nDefTabDist = 1;
+
nCount /= nDefTabDist;
- nNextPos = ( nCount + 1 ) * nDefTabDist ;
+ nNextPos = nCount < 0 || (!nCount && nSearchPos <= 0)? nCount * nDefTabDist :( nCount + 1 ) * nDefTabDist ;
// --> FME 2004-09-21 #117919 Minimum tab stop width is 1 or 51 twips:
-# HG changeset patch
-# Parent 23574dd1e2de7a4ebb1348b00ae43e1761af672d
-#i112657# do not crash when there are merged cells not started by \clmgf at the beginning of a row
-
diff -r 23574dd1e2de sw/source/filter/rtf/rtftbl.cxx
--- sw/source/filter/rtf/rtftbl.cxx Thu Jun 24 09:29:05 2010 +0200
+++ sw/source/filter/rtf/rtftbl.cxx Thu Jun 24 14:35:01 2010 +0200
workspace.writerfilter08.patch:
OOXMLFactory.cxx | 10 ++++++++--
OOXMLFastContextHandler.cxx | 1 +
2 files changed, 9 insertions(+), 2 deletions(-)
Index: workspace.writerfilter08.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.writerfilter08.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- workspace.writerfilter08.patch 18 Jun 2010 14:44:00 -0000 1.2
+++ workspace.writerfilter08.patch 13 Jul 2010 10:16:57 -0000 1.3
@@ -21,18 +21,11 @@ diff -ru writerfilter.orig/source/ooxml/
diff -ru writerfilter.orig/source/ooxml/OOXMLFastContextHandler.cxx writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
--- writerfilter.orig/source/ooxml/OOXMLFastContextHandler.cxx 2010-06-02 09:46:43.000000000 +0100
+++ writerfilter/source/ooxml/OOXMLFastContextHandler.cxx 2010-06-02 10:11:28.000000000 +0100
-@@ -152,12 +154,13 @@
- (OOXMLFastContextHandler * pContext)
+@@ -153,6 +153,7 @@
: cppu::WeakImplHelper1<com::sun::star::xml::sax::XFastContextHandler>(),
mpParent(pContext),
-+ mId(0),
+ mId(0),
+ mnDefine(0),
mnToken(OOXML_FAST_TOKENS_END),
mpStream(NULL),
mnTableDepth(0),
- mnInstanceNumber(mnInstanceCount),
- mnRefCount(0),
-- m_xContext(pContext->m_xContext),
- mbFallback(false)
- {
- if (pContext != NULL)
--- openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch DELETED ---
--- openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch DELETED ---
--- openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch DELETED ---
--- openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch DELETED ---
--- openoffice.org-3.1.1.ooo109280.sal.justcoredump.patch DELETED ---
--- openoffice.org-3.2.0.ooo47279.sd.objectsave.safe.patch DELETED ---
--- openoffice.org-3.3.0.ooo111446.writerfilter.avoidcrash.patch DELETED ---
--- workspace.calc53.patch DELETED ---
--- workspace.chart47.patch DELETED ---
--- workspace.cmcfixes64.patch DELETED ---
--- workspace.cmcfixes67.patch DELETED ---
--- workspace.cmcfixes70.patch DELETED ---
--- workspace.cmcfixes75.patch DELETED ---
--- workspace.dr73.patch DELETED ---
--- workspace.extras330.patch DELETED ---
--- workspace.fchints01.patch DELETED ---
--- workspace.fwk139.patch DELETED ---
--- workspace.gsminhibit.patch DELETED ---
--- workspace.gtkfpicker9.patch DELETED ---
--- workspace.hb33patches1.patch DELETED ---
--- workspace.impress188.patch DELETED ---
--- workspace.koheicsvimport.patch DELETED ---
--- workspace.locales33a.patch DELETED ---
--- workspace.mba33issues01.patch DELETED ---
--- workspace.odfmetadata4.patch DELETED ---
--- workspace.os140.patch DELETED ---
--- workspace.printerpullpages.patch DELETED ---
--- workspace.pythonssldedux.patch DELETED ---
--- workspace.s390xport02.patch DELETED ---
--- workspace.sdfindall.patch DELETED ---
--- workspace.slideshow1.patch DELETED ---
--- workspace.sw33bf02.patch DELETED ---
--- workspace.sw33bf03.patch DELETED ---
--- workspace.sw33bf04.patch DELETED ---
--- workspace.thbfixes10.patch DELETED ---
--- workspace.tl80.patch DELETED ---
--- workspace.vcl106.patch DELETED ---
--- workspace.vcl107.patch DELETED ---
--- workspace.vcl108.patch DELETED ---
--- workspace.vcl111.patch DELETED ---
--- workspace.vcl112.patch DELETED ---
--- workspace.writerfilter07.patch DELETED ---
- Previous message: rpms/svnkit/devel svnkit-1.3.3-dependencies.patch, NONE, 1.1 svnkit-1.3.3-ISVNStatusFileProvider.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 svnkit.spec, 1.15, 1.16 svnkit-1.3.2-ISVNStatusFileProvider.patch, 1.1, NONE svnkit-1.3.2-dependencies.patch, 1.1, NONE
- Next message: rpms/maven-ejb-plugin/devel maven-ejb-plugin.spec,1.2,1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list