[Libreoffice-commits] core.git: Branch 'feature/vclref' - vcl/source

Michael Meeks michael.meeks at collabora.com
Tue Mar 17 09:47:31 PDT 2015


 vcl/source/window/window.cxx |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 66669bed6101d45d04f9b4c99f5f130e12e33107
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Tue Mar 17 16:51:35 2015 +0000

    better widget debugging / printouts.
    
    Now this is in dispose, not a destructor we can use RTTI nicely.
    
    Change-Id: I6d92dce7a1c76a194a0f354a7a49a49a35c11794

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index a179d0e..93280a7 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -271,8 +271,7 @@ void Window::dispose()
             {
                 OStringBuffer aTempStr;
                 aTempStr.append("Window (");
-                aTempStr.append(OUStringToOString(GetText(),
-                                                       RTL_TEXTENCODING_UTF8));
+                aTempStr.append(lcl_createWindowInfo(*this));
                 aTempStr.append(") with live SystemWindows destroyed: ");
                 aTempStr.append(aErrorStr.toString());
                 OSL_FAIL(aTempStr.getStr());
@@ -296,7 +295,7 @@ void Window::dispose()
         if ( bError )
         {
             OStringBuffer aTempStr( "Window (" );
-            aTempStr.append(OUStringToOString(GetText(), RTL_TEXTENCODING_UTF8));
+            aTempStr.append(lcl_createWindowInfo(*this));
             aTempStr.append(") with live SystemWindows destroyed: ");
             aTempStr.append(aErrorStr.toString());
             OSL_FAIL( aTempStr.getStr() );
@@ -306,7 +305,7 @@ void Window::dispose()
         if ( mpWindowImpl->mpFirstChild )
         {
             OStringBuffer aTempStr("Window (");
-            aTempStr.append(OUStringToOString(GetText(), RTL_TEXTENCODING_UTF8));
+            aTempStr.append(lcl_createWindowInfo(*this));
             aTempStr.append(") with live children destroyed: ");
             pTempWin = mpWindowImpl->mpFirstChild;
             while ( pTempWin )
@@ -321,7 +320,7 @@ void Window::dispose()
         if ( mpWindowImpl->mpFirstOverlap )
         {
             OStringBuffer aTempStr("Window (");
-            aTempStr.append(OUStringToOString(GetText(), RTL_TEXTENCODING_UTF8));
+            aTempStr.append(lcl_createWindowInfo(*this));
             aTempStr.append(") with live SystemWindows destroyed: ");
             pTempWin = mpWindowImpl->mpFirstOverlap;
             while ( pTempWin )


More information about the Libreoffice-commits mailing list