diff options
author | Noel Grandin <noel@peralex.com> | 2013-10-08 13:36:42 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-10-10 09:18:59 +0200 |
commit | 6ada84236a211d77ec064b0bfdd8570cb10216e3 (patch) | |
tree | 327f1bf8852458e7d1be6ab721f2eb8cbb478999 /sw/source/ui/inc | |
parent | convert sc/source/ui/inc/zoomctrl.hxx from String to OUString (diff) | |
download | core-6ada84236a211d77ec064b0bfdd8570cb10216e3.tar.gz core-6ada84236a211d77ec064b0bfdd8570cb10216e3.zip |
convert sw/source/ui/inc/w*.hxx from String to OUString
and remove a couple of dead method definitions
Change-Id: Iaab20bd367e0387a1aafa656aee3bd78705cd64b
Diffstat (limited to 'sw/source/ui/inc')
-rw-r--r-- | sw/source/ui/inc/workctrl.hxx | 2 | ||||
-rw-r--r-- | sw/source/ui/inc/wrtsh.hxx | 44 |
2 files changed, 21 insertions, 25 deletions
diff --git a/sw/source/ui/inc/workctrl.hxx b/sw/source/ui/inc/workctrl.hxx index dcba5914ae5c..532f479b9cd2 100644 --- a/sw/source/ui/inc/workctrl.hxx +++ b/sw/source/ui/inc/workctrl.hxx @@ -165,7 +165,7 @@ public: SwScrollNaviPopup( sal_uInt16 nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, Window *pParent ); ~SwScrollNaviPopup(); - static String GetQuickHelpText(sal_Bool bNext); + static OUString GetQuickHelpText(sal_Bool bNext); virtual SfxPopupWindow* Clone() const; void GrabFocus(){aToolBox.GrabFocus();} diff --git a/sw/source/ui/inc/wrtsh.hxx b/sw/source/ui/inc/wrtsh.hxx index d9d446a8f299..3c6f7a373821 100644 --- a/sw/source/ui/inc/wrtsh.hxx +++ b/sw/source/ui/inc/wrtsh.hxx @@ -287,17 +287,17 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)(); // edit void Insert(SwField &, SwPaM *pCommentRange = NULL); - void Insert(const String &); + void Insert(const OUString &); // graphic - void Insert( const String &rPath, const String &rFilter, + void Insert( const OUString &rPath, const OUString &rFilter, const Graphic &, SwFlyFrmAttrMgr * = 0, sal_Bool bRule = sal_False ); - void InsertByWord( const String & ); - void InsertPageBreak(const String *pPageDesc = 0, sal_uInt16 nPgNum = 0 ); + void InsertByWord( const OUString & ); + void InsertPageBreak(const OUString *pPageDesc = 0, sal_uInt16 nPgNum = 0 ); void InsertLineBreak(); void InsertColumnBreak(); - void InsertFootnote(const String &, sal_Bool bEndNote = sal_False, sal_Bool bEdit = sal_True ); + void InsertFootnote(const OUString &, sal_Bool bEndNote = sal_False, sal_Bool bEdit = sal_True ); void SplitNode( sal_Bool bAutoFormat = sal_False, sal_Bool bCheckTableStart = sal_True ); bool CanInsert(); @@ -341,15 +341,15 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)(); GETSTYLE_CREATESOME, // if on PoolId create mapt GETSTYLE_CREATEANY }; // return standard if applicable - SwTxtFmtColl* GetParaStyle(const String &rCollName, + SwTxtFmtColl* GetParaStyle(const OUString &rCollName, GetStyle eCreate = GETSTYLE_NOCREATE); - SwCharFmt* GetCharStyle(const String &rFmtName, + SwCharFmt* GetCharStyle(const OUString &rFmtName, GetStyle eCreate = GETSTYLE_NOCREATE); SwFrmFmt* GetTblStyle(const OUString &rFmtName); - void SetPageStyle(const String &rCollName); + void SetPageStyle(const OUString &rCollName); - String GetCurPageStyle( const sal_Bool bCalcFrm = sal_True ) const; + OUString GetCurPageStyle( const sal_Bool bCalcFrm = sal_True ) const; // change current style using the attributes in effect void QuickUpdateStyle(); @@ -357,8 +357,8 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)(); enum DoType { UNDO, REDO, REPEAT }; void Do( DoType eDoType, sal_uInt16 nCnt = 1 ); - String GetDoString( DoType eDoType ) const; - String GetRepeatString() const; + OUString GetDoString( DoType eDoType ) const; + OUString GetRepeatString() const; sal_uInt16 GetDoStrings( DoType eDoType, SfxStringListItem& rStrLstItem ) const; // search and replace @@ -368,10 +368,10 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)(); FindRanges eFlags = FND_IN_BODY, int bReplace = sal_False ); - sal_uLong SearchTempl (const String &rTempl, + sal_uLong SearchTempl (const OUString &rTempl, SwDocPositions eStart, SwDocPositions eEnde, FindRanges eFlags = FND_IN_BODY, - const String* pReplTempl = 0 ); + const OUString* pReplTempl = 0 ); sal_uLong SearchAttr (const SfxItemSet& rFindSet, sal_Bool bNoColls, @@ -452,24 +452,24 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)(); bool TryRemoveIndent(); // #i23725# - String GetSelDescr() const; + OUString GetSelDescr() const; SwNavigationMgr& GetNavigationMgr(); void addCurrentPosition(); - sal_Bool GotoFly( const String& rName, FlyCntType eType = FLYCNTTYPE_ALL, + sal_Bool GotoFly( const OUString& rName, FlyCntType eType = FLYCNTTYPE_ALL, sal_Bool bSelFrame = sal_True ); bool GotoINetAttr( const SwTxtINetFmt& rAttr ); void GotoOutline( sal_uInt16 nIdx ); - bool GotoOutline( const String& rName ); - bool GotoRegion( const String& rName ); - sal_Bool GotoRefMark( const String& rRefMark, sal_uInt16 nSubType = 0, + bool GotoOutline( const OUString& rName ); + bool GotoRegion( const OUString& rName ); + sal_Bool GotoRefMark( const OUString& rRefMark, sal_uInt16 nSubType = 0, sal_uInt16 nSeqNo = 0 ); sal_Bool GotoNextTOXBase( const OUString* pName = 0); - bool GotoTable( const String& rName ); + bool GotoTable( const OUString& rName ); sal_Bool GotoFld( const SwFmtFld& rFld ); const SwRedline* GotoRedline( sal_uInt16 nArrPos, sal_Bool bSelect = sal_False); - void ChangeHeaderOrFooter(const String& rStyleName, sal_Bool bHeader, sal_Bool bOn, sal_Bool bShowWarning); + void ChangeHeaderOrFooter(const OUString& rStyleName, sal_Bool bHeader, sal_Bool bOn, sal_Bool bShowWarning); virtual void SetShowHeaderFooterSeparator( FrameControlType eControl, bool bShow ); private: @@ -477,10 +477,6 @@ private: SW_DLLPRIVATE void OpenMark(); SW_DLLPRIVATE void CloseMark( bool bOkFlag ); - SW_DLLPRIVATE String GetWrdDelim(); - SW_DLLPRIVATE String GetSDelim(); - SW_DLLPRIVATE String GetBothDelim(); - struct ModeStack { ModeStack *pNext; |