[Libreoffice-commits] core.git: 2 commits - UnoControls/source

[Stephan Bergmann]

 UnoControls/source/controls/progressmonitor.cxx |    4 ----
 UnoControls/source/controls/statusindicator.cxx |    2 +-
 UnoControls/source/inc/statusindicator.hxx      |    1 -
 3 files changed, 1 insertion(+), 6 deletions(-)

New commits:
commit 1990c75175118c4b1ff0f020c13213627b6adcb0
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Dec 16 13:31:48 2014 +0100

    Daft += "\0" triggers assert
    
    ...try
    
    GetProcessServiceManager().createInstance("stardiv.UnoControls.ProgressMonitor").addText("foo", "bar", false)
    
    in Basic...
    
    Change-Id: I30318c3e8e671a97b6a3fe2dd9ec03add21794ab

diff --git a/UnoControls/source/controls/progressmonitor.cxx b/UnoControls/source/controls/progressmonitor.cxx
index 035d5ed..df93a69 100644
--- a/UnoControls/source/controls/progressmonitor.cxx
+++ b/UnoControls/source/controls/progressmonitor.cxx
@@ -750,7 +750,6 @@ void ProgressMonitor::impl_rebuildFixedText ()
             aCollectString  +=  pSearchItem->sTopic;
             aCollectString  +=  "\n";
         }
-        aCollectString  +=  "\0";   // It's better :-)
 
         m_xTopic_Top->setText ( aCollectString );
     }
@@ -768,7 +767,6 @@ void ProgressMonitor::impl_rebuildFixedText ()
             aCollectString  +=  pSearchItem->sText;
             aCollectString  +=  "\n";
         }
-        aCollectString  +=  "\0";   // It's better :-)
 
         m_xText_Top->setText ( aCollectString );
     }
@@ -788,7 +786,6 @@ void ProgressMonitor::impl_rebuildFixedText ()
             aCollectString  +=  pSearchItem->sTopic;
             aCollectString  +=  "\n";
         }
-        aCollectString  +=  "\0";   // It's better :-)
 
         m_xTopic_Bottom->setText ( aCollectString );
     }
@@ -806,7 +803,6 @@ void ProgressMonitor::impl_rebuildFixedText ()
             aCollectString  +=  pSearchItem->sText;
             aCollectString  +=  "\n";
         }
-        aCollectString  +=  "\0";   // It's better :-)
 
         m_xText_Bottom->setText ( aCollectString );
     }
commit 8502d64878164144bb7f87d84117e260848cf9e3
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Dec 16 13:23:19 2014 +0100

    Daft "\0" triggers assert in OUString literal ctor
    
    ...try
    
    GetProcessServiceManager().createInstance("stardiv.UnoControls.StatusIndicator")
    
    in Basic...
    
    Change-Id: Iafc22188feb8a1d3f1b19ac4f6e209be62a44d17

diff --git a/UnoControls/source/controls/statusindicator.cxx b/UnoControls/source/controls/statusindicator.cxx
index fa9ef0b..240d148 100644
--- a/UnoControls/source/controls/statusindicator.cxx
+++ b/UnoControls/source/controls/statusindicator.cxx
@@ -60,7 +60,7 @@ StatusIndicator::StatusIndicator( const css::uno::Reference< XComponentContext >
     m_xProgressBar->setVisible( true );
     // Reset to defaults !!!
     // (progressbar take automatically its own defaults)
-    m_xText->setText( STATUSINDICATOR_DEFAULT_TEXT );
+    m_xText->setText( "" );
 
     --m_refCount;
 }
diff --git a/UnoControls/source/inc/statusindicator.hxx b/UnoControls/source/inc/statusindicator.hxx
index 50fcbdd..4760d3e 100644
--- a/UnoControls/source/inc/statusindicator.hxx
+++ b/UnoControls/source/inc/statusindicator.hxx
@@ -42,7 +42,6 @@ class ProgressBar;
 #define FIXEDTEXT_MODELNAME                     "com.sun.star.awt.UnoControlFixedTextModel"
 #define CONTROLNAME_TEXT                        "Text"                                                  // identifier the control in container
 #define CONTROLNAME_PROGRESSBAR                 "ProgressBar"                                           //              -||-
-#define STATUSINDICATOR_DEFAULT_TEXT            "\0"
 #define STATUSINDICATOR_BACKGROUNDCOLOR         TRGB_COLORDATA( 0x00, 0xC0, 0xC0, 0xC0 )                // lighgray
 #define STATUSINDICATOR_LINECOLOR_BRIGHT        TRGB_COLORDATA( 0x00, 0xFF, 0xFF, 0xFF )                // white
 #define STATUSINDICATOR_LINECOLOR_SHADOW        TRGB_COLORDATA( 0x00, 0x00, 0x00, 0x00 )                // black