summaryrefslogtreecommitdiff
path: root/forms/source/component
diff options
context:
space:
mode:
authorBrij Mohan Lal Srivastava <contactbrijmohan@gmail.com>2014-11-12 14:24:10 +0530
committerStephan Bergmann <sbergman@redhat.com>2014-11-14 09:20:38 +0100
commitd32be3ace8c8fd430bbecdf69f88a116b0ee91d1 (patch)
treeb373c084cb124434e0498867b24bc7bb333155dd /forms/source/component
parentf5e86ebc097f0f8bc5b282511149cb026710ecde (diff)
fdo#86023 - O[U]String needs a 'clear' method
Added clear() method to OString and OUString class, Updated appropriate call-sites. Change-Id: I0ba97fa6dc7af3e31b605953089a4e8e9c3e61ac Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'forms/source/component')
-rw-r--r--forms/source/component/Button.cxx4
-rw-r--r--forms/source/component/ComboBox.cxx6
-rw-r--r--forms/source/component/File.cxx2
-rw-r--r--forms/source/component/Hidden.cxx2
-rw-r--r--forms/source/component/ImageButton.cxx4
-rw-r--r--forms/source/component/ImageControl.cxx2
-rw-r--r--forms/source/component/imgprod.cxx4
7 files changed, 12 insertions, 12 deletions
diff --git a/forms/source/component/Button.cxx b/forms/source/component/Button.cxx
index 4c6adca2a7db..2bb0ea6b8187 100644
--- a/forms/source/component/Button.cxx
+++ b/forms/source/component/Button.cxx
@@ -212,8 +212,8 @@ void OButtonModel::read(const Reference<XObjectInputStream>& _rxInStream) throw
default:
OSL_FAIL("OButtonModel::read : unknown version !");
m_eButtonType = FormButtonType_PUSH;
- m_sTargetURL = OUString();
- m_sTargetFrame = OUString();
+ m_sTargetURL.clear();
+ m_sTargetFrame.clear();
break;
}
}
diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx
index 8e3bfff3861d..76bc4cfee15b 100644
--- a/forms/source/component/ComboBox.cxx
+++ b/forms/source/component/ComboBox.cxx
@@ -387,9 +387,9 @@ void SAL_CALL OComboBoxModel::read(const Reference<css::io::XObjectInputStream>&
if (nVersion > 0x0006)
{
OSL_FAIL("OComboBoxModel::read : invalid (means unknown) version !");
- m_aListSource = OUString();
+ m_aListSource.clear();
m_aBoundColumn <<= (sal_Int16)0;
- m_aDefaultText = OUString();
+ m_aDefaultText.clear();
m_eListSourceType = ListSourceType_TABLE;
m_bEmptyIsNull = true;
defaultCommonProperties();
@@ -407,7 +407,7 @@ void SAL_CALL OComboBoxModel::read(const Reference<css::io::XObjectInputStream>&
}
else // nVersion == 4
{
- m_aListSource = OUString();
+ m_aListSource.clear();
StringSequence aListSource;
_rxInStream >> aListSource;
const OUString* pToken = aListSource.getConstArray();
diff --git a/forms/source/component/File.cxx b/forms/source/component/File.cxx
index 5274b1cf35d8..34e437e0c57c 100644
--- a/forms/source/component/File.cxx
+++ b/forms/source/component/File.cxx
@@ -232,7 +232,7 @@ void OFileControlModel::read(const Reference<css::io::XObjectInputStream>& _rxIn
break;
default:
OSL_FAIL("OFileControlModel::read : unknown version !");
- m_sDefaultValue = OUString();
+ m_sDefaultValue.clear();
}
// Display default values after read
diff --git a/forms/source/component/Hidden.cxx b/forms/source/component/Hidden.cxx
index deb58cef4646..5b8437084210 100644
--- a/forms/source/component/Hidden.cxx
+++ b/forms/source/component/Hidden.cxx
@@ -164,7 +164,7 @@ void SAL_CALL OHiddenModel::read(const Reference<XObjectInputStream>& _rxInStrea
{
case 1 : { OUString sDummy; _rxInStream >> sDummy; _rxInStream >> m_sHiddenValue; } break;
case 2 : _rxInStream >> m_sHiddenValue; break;
- default : OSL_FAIL("OHiddenModel::read : unknown version !"); m_sHiddenValue = OUString();
+ default : OSL_FAIL("OHiddenModel::read : unknown version !"); m_sHiddenValue.clear();
}
OControlModel::read(_rxInStream);
}
diff --git a/forms/source/component/ImageButton.cxx b/forms/source/component/ImageButton.cxx
index 1802437dfae0..936c69194f7e 100644
--- a/forms/source/component/ImageButton.cxx
+++ b/forms/source/component/ImageButton.cxx
@@ -138,8 +138,8 @@ void OImageButtonModel::read(const Reference<XObjectInputStream>& _rxInStream) t
default :
OSL_FAIL("OImageButtonModel::read : unknown version !");
m_eButtonType = FormButtonType_PUSH;
- m_sTargetURL = OUString();
- m_sTargetFrame = OUString();
+ m_sTargetURL.clear();
+ m_sTargetFrame.clear();
break;
}
}
diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx
index 22d2c5aedf4d..f94b32e4cabf 100644
--- a/forms/source/component/ImageControl.cxx
+++ b/forms/source/component/ImageControl.cxx
@@ -550,7 +550,7 @@ void OImageControlModel::onDisconnectedDbColumn()
{
OBoundControlModel::onDisconnectedDbColumn();
- m_sDocumentURL = OUString();
+ m_sDocumentURL.clear();
}
diff --git a/forms/source/component/imgprod.cxx b/forms/source/component/imgprod.cxx
index b692155d0026..948e8c8220d3 100644
--- a/forms/source/component/imgprod.cxx
+++ b/forms/source/component/imgprod.cxx
@@ -244,7 +244,7 @@ void ImageProducer::SetImage( const OUString& rPath )
void ImageProducer::SetImage( SvStream& rStm )
{
- maURL = OUString();
+ maURL.clear();
mpGraphic->Clear();
mbConsInit = false;
@@ -256,7 +256,7 @@ void ImageProducer::SetImage( SvStream& rStm )
void ImageProducer::setImage( ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > & rInputStmRef )
{
- maURL = OUString();
+ maURL.clear();
mpGraphic->Clear();
mbConsInit = false;
delete mpStm;