[Libreoffice-commits] core.git: 4 commits - include/vcl sfx2/uiconfig starmath/uiconfig svx/source svx/uiconfig sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk uui/source vcl/inc vcl/source

Caolán McNamara caolanm at redhat.com
Sun Jun 30 12:40:38 PDT 2013


 include/vcl/btndlg.hxx                           |    8 ++---
 include/vcl/svapp.hxx                            |   10 +++---
 include/vcl/vclmedit.hxx                         |    2 -
 sfx2/uiconfig/ui/querysavedialog.ui              |    2 -
 starmath/uiconfig/smath/ui/savedefaultsdialog.ui |    2 -
 svx/source/dialog/prtqry.cxx                     |    2 -
 svx/uiconfig/ui/deletefooterdialog.ui            |    2 -
 svx/uiconfig/ui/deleteheaderdialog.ui            |    2 -
 sw/UIConfig_swriter.mk                           |    1 
 sw/inc/comcore.hrc                               |    1 
 sw/source/core/doc/docedt.cxx                    |    6 ++--
 sw/source/ui/app/app.src                         |    7 ----
 sw/source/ui/shells/textsh1.cxx                  |    2 -
 sw/uiconfig/swriter/ui/queryshowchangesdialog.ui |   34 +++++++++++++++++++++++
 sw/uiconfig/swriter/ui/saveashtmldialog.ui       |    2 -
 uui/source/alreadyopen.cxx                       |    4 +-
 uui/source/filechanged.cxx                       |    2 -
 uui/source/openlocked.cxx                        |    4 +-
 uui/source/trylater.cxx                          |    4 +-
 vcl/inc/svdata.hxx                               |    2 -
 vcl/source/app/svapp.cxx                         |   27 +++++++-----------
 vcl/source/app/svmain.cxx                        |    2 -
 vcl/source/window/btndlg.cxx                     |    8 ++---
 vcl/source/window/layout.cxx                     |    2 -
 24 files changed, 80 insertions(+), 58 deletions(-)

New commits:
commit e5f3e328a2ffe86425c571bb43ffd3f3f650db81
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Jun 30 20:39:26 2013 +0100

    misc minor tweaks to messagedialogs
    
    Change-Id: I0ec4a7257d352fac43aca57269ffaec96a706651

diff --git a/include/vcl/vclmedit.hxx b/include/vcl/vclmedit.hxx
index a9ba116..44fd194 100644
--- a/include/vcl/vclmedit.hxx
+++ b/include/vcl/vclmedit.hxx
@@ -116,7 +116,7 @@ public:
     virtual void    Resize();
     virtual void    GetFocus();
 
-    Size            CalcMinimumSize() const;
+    virtual Size    CalcMinimumSize() const;
     Size            CalcAdjustedSize( const Size& rPrefSize ) const;
     using Edit::CalcSize;
     Size            CalcSize( sal_uInt16 nColumns, sal_uInt16 nLines ) const;
diff --git a/sfx2/uiconfig/ui/querysavedialog.ui b/sfx2/uiconfig/ui/querysavedialog.ui
index 8fdce81..ab3dd3e 100644
--- a/sfx2/uiconfig/ui/querysavedialog.ui
+++ b/sfx2/uiconfig/ui/querysavedialog.ui
@@ -4,7 +4,7 @@
   <object class="GtkMessageDialog" id="QuerySaveDialog">
     <property name="can_focus">False</property>
     <property name="border_width">12</property>
-    <property name="title" translatable="yes">Save document</property>
+    <property name="title" translatable="yes">Save document?</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">warning</property>
diff --git a/starmath/uiconfig/smath/ui/savedefaultsdialog.ui b/starmath/uiconfig/smath/ui/savedefaultsdialog.ui
index bcf7108..6c05c7e 100644
--- a/starmath/uiconfig/smath/ui/savedefaultsdialog.ui
+++ b/starmath/uiconfig/smath/ui/savedefaultsdialog.ui
@@ -4,7 +4,7 @@
   <object class="GtkMessageDialog" id="SaveDefaultsDialog">
     <property name="can_focus">False</property>
     <property name="border_width">12</property>
