[Libreoffice-commits] .: patches/dev300
Michael Meeks
michael at kemper.freedesktop.org
Tue Mar 29 04:31:37 PDT 2011
patches/dev300/apply | 23 --
patches/dev300/mozilla-firefox.diff | 11 -
patches/dev300/speed-hash-style.diff | 65 -----
patches/dev300/system-stlport5.diff | 338 -------------------------------
patches/dev300/system-stlport51-oox.diff | 190 -----------------
patches/dev300/system-stlport51.diff | 199 ------------------
6 files changed, 826 deletions(-)
New commits:
commit 32411d004ac3e039cae43cfdd222a34ce68c0d8b
Author: Michael Meeks <michael.meeks at novell.com>
Date: Tue Mar 29 12:30:35 2011 +0100
remove many more obsolete patches
diff --git a/patches/dev300/apply b/patches/dev300/apply
index d4a9316..d07b42e 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -620,19 +620,12 @@ open-url-support-iceanimals.diff
# FIXME: is anybody using this feature?
#FIXME src680: separate-helpcontent.diff, jholesov
-# use --hash-style=gnu linking when supported
-speed-hash-style.diff, pmladek
-
# use -Wl,--as-needed, save 1% of relocations
link-as-needed.diff, i#89511, pmladek
[ DebianOnly ]
seamonkey-is-iceape.diff
-[ MandrivaOnly ]
-SectionOwner => gghibo
-# mozilla-firefox.diff
-
[ ArkOnly ]
SectionOwner => brosenk
@@ -1228,14 +1221,6 @@ SectionIssue => i#33654
#hack to get the proper msaccess tabpage
#msaccess-db-create-dialog-fix.diff
-
-#[ STLport5 ]
-#SectionIssue => i#63770
-#
-#system-stlport5.diff, i#79875
-#system-stlport51.diff, i#79876
-
-
[ OOXML ]
win32-installer-register-moox-types.diff
@@ -1279,14 +1264,6 @@ oox-xlsx-import-fix-connector-shape.diff, n#549331, Fong
# clear what to do. --tml
# oox-import-zoom-setting-with-tab-color.diff, n#494603, janneke
-
-#[ OOXSTLport5 ]
-#
-## oox devs, please reconsider operator[] use,
-## see i#80084/cws chart11 ! thank you!
-#system-stlport51-oox.diff
-#system-stlport51-oox-map.diff
-
[ PostgreSQL ]
sdbc-postgresql.diff
sdbc-postgresql-build-lst.diff
diff --git a/patches/dev300/mozilla-firefox.diff b/patches/dev300/mozilla-firefox.diff
deleted file mode 100644
index 4596f6b..0000000
--- a/patches/dev300/mozilla-firefox.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.mozff 2007-01-30 19:59:21.000000000 +0100
-+++ configure.in 2007-02-01 12:43:06.000000000 +0100
-@@ -3615,7 +3615,7 @@
- SYSTEM_MOZILLA=YES
- AC_MSG_CHECKING([which Mozilla flavour to use])
- if test -n "$with_firefox" && test "$with_firefox" != "no"; then
-- MOZ_FLAVOUR=firefox
-+ MOZ_FLAVOUR=mozilla-firefox
- elif test -n "$with_seamonkey" && test "$with_seamonkey" != "no"; then
- MOZ_FLAVOUR=seamonkey
- elif test -n "$with_xulrunner" && test "$with_xulrunner" != "no"; then
diff --git a/patches/dev300/speed-hash-style.diff b/patches/dev300/speed-hash-style.diff
deleted file mode 100644
index aa91a8b..0000000
--- a/patches/dev300/speed-hash-style.diff
+++ /dev/null
@@ -1,65 +0,0 @@
---- configure.in.old 2010-07-29 16:40:48.000000000 +0200
-+++ configure.in 2010-07-29 16:48:44.000000000 +0200
-@@ -1050,6 +1050,10 @@
- mozilla
- ], WITH_SYSTEM_MOZILLA=$withval, WITH_SYSTEM_MOZILLA=no)
-
-+AC_ARG_WITH(linker-hash-style,
-+[ --with-linker-hash-style
-+], WITH_LINKER_HASH_STYLE=$withval, WITH_LINKER_HASH_STYLE=gnu)
-+
- AC_ARG_WITH(stlport,
- AS_HELP_STRING([--with-stlport],
- [The location that STLport is installed in. The STL header files are assumed
-@@ -1628,9 +1631,9 @@ if test "$_os" = "SunOS"; then
- fi
-
- if test "$GCC" = "yes"; then
-- AC_MSG_CHECKING( for --hash-style=both linker support )
-+ AC_MSG_CHECKING( for --hash-style=$WITH_LINKER_HASH_STYLE linker support )
- hash_style_ldflags_save=$LDFLAGS
-- LDFLAGS="$LDFLAGS -Wl,--hash-style=both"
-+ LDFLAGS="$LDFLAGS -Wl,--hash-style=$WITH_LINKER_HASH_STYLE"
- AC_LINK_IFELSE([AC_LANG_PROGRAM([
- #include <stdio.h>
- ],[
-@@ -1644,6 +1647,7 @@ if test "$GCC" = "yes"; then
- LDFLAGS=$hash_style_ldflags_save
- fi
- AC_SUBST(HAVE_LD_HASH_STYLE)
-+AC_SUBST(WITH_LINKER_HASH_STYLE)
-
- dnl ===================================================================
- dnl Test the Compaq compiler for OSF1
---- set_soenv.in.old 2010-07-29 16:35:25.000000000 +0200
-+++ set_soenv.in 2010-07-29 16:48:44.000000000 +0200
-@@ -1776,6 +1776,7 @@ ToFile( "HAVE_GCC_VISIBILITY_FEATURE",
- ToFile( "HAVE_GCC_VISIBILITY_BROKEN",
- "@HAVE_GCC_VISIBILITY_BROKEN@", "e" );
- ToFile( "HAVE_LD_HASH_STYLE","@HAVE_LD_HASH_STYLE@","e" );
-+ToFile( "WITH_LINKER_HASH_STYLE","@WITH_LINKER_HASH_STYLE@","e" );
- ToFile( "HAVE_LD_BSYMBOLIC_FUNCTIONS",
- "@HAVE_LD_BSYMBOLIC_FUNCTIONS@","e" );
- ToFile( "CXX", $CXX, "e" );
---- solenv/inc/unxgcc.mk
-+++ solenv/inc/unxgcc.mk
-@@ -207,7 +207,7 @@ STDSHLCUIMT+=-ljemalloc
- .ENDIF
-
- .IF "$(HAVE_LD_HASH_STYLE)" == "TRUE"
--LINKFLAGS += -Wl,--hash-style=both
-+LINKFLAGS += -Wl,--hash-style=$(WITH_LINKER_HASH_STYLE)
- .ELSE
- LINKFLAGS += -Wl,-zdynsort
- .ENDIF
---- stlport/makefile.mk.old 2010-07-23 17:00:36.000000000 +0200
-+++ stlport/makefile.mk 2010-07-29 16:48:44.000000000 +0200
-@@ -144,7 +144,7 @@ BUILD_FLAGS=-f vc7.mak EXFLAGS="/EHa /Zc
- BUILD_FLAGS+= -j$(MAXPROCESS)
- .ENDIF
- .IF "$(HAVE_LD_HASH_STYLE)" == "TRUE"
--CXX+= -Wl,--hash-style=both
-+CXX+= -Wl,--hash-style=$(WITH_LINKER_HASH_STYLE)
- .ENDIF
-
- .IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)" == "TRUE"
diff --git a/patches/dev300/system-stlport5.diff b/patches/dev300/system-stlport5.diff
deleted file mode 100644
index 09f2b0b..0000000
--- a/patches/dev300/system-stlport5.diff
+++ /dev/null
@@ -1,338 +0,0 @@
---- sal/inc/rtl/allocator.hxx.orig 2006-07-28 13:39:12.000000000 +0200
-+++ sal/inc/rtl/allocator.hxx 2006-07-28 13:40:05.000000000 +0200
-@@ -179,6 +179,7 @@
-
- } /* namespace rtl */
-
-+#if STLPORT_VERSION < 500
- //######################################################
- /** REQUIRED BY STLPort (see stlport '_alloc.h'):
- Hack for compilers that do not support member
-@@ -195,6 +196,6 @@
- return (::rtl::Allocator<U>&)(a);
- }
- }
--
-+#endif /* STLPORT_VERSION < 500 */
- #endif /* INCLUDED_RTL_ALLOCATOR_HXX */
-
---- store/source/storbase.cxx.orig 2006-03-27 21:09:31.000000000 +0200
-+++ store/source/storbase.cxx 2006-03-27 21:10:51.000000000 +0200
-@@ -907,6 +907,7 @@
- return false;
- }
-
-+#if STLPORT_VERSION < 500
- //----------------------------------------------------------------------------
- // see stlport '_alloc.h' comments why old compilers require the hack below.
- //----------------------------------------------------------------------------
-@@ -921,6 +922,7 @@
- }
- }
- #endif /* __STL_MEMBER_TEMPLATE_CLASSES */
-+#endif /* STLPORT_VERSION < 500 */
-
- /*========================================================================
- *
---- configmgr/source/api/confeventhelpers.cxx.orig 2006-03-25 19:17:41.000000000 +0100
-+++ configmgr/source/api/confeventhelpers.cxx 2006-03-25 20:57:50.000000000 +0100
-@@ -105,7 +105,7 @@
- Pathes const& pathes = iter->pathList();
-
- // first clear the Path Map
-- for(Pathes::iterator itPath = pathes.begin(); itPath != pathes.end(); ++itPath)
-+ for(Pathes::const_iterator itPath = pathes.begin(); itPath != pathes.end(); ++itPath)
- {
- typedef PathMap::iterator PMIter;
- typedef std::pair<PMIter, PMIter> PMRange;
---- tools/source/generic/line.cxx.orig 2006-03-25 21:28:09.000000000 +0100
-+++ tools/source/generic/line.cxx 2006-03-25 21:29:28.000000000 +0100
-@@ -61,7 +61,12 @@
-
- double Line::GetLength() const
- {
-+#if STLPORT_VERSION < 500
- return hypot( maStart.X() - maEnd.X(), maStart.Y() - maEnd.Y() );
-+#else
-+// STLport5 hypot does not accept long int's
-+ return hypot( double(maStart.X() - maEnd.X()), double(maStart.Y() - maEnd.Y()) );
-+#endif
- }
-
- // ------------------------------------------------------------------------
---- vcl/source/gdi/jobset.cxx.orig 2006-03-25 21:50:33.000000000 +0100
-+++ vcl/source/gdi/jobset.cxx 2006-03-26 16:04:55.000000000 +0200
-@@ -294,8 +294,13 @@
- (pData1->mnPaperWidth == pData2->mnPaperWidth) &&
- (pData1->mnPaperHeight == pData2->mnPaperHeight) &&
- (pData1->mnDriverDataLen == pData2->mnDriverDataLen) &&
-- (memcmp( pData1->mpDriverData, pData2->mpDriverData, pData1->mnDriverDataLen ) == 0) &&
-- (pData1->maValueMap == pData2->maValueMap)
-+ (memcmp( pData1->mpDriverData, pData2->mpDriverData, pData1->mnDriverDataLen ) == 0)
-+#if STLPORT_VERSION < 500
-+ && (pData1->maValueMap == pData2->maValueMap)
-+#else
-+//FIXME: STLport5 alternative map compare?
-+ && (pData1->maValueMap.size() == pData2->maValueMap.size())
-+#endif
- )
- return TRUE;
-
---- xmloff/source/core/nmspmap.cxx.orig 2006-03-26 12:37:20.000000000 +0200
-+++ xmloff/source/core/nmspmap.cxx 2006-03-26 15:38:07.000000000 +0200
-@@ -103,7 +103,12 @@
-
- int SvXMLNamespaceMap::operator ==( const SvXMLNamespaceMap& rCmp ) const
- {
-+#if STLPORT_VERSION < 500
- return static_cast < int > (aNameHash == rCmp.aNameHash);
-+#else
-+//FIXME: STLport5 alternative map compare?
-+ return static_cast < int > (aNameHash.size() == rCmp.aNameHash.size());
-+#endif
- }
-
- sal_uInt16 SvXMLNamespaceMap::_Add( const OUString& rPrefix, const OUString &rName, sal_uInt16 nKey )
---- xmloff/source/style/xmlnumfe.cxx.orig 2006-03-26 15:54:06.000000000 +0200
-+++ xmloff/source/style/xmlnumfe.cxx 2006-03-26 15:54:33.000000000 +0200
-@@ -172,13 +172,13 @@
-
- sal_Bool SvXMLNumUsedList_Impl::IsUsed( sal_uInt32 nKey ) const
- {
-- SvXMLuInt32Set::iterator aItr = aUsed.find(nKey);
-+ SvXMLuInt32Set::const_iterator aItr = aUsed.find(nKey);
- return (aItr != aUsed.end());
- }
-
- sal_Bool SvXMLNumUsedList_Impl::IsWasUsed( sal_uInt32 nKey ) const
- {
-- SvXMLuInt32Set::iterator aItr = aWasUsed.find(nKey);
-+ SvXMLuInt32Set::const_iterator aItr = aWasUsed.find(nKey);
- return (aItr != aWasUsed.end());
- }
-
---- svx/source/svdraw/svdouno.cxx.orig 2006-03-26 17:21:56.000000000 +0200
-+++ svx/source/svdraw/svdouno.cxx 2006-03-26 17:22:47.000000000 +0200
-@@ -875,7 +875,7 @@
- SdrViewIter aIter( this );
- for ( SdrView* pView = aIter.FirstView(); pView; pView = aIter.NextView() )
- {
-- ::std::set< SdrView* >::const_iterator aPrevPos = aPreviouslyVisible.find( pView );
-+ ::std::set< SdrView* >::iterator aPrevPos = aPreviouslyVisible.find( pView );
- if ( aPreviouslyVisible.end() != aPrevPos )
- { // in pView, we were visible _before_ the layer change, and are
- // visible _after_ the layer change, too
---- sc/source/core/inc/bcaslot.hxx.orig 2006-03-26 18:50:41.000000000 +0200
-+++ sc/source/core/inc/bcaslot.hxx 2006-03-26 19:05:42.000000000 +0200
-@@ -109,7 +109,7 @@
- ScDocument* pDoc;
- ScBroadcastAreaSlotMachine* pBASM;
-
-- ScBroadcastAreas::iterator FindBroadcastArea( const ScRange& rRange ) const;
-+ ScBroadcastAreas::iterator FindBroadcastArea( const ScRange& rRange );
-
- public:
- ScBroadcastAreaSlot( ScDocument* pDoc,
---- sc/source/core/data/bcaslot.cxx.orig 2006-03-26 18:23:16.000000000 +0200
-+++ sc/source/core/data/bcaslot.cxx 2006-03-26 19:04:58.000000000 +0200
-@@ -204,7 +204,7 @@
-
-
- ScBroadcastAreas::iterator ScBroadcastAreaSlot::FindBroadcastArea(
-- const ScRange& rRange ) const
-+ const ScRange& rRange )
- {
- aTmpSeekBroadcastArea.UpdateRange( rRange);
- return aBroadcastAreaTbl.find( &aTmpSeekBroadcastArea);
---- sw/source/core/SwNumberTree/SwNumberTree.cxx.orig 2006-03-28 18:54:36.000000000 +0200
-+++ sw/source/core/SwNumberTree/SwNumberTree.cxx 2006-03-28 19:13:32.000000000 +0200
-@@ -160,7 +160,7 @@
- }
- }
-
--void SwNumberTreeNode::ValidateHierarchical(const SwNumberTreeNode * pNode) const
-+void SwNumberTreeNode::ValidateHierarchical(const SwNumberTreeNode * pNode)
- {
- tSwNumberTreeChildren::iterator aValidateIt =
- GetIterator(pNode);
-@@ -282,7 +282,7 @@
- }
- }
-
--void SwNumberTreeNode::ValidateContinuous(const SwNumberTreeNode * pNode) const
-+void SwNumberTreeNode::ValidateContinuous(const SwNumberTreeNode * pNode)
- {
- tSwNumberTreeChildren::iterator aIt = mItLastValid;
-
-@@ -340,7 +340,7 @@
- SetLastValid(aIt);
- }
-
--void SwNumberTreeNode::Validate(const SwNumberTreeNode * pNode) const
-+void SwNumberTreeNode::Validate(const SwNumberTreeNode * pNode)
- {
- if (! IsValid(pNode))
- {
-@@ -869,7 +869,7 @@
-
- bool SwNumberTreeNode::IsFirst(const SwNumberTreeNode * pNode) const
- {
-- tSwNumberTreeChildren::iterator aIt = mChildren.begin();
-+ tSwNumberTreeChildren::const_iterator aIt = mChildren.begin();
-
- if ((*aIt)->IsPhantom())
- aIt++;
-@@ -1020,7 +1020,7 @@
- #endif // __SW_NUMBER_TREE_SANITY_CHECK
-
- SwNumberTreeNode::tSwNumberTreeChildren::iterator
--SwNumberTreeNode::GetIterator(const SwNumberTreeNode * pChild) const
-+SwNumberTreeNode::GetIterator(const SwNumberTreeNode * pChild)
- {
- SwNumberTreeNode * pRoot = GetRoot();
-
-@@ -1136,7 +1136,7 @@
- return ! SwNumberTreeNodeLessThan(pA, pB);
- }
-
--SwNumberTreeNode * SwNumberTreeNode::GetLastDescendant() const
-+SwNumberTreeNode * SwNumberTreeNode::GetLastDescendant()
- {
- SwNumberTreeNode * pResult = NULL;
- tSwNumberTreeChildren::reverse_iterator aIt = mChildren.rbegin();
-@@ -1184,7 +1184,7 @@
-
- void SwNumberTreeNode::SetLastValid
- ( SwNumberTreeNode::tSwNumberTreeChildren::iterator aItValid,
-- bool bValidating ) const
-+ bool bValidating )
- {
- if (! (aItValid == mChildren.end() ||
- GetIterator(*aItValid) != mChildren.end()))
-@@ -1249,7 +1249,7 @@
- }
- }
-
--void SwNumberTreeNode::InvalidateTree() const
-+void SwNumberTreeNode::InvalidateTree()
- {
- // do not call SetInvalid, would cause loop !!!
- mItLastValid = mChildren.end();
---- sw/inc/SwNumberTree.hxx.orig 2006-03-28 18:54:48.000000000 +0200
-+++ sw/inc/SwNumberTree.hxx 2006-03-28 19:13:44.000000000 +0200
-@@ -196,7 +196,7 @@
-
- @attention All invalid children preceding pNode are validated, too.
- */
-- void Validate(const SwNumberTreeNode * pNode) const;
-+ void Validate(const SwNumberTreeNode * pNode);
-
- /**
- Validates a child using hierarchical numbering.
-@@ -205,7 +205,7 @@
-
- @attention All invalid children preceding pNode are validated, too.
- */
-- void ValidateHierarchical(const SwNumberTreeNode * pNode) const;
-+ void ValidateHierarchical(const SwNumberTreeNode * pNode);
-
- /**
- Validates a child using continuous numbering.
-@@ -214,7 +214,7 @@
-
- @attention All invalid children preceding pNode are validated, too.
- */
-- void ValidateContinuous(const SwNumberTreeNode * pNode) const;
-+ void ValidateContinuous(const SwNumberTreeNode * pNode);
-
- /**
- HB, OD : return node, if it isn't a phantom, otherwise return first
-@@ -230,7 +230,7 @@
-
- @return last descendant of the node
- */
-- SwNumberTreeNode * GetLastDescendant() const;
-+ SwNumberTreeNode * GetLastDescendant();
-
- /**
- Returns the greatest descendant of the root that is smaller than
-@@ -250,7 +250,7 @@
- the current last valid node
- */
- void SetLastValid(tSwNumberTreeChildren::iterator aItLastValid,
-- bool bValidating = false) const;
-+ bool bValidating = false);
-
- /**
- Set this node as last valid child of its parent.
-@@ -266,7 +266,7 @@
- of childs are set to the end of this list, thereby stating all
- children in the list are invalid.
- */
-- void InvalidateTree() const;
-+ void InvalidateTree();
-
- /**
- Notifies the node.
-@@ -368,7 +368,7 @@
- #endif // __SW_NUMBER_TREE_SANITY_CHECK
-
- tSwNumberTreeChildren::iterator
-- GetIterator(const SwNumberTreeNode * pChild) const;
-+ GetIterator(const SwNumberTreeNode * pChild);
-
- // --> OD 2006-04-26 #i64010# - made pure virtual
- virtual bool HasCountedChildren() const = 0;
---- sw/source/core/SwNumberTree/SwNodeNum.cxx.orig 2006-05-13 20:32:14.000000000 +0200
-+++ sw/source/core/SwNumberTree/SwNodeNum.cxx 2006-05-13 20:30:38.000000000 +0200
-@@ -167,7 +167,7 @@
- {
- bool bResult = false;
-
-- tSwNumberTreeChildren::iterator aIt;
-+ tSwNumberTreeChildren::const_iterator aIt;
-
- for (aIt = mChildren.begin(); aIt != mChildren.end(); aIt++)
- {
---- sw/source/core/layout/paintfrm.cxx.orig 2007-05-04 20:25:34.000000000 +0200
-+++ sw/source/core/layout/paintfrm.cxx 2007-05-04 20:28:38.000000000 +0200
-@@ -2372,7 +2372,7 @@
- break;
-
- const SwLineEntrySet& rEntrySet = (*aIter).second;
-- SwLineEntrySetIter aSetIter = rEntrySet.begin();
-+ SwLineEntrySetConstIter aSetIter = rEntrySet.begin();
- while ( aSetIter != rEntrySet.end() )
- {
- const SwLineEntry& rEntry = *aSetIter;
---- sw/source/core/unocore/unochart.cxx.orig 2007-06-26 22:55:22.000000000 +0200
-+++ sw/source/core/unocore/unochart.cxx 2007-06-26 22:57:42.000000000 +0200
-@@ -1515,7 +1515,7 @@
- pTable->GetFrmFmt()->GetDoc()->GetChartControllerHelper().StartOrContinueLocking();
-
- const Set_DataSequenceRef_t &rSet = aDataSequences[ pTable ];
-- Set_DataSequenceRef_t::iterator aIt( rSet.begin() );
-+ Set_DataSequenceRef_t::const_iterator aIt( rSet.begin() );
- while (aIt != rSet.end())
- {
- uno::Reference< util::XModifiable > xRef( uno::Reference< chart2::data::XDataSequence >(*aIt), uno::UNO_QUERY );
-@@ -1589,8 +1589,8 @@
- pTable->GetFrmFmt()->GetDoc()->GetChartControllerHelper().StartOrContinueLocking();
-
- const Set_DataSequenceRef_t &rSet = aDataSequences[ pTable ];
-- Set_DataSequenceRef_t::iterator aIt( rSet.begin() );
-- Set_DataSequenceRef_t::iterator aEndIt( rSet.end() );
-+ Set_DataSequenceRef_t::const_iterator aIt( rSet.begin() );
-+ Set_DataSequenceRef_t::const_iterator aEndIt( rSet.end() );
- while (aIt != aEndIt)
- {
- uno::Reference< lang::XComponent > xRef( uno::Reference< chart2::data::XDataSequence >(*aIt), uno::UNO_QUERY );
-@@ -1657,7 +1657,7 @@
-
- // iterate over all data-sequences for the table
- const Set_DataSequenceRef_t &rSet = aDataSequences[ &rTable ];
-- Set_DataSequenceRef_t::iterator aIt( rSet.begin() );
-+ Set_DataSequenceRef_t::const_iterator aIt( rSet.begin() );
- while (aIt != rSet.end())
- {
- uno::Reference< chart2::data::XTextualDataSequence > xRef( uno::Reference< chart2::data::XDataSequence >(*aIt), uno::UNO_QUERY );
diff --git a/patches/dev300/system-stlport51-oox.diff b/patches/dev300/system-stlport51-oox.diff
deleted file mode 100644
index 365f025..0000000
--- a/patches/dev300/system-stlport51-oox.diff
+++ /dev/null
@@ -1,190 +0,0 @@
---- oox/inc/oox/drawingml/clrscheme.hxx.orig 2007-07-16 17:18:26.000000000 +0200
-+++ oox/inc/oox/drawingml/clrscheme.hxx 2007-07-16 17:18:36.000000000 +0200
-@@ -36,9 +36,9 @@
- #ifndef OOX_DRAWINGML_CLRSCHEME_HXX
- #define OOX_DRAWINGML_CLRSCHEME_HXX
-
--#include <boost/shared_ptr.hpp>
- #include <map>
- #include <vector>
-+#include <boost/shared_ptr.hpp>
- #include "oox/core/namespaces.hxx"
-
- namespace oox { namespace drawingml {
---- oox/inc/oox/xls/globaldatahelper.hxx.orig 2007-07-16 17:46:11.000000000 +0200
-+++ oox/inc/oox/xls/globaldatahelper.hxx 2007-07-16 17:46:16.000000000 +0200
-@@ -36,10 +36,10 @@
- #ifndef OOX_XLS_GLOBALDATAHELPER_HXX
- #define OOX_XLS_GLOBALDATAHELPER_HXX
-
--#include <boost/shared_ptr.hpp>
- #include "oox/core/xmlfilterbase.hxx"
- #include "oox/core/binaryfilterbase.hxx"
- #include "oox/xls/biffhelper.hxx"
-+#include <boost/shared_ptr.hpp>
-
- namespace com { namespace sun { namespace star {
- namespace awt { class XDevice; }
---- oox/source/ppt/timenode.cxx.orig 2007-07-16 18:45:09.000000000 +0200
-+++ oox/source/ppt/timenode.cxx 2007-07-16 18:45:28.000000000 +0200
-@@ -34,8 +34,6 @@
- ************************************************************************/
-
-
--#include <boost/bind.hpp>
--
- #include <comphelper/processfactory.hxx>
-
- #include <com/sun/star/beans/XPropertySet.hpp>
-@@ -54,6 +52,7 @@
- #include "oox/core/wrappedpropertyset.hxx"
- #include "oox/ppt/timenode.hxx"
-
-+#include <boost/bind.hpp>
-
- using ::rtl::OUString;
- using namespace ::oox::core;
---- writerfilter/source/odiapi/props/PropertiesImpl.cxx.orig 2007-07-16 19:09:09.000000000 +0200
-+++ writerfilter/source/odiapi/props/PropertiesImpl.cxx 2007-07-16 19:10:48.000000000 +0200
-@@ -37,7 +37,6 @@
-
- #include "PropertiesImpl.hxx"
- #include <odiapi/props/Logger.hxx>
--#include <boost/assert.hpp>
- #include <stdlib.h>
- #include <stdio.h>
- #include <stdexcept>
-@@ -45,6 +44,7 @@
- #include <memory>
- #include <algorithm>
- #include <errno.h>
-+#include <boost/assert.hpp>
-
- using namespace boost;
- using namespace std;
---- writerfilter/source/doctok/WW8ResourceModelImpl.hxx.orig 2007-07-16 19:23:53.000000000 +0200
-+++ writerfilter/source/doctok/WW8ResourceModelImpl.hxx 2007-07-16 19:24:01.000000000 +0200
-@@ -36,6 +36,7 @@
- #ifndef INCLUDED_WW8_RESOURCE_MODEL_IMPL_HXX
- #define INCLUDED_WW8_RESOURCE_MODEL_IMPL_HXX
-
-+#include <map>
- #ifndef INCLUDED_WW8_DOCUMENT_HXX
- #include <doctok/WW8Document.hxx>
- #endif
-@@ -53,7 +54,6 @@
- #endif
-
- #include <odiapi/qname/QName.hxx>
--#include <map>
-
- namespace doctok
- {
---- writerfilter/inc/doctok/WW8Document.hxx.orig 2007-07-16 19:27:48.000000000 +0200
-+++ writerfilter/inc/doctok/WW8Document.hxx 2007-07-16 19:28:00.000000000 +0200
-@@ -36,7 +36,6 @@
- #ifndef INCLUDED_WW8_DOCUMENT_HXX
- #define INCLUDED_WW8_DOCUMENT_HXX
-
--#include <boost/shared_ptr.hpp>
- #ifndef _SAL_TYPES_H_
- #include <sal/types.h>
- #endif // _SAL_TYPES_H_
-@@ -62,6 +61,7 @@
- #endif
-
- #include <WriterFilterDllApi.hxx>
-+#include <boost/shared_ptr.hpp>
-
- namespace doctok {
-
---- writerfilter/source/doctok/WW8StructBase.hxx.orig 2007-07-16 19:24:53.000000000 +0200
-+++ writerfilter/source/doctok/WW8StructBase.hxx 2007-07-16 19:30:49.000000000 +0200
-@@ -36,8 +36,6 @@
- #ifndef INCLUDED_WW8_STRUCT_BASE_HXX
- #define INCLUDED_WW8_STRUCT_BASE_HXX
-
--#include <boost/shared_ptr.hpp>
--
- #ifndef INCLUDED_WW8_DOCUMENT_HXX
- #include <doctok/WW8Document.hxx>
- #endif
-@@ -46,6 +44,8 @@
- #include <OutputWithDepth.hxx>
- #endif
-
-+#include <boost/shared_ptr.hpp>
-+
- namespace doctok {
-
- class WW8DocumentImpl;
---- oox/inc/oox/drawingml/theme.hxx.orig 2007-07-20 11:13:07.000000000 +0200
-+++ oox/inc/oox/drawingml/theme.hxx 2007-07-20 11:13:24.000000000 +0200
-@@ -36,10 +36,10 @@
- #ifndef OOX_DRAWINGML_THEME_HXX
- #define OOX_DRAWINGML_THEME_HXX
-
--#include <boost/shared_ptr.hpp>
- #include "oox/core/propertymap.hxx"
- #include <oox/drawingml/clrscheme.hxx>
- #include <map>
-+#include <boost/shared_ptr.hpp>
-
- namespace oox { namespace drawingml {
-
---- oox/inc/oox/ppt/timenode.hxx.orig 2007-09-07 21:29:34.000000000 +0200
-+++ oox/inc/oox/ppt/timenode.hxx 2007-09-07 21:29:43.000000000 +0200
-@@ -37,9 +37,9 @@
- #ifndef OOX_DRAWINGML_TIMENODE_HXX
- #define OOX_DRAWINGML_TIMENODE_HXX
-
--#include <boost/shared_ptr.hpp>
- #include <vector>
- #include <list>
-+#include <boost/shared_ptr.hpp>
- #include <rtl/ustring.hxx>
-
- #include <com/sun/star/frame/XModel.hpp>
---- oox/source/ppt/slidepersist.cxx.orig 2007-09-07 21:30:22.000000000 +0200
-+++ oox/source/ppt/slidepersist.cxx 2007-09-07 21:30:29.000000000 +0200
-@@ -33,12 +33,12 @@
- *
- ************************************************************************/
-
--#include <boost/bind.hpp>
- #include "oox/ppt/timenode.hxx"
- #include "oox/ppt/pptshape.hxx"
- #include "oox/ppt/slidepersist.hxx"
- #include "oox/core/namespaces.hxx"
- #include "tokens.hxx"
-+#include <boost/bind.hpp>
-
- #include <com/sun/star/style/XStyle.hpp>
- #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
---- oox/inc/oox/vml/drawing.hxx.orig 2007-09-07 21:34:34.000000000 +0200
-+++ oox/inc/oox/vml/drawing.hxx 2007-09-07 21:34:39.000000000 +0200
-@@ -36,10 +36,10 @@
- #ifndef OOX_VML_DRAWING_HXX
- #define OOX_VML_DRAWING_HXX
-
-+#include <vector>
- #include <boost/shared_ptr.hpp>
- #include "oox/core/propertymap.hxx"
- #include "oox/vml/shape.hxx"
--#include <vector>
-
- namespace oox { namespace vml {
-
---- oox/inc/oox/vml/shape.hxx.orig 2007-09-07 21:37:00.000000000 +0200
-+++ oox/inc/oox/vml/shape.hxx 2007-09-07 21:38:52.000000000 +0200
-@@ -36,9 +36,9 @@
- #ifndef OOX_VML_SHAPE_HXX
- #define OOX_VML_SHAPE_HXX
-
-+#include <map>
- #include <boost/shared_ptr.hpp>
- #include "oox/core/propertymap.hxx"
--#include <map>
-
- namespace oox { namespace vml {
-
diff --git a/patches/dev300/system-stlport51.diff b/patches/dev300/system-stlport51.diff
deleted file mode 100644
index 65b81b4..0000000
--- a/patches/dev300/system-stlport51.diff
+++ /dev/null
@@ -1,199 +0,0 @@
---- canvas/source/tools/page.cxx.orig 2006-12-27 11:59:14.000000000 +0100
-+++ canvas/source/tools/page.cxx 2006-12-27 11:59:03.000000000 +0100
-@@ -36,8 +36,8 @@
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_canvas.hxx"
-
--#include <boost/bind.hpp>
- #include "page.hxx"
-+#include <boost/bind.hpp>
-
- namespace canvas
- {
---- canvas/source/tools/pagemanager.cxx.orig 2006-12-27 12:01:26.000000000 +0100
-+++ canvas/source/tools/pagemanager.cxx 2006-12-27 12:01:36.000000000 +0100
-@@ -36,8 +36,8 @@
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_canvas.hxx"
-
--#include <boost/bind.hpp>
- #include "pagemanager.hxx"
-+#include <boost/bind.hpp>
-
- namespace canvas
- {
---- canvas/source/tools/surfaceproxy.cxx.orig 2006-12-27 12:02:58.000000000 +0100
-+++ canvas/source/tools/surfaceproxy.cxx 2006-12-27 12:03:13.000000000 +0100
-@@ -36,11 +36,11 @@
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_canvas.hxx"
-
--#include <boost/bind.hpp>
- #include <basegfx/polygon/b2dpolygoncutandtouch.hxx>
- #include <basegfx/polygon/b2dpolygontriangulator.hxx>
- #include <basegfx/polygon/b2dpolypolygontools.hxx>
- #include "surfaceproxy.hxx"
-+#include <boost/bind.hpp>
-
- namespace canvas
- {
---- sc/inc/postit.hxx.orig 2006-12-28 01:31:34.000000000 +0100
-+++ sc/inc/postit.hxx 2006-12-28 01:31:44.000000000 +0100
-@@ -38,8 +38,6 @@
- #ifndef SC_POSTIT_HXX
- #define SC_POSTIT_HXX
-
--#include <boost/shared_ptr.hpp>
--
- #include <svtools/pathoptions.hxx>
- #include <svtools/useroptions.hxx>
-
-@@ -71,6 +69,8 @@
- #include <com/sun/star/drawing/XShape.hpp>
- #endif
-
-+#include <boost/shared_ptr.hpp>
-+
- // indicative text length for a note object
- #define SC_NOTE_SMALLTEXT 100
-
---- sc/source/filter/html/htmlpars.cxx.orig 2006-12-28 01:49:56.000000000 +0100
-+++ sc/source/filter/html/htmlpars.cxx 2006-12-28 01:50:04.000000000 +0100
-@@ -36,8 +36,6 @@
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_sc.hxx"
-
--#include <boost/shared_ptr.hpp>
--
- #define SC_HTMLPARS_CXX
- #include "scitems.hxx"
- #include <svx/eeitem.hxx>
-@@ -85,6 +83,8 @@
- #include "document.hxx"
- #include "rangelst.hxx"
-
-+#include <boost/shared_ptr.hpp>
-+
-
- SV_IMPL_VARARR_SORT( ScHTMLColOffset, ULONG );
-
---- sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx.orig 2006-12-28 12:50:04.000000000 +0100
-+++ sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx 2006-12-28 13:03:30.000000000 +0100
-@@ -36,6 +36,7 @@
- #ifndef SD_SLIDESORTER_SLIDE_SORTER_CONTROLLER_HXX
- #define SD_SLIDESORTER_SLIDE_SORTER_CONTROLLER_HXX
-
-+#include <memory>
- #include "model/SlsSharedPageDescriptor.hxx"
- #include "ViewShell.hxx"
-
-@@ -51,7 +52,6 @@
- #ifndef _SV_GEN_HXX
- #include <tools/gen.hxx>
- #endif
--#include <memory>
- #include <comphelper/implementationreference.hxx>
-
- class TabBar;
---- sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx.orig 2006-12-28 13:07:29.000000000 +0100
-+++ sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx 2006-12-28 13:07:38.000000000 +0100
-@@ -35,13 +35,13 @@
- #ifndef SD_SLIDESORTER_FOCUS_MANAGER_HXX
- #define SD_SLIDESORTER_FOCUS_MANAGER_HXX
-
-+#include <vector>
- #include <model/SlsSharedPageDescriptor.hxx>
-
- #include <sal/types.h>
- #ifndef _LINK_HXX
- #include <tools/link.hxx>
- #endif
--#include <vector>
-
- namespace sd { namespace slidesorter { namespace controller {
-
---- sd/source/ui/slidesorter/controller/SlsPageObjectFactory.cxx.orig 2006-12-28 13:11:40.000000000 +0100
-+++ sd/source/ui/slidesorter/controller/SlsPageObjectFactory.cxx 2006-12-28 13:11:46.000000000 +0100
-@@ -36,12 +36,12 @@
- // MARKER(update_precomp.py): autogen include statement, do not remove
- #include "precompiled_sd.hxx"
-
--#include "controller/SlsPageObjectFactory.hxx"
--
- #include "view/SlsPageObject.hxx"
- #include "view/SlsPageObjectViewContact.hxx"
- #include "view/SlsPageObjectViewObjectContact.hxx"
-
-+#include "controller/SlsPageObjectFactory.hxx"
-+
- #include "sdpage.hxx"
-
-
---- sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx.orig 2006-12-28 13:14:01.000000000 +0100
-+++ sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx 2006-12-28 13:14:08.000000000 +0100
-@@ -35,11 +35,11 @@
- #ifndef SD_SLIDESORTER_PAGE_SELECTOR_HXX
- #define SD_SLIDESORTER_PAGE_SELECTOR_HXX
-
--#include "model/SlsSharedPageDescriptor.hxx"
--
- #include <set>
- #include <memory>
-
-+#include "model/SlsSharedPageDescriptor.hxx"
-+
- class SdPage;
-
- namespace sd { namespace slidesorter { namespace model {
---- sd/source/ui/slidesorter/inc/view/SlsViewOverlay.hxx.orig 2006-12-28 13:21:53.000000000 +0100
-+++ sd/source/ui/slidesorter/inc/view/SlsViewOverlay.hxx 2006-12-28 13:22:02.000000000 +0100
-@@ -36,11 +36,11 @@
- #ifndef SD_SLIDESORTER_VIEW_OVERLAY_HXX
- #define SD_SLIDESORTER_VIEW_OVERLAY_HXX
-
-+#include <vector>
- #include "model/SlsSharedPageDescriptor.hxx"
-
- #include <osl/mutex.hxx>
- #include <tools/gen.hxx>
--#include <vector>
- #include <boost/weak_ptr.hpp>
-
- class OutputDevice;
---- extensions/source/update/check/updatehdl.hxx.orig 2007-07-15 13:38:04.000000000 +0200
-+++ extensions/source/update/check/updatehdl.hxx 2007-07-15 13:38:15.000000000 +0200
-@@ -36,8 +36,6 @@
- #ifndef INCLUDED_UPDATE_HDL_HXX
- #define INCLUDED_UPDATE_HDL_HXX
-
--#include "boost/utility.hpp"
--
- #ifndef _OSL_MUTEX_HXX_
- #include <osl/mutex.hxx>
- #endif
-@@ -85,6 +83,7 @@
- #endif
-
- #include "actionlistener.hxx"
-+#include "boost/utility.hpp"
-
- enum DialogControls
- {
---- chart2/source/view/main/ChartView.hxx.orig 2007-06-27 15:20:31.000000000 +0200
-+++ chart2/source/view/main/ChartView.hxx 2007-06-27 15:20:46.000000000 +0200
-@@ -35,6 +35,7 @@
- #ifndef _CHARTVIEWIMPL_HXX
- #define _CHARTVIEWIMPL_HXX
-
-+#include <vector>
- #include "chartview/ExplicitValueProvider.hxx"
- #include "ServiceMacros.hxx"
-
-@@ -82,7 +83,6 @@
- #include <com/sun/star/util/XUpdatable.hpp>
- #endif
-
--#include <vector>
- #include <boost/shared_ptr.hpp>
-
- class SdrPage;
More information about the Libreoffice-commits
mailing list