diff options
Diffstat (limited to 'sw/source/uibase')
| -rw-r--r-- | sw/source/uibase/docvw/srcedtw.cxx | 10 | ||||
| -rw-r--r-- | sw/source/uibase/inc/optpage.hxx | 4 | ||||
| -rw-r--r-- | sw/source/uibase/uiview/view.cxx | 2 |
3 files changed, 1 insertions, 15 deletions
diff --git a/sw/source/uibase/docvw/srcedtw.cxx b/sw/source/uibase/docvw/srcedtw.cxx index 288bcd774716..f8f825abd129 100644 --- a/sw/source/uibase/docvw/srcedtw.cxx +++ b/sw/source/uibase/docvw/srcedtw.cxx @@ -52,7 +52,6 @@ namespace struct TextPortion { - sal_uInt16 nLine; sal_uInt16 nStart, nEnd; svtools::ColorConfigEntry eType; }; @@ -91,7 +90,6 @@ static void lcl_Highlight(const OUString& rSource, TextPortions& aPortionList) // insert 'empty' portion if(nPortEnd < nActPos - 1 ) { - aText.nLine = 0; // don't move at the beginning aText.nStart = nPortEnd; if(nInsert) @@ -185,7 +183,6 @@ static void lcl_Highlight(const OUString& rSource, TextPortions& aPortionList) if(bFound ||(eFoundType == svtools::HTMLCOMMENT)) { TextPortion aTextPortion; - aTextPortion.nLine = 0; aTextPortion.nStart = nPortStart + 1; aTextPortion.nEnd = nPortEnd; aTextPortion.eType = eFoundType; @@ -199,7 +196,6 @@ static void lcl_Highlight(const OUString& rSource, TextPortions& aPortionList) } if(nInsert && nPortEnd < nActPos - 1) { - aText.nLine = 0; aText.nStart = nPortEnd + 1; aText.nEnd = nActPos - 1; aText.eType = svtools::HTMLUNKNOWN; @@ -694,9 +690,6 @@ void SwSrcEditWindow::ImpDoHighlight( const OUString& rSource, sal_uInt16 nLineO for ( size_t i = 0; i < nCount; i++ ) { TextPortion& r = aPortionList[i]; - SAL_WARN_IF( - r.nLine != aPortionList[0].nLine, "sw.level2", - "multiple lines after all?"); if ( r.nStart > r.nEnd ) // only until Bug from MD is resolved continue; @@ -722,8 +715,7 @@ void SwSrcEditWindow::ImpDoHighlight( const OUString& rSource, sal_uInt16 nLineO r.eType != svtools::HTMLUNKNOWN) r.eType = svtools::HTMLUNKNOWN; Color aColor(SW_MOD()->GetColorConfig().GetColorValue(r.eType).nColor); - sal_uInt16 nLine = nLineOff+r.nLine; - m_pTextEngine->SetAttrib( TextAttribFontColor( aColor ), nLine, r.nStart, r.nEnd+1 ); + m_pTextEngine->SetAttrib( TextAttribFontColor( aColor ), nLineOff, r.nStart, r.nEnd+1 ); } } diff --git a/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx index f86d5ca0a47d..801230d09bc1 100644 --- a/sw/source/uibase/inc/optpage.hxx +++ b/sw/source/uibase/inc/optpage.hxx @@ -157,11 +157,8 @@ class SwStdFontTabPage : public SfxTabPage bool m_bSetIdxDefault :1; bool m_bListHeightDefault :1; - bool m_bSetListHeightDefault :1; bool m_bLabelHeightDefault :1; - bool m_bSetLabelHeightDefault :1; bool m_bIndexHeightDefault :1; - bool m_bSetIndexHeightDefault :1; sal_uInt8 m_nFontGroup; //fontcfg.hxx: FONT_GROUP_[STANDARD|CJK|CTL] @@ -171,7 +168,6 @@ class SwStdFontTabPage : public SfxTabPage DECL_LINK(StandardHdl, Button*, void ); DECL_LINK(ModifyHdl, Edit&, void ); - DECL_LINK(ModifyHeightHdl, Edit&, void ); DECL_LINK(LoseFocusHdl, Control&, void ); SwStdFontTabPage(vcl::Window* pParent, const SfxItemSet& rSet); diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx index 0138ba9242e7..39b1cb7081b3 100644 --- a/sw/source/uibase/uiview/view.cxx +++ b/sw/source/uibase/uiview/view.cxx @@ -729,7 +729,6 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh ) SvxRulerSupportFlags::BORDERS | SvxRulerSupportFlags::REDUCED_METRIC, GetViewFrame()->GetBindings(), WB_VSCROLL | WB_EXTRAFIELD | WB_BORDER )), - m_pTogglePageBtn(nullptr), m_pLastTableFormat(nullptr), m_pFormatClipboard(new SwFormatClipboard()), m_nSelectionType( SelectionType::All ), @@ -1094,7 +1093,6 @@ SwView::~SwView() m_pVScrollbar.disposeAndClear(); m_pHRuler.disposeAndClear(); m_pVRuler.disposeAndClear(); - m_pTogglePageBtn.disposeAndClear(); m_pGlosHdl.reset(); m_pViewImpl.reset(); |