diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-20 09:48:41 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-20 09:48:41 +0200 |
| commit | 2850da4f8cab294b2f897d170b35ec532e3c4d49 (patch) | |
| tree | 549908e5c5b1d28ba2a6a37369201079c1209a5b /sw/source/ui/table/tabledlg.src | |
| parent | 457fe4e7e83a0fed70a07ddeb2158e02ff1bca7e (diff) | |
| parent | 5f03f0c86933b1372a96d05018610205bbd43db9 (diff) | |
Merge branch 'master' into feature/gnumake4
Conflicts:
starmath/JunitTest_sm_unoapi.mk
starmath/Library_sm.mk
starmath/Library_smd.mk
starmath/Makefile
starmath/prj/build.lst
starmath/prj/makefile.mk
starmath/qa/unoapi/Test.java
starmath/source/detreg.cxx
starmath/source/register.cxx
starmath/source/smdetect.cxx
sw/Library_sw.mk
sw/Library_swd.mk
sw/Library_swui.mk
sw/Library_vbaswobj.mk
sw/inc/iodetect.hxx
sw/inc/swddllapi.h
sw/source/filter/basflt/iodetect.cxx
Diffstat (limited to 'sw/source/ui/table/tabledlg.src')
| -rw-r--r-- | sw/source/ui/table/tabledlg.src | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sw/source/ui/table/tabledlg.src b/sw/source/ui/table/tabledlg.src index 51248119c5f1..1a0fc0ea55ee 100644 --- a/sw/source/ui/table/tabledlg.src +++ b/sw/source/ui/table/tabledlg.src @@ -616,7 +616,6 @@ TabPage TP_TABLE_TEXTFLOW // Disable = TRUE; Pos = MAP_APPFONT ( 178 , 14 ) ; Size = MAP_APPFONT ( 70 , 10 ) ; - // ### ACHTUNG: Neuer Text in Resource? S~palte : ~Spalte Text [ en-US ] = "Col~umn" ; }; RadioButton RB_PAGEBREAKBEFORE |