summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
Diffstat (limited to 'sc')
-rw-r--r--sc/inc/editutil.hxx2
-rw-r--r--sc/source/core/tool/editutil.cxx2
-rw-r--r--sc/source/ui/app/inputwin.cxx10
-rw-r--r--sc/source/ui/attrdlg/scdlgfact.cxx4
-rw-r--r--sc/source/ui/attrdlg/scdlgfact.hxx4
-rw-r--r--sc/source/ui/condformat/colorformat.cxx4
-rw-r--r--sc/source/ui/dbgui/consdlg.cxx2
-rw-r--r--sc/source/ui/dbgui/dbnamdlg.cxx12
-rw-r--r--sc/source/ui/dbgui/fieldwnd.cxx5
-rw-r--r--sc/source/ui/dbgui/scuiasciiopt.cxx2
-rw-r--r--sc/source/ui/inc/inputwin.hxx6
-rw-r--r--sc/source/ui/miscdlgs/crnrdlg.cxx6
-rw-r--r--sc/source/ui/miscdlgs/datafdlg.cxx2
-rw-r--r--sc/source/ui/miscdlgs/optsolver.cxx2
-rw-r--r--sc/source/ui/miscdlgs/simpref.cxx2
-rw-r--r--sc/source/ui/miscdlgs/tabopdlg.cxx12
-rw-r--r--sc/source/ui/optdlg/tpdefaults.cxx2
-rw-r--r--sc/source/ui/optdlg/tpformula.cxx4
-rw-r--r--sc/source/ui/optdlg/tpusrlst.cxx2
-rw-r--r--sc/source/ui/optdlg/tpview.cxx2
-rw-r--r--sc/source/ui/pagedlg/areasdlg.cxx2
-rw-r--r--sc/source/ui/pagedlg/tptable.cxx10
22 files changed, 50 insertions, 49 deletions
diff --git a/sc/inc/editutil.hxx b/sc/inc/editutil.hxx
index 5fbf6dc8eb1c..3bdbb322ebae 100644
--- a/sc/inc/editutil.hxx
+++ b/sc/inc/editutil.hxx
@@ -144,7 +144,7 @@ public:
SfxItemSet* pDefaults, sal_Bool bTakeOwnership = sal_True );
/// Overwritten method to be able to apply defaults already set
- void SetText( const String& rText );
+ void SetText( const OUString& rText );
/// Current defaults are not applied, new defaults are applied
void SetTextNewDefaults( const String& rText,
const SfxItemSet& rDefaults, sal_Bool bRememberCopy = sal_True );
diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx
index 016124f28bf2..b8053731f187 100644
--- a/sc/source/core/tool/editutil.cxx
+++ b/sc/source/core/tool/editutil.cxx
@@ -405,7 +405,7 @@ void ScEditEngineDefaulter::SetTextNewDefaults( const EditTextObject& rTextObjec
}
-void ScEditEngineDefaulter::SetText( const String& rText )
+void ScEditEngineDefaulter::SetText( const OUString& rText )
{
sal_Bool bUpdateMode = GetUpdateMode();
if ( bUpdateMode )
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 7ece5d92f669..64be1b4ea7cb 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -678,12 +678,12 @@ void ScInputWindow::SetFormulaMode( sal_Bool bSet )
aTextWindow.SetFormulaMode(bSet);
}
-void ScInputWindow::SetText( const String& rString )
+void ScInputWindow::SetText( const OUString& rString )
{
ToolBox::SetText(rString);
}
-String ScInputWindow::GetText() const
+OUString ScInputWindow::GetText() const
{
return ToolBox::GetText();
}
@@ -1373,7 +1373,7 @@ void ScMultiTextWnd::InitEditEngine()
pEditEngine->SetUpdateMode( sal_True );
// aString ist die Wahrheit...
- if ( bFilled && pEditEngine->GetText() == aString )
+ if ( bFilled && pEditEngine->GetText() == OUString(aString) )
Invalidate(); // Repaint fuer (hinterlegte) Felder
else
pEditEngine->SetText(aString); // dann wenigstens den richtigen Text
@@ -1665,7 +1665,7 @@ void ScTextWnd::LoseFocus()
{
}
-String ScTextWnd::GetText() const
+OUString ScTextWnd::GetText() const
{
// ueberladen, um per Testtool an den Text heranzukommen
@@ -1754,7 +1754,7 @@ void ScTextWnd::StartEditEngine()
pEditEngine->SetUpdateMode( sal_True );
// aString ist die Wahrheit...
- if ( bFilled && pEditEngine->GetText() == aString )
+ if ( bFilled && pEditEngine->GetText() == OUString(aString) )
Invalidate(); // Repaint fuer (hinterlegte) Felder
else
pEditEngine->SetText(aString); // dann wenigstens den richtigen Text
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx
index 642acfcffb50..5062beec2c28 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -141,11 +141,11 @@ void ScAbstractTabDialog_Impl::SetInputSet( const SfxItemSet* pInSet )
pDlg->SetInputSet( pInSet );
}
//From class Window.
-void ScAbstractTabDialog_Impl::SetText( const XubString& rStr )
+void ScAbstractTabDialog_Impl::SetText( const OUString& rStr )
{
pDlg->SetText( rStr );
}
-String ScAbstractTabDialog_Impl::GetText() const
+OUString ScAbstractTabDialog_Impl::GetText() const
{
return pDlg->GetText();
}
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx
index b51439b44d9a..2bcebbd2b83e 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -378,8 +378,8 @@ class ScAbstractTabDialog_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;
};
//------------------------------------------------------------------------
diff --git a/sc/source/ui/condformat/colorformat.cxx b/sc/source/ui/condformat/colorformat.cxx
index 353b50ba29b1..45303e61c341 100644
--- a/sc/source/ui/condformat/colorformat.cxx
+++ b/sc/source/ui/condformat/colorformat.cxx
@@ -268,7 +268,7 @@ IMPL_LINK_NOARG( ScDataBarSettingsDlg, TypeSelectHdl )
else
{
maEdMin.Enable();
- if(!maEdMin.GetText().Len())
+ if(maEdMin.GetText().isEmpty())
{
if(nSelectMin == COLORSCALE_PERCENTILE || nSelectMin == COLORSCALE_PERCENT)
maEdMin.SetText(OUString::number(50));
@@ -283,7 +283,7 @@ IMPL_LINK_NOARG( ScDataBarSettingsDlg, TypeSelectHdl )
else
{
maEdMax.Enable();
- if(!maEdMax.GetText().Len())
+ if(maEdMax.GetText().isEmpty())
{
if(nSelectMax == COLORSCALE_PERCENTILE || nSelectMax == COLORSCALE_PERCENT)
maEdMax.SetText(OUString::number(50));
diff --git a/sc/source/ui/dbgui/consdlg.cxx b/sc/source/ui/dbgui/consdlg.cxx
index a3d367a17a53..b8c8bbb1fcd0 100644
--- a/sc/source/ui/dbgui/consdlg.cxx
+++ b/sc/source/ui/dbgui/consdlg.cxx
@@ -459,7 +459,7 @@ IMPL_LINK( ScConsolidateDlg, ClickHdl, PushButton*, pBtn )
Close();
else if ( pBtn == &aBtnAdd )
{
- if ( aEdDataArea.GetText().Len() > 0 )
+ if ( !aEdDataArea.GetText().isEmpty() )
{
String aNewEntry( aEdDataArea.GetText() );
ScArea** ppAreas = NULL;
diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx
index 452e0dedcfad..24a1fcefd8d9 100644
--- a/sc/source/ui/dbgui/dbnamdlg.cxx
+++ b/sc/source/ui/dbgui/dbnamdlg.cxx
@@ -595,13 +595,13 @@ IMPL_LINK_NOARG(ScDbNameDlg, RemoveBtnHdl)
IMPL_LINK_NOARG(ScDbNameDlg, NameModifyHdl)
{
- String theName = aEdName.GetText();
+ OUString theName = aEdName.GetText();
sal_Bool bNameFound = (COMBOBOX_ENTRY_NOTFOUND
!= aEdName.GetEntryPos( theName ));
- if ( theName.Len() == 0 )
+ if ( theName.isEmpty() )
{
- if ( aBtnAdd.GetText() != aStrAdd )
+ if ( aBtnAdd.GetText() != OUString(aStrAdd) )
aBtnAdd.SetText( aStrAdd );
aBtnAdd .Disable();
aBtnRemove .Disable();
@@ -624,7 +624,7 @@ IMPL_LINK_NOARG(ScDbNameDlg, NameModifyHdl)
{
if ( bNameFound )
{
- if ( aBtnAdd.GetText() != aStrModify )
+ if ( aBtnAdd.GetText() != OUString(aStrModify) )
aBtnAdd.SetText( aStrModify );
if(!bSaved)
@@ -636,13 +636,13 @@ IMPL_LINK_NOARG(ScDbNameDlg, NameModifyHdl)
}
else
{
- if ( aBtnAdd.GetText() != aStrAdd )
+ if ( aBtnAdd.GetText() != OUString(aStrAdd) )
aBtnAdd.SetText( aStrAdd );
bSaved=false;
pSaveObj->Restore();
- if ( aEdAssign.GetText().Len() > 0 )
+ if ( !aEdAssign.GetText().isEmpty() )
{
aBtnAdd.Enable();
aBtnHeader.Enable();
diff --git a/sc/source/ui/dbgui/fieldwnd.cxx b/sc/source/ui/dbgui/fieldwnd.cxx
index 5bd76bdb92dc..dce0015bfda7 100644
--- a/sc/source/ui/dbgui/fieldwnd.cxx
+++ b/sc/source/ui/dbgui/fieldwnd.cxx
@@ -581,9 +581,10 @@ void ScDPFieldControlBase::DrawBackground( OutputDevice& rDev )
xub_StrLen nTokenCnt = comphelper::string::getTokenCount(GetText(), '\n');
long nY = (aSize.Height() - nTokenCnt * rDev.GetTextHeight()) / 2;
- for( xub_StrLen nToken = 0, nStringIx = 0; nToken < nTokenCnt; ++nToken )
+ sal_Int32 nStringIx = 0;
+ for( xub_StrLen nToken = 0; nToken < nTokenCnt; ++nToken )
{
- String aLine( GetText().GetToken( 0, '\n', nStringIx ) );
+ String aLine( GetText().getToken( 0, '\n', nStringIx ) );
Point aLinePos( (aSize.Width() - rDev.GetCtrlTextWidth( aLine )) / 2, nY );
rDev.DrawCtrlText( aLinePos, aLine );
nY += rDev.GetTextHeight();
diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx
index d39c2581ee41..cfa4d4e2e3fa 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -670,7 +670,7 @@ IMPL_LINK( ScImportAsciiDlg, SeparatorHdl, Control*, pCtrl )
if( (pCtrl == &aCkbOther) && aCkbOther.IsChecked() )
aEdOther.GrabFocus();
else if( pCtrl == &aEdOther )
- aCkbOther.Check( aEdOther.GetText().Len() > 0 );
+ aCkbOther.Check( !aEdOther.GetText().isEmpty() );
String aOldFldSeps( maFieldSeparators);
maFieldSeparators = GetSeparators();
diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx
index f150d0f8d287..cec8377d8f66 100644
--- a/sc/source/ui/inc/inputwin.hxx
+++ b/sc/source/ui/inc/inputwin.hxx
@@ -103,7 +103,7 @@ protected:
virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel );
- virtual String GetText() const;
+ virtual OUString GetText() const;
void ImplInitSettings();
void UpdateAutoCorrFlag();
@@ -283,8 +283,8 @@ public:
virtual void MouseMove( const MouseEvent& rMEvt );
bool IsMultiLineInput() { return mbIsMultiLine; }
protected:
- virtual void SetText( const String& rString );
- virtual String GetText() const;
+ virtual void SetText( const OUString& rString );
+ virtual OUString GetText() const;
bool UseSubTotal( ScRangeList* pRangeList ) const;
bool IsPointerAtResizePos();
diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx
index 60b67f805ea1..f0ff15580490 100644
--- a/sc/source/ui/miscdlgs/crnrdlg.cxx
+++ b/sc/source/ui/miscdlgs/crnrdlg.cxx
@@ -920,7 +920,7 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, Range1SelectHdl)
aRangeStr = aLbRange.GetSelectEntry();
}
else if ( nSelectPos > 2 && nSelectPos < nCnt && aRangeStr.Len()
- && aRangeStr == aEdAssign.GetText() )
+ && OUString(aRangeStr) == aEdAssign.GetText() )
{ // nach oben wandern statt nach unten auf die vorherige Position
nSelectPos -= 2;
aLbRange.SelectEntryPos( nSelectPos );
@@ -938,9 +938,9 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, Range1SelectHdl)
}
else
{
- if ( aEdAssign.GetText().Len() > 0 )
+ if ( !aEdAssign.GetText().isEmpty() )
{
- if ( aEdAssign2.GetText().Len() > 0 )
+ if ( !aEdAssign2.GetText().isEmpty() )
aBtnAdd.Enable();
else
aBtnAdd.Disable();
diff --git a/sc/source/ui/miscdlgs/datafdlg.cxx b/sc/source/ui/miscdlgs/datafdlg.cxx
index d87d5527a861..36fe4096c95d 100644
--- a/sc/source/ui/miscdlgs/datafdlg.cxx
+++ b/sc/source/ui/miscdlgs/datafdlg.cxx
@@ -292,7 +292,7 @@ IMPL_LINK_NOARG(ScDataFormDlg, Impl_NewHdl)
boost::ptr_vector<Edit>::iterator itr = maEdits.begin(), itrEnd = maEdits.end();
for(; itr != itrEnd; ++itr)
if (!boost::is_null(itr))
- if ( (*itr).GetText().Len() != 0 )
+ if ( !(*itr).GetText().isEmpty() )
{
bHasData = true;
break;
diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx
index 6882eeaa8a5a..06f540b1e0ea 100644
--- a/sc/source/ui/miscdlgs/optsolver.cxx
+++ b/sc/source/ui/miscdlgs/optsolver.cxx
@@ -655,7 +655,7 @@ IMPL_LINK_NOARG(ScOptSolverDlg, TargetModifyHdl)
{
// modify handler for the target edit:
// select "Value of" if something is input into the edit
- if ( maEdTargetValue.GetText().Len() )
+ if ( !maEdTargetValue.GetText().isEmpty() )
maRbValue.Check();
return 0;
}
diff --git a/sc/source/ui/miscdlgs/simpref.cxx b/sc/source/ui/miscdlgs/simpref.cxx
index 5245fd25d184..8a96e0ecc728 100644
--- a/sc/source/ui/miscdlgs/simpref.cxx
+++ b/sc/source/ui/miscdlgs/simpref.cxx
@@ -193,7 +193,7 @@ void ScSimpleRefDlg::StartRefInput()
if ( bMultiSelection )
{
// initially select the whole string, so it gets replaced by default
- aEdAssign.SetSelection( Selection( 0, aEdAssign.GetText().Len() ) );
+ aEdAssign.SetSelection( Selection( 0, aEdAssign.GetText().getLength() ) );
}
aRbAssign.DoRef();
diff --git a/sc/source/ui/miscdlgs/tabopdlg.cxx b/sc/source/ui/miscdlgs/tabopdlg.cxx
index be313f895a70..b5d051ea7e18 100644
--- a/sc/source/ui/miscdlgs/tabopdlg.cxx
+++ b/sc/source/ui/miscdlgs/tabopdlg.cxx
@@ -252,10 +252,10 @@ IMPL_LINK( ScTabOpDlg, BtnHdl, PushButton*, pBtn )
// bzw. Einfachreferenz bei beidem?
// 3. Ist mindestens Zeile oder Spalte und Formel voll?
- if (aEdFormulaRange.GetText().Len() == 0)
+ if (aEdFormulaRange.GetText().isEmpty())
nError = TABOPERR_NOFORMULA;
- else if (aEdRowCell.GetText().Len() == 0 &&
- aEdColCell.GetText().Len() == 0)
+ else if (aEdRowCell.GetText().isEmpty() &&
+ aEdColCell.GetText().isEmpty())
nError = TABOPERR_NOCOLROW;
else if ( !lcl_Parse( aEdFormulaRange.GetText(), pDoc, nCurTab,
theFormulaCell, theFormulaEnd ) )
@@ -263,21 +263,21 @@ IMPL_LINK( ScTabOpDlg, BtnHdl, PushButton*, pBtn )
else
{
const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention();
- if (aEdRowCell.GetText().Len() > 0)
+ if (!aEdRowCell.GetText().isEmpty())
{
if (!ConvertSingleRef( pDoc, aEdRowCell.GetText(), nCurTab,
theRowCell, eConv ))
nError = TABOPERR_WRONGROW;
else
{
- if (aEdColCell.GetText().Len() == 0 &&
+ if (aEdColCell.GetText().isEmpty() &&
theFormulaCell.Col() != theFormulaEnd.Col())
nError = TABOPERR_NOCOLFORMULA;
else
nMode = 1;
}
}
- if (aEdColCell.GetText().Len() > 0)
+ if (!aEdColCell.GetText().isEmpty())
{
if (!ConvertSingleRef( pDoc, aEdColCell.GetText(), nCurTab,
theColCell, eConv ))
diff --git a/sc/source/ui/optdlg/tpdefaults.cxx b/sc/source/ui/optdlg/tpdefaults.cxx
index 5020b9ce1b7d..14b7b8800747 100644
--- a/sc/source/ui/optdlg/tpdefaults.cxx
+++ b/sc/source/ui/optdlg/tpdefaults.cxx
@@ -89,7 +89,7 @@ sal_Bool ScTpDefaultsOptions::FillItemSet(SfxItemSet &rCoreSet)
OUString aSheetPrefix = aEdSheetPrefix.GetText();
- if ( aEdNSheets.GetSavedValue() != aEdNSheets.GetText()
+ if ( OUString(aEdNSheets.GetSavedValue()) != aEdNSheets.GetText()
|| static_cast<OUString>(aEdSheetPrefix.GetSavedValue()) != aSheetPrefix )
{
aOpt.SetInitTabCount( nTabCount );
diff --git a/sc/source/ui/optdlg/tpformula.cxx b/sc/source/ui/optdlg/tpformula.cxx
index 800ab6234928..37cd3d62d57b 100644
--- a/sc/source/ui/optdlg/tpformula.cxx
+++ b/sc/source/ui/optdlg/tpformula.cxx
@@ -115,8 +115,8 @@ void ScTpFormulaOptions::OnFocusSeparatorInput(Edit* pEdit)
return;
// Make sure the entire text is selected.
- xub_StrLen nLen = pEdit->GetText().Len();
- Selection aSel(0, nLen);
+ sal_Int32 nLen = pEdit->GetText().getLength();
+ Selection aSel(0, (sal_uInt16)nLen);
pEdit->SetSelection(aSel);
maOldSepValue = pEdit->GetText();
}
diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx
index 95c9e760de47..e6b01070b393 100644
--- a/sc/source/ui/optdlg/tpusrlst.cxx
+++ b/sc/source/ui/optdlg/tpusrlst.cxx
@@ -744,7 +744,7 @@ IMPL_LINK( ScTpUserLists, EdEntriesModHdl, MultiLineEdit*, pEd )
aEdCopyFrom .Disable();
}
- if ( aEdEntries.GetText().Len() > 0 )
+ if ( !aEdEntries.GetText().isEmpty() )
{
if ( !bCancelMode && !bModifyMode )
{
diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx
index cb7b49c787ce..f36e4a6f56e7 100644
--- a/sc/source/ui/optdlg/tpview.cxx
+++ b/sc/source/ui/optdlg/tpview.cxx
@@ -463,7 +463,7 @@ sal_Bool ScTpLayoutOptions::FillItemSet( SfxItemSet& rCoreSet )
bRet = sal_True;
}
- if(aTabMF.GetText() != aTabMF.GetSavedValue())
+ if(aTabMF.GetText() != OUString(aTabMF.GetSavedValue()))
{
rCoreSet.Put(SfxUInt16Item(SID_ATTR_DEFTABSTOP,
sal::static_int_cast<sal_uInt16>( aTabMF.Denormalize(aTabMF.GetValue(FUNIT_TWIP)) )));
diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx
index f2b0f4910a7d..cc1b78b4c5ed 100644
--- a/sc/source/ui/pagedlg/areasdlg.cxx
+++ b/sc/source/ui/pagedlg/areasdlg.cxx
@@ -623,7 +623,7 @@ IMPL_LINK( ScPrintAreasDlg, Impl_SelectHdl, ListBox*, pLb )
// fill edit field according to list box selection
if( (nSelPos == 0) || (nSelPos == nAllSheetPos) )
pEd->SetText( EMPTY_STRING );
- else if( nSelPos == nUserDefPos && !pLb->IsTravelSelect() && pEd->GetText().Len() == 0 )
+ else if( nSelPos == nUserDefPos && !pLb->IsTravelSelect() && pEd->GetText().isEmpty())
pLb->SelectEntryPos( 0 );
else if( nSelPos >= nFirstCustomPos )
pEd->SetText( *static_cast< String* >( pLb->GetEntryData( nSelPos ) ) );
diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx
index d2ee03d9e596..8e13cdeb4421 100644
--- a/sc/source/ui/pagedlg/tptable.cxx
+++ b/sc/source/ui/pagedlg/tptable.cxx
@@ -37,7 +37,7 @@
void EmptyNumericField::Modify()
{
- if( GetText().Len() )
+ if( !GetText().isEmpty() )
NumericField::Modify();
else
SetEmptyFieldValue();
@@ -335,7 +335,7 @@ sal_Bool ScTablePage::FillItemSet( SfxItemSet& rCoreSet )
if ( WAS_DEFAULT(nWhichPageNo,rOldSet)
&& ( (!bUseValue && bUseValue == aBtnPageNo.GetSavedValue())
|| ( bUseValue && bUseValue == aBtnPageNo.GetSavedValue()
- && aEdPageNo.GetText() == aEdPageNo.GetSavedValue() ) ) )
+ && aEdPageNo.GetText() == OUString(aEdPageNo.GetSavedValue()) ) ) )
{
rCoreSet.ClearItem( nWhichPageNo );
}
@@ -513,7 +513,7 @@ static sal_Bool lcl_PutScaleItem( sal_uInt16 nWhich,
{
sal_Bool bIsSel = (rListBox.GetSelectEntryPos() == nLBEntry);
sal_Bool bDataChanged = (rListBox.GetSavedValue() != nLBEntry) ||
- (rEd.GetSavedValue() != rEd.GetText()) ||
+ (OUString(rEd.GetSavedValue()) != rEd.GetText()) ||
!WAS_DEFAULT( nWhich, rOldSet );
if( bDataChanged )
@@ -537,8 +537,8 @@ static sal_Bool lcl_PutScaleItem2( sal_uInt16 nWhich,
sal_uInt16 nValue2 = (sal_uInt16)rEd2.GetValue();
sal_Bool bIsSel = (rListBox.GetSelectEntryPos() == nLBEntry);
sal_Bool bDataChanged = (rListBox.GetSavedValue() != nLBEntry) ||
- (rEd1.GetSavedValue() != rEd1.GetText()) ||
- (rEd2.GetSavedValue() != rEd2.GetText()) ||
+ (OUString(rEd1.GetSavedValue()) != rEd1.GetText()) ||
+ (OUString(rEd2.GetSavedValue()) != rEd2.GetText()) ||
!WAS_DEFAULT( nWhich, rOldSet );
if( bDataChanged )
generated by cgit (git 2.34.1) at 2025-02-27 16:05:26 +0000