[ooo-build-commit] Branch 'ooo/master' - 2 commits - sw/source
Jan Holesovsky
kendy at kemper.freedesktop.org
Wed Sep 2 02:10:05 PDT 2009
sw/source/core/unocore/unocoll.cxx | 37 +++++--------------------------------
sw/source/filter/ww8/ww8atr.cxx | 4 ++--
sw/source/ui/dbui/dbmgr.cxx | 24 ++++++++----------------
3 files changed, 15 insertions(+), 50 deletions(-)
New commits:
commit ca5f6b6f3a5bfc3f6728b660b40ca7010e9f2a66
Author: Release Engineers <releng at openoffice.org>
Date: Tue Sep 1 09:48:42 2009 +0000
#i10000# corrected wrong order of the curlied braces
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 778436e..7675123 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -2383,9 +2383,9 @@ void AttributeOutputBase::StartTOX( const SwSection& rSect )
GetExport( ).OutputField( 0, eCode, sStr, WRITEFIELD_START | WRITEFIELD_CMD_START |
WRITEFIELD_CMD_END );
}
-
- GetExport( ).bStartTOX = false;
}
+
+ GetExport( ).bStartTOX = false;
}
void AttributeOutputBase::EndTOX( const SwSection& rSect )
commit 52d14b131f8d61722c9a41478c99ed222e8257b4
Author: Release Engineers <releng at openoffice.org>
Date: Tue Sep 1 03:54:53 2009 +0000
#i10000# fix for buildbreaker
diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx
index 8d7564b..3c9ec39 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -999,19 +999,6 @@ uno::Any SwXFrames::getByIndex(sal_Int32 nIndex)
throw(IndexOutOfBoundsException, WrappedTargetException, uno::RuntimeException )
{
vos::OGuard aGuard(Application::GetSolarMutex());
-<<<<<<< /export/home/vg/mercurial/bjm02/sw/source/core/unocore/unocoll.cxx
- if(!IsValid())
- throw uno::RuntimeException();
- if(nIndex < 0 || nIndex >= USHRT_MAX) throw IndexOutOfBoundsException();
- const Reference<XEnumeration> xEnum = createEnumeration();
- while(xEnum->hasMoreElements())
- {
- uno::Any aCurrent = xEnum->nextElement();
- if(nIndex-- == 0)
- return aCurrent;
- }
- throw IndexOutOfBoundsException();
-=======
if(!IsValid())
throw uno::RuntimeException();
if(nIndex < 0 || nIndex >= USHRT_MAX)
@@ -1020,23 +1007,15 @@ uno::Any SwXFrames::getByIndex(sal_Int32 nIndex)
if(!pFmt)
throw IndexOutOfBoundsException();
return lcl_UnoWrapFrame(pFmt, eType);
->>>>>>> /tmp/unocoll.cxx~other.S_OqFC
}
uno::Any SwXFrames::getByName(const OUString& rName)
throw(NoSuchElementException, WrappedTargetException, uno::RuntimeException )
{
vos::OGuard aGuard(Application::GetSolarMutex());
-<<<<<<< /export/home/vg/mercurial/bjm02/sw/source/core/unocore/unocoll.cxx
- if(!IsValid())
- throw uno::RuntimeException();
- const Reference<XEnumeration> xEnum = createEnumeration();
- while(xEnum->hasMoreElements())
-=======
if(!IsValid())
throw uno::RuntimeException();
const SwFrmFmt* pFmt;
switch(eType)
->>>>>>> /tmp/unocoll.cxx~other.S_OqFC
{
case FLYCNTTYPE_GRF:
pFmt = GetDoc()->FindFlyByName(rName, ND_GRFNODE);
@@ -1053,7 +1032,7 @@ uno::Any SwXFrames::getByName(const OUString& rName)
uno::Sequence<OUString> SwXFrames::getElementNames(void) throw( uno::RuntimeException )
{
vos::OGuard aGuard(Application::GetSolarMutex());
- if(!IsValid())
+ if(!IsValid())
throw uno::RuntimeException();
const Reference<XEnumeration> xEnum = createEnumeration();
::std::vector<OUString> vNames;
@@ -1102,15 +1081,9 @@ uno::Type SAL_CALL SwXFrames::getElementType() throw(uno::RuntimeException)
sal_Bool SwXFrames::hasElements(void) throw(uno::RuntimeException)
{
vos::OGuard aGuard(Application::GetSolarMutex());
-<<<<<<< /export/home/vg/mercurial/bjm02/sw/source/core/unocore/unocoll.cxx
- if(!IsValid())
- throw uno::RuntimeException();
- return createEnumeration()->hasMoreElements();
-=======
if(!IsValid())
throw uno::RuntimeException();
return GetDoc()->GetFlyCount(eType) > 0;
->>>>>>> /tmp/unocoll.cxx~other.S_OqFC
}
SwXFrame* SwXFrames::GetObject(SwFrmFmt& rFmt, FlyCntType eType)
@@ -1598,10 +1571,10 @@ SwXBookmark* SwXBookmarks::GetObject( ::sw::mark::IMark& rBkmk, SwDoc* pDoc)
SwXBookmark* pXBkmk = (SwXBookmark*)SwClientIter(*pModify).First(TYPE(SwXBookmark));
if(!pXBkmk)
{
- // FIXME: These belong in XTextFieldsSupplier
- //if (dynamic_cast< ::sw::mark::TextFieldmark* >(&rBkmk))
+ // FIXME: These belong in XTextFieldsSupplier
+ //if (dynamic_cast< ::sw::mark::TextFieldmark* >(&rBkmk))
// pXBkmk = new SwXFieldmark(false, &rBkmk, pDoc);
- //else if (dynamic_cast< ::sw::mark::CheckboxFieldmark* >(&rBkmk))
+ //else if (dynamic_cast< ::sw::mark::CheckboxFieldmark* >(&rBkmk))
// pXBkmk = new SwXFieldmark(true, &rBkmk, pDoc);
//else
OSL_ENSURE(
diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx
index 5a06a5f..144ab21 100644
--- a/sw/source/ui/dbui/dbmgr.cxx
+++ b/sw/source/ui/dbui/dbmgr.cxx
@@ -3283,24 +3283,17 @@ sal_Int32 SwNewDBMgr::MergeDocuments( SwMailMergeConfigItem& rMMConfig,
//create a new pagestyle
//copy the pagedesc from the current document to the new document and change the name of the to-be-applied style
- SwDoc* pTargetDoc = pTargetShell->GetDoc();
- String sNewPageDescName = lcl_FindUniqueName(pTargetShell, sStartingPageDesc, nDocNo );
- pTargetShell->GetDoc()->MakePageDesc( sNewPageDescName );
- SwPageDesc* pTargetPageDesc = pTargetShell->FindPageDescByName( sNewPageDescName );
- const SwPageDesc* pWorkPageDesc = rWorkShell.FindPageDescByName( sStartingPageDesc );
+ SwDoc* pTargetDoc = pTargetShell->GetDoc();
+ String sNewPageDescName = lcl_FindUniqueName(pTargetShell, sStartingPageDesc, nDocNo );
+ pTargetShell->GetDoc()->MakePageDesc( sNewPageDescName );
+ SwPageDesc* pTargetPageDesc = pTargetShell->FindPageDescByName( sNewPageDescName );
+ const SwPageDesc* pWorkPageDesc = rWorkShell.FindPageDescByName( sStartingPageDesc );
- if(pWorkPageDesc && pTargetPageDesc)
- {
- pTargetDoc->CopyPageDesc( *pWorkPageDesc, *pTargetPageDesc, sal_False );
- sModifiedStartingPageDesc = sNewPageDescName;
- lcl_CopyFollowPageDesc( *pTargetShell, *pWorkPageDesc, *pTargetPageDesc, nDocNo );
- }
- }
- if(nDocNo == 1 || bPageStylesWithHeaderFooter)
+ if(pWorkPageDesc && pTargetPageDesc)
{
- pTargetDoc->CopyPageDesc( *pSourcePageDesc, *pTargetPageDesc, sal_False );
+ pTargetDoc->CopyPageDesc( *pWorkPageDesc, *pTargetPageDesc, sal_False );
sModifiedStartingPageDesc = sNewPageDescName;
- lcl_CopyFollowPageDesc( *pTargetShell, *pSourcePageDesc, *pTargetPageDesc, nDocNo );
+ lcl_CopyFollowPageDesc( *pTargetShell, *pWorkPageDesc, *pTargetPageDesc, nDocNo );
}
}
if(nDocNo == 1 || bPageStylesWithHeaderFooter)
@@ -3408,4 +3401,3 @@ void SwConnectionDisposedListener_Impl::disposing( const EventObject& rSource )
}
}
}
-
More information about the ooo-build-commit
mailing list