compilerplugins/clang/unusedenumconstants.readonly.results | 4 ----
include/sfx2/objsh.hxx | 4 +---
sfx2/source/doc/objserv.cxx | 7 +------
3 files changed, 2 insertions(+), 13 deletions(-)
New commits:
commit f691472b6ca89610eaf70c85640361fcee50ae9b
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Mon Nov 26 13:33:47 2018 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Nov 27 14:41:06 2018 +0100
remove unused SfxObjectShellFlags enum values
Change-Id: I945047c0955bc66602d1a5033197a7405a69a8d3
Reviewed-on: https://gerrit.libreoffice.org/64089
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/compilerplugins/clang/unusedenumconstants.readonly.results
b/compilerplugins/clang/unusedenumconstants.readonly.results
index a85cdefcaa73..e22ad2930bc0 100644
--- a/compilerplugins/clang/unusedenumconstants.readonly.results
+++ b/compilerplugins/clang/unusedenumconstants.readonly.results
@@ -406,10 +406,6 @@ include/oox/ppt/animationspersist.hxx:45
enum oox::ppt::(anonymous at
/home/noel/libo2/include/oox/ppt/animationspersist.hxx:36:5) NP_KEYTIMES
include/oox/ppt/animationspersist.hxx:45
enum oox::ppt::(anonymous at
/home/noel/libo2/include/oox/ppt/animationspersist.hxx:36:5) NP_FORMULA
-include/sfx2/objsh.hxx:120
- enum SfxObjectShellFlags DONTCLOSE
-include/sfx2/objsh.hxx:121
- enum SfxObjectShellFlags NODOCINFO
include/svl/ctloptions.hxx:64
enum SvtCTLOptions::TextNumerals NUMERALS_HINDI
include/svl/ctloptions.hxx:65
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index af6c050c1dc8..3a5233238149 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -117,13 +117,11 @@ enum class SfxObjectShellFlags
{
STD_NORMAL = 0x0000000,
HASMENU = 0x0000004,
- DONTCLOSE = 0x0000010,
- NODOCINFO = 0x0000020,
UNDEFINED = 0xf000000
};
namespace o3tl
{
- template<> struct typed_flags<SfxObjectShellFlags> :
is_typed_flags<SfxObjectShellFlags, 0xf000034> {};
+ template<> struct typed_flags<SfxObjectShellFlags> :
is_typed_flags<SfxObjectShellFlags, 0xf000004> {};
}
#define SFX_TITLE_TITLE 0
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 35d507286965..f1ee0f9a3464 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -962,16 +962,11 @@ void SfxObjectShell::GetState_Impl(SfxItemSet &rSet)
break;
case SID_DOCINFO:
- if ( pImpl->eFlags & SfxObjectShellFlags::NODOCINFO )
- rSet.DisableItem( nWhich );
break;
case SID_CLOSEDOC:
{
- if ( GetFlags() & SfxObjectShellFlags::DONTCLOSE )
- rSet.DisableItem(nWhich);
- else
- rSet.Put(SfxStringItem(nWhich, SfxResId(STR_CLOSEDOC)));
+ rSet.Put(SfxStringItem(nWhich, SfxResId(STR_CLOSEDOC)));
break;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
