[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-0' - sw/source

[Stephan Bergmann]

 sw/source/ui/docvw/edtwin.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7dd04eca892f036e2ef42cffedf871fcef26abad
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Jan 15 16:45:40 2014 +0100

    String::Len was used in a non-bool context here
    
    ...so 79f52d249fe043e6ec54be6ffa0c71a748920394 "convert sw/source/ui/inc/e*.hxx
    from String to OUString" should have converted it to call OUString::getLength,
    not OUString::isEmpty.
    
    Change-Id: Ie5633a1ff87094eb22179f14aab4b1508735a747
    (cherry picked from commit d0e4d1f01ef44474145469b7203ad3232e36de63)
    Reviewed-on: https://gerrit.libreoffice.org/7445
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 5a45f43..2e981c4 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -2396,7 +2396,7 @@ KEYINPUT_CHECKTABLE_INSDEL:
                 {
                     OUStringBuffer aBuf(m_aInBuffer);
                     comphelper::string::padToLength(aBuf,
-                        !m_aInBuffer.isEmpty() + aKeyEvent.GetRepeat() + 1, aCh);
+                        m_aInBuffer.getLength() + aKeyEvent.GetRepeat() + 1, aCh);
                     m_aInBuffer = aBuf.makeStringAndClear();
                     bFlushCharBuffer = Application::AnyInput( VCL_INPUT_KEYBOARD );
                     bFlushBuffer = !bFlushCharBuffer;