Commits

Anonymous committed 77c77d5

#i10000# fix for buildbreaker

Comments (0)

Files changed (2)

sw/source/core/unocore/unocoll.cxx

 /*************************************************************************
  *
  * 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
 	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)
     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);
 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;
 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)
     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(

sw/source/ui/dbui/dbmgr.cxx

                 //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)
         }
     }
 }
-
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.