summaryrefslogtreecommitdiff
path: root/sw/inc/fmtcol.hxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2013-09-23 07:19:08 +0100
committerCaolán McNamara <caolanm@redhat.com>2013-09-25 19:24:23 +0200
commit98de5b40c8a3fd4e57477b6d994e3b1472207f71 (patch)
tree567fdbbaecbddbfc19f28a08da5d1f6d5207748c /sw/inc/fmtcol.hxx
parent0552a91acde9dce28c0d92c552d21fbadfcb9184 (diff)
Related: fdo#38838 remove UniString::EqualsIgnoreCaseAscii
Change-Id: Ib5c3a2daa4a48bc286b14fa2cebb3306ea0012bc
Diffstat (limited to 'sw/inc/fmtcol.hxx')
-rw-r--r--sw/inc/fmtcol.hxx7
1 files changed, 4 insertions, 3 deletions
diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx
index 0d7f5ad83609..0b90a786fb12 100644
--- a/sw/inc/fmtcol.hxx
+++ b/sw/inc/fmtcol.hxx
@@ -23,6 +23,7 @@
#include <frmatr.hxx>
#include <swtypes.hxx> // For MAXLEVEL.
#include <boost/ptr_container/ptr_vector.hpp>
+#include <tools/string.hxx>
class SwDoc; // For friend.
@@ -35,7 +36,7 @@ protected:
: SwFmt( rPool, pFmtName, pWhichRanges, pDerFrom, nFmtWhich )
{ SetAuto( sal_False ); }
- SwFmtColl( SwAttrPool& rPool, const String &rFmtName,
+ SwFmtColl( SwAttrPool& rPool, const OUString &rFmtName,
const sal_uInt16* pWhichRanges, SwFmtColl* pDerFrom,
sal_uInt16 nFmtWhich )
: SwFmt( rPool, rFmtName, pWhichRanges, pDerFrom, nFmtWhich )
@@ -73,7 +74,7 @@ protected:
mbAssignedToOutlineStyle(false)
{ pNextTxtFmtColl = this; }
- SwTxtFmtColl( SwAttrPool& rPool, const String &rFmtCollName,
+ SwTxtFmtColl( SwAttrPool& rPool, const OUString &rFmtCollName,
SwTxtFmtColl* pDerFrom = 0,
sal_uInt16 nFmtWh = RES_TXTFMTCOLL )
: SwFmtColl( rPool, rFmtCollName, aTxtFmtCollSetRange,
@@ -155,7 +156,7 @@ protected:
pDerFrom, RES_GRFFMTCOLL )
{}
- SwGrfFmtColl( SwAttrPool& rPool, const String &rFmtCollName,
+ SwGrfFmtColl( SwAttrPool& rPool, const OUString &rFmtCollName,
SwGrfFmtColl* pDerFrom = 0 )
: SwFmtColl( rPool, rFmtCollName, aGrfFmtCollSetRange,
pDerFrom, RES_GRFFMTCOLL )