-    <property name="title" translatable="yes">Save defaults</property>
+    <property name="title" translatable="yes">Save defaults?</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">question</property>
diff --git a/svx/uiconfig/ui/deletefooterdialog.ui b/svx/uiconfig/ui/deletefooterdialog.ui
index 5432126..98fb3d5 100644
--- a/svx/uiconfig/ui/deletefooterdialog.ui
+++ b/svx/uiconfig/ui/deletefooterdialog.ui
@@ -4,7 +4,7 @@
   <object class="GtkMessageDialog" id="DeleteFooterDialog">
     <property name="can_focus">False</property>
     <property name="border_width">12</property>
-    <property name="title" translatable="yes">Delete footer</property>
+    <property name="title" translatable="yes">Delete footer?</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">warning</property>
diff --git a/svx/uiconfig/ui/deleteheaderdialog.ui b/svx/uiconfig/ui/deleteheaderdialog.ui
index a2099c6..2fb39b4 100644
--- a/svx/uiconfig/ui/deleteheaderdialog.ui
+++ b/svx/uiconfig/ui/deleteheaderdialog.ui
@@ -4,7 +4,7 @@
   <object class="GtkMessageDialog" id="DeleteHeaderDialog">
     <property name="can_focus">False</property>
     <property name="border_width">12</property>
-    <property name="title" translatable="yes">Delete header</property>
+    <property name="title" translatable="yes">Delete header?</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">warning</property>
commit d2b2b79106f4eb9e355229623554be2317046c4f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Jun 30 20:38:46 2013 +0100

    convert show redlines warning box to new-style message dialog
    
    Change-Id: I5d7e205c8908fab6ff70065961d77b3b91d82461

diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index d7f016d..b0a2966 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -103,6 +103,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
 	sw/uiconfig/swriter/ui/outlinenumbering \
 	sw/uiconfig/swriter/ui/outlinenumberingpage \
 	sw/uiconfig/swriter/ui/outlinepositionpage \
+	sw/uiconfig/swriter/ui/queryshowchangesdialog \
 	sw/uiconfig/swriter/ui/previewzoomdialog \
 	sw/uiconfig/swriter/ui/printoptionspage \
 	sw/uiconfig/swriter/ui/printeroptions \
diff --git a/sw/inc/comcore.hrc b/sw/inc/comcore.hrc
index ace1c6e..21e1d7e 100644
--- a/sw/inc/comcore.hrc
+++ b/sw/inc/comcore.hrc
@@ -43,7 +43,6 @@
 #define STR_SPELL_TITLE                     (RC_COMCORE_BEGIN + 15)
 #define STR_HYPH_TITLE                      (RC_COMCORE_BEGIN + 16)
 #define MSG_DISABLE_UNDO_QUESTION           (RC_COMCORE_BEGIN + 17)
-#define MSG_DISABLE_READLINE_QUESTION       (RC_COMCORE_BEGIN + 18)
 
 #define STR_REDLINE_INSERT                  (RC_COMCORE_BEGIN + 19)
 #define STR_REDLINE_DELETE                  (RC_COMCORE_BEGIN + 20)
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index c3ebae4..ac38be8 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -39,7 +39,7 @@
 #include <UndoInsert.hxx>
 #include <UndoDelete.hxx>
 #include <breakit.hxx>
-#include <vcl/msgbox.hxx>
+#include <vcl/layout.hxx>
 #include "comcore.hrc"
 #include "editsh.hxx"
 #include <fmtfld.hxx>
