diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-02-09 13:54:14 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-02-09 13:54:14 +0000 |
| commit | ec6ffa85f9ddf82902288f630f2ae8438e56cd0a (patch) | |
| tree | 872d0c9fa56f5af2b5f2184ca11b3822520ce215 /sw/source/ui/uiview/viewtab.cxx | |
| parent | 5d6803cfcb01af315df5087460e459ff81401053 (diff) | |
INTEGRATION: CWS os76 (1.30.200); FILE MERGED
2006/02/03 19:25:24 os 1.30.200.1: #126939# lcl_ConvertToCols: check size of both arrays to prevent a crash
Diffstat (limited to 'sw/source/ui/uiview/viewtab.cxx')
| -rw-r--r-- | sw/source/ui/uiview/viewtab.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sw/source/ui/uiview/viewtab.cxx b/sw/source/ui/uiview/viewtab.cxx index b27c3dae87..a2b9ff684a 100644 --- a/sw/source/ui/uiview/viewtab.cxx +++ b/sw/source/ui/uiview/viewtab.cxx @@ -4,9 +4,9 @@ * * $RCSfile: viewtab.cxx,v $ * - * $Revision: 1.30 $ + * $Revision: 1.31 $ * - * last change: $Author: rt $ $Date: 2005-09-09 11:16:12 $ + * last change: $Author: rt $ $Date: 2006-02-09 14:54:14 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -178,6 +178,10 @@ void lcl_ConvertToCols(const SvxColumnItem& rColItem, SwFmtCol& rCols) { ASSERT( rCols.GetNumCols() == rColItem.Count(), "Column count mismatch" ); + // #126939# ruler executes that change the columns shortly after the selection has changed + // can result in a crash + if(rCols.GetNumCols() != rColItem.Count()) + return; USHORT nLeft = 0; SwTwips nSumAll= 0; // Summiere alle Spalten und Raender auf |