ooo-build r14836 - in branches/ooo-build-3-0-1: . patches/dev300
- From: pmladek svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r14836 - in branches/ooo-build-3-0-1: . patches/dev300
- Date: Fri, 12 Dec 2008 17:34:37 +0000 (UTC)
Author: pmladek
Date: Fri Dec 12 17:34:37 2008
New Revision: 14836
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14836&view=rev
Log:
2008-12-12 Thorsten Behrens <tbehrens novell com>
* patches/dev300/webdav-locking-from-ooo-build-2-4-1.diff:
* patches/dev300/webdav-locking-from-ooo-build-2-4-1-m12.diff:
* patches/dev300/sw-field-patch-m12.diff:
* patches/dev300/sw-field-patch.diff:
* patches/dev300/apply: udpate for ooo300-m13
Added:
branches/ooo-build-3-0-1/patches/dev300/sw-field-patch-m12.diff
- copied unchanged from r14835, /branches/ooo-build-3-0-1/patches/dev300/sw-field-patch.diff
branches/ooo-build-3-0-1/patches/dev300/webdav-locking-from-ooo-build-2-4-1-m12.diff (props changed)
- copied unchanged from r14833, /branches/ooo-build-3-0-1/patches/dev300/webdav-locking-from-ooo-build-2-4-1.diff
Modified:
branches/ooo-build-3-0-1/ChangeLog
branches/ooo-build-3-0-1/NEWS
branches/ooo-build-3-0-1/patches/dev300/apply
branches/ooo-build-3-0-1/patches/dev300/sw-field-patch.diff
branches/ooo-build-3-0-1/patches/dev300/webdav-locking-from-ooo-build-2-4-1.diff
Modified: branches/ooo-build-3-0-1/NEWS
==============================================================================
--- branches/ooo-build-3-0-1/NEWS (original)
+++ branches/ooo-build-3-0-1/NEWS Fri Dec 12 17:34:37 2008
@@ -1,3 +1,9 @@
+ooo-build-3.0.0.99.1:
+
+ +features:
+ + support ooo300-m13 (3.0.1beta) [Rene, Petr]
+ +
+
ooo-build-3.0.0.3.5:
+ bug fixes:
Modified: branches/ooo-build-3-0-1/patches/dev300/apply
==============================================================================
--- branches/ooo-build-3-0-1/patches/dev300/apply (original)
+++ branches/ooo-build-3-0-1/patches/dev300/apply Fri Dec 12 17:34:37 2008
@@ -521,13 +521,25 @@
cws-webdavandgvfslocking1-ucb.diff
cws-webdavandgvfslocking1-unotools.diff
-[ WebDAV ]
+[ WebDAV > ooo300-m12 ]
SectionOwner => jholesov
SectionIssue => i#29152
# WebDAV locking implementation - the original version
# This is forward-ported from ooo-build-2-4-1, because the version for
# up-streaming still does not work as expected :-(
webdav-locking-from-ooo-build-2-4-1.diff
+
+[ WebDAV <= ooo300-m12 ]
+SectionOwner => jholesov
+SectionIssue => i#29152
+# WebDAV locking implementation - the original version
+# This is forward-ported from ooo-build-2-4-1, because the version for
+# up-streaming still does not work as expected :-(
+webdav-locking-from-ooo-build-2-4-1-m12.diff
+
+[ WebDAV ]
+SectionOwner => jholesov
+SectionIssue => i#29152
# fix saving files on Novell teaming via WebDaV
webdav-locking-local-temp-file.diff, bnc#440514, kendy
@@ -2349,12 +2361,17 @@
[ Win32Only ]
mozilla-source-1.7.5.patch.diff, i#84961, tml
+[ TemporaryHacks <= ooo300-m12 ]
+sw-field-patch-m12.diff, flr, n#248354
+
+[ TemporaryHacks > ooo300-m12 ]
+sw-field-patch.diff, flr, n#248354
+
[ TemporaryHacks ]
# First work on field enhancements...
offapi-field-patch.diff, flr, n#248354
svtools-field-patch.diff, flr, n#248354
-sw-field-patch.diff, flr, n#248354
xmloff-field-patch.diff, flr, n#248354
sw-field-patch-fix-competing-protection.diff, flr, n#400884
Modified: branches/ooo-build-3-0-1/patches/dev300/sw-field-patch.diff
==============================================================================
--- branches/ooo-build-3-0-1/patches/dev300/sw-field-patch.diff (original)
+++ branches/ooo-build-3-0-1/patches/dev300/sw-field-patch.diff Fri Dec 12 17:34:37 2008
@@ -1948,13 +1948,11 @@
rWW8Wrt.OutSwString(aSnippet, 0, nLen, bUnicode, eChrSet );
}
-diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
-index 4f1ba07..935d5c6 100644
---- sw/source/filter/ww8/wrtww8.cxx
-+++ sw/source/filter/ww8/wrtww8.cxx
-@@ -103,6 +103,10 @@
- #include <com/sun/star/document/XDocumentProperties.hpp>
+--- sw/source/filter/ww8/wrtww8.cxx.old 2008-11-19 15:36:54.000000000 +0100
++++ sw/source/filter/ww8/wrtww8.cxx 2008-12-12 17:57:56.000000000 +0100
+@@ -117,6 +117,10 @@
+ #include "dbgoutsw.hxx"
+#ifndef IDOCUMENTBOOKMARKACCESS_HXX_INCLUDED
+#include <IDocumentBookmarkAccess.hxx>
@@ -1963,7 +1961,7 @@
using namespace sw::util;
using namespace sw::types;
-@@ -185,7 +189,7 @@ public:
+@@ -199,7 +203,7 @@ public:
WW8_WrtBookmarks();
~WW8_WrtBookmarks();
@@ -1972,7 +1970,7 @@
void Write( SwWW8Writer& rWrt );
void MoveFieldBookmarks(ULONG nFrom,ULONG nTo);
-@@ -1222,7 +1226,7 @@ WW8_WrtBookmarks::~WW8_WrtBookmarks()
+@@ -1236,7 +1240,7 @@ WW8_WrtBookmarks::~WW8_WrtBookmarks()
{
}
@@ -1981,7 +1979,7 @@
{
USHORT nPos = GetPos( rNm );
if( USHRT_MAX == nPos )
-@@ -1254,7 +1258,7 @@ void WW8_WrtBookmarks::Append( WW8_CP nStartCp, const String& rNm )
+@@ -1268,7 +1272,7 @@ void WW8_WrtBookmarks::Append( WW8_CP nS
if (aFieldBookmarks[nPos])
--nStartCp;
@@ -1990,7 +1988,7 @@
}
}
-@@ -1352,6 +1356,9 @@ void SwWW8Writer::AppendBookmarks( const SwTxtNode& rNd,
+@@ -1366,6 +1370,9 @@ void SwWW8Writer::AppendBookmarks( const
for( USHORT n = 0; n < aArr.Count(); ++n )
{
const SwBookmark& rBkmk = *(SwBookmark*)aArr[ n ];
@@ -2000,7 +1998,7 @@
const SwPosition* pPos = &rBkmk.GetBookmarkPos(),
* pOPos = rBkmk.GetOtherBookmarkPos();
if( pOPos && pOPos->nNode == pPos->nNode &&
-@@ -1366,14 +1373,14 @@ void SwWW8Writer::AppendBookmarks( const SwTxtNode& rNd,
+@@ -1380,14 +1387,14 @@ void SwWW8Writer::AppendBookmarks( const
nCntnt < nAktEnd ) )
{
ULONG nCp = nSttCP + pPos->nContent.GetIndex() - nAktPos;
@@ -2018,7 +2016,7 @@
}
}
}
-@@ -1565,6 +1572,17 @@ void SwWW8Writer::WriteString16(SvStream& rStrm, const String& rStr,
+@@ -1579,6 +1586,17 @@ void SwWW8Writer::WriteString16(SvStream
rStrm.Write(&aBytes[0], aBytes.size());
}
@@ -2036,8 +2034,8 @@
void SwWW8Writer::WriteString8(SvStream& rStrm, const String& rStr,
bool bAddZero, rtl_TextEncoding eCodeSet)
{
-@@ -2580,5 +2598,118 @@ void SwWW8Writer::RestoreMacroCmds()
- pFib->lcbCmds = pTableStrm->Tell() - pFib->fcCmds;
+@@ -2882,6 +2900,119 @@ ULONG SwWW8Writer::StoreDoc()
+ return 0;
}
+void SwWW8Writer::WriteFormData(SwFieldBookmark &rFieldmark)
@@ -2154,20 +2152,20 @@
+
+}
- /* vi:set tabstop=4 shiftwidth=4 expandtab: */
-diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
-index a7ca0c1..9d47ee3 100644
---- sw/source/filter/ww8/wrtww8.hxx
-+++ sw/source/filter/ww8/wrtww8.hxx
-@@ -654,6 +654,7 @@ public:
- static void WriteString8(SvStream& rStrm, const String& rStr,
+ void SwWW8Writer::PrepareStorage()
+ {
+--- sw/source/filter/ww8/wrtww8.hxx.old 2008-11-19 15:37:08.000000000 +0100
++++ sw/source/filter/ww8/wrtww8.hxx 2008-12-12 18:04:14.000000000 +0100
+@@ -669,6 +669,8 @@ public:
bool bAddZero, rtl_TextEncoding eCodeSet);
+ static void WriteString_xstz(SvStream& rStrm, const String& rStr, bool bAddZero);
-+ static void WriteString_xstz(SvStream& rStrm, const String& rStr, bool bAddZero);
++// FIXME: this was defined in ooo300-m13 upstream sources???
++// static void WriteString_xstz(SvStream& rStrm, const String& rStr, bool bAddZero);
#if 1
//Prefer ww::bytes to WW8Bytes, migrate away from the other ones.
static void InsUInt16(ww::bytes &rO, sal_uInt16 n);
-@@ -710,6 +711,8 @@ public:
+@@ -725,6 +726,8 @@ public:
void AddLinkTarget(const String& rURL);
void CollectOutlineBookmarks(const SwDoc &rDoc);
void AddBookmark(String sBkmkName);
Modified: branches/ooo-build-3-0-1/patches/dev300/webdav-locking-from-ooo-build-2-4-1.diff
==============================================================================
--- branches/ooo-build-3-0-1/patches/dev300/webdav-locking-from-ooo-build-2-4-1.diff (original)
+++ branches/ooo-build-3-0-1/patches/dev300/webdav-locking-from-ooo-build-2-4-1.diff Fri Dec 12 17:34:37 2008
@@ -2157,11 +2157,11 @@
using namespace webdav_ucp;
@@ -353,7 +352,8 @@ Content::Content(
- m_eResourceType( UNKNOWN ),
m_pProvider( pProvider ),
- m_bTransient( sal_False ),
-- m_bCollection( sal_False )
-+ m_bCollection( sal_False ),
+ m_bTransient( false ),
+ m_bCollection( false ),
+- m_bDidGetOrHead( false )
++ m_bDidGetOrHead( false ),
+ m_bForceReadOnly( sal_False )
{
try
@@ -2207,9 +2207,9 @@
+ }
+ }
+
- const ResourceType & rType = getResourceType( xEnv );
{
osl::Guard< osl::Mutex > aGuard( m_aMutex );
+
@@ -1463,8 +1493,13 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
if ( !bNetworkAccessAllowed )
@@ -2226,7 +2226,7 @@
}
}
}
-@@ -2023,30 +2058,90 @@ uno::Any Content::open(
+@@ -2023,30 +2058,86 @@ uno::Any Content::open(
}
}
@@ -2295,14 +2295,10 @@
+ osl::MutexGuard aGuard( m_aMutex );
+
+ // cache headers.
-+// m_xCachedProps.reset( new ContentProperties( aResource ) );
-+ std::vector< DAVPropertyValue >::const_iterator it = aResource.properties.begin();
-+ std::vector< DAVPropertyValue >::const_iterator end = aResource.properties.end();
-+ while ( it != end )
-+ {
-+ DAVPropertyValue aProp = (*it++);
-+ m_xCachedProps->addProperty( aProp.Name, aProp.Value, true);
-+ }
++ if ( !m_xCachedProps.get())
++ m_xCachedProps.reset( new ContentProperties( aResource ) );
++ else
++ m_xCachedProps->addProperties( aResource );
+
+ m_xResAccess.reset(
+ new DAVResourceAccess( *xResAccess.get() ) );
@@ -2334,7 +2330,7 @@
try
{
std::auto_ptr< DAVResourceAccess > xResAccess;
-@@ -2060,33 +2155,27 @@ uno::Any Content::open(
+@@ -2060,28 +2155,31 @@ uno::Any Content::open(
xResAccess.reset(
new DAVResourceAccess( *m_xResAccess.get() ) );
}
@@ -2352,21 +2348,16 @@
+ // ContentProperties::getMappableHTTPHeaders( aHeaders );
+ uno::Reference< io::XInputStream > xIn
+ = xResAccess->GET( aHeaders, aResource, xEnv )->getInputStream();
-
+ m_bDidGetOrHead = true;
+
{
osl::MutexGuard aGuard( m_aMutex );
// cache headers.
- // m_xCachedProps.reset( new ContentProperties( aResource ) );
-- std::vector< DAVPropertyValue >::const_iterator it = aResource.properties.begin();
-- std::vector< DAVPropertyValue >::const_iterator end = aResource.properties.end();
-- while ( it != end )
-- {
-- DAVPropertyValue aProp = (*it++);
-- m_xCachedProps->addProperty( aProp.Name, aProp.Value, true);
-- }
--
--
+ if ( !m_xCachedProps.get())
+ m_xCachedProps.reset( new ContentProperties( aResource ) );
+ else
+ m_xCachedProps->addProperties( aResource );
m_xResAccess.reset(
new DAVResourceAccess( *xResAccess.get() ) );
@@ -2407,7 +2398,7 @@
{
osl::MutexGuard aGuard( m_aMutex );
-@@ -2118,43 +2216,69 @@ uno::Any Content::open(
+@@ -2118,47 +2216,74 @@ uno::Any Content::open(
// fill inputsream sync; return if all data present
DAVResource aResource;
std::vector< rtl::OUString > aHeaders;
@@ -2441,18 +2432,21 @@
+
+ // pass the lock to the stream
+ static_cast< NeonInputStream* >( xStream.get() )->SetLock( aLock, m_xResAccess->getURL() );
-
++
+ m_bDidGetOrHead = true;
+
{
+
osl::MutexGuard aGuard( m_aMutex );
-- // m_xCachedProps.reset(
-- // new ContentProperties( aResource ) );
-+// m_xCachedProps.reset(
-+// new ContentProperties( aResource ) );
-
+
+ // cache headers.
+ if ( !m_xCachedProps.get())
+ m_xCachedProps.reset( new ContentProperties( aResource ) );
+ else
+ m_xCachedProps->addProperties( aResource.properties );
+
m_xResAccess.reset(
new DAVResourceAccess( *xResAccess.get() ) );
-
}
- xDataSink->setInputStream( xIn );
@@ -2581,13 +2575,13 @@
--- ucb/source/ucp/webdav/webdavcontent.hxx
+++ ucb/source/ucp/webdav/webdavcontent.hxx
@@ -90,6 +90,7 @@ class Content : public ::ucbhelper::ContentImplHelper,
- ContentProvider* m_pProvider; // No need for a ref, base class holds object
- sal_Bool m_bTransient;
- sal_Bool m_bCollection;
+ bool m_bTransient;
+ bool m_bCollection;
+ bool m_bDidGetOrHead;
+ sal_Bool m_bForceReadOnly;
+ std::vector< rtl::OUString > m_aFailedPropNames;
private:
- virtual com::sun::star::uno::Sequence< com::sun::star::beans::Property >
diff --git ucb/source/ucp/webdav/webdavcontentcaps.cxx ucb/source/ucp/webdav/webdavcontentcaps.cxx
index ba3d4bc..f5c5652 100644
--- ucb/source/ucp/webdav/webdavcontentcaps.cxx
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
