CWS-TOOLING: integrate CWS bjm02

2009-08-12 Bjoern Michaelsen #i101879# moved officeversion from envelope body to requestbody
2009-08-11 Bjoern Michaelsen #i103732# reverting changeset f3f527950572
2009-08-10 Bjoern Michaelsen cws bjm02: merging local minibranches
2009-08-10 Bjoern Michaelsen #i104128# remove additional duplication in svx headers, remove license header merge conflicts in svx headers
2009-08-10 Bjoern Michaelsen #i100484# fixed buildbreaker on win32
2009-08-10 Bjoern Michaelsen #i104128# remove duplication in svx headers
2009-08-04 Bjoern Michaelsen #i103913# fixed bookmark updating when moving numbered para
2009-08-03 Bjoern Michaelsen #i101879# include officeversion/productname in soaprequest
2009-07-31 Bjoern Michaelsen #i84926# Selecting all in blockmode automatically falls back to std mode
2009-07-31 Bjoern Michaelsen #i100484# operation on 'pCmpLine' may be undefined, thanks cmc
2009-07-29 Bjoern Michaelsen #i103059# fixing crash on empty enumeration
2009-07-29 Bjoern Michaelsen #i98659# fixing typo in usagetracking option tabpage
2009-07-29 Bjoern Michaelsen #i103732# not triggering loading of oooimprovement dll if usage tracking is disabled
2009-07-29 Bjoern Michaelsen #i103036# stlunosequence can be use simple array-pointers as iterators, fixing used type in xmloff
2009-07-29 Bjoern Michaelsen #i103036# stlunosequence can be use simple array-pointers as iterators
2009-07-29 Bjoern Michaelsen #i103182# completely removing unused functions in extensions/oooimprovement
2009-07-28 Bjoern Michaelsen cws bjm02: merged changes from master up to milestone DEV300_m53
2009-06-29 Bjoern Michaelsen #i103182# commenting out getFailedAttempts(..) for future use
2009-06-29 Bjoern Michaelsen #i103183# removed unused function sw::mark::CrossRefBookmark::IsLegalName(..)
2009-06-29 Bjoern Michaelsen #i103182# removing unused functions in extensions/oooimprovement
2009-06-24 Bjoern Michaelsen #i103059# not using enumeration for getByName/getByIndex
2009-06-24 Bjoern Michaelsen #i103059# not using enumeration for hasByName/GetCount/hasElements for performance reasons
2009-06-24 Bjoern Michaelsen #i103036# stlunosequence can be use simple array-pointers as iterators
2009-08-27 releng CWS-TOOLING: integrate CWS hr65
2009-08-26 Jens-Heiner Rechtien #i104521#: implement 'setcurrent'; document --hg option to 'create'
2009-08-26 Jens-Heiner Rechtien #i104521#: SOAP method setSCMName() doesn't return a value
2009-08-26 Jens-Heiner Rechtien #i104521#: implement [set|get]_scm()
2009-08-26 Jens-Heiner Rechtien #i104521#: implement --hg switch to 'cws create'
2009-08-27 vg CWS-TOOLING: integrate CWS hr64_DEV300
2009-07-21 13:24:57 +0200 hr  r274189 : #i99576#: re-enable optimization for tabcont.cxx
2009-07-21 13:17:18 +0200 hr  r274188 : #i99592: disable -xspace optimization for Solaris x86 and SunStudio 12, due to some mis-optimzation in sc and elsewhere. SunStudio 12 update 1 is OK, but needs a few unrelated changes which will be implemented in DEV300 code line
2009-08-27 releng CWS-TOOLING: integrate CWS sw32bf02
2009-08-25 15:52:04 +0200 hde  r275366 : reactived testcases hit by issue 102752
2009-08-21 13:52:17 +0200 od  r275245 : #i102921# delete files whose deletion has been forgotten in cws impress172
2009-08-21 11:20:47 +0200 od  r275225 : CWS-TOOLING: rebase CWS sw32bf02 to trunk@275001 (milestone: DEV300:m55)
2009-08-20 16:21:30 +0200 od  r275191 : #i92511# method <lcl_MoveAllLowerObjs(..)>
- invalidation of cache for object rectangle inclusive spaces is needed.
2009-08-20 15:50:40 +0200 od  r275188 : #i96726# method <SwPagePreView::DocSzChgd(..)>
- trigger recalculation of page preview layout even if the count of pages is not changing
2009-08-20 12:37:32 +0200 od  r275172 : #i100466# correction for showing and hiding redlines
2009-08-18 13:25:18 +0200 od  r275100 : #i103817# method <XMLTextImportHelper::SetStyleAndAttrs(..)
- assure that a heading applies the outline style, if no other list style is applied.
2009-08-18 13:21:38 +0200 od  r275098 : #i103817# allow the outline style - list style for outline numbering - to be set directly at the paragraph
2009-08-17 14:13:02 +0200 od  r275052 : #i103684# add missing documentation for new optional OutlineLevel attribute introduced in OOo 3.1
2009-08-17 14:00:25 +0200 od  r275049 : #i100481# method <XMLTextFrameContext_Impl::CreateChildContext(..)>#
- correct condition for handling embedded documents and embedded math objects
2009-08-12 14:11:34 +0200 od  r274891 : #i97379# assure that columns are not applied to fly frames, which represent graphics or embedded objects
2009-08-12 12:51:43 +0200 od  r274889 : #i101870# method <SwTxtNode::_MakeNewTxtNode(..)>
- perform action on different paragraph styles before applying new paragraph style
2009-08-12 12:24:44 +0200 od  r274888 : #i101092# method <ViewShell::Paint(..)>
- encapsulate paint of document background and document into pre and post drawing layer paint calls
2009-08-12 11:38:48 +0200 od  r274886 : #i98766# minor adjustment in order to be warning free under Mac port builds
2009-08-12 11:33:54 +0200 od  r274885 : #i99267# method <SwTabFrm::MakeAll()>
- reset <bSplit> after forward move to assure that follows can be joined, if further space is available.
2009-08-12 11:11:49 +0200 od  r274882 : #i98766# method <ViewShell::SmoothScroll(..)
- disable smooth scroll for Mac port builds
2009-08-10 12:17:58 +0200 od  r274801 : CWS-TOOLING: rebase CWS sw32bf02 to trunk@274622 (milestone: DEV300:m54)
2009-07-21 16:56:45 +0200 od  r274206 : #i103685# method <SwTxtFormatter::NewTabPortion(..)>
- adjust condition to apply automatic tab stop at left margin correctly
in case that tab stops are not relative to indent
2009-07-10 11:53:53 +0200 od  r273883 : #i102752 method <SwDrawContact::Modify(..)>
- assure that a ShapePropertyChangeNotifier exists
2009-07-07 12:01:58 +0200 mst  r273788 : #i103304# apply patch by dtardon to fix bogus conditional
2009-07-07 09:01:13 +0200 od  r273767 : CWS-TOOLING: rebase CWS sw32bf02 to trunk@273468 (milestone: DEV300:m51)
2009-08-27 vg CWS-TOOLING: integrate CWS native264_DEV300
2009-08-13 11:58:58 +0200 is  r274928 : #i104200# update to jre6u16
2009-08-27 vg CWS-TOOLING: integrate CWS automationdev300m54tables
2009-08-14 13:01:05 +0200 wg  r274976 : i104224
2009-08-14 13:00:28 +0200 wg  r274975 : i104224
2009-08-14 12:12:34 +0200 wg  r274974 : i104222
2009-08-13 14:28:13 +0200 wg  r274944 : i104205
2009-08-13 14:27:40 +0200 wg  r274943 : i104205
2009-08-13 14:26:36 +0200 wg  r274942 : i104205

