diff options
| author | Niklas Johansson <sleeping.pillow@gmail.com> | 2016-11-01 12:19:08 +0100 |
|---|---|---|
| committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2016-12-02 09:07:35 +0000 |
| commit | 1453bc4ab3d42c34c32a7da63ed6f7bdbe513c2d (patch) | |
| tree | 554eda8f41d9ce960325d07cdeaa09aa97ea8588 | |
| parent | fc2106092d45a2e44d811882bbe60221d96d1834 (diff) | |
tdf#93592 Make it possible to add default language resource to dialogeditor
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>
| -rw-r--r-- | basctl/source/dlged/managelang.cxx | 19 | ||||
| -rw-r--r-- | basic/source/uno/dlgcont.cxx | 6 |
2 files changed, 11 insertions, 14 deletions
diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx index ab6bb4818bc2..4b979921dbf5 100644 --- a/basctl/source/dlged/managelang.cxx +++ b/basctl/source/dlged/managelang.cxx @@ -149,19 +149,12 @@ IMPL_LINK_NOARG(ManageLanguageDialog, AddHdl, Button*, void) ScopedVclPtrInstance< SetDefaultLanguageDialog > aDlg( this, m_xLocalizationMgr ); 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 - Sequence< Locale > aLocaleSeq = aDlg->GetLocales(); - m_xLocalizationMgr->handleAddLocales( aLocaleSeq ); - // update listbox - ClearLanguageBox(); - FillLanguageBox(); - } + // add new locales + Sequence< Locale > aLocaleSeq = aDlg->GetLocales(); + m_xLocalizationMgr->handleAddLocales( aLocaleSeq ); + // update listbox + ClearLanguageBox(); + FillLanguageBox(); if (SfxBindings* pBindings = GetBindingsPtr()) pBindings->Invalidate( SID_BASICIDE_CURRENT_LANG ); diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx index 5d5b45054d4d..fb90243ebaa2 100644 --- a/basic/source/uno/dlgcont.cxx +++ b/basic/source/uno/dlgcont.cxx @@ -379,7 +379,11 @@ Reference< css::resource::XStringResourcePersistence > } 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; } |