summaryrefslogtreecommitdiff
path: root/sw/inc
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-10-10 14:40:15 +0200
committerNoel Grandin <noel@peralex.com>2013-10-15 12:25:35 +0200
commitba118259b9c65a560627fb5a715fb405ca5eaa31 (patch)
treee475c3cac24dfadde3164c649697a3ac72b31086 /sw/inc
parent823cc23f1ba29c6956f47d104a8cf63fd5d48e7d (diff)
convert sw/inc/ndgrf.hxx from String to OUString
Change-Id: Iac457f283a2e16ee7fd6c104b86131cbe980aa5e
Diffstat (limited to 'sw/inc')
-rw-r--r--sw/inc/ndgrf.hxx14
1 files changed, 7 insertions, 7 deletions
diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx
index d41364a255b4..d073fb17a8a4 100644
--- a/sw/inc/ndgrf.hxx
+++ b/sw/inc/ndgrf.hxx
@@ -41,7 +41,7 @@ class SW_DLLPUBLIC SwGrfNode: public SwNoTxtNode
GraphicObject *mpReplacementGraphic;
::sfx2::SvBaseLinkRef refLink; ///< If graphics only as link then pointer is set.
Size nGrfSize;
- String aLowResGrf; ///< HTML: LowRes graphics (substitute until regular HighRes graphics is loaded).
+ OUString aLowResGrf; ///< HTML: LowRes graphics (substitute until regular HighRes graphics is loaded).
sal_Bool bTransparentFlagValid :1;
sal_Bool bInSwapIn :1;
@@ -58,13 +58,13 @@ class SW_DLLPUBLIC SwGrfNode: public SwNoTxtNode
sal_Bool mbIsStreamReadOnly;
SwGrfNode( const SwNodeIndex& rWhere,
- const String& rGrfName, const String& rFltName,
+ const OUString& rGrfName, const OUString& rFltName,
const Graphic* pGraphic,
SwGrfFmtColl* pGrfColl,
SwAttrSet* pAutoAttr = 0 );
///< Ctor for reading (SW/G) without graphics.
SwGrfNode( const SwNodeIndex& rWhere,
- const String& rGrfName, const String& rFltName,
+ const OUString& rGrfName, const OUString& rFltName,
SwGrfFmtColl* pGrfColl,
SwAttrSet* pAutoAttr = 0 );
SwGrfNode( const SwNodeIndex& rWhere,
@@ -118,7 +118,7 @@ class SW_DLLPUBLIC SwGrfNode: public SwNoTxtNode
reference to substorage or the root storage
*/
::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > _GetDocSubstorageOrRoot(
- const String& aStgName ) const;
+ const OUString& aStgName ) const;
public:
virtual ~SwGrfNode();
@@ -128,7 +128,7 @@ public:
virtual SwCntntNode *SplitCntntNode( const SwPosition & );
/// isolated only way to set GraphicObject to allow more actions when doing so
- void SetGraphic(const Graphic& rGraphic, const String& rLink);
+ void SetGraphic(const Graphic& rGraphic, const OUString& rLink);
/// wrappers for non-const calls at GraphicObject
void ReleaseGraphicFromCache() { maGrfObj.ReleaseFromCache(); }
@@ -165,7 +165,7 @@ public:
/** Re-read in case graphic was not OK. The current one
gets replaced by the new one. */
- sal_Bool ReRead( const String& rGrfName, const OUString& rFltName,
+ sal_Bool ReRead( const OUString& rGrfName, const OUString& rFltName,
const Graphic* pGraphic = 0,
const GraphicObject* pGrfObj = 0,
sal_Bool bModify = sal_True );
@@ -174,7 +174,7 @@ public:
/// Remove graphic in order to free memory.
short SwapOut();
/// Access to storage stream-name.
- void SetStreamName( const String& r ) { maGrfObj.SetUserData( r ); }
+ void SetStreamName( const OUString& r ) { maGrfObj.SetUserData( r ); }
/// Is this node selected by any shell?
sal_Bool IsSelected() const;