diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-05-31 10:45:45 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-31 10:45:45 +0200 |
| commit | bcb1ceafcc18aaa8199b21478dde39bdb9ae83dd (patch) | |
| tree | 619295a796fca507fa238235093b2c35323ffe84 /writerfilter/inc | |
| parent | 102d51ec7c35c0b90fff89093d1d2d8c47ea0b7c (diff) | |
| parent | 348f3a8b166c7c937766a25ec43eb9c0ecb38200 (diff) | |
Merge commit 'libreoffice-3.4.0.2'
Conflicts:
filter/source/graphicfilter/eps/eps.cxx
oox/source/export/shapes.cxx
oox/source/xls/workbookhelper.cxx
Diffstat (limited to 'writerfilter/inc')
| -rw-r--r-- | writerfilter/inc/resourcemodel/TableManager.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/writerfilter/inc/resourcemodel/TableManager.hxx b/writerfilter/inc/resourcemodel/TableManager.hxx index c22ea5090a72..a0525d1b45d9 100644 --- a/writerfilter/inc/resourcemodel/TableManager.hxx +++ b/writerfilter/inc/resourcemodel/TableManager.hxx @@ -221,7 +221,7 @@ class TableManager void resetRowProps() { - mpCellProps.reset(); + mpRowProps.reset(); } void setRowProps(PropertiesPointer pProps) |