mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#93592 Make it possible to add default language resource to dialogeditor

Browse Source 
During the conversion of uno services a few lines where removed that
probably should not have been removed. This caused the dialog editor
to crash if you tried to add a new language resource to a document
fdo#93077. The fix for that bug fixed the crash but also made it
imposible to add a language resource to a dialog that isn't previously
translated.

With this patch the functionality should be back on track, adding/removing
language resources without problems at least as far as my testing goes.

Change-Id: Ie6e083837894a219bf8e9c75dec6bf7652d51615
Reviewed-on: https://gerrit.libreoffice.org/30462
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
This commit is contained in:
Niklas Johansson
2016-11-01 12:19:08 +01:00
committed by Samuel Mehrbrodt
parent fc2106092d
commit 1453bc4ab3
2 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
basctl/source/dlged/managelang.cxx
View File

@@ -148,12 +148,6 @@ IMPL_LINK_NOARG(ManageLanguageDialog, AddHdl, Button*, void)
{ {
ScopedVclPtrInstance< SetDefaultLanguageDialog > aDlg( this, m_xLocalizationMgr ); ScopedVclPtrInstance< SetDefaultLanguageDialog > aDlg( this, m_xLocalizationMgr );
if ( RET_OK == aDlg->Execute() ) if ( RET_OK == aDlg->Execute() )
{
if (!m_xLocalizationMgr->isLibraryLocalized())
{
SAL_WARN("basctl.basicide", "Adding langs to non-localized library tdf#93077");
}
else
{ {
// add new locales // add new locales
Sequence< Locale > aLocaleSeq = aDlg->GetLocales(); Sequence< Locale > aLocaleSeq = aDlg->GetLocales();
@@ -161,7 +155,6 @@ IMPL_LINK_NOARG(ManageLanguageDialog, AddHdl, Button*, void)
// update listbox // update listbox
ClearLanguageBox(); ClearLanguageBox();
FillLanguageBox(); FillLanguageBox();
}
if (SfxBindings* pBindings = GetBindingsPtr()) if (SfxBindings* pBindings = GetBindingsPtr())
pBindings->Invalidate( SID_BASICIDE_CURRENT_LANG ); pBindings->Invalidate( SID_BASICIDE_CURRENT_LANG );

6
basic/source/uno/dlgcont.cxx
View File

@@ -379,7 +379,11 @@ Reference< css::resource::XStringResourcePersistence >
} }
catch(const uno::Exception& ) catch(const uno::Exception& )
{ {
// TODO: Error handling? // Something went wrong while trying to get the storage library.
// Return an object that supports StringResourceWithStorage, give it a storage location later.
xRet = Reference< resource::XStringResourcePersistence >(
mxContext->getServiceManager()->createInstanceWithContext("com.sun.star.resource.StringResourceWithStorage", mxContext),
UNO_QUERY );
return xRet; return xRet;
} }