diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2020-04-21 18:57:52 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2020-12-21 18:42:11 +0100 |
| commit | 88ac99d6afb1903c4f4a6a33b92fef461979703c (patch) | |
| tree | e235b25e8e02206f106b58e70c27f00dcd4c5acf /sd | |
| parent | fa87499193bddd2bc8728532f62b1e2a91052a44 (diff) | |
replace ODFDefaultVersion usage with ODFSaneDefaultVersion
Compare with ODFSVER_012 mostly works the same, except for places where
namespaces are defined where the ODFSVER_EXTENDED bit should be checked.
Conflicts:
sc/source/filter/xml/XMLExportDataPilot.cxx
xmloff/source/chart/SchXMLExport.cxx
Change-Id: I86469b763bc2f903632976bc9d6ec04d543d705e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108107
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/annotations/annotationmanager.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index 902bac125ce7..e15260ba081b 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -703,9 +703,9 @@ void AnnotationManagerImpl::GetAnnotationState(SfxItemSet& rSet) const bool bReadOnly = mrBase.GetDocShell()->IsReadOnly(); const bool bWrongPageKind = (pCurrentPage == nullptr) || (pCurrentPage->GetPageKind() != PageKind::Standard); - const SvtSaveOptions::ODFDefaultVersion nCurrentODFVersion( SvtSaveOptions().GetODFDefaultVersion() ); + const SvtSaveOptions::ODFSaneDefaultVersion nCurrentODFVersion( SvtSaveOptions().GetODFSaneDefaultVersion() ); - if( bReadOnly || bWrongPageKind || (nCurrentODFVersion <= SvtSaveOptions::ODFVER_012) ) + if (bReadOnly || bWrongPageKind || (nCurrentODFVersion <= SvtSaveOptions::ODFSVER_012)) rSet.DisableItem( SID_INSERT_POSTIT ); rSet.Put(SfxBoolItem(SID_TOGGLE_NOTES, mbShowAnnotations)); |