Attachment 40888 Details for Bug 32196 – corrected patch

[patch] corrected patch

0001-Display-correct-record-information-in-Data-Form-dial.patch (text/plain), 1.71 KB, created by Kohei Yoshida on 2010-12-07 17:10:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kohei Yoshida

Created: 2010-12-07 17:10:59 UTC

Size: 1.71 KB

patch

obsolete

>From 52263f697ca663016cd09cf229a6b373760f9d82 Mon Sep 17 00:00:00 2001
>From: Kohei Yoshida <kyoshida@novell.com>
>Date: Tue, 7 Dec 2010 17:06:16 -0500
>Subject: [PATCH] Display correct record information in Data Form dialog. (fdo#32196)
>
>I had accidentally removed the part that constructed correct string
>to display.  Recovered it, and modified it to use OUStringBuffer
>instead of sprintf to construct the string.
>---
> sc/source/ui/miscdlgs/datafdlg.cxx |   16 +++++++++++++---
> 1 files changed, 13 insertions(+), 3 deletions(-)
>
>diff --git a/sc/source/ui/miscdlgs/datafdlg.cxx b/sc/source/ui/miscdlgs/datafdlg.cxx
>index 377213f..50503e2 100644
>--- a/sc/source/ui/miscdlgs/datafdlg.cxx
>+++ b/sc/source/ui/miscdlgs/datafdlg.cxx
>@@ -42,8 +42,12 @@
> #include "refundo.hxx"
> #include "undodat.hxx"
> 
>+#include "rtl/ustrbuf.hxx"
>+
> #define HDL(hdl)            LINK( this, ScDataFormDlg, hdl )
> 
>+using ::rtl::OUStringBuffer;
>+
> //zhangyun
> ScDataFormDlg::ScDataFormDlg( Window* pParent, ScTabViewShell*  pTabViewShellOri) :
>     ModalDialog     ( pParent, ScResId( RID_SCDLG_DATAFORM ) ),
>@@ -272,9 +276,15 @@ void ScDataFormDlg::FillCtrls(SCROW /*nCurrentRow*/)
>                 pEdits[i]->SetText(String());
>         }
>     }
>-    char sRecordStr[256];
>-    if (aCurrentRow<=nEndRow)
>-        aFixedText.SetText(String::CreateFromAscii(sRecordStr));
>+
>+    if (aCurrentRow <= nEndRow)
>+    {
>+        OUStringBuffer aBuf;
>+        aBuf.append(static_cast<sal_Int32>(aCurrentRow - nStartRow));
>+        aBuf.appendAscii(" / ");
>+        aBuf.append(static_cast<sal_Int32>(nEndRow - nStartRow));
>+        aFixedText.SetText(aBuf.makeStringAndClear());
>+    }
>     else
>         aFixedText.SetText(String::CreateFromAscii("New Record"));
> 
>-- 
>1.7.3.1
>

Actions: View

Attachments on bug 32196: 40884 | 40888