strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Related tdf#111739: Don't insert special character into the document

Browse source 
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>
This commit is contained in:
Tamás Zolnai 2017-11-27 02:13:20 +01:00
parent 2aaea14739
commit 67eeab179a
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cui/source/tabpages/autocdlg.cxx
View file

@ -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) );

2
cui/source/tabpages/chardlg.cxx
View file

@ -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 )