CWS changehid: resync to m85

Mathias Bauer · Mathias Bauer · commit 209fbe2d6327 · 2010-07-22T10:55:12.000+02:00
diff --git a/sw/qa/unoapi/sw.sce b/sw/qa/unoapi/sw.sce
@@ -4,9 +4,9 @@
 -o sw.ParagraphStyle
 #i111197 -o sw.SwAccessibleDocumentPageView
 #i86751 -o sw.SwAccessibleDocumentView
-#i111185 -o sw.SwAccessibleEndnoteView
+-o sw.SwAccessibleEndnoteView
 -o sw.SwAccessibleFooterView
-#i111185 -o sw.SwAccessibleFootnoteView
+-o sw.SwAccessibleFootnoteView
 -o sw.SwAccessibleHeaderView
 #i89022 -o sw.SwAccessiblePageView
 -o sw.SwAccessibleParagraphView
@@ -18,25 +18,25 @@
 -o sw.SwXAutoTextContainer
 -o sw.SwXAutoTextEntry
 -o sw.SwXAutoTextGroup
-#i111185 -o sw.SwXBodyText
+-o sw.SwXBodyText
 -o sw.SwXBookmark
 -o sw.SwXBookmarks
 -o sw.SwXCell
 -o sw.SwXCellRange
 -o sw.SwXChapterNumbering
-#i111185 -o sw.SwXDocumentIndex
-#i111185 -o sw.SwXDocumentIndexMark
+-o sw.SwXDocumentIndex
+-o sw.SwXDocumentIndexMark
 -o sw.SwXDocumentIndexes
 -o sw.SwXDrawPage
-#i111185 -o sw.SwXEndnoteProperties
+-o sw.SwXEndnoteProperties
 -o sw.SwXFieldEnumeration
 -o sw.SwXFieldMaster
-#i111185 -o sw.SwXFootnote
-#i111185 -o sw.SwXFootnoteProperties
-#i111185 -o sw.SwXFootnoteText
-#i111185 -o sw.SwXFootnotes
+-o sw.SwXFootnote
+-o sw.SwXFootnoteProperties
+-o sw.SwXFootnoteText
+-o sw.SwXFootnotes
 -o sw.SwXFrames
-#i111185 -o sw.SwXHeadFootText
+-o sw.SwXHeadFootText
 -o sw.SwXLineNumberingProperties
 #i85640 -o sw.SwXMailMerge
 -o sw.SwXModule
@@ -51,20 +51,20 @@
 #i111190 -o sw.SwXShape
 -o sw.SwXStyleFamilies
 -o sw.SwXStyleFamily
-#i111185 -o sw.SwXTableCellText
+-o sw.SwXTableCellText
 -o sw.SwXTableColumns
 -o sw.SwXTableRows
 -o sw.SwXTextColumns
 -o sw.SwXTextCursor
 #i89021 -o sw.SwXTextDefaults
-#i111185 -o sw.SwXTextDocument
+-o sw.SwXTextDocument
 -o sw.SwXTextEmbeddedObject
 -o sw.SwXTextEmbeddedObjects
 -o sw.SwXTextField
 -o sw.SwXTextFieldMasters
 -o sw.SwXTextFieldTypes
 -o sw.SwXTextFrame
-#i111185 -o sw.SwXTextFrameText
+-o sw.SwXTextFrameText
 -o sw.SwXTextGraphicObject
 -o sw.SwXTextGraphicObjects
 #i103696 -o sw.SwXTextPortion
diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx
@@ -53,8 +53,6 @@
 #include <viewsh.hxx>
 #include <vcl/window.hxx>
 
-#define POSTITMGR ((ViewShell*)pNode->GetDoc()->GetDocShell()->GetWrtShell())->GetPostItMgr()
-
 using namespace ::com::sun::star;
 using namespace util;
 
@@ -333,9 +331,13 @@ BYTE SwPaM::Find( const SearchOptions& rSearchOpt, BOOL bSearchInNotes , utl::Te
 
             }
 
