diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-15 12:20:01 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-25 17:57:35 -0500 |
| commit | 56a52533d446c89592f838f3b50c97d6b7ff3961 (patch) | |
| tree | 05765f6f7a017f45a9a91275203e9c54b4a3cc37 /sc/source/ui/docshell/docsh2.cxx | |
| parent | e8c6a8e214441ac19a4e39511c757c8085c89366 (diff) | |
merge vosremoval-reference.diff
Diffstat (limited to 'sc/source/ui/docshell/docsh2.cxx')
| -rw-r--r-- | sc/source/ui/docshell/docsh2.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/ui/docshell/docsh2.cxx b/sc/source/ui/docshell/docsh2.cxx index 764664fe5..8686cc787 100644 --- a/sc/source/ui/docshell/docsh2.cxx +++ b/sc/source/ui/docshell/docsh2.cxx @@ -179,19 +179,19 @@ void ScDocShell::InitItems() PutItem( SvxColorTableItem( XColorTable::GetStdColorTable(), SID_COLOR_TABLE ) ); } - if ( !aDocument.GetForbiddenCharacters().isValid() || + if ( !aDocument.GetForbiddenCharacters().is() || !aDocument.IsValidAsianCompression() || !aDocument.IsValidAsianKerning() ) { // get settings from SvxAsianConfig SvxAsianConfig aAsian( sal_False ); - if ( !aDocument.GetForbiddenCharacters().isValid() ) + if ( !aDocument.GetForbiddenCharacters().is() ) { // set forbidden characters if necessary uno::Sequence<lang::Locale> aLocales = aAsian.GetStartEndCharLocales(); if (aLocales.getLength()) { - vos::ORef<SvxForbiddenCharactersTable> xForbiddenTable = + rtl::Reference<SvxForbiddenCharactersTable> xForbiddenTable = new SvxForbiddenCharactersTable( aDocument.GetServiceManager() ); const lang::Locale* pLocales = aLocales.getConstArray(); |