summaryrefslogtreecommitdiff
path: root/cui/source/options
diff options
context:
space:
mode:
authorChr. Rossmanith <ChrRossmanith@gmx.de>2013-01-24 15:12:43 +0100
committerChr. Rossmanith <ChrRossmanith@gmx.de>2013-01-24 22:26:40 +0100
commit2dab78ee2199d70b951aee86b80aab4374cc7c4f (patch)
tree40e1d3652242d7edd900b5d3f73002e77954e92f /cui/source/options
parent0057803c228e10bc1247ebb35c28cfc9ffc4cc5c (diff)
Change GetSavedValue() to return OUString
removed temporarily added OUString(...GetSavedValue()...) constructs again Change-Id: I11477654d217a5ae127c1ef1b19cbff56ed052a6
Diffstat (limited to 'cui/source/options')
-rw-r--r--cui/source/options/optgdlg.cxx4
-rw-r--r--cui/source/options/optgenrl.cxx2
-rw-r--r--cui/source/options/optinet2.cxx37
-rw-r--r--cui/source/options/optmemory.cxx2
-rw-r--r--cui/source/options/optsave.cxx2
5 files changed, 20 insertions, 27 deletions
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index cca9402c5ded..a41c945e0aee 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -894,7 +894,7 @@ sal_Bool OfaViewTabPage::FillItemSet( SfxItemSet& )
bAppearanceChanged = sal_True;
}
- if ( aAAPointLimit.GetValue() != aAAPointLimit.GetSavedValue().ToInt32() )
+ if ( aAAPointLimit.GetValue() != aAAPointLimit.GetSavedValue().toInt32() )
{
pAppearanceCfg->SetFontAntialiasingMinPixelHeight( aAAPointLimit.GetValue() );
bAppearanceChanged = sal_True;
@@ -1478,7 +1478,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() != OUString(aDatePatternsED.GetSavedValue()))
+ if (aDatePatternsED.GetText() != 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 21278cf8b4d0..5a1438b2073d 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 (OUString(vFields[i]->aEdit.GetSavedValue()) != vFields[i]->aEdit.GetText())
+ if (vFields[i]->aEdit.GetSavedValue() != vFields[i]->aEdit.GetText())
return true;
return false;
}
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 9bccdd0ddd55..c21db1da76fb 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -414,52 +414,45 @@ sal_Bool SvxProxyTabPage::FillItemSet(SfxItemSet& )
bModified = sal_True;
}
- if(OUString(aHttpProxyED.GetSavedValue()) != aHttpProxyED.GetText())
+ if(aHttpProxyED.GetSavedValue() != aHttpProxyED.GetText())
{
- xPropertySet->setPropertyValue( aHttpProxyPN,
- makeAny(rtl::OUString(aHttpProxyED.GetText())));
+ xPropertySet->setPropertyValue( aHttpProxyPN, makeAny(aHttpProxyED.GetText()));
bModified = sal_True;
}
- if ( OUString(aHttpPortED.GetSavedValue()) != aHttpPortED.GetText() )
+ if ( aHttpPortED.GetSavedValue() != aHttpPortED.GetText() )
{
- xPropertySet->setPropertyValue( aHttpPortPN,
- makeAny(aHttpPortED.GetText().toInt32()));
+ xPropertySet->setPropertyValue( aHttpPortPN, makeAny(aHttpPortED.GetText().toInt32()));
bModified = sal_True;
}
- if(OUString(aHttpsProxyED.GetSavedValue()) != aHttpsProxyED.GetText())
+ if( aHttpsProxyED.GetSavedValue() != aHttpsProxyED.GetText() )
{
- xPropertySet->setPropertyValue( aHttpsProxyPN,
- makeAny(rtl::OUString(aHttpsProxyED.GetText())));
+ xPropertySet->setPropertyValue( aHttpsProxyPN, makeAny(aHttpsProxyED.GetText()) );
bModified = sal_True;
}
- if ( OUString(aHttpsPortED.GetSavedValue()) != aHttpsPortED.GetText() )
+ if ( aHttpsPortED.GetSavedValue() != aHttpsPortED.GetText() )
{
- xPropertySet->setPropertyValue( aHttpsPortPN,
- makeAny(aHttpsPortED.GetText().toInt32()));
+ xPropertySet->setPropertyValue( aHttpsPortPN, makeAny(aHttpsPortED.GetText().toInt32()) );
bModified = sal_True;
}
- if(OUString(aFtpProxyED.GetSavedValue()) != aFtpProxyED.GetText())
+ if( aFtpProxyED.GetSavedValue() != aFtpProxyED.GetText())
{
- xPropertySet->setPropertyValue( aFtpProxyPN,
- makeAny( rtl::OUString(aFtpProxyED.GetText())));
+ xPropertySet->setPropertyValue( aFtpProxyPN, makeAny(aFtpProxyED.GetText()) );
bModified = sal_True;
}
- if ( OUString(aFtpPortED.GetSavedValue()) != aFtpPortED.GetText() )
+ if ( aFtpPortED.GetSavedValue() != aFtpPortED.GetText() )
{
- xPropertySet->setPropertyValue( aFtpPortPN,
- makeAny(aFtpPortED.GetText().toInt32()));
+ xPropertySet->setPropertyValue( aFtpPortPN, makeAny(aFtpPortED.GetText().toInt32()));
bModified = sal_True;
}
- if ( OUString(aNoProxyForED.GetSavedValue()) != aNoProxyForED.GetText() )
+ if ( aNoProxyForED.GetSavedValue() != aNoProxyForED.GetText() )
{
- xPropertySet->setPropertyValue( aNoProxyDescPN,
- makeAny( rtl::OUString(aNoProxyForED.GetText())));
+ xPropertySet->setPropertyValue( aNoProxyDescPN, makeAny( aNoProxyForED.GetText()));
bModified = sal_True;
}
@@ -1386,7 +1379,7 @@ SfxTabPage* SvxEMailTabPage::Create( Window* pParent, const SfxItemSet& rAttrSe
sal_Bool SvxEMailTabPage::FillItemSet( SfxItemSet& )
{
sal_Bool bMailModified = sal_False;
- if(!pImpl->aMailConfig.bROProgram && OUString(aMailerURLED.GetSavedValue()) != aMailerURLED.GetText())
+ if(!pImpl->aMailConfig.bROProgram && 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 48e120fe7159..e5c43f79cf11 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() != OUString(aUndoEdit.GetSavedValue()) )
+ if ( aUndoEdit.GetText() != 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 14d3a193dbcd..918a11fc1492 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() != OUString(aAutoSaveEdit.GetSavedValue()) )
+ if ( aAutoSaveEdit.GetText() != aAutoSaveEdit.GetSavedValue() )
{
rSet.Put( SfxUInt16Item( GetWhich( SID_ATTR_AUTOSAVEMINUTE ),
(sal_uInt16)aAutoSaveEdit.GetValue() ) );