+            SwDocShell *const pDocShell = pNode->GetDoc()->GetDocShell();
+            ViewShell *const pWrtShell = (pDocShell) ? (ViewShell*)(pDocShell->GetWrtShell()) : 0;
+            SwPostItMgr *const pPostItMgr = (pWrtShell) ? pWrtShell->GetPostItMgr() : 0;
+
             xub_StrLen aStart = 0;
             // do we need to finish a note?
-            if (POSTITMGR->HasActiveSidebarWin())
+            if (pPostItMgr && pPostItMgr->HasActiveSidebarWin())
             {
                 if (bSearchInNotes)
                 {
@@ -347,15 +349,15 @@ BYTE SwPaM::Find( const SearchOptions& rSearchOpt, BOOL bSearchInNotes , utl::Te
                             --aNumberPostits;
                     }
                     //search inside and finsih and put focus back into the doc
-                    if (POSTITMGR->FinishSearchReplace(rSearchOpt,bSrchForward))
+                    if (pPostItMgr->FinishSearchReplace(rSearchOpt,bSrchForward))
                     {
                         bFound = true ;
                         break;
                     }
                 }
                 else
                 {
-                    POSTITMGR->SetActiveSidebarWin(0);
+                    pPostItMgr->SetActiveSidebarWin(0);
                 }
             }
 
