patches/dev300/addrbk-datasrc-ordering.diff | 34 patches/dev300/apply | 30 patches/dev300/gcc-HelpLinker.diff | 37 - patches/dev300/odf-converter-ignore-writerfilter.diff | 141 --- patches/dev300/office-cfg-linux-common-template-dir.diff | 41 - patches/dev300/oox-pptx-export-update-to-ooo320.diff | 198 ----- patches/dev300/sfx2-pre-and-postprocess-during-save-load.diff | 355 ---------- 7 files changed, 1 insertion(+), 835 deletions(-)
New commits: commit dd851e09a287c75bb894e4b38ea9616e62c7c95a Author: Bjoern Michaelsen <bjoern.michael...@canonical.com> Date: Tue Nov 15 20:07:03 2011 +0100 gcc-HelpLinker.diff should be obsolete diff --git a/patches/dev300/apply b/patches/dev300/apply index 37ab886..0af2244 100644 --- a/patches/dev300/apply +++ b/patches/dev300/apply @@ -10,7 +10,7 @@ PATCHPATH=.:../vba:../mono:../64bit:../gstreamer:../ooxml:../postgresql OLDEST_SUPPORTED=ooo330-m7 ooo-build-3.2.98.0 libreoffice-3.2.99.1 # -------- Functional sub-sets -------- -Common : BuildBits, TemporaryHacks, Fixes, DefaultSettings, Features, Misc, CalcFixes, EasterEgg, GnomeVFS, VBAObjects, OOXML, FedoraCommonFixes, WriterDocComparison, MySQL +Common : BuildBits, TemporaryHacks, Fixes, DefaultSettings, Misc, CalcFixes, EasterEgg, GnomeVFS, VBAObjects, OOXML, FedoraCommonFixes, WriterDocComparison, MySQL LinuxCommon : Common, LinuxOnly, CliMonoCommon, Mono, MonoComp, Netbook MacOSXCommon : Common @@ -147,9 +147,6 @@ warning-return-values-stlport.diff, jholesov # gcc OOMs here otherwise (x86_64) writerfilter-qnametostr-NOOPTFILES.diff -# don't let HelpLinker be miscompiled with g++ 4.3 -gcc-HelpLinker.diff # RENAMED transex3 -> l10ntools - # included in dev300 for OOo-3.4 # add the .archive flag to some instsetoo_native/util/makefile.mk rules buildfix-instsetoo_native-archive.diff, i#111617 @@ -496,19 +493,6 @@ win32-prebuilt-writingaids-zip-scp2.diff # Optimal Page Wrap should be default for graphics insertion (X#59831) writer-default-as-optimal-page-wrap.diff, i#38108, jody -[ Features ] -# ask user on logout/shutdown to save documents -# It seems to be better not to use this. It interfers with upstream's -# handling of the issue. See discussion in bnc#525331. --tml -# session-management.diff, i#63156, rodo - -# embed generic media files inside odf docs, plus various related -# sound fixes from rodo -#impressmedia-features.diff, i#83753, n#515553, thorsten -#slideshow-sound.diff, n#515553, rodo - -# Pre- and postprocessing capabilities for loading and saving. -sfx2-pre-and-postprocess-during-save-load.diff, i#71939, flr [ BuildBits ] build-identification.diff, tml diff --git a/patches/dev300/gcc-HelpLinker.diff b/patches/dev300/gcc-HelpLinker.diff deleted file mode 100644 index 3266a6d..0000000 --- a/patches/dev300/gcc-HelpLinker.diff +++ /dev/null @@ -1,37 +0,0 @@ -From e038b9fdc8a8f997d6e85e2194911bb5b742fbe3 Mon Sep 17 00:00:00 2001 -From: Jan Holesovsky <ke...@suse.cz> -Date: Fri, 14 May 2010 16:53:24 +0200 -Subject: [PATCH 051/878] gcc-HelpLinker.diff - ---- - transex3/source/help/makefile.mk | 1 + - transex3/source/makefile.mk | 1 + - 2 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/transex3/source/help/makefile.mk b/transex3/source/help/makefile.mk -index 3196d23..2841da2 100644 ---- l10ntools/source/help/makefile.mk -+++ l10ntools/source/help/makefile.mk -@@ -36,6 +36,7 @@ TARGETTYPE=CUI - - .INCLUDE : settings.mk - .INCLUDE : helplinker.pmk -+CDEFS+= -O0 - - .IF "$(SYSTEM_LIBXSLT)" == "YES" - CFLAGS+= $(LIBXSLT_CFLAGS) -diff --git a/transex3/source/makefile.mk b/transex3/source/makefile.mk -index ab54779..e08e0ac 100644 ---- l10ntools/source/makefile.mk -+++ l10ntools/source/makefile.mk -@@ -39,6 +39,7 @@ ENABLE_EXCEPTIONS=TRUE - .INCLUDE : settings.mk - CDEFS+= -DYY_NEVER_INTERACTIVE=1 - #CDEFS+= -pg -+CDEFS+= -O0 - - .IF "$(SYSTEM_EXPAT)" == "YES" - CFLAGS+=-DSYSTEM_EXPAT --- -1.7.0.1 - diff --git a/patches/dev300/sfx2-pre-and-postprocess-during-save-load.diff b/patches/dev300/sfx2-pre-and-postprocess-during-save-load.diff deleted file mode 100644 index a3c6d27..0000000 --- a/patches/dev300/sfx2-pre-and-postprocess-during-save-load.diff +++ /dev/null @@ -1,355 +0,0 @@ ---- - package/source/xstor/xstorage.cxx | 8 +- - sfx2/source/doc/objstor.cxx | 257 ++++++++++++++++++++++++++++++++++++- - 2 files changed, 251 insertions(+), 14 deletions(-) - -diff --git package/source/xstor/xstorage.cxx package/source/xstor/xstorage.cxx -index c6cc37f..848c7c6 100644 ---- package/source/xstor/xstorage.cxx -+++ package/source/xstor/xstorage.cxx -@@ -4458,13 +4458,7 @@ sal_Bool SAL_CALL OStorage::hasByName( const ::rtl::OUString& aName ) - catch ( uno::Exception& aException ) - { - m_pImpl->AddLog( aException.Message ); -- m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Rethrow" ) ) ); -- -- uno::Any aCaught( ::cppu::getCaughtException() ); -- throw lang::WrappedTargetRuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Can not open storage!\n" ) ), -- uno::Reference< uno::XInterface >( static_cast< OWeakObject* >( this ), -- uno::UNO_QUERY ), -- aCaught ); -+ m_pImpl->AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Ignored...ok!?" ) ) ); - } - - return ( pElement != NULL ); -diff --git sfx2/source/doc/objstor.cxx sfx2/source/doc/objstor.cxx -index a2c1047..24e6c30 100644 ---- sfx2/source/doc/objstor.cxx -+++ sfx2/source/doc/objstor.cxx -@@ -105,6 +105,9 @@ - #include <rtl/logfile.hxx> - #include <basic/modsizeexceeded.hxx> - #include <osl/file.hxx> -+#include <com/sun/star/util/XMacroExpander.hpp> -+#include <osl/process.h> -+#include <osl/thread.hxx> - - #include <sfx2/signaturestate.hxx> - #include <sfx2/app.hxx> -@@ -156,6 +159,126 @@ using namespace ::cppu; - - namespace css = ::com::sun::star; - -+class StatusThread : public osl::Thread -+{ -+ oslFileHandle m_handle; -+ -+public: -+ int volatile progressTicks; -+ -+ StatusThread(oslFileHandle handle) : -+ osl::Thread(), m_handle(handle), progressTicks(0) -+ { -+ } -+ -+ -+ virtual void SAL_CALL run() { -+ sal_uInt64 nRead; -+ char buf[1024]; -+ for(;;) { -+ oslFileError err=osl_readFile(m_handle, buf, sizeof(buf)-1, &nRead); -+ if (err!=osl_File_E_None || nRead<=0) { -+ break; -+ } -+ buf[nRead]=0; -+ progressTicks++; -+ } -+ } -+ -+}; -+ -+static sal_Bool invokeExternalApp(String aAppName, ::rtl::OUString sourceParam, ::rtl::OUString targetParam, uno::Reference< ::com::sun::star::task::XStatusIndicator > xStatusIndicator) -+{ -+ static const char EXPAND_WILDCARD_CONST[] ="vnd.sun.star.expand:"; -+ static const char SOURCE_WILDCARD_CONST[]="%source%"; -+ static const char TARGET_WILDCARD_CONST[]="%target%"; -+ // get macro expansion -+ uno::Reference< XMultiServiceFactory> xMS(::comphelper::getProcessServiceFactory(), UNO_QUERY); -+ uno::Reference< beans::XPropertySet > xProps(xMS, UNO_QUERY); -+ uno::Reference< XComponentContext > xContext(xProps->getPropertyValue(rtl::OUString::createFromAscii("DefaultContext")), UNO_QUERY); -+ uno::Reference< util::XMacroExpander > xExpander(xContext->getValueByName(::rtl::OUString::createFromAscii("/singletons/com.sun.star.util.theMacroExpander")), UNO_QUERY); -+ -+ // parse preprocessing arguments -+ int c=aAppName.GetQuotedTokenCount('\"',','); -+ if (c<1) return sal_False; -+ rtl_uString **args=new rtl_uString*[c]; -+ for(int i=0;i<c;i++) { -+ String aArg=aAppName.GetQuotedToken(i,'\"',','); -+ if (aArg.EqualsIgnoreCaseAscii(EXPAND_WILDCARD_CONST, 0, strlen(EXPAND_WILDCARD_CONST))) { -+ rtl::OUString argStr(aArg.GetBuffer()+strlen(EXPAND_WILDCARD_CONST)); -+ aArg=xExpander->expandMacros(argStr); -+ } else if (aArg.EqualsIgnoreCaseAscii(SOURCE_WILDCARD_CONST, 0, strlen(SOURCE_WILDCARD_CONST))) { -+ aArg=sourceParam; -+ } else if (aArg.EqualsIgnoreCaseAscii(TARGET_WILDCARD_CONST, 0, strlen(TARGET_WILDCARD_CONST))) { -+ aArg=targetParam; -+ } -+ args[i]=rtl::OUString(aArg).pData; -+ rtl_uString_acquire(args[i]); -+ } -+ -+ sal_Bool bOk=sal_False; -+ -+#ifndef NDEBUG -+ for (int p=0;p<c;p++) { -+ rtl::OString aOString = ::rtl::OUStringToOString (args[p], RTL_TEXTENCODING_UTF8); -+ printf("args[%i]=\"%s\"\n", p, aOString.getStr()); -+ } -+#endif -+ // invoke processing step -+ oslProcess pProcess=NULL; -+ oslFileHandle handle=NULL; -+ oslProcessError error=osl_executeProcess_WithRedirectedIO( -+ args[0], -+ args+1, -+ c-1, -+ /*osl_Process_NORMAL*/ osl_Process_HIDDEN, -+ 0, -+ NULL, -+ NULL, -+ 0, -+ &pProcess, -+ NULL, -+ &handle, -+ NULL -+ ); -+ -+ if (error==osl_Process_E_None) { -+ static const int MAXBARTICKS=1000; -+ StatusThread statusThread(handle); -+ statusThread.create(); -+ if (xStatusIndicator.is()) { -+ xStatusIndicator->start(::rtl::OUString::createFromAscii("waiting for external application..."), MAXBARTICKS); -+ } -+ do { -+ TimeValue wait = {1, 0}; -+ error=osl_joinProcessWithTimeout( pProcess, &wait); -+ if (xStatusIndicator.is()) { -+ xStatusIndicator->setValue(statusThread.progressTicks%MAXBARTICKS); -+ } -+ } while (error==osl_Process_E_TimedOut); -+ if (xStatusIndicator.is()) { -+ xStatusIndicator->end(); -+ } -+ if (error==osl_Process_E_None) { -+ oslProcessInfo aProcessInfo; -+ aProcessInfo.Size = sizeof(aProcessInfo); -+ error = osl_getProcessInfo( pProcess, osl_Process_EXITCODE, &aProcessInfo ); -+ if (error==osl_Process_E_None && aProcessInfo.Code == 0) { -+ bOk=sal_True; -+ } -+ } -+ statusThread.join(); -+ } -+ osl_freeProcessHandle(pProcess); -+ -+ for(int i=0;i<c;i++) { -+ rtl_uString_release(args[i]); -+ } -+ delete[] args; -+ return bOk; -+} -+ -+ - //========================================================================= - void impl_addToModelCollection(const css::uno::Reference< css::frame::XModel >& xModel) - { -@@ -614,8 +737,14 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed ) - - // treat the package as broken if the mediatype was retrieved as a fallback - uno::Reference< beans::XPropertySet > xStorProps( xStorage, uno::UNO_QUERY_THROW ); -- xStorProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MediaTypeFallbackUsed" ) ) ) -- >>= bWarnMediaTypeFallback; -+ try { -+ xStorProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MediaTypeFallbackUsed" ) ) ) -+ >>= bWarnMediaTypeFallback; -+ } -+ catch( uno::Exception& ) -+ { -+ // Just ignore it if we can't get any MediaTypeFallbackUsed property, -+ } - - if ( pRepairPackageItem && pRepairPackageItem->GetValue() ) - { -@@ -627,8 +756,17 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed ) - bWarnMediaTypeFallback = sal_False; - } - -- if ( bWarnMediaTypeFallback || !xStorage->getElementNames().getLength() ) -- SetError( ERRCODE_IO_BROKENPACKAGE, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); -+ try { -+ if ( bWarnMediaTypeFallback || !xStorage->getElementNames().getLength() ) -+ SetError( ERRCODE_IO_BROKENPACKAGE, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); -+ } -+ catch( uno::Exception& ) -+ { -+ // Just ignore it if we can't get element names here. -+ // Is this the right thing to do, no clue. But it helps -+ // loading OOXML documents using the external odf-converter -+ // pre- and postprocessor (see below). -+ } - } - catch( uno::Exception& ) - { -@@ -641,7 +779,51 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed ) - { - pImp->nLoadedFlags = 0; - pImp->bModelInitialized = sal_False; -- bOk = xStorage.is() && LoadOwnFormat( *pMed ); -+ int end, pos = STRING_NOTFOUND; -+ String aUserData; -+ static const char PREPROCESS_CONST[]="Preprocess=<"; -+ if (pFilter) { -+ aUserData=pFilter->GetUserData(); -+ // check whether a prepocessing step is requested in the configuration -+ pos=aUserData.Search(::rtl::OUString::createFromAscii(PREPROCESS_CONST).getStr(), 0); -+ end=aUserData.Search( '>', pos+strlen(PREPROCESS_CONST)); -+ } -+ if (pos!=STRING_NOTFOUND && end!=STRING_NOTFOUND) { -+ String aAppName(aUserData, pos+strlen(PREPROCESS_CONST), end-(pos+strlen(PREPROCESS_CONST))); -+ -+ // setup status bar -+ SfxItemSet *pSet2 = pMed->GetItemSet(); -+ const SfxUnoAnyItem *pItem=NULL; -+ SfxItemState ret=pSet2->GetItemState( SID_PROGRESS_STATUSBAR_CONTROL, TRUE, (const SfxPoolItem**)&pItem); -+ uno::Reference< ::com::sun::star::task::XStatusIndicator > xStatusIndicator; -+ if (ret==SFX_ITEM_SET && pItem!=NULL) -+ { -+ pItem->GetValue() >>= xStatusIndicator; -+ } -+ // create a copy -+ SfxMedium myMed(*pMed, sal_False); -+ ::utl::TempFile aTempFile; -+ myMed.SetName(aTempFile.GetURL(), sal_True); -+ myMed.SetPhysicalName_Impl(aTempFile.GetFileName()); -+ myMed.ResetError(); -+ myMed.CloseStorage(); -+ myMed.CloseInStream(); -+ myMed.SetTemporary(sal_True); -+ -+ bOk = invokeExternalApp(aAppName, ::rtl::OUString(pMed->GetPhysicalName()), ::rtl::OUString(myMed.GetPhysicalName()), xStatusIndicator); -+ -+ // load from copy -+ if (bOk) { -+ bOk = xStorage.is() && LoadOwnFormat( myMed ); -+ -+ } else { -+ // We process only errors from invokeExternalApp at this point -+ // The errors from the above LoadOwnFormat are processed later -+ SetError( ERRCODE_IO_CANTREAD, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); -+ } -+ } else { -+ bOk = xStorage.is() && LoadOwnFormat( *pMed ); -+ } - if ( bOk ) - { - // the document loaded from template has no name -@@ -1074,6 +1256,7 @@ void Lock_Impl( SfxObjectShell* pDoc, BOOL bLock ) - - } - -+ - //------------------------------------------------------------------------- - - sal_Bool SfxObjectShell::SaveTo_Impl -@@ -1554,6 +1737,59 @@ sal_Bool SfxObjectShell::SaveTo_Impl - bOk = SaveChildren( TRUE ); - } - -+ if (bOk) { // commit *before* we do the conversion! -+ bOk = rMedium.Commit(); -+ } -+ -+ uno::Reference< embed::XStorage > xNewTmpStorage; -+ if (bOk) { -+ String aUserData=pFilter->GetUserData(); -+ // check whether a postprocessing step is requested in the configuration -+ static const char POSTPROCESS_CONST[]="Postprocess=<"; -+ int pos=aUserData.Search(::rtl::OUString::createFromAscii(POSTPROCESS_CONST).getStr(), 0); -+ int end=aUserData.Search( '>', pos+strlen(POSTPROCESS_CONST)); -+ if (pos!=STRING_NOTFOUND && end!=STRING_NOTFOUND) { -+ String aAppName(aUserData, pos+strlen(POSTPROCESS_CONST), end-(pos+strlen(POSTPROCESS_CONST))); -+ -+ // setup status bar -+ SfxItemSet *pSet2 = rMedium.GetItemSet(); -+ const SfxUnoAnyItem *pItem=NULL; -+ SfxItemState ret=pSet2->GetItemState( SID_PROGRESS_STATUSBAR_CONTROL, TRUE, (const SfxPoolItem**)&pItem); -+ uno::Reference< ::com::sun::star::task::XStatusIndicator > xStatusIndicator; -+ if (ret==SFX_ITEM_SET && pItem!=NULL) -+ { -+ pItem->GetValue() >>= xStatusIndicator; -+ } -+ -+ // create copy -+ ::rtl::OUString aTmpVersionURL = CreateTempCopyOfStorage_Impl( rMedium.GetStorage() ); -+ rMedium.CloseAndRelease(); -+ -+ rtl::OUString aSourceFile; -+ osl::FileBase::getSystemPathFromFileURL(aTmpVersionURL, aSourceFile); -+ String aTargetFile(rMedium.GetPhysicalName()); -+ -+ // remove the current target file after it was copied -+ // the postprocess might crash and the unprocessed file would confuse users -+ String aTargetFileURL; -+ ::utl::LocalFileHelper::ConvertPhysicalNameToURL( aTargetFile, aTargetFileURL ); -+ osl_removeFile(::rtl::OUString(aTargetFileURL).pData); -+ -+ bOk=invokeExternalApp(aAppName, aSourceFile, aTargetFile, xStatusIndicator); -+ -+ if (bOk) { -+ // create a new tmp storage -+ xNewTmpStorage=::comphelper::OStorageHelper::GetStorageFromURL( aTmpVersionURL, embed::ElementModes::READWRITE ); -+ // it does not make sense to reopen the file if it was not saved correctly -+ rMedium.ReOpen(); -+ } -+ } -+ } -+ -+ if (bOk && xNewTmpStorage.is()) { -+ rMedium.SetStorage_Impl(xNewTmpStorage); -+ } -+ - if ( bOk ) - { - // if ODF version of oasis format changes on saving the signature should not be preserved -@@ -1661,11 +1897,11 @@ sal_Bool SfxObjectShell::SaveTo_Impl - // transfer data to its destinated location - // the medium commits the storage or the stream it is based on - RegisterTransfer( rMedium ); -- bOk = rMedium.Commit(); - - if ( bOk ) - { - AddLog( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX "Storing is successful." ) ) ); -+ bOk = rMedium.Commit(); - - // if the target medium is an alien format and the "old" medium was an own format and the "old" medium - // has a name, the object storage must be exchanged, because now we need a new temporary storage -@@ -3527,7 +3763,14 @@ sal_Bool SfxObjectShell::CopyStoragesOfUnknownMediaType( const uno::Reference< e - - try - { -- uno::Sequence< ::rtl::OUString > aSubElements = xSource->getElementNames(); -+ uno::Sequence< ::rtl::OUString > aSubElements; -+ try { -+ aSubElements = xSource->getElementNames(); -+ } -+ catch( uno::Exception& ) -+ { -+ // Just ignore it, ok? -+ } - for ( sal_Int32 nInd = 0; nInd < aSubElements.getLength(); nInd++ ) - { - if ( aSubElements[nInd].equals( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Configurations" ) ) ) ) --- -1.7.0.1 - commit 64e5b4e738e95113d1faf82b7e720e5703cfa83e Author: Bjoern Michaelsen <bjoern.michael...@canonical.com> Date: Tue Nov 15 20:01:47 2011 +0100 office-cfg-linux-common-template-dir.diff should be obsolete diff --git a/patches/dev300/apply b/patches/dev300/apply index d2c575d..37ab886 100644 --- a/patches/dev300/apply +++ b/patches/dev300/apply @@ -334,10 +334,6 @@ calc-pdf-export-allow-filtered-range-filter.diff, n#585028, kohei # it is most likely solved in the plain code another way # fpicker-kde-gcc4-visibility.diff, pmladek -# search <ooo-home>/share/template/common for language independent templates -# will not push it upstream because it will be replaced by upcomming kendy's work -office-cfg-linux-common-template-dir.diff, pmladek - system-python-ure-bootstrap.diff, deb#501028, i#90701 pyuno-ooodir.diff, i#90701 system-python-uno-path.diff, i#97629 diff --git a/patches/dev300/office-cfg-linux-common-template-dir.diff b/patches/dev300/office-cfg-linux-common-template-dir.diff deleted file mode 100644 index 34cf86b..0000000 --- a/patches/dev300/office-cfg-linux-common-template-dir.diff +++ /dev/null @@ -1,41 +0,0 @@ ---- - .../registry/data/org/openoffice/Office/Common.xcu | 2 ++ - .../schema/org/openoffice/Office/Common.xcs | 4 ++-- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git officecfg/registry/data/org/openoffice/Office/Common.xcu officecfg/registry/data/org/openoffice/Office/Common.xcu -index bb3c779..642d227 100644 ---- officecfg/registry/data/org/openoffice/Office/Common.xcu -+++ officecfg/registry/data/org/openoffice/Office/Common.xcu -@@ -705,4 +705,6 @@ - "com.sun.star.configuration.backend.GconfBackend OpenGL_Faster"/> - </prop> - </node> -+ <!-- FIXME: This comment is needed to change a checksum or so. -+ Then the updated list of templates paths is read from Common.xcs--> - </oor:component-data> -diff --git officecfg/registry/schema/org/openoffice/Office/Common.xcs officecfg/registry/schema/org/openoffice/Office/Common.xcs -index 74c65d3..4e43df8 100644 ---- officecfg/registry/schema/org/openoffice/Office/Common.xcs -+++ officecfg/registry/schema/org/openoffice/Office/Common.xcs -@@ -1689,7 +1689,7 @@ - <author>MBA</author> - <desc>Specifies the templates originate from these folders and sub-folders.</desc> - </info> -- <value oor:separator=":">$(insturl)/share/template/$(vlang):$(insturl)/share/template:$(userurl)/template</value> -+ <value oor:separator=";">file:///usr/share/templates/ooo/common;file:///usr/share/templates/ooo/$(vlang);file:///usr/share/templates/ooo2/common;file:///usr/share/templates/ooo2/$(vlang);$(insturl)/share/template/common;$(insturl)/share/template/$(vlang);$(userurl)/template</value> - </prop> - <prop oor:name="UIConfig" oor:type="oor:string-list"> - <info> -@@ -1837,8 +1837,7 @@ - <info> - <desc>Specifies the default directory where all provided templates are located in folders and sub-folders.</desc> - </info> -- <value oor:separator=":">$(insturl)/share/template/$(vlang):$(insturl)/share/template:$(userurl)/template</value> -+ <value oor:separator=";">file:///usr/share/templates/ooo/common;file:///usr/share/templates/ooo/$(vlang);file:///usr/share/templates/ooo2/common;file:///usr/share/templates/ooo2/$(vlang);$(insturl)/share/template/common;$(insturl)/share/template/$(vlang);$(userurl)/template</value> - </prop> - <prop oor:name="UIConfig" oor:type="oor:string-list"> - <info> --- -1.7.0.1 - commit 38b714a8e9e568ab0404b680113887bf788c165e Author: Bjoern Michaelsen <bjoern.michael...@canonical.com> Date: Tue Nov 15 19:37:28 2011 +0100 odf-converter-ignore-writerfilter.diff is obsolete diff --git a/patches/dev300/apply b/patches/dev300/apply index 3924af2..d2c575d 100644 --- a/patches/dev300/apply +++ b/patches/dev300/apply @@ -10,7 +10,7 @@ PATCHPATH=.:../vba:../mono:../64bit:../gstreamer:../ooxml:../postgresql OLDEST_SUPPORTED=ooo330-m7 ooo-build-3.2.98.0 libreoffice-3.2.99.1 # -------- Functional sub-sets -------- -Common : BuildBits, TemporaryHacks, Fixes, DefaultSettings, Features, Misc, CalcFixes, EasterEgg, GnomeVFS, VBAObjects, OOXML, OOXMLExport, FedoraCommonFixes, WriterDocComparison, MySQL +Common : BuildBits, TemporaryHacks, Fixes, DefaultSettings, Features, Misc, CalcFixes, EasterEgg, GnomeVFS, VBAObjects, OOXML, FedoraCommonFixes, WriterDocComparison, MySQL LinuxCommon : Common, LinuxOnly, CliMonoCommon, Mono, MonoComp, Netbook MacOSXCommon : Common @@ -1279,10 +1279,6 @@ sw-do-not-capture-surround-through-objs-patch.diff, n#367341, i#18732, flr # need to be fixed in Pootle; sent mail to l...@es.libreoffice.org # sc-autofilter-l10n-es.diff, i#103840, pmladek -[ OOXMLExport ] -# hack to ignore writerfilter when odf-converter is present -odf-converter-ignore-writerfilter.diff, n#348471, n#502173, jholesov - [ Experimental ] experimental_ooapi.diff, flr diff --git a/patches/dev300/odf-converter-ignore-writerfilter.diff b/patches/dev300/odf-converter-ignore-writerfilter.diff deleted file mode 100644 index 2e9bb89..0000000 --- a/patches/dev300/odf-converter-ignore-writerfilter.diff +++ /dev/null @@ -1,141 +0,0 @@ ---- - filter/source/config/cache/filtercache.cxx | 95 ++++++++++++++++++++++++++++ - filter/source/config/cache/makefile.mk | 1 + - 2 files changed, 96 insertions(+), 0 deletions(-) - -diff --git filter/source/config/cache/filtercache.cxx filter/source/config/cache/filtercache.cxx -index 657e8ad..0edbb81 100644 ---- filter/source/config/cache/filtercache.cxx -+++ filter/source/config/cache/filtercache.cxx -@@ -62,7 +62,15 @@ - #include <tools/urlobj.hxx> - #include <tools/wldcrd.hxx> - -+#include <com/sun/star/deployment/thePackageManagerFactory.hpp> -+ - #include <comphelper/configurationhelper.hxx> -+#include <ucbhelper/commandenvironment.hxx> -+#include <rtl/bootstrap.hxx> -+ -+#include <osl/file.hxx> -+ -+using namespace com::sun::star; - - //_______________________________________________ - // namespace -@@ -1541,6 +1549,90 @@ void FilterCache::impl_load(EFillState eRequiredState) - // <- SAFE - } - -+static bool isOdfConverterInstalled() -+{ -+ static bool bTested = false; -+ static bool bInstalled = false; -+ -+ if ( bTested ) -+ return bInstalled; -+ -+ bTested = true; -+ -+ // the easy path - check for the OdfConverter binary -+ rtl::OUString aPath; -+ -+ rtl::Bootstrap::get( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BRAND_BASE_DIR" ) ), aPath ); -+ aPath += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/program/OdfConverter" ) ); -+ -+ osl::DirectoryItem aDirItem; -+ if ( osl::DirectoryItem::get( aPath, aDirItem ) == osl::FileBase::E_None ) -+ { -+ bInstalled = true; -+ return bInstalled; -+ } -+ -+ // check the installed extensions -+ uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> xMS(::comphelper::getProcessServiceFactory(), uno::UNO_QUERY); -+ uno::Reference< beans::XPropertySet > xProps(xMS, uno::UNO_QUERY); -+ uno::Reference< uno::XComponentContext > xContext(xProps->getPropertyValue(rtl::OUString::createFromAscii("DefaultContext")), uno::UNO_QUERY); -+ -+ uno::Reference< deployment::XPackageManager > xUserContext( -+ deployment::thePackageManagerFactory::get (xContext)->getPackageManager( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("user") ) ) ); -+ uno::Reference< ::com::sun::star::deployment::XPackageManager > xSharedContext( -+ deployment::thePackageManagerFactory::get (xContext)->getPackageManager( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("shared") ) ) ); -+ -+ uno::Reference< ::com::sun::star::task::XInteractionHandler > xInteractionHandler = uno::Reference< task::XInteractionHandler > ( -+ xMS->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.uui.InteractionHandler") ) ), uno::UNO_QUERY ); -+ ::ucbhelper::CommandEnvironment* pCommandEnv = new ::ucbhelper::CommandEnvironment( xInteractionHandler, uno::Reference< ucb::XProgressHandler >() ); -+ -+ uno::Reference< ucb::XCommandEnvironment > xCmdEnv( static_cast< ::com::sun::star::ucb::XCommandEnvironment* >( pCommandEnv ), uno::UNO_QUERY ); -+ -+ const uno::Sequence< uno::Reference< deployment::XPackage > > userPackages( -+ xUserContext->getDeployedPackages( NULL, xCmdEnv ) ); -+ const uno::Sequence< uno::Reference< deployment::XPackage > > sharedPackages( -+ xSharedContext->getDeployedPackages( NULL, xCmdEnv ) ); -+ -+ const uno::Sequence< uno::Reference< deployment::XPackage > > pkgsArray[2] = { -+ userPackages, -+ sharedPackages -+ }; -+ -+ for ( int i = 0; i < 2; i++ ) { -+ const uno::Sequence< uno::Reference< deployment::XPackage > > pkgs = pkgsArray[i]; -+ -+ for ( int j = 0; j < pkgs.getLength(); j++ ) { -+ rtl::OUString fname = pkgs[j]->getName(); -+ if ( fname.matchIgnoreAsciiCase( rtl::OUString::createFromAscii( "odf-converter-" ) ) ) { -+ printf( "Found match for odf-converter!\n"); -+ fflush( stdout ); -+ bInstalled = true; -+ return bInstalled; -+ } -+ } -+ } -+ -+ return false; -+} -+ -+static bool terribleHackToPreferOdfConverter( const rtl::OUString& rName ) -+{ -+ if ( !isOdfConverterInstalled() ) -+ return false; -+ -+ if ( rName.equalsAscii( "Calc MS Excel 2007 XML" ) || -+ rName.equalsAscii( "MS Excel 2007 XML" ) || -+ rName.equalsAscii( "MS PowerPoint 2007 XML" ) || -+ rName.equalsAscii( "Impress MS PowerPoint 2007 XML" ) || -+ rName.equalsAscii( "writer_MS_Word_2007" ) || -+ rName.equalsAscii( "MS Word 2007 XML" ) ) -+ { -+ return true; -+ } -+ -+ return false; -+} -+ - /*----------------------------------------------- - 22.09.2003 14:27 - -----------------------------------------------*/ -@@ -1608,6 +1700,9 @@ void FilterCache::impl_loadSet(const css::uno::Reference< css::container::XNameA - sal_Int32 c = lItems.getLength(); - for (sal_Int32 i=0; i<c; ++i) - { -+ if ( terribleHackToPreferOdfConverter( pItems[i] ) ) -+ continue; -+ - CacheItemList::iterator pItem = pCache->find(pItems[i]); - switch(eOption) - { -diff --git filter/source/config/cache/makefile.mk filter/source/config/cache/makefile.mk -index fbc4806..44cb87a 100644 ---- filter/source/config/cache/makefile.mk -+++ filter/source/config/cache/makefile.mk -@@ -60,6 +60,7 @@ SLOFILES= \ - SHL1OBJS= $(SLOFILES) - - SHL1STDLIBS= \ -+ $(UCBHELPERLIB) \ - $(COMPHELPERLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ --- -1.7.0.1 - commit c60a21e9d3c14d6e089611e6f3de13c73404272c Author: Bjoern Michaelsen <bjoern.michael...@canonical.com> Date: Tue Nov 15 19:35:02 2011 +0100 oox-pptx-export-update-to-ooo320.diff is obsolete diff --git a/patches/dev300/apply b/patches/dev300/apply index 7259105..3924af2 100644 --- a/patches/dev300/apply +++ b/patches/dev300/apply @@ -1283,8 +1283,6 @@ sw-do-not-capture-surround-through-objs-patch.diff, n#367341, i#18732, flr # hack to ignore writerfilter when odf-converter is present odf-converter-ignore-writerfilter.diff, n#348471, n#502173, jholesov -oox-pptx-export-update-to-ooo320.diff, rodo - [ Experimental ] experimental_ooapi.diff, flr diff --git a/patches/dev300/oox-pptx-export-update-to-ooo320.diff b/patches/dev300/oox-pptx-export-update-to-ooo320.diff deleted file mode 100644 index fb2ca90..0000000 --- a/patches/dev300/oox-pptx-export-update-to-ooo320.diff +++ /dev/null @@ -1,198 +0,0 @@ ---- - sd/source/filter/pptx/epptooxml.hxx | 4 +- - sd/source/filter/pptx/pptx-epptooxml.cxx | 78 +++++++++++------------- - sd/source/filter/pptx/pptx-pptexanimations.cxx | 2 +- - 3 files changed, 39 insertions(+), 45 deletions(-) - -diff --git sd/source/filter/pptx/epptooxml.hxx sd/source/filter/pptx/epptooxml.hxx -index 44beff3..f6b0a2e 100644 ---- sd/source/filter/pptx/epptooxml.hxx -+++ sd/source/filter/pptx/epptooxml.hxx -@@ -54,10 +54,10 @@ public: - - // only needed for import, leave them empty, refactor later XmlFilterBase to export and import base? - virtual sal_Int32 getSchemeClr( sal_Int32 /* nColorSchemeToken */ ) const { return 0; } -- virtual const oox::vml::DrawingPtr getDrawings() { return oox::vml::DrawingPtr(); } -+ virtual oox::vml::Drawing* getVmlDrawing() { return NULL; } - virtual const oox::drawingml::Theme* getCurrentTheme() const { return NULL; } - virtual const oox::drawingml::table::TableStyleListPtr getTableStyles() { return oox::drawingml::table::TableStyleListPtr(); } -- virtual oox::drawingml::chart::ChartConverter& getChartConverter(); -+ virtual oox::drawingml::chart::ChartConverter* getChartConverter() { return NULL; } - - static const char* GetSideDirection( sal_uInt8 nDirection ); - static const char* GetCornerDirection( sal_uInt8 nDirection ); -diff --git sd/source/filter/pptx/pptx-epptooxml.cxx sd/source/filter/pptx/pptx-epptooxml.cxx -index d25e178..0b64cca 100644 ---- sd/source/filter/pptx/pptx-epptooxml.cxx -+++ sd/source/filter/pptx/pptx-epptooxml.cxx -@@ -196,7 +196,6 @@ ShapeExport& PowerPointShapeExport::WriteUnknownShape( Reference< XShape > xShap - PowerPointExport::PowerPointExport( const Reference< XMultiServiceFactory > & rSMgr ) - : XmlFilterBase( rSMgr ), - PPTWriterBase(), -- mxChartConv( new ::oox::drawingml::chart::ChartConverter ), - mnLayoutFileIdMax( 1 ), - mnSlideIdMax( 1 << 8 ), - mnSlideMasterIdMax( 1 << 31 ), -@@ -223,8 +222,8 @@ bool PowerPointExport::exportDocument() throw() - - addRelation( US( "http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument" ), S( "ppt/presentation.xml" ) ); - -- mPresentationFS = openOutputStreamWithSerializer( US( "ppt/presentation.xml" ), -- US( "application/vnd.openxmlformats-officedocument.presentationml.presentation.main+xml" ) ); -+ mPresentationFS = openFragmentStreamWithSerializer( US( "ppt/presentation.xml" ), -+ US( "application/vnd.openxmlformats-officedocument.presentationml.presentation.main+xml" ) ); - - addRelation( mPresentationFS->getOutputStream(), - US( "http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme" ), -@@ -250,7 +249,7 @@ bool PowerPointExport::exportDocument() throw() - mPresentationFS->endElementNS( XML_p, XML_presentation ); - mPresentationFS.reset(); - -- commit(); -+ commitStorage(); - - maShapeMap.clear (); - -@@ -920,7 +919,7 @@ void PowerPointExport::WriteAnimationNodeCommonPropsStart( FSHelperPtr pFS, cons - } - } - -- sal_uInt32 nPresetId; -+ sal_uInt32 nPresetId = 0; - sal_Bool bPresetId = FALSE; - if ( pAny[ DFF_ANIM_PRESET_ID ] ) { - rtl::OUString sPreset; -@@ -1154,12 +1153,12 @@ void PowerPointExport::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNu - if( nPageNum == mnPages - 1 ) - mPresentationFS->endElementNS( XML_p, XML_sldIdLst ); - -- FSHelperPtr pFS = openOutputStreamWithSerializer( OUStringBuffer() -- .appendAscii( "ppt/slides/slide" ) -- .append( (sal_Int32) nPageNum + 1 ) -- .appendAscii( ".xml" ) -- .makeStringAndClear(), -- US( "application/vnd.openxmlformats-officedocument.presentationml.slide+xml" ) ); -+ FSHelperPtr pFS = openFragmentStreamWithSerializer( OUStringBuffer() -+ .appendAscii( "ppt/slides/slide" ) -+ .append( (sal_Int32) nPageNum + 1 ) -+ .appendAscii( ".xml" ) -+ .makeStringAndClear(), -+ US( "application/vnd.openxmlformats-officedocument.presentationml.slide+xml" ) ); - - if( mpSlidesFSArray.size() < mnPages ) - mpSlidesFSArray.resize( mnPages ); -@@ -1212,12 +1211,12 @@ void PowerPointExport::ImplWriteNotes( sal_uInt32 nPageNum ) - - DBG(printf("write Notes %d\n----------------\n", nPageNum)); - -- FSHelperPtr pFS = openOutputStreamWithSerializer( OUStringBuffer() -- .appendAscii( "ppt/notesSlides/notesSlide" ) -- .append( (sal_Int32) nPageNum + 1 ) -- .appendAscii( ".xml" ) -- .makeStringAndClear(), -- US( "application/vnd.openxmlformats-officedocument.presentationml.notesSlide+xml" ) ); -+ FSHelperPtr pFS = openFragmentStreamWithSerializer( OUStringBuffer() -+ .appendAscii( "ppt/notesSlides/notesSlide" ) -+ .append( (sal_Int32) nPageNum + 1 ) -+ .appendAscii( ".xml" ) -+ .makeStringAndClear(), -+ US( "application/vnd.openxmlformats-officedocument.presentationml.notesSlide+xml" ) ); - - pFS->startElementNS( XML_p, XML_notes, PNMSS, FSEND ); - -@@ -1352,12 +1351,12 @@ void PowerPointExport::ImplWriteSlideMaster( sal_uInt32 nPageNum, Reference< XPr - mPresentationFS->endElementNS( XML_p, XML_sldMasterIdLst ); - - FSHelperPtr pFS = -- openOutputStreamWithSerializer( OUStringBuffer() -- .appendAscii( "ppt/slideMasters/slideMaster" ) -- .append( (sal_Int32) nPageNum + 1 ) -- .appendAscii( ".xml" ) -- .makeStringAndClear(), -- US( "application/vnd.openxmlformats-officedocument.presentationml.slideMaster+xml" ) ); -+ openFragmentStreamWithSerializer( OUStringBuffer() -+ .appendAscii( "ppt/slideMasters/slideMaster" ) -+ .append( (sal_Int32) nPageNum + 1 ) -+ .appendAscii( ".xml" ) -+ .makeStringAndClear(), -+ US( "application/vnd.openxmlformats-officedocument.presentationml.slideMaster+xml" ) ); - if( mpMasterFSArray.size() < mnMasterPages ) - mpMasterFSArray.resize( mnMasterPages ); - mpMasterFSArray[ nPageNum ] = pFS; -@@ -1450,12 +1449,12 @@ void PowerPointExport::ImplWriteLayout( sal_Int32 nOffset, sal_uInt32 nMasterNum - return; - - FSHelperPtr pFS -- = openOutputStreamWithSerializer( OUStringBuffer() -- .appendAscii( "ppt/slideLayouts/slideLayout" ) -- .append( (sal_Int32) mnLayoutFileIdMax ) -- .appendAscii( ".xml" ) -- .makeStringAndClear(), -- US( "application/vnd.openxmlformats-officedocument.presentationml.slideLayout+xml" ) ); -+ = openFragmentStreamWithSerializer( OUStringBuffer() -+ .appendAscii( "ppt/slideLayouts/slideLayout" ) -+ .append( (sal_Int32) mnLayoutFileIdMax ) -+ .appendAscii( ".xml" ) -+ .makeStringAndClear(), -+ US( "application/vnd.openxmlformats-officedocument.presentationml.slideLayout+xml" ) ); - - // LayoutInfo& rLayoutInfo = GetLayoutInfo( mXPagePropSet ); - -@@ -1826,12 +1825,12 @@ ShapeExport& PowerPointShapeExport::WritePlaceholderShape( Reference< XShape > x - - void PowerPointExport::WriteTheme( sal_Int32 nThemeNum ) - { -- FSHelperPtr pFS = openOutputStreamWithSerializer( OUStringBuffer() -- .appendAscii( "ppt/theme/theme" ) -- .append( (sal_Int32) nThemeNum + 1 ) -- .appendAscii( ".xml" ) -- .makeStringAndClear(), -- US( "application/vnd.openxmlformats-officedocument.theme+xml" ) ); -+ FSHelperPtr pFS = openFragmentStreamWithSerializer( OUStringBuffer() -+ .appendAscii( "ppt/theme/theme" ) -+ .append( (sal_Int32) nThemeNum + 1 ) -+ .appendAscii( ".xml" ) -+ .makeStringAndClear(), -+ US( "application/vnd.openxmlformats-officedocument.theme+xml" ) ); - - pFS->startElementNS( XML_a, XML_theme, - FSNS( XML_xmlns, XML_a), "http://schemas.openxmlformats.org/drawingml/2006/main", -@@ -1881,8 +1880,8 @@ sal_Bool PowerPointExport::WriteNotesMaster() - mPresentationFS->endElementNS( XML_p, XML_notesMasterIdLst ); - - FSHelperPtr pFS = -- openOutputStreamWithSerializer( US( "ppt/notesMasters/notesMaster1.xml" ), -- US( "application/vnd.openxmlformats-officedocument.presentationml.notesMaster+xml" ) ); -+ openFragmentStreamWithSerializer( US( "ppt/notesMasters/notesMaster1.xml" ), -+ US( "application/vnd.openxmlformats-officedocument.presentationml.notesMaster+xml" ) ); - // write theme per master - WriteTheme( mnMasterPages ); - -@@ -1943,11 +1942,6 @@ sal_Bool PowerPointExport::ImplCreateMainNotes() - - //------------------------------------------------------------------------------------------------------------------------------------------------------------------ - --drawingml::chart::ChartConverter& PowerPointExport::getChartConverter() --{ -- return *mxChartConv; --} -- - #define IMPL_NAME "com.sun.star.comp.Impress.oox.PowerPointExport" - - OUString SAL_CALL PowerPointExport_getImplementationName() throw() -diff --git sd/source/filter/pptx/pptx-pptexanimations.cxx sd/source/filter/pptx/pptx-pptexanimations.cxx -index 3d4e90d..1f0ef5d 100644 ---- sd/source/filter/pptx/pptx-pptexanimations.cxx -+++ sd/source/filter/pptx/pptx-pptexanimations.cxx -@@ -1035,7 +1035,7 @@ sal_Int16 AnimationExporter::exportAnimPropertySet( SvStream& rStrm, const Refer - exportAnimPropertyuInt32( rStrm, DFF_ANIM_NODE_TYPE, nPPTNodeType, TRANSLATE_NONE ); - } - } -- sal_uInt32 nPresetId; -+ sal_uInt32 nPresetId = 0; - sal_uInt32 nPresetSubType = 0; - sal_uInt32 nAPIPresetClass = EffectPresetClass::CUSTOM; - sal_uInt32 nPresetClass = DFF_ANIM_PRESS_CLASS_USER_DEFINED; --- -1.7.0.1 - commit 5d2d51330deb5c5005fad74e97a895759b7a31fe Author: Bjoern Michaelsen <bjoern.michael...@canonical.com> Date: Tue Nov 15 19:31:47 2011 +0100 addrbk-datasrc-ordering.diff migrated to master diff --git a/patches/dev300/addrbk-datasrc-ordering.diff b/patches/dev300/addrbk-datasrc-ordering.diff deleted file mode 100644 index fa895d9..0000000 --- a/patches/dev300/addrbk-datasrc-ordering.diff +++ /dev/null @@ -1,34 +0,0 @@ ---- - dbaccess/source/ui/browser/dbtreeview.cxx | 2 +- - sw/source/ui/dbui/dbtree.cxx | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git dbaccess/source/ui/browser/dbtreeview.cxx dbaccess/source/ui/browser/dbtreeview.cxx -index e3c95e5..920e96c 100644 ---- dbaccess/source/ui/browser/dbtreeview.cxx -+++ dbaccess/source/ui/browser/dbtreeview.cxx -@@ -60,7 +60,7 @@ DBTreeView::DBTreeView( Window* pParent, const Reference< XMultiServiceFactory > - { - DBG_CTOR(DBTreeView,NULL); - -- m_pTreeListBox = new DBTreeListBox(this, _rxORB ,WB_HASLINES | WB_SORT | WB_HASBUTTONS | WB_HSCROLL |WB_HASBUTTONSATROOT,sal_True); -+ m_pTreeListBox = new DBTreeListBox(this, _rxORB ,WB_BORDER | WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONS | WB_HSCROLL |WB_HASBUTTONSATROOT); - m_pTreeListBox->EnableCheckButton(NULL); - m_pTreeListBox->SetDragDropMode( 0 ); - m_pTreeListBox->EnableInplaceEditing( sal_True ); -diff --git sw/source/ui/dbui/dbtree.cxx sw/source/ui/dbui/dbtree.cxx -index 4b31760..37bd962 100644 ---- sw/source/ui/dbui/dbtree.cxx -+++ sw/source/ui/dbui/dbtree.cxx -@@ -260,7 +260,7 @@ void SwDBTreeList::InitTreeList() - if(!pImpl->HasContext() && pImpl->GetWrtShell()) - return; - SetSelectionMode(SINGLE_SELECTION); -- SetWindowBits(WB_HASLINES|WB_CLIPCHILDREN|WB_SORT|WB_HASBUTTONS|WB_HASBUTTONSATROOT|WB_HSCROLL); -+ SetWindowBits(WB_HASLINES|WB_CLIPCHILDREN|WB_HASBUTTONS|WB_HASBUTTONSATROOT|WB_HSCROLL); - // Font nicht setzen, damit der Font des Controls uebernommen wird! - SetSpaceBetweenEntries(0); - SetNodeBitmaps( aImageList.GetImage(IMG_COLLAPSE), --- -1.7.0.1 - diff --git a/patches/dev300/apply b/patches/dev300/apply index 84f5b74..7259105 100644 --- a/patches/dev300/apply +++ b/patches/dev300/apply @@ -343,8 +343,6 @@ pyuno-ooodir.diff, i#90701 system-python-uno-path.diff, i#97629 [ Misc ] -# Address data source ordering x#62860 -addrbk-datasrc-ordering.diff, michael # Changed the default option in the Templates and Documents dialog. svtools-default-new-document.diff, rodo _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits