summaryrefslogtreecommitdiff
path: root/embeddedobj
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 /embeddedobj
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 'embeddedobj')
-rw-r--r--embeddedobj/source/commonembedding/persistence.cxx12
-rw-r--r--embeddedobj/source/general/dummyobject.cxx2
-rw-r--r--embeddedobj/source/msole/oleembed.cxx2
-rw-r--r--embeddedobj/source/msole/olepersist.cxx10
-rw-r--r--embeddedobj/source/msole/ownview.cxx4
5 files changed, 15 insertions, 15 deletions
diff --git a/embeddedobj/source/commonembedding/persistence.cxx b/embeddedobj/source/commonembedding/persistence.cxx
index e67cc77bd14a..e3f615df4e01 100644
--- a/embeddedobj/source/commonembedding/persistence.cxx
+++ b/embeddedobj/source/commonembedding/persistence.cxx
@@ -1447,7 +1447,7 @@ void SAL_CALL OCommonEmbeddedObject::saveCompleted( sal_Bool bUseNew )
{
if ( bUseNew )
m_aEntryName = m_aNewEntryName;
- m_aNewEntryName = OUString();
+ m_aNewEntryName.clear();
return;
}
@@ -1489,7 +1489,7 @@ void SAL_CALL OCommonEmbeddedObject::saveCompleted( sal_Bool bUseNew )
m_xNewObjectStorage = uno::Reference< embed::XStorage >();
m_xNewParentStorage = uno::Reference< embed::XStorage >();
- m_aNewEntryName = OUString();
+ m_aNewEntryName.clear();
m_aNewDocMediaDescriptor.realloc( 0 );
m_bWaitSaveCompleted = false;
@@ -1714,12 +1714,12 @@ void SAL_CALL OCommonEmbeddedObject::reload(
{
// the new URL
lArguments[nInd].Value >>= m_aLinkURL;
- m_aLinkFilterName = OUString();
+ m_aLinkFilterName.clear();
}
else if ( lArguments[nInd].Name == "FilterName" )
{
lArguments[nInd].Value >>= aNewLinkFilter;
- m_aLinkFilterName = OUString();
+ m_aLinkFilterName.clear();
}
}
@@ -1886,8 +1886,8 @@ void SAL_CALL OCommonEmbeddedObject::breakLink( const uno::Reference< embed::XSt
m_pDocHolder->Show();
m_bIsLink = false;
- m_aLinkFilterName = OUString();
- m_aLinkURL = OUString();
+ m_aLinkFilterName.clear();
+ m_aLinkURL.clear();
}
diff --git a/embeddedobj/source/general/dummyobject.cxx b/embeddedobj/source/general/dummyobject.cxx
index 236f12e16b41..3f6c4167eca3 100644
--- a/embeddedobj/source/general/dummyobject.cxx
+++ b/embeddedobj/source/general/dummyobject.cxx
@@ -447,7 +447,7 @@ void SAL_CALL ODummyEmbeddedObject::saveCompleted( sal_Bool bUseNew )
}
m_xNewParentStorage = uno::Reference< embed::XStorage >();
- m_aNewEntryName = OUString();
+ m_aNewEntryName.clear();
m_bWaitSaveCompleted = false;
}
diff --git a/embeddedobj/source/msole/oleembed.cxx b/embeddedobj/source/msole/oleembed.cxx
index 81511826ffaf..7bce91d12cb8 100644
--- a/embeddedobj/source/msole/oleembed.cxx
+++ b/embeddedobj/source/msole/oleembed.cxx
@@ -219,7 +219,7 @@ uno::Reference< embed::XStorage > OleEmbeddedObject::CreateTemporarySubstorage(
if ( !xResult.is() )
{
- o_aStorageName = OUString();
+ o_aStorageName.clear();
throw uno::RuntimeException();
}
diff --git a/embeddedobj/source/msole/olepersist.cxx b/embeddedobj/source/msole/olepersist.cxx
index 04224514ced4..7b9fe7827865 100644
--- a/embeddedobj/source/msole/olepersist.cxx
+++ b/embeddedobj/source/msole/olepersist.cxx
@@ -147,7 +147,7 @@ OUString GetNewFilledTempFile_Impl( const uno::Reference< io::XInputStream >& xI
catch( const uno::Exception& )
{
KillFile_Impl( aResult, xFactory );
- aResult = OUString();
+ aResult.clear();
}
}
@@ -726,7 +726,7 @@ uno::Reference< io::XStream > OleEmbeddedObject::TryToRetrieveCachedVisualRepres
{
// this is the own stream, so the temporary URL must be cleaned if it exists
KillFile_Impl( m_aTempURL, m_xFactory );
- m_aTempURL = OUString();
+ m_aTempURL.clear();
}
#ifdef WNT
@@ -1613,7 +1613,7 @@ void SAL_CALL OleEmbeddedObject::saveCompleted( sal_Bool bUseNew )
m_xNewObjectStream = uno::Reference< io::XStream >();
m_xNewParentStorage = uno::Reference< embed::XStorage >();
- m_aNewEntryName = OUString();
+ m_aNewEntryName.clear();
m_bWaitSaveCompleted = false;
m_bNewVisReplInStream = false;
m_xNewCachedVisRepl = uno::Reference< io::XStream >();
@@ -1964,7 +1964,7 @@ void SAL_CALL OleEmbeddedObject::breakLink( const uno::Reference< embed::XStorag
// disconnect the old temporary URL
OUString aOldTempURL = m_aTempURL;
- m_aTempURL = OUString();
+ m_aTempURL.clear();
OleComponent* pNewOleComponent = new OleComponent( m_xFactory, this );
try {
@@ -2017,7 +2017,7 @@ void SAL_CALL OleEmbeddedObject::breakLink( const uno::Reference< embed::XStorag
}
m_bIsLink = sal_False;
- m_aLinkURL = OUString();
+ m_aLinkURL.clear();
}
else
#endif
diff --git a/embeddedobj/source/msole/ownview.cxx b/embeddedobj/source/msole/ownview.cxx
index b0ffa3e7227c..277b0c43e578 100644
--- a/embeddedobj/source/msole/ownview.cxx
+++ b/embeddedobj/source/msole/ownview.cxx
@@ -442,7 +442,7 @@ void OwnView_Impl::CreateNative()
if ( !bOk && !m_aNativeTempURL.isEmpty() )
{
KillFile_Impl( m_aNativeTempURL, m_xFactory );
- m_aNativeTempURL = OUString();
+ m_aNativeTempURL.clear();
}
}
@@ -453,7 +453,7 @@ void OwnView_Impl::CreateNative()
if ( !bOk && !m_aNativeTempURL.isEmpty() )
{
KillFile_Impl( m_aNativeTempURL, m_xFactory );
- m_aNativeTempURL = OUString();
+ m_aNativeTempURL.clear();
}
}
}