Date: prev next · Thread: first prev next last
2013 Archives by date, by thread · List index


Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/1666

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/66/1666/1

Replace [Uni|Xub]String with OUString in vcl

Change-Id: I7cbefa72010cc3e49a93db5b2cbf49cfb08061f7
---
M vcl/inc/helpwin.hxx
M vcl/source/app/help.cxx
M vcl/source/app/svapp.cxx
M vcl/source/control/button.cxx
M vcl/source/control/combobox.cxx
M vcl/source/control/ctrl.cxx
M vcl/source/control/edit.cxx
M vcl/source/control/field.cxx
M vcl/source/control/field2.cxx
M vcl/source/control/longcurr.cxx
M vcl/source/control/morebtn.cxx
M vcl/source/edit/vclmedit.cxx
M vcl/source/window/floatwin.cxx
M vcl/source/window/msgbox.cxx
M vcl/source/window/toolbox2.cxx
M vcl/source/window/window.cxx
M vcl/unx/generic/app/i18n_status.cxx
17 files changed, 65 insertions(+), 65 deletions(-)



diff --git a/vcl/inc/helpwin.hxx b/vcl/inc/helpwin.hxx
index 63f91dd..6923c2b 100644
--- a/vcl/inc/helpwin.hxx
+++ b/vcl/inc/helpwin.hxx
@@ -48,7 +48,7 @@
                         DECL_LINK( TimerHdl, Timer* );
     virtual void        Paint( const Rectangle& );
     virtual void        RequestHelp( const HelpEvent& rHEvt );
-    virtual String      GetText() const;
+    virtual OUString    GetText() const;
     void                ImplShow();
 
 public:
diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx
index f9241dd..b172eb4 100644
--- a/vcl/source/app/help.cxx
+++ b/vcl/source/app/help.cxx
@@ -530,7 +530,7 @@
 
 // -----------------------------------------------------------------------
 
-XubString HelpTextWindow::GetText() const
+OUString HelpTextWindow::GetText() const
 {
     return maHelpText;
 }
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 73530fd..9014895 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -294,16 +294,16 @@
 
 // -----------------------------------------------------------------------
 
-XubString Application::GetCommandLineParam( sal_uInt16 nParam )
+OUString Application::GetCommandLineParam( sal_uInt16 nParam )
 {
-    rtl::OUString aParam;
+    OUString aParam;
     osl_getCommandArg( nParam, &aParam.pData );
     return aParam;
 }
 
 // -----------------------------------------------------------------------
 
