diff options
35 files changed, 110 insertions, 163 deletions
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx index 4fe98288c813..c56b5ed3d999 100644 --- a/sw/source/core/doc/doccomp.cxx +++ b/sw/source/core/doc/doccomp.cxx @@ -318,19 +318,14 @@ class CommonSubseq { private: std::unique_ptr<int[]> pData; - int nSize; protected: ArrayComparator &rCmp; CommonSubseq( ArrayComparator &rComparator, int nMaxSize ) - : nSize( nMaxSize ), rCmp( rComparator ) - { - pData.reset( new int[ nSize ] ); - } - - ~CommonSubseq() + : rCmp( rComparator ) { + pData.reset( new int[ nMaxSize ] ); } int FindLCS( int *pLcs1, int *pLcs2, int nStt1, diff --git a/sw/source/core/doc/docsort.cxx b/sw/source/core/doc/docsort.cxx index 8822c36e5de8..0541b19c0d33 100644 --- a/sw/source/core/doc/docsort.cxx +++ b/sw/source/core/doc/docsort.cxx @@ -741,9 +741,8 @@ void MoveCell(SwDoc* pDoc, const SwTableBox* pSource, const SwTableBox* pTar, } /// Generate two-dimensional array of FndBoxes -FlatFndBox::FlatFndBox(SwDoc* pDocPtr, const FndBox_& rBox) : +FlatFndBox::FlatFndBox(SwDoc* pDocPtr, const FndBox_& rBoxRef) : pDoc(pDocPtr), - rBoxRef(rBox), nRow(0), nCol(0) { // If the array is symmetric diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx index f80c39a0017b..19dff285050c 100644 --- a/sw/source/core/edit/autofmt.cxx +++ b/sw/source/core/edit/autofmt.cxx @@ -117,23 +117,7 @@ class SwAutoFormat NO_DELIM = (DIGIT|LOWER_ALPHA|UPPER_ALPHA|LOWER_ROMAN|UPPER_ROMAN) }; - enum Format_Status - { - READ_NEXT_PARA, - TST_EMPTY_LINE, - TST_ALPHA_LINE, - GET_ALL_INFO, - IS_ONE_LINE, - TST_ENUMERIC, - TST_IDENT, - TST_NEG_IDENT, - TST_TXT_BODY, - HAS_FMTCOLL, - IS_END - } m_eStat; - bool m_bEnd : 1; - bool m_bEmptyLine : 1; bool m_bMoreLines : 1; CharClass& GetCharClass( LanguageType eLang ) const @@ -2114,6 +2098,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFormatFlags const & bool bNxtEmpty = false; bool bNxtAlpha = false; sal_uInt16 nNxtLevel = 0; + bool bEmptyLine; // set area for autoformatting if( pSttNd ) @@ -2125,12 +2110,12 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFormatFlags const & // check the previous TextNode pNxtNd = m_aNdIdx.GetNode().GetTextNode(); - m_bEmptyLine = !pNxtNd || + bEmptyLine = !pNxtNd || IsEmptyLine( *pNxtNd ) || IsNoAlphaLine( *pNxtNd ); } else - m_bEmptyLine = true; // at document beginning + bEmptyLine = true; // at document beginning m_bEnd = false; @@ -2166,16 +2151,31 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFormatFlags const & // set defaults SwTextFrameInfo aFInfo( nullptr ); + enum Format_Status + { + READ_NEXT_PARA, + TST_EMPTY_LINE, + TST_ALPHA_LINE, + GET_ALL_INFO, + IS_ONE_LINE, + TST_ENUMERIC, + TST_IDENT, + TST_NEG_IDENT, + TST_TXT_BODY, + HAS_FMTCOLL, + IS_END + } eStat; + // This is the automat for autoformatting - m_eStat = READ_NEXT_PARA; + eStat = READ_NEXT_PARA; while( !m_bEnd ) { - switch( m_eStat ) + switch( eStat ) { case READ_NEXT_PARA: { GoNextPara(); - m_eStat = m_bEnd ? IS_END : TST_EMPTY_LINE; + eStat = m_bEnd ? IS_END : TST_EMPTY_LINE; } break; @@ -2184,17 +2184,17 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFormatFlags const & { if( m_aFlags.bDelEmptyNode && !HasObjects( *m_pCurTextNd ) ) { - m_bEmptyLine = true; + bEmptyLine = true; sal_uLong nOldCnt = m_pDoc->GetNodes().Count(); DelEmptyLine(); // Was there really a deletion of a node? if( nOldCnt != m_pDoc->GetNodes().Count() ) --m_aNdIdx; // do not skip the next paragraph } - m_eStat = READ_NEXT_PARA; + eStat = READ_NEXT_PARA; } else - m_eStat = TST_ALPHA_LINE; + eStat = TST_ALPHA_LINE; break; case TST_ALPHA_LINE: @@ -2208,7 +2208,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFormatFlags const & *pEdShell->GetCursor() = m_aDelPam; pEdShell->Push(); - m_eStat = IS_END; + eStat = IS_END; break; } @@ -2217,12 +2217,12 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFormatFlags const & if( !DoUnderline() && bReplaceStyles ) { SetColl( RES_POOLCOLL_STANDARD, true ); - m_bEmptyLine = true; + bEmptyLine = true; } - m_eStat = READ_NEXT_PARA; + eStat = READ_NEXT_PARA; } else - m_eStat = GET_ALL_INFO; + eStat = GET_ALL_INFO; break; case GET_ALL_INFO: @@ -2230,8 +2230,8 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFormatFlags const & if( m_pCurTextNd->GetNumRule() ) { // do nothing in numbering, go to next - m_bEmptyLine = false; - m_eStat = READ_NEXT_PARA; + bEmptyLine = false; + eStat = READ_NEXT_PARA; // delete all blanks at beginning/end and in between //JP 29.04.98: first only "all in between" DelMoreLinesBlanks(); @@ -2249,7 +2249,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFormatFlags const & (RES_POOLCOLL_TEXT_MOVE != nPoolId && RES_POOLCOLL_TEXT != nPoolId )) )) { - m_eStat = HAS_FMTCOLL; + eStat = HAS_FMTCOLL; break; } @@ -2272,7 +2272,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFormatFlags const & if( nLevel >= MAXLEVEL ) nLevel = MAXLEVEL-1; BuildEnum( nLevel, nDigitLvl ); - m_eStat = READ_NEXT_PARA; + eStat = READ_NEXT_PARA; break; } @@ -2289,7 +2289,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFormatFlags const & else if( pLRSpace->GetTextLeft() ) // is indentation BuildTextIndent(); } - m_eStat = READ_NEXT_PARA; + eStat = READ_NEXT_PARA; break; } } @@ -2303,8 +2303,8 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFormatFlags const & bNxtAlpha = IsNoAlphaLine( *pNxtNd ); nNxtLevel = CalcLevel( *pNxtNd ); - if( !m_bEmptyLine && HasBreakAttr( *m_pCurTextNd ) ) - m_bEmptyLine = true; + if( !bEmptyLine && HasBreakAttr( *m_pCurTextNd ) ) + bEmptyLine = true; if( !bNxtEmpty && HasBreakAttr( *pNxtNd ) ) bNxtEmpty = true; @@ -2315,13 +2315,13 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFormatFlags const & bNxtAlpha = false; nNxtLevel = 0; } - m_eStat = !m_bMoreLines ? IS_ONE_LINE : TST_ENUMERIC; + eStat = !m_bMoreLines ? IS_ONE_LINE : TST_ENUMERIC; } break; case IS_ONE_LINE: { - m_eStat = TST_ENUMERIC; + eStat = TST_ENUMERIC; if( !bReplaceStyles ) break; @@ -2329,17 +2329,17 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFormatFlags const & if( sClrStr.isEmpty() ) { - m_bEmptyLine = true; - m_eStat = READ_NEXT_PARA; + bEmptyLine = true; + eStat = READ_NEXT_PARA; break; // read next paragraph } // check if headline - if( !m_bEmptyLine || !IsFirstCharCapital( *m_pCurTextNd ) || + if( !bEmptyLine || !IsFirstCharCapital( *m_pCurTextNd ) || IsBlanksInString( *m_pCurTextNd ) ) break; - m_bEmptyLine = false; + bEmptyLine = false; const OUString sEndClrStr( DelTrailingBlanks(sClrStr) ); const sal_Unicode cLast = sEndClrStr[sEndClrStr.getLength() - 1]; @@ -2347,7 +2347,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFormatFlags const & if( ':' == cLast ) { BuildHeadLine( 2 ); - m_eStat = READ_NEXT_PARA; + eStat = READ_NEXT_PARA; break; } else if( 256 <= cLast || !strchr( ",.;", cLast ) ) @@ -2381,7 +2381,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFormatFlags const & BuildHeadLine( nLevel ); else BuildHeadLine( m_nLastHeadLvl ); - m_eStat = READ_NEXT_PARA; + eStat = READ_NEXT_PARA; break; } } @@ -2390,18 +2390,18 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFormatFlags const & case TST_ENUMERIC: { - m_bEmptyLine = false; + bEmptyLine = false; if( IsEnumericChar( *m_pCurTextNd )) { if( nLevel >= MAXLEVEL ) nLevel = MAXLEVEL-1; BuildEnum( nLevel, nDigitLvl ); - m_eStat = READ_NEXT_PARA; + eStat = READ_NEXT_PARA; } else if( bReplaceStyles ) - m_eStat = nLevel ? TST_IDENT : TST_NEG_IDENT; + eStat = nLevel ? TST_IDENT : TST_NEG_IDENT; else - m_eStat = READ_NEXT_PARA; + eStat = READ_NEXT_PARA; } break; @@ -2416,7 +2416,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFormatFlags const & BuildNegIndent( aFInfo.GetLineStart() ); else // is indentation BuildTextIndent(); - m_eStat = READ_NEXT_PARA; + eStat = READ_NEXT_PARA; } else if( nLevel && pNxtNd && !m_bEnd && !bNxtEmpty && !bNxtAlpha && !nNxtLevel && @@ -2424,10 +2424,10 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFormatFlags const & { // is an indentation BuildIndent(); - m_eStat = READ_NEXT_PARA; + eStat = READ_NEXT_PARA; } else - m_eStat = TST_TXT_BODY; + eStat = TST_TXT_BODY; break; case TST_NEG_IDENT: @@ -2442,7 +2442,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFormatFlags const & BuildNegIndent( aFInfo.GetLineStart() ); else // is _no_ indentation BuildText(); - m_eStat = READ_NEXT_PARA; + eStat = READ_NEXT_PARA; } else if( !nLevel && pNxtNd && !m_bEnd && !bNxtEmpty && !bNxtAlpha && nNxtLevel && @@ -2450,10 +2450,10 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFormatFlags const & { // is a negative indentation BuildNegIndent( aFInfo.GetLineStart() ); - m_eStat = READ_NEXT_PARA; + eStat = READ_NEXT_PARA; } else - m_eStat = TST_TXT_BODY; + eStat = TST_TXT_BODY; } break; @@ -2475,15 +2475,15 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFormatFlags const & BuildTextIndent(); else BuildText(); - m_eStat = READ_NEXT_PARA; + eStat = READ_NEXT_PARA; } break; case HAS_FMTCOLL: { // so far: if there were templates assigned, keep these and go to next node - m_bEmptyLine = false; - m_eStat = READ_NEXT_PARA; + bEmptyLine = false; + eStat = READ_NEXT_PARA; // delete all blanks at beginning/end and in between //JP 29.04.98: first only "all in between" DelMoreLinesBlanks(); diff --git a/sw/source/core/inc/UndoDraw.hxx b/sw/source/core/inc/UndoDraw.hxx index 3a758af6c86c..8229c2a8e77e 100644 --- a/sw/source/core/inc/UndoDraw.hxx +++ b/sw/source/core/inc/UndoDraw.hxx @@ -117,7 +117,6 @@ class SwUndoDrawDelete : public SwUndo { std::unique_ptr<SwUndoGroupObjImpl[]> pObjArr; SdrMarkList* pMarkLst; // MarkList for all selected SdrObjects - sal_uInt16 nSize; bool bDelFormat; public: diff --git a/sw/source/core/inc/docsort.hxx b/sw/source/core/inc/docsort.hxx index 10f141d656e4..fc10a3b987c4 100644 --- a/sw/source/core/inc/docsort.hxx +++ b/sw/source/core/inc/docsort.hxx @@ -139,7 +139,6 @@ private: void FillFlat(const FndBox_&, bool bLastBox=false); SwDoc* pDoc; - const FndBox_& rBoxRef; std::unique_ptr<FndBox_ const *[]> pArr; std::vector<std::unique_ptr<SfxItemSet>> ppItemSets; diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx index 5cbc6dbd38c5..8da2bd271369 100644 --- a/sw/source/core/text/frmpaint.cxx +++ b/sw/source/core/text/frmpaint.cxx @@ -71,7 +71,6 @@ class SwExtraPainter sal_uLong nLineNr; sal_uInt16 nDivider; bool bGoLeft; - bool bLineNum; bool IsClipChg() { return aClip.IsChg(); } SwExtraPainter(const SwExtraPainter&) = delete; @@ -93,7 +92,7 @@ public: SwExtraPainter::SwExtraPainter( const SwTextFrame *pFrame, SwViewShell *pVwSh, const SwLineNumberInfo &rLnInf, const SwRect &rRct, - sal_Int16 eHor, bool bLnNm ) + sal_Int16 eHor, bool bLineNum ) : aClip( pVwSh->GetWin() || pFrame->IsUndersized() ? pVwSh->GetOut() : nullptr ) , aRect( rRct ) , pTextFrame( pFrame ) @@ -105,7 +104,6 @@ SwExtraPainter::SwExtraPainter( const SwTextFrame *pFrame, SwViewShell *pVwSh, , nLineNr( 1 ) , nDivider(0) , bGoLeft(false) - , bLineNum( bLnNm ) { if( pFrame->IsUndersized() ) { diff --git a/sw/source/core/undo/undraw.cxx b/sw/source/core/undo/undraw.cxx index fa8e2003813f..f007d86eee08 100644 --- a/sw/source/core/undo/undraw.cxx +++ b/sw/source/core/undo/undraw.cxx @@ -478,9 +478,9 @@ void SwUndoDrawUnGroupConnectToLayout::AddFormatAndObj( SwDrawFrameFormat* pDraw } SwUndoDrawDelete::SwUndoDrawDelete( sal_uInt16 nCnt, const SwDoc* pDoc ) - : SwUndo( SwUndoId::DRAWDELETE, pDoc ), nSize( nCnt ), bDelFormat( true ) + : SwUndo( SwUndoId::DRAWDELETE, pDoc ), bDelFormat( true ) { - pObjArr.reset( new SwUndoGroupObjImpl[ nSize ] ); + pObjArr.reset( new SwUndoGroupObjImpl[ nCnt ] ); pMarkLst = new SdrMarkList(); } diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index 9e7230dc7b35..3b6f1b33f980 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -2807,7 +2807,6 @@ class CellSaveStruct : public SectionSaveStruct sal_uInt16 m_nRowSpan, m_nColSpan, m_nWidth, m_nHeight; sal_Int32 m_nNoBreakEndContentPos; // Character index of a <NOBR> - SvxAdjust m_eAdjust; sal_Int16 m_eVertOri; bool m_bHead : 1; @@ -2850,7 +2849,6 @@ CellSaveStruct::CellSaveStruct( SwHTMLParser& rParser, HTMLTable const *pCurTabl m_nWidth( 0 ), m_nHeight( 0 ), m_nNoBreakEndContentPos( 0 ), - m_eAdjust( pCurTable->GetInheritedAdjust() ), m_eVertOri( pCurTable->GetInheritedVertOri() ), m_bHead( bHd ), m_bPrcWidth( false ), @@ -2861,6 +2859,7 @@ CellSaveStruct::CellSaveStruct( SwHTMLParser& rParser, HTMLTable const *pCurTabl m_bNoBreak( false ) { OUString aNumFormat, aValue; + SvxAdjust eAdjust( pCurTable->GetInheritedAdjust() ); if( bReadOpt ) { @@ -2890,7 +2889,7 @@ CellSaveStruct::CellSaveStruct( SwHTMLParser& rParser, HTMLTable const *pCurTabl } break; case HtmlOptionId::ALIGN: - m_eAdjust = rOption.GetEnum( aHTMLPAlignTable, m_eAdjust ); + eAdjust = rOption.GetEnum( aHTMLPAlignTable, eAdjust ); break; case HtmlOptionId::VALIGN: m_eVertOri = rOption.GetEnum( aHTMLTableVAlignTable, m_eVertOri ); @@ -2972,8 +2971,8 @@ CellSaveStruct::CellSaveStruct( SwHTMLParser& rParser, HTMLTable const *pCurTabl nColl = RES_POOLCOLL_TABLE; } std::unique_ptr<HTMLAttrContext> xCntxt(new HTMLAttrContext(nToken, nColl, aEmptyOUStr, true)); - if( SvxAdjust::End != m_eAdjust ) - rParser.InsertAttr(&rParser.m_xAttrTab->pAdjust, SvxAdjustItem(m_eAdjust, RES_PARATR_ADJUST), + if( SvxAdjust::End != eAdjust ) + rParser.InsertAttr(&rParser.m_xAttrTab->pAdjust, SvxAdjustItem(eAdjust, RES_PARATR_ADJUST), xCntxt.get()); if( SwHTMLParser::HasStyleOptions( m_aStyle, m_aId, m_aClass, &m_aLang, &m_aDir ) ) @@ -4851,14 +4850,11 @@ namespace { class FrameDeleteWatch : public SwClient { - SwFrameFormat* m_pObjectFormat; public: FrameDeleteWatch(SwFrameFormat* pObjectFormat) - : m_pObjectFormat(pObjectFormat) { - if (m_pObjectFormat) - m_pObjectFormat->Add(this); - + if (pObjectFormat) + pObjectFormat->Add(this); } virtual void SwClientNotify(const SwModify& rModify, const SfxHint& rHint) override diff --git a/sw/source/ui/chrdlg/pardlg.cxx b/sw/source/ui/chrdlg/pardlg.cxx index 01491a1f6d96..74466e80e7eb 100644 --- a/sw/source/ui/chrdlg/pardlg.cxx +++ b/sw/source/ui/chrdlg/pardlg.cxx @@ -55,7 +55,6 @@ SwParaDlg::SwParaDlg(vcl::Window *pParent, "modules/swriter/ui/paradialog.ui", &rCoreSet, nullptr != pTitle) , rView(rVw) - , nDlgMode(nDialogMode) , bDrawParaDlg(bDraw) , m_nParaStd(0) , m_nParaAlign(0) @@ -132,7 +131,7 @@ SwParaDlg::SwParaDlg(vcl::Window *pParent, } else { - if(!(nDlgMode & DLG_ENVELOP)) + if(!(nDialogMode & DLG_ENVELOP)) m_nParaNumPara = AddTabPage("labelTP_NUMPARA", SwParagraphNumTabPage::Create, SwParagraphNumTabPage::GetRanges); else RemoveTabPage("labelTP_NUMPARA"); diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index fc16a924ea11..11525600f450 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -405,7 +405,6 @@ SwCaptionPreview::SwCaptionPreview(vcl::Window* pParent, WinBits nStyle) : Window(pParent, nStyle) , mbFontInitialized(false) { - maDrawPos = Point(4, 6); } VCL_BUILDER_FACTORY_CONSTRUCTOR(SwCaptionPreview, 0) @@ -487,7 +486,6 @@ SwCaptionOptPage::SwCaptionOptPage(vcl::Window* pParent, const SfxItemSet& rSet) SwStyleNameMapper::FillUIName(RES_POOLCOLL_LABEL_TABLE, m_sTable); SwStyleNameMapper::FillUIName(RES_POOLCOLL_LABEL_FRAME, m_sText); SwStyleNameMapper::FillUIName(RES_POOLCOLL_LABEL_DRAWING, m_sDrawing); - SwStyleNameMapper::FillUIName(RES_POOLCOLL_LABEL_FIGURE, m_sFigure); SwWrtShell* pSh = ::GetActiveWrtShell(); diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx index 7c9f56525e29..6345de75d88f 100644 --- a/sw/source/ui/dbui/addresslistdialog.cxx +++ b/sw/source/ui/dbui/addresslistdialog.cxx @@ -178,8 +178,8 @@ SwAddressListDialog::SwAddressListDialog(SwMailMergeAddressBlockPage* pParent) get(m_pTablePB, "changetable"); get(m_pOK, "ok"); - m_sName = get<FixedText>("name")->GetText(); - m_sTable = get<FixedText>("table")->GetText(); + OUString sName = get<FixedText>("name")->GetText(); + OUString sTable = get<FixedText>("table")->GetText(); m_sConnecting = get<FixedText>("connecting")->GetText(); const OUString sTemp(m_pDescriptionFI->GetText() @@ -198,7 +198,7 @@ SwAddressListDialog::SwAddressListDialog(SwMailMergeAddressBlockPage* pParent) pHeaderTreeContainer->set_height_request(aSize.Height()); m_pListLB = VclPtr<SwAddrSourceLB>::Create(*pHeaderTreeContainer); - m_pListLB->InsertHeaderEntry(m_sName + "\t" + m_sTable); + m_pListLB->InsertHeaderEntry(sName + "\t" + sTable); m_pListLB->setColSizes(); m_pListLB->SetStyle( m_pListLB->GetStyle() | WB_SORT | WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP ); diff --git a/sw/source/ui/dbui/addresslistdialog.hxx b/sw/source/ui/dbui/addresslistdialog.hxx index 6769c8353151..5344092e69cb 100644 --- a/sw/source/ui/dbui/addresslistdialog.hxx +++ b/sw/source/ui/dbui/addresslistdialog.hxx @@ -57,8 +57,6 @@ class SwAddressListDialog : public SfxModalDialog VclPtr<OKButton> m_pOK; - OUString m_sName; - OUString m_sTable; OUString m_sConnecting; SvTreeListEntry* m_pCreatedDataSource; diff --git a/sw/source/ui/dbui/mailmergewizard.cxx b/sw/source/ui/dbui/mailmergewizard.cxx index 72702b2b264e..a862e377ce1b 100644 --- a/sw/source/ui/dbui/mailmergewizard.cxx +++ b/sw/source/ui/dbui/mailmergewizard.cxx @@ -49,7 +49,6 @@ SwMailMergeWizard::SwMailMergeWizard(SwView& rView, std::shared_ptr<SwMailMergeC m_sAddressList( SwResId( ST_ADDRESSLIST )), m_sGreetingsLine( SwResId( ST_GREETINGSLINE )), m_sLayout( SwResId( ST_LAYOUT )), - m_sFinish( SwResId( ST_FINISH )), m_nRestartPage( MM_DOCUMENTSELECTPAGE ) { defaultButton(WizardButtonFlags::NEXT); @@ -57,7 +56,7 @@ SwMailMergeWizard::SwMailMergeWizard(SwView& rView, std::shared_ptr<SwMailMergeC setTitleBase(SwResId( ST_MMWTITLE ) ); - m_pFinish->SetText(m_sFinish); + m_pFinish->SetText(SwResId( ST_FINISH )); m_pNextPage->SetHelpId(HID_MM_NEXT_PAGE); m_pPrevPage->SetHelpId(HID_MM_PREV_PAGE); diff --git a/sw/source/ui/dbui/selectdbtabledialog.cxx b/sw/source/ui/dbui/selectdbtabledialog.cxx index f376d78696bd..28765408fc59 100644 --- a/sw/source/ui/dbui/selectdbtabledialog.cxx +++ b/sw/source/ui/dbui/selectdbtabledialog.cxx @@ -87,10 +87,6 @@ void SwAddressTable::setColSizes() SwSelectDBTableDialog::SwSelectDBTableDialog(vcl::Window* pParent, const uno::Reference< sdbc::XConnection>& rConnection) : SfxModalDialog(pParent, "SelectTableDialog", "modules/swriter/ui/selecttabledialog.ui") - , m_sName(SwResId(ST_NAME)) - , m_sType(SwResId(ST_TYPE)) - , m_sTable(SwResId(ST_TABLE)) - , m_sQuery(SwResId(ST_QUERY)) , m_xConnection(rConnection) { get(m_pPreviewPB, "preview"); @@ -102,8 +98,8 @@ SwSelectDBTableDialog::SwSelectDBTableDialog(vcl::Window* pParent, m_pTable = VclPtr<SwAddressTable>::Create(*pHeaderTreeContainer); long const aStaticTabs[]= { 0, 0 }; m_pTable->SetTabs( SAL_N_ELEMENTS(aStaticTabs), aStaticTabs ); - m_pTable->InsertHeaderItem(1, m_sName ); - m_pTable->InsertHeaderItem(2, m_sType ); + m_pTable->InsertHeaderItem(1, SwResId(ST_NAME) ); + m_pTable->InsertHeaderItem(2, SwResId(ST_TYPE) ); m_pPreviewPB->SetClickHdl(LINK(this, SwSelectDBTableDialog, PreviewHdl)); @@ -117,7 +113,7 @@ SwSelectDBTableDialog::SwSelectDBTableDialog(vcl::Window* pParent, { OUString sEntry = pTables[i]; sEntry += "\t"; - sEntry += m_sTable; + sEntry += SwResId(ST_TABLE); SvTreeListEntry* pEntry = m_pTable->InsertEntry(sEntry); pEntry->SetUserData(nullptr); } @@ -132,7 +128,7 @@ SwSelectDBTableDialog::SwSelectDBTableDialog(vcl::Window* pParent, { OUString sEntry = pQueries[i]; sEntry += "\t"; - sEntry += m_sQuery; + sEntry += SwResId(ST_QUERY); SvTreeListEntry* pEntry = m_pTable->InsertEntry(sEntry); pEntry->SetUserData(reinterpret_cast<void*>(1)); } diff --git a/sw/source/ui/dbui/selectdbtabledialog.hxx b/sw/source/ui/dbui/selectdbtabledialog.hxx index 276afbbd2577..9f251f3ee8a6 100644 --- a/sw/source/ui/dbui/selectdbtabledialog.hxx +++ b/sw/source/ui/dbui/selectdbtabledialog.hxx @@ -37,12 +37,6 @@ class SwSelectDBTableDialog : public SfxModalDialog { VclPtr<SwAddressTable> m_pTable; VclPtr<PushButton> m_pPreviewPB; - - OUString m_sName; - OUString m_sType; - OUString m_sTable; - OUString m_sQuery; - css::uno::Reference<css::sdbc::XConnection> m_xConnection; DECL_LINK(PreviewHdl, Button*, void); diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index da6a099e4beb..2a7a95027dac 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -349,7 +349,7 @@ SwEditRegionDlg::SwEditRegionDlg( vcl::Window* pParent, SwWrtShell& rWrtSh ) get(m_pDismiss, "remove"); get(m_pOK, "ok"); - bWeb = dynamic_cast<SwWebDocShell*>( rSh.GetView().GetDocShell() ) != nullptr; + bool bWeb = dynamic_cast<SwWebDocShell*>( rSh.GetView().GetDocShell() ) != nullptr; m_pTree->SetSelectHdl(LINK(this, SwEditRegionDlg, GetFirstEntryHdl)); m_pTree->SetDeselectHdl(LINK(this, SwEditRegionDlg, DeselectHdl)); diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx index c83bdf3b01d4..6230ad636d48 100644 --- a/sw/source/ui/envelp/mailmrge.cxx +++ b/sw/source/ui/envelp/mailmrge.cxx @@ -128,9 +128,9 @@ SwMailMergeDlg::SwMailMergeDlg(vcl::Window* pParent, SwWrtShell& rShell, pImpl (new SwMailMergeDlg_Impl), rSh (rShell), - nMergeType (DBMGR_MERGE_EMAIL), - m_aDialogSize( GetSizePixel() ) + nMergeType (DBMGR_MERGE_EMAIL) { + Size aDialogSize( GetSizePixel() ); get(m_pBeamerWin, "beamer"); get(m_pAllRB, "all"); @@ -315,7 +315,7 @@ SwMailMergeDlg::SwMailMergeDlg(vcl::Window* pParent, SwWrtShell& rShell, m_pAllRB->Check(); m_pMarkedRB->Enable(false); } - SetMinOutputSizePixel(m_aDialogSize); + SetMinOutputSizePixel(aDialogSize); try { uno::Reference< container::XNameContainer> xFilterFactory( xMSF->createInstance("com.sun.star.document.FilterFactory"), UNO_QUERY_THROW); diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx index 135eefb21216..b3367a1d37e1 100644 --- a/sw/source/ui/frmdlg/cption.cxx +++ b/sw/source/ui/frmdlg/cption.cxx @@ -127,7 +127,7 @@ SwCaptionDialog::SwCaptionDialog( vcl::Window *pParent, SwView &rV ) : SwWrtShell &rSh = rView.GetWrtShell(); uno::Reference< frame::XModel > xModel = rView.GetDocShell()->GetBaseModel(); - eType = rSh.GetSelectionType(); + SelectionType eType = rSh.GetSelectionType(); if ( eType & SelectionType::Ole ) { eType = SelectionType::Graphic; @@ -163,7 +163,6 @@ SwCaptionDialog::SwCaptionDialog( vcl::Window *pParent, SwView &rV ) : nPoolId = RES_POOLCOLL_LABEL_FIGURE; sString = ::GetOldGrfCat(); bCopyAttributes = true; - sObjectName = rSh.GetFlyName(); //if not OLE if(!xNameAccess.is()) { @@ -178,7 +177,6 @@ SwCaptionDialog::SwCaptionDialog( vcl::Window *pParent, SwView &rV ) : sString = ::GetOldTabCat(); uno::Reference< text::XTextTablesSupplier > xTables(xModel, uno::UNO_QUERY); xNameAccess = xTables->getTextTables(); - sObjectName = rSh.GetTableFormat()->GetName(); } else if( eType & SelectionType::Frame ) { @@ -186,7 +184,6 @@ SwCaptionDialog::SwCaptionDialog( vcl::Window *pParent, SwView &rV ) : sString = ::GetOldFrameCat(); uno::Reference< text::XTextFramesSupplier > xFrames(xModel, uno::UNO_QUERY); xNameAccess = xFrames->getTextFrames(); - sObjectName = rSh.GetFlyName(); } else if( eType == SelectionType::Text ) { diff --git a/sw/source/ui/frmdlg/frmdlg.cxx b/sw/source/ui/frmdlg/frmdlg.cxx index 2f9b8d3016e2..fb8915ab7673 100644 --- a/sw/source/ui/frmdlg/frmdlg.cxx +++ b/sw/source/ui/frmdlg/frmdlg.cxx @@ -72,7 +72,7 @@ SwFrameDlg::SwFrameDlg( SfxViewFrame const * pViewFrame, , m_nBorderId(0) { sal_uInt16 nHtmlMode = ::GetHtmlMode(m_pWrtShell->GetView().GetDocShell()); - m_bHTMLMode = (nHtmlMode & HTMLMODE_ON) != 0; + bool bHTMLMode = (nHtmlMode & HTMLMODE_ON) != 0; // example font for both example TabPages @@ -106,7 +106,7 @@ SwFrameDlg::SwFrameDlg( SfxViewFrame const * pViewFrame, m_nMacroId = AddTabPage("macro", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_MACROASSIGN), nullptr); m_nBorderId = AddTabPage("borders", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BORDER ), nullptr); - if(m_bHTMLMode) + if(bHTMLMode) { if (m_sDlgType == "FrameDialog" || m_sDlgType == "ObjectDialog") { diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx index 363dab1a8a0f..e20cf7677b90 100644 --- a/sw/source/ui/frmdlg/wrap.cxx +++ b/sw/source/ui/frmdlg/wrap.cxx @@ -50,10 +50,8 @@ const sal_uInt16 SwWrapTabPage::m_aWrapPageRg[] = { 0 }; -SwWrapDlg::SwWrapDlg(vcl::Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, bool bDrawMode) +SwWrapDlg::SwWrapDlg(vcl::Window* pParent, SfxItemSet& rSet, SwWrtShell* pWrtShell, bool bDrawMode) : SfxSingleTabDialog(pParent, rSet, "WrapDialog", "modules/swriter/ui/wrapdialog.ui") - , pWrtShell(pSh) - { // create TabPage VclPtr<SwWrapTabPage> pNewPage = static_cast<SwWrapTabPage*>( SwWrapTabPage::Create(get_content_area(), &rSet).get() ); diff --git a/sw/source/ui/table/convert.cxx b/sw/source/ui/table/convert.cxx index 0e140f0866f6..e399982fac24 100644 --- a/sw/source/ui/table/convert.cxx +++ b/sw/source/ui/table/convert.cxx @@ -106,7 +106,6 @@ SwConvertTableDlg::SwConvertTableDlg(SwView& rView, bool bToTable) , m_xRepeatHeaderNF(m_xBuilder->weld_spin_button("repeatheadersb")) , m_xDontSplitCB(m_xBuilder->weld_check_button("dontsplitcb")) , m_xAutoFormatBtn(m_xBuilder->weld_button("autofmt")) - , sConvertTextTable(SwResId(STR_CONVERT_TEXT_TABLE)) , pShell(&rView.GetWrtShell()) { if (nSaveButtonState > -1) @@ -133,7 +132,7 @@ SwConvertTableDlg::SwConvertTableDlg(SwView& rView, bool bToTable) } if( bToTable ) { - m_xDialog->set_title(sConvertTextTable); + m_xDialog->set_title(SwResId(STR_CONVERT_TEXT_TABLE)); m_xAutoFormatBtn->connect_clicked(LINK(this, SwConvertTableDlg, AutoFormatHdl)); m_xAutoFormatBtn->show(); m_xKeepColumn->show(); diff --git a/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx b/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx index 7cab19c264d5..7529bdbfe027 100644 --- a/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx +++ b/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx @@ -146,7 +146,6 @@ class SidebarTextControlAccessibleContext : public VCLXAccessibleComponent virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) override; private: - SidebarTextControl& mrSidebarTextControl; ::accessibility::AccessibleTextHelper* mpAccessibleTextHelper; ::osl::Mutex maMutex; @@ -156,12 +155,11 @@ class SidebarTextControlAccessibleContext : public VCLXAccessibleComponent SidebarTextControlAccessibleContext::SidebarTextControlAccessibleContext( SidebarTextControl& rSidebarTextControl ) : VCLXAccessibleComponent( rSidebarTextControl.GetWindowPeer() ) - , mrSidebarTextControl( rSidebarTextControl ) , mpAccessibleTextHelper( nullptr ) , maMutex() { - mpAccessibleTextHelper = new ::accessibility::AccessibleTextHelper( o3tl::make_unique<SidebarTextEditSource>(mrSidebarTextControl) ); - mpAccessibleTextHelper->SetEventSource( mrSidebarTextControl.GetWindowPeer() ); + mpAccessibleTextHelper = new ::accessibility::AccessibleTextHelper( o3tl::make_unique<SidebarTextEditSource>(rSidebarTextControl) ); + mpAccessibleTextHelper->SetEventSource( rSidebarTextControl.GetWindowPeer() ); } SidebarTextControlAccessibleContext::~SidebarTextControlAccessibleContext() diff --git a/sw/source/uibase/docvw/romenu.cxx b/sw/source/uibase/docvw/romenu.cxx index 16034feee07a..af8a625c55cf 100644 --- a/sw/source/uibase/docvw/romenu.cxx +++ b/sw/source/uibase/docvw/romenu.cxx @@ -115,7 +115,8 @@ SwReadOnlyPopup::SwReadOnlyPopup(const Point &rDPos, SwView &rV) { m_bGrfToGalleryAsLnk = SW_MOD()->GetModuleConfig()->IsGrfToGalleryAsLnk(); SwWrtShell &rSh = m_rView.GetWrtShell(); - rSh.IsURLGrfAtPos( m_rDocPos, &m_sURL, &m_sTargetFrameName, &m_sDescription ); + OUString sDescription; + rSh.IsURLGrfAtPos( m_rDocPos, &m_sURL, &m_sTargetFrameName, &sDescription ); if ( m_sURL.isEmpty() ) { SwContentAtPos aContentAtPos( IsAttrAtPos::InetAttr ); @@ -124,7 +125,6 @@ SwReadOnlyPopup::SwReadOnlyPopup(const Point &rDPos, SwView &rV) const SwFormatINetFormat &rIItem = *static_cast<const SwFormatINetFormat*>(aContentAtPos.aFnd.pAttr); m_sURL = rIItem.GetValue(); m_sTargetFrameName = rIItem.GetTargetFrame(); - m_sDescription = aContentAtPos.sStr; } } diff --git a/sw/source/uibase/docvw/romenu.hxx b/sw/source/uibase/docvw/romenu.hxx index 8b0a7fa0badc..7ddf442f7f17 100644 --- a/sw/source/uibase/docvw/romenu.hxx +++ b/sw/source/uibase/docvw/romenu.hxx @@ -63,8 +63,7 @@ class SwReadOnlyPopup const Point &m_rDocPos; Graphic m_aGraphic; OUString m_sURL, - m_sTargetFrameName, - m_sDescription; + m_sTargetFrameName; OUString m_sGrfName; std::vector<OUString> m_aThemeList; bool m_bGrfToGalleryAsLnk; diff --git a/sw/source/uibase/inc/convert.hxx b/sw/source/uibase/inc/convert.hxx index 90d1cfebf715..e62b7cbccad3 100644 --- a/sw/source/uibase/inc/convert.hxx +++ b/sw/source/uibase/inc/convert.hxx @@ -47,7 +47,6 @@ class SwConvertTableDlg : public weld::GenericDialogController std::unique_ptr<weld::CheckButton> m_xDontSplitCB; std::unique_ptr<weld::Button> m_xAutoFormatBtn; - OUString sConvertTextTable; std::unique_ptr<SwTableAutoFormat> mxTAutoFormat; SwWrtShell* pShell; diff --git a/sw/source/uibase/inc/cption.hxx b/sw/source/uibase/inc/cption.hxx index ded6d36b9dc8..3942fe4e0293 100644 --- a/sw/source/uibase/inc/cption.hxx +++ b/sw/source/uibase/inc/cption.hxx @@ -71,10 +71,8 @@ class SwCaptionDialog : public SvxStandardDialog SwView &rView; // search per active, avoid View SwFieldMgr *pMgr; // pointer to save the include - SelectionType eType; OUString sCharacterStyle; - OUString sObjectName; bool bCopyAttributes; bool bOrderNumberingFirst; //#i61007# order of captions diff --git a/sw/source/uibase/inc/frmdlg.hxx b/sw/source/uibase/inc/frmdlg.hxx index 28c8cbbbaaf4..1a05a1ea09c9 100644 --- a/sw/source/uibase/inc/frmdlg.hxx +++ b/sw/source/uibase/inc/frmdlg.hxx @@ -29,7 +29,6 @@ class SwFrameDlg : public SfxTabDialog { bool m_bFormat; bool m_bNew; - bool m_bHTMLMode; const SfxItemSet& m_rSet; OUString m_sDlgType; SwWrtShell* m_pWrtShell; diff --git a/sw/source/uibase/inc/mailmergewizard.hxx b/sw/source/uibase/inc/mailmergewizard.hxx index a9d022f0826e..a184216a917a 100644 --- a/sw/source/uibase/inc/mailmergewizard.hxx +++ b/sw/source/uibase/inc/mailmergewizard.hxx @@ -45,7 +45,6 @@ class SwMailMergeWizard : public ::svt::RoadmapWizard OUString m_sAddressList; OUString m_sGreetingsLine; OUString m_sLayout; - OUString m_sFinish; sal_uInt16 m_nRestartPage; diff --git a/sw/source/uibase/inc/mailmrge.hxx b/sw/source/uibase/inc/mailmrge.hxx index 718353b8b74c..6a2b5bf53566 100644 --- a/sw/source/uibase/inc/mailmrge.hxx +++ b/sw/source/uibase/inc/mailmrge.hxx @@ -101,7 +101,6 @@ class SwMailMergeDlg : public SvxStandardDialog css::uno::Sequence< css::uno::Any > m_aSelection; css::uno::Reference< css::frame::XFrame2 > m_xFrame; - Size m_aDialogSize; OUString m_sSaveFilter; OUString m_sFilename; diff --git a/sw/source/uibase/inc/olmenu.hxx b/sw/source/uibase/inc/olmenu.hxx index d37eb2edbfb5..0f42b7ff05c5 100644 --- a/sw/source/uibase/inc/olmenu.hxx +++ b/sw/source/uibase/inc/olmenu.hxx @@ -99,8 +99,6 @@ class SW_DLLPUBLIC SwSpellPopup OUString m_sExplanationLink; LanguageType m_nCheckedLanguage; - LanguageType m_nGuessLangWord; - LanguageType m_nGuessLangPara; std::map< sal_Int16, OUString > m_aLangTable_Text; std::map< sal_Int16, OUString > m_aLangTable_Paragraph; diff --git a/sw/source/uibase/inc/optload.hxx b/sw/source/uibase/inc/optload.hxx index 5b98e6508463..fb84a7b5ff2d 100644 --- a/sw/source/uibase/inc/optload.hxx +++ b/sw/source/uibase/inc/optload.hxx @@ -116,7 +116,6 @@ private: OUString maText; bool mbFontInitialized; vcl::Font maFont; - Point maDrawPos; public: SwCaptionPreview(vcl::Window* pParent, WinBits nStyle); virtual void ApplySettings(vcl::RenderContext& rRenderContext) override; @@ -157,7 +156,6 @@ private: OUString m_sOLE; OUString m_sIllustration; - OUString m_sFigure; OUString m_sTable; OUString m_sText; OUString m_sDrawing; diff --git a/sw/source/uibase/inc/regionsw.hxx b/sw/source/uibase/inc/regionsw.hxx index b2b38edd1125..70f1e5b5e12c 100644 --- a/sw/source/uibase/inc/regionsw.hxx +++ b/sw/source/uibase/inc/regionsw.hxx @@ -96,7 +96,6 @@ class SwEditRegionDlg : public SfxModalDialog sfx2::DocumentInserter* m_pDocInserter; bool bDontCheckPasswd :1; - bool bWeb :1; void RecurseList( const SwSectionFormat* pFormat, SvTreeListEntry* pEntry); size_t FindArrPos(const SwSectionFormat* pFormat); diff --git a/sw/source/uibase/inc/swuipardlg.hxx b/sw/source/uibase/inc/swuipardlg.hxx index 13c0775459dd..ebb5e0e1cc4e 100644 --- a/sw/source/uibase/inc/swuipardlg.hxx +++ b/sw/source/uibase/inc/swuipardlg.hxx @@ -24,7 +24,6 @@ class SwParaDlg: public SfxTabDialog { SwView& rView; sal_uInt16 nHtmlMode; - sal_uInt8 nDlgMode; bool bDrawParaDlg; sal_uInt16 m_nParaStd; diff --git a/sw/source/uibase/inc/wrap.hxx b/sw/source/uibase/inc/wrap.hxx index 1ab9564207dd..c0c34f1b6404 100644 --- a/sw/source/uibase/inc/wrap.hxx +++ b/sw/source/uibase/inc/wrap.hxx @@ -31,8 +31,6 @@ class SwWrtShell; class SwWrapDlg : public SfxSingleTabDialog { - SwWrtShell* pWrtShell; - public: SwWrapDlg(vcl::Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, bool bDrawMode); }; diff --git a/sw/source/uibase/lingu/olmenu.cxx b/sw/source/uibase/lingu/olmenu.cxx index a4ede37f35a4..111b4e9703a8 100644 --- a/sw/source/uibase/lingu/olmenu.cxx +++ b/sw/source/uibase/lingu/olmenu.cxx @@ -305,20 +305,20 @@ SwSpellPopup::SwSpellPopup( m_xPopupMenu->EnableItem(m_nCorrectMenuId, bEnable); uno::Reference< linguistic2::XLanguageGuessing > xLG = SW_MOD()->GetLanguageGuesser(); - m_nGuessLangWord = LANGUAGE_NONE; - m_nGuessLangPara = LANGUAGE_NONE; + LanguageType nGuessLangWord = LANGUAGE_NONE; + LanguageType nGuessLangPara = LANGUAGE_NONE; if (m_xSpellAlt.is() && xLG.is()) { - m_nGuessLangWord = EditView::CheckLanguage( m_xSpellAlt->getWord(), ::GetSpellChecker(), xLG, false ); - m_nGuessLangPara = EditView::CheckLanguage( rParaText, ::GetSpellChecker(), xLG, true ); + nGuessLangWord = EditView::CheckLanguage( m_xSpellAlt->getWord(), ::GetSpellChecker(), xLG, false ); + nGuessLangPara = EditView::CheckLanguage( rParaText, ::GetSpellChecker(), xLG, true ); } - if (m_nGuessLangWord != LANGUAGE_NONE || m_nGuessLangPara != LANGUAGE_NONE) + if (nGuessLangWord != LANGUAGE_NONE || nGuessLangPara != LANGUAGE_NONE) { // make sure LANGUAGE_NONE gets not used as menu entry - if (m_nGuessLangWord == LANGUAGE_NONE) - m_nGuessLangWord = m_nGuessLangPara; - if (m_nGuessLangPara == LANGUAGE_NONE) - m_nGuessLangPara = m_nGuessLangWord; + if (nGuessLangWord == LANGUAGE_NONE) + nGuessLangWord = nGuessLangPara; + if (nGuessLangPara == LANGUAGE_NONE) + nGuessLangPara = nGuessLangWord; } pMenu = m_xPopupMenu->GetPopupMenu(m_nAddMenuId); @@ -400,7 +400,7 @@ SwSpellPopup::SwSpellPopup( aSeq[0] = aCurrentLang; aSeq[1] = aScriptTypesInUse; aSeq[2] = aKeyboardLang; - aSeq[3] = SvtLanguageTable::GetLanguageString(m_nGuessLangWord); + aSeq[3] = SvtLanguageTable::GetLanguageString(nGuessLangWord); pMenu = m_xPopupMenu->GetPopupMenu(m_nLangSelectionMenuId); fillLangPopupMenu( pMenu, MN_SET_LANGUAGE_SELECTION_START, aSeq, pWrtSh, m_aLangTable_Text ); @@ -522,19 +522,19 @@ SwSpellPopup::SwSpellPopup( m_xPopupMenu->EnableItem(m_nCorrectDialogId, false); uno::Reference< linguistic2::XLanguageGuessing > xLG = SW_MOD()->GetLanguageGuesser(); - m_nGuessLangWord = LANGUAGE_NONE; - m_nGuessLangPara = LANGUAGE_NONE; + LanguageType nGuessLangWord = LANGUAGE_NONE; + LanguageType nGuessLangPara = LANGUAGE_NONE; if (xLG.is()) { - m_nGuessLangPara = EditView::CheckLanguage( rParaText, ::GetSpellChecker(), xLG, true ); + nGuessLangPara = EditView::CheckLanguage( rParaText, ::GetSpellChecker(), xLG, true ); } - if (m_nGuessLangWord != LANGUAGE_NONE || m_nGuessLangPara != LANGUAGE_NONE) + if (nGuessLangWord != LANGUAGE_NONE || nGuessLangPara != LANGUAGE_NONE) { // make sure LANGUAGE_NONE gets not used as menu entry - if (m_nGuessLangWord == LANGUAGE_NONE) - m_nGuessLangWord = m_nGuessLangPara; - if (m_nGuessLangPara == LANGUAGE_NONE) - m_nGuessLangPara = m_nGuessLangWord; + if (nGuessLangWord == LANGUAGE_NONE) + nGuessLangWord = nGuessLangPara; + if (nGuessLangPara == LANGUAGE_NONE) + nGuessLangPara = nGuessLangWord; } m_xPopupMenu->EnableItem(m_nAddMenuId, false); @@ -562,7 +562,7 @@ SwSpellPopup::SwSpellPopup( aSeq[0] = aCurrentLang; aSeq[1] = aScriptTypesInUse; aSeq[2] = aKeyboardLang; - aSeq[3] = SvtLanguageTable::GetLanguageString(m_nGuessLangWord); + aSeq[3] = SvtLanguageTable::GetLanguageString(nGuessLangWord); PopupMenu *pMenu = m_xPopupMenu->GetPopupMenu(m_nLangSelectionMenuId); fillLangPopupMenu( pMenu, MN_SET_LANGUAGE_SELECTION_START, aSeq, pWrtSh, m_aLangTable_Text ); |