diff options
author | Noel Grandin <noel@peralex.com> | 2013-10-08 14:15:04 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-10-10 09:19:00 +0200 |
commit | 5da5b52634d3452c16b733394bffb03cecd4cdd6 (patch) | |
tree | 909f47bda563bfb13802960de74f15064692962f /sw/source/ui/inc | |
parent | convert sw/source/ui/inc/uno*.hxx from String to OUString (diff) | |
download | core-5da5b52634d3452c16b733394bffb03cecd4cdd6.tar.gz core-5da5b52634d3452c16b733394bffb03cecd4cdd6.zip |
convert sw/source/ui/inc/ui*.hxx from String to OUString
Change-Id: I2c9844d1a31d058fadc81c8ff935ce2d75f25ad1
Diffstat (limited to 'sw/source/ui/inc')
-rw-r--r-- | sw/source/ui/inc/uinums.hxx | 20 | ||||
-rw-r--r-- | sw/source/ui/inc/uitool.hxx | 4 | ||||
-rw-r--r-- | sw/source/ui/inc/uivwimp.hxx | 2 |
3 files changed, 13 insertions, 13 deletions
diff --git a/sw/source/ui/inc/uinums.hxx b/sw/source/ui/inc/uinums.hxx index 44502b4d9dd2..9fff6c099db0 100644 --- a/sw/source/ui/inc/uinums.hxx +++ b/sw/source/ui/inc/uinums.hxx @@ -33,13 +33,13 @@ typedef boost::ptr_vector<SfxPoolItem> _SwNumFmtsAttrs; class SW_DLLPUBLIC SwNumRulesWithName { - String maName; + OUString maName; // the NumRule's formats _have_ to be independent of a document // (They should always be there!) class SW_DLLPRIVATE _SwNumFmtGlobal { SwNumFmt aFmt; - String sCharFmtName; + OUString sCharFmtName; sal_uInt16 nCharPoolId; _SwNumFmtsAttrs aItems; @@ -58,17 +58,17 @@ class SW_DLLPUBLIC SwNumRulesWithName _SwNumFmtGlobal* aFmts[ MAXLEVEL ]; protected: - void SetName(const String& rSet) {maName = rSet;} + void SetName(const OUString& rSet) {maName = rSet;} public: - SwNumRulesWithName(const SwNumRule &, const String &); + SwNumRulesWithName(const SwNumRule &, const OUString &); SwNumRulesWithName( const SwNumRulesWithName & ); SwNumRulesWithName(SvStream &, sal_uInt16 nVersion); ~SwNumRulesWithName(); const SwNumRulesWithName &operator=(const SwNumRulesWithName &); - const String& GetName() const { return maName; } + const OUString& GetName() const { return maName; } void MakeNumRule( SwWrtShell& rSh, SwNumRule& rChg ) const; void Store( SvStream& ); @@ -79,10 +79,10 @@ class SwBaseNumRules public: enum { nMaxRules = MAX_NUM_RULES }; // currently 9 defined forms protected: - SwNumRulesWithName *pNumRules[ MAX_NUM_RULES ]; - String sFileName; - sal_uInt16 nVersion; - sal_Bool bModified; + SwNumRulesWithName *pNumRules[ MAX_NUM_RULES ]; + OUString sFileName; + sal_uInt16 nVersion; + sal_Bool bModified; virtual int Load(SvStream&); virtual sal_Bool Store(SvStream&); @@ -90,7 +90,7 @@ protected: void Init(); public: - SwBaseNumRules(const String& rFileName); + SwBaseNumRules(const OUString& rFileName); virtual ~SwBaseNumRules(); inline const SwNumRulesWithName* GetRules(sal_uInt16 nIdx) const; diff --git a/sw/source/ui/inc/uitool.hxx b/sw/source/ui/inc/uitool.hxx index f4a0484381f3..9a1b3b8371cf 100644 --- a/sw/source/ui/inc/uitool.hxx +++ b/sw/source/ui/inc/uitool.hxx @@ -92,13 +92,13 @@ void SetApplyCharUnit(sal_Bool bApplyChar, sal_Bool bWeb); SW_DLLPUBLIC void FillCharStyleListBox(ListBox& rToFill, SwDocShell* pDocSh, bool bSorted = false, bool bWithDefault = false); //inserts a string sorted into a ListBox, -SW_DLLPUBLIC sal_uInt16 InsertStringSorted(const String& rEntry, ListBox& rToFill, sal_uInt16 nOffset); +SW_DLLPUBLIC sal_uInt16 InsertStringSorted(const OUString& rEntry, ListBox& rToFill, sal_uInt16 nOffset); // Get table width and alignement SwTwips GetTableWidth( SwFrmFmt* pFmt, SwTabCols& rCols, sal_uInt16 *pPercent, SwWrtShell* pSh ); -String GetAppLangDateTimeString( const DateTime& ); +OUString GetAppLangDateTimeString( const DateTime& ); // search for a command string withing the menu structure and execute it // at the dispatcher if there is one, if executed return true diff --git a/sw/source/ui/inc/uivwimp.hxx b/sw/source/ui/inc/uivwimp.hxx index f9a1794af7ef..1466a809668c 100644 --- a/sw/source/ui/inc/uivwimp.hxx +++ b/sw/source/ui/inc/uivwimp.hxx @@ -160,7 +160,7 @@ public: } - void StartDocumentInserter( const String& rFactory, const Link& rEndDialogHdl ); + void StartDocumentInserter( const OUString& rFactory, const Link& rEndDialogHdl ); SfxMedium* CreateMedium(); void InitRequest( const SfxRequest& rRequest ); |