sw/inc/swtable.hxx | 6 +++--- sw/inc/swtblfmt.hxx | 6 +++--- sw/inc/tblafmt.hxx | 4 ++-- sw/inc/txtfld.hxx | 4 ++-- sw/inc/undobj.hxx | 2 +- sw/inc/unochart.hxx | 6 +++--- sw/inc/unosrch.hxx | 4 ++-- sw/inc/unotbl.hxx | 6 +++--- sw/inc/unotxdoc.hxx | 26 +++++++++++++------------- sw/source/core/doc/docchart.cxx | 4 ++-- sw/source/core/table/swtable.cxx | 4 ++-- sw/source/core/undo/undobj.cxx | 2 +- sw/source/core/unocore/unochart.cxx | 6 +++--- sw/source/core/unocore/unotbl.cxx | 6 +++--- sw/source/ui/uno/unotxdoc.cxx | 18 +++++++++--------- 15 files changed, 52 insertions(+), 52 deletions(-)
New commits: commit d84b974290c494e643a83207a9aac16fc5f683bf Author: Noel Grandin <n...@peralex.com> Date: Thu Sep 19 08:02:20 2013 +0200 convert sw/inc/swtable.hxx from String to OUString Change-Id: I1f5c2c612589fd86567ee9d3e09ecd5bff74ce25 diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx index 312ddd1..83c153b 100644 --- a/sw/inc/swtable.hxx +++ b/sw/inc/swtable.hxx @@ -269,7 +269,7 @@ public: // #i80314# // add 2nd parameter in order to control validation check in called method // <_GetBoxNum(..)> - const SwTableBox* GetTblBox( const String& rName, + const SwTableBox* GetTblBox( const OUString& rName, const bool bPerformValidCheck = false ) const; // Copy selected boxes to another document. bool MakeCopy( SwDoc*, const SwPosition&, const SwSelBoxes&, @@ -293,7 +293,7 @@ public: bool IsTblComplex() const; // Returns true if table or selection is balanced. - bool IsTblComplexForChart( const String& rSel ) const; + bool IsTblComplexForChart( const OUString& rSel ) const; // Search all content-bearing boxes of the base line on which this box stands. // rBoxes as a return value for immediate use. @@ -432,7 +432,7 @@ public: bool bOvrTblLns=true ) const; // Return name of this box. It is determined dynamically and // is calculated from the position in the lines/boxes/table. - String GetName() const; + OUString GetName() const; // Return "value" of box (for calculating in table). double GetValue( SwTblCalcPara& rPara ) const; diff --git a/sw/source/core/doc/docchart.cxx b/sw/source/core/doc/docchart.cxx index 9c6a68e..6eacb57 100644 --- a/sw/source/core/doc/docchart.cxx +++ b/sw/source/core/doc/docchart.cxx @@ -52,10 +52,10 @@ void SwTable::UpdateCharts() const GetFrmFmt()->GetDoc()->UpdateCharts( GetFrmFmt()->GetName() ); } -bool SwTable::IsTblComplexForChart( const String& rSelection ) const +bool SwTable::IsTblComplexForChart( const OUString& rSelection ) const { const SwTableBox* pSttBox, *pEndBox; - if( 2 < rSelection.Len() ) + if( 2 < rSelection.getLength() ) { // Remove brackets at the beginning and from the end String sBox( rSelection ); diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx index 1091449..c424822 100644 --- a/sw/source/core/table/swtable.cxx +++ b/sw/source/core/table/swtable.cxx @@ -1414,7 +1414,7 @@ sal_uInt16 SwTable::_GetBoxNum( OUString& rStr, sal_Bool bFirstPart, // #i80314# // add 2nd parameter and its handling -const SwTableBox* SwTable::GetTblBox( const String& rName, +const SwTableBox* SwTable::GetTblBox( const OUString& rName, const bool bPerformValidCheck ) const { const SwTableBox* pBox = 0; @@ -1895,7 +1895,7 @@ void sw_GetTblBoxColStr( sal_uInt16 nCol, String& rNm ) } while( 1 ); } -String SwTableBox::GetName() const +OUString SwTableBox::GetName() const { if( !pSttNd ) // box without content? { diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx index cb0a359..e99879a 100644 --- a/sw/source/core/unocore/unotbl.cxx +++ b/sw/source/core/unocore/unotbl.cxx @@ -571,7 +571,7 @@ static void lcl_InspectLines(SwTableLines& rLines, std::vector<OUString*>& rAllN for(sal_uInt16 j = 0; j < rBoxes.size(); j++) { SwTableBox* pBox = rBoxes[j]; - if(pBox->GetName().Len() && pBox->getRowSpan() > 0 ) + if(!pBox->GetName().isEmpty() && pBox->getRowSpan() > 0 ) rAllNames.push_back( new OUString(pBox->GetName()) ); SwTableLines& rBoxLines = pBox->GetTabLines(); if(!rBoxLines.empty()) commit 04caa8bb956e8366f96acfaa9d0c271083978812 Author: Noel Grandin <n...@peralex.com> Date: Wed Sep 18 14:33:25 2013 +0200 convert sw/inc/swtblfmt.hxx from String to OUString Change-Id: I00f7fdaa33bc8b5ede2e3a7f1d1d938b62cc0646 diff --git a/sw/inc/swtblfmt.hxx b/sw/inc/swtblfmt.hxx index a54faa49..26ea0d8 100644 --- a/sw/inc/swtblfmt.hxx +++ b/sw/inc/swtblfmt.hxx @@ -32,7 +32,7 @@ protected: SwFrmFmt *pDrvdFrm ) : SwFrmFmt( rPool, pFmtNm, pDrvdFrm, RES_FRMFMT, aTableSetRange ) {} - SwTableFmt( SwAttrPool& rPool, const String &rFmtNm, + SwTableFmt( SwAttrPool& rPool, const OUString &rFmtNm, SwFrmFmt *pDrvdFrm ) : SwFrmFmt( rPool, rFmtNm, pDrvdFrm, RES_FRMFMT, aTableSetRange ) {} @@ -53,7 +53,7 @@ protected: SwFrmFmt *pDrvdFrm ) : SwFrmFmt( rPool, pFmtNm, pDrvdFrm, RES_FRMFMT, aTableLineSetRange ) {} - SwTableLineFmt( SwAttrPool& rPool, const String &rFmtNm, + SwTableLineFmt( SwAttrPool& rPool, const OUString &rFmtNm, SwFrmFmt *pDrvdFrm ) : SwFrmFmt( rPool, rFmtNm, pDrvdFrm, RES_FRMFMT, aTableLineSetRange ) {} @@ -73,7 +73,7 @@ protected: SwFrmFmt *pDrvdFrm ) : SwFrmFmt( rPool, pFmtNm, pDrvdFrm, RES_FRMFMT, aTableBoxSetRange ) {} - SwTableBoxFmt( SwAttrPool& rPool, const String &rFmtNm, + SwTableBoxFmt( SwAttrPool& rPool, const OUString &rFmtNm, SwFrmFmt *pDrvdFrm ) : SwFrmFmt( rPool, rFmtNm, pDrvdFrm, RES_FRMFMT, aTableBoxSetRange ) {} commit 1b26f79af3f7c1baf06bcdacf4c09f5dbfd10be7 Author: Noel Grandin <n...@peralex.com> Date: Wed Sep 18 13:53:12 2013 +0200 convert sw/inc/tblafmt.hxx from String to OUString Change-Id: Id3966feb27f87c340716034c836e01f72cb96808 diff --git a/sw/inc/tblafmt.hxx b/sw/inc/tblafmt.hxx index 8bb36f9..6ef8256 100644 --- a/sw/inc/tblafmt.hxx +++ b/sw/inc/tblafmt.hxx @@ -107,7 +107,7 @@ class SwBoxAutoFmt SvxRotateModeItem aRotateMode; // number format - String sNumFmtString; + OUString sNumFmtString; LanguageType eSysLanguage, eNumFmtLanguage; public: @@ -176,7 +176,7 @@ public: void SetVerticalAlignment(const SwFmtVertOrient& rNew) { m_aVerticalAlignment = rNew; } void SetBox( const SvxBoxItem& rNew ) { aBox = rNew; } void SetBackground( const SvxBrushItem& rNew ) { aBackground = rNew; } - void SetValueFormat( const String& rFmt, LanguageType eLng, LanguageType eSys ) + void SetValueFormat( const OUString& rFmt, LanguageType eLng, LanguageType eSys ) { sNumFmtString = rFmt; eNumFmtLanguage = eLng; eSysLanguage = eSys; } sal_Bool Load( SvStream& rStream, const SwAfVersions& rVersions, sal_uInt16 nVer ); commit 00ccef16bee93d4158c18f70c674b7a2c0be71aa Author: Noel Grandin <n...@peralex.com> Date: Wed Sep 18 13:44:51 2013 +0200 convert sw/inc/txtfld.hxx from String to OUString Change-Id: I7d06d6c22d280496a864d656c7a18ac00dd17332 diff --git a/sw/inc/txtfld.hxx b/sw/inc/txtfld.hxx index b12be7a..55aab0f 100644 --- a/sw/inc/txtfld.hxx +++ b/sw/inc/txtfld.hxx @@ -28,7 +28,7 @@ class SwTxtNode; class SwTxtFld : public SwTxtAttr { - mutable String m_aExpand; + mutable OUString m_aExpand; SwTxtNode * m_pTxtNode; public: @@ -62,7 +62,7 @@ inline SwTxtNode& SwTxtFld::GetTxtNode() const inline void SwTxtFld::ExpandAlways() { - m_aExpand += ' '; + m_aExpand += " "; Expand(); } commit 7160b9533e54132704b7730aa8893972841ce763 Author: Noel Grandin <n...@peralex.com> Date: Wed Sep 18 13:37:52 2013 +0200 convert sw/inc/undobj.hxx from String to OUString Change-Id: Ife9f401e7e3d06ba1c4507d6f654bb720f61a407 diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx index de01610..3c44d5b 100644 --- a/sw/inc/undobj.hxx +++ b/sw/inc/undobj.hxx @@ -54,7 +54,7 @@ class SwUndo protected: bool bCacheComment; - mutable String * pComment; + mutable OUString * pComment; void RemoveIdxFromSection( SwDoc&, sal_uLong nSttIdx, sal_uLong* pEndIdx = 0 ); void RemoveIdxFromRange( SwPaM& rPam, sal_Bool bMoveNext ); diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx index 42fcd7b..19ddb09 100644 --- a/sw/source/core/undo/undobj.cxx +++ b/sw/source/core/undo/undobj.cxx @@ -275,7 +275,7 @@ OUString SwUndo::GetComment() const { if (! pComment) { - pComment = new String(SW_RES(UNDO_BASE + GetId())); + pComment = new OUString(SW_RES(UNDO_BASE + GetId())); SwRewriter aRewriter = GetRewriter(); commit a72cc8b181b0f4614987d1b38f895c9e98970778 Author: Noel Grandin <n...@peralex.com> Date: Wed Sep 18 13:32:43 2013 +0200 convert sw/inc/unochart.hxx from String to OUString Change-Id: Ib9e52a28d0977efca3ccd2e06f87b413c205c2ad diff --git a/sw/inc/unochart.hxx b/sw/inc/unochart.hxx index 44229d8..656d1c4 100644 --- a/sw/inc/unochart.hxx +++ b/sw/inc/unochart.hxx @@ -66,7 +66,7 @@ class SwFrmFmt; ////////////////////////////////////////////////////////////////////// -bool FillRangeDescriptor( SwRangeDescriptor &rDesc, const String &rCellRangeName ); +bool FillRangeDescriptor( SwRangeDescriptor &rDesc, const OUString &rCellRangeName ); ////////////////////////////////////////////////////////////////////// @@ -265,8 +265,8 @@ class SwChartDataSequence : ::cppu::OInterfaceContainerHelper aModifyListeners; ::com::sun::star::chart2::data::DataSequenceRole aRole; - String aRowLabelText; - String aColLabelText; + OUString aRowLabelText; + OUString aColLabelText; // holds a reference to the data-provider to guarantee it's lifetime last as // long as the pointer may be used. diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx index 2e1c0176..7f2bf91 100644 --- a/sw/source/core/unocore/unochart.cxx +++ b/sw/source/core/unocore/unochart.cxx @@ -207,10 +207,10 @@ static void LaunchModifiedEvent( // - e.g. "Table1.A2:E5" bool FillRangeDescriptor( SwRangeDescriptor &rDesc, - const String &rCellRangeName ) + const OUString &rCellRangeName ) { - xub_StrLen nToken = STRING_NOTFOUND == rCellRangeName.Search('.') ? 0 : 1; - String aCellRangeNoTableName( rCellRangeName.GetToken( nToken, '.' ) ); + xub_StrLen nToken = -1 == rCellRangeName.indexOf('.') ? 0 : 1; + String aCellRangeNoTableName( rCellRangeName.getToken( nToken, '.' ) ); String aTLName( aCellRangeNoTableName.GetToken(0, ':') ); // name of top left cell String aBRName( aCellRangeNoTableName.GetToken(1, ':') ); // name of bottom right cell if(!aTLName.Len() || !aBRName.Len()) commit 4ebde2bc461e9661d7264340398b972fb69a89a6 Author: Noel Grandin <n...@peralex.com> Date: Wed Sep 18 13:17:50 2013 +0200 convert sw/inc/unosrch.hxx from String to OUString Change-Id: Ic25aef1e37cfa66402b7acf13f3fc4cdbc48d350 diff --git a/sw/inc/unosrch.hxx b/sw/inc/unosrch.hxx index 8b71eac..9b683bb 100644 --- a/sw/inc/unosrch.hxx +++ b/sw/inc/unosrch.hxx @@ -44,8 +44,8 @@ class SwXTextSearch : public cppu::WeakImplHelper3 { friend class SwXTextDocument; - String sSearchText; - String sReplaceText; + OUString sSearchText; + OUString sReplaceText; SwSearchProperties_Impl* pSearchProperties; SwSearchProperties_Impl* pReplaceProperties; diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx index 1b3e57d..65735a5 100644 --- a/sw/source/ui/uno/unotxdoc.cxx +++ b/sw/source/ui/uno/unotxdoc.cxx @@ -754,7 +754,7 @@ sal_Int32 SwXTextDocument::replaceAll(const Reference< util::XSearchDescriptor > nResult = (sal_Int32)pUnoCrsr->Find( aSearch, !pSearch->bStyles, eStart, eEnd, bCancel, (FindRanges)eRanges, - pSearch->sSearchText.Len() ? &aSearchOpt : 0, + !pSearch->sSearchText.isEmpty() ? &aSearchOpt : 0, &aReplace ); } else if(pSearch->bStyles) @@ -884,7 +884,7 @@ SwUnoCrsr* SwXTextDocument::FindAny(const Reference< util::XSearchDescriptor > nResult = (sal_Int32)pUnoCrsr->Find( aSearch, !pSearch->bStyles, eStart, eEnd, bCancel, (FindRanges)eRanges, - pSearch->sSearchText.Len() ? &aSearchOpt : 0, + !pSearch->sSearchText.isEmpty() ? &aSearchOpt : 0, 0 ); } else if(pSearch->bStyles) commit 8d620216102b6597d0152135ac10aeff268971d9 Author: Noel Grandin <n...@peralex.com> Date: Wed Sep 18 13:15:10 2013 +0200 convert sw/inc/unotbl.hxx from String to OUString Change-Id: Ib9e0324d104401b85cc1472ad7243822fd129c85 diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx index 38aa412..342759d 100644 --- a/sw/inc/unotbl.hxx +++ b/sw/inc/unotbl.hxx @@ -296,8 +296,8 @@ private: // Descriptor-interface SwTableProperties_Impl* pTableProps; - String m_sTableName; - sal_Bool bIsDescriptor; + OUString m_sTableName; + sal_Bool bIsDescriptor; unsigned short nRows; unsigned short nColumns; @@ -388,7 +388,7 @@ public: sal_uInt16 getRowCount(void); sal_uInt16 getColumnCount(void); ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > GetRangeByName(SwFrmFmt* pFmt, SwTable* pTable, - const String& sTLName, const String& sBRName, + const OUString& sTLName, const OUString& sBRName, SwRangeDescriptor& rDesc); //SwClient diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx index 079f375..cb0a359 100644 --- a/sw/source/core/unocore/unotbl.cxx +++ b/sw/source/core/unocore/unotbl.cxx @@ -2338,7 +2338,7 @@ void SwXTextTable::attachToRange(const uno::Reference< text::XTextRange > & xTex lcl_FormatTable( pTblFmt ); pTblFmt->Add(this); - if(m_sTableName.Len()) + if(!m_sTableName.isEmpty()) { sal_uInt16 nIndex = 1; const String sTmpName(m_sTableName); @@ -2441,7 +2441,7 @@ uno::Reference< table::XCell > SwXTextTable::getCellByPosition(sal_Int32 nColum } uno::Reference< table::XCellRange > SwXTextTable::GetRangeByName(SwFrmFmt* pFmt, SwTable* pTable, - const String& rTLName, const String& rBRName, + const OUString& rTLName, const OUString& rBRName, SwRangeDescriptor& rDesc) { SolarMutexGuard aGuard; commit 9f73517e50e464761c60666d9ca930d63ec34efe Author: Noel Grandin <n...@peralex.com> Date: Wed Sep 18 12:59:13 2013 +0200 convert sw/inc/unotxdoc.hxx from String to OUString Change-Id: I72387b5ed7e459615250d874c1404220822d57b5 diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx index 79d9f30..0c2378c 100644 --- a/sw/inc/unotxdoc.hxx +++ b/sw/inc/unotxdoc.hxx @@ -437,13 +437,13 @@ class SwXLinkTargetSupplier : public cppu::WeakImplHelper2 > { SwXTextDocument* pxDoc; - String sTables; - String sFrames; - String sGraphics; - String sOLEs; - String sSections; - String sOutlines; - String sBookmarks; + OUString sTables; + OUString sFrames; + OUString sGraphics; + OUString sOLEs; + OUString sSections; + OUString sOutlines; + OUString sBookmarks; public: SwXLinkTargetSupplier(SwXTextDocument& rxDoc); @@ -477,17 +477,17 @@ class SwXLinkNameAccessWrapper : public cppu::WeakImplHelper4 { css::uno::Reference< css::container::XNameAccess > xRealAccess; const SfxItemPropertySet* pPropSet; - const String sLinkSuffix; - const String sLinkDisplayName; + const OUString sLinkSuffix; + const OUString sLinkDisplayName; css::uno::Reference< css::text::XTextDocument > xDoc; SwXTextDocument* pxDoc; public: SwXLinkNameAccessWrapper(css::uno::Reference< css::container::XNameAccess > xAccess, - const String& rLinkDisplayName, String sSuffix); + const OUString& rLinkDisplayName, OUString sSuffix); SwXLinkNameAccessWrapper(SwXTextDocument& rxDoc, - const String& rLinkDisplayName, String sSuffix); + const OUString& rLinkDisplayName, OUString sSuffix); ~SwXLinkNameAccessWrapper(); //XNameAccess @@ -525,10 +525,10 @@ class SwXOutlineTarget : public cppu::WeakImplHelper2 > { const SfxItemPropertySet* pPropSet; - String sOutlineText; + OUString sOutlineText; public: - SwXOutlineTarget(const String& rOutlineText); + SwXOutlineTarget(const OUString& rOutlineText); ~SwXOutlineTarget(); //XPropertySet diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx index dd2ee42..1b3e57d 100644 --- a/sw/source/ui/uno/unotxdoc.cxx +++ b/sw/source/ui/uno/unotxdoc.cxx @@ -3488,7 +3488,7 @@ Sequence< OUString > SwXLinkTargetSupplier::getSupportedServiceNames(void) } SwXLinkNameAccessWrapper::SwXLinkNameAccessWrapper( - Reference< XNameAccess > xAccess, const String& rLinkDisplayName, String sSuffix ) : + Reference< XNameAccess > xAccess, const OUString& rLinkDisplayName, OUString sSuffix ) : xRealAccess(xAccess), pPropSet(aSwMapProvider.GetPropertySet(PROPERTY_MAP_LINK_TARGET)), sLinkSuffix(sSuffix), @@ -3498,7 +3498,7 @@ SwXLinkNameAccessWrapper::SwXLinkNameAccessWrapper( } SwXLinkNameAccessWrapper::SwXLinkNameAccessWrapper(SwXTextDocument& rxDoc, - const String& rLinkDisplayName, String sSuffix) : + const OUString& rLinkDisplayName, OUString sSuffix) : pPropSet(aSwMapProvider.GetPropertySet(PROPERTY_MAP_LINK_TARGET)), sLinkSuffix(sSuffix), sLinkDisplayName(rLinkDisplayName), @@ -3606,13 +3606,13 @@ sal_Bool SwXLinkNameAccessWrapper::hasByName(const OUString& rName) { sal_Bool bRet = sal_False; String sParam(rName); - if(sParam.Len() > sLinkSuffix.Len() ) + if(sParam.Len() > sLinkSuffix.getLength() ) { - String sCmp = sParam.Copy(sParam.Len() - sLinkSuffix.Len(), - sLinkSuffix.Len()); + String sCmp = sParam.Copy(sParam.Len() - sLinkSuffix.getLength(), + sLinkSuffix.getLength()); if(sCmp == sLinkSuffix) { - sParam = sParam.Copy(0, sParam.Len() - sLinkSuffix.Len()); + sParam = sParam.Copy(0, sParam.Len() - sLinkSuffix.getLength()); if(pxDoc) { if(!pxDoc->GetDocShell()) @@ -3774,7 +3774,7 @@ Sequence< OUString > SwXLinkNameAccessWrapper::getSupportedServiceNames(void) return aRet; } -SwXOutlineTarget::SwXOutlineTarget(const String& rOutlineText) : +SwXOutlineTarget::SwXOutlineTarget(const OUString& rOutlineText) : pPropSet(aSwMapProvider.GetPropertySet(PROPERTY_MAP_LINK_TARGET)), sOutlineText(rOutlineText) { _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits