[Libreoffice-commits] .: 2 commits - sd/source svx/source

[Libreoffice Gerrit user]

 sd/source/ui/dlg/custsdlg.cxx |    8 ++++----
 svx/source/xoutdev/xattr2.cxx |    6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 469cec21f7da6a680897615f912d137f94e62ee9
Author: Ivan Timofeev <timofeev.i.s at gmail.com>
Date:   Thu Jan 10 09:34:42 2013 +0400

    fix Search->indexOf conversion
    
    Change-Id: I2b02b62311c00fc47892ea7e24d8bc01ac4fb149

diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx
index d55a688..e6149ea 100644
--- a/sd/source/ui/dlg/custsdlg.cxx
+++ b/sd/source/ui/dlg/custsdlg.cxx
@@ -198,14 +198,14 @@ IMPL_LINK( SdCustomShowDlg, ClickButtonHdl, void *, p )
             OUString aStr( pShow->GetName() );
             OUString aStrCopy( SdResId( STR_COPY_CUSTOMSHOW ) );
 
-            sal_uInt16 nStrPos = aStr.indexOf( aStrCopy );
+            sal_Int32 nStrPos = aStr.indexOf( aStrCopy );
             sal_Int32 nNum = 1;
-            if( nStrPos == STRING_NOTFOUND )
+            if( nStrPos < 0 )
             {
                 aStr = aStr + " ("  + aStrCopy + OUString::valueOf( nNum ) + ")";
                 nStrPos = aStr.indexOf( aStrCopy );
             }
-            nStrPos = nStrPos + (sal_uInt16)aStrCopy.getLength();
+            nStrPos = nStrPos + aStrCopy.getLength();
             // Um nicht ins Nirvana zu greifen (--> Endlosschleife)
             if( nStrPos >= aStr.getLength() )
             {
commit 24edbb1900e95d3fee6c27006191e9ab67f60c21
Author: Ivan Timofeev <timofeev.i.s at gmail.com>
Date:   Thu Jan 10 09:18:59 2013 +0400

    valueOf sal_uInt16 -> valueOf sal_Int32
    
    Change-Id: Ibd92f5ebe3079dd0b75a0f429efc68842a4305ec

diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx
index bb78411..d55a688 100644
--- a/sd/source/ui/dlg/custsdlg.cxx
+++ b/sd/source/ui/dlg/custsdlg.cxx
@@ -199,7 +199,7 @@ IMPL_LINK( SdCustomShowDlg, ClickButtonHdl, void *, p )
             OUString aStrCopy( SdResId( STR_COPY_CUSTOMSHOW ) );
 
             sal_uInt16 nStrPos = aStr.indexOf( aStrCopy );
-            sal_uInt16 nNum = 1;
+            sal_Int32 nNum = 1;
             if( nStrPos == STRING_NOTFOUND )
             {
                 aStr = aStr + " ("  + aStrCopy + OUString::valueOf( nNum ) + ")";
diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx
index d7b04d5..dc7e3c1 100644
--- a/svx/source/xoutdev/xattr2.cxx
+++ b/svx/source/xoutdev/xattr2.cxx
@@ -99,7 +99,7 @@ SfxItemPresentation XLineTransparenceItem::GetPresentation
             rText = XubString( ResId( RID_SVXSTR_TRANSPARENCE, DIALOG_MGR() ) );
             rText.AppendAscii(": ");
         case SFX_ITEM_PRESENTATION_NAMELESS:
-            rText += OUString::valueOf((sal_uInt16) GetValue());
+            rText += OUString::valueOf(static_cast<sal_Int32>(GetValue()));
             rText += sal_Unicode('%');
             return ePres;
         default:
@@ -495,7 +495,7 @@ SfxItemPresentation XFillTransparenceItem::GetPresentation
             rText = XubString( ResId( RID_SVXSTR_TRANSPARENCE, DIALOG_MGR() ) );
             rText.AppendAscii(": ");
         case SFX_ITEM_PRESENTATION_NAMELESS:
-            rText += OUString::valueOf((sal_uInt16) GetValue() );
+            rText += OUString::valueOf(static_cast<sal_Int32>(GetValue()));
             rText += sal_Unicode('%');
             return ePres;
         default:
@@ -622,7 +622,7 @@ SfxItemPresentation XGradientStepCountItem::GetPresentation
 //          rText = XubString( ResId( RID_SVXSTR_GRADIENTSTEPCOUNT, DIALOG_MGR() ) );
 //          rText += ": ";
         case SFX_ITEM_PRESENTATION_NAMELESS:
-            rText += OUString::valueOf((sal_uInt16) GetValue() );
+            rText += OUString::valueOf(static_cast<sal_Int32>(GetValue()));
             return ePres;
         default:
             return SFX_ITEM_PRESENTATION_NONE;