[Libreoffice-commits] .: 4 commits - patches/dev300
Thorsten Behrens
thorsten at kemper.freedesktop.org
Fri Apr 29 09:59:23 PDT 2011
patches/dev300/apply | 15 ---
patches/dev300/cws-kohei03-sc-macfix.diff | 64 ---------------
patches/dev300/normalize-template-paths-fix.diff | 96 -----------------------
patches/dev300/sd-custom-show-fix.diff | 22 -----
patches/dev300/sfx2-global-scope-fix.diff | 28 ------
patches/dev300/svx-debug-sdrolestreams.diff | 30 -------
6 files changed, 255 deletions(-)
New commits:
commit fd1b9a83cfd0a2ad79e6b8a70a4c4d9dede8363d
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Fri Apr 29 18:08:37 2011 +0200
Applied normalize-template-paths-fix to master
diff --git a/patches/dev300/apply b/patches/dev300/apply
index a501108..98873d5 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1450,9 +1450,6 @@ ubuntu-arm-thumb.diff, doko
# Fix for crash on Windows by Rail Aliev. Root cause unknown.
svx-fix-fit-to-frame-crash.diff, n#508621, rodo
-# expand path placeholders early in template dialog
-normalize-template-paths-fix.diff, n#512146, thorsten
-
[ Experimental ]
experimental_ooapi.diff, flr
diff --git a/patches/dev300/normalize-template-paths-fix.diff b/patches/dev300/normalize-template-paths-fix.diff
deleted file mode 100644
index 049ebc2..0000000
--- a/patches/dev300/normalize-template-paths-fix.diff
+++ /dev/null
@@ -1,96 +0,0 @@
----
- .../officeinstallationdirectories.cxx | 12 +++---
- sfx2/source/doc/doctemplates.cxx | 35 ++++++++++++++++++++
- 2 files changed, 41 insertions(+), 6 deletions(-)
-
-diff --git comphelper/source/officeinstdir/officeinstallationdirectories.cxx comphelper/source/officeinstdir/officeinstallationdirectories.cxx
-index bd61880..d9ef725 100644
---- comphelper/source/officeinstdir/officeinstallationdirectories.cxx
-+++ comphelper/source/officeinstdir/officeinstallationdirectories.cxx
-@@ -159,9 +159,9 @@ OfficeInstallationDirectories::makeRelocatableURL( const rtl::OUString& URL )
- if ( nIndex != -1 )
- {
- return rtl::OUString(
-- URL.replaceAt( nIndex,
-- m_pOfficeDir->getLength(),
-- m_aOfficeDirMacro ) );
-+ aCanonicalURL.replaceAt( nIndex,
-+ m_pOfficeDir->getLength(),
-+ m_aOfficeDirMacro ) );
- }
- else
- {
-@@ -169,9 +169,9 @@ OfficeInstallationDirectories::makeRelocatableURL( const rtl::OUString& URL )
- if ( nIndex != -1 )
- {
- return rtl::OUString(
-- URL.replaceAt( nIndex,
-- m_pUserDir->getLength(),
-- m_aUserDirMacro ) );
-+ aCanonicalURL.replaceAt( nIndex,
-+ m_pUserDir->getLength(),
-+ m_aUserDirMacro ) );
- }
- }
- }
-diff --git sfx2/source/doc/doctemplates.cxx sfx2/source/doc/doctemplates.cxx
-index f33d3dd..b6950e6 100644
---- sfx2/source/doc/doctemplates.cxx
-+++ sfx2/source/doc/doctemplates.cxx
-@@ -48,6 +48,7 @@
- #include <com/sun/star/beans/XPropertySetInfo.hpp>
- #include <com/sun/star/beans/XPropertyContainer.hpp>
- #include <com/sun/star/beans/StringPair.hpp>
-+#include <com/sun/star/util/XMacroExpander.hpp>
- #include <com/sun/star/container/XContainerQuery.hpp>
- #include <com/sun/star/document/XTypeDetection.hpp>
- #include <com/sun/star/document/XStandaloneDocumentInfo.hpp>
-@@ -599,11 +600,45 @@ void SfxDocTplService_Impl::getDirList()
-
- maTemplateDirs = Sequence< OUString >( nCount );
-
-+ uno::Reference< XComponentContext > xCtx;
-+ uno::Reference< util::XMacroExpander > xExpander;
-+ uno::Reference< XPropertySet > xPropSet( mxFactory, UNO_QUERY );
-+ const rtl::OUString aPrefix(
-+ RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.expand:" ) );
-+
-+ if ( xPropSet.is() )
-+ {
-+ xPropSet->getPropertyValue(
-+ rtl::OUString(
-+ RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ) ) )
-+ >>= xCtx;
-+ }
-+
-+ if ( xCtx.is() )
-+ {
-+ xCtx->getValueByName(
-+ rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
-+ "/singletons/com.sun.star.util.theMacroExpander" ) ) )
-+ >>= xExpander;
-+
-+ OSL_ENSURE( xExpander.is(),
-+ "Unable to obtain macro expander singleton!" );
-+ }
-+
- for ( USHORT i=0; i<nCount; i++ )
- {
- aURL.SetSmartProtocol( INET_PROT_FILE );
- aURL.SetURL( aDirs.GetToken( i, C_DELIM ) );
- maTemplateDirs[i] = aURL.GetMainURL( INetURLObject::NO_DECODE );
-+
-+ sal_Int32 nIndex = maTemplateDirs[i].indexOf( aPrefix );
-+ if ( nIndex != -1 && xExpander.is() )
-+ {
-+ maTemplateDirs[i] = maTemplateDirs[i].replaceAt(nIndex,
-+ aPrefix.getLength(),
-+ rtl::OUString());
-+ maTemplateDirs[i] = xExpander->expandMacros( maTemplateDirs[i] );
-+ }
- }
-
- aValue <<= maTemplateDirs;
---
-1.7.0.1
-
commit cea818ff431fad13b36e5f08f5c51c6d6e9284ec
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Fri Apr 29 17:33:35 2011 +0200
Applied svx-debug-sdrolestreams to master
diff --git a/patches/dev300/apply b/patches/dev300/apply
index b4628fd..a501108 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1368,9 +1368,6 @@ testing-more-optimizations-ark.diff
# why? If this really is not needed, let's remove totally then. --tml
#sw-import-TOC.diff ,n#404254, Amelia Wang
-# (disabled) debug code extracting SdrOLE streams to some tmp location
-svx-debug-sdrolestreams.diff, thorsten
-
# fix wrong en-US accelerators in Impress
fix-sd-accelerators.diff, n#463733, i#97088, jholesov
diff --git a/patches/dev300/svx-debug-sdrolestreams.diff b/patches/dev300/svx-debug-sdrolestreams.diff
deleted file mode 100644
index d581404..0000000
--- a/patches/dev300/svx-debug-sdrolestreams.diff
+++ /dev/null
@@ -1,30 +0,0 @@
----
- filter/source/msfilter/msdffimp.cxx | 12 ++++++++++++
- 1 files changed, 12 insertions(+), 0 deletions(-)
-
-diff --git filter/source/msfilter/msdffimp.cxx filter/source/msfilter/msdffimp.cxx
-index 7e76d8d..b72b0fc 100644
---- filter/source/msfilter/msdffimp.cxx
-+++ filter/source/msfilter/msdffimp.cxx
-@@ -7692,6 +7692,18 @@ com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > SvxMS
- pFilter = aMatch.GetFilter4EA( aType );
- }
-
-+//#define DBG_EXTRACTOLESTREAMS
-+#ifdef DBG_EXTRACTOLESTREAMS
-+ static sal_Int32 nCount(0);
-+ String aTmpName(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("/tmp/embedded_stream_")));
-+ aTmpName += String::CreateFromInt32(nCount++);
-+ aTmpName += String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(".bin"));
-+ SvFileStream aTmpStream(aTmpName,STREAM_READ|STREAM_WRITE|STREAM_TRUNC);
-+ pStream->Seek(0);
-+ *pStream >> aTmpStream;
-+ aTmpStream.Close();
-+#endif
-+
- if ( pName || pFilter )
- {
- //Reuse current ole name
---
-1.7.0.1
-
commit f68598cad18f92bc7b9eba91072a1d3d9443a89f
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Fri Apr 29 17:26:29 2011 +0200
Removed sd-custom-show-fix, not generally useful
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 5b8f918..b4628fd 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1329,10 +1329,6 @@ svx-hacky-htmlselect-control-import.diff, n#523191, noelpwer
sd-slideshow-slideshowview-transformation-fix.diff, rodo
-# controversial fix - closer to ppt97 behaviour than to 2k7 - need
-# version compat distinction?
-sd-custom-show-fix.diff, n#355638, i#90145, thorsten
-
# temporary fix. does no harm and gets the job done but its not
# beautiful. Since the whole section needs to be refactored anyway decided not
# to waste for time with this fix but to focus on the refactoring
diff --git a/patches/dev300/sd-custom-show-fix.diff b/patches/dev300/sd-custom-show-fix.diff
deleted file mode 100644
index 0f4856f..0000000
--- a/patches/dev300/sd-custom-show-fix.diff
+++ /dev/null
@@ -1,22 +0,0 @@
----
- sd/source/ui/slideshow/slideshowimpl.cxx | 4 +---
- 1 files changed, 1 insertions(+), 3 deletions(-)
-
-diff --git sd/source/ui/slideshow/slideshowimpl.cxx sd/source/ui/slideshow/slideshowimpl.cxx
-index 61c6559..9e987ff 100755
---- sd/source/ui/slideshow/slideshowimpl.cxx
-+++ sd/source/ui/slideshow/slideshowimpl.cxx
-@@ -2693,9 +2693,7 @@ void SlideshowImpl::createSlideList( bool bAll, bool bStartWithActualSlide, cons
- for( pCustomSlide = pCustomShow->First(),nSlideIndex=0; pCustomSlide; pCustomSlide = pCustomShow->Next(), nSlideIndex++ )
- {
- const USHORT nSdSlide = ( ( (SdPage*) pCustomSlide )->GetPageNum() - 1 ) / 2;
--
-- if( !( mpDoc->GetSdPage( nSdSlide, PK_STANDARD ) )->IsExcluded())
-- mpSlideController->insertSlideNumber( nSdSlide );
-+ mpSlideController->insertSlideNumber( nSdSlide );
- }
- }
- }
---
-1.7.0.1
-
commit a587088ce2a50a2bfa4131b85e31f019f3c195db
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Fri Apr 29 17:20:43 2011 +0200
Removed stale sfx2-global-scope-fix and cws-kohei03-sc-macfix
diff --git a/patches/dev300/apply b/patches/dev300/apply
index c0952da..5b8f918 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1193,11 +1193,6 @@ xulrunner-1.9.1.diff, ccheney
# Drop this for now
# novell-win32-msi-patchability.diff, tml
-[ MacOSXOnly ]
-SectionOwner => thorsten
-sfx2-global-scope-fix.diff, thorsten
-cws-kohei03-sc-macfix.diff, thorsten
-
[ PardusOnly ]
pardus-default-ExternalMailer.diff
pardus-clipart.diff
diff --git a/patches/dev300/cws-kohei03-sc-macfix.diff b/patches/dev300/cws-kohei03-sc-macfix.diff
deleted file mode 100644
index ec4a52f..0000000
--- a/patches/dev300/cws-kohei03-sc-macfix.diff
+++ /dev/null
@@ -1,64 +0,0 @@
-diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
-index a664cfd..a734f42 100644
---- sc/inc/column.hxx
-+++ sc/inc/column.hxx
-@@ -36,6 +36,7 @@
- #include "compressedarray.hxx"
- #include "address.hxx"
- #include "rangenam.hxx"
-+#include "dociter.hxx"
- #include <tools/solar.h>
-
- #include <set>
-@@ -118,6 +119,7 @@ friend class ScDocument; // fuer FillInfo
- friend class ScDocumentIterator;
- friend class ScValueIterator;
- friend class ScDBQueryDataIterator;
-+friend class ScDBQueryDataIterator::DataAccessInternal;
- friend class ScColumnIterator;
- friend class ScQueryCellIterator;
- friend class ScMarkedDataIter;
-diff --git a/sc/inc/dociter.hxx b/sc/inc/dociter.hxx
-index 22cc806..60b57a6 100644
---- sc/inc/dociter.hxx
-+++ sc/inc/dociter.hxx
-@@ -161,6 +161,7 @@ private:
- const ScDBQueryDataIterator* mpParent;
- };
-
-+public:
- class DataAccessInternal : public DataAccess
- {
- public:
-@@ -185,6 +186,7 @@ private:
- bool bCalcAsShown;
- };
-
-+private:
- class DataAccessMatrix : public DataAccess
- {
- public:
-diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
-index 4d94701..43642e8 100644
---- sc/inc/document.hxx
-+++ sc/inc/document.hxx
-@@ -239,6 +239,7 @@ class ScDocument
- friend class ScDocumentIterator;
- friend class ScValueIterator;
- friend class ScDBQueryDataIterator;
-+friend class ScDBQueryDataIterator::DataAccessInternal;
- friend class ScCellIterator;
- friend class ScQueryCellIterator;
- friend class ScHorizontalCellIterator;
-diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
-index 9606b98..73bdb6a 100644
---- sc/inc/table.hxx
-+++ sc/inc/table.hxx
-@@ -188,6 +188,7 @@ friend class ScDocument; // fuer FillInfo
- friend class ScDocumentIterator;
- friend class ScValueIterator;
- friend class ScDBQueryDataIterator;
-+friend class ScDBQueryDataIterator::DataAccessInternal;
- friend class ScCellIterator;
- friend class ScQueryCellIterator;
- friend class ScHorizontalCellIterator;
diff --git a/patches/dev300/sfx2-global-scope-fix.diff b/patches/dev300/sfx2-global-scope-fix.diff
deleted file mode 100644
index 9c69c01..0000000
--- a/patches/dev300/sfx2-global-scope-fix.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-Fix SfxTabPage scope - force global namespace
-
-This was a build breaker on macos
----
-
- sfx2/inc/sfx2/tabdlg.hxx | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-
-diff --git sfx2/inc/sfx2/tabdlg.hxx sfx2/inc/sfx2/tabdlg.hxx
-index 64186d6..4976abd 100644
---- sfx2/inc/sfx2/tabdlg.hxx
-+++ sfx2/inc/sfx2/tabdlg.hxx
-@@ -134,12 +134,12 @@ protected:
- virtual SfxItemSet* CreateInputItemSet( USHORT nId );
- // wird *nicht* im Sfx gel"oscht!
- virtual const SfxItemSet* GetRefreshedSet();
-- virtual void PageCreated( USHORT nId, SfxTabPage &rPage );
-+ virtual void PageCreated( USHORT nId, ::SfxTabPage &rPage );
- virtual long Notify( NotifyEvent& rNEvt );
-
- SfxItemSet* pExampleSet;
- SfxItemSet* GetInputSetImpl();
-- SfxTabPage* GetTabPage( USHORT nPageId ) const;
-+ ::SfxTabPage* GetTabPage( USHORT nPageId ) const;
-
- BOOL IsInOK() const;
- /** prepare to leace the current page. Calls the DeactivatePage method of the current page, (if necessary),
More information about the Libreoffice-commits
mailing list