wrtsh2.cxx (332f371a) | wrtsh2.cxx (d5f1f34e) |
---|---|
1/************************************************************** 2 * 3 * Licensed to the Apache Software Foundation (ASF) under one 4 * or more contributor license agreements. See the NOTICE file 5 * distributed with this work for additional information 6 * regarding copyright ownership. The ASF licenses this file 7 * to you under the Apache License, Version 2.0 (the 8 * "License"); you may not use this file except in compliance --- 86 unchanged lines hidden (view full) --- 95 // for annotation fields: 96 // - keep the current selection in order to create a corresponding annotation mark 97 // - collapse cursor to its end 98 if ( IsTableMode() ) 99 { 100 GetTblCrs()->Normalize( sal_False ); 101 const SwPosition rStartPos( *(GetTblCrs()->GetMark()->nNode.GetNode().GetCntntNode()), 0 ); 102 KillPams(); | 1/************************************************************** 2 * 3 * Licensed to the Apache Software Foundation (ASF) under one 4 * or more contributor license agreements. See the NOTICE file 5 * distributed with this work for additional information 6 * regarding copyright ownership. The ASF licenses this file 7 * to you under the Apache License, Version 2.0 (the 8 * "License"); you may not use this file except in compliance --- 86 unchanged lines hidden (view full) --- 95 // for annotation fields: 96 // - keep the current selection in order to create a corresponding annotation mark 97 // - collapse cursor to its end 98 if ( IsTableMode() ) 99 { 100 GetTblCrs()->Normalize( sal_False ); 101 const SwPosition rStartPos( *(GetTblCrs()->GetMark()->nNode.GetNode().GetCntntNode()), 0 ); 102 KillPams(); |
103 EndPara(); | 103 if ( !IsEndOfPara() ) 104 { 105 EndPara(); 106 } |
104 const SwPosition rEndPos( *GetCurrentShellCursor().GetPoint() ); 105 pAnnotationTextRange = new SwPaM( rStartPos, rEndPos ); 106 } 107 else 108 { 109 NormalizePam( sal_False ); 110 const SwPaM& rCurrPaM = GetCurrentShellCursor(); 111 pAnnotationTextRange = new SwPaM( *rCurrPaM.GetPoint(), *rCurrPaM.GetMark() ); --- 422 unchanged lines hidden --- | 107 const SwPosition rEndPos( *GetCurrentShellCursor().GetPoint() ); 108 pAnnotationTextRange = new SwPaM( rStartPos, rEndPos ); 109 } 110 else 111 { 112 NormalizePam( sal_False ); 113 const SwPaM& rCurrPaM = GetCurrentShellCursor(); 114 pAnnotationTextRange = new SwPaM( *rCurrPaM.GetPoint(), *rCurrPaM.GetMark() ); --- 422 unchanged lines hidden --- |