diff options
| author | Noel Grandin <noel@peralex.com> | 2013-10-10 15:15:36 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-10-15 12:25:37 +0200 |
| commit | 440d1c137a9da117db4cc151b522e07284162acc (patch) | |
| tree | 4db834d54e1c1dfc8b00df440910fcbbf9b1c2bf /sw/inc | |
| parent | 5a2e72a8f471d5f7b007f4ebf33a55d1c5a3235f (diff) | |
convert sw/inc/frmfmt.hxx from String to OUString
Change-Id: I47ecd80d7e24de2bfecc8a57195601affbd5cc19
Diffstat (limited to 'sw/inc')
| -rw-r--r-- | sw/inc/frmfmt.hxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx index 7abed6c45838..f322e75769b4 100644 --- a/sw/inc/frmfmt.hxx +++ b/sw/inc/frmfmt.hxx @@ -52,7 +52,7 @@ protected: pDrvdFrm, nFmtWhich ) {} - SwFrmFmt( SwAttrPool& rPool, const String &rFmtNm, + SwFrmFmt( SwAttrPool& rPool, const OUString &rFmtNm, SwFrmFmt *pDrvdFrm, sal_uInt16 nFmtWhich = RES_FRMFMT, const sal_uInt16* pWhichRange = 0 ) : SwFmt( rPool, rFmtNm, (pWhichRange ? pWhichRange : aFrmFmtSetRange), @@ -121,7 +121,7 @@ public: virtual sal_Int16 GetPositionLayoutDir() const; virtual void SetPositionLayoutDir( const sal_Int16 _nPositionLayoutDir ); - virtual String GetDescription() const; + virtual OUString GetDescription() const; SW_DLLPRIVATE ::com::sun::star::uno::WeakReference< ::com::sun::star::uno::XInterface> const& GetXObject() const @@ -154,7 +154,7 @@ protected: SwFrmFmt *pDrvdFrm ) : SwFrmFmt( rPool, pFmtNm, pDrvdFrm, RES_FLYFRMFMT ) {} - SwFlyFrmFmt( SwAttrPool& rPool, const String &rFmtNm, + SwFlyFrmFmt( SwAttrPool& rPool, const OUString &rFmtNm, SwFrmFmt *pDrvdFrm ) : SwFrmFmt( rPool, rFmtNm, pDrvdFrm, RES_FLYFRMFMT ) {} @@ -220,7 +220,7 @@ class SW_DLLPUBLIC SwDrawFrmFmt: public SwFrmFmt friend class SwDoc; mutable const SdrObject * pSdrObjCached; - mutable String sSdrObjCachedComment; + mutable OUString sSdrObjCachedComment; /// Both not existent. SwDrawFrmFmt( const SwDrawFrmFmt &rCpy ); @@ -245,7 +245,7 @@ protected: mbPosAttrSet( false ) {} - SwDrawFrmFmt( SwAttrPool& rPool, const String &rFmtNm, + SwDrawFrmFmt( SwAttrPool& rPool, const OUString &rFmtNm, SwFrmFmt *pDrvdFrm ) : SwFrmFmt( rPool, rFmtNm, pDrvdFrm, RES_DRAWFRMFMT ), pSdrObjCached(NULL), @@ -284,7 +284,7 @@ public: mbPosAttrSet = false; } - virtual String GetDescription() const; + virtual OUString GetDescription() const; DECL_FIXEDMEMPOOL_NEWDEL(SwDrawFrmFmt); }; |