diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-05-31 10:45:59 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-31 10:45:59 +0200 |
| commit | 31d2ec14ca3790748cf0c724f14f494cce7dff4f (patch) | |
| tree | 074e3fcfbb3609f15c6f3dbb82f98d2bf35839df /sw/source/ui/inc/column.hxx | |
| parent | Explicitly cast RES_FRMATR enum value to sal_uInt16. (diff) | |
| parent | Version 3.4.0.2, tag libreoffice-3.4.0.2 (3.4.0-rc2) (diff) | |
| download | core-31d2ec14ca3790748cf0c724f14f494cce7dff4f.tar.gz core-31d2ec14ca3790748cf0c724f14f494cce7dff4f.zip | |
Merge commit 'libreoffice-3.4.0.2'
Conflicts:
sw/inc/viewsh.hxx
sw/source/core/layout/paintfrm.cxx
sw/source/ui/index/cnttab.cxx
sw/source/ui/ribbar/inputwin.cxx
Diffstat (limited to 'sw/source/ui/inc/column.hxx')
| -rw-r--r-- | sw/source/ui/inc/column.hxx | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sw/source/ui/inc/column.hxx b/sw/source/ui/inc/column.hxx index 67c58bebcb3a..b36e0623e719 100644 --- a/sw/source/ui/inc/column.hxx +++ b/sw/source/ui/inc/column.hxx @@ -139,8 +139,6 @@ class SwColumnPage : public SfxTabPage FixedText aLinePosLbl; ListBox aLinePosDLB; - FixedLine aVertFL; - FixedLine aPropertiesFL; FixedText aTextDirectionFT; ListBox aTextDirectionLB; |