diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2013-08-14 11:54:25 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-08-14 21:30:24 +0000 |
| commit | f9e8f092f770b00ca2327153da6ce9d88af4c6d5 (patch) | |
| tree | d28fd75677af074ee284747a1d3f9aabbd1a44d0 /sw/inc/modcfg.hxx | |
| parent | cafcf33915fe30af693a94f4224fedd5cb9f9a55 (diff) | |
String to OUString
Change-Id: I6ccde9448acf8564fe270f119ffdfa8b1bab8afe
Reviewed-on: https://gerrit.libreoffice.org/5409
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'sw/inc/modcfg.hxx')
| -rw-r--r-- | sw/inc/modcfg.hxx | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/sw/inc/modcfg.hxx b/sw/inc/modcfg.hxx index 374d519766b0..75d8a2aca69f 100644 --- a/sw/inc/modcfg.hxx +++ b/sw/inc/modcfg.hxx @@ -20,7 +20,6 @@ #define _MODOPT_HXX #include <boost/ptr_container/ptr_vector.hpp> -#include <tools/string.hxx> #include <tools/wintypes.hxx> #include <vcl/field.hxx> #include <unotools/configitem.hxx> @@ -144,18 +143,18 @@ class SwMiscConfig : public utl::ConfigItem { friend class SwModuleOptions; - String sWordDelimiter; // Statistics/WordNumber/Delimiter + OUString sWordDelimiter; // Statistics/WordNumber/Delimiter sal_Bool bDefaultFontsInCurrDocOnly; // DefaultFont/Document - sal_Bool bShowIndexPreview ; // Index/ShowPreview + sal_Bool bShowIndexPreview; // Index/ShowPreview sal_Bool bGrfToGalleryAsLnk; // Misc/GraphicToGalleryAsLink sal_Bool bNumAlignSize; // Numbering/Graphic/KeepRatio sal_Bool bSinglePrintJob; // FormLetter/PrintOutput/SinglePrintJobs sal_Bool bIsNameFromColumn; // FormLetter/FileOutput/FileName/Generation sal_Bool bAskForMailMergeInPrint; // Ask if documents containing fields should be 'mailmerged' sal_Int16 nMailingFormats; // FormLetter/MailingOutput/Formats - String sNameFromColumn; // FormLetter/FileOutput/FileName/FromDatabaseField (string!) - String sMailingPath; // FormLetter/FileOutput/Path - String sMailName; // FormLetter/FileOutput/FileName/FromManualSetting (string!) + OUString sNameFromColumn; // FormLetter/FileOutput/FileName/FromDatabaseField (string!) + OUString sMailingPath; // FormLetter/FileOutput/Path + OUString sMailName; // FormLetter/FileOutput/FileName/FromManualSetting (string!) const com::sun::star::uno::Sequence<OUString>& GetPropertyNames(); public: @@ -179,7 +178,7 @@ class SW_DLLPUBLIC SwModuleOptions SwMiscConfig aMiscConfig; - SwCompareConfig aCompareConfig; + SwCompareConfig aCompareConfig; //fiscus: don't show tips of text fields - it's not part of the configuration! sal_Bool bHideFieldTips : 1; @@ -304,24 +303,24 @@ public: } - const String& GetNameFromColumn() const { return aMiscConfig.sNameFromColumn; } - void SetNameFromColumn( const String& rSet ) { aMiscConfig.sNameFromColumn = rSet; + OUString GetNameFromColumn() const { return aMiscConfig.sNameFromColumn; } + void SetNameFromColumn( const OUString& rSet ) { aMiscConfig.sNameFromColumn = rSet; aMiscConfig.SetModified();} - String GetMailingPath() const { return aMiscConfig.sMailingPath; } - void SetMailingPath(const String& sPath) { aMiscConfig.sMailingPath = sPath; + OUString GetMailingPath() const { return aMiscConfig.sMailingPath; } + void SetMailingPath(const OUString& sPath) { aMiscConfig.sMailingPath = sPath; aMiscConfig.SetModified();} - String GetMailName() const { return aMiscConfig.sMailName; } - void SetMailName(const String& sName){ aMiscConfig.sMailName = sName; + OUString GetMailName() const { return aMiscConfig.sMailName; } + void SetMailName(const OUString& sName){ aMiscConfig.sMailName = sName; aMiscConfig.SetModified();} - const String &GetWordDelimiter() const { return aMiscConfig.sWordDelimiter; } - void SetWordDelimiter(const String& sDelim) { aMiscConfig.sWordDelimiter = sDelim; + OUString GetWordDelimiter() const { return aMiscConfig.sWordDelimiter; } + void SetWordDelimiter(const OUString& sDelim) { aMiscConfig.sWordDelimiter = sDelim; aMiscConfig.SetModified();} //convert word delimiter from or to user interface - static String ConvertWordDelimiter(const String& rDelim, sal_Bool bFromUI); + static OUString ConvertWordDelimiter(const OUString& rDelim, sal_Bool bFromUI); sal_Bool IsShowIndexPreview() const {return aMiscConfig.bShowIndexPreview;} void SetShowIndexPreview(sal_Bool bSet) |