@@ -391,7 +393,7 @@ BYTE SwPaM::Find( const SearchOptions& rSearchOpt, BOOL bSearchInNotes , utl::Te
                         if ( (bSrchForward && (GetPostIt(aLoop + aIgnore,pHts) < pHts->Count()) ) || ( !bSrchForward && (aLoop!=0) ))
                         {
                             const SwTxtAttr* pTxtAttr = bSrchForward ?  (*pHts)[GetPostIt(aLoop+aIgnore,pHts)] : (*pHts)[GetPostIt(aLoop+aIgnore-1,pHts)];
-                            if ( POSTITMGR->SearchReplace(((SwTxtFld*)pTxtAttr)->GetFld(),rSearchOpt,bSrchForward) )
+                            if ( pPostItMgr && pPostItMgr->SearchReplace(((SwTxtFld*)pTxtAttr)->GetFld(),rSearchOpt,bSrchForward) )
                             {
                                 bFound = true ;
                                 break;
diff --git a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
@@ -213,9 +213,11 @@ void SwToCntntAnchoredObjectPosition::CalcPosition()
                    !GetAnchoredObj().GetLastCharRect().Width() ) ||
                  !GetAnchoredObj().GetLastTopOfLine() )
             {
-                // --> OD 2004-07-15 #117380# - suppress check for paragraph
-                // portion information by passing <false> as first parameter
-                GetAnchoredObj().CheckCharRectAndTopOfLine( false );
+                // --> OD 2010-07-02 #i111886#
+                // Check existence of paragraph portion information in order
+                // to avoid formatting which could cause deletion of follow frames.
+                GetAnchoredObj().CheckCharRectAndTopOfLine();
+                // <--
                 // OD 2005-01-12 - Due to table break algorithm the character
                 // rectangle can have no height. Thus, check also the width
                 if ( ( !GetAnchoredObj().GetLastCharRect().Height() &&
diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx
@@ -194,6 +194,10 @@ SwTabPortion *SwTxtFormatter::NewTabPortion( SwTxtFormatInfo &rInf, bool bAuto )
             }
             SwTwips nCount = nSearchPos;
 
+            //Minimum tab stop width is 1
+            if (nDefTabDist <= 0)
+                nDefTabDist = 1;
+
             nCount /= nDefTabDist;
             nNextPos = nCount < 0 || (!nCount && nSearchPos <= 0)? nCount * nDefTabDist :( nCount + 1 ) * nDefTabDist ;
             // --> FME 2004-09-21 #117919 Minimum tab stop width is 1 or 51 twips:
diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx
@@ -367,7 +367,8 @@ class SwXDocumentIndex::Impl
             *aSwMapProvider.GetPropertySet(lcl_TypeToPropertyMap_Index(eType)))
         , m_eTOXType(eType)
         , m_ListenerContainer(static_cast< ::cppu::OWeakObject* >(&rThis))
-        , m_bIsDescriptor(0 == pBaseSection)
+        // #i111177# unxsols4 (Sun C++ 5.9 SunOS_sparc) may generate wrong code
+        , m_bIsDescriptor((0 == pBaseSection) ? true : false)
         , m_pDoc(&rDoc)
         , m_pProps((m_bIsDescriptor)
             ? new SwDocIndexDescriptorProperties_Impl(rDoc.GetTOXType(eType, 0))
@@ -1625,7 +1626,9 @@ class SwXDocumentIndexMark::Impl
             *aSwMapProvider.GetPropertySet(lcl_TypeToPropertyMap_Mark(eType)))
         , m_eTOXType(eType)
         , m_ListenerContainer(static_cast< ::cppu::OWeakObject* >(&rThis))
-        , m_bIsDescriptor(0 == pMark)
+// #i112513#: unxsols4 (Sun C++ 5.9 SunOS_sparc) generates wrong code for this
+//        , m_bIsDescriptor(0 == pMark)
+        , m_bIsDescriptor((0 == pMark) ? true : false)
         , m_TypeDepend(this, pType)
         , m_pTOXMark(pMark)
         , m_pDoc(pDoc)
diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx
@@ -139,7 +139,8 @@ class SwXParagraph::Impl
         , m_rThis(rThis)
         , m_ListenerContainer(static_cast< ::cppu::OWeakObject* >(&rThis))
         , m_rPropSet(*aSwMapProvider.GetPropertySet(PROPERTY_MAP_PARAGRAPH))
-        , m_bIsDescriptor(0 == pTxtNode)
+        // #i111177# unxsols4 (Sun C++ 5.9 SunOS_sparc) may generate wrong code
+        , m_bIsDescriptor((0 == pTxtNode) ? true : false)
         , m_nSelectionStartPos(nSelStart)
         , m_nSelectionEndPos(nSelEnd)
         , m_xParentText(xParent)
diff --git a/sw/source/core/unocore/unorefmk.cxx b/sw/source/core/unocore/unorefmk.cxx
@@ -68,7 +68,8 @@ class SwXReferenceMark::Impl
             SwDoc *const pDoc, SwFmtRefMark const*const pRefMark)
         : SwClient((pDoc) ? pDoc->GetUnoCallBack() : 0)
         , m_ListenerContainer(static_cast< ::cppu::OWeakObject* >(&rThis))
-        , m_bIsDescriptor(0 == pRefMark)
+        // #i111177# unxsols4 (Sun C++ 5.9 SunOS_sparc) may generate wrong code
+        , m_bIsDescriptor((0 == pRefMark) ? true : false)
         , m_pDoc(pDoc)
         , m_pMarkFmt(pRefMark)
     {
@@ -762,7 +763,8 @@ class SwXMeta::Impl
         , m_ListenerContainer(static_cast< ::cppu::OWeakObject* >(&rThis))
         , m_pTextPortions( pPortions )
         , m_bIsDisposed( false )
-        , m_bIsDescriptor(0 == pMeta)
+        // #i111177# unxsols4 (Sun C++ 5.9 SunOS_sparc) may generate wrong code
+        , m_bIsDescriptor((0 == pMeta) ? true : false)
         , m_xParentText(xParentText)
         , m_Text(rDoc, rThis)
     {
diff --git a/sw/source/core/unocore/unosect.cxx b/sw/source/core/unocore/unosect.cxx
@@ -136,7 +136,8 @@ class SwXTextSection::Impl
         , m_rPropSet(*aSwMapProvider.GetPropertySet(PROPERTY_MAP_SECTION))
         , m_ListenerContainer(static_cast< ::cppu::OWeakObject* >(&rThis))
         , m_bIndexHeader(bIndexHeader)
-        , m_bIsDescriptor(0 == pFmt)
+        // #i111177# unxsols4 (Sun C++ 5.9 SunOS_sparc) may generate wrong code
+        , m_bIsDescriptor((0 == pFmt) ? true : false)
         , m_pProps((pFmt) ? 0 : new SwTextSectionProperties_Impl())
     {
     }
diff --git a/sw/source/filter/rtf/rtftbl.cxx b/sw/source/filter/rtf/rtftbl.cxx
@@ -288,7 +288,12 @@ void SwRTFParser::ReadTable( int nToken )
             break;
 
         case RTF_CLMRG:
-            aMergeBoxes[ nBoxCnt ] = TRUE;
+            // would crash later on reading \cellx (#i112657#):
+            // the first cell cannot be merged with earlier ones.
+            if (nBoxCnt != 0)
+            {
+                aMergeBoxes[ nBoxCnt ] = TRUE;
+            }
             break;
 
         case RTF_CELLX:
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
@@ -1509,15 +1509,15 @@ void WW8TabBandDesc::ProcessSpacing(const BYTE* pParams)
         return;
     mbHasSpacing=true;
 #ifdef DBG_UTIL
-    BYTE nWhichCell =
-#endif
-            *pParams++;
+    BYTE nWhichCell = *pParams;
     ASSERT(nWhichCell == 0, "Expected cell to be 0!");
-    *pParams++; //unknown byte
+#endif
+    ++pParams; //Skip which cell
+    ++pParams; //unknown byte
 
     BYTE nSideBits = *pParams++;
     ASSERT(nSideBits < 0x10, "Unexpected value for nSideBits");
-    *pParams++; //unknown byte
+    ++pParams; //unknown byte
     USHORT nValue =  SVBT16ToShort( pParams );
     for (int i = wwTOP; i <= wwRIGHT; i++)
     {
@@ -1555,18 +1555,18 @@ void WW8TabBandDesc::ProcessSpecificSpacing(const BYTE* pParams)
     if (nWhichCell >= MAX_COL + 1)
         return;
 
-    *pParams++; //unknown byte
+    ++pParams; //unknown byte
     BYTE nSideBits = *pParams++;
     ASSERT(nSideBits < 0x10, "Unexpected value for nSideBits");
     nOverrideSpacing[nWhichCell] |= nSideBits;
 
     ASSERT(nOverrideSpacing[nWhichCell] < 0x10,
         "Unexpected value for nSideBits");
 #ifdef DBG_UTIL
-    BYTE nUnknown2 =
-#endif
-            *pParams++;
+    BYTE nUnknown2 = *pParams;
     ASSERT(nUnknown2 == 0x3, "Unexpected value for spacing2");
+#endif
+    ++pParams;
     USHORT nValue =  SVBT16ToShort( pParams );
 
     for (int i=0; i < 4; i++)
diff --git a/sw/source/ui/app/docsh.cxx b/sw/source/ui/app/docsh.cxx
@@ -1399,7 +1399,7 @@ bool SwDocShell::SetProtectionPassword( const String &rNewPassword )
     IDocumentRedlineAccess* pIDRA = pWrtShell->getIDocumentRedlineAccess();
     Sequence< sal_Int8 > aPasswd = pIDRA->GetRedlinePassword();
     if (pArgs && SFX_ITEM_SET == pArgs->GetItemState( FN_REDLINE_PROTECT, FALSE, &pItem )
-        && ((SfxBoolItem*)pItem)->GetValue() == aPasswd.getLength() > 0)
+        && ((SfxBoolItem*)pItem)->GetValue() == (aPasswd.getLength() > 0))
         return false;
 
     bool bRes = false;
diff --git a/sw/source/ui/docvw/SidebarTxtControlAcc.cxx b/sw/source/ui/docvw/SidebarTxtControlAcc.cxx
@@ -80,7 +80,7 @@ class SidebarTextEditSource : public SvxEditSource,
 SidebarTextEditSource::SidebarTextEditSource( SidebarTxtControl& rSidebarTxtControl )
     : SvxEditSource()
     , mrSidebarTxtControl( rSidebarTxtControl )
-    , mTextForwarder( *(rSidebarTxtControl.GetTextView()->GetOutliner()), NULL )
+    , mTextForwarder( *(rSidebarTxtControl.GetTextView()->GetOutliner()), FALSE )
     , mViewForwarder( *(rSidebarTxtControl.GetTextView()) )
 {
     if ( mrSidebarTxtControl.GetTextView() )

Original file line number	Diff line number	Diff line change
`@@ -53,8 +53,6 @@`
`53`	`53`	`#include <viewsh.hxx>`
`54`	`54`	`#include <vcl/window.hxx>`
`55`	`55`
`56`		`-#define POSTITMGR ((ViewShell*)pNode->GetDoc()->GetDocShell()->GetWrtShell())->GetPostItMgr()`
`57`		`-`
`58`	`56`	`using namespace ::com::sun::star;`
`59`	`57`	`using namespace util;`
`60`	`58`
`@@ -333,9 +331,13 @@ BYTE SwPaM::Find( const SearchOptions& rSearchOpt, BOOL bSearchInNotes , utl::Te`
`333`	`331`
`334`	`332`	`}`
`335`	`333`
	`334`	`+ SwDocShell *const pDocShell = pNode->GetDoc()->GetDocShell();`
	`335`	`+ ViewShell const pWrtShell = (pDocShell) ? (ViewShell)(pDocShell->GetWrtShell()) : 0;`
	`336`	`+ SwPostItMgr *const pPostItMgr = (pWrtShell) ? pWrtShell->GetPostItMgr() : 0;`
	`337`	`+`
`336`	`338`	`xub_StrLen aStart = 0;`
`337`	`339`	`// do we need to finish a note?`
`338`		`- if (POSTITMGR->HasActiveSidebarWin())`
	`340`	`+ if (pPostItMgr && pPostItMgr->HasActiveSidebarWin())`
`339`	`341`	`{`
`340`	`342`	`if (bSearchInNotes)`
`341`	`343`	`{`
`@@ -347,15 +349,15 @@ BYTE SwPaM::Find( const SearchOptions& rSearchOpt, BOOL bSearchInNotes , utl::Te`
`347`	`349`	`--aNumberPostits;`
`348`	`350`	`}`
`349`	`351`	`//search inside and finsih and put focus back into the doc`
`350`		`- if (POSTITMGR->FinishSearchReplace(rSearchOpt,bSrchForward))`
	`352`	`+ if (pPostItMgr->FinishSearchReplace(rSearchOpt,bSrchForward))`
`351`	`353`	`{`
`352`	`354`	`bFound = true ;`
`353`	`355`	`break;`
`354`	`356`	`}`
`355`	`357`	`}`
`356`	`358`	`else`
`357`	`359`	`{`
`358`		`- POSTITMGR->SetActiveSidebarWin(0);`
	`360`	`+ pPostItMgr->SetActiveSidebarWin(0);`
`359`	`361`	`}`
`360`	`362`	`}`
`361`	`363`
`@@ -391,7 +393,7 @@ BYTE SwPaM::Find( const SearchOptions& rSearchOpt, BOOL bSearchInNotes , utl::Te`
`391`	`393`	`if ( (bSrchForward && (GetPostIt(aLoop + aIgnore,pHts) < pHts->Count()) ) \|\| ( !bSrchForward && (aLoop!=0) ))`
`392`	`394`	`{`
`393`	`395`	`const SwTxtAttr* pTxtAttr = bSrchForward ? (pHts)[GetPostIt(aLoop+aIgnore,pHts)] : (pHts)[GetPostIt(aLoop+aIgnore-1,pHts)];`
`394`		`- if ( POSTITMGR->SearchReplace(((SwTxtFld*)pTxtAttr)->GetFld(),rSearchOpt,bSrchForward) )`
	`396`	`+ if ( pPostItMgr && pPostItMgr->SearchReplace(((SwTxtFld*)pTxtAttr)->GetFld(),rSearchOpt,bSrchForward) )`
`395`	`397`	`{`
`396`	`398`	`bFound = true ;`
`397`	`399`	`break;`
Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,8 @@ class SwXTextSection::Impl`
`136`	`136`	`, m_rPropSet(*aSwMapProvider.GetPropertySet(PROPERTY_MAP_SECTION))`
`137`	`137`	`, m_ListenerContainer(static_cast< ::cppu::OWeakObject* >(&rThis))`
`138`	`138`	`, m_bIndexHeader(bIndexHeader)`
`139`		`- , m_bIsDescriptor(0 == pFmt)`
	`139`	`+ // #i111177# unxsols4 (Sun C++ 5.9 SunOS_sparc) may generate wrong code`
	`140`	`+ , m_bIsDescriptor((0 == pFmt) ? true : false)`
`140`	`141`	`, m_pProps((pFmt) ? 0 : new SwTextSectionProperties_Impl())`
`141`	`142`	`{`
`142`	`143`	`}`