@@ -2700,8 +2700,8 @@ void SwDoc::checkRedlining(RedlineMode_t& _rReadlineMode)
     if ( pParent && !mbReadlineChecked && rRedlineTbl.size() > MAX_REDLINE_COUNT
         && !((_rReadlineMode & nsRedlineMode_t::REDLINE_SHOW_DELETE) == nsRedlineMode_t::REDLINE_SHOW_DELETE) )
     {
-        WarningBox aWarning( pParent,SW_RES(MSG_DISABLE_READLINE_QUESTION));
-        sal_uInt16 nResult = aWarning.Execute();
+        MessageDialog aQuery(pParent, "QueryShowChangesDialog", "modules/swriter/ui/queryshowchangesdialog.ui");
+        sal_uInt16 nResult = aQuery.Execute();
         mbReadlineChecked = sal_True;
         if ( nResult == RET_YES )
         {
diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
index fdde472..d18ee58 100644
--- a/sw/source/ui/app/app.src
+++ b/sw/source/ui/app/app.src
@@ -776,13 +776,6 @@ ToolBox RID_MODULE_TOOLBOX
     Scroll = TRUE ;
 };
 
-WarningBox MSG_DISABLE_READLINE_QUESTION
-{
-    BUTTONS = WB_YES_NO;
-    DEFBUTTON = WB_DEF_YES ;
-    Message [ en-US ] = "In the current document, changes are being recorded but not shown as such. In large documents, delays can occur when the document is edited. Do you want to show the changes to avoid delays?";
-};
-
 String STR_ROTATE_TO_STANDARD_ORIENTATION
 {
     Text [ en-US ] = "This image is rotated. Would you like to rotate it into standard orientation?";
diff --git a/sw/uiconfig/swriter/ui/queryshowchangesdialog.ui b/sw/uiconfig/swriter/ui/queryshowchangesdialog.ui
new file mode 100644
index 0000000..e43ea0d
--- /dev/null
+++ b/sw/uiconfig/swriter/ui/queryshowchangesdialog.ui
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <object class="GtkMessageDialog" id="QueryShowChangesDialog">
+    <property name="can_focus">False</property>
+    <property name="border_width">12</property>
+    <property name="title" translatable="yes">Show changes?</property>
+    <property name="type_hint">dialog</property>
+    <property name="skip_taskbar_hint">True</property>
+    <property name="message_type">question</property>
+    <property name="buttons">yes-no</property>
+    <property name="text" translatable="yes">Do you want to show changes to avoid delays?</property>
+    <property name="secondary_text" translatable="yes">In the current document, changes are being recorded but not shown as such. In large documents, delays can occur when the document is edited. Showing changes will avoid delays.</property>
+    <child internal-child="vbox">
+      <object class="GtkBox" id="messagedialog-vbox">
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">24</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="messagedialog-action_area">
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>
diff --git a/sw/uiconfig/swriter/ui/saveashtmldialog.ui b/sw/uiconfig/swriter/ui/saveashtmldialog.ui
index cd8f0d0..ebd1da5 100644
--- a/sw/uiconfig/swriter/ui/saveashtmldialog.ui
+++ b/sw/uiconfig/swriter/ui/saveashtmldialog.ui
@@ -4,7 +4,7 @@
   <object class="GtkMessageDialog" id="SaveAsHTMLDialog">
     <property name="can_focus">False</property>
     <property name="border_width">12</property>
-    <property name="title" translatable="yes">Save as HTML</property>
+    <property name="title" translatable="yes">Save as HTML?</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="message_type">question</property>
commit fea12c47101d3d13d1e6a611f88c54f257b49b11
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Jun 30 20:35:23 2013 +0100

    using primary font for secondary max text width
    
    Change-Id: If4d5d4be2a5552c52e7e98ff891e2166b7541800

diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index be28fff..0cdf84c 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -1813,7 +1813,7 @@ short MessageDialog::Execute()
         m_pSecondaryMessage->set_hexpand(true);
         m_pSecondaryMessage->SetText(m_sSecondaryString);
         m_pSecondaryMessage->Show(!m_sSecondaryString.isEmpty());
-        m_pSecondaryMessage->SetMaxTextWidth(m_pPrimaryMessage->approximate_char_width() * 80);
+        m_pSecondaryMessage->SetMaxTextWidth(m_pSecondaryMessage->approximate_char_width() * 80);
 
         VclButtonBox *pButtonBox = get_action_area();
         assert(pButtonBox);
commit 0306e253fef4c25d4fe39ff9b5711c9487adc47b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Jun 30 13:49:12 2013 +0100

    XubString->OUString
    
    Change-Id: I40ff06facc304630ccedd82d2f20b3573bdc5cb4

diff --git a/include/vcl/btndlg.hxx b/include/vcl/btndlg.hxx
index 5411098..12c7cbe 100644
--- a/include/vcl/btndlg.hxx
+++ b/include/vcl/btndlg.hxx
@@ -84,14 +84,14 @@ public:
 
     sal_uInt16              GetCurButtonId() const { return mnCurButtonId; }
 
-    void                AddButton( const XubString& rText, sal_uInt16 nId, sal_uInt16 nBtnFlags, long nSepPixel = 0 );
+    void                AddButton( const OUString& rText, sal_uInt16 nId, sal_uInt16 nBtnFlags, long nSepPixel = 0 );
     void                AddButton( StandardButtonType eType, sal_uInt16 nId, sal_uInt16 nBtnFlags, long nSepPixel = 0 );
     void                RemoveButton( sal_uInt16 nId );
     void                Clear();
-    sal_uInt16              GetButtonId( sal_uInt16 nButton ) const;
+    sal_uInt16          GetButtonId( sal_uInt16 nButton ) const;
     PushButton*         GetPushButton( sal_uInt16 nId ) const;
-    void                SetButtonText( sal_uInt16 nId, const XubString& rText );
-    void                SetButtonHelpText( sal_uInt16 nId, const XubString& rText );
+    void                SetButtonText( sal_uInt16 nId, const OUString& rText );
+    void                SetButtonHelpText( sal_uInt16 nId, const OUString& rText );
 
     void                SetFocusButton( sal_uInt16 nId = BUTTONDIALOG_BUTTON_NOTFOUND ) { mnFocusButtonId = nId; }
     sal_uInt16              GetFocusButton() const { return mnFocusButtonId; }
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index c67a189..67a48ee 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -143,12 +143,12 @@ public:
     virtual void                InitFinished();
     virtual void                DeInit();
 
-    static sal_uInt16               GetCommandLineParamCount();
-    static XubString            GetCommandLineParam( sal_uInt16 nParam );
-    static const XubString&     GetAppFileName();
+    static sal_uInt16           GetCommandLineParamCount();
+    static OUString             GetCommandLineParam( sal_uInt16 nParam );
+    static OUString             GetAppFileName();
 
-    virtual sal_uInt16              Exception( sal_uInt16 nError );
-    static void                 Abort( const XubString& rErrorText );
+    virtual sal_uInt16          Exception( sal_uInt16 nError );
+    static void                 Abort( const OUString& rErrorText );
 
     static void                 Execute();
     static void                 Quit();
diff --git a/svx/source/dialog/prtqry.cxx b/svx/source/dialog/prtqry.cxx
index 520e5d7..94b684d 100644
--- a/svx/source/dialog/prtqry.cxx
+++ b/svx/source/dialog/prtqry.cxx
@@ -35,7 +35,7 @@ SvxPrtQryBox::SvxPrtQryBox(Window* pParent) :
 
     AddButton(String(SVX_RES(RID_SVXSTR_QRY_PRINT_ALL)), 2, 0);
     AddButton(BUTTON_CANCEL, RET_CANCEL, BUTTONDIALOG_CANCELBUTTON);
-    SetButtonHelpText( RET_OK, String() );
+    SetButtonHelpText( RET_OK, OUString() );
 }
 
 SvxPrtQryBox::~SvxPrtQryBox()
diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx
index 2ac65fd..48e0355 100644
--- a/sw/source/ui/shells/textsh1.cxx
+++ b/sw/source/ui/shells/textsh1.cxx
@@ -279,7 +279,7 @@ static short lcl_AskRedlineMode(Window *pWin)
     aQBox.GetPushButton( RET_CANCEL )->SetHelpId(HID_AUTOFORMAT_REJECT  );
     aQBox.AddButton(String(SW_RES(STR_REDLINE_EDIT)), 2, 0);
     aQBox.GetPushButton( 2 )->SetHelpId(HID_AUTOFORMAT_EDIT_CHG);
-    aQBox.SetButtonHelpText( RET_OK, aEmptyStr );
+    aQBox.SetButtonHelpText( RET_OK, OUString() );
 
     return aQBox.Execute();
 }
