chart2/source/controller/main/DragMethod_Base.cxx | 2 - include/svx/svdview.hxx | 2 - sd/source/ui/animations/CustomAnimationCreateDialog.cxx | 4 +- svx/source/svdraw/svddrgmt.cxx | 27 +++++----------- svx/source/svdraw/svdmrkv.cxx | 7 ---- svx/source/svdraw/svdundo.cxx | 5 -- svx/source/svdraw/svdview.cxx | 3 - udkapi/com/sun/star/lang/Locale.idl | 2 - 8 files changed, 17 insertions(+), 35 deletions(-)
New commits: commit c5dd597faacb6ee06ff0c220d938534eda062072 Author: Thomas Arnhold <[email protected]> Date: Thu Sep 5 09:27:15 2013 +0200 fix idl: missing </b> Change-Id: I7415a3abfc599cece4254ac3f8104062bcd88224 diff --git a/udkapi/com/sun/star/lang/Locale.idl b/udkapi/com/sun/star/lang/Locale.idl index 5033824..1491e88 100644 --- a/udkapi/com/sun/star/lang/Locale.idl +++ b/udkapi/com/sun/star/lang/Locale.idl @@ -65,7 +65,7 @@ published struct Locale */ string Language; - /** specifies an <strong>ISO Country Code.</strong> + /** specifies an <strong>ISO Country Code</strong>. <p>These codes are the upper-case two-letter codes as defined by ISO-3166. You can find a full list of these codes at a commit 8664e88bc2006d6bcf477f7efafc0308b75a77d7 Author: Thomas Arnhold <[email protected]> Date: Wed Sep 4 12:41:12 2013 +0200 XubString to OUString And simplify: SdrMarkView::ImpTakeDescriptionStr SdrUndoObj::GetDescriptionStringForObject ImpTakeDescriptionStr checks for %1 occurence first, this seems to me like an optimization. So I left it in. Change-Id: I2d0ecfdf2b83a9a535bd893578837e549dd691c1 diff --git a/chart2/source/controller/main/DragMethod_Base.cxx b/chart2/source/controller/main/DragMethod_Base.cxx index e776807..6da22f5 100644 --- a/chart2/source/controller/main/DragMethod_Base.cxx +++ b/chart2/source/controller/main/DragMethod_Base.cxx @@ -66,7 +66,7 @@ OUString DragMethod_Base::getUndoDescription() const } void DragMethod_Base::TakeSdrDragComment(OUString& rStr) const { - rStr = String( getUndoDescription() ); + rStr = getUndoDescription(); } Pointer DragMethod_Base::GetSdrDragPointer() const { diff --git a/include/svx/svdview.hxx b/include/svx/svdview.hxx index bf0dee6..187e26b 100644 --- a/include/svx/svdview.hxx +++ b/include/svx/svdview.hxx @@ -298,7 +298,7 @@ public: // Sonstiges: // ~~~~~~~~~~ // Pointer GetPreferedPointer(const Point& rMousePos, const OutputDevice* pOut, sal_uInt16 nTol=0) const; -// String GetStatusText(); +// OUString GetStatusText(); // ///////////////////////////////////////////////////////////////////////////////////////////////// */ diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx index 95454ad..257d7fe 100644 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx @@ -76,7 +76,7 @@ public: virtual void MouseButtonUp( const MouseEvent& rMEvt ); - sal_uInt16 InsertCategory( const XubString& rStr, sal_uInt16 nPos = LISTBOX_APPEND ); + sal_uInt16 InsertCategory( const OUString& rStr, sal_uInt16 nPos = LISTBOX_APPEND ); void SetDoubleClickLink( const Link& rDoubleClickHdl ) { maDoubleClickHdl = rDoubleClickHdl; } @@ -104,7 +104,7 @@ CategoryListBox::~CategoryListBox() { } -sal_uInt16 CategoryListBox::InsertCategory( const XubString& rStr, sal_uInt16 nPos /* = LISTBOX_APPEND */ ) +sal_uInt16 CategoryListBox::InsertCategory( const OUString& rStr, sal_uInt16 nPos /* = LISTBOX_APPEND */ ) { sal_uInt16 n = ListBox::InsertEntry( rStr, nPos ); if( n != LISTBOX_ENTRY_NOTFOUND ) diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx index 3b143ee..a2c4e79 100644 --- a/svx/source/svdraw/svddrgmt.cxx +++ b/svx/source/svdraw/svddrgmt.cxx @@ -1525,11 +1525,9 @@ void SdrDragMove::TakeSdrDragComment(OUString& rStr) const ImpTakeDescriptionStr(STR_DragMethMove, rStr); rStr += " (x="; getSdrDragView().GetModel()->TakeMetricStr(DragStat().GetDX(), aStr); - rStr += aStr; - rStr += " y="; + rStr += aStr + " y="; getSdrDragView().GetModel()->TakeMetricStr(DragStat().GetDY(), aStr); - rStr += aStr; - rStr += ")"; + rStr += aStr + ")"; if(getSdrDragView().IsDragWithCopy()) { @@ -2134,8 +2132,7 @@ void SdrDragRotate::TakeSdrDragComment(OUString& rStr) const OUString aStr; getSdrDragView().GetModel()->TakeWinkStr(nTmpWink, aStr); - rStr += aStr; - rStr += ")"; + rStr += aStr + ")"; if(getSdrDragView().IsDragWithCopy()) rStr += ImpGetResStr(STR_EditWithCopy); @@ -2271,8 +2268,7 @@ void SdrDragShear::TakeSdrDragComment(OUString& rStr) const OUString aStr; getSdrDragView().GetModel()->TakeWinkStr(nTmpWink, aStr); - rStr += aStr; - rStr += ")"; + rStr += aStr + ")"; if(getSdrDragView().IsDragWithCopy()) rStr += ImpGetResStr(STR_EditWithCopy); @@ -2858,8 +2854,7 @@ void SdrDragCrook::TakeSdrDragComment(OUString& rStr) const nVal = std::abs(nVal); OUString aStr; getSdrDragView().GetModel()->TakeWinkStr(nVal, aStr); - rStr += aStr; - rStr += ")"; + rStr += aStr + ")"; } if(getSdrDragView().IsDragWithCopy()) @@ -3511,11 +3506,9 @@ void SdrDragDistort::TakeSdrDragComment(OUString& rStr) const rStr += " (x="; getSdrDragView().GetModel()->TakeMetricStr(DragStat().GetDX(), aStr); - rStr += aStr; - rStr += " y="; + rStr += aStr + " y="; getSdrDragView().GetModel()->TakeMetricStr(DragStat().GetDY(), aStr); - rStr += aStr; - rStr += ")"; + rStr += aStr + ")"; if(getSdrDragView().IsDragWithCopy()) rStr += ImpGetResStr(STR_EditWithCopy); @@ -3666,11 +3659,9 @@ void SdrDragCrop::TakeSdrDragComment(OUString& rStr) const rStr += " (x="; getSdrDragView().GetModel()->TakeMetricStr(DragStat().GetDX(), aStr); - rStr += aStr; - rStr += " y="; + rStr += aStr + " y="; getSdrDragView().GetModel()->TakeMetricStr(DragStat().GetDY(), aStr); - rStr += aStr; - rStr += ")"; + rStr += aStr + ")"; if(getSdrDragView().IsDragWithCopy()) rStr += ImpGetResStr(STR_EditWithCopy); diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index 07e3549..91f85ba 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -2015,12 +2015,7 @@ void SdrMarkView::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr, } } - nPos = rStr.indexOf("%2"); - - if(nPos != -1) - { - rStr = rStr.replaceAt(nPos, 2, OUString::number( nVal )); - } + rStr = rStr.replaceFirst("%2", OUString::number( nVal )); } //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx index df7b1e6..fcdf5f0 100644 --- a/svx/source/svdraw/svdundo.cxx +++ b/svx/source/svdraw/svdundo.cxx @@ -1315,10 +1315,7 @@ OUString SdrUndoObjStrAttr::GetComment() const { case OBJ_NAME: ImpTakeDescriptionStr( STR_UndoObjName, aStr ); - aStr += " "; - aStr += "\'"; - aStr += msNewStr; - aStr += "\'"; + aStr += " '" + msNewStr + "'"; break; case OBJ_TITLE: ImpTakeDescriptionStr( STR_UndoObjTitle, aStr ); diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx index 68d258e..4550509 100644 --- a/svx/source/svdraw/svdview.cxx +++ b/svx/source/svdraw/svdview.cxx @@ -1288,8 +1288,7 @@ OUString SdrView::GetStatusText() if(!aStr.isEmpty()) { // capitalize first letter - OUString aTmpStr(aStr.copy(0, 1)); - aStr = aStr.replaceAt(0, 1, aTmpStr.toAsciiUpperCase()); + aStr = aStr.replaceAt(0, 1, OUString(aStr[0]).toAsciiUpperCase()); } return aStr; } _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