-const XubString& Application::GetAppFileName()
+const OUString& Application::GetAppFileName()
 {
     ImplSVData* pSVData = ImplGetSVData();
     DBG_ASSERT( pSVData->maAppData.mpAppFileName, "AppFileName vor SVMain ?!" );
@@ -314,14 +314,14 @@
      *  #91147# provide a fallback for people without initialized
      *  vcl here (like setup in responsefile mode)
      */
-    static String aAppFileName;
-    if( !aAppFileName.Len() )
+    static OUString aAppFileName;
+    if( aAppFileName.isEmpty() )
     {
-        rtl::OUString aExeFileName;
+        OUString aExeFileName;
         osl_getExecutableFile( &aExeFileName.pData );
 
         // convert path to native file format
-        rtl::OUString aNativeFileName;
+        OUString aNativeFileName;
         osl::FileBase::getSystemPathFromFileURL( aExeFileName, aNativeFileName );
         aAppFileName = aNativeFileName;
     }
@@ -365,7 +365,7 @@
 
 // -----------------------------------------------------------------------
 
-void Application::Abort( const XubString& rErrorText )
+void Application::Abort( const OUString& rErrorText )
 {
     //HACK: Dump core iff --norestore command line argument is given (assuming
     // this process is run by developers who are interested in cores, vs. end
@@ -373,7 +373,7 @@
     bool dumpCore = false;
     sal_uInt16 n = GetCommandLineParamCount();
     for (sal_uInt16 i = 0; i != n; ++i) {
-        if (GetCommandLineParam(i).EqualsAscii("--norestore")) {
+        if (GetCommandLineParam(i) == "--norestore") {
             dumpCore = true;
             break;
         }
@@ -1168,20 +1168,20 @@
 
 // -----------------------------------------------------------------------
 
-void Application::SetAppName( const XubString& rUniqueName )
+void Application::SetAppName( const OUString& rUniqueName )
 {
     ImplSVData* pSVData = ImplGetSVData();
 
     // create if not existing
     if ( !pSVData->maAppData.mpAppName )
-        pSVData->maAppData.mpAppName = new XubString( rUniqueName );
+        pSVData->maAppData.mpAppName = new String( rUniqueName );
     else
         *(pSVData->maAppData.mpAppName) = rUniqueName;
 }
 
 // -----------------------------------------------------------------------
 
-XubString Application::GetAppName()
+OUString Application::GetAppName()
 {
     ImplSVData* pSVData = ImplGetSVData();
     if ( pSVData->maAppData.mpAppName )
@@ -1192,7 +1192,7 @@
 
 // -----------------------------------------------------------------------
 
-void Application::SetDisplayName( const UniString& rName )
+void Application::SetDisplayName( const OUString& rName )
 {
     ImplSVData* pSVData = ImplGetSVData();
 
@@ -1205,7 +1205,7 @@
 
 // -----------------------------------------------------------------------
 
-UniString Application::GetDisplayName()
+OUString Application::GetDisplayName()
 {
     ImplSVData* pSVData = ImplGetSVData();
     if ( pSVData->maAppData.mpDisplayName )
@@ -1728,8 +1728,8 @@
 
 // -----------------------------------------------------------------------
 
-void Application::ShowNativeErrorBox(const String& sTitle  ,
-                                     const String& sMessage)
+void Application::ShowNativeErrorBox(const OUString& sTitle  ,
+                                     const OUString& sMessage)
 {
     int btn = ImplGetSalSystem()->ShowNativeMessageBox (
             sTitle,
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 8ad4c6c..2fef91c 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -976,7 +976,7 @@
             break;
     }
 
-    sal_Bool bDropDown = ( IsSymbol() && (GetSymbol()==SYMBOL_SPIN_DOWN) && !GetText().Len() );
+    sal_Bool bDropDown = ( IsSymbol() && (GetSymbol()==SYMBOL_SPIN_DOWN) && GetText().isEmpty() );
 
     if( bDropDown && (aCtrlType == CTRL_COMBOBOX || aCtrlType == CTRL_LISTBOX ) )
     {
@@ -1556,7 +1556,7 @@
                     break;
             }
 
-            sal_Bool bDropDown = ( IsSymbol() && (GetSymbol()==SYMBOL_SPIN_DOWN) && 
!GetText().Len() );
+            sal_Bool bDropDown = ( IsSymbol() && (GetSymbol()==SYMBOL_SPIN_DOWN) && 
GetText().isEmpty() );
 
             if( bDropDown && GetParent()->IsNativeControlSupported( aCtrlType, 
PART_ENTIRE_CONTROL) &&
                    !GetParent()->IsNativeControlSupported( aCtrlType, PART_BUTTON_DOWN) )
@@ -1688,7 +1688,7 @@
     }
     else if ( IsImage() && ! (ImplGetButtonState() & BUTTON_DRAW_NOIMAGE) )
         aSize = GetModeImage().GetSizePixel();
-    if ( PushButton::GetText().Len() && ! (ImplGetButtonState() & BUTTON_DRAW_NOTEXT) )
+    if ( !PushButton::GetText().isEmpty() && ! (ImplGetButtonState() & BUTTON_DRAW_NOTEXT) )
     {
         sal_uLong nDrawFlags = 0;
         Size textSize = GetTextRect( Rectangle( Point(), Size( nMaxWidth ? nMaxWidth : 0x7fffffff, 
0x7fffffff ) ),
@@ -3640,7 +3640,7 @@
 
 void CheckBox::GetFocus()
 {
-    if ( !GetText().Len() || (ImplGetButtonState() & BUTTON_DRAW_NOTEXT) )
+    if ( GetText().isEmpty() || (ImplGetButtonState() & BUTTON_DRAW_NOTEXT) )
     {
         // increase button size to have space for focus rect
         // checkboxes without text will draw focusrect around the check
@@ -3673,7 +3673,7 @@
     HideFocus();
     Button::LoseFocus();
 
-    if ( !GetText().Len() || (ImplGetButtonState() & BUTTON_DRAW_NOTEXT) )
+    if ( GetText().isEmpty() || (ImplGetButtonState() & BUTTON_DRAW_NOTEXT) )
     {
         // decrease button size again (see GetFocus())
         // checkboxes without text will draw focusrect around the check
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 389929c3..8d6acc9 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -606,7 +606,7 @@
     {
         mpSubEdit->SetSizePixel( Size( aOutSz.Width(), mnDDHeight ) );
         mpImplLB->setPosSizePixel( 0, mnDDHeight, aOutSz.Width(), aOutSz.Height() - mnDDHeight );
-        if ( GetText().Len() )
+        if ( !GetText().isEmpty() )
             ImplUpdateFloatSelection();
     }
 
diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx
index 8ebd3eb..8e2dd41 100644
--- a/vcl/source/control/ctrl.cxx
+++ b/vcl/source/control/ctrl.cxx
@@ -271,11 +271,11 @@
 
 // -----------------------------------------------------------------------
 
-String Control::GetDisplayText() const
+OUString Control::GetDisplayText() const
 {
     if( !HasLayoutData() )
         FillLayoutData();
-    return mpControlData->mpLayoutData ? mpControlData->mpLayoutData->m_aDisplayText : GetText();
+    return mpControlData->mpLayoutData ? OUString(mpControlData->mpLayoutData->m_aDisplayText) : 
GetText();
 }
 
 // -----------------------------------------------------------------------
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 513fd51..2a46c3a 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -2836,7 +2836,7 @@
 
 // -----------------------------------------------------------------------
 
-XubString Edit::GetText() const
+OUString Edit::GetText() const
 {
     if ( mpSubEdit )
         return mpSubEdit->GetText();
@@ -2853,7 +2853,7 @@
     else if ( maPlaceholderText != rStr )
     {
         maPlaceholderText = rStr;
-        if ( GetText().Len() == 0 )
+        if ( GetText().isEmpty() )
             Invalidate();
     }
 }
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 8d0a340..653a2d6 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -425,7 +425,7 @@
 
 sal_Bool FormatterBase::IsEmptyFieldValue() const
 {
-    return (!mpField || !mpField->GetText().Len());
+    return (!mpField || mpField->GetText().isEmpty());
 }
 
 // -----------------------------------------------------------------------
@@ -688,7 +688,7 @@
     if ( !GetField() )
         return;
 
-    if ( !GetField()->GetText().Len() && ImplGetEmptyFieldValue() )
+    if ( GetField()->GetText().isEmpty() && ImplGetEmptyFieldValue() )
         return;
 
     XubString aStr;
@@ -756,9 +756,9 @@
 
         Selection aSelection = GetField()->GetSelection();
         aSelection.Justify();
-        XubString aText = GetField()->GetText();
+        OUString aText = GetField()->GetText();
         // leave it as is if selected until end
-        if ( (xub_StrLen)aSelection.Max() == aText.Len() )
+        if ( (xub_StrLen)aSelection.Max() == aText.getLength() )
         {
             if ( !aSelection.Len() )
                 aSelection.Min() = SELECTION_MAX;
@@ -858,7 +858,7 @@
         MarkToBeReformatted( sal_False );
     else if ( rNEvt.GetType() == EVENT_LOSEFOCUS )
     {
-        if ( MustBeReformatted() && (GetText().Len() || !IsEmptyFieldValueEnabled()) )
+        if ( MustBeReformatted() && (!GetText().isEmpty() || !IsEmptyFieldValueEnabled()) )
             Reformat();
     }
 
@@ -1016,7 +1016,7 @@
         MarkToBeReformatted( sal_False );
     else if ( rNEvt.GetType() == EVENT_LOSEFOCUS )
     {
-        if ( MustBeReformatted() && (GetText().Len() || !IsEmptyFieldValueEnabled()) )
+        if ( MustBeReformatted() && (!GetText().isEmpty() || !IsEmptyFieldValueEnabled()) )
             Reformat();
     }
 
@@ -1833,7 +1833,7 @@
         MarkToBeReformatted( sal_False );
     else if ( rNEvt.GetType() == EVENT_LOSEFOCUS )
     {
-        if ( MustBeReformatted() && (GetText().Len() || !IsEmptyFieldValueEnabled()) )
+        if ( MustBeReformatted() && (!GetText().isEmpty() || !IsEmptyFieldValueEnabled()) )
             Reformat();
     }
 
@@ -1959,7 +1959,7 @@
         MarkToBeReformatted( sal_False );
     else if ( rNEvt.GetType() == EVENT_LOSEFOCUS )
     {
-        if ( MustBeReformatted() && (GetText().Len() || !IsEmptyFieldValueEnabled()) )
+        if ( MustBeReformatted() && (!GetText().isEmpty() || !IsEmptyFieldValueEnabled()) )
             Reformat();
     }
 
@@ -2245,7 +2245,7 @@
         MarkToBeReformatted( sal_False );
     else if ( rNEvt.GetType() == EVENT_LOSEFOCUS )
     {
-        if ( MustBeReformatted() && (GetText().Len() || !IsEmptyFieldValueEnabled()) )
+        if ( MustBeReformatted() && (!GetText().isEmpty() || !IsEmptyFieldValueEnabled()) )
             Reformat();
     }
 
@@ -2347,7 +2347,7 @@
         MarkToBeReformatted( sal_False );
     else if ( rNEvt.GetType() == EVENT_LOSEFOCUS )
     {
-        if ( MustBeReformatted() && (GetText().Len() || !IsEmptyFieldValueEnabled()) )
+        if ( MustBeReformatted() && (!GetText().isEmpty() || !IsEmptyFieldValueEnabled()) )
             Reformat();
     }
 
diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx
index 4193b14..abb591c 100644
--- a/vcl/source/control/field2.cxx
+++ b/vcl/source/control/field2.cxx
@@ -889,7 +889,7 @@
         MarkToBeReformatted( sal_False );
     else if ( rNEvt.GetType() == EVENT_LOSEFOCUS )
     {
-        if ( MustBeReformatted() && (GetText().Len() || !IsEmptyFieldValueEnabled()) )
+        if ( MustBeReformatted() && (!GetText().isEmpty() || !IsEmptyFieldValueEnabled()) )
             Reformat();
     }
 
@@ -949,7 +949,7 @@
         MarkToBeReformatted( sal_False );
     else if ( rNEvt.GetType() == EVENT_LOSEFOCUS )
     {
-        if ( MustBeReformatted() && (GetText().Len() || !IsEmptyFieldValueEnabled()) )
+        if ( MustBeReformatted() && (GetText().isEmpty() || !IsEmptyFieldValueEnabled()) )
             Reformat();
     }
 
@@ -1744,10 +1744,10 @@
     {
         Selection aSelection = GetField()->GetSelection();
         aSelection.Justify();
-        XubString aText = GetField()->GetText();
+        OUString aText = GetField()->GetText();
 
         // If selected until the end then keep it that way
-        if ( (xub_StrLen)aSelection.Max() == aText.Len() )
+        if ( (xub_StrLen)aSelection.Max() == aText.getLength() )
         {
             if ( !aSelection.Len() )
                 aSelection.Min() = SELECTION_MAX;
@@ -1817,7 +1817,7 @@
 
     if ( GetField() && MustBeReformatted() && IsEmptyFieldValueEnabled() )
     {
-        if ( !GetField()->GetText().Len() )
+        if ( GetField()->GetText().isEmpty() )
         {
             bEmpty = sal_True;
         }
@@ -1837,7 +1837,7 @@
     if ( !GetField() )
         return;
 
-    if ( !GetField()->GetText().Len() && ImplGetEmptyFieldValue() )
+    if ( GetField()->GetText().isEmpty() && ImplGetEmptyFieldValue() )
         return;
 
     XubString aStr;
@@ -1979,7 +1979,7 @@
             // !!! We should find out why dates are treated differently than other fields (see
             // also bug: 52384)
 
-            sal_Bool bTextLen = GetText().Len() != 0;
+            sal_Bool bTextLen = !GetText().isEmpty();
             if ( bTextLen || !IsEmptyFieldValueEnabled() )
             {
                 if ( !ImplAllowMalformedInput() )
@@ -2113,7 +2113,7 @@
     {
         if ( MustBeReformatted() )
         {
-            sal_Bool bTextLen = GetText().Len() != 0;
+            sal_Bool bTextLen = !GetText().isEmpty();
             if ( bTextLen || !IsEmptyFieldValueEnabled() )
                 Reformat();
             else if ( !bTextLen && IsEmptyFieldValueEnabled() )
@@ -2706,10 +2706,10 @@
     {
         Selection aSelection = GetField()->GetSelection();
         aSelection.Justify();
-        XubString aText = GetField()->GetText();
+        OUString aText = GetField()->GetText();
 
         // If selected until the end then keep it that way
-        if ( (xub_StrLen)aSelection.Max() == aText.Len() )
+        if ( (xub_StrLen)aSelection.Max() == aText.getLength() )
         {
             if ( !aSelection.Len() )
                 aSelection.Min() = SELECTION_MAX;
@@ -2829,7 +2829,7 @@
     if ( !GetField() )
         return;
 
-    if ( !GetField()->GetText().Len() && ImplGetEmptyFieldValue() )
+    if ( GetField()->GetText().isEmpty() && ImplGetEmptyFieldValue() )
         return;
 
     XubString aStr;
@@ -2930,7 +2930,7 @@
         MarkToBeReformatted( sal_False );
     else if ( rNEvt.GetType() == EVENT_LOSEFOCUS )
     {
-        if ( MustBeReformatted() && (GetText().Len() || !IsEmptyFieldValueEnabled()) )
+        if ( MustBeReformatted() && (!GetText().isEmpty() || !IsEmptyFieldValueEnabled()) )
         {
             if ( !ImplAllowMalformedInput() )
                 Reformat();
@@ -3051,7 +3051,7 @@
         default:    OSL_FAIL( "ExtTimeFieldFormat unknown!" );
     }
 
-    if ( GetField() && GetField()->GetText().Len() )
+    if ( GetField() && !GetField()->GetText().isEmpty() )
         SetUserTime( GetTime() );
     ReformatAll();
 }
@@ -3093,7 +3093,7 @@
         MarkToBeReformatted( sal_False );
     else if ( rNEvt.GetType() == EVENT_LOSEFOCUS )
     {
-        if ( MustBeReformatted() && (GetText().Len() || !IsEmptyFieldValueEnabled()) )
+        if ( MustBeReformatted() && (!GetText().isEmpty() || !IsEmptyFieldValueEnabled()) )
             Reformat();
     }
 
diff --git a/vcl/source/control/longcurr.cxx b/vcl/source/control/longcurr.cxx
index e9a8330..d84b404 100644
--- a/vcl/source/control/longcurr.cxx
+++ b/vcl/source/control/longcurr.cxx
@@ -413,7 +413,7 @@
     if ( !GetField() )
         return;
 
-    if ( !GetField()->GetText().Len() && ImplGetEmptyFieldValue() )
+    if ( GetField()->GetText().isEmpty() && ImplGetEmptyFieldValue() )
         return;
 
     XubString aStr;
diff --git a/vcl/source/control/morebtn.cxx b/vcl/source/control/morebtn.cxx
index 6109045..5373b9f5 100644
--- a/vcl/source/control/morebtn.cxx
+++ b/vcl/source/control/morebtn.cxx
@@ -213,7 +213,7 @@
 
 // -----------------------------------------------------------------------
 
-XubString MoreButton::GetText() const
+OUString MoreButton::GetText() const
 {
     return PushButton::GetText();
 }
diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx
index 23109d6..b467dd0 100644
--- a/vcl/source/edit/vclmedit.cxx
+++ b/vcl/source/edit/vclmedit.cxx
@@ -1166,12 +1166,12 @@
     pImpVclMEdit->SetText( rStr );
 }
 
-String VclMultiLineEdit::GetText() const
+OUString VclMultiLineEdit::GetText() const
 {
     return pImpVclMEdit->GetText();
 }
 
-String VclMultiLineEdit::GetText( LineEnd aSeparator ) const
+OUString VclMultiLineEdit::GetText( LineEnd aSeparator ) const
 {
     return pImpVclMEdit->GetText( aSeparator );
 }
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index 4ca8573..92ce317 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -656,7 +656,7 @@
 
     // remove title
     mnOldTitle = mnTitle;
-    if ( ( mpWindowImpl->mnStyle & WB_POPUP ) && GetText().Len() )
+    if ( ( mpWindowImpl->mnStyle & WB_POPUP ) && !GetText().isEmpty() )
         SetTitleType( FLOATWIN_TITLE_POPUP );
     else if ( nFlags & FLOATWIN_POPUPMODE_ALLOWTEAROFF )
         SetTitleType( FLOATWIN_TITLE_TEAROFF );
diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx
index 86dd223..12a0147 100644
--- a/vcl/source/window/msgbox.cxx
+++ b/vcl/source/window/msgbox.cxx
@@ -442,7 +442,7 @@
 void InfoBox::ImplInitInfoBoxData()
 {
     // Default Text is the display title from the application
-    if ( !GetText().Len() )
+    if ( GetText().isEmpty() )
         SetText( Application::GetDisplayName() );
 
     SetImage( InfoBox::GetStandardImage() );
@@ -477,7 +477,7 @@
 void WarningBox::ImplInitWarningBoxData()
 {
     // Default Text is the display title from the application
-    if ( !GetText().Len() )
+    if ( GetText().isEmpty() )
         SetText( Application::GetDisplayName() );
 
     SetImage( WarningBox::GetStandardImage() );
@@ -522,7 +522,7 @@
 void ErrorBox::ImplInitErrorBoxData()
 {
     // Default Text is the display title from the application
-    if ( !GetText().Len() )
+    if ( GetText().isEmpty() )
         SetText( Application::GetDisplayName() );
 
     SetImage( ErrorBox::GetStandardImage() );
@@ -567,7 +567,7 @@
 void QueryBox::ImplInitQueryBoxData()
 {
     // Default Text is the display title from the application
-    if ( !GetText().Len() )
+    if ( GetText().isEmpty() )
         SetText( Application::GetDisplayName() );
 
     SetImage( QueryBox::GetStandardImage() );
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index b9a9853..32b5bf7 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -1817,7 +1817,7 @@
 
 // -----------------------------------------------------------------------
 
-String ToolBox::GetDisplayText() const
+OUString ToolBox::GetDisplayText() const
 {
     if( ! mpData->m_pLayoutData )
         ImplFillLayoutData();
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 4e926f9..16a1549 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -7888,7 +7888,7 @@
 
 // -----------------------------------------------------------------------
 
-String Window::GetText() const
+OUString Window::GetText() const
 {
     DBG_CHKTHIS( Window, ImplDbgCheckWindow );
 
@@ -7897,7 +7897,7 @@
 
 // -----------------------------------------------------------------------
 
-String Window::GetDisplayText() const
+OUString Window::GetDisplayText() const
 {
     DBG_CHKTHIS( Window, ImplDbgCheckWindow );
 
diff --git a/vcl/unx/generic/app/i18n_status.cxx b/vcl/unx/generic/app/i18n_status.cxx
index d932c5d..602c1d9 100644
--- a/vcl/unx/generic/app/i18n_status.cxx
+++ b/vcl/unx/generic/app/i18n_status.cxx
@@ -281,7 +281,7 @@
 
 void XIMStatusWindow::show( bool bShow, I18NStatus::ShowReason eReason )
 {
-    if( bShow && ! m_aStatusText.GetText().Len() )
+    if( bShow && m_aStatusText.GetText().isEmpty() )
         bShow = false;
 
     m_bDelayedShow = bShow;

-- 
To view, visit https://gerrit.libreoffice.org/1666
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7cbefa72010cc3e49a93db5b2cbf49cfb08061f7
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Christina Roßmanith <ChrRossmanith@web.de>


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.