diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-07-04 15:05:34 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-07-06 09:28:10 +0200 |
| commit | 12a3f5cefeaeb842507dd8038597fb77ca929dd1 (patch) | |
| tree | c1d496a275fceb1b2fda406f13acca71d9e6947a /sc/source/ui/docshell/docsh2.cxx | |
| parent | ab9b38a4064141705aa3a3de9a5d73b465ad3af3 (diff) | |
rework as a shared_ptr
mostly to try and track down a crash on exit of sw uwriter under
windows
Change-Id: Id67e93863056da319dd8225038d60a7f5783b103
Reviewed-on: https://gerrit.libreoffice.org/39604
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc/source/ui/docshell/docsh2.cxx')
| -rw-r--r-- | sc/source/ui/docshell/docsh2.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sc/source/ui/docshell/docsh2.cxx b/sc/source/ui/docshell/docsh2.cxx index e656dc49ce72..4055666e2201 100644 --- a/sc/source/ui/docshell/docsh2.cxx +++ b/sc/source/ui/docshell/docsh2.cxx @@ -115,20 +115,20 @@ void ScDocShell::InitItems() PutItem( SvxColorListItem( XColorList::GetStdColorList(), SID_COLOR_TABLE ) ); } - if ( !aDocument.GetForbiddenCharacters().is() || + if ( !aDocument.GetForbiddenCharacters() || !aDocument.IsValidAsianCompression() || !aDocument.IsValidAsianKerning() ) { // get settings from SvxAsianConfig SvxAsianConfig aAsian; - if ( !aDocument.GetForbiddenCharacters().is() ) + if (!aDocument.GetForbiddenCharacters()) { // set forbidden characters if necessary uno::Sequence<lang::Locale> aLocales = aAsian.GetStartEndCharLocales(); if (aLocales.getLength()) { - rtl::Reference<SvxForbiddenCharactersTable> xForbiddenTable = - new SvxForbiddenCharactersTable( comphelper::getProcessComponentContext() ); + std::shared_ptr<SvxForbiddenCharactersTable> xForbiddenTable( + new SvxForbiddenCharactersTable(comphelper::getProcessComponentContext())); const lang::Locale* pLocales = aLocales.getConstArray(); for (sal_Int32 i = 0; i < aLocales.getLength(); i++) |