summaryrefslogtreecommitdiff
path: root/cui/source/options
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-01-21 21:42:46 +0100
committerLuboš Luňák <l.lunak@suse.cz>2013-01-22 11:26:39 +0000
commitfea25896a87aa5826eb243069d34aae7d0333a4c (patch)
treea41c644ca2efcdc4814d53ee1bd7ae2b9c7b578f /cui/source/options
parentc605119a8a69a04e3dcc958d1ac2796d4bb04a9b (diff)
tools/string.hxx: add operator==/!= for OUString/String
This has the disadvantage that it makes comparisons involving fast OUString concatenation via operator+ ambiguous, as can be seen in scriptdlg.cxx, but it allows comparing String and OUString wihout explicit conversion, which is nice for incrementally converting code. Change-Id: Ibfc728bdb161a01e0f8311915c97bcbba8b58c0b Reviewed-on: https://gerrit.libreoffice.org/1803 Reviewed-by: Luboš Luňák <l.lunak@suse.cz> Tested-by: Luboš Luňák <l.lunak@suse.cz>
Diffstat (limited to 'cui/source/options')
-rw-r--r--cui/source/options/opthtml.cxx14
1 files changed, 7 insertions, 7 deletions
diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx
index 49a57fcba5dd..999303046d8c 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(OUString(aSize1NF.GetSavedValue()) != aSize1NF.GetText())
+ if(aSize1NF.GetSavedValue() != aSize1NF.GetText())
rHtmlOpt.SetFontSize(0, (sal_uInt16)aSize1NF.GetValue());
- if(OUString(aSize2NF.GetSavedValue()) != aSize2NF.GetText())
+ if(aSize2NF.GetSavedValue() != aSize2NF.GetText())
rHtmlOpt.SetFontSize(1, (sal_uInt16)aSize2NF.GetValue());
- if(OUString(aSize3NF.GetSavedValue()) != aSize3NF.GetText())
+ if(aSize3NF.GetSavedValue() != aSize3NF.GetText())
rHtmlOpt.SetFontSize(2, (sal_uInt16)aSize3NF.GetValue());
- if(OUString(aSize4NF.GetSavedValue()) != aSize4NF.GetText())
+ if(aSize4NF.GetSavedValue() != aSize4NF.GetText())
rHtmlOpt.SetFontSize(3, (sal_uInt16)aSize4NF.GetValue());
- if(OUString(aSize5NF.GetSavedValue()) != aSize5NF.GetText())
+ if(aSize5NF.GetSavedValue() != aSize5NF.GetText())
rHtmlOpt.SetFontSize(4, (sal_uInt16)aSize5NF.GetValue());
- if(OUString(aSize6NF.GetSavedValue()) != aSize6NF.GetText())
+ if(aSize6NF.GetSavedValue() != aSize6NF.GetText())
rHtmlOpt.SetFontSize(5, (sal_uInt16)aSize6NF.GetValue());
- if(OUString(aSize7NF.GetSavedValue()) != aSize7NF.GetText())
+ if(aSize7NF.GetSavedValue() != aSize7NF.GetText())
rHtmlOpt.SetFontSize(6, (sal_uInt16)aSize7NF.GetValue());
if(aNumbersEnglishUSCB.IsChecked() != aNumbersEnglishUSCB.GetSavedValue())