diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2013-08-17 18:41:03 +0200 |
|---|---|---|
| committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2013-08-17 21:10:39 +0000 |
| commit | 8aee44c1814ae7c1af14e942cf0513e1612a82d9 (patch) | |
| tree | ae9cfa6bc005c875176691c8c216f7421800847b /sw | |
| parent | 04314cc1244a5c681c2a0ea743e3675665ed7b7c (diff) | |
String to OUString
Change-Id: I41b73e0af6841247a0403974b1c66e5a66123420
Reviewed-on: https://gerrit.libreoffice.org/5483
Reviewed-by: Matteo Casalin <matteo.casalin@yahoo.com>
Tested-by: Matteo Casalin <matteo.casalin@yahoo.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/inc/lineinfo.hxx | 6 | ||||
| -rw-r--r-- | sw/source/core/text/frmpaint.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/unocore/unosett.cxx | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sw/inc/lineinfo.hxx b/sw/inc/lineinfo.hxx index 22bb1a9167a8..2557ada92aa8 100644 --- a/sw/inc/lineinfo.hxx +++ b/sw/inc/lineinfo.hxx @@ -38,7 +38,7 @@ class SW_DLLPUBLIC SwLineNumberInfo : public SwClient /**< purpose of derivation character style for displaying the numbers. */ { SvxNumberType aType; ///< e.g. roman linenumbers - String aDivider; ///< String for aditional interval (vert. lines user defined) + OUString aDivider; ///< String for aditional interval (vert. lines user defined) sal_uInt16 nPosFromLeft; ///< Position for paint sal_uInt16 nCountBy; ///< Paint only for every n line sal_uInt16 nDividerCountBy; /**< Interval for display of an user defined @@ -65,8 +65,8 @@ public: const SvxNumberType &GetNumType() const { return aType; } void SetNumType( SvxNumberType aNew ){ aType = aNew; } - const String &GetDivider() const { return aDivider; } - void SetDivider( const String &r ) { aDivider = r; } + OUString GetDivider() const { return aDivider; } + void SetDivider( const OUString &r ) { aDivider = r; } sal_uInt16 GetDividerCountBy() const { return nDividerCountBy; } void SetDividerCountBy( sal_uInt16 n ) { nDividerCountBy = n; } diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx index f3a0da997631..4296822c9871 100644 --- a/sw/source/core/text/frmpaint.cxx +++ b/sw/source/core/text/frmpaint.cxx @@ -124,7 +124,7 @@ SwExtraPainter::SwExtraPainter( const SwTxtFrm *pFrm, ViewShell *pVwSh, nLineNr, the first line number bLineNum is set back to sal_False if the numbering is completely outside of the paint rect */ - nDivider = rLineInf.GetDivider().Len() ? rLineInf.GetDividerCountBy() : 0; + nDivider = !rLineInf.GetDivider().isEmpty() ? rLineInf.GetDividerCountBy() : 0; nX = pFrm->Frm().Left(); SwCharFmt* pFmt = rLineInf.GetCharFmt( const_cast<IDocumentStylePoolAccess&>(*pFrm->GetNode()->getIDocumentStylePoolAccess()) ); OSL_ENSURE( pFmt, "PaintExtraData without CharFmt" ); diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx index 891eae189142..8b06232cb9a1 100644 --- a/sw/source/core/unocore/unosett.cxx +++ b/sw/source/core/unocore/unosett.cxx @@ -1052,7 +1052,7 @@ Any SwXLineNumberingProperties::getPropertyValue(const OUString& rPropertyName) aRet <<= (sal_Int16)rInfo.GetCountBy(); break; case WID_SEPARATOR_TEXT : - aRet <<= OUString(rInfo.GetDivider()); + aRet <<= rInfo.GetDivider(); break; case WID_SEPARATOR_INTERVAL: aRet <<= (sal_Int16)rInfo.GetDividerCountBy(); |