[ooo-build-commit] .: 3 commits - patches/dev300
Cédric Bosdonnat
cbosdo at kemper.freedesktop.org
Tue Sep 14 07:00:56 PDT 2010
patches/dev300/apply | 5 --
patches/dev300/field-patch-lock.diff | 50 -----------------------
patches/dev300/field-patch-uno-fix.diff | 68 --------------------------------
patches/dev300/fields-enable.diff | 21 ---------
4 files changed, 144 deletions(-)
New commits:
commit 221f0accc5084164e3e9d46ef2b0255c78ddeb79
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Tue Sep 14 16:00:37 2010 +0200
field-patch-lock.diff: moved to git repos
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 719e21b..da8c17b 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2539,9 +2539,6 @@ win32-restore-associations.diff, n#530872, tml
[ Fixes ]
fix-ppt-linespacing-import-export.diff, n#355302, rodo
-# Activate the changed upstreamed by cbosdo02 CWS
-field-patch-lock.diff, n#601355, cbosdo #upstreamed?
-
sw-import-html-controls.diff, n#485609, freuter
svx-hacky-htmlselect-control-import.diff, n#523191, noelpwer
diff --git a/patches/dev300/field-patch-lock.diff b/patches/dev300/field-patch-lock.diff
deleted file mode 100644
index 2b01acd..0000000
--- a/patches/dev300/field-patch-lock.diff
+++ /dev/null
@@ -1,50 +0,0 @@
----
- sw/source/core/crsr/pam.cxx | 28 +++++++++++++++++-----------
- 1 files changed, 17 insertions(+), 11 deletions(-)
-
-diff --git sw/source/core/crsr/pam.cxx sw/source/core/crsr/pam.cxx
-index a31ae4c..6de3089 100644
---- sw/source/core/crsr/pam.cxx
-+++ sw/source/core/crsr/pam.cxx
-@@ -825,21 +825,27 @@ BOOL SwPaM::HasReadonlySel( bool bFormView ) const
- }
- //FIXME FieldBk
- // TODO: Form Protection when Enhanced Fields are enabled
-- if (!bRet) {
-- const SwDoc *pDoc = GetDoc();
-- sw::mark::IMark* pA = NULL;
-- sw::mark::IMark* pB = NULL;
-- if ( pDoc )
-- {
-- const IDocumentMarkAccess* pMarksAccess = pDoc->getIDocumentMarkAccess( );
-- pA = GetPoint() ? pMarksAccess->getFieldmarkFor( *GetPoint( ) ) : NULL;
-- pB = GetMark( ) ? pMarksAccess->getFieldmarkFor( *GetMark( ) ) : pA;
-- bRet = ( pA != pB );
-- }
-+ const SwDoc *pDoc = GetDoc();
-+ sw::mark::IMark* pA = NULL;
-+ sw::mark::IMark* pB = NULL;
-+ if ( pDoc )
-+ {
-+ const IDocumentMarkAccess* pMarksAccess = pDoc->getIDocumentMarkAccess( );
-+ pA = GetPoint() ? pMarksAccess->getFieldmarkFor( *GetPoint( ) ) : NULL;
-+ pB = GetMark( ) ? pMarksAccess->getFieldmarkFor( *GetMark( ) ) : pA;
-+ }
-+
-+ if (!bRet)
-+ {
-+ bRet = ( pA != pB );
- bool bProtectForm = pDoc->get( IDocumentSettingAccess::PROTECT_FORM );
- if ( bProtectForm )
- bRet |= ( pA == NULL || pB == NULL );
- }
-+ else
-+ {
-+ bRet = !( pA == pB && pA != NULL );
-+ }
- return bRet;
- }
-
---
-1.7.0.1
-
commit fb354e08e267caff2b72b247ff3783cb1cea597e
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Tue Sep 14 15:59:21 2010 +0200
field-patch-uno-fix.diff: moved to git repos
diff --git a/patches/dev300/apply b/patches/dev300/apply
index d6d6d3f..719e21b 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2540,7 +2540,6 @@ win32-restore-associations.diff, n#530872, tml
fix-ppt-linespacing-import-export.diff, n#355302, rodo
# Activate the changed upstreamed by cbosdo02 CWS
-field-patch-uno-fix.diff, cbosdo #upstreamed?
field-patch-lock.diff, n#601355, cbosdo #upstreamed?
sw-import-html-controls.diff, n#485609, freuter
diff --git a/patches/dev300/field-patch-uno-fix.diff b/patches/dev300/field-patch-uno-fix.diff
deleted file mode 100644
index 35866ca..0000000
--- a/patches/dev300/field-patch-uno-fix.diff
+++ /dev/null
@@ -1,68 +0,0 @@
----
- sw/source/core/unocore/unocoll.cxx | 18 +++++++++---------
- 1 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git sw/source/core/unocore/unocoll.cxx sw/source/core/unocore/unocoll.cxx
-index 03df3e1..85c6b3f 100644
---- sw/source/core/unocore/unocoll.cxx
-+++ sw/source/core/unocore/unocoll.cxx
-@@ -1504,7 +1504,7 @@ sal_Int32 SwXBookmarks::getCount(void)
- vos::OGuard aGuard(Application::GetSolarMutex());
- if(!IsValid())
- throw uno::RuntimeException();
-- return GetDoc()->getIDocumentMarkAccess()->getBookmarksCount();
-+ return GetDoc()->getIDocumentMarkAccess()->getMarksCount();
- }
-
- uno::Any SwXBookmarks::getByIndex(sal_Int32 nIndex)
-@@ -1514,11 +1514,11 @@ uno::Any SwXBookmarks::getByIndex(sal_Int32 nIndex)
- if(!IsValid())
- throw uno::RuntimeException();
- IDocumentMarkAccess* const pMarkAccess = GetDoc()->getIDocumentMarkAccess();
-- if(nIndex < 0 || nIndex >= pMarkAccess->getBookmarksCount())
-+ if(nIndex < 0 || nIndex >= pMarkAccess->getMarksCount())
- throw IndexOutOfBoundsException();
-
- uno::Any aRet;
-- ::sw::mark::IMark* pBkmk = pMarkAccess->getBookmarksBegin()[nIndex].get();
-+ ::sw::mark::IMark* pBkmk = pMarkAccess->getMarksBegin()[nIndex].get();
- const uno::Reference< text::XTextContent > xRef =
- SwXBookmark::CreateXBookmark(*GetDoc(), *pBkmk);
- aRet <<= xRef;
-@@ -1533,8 +1533,8 @@ uno::Any SwXBookmarks::getByName(const rtl::OUString& rName)
- throw uno::RuntimeException();
-
- IDocumentMarkAccess* const pMarkAccess = GetDoc()->getIDocumentMarkAccess();
-- IDocumentMarkAccess::const_iterator_t ppBkmk = pMarkAccess->findBookmark(rName);
-- if(ppBkmk == pMarkAccess->getBookmarksEnd())
-+ IDocumentMarkAccess::const_iterator_t ppBkmk = pMarkAccess->findMark(rName);
-+ if(ppBkmk == pMarkAccess->getMarksEnd())
- throw NoSuchElementException();
-
- uno::Any aRet;
-@@ -1552,10 +1552,10 @@ uno::Sequence< OUString > SwXBookmarks::getElementNames(void)
- throw uno::RuntimeException();
-
- IDocumentMarkAccess* const pMarkAccess = GetDoc()->getIDocumentMarkAccess();
-- uno::Sequence<OUString> aSeq(pMarkAccess->getBookmarksCount());
-+ uno::Sequence<OUString> aSeq(pMarkAccess->getMarksCount());
- sal_Int32 nCnt = 0;
-- for(IDocumentMarkAccess::const_iterator_t ppMark = pMarkAccess->getBookmarksBegin();
-- ppMark != pMarkAccess->getBookmarksEnd();)
-+ for(IDocumentMarkAccess::const_iterator_t ppMark = pMarkAccess->getMarksBegin();
-+ ppMark != pMarkAccess->getMarksEnd();)
- aSeq[nCnt++] = (*ppMark++)->GetName();
- return aSeq;
- }
-@@ -1568,7 +1568,7 @@ sal_Bool SwXBookmarks::hasByName(const OUString& rName)
- throw uno::RuntimeException();
-
- IDocumentMarkAccess* const pMarkAccess = GetDoc()->getIDocumentMarkAccess();
-- return pMarkAccess->findBookmark(rName) != pMarkAccess->getBookmarksEnd();
-+ return pMarkAccess->findMark(rName) != pMarkAccess->getMarksEnd();
- }
-
- uno::Type SAL_CALL SwXBookmarks::getElementType()
---
-1.7.0.1
-
commit 3a8e62b9764cffe83415e6470f02dbdf1b16285c
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Tue Sep 14 15:57:04 2010 +0200
fields-enable.diff: moved to git repos
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 0a8375d..d6d6d3f 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2540,7 +2540,6 @@ win32-restore-associations.diff, n#530872, tml
fix-ppt-linespacing-import-export.diff, n#355302, rodo
# Activate the changed upstreamed by cbosdo02 CWS
-fields-enable.diff, cbosdo
field-patch-uno-fix.diff, cbosdo #upstreamed?
field-patch-lock.diff, n#601355, cbosdo #upstreamed?
diff --git a/patches/dev300/fields-enable.diff b/patches/dev300/fields-enable.diff
deleted file mode 100644
index 3392458..0000000
--- a/patches/dev300/fields-enable.diff
+++ /dev/null
@@ -1,21 +0,0 @@
----
- unotools/source/config/fltrcfg.cxx | 3 +--
- 1 files changed, 1 insertions(+), 2 deletions(-)
-
-diff --git unotools/source/config/fltrcfg.cxx unotools/source/config/fltrcfg.cxx
-index 4707b4a..35f13c0 100644
---- unotools/source/config/fltrcfg.cxx
-+++ unotools/source/config/fltrcfg.cxx
-@@ -530,8 +530,7 @@ void SvtFilterOptions::SetWriter2WinWord( BOOL bFlag )
-
- BOOL SvtFilterOptions::IsUseEnhancedFields() const
- {
-- return false; // disable for now;
--// return pImp->IsFlag( FILTERCFG_USE_ENHANCED_FIELDS );
-+ return pImp->IsFlag( FILTERCFG_USE_ENHANCED_FIELDS );
- }
-
- void SvtFilterOptions::SetUseEnhancedFields( BOOL bFlag )
---
-1.7.0.1
-
More information about the ooo-build-commit
mailing list