diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-11-24 17:40:26 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-11-24 18:06:18 +0100 |
| commit | 5c31a1b5474f5284cf694d04de5734921891915c (patch) | |
| tree | caebf1ffe12229d2370c76ad1fa0ae50e77c285f | |
| parent | b94c9e0d82c7430ad7c2f3b10b60651a141100a2 (diff) | |
fdo#86633: sw: remove bad tab pages from SwParaDlg for drawing objects
"Area" and "Transparence" only supported by Writer paragraphs.
(regression from 7d9bb549d498d6beed2c4050c402d09643febdfa)
Change-Id: I732e8d40fdeafaebf219fc7c5ddd53b850d8eca6
| -rw-r--r-- | sfx2/source/dialog/tabdlg.cxx | 3 | ||||
| -rw-r--r-- | sw/source/ui/chrdlg/pardlg.cxx | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index 1481fbd7de22..d533f3571a3b 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -551,7 +551,8 @@ void SfxTabDialog::SetApplyHandler(const Link& _rHdl) void SfxTabDialog::Start_Impl() { - DBG_ASSERT( pImpl->aData.size() == m_pTabCtrl->GetPageCount(), "not all pages registered" ); + assert(pImpl->aData.size() == m_pTabCtrl->GetPageCount() + && "not all pages registered"); sal_uInt16 nActPage = m_pTabCtrl->GetPageId( 0 ); // load old settings, when exists diff --git a/sw/source/ui/chrdlg/pardlg.cxx b/sw/source/ui/chrdlg/pardlg.cxx index 58b4a43187b9..3b007cabcc04 100644 --- a/sw/source/ui/chrdlg/pardlg.cxx +++ b/sw/source/ui/chrdlg/pardlg.cxx @@ -129,6 +129,8 @@ SwParaDlg::SwParaDlg(vcl::Window *pParent, RemoveTabPage("labelTP_DROPCAPS"); RemoveTabPage("labelTP_BACKGROUND"); RemoveTabPage("labelTP_BORDER"); + RemoveTabPage("area"); + RemoveTabPage("transparence"); } else { |