diff --git a/uui/source/alreadyopen.cxx b/uui/source/alreadyopen.cxx
index 468cb43..002d052 100644
--- a/uui/source/alreadyopen.cxx
+++ b/uui/source/alreadyopen.cxx
@@ -42,8 +42,8 @@ AlreadyOpenQueryBox::AlreadyOpenQueryBox( Window* pParent, ResMgr* pResMgr, cons
         AddButton( BUTTON_CANCEL, RET_CANCEL, BUTTONDIALOG_CANCELBUTTON );
     }
 
-    SetButtonHelpText( RET_YES, String::EmptyString() );
-    SetButtonHelpText( RET_NO, String::EmptyString() );
+    SetButtonHelpText( RET_YES, OUString() );
+    SetButtonHelpText( RET_NO, OUString() );
 }
 
 AlreadyOpenQueryBox::~AlreadyOpenQueryBox()
diff --git a/uui/source/filechanged.cxx b/uui/source/filechanged.cxx
index 0121762..b8c1311 100644
--- a/uui/source/filechanged.cxx
+++ b/uui/source/filechanged.cxx
@@ -31,7 +31,7 @@ FileChangedQueryBox::FileChangedQueryBox( Window* pParent, ResMgr* pResMgr ) :
             BUTTONDIALOG_DEFBUTTON | BUTTONDIALOG_OKBUTTON | BUTTONDIALOG_FOCUSBUTTON);
     AddButton( BUTTON_CANCEL, RET_CANCEL, BUTTONDIALOG_CANCELBUTTON );
 
