diff options
134 files changed, 200 insertions, 3906 deletions
diff --git a/sw/inc/calbck.hxx b/sw/inc/calbck.hxx index 17e01f2b78b2..94648f650470 100644 --- a/sw/inc/calbck.hxx +++ b/sw/inc/calbck.hxx @@ -74,7 +74,6 @@ class SW_DLLPUBLIC SwClient : ::boost::noncopyable friend class SwModify; friend class SwClientIter; -<<<<<<< local SwClient *pLeft, *pRight; // double-linked list of other clients SwModify *pRegisteredIn; // event source @@ -88,17 +87,6 @@ class SW_DLLPUBLIC SwClient : ::boost::noncopyable // mba: IMHO these methods should be pure virtual virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew); virtual void SwClientNotify( const SwModify& rModify, const SfxHint& rHint ); -======= - SwClient *pLeft, *pRight; // fuer die AVL-Sortierung - sal_Bool bModifyLocked : 1; // wird in SwModify::Modify benutzt, - // eigentlich ein Member des SwModify - // aber aus Platzgruenden hier. - sal_Bool bInModify : 1; // ist in einem Modify. (Debug!!!) - sal_Bool bInDocDTOR : 1; // Doc wird zerstoert, nicht "abmelden" - sal_Bool bInCache : 1; // Ist im BorderAttrCache des Layout, - // Traegt sich dann im Modify aus! - sal_Bool bInSwFntCache : 1; // Ist im SwFont-Cache der Formatierung ->>>>>>> other protected: // single argument ctors shall be explicit. @@ -128,37 +116,13 @@ public: // needed for class SwClientIter TYPEINFO(); -<<<<<<< local // get information about attribute - virtual BOOL GetInfo( SfxPoolItem& ) const; -======= - void LockModify() { bModifyLocked = sal_True; } - void UnlockModify() { bModifyLocked = sal_False; } - void SetInCache( sal_Bool bNew ) { bInCache = bNew; } - void SetInSwFntCache( sal_Bool bNew ) { bInSwFntCache = bNew; } - sal_Bool IsModifyLocked() const { return bModifyLocked; } - sal_Bool IsInDocDTOR() const { return bInDocDTOR; } - sal_Bool IsInCache() const { return bInCache; } - sal_Bool IsInSwFntCache() const { return bInSwFntCache; } - - // erfrage vom Client Informationen virtual sal_Bool GetInfo( SfxPoolItem& ) const; - -private: - SwClient( const SwClient& ); - SwClient &operator=( const SwClient& ); ->>>>>>> other }; inline SwClient::SwClient() : -<<<<<<< local pLeft(0), pRight(0), pRegisteredIn(0), mbIsAllowedToBeRemovedInModifyCall(false) {} -======= - pLeft(0), pRight(0), pRegisteredIn(0) -{ bModifyLocked = bInModify = bInDocDTOR = bInCache = bInSwFntCache = sal_False; } - ->>>>>>> other // ---------- // SwModify @@ -200,37 +164,21 @@ public: SwClient* Remove(SwClient *pDepend); const SwClient* GetDepends() const { return pRoot; } -<<<<<<< local // get information about attribute - virtual BOOL GetInfo( SfxPoolItem& ) const; -======= - // erfrage vom Client Informationen virtual sal_Bool GetInfo( SfxPoolItem& ) const; ->>>>>>> other -<<<<<<< local - void LockModify() { bModifyLocked = TRUE; } - void UnlockModify() { bModifyLocked = FALSE; } + void LockModify() { bModifyLocked = sal_True; } + void UnlockModify() { bModifyLocked = sal_False; } void SetInCache( BOOL bNew ) { bInCache = bNew; } void SetInSwFntCache( BOOL bNew ) { bInSwFntCache = bNew; } - void SetInDocDTOR() { bInDocDTOR = TRUE; } - BOOL IsModifyLocked() const { return bModifyLocked; } - BOOL IsInDocDTOR() const { return bInDocDTOR; } - BOOL IsInCache() const { return bInCache; } - BOOL IsInSwFntCache() const { return bInSwFntCache; } -======= - void SetInDocDTOR() { bInDocDTOR = sal_True; } ->>>>>>> other + void SetInDocDTOR() { bInDocDTOR = sal_True; } + sal_Bool IsModifyLocked() const { return bModifyLocked; } + sal_Bool IsInDocDTOR() const { return bInDocDTOR; } + sal_Bool IsInCache() const { return bInCache; } + sal_Bool IsInSwFntCache() const { return bInSwFntCache; } void CheckCaching( const sal_uInt16 nWhich ); - -<<<<<<< local bool IsLastDepend() { return pRoot && pRoot->IsLast(); } -======= - sal_Bool IsLastDepend() const - { return pRoot && !pRoot->pLeft && !pRoot->pRight; } ->>>>>>> other - int GetClientCount() const; }; @@ -251,12 +199,7 @@ public: SwClient* GetToTell() { return pToTell; } -<<<<<<< local - virtual BOOL GetInfo( SfxPoolItem & ) const; -======= - // erfrage vom Client Informationen virtual sal_Bool GetInfo( SfxPoolItem & ) const; ->>>>>>> other protected: virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNewValue ); diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx index 69bbb7e82143..6dbb2fbc3fe7 100644 --- a/sw/inc/crsrsh.hxx +++ b/sw/inc/crsrsh.hxx @@ -337,15 +337,10 @@ public: SwCrsrShell( SwCrsrShell& rShell, Window *pWin ); virtual ~SwCrsrShell(); -<<<<<<< local -======= - virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew); - // IShellCursorSupplier virtual SwPaM & CreateNewShellCursor(); virtual SwPaM & GetCurrentShellCursor(); ->>>>>>> other // neuen Cusror erzeugen und den alten anhaengen SwPaM * CreateCrsr(); // loesche den aktuellen Cursor und der folgende wird zum Aktuellen diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx index 037002afbd20..cf475663c5cd 100644 --- a/sw/inc/docsh.hxx +++ b/sw/inc/docsh.hxx @@ -278,11 +278,7 @@ public: void EnterWait( sal_Bool bLockDispatcher ); void LeaveWait( sal_Bool bLockDispatcher ); -<<<<<<< local - void ToggleBrowserMode(BOOL bOn, SwView* pView); -======= - void ToggleBrowserMode(sal_Bool bOn, SwView* pView = 0); ->>>>>>> other + void ToggleBrowserMode(sal_Bool bOn, SwView* pView); sal_uLong LoadStylesFromFile( const String& rURL, SwgReaderOption& rOpt, sal_Bool bUnoCall ); diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx index 70dbd5c0576e..4889288caf09 100644 --- a/sw/inc/docufld.hxx +++ b/sw/inc/docufld.hxx @@ -688,15 +688,7 @@ protected: public: SwRefPageGetFieldType( SwDoc* pDoc ); virtual SwFieldType* Copy() const; -<<<<<<< local - USHORT MakeSetList( _SetGetExpFlds& rTmpLst ); -======= - - // ueberlagert, um alle RefPageGet-Felder zu updaten - virtual void Modify( SfxPoolItem *, SfxPoolItem * ); sal_uInt16 MakeSetList( _SetGetExpFlds& rTmpLst ); - ->>>>>>> other SwDoc* GetDoc() const { return pDoc; } }; diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx index 567e92b84e9b..3d3169fcf27a 100644 --- a/sw/inc/expfld.hxx +++ b/sw/inc/expfld.hxx @@ -160,19 +160,13 @@ class SW_DLLPUBLIC SwSetExpFieldType : public SwValueFieldType { String sName; const SwNode* pOutlChgNd; -// sal_Unicode cDelim; String sDelim; -<<<<<<< local - USHORT nType; - BYTE nLevel; - BOOL bDeleted; -protected: - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ); -======= sal_uInt16 nType; sal_uInt8 nLevel; sal_Bool bDeleted; ->>>>>>> other + +protected: + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ); public: SwSetExpFieldType( SwDoc* pDoc, const String& rName, diff --git a/sw/inc/fchrfmt.hxx b/sw/inc/fchrfmt.hxx index 0fa469cbd046..53de41c11e3b 100644 --- a/sw/inc/fchrfmt.hxx +++ b/sw/inc/fchrfmt.hxx @@ -75,13 +75,7 @@ public: virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - // an das SwTxtCharFmt weiterleiten (vom SwClient) -<<<<<<< local - virtual BOOL GetInfo( SfxPoolItem& rInfo ) const; -======= - virtual void Modify( SfxPoolItem*, SfxPoolItem* ); virtual sal_Bool GetInfo( SfxPoolItem& rInfo ) const; ->>>>>>> other void SetCharFmt( SwFmt* pFmt ) { pFmt->Add(this); } SwCharFmt* GetCharFmt() const { return (SwCharFmt*)GetRegisteredIn(); } diff --git a/sw/inc/fmtfld.hxx b/sw/inc/fmtfld.hxx index a0534c01573f..372fa82fe5e7 100644 --- a/sw/inc/fmtfld.hxx +++ b/sw/inc/fmtfld.hxx @@ -74,12 +74,7 @@ public: virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; -<<<<<<< local - virtual BOOL GetInfo( SfxPoolItem& rInfo ) const; -======= - virtual void Modify( SfxPoolItem* pOld, SfxPoolItem* pNew ); virtual sal_Bool GetInfo( SfxPoolItem& rInfo ) const; ->>>>>>> other const SwField *GetFld() const { return pField; } SwField *GetFld() { return pField; } @@ -97,14 +92,9 @@ public: const SwTxtFld *GetTxtFld() const { return pTxtAttr; } SwTxtFld *GetTxtFld() { return pTxtAttr; } -<<<<<<< local - BOOL IsFldInDoc() const; - BOOL IsProtect() const; void RegisterToFieldType( SwFieldType& ); -======= sal_Bool IsFldInDoc() const; sal_Bool IsProtect() const; ->>>>>>> other }; class SW_DLLPUBLIC SwFmtFldHint : public SfxHint diff --git a/sw/inc/fmthdft.hxx b/sw/inc/fmthdft.hxx index 9db05e8c7ac1..73a56a283a2b 100644 --- a/sw/inc/fmthdft.hxx +++ b/sw/inc/fmthdft.hxx @@ -64,14 +64,9 @@ public: const SwFrmFmt *GetHeaderFmt() const { return (SwFrmFmt*)GetRegisteredIn(); } SwFrmFmt *GetHeaderFmt() { return (SwFrmFmt*)GetRegisteredIn(); } -<<<<<<< local - BOOL IsActive() const { return bActive; } - void SetActive( BOOL bNew = TRUE ) { bActive = bNew; } void RegisterToFormat( SwFmt& rFmt ); -======= sal_Bool IsActive() const { return bActive; } void SetActive( sal_Bool bNew = sal_True ) { bActive = bNew; } ->>>>>>> other }; @@ -103,22 +98,12 @@ public: const SwFrmFmt *GetFooterFmt() const { return (SwFrmFmt*)GetRegisteredIn(); } SwFrmFmt *GetFooterFmt() { return (SwFrmFmt*)GetRegisteredIn(); } -<<<<<<< local - BOOL IsActive() const { return bActive; } - void SetActive( BOOL bNew = TRUE ) { bActive = bNew; } void RegisterToFormat( SwFmt& rFmt ); -======= sal_Bool IsActive() const { return bActive; } void SetActive( sal_Bool bNew = sal_True ) { bActive = bNew; } ->>>>>>> other }; -<<<<<<< local - -inline const SwFmtHeader &SwAttrSet::GetHeader(BOOL bInP) const -======= inline const SwFmtHeader &SwAttrSet::GetHeader(sal_Bool bInP) const ->>>>>>> other { return (const SwFmtHeader&)Get( RES_HEADER,bInP); } inline const SwFmtFooter &SwAttrSet::GetFooter(sal_Bool bInP) const { return (const SwFmtFooter&)Get( RES_FOOTER,bInP); } diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx index 64a8aa1dc5d9..b553c9eadbd2 100644 --- a/sw/inc/format.hxx +++ b/sw/inc/format.hxx @@ -111,13 +111,8 @@ public: virtual sal_uInt16 ResetAllFmtAttr(); // <-- -<<<<<<< local inline SwFmt* DerivedFrom() const { return (SwFmt*)GetRegisteredIn(); } - inline BOOL IsDefault() const { return DerivedFrom() == 0; } -======= - inline SwFmt* DerivedFrom() const { return (SwFmt*)pRegisteredIn; } inline sal_Bool IsDefault() const { return DerivedFrom() == 0; } ->>>>>>> other inline const String& GetName() const { return aFmtName; } void SetName( const String& rNewName, sal_Bool bBroadcast=sal_False ); diff --git a/sw/inc/reffld.hxx b/sw/inc/reffld.hxx index e2b1f5bbb97b..daf690861260 100644 --- a/sw/inc/reffld.hxx +++ b/sw/inc/reffld.hxx @@ -72,6 +72,9 @@ enum REFERENCEMARK class SwGetRefFieldType : public SwFieldType { SwDoc* pDoc; +protected: + // ueberlagert, um alle Ref-Felder zu updaten + virtual void Modify( const SfxPoolItem*, const SfxPoolItem * ); public: SwGetRefFieldType(SwDoc* pDoc ); virtual SwFieldType* Copy() const; @@ -81,16 +84,8 @@ public: void MergeWithOtherDoc( SwDoc& rDestDoc ); static SwTxtNode* FindAnchor( SwDoc* pDoc, const String& rRefMark, -<<<<<<< local - USHORT nSubType, USHORT nSeqNo, - USHORT* pStt, USHORT* pEnd = 0 ); -protected: - // ueberlagert, um alle Ref-Felder zu updaten - virtual void Modify( const SfxPoolItem*, const SfxPoolItem * ); -======= sal_uInt16 nSubType, sal_uInt16 nSeqNo, sal_uInt16* pStt, sal_uInt16* pEnd = 0 ); ->>>>>>> other }; /*-------------------------------------------------------------------- diff --git a/sw/inc/swcrsr.hxx b/sw/inc/swcrsr.hxx index d9cb307e5ad8..01087cf0b3ef 100644 --- a/sw/inc/swcrsr.hxx +++ b/sw/inc/swcrsr.hxx @@ -127,17 +127,6 @@ public: const SfxItemSet* rReplSet = 0 ); // UI versions -<<<<<<< local - BOOL IsStartWord( sal_Int16 nWordType = com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ) const; - BOOL IsEndWord( sal_Int16 nWordType = com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ) const; - BOOL IsInWord( sal_Int16 nWordType = com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ) const; - BOOL IsStartEndSentence( bool bEnd ) const; - BOOL GoStartWord(); - BOOL GoEndWord(); - BOOL GoNextWord(); - BOOL GoPrevWord(); - BOOL SelectWord( ViewShell* pViewShell, const Point* pPt = 0 ); -======= sal_Bool IsStartWord( sal_Int16 nWordType = com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ) const; sal_Bool IsEndWord( sal_Int16 nWordType = com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ) const; sal_Bool IsInWord( sal_Int16 nWordType = com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ) const; @@ -147,20 +136,9 @@ public: sal_Bool GoNextWord(); sal_Bool GoPrevWord(); sal_Bool SelectWord( const Point* pPt = 0 ); ->>>>>>> other // API versions of above functions (will be used with a different // WordType for the break iterator) -<<<<<<< local - BOOL IsStartWordWT( sal_Int16 nWordType ) const; - BOOL IsEndWordWT( sal_Int16 nWordType ) const; - BOOL IsInWordWT( sal_Int16 nWordType ) const; - BOOL GoStartWordWT( sal_Int16 nWordType ); - BOOL GoEndWordWT( sal_Int16 nWordType ); - BOOL GoNextWordWT( sal_Int16 nWordType ); - BOOL GoPrevWordWT( sal_Int16 nWordType ); - BOOL SelectWordWT( ViewShell* pViewShell, sal_Int16 nWordType, const Point* pPt = 0 ); -======= sal_Bool IsStartWordWT( sal_Int16 nWordType ) const; sal_Bool IsEndWordWT( sal_Int16 nWordType ) const; sal_Bool IsInWordWT( sal_Int16 nWordType ) const; @@ -169,7 +147,6 @@ public: sal_Bool GoNextWordWT( sal_Int16 nWordType ); sal_Bool GoPrevWordWT( sal_Int16 nWordType ); sal_Bool SelectWordWT( sal_Int16 nWordType, const Point* pPt = 0 ); ->>>>>>> other enum SentenceMoveType { diff --git a/sw/inc/txtatr.hxx b/sw/inc/txtatr.hxx index ee41569cf50a..6990f07c42a5 100644 --- a/sw/inc/txtatr.hxx +++ b/sw/inc/txtatr.hxx @@ -45,15 +45,9 @@ public: SwTxtCharFmt( SwFmtCharFmt& rAttr, xub_StrLen nStart, xub_StrLen nEnd ); virtual ~SwTxtCharFmt( ); -<<<<<<< local // werden vom SwFmtCharFmt hierher weitergeleitet (no derivation from SwClient!) void ModifyNotification( const SfxPoolItem*, const SfxPoolItem* ); bool GetInfo( SfxPoolItem& rInfo ) const; -======= - // werden vom SwFmtCharFmt hierher weitergeleitet - virtual void Modify( SfxPoolItem*, SfxPoolItem* ); // SwClient - virtual sal_Bool GetInfo( SfxPoolItem& rInfo ) const; ->>>>>>> other // get and set TxtNode pointer void ChgTxtNode( SwTxtNode* pNew ) { m_pTxtNode = pNew; } @@ -101,12 +95,7 @@ public: virtual ~SwTxtRuby(); TYPEINFO(); -<<<<<<< local - virtual BOOL GetInfo( SfxPoolItem& rInfo ) const; -======= - virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew); virtual sal_Bool GetInfo( SfxPoolItem& rInfo ) const; ->>>>>>> other SW_DLLPRIVATE void InitRuby(SwTxtNode & rNode); diff --git a/sw/inc/txtinet.hxx b/sw/inc/txtinet.hxx index c5459453604e..5ea0df9fe3b2 100644 --- a/sw/inc/txtinet.hxx +++ b/sw/inc/txtinet.hxx @@ -50,12 +50,7 @@ public: virtual ~SwTxtINetFmt(); TYPEINFO(); -<<<<<<< local - virtual BOOL GetInfo( SfxPoolItem& rInfo ) const; -======= - virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew); virtual sal_Bool GetInfo( SfxPoolItem& rInfo ) const; ->>>>>>> other SW_DLLPRIVATE void InitINetFmt(SwTxtNode & rNode); diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx index 76cc31ba4c4f..9d447c18034f 100644 --- a/sw/inc/undobj.hxx +++ b/sw/inc/undobj.hxx @@ -234,471 +234,7 @@ public: class SwUndoInsLayFmt; -<<<<<<< local -public: - SwUndoStart( SwUndoId nId ); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - virtual void Repeat( SwUndoIter& ); - - // -> #111827# - virtual String GetComment() const; - void SetRewriter(const SwRewriter & rRewriter); - virtual SwRewriter GetRewriter() const; - // <- #111827# - - virtual SwUndoId GetEffectiveId() const; - SwUndoId GetUserId() const { return nUserId; } - // Setzen vom End-Undo-Offset geschieht im Doc::EndUndo - USHORT GetEndOffset() const { return nEndOffset; } - void SetEndOffset( USHORT n ) { nEndOffset = n; } -}; - -class SwUndoEnd: public SwUndo -{ - // Um innerhalb von Undo zuerkennen, wann ein Ende vorliegt, gibt - // GetId() immer die UNDO_END zurueck. Die UserId kann ueber - // GetUserId() erfragt werden. - SwUndoId nUserId; - // fuer die "Verpointerung" von Start- und End-Undos - USHORT nSttOffset; - - SwRewriter mRewriter; - -public: - SwUndoEnd( SwUndoId nId ); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - virtual void Repeat( SwUndoIter& ); - - // -> #111827# - virtual String GetComment() const; - void SetRewriter(const SwRewriter & rRewriter); - virtual SwRewriter GetRewriter() const; - // <- #111827# - - virtual SwUndoId GetEffectiveId() const; - SwUndoId GetUserId() const { return nUserId; } - - // Setzen vom Start-Undo-Offset geschieht im Doc::EndUndo - void SetSttOffset(USHORT _nSttOffSet) { nSttOffset = _nSttOffSet; } - USHORT GetSttOffset() const { return nSttOffset; } -}; - -class SwUndoInsert: public SwUndo, private SwUndoSaveCntnt -{ - SwPosition *pPos; // Inhalt fuers Redo - String *pTxt, *pUndoTxt; - SwRedlineData* pRedlData; - ULONG nNode; - xub_StrLen nCntnt, nLen; - BOOL bIsWordDelim : 1; - BOOL bIsAppend : 1; - - const IDocumentContentOperations::InsertFlags m_nInsertFlags; - - friend class SwDoc; // eigentlich nur SwDoc::Insert( String ) - BOOL CanGrouping( sal_Unicode cIns ); - BOOL CanGrouping( const SwPosition& rPos ); - - SwDoc * pDoc; - - void Init(const SwNodeIndex & rNode); - String * GetTxtFromDoc() const; - -public: - SwUndoInsert( const SwNodeIndex& rNode, xub_StrLen nCntnt, xub_StrLen nLen, - const IDocumentContentOperations::InsertFlags nInsertFlags, - BOOL bWDelim = TRUE ); - SwUndoInsert( const SwNodeIndex& rNode ); - virtual ~SwUndoInsert(); - - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - virtual void Repeat( SwUndoIter& ); - - // #111827# - /** - Returns rewriter for this undo object. - - The returned rewriter has the following rule: - - $1 -> '<inserted text>' - - <inserted text> is shortened to a length of nUndoStringLength. - - @return rewriter for this undo object - */ - virtual SwRewriter GetRewriter() const; - - - DECL_FIXEDMEMPOOL_NEWDEL(SwUndoInsert) -}; - - -class SwUndoDelete: public SwUndo, private SwUndRng, private SwUndoSaveCntnt -{ - SwNodeIndex* pMvStt; // Position der Nodes im UndoNodes-Array - String *pSttStr, *pEndStr; - SwRedlineData* pRedlData; - SwRedlineSaveDatas* pRedlSaveData; - ::boost::shared_ptr< ::sfx2::MetadatableUndo > m_pMetadataUndoStart; - ::boost::shared_ptr< ::sfx2::MetadatableUndo > m_pMetadataUndoEnd; - - String sTableName; - - ULONG nNode; - ULONG nNdDiff; // Differenz von Nodes vor-nach Delete - ULONG nSectDiff; // Diff. von Nodes vor/nach Move mit SectionNodes - ULONG nReplaceDummy; // Diff. to a temporary dummy object - USHORT nSetPos; - - BOOL bGroup : 1; // TRUE: ist schon eine Gruppe; wird in CanGrouping() ausgwertet !! - BOOL bBackSp : 1; // TRUE: wenn Gruppierung und der Inhalt davor geloescht wird - BOOL bJoinNext: 1; // TRUE: wenn der Bereich von Oben nach unten geht - BOOL bTblDelLastNd : 1; // TRUE: TextNode hinter der Tabelle einf./loeschen - BOOL bDelFullPara : 1; // TRUE: gesamte Nodes wurden geloescht - BOOL bResetPgDesc : 1; // TRUE: am nachfolgenden Node das PgDsc zuruecksetzen - BOOL bResetPgBrk : 1; // TRUE: am nachfolgenden Node das PgBreak zuruecksetzen - BOOL bFromTableCopy : 1; // TRUE: called by SwUndoTblCpyTbl - - BOOL SaveCntnt( const SwPosition* pStt, const SwPosition* pEnd, - SwTxtNode* pSttTxtNd, SwTxtNode* pEndTxtNd ); -public: - SwUndoDelete( SwPaM&, BOOL bFullPara = FALSE, BOOL bCalledByTblCpy = FALSE ); - virtual ~SwUndoDelete(); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - virtual void Repeat( SwUndoIter& ); - - // #111827# - /** - Returns rewriter for this undo object. - - The rewriter consists of the following rule: - - $1 -> '<deleted text>' - - <deleted text> is shortened to nUndoStringLength characters. - - @return rewriter for this undo object - */ - virtual SwRewriter GetRewriter() const; - - BOOL CanGrouping( SwDoc*, const SwPaM& ); - - void SetTblDelLastNd() { bTblDelLastNd = TRUE; } - - // fuer die PageDesc/PageBreak Attribute einer Tabelle - void SetPgBrkFlags( BOOL bPageBreak, BOOL bPageDesc ) - { bResetPgDesc = bPageDesc; bResetPgBrk = bPageBreak; } - - void SetTableName(const String & rName); - - // SwUndoTblCpyTbl needs this information: - long NodeDiff() const { return nSttNode - nEndNode; } - xub_StrLen ContentStart() const { return nSttCntnt; } - BOOL IsDelFullPara() const { return bDelFullPara; } - - DECL_FIXEDMEMPOOL_NEWDEL(SwUndoDelete) -}; - - -class SwUndoOverwrite: public SwUndo, private SwUndoSaveCntnt -{ - String aDelStr, aInsStr; - SwRedlineSaveDatas* pRedlSaveData; - ULONG nSttNode; - xub_StrLen nSttCntnt; - BOOL bInsChar : 1; // kein Overwrite mehr; sondern Insert - BOOL bGroup : 1; // TRUE: ist schon eine Gruppe; wird in - // CanGrouping() ausgwertet !! -public: - SwUndoOverwrite( SwDoc*, SwPosition&, sal_Unicode cIns ); - virtual ~SwUndoOverwrite(); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - virtual void Repeat( SwUndoIter& ); - - // #111827# - /** - Returns the rewriter of this undo object. - - The rewriter contains the following rule: - - $1 -> '<overwritten text>' - - <overwritten text> is shortened to nUndoStringLength characters. - - @return the rewriter of this undo object - */ - virtual SwRewriter GetRewriter() const; - - BOOL CanGrouping( SwDoc*, SwPosition&, sal_Unicode cIns ); -}; - - -class SwUndoSplitNode: public SwUndo -{ - SwHistory* pHistory; - SwRedlineData* pRedlData; - ULONG nNode; - xub_StrLen nCntnt; - BOOL bTblFlag : 1; - BOOL bChkTblStt : 1; -public: - SwUndoSplitNode( SwDoc* pDoc, const SwPosition& rPos, BOOL bChkTbl ); - virtual ~SwUndoSplitNode(); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - virtual void Repeat( SwUndoIter& ); - void SetTblFlag() { bTblFlag = TRUE; } -}; - - -class SwUndoMove : public SwUndo, private SwUndRng, private SwUndoSaveCntnt -{ - // nDest.. - Bereich, in den verschoben wurde (nach dem Move!) - // nIns.. - Position, von der verschoben wurde und wieder die neue InsPos. ist - // nMv.. Position auf die verschoben wird (vor dem Move!) ; fuers REDO - ULONG nDestSttNode, nDestEndNode, nInsPosNode, nMvDestNode; - xub_StrLen nDestSttCntnt, nDestEndCntnt, nInsPosCntnt, nMvDestCntnt; - - USHORT nFtnStt; // StartPos der Fussnoten in der History - - BOOL bJoinNext : 1, - bJoinPrev : 1, - bMoveRange : 1; - - bool bMoveRedlines; // use DOC_MOVEREDLINES when calling SwDoc::Move - - void DelFtn( const SwPaM& ); -public: - SwUndoMove( const SwPaM&, const SwPosition& ); - SwUndoMove( SwDoc* pDoc, const SwNodeRange&, const SwNodeIndex& ); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - // setze den Destination-Bereich nach dem Verschieben. - void SetDestRange( const SwPaM&, const SwPosition&, BOOL, BOOL ); - void SetDestRange( const SwNodeIndex& rStt, const SwNodeIndex& rEnd, - const SwNodeIndex& rInsPos ); - - BOOL IsMoveRange() const { return bMoveRange; } - ULONG GetEndNode() const { return nEndNode; } - ULONG GetDestSttNode() const { return nDestSttNode; } - xub_StrLen GetDestSttCntnt() const { return nDestSttCntnt; } - - void SetMoveRedlines( bool b ) { bMoveRedlines = b; } - -}; - - -class SwUndoAttr : public SwUndo, private SwUndRng -{ - SfxItemSet m_AttrSet; // attributes for Redo - const ::std::auto_ptr<SwHistory> m_pHistory; // History for Undo - ::std::auto_ptr<SwRedlineData> m_pRedlineData; // Redlining - ::std::auto_ptr<SwRedlineSaveDatas> m_pRedlineSaveData; - ULONG m_nNodeIndex; // Offset: for Redlining - const SetAttrMode m_nInsertFlags; // insert flags - - void RemoveIdx( SwDoc& rDoc ); - -public: - SwUndoAttr( const SwPaM&, const SfxItemSet &, const SetAttrMode nFlags ); - SwUndoAttr( const SwPaM&, const SfxPoolItem&, const SetAttrMode nFlags ); - virtual ~SwUndoAttr(); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - virtual void Repeat( SwUndoIter& ); - void SaveRedlineData( const SwPaM& rPam, BOOL bInsCntnt ); - - SwHistory& GetHistory() { return *m_pHistory; } - -}; - -class SwUndoResetAttr : public SwUndo, private SwUndRng -{ - const ::std::auto_ptr<SwHistory> m_pHistory; - SvUShortsSort m_Ids; - const USHORT m_nFormatId; // Format-Id for Redo - -public: - SwUndoResetAttr( const SwPaM&, USHORT nFmtId ); - SwUndoResetAttr( const SwPosition&, USHORT nFmtId ); - virtual ~SwUndoResetAttr(); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - virtual void Repeat( SwUndoIter& ); - void SetAttrs( const SvUShortsSort& rArr ); - - SwHistory& GetHistory() { return *m_pHistory; } - -}; - -class SwUndoFmtAttr : public SwUndo -{ - friend class SwUndoDefaultAttr; - SwFmt * m_pFmt; - ::std::auto_ptr<SfxItemSet> m_pOldSet; // old attributes - ULONG m_nNodeIndex; - const USHORT m_nFmtWhich; - const bool m_bSaveDrawPt; - - bool IsFmtInDoc( SwDoc* ); //is the attribute format still in the Doc? - void SaveFlyAnchor( bool bSaveDrawPt = false ); - // --> OD 2004-10-26 #i35443# - Add return value, type <bool>. - // Return value indicates, if anchor attribute is restored. - // Notes: - If anchor attribute is restored, all other existing attributes - // are also restored. - // - Anchor attribute isn't restored successfully, if it contains - // an invalid anchor position and all other existing attributes - // aren't restored. - // This situation occurs for undo of styles. - bool RestoreFlyAnchor( SwUndoIter& rIter ); - // <-- - // --> OD 2008-02-27 #refactorlists# - removed <rAffectedItemSet> - void Init(); - // <-- - -public: - // register at the Format and save old attributes - // --> OD 2008-02-27 #refactorlists# - removed <rNewSet> - SwUndoFmtAttr( const SfxItemSet& rOldSet, - SwFmt& rFmt, - bool bSaveDrawPt = true ); - // <-- - SwUndoFmtAttr( const SfxPoolItem& rItem, - SwFmt& rFmt, - bool bSaveDrawPt = true ); - virtual ~SwUndoFmtAttr(); - virtual void Undo( SwUndoIter& ); - // --> OD 2004-10-26 #i35443# - <Redo(..)> calls <Undo(..)> - nothing else - virtual void Redo( SwUndoIter& ); - // <-- - virtual void Repeat( SwUndoIter& ); - virtual SwRewriter GetRewriter() const; - - void PutAttr( const SfxPoolItem& rItem ); - SwFmt* GetFmt( SwDoc& rDoc ); // checks if it is still in the Doc! -}; - -// --> OD 2008-02-12 #newlistlevelattrs# -class SwUndoFmtResetAttr : public SwUndo -{ - public: - SwUndoFmtResetAttr( SwFmt& rChangedFormat, - const USHORT nWhichId ); - ~SwUndoFmtResetAttr(); - - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - - private: - // format at which a certain attribute is reset. - SwFmt * const m_pChangedFormat; - // which ID of the reset attribute - const USHORT m_nWhichId; - // old attribute which has been reset - needed for undo. - ::std::auto_ptr<SfxPoolItem> m_pOldItem; -}; -// <-- - -class SwUndoDontExpandFmt : public SwUndo -{ - const ULONG m_nNodeIndex; - const xub_StrLen m_nContentIndex; - -public: - SwUndoDontExpandFmt( const SwPosition& rPos ); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - virtual void Repeat( SwUndoIter& ); -}; - -// helper class to receive changed attribute sets -class SwUndoFmtAttrHelper : public SwClient -{ - ::std::auto_ptr<SwUndoFmtAttr> m_pUndo; - const bool m_bSaveDrawPt; -protected: - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ); - -public: - SwUndoFmtAttrHelper( SwFmt& rFmt, bool bSaveDrawPt = true ); - - SwUndoFmtAttr* GetUndo() const { return m_pUndo.get(); } - // release the undo object (so it is not deleted here), and return it - SwUndoFmtAttr* ReleaseUndo() { return m_pUndo.release(); } -}; - - -class SwUndoFmtColl : public SwUndo, private SwUndRng -{ - String aFmtName; - SwHistory* pHistory; - SwFmtColl* pFmtColl; - // --> OD 2008-04-15 #refactorlists# - for correct <ReDo(..)> and <Repeat(..)> - // boolean, which indicates that the attributes are reseted at the nodes - // before the format has been applied. - const bool mbReset; - // boolean, which indicates that the list attributes had been reseted at - // the nodes before the format has been applied. - const bool mbResetListAttrs; - // <-- -public: - // --> OD 2008-04-15 #refactorlists# -// SwUndoFmtColl( const SwPaM&, SwFmtColl* ); - SwUndoFmtColl( const SwPaM&, SwFmtColl*, - const bool bReset, - const bool bResetListAttrs ); - // <-- - virtual ~SwUndoFmtColl(); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - virtual void Repeat( SwUndoIter& ); - - // #111827# - /** - Returns the rewriter for this undo object. - - The rewriter contains one rule: - - $1 -> <name of format collection> - - <name of format collection> is the name of the format - collection that is applied by the action recorded by this undo - object. - - @return the rewriter for this undo object - */ - virtual SwRewriter GetRewriter() const; - - SwHistory* GetHistory() { return pHistory; } - -}; - - -class SwUndoMoveLeftMargin : public SwUndo, private SwUndRng -{ - const ::std::auto_ptr<SwHistory> m_pHistory; - const bool m_bModulus; - -public: - SwUndoMoveLeftMargin( const SwPaM&, BOOL bRight, BOOL bModulus ); - virtual ~SwUndoMoveLeftMargin(); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - virtual void Repeat( SwUndoIter& ); - - SwHistory& GetHistory() { return *m_pHistory; } - -}; - -// Basis-Klasse fuer Insert von Dokument, Glossaries und Kopieren -======= // base class for insertion of Document, Glossaries and Copy ->>>>>>> other class SwUndoInserts : public SwUndo, public SwUndRng, private SwUndoSaveCntnt { SwTxtFmtColl *pTxtFmtColl, *pLastNdColl; @@ -796,696 +332,4 @@ public: }; -<<<<<<< local - -class SwUndoSetFlyFmt : public SwUndo, public SwClient -{ - SwFrmFmt* pFrmFmt; // das gespeicherte FlyFormat - SwFrmFmt* pOldFmt; // die alte Fly Vorlage - SwFrmFmt* pNewFmt; // die neue Fly Vorlage - SfxItemSet* pItemSet; // die zurueck-/ gesetzten Attribute - ULONG nOldNode, nNewNode; - xub_StrLen nOldCntnt, nNewCntnt; - USHORT nOldAnchorTyp, nNewAnchorTyp; - BOOL bAnchorChgd; - - void PutAttr( USHORT nWhich, const SfxPoolItem* pItem ); - void GetAnchor( SwFmtAnchor& rAnhor, ULONG nNode, xub_StrLen nCntnt ); - -protected: - virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ); - -public: - SwUndoSetFlyFmt( SwFrmFmt& rFlyFmt, SwFrmFmt& rNewFrmFmt ); - virtual ~SwUndoSetFlyFmt(); - - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - - virtual SwRewriter GetRewriter() const; - void DeRegisterFromFormat( SwFmt& ); -}; - -//-------------------------------------------------------------------- - -class _UnReplaceData; -SV_DECL_PTRARR_DEL( _UnReplaceDatas, _UnReplaceData*, 10, 25 ) - -class SwUndoReplace : public SwUndo -{ - friend class SwDoc; - - BOOL bOldIterFlag; // Status vom Undo-Iter vorm 1. Aufruf - USHORT nAktPos; // fuer GetUndoRange und Undo/Redo - _UnReplaceDatas aArr; - SwRedlineData* pRedlData; - -public: - SwUndoReplace(); - virtual ~SwUndoReplace(); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - - // #111827# - /** - Returns the rewriter of this undo object. - - If this undo object represents several replacements the - rewriter contains the following rules: - - $1 -> <number of replacements> - $2 -> occurrences of - $3 -> <replaced text> - - If this undo object represents one replacement the rewriter - contains these rules: - - $1 -> <replaced text> - $2 -> "->" (STR_YIELDS) - $3 -> <replacing text> - - @return the rewriter of this undo object - */ - virtual SwRewriter GetRewriter() const; - - void AddEntry( const SwPaM& rPam, const String& rInsert, BOOL bRegExp ); - void SetEntryEnd( const SwPaM& rPam ); - - BOOL IsFull() const - { return ((USHRT_MAX / sizeof( void* )) - 50 ) < aArr.Count(); } - -}; - - -//-------------------------------------------------------------------- - - -class SwUndoTblHeadline : public SwUndo -{ - ULONG nTblNd; - USHORT nOldHeadline; - USHORT nNewHeadline; -public: - SwUndoTblHeadline( const SwTable&, USHORT nOldHdl, USHORT nNewHdl ); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - virtual void Repeat( SwUndoIter& ); -}; - - -//------------ Undo von Insert-/Delete-Sections ---------------------- - -class SwUndoInsSection : public SwUndo, private SwUndRng -{ -private: - const ::std::auto_ptr<SwSectionData> m_pSectionData; - const ::std::auto_ptr<SwTOXBase> m_pTOXBase; /// set iff section is TOX - const ::std::auto_ptr<SfxItemSet> m_pAttrSet; - ::std::auto_ptr<SwHistory> m_pHistory; - ::std::auto_ptr<SwRedlineData> m_pRedlData; - ULONG m_nSectionNodePos; - bool m_bSplitAtStart : 1; - bool m_bSplitAtEnd : 1; - bool m_bUpdateFtn : 1; - - void Join( SwDoc& rDoc, ULONG nNode ); - -public: - SwUndoInsSection(SwPaM const&, SwSectionData const&, - SfxItemSet const*const pSet, SwTOXBase const*const pTOXBase); - virtual ~SwUndoInsSection(); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - virtual void Repeat( SwUndoIter& ); - - void SetSectNdPos(ULONG const nPos) { m_nSectionNodePos = nPos; } - void SaveSplitNode(SwTxtNode *const pTxtNd, bool const bAtStart); - void SetUpdtFtnFlag(bool const bFlag) { m_bUpdateFtn = bFlag; } -}; - -SW_DLLPRIVATE SwUndo * MakeUndoDelSection(SwSectionFmt const&); - -SW_DLLPRIVATE SwUndo * MakeUndoUpdateSection(SwSectionFmt const&, bool const); - - -//------------ Undo von verschieben/stufen von Gliederung ---------------- - -class SwUndoOutlineLeftRight : public SwUndo, private SwUndRng -{ - short nOffset; -public: - SwUndoOutlineLeftRight( const SwPaM& rPam, short nOffset ); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - virtual void Repeat( SwUndoIter& ); -}; - -//-------------------------------------------------------------------- - -class SwUndoDefaultAttr : public SwUndo -{ - ::std::auto_ptr<SfxItemSet> m_pOldSet; // the old attributes - ::std::auto_ptr<SvxTabStopItem> m_pTabStop; - -public: - // registers at the format and saves old attributes - SwUndoDefaultAttr( const SfxItemSet& rOldSet ); - virtual ~SwUndoDefaultAttr(); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); -}; - -//-------------------------------------------------------------------- -// ---------- Undo fuer Numerierung ---------------------------------- - -class SwUndoInsNum : public SwUndo, private SwUndRng -{ - SwNumRule aNumRule; - SwHistory* pHistory; - ULONG nSttSet; - SwNumRule* pOldNumRule; - String sReplaceRule; - USHORT nLRSavePos; -public: - SwUndoInsNum( const SwPaM& rPam, const SwNumRule& rRule ); - SwUndoInsNum( const SwNumRule& rOldRule, const SwNumRule& rNewRule, - SwUndoId nUndoId = UNDO_INSFMTATTR ); - SwUndoInsNum( const SwPosition& rPos, const SwNumRule& rRule, - const String& rReplaceRule ); - virtual ~SwUndoInsNum(); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - virtual void Repeat( SwUndoIter& ); - virtual SwRewriter GetRewriter() const; - - SwHistory* GetHistory(); // wird ggfs. neu angelegt! - void SetSttNum( ULONG nNdIdx ) { nSttSet = nNdIdx; } - void SaveOldNumRule( const SwNumRule& rOld ); - - void SetLRSpaceEndPos(); - -}; - -class SwUndoDelNum : public SwUndo, private SwUndRng -{ - SvULongs aNodeIdx; - SvBytes aLevels; - SvBools aRstLRSpaces; - SwHistory* pHistory; -public: - SwUndoDelNum( const SwPaM& rPam ); - virtual ~SwUndoDelNum(); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - virtual void Repeat( SwUndoIter& ); - - void AddNode( const SwTxtNode& rNd, BOOL bResetLRSpace ); - SwHistory* GetHistory() { return pHistory; } - -}; - -class SwUndoMoveNum : public SwUndo, private SwUndRng -{ - ULONG nNewStt; - long nOffset; -public: - SwUndoMoveNum( const SwPaM& rPam, long nOffset, BOOL bIsOutlMv = FALSE ); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - virtual void Repeat( SwUndoIter& ); - void SetStartNode( ULONG nValue ) { nNewStt = nValue; } -}; - -class SwUndoNumUpDown : public SwUndo, private SwUndRng -{ - short nOffset; -public: - SwUndoNumUpDown( const SwPaM& rPam, short nOffset ); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - virtual void Repeat( SwUndoIter& ); -}; - -class SwUndoNumOrNoNum : public SwUndo -{ - ULONG nIdx; - BOOL mbNewNum, mbOldNum; - -public: - SwUndoNumOrNoNum( const SwNodeIndex& rIdx, BOOL mbOldNum, - BOOL mbNewNum ); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - virtual void Repeat( SwUndoIter& ); -}; - -class SwUndoNumRuleStart : public SwUndo -{ - ULONG nIdx; - USHORT nOldStt, nNewStt; - BOOL bSetSttValue : 1; - BOOL bFlag : 1; -public: - SwUndoNumRuleStart( const SwPosition& rPos, BOOL bDelete ); - SwUndoNumRuleStart( const SwPosition& rPos, USHORT nStt ); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - virtual void Repeat( SwUndoIter& ); -}; - -//-------------------------------------------------------------------- -// ---------- Undo fuer DrawObjecte ---------------------------------- - -class SwSdrUndo : public SwUndo -{ - SdrUndoAction* pSdrUndo; - SdrMarkList* pMarkList; // MarkList for all selected SdrObjects -public: - SwSdrUndo( SdrUndoAction* , const SdrMarkList* pMarkList ); - virtual ~SwSdrUndo(); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - - String GetComment() const; -}; - -class SwUndoDrawGroup : public SwUndo -{ - SwUndoGroupObjImpl* pObjArr; - USHORT nSize; - BOOL bDelFmt; - -public: - SwUndoDrawGroup( USHORT nCnt ); - virtual ~SwUndoDrawGroup(); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - - void AddObj( USHORT nPos, SwDrawFrmFmt*, SdrObject* ); - void SetGroupFmt( SwDrawFrmFmt* ); -}; - -// --> OD 2006-11-01 #130889# -// Action "ungroup drawing object" is now splitted into three parts - see -// method <SwDoc::UnGroupSelection(..)>: -// - creation for <SwDrawFrmFmt> instances for the group members of the -// selected group objects -// - intrinsic ungroup of the selected group objects -// - creation of <SwDrawContact> instances for the former group members and -// connection to the Writer layout. -// Thus, two undo actions (instances of <SwUndo>) are needed: -// - Existing class <SwUndoDrawUnGroup> takes over the part for the formats. -// - New class <SwUndoDrawUnGroupConnectToLayout> takes over the part for -// contact object. -class SwUndoDrawUnGroup : public SwUndo -{ - SwUndoGroupObjImpl* pObjArr; - USHORT nSize; - BOOL bDelFmt; - -public: - SwUndoDrawUnGroup( SdrObjGroup* ); - virtual ~SwUndoDrawUnGroup(); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - - void AddObj( USHORT nPos, SwDrawFrmFmt* ); -}; - -// --> OD 2006-11-01 #130889# -class SwUndoDrawUnGroupConnectToLayout : public SwUndo -{ - private: - std::vector< std::pair< SwDrawFrmFmt*, SdrObject* > > aDrawFmtsAndObjs; - - public: - SwUndoDrawUnGroupConnectToLayout(); - virtual ~SwUndoDrawUnGroupConnectToLayout(); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - - void AddFmtAndObj( SwDrawFrmFmt* pDrawFrmFmt, - SdrObject* pDrawObject ); -}; -// <-- - - -class SwUndoDrawDelete : public SwUndo -{ - SwUndoGroupObjImpl* pObjArr; - SdrMarkList* pMarkLst; // MarkList for all selected SdrObjects - USHORT nSize; - BOOL bDelFmt; - -public: - SwUndoDrawDelete( USHORT nCnt ); - virtual ~SwUndoDrawDelete(); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - - void AddObj( USHORT nPos, SwDrawFrmFmt*, const SdrMark& ); -}; - -//-------------------------------------------------------------------- - -class SwUndoReRead : public SwUndo -{ - Graphic *pGrf; - String *pNm, *pFltr; - ULONG nPos; - USHORT nMirr; - - void SaveGraphicData( const SwGrfNode& ); - void SetAndSave( SwUndoIter& ); - -public: - SwUndoReRead( const SwPaM& rPam, const SwGrfNode& pGrfNd ); - virtual ~SwUndoReRead(); - - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); -}; - -//-------------------------------------------------------------------- - -class SwUndoInsertLabel : public SwUndo -{ - union { - struct { - // fuer NoTxtFrms - SwUndoInsLayFmt* pUndoFly; - SwUndoFmtAttr* pUndoAttr; - } OBJECT; - struct { - // fuer Tabelle/TextRahmen - SwUndoDelete* pUndoInsNd; - ULONG nNode; - } NODE; - }; - - String sText; - // --> PB 2005-01-06 #i39983# - the separator will be drawed with a character style - String sSeparator; - // <-- - String sNumberSeparator; - String sCharacterStyle; - // OD 2004-04-15 #i26791# - re-store of drawing object position no longer needed - USHORT nFldId; - SwLabelType eType; - BYTE nLayerId; // fuer Zeichen-Objekte - BOOL bBefore :1; - BOOL bUndoKeep :1; - BOOL bCpyBrd :1; - -public: - SwUndoInsertLabel( const SwLabelType eTyp, const String &rText, - // --> PB 2005-01-06 #i39983# - the separator will be drawed with a character style - const String& rSeparator, - // <-- - const String& rNumberSeparator, //#i61007# order of captions - const BOOL bBefore, const USHORT nId, - const String& rCharacterStyle, - const BOOL bCpyBrd ); - virtual ~SwUndoInsertLabel(); - - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - virtual void Repeat( SwUndoIter& ); - - // #111827# - /** - Returns the rewriter of this undo object. - - The rewriter contains this rule: - - $1 -> '<text of inserted label>' - - <text of inserted label> is shortened to nUndoStringLength - characters. - - @return the rewriter of this undo object - */ - virtual SwRewriter GetRewriter() const; - - void SetNodePos( ULONG nNd ) - { if( LTYPE_OBJECT != eType ) NODE.nNode = nNd; } - - void SetUndoKeep() { bUndoKeep = TRUE; } - void SetFlys( SwFrmFmt& rOldFly, SfxItemSet& rChgSet, SwFrmFmt& rNewFly ); - void SetDrawObj( BYTE nLayerId ); -}; - -//-------------------------------------------------------------------- - -class SwUndoChangeFootNote : public SwUndo, private SwUndRng -{ - const ::std::auto_ptr<SwHistory> m_pHistory; - const String m_Text; - const USHORT m_nNumber; - const bool m_bEndNote; - -public: - SwUndoChangeFootNote( const SwPaM& rRange, const String& rTxt, - USHORT nNum, bool bIsEndNote ); - virtual ~SwUndoChangeFootNote(); - - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - virtual void Repeat( SwUndoIter& ); - - SwHistory& GetHistory() { return *m_pHistory; } -}; - -class SwUndoFootNoteInfo : public SwUndo -{ - ::std::auto_ptr<SwFtnInfo> m_pFootNoteInfo; - -public: - SwUndoFootNoteInfo( const SwFtnInfo &rInfo ); - virtual ~SwUndoFootNoteInfo(); - - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); -}; - -class SwUndoEndNoteInfo : public SwUndo -{ - ::std::auto_ptr<SwEndNoteInfo> m_pEndNoteInfo; - -public: - SwUndoEndNoteInfo( const SwEndNoteInfo &rInfo ); - virtual ~SwUndoEndNoteInfo(); - - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); -}; - - -//-------------------------------------------------------------------- - -struct _UndoTransliterate_Data; -class SwUndoTransliterate : public SwUndo, public SwUndRng -{ - std::vector< _UndoTransliterate_Data * > aChanges; - sal_uInt32 nType; - -public: - SwUndoTransliterate( const SwPaM& rPam, - const utl::TransliterationWrapper& rTrans ); - virtual ~SwUndoTransliterate(); - - virtual void Undo( SwUndoIter& rUndoIter ); - virtual void Redo( SwUndoIter& rUndoIter ); - virtual void Repeat( SwUndoIter& rUndoIter ); - - void AddChanges( SwTxtNode& rTNd, xub_StrLen nStart, xub_StrLen nLen, - ::com::sun::star::uno::Sequence <sal_Int32>& rOffsets ); - BOOL HasData() const { return aChanges.size() > 0; } -}; - -//-------------------------------------------------------------------- - -class SwUndoRedline : public SwUndo, public SwUndRng -{ -protected: - SwRedlineData* pRedlData; - SwRedlineSaveDatas* pRedlSaveData; - SwUndoId nUserId; - BOOL bHiddenRedlines; - - virtual void _Undo( SwUndoIter& ); - virtual void _Redo( SwUndoIter& ); - -public: - SwUndoRedline( SwUndoId nUserId, const SwPaM& rRange ); - virtual ~SwUndoRedline(); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - - SwUndoId GetUserId() const { return nUserId; } - USHORT GetRedlSaveCount() const - { return pRedlSaveData ? pRedlSaveData->Count() : 0; } -}; - -class SwUndoRedlineDelete : public SwUndoRedline -{ - BOOL bCanGroup : 1; - BOOL bIsDelim : 1; - BOOL bIsBackspace : 1; - - virtual void _Undo( SwUndoIter& ); - virtual void _Redo( SwUndoIter& ); - -public: - SwUndoRedlineDelete( const SwPaM& rRange, SwUndoId nUserId = UNDO_EMPTY ); - - BOOL CanGrouping( const SwUndoRedlineDelete& rPrev ); -}; - -class SwUndoRedlineSort : public SwUndoRedline -{ - SwSortOptions* pOpt; - ULONG nSaveEndNode, nOffset; - xub_StrLen nSaveEndCntnt; - - virtual void _Undo( SwUndoIter& ); - virtual void _Redo( SwUndoIter& ); - -public: - SwUndoRedlineSort( const SwPaM& rRange, const SwSortOptions& rOpt ); - virtual ~SwUndoRedlineSort(); - virtual void Repeat( SwUndoIter& ); - - void SetSaveRange( const SwPaM& rRange ); - void SetOffset( const SwNodeIndex& rIdx ); -}; - -class SwUndoAcceptRedline : public SwUndoRedline -{ - virtual void _Redo( SwUndoIter& ); -public: - SwUndoAcceptRedline( const SwPaM& rRange ); - virtual void Repeat( SwUndoIter& ); -}; - -class SwUndoRejectRedline : public SwUndoRedline -{ - virtual void _Redo( SwUndoIter& ); -public: - SwUndoRejectRedline( const SwPaM& rRange ); - virtual void Repeat( SwUndoIter& ); -}; - -//-------------------------------------------------------------------- - -class SwUndoCompDoc : public SwUndo, public SwUndRng -{ - SwRedlineData* pRedlData; - SwUndoDelete* pUnDel, *pUnDel2; - SwRedlineSaveDatas* pRedlSaveData; - BOOL bInsert; -public: - SwUndoCompDoc( const SwPaM& rRg, BOOL bIns ); - SwUndoCompDoc( const SwRedline& rRedl ); - - virtual ~SwUndoCompDoc(); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); -}; - - -//-------------------------------------------------------------------- - -// Object der als Iterator durch die Undo-Liste laeuft, bis die -// letze oder die angegebene Klammerung/Id erreicht ist. - -class SwUndoIter -{ - friend class SwDoc; // um im SwDoc::Undo bWeiter zu stezen - friend void SwUndoEnd::Undo( SwUndoIter& ); - friend void SwUndoStart::Undo( SwUndoIter& ); - friend void SwUndoEnd::Redo( SwUndoIter& ); - friend void SwUndoStart::Redo( SwUndoIter& ); - friend void SwUndoEnd::Repeat( SwUndoIter& ); - friend void SwUndoStart::Repeat( SwUndoIter& ); - friend void SwUndoReplace::Undo( SwUndoIter& ); - friend void SwUndoReplace::Redo( SwUndoIter& ); - - SwUndoId nUndoId; - USHORT nEndCnt; - BOOL bWeiter : 1; - BOOL bUpdateAttr : 1; // Setze das GCAttr an der CursorShell - -public: - SwPaM * pAktPam; // Member fuer das Undo - SwUndo* pLastUndoObj; // fuers Redo, das vorherige UndoObj. - SwFrmFmt* pSelFmt; // ggfs. das Format Rahmen/Object-Selektionen - SdrMarkList* pMarkList; // MarkList for all selected SdrObjects - - SwUndoIter( SwPaM * pPam, SwUndoId nId = UNDO_EMPTY ); - - BOOL IsNextUndo() const { return bWeiter; } - BOOL IsUpdateAttr() const { return bUpdateAttr; } - void SetUpdateAttr( BOOL bNew ) { bUpdateAttr = bNew; } - - inline SwDoc& GetDoc() const; - SwUndoId GetId() const { return nUndoId; } - SwUndoId GetLastUndoId() const - { return pLastUndoObj ? pLastUndoObj->GetId() : UNDO_EMPTY ; } - void ClearSelections() { pSelFmt = 0; pMarkList = 0; } -}; - - -// -> #111827# -const int nUndoStringLength = 20; - -/** - Shortens a string to a maximum length. - - @param rStr the string to be shortened - @param nLength the maximum length for rStr - @param rFillStr string to replace cut out characters with - - If rStr has less than nLength characters it will be returned unaltered. - - If rStr has more than nLength characters the following algorithm - generates the shortened string: - - frontLength = (nLength - length(rFillStr)) / 2 - rearLength = nLength - length(rFillStr) - frontLength - shortenedString = concat(<first frontLength characters of rStr, - rFillStr, - <last rearLength characters of rStr>) - - Preconditions: - - nLength - length(rFillStr) >= 2 - - @return the shortened string - */ -String ShortenString(const String & rStr, xub_StrLen nLength, const String & rFillStr); -// <- #111827# - -// #16487# -/** - Denotes special characters in a string. - - The rStr is split into parts containing special characters and - parts not containing special characters. In a part containing - special characters all characters are equal. These parts are - maximal. - - @param rStr the string to denote in - - The resulting string is generated by concatenating the found - parts. The parts without special characters are surrounded by - "'". The parts containing special characters are denoted as "n x", - where n is the length of the part and x is the representation of - the special character (i. e. "tab(s)"). - - @return the denoted string -*/ -String DenoteSpecialCharacters(const String & rStr); - -======= ->>>>>>> other #endif diff --git a/sw/inc/usrfld.hxx b/sw/inc/usrfld.hxx index 75e717122150..11d1db177c84 100644 --- a/sw/inc/usrfld.hxx +++ b/sw/inc/usrfld.hxx @@ -71,15 +71,11 @@ public: sal_Bool IsDeleted() const { return bDeleted; } void SetDeleted( sal_Bool b ) { bDeleted = b; } -<<<<<<< local - virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nMId ) const; - virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nMId ); -protected: - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ); -======= virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nMId ) const; virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nMId ); ->>>>>>> other + +protected: + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ); }; inline sal_Bool SwUserFieldType::IsValid() const diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx index 8ba1d1b5195b..5638967197ce 100644 --- a/sw/inc/viewopt.hxx +++ b/sw/inc/viewopt.hxx @@ -158,21 +158,10 @@ protected: sal_Bool bStarOneSetting : 1;// prevent from UI automatics (no scrollbars in readonly documents) sal_Bool bIsPagePreview : 1; // the preview mustn't print field/footnote/... shadings sal_Bool bSelectionInReadonly : 1; //determines whether selection is switched on in readonly documents - // --> FME 2004-06-29 #114856# Formular view -<<<<<<< local - BOOL mbFormView : 1; -======= sal_Bool bFormView : 1; ->>>>>>> other - // <-- -<<<<<<< local - BOOL mbBookview : 1; // view mode for page preview - BOOL mbBrowseMode : 1; //swmod 080130 - BOOL mbViewLayoutBookMode : 1; // book view mode for edit view -======= + sal_Bool mbBrowseMode : 1; //swmod 080130 sal_Bool bBookview : 1; // view mode for page preview sal_Bool mbViewLayoutBookMode : 1; // book view mode for edit view ->>>>>>> other sal_Bool bShowPlaceHolderFields : 1; //only used in printing! mutable bool bIdle; @@ -419,26 +408,14 @@ public: sal_Bool IsSelectionInReadonly() const {return bSelectionInReadonly;} void SetSelectionInReadonly(sal_Bool bSet) {bSelectionInReadonly = bSet;} - // --> FME 2004-06-29 #114856# Formular view -<<<<<<< local - BOOL IsFormView() const { return mbFormView; } - void SetFormView( BOOL bSet ) { mbFormView = bSet; } -======= sal_Bool IsFormView() const { return bFormView; } void SetFormView( sal_Bool bSet ) { bFormView = bSet; } ->>>>>>> other // <-- -<<<<<<< local - inline BOOL IsPagePrevBookview() const { return mbBookview; } - inline void SetPagePrevBookview(BOOL bSet) { mbBookview = bSet; } - - inline BOOL getBrowseMode() const { return mbBrowseMode; } - inline void setBrowseMode(BOOL bSet) { mbBrowseMode = bSet; } -======= + inline sal_Bool getBrowseMode() const { return mbBrowseMode; } + inline void setBrowseMode(sal_Bool bSet) { mbBrowseMode = bSet; } inline sal_Bool IsPagePrevBookview() const { return bBookview; } inline void SetPagePrevBookview(sal_Bool bSet) { bBookview = bSet; } ->>>>>>> other sal_Bool IsAutoCompleteWords() const; diff --git a/sw/source/core/attr/calbck.cxx b/sw/source/core/attr/calbck.cxx index 6a30ed257d41..64eedaf6e419 100644 --- a/sw/source/core/attr/calbck.cxx +++ b/sw/source/core/attr/calbck.cxx @@ -42,15 +42,6 @@ TYPEINIT0(SwClient); SwClient::SwClient(SwModify *pToRegisterIn) : pLeft( 0 ), pRight( 0 ), pRegisteredIn( 0 ), mbIsAllowedToBeRemovedInModifyCall(false) { -<<<<<<< local -======= - bModifyLocked = - bInModify = - bInDocDTOR = - bInCache = sal_False; - bInSwFntCache = sal_False; - ->>>>>>> other if(pToRegisterIn) // connect to SwModify pToRegisterIn->Add(this); @@ -101,19 +92,9 @@ SwClient::~SwClient() } -<<<<<<< local -/*************************************************************************/ -BOOL SwClient::GetInfo( SfxPoolItem& ) const -======= - // erfrage vom Client Informationen sal_Bool SwClient::GetInfo( SfxPoolItem& ) const ->>>>>>> other { -<<<<<<< local - return TRUE; // no information here, return TRUE to enable continuation -======= return sal_True; // und weiter ->>>>>>> other } @@ -198,19 +179,9 @@ void SwModify::NotifyClients( const SfxPoolItem *pOldValue, const SfxPoolItem *p LockModify(); -<<<<<<< local // mba: WTF?! -======= -#ifndef DBG_UTIL - bInModify = sal_True; -#else ->>>>>>> other if( !pOldValue ) -<<<<<<< local - bLockClientList = TRUE; -======= - bInModify = sal_True; ->>>>>>> other + bLockClientList = sal_True; else { // following Modifies shouldn't call an ASSERT @@ -225,53 +196,21 @@ void SwModify::NotifyClients( const SfxPoolItem *pOldValue, const SfxPoolItem *p case RES_REFMARK_DELETED: case RES_TOXMARK_DELETED: case RES_FIELD_DELETED: -<<<<<<< local - bLockClientList = FALSE; -======= - bInModify = sal_False; ->>>>>>> other + bLockClientList = sal_False; break; default: -<<<<<<< local - bLockClientList = TRUE; -======= - bInModify = sal_True; ->>>>>>> other + bLockClientList = sal_True; } } -<<<<<<< local ModifyBroadcast( pOldValue, pNewValue ); - bLockClientList = FALSE; -======= - SwClientIter aIter( *this ); - SwClient * pLast = aIter.GoStart(); - if( pLast ) // konnte zum Anfang gesprungen werden ?? - do - { - pLast->Modify( pOldValue, pNewValue ); - if( !pRoot ) // Baum schon Weg ?? - break; - } while( 0 != ( pLast = aIter++ )); - - bInModify = sal_False; ->>>>>>> other + bLockClientList = sal_False; UnlockModify(); } -<<<<<<< local -BOOL SwModify::GetInfo( SfxPoolItem& rInfo ) const -======= -// erfrage vom Modify Informationen - sal_Bool SwModify::GetInfo( SfxPoolItem& rInfo ) const ->>>>>>> other { -<<<<<<< local - BOOL bRet = TRUE; // means: continue with next one -======= sal_Bool bRet = sal_True; // bedeutet weiter zum naechsten ->>>>>>> other if( pRoot ) { @@ -364,14 +303,9 @@ SwClient* SwModify::Remove(SwClient * pDepend) pDepend->pLeft = 0; pDepend->pRight = 0; } -<<<<<<< local else { ASSERT( false, "SwModify::Remove(): pDepend nicht gefunden" ); -======= - else { - ASSERT( sal_False, "SwModify::Remove(): pDepend nicht gefunden"); ->>>>>>> other } // disconnect client from me @@ -392,19 +326,6 @@ int SwModify::GetClientCount() const return nRet; } -<<<<<<< local -/*************************************************************************/ -======= -/************************************************************************* -|* SwModify::CheckCaching( const sal_uInt16 nWhich ) -|* -|* Ersterstellung JP 25.06.95 -|* Letzte Aenderung JP 25.06.95 -*************************************************************************/ - - ->>>>>>> other - void SwModify::CheckCaching( const sal_uInt16 nWhich ) { if (isCHRATR(nWhich)) @@ -485,12 +406,7 @@ void SwDepend::SwClientNotify( const SwModify& rMod, const SfxHint& rHint ) pToTell->SwClientNotifyCall( rMod, rHint ); } -<<<<<<< local -BOOL SwDepend::GetInfo( SfxPoolItem& rInfo ) const -======= - // erfrage vom Modify Informationen sal_Bool SwDepend::GetInfo( SfxPoolItem& rInfo ) const ->>>>>>> other { return pToTell ? pToTell->GetInfo( rInfo ) : sal_True; } diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx index 8c80a87738ea..2e4212fea321 100644 --- a/sw/source/core/attr/format.cxx +++ b/sw/source/core/attr/format.cxx @@ -330,13 +330,8 @@ void SwFmt::Modify( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewValue ) if( aNew.Count() ) // keine mehr gesetzt, dann Ende !! -<<<<<<< local - NotifyClients( &aOld, &aNew ); - bWeiter = FALSE; -======= - SwModify::Modify( &aOld, &aNew ); + NotifyClients( &aOld, &aNew ); bWeiter = sal_False; ->>>>>>> other } break; case RES_FMT_CHG: @@ -358,20 +353,11 @@ void SwFmt::Modify( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewValue ) // Formate (und keine Frames) propagieren. // mba: the code does the opposite from what is written in the comment! ResetWritten(); -<<<<<<< local // mba: here we don't use the additional stuff from NotifyClients(). // should we?! // mba: move the code that ignores this event to the clients ModifyBroadcast( pOldValue, pNewValue, TYPE(SwFmt) ); - bWeiter = FALSE; -======= - SwClientIter aIter( *this ); - for( SwClient *pClient = aIter.First( TYPE(SwFmt) ); pClient; - pClient = aIter.Next() ) - pClient->Modify( pOldValue, pNewValue ); - bWeiter = sal_False; ->>>>>>> other } break; diff --git a/sw/source/core/crsr/callnk.cxx b/sw/source/core/crsr/callnk.cxx index f47e06b81914..8b5bf2fc5a46 100644 --- a/sw/source/core/crsr/callnk.cxx +++ b/sw/source/core/crsr/callnk.cxx @@ -191,11 +191,7 @@ SwCallLink::~SwCallLink() const SwFrm* pFrm; const SwFlyFrm *pFlyFrm; -<<<<<<< local - if( !rShell.ActionPend() && 0 != ( pFrm = pCNd->getLayoutFrm(rShell.GetLayout(),0,0,FALSE) ) && -======= - if( !rShell.ActionPend() && 0 != ( pFrm = pCNd->GetFrm(0,0,sal_False) ) && ->>>>>>> other + if( !rShell.ActionPend() && 0 != ( pFrm = pCNd->getLayoutFrm(rShell.GetLayout(),0,0,sal_False) ) && 0 != ( pFlyFrm = pFrm->FindFlyFrm() ) && !rShell.IsTableMode() ) { const SwNodeIndex* pIndex = pFlyFrm->GetFmt()->GetCntnt().GetCntntIdx(); @@ -212,11 +208,7 @@ SwCallLink::~SwCallLink() } } -<<<<<<< local -long SwCallLink::getLayoutFrm( const SwRootFrm* pRoot, SwTxtNode& rNd, xub_StrLen nCntPos, BOOL bCalcFrm ) -======= -long SwCallLink::GetFrm( SwTxtNode& rNd, xub_StrLen nCntPos, sal_Bool bCalcFrm ) ->>>>>>> other +long SwCallLink::getLayoutFrm( const SwRootFrm* pRoot, SwTxtNode& rNd, xub_StrLen nCntPos, sal_Bool bCalcFrm ) { SwTxtFrm* pFrm = (SwTxtFrm*)rNd.getLayoutFrm(pRoot,0,0,bCalcFrm), *pNext = pFrm; if ( pFrm && !pFrm->IsHiddenNow() ) diff --git a/sw/source/core/crsr/callnk.hxx b/sw/source/core/crsr/callnk.hxx index 0952bbb256b7..93f6e8f11738 100644 --- a/sw/source/core/crsr/callnk.hxx +++ b/sw/source/core/crsr/callnk.hxx @@ -49,11 +49,7 @@ public: bool bAktSelection ); ~SwCallLink(); -<<<<<<< local - static long getLayoutFrm( const SwRootFrm*, SwTxtNode& rNd, xub_StrLen nCntPos, BOOL bCalcFrm ); -======= - static long GetFrm( SwTxtNode& rNd, xub_StrLen nCntPos, sal_Bool bCalcFrm ); ->>>>>>> other + static long getLayoutFrm( const SwRootFrm*, SwTxtNode& rNd, xub_StrLen nCntPos, sal_Bool bCalcFrm ); }; diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx index db5ecf0778ca..90eac5ef7d04 100644 --- a/sw/source/core/crsr/crsrsh.cxx +++ b/sw/source/core/crsr/crsrsh.cxx @@ -201,13 +201,8 @@ SwPaM* SwCrsrShell::GetCrsr( sal_Bool bMakeTblCrsr ) const const SwCntntNode* pCNd; if( pTblCrsr->GetPoint()->nNode.GetIndex() && pTblCrsr->GetMark()->nNode.GetIndex() && -<<<<<<< local 0 != ( pCNd = pTblCrsr->GetCntntNode() ) && pCNd->getLayoutFrm( GetLayout() ) && - 0 != ( pCNd = pTblCrsr->GetCntntNode(FALSE) ) && pCNd->getLayoutFrm( GetLayout() ) ) -======= - 0 != ( pCNd = pTblCrsr->GetCntntNode() ) && pCNd->GetFrm() && - 0 != ( pCNd = pTblCrsr->GetCntntNode(sal_False) ) && pCNd->GetFrm()) ->>>>>>> other + 0 != ( pCNd = pTblCrsr->GetCntntNode(sal_False) ) && pCNd->getLayoutFrm( GetLayout() ) ) { SwShellTableCrsr* pTC = (SwShellTableCrsr*)pTblCrsr; GetLayout()->MakeTblCrsrs( *pTC ); @@ -235,11 +230,7 @@ void SwCrsrShell::StartAction() nAktNdTyp = rNd.GetNodeType(); bAktSelection = *pCurCrsr->GetPoint() != *pCurCrsr->GetMark(); if( ND_TEXTNODE & nAktNdTyp ) -<<<<<<< local - nLeftFrmPos = SwCallLink::getLayoutFrm( GetLayout(), (SwTxtNode&)rNd, nAktCntnt, TRUE ); -======= - nLeftFrmPos = SwCallLink::GetFrm( (SwTxtNode&)rNd, nAktCntnt, sal_True ); ->>>>>>> other + nLeftFrmPos = SwCallLink::getLayoutFrm( GetLayout(), (SwTxtNode&)rNd, nAktCntnt, sal_True ); else nLeftFrmPos = 0; } @@ -608,13 +599,8 @@ sal_Bool SwCrsrShell::MovePage( SwWhichPage fnWhichPage, SwPosPage fnPosPage ) SwCrsrSaveState aSaveState( *pCurCrsr ); Point& rPt = pCurCrsr->GetPtPos(); SwCntntFrm * pFrm = pCurCrsr->GetCntntNode()-> -<<<<<<< local - getLayoutFrm( GetLayout(), &rPt, pCurCrsr->GetPoint(), FALSE ); - if( pFrm && TRUE == ( bRet = GetFrmInPage( pFrm, fnWhichPage, -======= - GetFrm( &rPt, pCurCrsr->GetPoint() ); + getLayoutFrm( GetLayout(), &rPt, pCurCrsr->GetPoint(), sal_False ); if( pFrm && sal_True == ( bRet = GetFrmInPage( pFrm, fnWhichPage, ->>>>>>> other fnPosPage, pCurCrsr ) ) && !pCurCrsr->IsSelOvr( nsSwCursorSelOverFlags::SELOVER_TOGGLE | nsSwCursorSelOverFlags::SELOVER_CHANGEPOS )) @@ -659,11 +645,7 @@ SwFrm* lcl_IsInHeaderFooter( const SwNodeIndex& rIdx, Point& rPt ) SwCntntNode* pCNd = rIdx.GetNode().GetCntntNode(); if( pCNd ) { -<<<<<<< local - pFrm = pCNd->getLayoutFrm( pCNd->GetDoc()->GetCurrentLayout(), &rPt, 0, FALSE )->GetUpper(); -======= - pFrm = pCNd->GetFrm( &rPt, 0, sal_False )->GetUpper(); ->>>>>>> other + pFrm = pCNd->getLayoutFrm( pCNd->GetDoc()->GetCurrentLayout(), &rPt, 0, sal_False )->GetUpper(); while( pFrm && !pFrm->IsHeaderFrm() && !pFrm->IsFooterFrm() ) pFrm = pFrm->IsFlyFrm() ? ((SwFlyFrm*)pFrm)->AnchorFrm() : pFrm->GetUpper(); @@ -749,17 +731,10 @@ int SwCrsrShell::SetCrsr( const Point &rLPt, sal_Bool bOnlyText, bool bBlock ) else if( aPos.nNode.GetNode().IsCntntNode() ) { // im gleichen Frame gelandet? -<<<<<<< local SwFrm* pOld = ((SwCntntNode&)aPos.nNode.GetNode()).getLayoutFrm( - GetLayout(), &aCharRect.Pos(), 0, FALSE ); + GetLayout(), &aCharRect.Pos(), 0, sal_False ); SwFrm* pNew = ((SwCntntNode&)aPos.nNode.GetNode()).getLayoutFrm( - GetLayout(), &aPt, 0, FALSE ); -======= - SwFrm* pOld = ((SwCntntNode&)aPos.nNode.GetNode()).GetFrm( - &aCharRect.Pos(), 0, sal_False ); - SwFrm* pNew = ((SwCntntNode&)aPos.nNode.GetNode()).GetFrm( - &aPt, 0, sal_False ); ->>>>>>> other + GetLayout(), &aPt, 0, sal_False ); if( pNew == pOld ) return bRet; } @@ -1443,12 +1418,8 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, sal_Bool bIdleEnd ) // Second check if mark is in repeated headline: if ( !bInRepeatedHeadline ) { -<<<<<<< local - SwCntntFrm* pMarkTblFrm = pITmpCrsr->GetCntntNode( FALSE )-> - getLayoutFrm( GetLayout(), &aTmpMk, pITmpCrsr->GetMark(), FALSE ); -======= - SwCntntFrm* pMarkTblFrm = pITmpCrsr->GetCntntNode( sal_False )->GetFrm( &aTmpMk, pITmpCrsr->GetMark() ); ->>>>>>> other + SwCntntFrm* pMarkTblFrm = pITmpCrsr->GetCntntNode( sal_False )-> + getLayoutFrm( GetLayout(), &aTmpMk, pITmpCrsr->GetMark(), sal_False ); ASSERT( pMarkTblFrm, "Tabelle Crsr nicht im Content ??" ); if ( pMarkTblFrm ) @@ -1660,15 +1631,9 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, sal_Bool bIdleEnd ) do { sal_Bool bAgainst; do { -<<<<<<< local - bAgainst = FALSE; - pFrm = pShellCrsr->GetCntntNode()->getLayoutFrm( GetLayout(), - &pShellCrsr->GetPtPos(), pShellCrsr->GetPoint(), FALSE ); -======= bAgainst = sal_False; - pFrm = pShellCrsr->GetCntntNode()->GetFrm( - &pShellCrsr->GetPtPos(), pShellCrsr->GetPoint() ); ->>>>>>> other + pFrm = pShellCrsr->GetCntntNode()->getLayoutFrm( GetLayout(), + &pShellCrsr->GetPtPos(), pShellCrsr->GetPoint(), sal_False ); // ist der Frm nicht mehr vorhanden, dann muss das gesamte Layout // erzeugt werden, weil ja mal hier einer vorhanden war !! if ( !pFrm ) @@ -2181,22 +2146,13 @@ SwCntntFrm *SwCrsrShell::GetCurrFrm( const sal_Bool bCalcFrm ) const const sal_uInt16* pST = &nStartAction; ++(*((sal_uInt16*)pST)); const Size aOldSz( GetDocSize() ); -<<<<<<< local pRet = pNd->getLayoutFrm( GetLayout(), &pCurCrsr->GetPtPos(), pCurCrsr->GetPoint() ); - --(*((USHORT*)pST)); -======= - pRet = pNd->GetFrm( &pCurCrsr->GetPtPos(), pCurCrsr->GetPoint() ); --(*((sal_uInt16*)pST)); ->>>>>>> other if( aOldSz != GetDocSize() ) ((SwCrsrShell*)this)->SizeChgNotify(); } else -<<<<<<< local - pRet = pNd->getLayoutFrm( GetLayout(), &pCurCrsr->GetPtPos(), pCurCrsr->GetPoint(), FALSE); -======= - pRet = pNd->GetFrm( &pCurCrsr->GetPtPos(), pCurCrsr->GetPoint(), sal_False); ->>>>>>> other + pRet = pNd->getLayoutFrm( GetLayout(), &pCurCrsr->GetPtPos(), pCurCrsr->GetPoint(), sal_False); } return pRet; } @@ -2829,11 +2785,7 @@ sal_Bool SwCrsrShell::FindValidCntntNode( sal_Bool bOnlyText ) SwCntntNode* pCNd = rNdIdx.GetNode().GetCntntNode(); const SwCntntFrm * pFrm; -<<<<<<< local - if( pCNd && 0 != (pFrm = pCNd->getLayoutFrm( GetLayout(),0,pCurCrsr->GetPoint(),FALSE)) && -======= - if( pCNd && 0 != (pFrm = pCNd->GetFrm(0,pCurCrsr->GetPoint(),sal_False)) && ->>>>>>> other + if( pCNd && 0 != (pFrm = pCNd->getLayoutFrm( GetLayout(),0,pCurCrsr->GetPoint(),sal_False)) && !IsReadOnlyAvailable() && pFrm->IsProtected() && nNdIdx < rNds.GetEndOfExtras().GetIndex() ) { @@ -2949,11 +2901,7 @@ sal_Bool SwCrsrShell::FindValidCntntNode( sal_Bool bOnlyText ) if( bOk && rNdIdx.GetIndex() < rNds.GetEndOfExtras().GetIndex() ) { // Teste mal auf Fly - kann auch noch geschuetzt sein!! -<<<<<<< local - if( 0 == (pFrm = pCNd->getLayoutFrm( GetLayout(),0,0,FALSE)) || -======= - if( 0 == (pFrm = pCNd->GetFrm(0,0,sal_False)) || ->>>>>>> other + if( 0 == (pFrm = pCNd->getLayoutFrm( GetLayout(),0,0,sal_False)) || ( !IsReadOnlyAvailable() && pFrm->IsProtected() ) || ( bOnlyText && pCNd->IsNoTxtNode() ) ) { @@ -2985,11 +2933,7 @@ sal_Bool SwCrsrShell::FindValidCntntNode( sal_Bool bOnlyText ) // falls Cursor im versteckten Bereich ist, auf jedenfall schon mal // verschieben!! -<<<<<<< local - if( !pCNd || !pCNd->getLayoutFrm( GetLayout(),0,0,FALSE) ) -======= - if( !pCNd || !pCNd->GetFrm(0,0,sal_False) ) ->>>>>>> other + if( !pCNd || !pCNd->getLayoutFrm( GetLayout(),0,0,sal_False) ) { SwCrsrMoveState aTmpState( MV_NONE ); aTmpState.bSetInReadOnly = IsReadOnlyAvailable(); @@ -3554,11 +3498,7 @@ void SwCrsrShell::GetSmartTagTerm( const Point& rPt, SwRect& rSelectRect, SwCrsrMoveState aState; aState.bRealWidth = sal_True; SwCntntNode* pCntntNode = pCrsr->GetCntntNode(); -<<<<<<< local - SwCntntFrm *pCntntFrame = pCntntNode->getLayoutFrm( GetLayout(), &rPt, pCrsr->GetPoint(), FALSE); -======= - SwCntntFrm *pCntntFrame = pCntntNode->GetFrm( &rPt, pCrsr->GetPoint(), sal_False); ->>>>>>> other + SwCntntFrm *pCntntFrame = pCntntNode->getLayoutFrm( GetLayout(), &rPt, pCrsr->GetPoint(), sal_False); pCntntFrame->GetCharRect( aStartRect, *pCrsr->GetPoint(), &aState ); rContent = nWordEnd; diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx index 3270ca0a0e7e..f2624677c4be 100644 --- a/sw/source/core/crsr/crstrvl.cxx +++ b/sw/source/core/crsr/crstrvl.cxx @@ -277,11 +277,7 @@ sal_Bool SwCrsrShell::SetCrsrInHdFt( sal_uInt16 nDescNo, sal_Bool bInHeader ) const SwFrm* pFrm; Point aPt( pCurCrsr->GetPtPos() ); -<<<<<<< local - if( pCNd && 0 != ( pFrm = pCNd->getLayoutFrm( GetLayout(), &aPt, 0, FALSE ) )) -======= - if( pCNd && 0 != ( pFrm = pCNd->GetFrm( &aPt, 0, sal_False ) )) ->>>>>>> other + if( pCNd && 0 != ( pFrm = pCNd->getLayoutFrm( GetLayout(), &aPt, 0, sal_False ) )) { // dann kann der Cursor ja auch hinein gesetzt werden SwCallLink aLk( *this ); // Crsr-Moves ueberwachen, evt. Link callen @@ -483,14 +479,8 @@ sal_Bool SwCrsrShell::GotoNxtPrvTblFormula( sal_Bool bNext, sal_Bool bOnlyErrors if( rPos.nNode < GetDoc()->GetNodes().GetEndOfExtras() ) // auch beim Einsammeln wird nur der erste Frame benutzt! -<<<<<<< local aCurGEF.SetBodyPos( *rPos.nNode.GetNode().GetCntntNode()->getLayoutFrm( GetLayout(), - &aPt, &rPos, FALSE ) ); -======= - aCurGEF.SetBodyPos( *rPos.nNode.GetNode().GetCntntNode()->GetFrm( &aPt, &rPos, sal_False ) ); ->>>>>>> other - { const SfxPoolItem* pItem; const SwTableBox* pTBox; @@ -508,11 +498,7 @@ sal_Bool SwCrsrShell::GotoNxtPrvTblFormula( sal_Bool bNext, sal_Bool bOnlyErrors const SwCntntFrm* pCFrm; SwNodeIndex aIdx( *pTBox->GetSttNd() ); const SwCntntNode* pCNd = GetDoc()->GetNodes().GoNext( &aIdx ); -<<<<<<< local - if( pCNd && 0 != ( pCFrm = pCNd->getLayoutFrm( GetLayout(), &aPt, 0, FALSE ) ) && -======= - if( pCNd && 0 != ( pCFrm = pCNd->GetFrm( &aPt, 0, sal_False ) ) && ->>>>>>> other + if( pCNd && 0 != ( pCFrm = pCNd->getLayoutFrm( GetLayout(), &aPt, 0, sal_False ) ) && (IsReadOnlyAvailable() || !pCFrm->IsProtected() )) { _SetGetExpFld aCmp( *pTBox ); @@ -563,12 +549,7 @@ sal_Bool SwCrsrShell::GotoNxtPrvTOXMark( sal_Bool bNext ) if( rPos.nNode.GetIndex() < GetDoc()->GetNodes().GetEndOfExtras().GetIndex() ) // auch beim Einsammeln wird nur der erste Frame benutzt! aCurGEF.SetBodyPos( *rPos.nNode.GetNode(). -<<<<<<< local - GetCntntNode()->getLayoutFrm( GetLayout(), &aPt, &rPos, FALSE ) ); -======= - GetCntntNode()->GetFrm( &aPt, &rPos, sal_False ) ); ->>>>>>> other - + GetCntntNode()->getLayoutFrm( GetLayout(), &aPt, &rPos, sal_False ) ); { const SfxPoolItem* pItem; const SwCntntFrm* pCFrm; @@ -581,11 +562,7 @@ sal_Bool SwCrsrShell::GotoNxtPrvTOXMark( sal_Bool bNext ) RES_TXTATR_TOXMARK, n ) ) && 0 != (pTxtTOX = ((SwTOXMark*)pItem)->GetTxtTOXMark() ) && ( pTxtNd = &pTxtTOX->GetTxtNode())->GetNodes().IsDocNodes() && -<<<<<<< local - 0 != ( pCFrm = pTxtNd->getLayoutFrm( GetLayout(), &aPt, 0, FALSE )) && -======= - 0 != ( pCFrm = pTxtNd->GetFrm( &aPt, 0, sal_False )) && ->>>>>>> other + 0 != ( pCFrm = pTxtNd->getLayoutFrm( GetLayout(), &aPt, 0, sal_False )) && ( IsReadOnlyAvailable() || !pCFrm->IsProtected() )) { SwNodeIndex aNdIndex( *pTxtNd ); // UNIX benoetigt dieses Obj. @@ -652,17 +629,10 @@ void lcl_MakeFldLst( _SetGetExpFlds& rLst, const SwFieldType& rFldType, // es muss immer der 1. Frame gesucht werden Point aPt; SwTxtFld* pTxtFld; -<<<<<<< local SwIterator<SwFmtFld,SwFieldType> aIter(rFldType); - BOOL bSubType = nSubType != USHRT_MAX; + bool bSubType = nSubType != USHRT_MAX; for( SwFmtFld* pFmtFld = aIter.First(); pFmtFld; pFmtFld = aIter.Next() ) if( 0 != ( pTxtFld = pFmtFld->GetTxtFld() ) && -======= - SwClientIter aIter( (SwFieldType&)rFldType ); - sal_Bool bSubType = nSubType != USHRT_MAX; - for( SwClient* pLast = aIter.First( TYPE( SwFmtFld )); pLast; pLast = aIter.Next() ) - if( 0 != ( pTxtFld = ((SwFmtFld*)pLast)->GetTxtFld() ) && ->>>>>>> other ( !bChkInpFlag || ((SwSetExpField*)pTxtFld->GetFld().GetFld()) ->GetInputFlag() ) && (!bSubType || (pFmtFld->GetFld()->GetSubType() @@ -670,11 +640,7 @@ void lcl_MakeFldLst( _SetGetExpFlds& rLst, const SwFieldType& rFldType, { SwCntntFrm* pCFrm; const SwTxtNode& rTxtNode = pTxtFld->GetTxtNode(); -<<<<<<< local - if( 0 != ( pCFrm = rTxtNode.getLayoutFrm( rTxtNode.GetDoc()->GetCurrentLayout(), &aPt, 0, FALSE )) && -======= - if( 0 != ( pCFrm = rTxtNode.GetFrm( &aPt, 0, sal_False )) && ->>>>>>> other + if( 0 != ( pCFrm = rTxtNode.getLayoutFrm( rTxtNode.GetDoc()->GetCurrentLayout(), &aPt, 0, sal_False )) && ( bInReadOnly || !pCFrm->IsProtected() )) { _SetGetExpFld* pNew = new _SetGetExpFld( @@ -759,11 +725,7 @@ sal_Bool SwCrsrShell::MoveFldType( const SwFieldType* pFldType, sal_Bool bNext, { // auch beim Einsammeln wird nur der erste Frame benutzt! Point aPt; -<<<<<<< local - aSrch.SetBodyPos( *pTNd->getLayoutFrm( GetLayout(), &aPt, &rPos, FALSE ) ); -======= - aSrch.SetBodyPos( *pTNd->GetFrm( &aPt, &rPos, sal_False ) ); ->>>>>>> other + aSrch.SetBodyPos( *pTNd->getLayoutFrm( GetLayout(), &aPt, &rPos, sal_False ) ); } sal_Bool bFound = aSrtLst.Seek_Entry( &aSrch, &nPos ); @@ -1626,13 +1588,10 @@ sal_Bool SwContentAtPos::IsInProtectSect() const const SwCntntFrm* pFrm; return pNd && ( pNd->IsInProtectSect() || -<<<<<<< local - ( 0 != ( pFrm = pNd->getLayoutFrm( pNd->GetDoc()->GetCurrentLayout(), 0,0,FALSE)) && -======= - ( 0 != ( pFrm = pNd->GetFrm(0,0,sal_False)) && ->>>>>>> other + ( 0 != ( pFrm = pNd->getLayoutFrm( pNd->GetDoc()->GetCurrentLayout(), 0,0,sal_False)) && pFrm->IsProtected() )); } + bool SwContentAtPos::IsInRTLText()const { bool bRet = false; diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx index b6615ffae076..e1599db289c9 100644 --- a/sw/source/core/crsr/pam.cxx +++ b/sw/source/core/crsr/pam.cxx @@ -640,11 +640,7 @@ sal_uInt16 SwPaM::GetPageNum( sal_Bool bAtPoint, const Point* pLayPos ) const SwPosition* pPos = bAtPoint ? m_pPoint : m_pMark; if( 0 != ( pNd = pPos->nNode.GetNode().GetCntntNode() ) && -<<<<<<< local - 0 != ( pCFrm = pNd->getLayoutFrm( pNd->GetDoc()->GetCurrentLayout(), pLayPos, pPos, FALSE )) && -======= - 0 != ( pCFrm = pNd->GetFrm( pLayPos, pPos, sal_False )) && ->>>>>>> other + 0 != ( pCFrm = pNd->getLayoutFrm( pNd->GetDoc()->GetCurrentLayout(), pLayPos, pPos, sal_False )) && 0 != ( pPg = pCFrm->FindPageFrm() )) return pPg->GetPhyPageNum(); return 0; @@ -687,11 +683,7 @@ sal_Bool SwPaM::HasReadonlySel( bool bFormView ) const const SwCntntFrm *pFrm; if( 0 != ( pNd = GetPoint()->nNode.GetNode().GetCntntNode() )) -<<<<<<< local - pFrm = pNd->getLayoutFrm( pNd->GetDoc()->GetCurrentLayout(), &aTmpPt, GetPoint(), FALSE ); -======= - pFrm = pNd->GetFrm( &aTmpPt, GetPoint(), sal_False ); ->>>>>>> other + pFrm = pNd->getLayoutFrm( pNd->GetDoc()->GetCurrentLayout(), &aTmpPt, GetPoint(), sal_False ); else pFrm = 0; @@ -719,11 +711,7 @@ sal_Bool SwPaM::HasReadonlySel( bool bFormView ) const if( !bRet && HasMark() && GetPoint()->nNode != GetMark()->nNode ) { if( 0 != ( pNd = GetMark()->nNode.GetNode().GetCntntNode() )) -<<<<<<< local - pFrm = pNd->getLayoutFrm( pNd->GetDoc()->GetCurrentLayout(), &aTmpPt, GetMark(), FALSE ); -======= - pFrm = pNd->GetFrm( &aTmpPt, GetMark(), sal_False ); ->>>>>>> other + pFrm = pNd->getLayoutFrm( pNd->GetDoc()->GetCurrentLayout(), &aTmpPt, GetMark(), sal_False ); else pFrm = 0; diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx index ac76ca3f2d04..565500004ff3 100644 --- a/sw/source/core/crsr/swcrsr.cxx +++ b/sw/source/core/crsr/swcrsr.cxx @@ -1175,11 +1175,7 @@ sal_Bool SwCursor::GoPrevWord() return GoPrevWordWT( WordType::ANYWORD_IGNOREWHITESPACES ); } -<<<<<<< local -BOOL SwCursor::SelectWord( ViewShell* pViewShell, const Point* pPt ) -======= -sal_Bool SwCursor::SelectWord( const Point* pPt ) ->>>>>>> other +sal_Bool SwCursor::SelectWord( ViewShell* pViewShell, const Point* pPt ) { return SelectWordWT( pViewShell, WordType::ANYWORD_IGNOREWHITESPACES, pPt ); } @@ -1357,11 +1353,7 @@ sal_Bool SwCursor::GoPrevWordWT( sal_Int16 nWordType ) return bRet; } -<<<<<<< local -BOOL SwCursor::SelectWordWT( ViewShell* pViewShell, sal_Int16 nWordType, const Point* pPt ) -======= -sal_Bool SwCursor::SelectWordWT( sal_Int16 nWordType, const Point* pPt ) ->>>>>>> other +sal_Bool SwCursor::SelectWordWT( ViewShell* pViewShell, sal_Int16 nWordType, const Point* pPt ) { SwCrsrSaveState aSave( *this ); diff --git a/sw/source/core/crsr/trvltbl.cxx b/sw/source/core/crsr/trvltbl.cxx index 0ecc02da4e4a..ee33dd8208e3 100644 --- a/sw/source/core/crsr/trvltbl.cxx +++ b/sw/source/core/crsr/trvltbl.cxx @@ -193,13 +193,8 @@ sal_Bool SwCrsrShell::_SelTblRowOrCol( bool bRow, bool bRowSimple ) { const SwShellCrsr *pCrsr = _GetCrsr(); const SwFrm* pStartFrm = pFrm; -<<<<<<< local - const SwCntntNode *pCNd = pCrsr->GetCntntNode( FALSE ); - const SwFrm* pEndFrm = pCNd ? pCNd->getLayoutFrm( GetLayout(), &pCrsr->GetMkPos() ) : 0; -======= const SwCntntNode *pCNd = pCrsr->GetCntntNode( sal_False ); - const SwFrm* pEndFrm = pCNd ? pCNd->GetFrm( &pCrsr->GetMkPos() ) : 0; ->>>>>>> other + const SwFrm* pEndFrm = pCNd ? pCNd->getLayoutFrm( GetLayout(), &pCrsr->GetMkPos() ) : 0; if ( bRow ) { diff --git a/sw/source/core/crsr/unocrsr.cxx b/sw/source/core/crsr/unocrsr.cxx index 050306cdc8a7..7a25fe5c47a2 100644 --- a/sw/source/core/crsr/unocrsr.cxx +++ b/sw/source/core/crsr/unocrsr.cxx @@ -244,15 +244,9 @@ void SwUnoTableCrsr::MakeBoxSels() const SwCntntNode* pCNd; bool bMakeTblCrsrs = true; if( GetPoint()->nNode.GetIndex() && GetMark()->nNode.GetIndex() && -<<<<<<< local 0 != ( pCNd = GetCntntNode() ) && pCNd->getLayoutFrm( pCNd->GetDoc()->GetCurrentLayout() ) && - 0 != ( pCNd = GetCntntNode(FALSE) ) && pCNd->getLayoutFrm( pCNd->GetDoc()->GetCurrentLayout() ) ) - bMakeTblCrsrs = GetDoc()->GetCurrentLayout()->MakeTblCrsrs( *this ); //swmod 080218 -======= - 0 != ( pCNd = GetCntntNode() ) && pCNd->GetFrm() && - 0 != ( pCNd = GetCntntNode(sal_False) ) && pCNd->GetFrm() ) - bMakeTblCrsrs = GetDoc()->GetRootFrm()->MakeTblCrsrs( *this ); ->>>>>>> other + 0 != ( pCNd = GetCntntNode(sal_False) ) && pCNd->getLayoutFrm( pCNd->GetDoc()->GetCurrentLayout() ) ) + bMakeTblCrsrs = GetDoc()->GetCurrentLayout()->MakeTblCrsrs( *this ); if ( !bMakeTblCrsrs ) { diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx index 2dc08a28dfd5..f526e9b765a8 100644 --- a/sw/source/core/crsr/viscrs.cxx +++ b/sw/source/core/crsr/viscrs.cxx @@ -454,11 +454,7 @@ void SwVisCrsr::_SetPosAndShow() if( rNode.IsTxtNode() ) { const SwTxtNode& rTNd = *rNode.GetTxtNode(); -<<<<<<< local - const SwFrm* pFrm = rTNd.getLayoutFrm( pCrsrShell->GetLayout(), 0, 0, FALSE ); -======= - const SwFrm* pFrm = rTNd.GetFrm( 0, 0, sal_False ); ->>>>>>> other + const SwFrm* pFrm = rTNd.getLayoutFrm( pCrsrShell->GetLayout(), 0, 0, sal_False ); if ( pFrm ) { const SwScriptInfo* pSI = ((SwTxtFrm*)pFrm)->GetScriptInfo(); @@ -815,13 +811,8 @@ short SwShellCrsr::MaxReplaceArived() // alte Actions beenden; die Tabellen-Frames werden angelegt und // eine SSelection kann erzeugt werden SvUShorts aArr; -<<<<<<< local - USHORT nActCnt; - ViewShell *pShell = const_cast< SwCrsrShell* >( GetShell() ), -======= sal_uInt16 nActCnt; - ViewShell *pShell = GetDoc()->GetRootFrm()->GetCurrShell(), ->>>>>>> other + ViewShell *pShell = const_cast< SwCrsrShell* >( GetShell() ), *pSh = pShell; do { for( nActCnt = 0; pSh->ActionPend(); ++nActCnt ) diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx index 3271a497f24b..c454da191cf7 100644 --- a/sw/source/core/doc/doc.cxx +++ b/sw/source/core/doc/doc.cxx @@ -118,13 +118,11 @@ #include <viewsh.hxx> #include <shellres.hxx> #include <txtfrm.hxx> -<<<<<<< local #include <attrhint.hxx> -======= + #include <wdocsh.hxx> // SwWebDocShell #include <prtopt.hxx> // SwPrintOptions ->>>>>>> other #include <vector> #include <map> @@ -377,13 +375,8 @@ const i18n::ForbiddenCharacters* return pRet; } -<<<<<<< local -void SwDoc::setForbiddenCharacters(/*[in]*/ USHORT nLang, - /*[in]*/ const com::sun::star::i18n::ForbiddenCharacters& rFChars ) -======= void SwDoc::setForbiddenCharacters(/*[in]*/ sal_uInt16 nLang, - /*[in]*/ const i18n::ForbiddenCharacters& rFChars ) ->>>>>>> other + /*[in]*/ const com::sun::star::i18n::ForbiddenCharacters& rFChars ) { if( !xForbiddenCharsTable.isValid() ) { @@ -1104,16 +1097,9 @@ sal_uInt16 _PostItFld::GetPageNo( //sondern die des ersten Auftretens des PostIts innerhalb des selektierten //Bereichs ermittelt werden. rVirtPgNo = 0; -<<<<<<< local - USHORT nPos = GetCntnt(); + sal_uInt16 nPos = GetCntnt(); SwIterator<SwTxtFrm,SwTxtNode> aIter( GetFld()->GetTxtNode() ); for( SwTxtFrm* pFrm = aIter.First(); pFrm; pFrm = aIter.Next() ) -======= - sal_uInt16 nPos = GetCntnt(); - SwClientIter aIter( (SwModify &)GetFld()->GetTxtNode() ); - for( SwTxtFrm* pFrm = (SwTxtFrm*)aIter.First( TYPE( SwFrm )); - pFrm; pFrm = (SwTxtFrm*)aIter.Next() ) ->>>>>>> other { if( pFrm->GetOfst() > nPos || (pFrm->HasFollow() && pFrm->GetFollow()->GetOfst() <= nPos) ) @@ -1772,13 +1758,8 @@ void SwDoc::UpdateDocStat( SwDocStat& rStat ) } } -<<<<<<< local rStat.nPage = GetCurrentLayout() ? GetCurrentLayout()->GetPageNum() : 0; //swmod 080218 - rStat.bModified = FALSE; -======= - rStat.nPage = GetRootFrm() ? GetRootFrm()->GetPageNum() : 0; rStat.bModified = sal_False; ->>>>>>> other SetDocStat( rStat ); com::sun::star::uno::Sequence < com::sun::star::beans::NamedValue > aStat( rStat.nPage ? 7 : 6); @@ -2102,19 +2083,9 @@ void SwDoc::InvalidateAutoCompleteFlag() SwRootFrm* pTmpRoot = GetCurrentLayout(); if( pTmpRoot ) { -<<<<<<< local std::set<SwRootFrm*> aAllLayouts = GetAllLayouts(); std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::mem_fun(&SwRootFrm::AllInvalidateAutoCompleteWords));//swmod 080305 - for( ULONG nNd = 1, nCnt = GetNodes().Count(); nNd < nCnt; ++nNd ) -======= - SwPageFrm *pPage = (SwPageFrm*)GetRootFrm()->Lower(); - while ( pPage ) - { - pPage->InvalidateAutoCompleteWords(); - pPage = (SwPageFrm*)pPage->GetNext(); - } for( sal_uLong nNd = 1, nCnt = GetNodes().Count(); nNd < nCnt; ++nNd ) ->>>>>>> other { SwTxtNode* pTxtNode = GetNodes()[ nNd ]->GetTxtNode(); if ( pTxtNode ) pTxtNode->SetAutoCompleteWordDirty( true ); diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx index f64f37e02011..9faf35b93e40 100644 --- a/sw/source/core/doc/docdesc.cxx +++ b/sw/source/core/doc/docdesc.cxx @@ -70,12 +70,8 @@ #include <GetMetricVal.hxx> #include <unotools/syslocale.hxx> #include <statstr.hrc> -<<<<<<< local #include <switerator.hxx> -======= #include <hints.hxx> - ->>>>>>> other #include <SwUndoPageDesc.hxx> #include <pagedeschint.hxx> #include <tgrditem.hxx> @@ -445,28 +441,6 @@ void SwDoc::ChgPageDesc( sal_uInt16 i, const SwPageDesc &rChged ) |* |*************************************************************************/ -<<<<<<< local -======= -void lcl_RemoveFrms( SwFrmFmt& rFmt, sal_Bool& rbFtnsRemoved ) -{ - SwClientIter aIter( rFmt ); - SwFrm *pFrm; - for( pFrm = (SwFrm*)aIter.First(TYPE(SwFrm)); pFrm; - pFrm = (SwFrm*)aIter.Next() ) - if ( !rbFtnsRemoved && pFrm->IsPageFrm() && - ((SwPageFrm*)pFrm)->IsFtnPage() ) - { - rFmt.getIDocumentLayoutAccess()->GetRootFrm()->RemoveFtns( 0, sal_False, sal_True ); - rbFtnsRemoved = sal_True; - } - else - { - pFrm->Cut(); - delete pFrm; - } -} - ->>>>>>> other // #i7983# void SwDoc::PreDelPageDesc(SwPageDesc * pDel) { @@ -497,8 +471,7 @@ void SwDoc::PreDelPageDesc(SwPageDesc * pDel) } } -<<<<<<< local - for ( USHORT j = 0; j < aPageDescs.Count(); ++j ) + for ( sal_uInt16 j = 0; j < aPageDescs.Count(); ++j ) { if ( aPageDescs[j]->GetFollow() == pDel ) { @@ -534,22 +507,6 @@ void SwDoc::PreDelPageDesc(SwPageDesc * pDel) GetRootFrm()->CheckPageDescs( (SwPageFrm*)GetRootFrm()->Lower() ); } } - - if( GetRootFrm() ) // ist nicht immer vorhanden!! (Orginizer) - { - //Wenn jetzt noch irgendwelche Seiten auf die FrmFmt'e (Master und Left) - //Zeigen (z.B. irgendwelche Fussnotenseiten), so muessen die Seiten - //vernichtet werden. - - // Wenn wir auf Endnotenseiten stossen, schmeissen wir alle Fussnoten weg, - // anders kann die Reihenfolge der Seiten (FollowsPageDescs usw.) - // nicht garantiert werden. - sal_Bool bFtnsRemoved = sal_False; - - ::lcl_RemoveFrms( pDel->GetMaster(), bFtnsRemoved ); - ::lcl_RemoveFrms( pDel->GetLeft(), bFtnsRemoved ); - } ->>>>>>> other } // #116530# @@ -694,13 +651,8 @@ void SwDoc::PrtDataChanged() if( GetDocShell() ) GetDocShell()->UpdateFontList(); -<<<<<<< local - BOOL bDraw = TRUE; - if ( pTmpRoot ) -======= sal_Bool bDraw = sal_True; - if ( GetRootFrm() ) ->>>>>>> other + if ( pTmpRoot ) { ViewShell *pSh = GetCurrentViewShell(); if( !pSh->GetViewOptions()->getBrowseMode() || @@ -709,13 +661,8 @@ void SwDoc::PrtDataChanged() if ( GetDocShell() ) pWait = new SwWait( *GetDocShell(), sal_True ); -<<<<<<< local pTmpRoot->StartAllAction(); - bEndAction = TRUE; -======= - GetRootFrm()->StartAllAction(); bEndAction = sal_True; ->>>>>>> other bDraw = sal_False; if( pDrawModel ) @@ -881,21 +828,12 @@ IMPL_LINK( SwDoc, DoUpdateModifiedOLE, Timer *, ) GetCurrentLayout()->StartAllAction(); //swmod 080218 SwMsgPoolItem aMsgHint( RES_UPDATE_ATTR ); -<<<<<<< local - for( USHORT i = 0; i < pNodes->Count(); ++i ) -======= - for( sal_uInt16 i = 0; i < aOLENodes.Count(); ++i ) ->>>>>>> other + for( sal_uInt16 i = 0; i < pNodes->Count(); ++i ) { ::SetProgressState( i, GetDocShell() ); -<<<<<<< local SwOLENode* pOLENd = (*pNodes)[i]; - pOLENd->SetOLESizeInvalid( FALSE ); -======= - SwOLENode* pOLENd = aOLENodes[i]; - pOLENd->SetOLESizeInvalid( sal_False ); ->>>>>>> other + pOLENd->SetOLESizeInvalid( sal_false ); //Kennen wir nicht, also muss das Objekt geladen werden. //Wenn es keine Benachrichtigung wuenscht diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx index 5c93ac5b8201..619a193134b1 100644 --- a/sw/source/core/doc/docdraw.cxx +++ b/sw/source/core/doc/docdraw.cxx @@ -654,12 +654,8 @@ void SwDoc::InitDrawModel() nInvisibleControls = pDrawModel->GetLayerAdmin().NewLayer( sLayerNm )->GetID(); } -<<<<<<< local - SdrPage* pMasterPage = pDrawModel->AllocPage( FALSE ); + SdrPage* pMasterPage = pDrawModel->AllocPage( sal_False ); pDrawModel->InsertPage( pMasterPage ); -======= - pDrawModel->InsertPage( pDrawModel->AllocPage( sal_False ) ); ->>>>>>> other RTL_LOGFILE_CONTEXT_TRACE( aLog, "after create DrawDocument" ); RTL_LOGFILE_CONTEXT_TRACE( aLog, "before create Spellchecker/Hyphenator" ); diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx index 67d14f505fb9..89552c3b1ad9 100644 --- a/sw/source/core/doc/docfld.cxx +++ b/sw/source/core/doc/docfld.cxx @@ -2529,11 +2529,7 @@ void SwDocUpdtFld::GetBodyNode( const SwTxtFld& rTFld, sal_uInt16 nFldWhich ) // immer den ersten !! (in Tab-Headline, Kopf-/Fuss ) Point aPt; -<<<<<<< local - const SwCntntFrm* pFrm = rTxtNd.getLayoutFrm( rDoc.GetCurrentLayout(), &aPt, 0, FALSE ); -======= - const SwCntntFrm* pFrm = rTxtNd.GetFrm( &aPt, 0, sal_False ); ->>>>>>> other + const SwCntntFrm* pFrm = rTxtNd.getLayoutFrm( rDoc.GetCurrentLayout(), &aPt, 0, sal_False ); _SetGetExpFld* pNew = NULL; sal_Bool bIsInBody = sal_False; @@ -2599,11 +2595,7 @@ void SwDocUpdtFld::GetBodyNode( const SwSectionNode& rSectNd ) // immer den ersten !! (in Tab-Headline, Kopf-/Fuss ) Point aPt; -<<<<<<< local - const SwCntntFrm* pFrm = pCNd->getLayoutFrm( rDoc.GetCurrentLayout(), &aPt, 0, FALSE ); -======= - const SwCntntFrm* pFrm = pCNd->GetFrm( &aPt, 0, sal_False ); ->>>>>>> other + const SwCntntFrm* pFrm = pCNd->getLayoutFrm( rDoc.GetCurrentLayout(), &aPt, 0, sal_False ); if( !pFrm ) break; diff --git a/sw/source/core/doc/docfly.cxx b/sw/source/core/doc/docfly.cxx index e26669f7b604..58af4176849a 100644 --- a/sw/source/core/doc/docfly.cxx +++ b/sw/source/core/doc/docfly.cxx @@ -73,14 +73,7 @@ extern sal_uInt16 GetHtmlMode( const SwDocShell* ); using namespace ::com::sun::star; -<<<<<<< local -USHORT SwDoc::GetFlyCount( FlyCntType eType ) const -======= -/*-----------------17.02.98 08:35------------------- - ---------------------------------------------------*/ sal_uInt16 SwDoc::GetFlyCount( FlyCntType eType ) const ->>>>>>> other { const SwSpzFrmFmts& rFmts = *GetSpzFrmFmts(); sal_uInt16 nSize = rFmts.Count(); @@ -183,11 +176,7 @@ Point lcl_FindAnchorLayPos( SwDoc& rDoc, const SwFmtAnchor& rAnch, { const SwPosition *pPos = rAnch.GetCntntAnchor(); const SwCntntNode* pNd = pPos->nNode.GetNode().GetCntntNode(); -<<<<<<< local - const SwFrm* pOld = pNd ? pNd->getLayoutFrm( rDoc.GetCurrentLayout(), &aRet, 0, FALSE ) : 0; -======= - const SwFrm* pOld = pNd ? pNd->GetFrm( &aRet, 0, sal_False ) : 0; ->>>>>>> other + const SwFrm* pOld = pNd ? pNd->getLayoutFrm( rDoc.GetCurrentLayout(), &aRet, 0, sal_False ) : 0; if( pOld ) aRet = pOld->Frm().Pos(); } @@ -206,15 +195,9 @@ Point lcl_FindAnchorLayPos( SwDoc& rDoc, const SwFmtAnchor& rAnch, case FLY_AT_PAGE: { -<<<<<<< local - USHORT nPgNum = rAnch.GetPageNum(); - const SwPageFrm *pPage = (SwPageFrm*)rDoc.GetCurrentLayout()->Lower(); - for( USHORT i = 1; (i <= nPgNum) && pPage; ++i, -======= sal_uInt16 nPgNum = rAnch.GetPageNum(); - const SwPageFrm *pPage = (SwPageFrm*)rDoc.GetRootFrm()->Lower(); + const SwPageFrm *pPage = (SwPageFrm*)rDoc.GetCurrentLayout()->Lower(); for( sal_uInt16 i = 1; (i <= nPgNum) && pPage; ++i, ->>>>>>> other pPage = (const SwPageFrm*)pPage->GetNext() ) if( i == nPgNum ) { @@ -526,20 +509,8 @@ void SwDoc::SetFlyFrmDescription( SwFlyFrmFmt& rFlyFrmFmt, } // <-- -<<<<<<< local -BOOL SwDoc::SetFrmFmtToFly( SwFrmFmt& rFmt, SwFrmFmt& rNewFmt, - SfxItemSet* pSet, BOOL bKeepOrient ) -======= -/*************************************************************************** - * Methode : sal_Bool SwDoc::SetFrmFmtToFly( SwFlyFrm&, SwFrmFmt& ) - * Beschreibung: - * Erstellt : OK 14.04.94 15:40 - * Aenderung : JP 23.04.98 - ***************************************************************************/ - sal_Bool SwDoc::SetFrmFmtToFly( SwFrmFmt& rFmt, SwFrmFmt& rNewFmt, SfxItemSet* pSet, sal_Bool bKeepOrient ) ->>>>>>> other { sal_Bool bChgAnchor = sal_False, bFrmSz = sal_False; @@ -744,11 +715,7 @@ sal_Bool SwDoc::ChgAnchor( const SdrMarkList& _rMrkList, // OD 20.06.2003 #108784# - consider that drawing objects // can be in header/footer. Thus, <GetFrm()> by left-top-corner pTxtFrm = aPos.nNode.GetNode(). -<<<<<<< local - GetCntntNode()->getLayoutFrm( GetCurrentLayout(), &aPt, 0, FALSE ); -======= - GetCntntNode()->GetFrm( &aPt, 0, sal_False ); ->>>>>>> other + GetCntntNode()->getLayoutFrm( GetCurrentLayout(), &aPt, 0, sal_False ); } const SwFrm *pTmp = ::FindAnchor( pTxtFrm, aPt ); pNewAnchorFrm = pTmp->FindFlyFrm(); diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx index d0f60e5bb058..67999d21381c 100644 --- a/sw/source/core/doc/docfmt.cxx +++ b/sw/source/core/doc/docfmt.cxx @@ -2045,14 +2045,7 @@ void SwDoc::CopyFmtArr( const SvPtrarr& rSourceArr, continue; pDest = FindFmtByName( rDestArr, pSrc->GetName() ); -<<<<<<< local - pDest->SetAuto( FALSE ); -======= pDest->SetAuto( sal_False ); -// pDest->ResetAllAttr(); -// pDest->CopyAttrs( *pSrc, sal_True ); // kopiere Attribute -//JP 19.02.96: ist so wohl optimaler - loest ggfs. kein Modify aus! ->>>>>>> other pDest->DelDiffs( *pSrc ); // #i94285#: existing <SwFmtPageDesc> instance, before copying attributes @@ -2176,12 +2169,8 @@ void SwDoc::CopyPageDescHeaderFooterImpl( bool bCpyHeader, void SwDoc::CopyPageDesc( const SwPageDesc& rSrcDesc, SwPageDesc& rDstDesc, sal_Bool bCopyPoolIds ) { -<<<<<<< local - BOOL bNotifyLayout = FALSE; - SwRootFrm* pTmpRoot = GetCurrentLayout();//swmod 080219 -======= sal_Bool bNotifyLayout = sal_False; ->>>>>>> other + SwRootFrm* pTmpRoot = GetCurrentLayout();//swmod 080219 rDstDesc.SetLandscape( rSrcDesc.GetLandscape() ); rDstDesc.SetNumType( rSrcDesc.GetNumType() ); diff --git a/sw/source/core/doc/docftn.cxx b/sw/source/core/doc/docftn.cxx index 2d8d911cbc9c..e268f283df2b 100644 --- a/sw/source/core/doc/docftn.cxx +++ b/sw/source/core/doc/docftn.cxx @@ -303,12 +303,8 @@ void SwDoc::SetFtnInfo(const SwFtnInfo& rInfo) //pTmpRoot->UpdateFtnNums(); std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::mem_fun(&SwRootFrm::UpdateFtnNums));//swmod 080304 if ( bFtnDesc ) -<<<<<<< local //pTmpRoot->CheckFtnPageDescs( FALSE ); - std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::bind2nd(std::mem_fun(&SwRootFrm::CheckFtnPageDescs), FALSE));//swmod 080304 -======= - GetRootFrm()->CheckFtnPageDescs( sal_False ); ->>>>>>> other + std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::bind2nd(std::mem_fun(&SwRootFrm::CheckFtnPageDescs), sal_False));//swmod 080304 if ( bExtra ) { //Fuer die Benachrichtung bezueglich ErgoSum usw. sparen wir uns @@ -375,15 +371,11 @@ void SwDoc::SetEndNoteInfo(const SwEndNoteInfo& rInfo) if ( pTmpRoot ) { if ( bFtnDesc ) -<<<<<<< local //pTmpRoot->CheckFtnPageDescs( TRUE ); { std::set<SwRootFrm*> aAllLayouts = GetAllLayouts(); - std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::bind2nd(std::mem_fun(&SwRootFrm::CheckFtnPageDescs), TRUE));//swmod 080304 + std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::bind2nd(std::mem_fun(&SwRootFrm::CheckFtnPageDescs), sal_True));//swmod 080304 } -======= - GetRootFrm()->CheckFtnPageDescs( sal_True ); ->>>>>>> other if ( bExtra ) { //Fuer die Benachrichtung bezueglich ErgoSum usw. sparen wir uns diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx index 65dd1c51a797..2a65f13d10d0 100644 --- a/sw/source/core/doc/doclay.cxx +++ b/sw/source/core/doc/doclay.cxx @@ -1935,12 +1935,7 @@ IMPL_LINK( SwDoc, DoIdleJobs, Timer *, pTimer ) if( pTmpRoot->IsNeedGrammarCheck() ) { -<<<<<<< local - BOOL bIsOnlineSpell = pSh->GetViewOptions()->IsOnlineSpell(); -======= sal_Bool bIsOnlineSpell = pSh->GetViewOptions()->IsOnlineSpell(); - ->>>>>>> other sal_Bool bIsAutoGrammar = sal_False; SvtLinguConfig().GetProperty( ::rtl::OUString::createFromAscii( UPN_IS_GRAMMAR_AUTO ) ) >>= bIsAutoGrammar; diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx index 9ff8e90f76b6..98ad5724f10d 100644 --- a/sw/source/core/doc/docnew.cxx +++ b/sw/source/core/doc/docnew.cxx @@ -313,11 +313,6 @@ SwDoc::SwDoc() mbUpdateExpFld = mbNewDoc = mbCopyIsMove = -<<<<<<< local - mbNoDrawUndoObj = -======= - mbBrowseMode = ->>>>>>> other mbInReading = mbInXMLImport = mbUpdateTOX = diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx index 93cef43b956c..72e1010da86c 100644 --- a/sw/source/core/doc/docnum.cxx +++ b/sw/source/core/doc/docnum.cxx @@ -1353,23 +1353,6 @@ void SwDoc::StopNumRuleAnimations( OutputDevice* pOut ) { for( sal_uInt16 n = GetNumRuleTbl().Count(); n; ) { -<<<<<<< local -======= - // --> OD 2008-02-19 #refactorlists# -// SwNumRuleInfo aUpd( GetNumRuleTbl()[ --n ]->GetName() ); -// aUpd.MakeList( *this ); - -// for( sal_uLong nFirst = 0, nLast = aUpd.GetList().Count(); -// nFirst < nLast; ++nFirst ) -// { -// SwTxtNode* pTNd = aUpd.GetList().GetObject( nFirst ); -// SwClientIter aIter( *pTNd ); -// for( SwFrm* pFrm = (SwFrm*)aIter.First( TYPE(SwFrm) ); -// pFrm; pFrm = (SwFrm*)aIter.Next() ) -// if( ((SwTxtFrm*)pFrm)->HasAnimation() ) -// ((SwTxtFrm*)pFrm)->StopAnimation( pOut ); -// } ->>>>>>> other SwNumRule::tTxtNodeList aTxtNodeList; GetNumRuleTbl()[ --n ]->GetTxtNodeList( aTxtNodeList ); for ( SwNumRule::tTxtNodeList::iterator aTxtNodeIter = aTxtNodeList.begin(); diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx index 999d797f94fe..ce17a146d40f 100644 --- a/sw/source/core/doc/doctxm.cxx +++ b/sw/source/core/doc/doctxm.cxx @@ -272,11 +272,7 @@ const SwTOXMark& SwDoc::GotoTOXMark( const SwTOXMark& rCurTOXMark, if( pTOXMark != &rCurTOXMark && 0 != ( pMark = pTOXMark->GetTxtTOXMark()) && 0 != ( pTOXSrc = pMark->GetpTxtNd() ) && -<<<<<<< local - 0 != ( pCFrm = pTOXSrc->getLayoutFrm( GetCurrentLayout(), &aPt, 0, FALSE )) && -======= - 0 != ( pCFrm = pTOXSrc->GetFrm( &aPt, 0, sal_False )) && ->>>>>>> other + 0 != ( pCFrm = pTOXSrc->getLayoutFrm( GetCurrentLayout(), &aPt, 0, sal_False )) && ( bInReadOnly || !pCFrm->IsProtected() )) { CompareNodeCntnt aAbsNew( pTOXSrc->GetIndex(), *pMark->GetStart() ); @@ -491,12 +487,7 @@ const SwAttrSet& SwDoc::GetTOXBaseAttrSet(const SwTOXBase& rTOXBase) const return pFmt->GetAttrSet(); } -<<<<<<< local -const SwTOXBase* SwDoc::GetDefaultTOXBase( TOXTypes eTyp, BOOL bCreate ) -======= - --------------------------------------------------*/ const SwTOXBase* SwDoc::GetDefaultTOXBase( TOXTypes eTyp, sal_Bool bCreate ) ->>>>>>> other { SwTOXBase** prBase = 0; switch(eTyp) @@ -644,12 +635,7 @@ sal_uInt16 SwDoc::GetTOXTypeCount(TOXTypes eTyp) const return nCnt; } -<<<<<<< local -const SwTOXType* SwDoc::GetTOXType( TOXTypes eTyp, USHORT nId ) const -======= - --------------------------------------------------------------------*/ const SwTOXType* SwDoc::GetTOXType( TOXTypes eTyp, sal_uInt16 nId ) const ->>>>>>> other { const SwTOXTypePtr * ppTTypes = pTOXTypes->GetData(); sal_uInt16 nCnt = 0; @@ -721,14 +707,7 @@ String SwDoc::GetUniqueTOXBaseName( const SwTOXType& rType, return aName += String::CreateFromInt32( ++nNum ); } -<<<<<<< local -BOOL SwDoc::SetTOXBaseName(const SwTOXBase& rTOXBase, const String& rName) -======= -/*-------------------------------------------------------------------- - - --------------------------------------------------------------------*/ sal_Bool SwDoc::SetTOXBaseName(const SwTOXBase& rTOXBase, const String& rName) ->>>>>>> other { ASSERT( rTOXBase.ISA( SwTOXBaseSection ), "keine TOXBaseSection!" ); @@ -1295,15 +1274,9 @@ void SwTOXBaseSection::UpdateOutline( const SwTxtNode* pOwnChapterNode ) ::SetProgressState( 0, pDoc->GetDocShell() ); SwTxtNode* pTxtNd = rOutlNds[ n ]->GetTxtNode(); if( pTxtNd && pTxtNd->Len() && pTxtNd->GetDepends() && -<<<<<<< local - //USHORT(pTxtNd->GetTxtColl()->GetOutlineLevel()+1) <= GetLevel() && //#outline level,zhaojianwei - USHORT( pTxtNd->GetAttrOutlineLevel()) <= GetLevel() && //<-end,zhaojianwei - pTxtNd->getLayoutFrm( pDoc->GetCurrentLayout() ) && -======= //sal_uInt16(pTxtNd->GetTxtColl()->GetOutlineLevel()+1) <= GetLevel() && //#outline level,zhaojianwei sal_uInt16( pTxtNd->GetAttrOutlineLevel()) <= GetLevel() && //<-end,zhaojianwei - pTxtNd->GetFrm() && ->>>>>>> other + pTxtNd->getLayoutFrm( pDoc->GetCurrentLayout() ) && !pTxtNd->HasHiddenParaField() && !pTxtNd->HasHiddenCharAttribute( true ) && ( !IsFromChapter() || @@ -1752,11 +1725,7 @@ void SwTOXBaseSection::GenerateText( sal_uInt16 nArrayIdx, long nRightMargin; if( pPageDesc ) { -<<<<<<< local - const SwFrm* pFrm = pTOXNd->getLayoutFrm( pDoc->GetCurrentLayout(), 0, 0, TRUE ); -======= - const SwFrm* pFrm = pTOXNd->GetFrm( 0, 0, sal_True ); ->>>>>>> other + const SwFrm* pFrm = pTOXNd->getLayoutFrm( pDoc->GetCurrentLayout(), 0, 0, sal_True ); if( !pFrm || 0 == ( pFrm = pFrm->FindPageFrm() ) || pPageDesc != ((SwPageFrm*)pFrm)->GetPageDesc() ) // dann muss man ueber den PageDesc gehen diff --git a/sw/source/core/doc/fmtcol.cxx b/sw/source/core/doc/fmtcol.cxx index 030ab6bc311c..19638c159bc1 100644 --- a/sw/source/core/doc/fmtcol.cxx +++ b/sw/source/core/doc/fmtcol.cxx @@ -357,15 +357,9 @@ sal_Bool SwTxtFmtColl::IsAtDocNodeSet() const { SwIterator<SwCntntNode,SwFmtColl> aIter( *this ); const SwNodes& rNds = GetDoc()->GetNodes(); -<<<<<<< local for( SwCntntNode* pNode = aIter.First(); pNode; pNode = aIter.Next() ) if( &(pNode->GetNodes()) == &rNds ) - return TRUE; -======= - for( SwClient* pC = aIter.First(TYPE(SwCntntNode)); pC; pC = aIter.Next() ) - if( &((SwCntntNode*)pC)->GetNodes() == &rNds ) return sal_True; ->>>>>>> other return sal_False; } diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx index 8538ff0991ea..c4e89fc12576 100644 --- a/sw/source/core/doc/htmltbl.cxx +++ b/sw/source/core/doc/htmltbl.cxx @@ -414,16 +414,9 @@ sal_uInt16 SwHTMLTableLayout::GetBrowseWidthByTabFrm( sal_uInt16 SwHTMLTableLayout::GetBrowseWidthByTable( const SwDoc& rDoc ) const { -<<<<<<< local - USHORT nBrowseWidth = 0; + sal_uInt16 nBrowseWidth = 0; SwTabFrm* pFrm = SwIterator<SwTabFrm,SwFmt>::FirstElement( *pSwTable->GetFrmFmt() ); if( pFrm ) -======= - sal_uInt16 nBrowseWidth = 0; - SwClientIter aIter( *(SwModify*)pSwTable->GetFrmFmt() ); - SwClient* pCli = aIter.First( TYPE( SwTabFrm )); - if( pCli ) ->>>>>>> other { nBrowseWidth = GetBrowseWidthByTabFrm( *pFrm ); } @@ -1801,11 +1794,7 @@ void SwHTMLTableLayout::_Resize( sal_uInt16 nAbsAvail, sal_Bool bRecalc ) SetWidths( sal_True, nAbsAvail ); if ( pRoot && pRoot->IsCallbackActionEnabled() ) -<<<<<<< local - pRoot->EndAllAction( TRUE ); //True per VirDev (Browsen ruhiger) //swmod 071108//swmod 071225 -======= - pRoot->EndAllAction( sal_True ); //True per VirDev (Browsen ruhiger) ->>>>>>> other + pRoot->EndAllAction( sal_True ); //True per VirDev (Browsen ruhiger) //swmod 071108//swmod 071225 } IMPL_STATIC_LINK( SwHTMLTableLayout, DelayedResize_Impl, void*, EMPTYARG ) diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx index bf632eed0c02..73f6571e5ad9 100644 --- a/sw/source/core/doc/number.cxx +++ b/sw/source/core/doc/number.cxx @@ -333,13 +333,8 @@ SwNumFmt& SwNumFmt::operator=( const SwNumFmt& rNumFmt) ---------------------------------------------------------------------------*/ sal_Bool SwNumFmt::operator==( const SwNumFmt& rNumFmt) const { -<<<<<<< local - BOOL bRet = SvxNumberFormat::operator==(rNumFmt) && - GetRegisteredIn() == rNumFmt.GetRegisteredIn(); -======= sal_Bool bRet = SvxNumberFormat::operator==(rNumFmt) && - pRegisteredIn == rNumFmt.pRegisteredIn; ->>>>>>> other + GetRegisteredIn() == rNumFmt.GetRegisteredIn(); return bRet; } diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx index b5ca8e4f8a11..a71c0e170834 100644 --- a/sw/source/core/doc/tblrwcl.cxx +++ b/sw/source/core/doc/tblrwcl.cxx @@ -623,13 +623,8 @@ sal_Bool SwTable::_InsertRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, } //Lines fuer das Layout-Update herausuchen. -<<<<<<< local - const BOOL bLayout = !IsNewModel() && - 0 != SwIterator<SwTabFrm,SwFmt>::FirstElement( *GetFrmFmt() ); -======= const sal_Bool bLayout = !IsNewModel() && - 0 != SwClientIter( *GetFrmFmt() ).First( TYPE(SwTabFrm) ); ->>>>>>> other + 0 != SwIterator<SwTabFrm,SwFmt>::FirstElement( *GetFrmFmt() ); if ( bLayout ) { @@ -750,11 +745,7 @@ sal_Bool SwTable::AppendRow( SwDoc* pDoc, sal_uInt16 nCnt ) SetHTMLTableLayout( 0 ); // MIB 9.7.97: HTML-Layout loeschen //Lines fuer das Layout-Update herausuchen. -<<<<<<< local - const BOOL bLayout = 0 != SwIterator<SwTabFrm,SwFmt>::FirstElement( *GetFrmFmt() ); -======= - const sal_Bool bLayout = 0 != SwClientIter( *GetFrmFmt() ).First( TYPE(SwTabFrm) ); ->>>>>>> other + bool bLayout = 0 != SwIterator<SwTabFrm,SwFmt>::FirstElement( *GetFrmFmt() ); if( bLayout ) { aFndBox.SetTableLines( *this ); diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx index 5f4ed2c63ce5..278f0d15c8d1 100644 --- a/sw/source/core/docnode/ndsect.cxx +++ b/sw/source/core/docnode/ndsect.cxx @@ -920,13 +920,8 @@ SwSectionNode* SwNodes::InsertTextSection(SwNodeIndex const& rNdIdx, // Hier bietet sich als Optimierung an, vorhandene Frames nicht zu // zerstoeren und wieder neu anzulegen, sondern nur umzuhaengen. -<<<<<<< local - BOOL bInsFrm = bCreateFrms && !pSectNd->GetSection().IsHidden() && - GetDoc()->GetCurrentViewShell(); //swmod 071108//swmod 071225 -======= sal_Bool bInsFrm = bCreateFrms && !pSectNd->GetSection().IsHidden() && - GetDoc()->GetRootFrm(); ->>>>>>> other + GetDoc()->GetCurrentViewShell(); //swmod 071108//swmod 071225 SwNode2Layout *pNode2Layout = NULL; if( bInsFrm ) { @@ -1071,29 +1066,8 @@ SwFrm* SwClearDummies( SwFrm* pFrm ) SwSectionNode::~SwSectionNode() { -<<<<<<< local // mba: test if iteration works as clients will be removed in callback m_pSection->GetFmt()->CallSwClientNotify( SfxSimpleHint( SFX_HINT_DYING ) ); - - SwDoc* pDoc = GetDoc(); -======= - { - SwClientIter aIter( *(m_pSection->GetFmt()) ); - SwClient *pLast = aIter.GoStart(); - while ( pLast ) - { - if ( pLast->IsA( TYPE(SwFrm) ) ) - { - SwSectionFrm *pSectFrm = (SwSectionFrm*)pLast; - SwSectionFrm::MoveCntntAndDelete( pSectFrm, sal_True ); - pLast = aIter.GoStart(); - } - else - pLast = aIter++; - } - } ->>>>>>> other - SwSectionFmt* pFmt = m_pSection->GetFmt(); if( pFmt ) { diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx index fbd54bcee102..5896792ee7c3 100644 --- a/sw/source/core/docnode/ndtbl.cxx +++ b/sw/source/core/docnode/ndtbl.cxx @@ -30,10 +30,6 @@ #include "precompiled_sw.hxx" #include <com/sun/star/chart2/XChartDocument.hpp> -<<<<<<< local -======= - ->>>>>>> other #include <hintids.hxx> #include <editeng/lrspitem.hxx> #include <editeng/brkitem.hxx> @@ -1151,13 +1147,6 @@ const SwTable* SwDoc::TextToTable( const std::vector< std::vector<SwNodeRange> > bool const bUndo(GetIDocumentUndoRedo().DoesUndo()); if (bUndo) { -<<<<<<< local -======= -// GetIDocumentUndoRedo().StartUndo( UNDO_TEXTTOTABLE ); -// pUndo = new SwUndoTxtToTbl( aOriginal, rInsTblOpts, cCh, eAdjust, pTAFmt ); -// GetIDocumentUndoRedo().AppendUndo(pUndo); - ->>>>>>> other // das Splitten vom TextNode nicht in die Undohistory aufnehmen GetIDocumentUndoRedo().DoUndo(false); } @@ -1209,11 +1198,6 @@ const SwTable* SwDoc::TextToTable( const std::vector< std::vector<SwNodeRange> > pLineFmt->SetFmtAttr( SwFmtFillOrder( ATT_LEFT_TO_RIGHT )); // die Tabelle bekommt USHRT_MAX als default SSize pTableFmt->SetFmtAttr( SwFmtFrmSize( ATT_VAR_SIZE, USHRT_MAX )); -<<<<<<< local -======= -// if( !(rInsTblOpts.mnInsMode & tabopts::SPLIT_LAYOUT) ) -// pTableFmt->SetAttr( SwFmtLayoutSplit( sal_False )); ->>>>>>> other /* #106283# If the first node in the selection is a context node and if it has an item FRAMEDIR set (no default) propagate the item to the @@ -1236,17 +1220,7 @@ const SwTable* SwDoc::TextToTable( const std::vector< std::vector<SwNodeRange> > SwTable * pNdTbl = &pTblNd->GetTable(); ASSERT( pNdTbl, "kein Tabellen-Node angelegt." ) -<<<<<<< local pNdTbl->RegisterToFormat( *pTableFmt ); -======= - pTableFmt->Add( pNdTbl ); // das Frame-Format setzen - -// const sal_uInt16 nRowsToRepeat = -// tabopts::HEADLINE == (rInsTblOpts.mnInsMode & tabopts::HEADLINE) ? -// rInsTblOpts.mnRowsToRepeat : -// 0; -// pNdTbl->SetRowsToRepeat( nRowsToRepeat ); ->>>>>>> other sal_Bool bUseBoxFmt = sal_False; if( !pBoxFmt->GetDepends() ) @@ -1258,32 +1232,9 @@ const SwTable* SwDoc::TextToTable( const std::vector< std::vector<SwNodeRange> > delete pBoxFmt; } -<<<<<<< local - ULONG nIdx = pTblNd->GetIndex(); -======= - //Orientation am Fmt der Table setzen -// pTableFmt->SetAttr( SwFmtHoriOrient( 0, eAdjust ) ); -// pTableFmt->Add( pNdTbl ); // das Frame-Format setzen - - sal_uLong nIdx = pTblNd->GetIndex(); ->>>>>>> other aNode2Layout.RestoreUpperFrms( GetNodes(), nIdx, nIdx + 1 ); -<<<<<<< local -======= - { -// SwPaM& rTmp = (SwPaM&)rRange; // Point immer an den Anfang -// rTmp.DeleteMark(); -// rTmp.GetPoint()->nNode = *pTblNd; -// SwCntntNode* pCNd = GetNodes().GoNext( &rTmp.GetPoint()->nNode ); -// rTmp.GetPoint()->nContent.Assign( pCNd, 0 ); - } - -// if( pUndo ) -// GetIDocumentUndoRedo().EndUndo( UNDO_TEXTTOTABLE ); - ->>>>>>> other SetModified(); SetFieldsDirty( true, NULL, 0 ); return pNdTbl; @@ -2575,12 +2526,7 @@ void SwTableNode::DelFrms() SwTabFrm *pFrm = aIter.First(); while ( pFrm ) { -<<<<<<< local - BOOL bAgain = FALSE; -======= sal_Bool bAgain = sal_False; - if ( pLast->IsA( TYPE(SwFrm) ) ) ->>>>>>> other { if ( !pFrm->IsFollow() ) { @@ -2647,11 +2593,7 @@ void SwDoc::GetTabCols( SwTabCols &rFill, const SwCursor* pCrsr, if( pShCrsr ) aPt = pShCrsr->GetPtPos(); -<<<<<<< local - const SwFrm* pTmpFrm = pCNd->getLayoutFrm( pCNd->GetDoc()->GetCurrentLayout(), &aPt, 0, FALSE ); -======= - const SwFrm* pTmpFrm = pCNd->GetFrm( &aPt, 0, sal_False ); ->>>>>>> other + const SwFrm* pTmpFrm = pCNd->getLayoutFrm( pCNd->GetDoc()->GetCurrentLayout(), &aPt, 0, sal_False ); do { pTmpFrm = pTmpFrm->GetUpper(); } while ( !pTmpFrm->IsCellFrm() ); @@ -2876,11 +2818,7 @@ void SwDoc::SetTabCols( const SwTabCols &rNew, sal_Bool bCurRowOnly, if( pShCrsr ) aPt = pShCrsr->GetPtPos(); -<<<<<<< local - const SwFrm* pTmpFrm = pCNd->getLayoutFrm( pCNd->GetDoc()->GetCurrentLayout(), &aPt, 0, FALSE ); -======= - const SwFrm* pTmpFrm = pCNd->GetFrm( &aPt, 0, sal_False ); ->>>>>>> other + const SwFrm* pTmpFrm = pCNd->getLayoutFrm( pCNd->GetDoc()->GetCurrentLayout(), &aPt, 0, sal_False ); do { pTmpFrm = pTmpFrm->GetUpper(); } while ( !pTmpFrm->IsCellFrm() ); diff --git a/sw/source/core/docnode/ndtbl1.cxx b/sw/source/core/docnode/ndtbl1.cxx index 559109ae3e0b..c7a911188c88 100644 --- a/sw/source/core/docnode/ndtbl1.cxx +++ b/sw/source/core/docnode/ndtbl1.cxx @@ -28,10 +28,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sw.hxx" -<<<<<<< local -======= - ->>>>>>> other #include "hintids.hxx" #include <editeng/lrspitem.hxx> #include <editeng/boxitem.hxx> @@ -59,14 +55,10 @@ #include "swtblfmt.hxx" #include "docary.hxx" #include "ndindex.hxx" -<<<<<<< local #include "undobj.hxx" #include "switerator.hxx" -======= #include <UndoTable.hxx> ->>>>>>> other - using namespace ::com::sun::star; diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx index 7c62f31f7eef..88418c899080 100644 --- a/sw/source/core/docnode/node.cxx +++ b/sw/source/core/docnode/node.cxx @@ -443,21 +443,15 @@ sal_Bool SwNode::IsInVisibleArea( ViewShell* pSh ) const else pNd = GetCntntNode(); -<<<<<<< local -======= const SwFrm* pFrm; if( pNd && 0 != ( pFrm = pNd->GetFrm( 0, 0, sal_False ) ) ) { ->>>>>>> other if( !pSh ) // dann die Shell vom Doc besorgen: GetDoc()->GetEditShell( &pSh ); if( pSh ) { - const SwFrm* pFrm; - if( pNd && 0 != ( pFrm = pNd->getLayoutFrm( pSh->GetLayout(), 0, 0, FALSE ) ) ) - { if ( pFrm->IsInTab() ) pFrm = pFrm->FindTabFrm(); @@ -861,13 +855,8 @@ const SwTxtNode* SwNode::FindOutlineNodeOfLevel( sal_uInt8 nLvl ) const const SwCntntNode* pCNd = GetCntntNode(); Point aPt( 0, 0 ); -<<<<<<< local - const SwFrm* pFrm = pRet->getLayoutFrm( pRet->GetDoc()->GetCurrentLayout(), &aPt, 0, FALSE ), - * pMyFrm = pCNd ? pCNd->getLayoutFrm( pCNd->GetDoc()->GetCurrentLayout(), &aPt, 0, FALSE ) : 0; -======= - const SwFrm* pFrm = pRet->GetFrm( &aPt, 0, sal_False ), - * pMyFrm = pCNd ? pCNd->GetFrm( &aPt, 0, sal_False ) : 0; ->>>>>>> other + const SwFrm* pFrm = pRet->getLayoutFrm( pRet->GetDoc()->GetCurrentLayout(), &aPt, 0, sal_False ), + * pMyFrm = pCNd ? pCNd->getLayoutFrm( pCNd->GetDoc()->GetCurrentLayout(), &aPt, 0, sal_False ) : 0; const SwPageFrm* pPgFrm = pFrm ? pFrm->FindPageFrm() : 0; if( pPgFrm && pMyFrm && pPgFrm->Frm().Top() > pMyFrm->Frm().Top() ) @@ -1161,28 +1150,15 @@ sal_Bool SwCntntNode::InvalidateNumRule() return 0 != pRule; } -<<<<<<< local SwCntntFrm *SwCntntNode::getLayoutFrm( const SwRootFrm* _pRoot, - const Point* pPoint, const SwPosition *pPos, const BOOL bCalcFrm ) const -======= - -SwCntntFrm *SwCntntNode::GetFrm( const Point* pPoint, - const SwPosition *pPos, - const sal_Bool bCalcFrm ) const ->>>>>>> other + const Point* pPoint, const SwPosition *pPos, const sal_Bool bCalcFrm ) const { return (SwCntntFrm*) ::GetFrmOfModify( _pRoot, *(SwModify*)this, FRM_CNTNT, pPoint, pPos, bCalcFrm ); } -<<<<<<< local - -SwRect SwCntntNode::FindLayoutRect( const BOOL bPrtArea, const Point* pPoint, - const BOOL bCalcFrm ) const -======= SwRect SwCntntNode::FindLayoutRect( const sal_Bool bPrtArea, const Point* pPoint, const sal_Bool bCalcFrm ) const ->>>>>>> other { SwRect aRet; SwCntntFrm* pFrm = (SwCntntFrm*)::GetFrmOfModify( 0, *(SwModify*)this, @@ -1400,64 +1376,7 @@ void SwCntntNode::DelFrms() if( !GetDepends() ) return; -<<<<<<< local SwCntntFrm::DelFrms(*this); -======= - SwClientIter aIter( *this ); - SwCntntFrm *pFrm; - - for( pFrm = (SwCntntFrm*)aIter.First( TYPE(SwCntntFrm)); pFrm; - pFrm = (SwCntntFrm*)aIter.Next() ) - { - // --> OD 2005-12-01 #i27138# - // notify accessibility paragraphs objects about changed - // CONTENT_FLOWS_FROM/_TO relation. - // Relation CONTENT_FLOWS_FROM for current next paragraph will change - // and relation CONTENT_FLOWS_TO for current previous paragraph will change. - if ( pFrm->IsTxtFrm() ) - { - ViewShell* pViewShell( pFrm->GetShell() ); - if ( pViewShell && pViewShell->GetLayout() && - pViewShell->GetLayout()->IsAnyShellAccessible() ) - { - pViewShell->InvalidateAccessibleParaFlowRelation( - dynamic_cast<SwTxtFrm*>(pFrm->FindNextCnt( true )), - dynamic_cast<SwTxtFrm*>(pFrm->FindPrevCnt( true )) ); - } - } - // <-- - if( pFrm->HasFollow() ) - pFrm->GetFollow()->_SetIsFollow( pFrm->IsFollow() ); - if( pFrm->IsFollow() ) - { - SwCntntFrm* pMaster = (SwTxtFrm*)pFrm->FindMaster(); - pMaster->SetFollow( pFrm->GetFollow() ); - pFrm->_SetIsFollow( sal_False ); - } - pFrm->SetFollow( 0 );//Damit er nicht auf dumme Gedanken kommt. - //Andernfalls kann es sein, dass ein Follow - //vor seinem Master zerstoert wird, der Master - //greift dann ueber den ungueltigen - //Follow-Pointer auf fremdes Memory zu. - //Die Kette darf hier zerknauscht werden, weil - //sowieso alle zerstoert werden. - if( pFrm->GetUpper() && pFrm->IsInFtn() && !pFrm->GetIndNext() && - !pFrm->GetIndPrev() ) - { - SwFtnFrm *pFtn = pFrm->FindFtnFrm(); - ASSERT( pFtn, "You promised a FtnFrm?" ); - SwCntntFrm* pCFrm; - if( !pFtn->GetFollow() && !pFtn->GetMaster() && - 0 != ( pCFrm = pFtn->GetRefFromAttr()) && pCFrm->IsFollow() ) - { - ASSERT( pCFrm->IsTxtFrm(), "NoTxtFrm has Footnote?" ); - ((SwTxtFrm*)pCFrm->FindMaster())->Prepare( PREP_FTN_GONE ); - } - } - pFrm->Cut(); - delete pFrm; - } ->>>>>>> other if( IsTxtNode() ) { ((SwTxtNode*)this)->SetWrong( NULL ); @@ -2066,11 +1985,7 @@ short SwCntntNode::GetTextDirection( const SwPosition& rPos, // --> OD 2007-01-10 #i72024# // No format of the frame, because this can cause recursive layout actions -<<<<<<< local - SwFrm* pFrm = getLayoutFrm( GetDoc()->GetCurrentLayout(), &aPt, &rPos, FALSE ); -======= - SwFrm* pFrm = GetFrm( &aPt, &rPos, sal_False ); ->>>>>>> other + SwFrm* pFrm = getLayoutFrm( GetDoc()->GetCurrentLayout(), &aPt, &rPos, sal_False ); // <-- if ( pFrm ) diff --git a/sw/source/core/docnode/node2lay.cxx b/sw/source/core/docnode/node2lay.cxx index 70ceb1e0d4ab..7c4e648f6c19 100644 --- a/sw/source/core/docnode/node2lay.cxx +++ b/sw/source/core/docnode/node2lay.cxx @@ -77,7 +77,6 @@ public: * vor oder hinter den eingefuegt werden soll. * --------------------------------------------------*/ -<<<<<<< local SwNode* GoNextWithFrm(const SwNodes& rNodes, SwNodeIndex *pIdx) { if( pIdx->GetIndex() >= rNodes.Count() - 1 ) @@ -143,12 +142,8 @@ SwNode* GoPreviousWithFrm(SwNodeIndex *pIdx) } -SwNode2LayImpl::SwNode2LayImpl( const SwNode& rNode, ULONG nIdx, BOOL bSearch ) - : pUpperFrms( NULL ), nIndex( nIdx ), bInit( FALSE ) -======= SwNode2LayImpl::SwNode2LayImpl( const SwNode& rNode, sal_uLong nIdx, sal_Bool bSearch ) : pUpperFrms( NULL ), nIndex( nIdx ), bInit( sal_False ) ->>>>>>> other { const SwNode* pNd; if( bSearch || rNode.IsSectionNode() ) @@ -166,13 +161,8 @@ SwNode2LayImpl::SwNode2LayImpl( const SwNode& rNode, sal_uLong nIdx, sal_Bool bS else { SwNodeIndex aTmp( rNode, -1 ); -<<<<<<< local pNd = GoNextWithFrm( rNode.GetNodes(), &aTmp ); - bMaster = TRUE; -======= - pNd = rNode.GetNodes().GoNextWithFrm( &aTmp ); bMaster = sal_True; ->>>>>>> other if( !bSearch && pNd && rNode.EndOfSectionIndex() < pNd->GetIndex() ) pNd = NULL; // Nicht ueber den Bereich hinausschiessen } @@ -218,13 +208,8 @@ SwFrm* SwNode2LayImpl::NextFrm() return sal_False; if( !bInit ) { -<<<<<<< local pRet = pIter->First(); - bInit = TRUE; -======= - pRet = (SwFrm*)pIter->First(TYPE(SwFrm)); bInit = sal_True; ->>>>>>> other } else pRet = pIter->Next(); diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx index 69160d5603eb..e722400e8dca 100644 --- a/sw/source/core/docnode/section.cxx +++ b/sw/source/core/docnode/section.cxx @@ -29,10 +29,6 @@ #include "precompiled_sw.hxx" #include <stdlib.h> -<<<<<<< local -======= - ->>>>>>> other #include <hintids.hxx> #include <svl/intitem.hxx> #include <svl/stritem.hxx> @@ -704,26 +700,9 @@ SwSectionFmt::~SwSectionFmt() rSect.SetHidden(false); } } -<<<<<<< local - // mba: test iteration; objects are removed while iterating CallSwClientNotify( SfxSimpleHint(SFX_HINT_DYING) ); -======= - SwClientIter aIter( *this ); - SwClient *pLast = aIter.GoStart(); - while ( pLast ) - { - if ( pLast->IsA( TYPE(SwFrm) ) ) - { - SwSectionFrm *pFrm = (SwSectionFrm*)pLast; - SwSectionFrm::MoveCntntAndDelete( pFrm, sal_True ); - pLast = aIter.GoStart(); - } - else - pLast = aIter++; - } ->>>>>>> other // hebe die Section doch mal auf SwNodeRange aRg( *pSectNd, 0, *pSectNd->EndOfSectionNode() ); GetDoc()->GetNodes().SectionUp( &aRg ); @@ -737,18 +716,7 @@ SwSectionFmt::~SwSectionFmt() SwSection * SwSectionFmt::GetSection() const { -<<<<<<< local return SwIterator<SwSection,SwSectionFmt>::FirstElement( *this ); -======= - if( GetDepends() ) - { - SwClientIter aIter( *(SwSectionFmt*)this ); - return (SwSectionPtr)aIter.First( TYPE(SwSection) ); - } - - ASSERT( sal_False, "keine Section als Client." ) - return 0; ->>>>>>> other } extern void lcl_DeleteFtn( SwSectionNode *pNd, sal_uLong nStt, sal_uLong nEnd ); @@ -770,41 +738,12 @@ void SwSectionFmt::DelFrms() SwSectionFmt *pLast = aIter.First(); while ( pLast ) { -<<<<<<< local pLast->DelFrms(); pLast = aIter.Next(); -======= - if ( pLast->IsA( TYPE(SwFrm) ) ) - { - SwSectionFrm *pFrm = (SwSectionFrm*)pLast; - SwSectionFrm::MoveCntntAndDelete( pFrm, sal_False ); - pLast = aIter.GoStart(); - } - else - { - pLast = aIter++; - } ->>>>>>> other } -<<<<<<< local - ULONG nEnde = pSectNd->EndOfSectionIndex(); - ULONG nStart = pSectNd->GetIndex()+1; -======= - // Then delete frames of the nested <SwSectionFmt> instances - pLast = aIter.GoStart(); - while ( pLast ) - { - if ( pLast->IsA( TYPE(SwSectionFmt) ) ) - { - ((SwSectionFmt*)pLast)->DelFrms(); - } - pLast = aIter++; - } - // <-- sal_uLong nEnde = pSectNd->EndOfSectionIndex(); sal_uLong nStart = pSectNd->GetIndex()+1; ->>>>>>> other lcl_DeleteFtn( pSectNd, nStart, nEnde ); } if( pIdx ) @@ -1036,11 +975,7 @@ sal_uInt16 SwSectionFmt::GetChildSections( SwSections& rArr, const SwNodeIndex* pIdx; for( SwSectionFmt* pLast = aIter.First(); pLast; pLast = aIter.Next() ) if( bAllSections || -<<<<<<< local - ( 0 != ( pIdx = pLast->GetCntnt(FALSE). -======= - ( 0 != ( pIdx = ((SwSectionFmt*)pLast)->GetCntnt(sal_False). ->>>>>>> other + ( 0 != ( pIdx = pLast->GetCntnt(sal_False). GetCntntIdx()) && &pIdx->GetNodes() == &GetDoc()->GetNodes() )) { const SwSection* Dummy = pLast->GetSection(); diff --git a/sw/source/core/docnode/swbaslnk.cxx b/sw/source/core/docnode/swbaslnk.cxx index 5ca378199a64..d34f60952e2f 100644 --- a/sw/source/core/docnode/swbaslnk.cxx +++ b/sw/source/core/docnode/swbaslnk.cxx @@ -218,13 +218,8 @@ void SwBaseLink::DataChanged( const String& rMimeType, if ( (!pSh || !pSh->ActionPend()) && (!pESh || !pESh->ActionPend()) ) { SwMsgPoolItem aMsgHint( RES_GRAPHIC_PIECE_ARRIVED ); -<<<<<<< local pCntntNode->ModifyNotification( &aMsgHint, &aMsgHint ); - bUpdate = FALSE; -======= - pCntntNode->Modify( &aMsgHint, &aMsgHint ); bUpdate = sal_False; ->>>>>>> other } } @@ -443,23 +438,7 @@ sal_Bool SwBaseLink::SwapIn( sal_Bool bWaitForData, sal_Bool bNativFormat ) else bRes = Update(); -<<<<<<< local - bSwapIn = FALSE; -======= bSwapIn = sal_False; - - // --> OD 2005-04-11 #i46300# - deactivate fix for issues i9861 and i33293 -// if ( pTBIS && pTBIS->isTouched() ) -// { -// // --> OD 2005-04-11 #i46300# - determine correct URL for the graphic -// String sGrfNm; -// GetLinkManager()->GetDisplayNames( this, 0, &sGrfNm, 0, 0 ); -// (m_pReReadThread = new ReReadThread( -// this, sGrfNm, bWaitForData, bNativFormat))->create(); -// // <-- -// } - // <-- ->>>>>>> other return bRes; } diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx index 588deed2e69a..e501eb970121 100644 --- a/sw/source/core/draw/dcontact.cxx +++ b/sw/source/core/draw/dcontact.cxx @@ -546,91 +546,6 @@ void SwFlyDrawContact::SetMaster( SdrObject* _pNewMaster ) /************************************************************************* |* -<<<<<<< local -======= -|* SwFlyDrawContact::CreateNewRef() -|* -|* Ersterstellung MA 14. Dec. 94 -|* Letzte Aenderung MA 24. Apr. 95 -|* -|*************************************************************************/ - -SwVirtFlyDrawObj *SwFlyDrawContact::CreateNewRef( SwFlyFrm *pFly ) -{ - SwVirtFlyDrawObj *pDrawObj = new SwVirtFlyDrawObj( *GetMaster(), pFly ); - pDrawObj->SetModel( GetMaster()->GetModel() ); - pDrawObj->SetUserCall( this ); - - //Der Reader erzeugt die Master und setzt diese, um die Z-Order zu - //transportieren, in die Page ein. Beim erzeugen der ersten Referenz werden - //die Master aus der Liste entfernt und fuehren von da an ein - //Schattendasein. - SdrPage* pPg( 0L ); - if ( 0 != ( pPg = GetMaster()->GetPage() ) ) - { - const sal_uInt32 nOrdNum = GetMaster()->GetOrdNum(); - pPg->ReplaceObject( pDrawObj, nOrdNum ); - } - // --> OD 2004-08-16 #i27030# - insert new <SwVirtFlyDrawObj> instance - // into drawing page with correct order number - else - { - GetFmt()->getIDocumentDrawModelAccess()->GetDrawModel()->GetPage( 0 )-> - InsertObject( pDrawObj, _GetOrdNumForNewRef( pFly ) ); - } - // <-- - // --> OD 2004-12-13 #i38889# - assure, that new <SwVirtFlyDrawObj> instance - // is in a visible layer. - MoveObjToVisibleLayer( pDrawObj ); - // <-- - return pDrawObj; -} - -/** method to determine new order number for new instance of <SwVirtFlyDrawObj> - - OD 2004-08-16 #i27030# - Used in method <CreateNewRef(..)> - - @author OD -*/ -sal_uInt32 SwFlyDrawContact::_GetOrdNumForNewRef( const SwFlyFrm* _pFlyFrm ) -{ - sal_uInt32 nOrdNum( 0L ); - - // search for another Writer fly frame registered at same frame format - SwClientIter aIter( *GetFmt() ); - const SwFlyFrm* pFlyFrm( 0L ); - for ( pFlyFrm = (SwFlyFrm*)aIter.First( TYPE(SwFlyFrm) ); - pFlyFrm; - pFlyFrm = (SwFlyFrm*)aIter.Next() ) - { - if ( pFlyFrm != _pFlyFrm ) - { - break; - } - } - - if ( pFlyFrm ) - { - // another Writer fly frame found. Take its order number - nOrdNum = pFlyFrm->GetVirtDrawObj()->GetOrdNum(); - } - else - { - // no other Writer fly frame found. Take order number of 'master' object - // --> OD 2004-11-11 #i35748# - use method <GetOrdNumDirect()> instead - // of method <GetOrdNum()> to avoid a recalculation of the order number, - // which isn't intended. - nOrdNum = GetMaster()->GetOrdNumDirect(); - // <-- - } - - return nOrdNum; -} - -/************************************************************************* -|* ->>>>>>> other |* SwFlyDrawContact::Modify() |* |* Ersterstellung OK 08.11.94 10:21 @@ -2002,15 +1917,11 @@ void SwDrawContact::ConnectToLayout( const SwFmtAnchor* pAnch ) { case FLY_AT_PAGE: { -<<<<<<< local - USHORT nPgNum = pAnch->GetPageNum(); + sal_uInt16 nPgNum = pAnch->GetPageNum(); ViewShell *pShell = pDrawFrmFmt->getIDocumentLayoutAccess()->GetCurrentViewShell(); if( !pShell ) break; SwRootFrm* pRoot = pShell->GetLayout(); -======= - sal_uInt16 nPgNum = pAnch->GetPageNum(); ->>>>>>> other SwPageFrm *pPage = static_cast<SwPageFrm*>(pRoot->Lower()); for ( sal_uInt16 i = 1; i < nPgNum && pPage; ++i ) diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx index 9bcc18ee8c44..db6c04ff54bd 100644 --- a/sw/source/core/draw/dview.cxx +++ b/sw/source/core/draw/dview.cxx @@ -1084,16 +1084,10 @@ void SwDrawView::ReplaceMarkedDrawVirtObjs( SdrMarkView& _rMarkView ) void SwDrawView::DeleteMarked() { SwDoc* pDoc = Imp().GetShell()->GetDoc(); -<<<<<<< local SwRootFrm *pTmpRoot = pDoc->GetCurrentLayout();//swmod 080317 if ( pTmpRoot ) pTmpRoot->StartAllAction(); pDoc->StartUndo(UNDO_EMPTY, NULL); -======= - if ( pDoc->GetRootFrm() ) - pDoc->GetRootFrm()->StartAllAction(); - pDoc->GetIDocumentUndoRedo().StartUndo(UNDO_EMPTY, NULL); ->>>>>>> other // OD 18.06.2003 #108784# - replace marked <SwDrawVirtObj>-objects by its // reference objects. { @@ -1112,14 +1106,8 @@ void SwDrawView::DeleteMarked() FmFormView::DeleteMarked(); ::FrameNotify( Imp().GetShell(), FLY_DRAG_END ); } -<<<<<<< local pDoc->EndUndo(UNDO_EMPTY, NULL); if( pTmpRoot ) pTmpRoot->EndAllAction(); //swmod 080218 -======= - pDoc->GetIDocumentUndoRedo().EndUndo(UNDO_EMPTY, NULL); - if( pDoc->GetRootFrm() ) - pDoc->GetRootFrm()->EndAllAction(); ->>>>>>> other } diff --git a/sw/source/core/edit/edfld.cxx b/sw/source/core/edit/edfld.cxx index 29979805948a..3ed48bdf387f 100644 --- a/sw/source/core/edit/edfld.cxx +++ b/sw/source/core/edit/edfld.cxx @@ -201,12 +201,7 @@ void SwEditShell::FieldToText( SwFieldType* pType ) Push(); SwPaM* pPaM = GetCrsr(); -<<<<<<< local SwFieldHint aHint( pPaM ); -======= - sal_Bool bDDEFld = RES_DDEFLD == pType->Which(); - // Modify-Object gefunden, trage alle Felder ins Array ein ->>>>>>> other SwClientIter aIter( *pType ); for ( SwClient* pClient = aIter.GoStart(); pClient; aIter++ ) { @@ -557,13 +552,8 @@ sal_Bool SwEditShell::IsAnyDatabaseFieldInDoc()const while(pFld) { if(pFld->IsFldInDoc()) -<<<<<<< local - return TRUE; - pFld = aIter.Next(); -======= return sal_True; - pFld = (SwFmtFld*)aIter.Next(); ->>>>>>> other + pFld = aIter.Next(); } } break; diff --git a/sw/source/core/edit/edfldexp.cxx b/sw/source/core/edit/edfldexp.cxx index 53ae433308cc..ae3aed3f1ea6 100644 --- a/sw/source/core/edit/edfldexp.cxx +++ b/sw/source/core/edit/edfldexp.cxx @@ -45,14 +45,7 @@ using namespace com::sun::star; using ::rtl::OUString; -<<<<<<< local -BOOL SwEditShell::IsFieldDataSourceAvailable(String& rUsedDataSource) const -======= -/* -----------------28.11.2002 17:53----------------- - * - * --------------------------------------------------*/ sal_Bool SwEditShell::IsFieldDataSourceAvailable(String& rUsedDataSource) const ->>>>>>> other { const SwFldTypes * pFldTypes = GetDoc()->GetFldTypes(); const sal_uInt16 nSize = pFldTypes->Count(); diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx index 3dc20356dee7..b90362cc906f 100644 --- a/sw/source/core/edit/editsh.cxx +++ b/sw/source/core/edit/editsh.cxx @@ -437,13 +437,8 @@ void SwEditShell::ClearAutomaticContour() if( pNd->HasAutomaticContour() ) { StartAllAction(); -<<<<<<< local - pNd->SetContour( NULL, FALSE ); - SwFlyFrm *pFly = (SwFlyFrm*)pNd->getLayoutFrm(GetLayout())->GetUpper(); -======= pNd->SetContour( NULL, sal_False ); - SwFlyFrm *pFly = (SwFlyFrm*)pNd->GetFrm()->GetUpper(); ->>>>>>> other + SwFlyFrm *pFly = (SwFlyFrm*)pNd->getLayoutFrm(GetLayout())->GetUpper(); const SwFmtSurround &rSur = pFly->GetFmt()->GetSurround(); pFly->GetFmt()->NotifyClients( (SwFmtSurround*)&rSur, (SwFmtSurround*)&rSur ); GetDoc()->SetModified(); @@ -484,13 +479,8 @@ sal_Bool SwEditShell::HasOLEObj( const String &rName ) const SwNode& rNd = aIdx.GetNode(); if( rNd.IsOLENode() && rName == ((SwOLENode&)rNd).GetChartTblName() && -<<<<<<< local ((SwOLENode&)rNd).getLayoutFrm( GetLayout() ) ) - return TRUE; -======= - ((SwOLENode&)rNd).GetFrm() ) return sal_True; ->>>>>>> other aIdx.Assign( *pStNd->EndOfSectionNode(), + 1 ); } diff --git a/sw/source/core/edit/edlingu.cxx b/sw/source/core/edit/edlingu.cxx index 3e7e240ff9b0..10dcba3c1a3c 100644 --- a/sw/source/core/edit/edlingu.cxx +++ b/sw/source/core/edit/edlingu.cxx @@ -1095,11 +1095,7 @@ uno::Reference< XSpellAlternatives > SwCrsrMoveState aState; aState.bRealWidth = sal_True; SwCntntNode* pCntntNode = pCrsr->GetCntntNode(); -<<<<<<< local - SwCntntFrm *pCntntFrame = pCntntNode->getLayoutFrm( GetLayout(), pPt, pCrsr->GetPoint(), FALSE); -======= - SwCntntFrm *pCntntFrame = pCntntNode->GetFrm(pPt, pCrsr->GetPoint(), sal_False); ->>>>>>> other + SwCntntFrm *pCntntFrame = pCntntNode->getLayoutFrm( GetLayout(), pPt, pCrsr->GetPoint(), sal_False); pCntntFrame->GetCharRect( aStartRect, *pCrsr->GetPoint(), &aState ); rContent = nWordEnd; @@ -1243,11 +1239,7 @@ bool SwEditShell::GetGrammarCorrection( SwCrsrMoveState aState; aState.bRealWidth = sal_True; SwCntntNode* pCntntNode = pCrsr->GetCntntNode(); -<<<<<<< local - SwCntntFrm *pCntntFrame = pCntntNode->getLayoutFrm( GetLayout(), pPt, pCrsr->GetPoint(), FALSE); -======= - SwCntntFrm *pCntntFrame = pCntntNode->GetFrm(pPt, pCrsr->GetPoint(), sal_False); ->>>>>>> other + SwCntntFrm *pCntntFrame = pCntntNode->getLayoutFrm( GetLayout(), pPt, pCrsr->GetPoint(), sal_False); pCntntFrame->GetCharRect( aStartRect, *pCrsr->GetPoint(), &aState ); rContent = nWordEnd; diff --git a/sw/source/core/edit/edundo.cxx b/sw/source/core/edit/edundo.cxx index f30db42a4460..9ae0d641a3c2 100644 --- a/sw/source/core/edit/edundo.cxx +++ b/sw/source/core/edit/edundo.cxx @@ -238,9 +238,8 @@ void lcl_SelectSdrMarkList( SwEditShell* pShell, if( pShell->ISA( SwFEShell ) ) { SwFEShell* pFEShell = static_cast<SwFEShell*>( pShell ); -<<<<<<< local bool bFirst = true; - for( USHORT i = 0; i < pSdrMarkList->GetMarkCount(); ++i ) + for( sal_uInt16 i = 0; i < pSdrMarkList->GetMarkCount(); ++i ) { SdrObject *pObj = pSdrMarkList->GetMark( i )->GetMarkedSdrObj(); if( pObj ) @@ -249,12 +248,6 @@ void lcl_SelectSdrMarkList( SwEditShell* pShell, bFirst = false; } } -======= - for( sal_uInt16 i = 0; i < pSdrMarkList->GetMarkCount(); ++i ) - pFEShell->SelectObj( Point(), - (i==0) ? 0 : SW_ADD_SELECT, - pSdrMarkList->GetMark( i )->GetMarkedSdrObj() ); ->>>>>>> other // the old implementation would always unselect // objects, even if no new ones were selected. If this diff --git a/sw/source/core/fields/authfld.cxx b/sw/source/core/fields/authfld.cxx index d12f65a38d16..2275fddaf6ad 100644 --- a/sw/source/core/fields/authfld.cxx +++ b/sw/source/core/fields/authfld.cxx @@ -191,12 +191,7 @@ long SwAuthorityFieldType::AddField(const String& rFieldContents) return nRet; } -<<<<<<< local -BOOL SwAuthorityFieldType::AddField(long nHandle) -======= - --------------------------------------------------*/ sal_Bool SwAuthorityFieldType::AddField(long nHandle) ->>>>>>> other { sal_Bool bRet = sal_False; for( sal_uInt16 j = 0; j < m_pDataArr->Count(); j++ ) @@ -302,14 +297,7 @@ sal_uInt16 SwAuthorityFieldType::AppendField( const SwAuthEntry& rInsert ) return nRet; } -<<<<<<< local -long SwAuthorityFieldType::GetHandle(USHORT nPos) -======= -/*-- 11.10.99 08:49:24--------------------------------------------------- - - -----------------------------------------------------------------------*/ long SwAuthorityFieldType::GetHandle(sal_uInt16 nPos) ->>>>>>> other { long nRet = 0; if( nPos < m_pDataArr->Count() ) @@ -320,12 +308,7 @@ long SwAuthorityFieldType::GetHandle(sal_uInt16 nPos) return nRet; } -<<<<<<< local -USHORT SwAuthorityFieldType::GetSequencePos(long nHandle) -======= - --------------------------------------------------*/ sal_uInt16 SwAuthorityFieldType::GetSequencePos(long nHandle) ->>>>>>> other { //find the field in a sorted array of handles, #ifdef DBG_UTIL @@ -421,12 +404,7 @@ sal_uInt16 SwAuthorityFieldType::GetSequencePos(long nHandle) return nRet; } -<<<<<<< local -BOOL SwAuthorityFieldType::QueryValue( Any& rVal, USHORT nWhichId ) const -======= - ---------------------------------------------------------------------------*/ sal_Bool SwAuthorityFieldType::QueryValue( Any& rVal, sal_uInt16 nWhichId ) const ->>>>>>> other { switch( nWhichId ) { @@ -481,12 +459,7 @@ sal_Bool SwAuthorityFieldType::QueryValue( Any& rVal, sal_uInt16 nWhichId ) c return sal_True; } -<<<<<<< local -BOOL SwAuthorityFieldType::PutValue( const Any& rAny, USHORT nWhichId ) -======= - ---------------------------------------------------------------------------*/ sal_Bool SwAuthorityFieldType::PutValue( const Any& rAny, sal_uInt16 nWhichId ) ->>>>>>> other { sal_Bool bRet = sal_True; String sTmp; @@ -566,22 +539,12 @@ void SwAuthorityFieldType::Modify( const SfxPoolItem* pOld, const SfxPoolItem *p NotifyClients( pOld, pNew ); } -<<<<<<< local -USHORT SwAuthorityFieldType::GetSortKeyCount() const -======= - --------------------------------------------------*/ sal_uInt16 SwAuthorityFieldType::GetSortKeyCount() const ->>>>>>> other { return m_pSortKeyArr->Count(); } -<<<<<<< local -const SwTOXSortKey* SwAuthorityFieldType::GetSortKey(USHORT nIdx) const -======= - --------------------------------------------------*/ const SwTOXSortKey* SwAuthorityFieldType::GetSortKey(sal_uInt16 nIdx) const ->>>>>>> other { SwTOXSortKey* pRet = 0; if(m_pSortKeyArr->Count() > nIdx) @@ -590,12 +553,7 @@ const SwTOXSortKey* SwAuthorityFieldType::GetSortKey(sal_uInt16 nIdx) const return pRet; } -<<<<<<< local -void SwAuthorityFieldType::SetSortKeys(USHORT nKeyCount, SwTOXSortKey aKeys[]) -======= - --------------------------------------------------*/ void SwAuthorityFieldType::SetSortKeys(sal_uInt16 nKeyCount, SwTOXSortKey aKeys[]) ->>>>>>> other { m_pSortKeyArr->DeleteAndDestroy(0, m_pSortKeyArr->Count()); sal_uInt16 nArrIdx = 0; @@ -713,12 +671,7 @@ const char* aFieldNames[] = "ISBN" }; -<<<<<<< local -BOOL SwAuthorityField::QueryValue( Any& rAny, USHORT /*nWhichId*/ ) const -======= - ---------------------------------------------------------------------------*/ sal_Bool SwAuthorityField::QueryValue( Any& rAny, sal_uInt16 /*nWhichId*/ ) const ->>>>>>> other { if(!GetTyp()) return sal_False; diff --git a/sw/source/core/fields/cellfml.cxx b/sw/source/core/fields/cellfml.cxx index efca89a4609d..069d4f2a798c 100644 --- a/sw/source/core/fields/cellfml.cxx +++ b/sw/source/core/fields/cellfml.cxx @@ -720,36 +720,13 @@ const SwTable* SwTableFormula::FindTable( SwDoc& rDoc, const String& rNm ) const return pRet; } -/* */ - const SwFrm* lcl_GetBoxFrm( const SwTableBox& rBox ) { -<<<<<<< local -======= -/* - - // oder besser ueber die Box den Frame suchen - - SwClientIter aIter( *pBox->GetFrmFmt() ); - sal_uLong nMinPos = ULONG_MAX; - const SwFrm* pFnd = 0; - for( SwFrm* pF = (SwFrm*)aIter.First( TYPE( SwCellFrm )); pF; - pF = (SwFrm*)aIter.Next() ) - { - if( pF->Frm().Y() < - } -*/ - ->>>>>>> other SwNodeIndex aIdx( *rBox.GetSttNd() ); SwCntntNode* pCNd = aIdx.GetNodes().GoNext( &aIdx ); ASSERT( pCNd, "Box hat keinen TextNode" ); Point aPt; // den im Layout 1. Frame returnen - Tab.Kopfzeile !! -<<<<<<< local - return pCNd->getLayoutFrm( pCNd->GetDoc()->GetCurrentLayout(), &aPt, NULL, FALSE ); -======= - return pCNd->GetFrm( &aPt, NULL, sal_False ); ->>>>>>> other + return pCNd->getLayoutFrm( pCNd->GetDoc()->GetCurrentLayout(), &aPt, NULL, sal_False ); } long lcl_GetLongBoxNum( String& rStr ) diff --git a/sw/source/core/fields/dbfld.cxx b/sw/source/core/fields/dbfld.cxx index faddd9a1b8b4..c06ef6cf9984 100644 --- a/sw/source/core/fields/dbfld.cxx +++ b/sw/source/core/fields/dbfld.cxx @@ -123,14 +123,7 @@ void SwDBFieldType::ReleaseRef() } } -<<<<<<< local -BOOL SwDBFieldType::QueryValue( uno::Any& rAny, USHORT nWhichId ) const -======= -/* -----------------24.02.99 14:51------------------- - * - * --------------------------------------------------*/ sal_Bool SwDBFieldType::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const ->>>>>>> other { switch( nWhichId ) { @@ -151,15 +144,8 @@ sal_Bool SwDBFieldType::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const } return sal_True; } -<<<<<<< local -BOOL SwDBFieldType::PutValue( const uno::Any& rAny, USHORT nWhichId ) -======= -/* -----------------24.02.99 14:51------------------- - * - * --------------------------------------------------*/ sal_Bool SwDBFieldType::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) ->>>>>>> other { switch( nWhichId ) { @@ -421,12 +407,7 @@ void SwDBField::SetSubType(sal_uInt16 nType) } -<<<<<<< local -BOOL SwDBField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const -======= ---------------------------------------------------*/ sal_Bool SwDBField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const ->>>>>>> other { switch( nWhichId ) { @@ -458,12 +439,7 @@ sal_Bool SwDBField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const } -<<<<<<< local -BOOL SwDBField::PutValue( const uno::Any& rAny, USHORT nWhichId ) -======= ---------------------------------------------------*/ sal_Bool SwDBField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) ->>>>>>> other { switch( nWhichId ) { @@ -566,14 +542,7 @@ String SwDBNameInfField::GetFieldName() const return lcl_DBTrennConv(sStr); } -<<<<<<< local -BOOL SwDBNameInfField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const -======= -/*-----------------06.03.98 16:55------------------- - ---------------------------------------------------*/ sal_Bool SwDBNameInfField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const ->>>>>>> other { switch( nWhichId ) { @@ -598,12 +567,7 @@ sal_Bool SwDBNameInfField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) con return sal_True; } -<<<<<<< local -BOOL SwDBNameInfField::PutValue( const uno::Any& rAny, USHORT nWhichId ) -======= ---------------------------------------------------*/ sal_Bool SwDBNameInfField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) ->>>>>>> other { switch( nWhichId ) { @@ -635,22 +599,12 @@ sal_Bool SwDBNameInfField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) return sal_True; } -<<<<<<< local -USHORT SwDBNameInfField::GetSubType() const -======= - --------------------------------------------------*/ sal_uInt16 SwDBNameInfField::GetSubType() const ->>>>>>> other { return nSubType; } -<<<<<<< local -void SwDBNameInfField::SetSubType(USHORT nType) -======= - --------------------------------------------------*/ void SwDBNameInfField::SetSubType(sal_uInt16 nType) ->>>>>>> other { nSubType = nType; } @@ -725,12 +679,7 @@ void SwDBNextSetField::SetPar1(const String& rStr) aCond = rStr; } -<<<<<<< local -BOOL SwDBNextSetField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const -======= ---------------------------------------------------*/ sal_Bool SwDBNextSetField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const ->>>>>>> other { sal_Bool bRet = sal_True; switch( nWhichId ) @@ -744,12 +693,7 @@ sal_Bool SwDBNextSetField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) con return bRet; } -<<<<<<< local -BOOL SwDBNextSetField::PutValue( const uno::Any& rAny, USHORT nWhichId ) -======= ---------------------------------------------------*/ sal_Bool SwDBNextSetField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) ->>>>>>> other { sal_Bool bRet = sal_True; switch( nWhichId ) @@ -852,12 +796,7 @@ void SwDBNumSetField::SetPar2(const String& rStr) aPar2 = rStr; } -<<<<<<< local -BOOL SwDBNumSetField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const -======= ---------------------------------------------------*/ sal_Bool SwDBNumSetField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const ->>>>>>> other { sal_Bool bRet = sal_True; switch( nWhichId ) @@ -874,12 +813,7 @@ sal_Bool SwDBNumSetField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) cons return bRet; } -<<<<<<< local -BOOL SwDBNumSetField::PutValue( const uno::Any& rAny, USHORT nWhichId ) -======= ---------------------------------------------------*/ sal_Bool SwDBNumSetField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) ->>>>>>> other { sal_Bool bRet = sal_True; switch( nWhichId ) @@ -959,22 +893,12 @@ SwField* SwDBNameField::Copy() const } -<<<<<<< local -BOOL SwDBNameField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const -======= ---------------------------------------------------*/ sal_Bool SwDBNameField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const ->>>>>>> other { return SwDBNameInfField::QueryValue(rAny, nWhichId ); } -<<<<<<< local -BOOL SwDBNameField::PutValue( const uno::Any& rAny, USHORT nWhichId ) -======= ---------------------------------------------------*/ sal_Bool SwDBNameField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) ->>>>>>> other { return SwDBNameInfField::PutValue(rAny, nWhichId ); } @@ -1014,12 +938,7 @@ String SwDBSetNumberField::Expand() const if(0 !=(GetSubType() & nsSwExtendedSubType::SUB_INVISIBLE) || nNumber == 0) return aEmptyStr; else -<<<<<<< local - return FormatNumber((USHORT)nNumber, GetFormat()); -======= return FormatNumber((sal_uInt16)nNumber, GetFormat()); - //return(nNumber == 0 ? aEmptyStr : FormatNumber(nNumber, GetFormat())); ->>>>>>> other } //------------------------------------------------------------------------------ @@ -1048,12 +967,7 @@ SwField* SwDBSetNumberField::Copy() const return pTmp; } -<<<<<<< local -BOOL SwDBSetNumberField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const -======= ---------------------------------------------------*/ sal_Bool SwDBSetNumberField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const ->>>>>>> other { sal_Bool bRet = sal_True; switch( nWhichId ) @@ -1070,12 +984,7 @@ sal_Bool SwDBSetNumberField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) c return bRet; } -<<<<<<< local -BOOL SwDBSetNumberField::PutValue( const uno::Any& rAny, USHORT nWhichId ) -======= ---------------------------------------------------*/ sal_Bool SwDBSetNumberField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) ->>>>>>> other { sal_Bool bRet = sal_True; switch( nWhichId ) diff --git a/sw/source/core/fields/ddefld.cxx b/sw/source/core/fields/ddefld.cxx index af709c5e9450..1c40298fba63 100644 --- a/sw/source/core/fields/ddefld.cxx +++ b/sw/source/core/fields/ddefld.cxx @@ -137,13 +137,8 @@ void SwIntrnlRefLink::DataChanged( const String& rMimeType, else if( pSh ) pSh->StartAction(); } -<<<<<<< local pLast->ModifyNotification( 0, &aUpdateDDE ); - bCallModify = TRUE; -======= - pLast->Modify( 0, &aUpdateDDE ); bCallModify = sal_True; ->>>>>>> other } } while( 0 != ( pLast = aIter++ )); diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx index 0f84d40c5c1c..a21933e95404 100644 --- a/sw/source/core/fields/docufld.cxx +++ b/sw/source/core/fields/docufld.cxx @@ -247,14 +247,7 @@ sal_uInt16 SwPageNumberField::GetSubType() const return nSubType; } -<<<<<<< local -BOOL SwPageNumberField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const -======= -/*-----------------05.03.98 10:25------------------- - ---------------------------------------------------*/ sal_Bool SwPageNumberField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const ->>>>>>> other { switch( nWhichId ) { @@ -285,12 +278,7 @@ sal_Bool SwPageNumberField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) co return sal_True; } -<<<<<<< local -BOOL SwPageNumberField::PutValue( const uno::Any& rAny, USHORT nWhichId ) -======= ---------------------------------------------------*/ sal_Bool SwPageNumberField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) ->>>>>>> other { sal_Bool bRet = sal_True; sal_Int16 nSet = 0; @@ -388,14 +376,7 @@ SwField* SwAuthorField::Copy() const return pTmp; } -<<<<<<< local -BOOL SwAuthorField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const -======= -/*-----------------05.03.98 11:15------------------- - ---------------------------------------------------*/ sal_Bool SwAuthorField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const ->>>>>>> other { sal_Bool bVal; switch( nWhichId ) @@ -420,12 +401,7 @@ sal_Bool SwAuthorField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const return sal_True; } -<<<<<<< local -BOOL SwAuthorField::PutValue( const uno::Any& rAny, USHORT nWhichId ) -======= ---------------------------------------------------*/ sal_Bool SwAuthorField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) ->>>>>>> other { switch( nWhichId ) { @@ -541,14 +517,7 @@ SwField* SwFileNameField::Copy() const return pTmp; } -<<<<<<< local -BOOL SwFileNameField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const -======= -/*-----------------05.03.98 08:59------------------- - ---------------------------------------------------*/ sal_Bool SwFileNameField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const ->>>>>>> other { switch( nWhichId ) { @@ -588,12 +557,7 @@ sal_Bool SwFileNameField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) cons return sal_True; } -<<<<<<< local -BOOL SwFileNameField::PutValue( const uno::Any& rAny, USHORT nWhichId ) -======= ---------------------------------------------------*/ sal_Bool SwFileNameField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) ->>>>>>> other { switch( nWhichId ) { @@ -724,14 +688,7 @@ SwField* SwTemplNameField::Copy() const return pTmp; } -<<<<<<< local -BOOL SwTemplNameField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const -======= -/*-----------------05.03.98 08:59------------------- - ---------------------------------------------------*/ sal_Bool SwTemplNameField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const ->>>>>>> other { switch ( nWhichId ) { @@ -757,12 +714,7 @@ sal_Bool SwTemplNameField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) con return sal_True; } -<<<<<<< local -BOOL SwTemplNameField::PutValue( const uno::Any& rAny, USHORT nWhichId ) -======= ---------------------------------------------------*/ sal_Bool SwTemplNameField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) ->>>>>>> other { switch ( nWhichId ) { @@ -886,14 +838,7 @@ void SwDocStatField::ChangeExpansion( const SwFrm* pFrm ) pFrm->FindPageFrm()->GetPageDesc()->GetNumType().GetNumberingType() ); } -<<<<<<< local -BOOL SwDocStatField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const -======= -/*-----------------05.03.98 11:38------------------- - ---------------------------------------------------*/ sal_Bool SwDocStatField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const ->>>>>>> other { switch ( nWhichId ) { @@ -906,12 +851,7 @@ sal_Bool SwDocStatField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const return sal_True; } -<<<<<<< local -BOOL SwDocStatField::PutValue( const uno::Any& rAny, USHORT nWhichId ) -======= ---------------------------------------------------*/ sal_Bool SwDocStatField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) ->>>>>>> other { sal_Bool bRet = sal_False; switch ( nWhichId ) @@ -1770,12 +1710,7 @@ SwField* SwHiddenParaField::Copy() const return pFld; } -<<<<<<< local -BOOL SwHiddenParaField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const -======= ---------------------------------------------------*/ sal_Bool SwHiddenParaField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const ->>>>>>> other { switch ( nWhichId ) { @@ -1795,12 +1730,7 @@ sal_Bool SwHiddenParaField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) co return sal_True; } -<<<<<<< local -BOOL SwHiddenParaField::PutValue( const uno::Any& rAny, USHORT nWhichId ) -======= ---------------------------------------------------*/ sal_Bool SwHiddenParaField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) ->>>>>>> other { switch ( nWhichId ) { @@ -1940,14 +1870,7 @@ sal_uInt32 SwPostItField::GetNumberOfParagraphs() const return (mpText) ? mpText->Count() : 1; } -<<<<<<< local -BOOL SwPostItField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const -======= -/*-----------------05.03.98 13:42------------------- - ---------------------------------------------------*/ sal_Bool SwPostItField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const ->>>>>>> other { switch( nWhichId ) { @@ -2007,15 +1930,7 @@ sal_Bool SwPostItField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const return sal_True; } -<<<<<<< local -BOOL SwPostItField::PutValue( const uno::Any& rAny, USHORT nWhichId ) -======= - -/*-----------------05.03.98 13:42------------------- - ---------------------------------------------------*/ sal_Bool SwPostItField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) ->>>>>>> other { switch( nWhichId ) { @@ -2156,14 +2071,7 @@ void SwExtUserField::SetSubType(sal_uInt16 nSub) nType = nSub; } -<<<<<<< local -BOOL SwExtUserField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const -======= -/*-----------------05.03.98 14:14------------------- - ---------------------------------------------------*/ sal_Bool SwExtUserField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const ->>>>>>> other { switch( nWhichId ) { @@ -2189,12 +2097,7 @@ sal_Bool SwExtUserField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const return sal_True; } -<<<<<<< local -BOOL SwExtUserField::PutValue( const uno::Any& rAny, USHORT nWhichId ) -======= ---------------------------------------------------*/ sal_Bool SwExtUserField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) ->>>>>>> other { switch( nWhichId ) { @@ -2283,14 +2186,7 @@ void SwRefPageSetField::SetPar2(const String& rStr) SetOffset( (short) rStr.ToInt32() ); } -<<<<<<< local -BOOL SwRefPageSetField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const -======= -/*-----------------05.03.98 14:52------------------- - ---------------------------------------------------*/ sal_Bool SwRefPageSetField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const ->>>>>>> other { switch( nWhichId ) { @@ -2306,12 +2202,7 @@ sal_Bool SwRefPageSetField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) co return sal_True; } -<<<<<<< local -BOOL SwRefPageSetField::PutValue( const uno::Any& rAny, USHORT nWhichId ) -======= ---------------------------------------------------*/ sal_Bool SwRefPageSetField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) ->>>>>>> other { switch( nWhichId ) { @@ -2558,12 +2449,7 @@ void SwRefPageGetField::ChangeExpansion( const SwFrm* pFrm, } } -<<<<<<< local -BOOL SwRefPageGetField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const -======= ---------------------------------------------------*/ sal_Bool SwRefPageGetField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const ->>>>>>> other { switch( nWhichId ) { @@ -2579,12 +2465,7 @@ sal_Bool SwRefPageGetField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) co return sal_True; } -<<<<<<< local -BOOL SwRefPageGetField::PutValue( const uno::Any& rAny, USHORT nWhichId ) -======= ---------------------------------------------------*/ sal_Bool SwRefPageGetField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) ->>>>>>> other { switch( nWhichId ) { @@ -2699,14 +2580,7 @@ void SwJumpEditField::SetPar2(const String& rStr) sHelp = rStr; } -<<<<<<< local -BOOL SwJumpEditField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const -======= -/*-----------------05.03.98 15:00------------------- - ---------------------------------------------------*/ sal_Bool SwJumpEditField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const ->>>>>>> other { switch( nWhichId ) { @@ -2738,12 +2612,7 @@ sal_Bool SwJumpEditField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) cons return sal_True; } -<<<<<<< local -BOOL SwJumpEditField::PutValue( const uno::Any& rAny, USHORT nWhichId ) -======= ---------------------------------------------------*/ sal_Bool SwJumpEditField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) ->>>>>>> other { switch( nWhichId ) { diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx index 425566999b5e..15e72ee1d7fc 100644 --- a/sw/source/core/fields/expfld.cxx +++ b/sw/source/core/fields/expfld.cxx @@ -426,14 +426,7 @@ void SwGetExpField::SetLanguage(sal_uInt16 nLng) SwValueField::SetLanguage(nLng); } -<<<<<<< local -BOOL SwGetExpField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const -======= -/*-----------------07.03.98 16:08------------------- - ---------------------------------------------------*/ sal_Bool SwGetExpField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const ->>>>>>> other { switch( nWhichId ) { @@ -470,12 +463,7 @@ sal_Bool SwGetExpField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const return sal_True; } -<<<<<<< local -BOOL SwGetExpField::PutValue( const uno::Any& rAny, USHORT nWhichId ) -======= ---------------------------------------------------*/ sal_Bool SwGetExpField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) ->>>>>>> other { sal_Int32 nTmp = 0; String sTmp; @@ -515,15 +503,7 @@ sal_Bool SwGetExpField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) return sal_True; } -<<<<<<< local -SwSetExpFieldType::SwSetExpFieldType( SwDoc* pDc, const String& rName, USHORT nTyp ) -======= -/*-----------------JP: 17.06.93 ------------------- - Set-Expression-Type - --------------------------------------------------*/ - SwSetExpFieldType::SwSetExpFieldType( SwDoc* pDc, const String& rName, sal_uInt16 nTyp ) ->>>>>>> other : SwValueFieldType( pDc, RES_SETEXPFLD ), sName( rName ), pOutlChgNd( 0 ), @@ -666,14 +646,7 @@ void SwSetExpFieldType::SetChapter( SwSetExpField& rFld, const SwNode& rNd ) } } -<<<<<<< local -BOOL SwSetExpFieldType::QueryValue( uno::Any& rAny, USHORT nWhichId ) const -======= -/* -----------------24.03.99 09:44------------------- - * - * --------------------------------------------------*/ sal_Bool SwSetExpFieldType::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const ->>>>>>> other { switch( nWhichId ) { @@ -1073,14 +1046,7 @@ String SwInputField::Expand() const return sRet; } -<<<<<<< local -BOOL SwInputField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const -======= -/*-----------------06.03.98 11:12------------------- - ---------------------------------------------------*/ sal_Bool SwInputField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const ->>>>>>> other { switch( nWhichId ) { @@ -1102,12 +1068,7 @@ sal_Bool SwInputField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const return sal_True; } -<<<<<<< local -BOOL SwInputField::PutValue( const uno::Any& rAny, USHORT nWhichId ) -======= ---------------------------------------------------*/ sal_Bool SwInputField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) ->>>>>>> other { switch( nWhichId ) { @@ -1191,12 +1152,7 @@ void SwInputField::SetSubType(sal_uInt16 nSub) nSubType = nSub; } -<<<<<<< local -BOOL SwSetExpField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const -======= ---------------------------------------------------*/ sal_Bool SwSetExpField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const ->>>>>>> other { switch( nWhichId ) { @@ -1261,12 +1217,7 @@ sal_Bool SwSetExpField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const return sal_True; } -<<<<<<< local -BOOL SwSetExpField::PutValue( const uno::Any& rAny, USHORT nWhichId ) -======= ---------------------------------------------------*/ sal_Bool SwSetExpField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) ->>>>>>> other { sal_Int32 nTmp32 = 0; sal_Int16 nTmp16 = 0; diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx index d83a38c777e6..ddcc754eab23 100644 --- a/sw/source/core/fields/reffld.cxx +++ b/sw/source/core/fields/reffld.cxx @@ -104,13 +104,8 @@ void lcl_GetLayTree( const SwFrm* pFrm, SvPtrarr& rArr ) sal_Bool IsFrameBehind( const SwTxtNode& rMyNd, sal_uInt16 nMySttPos, const SwTxtNode& rBehindNd, sal_uInt16 nSttPos ) { -<<<<<<< local - const SwTxtFrm *pMyFrm = (SwTxtFrm*)rMyNd.getLayoutFrm( rMyNd.GetDoc()->GetCurrentLayout(), 0,0,FALSE), - *pFrm = (SwTxtFrm*)rBehindNd.getLayoutFrm( rBehindNd.GetDoc()->GetCurrentLayout(), 0,0,FALSE); -======= - const SwTxtFrm *pMyFrm = (SwTxtFrm*)rMyNd.GetFrm(0,0,sal_False), - *pFrm = (SwTxtFrm*)rBehindNd.GetFrm(0,0,sal_False); ->>>>>>> other + const SwTxtFrm *pMyFrm = (SwTxtFrm*)rMyNd.getLayoutFrm( rMyNd.GetDoc()->GetCurrentLayout(), 0,0,sal_False), + *pFrm = (SwTxtFrm*)rBehindNd.getLayoutFrm( rBehindNd.GetDoc()->GetCurrentLayout(), 0,0,sal_False); while( pFrm && !pFrm->IsInside( nSttPos ) ) pFrm = (SwTxtFrm*)pFrm->GetFollow(); @@ -396,11 +391,7 @@ void SwGetRefField::UpdateField( const SwTxtFld* pFldTxtAttr ) case REF_PAGE: case REF_PAGE_PGDESC: { -<<<<<<< local - const SwTxtFrm* pFrm = (SwTxtFrm*)pTxtNd->getLayoutFrm( pDoc->GetCurrentLayout(), 0,0,FALSE), -======= - const SwTxtFrm* pFrm = (SwTxtFrm*)pTxtNd->GetFrm(0,0,sal_False), ->>>>>>> other + const SwTxtFrm* pFrm = (SwTxtFrm*)pTxtNd->getLayoutFrm( pDoc->GetCurrentLayout(), 0,0,sal_False), *pSave = pFrm; while( pFrm && !pFrm->IsInside( nStt ) ) pFrm = (SwTxtFrm*)pFrm->GetFollow(); @@ -585,14 +576,7 @@ String SwGetRefField::GetPar2() const return Expand(); } -<<<<<<< local -BOOL SwGetRefField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const -======= -/*-----------------06.03.98 13:34------------------- - ---------------------------------------------------*/ sal_Bool SwGetRefField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const ->>>>>>> other { switch( nWhichId ) { @@ -664,12 +648,7 @@ sal_Bool SwGetRefField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const return sal_True; } -<<<<<<< local -BOOL SwGetRefField::PutValue( const uno::Any& rAny, USHORT nWhichId ) -======= ---------------------------------------------------*/ sal_Bool SwGetRefField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) ->>>>>>> other { String sTmp; switch( nWhichId ) diff --git a/sw/source/core/fields/tblcalc.cxx b/sw/source/core/fields/tblcalc.cxx index 0f2b22dbdee8..082b0b9f2a2d 100644 --- a/sw/source/core/fields/tblcalc.cxx +++ b/sw/source/core/fields/tblcalc.cxx @@ -181,14 +181,7 @@ void SwTblField::SetPar2(const String& rStr) } -<<<<<<< local -BOOL SwTblField::QueryValue( uno::Any& rAny, USHORT nWhichId ) const -======= -/*-----------------04.03.98 10:33------------------- - ---------------------------------------------------*/ sal_Bool SwTblField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const ->>>>>>> other { sal_Bool bRet = sal_True; switch ( nWhichId ) @@ -220,12 +213,7 @@ sal_Bool SwTblField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const return bRet; } -<<<<<<< local -BOOL SwTblField::PutValue( const uno::Any& rAny, USHORT nWhichId ) -======= ---------------------------------------------------*/ sal_Bool SwTblField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId ) ->>>>>>> other { sal_Bool bRet = sal_True; String sTmp; diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx index d7087ed03dd2..ed851204d1b5 100644 --- a/sw/source/core/frmedt/fecopy.cxx +++ b/sw/source/core/frmedt/fecopy.cxx @@ -268,11 +268,7 @@ sal_Bool lcl_SetAnchor( const SwPosition& rPos, const SwNode& rNd, SwFlyFrm* pFl { sal_Bool bRet = sal_True; rAnchor.SetAnchor( &rPos ); -<<<<<<< local - SwCntntFrm* pTmpFrm = rNd.GetCntntNode()->getLayoutFrm( rDestShell.GetLayout(), &rInsPt, 0, FALSE ); -======= - SwCntntFrm* pTmpFrm = rNd.GetCntntNode()->GetFrm( &rInsPt, 0, sal_False ); ->>>>>>> other + SwCntntFrm* pTmpFrm = rNd.GetCntntNode()->getLayoutFrm( rDestShell.GetLayout(), &rInsPt, 0, sal_False ); SwFlyFrm *pTmpFly = pTmpFrm->FindFlyFrm(); if( pTmpFly && bCheckFlyRecur && pFly->IsUpperOf( *pTmpFly ) ) { diff --git a/sw/source/core/frmedt/fedesc.cxx b/sw/source/core/frmedt/fedesc.cxx index 30737bb8209f..9b3d36fb6a7e 100644 --- a/sw/source/core/frmedt/fedesc.cxx +++ b/sw/source/core/frmedt/fedesc.cxx @@ -240,23 +240,14 @@ const SwPageDesc* SwFEShell::GetSelectedPageDescs() const FOREACHPAM_START(this) if( 0 != (pCNd = PCURCRSR->GetCntntNode() ) && -<<<<<<< local - 0 != ( pPtFrm = pCNd->getLayoutFrm( GetLayout(), &aNulPt, 0, FALSE )) ) -======= - 0 != ( pPtFrm = pCNd->GetFrm( &aNulPt, 0, sal_False )) ) ->>>>>>> other + 0 != ( pPtFrm = pCNd->getLayoutFrm( GetLayout(), &aNulPt, 0, sal_False )) ) pPtFrm = pPtFrm->FindPageFrm(); else pPtFrm = 0; if( PCURCRSR->HasMark() && -<<<<<<< local - 0 != (pCNd = PCURCRSR->GetCntntNode( FALSE ) ) && - 0 != ( pMkFrm = pCNd->getLayoutFrm( GetLayout(), &aNulPt, 0, FALSE )) ) -======= 0 != (pCNd = PCURCRSR->GetCntntNode( sal_False ) ) && - 0 != ( pMkFrm = pCNd->GetFrm( &aNulPt, 0, sal_False )) ) ->>>>>>> other + 0 != ( pMkFrm = pCNd->getLayoutFrm( GetLayout(), &aNulPt, 0, sal_False )) ) pMkFrm = pMkFrm->FindPageFrm(); else pMkFrm = pPtFrm; diff --git a/sw/source/core/frmedt/fefly1.cxx b/sw/source/core/frmedt/fefly1.cxx index 2e423dc11069..6437b3250046 100644 --- a/sw/source/core/frmedt/fefly1.cxx +++ b/sw/source/core/frmedt/fefly1.cxx @@ -492,11 +492,7 @@ Point SwFEShell::FindAnchorPos( const Point& rAbsPos, sal_Bool bMoveIt ) SwPosition aPos( GetDoc()->GetNodes().GetEndOfExtras() ); Point aTmpPnt( rAbsPos ); GetLayout()->GetCrsrOfst( &aPos, aTmpPnt, &aState ); -<<<<<<< local - pTxtFrm = aPos.nNode.GetNode().GetCntntNode()->getLayoutFrm( GetLayout(),0,&aPos,FALSE ); -======= - pTxtFrm = aPos.nNode.GetNode().GetCntntNode()->GetFrm(0,&aPos,sal_False ); ->>>>>>> other + pTxtFrm = aPos.nNode.GetNode().GetCntntNode()->getLayoutFrm( GetLayout(),0,&aPos,sal_False ); } const SwFrm *pNewAnch; if( pTxtFrm ) diff --git a/sw/source/core/frmedt/feflyole.cxx b/sw/source/core/frmedt/feflyole.cxx index 1138859bcc47..2ac1f14f24b2 100644 --- a/sw/source/core/frmedt/feflyole.cxx +++ b/sw/source/core/frmedt/feflyole.cxx @@ -79,13 +79,8 @@ SwFlyFrm *SwFEShell::FindFlyFrm( const uno::Reference < embed::XEmbeddedObject > if ( pNd->IsOLENode() && ((SwOLENode*)pNd)->GetOLEObj().GetOleRef() == xObj ) { -<<<<<<< local - bExist = TRUE; - SwFrm *pFrm = ((SwOLENode*)pNd)->getLayoutFrm( GetLayout() ); -======= bExist = sal_True; - SwFrm *pFrm = ((SwOLENode*)pNd)->GetFrm(); ->>>>>>> other + SwFrm *pFrm = ((SwOLENode*)pNd)->getLayoutFrm( GetLayout() ); if ( pFrm ) pFly = pFrm->FindFlyFrm(); break; diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx index 88a9983af88f..82365e2500df 100644 --- a/sw/source/core/frmedt/feshview.cxx +++ b/sw/source/core/frmedt/feshview.cxx @@ -1687,11 +1687,7 @@ sal_Bool SwFEShell::ImpEndCreate() // die naechste nicht READONLY Position suchen? bAtPage = true; -<<<<<<< local - pAnch = aPos.nNode.GetNode().GetCntntNode()->getLayoutFrm( GetLayout(), &aPoint, 0, FALSE ); -======= - pAnch = aPos.nNode.GetNode().GetCntntNode()->GetFrm( &aPoint, 0, sal_False ); ->>>>>>> other + pAnch = aPos.nNode.GetNode().GetCntntNode()->getLayoutFrm( GetLayout(), &aPoint, 0, sal_False ); if( !bAtPage ) { @@ -2831,19 +2827,9 @@ long SwFEShell::GetSectionWidth( SwFmt& rFmt ) const return pSct->Frm().Width(); return 0; } -<<<<<<< local -======= -/* -----------------------------2002/06/24 15:07------------------------------ ->>>>>>> other -<<<<<<< local -void SwFEShell::CreateDefaultShape( UINT16 /*SdrObjKind ?*/ eSdrObjectKind, const Rectangle& rRect, - USHORT nSlotId) -======= - ---------------------------------------------------------------------------*/ void SwFEShell::CreateDefaultShape( sal_uInt16 /*SdrObjKind ?*/ eSdrObjectKind, const Rectangle& rRect, sal_uInt16 nSlotId) ->>>>>>> other { SdrView* pDrawView = GetDrawView(); SdrModel* pDrawModel = pDrawView->GetModel(); diff --git a/sw/source/core/frmedt/fetab.cxx b/sw/source/core/frmedt/fetab.cxx index 26dc11c4b4f1..c193d4f239b8 100644 --- a/sw/source/core/frmedt/fetab.cxx +++ b/sw/source/core/frmedt/fetab.cxx @@ -1167,11 +1167,7 @@ sal_uInt16 lcl_GetRowNumber( const SwPosition& rPos ) const SwCntntFrm *pFrm; if( 0 != ( pNd = rPos.nNode.GetNode().GetCntntNode() )) -<<<<<<< local - pFrm = pNd->getLayoutFrm( pNd->GetDoc()->GetCurrentLayout(), &aTmpPt, &rPos, FALSE ); -======= - pFrm = pNd->GetFrm( &aTmpPt, &rPos, sal_False ); ->>>>>>> other + pFrm = pNd->getLayoutFrm( pNd->GetDoc()->GetCurrentLayout(), &aTmpPt, &rPos, sal_False ); else pFrm = 0; diff --git a/sw/source/core/frmedt/fews.cxx b/sw/source/core/frmedt/fews.cxx index 68105ee81b26..5746b07dba97 100644 --- a/sw/source/core/frmedt/fews.cxx +++ b/sw/source/core/frmedt/fews.cxx @@ -429,13 +429,8 @@ void SwFEShell::SetNewPageOffset( sal_uInt16 nOffset ) void SwFEShell::SetPageOffset( sal_uInt16 nOffset ) { -<<<<<<< local - const SwPageFrm *pPage = GetCurrFrm( FALSE )->FindPageFrm(); - const SwRootFrm* pDocLayout = GetLayout(); -======= const SwPageFrm *pPage = GetCurrFrm( sal_False )->FindPageFrm(); - const SwRootFrm* pLayout = GetLayout(); ->>>>>>> other + const SwRootFrm* pDocLayout = GetLayout(); while ( pPage ) { const SwFrm *pFlow = pPage->FindFirstBodyCntnt(); @@ -446,11 +441,7 @@ void SwFEShell::SetPageOffset( sal_uInt16 nOffset ) const SwFmtPageDesc& rPgDesc = pFlow->GetAttrSet()->GetPageDesc(); if ( rPgDesc.GetNumOffset() ) { -<<<<<<< local - pDocLayout->SetVirtPageNum( TRUE ); -======= - pLayout->SetVirtPageNum( sal_True ); ->>>>>>> other + pDocLayout->SetVirtPageNum( sal_True ); lcl_SetAPageOffset( nOffset, (SwPageFrm*)pPage, this ); break; } diff --git a/sw/source/core/frmedt/tblsel.cxx b/sw/source/core/frmedt/tblsel.cxx index a1e38d87f194..e5f7186b7c3c 100644 --- a/sw/source/core/frmedt/tblsel.cxx +++ b/sw/source/core/frmedt/tblsel.cxx @@ -291,13 +291,8 @@ void GetTblSel( const SwCursor& rCrsr, SwSelBoxes& rBoxes, } const SwCntntNode *pCntNd = rCrsr.GetCntntNode(); const SwLayoutFrm *pStart = pCntNd ? -<<<<<<< local pCntNd->getLayoutFrm( pCntNd->GetDoc()->GetCurrentLayout(), &aPtPos )->GetUpper() : 0; - pCntNd = rCrsr.GetCntntNode(FALSE); -======= - pCntNd->GetFrm( &aPtPos )->GetUpper() : 0; pCntNd = rCrsr.GetCntntNode(sal_False); ->>>>>>> other const SwLayoutFrm *pEnd = pCntNd ? pCntNd->getLayoutFrm( pCntNd->GetDoc()->GetCurrentLayout(), &aMkPos )->GetUpper() : 0; if( pStart && pEnd ) @@ -508,13 +503,8 @@ sal_Bool ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd, // OD 07.11.2003 #i22135# - Also the content of the table could be // invisible - e.g. in a hidden section // Robust: check, if content was found (e.g. empty table cells) -<<<<<<< local if ( !pCNd || pCNd->getLayoutFrm( pCNd->GetDoc()->GetCurrentLayout() ) == NULL ) - return FALSE; -======= - if ( !pCNd || pCNd->GetFrm() == NULL ) return sal_False; ->>>>>>> other const SwLayoutFrm *pStart = pCNd ? pCNd->getLayoutFrm( pCNd->GetDoc()->GetCurrentLayout(), &aNullPos )->GetUpper() : 0; ASSERT( pStart, "ohne Frame geht gar nichts" ); @@ -787,11 +777,7 @@ sal_Bool GetAutoSumSel( const SwCrsrShell& rShell, SwCellFrms& rBoxes ) const SwLayoutFrm *pStart = pCrsr->GetCntntNode()->getLayoutFrm( rShell.GetLayout(), &pCrsr->GetPtPos() )->GetUpper(), -<<<<<<< local - *pEnd = pCrsr->GetCntntNode(FALSE)->getLayoutFrm( rShell.GetLayout(), -======= - *pEnd = pCrsr->GetCntntNode(sal_False)->GetFrm( ->>>>>>> other + *pEnd = pCrsr->GetCntntNode(sal_False)->getLayoutFrm( rShell.GetLayout(), &pCrsr->GetMkPos() )->GetUpper(); const SwLayoutFrm* pSttCell = pStart; @@ -1029,18 +1015,12 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes, // das die 1. Headline mit drin ist. // Point aPt( rShell.GetCharRect().Pos() ); Point aPt( 0, 0 ); -<<<<<<< local const SwCntntNode* pCntNd = rPam.GetCntntNode(); const SwLayoutFrm *pStart = pCntNd->getLayoutFrm( pCntNd->GetDoc()->GetCurrentLayout(), &aPt )->GetUpper(); - pCntNd = rPam.GetCntntNode(FALSE); - const SwLayoutFrm *pEnd = rPam.GetCntntNode(FALSE)->getLayoutFrm( pCntNd->GetDoc()->GetCurrentLayout(), -======= - const SwLayoutFrm *pStart = rPam.GetCntntNode()->GetFrm( - &aPt )->GetUpper(), - *pEnd = rPam.GetCntntNode(sal_False)->GetFrm( ->>>>>>> other + pCntNd = rPam.GetCntntNode(sal_False); + const SwLayoutFrm *pEnd = pCntNd->getLayoutFrm( pCntNd->GetDoc()->GetCurrentLayout(), &aPt )->GetUpper(); SwSelUnions aUnions; @@ -1554,17 +1534,11 @@ sal_uInt16 CheckMergeSel( const SwPaM& rPam ) // richtig. Warum nicht Point 0,0 benutzen? Dann ist garantiert, // das die 1. Headline mit drin ist. Point aPt; -<<<<<<< local const SwCntntNode* pCntNd = rPam.GetCntntNode(); const SwLayoutFrm *pStart = pCntNd->getLayoutFrm( pCntNd->GetDoc()->GetCurrentLayout(), &aPt )->GetUpper(); - pCntNd = rPam.GetCntntNode(FALSE); - const SwLayoutFrm *pEnd = rPam.GetCntntNode(FALSE)->getLayoutFrm( pCntNd->GetDoc()->GetCurrentLayout(), -======= - const SwLayoutFrm *pStart = rPam.GetCntntNode()->GetFrm( - &aPt )->GetUpper(), - *pEnd = rPam.GetCntntNode(sal_False)->GetFrm( ->>>>>>> other + pCntNd = rPam.GetCntntNode(sal_False); + const SwLayoutFrm *pEnd = pCntNd->getLayoutFrm( pCntNd->GetDoc()->GetCurrentLayout(), &aPt )->GetUpper(); GetTblSel( pStart, pEnd, aBoxes, 0 ); return CheckMergeSel( aBoxes ); @@ -2094,18 +2068,12 @@ sal_Bool CheckSplitCells( const SwCursor& rCrsr, sal_uInt16 nDiv, aPtPos = pShCrsr->GetPtPos(); aMkPos = pShCrsr->GetMkPos(); } -<<<<<<< local const SwCntntNode* pCntNd = rCrsr.GetCntntNode(); const SwLayoutFrm *pStart = pCntNd->getLayoutFrm( pCntNd->GetDoc()->GetCurrentLayout(), &aPtPos )->GetUpper(); - pCntNd = rCrsr.GetCntntNode(FALSE); - const SwLayoutFrm *pEnd = rCrsr.GetCntntNode(FALSE)->getLayoutFrm( pCntNd->GetDoc()->GetCurrentLayout(), -======= - const SwLayoutFrm *pStart = rCrsr.GetCntntNode()->GetFrm( - &aPtPos )->GetUpper(), - *pEnd = rCrsr.GetCntntNode(sal_False)->GetFrm( ->>>>>>> other + pCntNd = rCrsr.GetCntntNode(sal_False); + const SwLayoutFrm *pEnd = pCntNd->getLayoutFrm( pCntNd->GetDoc()->GetCurrentLayout(), &aMkPos )->GetUpper(); SWRECTFN( pStart->GetUpper() ) @@ -2492,15 +2460,9 @@ void _FndBox::MakeFrms( SwTable &rTable ) i >= 0 && !pSibling; --i ) { SwTableLine *pLine = pLineBehind ? pLineBehind : -<<<<<<< local - rTable.GetTabLines()[static_cast<USHORT>(i)]; + rTable.GetTabLines()[static_cast<sal_uInt16>(i)]; SwIterator<SwRowFrm,SwFmt> aIter( *pLine->GetFrmFmt() ); pSibling = aIter.First(); -======= - rTable.GetTabLines()[static_cast<sal_uInt16>(i)]; - SwClientIter aIter( *pLine->GetFrmFmt() ); - pSibling = (SwFrm*)aIter.First( TYPE(SwFrm) ); ->>>>>>> other while ( pSibling && ( pSibling->GetTabLine() != pLine || !lcl_IsLineOfTblFrm( *pTable, *pSibling ) || diff --git a/sw/source/core/inc/UndoAttribute.hxx b/sw/source/core/inc/UndoAttribute.hxx index 84423605b5d0..849603e2b534 100644 --- a/sw/source/core/inc/UndoAttribute.hxx +++ b/sw/source/core/inc/UndoAttribute.hxx @@ -192,7 +192,7 @@ class SwUndoFmtAttrHelper : public SwClient public: SwUndoFmtAttrHelper( SwFmt& rFmt, bool bSaveDrawPt = true ); - virtual void Modify( SfxPoolItem*, SfxPoolItem* ); + virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ); SwUndoFmtAttr* GetUndo() const { return m_pUndo.get(); } // release the undo object (so it is not deleted here), and return it diff --git a/sw/source/core/inc/UndoCore.hxx b/sw/source/core/inc/UndoCore.hxx index 41e89dcdd518..c5907426bf40 100644 --- a/sw/source/core/inc/UndoCore.hxx +++ b/sw/source/core/inc/UndoCore.hxx @@ -177,7 +177,7 @@ class SwUndoSetFlyFmt : public SwUndo, public SwClient sal_Bool bAnchorChgd; void PutAttr( sal_uInt16 nWhich, const SfxPoolItem* pItem ); - void Modify( SfxPoolItem*, SfxPoolItem* ); + void Modify( const SfxPoolItem*, const SfxPoolItem* ); void GetAnchor( SwFmtAnchor& rAnhor, sal_uLong nNode, xub_StrLen nCntnt ); public: diff --git a/sw/source/core/inc/cellfrm.hxx b/sw/source/core/inc/cellfrm.hxx index 317e70aa22c1..7554271a63c3 100644 --- a/sw/source/core/inc/cellfrm.hxx +++ b/sw/source/core/inc/cellfrm.hxx @@ -47,17 +47,10 @@ public: SwCellFrm( const SwTableBox &, SwFrm*, bool bInsertContent = true ); ~SwCellFrm(); -<<<<<<< local - virtual BOOL GetCrsrOfst( SwPosition *, Point&, SwCrsrMoveState* = 0 ) const; - virtual void Paint( SwRect const&, SwPrintData const*const pPrintData = NULL ) const; - virtual void CheckDirection( BOOL bVert ); -======= virtual sal_Bool GetCrsrOfst( SwPosition *, Point&, SwCrsrMoveState* = 0 ) const; - virtual void Modify( SfxPoolItem*, SfxPoolItem* ); virtual void Paint( SwRect const&, SwPrintData const*const pPrintData = NULL ) const; virtual void CheckDirection( sal_Bool bVert ); ->>>>>>> other // --> OD 2010-02-17 #i103961# virtual void Cut(); diff --git a/sw/source/core/inc/cntfrm.hxx b/sw/source/core/inc/cntfrm.hxx index 88c8f68c17f5..46bd79377bbb 100644 --- a/sw/source/core/inc/cntfrm.hxx +++ b/sw/source/core/inc/cntfrm.hxx @@ -53,11 +53,7 @@ class SwCntntFrm: public SwFrm, public SwFlowFrm // <-- virtual void MakeAll(); -<<<<<<< local - void _UpdateAttr( const SfxPoolItem*, const SfxPoolItem*, BYTE &, -======= - void _UpdateAttr( SfxPoolItem*, SfxPoolItem*, sal_uInt8 &, ->>>>>>> other + void _UpdateAttr( const SfxPoolItem*, const SfxPoolItem*, sal_uInt8 &, SwAttrSetChg *pa = 0, SwAttrSetChg *pb = 0 ); virtual sal_Bool ShouldBwdMoved( SwLayoutFrm *pNewUpper, sal_Bool, sal_Bool& ); @@ -68,15 +64,9 @@ protected: sal_Bool MakePrtArea( const SwBorderAttrs & ); -<<<<<<< local virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ); - virtual SwTwips ShrinkFrm( SwTwips, BOOL bTst = FALSE, BOOL bInfo = FALSE ); - virtual SwTwips GrowFrm ( SwTwips, BOOL bTst = FALSE, BOOL bInfo = FALSE ); -======= - virtual void Modify( SfxPoolItem*, SfxPoolItem* ); virtual SwTwips ShrinkFrm( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ); virtual SwTwips GrowFrm ( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ); ->>>>>>> other SwCntntFrm( SwCntntNode * const, SwFrm* ); diff --git a/sw/source/core/inc/flyfrm.hxx b/sw/source/core/inc/flyfrm.hxx index bd57549a41c5..db16dd447c27 100644 --- a/sw/source/core/inc/flyfrm.hxx +++ b/sw/source/core/inc/flyfrm.hxx @@ -60,23 +60,14 @@ sal_Bool CalcClipRect( const SdrObject *pSdrObj, SwRect &rRect, sal_Bool bMove = class SwFlyFrm : public SwLayoutFrm, public SwAnchoredObject { //darf Locken. Definiert in frmtool.cxx -<<<<<<< local friend void AppendObjs ( const SwSpzFrmFmts *, ULONG, SwFrm *, SwPageFrm * ); -======= - friend void AppendObjs ( const SwSpzFrmFmts *, sal_uLong, SwFrm *, SwPageFrm * ); - friend void AppendAllObjs( const SwSpzFrmFmts * ); ->>>>>>> other friend void Notify( SwFlyFrm *, SwPageFrm *pOld, const SwRect &rOld, const SwRect* pOldPrt ); void InitDrawObj( sal_Bool bNotify ); //Wird von den CToren gerufen. void FinitDrawObj(); //Wird vom CTor gerufen. -<<<<<<< local - void _UpdateAttr( const SfxPoolItem*, const SfxPoolItem*, BYTE &, -======= - void _UpdateAttr( SfxPoolItem*, SfxPoolItem*, sal_uInt8 &, ->>>>>>> other + void _UpdateAttr( const SfxPoolItem*, const SfxPoolItem*, sal_uInt8 &, SwAttrSetChg *pa = 0, SwAttrSetChg *pb = 0 ); using SwLayoutFrm::CalcRel; diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx index 62ed01cce55d..99d7f0ce2bbc 100644 --- a/sw/source/core/inc/frame.hxx +++ b/sw/source/core/inc/frame.hxx @@ -344,11 +344,7 @@ class SwFrm: public SwClient, public SfxBroadcaster SwCntntFrm* _FindPrevCnt( const bool _bInSameFtn = false ); -<<<<<<< local - void _UpdateAttrFrm( const SfxPoolItem*, const SfxPoolItem*, BYTE & ); -======= - void _UpdateAttrFrm( SfxPoolItem*, SfxPoolItem*, sal_uInt8 & ); ->>>>>>> other + void _UpdateAttrFrm( const SfxPoolItem*, const SfxPoolItem*, sal_uInt8 & ); SwFrm* _GetIndNext(); void SetDirFlags( sal_Bool bVert ); @@ -404,14 +400,10 @@ protected: void ColLock() { bColLocked = sal_True; } void ColUnlock() { bColLocked = sal_False; } -<<<<<<< local // Only used by SwRootFrm Ctor to get 'this' into mpRoot... void setRootFrm( SwRootFrm* pRoot ) { mpRoot = pRoot; } - SwPageFrm *InsertPage( SwPageFrm *pSibling, BOOL bFtn ); -======= SwPageFrm *InsertPage( SwPageFrm *pSibling, sal_Bool bFtn ); ->>>>>>> other void PrepareMake(); void OptPrepareMake(); void MakePos(); @@ -653,12 +645,7 @@ public: // <-- inline SwFrm *FindPrev(); inline const SwPageFrm *FindPageFrm() const; -<<<<<<< local - inline const SwFtnBossFrm *FindFtnBossFrm( BOOL bFtn = FALSE ) const; -======= - inline const SwRootFrm *FindRootFrm() const; inline const SwFtnBossFrm *FindFtnBossFrm( sal_Bool bFtn = sal_False ) const; ->>>>>>> other inline const SwFrm *FindColFrm() const; inline const SwFrm *FindFooterOrHeader() const; inline const SwTabFrm *FindTabFrm() const; @@ -923,13 +910,9 @@ public: bool IsInCoveredCell() const; // FME 2007-08-30 #i81146# new loop control -<<<<<<< local - void ValidateThisAndAllLowers( const USHORT nStage ); bool KnowsFormat( const SwFmt& rFmt ) const; void RegisterToFormat( SwFmt& rFmt ); -======= void ValidateThisAndAllLowers( const sal_uInt16 nStage ); ->>>>>>> other }; inline sal_Bool SwFrm::IsInDocBody() const diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx index d5157954b9bb..c264e8439092 100644 --- a/sw/source/core/inc/frmtool.hxx +++ b/sw/source/core/inc/frmtool.hxx @@ -139,11 +139,7 @@ const SwFrm * MA_FASTCALL FindPage( const SwRect &rRect, const SwFrm *pPage ); // JP 07.05.98: wird von SwCntntNode::GetFrm und von SwFlyFrm::GetFrm // gerufen -<<<<<<< local -SwFrm* GetFrmOfModify( const SwRootFrm* pLayout, SwModify const&, USHORT const nFrmType, const Point* = 0, -======= -SwFrm* GetFrmOfModify( SwModify const&, sal_uInt16 const nFrmType, const Point* = 0, ->>>>>>> other +SwFrm* GetFrmOfModify( const SwRootFrm* pLayout, SwModify const&, sal_uInt16 const nFrmType, const Point* = 0, const SwPosition *pPos = 0, const sal_Bool bCalcFrm = sal_False ); diff --git a/sw/source/core/inc/hffrm.hxx b/sw/source/core/inc/hffrm.hxx index 0158f04e7dc5..f4a098f9cb1a 100644 --- a/sw/source/core/inc/hffrm.hxx +++ b/sw/source/core/inc/hffrm.hxx @@ -39,11 +39,7 @@ protected: void FormatPrt(SwTwips & nUL, const SwBorderAttrs * pAttrs); inline sal_Bool GetEatSpacing() const; // in hffrm.cxx public: -<<<<<<< local - SwHeadFootFrm(SwFrmFmt * pFrm, SwFrm*, USHORT aType); -======= - SwHeadFootFrm(SwFrmFmt * pFrm, sal_uInt16 aType); ->>>>>>> other + SwHeadFootFrm(SwFrmFmt * pFrm, SwFrm*, sal_uInt16 aType); virtual void Format( const SwBorderAttrs *pAttrs = 0 ); virtual SwTwips GrowFrm( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ); diff --git a/sw/source/core/inc/pagefrm.hxx b/sw/source/core/inc/pagefrm.hxx index 0672251a8323..c5d63d0895ec 100644 --- a/sw/source/core/inc/pagefrm.hxx +++ b/sw/source/core/inc/pagefrm.hxx @@ -92,11 +92,7 @@ class SwPageFrm: public SwFtnBossFrm static const sal_Int8 mnBorderPxWidth; static const sal_Int8 mnShadowPxWidth; -<<<<<<< local - void _UpdateAttr( const SfxPoolItem*, const SfxPoolItem*, BYTE &, -======= - void _UpdateAttr( SfxPoolItem*, SfxPoolItem*, sal_uInt8 &, ->>>>>>> other + void _UpdateAttr( const SfxPoolItem*, const SfxPoolItem*, sal_uInt8 &, SwAttrSetChg *pa = 0, SwAttrSetChg *pb = 0 ); // Anpassen der max. Fussnotenhoehen in den einzelnen Spalten diff --git a/sw/source/core/inc/sectfrm.hxx b/sw/source/core/inc/sectfrm.hxx index d7c5b7cccb66..77314ff7f956 100644 --- a/sw/source/core/inc/sectfrm.hxx +++ b/sw/source/core/inc/sectfrm.hxx @@ -45,11 +45,7 @@ class SwSectionFrm: public SwLayoutFrm, public SwFlowFrm { SwSection* pSection; -<<<<<<< local - void _UpdateAttr( const SfxPoolItem*, const SfxPoolItem*, BYTE &, -======= - void _UpdateAttr( SfxPoolItem*, SfxPoolItem*, sal_uInt8 &, ->>>>>>> other + void _UpdateAttr( const SfxPoolItem*, const SfxPoolItem*, sal_uInt8 &, SwAttrSetChg *pa = 0, SwAttrSetChg *pb = 0 ); void _Cut( sal_Bool bRemove ); // Is there a FtnContainer? @@ -67,13 +63,8 @@ protected: virtual void SwClientNotify( const SwModify&, const SfxHint& ); public: -<<<<<<< local SwSectionFrm( SwSection &, SwFrm* ); //Inhalt wird nicht erzeugt! - SwSectionFrm( SwSectionFrm &, BOOL bMaster );//_Nur_ zum Erzeugen von Master/Follows -======= - SwSectionFrm( SwSection & ); //Inhalt wird nicht erzeugt! SwSectionFrm( SwSectionFrm &, sal_Bool bMaster );//_Nur_ zum Erzeugen von Master/Follows ->>>>>>> other ~SwSectionFrm(); void Init(); diff --git a/sw/source/core/inc/tabfrm.hxx b/sw/source/core/inc/tabfrm.hxx index 4b839e9da0fe..786383deeecf 100644 --- a/sw/source/core/inc/tabfrm.hxx +++ b/sw/source/core/inc/tabfrm.hxx @@ -102,11 +102,7 @@ class SwTabFrm: public SwLayoutFrm, public SwFlowFrm bool Split( const SwTwips nCutPos, bool bTryToSplit, bool bTableRowKeep ); bool Join(); -<<<<<<< local - void _UpdateAttr( const SfxPoolItem*, const SfxPoolItem*, BYTE &, -======= - void _UpdateAttr( SfxPoolItem*, SfxPoolItem*, sal_uInt8 &, ->>>>>>> other + void _UpdateAttr( const SfxPoolItem*, const SfxPoolItem*, sal_uInt8 &, SwAttrSetChg *pa = 0, SwAttrSetChg *pb = 0 ); virtual sal_Bool ShouldBwdMoved( SwLayoutFrm *pNewUpper, sal_Bool bHead, sal_Bool &rReformat ); @@ -114,13 +110,10 @@ class SwTabFrm: public SwLayoutFrm, public SwFlowFrm protected: virtual void MakeAll(); virtual void Format( const SwBorderAttrs *pAttrs = 0 ); - //Aendert nur die Framesize, nicht die PrtArea-SSize -<<<<<<< local - virtual SwTwips GrowFrm ( SwTwips, BOOL bTst = FALSE, BOOL bInfo = FALSE ); virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ); -======= + //Aendert nur die Framesize, nicht die PrtArea-SSize virtual SwTwips GrowFrm ( SwTwips, sal_Bool bTst = sal_False, sal_Bool bInfo = sal_False ); ->>>>>>> other + public: SwTabFrm( SwTable &, SwFrm* ); //Immer nach dem erzeugen _und_ pasten das //Regist Flys rufen! @@ -136,12 +129,7 @@ public: inline SwTabFrm *GetFollow(); SwTabFrm* FindMaster( bool bFirstMaster = false ) const; -<<<<<<< local - virtual BOOL GetInfo( SfxPoolItem &rHnt ) const; -======= - virtual void Modify( SfxPoolItem*, SfxPoolItem* ); virtual sal_Bool GetInfo( SfxPoolItem &rHnt ) const; ->>>>>>> other virtual void Paint( SwRect const&, SwPrintData const*const pPrintData = NULL ) const; virtual void CheckDirection( sal_Bool bVert ); diff --git a/sw/source/core/layout/colfrm.cxx b/sw/source/core/layout/colfrm.cxx index 0e2aaa1c0081..ec8a69f5bc88 100644 --- a/sw/source/core/layout/colfrm.cxx +++ b/sw/source/core/layout/colfrm.cxx @@ -249,11 +249,7 @@ void SwLayoutFrm::ChgColumns( const SwFmtCol &rOld, const SwFmtCol &rNew, // SaveCntnt wuerde auch den Inhalt der Fussnotencontainer aufsaugen // und im normalen Textfluss unterbringen. if( IsPageBodyFrm() ) -<<<<<<< local - pDoc->GetCurrentLayout()->RemoveFtns( (SwPageFrm*)GetUpper(), TRUE, FALSE ); //swmod 080218 -======= - pDoc->GetRootFrm()->RemoveFtns( (SwPageFrm*)GetUpper(), sal_True, sal_False ); ->>>>>>> other + pDoc->GetCurrentLayout()->RemoveFtns( (SwPageFrm*)GetUpper(), sal_True, sal_False ); //swmod 080218 pSave = ::SaveCntnt( this ); //Wenn Spalten existieren, jetzt aber eine Spaltenanzahl von diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx index 65e0bd6734a8..918363dfc648 100644 --- a/sw/source/core/layout/flowfrm.cxx +++ b/sw/source/core/layout/flowfrm.cxx @@ -1157,14 +1157,9 @@ sal_Bool SwFlowFrm::IsPrevObjMove() const // und fuer diesen ggf. Umbrechen. //!!!!!!!!!!!Hack!!!!!!!!!!! -<<<<<<< local const ViewShell *pSh = rThis.getRootFrm()->GetCurrShell(); if( pSh && pSh->GetViewOptions()->getBrowseMode() ) - return FALSE; -======= - if ( rThis.GetUpper()->GetFmt()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE) ) return sal_False; ->>>>>>> other SwFrm *pPre = rThis.FindPrev(); @@ -2667,13 +2662,8 @@ sal_Bool SwFlowFrm::MoveBwd( sal_Bool &rbReformat ) SwPageFrm *pNewPage = rThis.FindPageFrm(); if( pNewPage != pOldPage ) { -<<<<<<< local - rThis.Prepare( PREP_BOSS_CHGD, (const void*)pOldPage, FALSE ); - ViewShell *pSh = rThis.getRootFrm()->GetCurrShell(); -======= rThis.Prepare( PREP_BOSS_CHGD, (const void*)pOldPage, sal_False ); - ViewShell *pSh = rThis.GetShell(); ->>>>>>> other + ViewShell *pSh = rThis.getRootFrm()->GetCurrShell(); if ( pSh && !pSh->Imp()->IsUpdateExpFlds() ) pSh->GetDoc()->SetNewFldLst(true); //Wird von CalcLayout() hinterher eledigt! diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx index fe79266ac084..b6c977d249b4 100644 --- a/sw/source/core/layout/fly.cxx +++ b/sw/source/core/layout/fly.cxx @@ -378,7 +378,6 @@ void SwFlyFrm::DeleteCnt() |* Letzte Aenderung MA 30. Nov. 95 |* |*************************************************************************/ -<<<<<<< local sal_uInt32 SwFlyFrm::_GetOrdNumForNewRef( const SwFlyDrawContact* pContact ) { @@ -446,10 +445,7 @@ SwVirtFlyDrawObj* SwFlyFrm::CreateNewRef( SwFlyDrawContact *pContact ) -void SwFlyFrm::InitDrawObj( BOOL bNotify ) -======= void SwFlyFrm::InitDrawObj( sal_Bool bNotify ) ->>>>>>> other { //ContactObject aus dem Format suchen. Wenn bereits eines existiert, so //braucht nur eine neue Ref erzeugt werden, anderfalls ist es jetzt an @@ -865,24 +861,13 @@ void SwFlyFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew ) // <-- } -<<<<<<< local void SwFlyFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew, - BYTE &rInvFlags, -======= -void SwFlyFrm::_UpdateAttr( SfxPoolItem *pOld, SfxPoolItem *pNew, sal_uInt8 &rInvFlags, ->>>>>>> other SwAttrSetChg *pOldSet, SwAttrSetChg *pNewSet ) { -<<<<<<< local - BOOL bClear = TRUE; - const USHORT nWhich = pOld ? pOld->Which() : pNew ? pNew->Which() : 0; - ViewShell *pSh = getRootFrm()->GetCurrShell(); -======= sal_Bool bClear = sal_True; const sal_uInt16 nWhich = pOld ? pOld->Which() : pNew ? pNew->Which() : 0; - ViewShell *pSh = GetShell(); ->>>>>>> other + ViewShell *pSh = getRootFrm()->GetCurrShell(); switch( nWhich ) { case RES_VERT_ORIENT: diff --git a/sw/source/core/layout/flycnt.cxx b/sw/source/core/layout/flycnt.cxx index e6f73c81c381..3d7391a3cf4e 100644 --- a/sw/source/core/layout/flycnt.cxx +++ b/sw/source/core/layout/flycnt.cxx @@ -195,11 +195,7 @@ void SwFlyAtCntFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) if ( !pCntnt ) { SwCntntNode *pNode = aNewIdx.GetNode().GetCntntNode(); -<<<<<<< local - pCntnt = pNode->getLayoutFrm( getRootFrm(), &pOldAnchor->Frm().Pos(), 0, FALSE ); -======= - pCntnt = pNode->GetFrm( &pOldAnchor->Frm().Pos(), 0, sal_False ); ->>>>>>> other + pCntnt = pNode->getLayoutFrm( getRootFrm(), &pOldAnchor->Frm().Pos(), 0, sal_False ); ASSERT( pCntnt, "Neuen Anker nicht gefunden" ); } //Flys haengen niemals an einem Follow sondern immer am diff --git a/sw/source/core/layout/flylay.cxx b/sw/source/core/layout/flylay.cxx index 38f91d0e509f..8a9ef192e902 100644 --- a/sw/source/core/layout/flylay.cxx +++ b/sw/source/core/layout/flylay.cxx @@ -599,13 +599,8 @@ void SwFlyLayFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) if ( FLY_AT_PAGE == pAnch->GetAnchorId() ) { -<<<<<<< local - USHORT nPgNum = pAnch->GetPageNum(); - SwRootFrm *pRoot = getRootFrm(); -======= sal_uInt16 nPgNum = pAnch->GetPageNum(); - SwRootFrm *pRoot = FindRootFrm(); ->>>>>>> other + SwRootFrm *pRoot = getRootFrm(); SwPageFrm *pTmpPage = (SwPageFrm*)pRoot->Lower(); for ( sal_uInt16 i = 1; (i <= nPgNum) && pTmpPage; ++i, pTmpPage = (SwPageFrm*)pTmpPage->GetNext() ) @@ -627,11 +622,7 @@ void SwFlyLayFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) { SwNodeIndex aIdx( pAnch->GetCntntAnchor()->nNode ); SwCntntFrm *pCntnt = GetFmt()->GetDoc()->GetNodes().GoNext( &aIdx )-> -<<<<<<< local - GetCntntNode()->getLayoutFrm( getRootFrm(), 0, 0, FALSE ); -======= - GetCntntNode()->GetFrm( 0, 0, sal_False ); ->>>>>>> other + GetCntntNode()->getLayoutFrm( getRootFrm(), 0, 0, sal_False ); if( pCntnt ) { SwFlyFrm *pTmp = pCntnt->FindFlyFrm(); @@ -773,13 +764,8 @@ void SwPageFrm::AppendFlyToPage( SwFlyFrm *pNew ) void SwPageFrm::RemoveFlyFromPage( SwFlyFrm *pToRemove ) { -<<<<<<< local - const UINT32 nOrdNum = pToRemove->GetVirtDrawObj()->GetOrdNum(); - getRootFrm()->GetDrawPage()->RemoveObject( nOrdNum ); -======= const sal_uInt32 nOrdNum = pToRemove->GetVirtDrawObj()->GetOrdNum(); - FindRootFrm()->GetDrawPage()->RemoveObject( nOrdNum ); ->>>>>>> other + getRootFrm()->GetDrawPage()->RemoveObject( nOrdNum ); pToRemove->GetVirtDrawObj()->ReferencedObj().SetOrdNum( nOrdNum ); if ( GetUpper() ) diff --git a/sw/source/core/layout/flypos.cxx b/sw/source/core/layout/flypos.cxx index 655b5c4cba12..83712d597a51 100644 --- a/sw/source/core/layout/flypos.cxx +++ b/sw/source/core/layout/flypos.cxx @@ -47,7 +47,7 @@ SwPosFlyFrm::SwPosFlyFrm( const SwNodeIndex& rIdx, const SwFrmFmt* pFmt, sal_uInt16 nArrPos ) : pFrmFmt( pFmt ), pNdIdx( (SwNodeIndex*) &rIdx ) { - sal_Bool bFnd = sal_False; + bool bFnd = false; const SwFmtAnchor& rAnchor = pFmt->GetAnchor(); if (FLY_AT_PAGE == rAnchor.GetAnchorId()) { @@ -58,36 +58,24 @@ SwPosFlyFrm::SwPosFlyFrm( const SwNodeIndex& rIdx, const SwFrmFmt* pFmt, if( RES_FLYFRMFMT == pFmt->Which() ) { // Schauen, ob es ein SdrObject dafuer gibt -<<<<<<< local SwFlyFrm* pFly = SwIterator<SwFlyFrm,SwFmt>::FirstElement(*pFmt); if( pFly ) { nOrdNum = pFly->GetVirtDrawObj()->GetOrdNum(); - bFnd = TRUE; -======= - if( aIter.First( TYPE( SwFlyFrm) ) ) - nOrdNum = ((SwFlyFrm*)aIter())->GetVirtDrawObj()->GetOrdNum(), - bFnd = sal_True; ->>>>>>> other - } + bFnd = true; + } } else if( RES_DRAWFRMFMT == pFmt->Which() ) { // Schauen, ob es ein SdrObject dafuer gibt -<<<<<<< local SwDrawContact* pContact = SwIterator<SwDrawContact,SwFmt>::FirstElement(*pFmt); if( pContact ) { nOrdNum = pContact->GetMaster()->GetOrdNum(); - bFnd = TRUE; -======= - if( aIter.First( TYPE(SwDrawContact) ) ) - nOrdNum = ((SwDrawContact*)aIter())->GetMaster()->GetOrdNum(), - bFnd = sal_True; ->>>>>>> other + bFnd = true; + } } } - } if( !bFnd ) { diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx index cf3847aa613c..18f88b99485c 100644 --- a/sw/source/core/layout/frmtool.cxx +++ b/sw/source/core/layout/frmtool.cxx @@ -1122,11 +1122,7 @@ void AppendObjs( const SwSpzFrmFmts *pTbl, sal_uLong nIndex, } } -<<<<<<< local bool lcl_ObjConnected( SwFrmFmt *pFmt, const SwFrm* pSib ) -======= -sal_Bool MA_FASTCALL lcl_ObjConnected( SwFrmFmt *pFmt ) ->>>>>>> other { SwIterator<SwFlyFrm,SwFmt> aIter( *pFmt ); if ( RES_FLYFRMFMT == pFmt->Which() ) @@ -1145,11 +1141,7 @@ sal_Bool MA_FASTCALL lcl_ObjConnected( SwFrmFmt *pFmt ) if ( pContact ) return pContact->GetAnchorFrm() != 0; } -<<<<<<< local return false; -======= - return sal_False; ->>>>>>> other } /** helper method to determine, if a <SwFrmFmt>, which has an object connected, @@ -1201,11 +1193,7 @@ void AppendAllObjs( const SwSpzFrmFmts *pTbl, const SwFrm* pSib ) //will ich hier nicht. bRemove = sal_True; } -<<<<<<< local - else if ( FALSE == (bRemove = ::lcl_ObjConnected( pFmt, pSib )) || -======= - else if ( sal_False == (bRemove = ::lcl_ObjConnected( pFmt )) || ->>>>>>> other + else if ( sal_False == (bRemove = ::lcl_ObjConnected( pFmt, pSib )) || ::lcl_InHeaderOrFooter( *pFmt ) ) { // OD 23.06.2003 #108784# - correction: for objects in header @@ -1251,23 +1239,12 @@ void MA_FASTCALL _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc, SwFrm *pPrv ) { pDoc->BlockIdling(); -<<<<<<< local SwRootFrm* pLayout = pLay->getRootFrm(); - const BOOL bOldCallbackActionEnabled = pLayout ? pLayout->IsCallbackActionEnabled() : FALSE; + const BOOL bOldCallbackActionEnabled = pLayout ? pLayout->IsCallbackActionEnabled() : sal_False; if( bOldCallbackActionEnabled ) - pLayout->SetCallbackActionEnabled( FALSE ); -======= - SwRootFrm* pLayout = pDoc->GetRootFrm(); - const sal_Bool bOldCallbackActionEnabled = pLayout ? pLayout->IsCallbackActionEnabled() : sal_False; - if(pLayout) pLayout->SetCallbackActionEnabled( sal_False ); ->>>>>>> other -<<<<<<< local - //Bei der Erzeugung des Layouts wird bPages mit TRUE uebergeben. Dann -======= //Bei der Erzeugung des Layouts wird bPages mit sal_True uebergeben. Dann ->>>>>>> other //werden schon mal alle x Absaetze neue Seiten angelegt. Bei umbruechen //und/oder Pagedescriptorwechseln werden gleich die entsprechenden Seiten //angelegt. @@ -1636,13 +1613,8 @@ void MA_FASTCALL _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc, if ( bPages ) //Jetzt noch die Flys verbinden lassen. { if ( !bDontCreateObjects ) -<<<<<<< local AppendAllObjs( pTbl, pLayout ); - bObjsDirect = TRUE; -======= - AppendAllObjs( pTbl ); bObjsDirect = sal_True; ->>>>>>> other } if( pPageMaker ) @@ -1870,13 +1842,8 @@ void MakeFrms( SwDoc *pDoc, const SwNodeIndex &rSttIdx, // und damit ruhig zerstoert werden. if( !pSct->ContainsCntnt() ) { -<<<<<<< local - pSct->DelEmpty( TRUE ); - pUpper->getRootFrm()->RemoveFromList( pSct ); -======= pSct->DelEmpty( sal_True ); - pDoc->GetRootFrm()->RemoveFromList( pSct ); ->>>>>>> other + pUpper->getRootFrm()->RemoveFromList( pSct ); delete pSct; } } @@ -3380,8 +3347,6 @@ const SwFrm* MA_FASTCALL FindPage( const SwRect &rRect, const SwFrm *pPage ) return pPage; } -<<<<<<< local - #include <svl/smplhint.hxx> class SwFrmHolder : private SfxListener { @@ -3420,12 +3385,8 @@ void SwFrmHolder::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) } } -SwFrm* GetFrmOfModify( const SwRootFrm* pLayout, SwModify const& rMod, USHORT const nFrmType, - const Point* pPoint, const SwPosition *pPos, const BOOL bCalcFrm ) -======= -SwFrm* GetFrmOfModify( SwModify const& rMod, sal_uInt16 const nFrmType, +SwFrm* GetFrmOfModify( const SwRootFrm* pLayout, SwModify const& rMod, sal_uInt16 const nFrmType, const Point* pPoint, const SwPosition *pPos, const sal_Bool bCalcFrm ) ->>>>>>> other { SwFrm *pMinFrm = 0, *pTmpFrm; SwFrmHolder aHolder; diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx index 68ac053fa793..9f70bf9b05b4 100644 --- a/sw/source/core/layout/ftnfrm.cxx +++ b/sw/source/core/layout/ftnfrm.cxx @@ -270,7 +270,6 @@ void SwFtnContFrm::Format( const SwBorderAttrs * ) if ( !bValidSize ) { -<<<<<<< local bool bGrow = pPage->IsFtnPage(); if( bGrow ) { @@ -279,11 +278,7 @@ void SwFtnContFrm::Format( const SwBorderAttrs * ) bGrow = false; } if( bGrow ) - Grow( LONG_MAX, FALSE ); -======= - if ( pPage->IsFtnPage() && !GetFmt()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE) ) Grow( LONG_MAX, sal_False ); ->>>>>>> other else { //Die Groesse in der VarSize wird durch den Inhalt plus den @@ -726,13 +721,7 @@ void SwFtnFrm::Paste( SwFrm* pParent, SwFrm* pSibling ) |* |* Beschreibung Liefert das naechste LayoutBlatt in den das |* Frame gemoved werden kann. -<<<<<<< local -|* Neue Seiten werden nur dann erzeugt, wenn der Parameter TRUE ist. -======= |* Neue Seiten werden nur dann erzeugt, wenn der Parameter sal_True ist. -|* Ersterstellung MA 16. Nov. 92 -|* Letzte Aenderung AMA 09. Nov. 98 ->>>>>>> other |* |*************************************************************************/ @@ -1340,17 +1329,10 @@ void SwFtnBossFrm::ResetFtn( const SwFtnFrm *pCheck ) SwCntntNode *pNd = aIdx.GetNode().GetCntntNode(); if ( !pNd ) pNd = pCheck->GetFmt()->GetDoc()-> -<<<<<<< local - GetNodes().GoNextSection( &aIdx, TRUE, FALSE ); + GetNodes().GoNextSection( &aIdx, sal_True, sal_False ); SwIterator<SwFrm,SwCntntNode> aIter( *pNd ); SwFrm* pFrm = aIter.First(); while( pFrm ) -======= - GetNodes().GoNextSection( &aIdx, sal_True, sal_False ); - SwClientIter aIter( *pNd ); - SwClient* pLast = aIter.GoStart(); - while( pLast ) ->>>>>>> other { if( pFrm->getRootFrm() == pCheck->getRootFrm() ) { @@ -2788,14 +2770,9 @@ void SwFtnBossFrm::SetFtnDeadLine( const SwTwips nDeadLine ) else nMaxFtnHeight = -(pBody->Frm().*fnRect->fnBottomDist)( nDeadLine ); -<<<<<<< local const ViewShell *pSh = getRootFrm() ? getRootFrm()->GetCurrShell() : 0; if( pSh && pSh->GetViewOptions()->getBrowseMode() ) - nMaxFtnHeight += pBody->Grow( LONG_MAX, TRUE ); -======= - if ( GetFmt()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE) ) nMaxFtnHeight += pBody->Grow( LONG_MAX, sal_True ); ->>>>>>> other if ( IsInSct() ) nMaxFtnHeight += FindSctFrm()->Grow( LONG_MAX, sal_True ); @@ -3244,11 +3221,7 @@ SwCntntFrm* SwFtnFrm::GetRefFromAttr() ASSERT( pAttr, "invalid Attribute" ); SwTxtNode& rTNd = (SwTxtNode&)pAttr->GetTxtNode(); SwPosition aPos( rTNd, SwIndex( &rTNd, *pAttr->GetStart() )); -<<<<<<< local - SwCntntFrm* pCFrm = rTNd.getLayoutFrm( getRootFrm(), 0, &aPos, FALSE ); -======= - SwCntntFrm* pCFrm = rTNd.GetFrm( 0, &aPos, sal_False ); ->>>>>>> other + SwCntntFrm* pCFrm = rTNd.getLayoutFrm( getRootFrm(), 0, &aPos, sal_False ); return pCFrm; } diff --git a/sw/source/core/layout/hffrm.cxx b/sw/source/core/layout/hffrm.cxx index 3b52ea360ead..519ca072ed59 100644 --- a/sw/source/core/layout/hffrm.cxx +++ b/sw/source/core/layout/hffrm.cxx @@ -119,13 +119,8 @@ static void lcl_LayoutFrmEnsureMinHeight(SwLayoutFrm & rFrm, } } -<<<<<<< local -SwHeadFootFrm::SwHeadFootFrm( SwFrmFmt * pFmt, SwFrm* pSib, USHORT nTypeIn) +SwHeadFootFrm::SwHeadFootFrm( SwFrmFmt * pFmt, SwFrm* pSib, sal_uInt16 nTypeIn) : SwLayoutFrm( pFmt, pSib ) -======= -SwHeadFootFrm::SwHeadFootFrm( SwFrmFmt * pFmt, sal_uInt16 nTypeIn) - : SwLayoutFrm(pFmt) ->>>>>>> other { nType = nTypeIn; SetDerivedVert( sal_False ); @@ -717,12 +712,8 @@ void SwPageFrm::PrepareHeader() const SwFmtHeader &rH = ((SwFrmFmt*)GetRegisteredIn())->GetHeader(); -<<<<<<< local const ViewShell *pSh = getRootFrm()->GetCurrShell(); - const BOOL bOn = !(pSh && pSh->GetViewOptions()->getBrowseMode()); -======= - const sal_Bool bOn = !((SwFrmFmt*)pRegisteredIn)->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE); ->>>>>>> other + const sal_Bool bOn = !(pSh && pSh->GetViewOptions()->getBrowseMode()); if ( bOn && rH.IsActive() ) { //Header einsetzen, vorher entfernen falls vorhanden. @@ -772,12 +763,8 @@ void SwPageFrm::PrepareFooter() while ( pLay->GetNext() ) pLay = (SwLayoutFrm*)pLay->GetNext(); -<<<<<<< local const ViewShell *pSh = getRootFrm()->GetCurrShell(); - const BOOL bOn = !(pSh && pSh->GetViewOptions()->getBrowseMode()); -======= - const sal_Bool bOn = !((SwFrmFmt*)pRegisteredIn)->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE); ->>>>>>> other + const sal_Bool bOn = !(pSh && pSh->GetViewOptions()->getBrowseMode()); if ( bOn && rF.IsActive() ) { //Footer einsetzen, vorher entfernen falls vorhanden. diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx index c5606aa40878..0597876fd07f 100644 --- a/sw/source/core/layout/layact.cxx +++ b/sw/source/core/layout/layact.cxx @@ -437,14 +437,9 @@ sal_Bool SwLayAction::RemoveEmptyBrowserPages() { //Beim umschalten vom normalen in den Browsermodus bleiben u.U. einige //unangenehm lange stehen. Diese beseiten wir mal schnell. -<<<<<<< local - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; const ViewShell *pSh = pRoot->GetCurrShell(); if( pSh && pSh->GetViewOptions()->getBrowseMode() ) -======= - sal_Bool bRet = sal_False; - if ( pRoot->GetFmt()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE) ) ->>>>>>> other { SwPageFrm *pPage = (SwPageFrm*)pRoot->Lower(); do @@ -1196,14 +1191,9 @@ static const SwAnchoredObject* lcl_FindFirstInvaObj( const SwPageFrm* _pPage, sal_Bool SwLayAction::IsShortCut( SwPageFrm *&prPage ) { -<<<<<<< local - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; const ViewShell *pSh = pRoot->GetCurrShell(); const BOOL bBrowse = pSh && pSh->GetViewOptions()->getBrowseMode(); -======= - sal_Bool bRet = sal_False; - const sal_Bool bBrowse = pRoot->GetFmt()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE); ->>>>>>> other //Wenn die Seite nicht Gueltig ist wird sie schnell formatiert, sonst //gibts nix als Aerger. @@ -1456,17 +1446,10 @@ sal_Bool SwLayAction::FormatLayout( SwLayoutFrm *pLay, sal_Bool bAddRect ) { const ViewShell *pSh = pLay->getRootFrm()->GetCurrShell(); //Einschraenkungen wegen Kopf-/Fusszeilen -<<<<<<< local if( pSh && pSh->GetViewOptions()->getBrowseMode() && !( pLay->IsCompletePaint() && pLay->FindPageFrm()->FindFtnCont() ) ) - bNoPaint = TRUE; -======= - if ( !( pLay->IsCompletePaint() && - pLay->FindPageFrm()->FindFtnCont() ) ) - { bNoPaint = sal_True; ->>>>>>> other - } + } if ( !bNoPaint && IsPaint() && bAddRect && (pLay->IsCompletePaint() || bChanged) ) { @@ -1860,12 +1843,8 @@ sal_Bool SwLayAction::FormatLayoutTab( SwTabFrm *pTab, sal_Bool bAddRect ) sal_Bool SwLayAction::FormatCntnt( const SwPageFrm *pPage ) { const SwCntntFrm *pCntnt = pPage->ContainsCntnt(); -<<<<<<< local const ViewShell *pSh = pRoot->GetCurrShell(); - const BOOL bBrowse = pSh && pSh->GetViewOptions()->getBrowseMode(); -======= - const sal_Bool bBrowse = pRoot->GetFmt()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE); ->>>>>>> other + const sal_Bool bBrowse = pSh && pSh->GetViewOptions()->getBrowseMode(); while ( pCntnt && pPage->IsAnLower( pCntnt ) ) { diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx index 45d524b5a822..20bc750c84d3 100644 --- a/sw/source/core/layout/newfrm.cxx +++ b/sw/source/core/layout/newfrm.cxx @@ -444,14 +444,9 @@ SwRootFrm::SwRootFrm( SwFrmFmt *pFmt, ViewShell * pSh ) : nAccessibleShells( 0 ) { nType = FRMC_ROOT; -<<<<<<< local - bIdleFormat = bTurboAllowed = bAssertFlyPages = bIsNewLayout = TRUE; - bCheckSuperfluous = bBrowseWidthValid = FALSE; - setRootFrm( this ); -======= bIdleFormat = bTurboAllowed = bAssertFlyPages = bIsNewLayout = sal_True; bCheckSuperfluous = bBrowseWidthValid = sal_False; ->>>>>>> other + setRootFrm( this ); InitCurrShells( this ); @@ -460,13 +455,8 @@ SwRootFrm::SwRootFrm( SwFrmFmt *pFmt, ViewShell * pSh ) : IDocumentFieldsAccess *pFieldsAccess = pFmt->getIDocumentFieldsAccess(); const IDocumentSettingAccess *pSettingAccess = pFmt->getIDocumentSettingAccess(); pTimerAccess->StopIdling(); -<<<<<<< local pLayoutAccess->SetCurrentViewShell( this->GetCurrShell() ); //Fuer das Erzeugen der Flys durch MakeFrms() //swmod 071108//swmod 071225 - bCallbackActionEnabled = FALSE; //vor Verlassen auf TRUE setzen! -======= - pLayoutAccess->SetRootFrm( this ); //Fuer das Erzeugen der Flys durch MakeFrms() bCallbackActionEnabled = sal_False; //vor Verlassen auf sal_True setzen! ->>>>>>> other SdrModel *pMd = pFmt->getIDocumentDrawModelAccess()->GetDrawModel(); if ( pMd ) diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx index 9d4ecc991a7f..ce2874366f72 100644 --- a/sw/source/core/layout/pagechg.cxx +++ b/sw/source/core/layout/pagechg.cxx @@ -575,13 +575,8 @@ void SwPageFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew ) } } -<<<<<<< local void SwPageFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew, - BYTE &rInvFlags, -======= -void SwPageFrm::_UpdateAttr( SfxPoolItem *pOld, SfxPoolItem *pNew, sal_uInt8 &rInvFlags, ->>>>>>> other SwAttrSetChg *pOldSet, SwAttrSetChg *pNewSet ) { sal_Bool bClear = sal_True; @@ -1367,13 +1362,8 @@ SwPageFrm *SwFrm::InsertPage( SwPageFrm *pPrevPage, sal_Bool bFtn ) { if ( bCheckPages ) { -<<<<<<< local - CheckPageDescs( pSibling, FALSE ); - ViewShell *pSh = getRootFrm()->GetCurrShell(); -======= CheckPageDescs( pSibling, sal_False ); - ViewShell *pSh = GetShell(); ->>>>>>> other + ViewShell *pSh = getRootFrm()->GetCurrShell(); SwViewImp *pImp = pSh ? pSh->Imp() : 0; if ( pImp && pImp->IsAction() && !pImp->GetLayAction().IsCheckPages() ) { @@ -1787,13 +1777,8 @@ void SwRootFrm::ImplCalcBrowseWidth() if ( !pFrm ) return; -<<<<<<< local - bBrowseWidthValid = TRUE; - ViewShell *pSh = getRootFrm()->GetCurrShell(); -======= bBrowseWidthValid = sal_True; - ViewShell *pSh = GetShell(); ->>>>>>> other + ViewShell *pSh = getRootFrm()->GetCurrShell(); nBrowseWidth = pSh ? MINLAY + 2 * pSh->GetOut()-> PixelToLogic( pSh->GetBrowseBorder() ).Width() diff --git a/sw/source/core/layout/pagedesc.cxx b/sw/source/core/layout/pagedesc.cxx index 01b238178cf4..0614a2c7c654 100644 --- a/sw/source/core/layout/pagedesc.cxx +++ b/sw/source/core/layout/pagedesc.cxx @@ -289,13 +289,8 @@ void SwPageDesc::RegisterChange() void SwPageDesc::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) { -<<<<<<< local - const USHORT nWhich = pOld ? pOld->Which() : pNew ? pNew->Which() : 0; - NotifyClients( pOld, pNew ); -======= const sal_uInt16 nWhich = pOld ? pOld->Which() : pNew ? pNew->Which() : 0; - SwModify::Modify( pOld, pNew ); ->>>>>>> other + NotifyClients( pOld, pNew ); if ( (RES_ATTRSET_CHG == nWhich) || (RES_FMT_CHG == nWhich) || isCHRATR(nWhich) || (RES_PARATR_LINESPACING == nWhich) ) @@ -322,11 +317,7 @@ static const SwFrm* lcl_GetFrmOfNode( const SwNode& rNd ) pMod = 0; Point aNullPt; -<<<<<<< local - return pMod ? ::GetFrmOfModify( 0, *pMod, nFrmType, &aNullPt, 0, FALSE ) -======= - return pMod ? ::GetFrmOfModify( *pMod, nFrmType, &aNullPt, 0, sal_False ) ->>>>>>> other + return pMod ? ::GetFrmOfModify( 0, *pMod, nFrmType, &aNullPt, 0, sal_False ) : 0; } diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 35207452f7c5..072e549f8341 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -3086,24 +3086,14 @@ void SwRootFrm::HackPrepareLongTblPaint( int nMode ) case HACK_TABLEMODE_INIT : ASSERT( !pLines, "HackPrepare: already prepared" ); pLines = new SwLineRects; ASSERT( !pGlobalShell, "old GlobalShell lost" ); -<<<<<<< local pGlobalShell = GetCurrShell(); - bTableHack = TRUE; -======= - pGlobalShell = GetShell(); bTableHack = sal_True; ->>>>>>> other break; case HACK_TABLEMODE_LOCKLINES : pLines->LockLines( sal_True ); break; case HACK_TABLEMODE_PAINTLINES : pLines->PaintLines( GetShell()->GetOut() ); break; -<<<<<<< local - case HACK_TABLEMODE_UNLOCKLINES: pLines->LockLines( FALSE ); break; - case HACK_TABLEMODE_EXIT : pLines->PaintLines( GetCurrShell()->GetOut() ); -======= case HACK_TABLEMODE_UNLOCKLINES: pLines->LockLines( sal_False ); break; - case HACK_TABLEMODE_EXIT : pLines->PaintLines( GetShell()->GetOut() ); ->>>>>>> other + case HACK_TABLEMODE_EXIT : pLines->PaintLines( GetCurrShell()->GetOut() ); DELETEZ( pLines ); pGlobalShell = 0; bTableHack = sal_False; @@ -5728,12 +5718,7 @@ void SwFrm::PaintBackground( const SwRect &rRect, const SwPageFrm *pPage, { if ( bBack || bPageFrm || !bLowerMode ) { -<<<<<<< local - const BOOL bBrowse = pSh->GetViewOptions()->getBrowseMode(); -======= - const sal_Bool bBrowse = pSh->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE); ->>>>>>> other - + const sal_Bool bBrowse = pSh->GetViewOptions()->getBrowseMode(); SwRect aRect; if ( (bPageFrm && bBrowse) || (IsTxtFrm() && Prt().SSize() == Frm().SSize()) ) diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx index c8a19fd5694b..a5663b69660c 100644 --- a/sw/source/core/layout/sectfrm.cxx +++ b/sw/source/core/layout/sectfrm.cxx @@ -86,13 +86,8 @@ SwSectionFrm::SwSectionFrm( SwSection &rSect, SwFrm* pSib ) : CalcEndAtEndFlag(); } -<<<<<<< local -SwSectionFrm::SwSectionFrm( SwSectionFrm &rSect, BOOL bMaster ) : - SwLayoutFrm( rSect.GetFmt(), rSect.getRootFrm() ), -======= SwSectionFrm::SwSectionFrm( SwSectionFrm &rSect, sal_Bool bMaster ) : - SwLayoutFrm( rSect.GetFmt() ), ->>>>>>> other + SwLayoutFrm( rSect.GetFmt(), rSect.getRootFrm() ), SwFlowFrm( (SwFrm&)*this ), pSection( rSect.GetSection() ) { @@ -1339,14 +1334,8 @@ void SwSectionFrm::Format( const SwBorderAttrs *pAttr ) { if( !pSection ) // Durch DelEmpty { -<<<<<<< local ASSERT( getRootFrm()->IsInDelList( this ), "SectionFrm without Section" ); - bValidSize = bValidPos = bValidPrtArea = TRUE; -======= - ASSERT( GetFmt()->GetDoc()->GetRootFrm()->IsInDelList( this ), - "SectionFrm without Section" ); bValidSize = bValidPos = bValidPrtArea = sal_True; ->>>>>>> other return; } SWRECTFN( this ) @@ -1421,16 +1410,10 @@ void SwSectionFrm::Format( const SwBorderAttrs *pAttr ) // OD 15.10.2002 #103517# - allow grow in online layout // Thus, set <..IsBrowseMode()> as parameter <bGrow> on calling // method <_CheckClipping(..)>. -<<<<<<< local const ViewShell *pSh = getRootFrm()->GetCurrShell(); _CheckClipping( pSh && pSh->GetViewOptions()->getBrowseMode(), bMaximize ); - bMaximize = ToMaximize( FALSE ); - bValidSize = TRUE; -======= - _CheckClipping( GetFmt()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE), bMaximize ); bMaximize = ToMaximize( sal_False ); bValidSize = sal_True; ->>>>>>> other } //Breite der Spalten pruefen und ggf. einstellen. @@ -2494,7 +2477,6 @@ void SwSectionFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew ) } } -<<<<<<< local void SwSectionFrm::SwClientNotify( const SwModify& rMod, const SfxHint& rHint ) { const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint); @@ -2505,11 +2487,7 @@ void SwSectionFrm::SwClientNotify( const SwModify& rMod, const SfxHint& rHint ) } void SwSectionFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew, - BYTE &rInvFlags, -======= -void SwSectionFrm::_UpdateAttr( SfxPoolItem *pOld, SfxPoolItem *pNew, sal_uInt8 &rInvFlags, ->>>>>>> other SwAttrSetChg *pOldSet, SwAttrSetChg *pNewSet ) { sal_Bool bClear = sal_True; diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx index 7ce2a0330308..639e52216b3b 100644 --- a/sw/source/core/layout/tabfrm.cxx +++ b/sw/source/core/layout/tabfrm.cxx @@ -265,13 +265,8 @@ SwRowFrm* lcl_InsertNewFollowFlowLine( SwTabFrm& rTab, const SwFrm& rTmpRow, boo ASSERT( rTmpRow.IsRowFrm(), "No row frame to copy for FollowFlowLine" ) const SwRowFrm& rRow = (SwRowFrm&)rTmpRow; -<<<<<<< local - rTab.SetFollowFlowLine( TRUE ); - SwRowFrm *pFollowFlowLine = new SwRowFrm(*rRow.GetTabLine(), &rTab, false ); -======= rTab.SetFollowFlowLine( sal_True ); - SwRowFrm *pFollowFlowLine = new SwRowFrm(*rRow.GetTabLine(), false ); ->>>>>>> other + SwRowFrm *pFollowFlowLine = new SwRowFrm(*rRow.GetTabLine(), &rTab, false ); pFollowFlowLine->SetRowSpanLine( bRowSpanLine ); SwFrm* pFirstRow = rTab.GetFollow()->GetFirstNonHeadlineRow(); pFollowFlowLine->InsertBefore( rTab.GetFollow(), pFirstRow ); @@ -3331,13 +3326,8 @@ void SwTabFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew ) } } -<<<<<<< local void SwTabFrm::_UpdateAttr( const SfxPoolItem *pOld, const SfxPoolItem *pNew, - BYTE &rInvFlags, -======= -void SwTabFrm::_UpdateAttr( SfxPoolItem *pOld, SfxPoolItem *pNew, sal_uInt8 &rInvFlags, ->>>>>>> other SwAttrSetChg *pOldSet, SwAttrSetChg *pNewSet ) { sal_Bool bClear = sal_True; @@ -3359,13 +3349,8 @@ void SwTabFrm::_UpdateAttr( SfxPoolItem *pOld, SfxPoolItem *pNew, const sal_uInt16 nNewRepeat = GetTable()->GetRowsToRepeat(); for ( sal_uInt16 nIdx = 0; nIdx < nNewRepeat; ++nIdx ) { -<<<<<<< local - bDontCreateObjects = TRUE; //frmtool - SwRowFrm* pHeadline = new SwRowFrm( *GetTable()->GetTabLines()[ nIdx ], this ); -======= bDontCreateObjects = sal_True; //frmtool - SwRowFrm* pHeadline = new SwRowFrm( *GetTable()->GetTabLines()[ nIdx ] ); ->>>>>>> other + SwRowFrm* pHeadline = new SwRowFrm( *GetTable()->GetTabLines()[ nIdx ], this ); pHeadline->SetRepeatedHeadline( true ); bDontCreateObjects = sal_False; pHeadline->Paste( this, pLowerRow ); @@ -3637,14 +3622,9 @@ sal_Bool SwTabFrm::ShouldBwdMoved( SwLayoutFrm *pNewUpper, sal_Bool, sal_Bool &r nSpace = nTmpSpace; // <-- -<<<<<<< local const ViewShell *pSh = getRootFrm()->GetCurrShell(); if( pSh && pSh->GetViewOptions()->getBrowseMode() ) - nSpace += pNewUpper->Grow( LONG_MAX, TRUE ); -======= - if ( GetFmt()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE) ) nSpace += pNewUpper->Grow( LONG_MAX, sal_True ); ->>>>>>> other } } else if( !bLockBackMove ) diff --git a/sw/source/core/layout/trvlfrm.cxx b/sw/source/core/layout/trvlfrm.cxx index 9a2b8acc4d96..a0ae514af78b 100644 --- a/sw/source/core/layout/trvlfrm.cxx +++ b/sw/source/core/layout/trvlfrm.cxx @@ -892,13 +892,8 @@ sal_Bool SwCntntFrm::UnitDown( SwPaM* pPam, const SwTwips, sal_Bool bInReadOnly sal_uInt16 SwRootFrm::GetCurrPage( const SwPaM *pActualCrsr ) const { ASSERT( pActualCrsr, "Welche Seite soll's denn sein?" ); -<<<<<<< local - const SwFrm *pActFrm = GetFmt()->GetDoc()->GetNodes()[pActualCrsr->GetPoint()->nNode]-> - GetCntntNode()->getLayoutFrm( this, 0, -======= SwFrm const*const pActFrm = pActualCrsr->GetPoint()->nNode.GetNode(). GetCntntNode()->GetFrm( 0, ->>>>>>> other pActualCrsr->GetPoint(), sal_False ); return pActFrm->FindPageFrm()->GetPhyPageNum(); @@ -1883,13 +1878,8 @@ bool SwRootFrm::MakeTblCrsrs( SwTableCursor& rTblCrsr ) const SwCntntNode* pTmpStartNode = rTblCrsr.GetCntntNode(); const SwCntntNode* pTmpEndNode = rTblCrsr.GetCntntNode(sal_False); -<<<<<<< local - const SwFrm* pTmpStartFrm = pTmpStartNode ? pTmpStartNode->getLayoutFrm( this, &aPtPt, 0, FALSE ) : 0; - const SwFrm* pTmpEndFrm = pTmpEndNode ? pTmpEndNode->getLayoutFrm( this, &aMkPt, 0, FALSE ) : 0; -======= - const SwFrm* pTmpStartFrm = pTmpStartNode ? pTmpStartNode->GetFrm( &aPtPt, 0, sal_False ) : 0; - const SwFrm* pTmpEndFrm = pTmpEndNode ? pTmpEndNode->GetFrm( &aMkPt, 0, sal_False ) : 0; ->>>>>>> other + const SwFrm* pTmpStartFrm = pTmpStartNode ? pTmpStartNode->getLayoutFrm( this, &aPtPt, 0, sal_False ) : 0; + const SwFrm* pTmpEndFrm = pTmpEndNode ? pTmpEndNode->getLayoutFrm( this, &aMkPt, 0, sal_False ) : 0; const SwLayoutFrm* pStart = pTmpStartFrm ? pTmpStartFrm->GetUpper() : 0; const SwLayoutFrm* pEnd = pTmpEndFrm ? pTmpEndFrm->GetUpper() : 0; @@ -2056,21 +2046,11 @@ void SwRootFrm::CalcFrmRects( SwShellCrsr &rCrsr, sal_Bool bIsTblMode ) //Erstmal die CntntFrms zum Start und End besorgen, die brauch ich auf //jedenfall. -<<<<<<< local - const SwCntntFrm *pStartFrm = rNds[ pStartPos->nNode ]-> - GetCntntNode()->getLayoutFrm( this, &rCrsr.GetSttPos(), pStartPos ); -======= SwCntntFrm const* pStartFrm = pStartPos->nNode.GetNode(). - GetCntntNode()->GetFrm( &rCrsr.GetSttPos(), pStartPos ); ->>>>>>> other + GetCntntNode()->getLayoutFrm( this, &rCrsr.GetSttPos(), pStartPos ); -<<<<<<< local - const SwCntntFrm *pEndFrm = rNds[ pEndPos->nNode ]-> - GetCntntNode()->getLayoutFrm( this, &rCrsr.GetEndPos(), pEndPos ); -======= SwCntntFrm const* pEndFrm = pEndPos->nNode.GetNode(). - GetCntntNode()->GetFrm( &rCrsr.GetEndPos(), pEndPos ); ->>>>>>> other + GetCntntNode()->getLayoutFrm( this, &rCrsr.GetEndPos(), pEndPos ); ASSERT( (pStartFrm && pEndFrm), "Keine CntntFrms gefunden." ); diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx index 50e9c4332932..9d9187c7e61c 100644 --- a/sw/source/core/layout/wsfrm.cxx +++ b/sw/source/core/layout/wsfrm.cxx @@ -128,12 +128,7 @@ void SwFrm::RegisterToFormat( SwFmt& rFmt ) rFmt.Add( this ); } -<<<<<<< local -void SwFrm::CheckDir( UINT16 nDir, BOOL bVert, BOOL bOnlyBiDi, BOOL bBrowse ) -======= - void SwFrm::CheckDir( sal_uInt16 nDir, sal_Bool bVert, sal_Bool bOnlyBiDi, sal_Bool bBrowse ) ->>>>>>> other { if( FRMDIR_ENVIRONMENT == nDir || ( bVert && bOnlyBiDi ) ) { @@ -297,13 +292,8 @@ void SwFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew ) } } -<<<<<<< local void SwFrm::_UpdateAttrFrm( const SfxPoolItem *pOld, const SfxPoolItem *pNew, - BYTE &rInvFlags ) -======= -void SwFrm::_UpdateAttrFrm( SfxPoolItem *pOld, SfxPoolItem *pNew, sal_uInt8 &rInvFlags ) ->>>>>>> other { sal_uInt16 nWhich = pOld ? pOld->Which() : pNew ? pNew->Which() : 0; switch( nWhich ) @@ -1410,12 +1400,8 @@ SwTwips SwFrm::AdjustNeighbourhood( SwTwips nDiff, sal_Bool bTst ) if ( !nDiff || !GetUpper()->IsFtnBossFrm() ) // nur innerhalb von Seiten/Spalten return 0L; -<<<<<<< local const ViewShell *pSh = getRootFrm()->GetCurrShell(); - const BOOL bBrowse = pSh && pSh->GetViewOptions()->getBrowseMode(); -======= - sal_Bool bBrowse = GetUpper()->GetFmt()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE); ->>>>>>> other + const sal_Bool bBrowse = pSh && pSh->GetViewOptions()->getBrowseMode(); //Der (Page)Body veraendert sich nur im BrowseMode, aber nicht wenn er //Spalten enthaelt. @@ -1912,14 +1898,9 @@ SwTwips SwCntntFrm::GrowFrm( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo ) nDist > (LONG_MAX - nFrmHeight ) ) nDist = LONG_MAX - nFrmHeight; -<<<<<<< local const ViewShell *pSh = getRootFrm()->GetCurrShell(); - const BOOL bBrowse = pSh && pSh->GetViewOptions()->getBrowseMode(); - const USHORT nTmpType = bBrowse ? 0x2084: 0x2004; //Row+Cell, Browse mit Body -======= - const sal_Bool bBrowse = GetUpper()->GetFmt()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE); + const sal_Bool bBrowse = pSh && pSh->GetViewOptions()->getBrowseMode(); const sal_uInt16 nTmpType = bBrowse ? 0x2084: 0x2004; //Row+Cell, Browse mit Body ->>>>>>> other if( !(GetUpper()->GetType() & nTmpType) && GetUpper()->HasFixSize() ) { if ( !bTst ) @@ -2217,13 +2198,8 @@ void SwCntntFrm::Modify( const SfxPoolItem* pOld, const SfxPoolItem * pNew ) } } -<<<<<<< local void SwCntntFrm::_UpdateAttr( const SfxPoolItem* pOld, const SfxPoolItem* pNew, - BYTE &rInvFlags, -======= -void SwCntntFrm::_UpdateAttr( SfxPoolItem* pOld, SfxPoolItem* pNew, sal_uInt8 &rInvFlags, ->>>>>>> other SwAttrSetChg *pOldSet, SwAttrSetChg *pNewSet ) { sal_Bool bClear = sal_True; @@ -2445,14 +2421,9 @@ SwTwips SwLayoutFrm::InnerHeight() const |*************************************************************************/ SwTwips SwLayoutFrm::GrowFrm( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo ) { -<<<<<<< local const ViewShell *pSh = getRootFrm()->GetCurrShell(); - const BOOL bBrowse = pSh && pSh->GetViewOptions()->getBrowseMode(); - const USHORT nTmpType = bBrowse ? 0x2084: 0x2004; //Row+Cell, Browse mit Body -======= - const sal_Bool bBrowse = GetFmt()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE); + const sal_Bool bBrowse = pSh && pSh->GetViewOptions()->getBrowseMode(); const sal_uInt16 nTmpType = bBrowse ? 0x2084: 0x2004; //Row+Cell, Browse mit Body ->>>>>>> other if( !(GetType() & nTmpType) && HasFixSize() ) return 0; @@ -2617,14 +2588,9 @@ SwTwips SwLayoutFrm::GrowFrm( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo ) |*************************************************************************/ SwTwips SwLayoutFrm::ShrinkFrm( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo ) { -<<<<<<< local const ViewShell *pSh = getRootFrm()->GetCurrShell(); - const BOOL bBrowse = pSh && pSh->GetViewOptions()->getBrowseMode(); - const USHORT nTmpType = bBrowse ? 0x2084: 0x2004; //Row+Cell, Browse mit Body -======= - const sal_Bool bBrowse = GetFmt()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE); + const sal_Bool bBrowse = pSh && pSh->GetViewOptions()->getBrowseMode(); const sal_uInt16 nTmpType = bBrowse ? 0x2084: 0x2004; //Row+Cell, Browse mit Body ->>>>>>> other if( !(GetType() & nTmpType) && HasFixSize() ) return 0; @@ -3475,23 +3441,12 @@ void SwLayoutFrm::FormatWidthCols( const SwBorderAttrs &rAttrs, //3. Weiter mit 1. bis zur Stabilitaet. const SwFmtCol &rCol = rAttrs.GetAttrSet().GetCol(); -<<<<<<< local - const USHORT nNumCols = rCol.GetNumCols(); -======= const sal_uInt16 nNumCols = rCol.GetNumCols(); ->>>>>>> other - -<<<<<<< local - BOOL bEnd = FALSE; - BOOL bBackLock = FALSE; - ViewShell *pSh = getRootFrm()->GetCurrShell(); - SwViewImp *pImp = pSh ? pSh->Imp() : 0; -======= sal_Bool bEnd = sal_False; sal_Bool bBackLock = sal_False; - SwViewImp *pImp = GetShell() ? GetShell()->Imp() : 0; ->>>>>>> other + ViewShell *pSh = getRootFrm()->GetCurrShell(); + SwViewImp *pImp = pSh ? pSh->Imp() : 0; { // Zugrunde liegender Algorithmus // Es wird versucht, eine optimale Hoehe fuer die Spalten zu finden. diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx index 74197aee67df..e4fc3278d4e1 100644 --- a/sw/source/core/table/swtable.cxx +++ b/sw/source/core/table/swtable.cxx @@ -2498,24 +2498,6 @@ sal_Bool SwTableBox::HasNumCntnt( double& rNum, sal_uInt32& rFmtIndex, rFmtIndex = 0; bRet = pNumFmtr->IsNumberFormat( aTxt, rFmtIndex, rNum ); -<<<<<<< local -======= - -/* -// wie bekommt man aus dem neuen String den neuen Wert? -// denn der Numberformater erkennt aus "123.--DM" kein Zahlenformat! - if( !bRet && rFmtIndex && !pNumFmtr->IsTextFormat( rFmtIndex ) && - SFX_ITEM_SET == GetFrmFmt()->GetItemState( RES_BOXATR_VALUE, - sal_False, &pItem )) - { - Color* pCol; - String sNewTxt; - pNumFmtr->GetOutputString( ((SwTblBoxValue*)pItem)->GetValue(), - rFmtIndex, sNewTxt, &pCol ); - bRet = aTxt == sNewTxt; - } -*/ ->>>>>>> other } else rIsEmptyTxtNd = sal_False; diff --git a/sw/source/core/text/itratr.cxx b/sw/source/core/text/itratr.cxx index 4e89e2c53ed3..f88ac8403229 100644 --- a/sw/source/core/text/itratr.cxx +++ b/sw/source/core/text/itratr.cxx @@ -589,13 +589,8 @@ sal_Bool lcl_MinMaxNode( const SwFrmFmtPtr& rpNd, void* pArgs ) // changing this method very likely requires changing of // "GetScalingOfSelectedText" -<<<<<<< local -void SwTxtNode::GetMinMaxSize( ULONG nIndex, ULONG& rMin, ULONG &rMax, - ULONG& rAbsMin, OutputDevice* pOut ) const//swmodtest 080307 -======= void SwTxtNode::GetMinMaxSize( sal_uLong nIndex, sal_uLong& rMin, sal_uLong &rMax, sal_uLong& rAbsMin, OutputDevice* pOut ) const ->>>>>>> other { ViewShell* pSh = 0; GetDoc()->GetEditShell( &pSh ); diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx index 366ede0c888e..1555fca79192 100644 --- a/sw/source/core/text/porfld.cxx +++ b/sw/source/core/text/porfld.cxx @@ -1243,13 +1243,8 @@ sal_Bool SwCombinedPortion::Format( SwTxtFormatInfo &rInf ) } } -<<<<<<< local - USHORT nTop = ( nCount + 1 ) / 2; // the first character of the second line - ViewShell *pSh = rInf.GetTxtFrm()->getRootFrm()->GetCurrShell(); -======= sal_uInt16 nTop = ( nCount + 1 ) / 2; // the first character of the second line - ViewShell *pSh = rInf.GetTxtFrm()->GetShell(); ->>>>>>> other + ViewShell *pSh = rInf.GetTxtFrm()->getRootFrm()->GetCurrShell(); SwFont aTmpFont( *rInf.GetFont() ); SwFontSave aFontSave( rInf, &aTmpFont ); nProportion = 55; diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx index 152432de4d75..45830ec85d76 100644 --- a/sw/source/core/tox/tox.cxx +++ b/sw/source/core/tox/tox.cxx @@ -116,15 +116,8 @@ const PatternIni aPatternIni[] = {AUTH_FIELD_AUTHOR, AUTH_FIELD_TITLE, AUTH_FIELD_YEAR, USHRT_MAX, USHRT_MAX}, //AUTH_FIELD_CUSTOM5, {USHRT_MAX, USHRT_MAX, USHRT_MAX, USHRT_MAX, USHRT_MAX} }; -<<<<<<< local -SwFormTokens lcl_GetAuthPattern(USHORT nTypeId) -======= -/* -----------------23.09.99 13:58------------------- - --------------------------------------------------*/ -// -> #i21237# SwFormTokens lcl_GetAuthPattern(sal_uInt16 nTypeId) ->>>>>>> other { SwFormTokens aRet; diff --git a/sw/source/core/tox/txmsrt.cxx b/sw/source/core/tox/txmsrt.cxx index 38b143db6825..ea3b772d24d2 100644 --- a/sw/source/core/tox/txmsrt.cxx +++ b/sw/source/core/tox/txmsrt.cxx @@ -181,11 +181,7 @@ SwTOXSortTabBase::SwTOXSortTabBase( TOXSortType nTyp, const SwCntntNode* pNd, { // dann die "Anker" (Body) Position holen. Point aPt; -<<<<<<< local - const SwCntntFrm* pFrm = pNd->getLayoutFrm( pNd->GetDoc()->GetCurrentLayout(), &aPt, 0, FALSE ); -======= - const SwCntntFrm* pFrm = pNd->GetFrm( &aPt, 0, sal_False ); ->>>>>>> other + const SwCntntFrm* pFrm = pNd->getLayoutFrm( pNd->GetDoc()->GetCurrentLayout(), &aPt, 0, sal_False ); if( pFrm ) { SwPosition aPos( *pNd ); diff --git a/sw/source/core/txtnode/atrftn.cxx b/sw/source/core/txtnode/atrftn.cxx index ea961555bcf2..1135936b8d34 100644 --- a/sw/source/core/txtnode/atrftn.cxx +++ b/sw/source/core/txtnode/atrftn.cxx @@ -366,12 +366,8 @@ void SwTxtFtn::DelFrms( const SwFrm* pSib ) if ( !m_pTxtNode ) return; -<<<<<<< local const SwRootFrm* pRoot = pSib ? pSib->getRootFrm() : 0; - BOOL bFrmFnd = FALSE; -======= sal_Bool bFrmFnd = sal_False; ->>>>>>> other { SwIterator<SwCntntFrm,SwTxtNode> aIter( *m_pTxtNode ); for( SwCntntFrm* pFnd = aIter.First(); pFnd; pFnd = aIter.Next() ) diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx index 3bd6f8594c1c..e2888a208d51 100644 --- a/sw/source/core/txtnode/fntcache.cxx +++ b/sw/source/core/txtnode/fntcache.cxx @@ -836,13 +836,8 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf ) // true if pOut is the printer and the printer has been used for formatting const sal_Bool bPrt = OUTDEV_PRINTER == rInf.GetOut().GetOutDevType() && OUTDEV_PRINTER == rRefDev.GetOutDevType(); -<<<<<<< local - const BOOL bBrowse = ( pWin && - rInf.GetShell()->GetViewOptions()->getBrowseMode() && -======= const sal_Bool bBrowse = ( pWin && - pIDSA->get(IDocumentSettingAccess::BROWSE_MODE) && ->>>>>>> other + rInf.GetShell()->GetViewOptions()->getBrowseMode() && !rInf.GetShell()->GetViewOptions()->IsPrtFormat() && !rInf.GetBullet() && ( rInf.GetSpace() || !rInf.GetKern() ) && diff --git a/sw/source/core/txtnode/txtatr2.cxx b/sw/source/core/txtnode/txtatr2.cxx index 698be6cd1443..9baac7ad5e87 100644 --- a/sw/source/core/txtnode/txtatr2.cxx +++ b/sw/source/core/txtnode/txtatr2.cxx @@ -81,12 +81,7 @@ void SwTxtCharFmt::ModifyNotification( const SfxPoolItem* pOld, const SfxPoolIte } } - // erfrage vom Modify Informationen -<<<<<<< local -bool SwTxtCharFmt::GetInfo( SfxPoolItem& rInfo ) const -======= sal_Bool SwTxtCharFmt::GetInfo( SfxPoolItem& rInfo ) const ->>>>>>> other { if ( RES_AUTOFMT_DOCNODE != rInfo.Which() || !m_pTxtNode || &m_pTxtNode->GetNodes() != static_cast<SwAutoFmtGetDocNode&>(rInfo).pNodes ) diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx index 6d1d47543de8..d908fd24c18d 100644 --- a/sw/source/core/undo/rolbck.cxx +++ b/sw/source/core/undo/rolbck.cxx @@ -942,11 +942,7 @@ void SwHistoryChangeFlyAnchor::SetInDoc( SwDoc* pDoc, bool ) aTmp.SetAnchor( &aPos ); // so the Layout does not get confused -<<<<<<< local - if ( !pCNd || !pCNd->getLayoutFrm( pDoc->GetCurrentLayout(), 0, 0, FALSE ) ) -======= - if ( !pCNd || !pCNd->GetFrm( 0, 0, sal_False ) ) ->>>>>>> other + if ( !pCNd || !pCNd->getLayoutFrm( pDoc->GetCurrentLayout(), 0, 0, sal_False ) ) { m_rFmt.DelFrms(); } diff --git a/sw/source/core/undo/undobj1.cxx b/sw/source/core/undo/undobj1.cxx index 7a4abe803bde..0347168d9f8a 100644 --- a/sw/source/core/undo/undobj1.cxx +++ b/sw/source/core/undo/undobj1.cxx @@ -341,14 +341,8 @@ void SwUndoInsLayFmt::RepeatImpl(::sw::RepeatContext & rContext) } else if (FLY_AT_PAGE == aAnchor.GetAnchorId()) { -<<<<<<< local - aAnchor.SetPageNum( pDoc->GetCurrentLayout()->GetCurrPage( rUndoIter.pAktPam )); + aAnchor.SetPageNum( pDoc->GetCurrentLayout()->GetCurrPage( &rContext.GetRepeatPaM() )); } -======= - aAnchor.SetPageNum( - pDoc->GetRootFrm()->GetCurrPage(& rContext.GetRepeatPaM()) ); - } ->>>>>>> other else { ASSERT( sal_False, "was fuer ein Anker ist es denn nun?" ); } diff --git a/sw/source/core/undo/undraw.cxx b/sw/source/core/undo/undraw.cxx index d7f994e54de4..5acb04c63d68 100644 --- a/sw/source/core/undo/undraw.cxx +++ b/sw/source/core/undo/undraw.cxx @@ -63,14 +63,7 @@ struct SwUndoGroupObjImpl { SwDrawFrmFmt* pFmt; SdrObject* pObj; -<<<<<<< local - ULONG nNodeIdx; -======= sal_uLong nNodeIdx; - - // OD 2004-04-15 #i26791# - keeping the anchor and the relative position - // of drawing objects no longer needed ->>>>>>> other }; @@ -392,12 +385,7 @@ void SwUndoDrawUnGroup::UndoImpl(::sw::UndoRedoContext & rContext) { bDelFmt = sal_True; -<<<<<<< local - // remove from array - SwDoc* pDoc = &rIter.GetDoc(); -======= SwDoc *const pDoc = & rContext.GetDoc(); ->>>>>>> other SwSpzFrmFmts& rFlyFmts = *(SwSpzFrmFmts*)pDoc->GetSpzFrmFmts(); // remove from array @@ -569,14 +557,9 @@ void SwUndoDrawDelete::UndoImpl(::sw::UndoRedoContext & rContext) { static_cast<SwDrawFrmFmt*>(rSave.pFmt)->PosAttrSet(); } -<<<<<<< local - } - rIter.pMarkList = pMarkLst; -======= // <-- } rContext.SetSelections(0, pMarkLst); ->>>>>>> other } void SwUndoDrawDelete::RedoImpl(::sw::UndoRedoContext & rContext) diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx index 6029f6e7bfd0..f42c0ef0a7c2 100644 --- a/sw/source/core/undo/untbl.cxx +++ b/sw/source/core/undo/untbl.cxx @@ -139,13 +139,8 @@ public: sal_Bool bSaveFml = sal_True ); ~_SaveTable(); -<<<<<<< local - USHORT AddFmt( SwFrmFmt* pFmt, bool bIsLine ); - void NewFrmFmt( const SwTableLine* , const SwTableBox*, USHORT nFmtPos, -======= sal_uInt16 AddFmt( SwFrmFmt* pFmt, bool bIsLine ); - void NewFrmFmt( const SwClient* pLnBx, sal_Bool bIsLine, sal_uInt16 nFmtPos, ->>>>>>> other + void NewFrmFmt( const SwTableLine* , const SwTableBox*, sal_uInt16 nFmtPos, SwFrmFmt* pOldFmt ); void RestoreAttr( SwTable& rTbl, sal_Bool bModifyBox = sal_False ); @@ -1133,13 +1128,8 @@ void _SaveTable::CreateNew( SwTable& rTbl, sal_Bool bCreateFrms, } -<<<<<<< local void _SaveTable::NewFrmFmt( const SwTableLine* pTblLn, const SwTableBox* pTblBx, - USHORT nFmtPos, SwFrmFmt* pOldFmt ) -======= -void _SaveTable::NewFrmFmt( const SwClient* pLnBx, sal_Bool bIsLine, sal_uInt16 nFmtPos, SwFrmFmt* pOldFmt ) ->>>>>>> other { SwDoc* pDoc = pOldFmt->GetDoc(); @@ -1216,11 +1206,7 @@ _SaveLine::~_SaveLine() void _SaveLine::RestoreAttr( SwTableLine& rLine, _SaveTable& rSTbl ) { -<<<<<<< local rSTbl.NewFrmFmt( &rLine, 0, nItemSet, rLine.GetFrmFmt() ); -======= - rSTbl.NewFrmFmt( &rLine, sal_True, nItemSet, rLine.GetFrmFmt() ); ->>>>>>> other _SaveBox* pBx = pBox; for( sal_uInt16 n = 0; n < rLine.GetTabBoxes().Count(); ++n, pBx = pBx->pNext ) @@ -1310,11 +1296,7 @@ _SaveBox::~_SaveBox() void _SaveBox::RestoreAttr( SwTableBox& rBox, _SaveTable& rSTbl ) { -<<<<<<< local rSTbl.NewFrmFmt( 0, &rBox, nItemSet, rBox.GetFrmFmt() ); -======= - rSTbl.NewFrmFmt( &rBox, sal_False, nItemSet, rBox.GetFrmFmt() ); ->>>>>>> other if( ULONG_MAX == nSttNode ) // keine EndBox { diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx index 92b338a4d169..fe86698ab4ad 100644 --- a/sw/source/core/unocore/unocoll.cxx +++ b/sw/source/core/unocore/unocoll.cxx @@ -1092,12 +1092,7 @@ OUString SwXTextFrames::getImplementationName(void) throw( RuntimeException ) return C2U("SwXTextFrames"); } -<<<<<<< local -BOOL SwXTextFrames::supportsService(const OUString& rServiceName) throw( RuntimeException ) -======= - ---------------------------------------------------------------------------*/ sal_Bool SwXTextFrames::supportsService(const OUString& rServiceName) throw( RuntimeException ) ->>>>>>> other { return C2U("com.sun.star.text.TextFrames") == rServiceName; } @@ -1128,12 +1123,7 @@ OUString SwXTextGraphicObjects::getImplementationName(void) throw( RuntimeExcept return C2U("SwXTextGraphicObjects"); } -<<<<<<< local -BOOL SwXTextGraphicObjects::supportsService(const OUString& rServiceName) throw( RuntimeException ) -======= - ---------------------------------------------------------------------------*/ sal_Bool SwXTextGraphicObjects::supportsService(const OUString& rServiceName) throw( RuntimeException ) ->>>>>>> other { return C2U("com.sun.star.text.TextGraphicObjects") == rServiceName; } @@ -1163,12 +1153,7 @@ OUString SwXTextEmbeddedObjects::getImplementationName(void) throw( RuntimeExcep return C2U("SwXTextEmbeddedObjects"); } -<<<<<<< local -BOOL SwXTextEmbeddedObjects::supportsService(const OUString& rServiceName) throw( RuntimeException ) -======= - ---------------------------------------------------------------------------*/ sal_Bool SwXTextEmbeddedObjects::supportsService(const OUString& rServiceName) throw( RuntimeException ) ->>>>>>> other { return C2U("com.sun.star.text.TextEmbeddedObjects") == rServiceName; } @@ -1199,12 +1184,7 @@ OUString SwXTextSections::getImplementationName(void) throw( RuntimeException ) return C2U("SwXTextSections"); } -<<<<<<< local -BOOL SwXTextSections::supportsService(const OUString& rServiceName) throw( RuntimeException ) -======= - ---------------------------------------------------------------------------*/ sal_Bool SwXTextSections::supportsService(const OUString& rServiceName) throw( RuntimeException ) ->>>>>>> other { return C2U("com.sun.star.text.TextSections") == rServiceName; } @@ -1561,12 +1541,7 @@ OUString SwXFootnotes::getImplementationName(void) throw( RuntimeException ) return C2U("SwXFootnotes"); } -<<<<<<< local -BOOL SwXFootnotes::supportsService(const OUString& rServiceName) throw( RuntimeException ) -======= - ---------------------------------------------------------------------------*/ sal_Bool SwXFootnotes::supportsService(const OUString& rServiceName) throw( RuntimeException ) ->>>>>>> other { return C2U("com.sun.star.text.Footnotes") == rServiceName; } @@ -1669,12 +1644,7 @@ OUString SwXReferenceMarks::getImplementationName(void) throw( RuntimeException return C2U("SwXReferenceMarks"); } -<<<<<<< local -BOOL SwXReferenceMarks::supportsService(const OUString& rServiceName) throw( RuntimeException ) -======= - ---------------------------------------------------------------------------*/ sal_Bool SwXReferenceMarks::supportsService(const OUString& rServiceName) throw( RuntimeException ) ->>>>>>> other { return C2U("com.sun.star.text.ReferenceMarks") == rServiceName; } diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx index f3fc03148bbe..449559b5272a 100644 --- a/sw/source/core/unocore/unodraw.cxx +++ b/sw/source/core/unocore/unodraw.cxx @@ -489,12 +489,7 @@ rtl::OUString SwXDrawPage::getImplementationName(void) throw( uno::RuntimeExcept return C2U("SwXDrawPage"); } -<<<<<<< local -BOOL SwXDrawPage::supportsService(const rtl::OUString& rServiceName) throw( uno::RuntimeException ) -======= - ---------------------------------------------------------------------------*/ sal_Bool SwXDrawPage::supportsService(const rtl::OUString& rServiceName) throw( uno::RuntimeException ) ->>>>>>> other { return C2U("com.sun.star.drawing.GenericDrawPage") == rServiceName; } diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx index b56eb7c0a535..bb2d1721d4b0 100644 --- a/sw/source/core/unocore/unofield.cxx +++ b/sw/source/core/unocore/unofield.cxx @@ -417,12 +417,7 @@ OUString SwXFieldMaster::getImplementationName(void) throw( uno::RuntimeExceptio return C2U("SwXFieldMaster"); } -<<<<<<< local -BOOL SwXFieldMaster::supportsService(const OUString& rServiceName) throw( uno::RuntimeException ) -======= - ---------------------------------------------------------------------------*/ sal_Bool SwXFieldMaster::supportsService(const OUString& rServiceName) throw( uno::RuntimeException ) ->>>>>>> other { sal_Bool bRet = sal_False; if(rServiceName.equalsAsciiL( @@ -969,8 +964,6 @@ void SwXFieldMaster::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) } } -<<<<<<< local -======= const Programmatic2UIName_Impl* lcl_GetFieldNameTable() { static sal_Bool bInitialized = sal_False; @@ -990,11 +983,7 @@ const Programmatic2UIName_Impl* lcl_GetFieldNameTable() } return &aFieldNames[0]; } - ---------------------------------------------------------------------------*/ -/* -----------------------------06.11.00 10:26-------------------------------- - ---------------------------------------------------------------------------*/ ->>>>>>> other OUString SwXFieldMaster::GetProgrammaticName(const SwFieldType& rType, SwDoc& rDoc) { OUString sRet(rType.GetName()); @@ -2413,14 +2402,8 @@ OUString SwXTextFieldMasters::getImplementationName(void) throw( uno::RuntimeExc { return C2U("SwXTextFieldMasters"); } -<<<<<<< local -BOOL SwXTextFieldMasters::supportsService(const OUString& rServiceName) throw( uno::RuntimeException ) -======= -/* -----------------------------06.04.00 13:22-------------------------------- - ---------------------------------------------------------------------------*/ sal_Bool SwXTextFieldMasters::supportsService(const OUString& rServiceName) throw( uno::RuntimeException ) ->>>>>>> other { return rServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.text.TextFieldMasters" )); @@ -2647,12 +2630,7 @@ OUString SwXTextFieldTypes::getImplementationName(void) throw( uno::RuntimeExcep return C2U("SwXTextFieldTypes"); } -<<<<<<< local -BOOL SwXTextFieldTypes::supportsService(const OUString& rServiceName) throw( uno::RuntimeException ) -======= - ---------------------------------------------------------------------------*/ sal_Bool SwXTextFieldTypes::supportsService(const OUString& rServiceName) throw( uno::RuntimeException ) ->>>>>>> other { return rServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.text.TextFields" )); @@ -2745,12 +2723,7 @@ OUString SwXFieldEnumeration::getImplementationName(void) throw( uno::RuntimeExc return C2U("SwXFieldEnumeration"); } -<<<<<<< local -BOOL SwXFieldEnumeration::supportsService(const OUString& rServiceName) throw( uno::RuntimeException ) -======= - ---------------------------------------------------------------------------*/ sal_Bool SwXFieldEnumeration::supportsService(const OUString& rServiceName) throw( uno::RuntimeException ) ->>>>>>> other { return rServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.text.FieldEnumeration" )); diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index 3466dc1cf20e..9681279c350f 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -157,22 +157,12 @@ BaseFrameProperties_Impl::~BaseFrameProperties_Impl() { } -<<<<<<< local -void BaseFrameProperties_Impl::SetProperty(USHORT nWID, BYTE nMemberId, const uno::Any& rVal) -======= - ---------------------------------------------------------------------------*/ void BaseFrameProperties_Impl::SetProperty(sal_uInt16 nWID, sal_uInt8 nMemberId, const uno::Any& rVal) ->>>>>>> other { aAnyMap.SetValue( nWID, nMemberId, rVal ); } -<<<<<<< local -sal_Bool BaseFrameProperties_Impl::GetProperty(USHORT nWID, BYTE nMemberId, const uno::Any*& rpAny) -======= - ---------------------------------------------------------------------------*/ sal_Bool BaseFrameProperties_Impl::GetProperty(sal_uInt16 nWID, sal_uInt8 nMemberId, const uno::Any*& rpAny) ->>>>>>> other { return aAnyMap.FillValue( nWID, nMemberId, rpAny ); } @@ -742,12 +732,7 @@ OUString SwXFrame::getImplementationName(void) throw( uno::RuntimeException ) return C2U("SwXFrame"); } -<<<<<<< local -BOOL SwXFrame::supportsService(const :: OUString& rServiceName) throw( uno::RuntimeException ) -======= - ---------------------------------------------------------------------------*/ sal_Bool SwXFrame::supportsService(const :: OUString& rServiceName) throw( uno::RuntimeException ) ->>>>>>> other { return !rServiceName.compareToAscii("com.sun.star.text.BaseFrame")|| !rServiceName.compareToAscii("com.sun.star.text.TextContent") || diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx index cc4a31c5af9b..a3f23ea6bfb4 100644 --- a/sw/source/core/unocore/unoidx.cxx +++ b/sw/source/core/unocore/unoidx.cxx @@ -1247,31 +1247,11 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, case WID_INDEX_MARKS: { SwTOXMarks aMarks; -<<<<<<< local const SwTOXType* pType = pTOXBase->GetTOXType(); SwTOXMark::InsertTOXMarks( aMarks, *pType ); uno::Sequence< uno::Reference<text::XDocumentIndexMark> > aXMarks(aMarks.Count()); uno::Reference<text::XDocumentIndexMark>* pxMarks = aXMarks.getArray(); - for(USHORT i = 0; i < aMarks.Count(); i++) -======= - SwTOXType const*const pType = pTOXBase->GetTOXType(); - SwClientIter aIter(*pType); - SwTOXMark * pMark = - static_cast<SwTOXMark*>(aIter.First(TYPE(SwTOXMark))); - while( pMark ) - { - if(pMark->GetTxtTOXMark()) - { - aMarks.C40_INSERT(SwTOXMark, pMark, aMarks.Count()); - } - pMark = static_cast<SwTOXMark*>(aIter.Next()); - } - uno::Sequence< uno::Reference<text::XDocumentIndexMark> > - aXMarks(aMarks.Count()); - uno::Reference<text::XDocumentIndexMark>* pxMarks = - aXMarks.getArray(); for(sal_uInt16 i = 0; i < aMarks.Count(); i++) ->>>>>>> other { SwTOXMark* pMark = aMarks.GetObject(i); pxMarks[i] = SwXDocumentIndexMark::CreateXDocumentIndexMark( diff --git a/sw/source/core/unocore/unoredlines.cxx b/sw/source/core/unocore/unoredlines.cxx index 9061d6b9af5d..666c80a17bc7 100644 --- a/sw/source/core/unocore/unoredlines.cxx +++ b/sw/source/core/unocore/unoredlines.cxx @@ -111,12 +111,7 @@ OUString SwXRedlines::getImplementationName(void) throw( uno::RuntimeException ) return C2U("SwXRedlines"); } -<<<<<<< local -BOOL SwXRedlines::supportsService(const rtl::OUString& /*ServiceName*/) -======= - -----------------------------------------------------------------------*/ sal_Bool SwXRedlines::supportsService(const rtl::OUString& /*ServiceName*/) ->>>>>>> other throw( uno::RuntimeException ) { DBG_ERROR("not implemented"); @@ -157,12 +152,7 @@ SwXRedlineEnumeration::~SwXRedlineEnumeration() { } -<<<<<<< local -BOOL SwXRedlineEnumeration::hasMoreElements(void) throw( uno::RuntimeException ) -======= - -----------------------------------------------------------------------*/ sal_Bool SwXRedlineEnumeration::hasMoreElements(void) throw( uno::RuntimeException ) ->>>>>>> other { if(!pDoc) throw uno::RuntimeException(); @@ -188,12 +178,7 @@ rtl::OUString SwXRedlineEnumeration::getImplementationName(void) throw( uno::Run return C2U("SwXRedlineEnumeration"); } -<<<<<<< local -BOOL SwXRedlineEnumeration::supportsService(const rtl::OUString& /*ServiceName*/) throw( uno::RuntimeException ) -======= - -----------------------------------------------------------------------*/ sal_Bool SwXRedlineEnumeration::supportsService(const rtl::OUString& /*ServiceName*/) throw( uno::RuntimeException ) ->>>>>>> other { return sal_False; } diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx index 744336bf11c2..79f2b127dcac 100644 --- a/sw/source/core/unocore/unotbl.cxx +++ b/sw/source/core/unocore/unotbl.cxx @@ -1241,17 +1241,8 @@ OUString SwXCell::getImplementationName(void) throw( uno::RuntimeException ) { return C2U("SwXCell"); } -<<<<<<< local -======= -/* -----------------------------19.04.00 15:20-------------------------------- ->>>>>>> other - -<<<<<<< local -BOOL SwXCell::supportsService(const OUString& rServiceName) throw( uno::RuntimeException ) -======= - ---------------------------------------------------------------------------*/ + sal_Bool SwXCell::supportsService(const OUString& rServiceName) throw( uno::RuntimeException ) ->>>>>>> other { String sServiceName(rServiceName); return sServiceName.EqualsAscii("com.sun.star.text.CellProperties"); @@ -1273,17 +1264,8 @@ OUString SwXTextTableRow::getImplementationName(void) throw( uno::RuntimeExcepti { return C2U("SwXTextTableRow"); } -<<<<<<< local -======= -/* -----------------------------19.04.00 15:20-------------------------------- ->>>>>>> other -<<<<<<< local -BOOL SwXTextTableRow::supportsService(const OUString& rServiceName) throw( uno::RuntimeException ) -======= - ---------------------------------------------------------------------------*/ sal_Bool SwXTextTableRow::supportsService(const OUString& rServiceName) throw( uno::RuntimeException ) ->>>>>>> other { return C2U("com.sun.star.text.TextTableRow") == rServiceName; } @@ -1470,17 +1452,8 @@ OUString SwXTextTableCursor::getImplementationName(void) throw( uno::RuntimeExce { return C2U("SwXTextTableCursor"); } -<<<<<<< local -======= -/* -----------------------------19.04.00 15:21-------------------------------- ->>>>>>> other -<<<<<<< local -BOOL SwXTextTableCursor::supportsService(const OUString& rServiceName) throw( uno::RuntimeException ) -======= - ---------------------------------------------------------------------------*/ sal_Bool SwXTextTableCursor::supportsService(const OUString& rServiceName) throw( uno::RuntimeException ) ->>>>>>> other { return C2U("com.sun.star.text.TextTableCursor") == rServiceName; } @@ -1918,15 +1891,8 @@ SwTableProperties_Impl::SwTableProperties_Impl() SwTableProperties_Impl::~SwTableProperties_Impl() { } -<<<<<<< local -void SwTableProperties_Impl::SetProperty(USHORT nWhichId, USHORT nMemberId, const uno::Any& rVal) -======= -/* -----------------22.06.98 09:51------------------- - * - * --------------------------------------------------*/ void SwTableProperties_Impl::SetProperty(sal_uInt16 nWhichId, sal_uInt16 nMemberId, const uno::Any& rVal) ->>>>>>> other { aAnyMap.SetValue( nWhichId, nMemberId, rVal ); } @@ -3621,17 +3587,8 @@ OUString SwXCellRange::getImplementationName(void) throw( uno::RuntimeException { return C2U("SwXCellRange"); } -<<<<<<< local -======= -/* -----------------------------19.04.00 15:21-------------------------------- ->>>>>>> other -<<<<<<< local -BOOL SwXCellRange::supportsService(const OUString& rServiceName) throw( uno::RuntimeException ) -======= - ---------------------------------------------------------------------------*/ sal_Bool SwXCellRange::supportsService(const OUString& rServiceName) throw( uno::RuntimeException ) ->>>>>>> other { return rServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM ( "com.sun.star.text.CellRange" ) ) || @@ -4596,17 +4553,8 @@ OUString SwXTableRows::getImplementationName(void) throw( uno::RuntimeException { return C2U("SwXTableRows"); } -<<<<<<< local -======= -/* -----------------------------19.04.00 15:22-------------------------------- ->>>>>>> other -<<<<<<< local -BOOL SwXTableRows::supportsService(const OUString& rServiceName) throw( uno::RuntimeException ) -======= - ---------------------------------------------------------------------------*/ sal_Bool SwXTableRows::supportsService(const OUString& rServiceName) throw( uno::RuntimeException ) ->>>>>>> other { return C2U("com.sun.star.text.TableRows") == rServiceName; } @@ -4822,17 +4770,8 @@ OUString SwXTableColumns::getImplementationName(void) throw( uno::RuntimeExcepti { return C2U("SwXTableColumns"); } -<<<<<<< local -======= -/* -----------------------------19.04.00 15:23-------------------------------- ->>>>>>> other -<<<<<<< local -BOOL SwXTableColumns::supportsService(const OUString& rServiceName) throw( uno::RuntimeException ) -======= - ---------------------------------------------------------------------------*/ sal_Bool SwXTableColumns::supportsService(const OUString& rServiceName) throw( uno::RuntimeException ) ->>>>>>> other { return C2U("com.sun.star.text.TableColumns") == rServiceName; } diff --git a/sw/source/core/view/vdraw.cxx b/sw/source/core/view/vdraw.cxx index ef99855c0472..994841e6787f 100644 --- a/sw/source/core/view/vdraw.cxx +++ b/sw/source/core/view/vdraw.cxx @@ -272,11 +272,7 @@ sal_Bool SwViewImp::IsDragPossible( const Point &rPoint ) SdrObject *pO = rMrkList.GetMark(rMrkList.GetMarkCount()-1)->GetMarkedSdrObj(); SwRect aRect; -<<<<<<< local - if( pO && ::CalcClipRect( pO, aRect, FALSE ) ) -======= - if( ::CalcClipRect( pO, aRect, sal_False ) ) ->>>>>>> other + if( pO && ::CalcClipRect( pO, aRect, sal_False ) ) { SwRect aTmp; ::CalcClipRect( pO, aTmp, sal_True ); diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index e24ff471ad78..f83d1e1e03e1 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -1651,26 +1651,16 @@ void ViewShell::PaintDesktop( const SwRect &rRect ) //Kann z.B. waehrend des Idle'ns zwischenzeitlich auftreten. //Die Rechtecke neben den Seiten muessen wir leider auf jedenfall Painten, //den diese werden spaeter beim VisPortChgd ausgespart. -<<<<<<< local - BOOL bBorderOnly = FALSE; - const SwRootFrm *pRoot = GetLayout();//swmod 080305 -======= sal_Bool bBorderOnly = sal_False; - const SwRootFrm *pRoot = GetDoc()->GetRootFrm(); ->>>>>>> other + const SwRootFrm *pRoot = GetLayout();//swmod 080305 if ( rRect.Top() > pRoot->Frm().Bottom() ) { const SwFrm *pPg = pRoot->Lower(); while ( pPg && pPg->GetNext() ) pPg = pPg->GetNext(); if ( !pPg || !pPg->Frm().IsOver( VisArea() ) ) -<<<<<<< local - bBorderOnly = TRUE; - } //swmod 071108//swmod 071225 -======= bBorderOnly = sal_True; } ->>>>>>> other const bool bBookMode = GetViewOptions()->IsViewLayoutBookMode(); @@ -2312,29 +2302,18 @@ void ViewShell::ImplApplyViewOptions( const SwViewOption &rOpt ) // Wenn kein ReferenzDevice (Drucker) zum Formatieren benutzt wird, // sondern der Bildschirm, muss bei Zoomfaktoraenderung neu formatiert // werden. -<<<<<<< local if( pOpt->getBrowseMode() ) - bReformat = TRUE; -======= - if( getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE) ) bReformat = sal_True; ->>>>>>> other } -<<<<<<< local bool bBrowseModeChanged = false; if( pOpt->getBrowseMode() != rOpt.getBrowseMode() ) { bBrowseModeChanged = true; - bReformat = TRUE; + bReformat = sal_True; } else if( pOpt->getBrowseMode() && pOpt->IsPrtFormat() != rOpt.IsPrtFormat() ) - bReformat = TRUE; -======= - if ( getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE) && - pOpt->IsPrtFormat() != rOpt.IsPrtFormat() ) bReformat = sal_True; ->>>>>>> other if ( HasDrawView() || rOpt.IsGridVisible() ) { @@ -2476,14 +2455,8 @@ void ViewShell::SetPDFExportOption(sal_Bool bSet) { if( bSet != pOpt->IsPDFExport() ) { -<<<<<<< local if( bSet && pOpt->getBrowseMode() ) - pOpt->SetPrtFormat( TRUE ); -======= - if( bSet && - getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE) ) pOpt->SetPrtFormat( sal_True ); ->>>>>>> other pOpt->SetPDFExport(bSet); } } diff --git a/sw/source/core/view/vnew.cxx b/sw/source/core/view/vnew.cxx index 031da20042d2..1aa1d91b2f94 100644 --- a/sw/source/core/view/vnew.cxx +++ b/sw/source/core/view/vnew.cxx @@ -32,10 +32,7 @@ #include <sfx2/printer.hxx> #include <rtl/logfile.hxx> #include <doc.hxx> -<<<<<<< local -======= #include <IDocumentUndoRedo.hxx> ->>>>>>> other #include <docsh.hxx> #include <viewsh.hxx> #include <rootfrm.hxx> diff --git a/sw/source/core/view/vprint.cxx b/sw/source/core/view/vprint.cxx index f487e680f3f9..638d5ab80aa9 100644 --- a/sw/source/core/view/vprint.cxx +++ b/sw/source/core/view/vprint.cxx @@ -341,23 +341,13 @@ void ViewShell::CalcPagesForPrint( sal_uInt16 nMax ) { SET_CURR_SHELL( this ); -<<<<<<< local SwRootFrm* pMyLayout = GetLayout(); -======= - SwRootFrm* pLayout = GetLayout(); - // sal_uLong nStatMax = pLayout->GetPageNum(); ->>>>>>> other const SwFrm *pPage = pMyLayout->Lower(); SwLayAction aAction( pMyLayout, Imp() ); -<<<<<<< local pMyLayout->StartAllAction(); - for ( USHORT i = 1; pPage && i <= nMax; pPage = pPage->GetNext(), ++i ) -======= - pLayout->StartAllAction(); for ( sal_uInt16 i = 1; pPage && i <= nMax; pPage = pPage->GetNext(), ++i ) ->>>>>>> other { pPage->Calc(); SwRect aOldVis( VisArea() ); @@ -636,13 +626,8 @@ void ViewShell::PrtOle2( SwDoc *pDoc, const SwViewOption *pOpt, const SwPrintDat if ( pSh->GetViewOptions()->getBrowseMode() && pSh->GetNext() == pSh ) { -<<<<<<< local - pSh->CheckBrowseView( FALSE ); - pSh->GetLayout()->Lower()->InvalidateSize(); -======= pSh->CheckBrowseView( sal_False ); - pDoc->GetRootFrm()->Lower()->InvalidateSize(); ->>>>>>> other + pSh->GetLayout()->Lower()->InvalidateSize(); } // --> FME 2005-02-10 #119474# diff --git a/sw/source/ui/app/docsh.cxx b/sw/source/ui/app/docsh.cxx index e46b0f3b106a..9dc59a4aca19 100644 --- a/sw/source/ui/app/docsh.cxx +++ b/sw/source/ui/app/docsh.cxx @@ -909,35 +909,6 @@ Rectangle SwDocShell::GetVisArea( sal_uInt16 nAspect ) const const SwRect aPageRect = pNd->FindPageFrmRect( sal_False, 0, sal_False ); return aPageRect.SVRect(); -<<<<<<< local -======= - - // Why does this have to be that complicated? I replaced this by the - // call of FindPageFrmRect(): - /* - //PageDesc besorgen, vom ersten Absatz oder den default. - const SwFmtPageDesc &rDesc = pNd->GetSwAttrSet().GetPageDesc(); - const SwPageDesc* pDesc = rDesc.GetPageDesc(); - if( !pDesc ) - pDesc = &const_cast<const SwDoc *>(pDoc)->GetPageDesc( 0 ); - - //Das Format wird evtl. von der virtuellen Seitennummer bestimmt. - const sal_uInt16 nPgNum = rDesc.GetNumOffset(); - const sal_Bool bOdd = nPgNum % 2 ? sal_True : sal_False; - const SwFrmFmt *pFmt = bOdd ? pDesc->GetRightFmt() : pDesc->GetLeftFmt(); - if ( !pFmt ) //#40568# - pFmt = bOdd ? pDesc->GetLeftFmt() : pDesc->GetRightFmt(); - - if ( pFmt->GetFrmSize().GetWidth() == LONG_MAX ) - //Jetzt wird es aber Zeit fuer die Initialisierung - pDoc->getPrinter( true ); - - const SwFmtFrmSize& rFrmSz = pFmt->GetFrmSize(); - const Size aSz( rFrmSz.GetWidth(), rFrmSz.GetHeight() ); - const Point aPt( DOCUMENTBORDER, DOCUMENTBORDER ); - const Rectangle aRect( aPt, aSz ); - return aRect;*/ ->>>>>>> other } return SfxObjectShell::GetVisArea( nAspect ); } @@ -1017,12 +988,8 @@ void SwDocShell::GetState(SfxItemSet& rSet) { case SID_PRINTPREVIEW: { -<<<<<<< local - BOOL bDisable = IsInPlaceActive(); - // Disable "multiple layout" -======= sal_Bool bDisable = IsInPlaceActive(); ->>>>>>> other + // Disable "multiple layout" if ( !bDisable ) { SfxViewFrame *pTmpFrm = SfxViewFrame::GetFirst(this); diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx index 0d44efe7a250..9c867a90bf08 100644 --- a/sw/source/ui/app/docsh2.cxx +++ b/sw/source/ui/app/docsh2.cxx @@ -1178,63 +1178,6 @@ void SwDocShell::Execute(SfxRequest& rReq) SW_MOD()->CheckSpellChanges(sal_False, sal_True, sal_True, sal_False ); break; -<<<<<<< local -======= - case SID_BROWSER_MODE: - case FN_PRINT_LAYOUT: //Fuer Web, genau umgekehrt zum BrowserMode - { - int eState = STATE_TOGGLE; - sal_Bool bSet = sal_True; - const SfxPoolItem* pAttr=NULL; - if ( pArgs && SFX_ITEM_SET == pArgs->GetItemState( nWhich , sal_False, &pAttr )) - { - bSet = ((SfxBoolItem*)pAttr)->GetValue(); - if ( nWhich == FN_PRINT_LAYOUT ) - bSet = !bSet; - eState = bSet ? STATE_ON : STATE_OFF; - } - - if ( STATE_TOGGLE == eState ) - bSet = !GetDoc()->get(IDocumentSettingAccess::BROWSE_MODE); - - ToggleBrowserMode(bSet, 0); - - // OS: numerische Reihenfolge beachten! - static sal_uInt16 __READONLY_DATA aInva[] = - { - SID_NEWWINDOW,/*5620*/ - SID_BROWSER_MODE, /*6313*/ - SID_RULER_BORDERS, SID_RULER_PAGE_POS, - SID_ATTR_LONG_LRSPACE, - SID_HTML_MODE, - SID_RULER_PROTECT, - SID_AUTOSPELL_CHECK, - FN_RULER, /*20211*/ - FN_VIEW_GRAPHIC, /*20213*/ - FN_VIEW_BOUNDS, /**/ - FN_VIEW_FIELDS, /*20215*/ - FN_VLINEAL, /*20216*/ - FN_VSCROLLBAR, /*20217*/ - FN_HSCROLLBAR, /*20218*/ - FN_VIEW_META_CHARS, /**/ - FN_VIEW_MARKS, /**/ - FN_VIEW_FIELDNAME, /**/ - FN_VIEW_TABLEGRID, /*20227*/ - FN_PRINT_LAYOUT, /*20237*/ - FN_QRY_MERGE, /*20364*/ - 0 - }; - // the view must not exist! - SfxViewFrame *pTmpFrm = SfxViewFrame::GetFirst( this ); - if( pTmpFrm ) - pTmpFrm->GetBindings().Invalidate( aInva ); - if ( !pAttr ) - rReq.AppendItem( SfxBoolItem( nWhich, bSet ) ); - rReq.Done(); - } - break; - ->>>>>>> other case SID_MAIL_PREPAREEXPORT: { //pWrtShell is not set in page preview @@ -1820,84 +1763,8 @@ void SwDocShell::ReloadFromHtml( const String& rStreamName, SwSrcView* pSrcView pDoc->ResetModified(); } -<<<<<<< local -ULONG SwDocShell::LoadStylesFromFile( const String& rURL, - SwgReaderOption& rOpt, BOOL bUnoCall ) -======= -/* -----------------------------14.12.99 16:52-------------------------------- - - ---------------------------------------------------------------------------*/ -void SwDocShell::ToggleBrowserMode(sal_Bool bSet, SwView* _pView ) -{ - GetDoc()->set(IDocumentSettingAccess::BROWSE_MODE, bSet ); - UpdateFontList(); - SwView* pTempView = _pView ? _pView : (SwView*)GetView(); - if( pTempView ) - { - SfxBindings& rBind = pTempView->GetViewFrame()->GetBindings(); - rBind.Invalidate(FN_SHADOWCURSOR); - rBind.Invalidate(SID_BROWSER_MODE); - rBind.Invalidate(FN_PRINT_LAYOUT); - - if( !GetDoc()->getPrinter( false ) ) - { - pTempView->SetPrinter( GetDoc()->getPrinter( false ), - SFX_PRINTER_PRINTER | SFX_PRINTER_JOBSETUP ); - } - - // --> FME 2005-03-16 #i44963# Good occasion to check if page sizes in - // page descriptions are still set to (LONG_MAX, LONG_MAX) (html import) - GetDoc()->CheckDefaultPageFmt(); - // <-- - - // Currently there can be only one view (layout) if the document is viewed in Web layout - // So if there are more views we are in print layout and for toggling to Web layout all other views must be closed - SfxViewFrame *pTmpFrm = SfxViewFrame::GetFirst(this, sal_False); - do { - if( pTmpFrm != pTempView->GetViewFrame() ) - { - pTmpFrm->DoClose(); - pTmpFrm = SfxViewFrame::GetFirst(this, sal_False); - } - else - pTmpFrm = pTmpFrm->GetNext(*pTmpFrm, this, sal_False); - - } while ( pTmpFrm ); - - const SwViewOption& rViewOptions = *pTempView->GetWrtShell().GetViewOptions(); - - // set view columns before toggling: - if ( bSet ) - { - const sal_uInt16 nColumns = rViewOptions.GetViewLayoutColumns(); - const bool bBookMode = rViewOptions.IsViewLayoutBookMode(); - if ( 1 != nColumns || bBookMode ) - { - ((SwView*)GetView())->SetViewLayout( 1, false ); - } - } - - // Triggeres a formatting: - pTempView->GetWrtShell().CheckBrowseView( sal_True ); - pTempView->CheckVisArea(); - - if( GetDoc()->get(IDocumentSettingAccess::BROWSE_MODE) ) - { - const SvxZoomType eType = (SvxZoomType)rViewOptions.GetZoomType(); - - if ( SVX_ZOOM_PERCENT != eType) - { - ((SwView*)GetView())->SetZoom( eType ); - } - } - pTempView->InvalidateBorder(); - pTempView->SetNewWindowAllowed(!bSet); - } -} - sal_uLong SwDocShell::LoadStylesFromFile( const String& rURL, SwgReaderOption& rOpt, sal_Bool bUnoCall ) ->>>>>>> other { sal_uLong nErr = 0; diff --git a/sw/source/ui/config/viewopt.cxx b/sw/source/ui/config/viewopt.cxx index 82df13bedcbf..91c174478915 100644 --- a/sw/source/ui/config/viewopt.cxx +++ b/sw/source/ui/config/viewopt.cxx @@ -216,20 +216,11 @@ SwViewOption::SwViewOption() : bIsPagePreview(sal_False), bSelectionInReadonly(sal_False), // --> FME 2004-06-29 #114856# Formular view -<<<<<<< local - mbFormView(FALSE), -======= bFormView(sal_False), ->>>>>>> other // <-- -<<<<<<< local - mbBookview(FALSE), - mbBrowseMode(FALSE), - mbViewLayoutBookMode(FALSE), -======= bBookview(sal_False), + mbBrowseMode(sal_False), mbViewLayoutBookMode(sal_False), ->>>>>>> other bShowPlaceHolderFields( sal_True ), nZoom( 100 ), diff --git a/sw/source/ui/fldui/fldmgr.cxx b/sw/source/ui/fldui/fldmgr.cxx index 3e89baa7bf8d..e01be411c866 100644 --- a/sw/source/ui/fldui/fldmgr.cxx +++ b/sw/source/ui/fldui/fldmgr.cxx @@ -1034,13 +1034,8 @@ sal_Bool SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) sal_uInt16 nTmpPos = sCmd.SearchAndReplace( ' ', sfx2::cTokenSeperator ); sCmd.SearchAndReplace( ' ', sfx2::cTokenSeperator, nTmpPos ); -<<<<<<< local - SwDDEFieldType aTyp( rData.sPar1, sCmd, (USHORT)nFormatId ); - SwDDEFieldType* pTyp = (SwDDEFieldType*)pCurShell->InsertFldType( aTyp ); -======= SwDDEFieldType* pTyp = (SwDDEFieldType*)pCurShell->InsertFldType( SwDDEFieldType( rData.sPar1, sCmd, (sal_uInt16)nFormatId )); ->>>>>>> other pFld = new SwDDEField( pTyp ); break; } diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx index 8ffc9d519e88..7abdbbb85d7b 100644 --- a/sw/source/ui/uiview/pview.cxx +++ b/sw/source/ui/uiview/pview.cxx @@ -1251,30 +1251,6 @@ void SwPagePreView::Init(const SwViewOption * pPrefs) SwViewOption aOpt( *pPrefs ); -<<<<<<< local - aOpt.SetPagePreview(TRUE); - aOpt.SetTab( FALSE ); - aOpt.SetBlank( FALSE ); - aOpt.SetHardBlank( FALSE ); - aOpt.SetParagraph( FALSE ); - aOpt.SetLineBreak( FALSE ); - aOpt.SetPageBreak( FALSE ); - aOpt.SetColumnBreak( FALSE ); - aOpt.SetSoftHyph( FALSE ); - aOpt.SetFldName( FALSE ); - aOpt.SetPostIts( FALSE ); - aOpt.SetShowHiddenChar( FALSE ); - aOpt.SetShowHiddenField( FALSE ); - aOpt.SetShowHiddenPara( FALSE ); - aOpt.SetViewHRuler( FALSE ); - aOpt.SetViewVRuler( FALSE ); - aOpt.SetGraphic( TRUE ); - aOpt.SetTable( TRUE ); - aOpt.SetSnap( FALSE ); - aOpt.SetGridVisible( FALSE ); - aOpt.setBrowseMode( FALSE ); - -======= aOpt.SetPagePreview(sal_True); aOpt.SetTab( sal_False ); aOpt.SetBlank( sal_False ); @@ -1295,7 +1271,7 @@ void SwPagePreView::Init(const SwViewOption * pPrefs) aOpt.SetTable( sal_True ); aOpt.SetSnap( sal_False ); aOpt.SetGridVisible( sal_False ); ->>>>>>> other + GetViewShell()->ApplyViewOptions( aOpt ); GetViewShell()->ApplyAccessiblityOptions(SW_MOD()->GetAccessibilityOptions()); @@ -1303,16 +1279,6 @@ void SwPagePreView::Init(const SwViewOption * pPrefs) SwPrintData const aPrintOptions = *SW_MOD()->GetPrtOptions(false); GetViewShell()->AdjustOptionsForPagePreview( aPrintOptions ); -<<<<<<< local -======= - IDocumentSettingAccess* pIDSA = pESh->getIDocumentSettingAccess(); - if( pIDSA->get(IDocumentSettingAccess::BROWSE_MODE)) - { - pIDSA->set(IDocumentSettingAccess::BROWSE_MODE, false); - pESh->CheckBrowseView( sal_True ); - } - ->>>>>>> other GetViewShell()->CalcLayout(); DocSzChgd( GetViewShell()->GetDocSize() ); diff --git a/sw/source/ui/uiview/srcview.cxx b/sw/source/ui/uiview/srcview.cxx index 4b7daf8b3d93..f2628d48dde8 100644 --- a/sw/source/ui/uiview/srcview.cxx +++ b/sw/source/ui/uiview/srcview.cxx @@ -306,13 +306,8 @@ void SwSrcView::Init() aEditWin.SetReadonly(sal_True); } -// StartListening(*GetViewFrame()); -<<<<<<< local SetNewWindowAllowed( sal_False ); - StartListening(*pDocShell,TRUE); -======= StartListening(*pDocShell,sal_True); ->>>>>>> other } /*-------------------------------------------------------------------- diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx index 43f9c490ea2c..c1ac5c30585c 100644 --- a/sw/source/ui/uiview/view.cxx +++ b/sw/source/ui/uiview/view.cxx @@ -848,15 +848,8 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh ) nNewPage = ((SwPagePreView*)pExistingSh)->GetNewPage(); bOldShellWasPagePreView = sal_True; } -<<<<<<< local - else if( pExistingSh->IsA( TYPE( SwSrcView ) ) ) - bOldShellWasSrcView = TRUE; - } -======= - else if( pExistingSh && - pExistingSh->IsA( TYPE( SwSrcView ) ) ) + else if( pExistingSh->IsA( TYPE( SwSrcView ) ) ) bOldShellWasSrcView = sal_True; ->>>>>>> other RTL_LOGFILE_CONTEXT_TRACE( aLog, "before create WrtShell" ); if(PTR_CAST( SwView, pExistingSh)) @@ -984,12 +977,8 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh ) pWrtShell->DoUndo( 0 != SW_MOD()->GetUndoOptions().GetUndoCount() ); -<<<<<<< local - const BOOL bBrowse = pWrtShell->GetViewOptions()->getBrowseMode(); + const sal_Bool bBrowse = pWrtShell->GetViewOptions()->getBrowseMode(); // Disable "multiple window" -======= - const sal_Bool bBrowse = pWrtShell->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE); ->>>>>>> other SetNewWindowAllowed(!bBrowse); // End of disabled multiple window diff --git a/sw/source/ui/uiview/viewport.cxx b/sw/source/ui/uiview/viewport.cxx index c20b5e26ff22..ab8853ab5637 100644 --- a/sw/source/ui/uiview/viewport.cxx +++ b/sw/source/ui/uiview/viewport.cxx @@ -196,7 +196,7 @@ aDocSz = rSz; //Wenn Text geloescht worden ist, kann es sein, dass die VisArea hinter //den sichtbaren Bereich verweist Rectangle aNewVisArea( aVisArea ); - sal_Bool bModified = false; + bool bModified = false; SwTwips lGreenOffset = IsDocumentBorder() ? DOCUMENTBORDER : DOCUMENTBORDER * 2; SwTwips lTmp = aDocSz.Width() + lGreenOffset; @@ -205,11 +205,7 @@ aDocSz = rSz; lTmp = aNewVisArea.Right() - lTmp; aNewVisArea.Right() -= lTmp; aNewVisArea.Left() -= lTmp; -<<<<<<< local bModified = true; -======= - bModified = sal_True; ->>>>>>> other } lTmp = aDocSz.Height() + lGreenOffset; @@ -218,11 +214,7 @@ aDocSz = rSz; lTmp = aNewVisArea.Bottom() - lTmp; aNewVisArea.Bottom() -= lTmp; aNewVisArea.Top() -= lTmp; -<<<<<<< local bModified = true; -======= - bModified = sal_True; ->>>>>>> other } if ( bModified ) @@ -1129,17 +1121,10 @@ void SwView::OuterResizePixel( const Point &rOfst, const Size &rSize ) bInOuterResizePixel = sal_True; // feststellen, ob Scrollbars angezeigt werden duerfen -<<<<<<< local - BOOL bBrowse = pWrtShell->GetViewOptions()->getBrowseMode(); - BOOL bShowH = FALSE, - bShowV = FALSE, - bAuto = FALSE, -======= - sal_Bool bBrowse = pWrtShell->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE); + sal_Bool bBrowse = pWrtShell->GetViewOptions()->getBrowseMode(); sal_Bool bShowH = sal_False, bShowV = sal_False, bAuto = sal_False, ->>>>>>> other bHAuto = bBrowse; switch( GetScrollingMode() ) { @@ -1229,13 +1214,8 @@ void SwView::OuterResizePixel( const Point &rOfst, const Size &rSize ) pDocSh->SetVisArea( pDocSh->SfxInPlaceObject::GetVisArea() );*/ if ( pWrtShell->GetViewOptions()->GetZoomType() != SVX_ZOOM_PERCENT && -<<<<<<< local !pWrtShell->GetViewOptions()->getBrowseMode() ) - _SetZoom( aEditSz, (SvxZoomType)pWrtShell->GetViewOptions()->GetZoomType(), 100, TRUE ); -======= - !pWrtShell->getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE) ) _SetZoom( aEditSz, (SvxZoomType)pWrtShell->GetViewOptions()->GetZoomType(), 100, sal_True ); ->>>>>>> other pWrtShell->EndAction(); bRepeat = bScroll1 != pVScrollbar->IsVisible(sal_True); diff --git a/sw/source/ui/uiview/viewtab.cxx b/sw/source/ui/uiview/viewtab.cxx index 83774f5f0559..5f145e8ca21f 100644 --- a/sw/source/ui/uiview/viewtab.cxx +++ b/sw/source/ui/uiview/viewtab.cxx @@ -275,16 +275,9 @@ void SwView::ExecTabWin( SfxRequest& rReq ) SwWrtShell &rSh = GetWrtShell(); const sal_uInt16 nFrmType = rSh.IsObjSelected() ? FRMTYPE_DRAWOBJ : -<<<<<<< local - rSh.GetFrmType(0,TRUE); - const BOOL bFrmSelection = rSh.IsFrmSelected(); - const BOOL bBrowse = rSh.GetViewOptions()->getBrowseMode(); -======= rSh.GetFrmType(0,sal_True); - const sal_Bool bFrmSelection = rSh.IsFrmSelected(); - const sal_Bool bBrowse = rSh.getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE); - ->>>>>>> other + const sal_Bool bFrmSelection = rSh.IsFrmSelected(); + const sal_Bool bBrowse = rSh.GetViewOptions()->getBrowseMode(); const sal_uInt16 nSlot = rReq.GetSlot(); const sal_uInt16 nDescId = rSh.GetCurPageDesc(); @@ -920,12 +913,7 @@ void SwView::StateTabWin(SfxItemSet& rSet) : rSh.GetFrmType( pPt, sal_True ); const sal_Bool bFrmSelection = rSh.IsFrmSelected(); - -<<<<<<< local - const BOOL bBrowse = rSh.GetViewOptions()->getBrowseMode(); -======= - const sal_Bool bBrowse = rSh.getIDocumentSettingAccess()->get(IDocumentSettingAccess::BROWSE_MODE); ->>>>>>> other + const sal_Bool bBrowse = rSh.GetViewOptions()->getBrowseMode(); // PageOffset/Begrenzer const SwRect& rPageRect = rSh.GetAnyCurRect( RECT_PAGE, pPt ); const SwRect& rPagePrtRect = rSh.GetAnyCurRect( RECT_PAGE_PRT, pPt ); diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx index 1a505b8af00a..c3840549e728 100644 --- a/sw/source/ui/uno/unotxdoc.cxx +++ b/sw/source/ui/uno/unotxdoc.cxx @@ -2751,11 +2751,7 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount( } // --> FME 2005-05-23 #122919# Force field update before PDF export: -<<<<<<< local - pViewShell->UpdateFlds(TRUE); -======= - pWrtShell->ViewShell::UpdateFlds(sal_True); ->>>>>>> other + pViewShell->ViewShell::UpdateFlds(sal_True); // <-- if( bStateChanged ) pRenderDocShell->EnableSetModified( sal_True ); |