summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--desktop/source/deployment/gui/dp_gui_updatedialog.cxx31
-rw-r--r--starmath/source/dialog.cxx24
-rw-r--r--vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx1
3 files changed, 27 insertions, 29 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index a5d9ab3d9d24..f81a92f7a6eb 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -97,7 +97,6 @@
#include "tools/link.hxx"
#include "tools/resid.hxx"
#include "tools/solar.h"
-#include "tools/string.hxx"
#include "unotools/configmgr.hxx"
#include "vcl/button.hxx"
#include "vcl/dialog.hxx"
@@ -533,18 +532,18 @@ UpdateDialog::UpdateDialog(
m_help(this, DpGuiResId(RID_DLG_UPDATE_HELP)),
m_ok(this, DpGuiResId(RID_DLG_UPDATE_OK)),
m_close(this, DpGuiResId(RID_DLG_UPDATE_CLOSE)),
- m_error(String(DpGuiResId(RID_DLG_UPDATE_ERROR))),
- m_none(String(DpGuiResId(RID_DLG_UPDATE_NONE))),
- m_noInstallable(String(DpGuiResId(RID_DLG_UPDATE_NOINSTALLABLE))),
- m_failure(String(DpGuiResId(RID_DLG_UPDATE_FAILURE))),
- m_unknownError(String(DpGuiResId(RID_DLG_UPDATE_UNKNOWNERROR))),
- m_noDescription(String(DpGuiResId(RID_DLG_UPDATE_NODESCRIPTION))),
- m_noInstall(String(DpGuiResId(RID_DLG_UPDATE_NOINSTALL))),
- m_noDependency(String(DpGuiResId(RID_DLG_UPDATE_NODEPENDENCY))),
- m_noDependencyCurVer(String(DpGuiResId(RID_DLG_UPDATE_NODEPENDENCY_CUR_VER))),
- m_browserbased(String(DpGuiResId(RID_DLG_UPDATE_BROWSERBASED))),
- m_version(String(DpGuiResId(RID_DLG_UPDATE_VERSION))),
- m_ignoredUpdate(String(DpGuiResId(RID_DLG_UPDATE_IGNORED_UPDATE))),
+ m_error(ResId::toString(DpGuiResId(RID_DLG_UPDATE_ERROR))),
+ m_none(ResId::toString(DpGuiResId(RID_DLG_UPDATE_NONE))),
+ m_noInstallable(ResId::toString(DpGuiResId(RID_DLG_UPDATE_NOINSTALLABLE))),
+ m_failure(ResId::toString(DpGuiResId(RID_DLG_UPDATE_FAILURE))),
+ m_unknownError(ResId::toString(DpGuiResId(RID_DLG_UPDATE_UNKNOWNERROR))),
+ m_noDescription(ResId::toString(DpGuiResId(RID_DLG_UPDATE_NODESCRIPTION))),
+ m_noInstall(ResId::toString(DpGuiResId(RID_DLG_UPDATE_NOINSTALL))),
+ m_noDependency(ResId::toString(DpGuiResId(RID_DLG_UPDATE_NODEPENDENCY))),
+ m_noDependencyCurVer(ResId::toString(DpGuiResId(RID_DLG_UPDATE_NODEPENDENCY_CUR_VER))),
+ m_browserbased(ResId::toString(DpGuiResId(RID_DLG_UPDATE_BROWSERBASED))),
+ m_version(ResId::toString(DpGuiResId(RID_DLG_UPDATE_VERSION))),
+ m_ignoredUpdate(ResId::toString(DpGuiResId(RID_DLG_UPDATE_IGNORED_UPDATE))),
m_updateData(*updateData),
m_thread(
new UpdateDialog::Thread(
@@ -622,9 +621,9 @@ short UpdateDialog::Execute() {
UpdateDialog::CheckListBox::CheckListBox( UpdateDialog & dialog, ResId const & resource,
Image const & normalStaticImage ):
SvxCheckListBox( &dialog, resource, normalStaticImage ),
- m_ignoreUpdate( String( DpGuiResId( RID_DLG_UPDATE_IGNORE ) ) ),
- m_ignoreAllUpdates( String( DpGuiResId( RID_DLG_UPDATE_IGNORE_ALL ) ) ),
- m_enableUpdate( String( DpGuiResId( RID_DLG_UPDATE_ENABLE ) ) ),
+ m_ignoreUpdate( ResId::toString( DpGuiResId( RID_DLG_UPDATE_IGNORE ) ) ),
+ m_ignoreAllUpdates( ResId::toString( DpGuiResId( RID_DLG_UPDATE_IGNORE_ALL ) ) ),
+ m_enableUpdate( ResId::toString( DpGuiResId( RID_DLG_UPDATE_ENABLE ) ) ),
m_dialog(dialog)
{}
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 23fd2de70e6d..c46dbc2498a6 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -663,7 +663,7 @@ SmCategoryDesc::SmCategoryDesc(const ResId& rResId, sal_uInt16 nCategoryIdx) :
{
if (IsAvailableRes(ResId(1,*rResId.GetResMgr()).SetRT(RSC_STRING)))
{
- Name = XubString(ResId(1,*rResId.GetResMgr()));
+ Name = ResId::toString(ResId(1,*rResId.GetResMgr()));
int i;
for (i = 0; i < 4; i++)
@@ -1510,7 +1510,7 @@ SmSymbolDialog::SmSymbolDialog(Window *pParent, OutputDevice *pFntListDevice,
if (bFreeRes)
FreeResource();
- aSymbolSetName = String();
+ aSymbolSetName = rtl::OUString();
aSymbolSet.clear();
FillSymbolSets();
if (aSymbolSets.GetEntryCount() > 0)
@@ -1575,7 +1575,7 @@ bool SmSymbolDialog::SelectSymbolSet(const XubString &rSymbolSetName)
bool bRet = false;
sal_uInt16 nPos = aSymbolSets.GetEntryPos(rSymbolSetName);
- aSymbolSetName = String();
+ aSymbolSetName = rtl::OUString();
aSymbolSet.clear();
if (nPos != LISTBOX_ENTRY_NOTFOUND)
{
@@ -1676,7 +1676,7 @@ void SmSymDefineDialog::FillSymbols(ComboBox &rComboBox, bool bDeleteText)
rComboBox.Clear();
if (bDeleteText)
- rComboBox.SetText(XubString());
+ rComboBox.SetText(rtl::OUString());
ComboBox &rBox = &rComboBox == &aOldSymbols ? aOldSymbolSets : aSymbolSets;
SymbolPtrVec_t aSymSet( aSymbolMgrCopy.GetSymbolSet( rBox.GetText() ) );
@@ -1694,7 +1694,7 @@ void SmSymDefineDialog::FillSymbolSets(ComboBox &rComboBox, bool bDeleteText)
rComboBox.Clear();
if (bDeleteText)
- rComboBox.SetText(XubString());
+ rComboBox.SetText(rtl::OUString());
const std::set< String > aSymbolSetNames( aSymbolMgrCopy.GetSymbolSetNames() );
std::set< String >::const_iterator aIt( aSymbolSetNames.begin() );
@@ -1725,7 +1725,7 @@ void SmSymDefineDialog::FillStyles(bool bDeleteText)
{
aStyles.Clear();
if (bDeleteText)
- aStyles.SetText(XubString());
+ aStyles.SetText(rtl::OUString());
XubString aText (aFonts.GetSelectEntry());
if (aText.Len() != 0)
@@ -1933,7 +1933,7 @@ IMPL_LINK( SmSymDefineDialog, ChangeClickHdl, Button *, EMPTYARG pButton )
// clear display for original symbol if necessary
if (bNameChanged)
- SetOrigSymbol(NULL, XubString());
+ SetOrigSymbol(NULL, rtl::OUString());
// update display of new symbol
aSymbolDisplay.SetSymbol( &aNewSymbol );
@@ -1965,7 +1965,7 @@ IMPL_LINK( SmSymDefineDialog, DeleteClickHdl, Button *, EMPTYARG pButton )
aSymbolMgrCopy.RemoveSymbol( pOrigSymbol->GetName() );
// clear display for original symbol
- SetOrigSymbol(NULL, XubString());
+ SetOrigSymbol(NULL, rtl::OUString());
// update list box entries
FillSymbolSets(aOldSymbolSets, false);
@@ -2200,7 +2200,7 @@ bool SmSymDefineDialog::SelectSymbolSet(ComboBox &rComboBox,
bRet = true;
}
else if (bDeleteText)
- rComboBox.SetText(XubString());
+ rComboBox.SetText(rtl::OUString());
bool bIsOld = &rComboBox == &aOldSymbolSets;
@@ -2249,7 +2249,7 @@ void SmSymDefineDialog::SetOrigSymbol(const SmSym *pSymbol,
}
else
{ // loeschen des angezeigten Symbols
- aOldSymbolDisplay.SetText(XubString());
+ aOldSymbolDisplay.SetText(rtl::OUString());
aOldSymbolDisplay.Invalidate();
}
aOldSymbolName .SetText(aSymName);
@@ -2308,7 +2308,7 @@ bool SmSymDefineDialog::SelectSymbol(ComboBox &rComboBox,
bRet = true;
}
else if (bDeleteText)
- rComboBox.SetText(XubString());
+ rComboBox.SetText(rtl::OUString());
if (bIsOld)
{
@@ -2417,7 +2417,7 @@ bool SmSymDefineDialog::SelectStyle(const XubString &rStyleName, bool bApplyFont
bRet = sal_True;
}
else
- aStyles.SetText(XubString());
+ aStyles.SetText(rtl::OUString());
UpdateButtons();
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
index 9483bd353067..27a8dc157580 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -49,7 +49,6 @@
#include <vcl/svapp.hxx>
-#include <tools/string.hxx>
#include <tools/urlobj.hxx>
#include <algorithm>
generated by cgit (git 2.34.1) at 2025-02-03 06:56:35 +0000