7 files changed, 114 insertions, 63 deletions

diff --git a/sw/source/core/crsr/crossrefbookmark.cxx b/sw/source/core/crsr/crossrefbookmark.cxx
index 38b502caee75..d148027f13d3 100644
--- a/sw/source/core/crsr/crossrefbookmark.cxx
+++ b/sw/source/core/crsr/crossrefbookmark.cxx
@@ -75,11 +75,6 @@ namespace sw { namespace mark
         return *static_cast<SwPosition*>(NULL);
     }
 
-    bool CrossRefBookmark::IsLegalName(const ::rtl::OUString& rName)
-    {
-        return CrossRefNumItemBookmark::IsLegalName(rName) || CrossRefHeadingBookmark::IsLegalName(rName);
-    }
-
     CrossRefHeadingBookmark::CrossRefHeadingBookmark(const SwPaM& rPaM,
         const KeyCode& rCode,
         const OUString& rName,
diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx
index 2d6738fd915f..14a3ed87a8d1 100644
--- a/sw/source/core/doc/tblrwcl.cxx
+++ b/sw/source/core/doc/tblrwcl.cxx
@@ -360,11 +360,18 @@ BOOL lcl_CopyCol( const _FndBox*& rpFndBox, void* pPara )
             SwTableBoxFmt* pNewFmt = (SwTableBoxFmt*)pBox->ClaimFrmFmt();
 
             // suche die selektierten Boxen in der Line:
-            _FndLine* pCmpLine;
+            _FndLine* pCmpLine = NULL;
             SwFmtFrmSize aFrmSz( pNewFmt->GetFrmSize() );
-            if( pBox->GetTabLines().Count() &&
-                ( pCmpLine = rpFndBox->GetLines()[ 0 ])->GetBoxes().Count()
-                    != pCmpLine->GetLine()->GetTabBoxes().Count() )
+
+            bool bDiffCount = false;
+            if( pBox->GetTabLines().Count() )
+            {
+                pCmpLine = rpFndBox->GetLines()[ 0 ];
+                if ( pCmpLine->GetBoxes().Count() != pCmpLine->GetLine()->GetTabBoxes().Count() )
+                    bDiffCount = true;
+            }
+
+            if( bDiffCount )
             {
                 // die erste Line sollte reichen
                 _FndBoxes& rFndBoxes = pCmpLine->GetBoxes();
diff --git a/sw/source/core/edit/edsect.cxx b/sw/source/core/edit/edsect.cxx
index 5cc2277c5ccc..bf6565d352fd 100644
--- a/sw/source/core/edit/edsect.cxx
+++ b/sw/source/core/edit/edsect.cxx
@@ -72,8 +72,10 @@ const SwSection* SwEditShell::InsertSection( const SwSection& rNew,
 
 BOOL SwEditShell::IsInsRegionAvailable() const
 {
-    SwPaM* pCrsr;
-    if( IsTableMode() || ( pCrsr = GetCrsr() )->GetNext() != pCrsr )
+    if( IsTableMode() )
+        return FALSE;
+    SwPaM* pCrsr = GetCrsr();
+    if( pCrsr->GetNext() != pCrsr )
         return FALSE;
     if( pCrsr->HasMark() )
         return 0 != GetDoc()->IsInsRegionAvailable( *pCrsr );
diff --git a/sw/source/core/edit/edws.cxx b/sw/source/core/edit/edws.cxx
index 0d51c62602d0..00fe089b91e9 100644
--- a/sw/source/core/edit/edws.cxx
+++ b/sw/source/core/edit/edws.cxx
@@ -189,13 +189,21 @@ sal_uInt16 SwEditShell::GetCntType() const
 sal_Bool SwEditShell::HasOtherCnt() const
 
 {
+    if ( GetDoc()->GetSpzFrmFmts()->Count() )
+        return sal_True;
+
     const SwNodes &rNds = GetDoc()->GetNodes();
     const SwNode *pNd;
-    return GetDoc()->GetSpzFrmFmts()->Count() ||
-            1 != (( pNd = &rNds.GetEndOfInserts() )->GetIndex() -
-                pNd->StartOfSectionIndex() ) ||
-            1 != (( pNd = &rNds.GetEndOfAutotext() )->GetIndex() -
-                pNd->StartOfSectionIndex() );
+
+    pNd = &rNds.GetEndOfInserts();
+    if ( 1 != (pNd->GetIndex() - pNd->StartOfSectionIndex()) )
+        return sal_True;
+
+    pNd = &rNds.GetEndOfAutotext();
+    if ( 1 != (pNd->GetIndex() - pNd->StartOfSectionIndex()) )
+        return sal_True;
+
+    return sal_False;
 }
 
 /******************************************************************************
diff --git a/sw/source/core/inc/crossrefbookmark.hxx b/sw/source/core/inc/crossrefbookmark.hxx
index 3712950fbb23..84ebaf1eb9e6 100644
--- a/sw/source/core/inc/crossrefbookmark.hxx
+++ b/sw/source/core/inc/crossrefbookmark.hxx
@@ -70,8 +70,6 @@ namespace sw { namespace mark
                     "<SwCrossRefBookmark::ClearOtherMarkPos(..)>"
                     " - misusage of CrossRefBookmark: other bookmark position isn't allowed to be set or cleared." );
             }
-
-            static bool IsLegalName(const ::rtl::OUString& rName);
     };
 
     class CrossRefHeadingBookmark
diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx
index decd73e07e63..848530b422a1 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -806,10 +806,10 @@ XTextTable* SwXTextTables::GetObject( SwFrmFmt& rFmt )
  ******************************************************************/
 namespace
 {
-    template<FlyCntType T> struct SwXFrameEnumeration_traits {};
+    template<FlyCntType T> struct UnoFrameWrap_traits {};
 
     template<>
-    struct SwXFrameEnumeration_traits<FLYCNTTYPE_FRM>
+    struct UnoFrameWrap_traits<FLYCNTTYPE_FRM>
     {
         typedef SwXTextFrame core_frame_t;
         typedef XTextFrame uno_frame_t;
@@ -817,7 +817,7 @@ namespace
     };
 
     template<>
-    struct SwXFrameEnumeration_traits<FLYCNTTYPE_GRF>
+    struct UnoFrameWrap_traits<FLYCNTTYPE_GRF>
     {
         typedef SwXTextGraphicObject core_frame_t;
         typedef XTextContent uno_frame_t;
@@ -825,7 +825,7 @@ namespace
     };
 
     template<>
-    struct SwXFrameEnumeration_traits<FLYCNTTYPE_OLE>
+    struct UnoFrameWrap_traits<FLYCNTTYPE_OLE>
     {
         typedef SwXTextEmbeddedObject core_frame_t;
         typedef XEmbeddedObjectSupplier uno_frame_t;
@@ -833,6 +833,33 @@ namespace
     };
 
     template<FlyCntType T>
+    static uno::Any lcl_UnoWrapFrame(SwFrmFmt* pFmt)
+    {
+        SwXFrame* pFrm = static_cast<SwXFrame*>(SwClientIter(*pFmt).First(TYPE(SwXFrame)));
+        if(!pFrm)
+            pFrm = new typename UnoFrameWrap_traits<T>::core_frame_t(*pFmt);
+        Reference< typename UnoFrameWrap_traits<T>::uno_frame_t > xFrm =
+            static_cast< typename UnoFrameWrap_traits<T>::core_frame_t* >(pFrm);
+        return uno::makeAny(xFrm);
+    }
+
+    // runtime adapter for lcl_UnoWrapFrame
+    static uno::Any lcl_UnoWrapFrame(SwFrmFmt* pFmt, FlyCntType eType) throw(uno::RuntimeException())
+    {
+        switch(eType)
+        {
+            case FLYCNTTYPE_FRM:
+                return lcl_UnoWrapFrame<FLYCNTTYPE_FRM>(pFmt);
+            case FLYCNTTYPE_GRF:
+                return lcl_UnoWrapFrame<FLYCNTTYPE_GRF>(pFmt);
+            case FLYCNTTYPE_OLE:
+                return lcl_UnoWrapFrame<FLYCNTTYPE_OLE>(pFmt);
+            default:
+                throw uno::RuntimeException();
+        }
+    }
+
+    template<FlyCntType T>
     class SwXFrameEnumeration : public SwSimpleEnumerationBaseClass
     {
         private:
@@ -844,12 +871,12 @@ namespace
             SwXFrameEnumeration(const SwDoc* const pDoc);
 
             //XEnumeration
-            virtual BOOL SAL_CALL hasMoreElements(void) throw( RuntimeException );
+            virtual sal_Bool SAL_CALL hasMoreElements(void) throw( RuntimeException );
             virtual Any SAL_CALL nextElement(void) throw( NoSuchElementException, WrappedTargetException, RuntimeException );
 
             //XServiceInfo
             virtual OUString SAL_CALL getImplementationName(void) throw( RuntimeException );
-            virtual BOOL SAL_CALL supportsService(const OUString& ServiceName) throw( RuntimeException );
+            virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( RuntimeException );
             virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( RuntimeException );
     };
 }
@@ -860,31 +887,25 @@ SwXFrameEnumeration<T>::SwXFrameEnumeration(const SwDoc* const pDoc)
 {
     vos::OGuard aGuard(Application::GetSolarMutex());
     const SwSpzFrmFmts* const pFmts = pDoc->GetSpzFrmFmts();
-    const USHORT nSize = pFmts->Count();
+    if(!pFmts->Count())
+        return;
+    const SwFrmFmt* const pFmtsEnd = (*pFmts)[pFmts->Count()];
     ::std::insert_iterator<frmcontainer_t> pInserter = ::std::insert_iterator<frmcontainer_t>(m_aFrames, m_aFrames.begin());
-    for( USHORT i=0; i < nSize; ++i )
+    for(SwFrmFmt* pFmt = (*pFmts)[0]; pFmt < pFmtsEnd; ++pFmt)
     {
-        SwFrmFmt* pFmt = (*pFmts)[i];
         if(pFmt->Which() != RES_FLYFRMFMT)
             continue;
         const SwNodeIndex* pIdx =  pFmt->GetCntnt().GetCntntIdx();
         if(!pIdx || !pIdx->GetNodes().IsDocNodes())
             continue;
         const SwNode* pNd = pDoc->GetNodes()[ pIdx->GetIndex() + 1 ];
-        if(SwXFrameEnumeration_traits<T>::filter(pNd))
-        {
-            SwXFrame* pFrm = (SwXFrame*)SwClientIter( *pFmt ).First( TYPE( SwXFrame ));
-            if( !pFrm )
-                pFrm = new typename SwXFrameEnumeration_traits<T>::core_frame_t(*pFmt);
-            Reference< typename SwXFrameEnumeration_traits<T>::uno_frame_t > xFrm =
-                static_cast< typename SwXFrameEnumeration_traits<T>::core_frame_t* >(pFrm);
-            *pInserter++ = uno::makeAny(xFrm);
-        }
+        if(UnoFrameWrap_traits<T>::filter(pNd))
+            *pInserter++ = lcl_UnoWrapFrame<T>(pFmt);
     }
 }
 
 template<FlyCntType T>
-BOOL SwXFrameEnumeration<T>::hasMoreElements(void) throw( RuntimeException )
+sal_Bool SwXFrameEnumeration<T>::hasMoreElements(void) throw( RuntimeException )
 {
     vos::OGuard aGuard(Application::GetSolarMutex());
     return !m_aFrames.empty();
@@ -908,7 +929,7 @@ OUString SwXFrameEnumeration<T>::getImplementationName(void) throw( RuntimeExcep
 }
 
 template<FlyCntType T>
-BOOL SwXFrameEnumeration<T>::supportsService(const OUString& ServiceName) throw( RuntimeException )
+sal_Bool SwXFrameEnumeration<T>::supportsService(const OUString& ServiceName) throw( RuntimeException )
 {
     return C2U("com.sun.star.container.XEnumeration") == ServiceName;
 }
@@ -971,20 +992,14 @@ sal_Int32 SwXFrames::getCount(void) throw(uno::RuntimeException)
     vos::OGuard aGuard(Application::GetSolarMutex());
     if(!IsValid())
         throw uno::RuntimeException();
-    const Reference<XEnumeration> xEnum = createEnumeration();
-    sal_Int32 nCount = 0;
-    while(xEnum->hasMoreElements())
-    {
-        xEnum->nextElement();
-        ++nCount;
-    }
-    return nCount;
+    return GetDoc()->GetFlyCount(eType);
 }
 
 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();
@@ -996,23 +1011,43 @@ uno::Any SwXFrames::getByIndex(sal_Int32 nIndex)
             return aCurrent;
     }
     throw IndexOutOfBoundsException();
+=======
+    if(!IsValid())
+        throw uno::RuntimeException();
+    if(nIndex < 0 || nIndex >= USHRT_MAX)
+        throw IndexOutOfBoundsException();
+    SwFrmFmt* pFmt = GetDoc()->GetFlyNum(static_cast<sal_uInt16>(nIndex), eType);
+    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
     {
-        uno::Any aCurrent = xEnum->nextElement();
-        Reference<container::XNamed> xNamed;
-        aCurrent >>= xNamed;
-        if(xNamed.is() && xNamed->getName() == rName)
-            return aCurrent;
+        case FLYCNTTYPE_GRF:
+            pFmt = GetDoc()->FindFlyByName(rName, ND_GRFNODE);
+        case FLYCNTTYPE_OLE:
+            pFmt = GetDoc()->FindFlyByName(rName, ND_OLENODE);
+        default:
+            pFmt = GetDoc()->FindFlyByName(rName, ND_TEXTNODE);
     }
-    throw NoSuchElementException();
+    if(!pFmt)
+        throw NoSuchElementException();
+    return lcl_UnoWrapFrame(const_cast<SwFrmFmt*>(pFmt), eType);
 }
 
 uno::Sequence<OUString> SwXFrames::getElementNames(void) throw( uno::RuntimeException )
@@ -1035,16 +1070,17 @@ uno::Sequence<OUString> SwXFrames::getElementNames(void) throw( uno::RuntimeExce
 sal_Bool SwXFrames::hasByName(const OUString& rName) throw( uno::RuntimeException )
 {
     vos::OGuard aGuard(Application::GetSolarMutex());
-    if(!IsValid()) throw uno::RuntimeException();
-    const Reference<XEnumeration> xEnum = createEnumeration();
-    while(xEnum->hasMoreElements())
+    if(!IsValid())
+        throw uno::RuntimeException();
+    switch(eType)
     {
-        Reference<XNamed> xNamed;
-        xEnum->nextElement() >>= xNamed;
-        if(xNamed.is() && xNamed->getName() == rName)
-            return true;
+        case FLYCNTTYPE_GRF:
+            return GetDoc()->FindFlyByName(rName, ND_GRFNODE) != NULL;
+        case FLYCNTTYPE_OLE:
+            return GetDoc()->FindFlyByName(rName, ND_OLENODE) != NULL;
+        default:
+            return GetDoc()->FindFlyByName(rName, ND_TEXTNODE) != NULL;
     }
-    return false;
 }
 
 uno::Type SAL_CALL SwXFrames::getElementType() throw(uno::RuntimeException)
@@ -1066,9 +1102,15 @@ 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)
diff --git a/sw/source/ui/wrtsh/select.cxx b/sw/source/ui/wrtsh/select.cxx
index f45c68ef7ec9..5ed81c942ea4 100644
--- a/sw/source/ui/wrtsh/select.cxx
+++ b/sw/source/ui/wrtsh/select.cxx
@@ -140,8 +140,9 @@ long SwWrtShell::SelAll()
 {
     const BOOL bLockedView = IsViewLocked();
     LockView( TRUE );
-
     {
+        if(bBlockMode)
+            LeaveBlockMode();
         MV_KONTEXT(this);
         BOOL bMoveTable = FALSE;
         SwPosition *pStartPos = 0;
@@ -191,9 +192,7 @@ long SwWrtShell::SelAll()
         }
     }
     EndSelect();
-
     LockView( bLockedView );
-
     return 1;
 }