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

[Caolán McNamara]

 UnoControls/source/inc/progressmonitor.hxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f9171206e80b1ff3e3917e2f448ff2b2a43a0b2e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Dec 17 20:28:11 2013 +0000

    embedded nulls in literals
    
    these used to be used with OUString::createFromAscii so a blank
    string is fine here
    
    Change-Id: I744d2be5471fad2675741f908e1ad78f0d5eefbc
    (cherry picked from commit 669c282fea83c44d545fa8c1bfe03fa45568c35b)

diff --git a/UnoControls/source/inc/progressmonitor.hxx b/UnoControls/source/inc/progressmonitor.hxx
index 48bc2b9..759ea6d 100644
--- a/UnoControls/source/inc/progressmonitor.hxx
+++ b/UnoControls/source/inc/progressmonitor.hxx
@@ -75,8 +75,8 @@ namespace unocontrols{
 #define CONTROLNAME_BUTTON                              "Button"                                                //              -||-
 #define CONTROLNAME_PROGRESSBAR                         "ProgressBar"                                           //              -||-
 #define DEFAULT_BUTTONLABEL                             "Abbrechen"
-#define PROGRESSMONITOR_DEFAULT_TOPIC                   "\0"
-#define PROGRESSMONITOR_DEFAULT_TEXT                    "\0"
+#define PROGRESSMONITOR_DEFAULT_TOPIC                   ""
+#define PROGRESSMONITOR_DEFAULT_TEXT                    ""
 #define PROGRESSMONITOR_BACKGROUNDCOLOR                 TRGB_COLORDATA( 0x00, 0xC0, 0xC0, 0xC0 )                // lighgray
 #define PROGRESSMONITOR_LINECOLOR_BRIGHT                TRGB_COLORDATA( 0x00, 0xFF, 0xFF, 0xFF )                // white
 #define PROGRESSMONITOR_LINECOLOR_SHADOW                TRGB_COLORDATA( 0x00, 0x00, 0x00, 0x00 )                // black