diff options
| author | Noel Grandin <noel@peralex.com> | 2015-04-13 16:33:56 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-04-15 11:36:13 +0000 |
| commit | ba9acdf799bf556c8a20b1dc27eb116e23d481db (patch) | |
| tree | a4d3cb636b3369a7fb0e8ea027e1944dd3d48645 /sw/inc | |
| parent | fe73ed7c79b96eaa5aa84314a07ae11f188575a1 (diff) | |
convert TXTFORMAT constants to scoped enum
and move them to the SW module since that is the only place they are
used
Change-Id: Ic037e5ac9d2514377669c5f583b856e1da429a19
Reviewed-on: https://gerrit.libreoffice.org/15303
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sw/inc')
| -rw-r--r-- | sw/inc/modcfg.hxx | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/sw/inc/modcfg.hxx b/sw/inc/modcfg.hxx index 7242ed6b8ae6..e79c23689211 100644 --- a/sw/inc/modcfg.hxx +++ b/sw/inc/modcfg.hxx @@ -30,10 +30,26 @@ #include "itabenum.hxx" #include <tools/globname.hxx> #include <editeng/svxenum.hxx> -class SwModuleOptions; +#include <o3tl/typed_flags_set.hxx> +class SwModuleOptions; class InsCaptionOpt; +// text format for the sending of messages ------------------------------ +enum class MailTxtFormats +{ + NONE = 0x00, + ASCII = 0x01, + HTML = 0x02, + RTF = 0x04, + OFFICE = 0x08 +}; +namespace o3tl +{ + template<> struct typed_flags<MailTxtFormats> : is_typed_flags<MailTxtFormats, 0x0f> {}; +} + + class InsCaptionOptArr { private: @@ -161,7 +177,7 @@ class SwMiscConfig : public utl::ConfigItem bool bSinglePrintJob; // FormLetter/PrintOutput/SinglePrintJobs bool bIsNameFromColumn; // FormLetter/FileOutput/FileName/Generation bool bAskForMailMergeInPrint; // Ask if documents containing fields should be 'mailmerged' - sal_Int16 nMailingFormats; // FormLetter/MailingOutput/Formats + MailTxtFormats nMailingFormats; // FormLetter/MailingOutput/Formats OUString sNameFromColumn; // FormLetter/FileOutput/FileName/FromDatabaseField (string!) OUString sMailingPath; // FormLetter/FileOutput/Path OUString sMailName; // FormLetter/FileOutput/FileName/FromManualSetting (string!) @@ -286,9 +302,9 @@ public: void SetGrfToGalleryAsLnk( bool b ) { aMiscConfig.bGrfToGalleryAsLnk = b; aMiscConfig.SetModified();} - sal_Int16 GetMailingFormats() const { return aMiscConfig.nMailingFormats;} - void SetMailingFormats( sal_Int16 nSet ) { aMiscConfig.nMailingFormats = nSet; - aMiscConfig.SetModified();} + MailTxtFormats GetMailingFormats() const { return aMiscConfig.nMailingFormats;} + void SetMailingFormats( MailTxtFormats nSet ) { aMiscConfig.nMailingFormats = nSet; + aMiscConfig.SetModified();} bool IsSinglePrintJob() const { return aMiscConfig.bSinglePrintJob; } void SetSinglePrintJob( bool b ) { aMiscConfig.bSinglePrintJob = b; |