-    SetButtonHelpText( RET_YES, String::EmptyString() );
+    SetButtonHelpText( RET_YES, OUString() );
     SetMessText(ResId(STR_FILECHANGED_MSG, *pResMgr).toString());
 }
 
diff --git a/uui/source/openlocked.cxx b/uui/source/openlocked.cxx
index c40b484..f58a871 100644
--- a/uui/source/openlocked.cxx
+++ b/uui/source/openlocked.cxx
@@ -33,8 +33,8 @@ OpenLockedQueryBox::OpenLockedQueryBox( Window* pParent, ResMgr* pResMgr, const
     AddButton(ResId(STR_OPENLOCKED_OPENCOPY_BTN, *pResMgr).toString(), RET_NO, 0);
 
     AddButton( BUTTON_CANCEL, RET_CANCEL, BUTTONDIALOG_CANCELBUTTON );
-    SetButtonHelpText( RET_YES, String() );
-    SetButtonHelpText( RET_NO, String() );
+    SetButtonHelpText( RET_YES, OUString() );
+    SetButtonHelpText( RET_NO, OUString() );
 
 #ifdef WNT
     // bnc#656566
diff --git a/uui/source/trylater.cxx b/uui/source/trylater.cxx
index 411ba0f8..57825c15 100644
--- a/uui/source/trylater.cxx
+++ b/uui/source/trylater.cxx
@@ -32,8 +32,8 @@ TryLaterQueryBox::TryLaterQueryBox( Window* pParent, ResMgr* pResMgr, const Stri
     AddButton(ResId(STR_TRYLATER_SAVEAS_BTN, *pResMgr).toString(), RET_NO, 0);
     AddButton( BUTTON_CANCEL, RET_CANCEL, BUTTONDIALOG_CANCELBUTTON );
 
-    SetButtonHelpText( RET_YES, String::EmptyString() );
-    SetButtonHelpText( RET_NO, String::EmptyString() );
+    SetButtonHelpText( RET_YES, OUString() );
+    SetButtonHelpText( RET_NO, OUString() );
 }
 
 TryLaterQueryBox::~TryLaterQueryBox()
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index a929165..e056031 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -117,7 +117,7 @@ struct ImplSVAppData
     VclEventListeners*      mpKeyListeners;     // listeners for key events only (eg, extended toolkit)
     ImplAccelManager*       mpAccelMgr;         // Accelerator Manager
     XubString*              mpAppName;          // Application name
-    XubString*              mpAppFileName;      // Abs. Application FileName
+    OUString*               mpAppFileName;      // Abs. Application FileName
     OUString*               mpDisplayName;      // Application Display Name
     String*                 mpFontPath;         // Additional Fontpath
     Help*                   mpHelp;             // Application help
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 8fdbfaa..0e4d763 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -287,7 +287,7 @@ sal_uInt16 Application::GetCommandLineParamCount()
 
 // -----------------------------------------------------------------------
 
-XubString Application::GetCommandLineParam( sal_uInt16 nParam )
+OUString Application::GetCommandLineParam( sal_uInt16 nParam )
 {
     OUString aParam;
     osl_getCommandArg( nParam, &aParam.pData );
@@ -296,7 +296,7 @@ XubString Application::GetCommandLineParam( sal_uInt16 nParam )
 
 // -----------------------------------------------------------------------
 
-const XubString& Application::GetAppFileName()
+OUString Application::GetAppFileName()
 {
     ImplSVData* pSVData = ImplGetSVData();
     DBG_ASSERT( pSVData->maAppData.mpAppFileName, "AppFileName should be set to something after SVMain!" );
@@ -304,20 +304,15 @@ const XubString& Application::GetAppFileName()
         return *pSVData->maAppData.mpAppFileName;
 
     /*
-     *  #91147# provide a fallback for people without initialized
-     *  vcl here (like setup in responsefile mode)
+     *  provide a fallback for people without initialized vcl here (like setup
+     *  in responsefile mode)
      */
-    static String aAppFileName;
-    if( !aAppFileName.Len() )
-    {
-        OUString aExeFileName;
-        osl_getExecutableFile( &aExeFileName.pData );
+    OUString aAppFileName;
+    OUString aExeFileName;
+    osl_getExecutableFile(&aExeFileName.pData);
 
-        // convert path to native file format
-        OUString aNativeFileName;
-        osl::FileBase::getSystemPathFromFileURL( aExeFileName, aNativeFileName );
-        aAppFileName = aNativeFileName;
-    }
+    // convert path to native file format
+    osl::FileBase::getSystemPathFromFileURL(aExeFileName, aAppFileName);
 
     return aAppFileName;
 }
@@ -358,7 +353,7 @@ sal_uInt16 Application::Exception( sal_uInt16 nError )
 
 // -----------------------------------------------------------------------
 
-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
@@ -366,7 +361,7 @@ void Application::Abort( const XubString& rErrorText )
     bool dumpCore = false;
     sal_uInt16 n = GetCommandLineParamCount();
     for (sal_uInt16 i = 0; i != n; ++i) {
-        if (GetCommandLineParam(i).EqualsAscii("--norestore")) {
+        if (GetCommandLineParam(i).equals("--norestore")) {
             dumpCore = true;
             break;
         }
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index 9104be9..e2766b0 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -289,7 +289,7 @@ bool InitVCL()
     // convert path to native file format
     OUString aNativeFileName;
     osl::FileBase::getSystemPathFromFileURL( aExeFileName, aNativeFileName );
-    pSVData->maAppData.mpAppFileName = new String( aNativeFileName );
+    pSVData->maAppData.mpAppFileName = new OUString( aNativeFileName );
 
     // Initialize global data
     pSVData->maGDIData.mpScreenFontList     = new ImplDevFontList;
diff --git a/vcl/source/window/btndlg.cxx b/vcl/source/window/btndlg.cxx
index 5d96964..02e338f 100644
--- a/vcl/source/window/btndlg.cxx
+++ b/vcl/source/window/btndlg.cxx
@@ -262,7 +262,7 @@ void ButtonDialog::Click()
         maClickHdl.Call( this );
 }
 
-void ButtonDialog::AddButton( const XubString& rText, sal_uInt16 nId,
+void ButtonDialog::AddButton( const OUString& rText, sal_uInt16 nId,
                               sal_uInt16 nBtnFlags, long nSepPixel )
 {
     // PageItem anlegen
@@ -272,7 +272,7 @@ void ButtonDialog::AddButton( const XubString& rText, sal_uInt16 nId,
     pItem->mnSepSize        = nSepPixel;
     pItem->mpPushButton     = ImplCreatePushButton( nBtnFlags );
 
-    if ( rText.Len() )
+    if (!rText.isEmpty())
         pItem->mpPushButton->SetText( rText );
 
     maItemList.push_back(pItem);
@@ -370,7 +370,7 @@ PushButton* ButtonDialog::GetPushButton( sal_uInt16 nId ) const
         return NULL;
 }
 
-void ButtonDialog::SetButtonText( sal_uInt16 nId, const XubString& rText )
+void ButtonDialog::SetButtonText( sal_uInt16 nId, const OUString& rText )
 {
     ImplBtnDlgItem* pItem = ImplGetItem( nId );
 
@@ -381,7 +381,7 @@ void ButtonDialog::SetButtonText( sal_uInt16 nId, const XubString& rText )
     }
 }
 
-void ButtonDialog::SetButtonHelpText( sal_uInt16 nId, const XubString& rText )
+void ButtonDialog::SetButtonHelpText( sal_uInt16 nId, const OUString& rText )
 {
     ImplBtnDlgItem* pItem = ImplGetItem( nId );
 


More information about the Libreoffice-commits mailing list