diff options
| author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2017-11-27 02:13:20 +0100 |
|---|---|---|
| committer | Tamás Zolnai <tamas.zolnai@collabora.com> | 2017-11-29 17:24:11 +0100 |
| commit | 67eeab179a7e1d8b479d08a38093172531d4c3c9 (patch) | |
| tree | 88e57fbc2d37f2b0f9d8e8b6e36ef6f8c2321074 | |
| parent | 2aaea1473962c5d0f62852a627ec0e5f0307f7bc (diff) | |
Related tdf#111739: Don't insert special character into the document
When it's only needed to be applied inside a dialog.
Change-Id: I7d61cfb49f80ab43511c9fc6cc6733a990dcae55
Reviewed-on: https://gerrit.libreoffice.org/45436
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com>
| -rw-r--r-- | cui/source/tabpages/autocdlg.cxx | 4 | ||||
| -rw-r--r-- | cui/source/tabpages/chardlg.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 8292c7c27120..7984bc3254d0 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -729,7 +729,7 @@ IMPL_LINK_NOARG(OfaSwAutoFmtOptionsPage, EditHdl, Button*, void) if( nSelEntryPos == REPLACE_BULLETS || nSelEntryPos == APPLY_NUMBERING) { - ScopedVclPtrInstance< SvxCharacterMap > pMapDlg(this); + ScopedVclPtrInstance< SvxCharacterMap > pMapDlg(this, nullptr, false); ImpUserData* pUserData = static_cast<ImpUserData*>(m_pCheckLB->FirstSelected()->GetUserData()); pMapDlg->SetCharFont(*pUserData->pFont); pMapDlg->SetChar( (*pUserData->pString)[0] ); @@ -2051,7 +2051,7 @@ IMPL_LINK( OfaQuoteTabPage, QuoteHdl, Button*, pBtn, void ) else if (pBtn == m_pDblEndQuotePB) nMode = DBL_END; // start character selection dialog - ScopedVclPtrInstance< SvxCharacterMap > pMap( this ); + ScopedVclPtrInstance< SvxCharacterMap > pMap( this, nullptr, false ); pMap->SetCharFont( OutputDevice::GetDefaultFont(DefaultFontType::LATIN_TEXT, LANGUAGE_ENGLISH_US, GetDefaultFontFlags::OnlyOne )); pMap->SetText(nMode < SGL_END ? CuiResId(RID_SVXSTR_STARTQUOTE) : CuiResId(RID_SVXSTR_ENDQUOTE) ); diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 06f8616ded00..af80bb565ef7 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -3213,7 +3213,7 @@ void SvxCharTwoLinesPage::Initialize() void SvxCharTwoLinesPage::SelectCharacter( ListBox* pBox ) { bool bStart = pBox == m_pStartBracketLB; - VclPtrInstance< SvxCharacterMap > aDlg( this ); + VclPtrInstance< SvxCharacterMap > aDlg( this, nullptr, false ); aDlg->DisableFontSelection(); if ( aDlg->Execute() == RET_OK ) |