[Libreoffice-commits] .: avmedia/source basctl/source basic/source chart2/source cui/source dbaccess/source editeng/inc editeng/source extensions/source filter/source forms/source formula/source fpicker/source framework/source padmin/source reportdesign/source sc/inc sc/source sd/inc sd/source sfx2/inc sfx2/source starmath/inc starmath/qa starmath/source svtools/inc svtools/source svx/inc svx/source sw/inc sw/source toolkit/source uui/source vcl/inc vcl/source vcl/unx
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Jan 21 12:48:58 PST 2013
avmedia/source/framework/mediacontrol.cxx | 8 +-
basctl/source/basicide/brkdlg.cxx | 2
basctl/source/basicide/macrodlg.cxx | 4 -
basctl/source/basicide/moduldl2.cxx | 2
basic/source/runtime/inputbox.cxx | 12 +--
chart2/source/controller/dialogs/res_ErrorBar.cxx | 5 -
chart2/source/controller/dialogs/res_Titles.cxx | 14 ++--
chart2/source/controller/dialogs/tp_AxisPositions.cxx | 2
chart2/source/controller/dialogs/tp_DataSource.cxx | 4 -
cui/source/customize/cfg.cxx | 2
cui/source/dialogs/SpellDialog.cxx | 16 ++--
cui/source/dialogs/commonlingui.cxx | 4 -
cui/source/dialogs/commonlingui.hxx | 4 -
cui/source/dialogs/cuicharmap.cxx | 2
cui/source/dialogs/cuifmsearch.cxx | 6 -
cui/source/dialogs/hangulhanjadlg.cxx | 4 -
cui/source/dialogs/hlinettp.cxx | 4 -
cui/source/dialogs/hlmailtp.cxx | 2
cui/source/dialogs/insdlg.cxx | 6 -
cui/source/dialogs/passwdomdlg.cxx | 14 ++--
cui/source/dialogs/thesdlg.cxx | 8 +-
cui/source/factory/dlgfact.cxx | 24 +++----
cui/source/factory/dlgfact.hxx | 24 +++----
cui/source/inc/SpellDialog.hxx | 2
cui/source/inc/cuicharmap.hxx | 2
cui/source/inc/thesdlg.hxx | 10 +-
cui/source/options/doclinkdialog.cxx | 6 -
cui/source/options/fontsubs.cxx | 2
cui/source/options/optdict.cxx | 6 -
cui/source/options/optgdlg.cxx | 4 -
cui/source/options/optgenrl.cxx | 2
cui/source/options/opthtml.cxx | 14 ++--
cui/source/options/optinet2.cxx | 22 +++---
cui/source/options/optmemory.cxx | 2
cui/source/options/optsave.cxx | 2
cui/source/tabpages/autocdlg.cxx | 8 +-
cui/source/tabpages/backgrnd.cxx | 2
cui/source/tabpages/border.cxx | 12 +--
cui/source/tabpages/chardlg.cxx | 6 -
cui/source/tabpages/connect.cxx | 14 ++--
cui/source/tabpages/grfpage.cxx | 8 +-
cui/source/tabpages/measure.cxx | 12 +--
cui/source/tabpages/numfmt.cxx | 6 -
cui/source/tabpages/page.cxx | 26 +++----
cui/source/tabpages/paragrph.cxx | 6 -
cui/source/tabpages/tabstpge.cxx | 2
cui/source/tabpages/textattr.cxx | 8 +-
cui/source/tabpages/tparea.cxx | 6 -
cui/source/tabpages/tpcolor.cxx | 2
cui/source/tabpages/tphatch.cxx | 4 -
cui/source/tabpages/tpline.cxx | 10 +-
cui/source/tabpages/tplnedef.cxx | 10 +-
dbaccess/source/ext/macromigration/macromigrationpages.cxx | 4 -
dbaccess/source/ui/control/curledit.cxx | 8 +-
dbaccess/source/ui/control/sqledit.cxx | 2
dbaccess/source/ui/dlg/ConnectionHelper.cxx | 8 +-
dbaccess/source/ui/dlg/ConnectionPage.cxx | 10 +-
dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx | 22 +++---
dbaccess/source/ui/dlg/TextConnectionHelper.cxx | 16 ++--
dbaccess/source/ui/dlg/UserAdmin.cxx | 2
dbaccess/source/ui/dlg/admincontrols.cxx | 10 +-
dbaccess/source/ui/dlg/adminpages.cxx | 2
dbaccess/source/ui/dlg/detailpages.cxx | 8 +-
dbaccess/source/ui/dlg/directsql.cxx | 2
dbaccess/source/ui/dlg/dlgsave.cxx | 6 -
dbaccess/source/ui/inc/FieldControls.hxx | 6 -
dbaccess/source/ui/inc/curledit.hxx | 6 -
dbaccess/source/ui/inc/sqledit.hxx | 2
dbaccess/source/ui/misc/WCPage.cxx | 2
dbaccess/source/ui/misc/WTypeSelect.cxx | 2
editeng/inc/editeng/editeng.hxx | 4 -
editeng/source/editeng/editeng.cxx | 6 -
editeng/source/editeng/editundo.hxx | 2
extensions/source/abpilot/abpfinalpage.cxx | 4 -
extensions/source/dbpilots/groupboxwiz.cxx | 2
extensions/source/propctrlr/inspectorhelpwindow.cxx | 2
extensions/source/propctrlr/inspectorhelpwindow.hxx | 2
extensions/source/propctrlr/standardcontrol.cxx | 12 +--
extensions/source/propctrlr/usercontrol.cxx | 6 -
filter/source/pdf/impdialog.cxx | 2
filter/source/xsltdialog/xmlfiltertabpagebasic.cxx | 8 +-
forms/source/solar/control/navtoolbar.cxx | 4 -
formula/source/ui/dlg/formula.cxx | 2
fpicker/source/office/iodlg.cxx | 4 -
framework/source/layoutmanager/toolbarlayoutmanager.cxx | 2
framework/source/services/license.cxx | 2
framework/source/uielement/comboboxtoolbarcontroller.cxx | 2
framework/source/uielement/edittoolbarcontroller.cxx | 2
framework/source/uielement/spinfieldtoolbarcontroller.cxx | 2
padmin/source/adddlg.cxx | 4 -
padmin/source/cmddlg.cxx | 4 -
padmin/source/newppdlg.cxx | 2
padmin/source/titlectrl.cxx | 2
padmin/source/titlectrl.hxx | 4 -
reportdesign/source/ui/dlg/Condition.cxx | 2
reportdesign/source/ui/dlg/GroupsSorting.cxx | 2
reportdesign/source/ui/report/StartMarker.cxx | 2
sc/inc/editutil.hxx | 2
sc/source/core/tool/editutil.cxx | 2
sc/source/ui/app/inputwin.cxx | 10 +-
sc/source/ui/attrdlg/scdlgfact.cxx | 4 -
sc/source/ui/attrdlg/scdlgfact.hxx | 4 -
sc/source/ui/condformat/colorformat.cxx | 4 -
sc/source/ui/dbgui/consdlg.cxx | 2
sc/source/ui/dbgui/dbnamdlg.cxx | 12 +--
sc/source/ui/dbgui/fieldwnd.cxx | 5 -
sc/source/ui/dbgui/scuiasciiopt.cxx | 2
sc/source/ui/inc/inputwin.hxx | 6 -
sc/source/ui/miscdlgs/crnrdlg.cxx | 6 -
sc/source/ui/miscdlgs/datafdlg.cxx | 2
sc/source/ui/miscdlgs/optsolver.cxx | 2
sc/source/ui/miscdlgs/simpref.cxx | 2
sc/source/ui/miscdlgs/tabopdlg.cxx | 12 +--
sc/source/ui/optdlg/tpdefaults.cxx | 2
sc/source/ui/optdlg/tpformula.cxx | 4 -
sc/source/ui/optdlg/tpusrlst.cxx | 2
sc/source/ui/optdlg/tpview.cxx | 2
sc/source/ui/pagedlg/areasdlg.cxx | 2
sc/source/ui/pagedlg/tptable.cxx | 10 +-
sd/inc/sdabstdlg.hxx | 2
sd/source/filter/html/pubdlg.cxx | 2
sd/source/ui/animations/CustomAnimationDialog.cxx | 2
sd/source/ui/dlg/paragr.cxx | 2
sd/source/ui/dlg/sddlgfact.cxx | 18 ++---
sd/source/ui/dlg/sddlgfact.hxx | 18 ++---
sd/source/ui/dlg/tpoption.cxx | 2
sd/source/ui/func/fuinsfil.cxx | 4 -
sfx2/inc/sfx2/controlwrapper.hxx | 2
sfx2/inc/sfx2/progress.hxx | 3
sfx2/inc/sfx2/sfxdlg.hxx | 4 -
sfx2/inc/sfx2/titledockwin.hxx | 4 -
sfx2/source/appl/impldde.cxx | 6 -
sfx2/source/appl/lnkbase2.cxx | 4 -
sfx2/source/appl/newhelp.cxx | 2
sfx2/source/bastyp/progress.cxx | 5 -
sfx2/source/dialog/dinfdlg.cxx | 8 +-
sfx2/source/dialog/passwd.cxx | 6 -
sfx2/source/dialog/srchdlg.cxx | 2
sfx2/source/dialog/titledockwin.cxx | 6 -
sfx2/source/dialog/versdlg.cxx | 4 -
starmath/inc/document.hxx | 4 -
starmath/inc/edit.hxx | 4 -
starmath/qa/cppunit/test_nodetotextvisitors.cxx | 6 -
starmath/source/dialog.cxx | 2
starmath/source/document.cxx | 8 +-
starmath/source/edit.cxx | 6 -
starmath/source/view.cxx | 4 -
svtools/inc/svtools/ctrlbox.hxx | 4 -
svtools/inc/svtools/editbrowsebox.hxx | 6 -
svtools/inc/svtools/editimplementation.hxx | 2
svtools/inc/svtools/editsyntaxhighlighter.hxx | 4 -
svtools/inc/svtools/filectrl.hxx | 4 -
svtools/inc/svtools/fmtfield.hxx | 6 -
svtools/inc/svtools/ivctrl.hxx | 12 +--
svtools/inc/svtools/svxbox.hxx | 2
svtools/inc/svtools/treelistbox.hxx | 2
svtools/source/brwbox/ebbcontrols.cxx | 6 -
svtools/source/contnr/DocumentInfoPreview.cxx | 2
svtools/source/contnr/treelistbox.cxx | 2
svtools/source/control/filectrl.cxx | 4 -
svtools/source/control/fmtfield.cxx | 24 +++----
svtools/source/control/inettbc.cxx | 10 +-
svtools/source/control/tabbar.cxx | 2
svtools/source/dialogs/addresstemplate.cxx | 2
svtools/source/dialogs/wizardmachine.cxx | 7 --
svtools/source/edit/editsyntaxhighlighter.cxx | 2
svtools/source/uno/unoiface.cxx | 2
svx/inc/svx/paraprev.hxx | 4 -
svx/inc/svx/srchdlg.hxx | 4 -
svx/inc/svx/svxdlg.hxx | 8 +-
svx/source/dialog/compressgraphicdialog.cxx | 2
svx/source/dialog/ctredlin.cxx | 8 +-
svx/source/dialog/imapdlg.cxx | 4 -
svx/source/dialog/rubydialog.cxx | 4 -
svx/source/dialog/srchdlg.cxx | 34 +++++-----
svx/source/fmcomp/gridcell.cxx | 2
svx/source/fmcomp/gridctrl.cxx | 2
svx/source/form/tbxform.cxx | 4 -
svx/source/gallery2/galbrws2.cxx | 4 -
svx/source/tbxctrls/grafctrl.cxx | 8 +-
svx/source/tbxctrls/tbcontrl.cxx | 2
svx/source/tbxctrls/tbunosearchcontrollers.cxx | 2
svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx | 2
sw/inc/swabstdlg.hxx | 4 -
sw/source/ui/cctrl/actctrl.cxx | 4 -
sw/source/ui/cctrl/swlbox.cxx | 4 -
sw/source/ui/chrdlg/chardlg.cxx | 4 -
sw/source/ui/chrdlg/drpcps.cxx | 10 +-
sw/source/ui/chrdlg/numpara.cxx | 4 -
sw/source/ui/config/mailconfigpage.cxx | 8 +-
sw/source/ui/config/optload.cxx | 10 +-
sw/source/ui/config/optpage.cxx | 10 +-
sw/source/ui/dbui/createaddresslistdialog.cxx | 2
sw/source/ui/dbui/dbinsdlg.cxx | 4 -
sw/source/ui/dbui/mmaddressblockpage.cxx | 8 +-
sw/source/ui/dbui/mmaddressblockpage.hxx | 2
sw/source/ui/dbui/mmgreetingspage.cxx | 8 +-
sw/source/ui/dbui/mmoutputpage.cxx | 12 +--
sw/source/ui/dialog/swdlgfact.cxx | 20 ++---
sw/source/ui/dialog/swdlgfact.hxx | 20 ++---
sw/source/ui/docvw/SidebarWin.cxx | 16 ++--
sw/source/ui/envelp/envlop1.cxx | 2
sw/source/ui/envelp/labfmt.cxx | 2
sw/source/ui/fldui/flddb.cxx | 6 -
sw/source/ui/fldui/flddok.cxx | 12 +--
sw/source/ui/fldui/fldfunc.cxx | 18 ++---
sw/source/ui/fldui/fldref.cxx | 4 -
sw/source/ui/fldui/fldvar.cxx | 16 ++--
sw/source/ui/frmdlg/cption.cxx | 4 -
sw/source/ui/frmdlg/frmpage.cxx | 14 ++--
sw/source/ui/inc/dbinsdlg.hxx | 2
sw/source/ui/inc/swlbox.hxx | 2
sw/source/ui/index/cnttab.cxx | 16 ++--
sw/source/ui/index/swuiidxmrk.cxx | 30 ++++----
sw/source/ui/misc/bookmark.cxx | 7 --
sw/source/ui/misc/glossary.cxx | 8 +-
sw/source/ui/misc/insfnote.cxx | 6 -
sw/source/ui/misc/linenum.cxx | 2
sw/source/ui/misc/outline.cxx | 2
sw/source/ui/ribbar/inputwin.cxx | 4 -
sw/source/ui/table/convert.cxx | 4 -
sw/source/ui/table/tabledlg.cxx | 6 -
toolkit/source/awt/vclxwindows.cxx | 2
uui/source/logindlg.cxx | 2
uui/source/masterpasscrtdlg.cxx | 2
uui/source/passworddlg.cxx | 2
vcl/inc/helpwin.hxx | 2
vcl/inc/vcl/combobox.hxx | 4 -
vcl/inc/vcl/ctrl.hxx | 4 -
vcl/inc/vcl/edit.hxx | 6 -
vcl/inc/vcl/fixedhyper.hxx | 2
vcl/inc/vcl/longcurr.hxx | 2
vcl/inc/vcl/menu.hxx | 6 -
vcl/inc/vcl/morebtn.hxx | 6 -
vcl/inc/vcl/status.hxx | 2
vcl/inc/vcl/texteng.hxx | 2
vcl/inc/vcl/toolbox.hxx | 2
vcl/inc/vcl/vclmedit.hxx | 8 +-
vcl/inc/vcl/window.hxx | 6 -
vcl/source/app/help.cxx | 2
vcl/source/control/button.cxx | 10 +-
vcl/source/control/combobox.cxx | 6 -
vcl/source/control/ctrl.cxx | 6 -
vcl/source/control/edit.cxx | 8 +-
vcl/source/control/field.cxx | 20 ++---
vcl/source/control/field2.cxx | 28 ++++----
vcl/source/control/fixedhyper.cxx | 2
vcl/source/control/longcurr.cxx | 2
vcl/source/control/morebtn.cxx | 4 -
vcl/source/edit/texteng.cxx | 8 +-
vcl/source/edit/vclmedit.cxx | 14 ++--
vcl/source/window/floatwin.cxx | 2
vcl/source/window/msgbox.cxx | 8 +-
vcl/source/window/status.cxx | 2
vcl/source/window/toolbox2.cxx | 4 -
vcl/source/window/window.cxx | 8 +-
vcl/unx/generic/app/i18n_status.cxx | 4 -
257 files changed, 774 insertions(+), 778 deletions(-)
New commits:
commit e3f11c10d8cc759d01afa4b8fd8bd98c81a03119
Author: Chr. Rossmanith <ChrRossmanith at gmx.de>
Date: Mon Jan 21 14:32:09 2013 +0100
Changed SetText() / GetText() to take/return OUString
replaced lots of Len() with isEmpty()
Change-Id: I6b82d48245ee2a0782e05a326f7934e9357227d0
Reviewed-on: https://gerrit.libreoffice.org/1795
Reviewed-by: Michael Stahl <mstahl at redhat.com>
Tested-by: Michael Stahl <mstahl at redhat.com>
diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx
index ca2c9da..38d947a 100644
--- a/avmedia/source/framework/mediacontrol.cxx
+++ b/avmedia/source/framework/mediacontrol.cxx
@@ -409,14 +409,14 @@ void MediaControl::implUpdateTimeField( double fCurTime )
{
if( !maItem.getURL().isEmpty() )
{
- String aTimeString;
+ OUString aTimeString;
SvtSysLocale aSysLocale;
const LocaleDataWrapper& rLocaleData = aSysLocale.GetLocaleData();
- aTimeString += rLocaleData.getDuration( Time( 0, 0, static_cast< sal_uInt32 >( floor( fCurTime ) ) ) );
- aTimeString.AppendAscii( " / " );
- aTimeString += rLocaleData.getDuration( Time( 0, 0, static_cast< sal_uInt32 >( floor( maItem.getDuration() ) )) );
+ aTimeString += rLocaleData.getDuration( Time( 0, 0, static_cast< sal_uInt32 >( floor( fCurTime ) ) ) ) +
+ " / " +
+ rLocaleData.getDuration( Time( 0, 0, static_cast< sal_uInt32 >( floor( maItem.getDuration() ) )) );
if( maTimeEdit.GetText() != aTimeString )
maTimeEdit.SetText( aTimeString );
diff --git a/basctl/source/basicide/brkdlg.cxx b/basctl/source/basicide/brkdlg.cxx
index 9be73f1..6f424ce 100644
--- a/basctl/source/basicide/brkdlg.cxx
+++ b/basctl/source/basicide/brkdlg.cxx
@@ -174,7 +174,7 @@ IMPL_LINK( BreakPointDialog, EditModifyHdl, Edit *, pEdit )
{
BreakPoint* pBrk = GetSelectedBreakPoint();
if ( pBrk )
- pBrk->nStopAfter = pEdit->GetText().ToInt32();
+ pBrk->nStopAfter = pEdit->GetText().toInt32();
}
return 0;
}
diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx
index c4d1625..cb843d6 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -632,7 +632,7 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton )
if ( !IsValidSbxName(m_pMacroNameEdit->GetText()) )
{
ErrorBox( this, WB_OK | WB_DEF_OK, String( IDEResId( RID_STR_BADSBXNAME ) ) ).Execute();
- m_pMacroNameEdit->SetSelection( Selection( 0, m_pMacroNameEdit->GetText().Len() ) );
+ m_pMacroNameEdit->SetSelection( Selection( 0, m_pMacroNameEdit->GetText().getLength() ) );
m_pMacroNameEdit->GrabFocus();
return 0;
}
@@ -700,7 +700,7 @@ IMPL_LINK( MacroChooser, ButtonHdl, Button *, pButton )
if ( !IsValidSbxName(m_pMacroNameEdit->GetText()) )
{
ErrorBox( this, WB_OK | WB_DEF_OK, String( IDEResId( RID_STR_BADSBXNAME ) ) ).Execute();
- m_pMacroNameEdit->SetSelection( Selection( 0, m_pMacroNameEdit->GetText().Len() ) );
+ m_pMacroNameEdit->SetSelection( Selection( 0, m_pMacroNameEdit->GetText().getLength() ) );
m_pMacroNameEdit->GrabFocus();
return 1;
}
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index d846bf3..68b459e 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -459,7 +459,7 @@ IMPL_LINK_NOARG(GotoLineDialog, OkButtonHandler)
if ( GetLineNumber() )
EndDialog(1);
else
- aEdit.SetText( aEdit.GetText(), Selection(0, aEdit.GetText().Len() ));
+ aEdit.SetText( aEdit.GetText(), Selection(0, aEdit.GetText().getLength() ));
return 0;
}
diff --git a/basic/source/runtime/inputbox.cxx b/basic/source/runtime/inputbox.cxx
index 8a03001..14fe7f1 100644
--- a/basic/source/runtime/inputbox.cxx
+++ b/basic/source/runtime/inputbox.cxx
@@ -33,7 +33,7 @@ class SvRTLInputBox : public ModalDialog
OKButton aOk;
CancelButton aCancel;
FixedText aPromptText;
- String aText;
+ OUString aText;
void PositionDialog( long nXTwips, long nYTwips, const Size& rDlgSize );
void InitButtons( const Size& rDlgSize );
@@ -45,7 +45,7 @@ class SvRTLInputBox : public ModalDialog
public:
SvRTLInputBox( Window* pParent, const String& rPrompt, const String& rTitle,
const String& rDefault, long nXTwips = -1, long nYTwips = -1 );
- String GetText() const { return aText; }
+ OUString GetText() const { return aText; }
};
SvRTLInputBox::SvRTLInputBox( Window* pParent, const String& rPrompt,
@@ -65,12 +65,12 @@ SvRTLInputBox::SvRTLInputBox( Window* pParent, const String& rPrompt,
aCancel.Show();
aEdit.Show();
aPromptText.Show();
- SetText( rTitle );
+ SetText( OUString(rTitle) );
Font aFont( GetFont());
Color aColor( GetBackground().GetColor() );
aFont.SetFillColor( aColor );
aEdit.SetFont( aFont );
- aEdit.SetText( rDefault );
+ aEdit.SetText( OUString(rDefault) );
aEdit.SetSelection( Selection( SELECTION_MIN, SELECTION_MAX ) );
}
@@ -109,7 +109,7 @@ void SvRTLInputBox::PositionPrompt(const String& rPrompt,const Size& rDlgSize)
return;
String aText_(convertLineEnd(rPrompt, LINEEND_CR));
aPromptText.SetPosPixel( LogicToPixel(Point(5,5)));
- aPromptText.SetText( aText_ );
+ aPromptText.SetText( OUString(aText_) );
Size aSize( rDlgSize );
aSize.Width() -= 70;
aSize.Height() -= 50;
@@ -131,7 +131,7 @@ IMPL_LINK_INLINE_START( SvRTLInputBox, CancelHdl, Button *, pButton )
{
(void)pButton;
- aText.Erase();
+ aText="";
EndDialog( 0 );
return 0;
}
diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx
index 377c7dd..3b1fb4f 100644
--- a/chart2/source/controller/dialogs/res_ErrorBar.cxx
+++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx
@@ -393,9 +393,8 @@ IMPL_LINK( ErrorBarResources, CategoryChosen, void *, )
eOldError != CHERROR_RANGE )
{
m_aCbSyncPosNeg.Check(
- (m_aEdRangePositive.GetText().Len() > 0) &&
- m_aEdRangePositive.GetText().Equals(
- m_aEdRangeNegative.GetText()));
+ (!m_aEdRangePositive.GetText().isEmpty()) &&
+ m_aEdRangePositive.GetText() == m_aEdRangeNegative.GetText());
}
// changed from range
else if( m_eErrorKind != CHERROR_RANGE &&
diff --git a/chart2/source/controller/dialogs/res_Titles.cxx b/chart2/source/controller/dialogs/res_Titles.cxx
index e2845b7..ee1b239 100644
--- a/chart2/source/controller/dialogs/res_Titles.cxx
+++ b/chart2/source/controller/dialogs/res_Titles.cxx
@@ -188,13 +188,13 @@ void TitleResources::writeToResources( const TitleDialogData& rInput )
void TitleResources::readFromResources( TitleDialogData& rOutput )
{
- rOutput.aExistenceList[0] = static_cast<sal_Bool>(m_aEd_Main.GetText().Len()!=0);
- rOutput.aExistenceList[1] = static_cast<sal_Bool>(m_aEd_Sub.GetText().Len()!=0);
- rOutput.aExistenceList[2] = static_cast<sal_Bool>(m_aEd_XAxis.GetText().Len()!=0);
- rOutput.aExistenceList[3] = static_cast<sal_Bool>(m_aEd_YAxis.GetText().Len()!=0);
- rOutput.aExistenceList[4] = static_cast<sal_Bool>(m_aEd_ZAxis.GetText().Len()!=0);
- rOutput.aExistenceList[5] = static_cast<sal_Bool>(m_aEd_SecondaryXAxis.GetText().Len()!=0);
- rOutput.aExistenceList[6] = static_cast<sal_Bool>(m_aEd_SecondaryYAxis.GetText().Len()!=0);
+ rOutput.aExistenceList[0] = static_cast<sal_Bool>(!m_aEd_Main.GetText().isEmpty());
+ rOutput.aExistenceList[1] = static_cast<sal_Bool>(!m_aEd_Sub.GetText().isEmpty());
+ rOutput.aExistenceList[2] = static_cast<sal_Bool>(!m_aEd_XAxis.GetText().isEmpty());
+ rOutput.aExistenceList[3] = static_cast<sal_Bool>(!m_aEd_YAxis.GetText().isEmpty());
+ rOutput.aExistenceList[4] = static_cast<sal_Bool>(!m_aEd_ZAxis.GetText().isEmpty());
+ rOutput.aExistenceList[5] = static_cast<sal_Bool>(!m_aEd_SecondaryXAxis.GetText().isEmpty());
+ rOutput.aExistenceList[6] = static_cast<sal_Bool>(!m_aEd_SecondaryYAxis.GetText().isEmpty());
rOutput.aTextList[0] = m_aEd_Main.GetText();
rOutput.aTextList[1] = m_aEd_Sub.GetText();
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
index 9f4dd12..11a98c6 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
@@ -454,7 +454,7 @@ IMPL_LINK_NOARG(AxisPositionsTabPage, CrossesAtSelectHdl)
m_aED_CrossesAt.Show( (2==nPos) && !m_bCrossingAxisIsCategoryAxis );
m_aED_CrossesAtCategory.Show( (2==nPos) && m_bCrossingAxisIsCategoryAxis );
- if(! m_aED_CrossesAt.GetText().Len() )
+ if( m_aED_CrossesAt.GetText().isEmpty() )
m_aED_CrossesAt.SetValue(0.0);
if( 0 == m_aED_CrossesAtCategory.GetSelectEntryCount() )
m_aED_CrossesAtCategory.SelectEntryPos(0);
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx
index bb5ef2a..257a277 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -629,7 +629,7 @@ IMPL_LINK_NOARG(DataSourceTabPage, MainRangeButtonClickedHdl)
{
OSL_ASSERT( m_pCurrentRangeChoosingField == 0 );
m_pCurrentRangeChoosingField = & m_aEDT_RANGE;
- if( m_aEDT_RANGE.GetText().Len() > 0 &&
+ if( !m_aEDT_RANGE.GetText().isEmpty() &&
! updateModelFromControl( m_pCurrentRangeChoosingField ))
return 0;
@@ -673,7 +673,7 @@ IMPL_LINK_NOARG(DataSourceTabPage, CategoriesRangeButtonClickedHdl)
{
OSL_ASSERT( m_pCurrentRangeChoosingField == 0 );
m_pCurrentRangeChoosingField = & m_aEDT_CATEGORIES;
- if( m_aEDT_CATEGORIES.GetText().Len() > 0 &&
+ if( !m_aEDT_CATEGORIES.GetText().isEmpty() &&
! updateModelFromControl( m_pCurrentRangeChoosingField ))
return 0;
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 3b4e49f..5ecfba5 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -2876,7 +2876,7 @@ IMPL_LINK(SvxMainMenuOrganizerDialog, ModifyHdl, Edit*, pEdit)
(void)pEdit;
// if the Edit control is empty do not change the name
- if ( aMenuNameEdit.GetText().Equals( String() ) )
+ if ( aMenuNameEdit.GetText() == "" )
{
return 0;
}
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index c3e3f4f..135e9c0c 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -364,7 +364,7 @@ void SpellDialog::UpdateBoxes_Impl()
m_pCheckGrammarCB->Show(rParent.HasGrammarChecking());
m_pExplainLink->Show(!m_pExplainLink->GetURL().isEmpty());
- if (m_pExplainFT->GetText().Len() == 0)
+ if (m_pExplainFT->GetText().isEmpty())
{
m_pExplainFT->Hide();
m_pExplainLink->Hide();
@@ -706,7 +706,7 @@ void SpellDialog::Impl_Restore()
//clear the "ChangeAllList"
SvxGetChangeAllList()->clear();
//get a new sentence
- m_pSentenceED->SetText(rtl::OUString());
+ m_pSentenceED->SetText(OUString());
m_pSentenceED->ResetModified();
//Resolves: fdo#39348 refill the dialog with the currently spelled sentence
SpellContinue_Impl(true);
@@ -959,7 +959,7 @@ IMPL_LINK(SpellDialog, ModifyHdl, SentenceEditWindow_Impl*, pEd)
bModified = true;
m_pSuggestionLB->SetNoSelection();
m_pSuggestionLB->Disable();
- String sNewText( m_pSentenceED->GetText() );
+ OUString sNewText( m_pSentenceED->GetText() );
m_pAutoCorrPB->Enable( sNewText != m_pSentenceED->GetText() );
SpellUndoAction_Impl* pSpellAction = new SpellUndoAction_Impl(SPELLUNDO_CHANGE_TEXTENGINE, aDialogUndoLink);
if(!m_pChangeAllPB->IsEnabled())
@@ -1447,7 +1447,7 @@ long SentenceEditWindow_Impl::PreNotify( NotifyEvent& rNEvt )
break;
}
//save the current paragraph
- sal_uInt16 nCurrentLen = GetText().Len();
+ sal_Int32 nCurrentLen = GetText().getLength();
if(nAction != ACTION_SELECTFIELD)
pTextView->GetWindow()->KeyInput(rKeyEvt);
else
@@ -1485,11 +1485,11 @@ long SentenceEditWindow_Impl::PreNotify( NotifyEvent& rNEvt )
else if(pErrorAttr)
{
//determine the change
- sal_uInt16 nAddedChars = GetText().Len() - nCurrentLen;
+ sal_Int32 nAddedChars = GetText().getLength() - nCurrentLen;
TextAttrib* pNewError = pErrorAttr->GetAttr().Clone();
- sal_uInt16 nStart = pErrorAttr->GetStart();
- sal_uInt16 nEnd = pErrorAttr->GetEnd();
+ sal_Int32 nStart = pErrorAttr->GetStart();
+ sal_Int32 nEnd = pErrorAttr->GetEnd();
pTextEngine->RemoveAttrib( 0, *pErrorAttr );
nStart = nStart - (sal_uInt16)nAddedChars;
SetAttrib( *pNewError, 0, nStart - nAddedChars, nEnd );
@@ -1772,7 +1772,7 @@ void SentenceEditWindow_Impl::SetAttrib( const TextAttrib& rAttr, sal_uLong nPar
}
//-----------------------------------------------------------------------
-void SentenceEditWindow_Impl::SetText( const String& rStr )
+void SentenceEditWindow_Impl::SetText( const OUString& rStr )
{
m_nErrorStart = m_nErrorEnd = 0;
GetTextEngine()->SetText(rStr);
diff --git a/cui/source/dialogs/commonlingui.cxx b/cui/source/dialogs/commonlingui.cxx
index e6b3d00..d94a074 100644
--- a/cui/source/dialogs/commonlingui.cxx
+++ b/cui/source/dialogs/commonlingui.cxx
@@ -57,13 +57,13 @@ long SvxClickInfoCtr::PreNotify( NotifyEvent& rNEvt )
}
//-----------------------------------------------------------------------------
-void SvxClickInfoCtr::SetText( const XubString& rStr )
+void SvxClickInfoCtr::SetText( const OUString& rStr )
{
aFixedInfo.SetText(rStr );
}
//-----------------------------------------------------------------------------
-XubString SvxClickInfoCtr::GetText() const
+OUString SvxClickInfoCtr::GetText() const
{
return aFixedInfo.GetText();
}
diff --git a/cui/source/dialogs/commonlingui.hxx b/cui/source/dialogs/commonlingui.hxx
index 47e309a..90c3f4e 100644
--- a/cui/source/dialogs/commonlingui.hxx
+++ b/cui/source/dialogs/commonlingui.hxx
@@ -41,8 +41,8 @@ public:
SvxClickInfoCtr( Window* pParent, const ResId& rResId );
~SvxClickInfoCtr();
- virtual void SetText( const XubString& rStr );
- virtual XubString GetText() const;
+ virtual void SetText( const OUString& rStr );
+ virtual OUString GetText() const;
void SetActivateHdl( const Link& rLink ) { aActivateLink = rLink; }
const Link& GetActivateHdl() const { return aActivateLink; }
diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx
index 2bf0139..0b06b97 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -264,7 +264,7 @@ void SvxShowText::Resize()
// -----------------------------------------------------------------------
-void SvxShowText::SetText( const String& rText )
+void SvxShowText::SetText( const OUString& rText )
{
Control::SetText( rText );
Invalidate();
diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx
index 665643c..9d0fc46 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -427,7 +427,7 @@ IMPL_LINK(FmSearchDialog, OnClickedSpecialSettings, Button*, pButton )
//------------------------------------------------------------------------
IMPL_LINK_NOARG(FmSearchDialog, OnSearchTextModified)
{
- if ((m_cmbSearchText.GetText().Len() != 0) || !m_rbSearchForText.IsChecked())
+ if ((!m_cmbSearchText.GetText().isEmpty()) || !m_rbSearchForText.IsChecked())
m_pbSearchAgain.Enable();
else
m_pbSearchAgain.Disable();
@@ -668,7 +668,7 @@ void FmSearchDialog::EnableSearchUI(sal_Bool bEnable)
if ( WINDOW_EDIT == m_pPreSearchFocus->GetType() )
{
Edit* pEdit = static_cast< Edit* >( m_pPreSearchFocus );
- pEdit->SetSelection( Selection( 0, pEdit->GetText().Len() ) );
+ pEdit->SetSelection( Selection( 0, pEdit->GetText().getLength() ) );
}
}
m_pPreSearchFocus = NULL;
@@ -680,7 +680,7 @@ void FmSearchDialog::EnableSearchUI(sal_Bool bEnable)
void FmSearchDialog::EnableSearchForDependees(sal_Bool bEnable)
{
sal_Bool bSearchingForText = m_rbSearchForText.IsChecked();
- m_pbSearchAgain.Enable(bEnable && (!bSearchingForText || (m_cmbSearchText.GetText().Len() != 0)));
+ m_pbSearchAgain.Enable(bEnable && (!bSearchingForText || (!m_cmbSearchText.GetText().isEmpty())));
bEnable = bEnable && bSearchingForText;
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index 6e83377..024e140 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -701,9 +701,9 @@ namespace svx
//-------------------------------------------------------------------------
IMPL_LINK_NOARG(HangulHanjaConversionDialog, OnSuggestionModified)
{
- m_aFind.Enable( m_pPlayground->GetWordInputControl().GetSavedValue() != m_pPlayground->GetWordInputControl().GetText() );
+ m_aFind.Enable( OUString(m_pPlayground->GetWordInputControl().GetSavedValue()) != m_pPlayground->GetWordInputControl().GetText() );
- bool bSameLen = m_pPlayground->GetWordInputControl().GetText().Len() == m_pPlayground->GetCurrentText().Len();
+ bool bSameLen = m_pPlayground->GetWordInputControl().GetText().getLength() == m_pPlayground->GetCurrentText().Len();
m_pPlayground->EnableButton( SvxCommonLinguisticControl::eChange, m_bDocumentMode && bSameLen );
m_pPlayground->EnableButton( SvxCommonLinguisticControl::eChangeAll, m_bDocumentMode && bSameLen );
diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx
index 1e538a7..319e68d 100644
--- a/cui/source/dialogs/hlinettp.cxx
+++ b/cui/source/dialogs/hlinettp.cxx
@@ -193,7 +193,7 @@ String SvxHyperlinkInternetTp::CreateAbsoluteURL() const
}
// username and password for ftp-url
- if( aURL.GetProtocol() == INET_PROT_FTP && maEdLogin.GetText().Len()!=0 )
+ if( aURL.GetProtocol() == INET_PROT_FTP && !maEdLogin.GetText().isEmpty() )
aURL.SetUserAndPass ( maEdLogin.GetText(), maEdPassword.GetText() );
if ( aURL.GetProtocol() != INET_PROT_NOT_VALID )
@@ -374,7 +374,7 @@ IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ClickAnonymousHdl_Impl)
// disable login-editfields if checked
if ( maCbAnonymous.IsChecked() )
{
- if ( maEdLogin.GetText().ToLowerAscii().SearchAscii ( sAnonymous ) == 0 )
+ if ( maEdLogin.GetText().toAsciiLowerCase().indexOf ( sAnonymous ) == 0 )
{
maStrOldUser = aEmptyStr;
maStrOldPassword = aEmptyStr;
diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx
index 3134196..1899ed9 100644
--- a/cui/source/dialogs/hlmailtp.cxx
+++ b/cui/source/dialogs/hlmailtp.cxx
@@ -159,7 +159,7 @@ String SvxHyperlinkMailTp::CreateAbsoluteURL() const
// subject for EMail-url
if( aURL.GetProtocol() == INET_PROT_MAILTO )
{
- if ( maEdSubject.GetText() != aEmptyStr )
+ if ( maEdSubject.GetText() != OUString(aEmptyStr) )
{
String aQuery = rtl::OUString("subject=");
aQuery.Append( maEdSubject.GetText() );
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index 4d9c808..54495d5 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -643,7 +643,7 @@ short SfxInsertFloatingFrameDialog::Execute()
if ( bOK && ( nRet = Dialog::Execute() ) == RET_OK )
{
::rtl::OUString aURL;
- if ( m_pEDURL->GetText().Len() )
+ if ( !m_pEDURL->GetText().isEmpty() )
{
// URL can be a valid and absolute URL or a system file name
INetURLObject aObj;
@@ -684,13 +684,13 @@ short SfxInsertFloatingFrameDialog::Execute()
long lMarginWidth;
if ( !m_pCBMarginWidthDefault->IsChecked() )
- lMarginWidth = (long) m_pNMMarginWidth->GetText().ToInt32();
+ lMarginWidth = (long) m_pNMMarginWidth->GetText().toInt32();
else
lMarginWidth = SIZE_NOT_SET;
long lMarginHeight;
if ( !m_pCBMarginHeightDefault->IsChecked() )
- lMarginHeight = (long) m_pNMMarginHeight->GetText().ToInt32();
+ lMarginHeight = (long) m_pNMMarginHeight->GetText().toInt32();
else
lMarginHeight = SIZE_NOT_SET;
diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx
index 11c05b4..9c7ce0c 100644
--- a/cui/source/dialogs/passwdomdlg.cxx
+++ b/cui/source/dialogs/passwdomdlg.cxx
@@ -64,7 +64,7 @@ PasswordReenterEdit_Impl::~PasswordReenterEdit_Impl()
void PasswordReenterEdit_Impl::Paint( const Rectangle& rRect )
{
- if (GetText().Len() == 0)
+ if (GetText().isEmpty())
{
Push( PUSH_TEXTCOLOR );
SetTextColor( Color( COL_GRAY ) );
@@ -174,8 +174,8 @@ PasswordToOpenModifyDialog_Impl::~PasswordToOpenModifyDialog_Impl()
IMPL_LINK( PasswordToOpenModifyDialog_Impl, OkBtnClickHdl, OKButton *, EMPTYARG /*pBtn*/ )
{
bool bInvalidState = !m_aOpenReadonlyCB.IsChecked() &&
- m_aPasswdToOpenED.GetText().Len() == 0 &&
- m_aPasswdToModifyED.GetText().Len() == 0;
+ m_aPasswdToOpenED.GetText().isEmpty() &&
+ m_aPasswdToModifyED.GetText().isEmpty();
if (bInvalidState)
{
ErrorBox aErrorBox( m_pParent, WB_OK,
@@ -243,18 +243,18 @@ PasswordToOpenModifyDialog::~PasswordToOpenModifyDialog()
String PasswordToOpenModifyDialog::GetPasswordToOpen() const
{
const bool bPasswdOk =
- m_pImpl->m_aPasswdToOpenED.GetText().Len() > 0 &&
+ !m_pImpl->m_aPasswdToOpenED.GetText().isEmpty() &&
m_pImpl->m_aPasswdToOpenED.GetText() == m_pImpl->m_aReenterPasswdToOpenED.GetText();
- return bPasswdOk ? m_pImpl->m_aPasswdToOpenED.GetText() : String();
+ return bPasswdOk ? m_pImpl->m_aPasswdToOpenED.GetText() : OUString();
}
String PasswordToOpenModifyDialog::GetPasswordToModify() const
{
const bool bPasswdOk =
- m_pImpl->m_aPasswdToModifyED.GetText().Len() > 0 &&
+ !m_pImpl->m_aPasswdToModifyED.GetText().isEmpty() &&
m_pImpl->m_aPasswdToModifyED.GetText() == m_pImpl->m_aReenterPasswdToModifyED.GetText();
- return bPasswdOk ? m_pImpl->m_aPasswdToModifyED.GetText() : String();
+ return bPasswdOk ? m_pImpl->m_aPasswdToModifyED.GetText() : OUString();
}
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index e94cbed..8480b23 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -113,16 +113,16 @@ ReplaceEdit::~ReplaceEdit()
void ReplaceEdit::Modify()
{
if (m_pBtn)
- m_pBtn->Enable( GetText().Len() > 0 );
+ m_pBtn->Enable( !GetText().isEmpty() );
}
-void ReplaceEdit::SetText( const XubString& rStr )
+void ReplaceEdit::SetText( const OUString& rStr )
{
Edit::SetText( rStr );
Modify();
}
-void ReplaceEdit::SetText( const XubString& rStr, const Selection& rNewSelection )
+void ReplaceEdit::SetText( const OUString& rStr, const Selection& rNewSelection )
{
Edit::SetText( rStr, rNewSelection );
Modify();
@@ -324,7 +324,7 @@ bool SvxThesaurusDialog::UpdateAlternativesBox_Impl()
void SvxThesaurusDialog::LookUp( const String &rText )
{
- if (rText != m_pWordCB->GetText()) // avoid moving of the cursor if the text is the same
+ if (OUString(rText) != m_pWordCB->GetText()) // avoid moving of the cursor if the text is the same
m_pWordCB->SetText( rText );
LookUp_Impl();
}
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 8664374..09005d3 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -216,11 +216,11 @@ void CuiAbstractTabDialog_Impl::SetInputSet( const SfxItemSet* pInSet )
pDlg->SetInputSet( pInSet );
}
//From class Window.
-void CuiAbstractTabDialog_Impl::SetText( const XubString& rStr )
+void CuiAbstractTabDialog_Impl::SetText( const OUString& rStr )
{
pDlg->SetText( rStr );
}
-String CuiAbstractTabDialog_Impl::GetText() const
+OUString CuiAbstractTabDialog_Impl::GetText() const
{
return pDlg->GetText();
}
@@ -231,12 +231,12 @@ const SfxItemSet* CuiAbstractSfxDialog_Impl::GetOutputItemSet() const
return pDlg->GetOutputItemSet();
}
-void CuiAbstractSfxDialog_Impl::SetText( const XubString& rStr )
+void CuiAbstractSfxDialog_Impl::SetText( const OUString& rStr )
{
pDlg->SetText( rStr );
}
-String CuiAbstractSfxDialog_Impl::GetText() const
+OUString CuiAbstractSfxDialog_Impl::GetText() const
{
return pDlg->GetText();
}
@@ -643,11 +643,11 @@ void AbstractSvxTransformTabDialog_Impl::SetInputSet( const SfxItemSet* pInSet )
pDlg->SetInputSet( pInSet );
}
//From class Window.
-void AbstractSvxTransformTabDialog_Impl::SetText( const XubString& rStr )
+void AbstractSvxTransformTabDialog_Impl::SetText( const OUString& rStr )
{
pDlg->SetText( rStr );
}
-String AbstractSvxTransformTabDialog_Impl::GetText() const
+OUString AbstractSvxTransformTabDialog_Impl::GetText() const
{
return pDlg->GetText();
}
@@ -682,11 +682,11 @@ void AbstractSvxCaptionDialog_Impl::SetInputSet( const SfxItemSet* pInSet )
pDlg->SetInputSet( pInSet );
}
//From class Window.
-void AbstractSvxCaptionDialog_Impl::SetText( const XubString& rStr )
+void AbstractSvxCaptionDialog_Impl::SetText( const OUString& rStr )
{
pDlg->SetText( rStr );
}
-String AbstractSvxCaptionDialog_Impl::GetText() const
+OUString AbstractSvxCaptionDialog_Impl::GetText() const
{
return pDlg->GetText();
}
@@ -737,7 +737,7 @@ void AbstractSvxNameDialog_Impl::SetHelpId( const rtl::OString& aHelpId )
{
pDlg->SetHelpId( aHelpId );
}
-void AbstractSvxNameDialog_Impl::SetText( const XubString& rStr )
+void AbstractSvxNameDialog_Impl::SetText( const OUString& rStr )
{
pDlg->SetText( rStr );
}
@@ -907,16 +907,16 @@ void AbstractSvxAreaTabDialog_Impl::SetInputSet( const SfxItemSet* pInSet )
pDlg->SetInputSet( pInSet );
}
//From class Window.
-void AbstractSvxAreaTabDialog_Impl::SetText( const XubString& rStr )
+void AbstractSvxAreaTabDialog_Impl::SetText( const OUString& rStr )
{
pDlg->SetText( rStr );
}
-String AbstractSvxAreaTabDialog_Impl::GetText() const
+OUString AbstractSvxAreaTabDialog_Impl::GetText() const
{
return pDlg->GetText();
}
-void AbstractSvxPostItDialog_Impl::SetText( const XubString& rStr )
+void AbstractSvxPostItDialog_Impl::SetText( const OUString& rStr )
{
pDlg->SetText( rStr );
}
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index 080d8b7..dd4c37a 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -115,8 +115,8 @@ class CuiAbstractSfxDialog_Impl : public SfxAbstractDialog
virtual const SfxItemSet* GetOutputItemSet() const;
//From class Window.
- virtual void SetText( const XubString& rStr );
- virtual String GetText() const ;
+ virtual void SetText( const OUString& rStr );
+ virtual OUString GetText() const ;
};
class CuiAbstractTabDialog_Impl : public SfxAbstractTabDialog
@@ -128,8 +128,8 @@ class CuiAbstractTabDialog_Impl : public SfxAbstractTabDialog
virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem );
virtual void SetInputSet( const SfxItemSet* pInSet );
//From class Window.
- virtual void SetText( const XubString& rStr );
- virtual String GetText() const;
+ virtual void SetText( const OUString& rStr );
+ virtual OUString GetText() const;
};
//for SvxDistributeDialog begin
@@ -346,8 +346,8 @@ class AbstractSvxTransformTabDialog_Impl : public AbstractSvxTransformTabDialog
virtual const SfxItemSet* GetOutputItemSet() const;
virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem );
virtual void SetInputSet( const SfxItemSet* pInSet );
- virtual void SetText( const XubString& rStr );
- virtual String GetText() const;
+ virtual void SetText( const OUString& rStr );
+ virtual OUString GetText() const;
};
class AbstractSvxCaptionDialog_Impl : public AbstractSvxCaptionDialog
{
@@ -358,8 +358,8 @@ class AbstractSvxCaptionDialog_Impl : public AbstractSvxCaptionDialog
virtual const SfxItemSet* GetOutputItemSet() const;
virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem );
virtual void SetInputSet( const SfxItemSet* pInSet );
- virtual void SetText( const XubString& rStr );
- virtual String GetText() const;
+ virtual void SetText( const OUString& rStr );
+ virtual OUString GetText() const;
};
//for FmInputRecordNoDialog end
@@ -391,7 +391,7 @@ class AbstractSvxNameDialog_Impl :public AbstractSvxNameDialog
virtual void SetEditHelpId(const rtl::OString&) ;
//from class Window
virtual void SetHelpId( const rtl::OString& ) ;
- virtual void SetText( const XubString& rStr ) ;
+ virtual void SetText( const OUString& rStr ) ;
private:
Link aCheckNameHdl;
DECL_LINK(CheckNameHdl, void *);
@@ -506,8 +506,8 @@ class AbstractSvxAreaTabDialog_Impl :public AbstractSvxAreaTabDialog
virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem );
virtual void SetInputSet( const SfxItemSet* pInSet );
// From class Window.
- virtual void SetText( const XubString& rStr );
- virtual String GetText() const;
+ virtual void SetText( const OUString& rStr );
+ virtual OUString GetText() const;
};
// add for SvxAreaTabDialog end
@@ -542,7 +542,7 @@ class SvxPostItDialog;
class AbstractSvxPostItDialog_Impl :public AbstractSvxPostItDialog
{
DECL_ABSTDLG_BASE( AbstractSvxPostItDialog_Impl, SvxPostItDialog )
- virtual void SetText( const XubString& rStr ); //From class Window
+ virtual void SetText( const OUString& rStr ); //From class Window
virtual const SfxItemSet* GetOutputItemSet() const;
virtual void SetPrevHdl( const Link& rLink ) ;
virtual void SetNextHdl( const Link& rLink ) ;
diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx
index b7b4ef0..10ce9b2 100644
--- a/cui/source/inc/SpellDialog.hxx
+++ b/cui/source/inc/SpellDialog.hxx
@@ -81,7 +81,7 @@ public:
void SetModifyHdl(const Link& rLink) { m_aModifyLink = rLink;}
void SetAttrib( const TextAttrib& rAttr, sal_uLong nPara, sal_uInt16 nStart, sal_uInt16 nEnd );
- void SetText( const String& rStr );
+ void SetText( const OUString& rStr );
bool MarkNextError( bool bIgnoreCurrentError );
void ChangeMarkedWord(const String& rNewWord, LanguageType eLanguage);
diff --git a/cui/source/inc/cuicharmap.hxx b/cui/source/inc/cuicharmap.hxx
index d9db58c..27b0d0f 100644
--- a/cui/source/inc/cuicharmap.hxx
+++ b/cui/source/inc/cuicharmap.hxx
@@ -44,7 +44,7 @@ public:
~SvxShowText();
void SetFont( const Font& rFont );
- void SetText( const String& rText );
+ void SetText( const OUString& rText );
void SetCentered(bool bCenter) { mbCenter = bCenter; }
virtual void Resize();
diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx
index f8353ef..5ab74b0 100644
--- a/cui/source/inc/thesdlg.hxx
+++ b/cui/source/inc/thesdlg.hxx
@@ -58,8 +58,8 @@ public:
class AlternativesExtraData
{
- String sText;
- bool bHeader;
+ OUString sText;
+ bool bHeader;
public:
AlternativesExtraData() : bHeader( false ) {}
@@ -70,7 +70,7 @@ public:
}
bool IsHeader() const { return bHeader; }
- const String& GetText() const { return sText; }
+ const OUString& GetText() const { return sText; }
};
class ThesaurusAlternativesCtrl
@@ -118,8 +118,8 @@ public:
// Edit
virtual void Modify();
- virtual void SetText( const XubString& rStr );
- virtual void SetText( const XubString& rStr, const Selection& rNewSelection );
+ virtual void SetText( const OUString& rStr );
+ virtual void SetText( const OUString& rStr, const Selection& rNewSelection );
};
class SvxThesaurusDialog : public SvxStandardDialog
diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx
index 98b5500..d38b872 100644
--- a/cui/source/options/doclinkdialog.cxx
+++ b/cui/source/options/doclinkdialog.cxx
@@ -96,7 +96,7 @@ namespace svx
void ODocumentLinkDialog::validate( )
{
- m_aOK.Enable( (0 != m_aName.GetText().Len()) && ( 0 != m_aURL.GetText().Len() ) );
+ m_aOK.Enable( ( !m_aName.GetText().isEmpty()) && ( !m_aURL.GetText().isEmpty() ) );
}
//------------------------------------------------------------------
@@ -179,7 +179,7 @@ namespace svx
if (0 != aFileDlg.Execute())
return 0L;
- if (0 == m_aName.GetText().Len())
+ if (m_aName.GetText().isEmpty())
{ // default the name to the base of the chosen URL
INetURLObject aParser;
@@ -188,7 +188,7 @@ namespace svx
m_aName.SetText(aParser.getBase(INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET));
- m_aName.SetSelection(Selection(0,m_aName.GetText().Len()));
+ m_aName.SetSelection(Selection(0,m_aName.GetText().getLength()));
m_aName.GrabFocus();
}
else
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index e511a3f..1ce2e89 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -385,7 +385,7 @@ void SvxFontSubstTabPage::CheckEnable()
sEntry += aFont2CB.GetText();
// because of OS/2 optimization error (Bug #56267) a bit more intricate:
- if (!aFont1CB.GetText().Len() || !aFont2CB.GetText().Len())
+ if (aFont1CB.GetText().isEmpty() || aFont2CB.GetText().isEmpty())
bApply = sal_False;
else if(aFont1CB.GetText() == aFont2CB.GetText())
bApply = sal_False;
diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index 9855c8a..e8d3f48 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -194,7 +194,7 @@ IMPL_LINK_NOARG(SvxNewDictionaryDialog, OKHdl_Impl)
IMPL_LINK_NOARG_INLINE_START(SvxNewDictionaryDialog, ModifyHdl_Impl)
{
- if ( aNameEdit.GetText().Len() )
+ if ( !aNameEdit.GetText().isEmpty() )
aOKBtn.Enable();
else
aOKBtn.Disable();
@@ -552,7 +552,7 @@ IMPL_LINK(SvxEditDictionaryDialog, SelectHdl, SvTabListBox*, pBox)
if(!bFirstSelect)
{
SvTreeListEntry* pEntry = pBox->FirstSelected();
- String sTmpShort(pBox->GetEntryText(pEntry, 0));
+ OUString sTmpShort(pBox->GetEntryText(pEntry, 0));
// without this the curser is always at the beginning of a word, if the text
// is set over the ModifyHdl, although you're editing there at the moment
if(aWordED.GetText() != sTmpShort)
@@ -761,7 +761,7 @@ IMPL_LINK(SvxEditDictionaryDialog, ModifyHdl, Edit*, pEdt)
sal_Bool bIsChange =
CDE_EQUAL != cmpDicEntry_Impl(aWordED.GetText(), aWordText)
|| CDE_EQUAL != cmpDicEntry_Impl(aReplaceED.GetText(), aReplaceText);
- if (aWordED.GetText().Len() && bIsChange)
+ if (!aWordED.GetText().isEmpty() && bIsChange)
bEnableNewReplace = sal_True;
}
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 6b7f6ec..9bbfab8 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -350,7 +350,7 @@ sal_Bool OfaMiscTabPage::FillItemSet( SfxItemSet& rSet )
const SfxUInt16Item* pUInt16Item =
PTR_CAST( SfxUInt16Item, GetOldItem( rSet, SID_ATTR_YEAR2000 ) );
- sal_uInt16 nNum = (sal_uInt16)aYearValueField.GetText().ToInt32();
+ sal_uInt16 nNum = (sal_uInt16)aYearValueField.GetText().toInt32();
if ( pUInt16Item && pUInt16Item->GetValue() != nNum )
{
bModified = sal_True;
@@ -1480,7 +1480,7 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
// Configured date acceptance patterns, for example Y-M-D;M-D or empty for
// locale default.
- if (aDatePatternsED.GetText() != aDatePatternsED.GetSavedValue())
+ if (aDatePatternsED.GetText() != OUString(aDatePatternsED.GetSavedValue()))
pLangConfig->aSysLocaleOptions.SetDatePatternsConfigString( aDatePatternsED.GetText());
SfxObjectShell* pCurrentDocShell = SfxObjectShell::Current();
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index 5a1438b..21278cf 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -483,7 +483,7 @@ sal_Bool SvxGeneralTabPage::GetAddress_Impl()
// modified?
for (unsigned i = 0; i != vFields.size(); ++i)
- if (vFields[i]->aEdit.GetSavedValue() != vFields[i]->aEdit.GetText())
+ if (OUString(vFields[i]->aEdit.GetSavedValue()) != vFields[i]->aEdit.GetText())
return true;
return false;
}
diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx
index 9993030..49a57fc 100644
--- a/cui/source/options/opthtml.cxx
+++ b/cui/source/options/opthtml.cxx
@@ -111,19 +111,19 @@ SfxTabPage* OfaHtmlTabPage::Create( Window* pParent,
sal_Bool OfaHtmlTabPage::FillItemSet( SfxItemSet& )
{
SvxHtmlOptions& rHtmlOpt = SvxHtmlOptions::Get();
- if(aSize1NF.GetSavedValue() != aSize1NF.GetText())
+ if(OUString(aSize1NF.GetSavedValue()) != aSize1NF.GetText())
rHtmlOpt.SetFontSize(0, (sal_uInt16)aSize1NF.GetValue());
- if(aSize2NF.GetSavedValue() != aSize2NF.GetText())
+ if(OUString(aSize2NF.GetSavedValue()) != aSize2NF.GetText())
rHtmlOpt.SetFontSize(1, (sal_uInt16)aSize2NF.GetValue());
- if(aSize3NF.GetSavedValue() != aSize3NF.GetText())
+ if(OUString(aSize3NF.GetSavedValue()) != aSize3NF.GetText())
rHtmlOpt.SetFontSize(2, (sal_uInt16)aSize3NF.GetValue());
- if(aSize4NF.GetSavedValue() != aSize4NF.GetText())
+ if(OUString(aSize4NF.GetSavedValue()) != aSize4NF.GetText())
rHtmlOpt.SetFontSize(3, (sal_uInt16)aSize4NF.GetValue());
- if(aSize5NF.GetSavedValue() != aSize5NF.GetText())
+ if(OUString(aSize5NF.GetSavedValue()) != aSize5NF.GetText())
rHtmlOpt.SetFontSize(4, (sal_uInt16)aSize5NF.GetValue());
- if(aSize6NF.GetSavedValue() != aSize6NF.GetText())
+ if(OUString(aSize6NF.GetSavedValue()) != aSize6NF.GetText())
rHtmlOpt.SetFontSize(5, (sal_uInt16)aSize6NF.GetValue());
- if(aSize7NF.GetSavedValue() != aSize7NF.GetText())
+ if(OUString(aSize7NF.GetSavedValue()) != aSize7NF.GetText())
rHtmlOpt.SetFontSize(6, (sal_uInt16)aSize7NF.GetValue());
if(aNumbersEnglishUSCB.IsChecked() != aNumbersEnglishUSCB.GetSavedValue())
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 240cb87..37a4c63 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -414,49 +414,49 @@ sal_Bool SvxProxyTabPage::FillItemSet(SfxItemSet& )
bModified = sal_True;
}
- if(aHttpProxyED.GetSavedValue() != aHttpProxyED.GetText())
+ if(OUString(aHttpProxyED.GetSavedValue()) != aHttpProxyED.GetText())
{
xPropertySet->setPropertyValue( aHttpProxyPN,
makeAny(rtl::OUString(aHttpProxyED.GetText())));
bModified = sal_True;
}
- if ( aHttpPortED.GetSavedValue() != aHttpPortED.GetText() )
+ if ( OUString(aHttpPortED.GetSavedValue()) != aHttpPortED.GetText() )
{
xPropertySet->setPropertyValue( aHttpPortPN,
- makeAny(aHttpPortED.GetText().ToInt32()));
+ makeAny(aHttpPortED.GetText().toInt32()));
bModified = sal_True;
}
- if(aHttpsProxyED.GetSavedValue() != aHttpsProxyED.GetText())
+ if(OUString(aHttpsProxyED.GetSavedValue()) != aHttpsProxyED.GetText())
{
xPropertySet->setPropertyValue( aHttpsProxyPN,
makeAny(rtl::OUString(aHttpsProxyED.GetText())));
bModified = sal_True;
}
- if ( aHttpsPortED.GetSavedValue() != aHttpsPortED.GetText() )
+ if ( OUString(aHttpsPortED.GetSavedValue()) != aHttpsPortED.GetText() )
{
xPropertySet->setPropertyValue( aHttpsPortPN,
- makeAny(aHttpsPortED.GetText().ToInt32()));
+ makeAny(aHttpsPortED.GetText().toInt32()));
bModified = sal_True;
}
- if(aFtpProxyED.GetSavedValue() != aFtpProxyED.GetText())
+ if(OUString(aFtpProxyED.GetSavedValue()) != aFtpProxyED.GetText())
{
xPropertySet->setPropertyValue( aFtpProxyPN,
makeAny( rtl::OUString(aFtpProxyED.GetText())));
bModified = sal_True;
}
- if ( aFtpPortED.GetSavedValue() != aFtpPortED.GetText() )
+ if ( OUString(aFtpPortED.GetSavedValue()) != aFtpPortED.GetText() )
{
xPropertySet->setPropertyValue( aFtpPortPN,
- makeAny(aFtpPortED.GetText().ToInt32()));
+ makeAny(aFtpPortED.GetText().toInt32()));
bModified = sal_True;
}
- if ( aNoProxyForED.GetSavedValue() != aNoProxyForED.GetText() )
+ if ( OUString(aNoProxyForED.GetSavedValue()) != aNoProxyForED.GetText() )
{
xPropertySet->setPropertyValue( aNoProxyDescPN,
makeAny( rtl::OUString(aNoProxyForED.GetText())));
@@ -1386,7 +1386,7 @@ SfxTabPage* SvxEMailTabPage::Create( Window* pParent, const SfxItemSet& rAttrSe
sal_Bool SvxEMailTabPage::FillItemSet( SfxItemSet& )
{
sal_Bool bMailModified = sal_False;
- if(!pImpl->aMailConfig.bROProgram && aMailerURLED.GetSavedValue() != aMailerURLED.GetText())
+ if(!pImpl->aMailConfig.bROProgram && OUString(aMailerURLED.GetSavedValue()) != aMailerURLED.GetText())
{
pImpl->aMailConfig.sProgram = aMailerURLED.GetText();
bMailModified = sal_True;
diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx
index e5c43f7..48e120f 100644
--- a/cui/source/options/optmemory.cxx
+++ b/cui/source/options/optmemory.cxx
@@ -176,7 +176,7 @@ sal_Bool OfaMemoryOptionsPage::FillItemSet( SfxItemSet& rSet )
boost::shared_ptr< comphelper::ConfigurationChanges > batch(
comphelper::ConfigurationChanges::create());
- if ( aUndoEdit.GetText() != aUndoEdit.GetSavedValue() )
+ if ( aUndoEdit.GetText() != OUString(aUndoEdit.GetSavedValue()) )
officecfg::Office::Common::Undo::Steps::set(
aUndoEdit.GetValue(), batch);
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index d818d91..394ece1 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -310,7 +310,7 @@ sal_Bool SfxSaveTabPage::FillItemSet( SfxItemSet& rSet )
bModified |= sal_True;
}
- if ( aAutoSaveEdit.GetText() != aAutoSaveEdit.GetSavedValue() )
+ if ( aAutoSaveEdit.GetText() != OUString(aAutoSaveEdit.GetSavedValue()) )
{
rSet.Put( SfxUInt16Item( GetWhich( SID_ATTR_AUTOSAVEMINUTE ),
(sal_uInt16)aAutoSaveEdit.GetValue() ) );
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 48bd0c7..b64619f 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -1095,7 +1095,7 @@ IMPL_LINK(OfaAutocorrReplacePage, SelectHdl, SvTabListBox*, pBox)
if(!bFirstSelect || !bHasSelectionText)
{
SvTreeListEntry* pEntry = pBox->FirstSelected();
- String sTmpShort(pBox->GetEntryText(pEntry, 0));
+ OUString sTmpShort(pBox->GetEntryText(pEntry, 0));
// if the text is set via ModifyHdl, the cursor is always at the beginning
// of a word, although you're editing here
sal_Bool bSameContent = 0 == pCompareClass->compareString( sTmpShort, aShortED.GetText() );
@@ -1197,7 +1197,7 @@ IMPL_LINK(OfaAutocorrReplacePage, NewDelHdl, PushButton*, pBtn)
{
SvTreeListEntry* _pNewEntry = aReplaceTLB.FirstSelected();
String sEntry(aShortED.GetText());
- if(sEntry.Len() && ( aReplaceED.GetText().Len() ||
+ if(sEntry.Len() && ( !aReplaceED.GetText().isEmpty() ||
( bHasSelectionText && bSWriter ) ))
{
NewEntry(aShortED.GetText(), aReplaceED.GetText());
@@ -1630,7 +1630,7 @@ void OfaAutocorrExceptPage::Reset( const SfxItemSet& )
IMPL_LINK(OfaAutocorrExceptPage, NewDelHdl, PushButton*, pBtn)
{
if((pBtn == &aNewAbbrevPB || pBtn == (PushButton*)&aAbbrevED )
- && aAbbrevED.GetText().Len())
+ && !aAbbrevED.GetText().isEmpty())
{
aAbbrevLB.InsertEntry(aAbbrevED.GetText());
ModifyHdl(&aAbbrevED);
@@ -1641,7 +1641,7 @@ IMPL_LINK(OfaAutocorrExceptPage, NewDelHdl, PushButton*, pBtn)
ModifyHdl(&aAbbrevED);
}
else if((pBtn == &aNewDoublePB || pBtn == (PushButton*)&aDoubleCapsED )
- && aDoubleCapsED.GetText().Len())
+ && !aDoubleCapsED.GetText().isEmpty())
{
aDoubleCapsLB.InsertEntry(aDoubleCapsED.GetText());
ModifyHdl(&aDoubleCapsED);
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 1151fb5..afad498 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -763,7 +763,7 @@ sal_Bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet )
SfxItemState eOldItemState = rCoreSet.GetItemState(nSlot, sal_False);
const SfxItemSet& rOldSet = GetItemSet();
- sal_Bool bGraphTransparencyChanged = bGraphTransparency && (m_pGraphTransMF->GetText() != m_pGraphTransMF->GetSavedValue());
+ sal_Bool bGraphTransparencyChanged = bGraphTransparency && (m_pGraphTransMF->GetText() != OUString(m_pGraphTransMF->GetSavedValue()));
if ( pOld )
{
const SvxBrushItem& rOldItem = (const SvxBrushItem&)*pOld;
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 2bd6766..960eaa3 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -602,8 +602,8 @@ sal_Bool SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
if( !mbUseMarginItem )
{
// #106224# all edits empty: do nothing
- if( m_pLeftMF->GetText().Len() || m_pRightMF->GetText().Len() ||
- m_pTopMF->GetText().Len() || m_pBottomMF->GetText().Len() )
+ if( !m_pLeftMF->GetText().isEmpty() || !m_pRightMF->GetText().isEmpty() ||
+ !m_pTopMF->GetText().isEmpty() || !m_pBottomMF->GetText().isEmpty() )
{
if ( ((mbHorEnabled || mbVerEnabled || (nSWMode & SW_BORDER_MODE_TABLE)) &&
(m_pLeftMF->IsModified()||m_pRightMF->IsModified()||
@@ -617,10 +617,10 @@ sal_Bool SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
rCoreAttrs, SID_ATTR_BORDER_INNER );
if (
!pOldBoxItem ||
- m_pLeftMF->GetText() != m_pLeftMF->GetSavedValue() ||
- m_pRightMF->GetText() != m_pRightMF->GetSavedValue() ||
- m_pTopMF->GetText() != m_pTopMF->GetSavedValue() ||
- m_pBottomMF->GetText() != m_pBottomMF->GetSavedValue() ||
+ m_pLeftMF->GetText() != OUString(m_pLeftMF->GetSavedValue()) ||
+ m_pRightMF->GetText() != OUString(m_pRightMF->GetSavedValue()) ||
+ m_pTopMF->GetText() != OUString(m_pTopMF->GetSavedValue()) ||
+ m_pBottomMF->GetText() != OUString(m_pBottomMF->GetSavedValue()) ||
nMinValue == m_pLeftMF->GetValue() ||
nMinValue == m_pRightMF->GetValue() ||
nMinValue == m_pTopMF->GetValue() ||
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 9d444d4..9c35aff 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -483,7 +483,7 @@ namespace
aSize.Height() =
ItemToControl( nHeight, _pPage->GetItemSet().GetPool()->GetMetric( _nFontHeightWhich ), SFX_FUNIT_TWIP );
}
- else if ( _pFontSizeLB->GetText().Len() )
+ else if ( !_pFontSizeLB->GetText().isEmpty() )
aSize.Height() = PointToTwips( static_cast<long>(_pFontSizeLB->GetValue() / 10) );
else
aSize.Height() = 200; // default 10pt
@@ -1021,7 +1021,7 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan
// FontSize
long nSize = static_cast<long>(pSizeBox->GetValue());
- if ( !pSizeBox->GetText().Len() ) // GetValue() returns the min-value
+ if ( pSizeBox->GetText().isEmpty() ) // GetValue() returns the min-value
nSize = 0;
long nSavedSize = pSizeBox->GetSavedValue().ToInt32();
bool bRel = true;
@@ -3223,7 +3223,7 @@ sal_Bool SvxCharPositionPage::FillItemSet( SfxItemSet& rSet )
// Scale Width
nWhich = GetWhich( SID_ATTR_CHAR_SCALEWIDTH );
- if ( m_pScaleWidthMF->GetText() != m_pScaleWidthMF->GetSavedValue() )
+ if ( m_pScaleWidthMF->GetText() != OUString(m_pScaleWidthMF->GetSavedValue()) )
{
rSet.Put( SvxCharScaleWidthItem( (sal_uInt16)m_pScaleWidthMF->GetValue(), nWhich ) );
bModified = sal_True;
diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx
index f1d088d..1b2eb47 100644
--- a/cui/source/tabpages/connect.cxx
+++ b/cui/source/tabpages/connect.cxx
@@ -324,49 +324,49 @@ sal_Bool SvxConnectionPage::FillItemSet( SfxItemSet& rAttrs)
sal_Bool bModified = sal_False;
sal_Int32 nValue;
- if( aMtrFldHorz1.GetText() != aMtrFldHorz1.GetSavedValue() )
+ if( aMtrFldHorz1.GetText() != OUString(aMtrFldHorz1.GetSavedValue()) )
{
nValue = GetCoreValue( aMtrFldHorz1, eUnit );
rAttrs.Put( SdrEdgeNode1HorzDistItem( nValue ) );
bModified = sal_True;
}
- if( aMtrFldHorz2.GetText() != aMtrFldHorz2.GetSavedValue() )
+ if( aMtrFldHorz2.GetText() != OUString(aMtrFldHorz2.GetSavedValue()) )
{
nValue = GetCoreValue( aMtrFldHorz2, eUnit );
rAttrs.Put( SdrEdgeNode2HorzDistItem( nValue ) );
bModified = sal_True;
}
- if( aMtrFldVert1.GetText() != aMtrFldVert1.GetSavedValue() )
+ if( aMtrFldVert1.GetText() != OUString(aMtrFldVert1.GetSavedValue()) )
{
nValue = GetCoreValue( aMtrFldVert1, eUnit );
rAttrs.Put( SdrEdgeNode1VertDistItem( nValue ) );
bModified = sal_True;
}
- if( aMtrFldVert2.GetText() != aMtrFldVert2.GetSavedValue() )
+ if( aMtrFldVert2.GetText() != OUString(aMtrFldVert2.GetSavedValue()) )
{
nValue = GetCoreValue( aMtrFldVert2, eUnit );
rAttrs.Put( SdrEdgeNode2VertDistItem( nValue ) );
bModified = sal_True;
}
- if( aMtrFldLine1.GetText() != aMtrFldLine1.GetSavedValue() )
+ if( aMtrFldLine1.GetText() != OUString(aMtrFldLine1.GetSavedValue()) )
{
nValue = GetCoreValue( aMtrFldLine1, eUnit );
rAttrs.Put( SdrEdgeLine1DeltaItem( nValue ) );
bModified = sal_True;
}
- if( aMtrFldLine2.GetText() != aMtrFldLine2.GetSavedValue() )
+ if( aMtrFldLine2.GetText() != OUString(aMtrFldLine2.GetSavedValue()) )
{
nValue = GetCoreValue( aMtrFldLine2, eUnit );
rAttrs.Put( SdrEdgeLine2DeltaItem( nValue ) );
bModified = sal_True;
}
- if( aMtrFldLine3.GetText() != aMtrFldLine3.GetSavedValue() )
+ if( aMtrFldLine3.GetText() != OUString(aMtrFldLine3.GetSavedValue()) )
{
nValue = GetCoreValue( aMtrFldLine3, eUnit );
rAttrs.Put( SdrEdgeLine3DeltaItem( nValue ) );
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index 1d3694b..bbe0783 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -237,8 +237,8 @@ sal_Bool SvxGrfCropPage::FillItemSet(SfxItemSet &rSet)
{
const SfxItemPool& rPool = *rSet.GetPool();
sal_Bool bModified = sal_False;
- if( aWidthMF.GetSavedValue() != aWidthMF.GetText() ||
- aHeightMF.GetSavedValue() != aHeightMF.GetText() )
+ if( OUString(aWidthMF.GetSavedValue()) != aWidthMF.GetText() ||
+ OUString(aHeightMF.GetSavedValue()) != aHeightMF.GetText() )
{
sal_uInt16 nW = rPool.GetWhich( SID_ATTR_GRAF_FRMSIZE );
FieldUnit eUnit = MapToFieldUnit( rSet.GetPool()->GetMetric( nW ));
@@ -256,9 +256,9 @@ sal_Bool SvxGrfCropPage::FillItemSet(SfxItemSet &rSet)
aSz = (const SvxSizeItem&)GetItemSet().Get( nW );
Size aTmpSz( aSz.GetSize() );
- if( aWidthMF.GetText() != aWidthMF.GetSavedValue() )
+ if( aWidthMF.GetText() != OUString(aWidthMF.GetSavedValue()) )
aTmpSz.Width() = lcl_GetValue( aWidthMF, eUnit );
- if( aHeightMF.GetText() != aHeightMF.GetSavedValue() )
+ if( aHeightMF.GetText() != OUString(aHeightMF.GetSavedValue()) )
aTmpSz.Height() = lcl_GetValue( aHeightMF, eUnit );
aSz.SetSize( aTmpSz );
aWidthMF.SaveValue();
diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx
index 215ba1b..edf5eda 100644
--- a/cui/source/tabpages/measure.cxx
+++ b/cui/source/tabpages/measure.cxx
@@ -438,35 +438,35 @@ sal_Bool SvxMeasurePage::FillItemSet( SfxItemSet& rAttrs)
sal_Int32 nValue;
TriState eState;
- if( aMtrFldLineDist.GetText() != aMtrFldLineDist.GetSavedValue() )
+ if( aMtrFldLineDist.GetText() != OUString(aMtrFldLineDist.GetSavedValue()) )
{
nValue = GetCoreValue( aMtrFldLineDist, eUnit );
rAttrs.Put( SdrMeasureLineDistItem( nValue ) );
bModified = sal_True;
}
- if( aMtrFldHelplineOverhang.GetText() != aMtrFldHelplineOverhang.GetSavedValue() )
+ if( aMtrFldHelplineOverhang.GetText() != OUString(aMtrFldHelplineOverhang.GetSavedValue()) )
{
nValue = GetCoreValue( aMtrFldHelplineOverhang, eUnit );
rAttrs.Put( SdrMeasureHelplineOverhangItem( nValue ) );
bModified = sal_True;
}
- if( aMtrFldHelplineDist.GetText() != aMtrFldHelplineDist.GetSavedValue() )
+ if( aMtrFldHelplineDist.GetText() != OUString(aMtrFldHelplineDist.GetSavedValue()) )
{
nValue = GetCoreValue( aMtrFldHelplineDist, eUnit );
rAttrs.Put( SdrMeasureHelplineDistItem( nValue ) );
bModified = sal_True;
}
- if( aMtrFldHelpline1Len.GetText() != aMtrFldHelpline1Len.GetSavedValue() )
+ if( aMtrFldHelpline1Len.GetText() != OUString(aMtrFldHelpline1Len.GetSavedValue()) )
{
nValue = GetCoreValue( aMtrFldHelpline1Len, eUnit );
rAttrs.Put( SdrMeasureHelpline1LenItem( nValue ) );
bModified = sal_True;
}
- if( aMtrFldHelpline2Len.GetText() != aMtrFldHelpline2Len.GetSavedValue() )
+ if( aMtrFldHelpline2Len.GetText() != OUString(aMtrFldHelpline2Len.GetSavedValue()) )
{
nValue = GetCoreValue( aMtrFldHelpline2Len, eUnit );
rAttrs.Put( SdrMeasureHelpline2LenItem( nValue ) );
@@ -480,7 +480,7 @@ sal_Bool SvxMeasurePage::FillItemSet( SfxItemSet& rAttrs)
bModified = sal_True;
}
- if( aMtrFldDecimalPlaces.GetText() != aMtrFldDecimalPlaces.GetSavedValue() )
+ if( aMtrFldDecimalPlaces.GetText() != OUString(aMtrFldDecimalPlaces.GetSavedValue()) )
{
nValue = static_cast<sal_Int32>(aMtrFldDecimalPlaces.GetValue());
rAttrs.Put(
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 4dad881..09ea455 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -1348,7 +1348,7 @@ IMPL_LINK( SvxNumberFormatTabPage, ClickHdl_Impl, PushButton*, pIB)
SetCategory(nCatLbSelPos );
FillFormatListBox_Impl( aEntryList );
- if(m_pEdComment->GetText()!=m_pLbCategory->GetEntry(1))
+ if(m_pEdComment->GetText()!=OUString(m_pLbCategory->GetEntry(1)))
{
pNumFmtShell->SetComment4Entry(nFmtLbSelPos,
m_pEdComment->GetText());
@@ -1459,12 +1459,12 @@ IMPL_LINK( SvxNumberFormatTabPage, EditHdl_Impl, Edit*, pEdFormat )
{
sal_uInt32 nCurKey = NUMKEY_UNDEFINED;
- if ( m_pEdFormat->GetText().Len() == 0 )
+ if ( m_pEdFormat->GetText().isEmpty() )
{
m_pIbAdd->Enable(sal_False );
m_pIbRemove->Enable(sal_False );
m_pIbInfo->Enable(sal_False );
- m_pFtComment->SetText(String());
+ m_pFtComment->SetText(OUString());
}
else
{
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 50b6a57..daaf17e 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -685,13 +685,13 @@ sal_Bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet )
nWhich = GetWhich( SID_ATTR_ULSPACE );
SvxULSpaceItem aTopMargin( (const SvxULSpaceItem&)rOldSet.Get( nWhich ) );
- if ( aLeftMarginEdit.GetText() != aLeftMarginEdit.GetSavedValue() )
+ if ( aLeftMarginEdit.GetText() != OUString(aLeftMarginEdit.GetSavedValue()) )
{
aMargin.SetLeft( (sal_uInt16)GetCoreValue( aLeftMarginEdit, eUnit ) );
bModified |= sal_True;
}
- if ( aRightMarginEdit.GetText() != aRightMarginEdit.GetSavedValue() )
+ if ( aRightMarginEdit.GetText() != OUString(aRightMarginEdit.GetSavedValue()) )
{
aMargin.SetRight( (sal_uInt16)GetCoreValue( aRightMarginEdit, eUnit ) );
bModified |= sal_True;
@@ -710,13 +710,13 @@ sal_Bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet )
sal_Bool bMod = sal_False;
- if ( aTopMarginEdit.GetText() != aTopMarginEdit.GetSavedValue() )
+ if ( aTopMarginEdit.GetText() != OUString(aTopMarginEdit.GetSavedValue()) )
{
aTopMargin.SetUpper( (sal_uInt16)GetCoreValue( aTopMarginEdit, eUnit ) );
bMod |= sal_True;
}
- if ( aBottomMarginEdit.GetText() != aBottomMarginEdit.GetSavedValue() )
+ if ( aBottomMarginEdit.GetText() != OUString(aBottomMarginEdit.GetSavedValue()) )
{
aTopMargin.SetLower( (sal_uInt16)GetCoreValue( aBottomMarginEdit, eUnit ) );
bMod |= sal_True;
@@ -900,18 +900,18 @@ IMPL_LINK_NOARG(SvxPageDescPage, LayoutHdl_Impl)
if ( nPos == SVX_PAGE_MIRROR )
{
- if ( aLeftMarginLbl.GetText() != aInsideText )
+ if ( aLeftMarginLbl.GetText() != OUString(aInsideText) )
aLeftMarginLbl.SetText( aInsideText );
- if ( aRightMarginLbl.GetText() != aOutsideText )
+ if ( aRightMarginLbl.GetText() != OUString(aOutsideText) )
aRightMarginLbl.SetText( aOutsideText );
}
else
{
- if ( aLeftMarginLbl.GetText() != aLeftText )
+ if ( aLeftMarginLbl.GetText() != OUString(aLeftText) )
aLeftMarginLbl.SetText( aLeftText );
- if ( aRightMarginLbl.GetText() != aRightText )
+ if ( aRightMarginLbl.GetText() != OUString(aRightText) )
aRightMarginLbl.SetText( aRightText );
}
UpdateExample_Impl( true );
@@ -1630,7 +1630,7 @@ bool SvxPageDescPage::IsPrinterRangeOverflow(
long nValue = static_cast<long>(rField.GetValue());
if ( bCheck &&
( nValue < nFirstMargin || nValue > nLastMargin ) &&
- rField.GetText() != rField.GetSavedValue() )
+ rField.GetText() != OUString(rField.GetSavedValue()) )
{
rField.SetValue( nValue < nFirstMargin ? nFirstMargin : nLastMargin );
bRet = true;
@@ -1664,19 +1664,19 @@ void SvxPageDescPage::CheckMarginEdits( bool _bClear )
bool SvxPageDescPage::IsMarginOutOfRange()
{
bool bRet = ( ( ( !( pImpl->m_nPos & MARGIN_LEFT ) &&
- ( aLeftMarginEdit.GetText() != aLeftMarginEdit.GetSavedValue() ) ) &&
+ ( aLeftMarginEdit.GetText() != OUString(aLeftMarginEdit.GetSavedValue()) ) ) &&
( aLeftMarginEdit.GetValue() < nFirstLeftMargin ||
aLeftMarginEdit.GetValue() > nLastLeftMargin ) ) ||
( ( !( pImpl->m_nPos & MARGIN_RIGHT ) &&
- ( aRightMarginEdit.GetText() != aRightMarginEdit.GetSavedValue() ) ) &&
+ ( aRightMarginEdit.GetText() != OUString(aRightMarginEdit.GetSavedValue()) ) ) &&
( aRightMarginEdit.GetValue() < nFirstRightMargin ||
aRightMarginEdit.GetValue() > nLastRightMargin ) ) ||
( ( !( pImpl->m_nPos & MARGIN_TOP ) &&
- ( aTopMarginEdit.GetText() != aTopMarginEdit.GetSavedValue() ) ) &&
+ ( aTopMarginEdit.GetText() != OUString(aTopMarginEdit.GetSavedValue()) ) ) &&
( aTopMarginEdit.GetValue() < nFirstTopMargin ||
aTopMarginEdit.GetValue() > nLastTopMargin ) ) ||
( ( !( pImpl->m_nPos & MARGIN_BOTTOM ) &&
- ( aBottomMarginEdit.GetText() != aBottomMarginEdit.GetSavedValue() ) ) &&
+ ( aBottomMarginEdit.GetText() != OUString(aBottomMarginEdit.GetSavedValue()) ) ) &&
( aBottomMarginEdit.GetValue() < nFirstBottomMargin ||
aBottomMarginEdit.GetValue() > nLastBottomMargin ) ) );
return bRet;
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 91a376c..6f99231 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -802,7 +802,7 @@ IMPL_LINK( SvxStdParagraphTabPage, LineDistHdl_Impl, ListBox *, pBox )
aLineDistAtMetricBox.SetMin(0);
- if ( !aLineDistAtMetricBox.GetText().Len() )
+ if ( aLineDistAtMetricBox.GetText().isEmpty() )
aLineDistAtMetricBox.SetValue(
aLineDistAtMetricBox.Normalize( 1 ) );
aLineDistAtPercentBox.Hide();
@@ -816,7 +816,7 @@ IMPL_LINK( SvxStdParagraphTabPage, LineDistHdl_Impl, ListBox *, pBox )
pActLineDistFld = &aLineDistAtMetricBox;
aLineDistAtMetricBox.SetMin(0);
- if ( !aLineDistAtMetricBox.GetText().Len() )
+ if ( aLineDistAtMetricBox.GetText().isEmpty() )
aLineDistAtMetricBox.SetValue(
aLineDistAtMetricBox.Normalize( 10 ), FUNIT_TWIP );
aLineDistAtPercentBox.Hide();
@@ -829,7 +829,7 @@ IMPL_LINK( SvxStdParagraphTabPage, LineDistHdl_Impl, ListBox *, pBox )
aLineDistAtMetricBox.Hide();
pActLineDistFld = &aLineDistAtPercentBox;
- if ( !aLineDistAtPercentBox.GetText().Len() )
+ if ( aLineDistAtPercentBox.GetText().isEmpty() )
aLineDistAtPercentBox.SetValue(
aLineDistAtPercentBox.Normalize( 100 ), FUNIT_TWIP );
aLineDistAtMetricBox.Hide();
diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx
index ef6d44b..dc54319 100644
--- a/cui/source/tabpages/tabstpge.cxx
+++ b/cui/source/tabpages/tabstpge.cxx
@@ -536,7 +536,7 @@ IMPL_LINK( SvxTabulatorTabPage, NewHdl_Impl, Button *, pBtn )
// If no RadioButton was clicked, we need to put anyway
bCheck |= sal_True;
// Set the selection into the position Edit
- aTabBox.SetSelection(Selection(0, aTabBox.GetText().Len()));
+ aTabBox.SetSelection(Selection(0, aTabBox.GetText().getLength()));
return 0;
}
diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx
index 32e0448..7eb2911 100644
--- a/cui/source/tabpages/textattr.cxx
+++ b/cui/source/tabpages/textattr.cxx
@@ -343,25 +343,25 @@ sal_Bool SvxTextAttrPage::FillItemSet( SfxItemSet& rAttrs)
sal_Int32 nValue;
TriState eState;
- if( aMtrFldLeft.GetText() != aMtrFldLeft.GetSavedValue() )
+ if( aMtrFldLeft.GetText() != OUString(aMtrFldLeft.GetSavedValue()) )
{
nValue = GetCoreValue( aMtrFldLeft, eUnit );
rAttrs.Put( SdrTextLeftDistItem( nValue ) );
}
- if( aMtrFldRight.GetText() != aMtrFldRight.GetSavedValue() )
+ if( aMtrFldRight.GetText() != OUString(aMtrFldRight.GetSavedValue()) )
{
nValue = GetCoreValue( aMtrFldRight, eUnit );
rAttrs.Put( SdrTextRightDistItem( nValue ) );
}
- if( aMtrFldTop.GetText() != aMtrFldTop.GetSavedValue() )
+ if( aMtrFldTop.GetText() != OUString(aMtrFldTop.GetSavedValue()) )
{
nValue = GetCoreValue( aMtrFldTop, eUnit );
rAttrs.Put( SdrTextUpperDistItem( nValue ) );
}
- if( aMtrFldBottom.GetText() != aMtrFldBottom.GetSavedValue() )
+ if( aMtrFldBottom.GetText() != OUString(aMtrFldBottom.GetSavedValue()) )
{
nValue = GetCoreValue( aMtrFldBottom, eUnit );
rAttrs.Put( SdrTextLowerDistItem( nValue ) );
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 87b410f..08d15d6 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -1165,7 +1165,7 @@ sal_Bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs )
else
{
// condition != Disabled ?
- if( aNumFldStepCount.GetText().Len() > 0 )
+ if( !aNumFldStepCount.GetText().isEmpty() )
{
nValue = (sal_uInt16) aNumFldStepCount.GetValue();
if( nValue != (sal_uInt16) aNumFldStepCount.GetSavedValue().ToInt32() )
@@ -2234,7 +2234,7 @@ IMPL_LINK( SvxAreaTabPage, ModifyStepCountHdl_Impl, void *, p )
{
if( aTsbStepCount.GetState() == STATE_NOCHECK )
{
- if( aNumFldStepCount.GetText().Len() == 0 )
+ if( aNumFldStepCount.GetText().isEmpty() )
aNumFldStepCount.SetText(rtl::OUString("64"));
aNumFldStepCount.Enable();
@@ -2247,7 +2247,7 @@ IMPL_LINK( SvxAreaTabPage, ModifyStepCountHdl_Impl, void *, p )
if( aTsbStepCount.GetState() != STATE_CHECK )
{
// condition != Disabled ?
- if( aNumFldStepCount.GetText().Len() > 0 )
+ if( !aNumFldStepCount.GetText().isEmpty() )
nValue = (sal_uInt16) aNumFldStepCount.GetValue();
}
rXFSet.Put( XGradientStepCountItem( nValue ) );
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 8968997..25c394f 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -513,7 +513,7 @@ long SvxColorTabPage::CheckChanges_Impl()
if( nPos != LISTBOX_ENTRY_NOTFOUND )
{
Color aColor = pColorList->GetColor( nPos )->GetColor();
- String aString = aLbColor.GetSelectEntry();
+ OUString aString = aLbColor.GetSelectEntry();
// aNewColor, because COL_USER != COL_something, even if RGB values are the same
// Color aNewColor( aColor.GetRed(), aColor.GetGreen(), aColor.GetBlue() );
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 07d7267..9fb4d89 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -230,8 +230,8 @@ int SvxHatchTabPage::DeactivatePage( SfxItemSet* _pSet )
long SvxHatchTabPage::CheckChanges_Impl()
{
- if( aMtrDistance.GetText() != aMtrDistance.GetSavedValue() ||
- aMtrAngle.GetText() != aMtrAngle.GetSavedValue() ||
+ if( aMtrDistance.GetText() != OUString(aMtrDistance.GetSavedValue()) ||
+ aMtrAngle.GetText() != OUString(aMtrAngle.GetSavedValue()) ||
aLbLineType.GetSelectEntryPos() != aLbLineType.GetSavedValue() ||
aLbLineColor.GetSelectEntryPos() != aLbLineColor.GetSavedValue() ||
aLbHatchings.GetSelectEntryPos() != aLbHatchings.GetSavedValue() )
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 8e65d47..fbd083b 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -753,7 +753,7 @@ sal_Bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
}
// Line width
// GetSavedValue() returns String!
- if( aMtrLineWidth.GetText() != aMtrLineWidth.GetSavedValue() )
+ if( aMtrLineWidth.GetText() != OUString(aMtrLineWidth.GetSavedValue()) )
{
XLineWidthItem aItem( GetCoreValue( aMtrLineWidth, ePoolUnit ) );
pOld = GetOldItem( rAttrs, XATTR_LINEWIDTH );
@@ -764,7 +764,7 @@ sal_Bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
}
}
// Width line start
- if( aMtrStartWidth.GetText() != aMtrStartWidth.GetSavedValue() )
+ if( aMtrStartWidth.GetText() != OUString(aMtrStartWidth.GetSavedValue()) )
{
XLineStartWidthItem aItem( GetCoreValue( aMtrStartWidth, ePoolUnit ) );
pOld = GetOldItem( rAttrs, XATTR_LINESTARTWIDTH );
@@ -775,7 +775,7 @@ sal_Bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
}
}
// Width line end
- if( aMtrEndWidth.GetText() != aMtrEndWidth.GetSavedValue() )
+ if( aMtrEndWidth.GetText() != OUString(aMtrEndWidth.GetSavedValue()) )
{
XLineEndWidthItem aItem( GetCoreValue( aMtrEndWidth, ePoolUnit ) );
pOld = GetOldItem( rAttrs, XATTR_LINEENDWIDTH );
@@ -868,7 +868,7 @@ sal_Bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
}
// Width line start
- if( aMtrStartWidth.GetText() != aMtrStartWidth.GetSavedValue() )
+ if( aMtrStartWidth.GetText() != OUString(aMtrStartWidth.GetSavedValue()) )
{
XLineStartWidthItem aItem( GetCoreValue( aMtrStartWidth, ePoolUnit ) );
pOld = GetOldItem( rAttrs, XATTR_LINESTARTWIDTH );
@@ -879,7 +879,7 @@ sal_Bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
}
}
// Width line end
- if( aMtrEndWidth.GetText() != aMtrEndWidth.GetSavedValue() )
+ if( aMtrEndWidth.GetText() != OUString(aMtrEndWidth.GetSavedValue()) )
{
XLineEndWidthItem aItem( GetCoreValue( aMtrEndWidth, ePoolUnit ) );
pOld = GetOldItem( rAttrs, XATTR_LINEENDWIDTH );
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index 4718ec5..6108aaa 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -222,13 +222,13 @@ void SvxLineDefTabPage::CheckChanges_Impl()
// is here used to NOT lose changes
//XDashStyle eXDS;
- if( aNumFldNumber1.GetText() != aNumFldNumber1.GetSavedValue() ||
- aMtrLength1.GetText() != aMtrLength1.GetSavedValue() ||
+ if( aNumFldNumber1.GetText() != OUString(aNumFldNumber1.GetSavedValue()) ||
+ aMtrLength1.GetText() != OUString(aMtrLength1.GetSavedValue()) ||
aLbType1.GetSelectEntryPos() != aLbType1.GetSavedValue() ||
- aNumFldNumber2.GetText() != aNumFldNumber2.GetSavedValue() ||
- aMtrLength2.GetText() != aMtrLength2.GetSavedValue() ||
+ aNumFldNumber2.GetText() != OUString(aNumFldNumber2.GetSavedValue()) ||
+ aMtrLength2.GetText() != OUString(aMtrLength2.GetSavedValue()) ||
aLbType2.GetSelectEntryPos() != aLbType2.GetSavedValue() ||
- aMtrDistance.GetText() != aMtrDistance.GetSavedValue() )
+ aMtrDistance.GetText() != OUString(aMtrDistance.GetSavedValue()) )
{
ResMgr& rMgr = CUI_MGR();
Image aWarningBoxImage = WarningBox::GetStandardImage();
diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.cxx b/dbaccess/source/ext/macromigration/macromigrationpages.cxx
index 0bd39fe..18ae6c6 100644
--- a/dbaccess/source/ext/macromigration/macromigrationpages.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationpages.cxx
@@ -131,7 +131,7 @@ namespace dbmm
void SaveDBDocPage::impl_updateLocationDependentItems()
{
updateDialogTravelUI();
- m_aStartMigration.Show( m_aSaveAsLocation.GetText().Len() > 0 );
+ m_aStartMigration.Show( !m_aSaveAsLocation.GetText().isEmpty() );
}
//--------------------------------------------------------------------
@@ -172,7 +172,7 @@ namespace dbmm
if ( !MacroMigrationPage::canAdvance() )
return false;
- return m_aSaveAsLocation.GetText().Len() > 0;
+ return !m_aSaveAsLocation.GetText().isEmpty();
}
//--------------------------------------------------------------------
diff --git a/dbaccess/source/ui/control/curledit.cxx b/dbaccess/source/ui/control/curledit.cxx
index be08a41..9ed5523 100644
--- a/dbaccess/source/ui/control/curledit.cxx
+++ b/dbaccess/source/ui/control/curledit.cxx
@@ -67,14 +67,14 @@ String OConnectionURLEdit::GetTextNoPrefix() const
}
//-------------------------------------------------------------------------
-void OConnectionURLEdit::SetText(const String& _rStr)
+void OConnectionURLEdit::SetText(const OUString& _rStr)
{
Selection aNoSelection(0,0);
SetText(_rStr, aNoSelection);
}
//-------------------------------------------------------------------------
-void OConnectionURLEdit::SetText(const String& _rStr, const Selection& /*_rNewSelection*/)
+void OConnectionURLEdit::SetText(const OUString& _rStr, const Selection& /*_rNewSelection*/)
{
// create new sub controls, if necessary
if (!GetSubEdit())
@@ -90,7 +90,7 @@ void OConnectionURLEdit::SetText(const String& _rStr, const Selection& /*_rNewSe
m_pForcedPrefix->Show(m_bShowPrefix);
- sal_Bool bIsEmpty = 0 == _rStr.Len();
+ sal_Bool bIsEmpty = _rStr.isEmpty();
// calc the prefix
String sPrefix;
if (!bIsEmpty)
@@ -126,7 +126,7 @@ void OConnectionURLEdit::SetText(const String& _rStr, const Selection& /*_rNewSe
}
//-------------------------------------------------------------------------
-String OConnectionURLEdit::GetText() const
+OUString OConnectionURLEdit::GetText() const
{
if ( m_pForcedPrefix )
return m_pForcedPrefix->GetText() += Edit::GetText();
diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx
index 4154c28..feee0a0 100644
--- a/dbaccess/source/ui/control/sqledit.cxx
+++ b/dbaccess/source/ui/control/sqledit.cxx
@@ -204,7 +204,7 @@ IMPL_LINK(OSqlEdit, ModifyHdl, void*, /*EMPTYTAG*/)
return 0;
}
-void OSqlEdit::SetText(const String& rNewText)
+void OSqlEdit::SetText(const OUString& rNewText)
{
DBG_CHKTHIS(OSqlEdit,NULL);
if (m_timerUndoActionCreation.IsActive())
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index 8bac697..9193dbc 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@ -391,16 +391,16 @@ DBG_NAME(OConnectionHelper)
String OConnectionHelper::impl_getURL( sal_Bool _bPrefix ) const
{
// get the pure text
- String sURL = _bPrefix ? m_aConnectionURL.GetText() : m_aConnectionURL.GetTextNoPrefix();
+ OUString sURL = _bPrefix ? m_aConnectionURL.GetText() : OUString(m_aConnectionURL.GetTextNoPrefix());
OSL_ENSURE( m_pCollection, "OConnectionHelper::impl_getURL: have no interpreter for the URLs!" );
- if ( m_pCollection && sURL.Len() )
+ if ( m_pCollection && !sURL.isEmpty() )
{
if ( m_pCollection->isFileSystemBased( m_eType ) )
{
// get the two parts: prefix and file URL
- String sTypePrefix, sFileURLDecoded;
+ OUString sTypePrefix, sFileURLDecoded;
if ( _bPrefix )
{
sTypePrefix = m_pCollection->getPrefix( m_eType );
@@ -412,7 +412,7 @@ DBG_NAME(OConnectionHelper)
}
sURL = sTypePrefix;
- if ( sFileURLDecoded.Len() )
+ if ( !sFileURLDecoded.isEmpty() )
{
OFileNotation aFileNotation( sFileURLDecoded, OFileNotation::N_SYSTEM );
sURL += String( aFileNotation.get( OFileNotation::N_URL ) );
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx
index eb33e8e..2076a1c 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx
@@ -252,7 +252,7 @@ namespace dbaui
m_aJavaDriverLabel.Show(bEnableJDBC);
m_aJavaDriver.Show(bEnableJDBC);
m_aTestJavaDriver.Show(bEnableJDBC);
- m_aTestJavaDriver.Enable( m_aJavaDriver.GetText().Len() != 0);
+ m_aTestJavaDriver.Enable( !m_aJavaDriver.GetText().isEmpty() );
m_aFL3.Show(bEnableJDBC);
checkTestConnection();
@@ -291,7 +291,7 @@ namespace dbaui
{
sal_Bool bChangedSomething = sal_False;
- if (m_aUserName.GetText() != m_aUserName.GetSavedValue())
+ if (m_aUserName.GetText() != OUString(m_aUserName.GetSavedValue()))
{
_rSet.Put(SfxStringItem(DSID_USER, m_aUserName.GetText()));
_rSet.Put(SfxStringItem(DSID_PASSWORD, String()));
@@ -316,7 +316,7 @@ namespace dbaui
sal_Bool bSuccess = sal_False;
try
{
- if ( m_aJavaDriver.GetText().Len() )
+ if ( !m_aJavaDriver.GetText().isEmpty() )
{
::rtl::Reference< jvmaccess::VirtualMachine > xJVM = ::connectivity::getJavaVM( Reference<XMultiServiceFactory>(m_pAdminDialog->getORB()->getServiceManager(), UNO_QUERY_THROW) );
bSuccess = ::connectivity::existsJavaClassByName(xJVM,m_aJavaDriver.GetText());
@@ -338,7 +338,7 @@ namespace dbaui
OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF");
sal_Bool bEnableTestConnection = !m_aConnectionURL.IsVisible() || (m_aConnectionURL.GetTextNoPrefix().Len() != 0);
if ( m_pCollection->determineType(m_eType) == ::dbaccess::DST_JDBC )
- bEnableTestConnection = bEnableTestConnection && (m_aJavaDriver.GetText().Len() != 0);
+ bEnableTestConnection = bEnableTestConnection && (!m_aJavaDriver.GetText().isEmpty());
m_aTestConnection.Enable(bEnableTestConnection);
return true;
}
@@ -346,7 +346,7 @@ namespace dbaui
IMPL_LINK(OConnectionTabPage, OnEditModified, Edit*, _pEdit)
{
if ( _pEdit == &m_aJavaDriver )
- m_aTestJavaDriver.Enable( m_aJavaDriver.GetText().Len() != 0 );
+ m_aTestJavaDriver.Enable( !m_aJavaDriver.GetText().isEmpty() );
checkTestConnection();
// tell the listener we were modified
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index f84b37c..ef5cd57 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -182,7 +182,7 @@ DBG_NAME(OTextConnectionPageSetup)
fillString(_rSet,&m_aETBaseDN,DSID_CONN_LDAP_BASEDN, bChangedSomething);
fillInt32(_rSet,&m_aNFPortNumber,DSID_CONN_LDAP_PORTNUMBER,bChangedSomething);
- if ( m_aETHostServer.GetText() != m_aETHostServer.GetSavedValue() )
+ if ( m_aETHostServer.GetText() != OUString(m_aETHostServer.GetSavedValue()) )
{
DbuTypeCollectionItem* pCollectionItem = PTR_CAST(DbuTypeCollectionItem, _rSet.GetItem(DSID_TYPECOLLECTION));
::dbaccess::ODsnTypeCollection* pCollection = NULL;
@@ -239,7 +239,7 @@ DBG_NAME(OTextConnectionPageSetup)
// -----------------------------------------------------------------------
IMPL_LINK(OLDAPConnectionPageSetup, OnEditModified, Edit*, /*_pEdit*/)
{
- sal_Bool bRoadmapState = ((m_aETHostServer.GetText().Len() != 0 ) && ( m_aETBaseDN.GetText().Len() != 0 ) && (m_aFTPortNumber.GetText().Len() != 0 ));
+ sal_Bool bRoadmapState = ((!m_aETHostServer.GetText().isEmpty() ) && ( !m_aETBaseDN.GetText().isEmpty() ) && (!m_aFTPortNumber.GetText().isEmpty() ));
SetRoadmapStateValue(bRoadmapState);
callModifiedHdl();
return 0L;
@@ -535,14 +535,14 @@ DBG_NAME(OMySQLIntroPageSetup)
OGenericAdministrationPage::implInitControls(_rSet, _bSaveValue);
// to get the correct value when saveValue was called by base class
- if ( !m_aETDriverClass.GetText().Len() )
+ if ( m_aETDriverClass.GetText().isEmpty() )
{
m_aETDriverClass.SetText(m_sDefaultJdbcDriverName);
m_aETDriverClass.SetModifyFlag();
}
callModifiedHdl();
- sal_Bool bRoadmapState = ((m_aETDatabasename.GetText().Len() != 0 ) && ( m_aETHostname.GetText().Len() != 0 ) && (m_aNFPortNumber.GetText().Len() != 0 ) && ( m_aETDriverClass.GetText().Len() != 0 ));
+ sal_Bool bRoadmapState = ((!m_aETDatabasename.GetText().isEmpty() ) && (!m_aETHostname.GetText().isEmpty()) && (!m_aNFPortNumber.GetText().isEmpty() ) && ( !m_aETDriverClass.GetText().isEmpty() ));
SetRoadmapStateValue(bRoadmapState);
}
@@ -554,7 +554,7 @@ DBG_NAME(OMySQLIntroPageSetup)
sal_Bool bSuccess = sal_False;
try
{
- if ( m_aETDriverClass.GetText().Len() )
+ if ( !m_aETDriverClass.GetText().isEmpty() )
{
// TODO change jvmaccess
::rtl::Reference< jvmaccess::VirtualMachine > xJVM = ::connectivity::getJavaVM( uno::Reference<lang::XMultiServiceFactory>(m_pAdminDialog->getORB()->getServiceManager(), uno::UNO_QUERY_THROW) );
@@ -576,8 +576,8 @@ DBG_NAME(OMySQLIntroPageSetup)
IMPL_LINK(OGeneralSpecialJDBCConnectionPageSetup, OnEditModified, Edit*, _pEdit)
{
if ( _pEdit == &m_aETDriverClass )
- m_aPBTestJavaDriver.Enable( m_aETDriverClass.GetText().Len() != 0 );
- sal_Bool bRoadmapState = ((m_aETDatabasename.GetText().Len() != 0 ) && ( m_aETHostname.GetText().Len() != 0 ) && (m_aNFPortNumber.GetText().Len() != 0 ) && ( m_aETDriverClass.GetText().Len() != 0 ));
+ m_aPBTestJavaDriver.Enable( !m_aETDriverClass.GetText().isEmpty() );
+ sal_Bool bRoadmapState = ((!m_aETDatabasename.GetText().isEmpty() ) && ( !m_aETHostname.GetText().isEmpty() ) && (!m_aNFPortNumber.GetText().isEmpty() ) && ( !m_aETDriverClass.GetText().isEmpty() ));
SetRoadmapStateValue(bRoadmapState);
callModifiedHdl();
return 0L;
@@ -662,7 +662,7 @@ DBG_NAME(OMySQLIntroPageSetup)
{
OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF");
sal_Bool bEnableTestConnection = !m_aConnectionURL.IsVisible() || (m_aConnectionURL.GetTextNoPrefix().Len() != 0);
- bEnableTestConnection = bEnableTestConnection && (m_aETDriverClass.GetText().Len() != 0);
+ bEnableTestConnection = bEnableTestConnection && (!m_aETDriverClass.GetText().isEmpty());
return bEnableTestConnection;
}
@@ -674,7 +674,7 @@ DBG_NAME(OMySQLIntroPageSetup)
sal_Bool bSuccess = sal_False;
try
{
- if ( m_aETDriverClass.GetText().Len() )
+ if ( !m_aETDriverClass.GetText().isEmpty() )
{
// TODO change jvmaccess
::rtl::Reference< jvmaccess::VirtualMachine > xJVM = ::connectivity::getJavaVM( uno::Reference<lang::XMultiServiceFactory>(m_pAdminDialog->getORB()->getServiceManager(), uno::UNO_QUERY_THROW) );
@@ -695,7 +695,7 @@ DBG_NAME(OMySQLIntroPageSetup)
IMPL_LINK(OJDBCConnectionPageSetup, OnEditModified, Edit*, _pEdit)
{
if ( _pEdit == &m_aETDriverClass )
- m_aPBTestJavaDriver.Enable( m_aETDriverClass.GetText().Len() != 0 );
+ m_aPBTestJavaDriver.Enable( !m_aETDriverClass.GetText().isEmpty() );
SetRoadmapStateValue(checkTestConnection());
// tell the listener we were modified
callModifiedHdl();
@@ -825,7 +825,7 @@ DBG_NAME(OAuthentificationPageSetup)
{
sal_Bool bChangedSomething = sal_False;
- if (m_aETUserName.GetText() != m_aETUserName.GetSavedValue())
+ if (m_aETUserName.GetText() != OUString(m_aETUserName.GetSavedValue()))
{
_rSet.Put(SfxStringItem(DSID_USER, m_aETUserName.GetText()));
_rSet.Put(SfxStringItem(DSID_PASSWORD, String()));
diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
index ff38363..f979b51 100644
--- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
@@ -300,7 +300,7 @@ DBG_NAME(OTextConnectionHelper)
aErrorText.SearchAndReplaceAscii("#1",m_aFieldSeparatorLabel.GetText());
pErrorWin = &m_aFieldSeparator;
}
- else if (!m_aDecimalSeparator.GetText().Len())
+ else if (m_aDecimalSeparator.GetText().isEmpty())
{ // No DecimalSeparator
aErrorText = String(ModuleRes(STR_AUTODELIMITER_MISSING));
aErrorText.SearchAndReplaceAscii("#1",m_aDecimalSeparatorLabel.GetText());
@@ -386,25 +386,25 @@ DBG_NAME(OTextConnectionHelper)
if ( ( m_nAvailableSections & TC_SEPARATORS ) != 0 )
{
- if( m_aFieldSeparator.GetText() != m_aFieldSeparator.GetSavedValue() )
+ if( m_aFieldSeparator.GetText() != OUString(m_aFieldSeparator.GetSavedValue()) )
{
rSet.Put( SfxStringItem(DSID_FIELDDELIMITER, GetSeparator( m_aFieldSeparator, m_aFieldSeparatorList) ) );
bChangedSomething = sal_True;
}
- if( m_aTextSeparator.GetText() != m_aTextSeparator.GetSavedValue() )
+ if( m_aTextSeparator.GetText() != OUString(m_aTextSeparator.GetSavedValue()) )
{
rSet.Put( SfxStringItem(DSID_TEXTDELIMITER, GetSeparator( m_aTextSeparator, m_aTextSeparatorList) ) );
bChangedSomething = sal_True;
}
- if( m_aDecimalSeparator.GetText() != m_aDecimalSeparator.GetSavedValue() )
+ if( m_aDecimalSeparator.GetText() != OUString(m_aDecimalSeparator.GetSavedValue()) )
{
- rSet.Put( SfxStringItem(DSID_DECIMALDELIMITER, m_aDecimalSeparator.GetText().Copy(0, 1) ) );
+ rSet.Put( SfxStringItem(DSID_DECIMALDELIMITER, m_aDecimalSeparator.GetText().copy(0, 1) ) );
bChangedSomething = sal_True;
}
- if( m_aThousandsSeparator.GetText() != m_aThousandsSeparator.GetSavedValue() )
+ if( m_aThousandsSeparator.GetText() != OUString(m_aThousandsSeparator.GetSavedValue()) )
{
- rSet.Put( SfxStringItem(DSID_THOUSANDSDELIMITER, m_aThousandsSeparator.GetText().Copy(0,1) ) );
+ rSet.Put( SfxStringItem(DSID_THOUSANDSDELIMITER, m_aThousandsSeparator.GetText().copy(0,1) ) );
bChangedSomething = sal_True;
}
}
@@ -453,7 +453,7 @@ DBG_NAME(OTextConnectionHelper)
xub_StrLen nPos(rBox.GetEntryPos( rBox.GetText() ));
if( nPos == COMBOBOX_ENTRY_NOTFOUND )
- return rBox.GetText().Copy(0);
+ return rBox.GetText().copy(0);
if ( !( &m_aTextSeparator == &rBox && nPos == (rBox.GetEntryCount()-1) ) )
return rtl::OUString(
diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx
index a79399a..a0d074e 100644
--- a/dbaccess/source/ui/dlg/UserAdmin.cxx
+++ b/dbaccess/source/ui/dlg/UserAdmin.cxx
@@ -122,7 +122,7 @@ IMPL_LINK_NOARG(OPasswordDialog, OKHdl_Impl)
// -----------------------------------------------------------------------------
IMPL_LINK( OPasswordDialog, ModifiedHdl, Edit *, pEdit )
{
- aOKBtn.Enable(pEdit->GetText().Len() != 0);
+ aOKBtn.Enable(!pEdit->GetText().isEmpty());
return 0;
}
diff --git a/dbaccess/source/ui/dlg/admincontrols.cxx b/dbaccess/source/ui/dlg/admincontrols.cxx
index 097cde2..250a431 100644
--- a/dbaccess/source/ui/dlg/admincontrols.cxx
+++ b/dbaccess/source/ui/dlg/admincontrols.cxx
@@ -272,23 +272,23 @@ namespace dbaui
//--------------------------------------------------------------------
bool MySQLNativeSettings::canAdvance() const
{
- if ( m_aDatabaseName.GetText().Len() == 0 )
+ if ( m_aDatabaseName.GetText().isEmpty() )
return false;
if ( m_aHostPortRadio.IsChecked()
- && ( ( m_aHostName.GetText().Len() == 0 )
- || ( m_aPort.GetText().Len() == 0 )
+ && ( ( m_aHostName.GetText().isEmpty() )
+ || ( m_aPort.GetText().isEmpty() )
)
)
return false;
#ifdef UNX
if ( ( m_aSocketRadio.IsChecked() )
- && ( m_aSocket.GetText().Len() == 0 )
+ && ( m_aSocket.GetText().isEmpty() )
)
#else
if ( ( m_aNamedPipeRadio.IsChecked() )
- && ( m_aNamedPipe.GetText().Len() == 0 )
+ && ( m_aNamedPipe.GetText().isEmpty() )
)
#endif
return false;
diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx
index f0e4af3..fcdb61c 100644
--- a/dbaccess/source/ui/dlg/adminpages.cxx
+++ b/dbaccess/source/ui/dlg/adminpages.cxx
@@ -237,7 +237,7 @@ namespace dbaui
// -----------------------------------------------------------------------
void OGenericAdministrationPage::fillString(SfxItemSet& _rSet,Edit* _pEdit,sal_uInt16 _nID,sal_Bool& _bChangedSomething)
{
- if( (_pEdit != NULL) && (_pEdit->GetText() != _pEdit->GetSavedValue()) )
+ if( (_pEdit != NULL) && (_pEdit->GetText() != OUString(_pEdit->GetSavedValue())) )
{
_rSet.Put(SfxStringItem(_nID, _pEdit->GetText()));
_bChangedSomething = sal_True;
diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx
index ff3e679..45831a6 100644
--- a/dbaccess/source/ui/dlg/detailpages.cxx
+++ b/dbaccess/source/ui/dlg/detailpages.cxx
@@ -609,7 +609,7 @@ namespace dbaui
OCommonBehaviourTabPage::implInitControls(_rSet, _bSaveValue);
// to get the correcxt value when saveValue was called by base class
- if ( m_bUseClass && !m_aEDDriverClass.GetText().Len() )
+ if ( m_bUseClass && m_aEDDriverClass.GetText().isEmpty() )
{
m_aEDDriverClass.SetText(m_sDefaultJdbcDriverName);
m_aEDDriverClass.SetModifyFlag();
@@ -624,7 +624,7 @@ namespace dbaui
sal_Bool bSuccess = sal_False;
try
{
- if ( m_aEDDriverClass.GetText().Len() )
+ if ( !m_aEDDriverClass.GetText().isEmpty() )
{
// TODO change jvmaccess
::rtl::Reference< jvmaccess::VirtualMachine > xJVM = ::connectivity::getJavaVM( Reference<XMultiServiceFactory>(m_pAdminDialog->getORB()->getServiceManager(), UNO_QUERY_THROW) );
@@ -645,7 +645,7 @@ namespace dbaui
IMPL_LINK(OGeneralSpecialJDBCDetailsPage, OnEditModified, Edit*, _pEdit)
{
if ( m_bUseClass && _pEdit == &m_aEDDriverClass )
- m_aTestJavaDriver.Enable( m_aEDDriverClass.GetText().Len() != 0 );
+ m_aTestJavaDriver.Enable( !m_aEDDriverClass.GetText().isEmpty() );
// tell the listener we were modified
callModifiedHdl();
@@ -705,7 +705,7 @@ namespace dbaui
bChangedSomething |= m_aMySQLSettings.FillItemSet( _rSet );
- if ( m_aUserName.GetText() != m_aUserName.GetSavedValue() )
+ if ( m_aUserName.GetText() != OUString(m_aUserName.GetSavedValue()) )
{
_rSet.Put( SfxStringItem( DSID_USER, m_aUserName.GetText() ) );
_rSet.Put( SfxStringItem( DSID_PASSWORD, String()));
diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx
index 2f57720..9ce1968 100644
--- a/dbaccess/source/ui/dlg/directsql.cxx
+++ b/dbaccess/source/ui/dlg/directsql.cxx
@@ -356,7 +356,7 @@ DBG_NAME(DirectSQLDialog)
//--------------------------------------------------------------------
IMPL_LINK( DirectSQLDialog, OnStatementModified, void*, /*NOTINTERESTEDIN*/ )
{
- m_aExecute.Enable(0 != m_aSQL.GetText().Len());
+ m_aExecute.Enable(!m_aSQL.GetText().isEmpty());
return 0L;
}
diff --git a/dbaccess/source/ui/dlg/dlgsave.cxx b/dbaccess/source/ui/dlg/dlgsave.cxx
index b3258ad..bcb599f 100644
--- a/dbaccess/source/ui/dlg/dlgsave.cxx
+++ b/dbaccess/source/ui/dlg/dlgsave.cxx
@@ -355,7 +355,7 @@ IMPL_LINK(OSaveAsDlg, ButtonClickHdl, Button *, pButton)
IMPL_LINK(OSaveAsDlg, EditModifyHdl, Edit *, pEdit )
{
if (pEdit == &m_pImpl->m_aTitle)
- m_pImpl->m_aPB_OK.Enable(0 != m_pImpl->m_aTitle.GetText().Len());
+ m_pImpl->m_aPB_OK.Enable(!m_pImpl->m_aTitle.GetText().isEmpty());
return 0;
}
// -----------------------------------------------------------------------------
@@ -429,7 +429,7 @@ void OSaveAsDlg::implInit()
}
// -----------------------------------------------------------------------------
String OSaveAsDlg::getName() const { return m_pImpl->m_aName; }
-String OSaveAsDlg::getCatalog() const { return m_pImpl->m_aCatalog.IsVisible() ? m_pImpl->m_aCatalog.GetText() : String(); }
-String OSaveAsDlg::getSchema() const { return m_pImpl->m_aSchema.IsVisible() ? m_pImpl->m_aSchema.GetText() : String(); }
+String OSaveAsDlg::getCatalog() const { return m_pImpl->m_aCatalog.IsVisible() ? m_pImpl->m_aCatalog.GetText() : OUString(); }
+String OSaveAsDlg::getSchema() const { return m_pImpl->m_aSchema.IsVisible() ? m_pImpl->m_aSchema.GetText() : OUString(); }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/FieldControls.hxx b/dbaccess/source/ui/inc/FieldControls.hxx
index c571a11..2e10878 100644
--- a/dbaccess/source/ui/inc/FieldControls.hxx
+++ b/dbaccess/source/ui/inc/FieldControls.hxx
@@ -48,7 +48,7 @@ namespace dbaui
public:
inline OPropColumnEditCtrl(Window* pParent, ::rtl::OUString& _rAllowedChars, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0);
- inline sal_Bool IsModified() const { return GetText() != GetSavedValue(); }
+ inline sal_Bool IsModified() const { return GetText() != OUString(GetSavedValue()); }
short GetPos() const { return m_nPos; }
String GetHelp() const { return m_strHelpText; }
@@ -80,7 +80,7 @@ namespace dbaui
inline OPropEditCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0);
inline OPropEditCtrl(Window* pParent, sal_uInt16 nHelpId, const ResId& _rRes,short nPosition = -1);
- inline sal_Bool IsModified() const { return GetText() != GetSavedValue(); }
+ inline sal_Bool IsModified() const { return GetText() != OUString(GetSavedValue()); }
short GetPos() const { return m_nPos; }
String GetHelp() const { return m_strHelpText; }
@@ -115,7 +115,7 @@ namespace dbaui
inline OPropNumericEditCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0);
inline OPropNumericEditCtrl(Window* pParent, sal_uInt16 nHelpId, const ResId& _rRes,short nPosition = -1);
- inline sal_Bool IsModified() const { return GetText() != GetSavedValue(); }
+ inline sal_Bool IsModified() const { return GetText() != OUString(GetSavedValue()); }
short GetPos() const { return m_nPos; }
String GetHelp() const { return m_strHelpText; }
diff --git a/dbaccess/source/ui/inc/curledit.hxx b/dbaccess/source/ui/inc/curledit.hxx
index 522a1e8..981d790 100644
--- a/dbaccess/source/ui/inc/curledit.hxx
+++ b/dbaccess/source/ui/inc/curledit.hxx
@@ -51,9 +51,9 @@ public:
public:
// Edit overridables
- virtual void SetText(const String& _rStr);
- virtual void SetText(const String& _rStr, const Selection& _rNewSelection);
- virtual String GetText() const;
+ virtual void SetText(const OUString& _rStr);
+ virtual void SetText(const OUString& _rStr, const Selection& _rNewSelection);
+ virtual OUString GetText() const;
/** Showsthe Prefix
diff --git a/dbaccess/source/ui/inc/sqledit.hxx b/dbaccess/source/ui/inc/sqledit.hxx
index a4ac1a3..50a5dcb 100644
--- a/dbaccess/source/ui/inc/sqledit.hxx
+++ b/dbaccess/source/ui/inc/sqledit.hxx
@@ -70,7 +70,7 @@ namespace dbaui
virtual ~OSqlEdit();
// Edit overridables
- virtual void SetText(const String& rNewText);
+ virtual void SetText(const OUString& rNewText);
using MultiLineEditSyntaxHighlight::SetText;
// own functionality
diff --git a/dbaccess/source/ui/misc/WCPage.cxx b/dbaccess/source/ui/misc/WCPage.cxx
index 6e16280..5205c7e 100644
--- a/dbaccess/source/ui/misc/WCPage.cxx
+++ b/dbaccess/source/ui/misc/WCPage.cxx
@@ -167,7 +167,7 @@ sal_Bool OCopyTable::LeavePage()
{
DBG_CHKTHIS(OCopyTable,NULL);
m_pParent->m_bCreatePrimaryKeyColumn = (m_bPKeyAllowed && m_aCB_PrimaryColumn.IsEnabled()) ? m_aCB_PrimaryColumn.IsChecked() : sal_False;
- m_pParent->m_aKeyName = m_pParent->m_bCreatePrimaryKeyColumn ? m_edKeyName.GetText() : String();
+ m_pParent->m_aKeyName = m_pParent->m_bCreatePrimaryKeyColumn ? m_edKeyName.GetText() : OUString();
m_pParent->setUseHeaderLine( m_aCB_UseHeaderLine.IsChecked() );
// first check if the table already exists in the database
diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx
index a55ee7b..d9ec94d 100644
--- a/dbaccess/source/ui/misc/WTypeSelect.cxx
+++ b/dbaccess/source/ui/misc/WTypeSelect.cxx
@@ -355,7 +355,7 @@ IMPL_LINK( OWizTypeSelect, ButtonClickHdl, Button *, /*pButton*/ )
DBG_CHKTHIS(OWizTypeSelect,NULL);
sal_Int32 nBreakPos;
m_pParent->CheckColumns(nBreakPos);
- fillColumnList(m_etAuto.GetText().ToInt32());
+ fillColumnList(m_etAuto.GetText().toInt32());
ActivatePage();
diff --git a/editeng/inc/editeng/editeng.hxx b/editeng/inc/editeng/editeng.hxx
index 0eb4b12..48e236c 100644
--- a/editeng/inc/editeng/editeng.hxx
+++ b/editeng/inc/editeng/editeng.hxx
@@ -244,7 +244,7 @@ public:
const Size& GetMaxAutoPaperSize() const;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list