diff options
author | Noel Grandin <noel@peralex.com> | 2013-09-17 16:21:15 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-09-19 10:14:17 +0200 |
commit | 39ba0533e1ec827d1d1b5b58f47fb1035b91f015 (patch) | |
tree | 53e59961de289eeb213a915f63566c18652adf51 /sw/inc | |
parent | 5397d7c21313e46c615a712f16db83a0f3f273da (diff) |
convert sw/inc/IDocumentContentOperations.hxx from String to OUString
Change-Id: I0ee1415b0ae8a0707faafd05f3b2f95200062614
Diffstat (limited to 'sw/inc')
-rw-r--r-- | sw/inc/IDocumentContentOperations.hxx | 13 | ||||
-rw-r--r-- | sw/inc/doc.hxx | 12 |
2 files changed, 12 insertions, 13 deletions
diff --git a/sw/inc/IDocumentContentOperations.hxx b/sw/inc/IDocumentContentOperations.hxx index 6f0bf4067b53..590d4f60aae7 100644 --- a/sw/inc/IDocumentContentOperations.hxx +++ b/sw/inc/IDocumentContentOperations.hxx @@ -26,7 +26,6 @@ struct SwPosition; class SwNode; class SwNodeRange; - class String; class Graphic; class SfxItemSet; class SfxPoolItem; @@ -99,11 +98,11 @@ /** Overwrite string in an existing text node. */ - virtual bool Overwrite(const SwPaM &rRg, const String& rStr) = 0; + virtual bool Overwrite(const SwPaM &rRg, const OUString& rStr) = 0; /** Insert string into existing text node at position rRg.Point(). */ - virtual bool InsertString(const SwPaM &rRg, const String&, + virtual bool InsertString(const SwPaM &rRg, const OUString&, const enum InsertFlags nInsertMode = INS_EMPTYEXPAND ) = 0; /** change text to Upper/Lower/Hiragana/Katagana/... @@ -112,7 +111,7 @@ /** Insert graphic or formula. The XXXX are copied. */ - virtual SwFlyFrmFmt* Insert(const SwPaM &rRg, const String& rGrfName, const String& rFltName, const Graphic* pGraphic, + virtual SwFlyFrmFmt* Insert(const SwPaM &rRg, const OUString& rGrfName, const OUString& rFltName, const Graphic* pGraphic, const SfxItemSet* pFlyAttrSet, const SfxItemSet* pGrfAttrSet, SwFrmFmt*) = 0; virtual SwFlyFrmFmt* Insert(const SwPaM& rRg, const GraphicObject& rGrfObj, const SfxItemSet* pFlyAttrSet, @@ -120,7 +119,7 @@ /** Transpose graphic (with undo) */ - virtual void ReRead(SwPaM&, const String& rGrfName, const String& rFltName, const Graphic* pGraphic, const GraphicObject* pGrfObj) = 0; + virtual void ReRead(SwPaM&, const OUString& rGrfName, const OUString& rFltName, const Graphic* pGraphic, const GraphicObject* pGrfObj) = 0; /** Insert a DrawObject. The object must be already registered in DrawModel. @@ -132,7 +131,7 @@ virtual SwFlyFrmFmt* Insert(const SwPaM &rRg, const svt::EmbeddedObjectRef& xObj, const SfxItemSet* pFlyAttrSet, const SfxItemSet* pGrfAttrSet, SwFrmFmt*) = 0; - virtual SwFlyFrmFmt* InsertOLE(const SwPaM &rRg, const String& rObjName, sal_Int64 nAspect, const SfxItemSet* pFlyAttrSet, + virtual SwFlyFrmFmt* InsertOLE(const SwPaM &rRg, const OUString& rObjName, sal_Int64 nAspect, const SfxItemSet* pFlyAttrSet, const SfxItemSet* pGrfAttrSet, SwFrmFmt*) = 0; /** Split a node at rPos (implemented only for TxtNode). @@ -147,7 +146,7 @@ ( not \& ). E.g.: Find: "zzz", Replace: "xx\t\\t..&..\&" --> "xx\t<Tab>..zzz..&" */ - virtual bool ReplaceRange(SwPaM& rPam, const String& rNewStr, + virtual bool ReplaceRange(SwPaM& rPam, const OUString& rNewStr, const bool bRegExReplace) = 0; /** Insert an attribute. If rRg spans several nodes the diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index 57af66255b91..bff786859107 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -861,12 +861,12 @@ public: virtual bool MoveRange(SwPaM&, SwPosition&, SwMoveFlags); virtual bool MoveNodeRange(SwNodeRange&, SwNodeIndex&, SwMoveFlags); virtual bool MoveAndJoin(SwPaM&, SwPosition&, SwMoveFlags); - virtual bool Overwrite(const SwPaM &rRg, const String& rStr); - virtual bool InsertString(const SwPaM &rRg, const String&, + virtual bool Overwrite(const SwPaM &rRg, const OUString& rStr); + virtual bool InsertString(const SwPaM &rRg, const OUString&, const enum InsertFlags nInsertMode = INS_EMPTYEXPAND ); virtual bool UpdateParRsid( SwTxtNode *pTxtNode, sal_uInt32 nVal = 0 ); virtual bool UpdateRsid( const SwPaM &rRg, xub_StrLen nLen ); - virtual SwFlyFrmFmt* Insert(const SwPaM &rRg, const String& rGrfName, const String& rFltName, const Graphic* pGraphic, + virtual SwFlyFrmFmt* Insert(const SwPaM &rRg, const OUString& rGrfName, const OUString& rFltName, const Graphic* pGraphic, const SfxItemSet* pFlyAttrSet, const SfxItemSet* pGrfAttrSet, SwFrmFmt*); virtual SwFlyFrmFmt* Insert(const SwPaM& rRg, const GraphicObject& rGrfObj, const SfxItemSet* pFlyAttrSet, const SfxItemSet* pGrfAttrSet, SwFrmFmt*); @@ -878,14 +878,14 @@ public: const SetAttrMode nFlags,bool bExpandCharToPara=false); virtual bool InsertItemSet (const SwPaM &rRg, const SfxItemSet&, const SetAttrMode nFlags); - virtual void ReRead(SwPaM&, const String& rGrfName, const String& rFltName, const Graphic* pGraphic, const GraphicObject* pGrfObj); + virtual void ReRead(SwPaM&, const OUString& rGrfName, const OUString& rFltName, const Graphic* pGraphic, const GraphicObject* pGrfObj); virtual void TransliterateText(const SwPaM& rPaM, utl::TransliterationWrapper&); - virtual SwFlyFrmFmt* InsertOLE(const SwPaM &rRg, const String& rObjName, sal_Int64 nAspect, const SfxItemSet* pFlyAttrSet, + virtual SwFlyFrmFmt* InsertOLE(const SwPaM &rRg, const OUString& rObjName, sal_Int64 nAspect, const SfxItemSet* pFlyAttrSet, const SfxItemSet* pGrfAttrSet, SwFrmFmt*); virtual bool SplitNode(const SwPosition &rPos, bool bChkTableStart); virtual bool AppendTxtNode(SwPosition& rPos); virtual void SetModified(SwPaM &rPaM); - virtual bool ReplaceRange(SwPaM& rPam, const String& rNewStr, + virtual bool ReplaceRange(SwPaM& rPam, const OUString& rNewStr, const bool bRegExReplace); virtual void RemoveLeadingWhiteSpace(const SwPosition & rPos ); |