mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fdo#86023 - O[U]String needs a 'clear' method

Browse Source 
Added clear() method to OString and OUString class, Updated appropriate call-sites.

Change-Id: I0ba97fa6dc7af3e31b605953089a4e8e9c3e61ac
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Brij Mohan Lal Srivastava 2014-11-12 14:24:10 +05:30 committed by Stephan Bergmann
parent f5e86ebc09
commit d32be3ace8
357 changed files with 714 additions and 667 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
accessibility/source/extended/accessibletabbarpage.cxx
View File

@ -242,7 +242,7 @@ namespace accessibility
void AccessibleTabBarPage::disposing()
{
AccessibleTabBarBase::disposing();
m_sPageText = OUString();
m_sPageText.clear();
}

4
accessibility/source/standard/accessiblemenuitemcomponent.cxx
View File

@ -299,8 +299,8 @@ void SAL_CALL OAccessibleMenuItemComponent::disposing()
OAccessibleMenuBaseComponent::disposing();
m_pParent = NULL;
m_sAccessibleName = OUString();
m_sItemText = OUString();
m_sAccessibleName.clear();
m_sItemText.clear();
}

2
accessibility/source/standard/vclxaccessiblelistitem.cxx
View File

@ -183,7 +183,7 @@ void SAL_CALL VCLXAccessibleListItem::disposing()
::osl::MutexGuard aGuard( m_aMutex );
VCLXAccessibleListItem_BASE::disposing();
m_sEntryText = OUString();
m_sEntryText.clear();
m_pListBoxHelper = NULL;
m_xParent = NULL;
m_xParentContext = NULL;

4
accessibility/source/standard/vclxaccessiblestatusbaritem.cxx
View File

@ -221,8 +221,8 @@ void VCLXAccessibleStatusBarItem::disposing()
AccessibleTextHelper_BASE::disposing();
m_pStatusBar = NULL;
m_sItemName = OUString();
m_sItemText = OUString();
m_sItemName.clear();
m_sItemText.clear();
}

2
accessibility/source/standard/vclxaccessibletabpage.cxx
View File

@ -254,7 +254,7 @@ void VCLXAccessibleTabPage::disposing()
AccessibleTextHelper_BASE::disposing();
m_pTabControl = NULL;
m_sPageText = OUString();
m_sPageText.clear();
}

2
accessibility/source/standard/vclxaccessibletextcomponent.cxx
View File

@ -125,7 +125,7 @@ void VCLXAccessibleTextComponent::disposing()
{
VCLXAccessibleComponent::disposing();
m_sText = OUString();
m_sText.clear();
}

2
avmedia/source/framework/mediaitem.cxx
View File

@ -133,7 +133,7 @@ bool MediaItem::GetPresentation( SfxItemPresentation,
OUString& rText,
const IntlWrapper * ) const
{
rText = OUString();
rText.clear();
return false;
}

4
avmedia/source/framework/modeltools.cxx
View File

@ -48,7 +48,7 @@ namespace avmedia {
static void lcl_UnzipKmz(const OUString& rSourceURL, const OUString& rOutputFolderURL, OUString& o_rDaeFileURL)
{
o_rDaeFileURL = OUString();
o_rDaeFileURL.clear();
uno::Reference<packages::zip::XZipFileAccess2> xNameAccess =
packages::zip::ZipFileAccess::createWithURL(comphelper::getProcessComponentContext(), rSourceURL);
uno::Sequence< OUString > aNames = xNameAccess->getElementNames();
@ -70,7 +70,7 @@ static void lcl_UnzipKmz(const OUString& rSourceURL, const OUString& rOutputFold
bool KmzDae2Gltf(const OUString& rSourceURL, OUString& o_rOutput)
{
o_rOutput = OUString();
o_rOutput.clear();
const bool bIsDAE = rSourceURL.endsWithIgnoreAsciiCase(".dae");
const bool bIsKMZ = rSourceURL.endsWithIgnoreAsciiCase(".kmz");
if( !bIsDAE && !bIsKMZ )

2
avmedia/source/gstreamer/gstplayer.cxx
View File

@ -401,7 +401,7 @@ bool Player::create( const OUString& rURL )
if( bRet )
maURL = rURL;
else
maURL = OUString();
maURL.clear();
return bRet;
}

2
avmedia/source/viewer/mediawindow.cxx
View File

@ -318,7 +318,7 @@ bool MediaWindow::executeMediaURLDialog(vcl::Window* /* pParent */,
}
}
else if( !rURL.isEmpty() )
rURL = OUString();
rURL.clear();
return !rURL.isEmpty();
}

2
avmedia/source/viewer/mediawindow_impl.cxx
View File

@ -299,7 +299,7 @@ void MediaWindowImpl::setURL( const OUString& rURL,
}
mxPlayer.clear();
mTempFileURL = OUString();
mTempFileURL.clear();
if (!rTempURL.isEmpty())
{

2
avmedia/source/win/framegrabber.cxx
View File

@ -96,7 +96,7 @@ bool FrameGrabber::create( const OUString& rURL )
pDet = NULL;
}
else
maURL = OUString();
maURL.clear();
return !maURL.isEmpty();
}

2
avmedia/source/win/player.cxx
View File

@ -189,7 +189,7 @@ bool Player::create( const OUString& rURL )
if( bRet )
maURL = rURL;
else
maURL = OUString();
maURL.clear();
return bRet;
}

2
basctl/source/basicide/scriptdocument.cxx
View File

@ -681,7 +681,7 @@ namespace basctl
bool ScriptDocument::Impl::createModule( const OUString& _rLibName, const OUString& _rModName, bool _bCreateMain, OUString& _out_rNewModuleCode ) const
{
_out_rNewModuleCode = OUString();
_out_rNewModuleCode.clear();
try
{
Reference< XNameContainer > xLib( getLibrary( E_SCRIPTS, _rLibName, true ) );

2
basic/source/classes/errobject.cxx
View File

@ -137,7 +137,7 @@ ErrObject::setSource( const OUString& _source ) throw (uno::RuntimeException, st
void SAL_CALL
ErrObject::Clear( ) throw (uno::RuntimeException, std::exception)
{
m_sHelpFile = OUString();
m_sHelpFile.clear();
m_sSource = m_sHelpFile;
m_sDescription = m_sSource;
m_nNumber = 0;

2
basic/source/classes/sbxmod.cxx
View File

@ -1833,7 +1833,7 @@ bool SbModule::StoreBinaryData( SvStream& rStrm, sal_uInt16 nVer )
bRet = SbxObject::StoreData( rStrm );
if( bRet )
{
pImage->aOUSource = OUString();
(pImage->aOUSource).clear();
pImage->aComment = aComment;
pImage->aName = GetName();

6
basic/source/runtime/iosys.cxx
View File

@ -738,7 +738,7 @@ SbError SbiStream::Write( const OString& rBuf, sal_uInt16 n )
aLine = aLine.copy(0, nLineLen);
}
WriteLines(*pStrm, aLine);
aLine = OString();
aLine.clear();
}
}
else
@ -857,7 +857,7 @@ void SbiIoSystem::Shutdown()
MessBox( GetpApp()->GetDefDialogParent(), WinBits( WB_OK ), OUString(), aOut ).Execute();
#endif
}
aOut = OUString();
aOut.clear();
}
@ -965,7 +965,7 @@ void SbiIoSystem::ReadCon(OString& rIn)
{
nError = SbERR_USER_ABORT;
}
aPrompt = OString();
aPrompt.clear();
}
// output of a MessageBox, if theres a CR in the console-buffer

2
bridges/source/cpp_uno/shared/vtablefactory.cxx
View File

@ -288,7 +288,7 @@ bool VtableFactory::createBlock(Block &block, sal_Int32 slotCount) const
freeBlock(block);
strDirectory = OUString();
strDirectory.clear();
}
if (!block.start || !block.exec || block.fd == -1)
{

2
chart2/source/controller/main/SelectionHelper.cxx
View File

@ -409,7 +409,7 @@ OUString SelectionHelper::getHitObjectCID(
//accept only named objects while searching for the object to select
if( !findNamedParent( pNewObj, aRet, true ) )
{
aRet = OUString();
aRet.clear();
}
OUString aPageCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, OUString() ) );//@todo read CID from model

4
chart2/source/tools/InternalDataProvider.cxx
View File

@ -542,7 +542,7 @@ InternalDataProvider::createDataSequenceFromArray( const OUString& rArrayStr, co
aElem = OUString(pElem, p-pElem);
aRawElems.push_back(aElem);
pElem = NULL;
aElem = OUString();
aElem.clear();
++p; // Skip '"'.
if (p == pEnd)
@ -560,7 +560,7 @@ InternalDataProvider::createDataSequenceFromArray( const OUString& rArrayStr, co
aElem = OUString(pElem, p-pElem);
aRawElems.push_back(aElem);
pElem = NULL;
aElem = OUString();
aElem.clear();
}
else if (!pElem)
pElem = p;

2
chart2/source/view/diagram/VDiagram.cxx
View File

@ -497,7 +497,7 @@ void VDiagram::createShapes_3d()
OUString aWallCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, OUString() ) );//@todo read CID from model
if( !bAddFloorAndWall )
aWallCID = OUString();
aWallCID.clear();
uno::Reference< drawing::XShapes > xWallGroup_Shapes( m_pShapeFactory->createGroup3D( xOuterGroup_Shapes, aWallCID ) );
CuboidPlanePosition eLeftWallPos( ThreeDHelper::getAutomaticCuboidPlanePositionForStandardLeftWall( uno::Reference< beans::XPropertySet >( m_xDiagram, uno::UNO_QUERY ) ) );

2
codemaker/source/codemaker/global.cxx
View File

@ -325,7 +325,7 @@ void FileStream::close()
{
osl_closeFile(m_file);
m_file = NULL;
m_name = OString();
m_name.clear();
}
}

2
codemaker/source/javamaker/javatype.cxx
View File

@ -308,7 +308,7 @@ SpecialType getFieldDescriptor(
if (needsSig) {
*signature = sig.makeStringAndClear();
} else {
*signature = OString();
signature->clear();
}
}
return specialType;

2
comphelper/qa/string/test_string.cxx
View File

@ -405,7 +405,7 @@ void TestString::testEqualsString()
CPPUNIT_ASSERT(!::comphelper::string::equals(aIn, 'B'));
aIn = OString("AA");
CPPUNIT_ASSERT(!::comphelper::string::equals(aIn, 'A'));
aIn = OString();
aIn.clear();
CPPUNIT_ASSERT(!::comphelper::string::equals(aIn, 'A'));
}

2
comphelper/source/misc/documentinfo.cxx
View File

@ -96,7 +96,7 @@ namespace comphelper {
// private:object as URL
sDocURL = _rxDocument->getURL();
if ( sDocURL.matchAsciiL( "private:", 8 ) )
sDocURL = OUString();
sDocURL.clear();
// 2. if the document is not saved, yet, check the frame title
if ( sDocURL.isEmpty() )

2
configmgr/source/valueparser.cxx
View File

@ -403,7 +403,7 @@ bool ValueParser::endElement() {
}
items_.clear();
}
separator_ = OString();
separator_.clear();
node_.clear();
}
break;

2
connectivity/source/commontools/CommonTools.cxx
View File

@ -233,7 +233,7 @@ OUString convertName2SQLName(const OUString& rName,const OUString& _rSpecials)
}
if ( !bValid )
aNewName = OUString();
aNewName.clear();
return aNewName;
}

2
connectivity/source/commontools/TTableHelper.cxx
View File

@ -369,7 +369,7 @@ void OTableHelper::refreshForeignKeys(TStringVector& _rNames)
// this must be outsid the "if" because we have to call in a right order
sCatalog = xRow->getString(1);
if ( xRow->wasNull() )
sCatalog = OUString();
sCatalog.clear();
aSchema = xRow->getString(2);
aName = xRow->getString(3);

2
connectivity/source/commontools/parameters.cxx
View File

@ -108,7 +108,7 @@ namespace dbtools
m_aParameterInformation.swap( aEmptyInfo );
m_aMasterFields.realloc( 0 );
m_aDetailFields.realloc( 0 );
m_sIdentifierQuoteString = OUString();
m_sIdentifierQuoteString.clear();
::std::vector< bool > aEmptyArray;
m_aParametersVisited.swap( aEmptyArray );
m_bUpToDate = false;

2
connectivity/source/commontools/predicateinput.cxx
View File

@ -267,7 +267,7 @@ namespace dbtools
getSeparatorChars( rParseContext.getPreferredLocale(), nDecSeparator, nThousandSeparator );
// translate it back into a string
sTransformedText = OUString();
sTransformedText.clear();
pParseNode->parseNodeToPredicateStr(
sTransformedText, m_xConnection, m_xFormatter, _rxField, OUString(),
rParseContext.getPreferredLocale(), (sal_Char)nDecSeparator, &rParseContext

2
connectivity/source/drivers/dbase/DIndex.cxx
View File

@ -405,7 +405,7 @@ void ODbaseIndex::createINFEntry()
aKeyName = aInfFile.GetKeyName(i);
if (bCase ? aKeyName.equals(aNewEntry) : aKeyName.equalsIgnoreAsciiCase(aNewEntry))
{
aNewEntry = OString();
aNewEntry.clear();
break;
}
}

2
connectivity/source/drivers/file/FResultSet.cxx
View File

@ -1574,7 +1574,7 @@ void OResultSet::setBoundedColumns(const OValueRefRow& _rRow,
if (xTableColumn.is())
xTableColumn->getPropertyValue(sName) >>= sTableColumnName;
else
sTableColumnName = OUString();
sTableColumnName.clear();
// look if we have such a select column
// TODO: would like to have a O(log n) search here ...

2
connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
View File

@ -417,7 +417,7 @@ sal_Bool PreparedStatement::execute( )
m_executedStatement = buf.makeStringAndClear();
m_lastResultset.clear();
m_lastTableInserted = OUString();
m_lastTableInserted.clear();
struct CommandData data;
data.refMutex = m_refMutex;

4
connectivity/source/drivers/postgresql/pq_statement.cxx
View File

@ -464,7 +464,7 @@ bool executePostgresCommand( const OString & cmd, struct CommandData *data )
ExecStatusType state = PQresultStatus( result );
*(data->pLastOidInserted) = 0;
*(data->pLastTableInserted) = OUString();
(data->pLastTableInserted)->clear();
*(data->pLastQuery) = cmd;
bool ret = false;
@ -858,7 +858,7 @@ sal_Bool Statement::execute( const OUString& sql )
OString cmd = OUStringToOString( sql, m_pSettings );
m_lastResultset.clear();
m_lastTableInserted = OUString();
m_lastTableInserted.clear();
struct CommandData data;
data.refMutex = m_refMutex;

8
connectivity/source/drivers/postgresql/pq_tools.cxx
View File

@ -552,7 +552,7 @@ void splitConcatenatedIdentifier( const OUString & source, OUString *first, OUSt
switch (vec.size())
{
case 1:
*first = OUString();
first->clear();
*second = OStringToOUString( vec[0], RTL_TEXTENCODING_UTF8 );
break;
case 3:
@ -808,7 +808,7 @@ OString extractSingleTableFromSelect( const OStringVector &vec )
RTL_CONSTASCII_STRINGPARAM( "(" ) ) == 0 )
{
// whoops, it is a function
ret = OString();
ret.clear();
}
else
{
@ -828,7 +828,7 @@ OString extractSingleTableFromSelect( const OStringVector &vec )
RTL_CONSTASCII_STRINGPARAM( "," ) ) == 0 )
{
// whoops, multiple tables are used
ret = OString();
ret.clear();
}
else
{
@ -842,7 +842,7 @@ OString extractSingleTableFromSelect( const OStringVector &vec )
strlen(forbiddenKeywords[i]) ) )
{
// whoops, it is a join
ret = OString();
ret.clear();
}
}
}

6
connectivity/source/sdbcx/VCatalog.cxx
View File

@ -189,13 +189,13 @@ OUString OCatalog::buildName(const Reference< XRow >& _xRow)
{
OUString sCatalog = _xRow->getString(1);
if ( _xRow->wasNull() )
sCatalog = OUString();
sCatalog.clear();
OUString sSchema = _xRow->getString(2);
if ( _xRow->wasNull() )
sSchema = OUString();
sSchema.clear();
OUString sTable = _xRow->getString(3);
if ( _xRow->wasNull() )
sTable = OUString();
sTable.clear();
OUString sComposedName(
::dbtools::composeTableName( m_xMetaData, sCatalog, sSchema, sTable, false, ::dbtools::eInDataManipulation ) );

2
cui/source/customize/acccfg.cxx
View File

@ -1090,7 +1090,7 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, RemoveHdl)
// remove function name from selected entry
sal_uInt16 nCol = m_pEntriesBox->TabCount() - 1;
m_pEntriesBox->SetEntryText( OUString(), nPos, nCol );
pEntry->m_sCommand = OUString();
(pEntry->m_sCommand).clear();
((Link &) m_pFunctionBox->GetSelectHdl()).Call( m_pFunctionBox );
return 0;

10
cui/source/customize/cfgutil.cxx
View File

@ -103,8 +103,8 @@ bool SfxStylesInfo_Impl::parseStyleCommand(SfxStyleInfo_Impl& aStyle)
if (!aStyle.sCommand.startsWith(CMDURL_STYLEPROT_ONLY))
return false;
aStyle.sFamily = OUString();
aStyle.sStyle = OUString();
aStyle.sFamily.clear();
aStyle.sStyle.clear();
sal_Int32 nCmdLen = aStyle.sCommand.getLength();
OUString sCmdArgs = aStyle.sCommand.copy(LEN_STYLEPROT, nCmdLen-LEN_STYLEPROT);
@ -148,14 +148,14 @@ void SfxStylesInfo_Impl::getLabel4Style(SfxStyleInfo_Impl& aStyle)
if (xStyleSet.is())
xStyleSet->getByName(aStyle.sStyle) >>= xStyle;
aStyle.sLabel = OUString();
aStyle.sLabel.clear();
if (xStyle.is())
xStyle->getPropertyValue(STYLEPROP_UINAME) >>= aStyle.sLabel;
}
catch(const css::uno::RuntimeException&)
{ throw; }
catch(const css::uno::Exception&)
{ aStyle.sLabel = OUString(); }
{ aStyle.sLabel.clear(); }
if (aStyle.sLabel.isEmpty())
{
@ -839,7 +839,7 @@ OUString SfxConfigGroupListBox::MapCommand2UIName(const OUString& sCommand)
catch(const css::uno::RuntimeException&)
{ throw; }
catch(css::uno::Exception&)
{ sUIName = OUString(); }
{ sUIName.clear(); }
// fallback for missing UINames !?
if (sUIName.isEmpty())

2
cui/source/customize/selector.cxx
View File

@ -422,7 +422,7 @@ void SvxConfigGroupListBox::Init(bool bShowSlots, const Reference< frame::XFrame
try{
aModuleId = xModuleManager->identify( m_xFrame );
}catch(const uno::Exception&)
{ aModuleId = OUString(); }
{ aModuleId.clear(); }
Reference< container::XNameAccess > const xNameAccess(
frame::theUICommandDescription::get(xContext) );

2
cui/source/dialogs/insdlg.cxx
View File

@ -421,7 +421,7 @@ static void Plugin_ImplFillCommandSequence( const OUString& aCommands, uno::Sequ
short SvInsertPlugInDialog::Execute()
{
short nRet = RET_OK;
m_aCommands = OUString();
m_aCommands.clear();
DBG_ASSERT( m_xStorage.is(), "No storage!");
if ( m_xStorage.is() && ( nRet = Dialog::Execute() ) == RET_OK )
{

2
cui/source/options/treeopt.cxx
View File

@ -226,7 +226,7 @@ static void deleteGroupNames()
{
sal_uInt16 nIndex = 0;
while ( ModuleMap[ nIndex ].m_pModule )
ModuleMap[ nIndex++ ].m_sGroupName = OUString();
ModuleMap[ nIndex++ ].m_sGroupName.clear();
}
static sal_uInt16 getGroupNodeId( const OUString& rModule )

8
dbaccess/source/core/api/SingleSelectQueryComposer.cxx
View File

@ -330,7 +330,7 @@ void SAL_CALL OSingleSelectQueryComposer::setQuery( const OUString& command ) th
// we have no "elementary" parts anymore (means filter/groupby/having/order clauses)
for ( SQLPart eLoopParts = Where; eLoopParts != SQLPartCount; incSQLPart( eLoopParts ) )
m_aElementaryParts[ eLoopParts ] = OUString();
m_aElementaryParts[ eLoopParts ].clear();
}
void SAL_CALL OSingleSelectQueryComposer::setCommand( const OUString& Command,sal_Int32 _nCommandType ) throw(SQLException, RuntimeException, std::exception)
@ -1754,21 +1754,21 @@ Sequence< Sequence< PropertyValue > > OSingleSelectQueryComposer::getStructuredC
pCondition = pWhereNode->getChild(1);
#if OSL_DEBUG_LEVEL > 0
sCondition = OUString();
sCondition.clear();
pCondition->parseNodeToStr( sCondition, m_xConnection );
#endif
OSQLParseNode::disjunctiveNormalForm(pCondition);
pCondition = pWhereNode->getChild(1);
#if OSL_DEBUG_LEVEL > 0
sCondition = OUString();
sCondition.clear();
pCondition->parseNodeToStr( sCondition, m_xConnection );
#endif
OSQLParseNode::absorptions(pCondition);
pCondition = pWhereNode->getChild(1);
#if OSL_DEBUG_LEVEL > 0
sCondition = OUString();
sCondition.clear();
pCondition->parseNodeToStr( sCondition, m_xConnection );
#endif
if ( pCondition )

6
dbaccess/source/core/dataaccess/datasource.cxx
View File

@ -917,7 +917,7 @@ void ODatabaseSource::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const
case PROPERTY_ID_USER:
rValue >>= m_pImpl->m_sUser;
// if the user name has changed, reset the password
m_pImpl->m_aPassword = OUString();
(m_pImpl->m_aPassword).clear();
break;
case PROPERTY_ID_PASSWORD:
rValue >>= m_pImpl->m_aPassword;
@ -1131,7 +1131,7 @@ Reference< XConnection > SAL_CALL ODatabaseSource::connectWithCompletion( const
m_pImpl->m_aPassword = pAuthenticate->getPassword();
bNewPasswordGiven = true;
}
m_pImpl->m_sFailedPassword = OUString();
(m_pImpl->m_sFailedPassword).clear();
}
try
@ -1146,7 +1146,7 @@ Reference< XConnection > SAL_CALL ODatabaseSource::connectWithCompletion( const
// assume that we had an authentication problem. Without this we may, after an unsuccessful connect, while
// the user gave us a password an the order to remember it, never allow an password input again (at least
// not without restarting the session)
m_pImpl->m_aPassword = OUString();
(m_pImpl->m_aPassword).clear();
}
throw;
}

2
dbaccess/source/core/recovery/settingsimport.cxx
View File

@ -69,7 +69,7 @@ namespace dbaccess
void SettingsImport::split( const OUString& i_rElementName, OUString& o_rNamespace, OUString& o_rLocalName )
{
o_rNamespace = OUString();
o_rNamespace.clear();
o_rLocalName = i_rElementName;
const sal_Int32 nSeparatorPos = i_rElementName.indexOf( ':' );
if ( nSeparatorPos > -1 )

2
dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx
View File

@ -59,7 +59,7 @@ OXMLFileBasedDatabase::OXMLFileBasedDatabase( ODBFilter& rImport,
const sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName );
const OUString sValue = _xAttrList->getValueByIndex( i );
aProperty.Name = OUString();
aProperty.Name.clear();
aProperty.Value = Any();
switch( rTokenMap.Get( nPrefix, sLocalName ) )

2
dbaccess/source/ui/browser/dsbrowserDnD.cxx
View File

@ -138,7 +138,7 @@ namespace dbaui
m_aAsyncDrop.bError = false;
m_aAsyncDrop.bHtml = false;
m_aAsyncDrop.pDroppedAt = NULL;
m_aAsyncDrop.aUrl = OUString();
m_aAsyncDrop.aUrl.clear();
// loop through the available formats and see what we can do ...
// first we have to check if it is our own format, if not we have to copy the stream :-(

2
dbaccess/source/ui/dlg/adtabdlg.cxx
View File

@ -118,7 +118,7 @@ OUString TableListFacade::getSelectedName( OUString& _out_rAliasName ) const
&& !xMeta->supportsSchemasInDataManipulation() )
{
aCatalog = aSchema;
aSchema = OUString();
aSchema.clear();
}
aComposedName = ::dbtools::composeTableName(

2
dbaccess/source/ui/inc/indexes.hxx
View File

@ -71,7 +71,7 @@ namespace dbaui
void clearModified() { setModified(false); }
bool isNew() const { return getOriginalName().isEmpty(); }
void flagAsNew(const GrantIndexAccess&) { sOriginalName = OUString(); }
void flagAsNew(const GrantIndexAccess&) { sOriginalName.clear(); }
void flagAsCommitted(const GrantIndexAccess&) { sOriginalName = sName; }
private:

3
dbaccess/source/ui/querydesign/ConnectionLineData.cxx
View File

@ -61,7 +61,8 @@ OConnectionLineData& OConnectionLineData::operator=( const OConnectionLineData&
bool OConnectionLineData::Reset()
{
m_aDestFieldName = m_aSourceFieldName = OUString();
m_aDestFieldName.clear();
m_aSourceFieldName.clear();
return true;
}

2
dbaccess/source/ui/querydesign/QTableWindow.cxx
View File

@ -61,7 +61,7 @@ OQueryTableWindow::OQueryTableWindow( vcl::Window* pParent, const TTableWindowDa
// if table name matches alias, do not pass to InitialAlias,
// as the appending of a possible token could not succeed...
if (m_strInitialAlias == pTabWinData->GetTableName())
m_strInitialAlias = OUString();
m_strInitialAlias.clear();
SetHelpId(HID_CTL_QRYDGNTAB);
}

4
dbaccess/source/ui/querydesign/querycontroller.cxx
View File

@ -904,7 +904,7 @@ void OQueryController::impl_initialize()
break;
case CommandType::COMMAND:
setStatement_fireEvent( sCommand );
m_sName = OUString();
m_sName.clear();
break;
default:
OSL_FAIL( "OQueryController::impl_initialize: logic error in code!" );
@ -1771,7 +1771,7 @@ OUString OQueryController::translateStatement( bool _bFireStatementChange )
::dbtools::SQLExceptionInfo aInfo(e);
showError(aInfo);
// an error occurred so we clear the statement
sTranslatedStmt = OUString();
sTranslatedStmt.clear();
}
}
else if(m_sStatement.isEmpty())

2
dbaccess/source/ui/relationdesign/RTableConnectionData.cxx
View File

@ -319,7 +319,7 @@ bool ORelationTableConnectionData::Update()
}
// get the name of foreign key; search for columns
m_aConnName = OUString();
m_aConnName.clear();
xKey.clear();
bool bDropRelation = false;
for(sal_Int32 i=0;i<xKeys->getCount();++i)

2
dbaccess/source/ui/uno/copytablewizard.cxx
View File

@ -569,7 +569,7 @@ void CopyTableWizard::impl_dialogToAttributes_nothrow( const OCopyTableWizard& _
if ( m_aPrimaryKeyName.IsPresent )
m_aPrimaryKeyName.Value = _rDialog.getPrimaryKeyName();
else
m_aPrimaryKeyName.Value = OUString();
m_aPrimaryKeyName.Value.clear();
m_sDestinationTable = _rDialog.getName();

2
desktop/source/deployment/gui/dp_gui_service.cxx
View File

@ -266,7 +266,7 @@ void ServiceImpl::startExecuteModal(
myExtMgr->createDialog( false );
if (!m_initialTitle.isEmpty()) {
myExtMgr->SetText( m_initialTitle );
m_initialTitle = OUString();
m_initialTitle.clear();
}
if ( m_bShowUpdateOnly )
{

2
desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
View File

@ -561,7 +561,7 @@ void UpdateInstallDialog::Thread::removeTempDownloads()
//remove also the temp file which we have used to create the unique name
OUString tempFile = m_sDownloadFolder.copy(0, m_sDownloadFolder.getLength() - 1);
dp_misc::erase_path(tempFile, cssu::Reference<css::ucb::XCommandEnvironment>(),false);
m_sDownloadFolder = OUString();
m_sDownloadFolder.clear();
}
}

2
editeng/source/editeng/editattr.cxx
View File

@ -363,7 +363,7 @@ void EditCharAttribField::SetFieldValue(const OUString& rVal)
void EditCharAttribField::Reset()
{
aFieldValue = OUString();
aFieldValue.clear();
delete pTxtColor; pTxtColor = NULL;
delete pFldColor; pFldColor = NULL;
}

2
editeng/source/editeng/textconv.cxx
View File

@ -234,7 +234,7 @@ bool TextConvWrapper::ConvContinue_impl()
// modified version of EditSpellWrapper::SpellContinue
// get next convertible text portion and its language
m_aConvText = OUString();
m_aConvText.clear();
m_nConvTextLang = LANGUAGE_NONE;
m_pEditView->GetImpEditEngine()->ImpConvert( m_aConvText, m_nConvTextLang,
m_pEditView, GetSourceLanguage(), m_aConvSel,

6
editeng/source/items/frmitems.cxx
View File

@ -2048,7 +2048,7 @@ bool SvxBoxItem::GetPresentation
{
case SFX_ITEM_PRESENTATION_NAMELESS:
{
rText = OUString();
rText.clear();
if ( pTop )
{
@ -2561,7 +2561,7 @@ bool SvxBoxInfoItem::GetPresentation
OUString& rText, const IntlWrapper *
) const
{
rText = OUString();
rText.clear();
return false;
}
@ -3184,7 +3184,7 @@ bool SvxLineItem::GetPresentation
OUString& rText, const IntlWrapper *pIntl
) const
{
rText = OUString();
rText.clear();
if ( pLine )
rText = pLine->GetValueString( eCoreUnit, ePresUnit, pIntl,

6
editeng/source/items/paraitem.cxx
View File

@ -233,7 +233,7 @@ bool SvxLineSpacingItem::GetPresentation
#ifdef DBG_UTIL
rText = "SvxLineSpacingItem";
#else
rText = OUString();
rText.clear();
#endif
return false;
}
@ -1081,7 +1081,7 @@ bool SvxTabStopItem::GetPresentation
OUString& rText, const IntlWrapper *pIntl
) const
{
rText = OUString();
rText.clear();
bool bComma = false;
@ -1300,7 +1300,7 @@ bool SvxPageModelItem::GetPresentation
OUString& rText, const IntlWrapper *
) const
{
rText = OUString();
rText.clear();
bool bSet = !GetValue().isEmpty();
switch ( ePres )

10
editeng/source/items/textitem.cxx
View File

@ -202,7 +202,7 @@ bool SvxFontListItem::GetPresentation
OUString& rText, const IntlWrapper * /*pIntl*/
) const
{
rText = OUString();
rText.clear();
return false;
}
@ -1790,7 +1790,7 @@ bool SvxPropSizeItem::GetPresentation
OUString& rText, const IntlWrapper * /*pIntl*/
) const
{
rText = OUString();
rText.clear();
return false;
}
@ -2015,7 +2015,7 @@ bool SvxCharSetColorItem::GetPresentation
OUString& rText, const IntlWrapper * /*pIntl*/
) const
{
rText = OUString();
rText.clear();
return false;
}
@ -2549,7 +2549,7 @@ bool SvxNoLinebreakItem::GetPresentation
OUString& rText, const IntlWrapper * /*pIntl*/
) const
{
rText = OUString();
rText.clear();
return false;
}
@ -2594,7 +2594,7 @@ bool SvxNoHyphenItem::GetPresentation
OUString& rText, const IntlWrapper * /*pIntl*/
) const
{
rText = OUString();
rText.clear();
return false;
}

2
editeng/source/misc/hangulhanja.cxx
View File

@ -471,7 +471,7 @@ namespace editeng
{
const bool bAllowImplicitChanges = m_eConvType == HHC::eConvSimplifiedTraditional;
m_sCurrentPortion = OUString();
m_sCurrentPortion.clear();
m_nCurrentPortionLang = LANGUAGE_NONE;
m_pAntiImpl->GetNextPortion( m_sCurrentPortion, m_nCurrentPortionLang, bAllowImplicitChanges );
m_nReplacementBaseIndex = 0;

12
embeddedobj/source/commonembedding/persistence.cxx
View File

@ -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();
}

2
embeddedobj/source/general/dummyobject.cxx
View File

@ -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;
}

2
embeddedobj/source/msole/oleembed.cxx
View File

@ -219,7 +219,7 @@ uno::Reference< embed::XStorage > OleEmbeddedObject::CreateTemporarySubstorage(
if ( !xResult.is() )
{
o_aStorageName = OUString();
o_aStorageName.clear();
throw uno::RuntimeException();
}

10
embeddedobj/source/msole/olepersist.cxx
View File

@ -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

4
embeddedobj/source/msole/ownview.cxx
View File

@ -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();
}
}
}

2
extensions/source/bibliography/datman.hxx
View File

@ -178,7 +178,7 @@ public:
void SetToolbar(BibToolBar* pSet);
const OUString& GetIdentifierMapping();
void ResetIdentifierMapping() {sIdentifierMapping = OUString();}
void ResetIdentifierMapping() {sIdentifierMapping.clear();}
::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > GetFormController();
// #100312# ----------

2
extensions/source/bibliography/general.cxx
View File

@ -476,7 +476,7 @@ uno::Reference< awt::XControlModel > BibGeneralPage::AddXControl(
for(sal_uInt16 j = 0; j < TYPE_COUNT; j++)
pValuesArr[j] = aBibTypeArr[j];
// empty string if an invalid value no values is set
pValuesArr[TYPE_COUNT] = OUString();
pValuesArr[TYPE_COUNT].clear();
aAny.setValue(&aValues, ::getCppuType((uno::Sequence<OUString>*)0));

2
extensions/source/logging/loghandler.cxx
View File

@ -110,7 +110,7 @@ namespace logging
_out_rEncoding = OUString::createFromAscii( pMimeCharset );
return true;
}
_out_rEncoding = OUString();
_out_rEncoding.clear();
return false;
}

2
extensions/source/propctrlr/formcomponenthandler.cxx
View File

@ -2616,7 +2616,7 @@ namespace pcr
OSL_PRECOND( Reference< XRowSet >( m_xComponent, UNO_QUERY ).is(),
"FormComponentPropertyHandler::impl_dialogFilterOrSort_nothrow: to be called for forms only!" );
_out_rSelectedClause = OUString();
_out_rSelectedClause.clear();
bool bSuccess = false;
SQLExceptionInfo aErrorInfo;
try

6
extensions/source/update/check/download.cxx
View File

@ -373,7 +373,7 @@ Download::start(const OUString& rURL, const OUString& rFile, const OUString& rDe
if ( m_aHandler->checkDownloadDestination( aURL.copy( nIndex+1 ) ) )
{
osl_removeFile( aFile.pData );
aFile = OUString();
aFile.clear();
}
else
m_aHandler->downloadStarted( aFile, 0 );
@ -381,7 +381,7 @@ Download::start(const OUString& rURL, const OUString& rFile, const OUString& rDe
else
{
osl_removeFile( aFile.pData );
aFile = OUString();
aFile.clear();
}
}
@ -402,7 +402,7 @@ Download::start(const OUString& rURL, const OUString& rFile, const OUString& rDe
}
}
else if( osl_File_E_NOENT == rc ) // file has been deleted meanwhile ..
out.File = OUString();
out.File.clear();
}
OString aProxyHost;

2
extensions/source/update/check/updatecheck.cxx
View File

@ -1310,7 +1310,7 @@ UpdateCheck::setUpdateInfo(const UpdateInfo& aInfo)
if( ((1 == iter2->Pos) || (2 == iter2->Pos)) && autoDownloadEnabled && !iter2->URL2.isEmpty())
{
iter2->URL = iter2->URL2;
iter2->URL2 = OUString();
(iter2->URL2).clear();
iter2->Pos = iter2->Pos2;
iter2->Pos2 = 0;
}

6
filter/source/config/cache/cacheupdatelistener.cxx vendored
View File

@ -126,8 +126,8 @@ void SAL_CALL CacheUpdateListener::changesOccurred(const css::util::ChangesEven
if ( ! ::utl::splitLastFromConfigurationPath(sOrgPath, sTempPath, sProperty))
{
sNode = sLocale;
sProperty = OUString();
sLocale = OUString();
sProperty.clear();
sLocale.clear();
}
else
{
@ -136,7 +136,7 @@ void SAL_CALL CacheUpdateListener::changesOccurred(const css::util::ChangesEven
{
sNode = sProperty;
sProperty = sLocale;
sLocale = OUString();
sLocale.clear();
}
}

14
filter/source/config/cache/typedetection.cxx vendored
View File

@ -453,7 +453,7 @@ OUString SAL_CALL TypeDetection::queryTypeByDescriptor(css::uno::Sequence< css::
"filter.config",
"caught Exception \"" << e.Message
<< "\" while querying type of <" << sURL << ">");
sType = OUString();
sType.clear();
}
// adapt media descriptor, so it contains the right values
@ -546,7 +546,7 @@ void TypeDetection::impl_checkResultsAndAddBestFilter(utl::MediaDescriptor& rDes
// - or to any other filter if no preferred filter was set.
// Note: It's an optimization only!
// It's not guaranteed, that such preferred filter exists.
sFilter = OUString();
sFilter.clear();
try
{
// SAFE ->
@ -569,7 +569,7 @@ void TypeDetection::impl_checkResultsAndAddBestFilter(utl::MediaDescriptor& rDes
// d)
// Search for any import(!) filter, which is registered for this type.
sFilter = OUString();
sFilter.clear();
try
{
// SAFE ->
@ -610,7 +610,7 @@ void TypeDetection::impl_checkResultsAndAddBestFilter(utl::MediaDescriptor& rDes
aLock.clear();
// <- SAFE
sFilter = OUString();
sFilter.clear();
}
if (!sFilter.isEmpty())
@ -656,7 +656,7 @@ bool TypeDetection::impl_getPreselectionForType(
}
catch(const css::container::NoSuchElementException&)
{
sType = OUString();
sType.clear();
bBreakDetection = true;
}
@ -879,7 +879,7 @@ OUString TypeDetection::impl_detectTypeFlatAndDeep( utl::MediaDescriptor& r
{
// reset it everytimes, so the outside code can distinguish between
// a set and a not set value.
rLastChance = OUString();
rLastChance.clear();
rUsedDetectors.clear();
// step over all possible types for this URL.
@ -1046,7 +1046,7 @@ OUString TypeDetection::impl_askDetectService(const OUString& sDet
// Thrown exceptions mostly will end in crash recovery ...
// But might be we find another deep detection service which can detect the same
// document without a problem .-)
sDeepType = OUString();
sDeepType.clear();
}
// seek to 0 is an optional feature to be more robust against

8
filter/source/msfilter/svdfppt.cxx
View File

@ -5227,7 +5227,7 @@ void PPTStyleTextPropReader::Init( SvStream& rIn, SdrPowerPointImport& rMan, con
if ( nLen )
aCharPropSet.maString = aString.copy( nCharAnzRead, nLen );
else if ( bEmptyParaPossible )
aCharPropSet.maString = OUString();
aCharPropSet.maString.clear();
if ( nLen || bEmptyParaPossible )
aCharPropList.push_back( new PPTCharPropSet( aCharPropSet, nCurrentPara ) );
nCurrentPara++;
@ -5270,7 +5270,7 @@ void PPTStyleTextPropReader::Init( SvStream& rIn, SdrPowerPointImport& rMan, con
if ( !aCharPropList.empty() && ( aCharPropList.back()->mnParagraph != nCurrentPara ) )
{
PPTCharPropSet* pCharPropSet = new PPTCharPropSet( *aCharPropList.back(), nCurrentPara );
pCharPropSet->maString = OUString();
(pCharPropSet->maString).clear();
pCharPropSet->mnOriginalTextPos = nStringLen - 1;
aCharPropList.push_back( pCharPropSet );
}
@ -6807,7 +6807,7 @@ PPTTextObj::PPTTextObj( SvStream& rIn, SdrPowerPointImport& rSdrPowerPointImport
if ( aString[nCount] == 0x2a )
{
sal_uInt32 nBehind = aString.getLength() - ( nCount + 1 );
pSet->maString = OUString();
(pSet->maString).clear();
if ( nBehind )
{
PPTCharPropSet* pNewCPS = new PPTCharPropSet( *pSet );
@ -6906,7 +6906,7 @@ PPTTextObj::PPTTextObj( SvStream& rIn, SdrPowerPointImport& rSdrPowerPointImport
pCurrent->mpFieldItem = new SvxFieldItem( SvxURLField( pField->GetURL(), aRepresentation, SVXURLFORMAT_REPR ), EE_FEATURE_FIELD );
nHyperLenLeft = 0;
}
pCurrent->maString = OUString();
(pCurrent->maString).clear();
pCurrent->SetColor( PPT_COLSCHEME_A_UND_HYPERLINK );
}
nIdx++;

4
filter/source/pdf/pdfexport.cxx
View File

@ -717,8 +717,8 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >&
// after this point we don't need the legacy clear passwords anymore
// however they are still inside the passed filter data sequence
// which is sadly out out our control
aPermissionPassword = OUString();
aOpenPassword = OUString();
aPermissionPassword.clear();
aOpenPassword.clear();
/*
* FIXME: the entries are only implicitly defined by the resource file. Should there

2
filter/source/xsltdialog/typedetectionimport.cxx
View File

@ -279,7 +279,7 @@ void SAL_CALL TypeDetectionImporter::startElement( const OUString& aName, const
if( aName == sValue )
{
eNewState = e_Value;
maValue = OUString();
maValue.clear();
}
}

4
filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
View File

@ -431,7 +431,7 @@ bool XMLFilterSettingsDialog::insertOrEdit( filter_info_impl* pNewInfo, const fi
{
if( pOldInfo->maType == pOldInfo->maFilterName )
{
pNewInfo->maType = OUString();
(pNewInfo->maType).clear();
}
}
@ -1163,7 +1163,7 @@ void XMLFilterSettingsDialog::initFilterList()
Sequence< OUString > aExtensions;
if( pValues2->Value >>= aExtensions )
{
pTempFilter->maExtension = OUString();
(pTempFilter->maExtension).clear();
sal_Int32 nCount3( aExtensions.getLength() );
OUString* pExtensions = aExtensions.getArray();

4
forms/source/component/Button.cxx
View File

@ -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;
}
}

6
forms/source/component/ComboBox.cxx
View File

@ -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();

2
forms/source/component/File.cxx
View File

@ -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

2
forms/source/component/Hidden.cxx
View File

@ -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);
}

4
forms/source/component/ImageButton.cxx
View File

@ -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;
}
}

2
forms/source/component/ImageControl.cxx
View File

@ -550,7 +550,7 @@ void OImageControlModel::onDisconnectedDbColumn()
{
OBoundControlModel::onDisconnectedDbColumn();
m_sDocumentURL = OUString();
m_sDocumentURL.clear();
}

4
forms/source/component/imgprod.cxx
View File

@ -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;

2
forms/source/xforms/datatypes.cxx
View File

@ -521,7 +521,7 @@ namespace xforms
if ( !OStringType_Base::checkPropertySanity( _nHandle, _rNewValue, _rErrorMessage ) )
return false;
_rErrorMessage = OUString();
_rErrorMessage.clear();
switch ( _nHandle )
{
case PROPERTY_ID_XSD_LENGTH:

6
forms/source/xforms/mip.cxx
View File

@ -87,8 +87,8 @@ void MIP::resetRequired() { mbHasRequired = false; mbRequired = false; }
void MIP::setRelevant( bool b ) { mbHasRelevant = true; mbRelevant = b; }
void MIP::resetRelevant() { mbHasRelevant = false; mbRelevant = true; }
void MIP::setConstraint( bool b ) { mbHasConstraint = true; mbConstraint = b; msConstraintExplanation = OUString(); }
void MIP::resetConstraint() { mbHasConstraint = false; mbConstraint = true; msConstraintExplanation = OUString(); }
void MIP::setConstraint( bool b ) { mbHasConstraint = true; mbConstraint = b; msConstraintExplanation.clear(); }
void MIP::resetConstraint() { mbHasConstraint = false; mbConstraint = true; msConstraintExplanation.clear(); }
void MIP::setConstraintExplanation( const OUString& s ) { msConstraintExplanation = s; }
@ -97,7 +97,7 @@ void MIP::setHasCalculate( bool b ) { mbHasCalculate = b; }
void MIP::resetCalculate() { mbHasCalculate = false; }
void MIP::setTypeName( const OUString& s ) { msTypeName = s; mbHasTypeName = true; }
void MIP::resetTypeName() { msTypeName = OUString(); mbHasTypeName = false; }
void MIP::resetTypeName() { msTypeName.clear(); mbHasTypeName = false; }

2
fpicker/source/office/iodlg.cxx
View File

@ -291,7 +291,7 @@ namespace
*/
bool getEnvironmentValue( const sal_Char* _pAsciiEnvName, OUString& _rValue )
{
_rValue = OUString();
_rValue.clear();
OUString sEnvName = OUString::createFromAscii( _pAsciiEnvName );
osl_getEnvironment( sEnvName.pData, &_rValue.pData );
return !_rValue.isEmpty();

2
fpicker/source/win32/filepicker/filepickerstate.cxx
View File

@ -218,7 +218,7 @@ static OUString trimTrailingSpaces(const OUString& rString)
if (nIndex >= 0)
aResult = rString.copy(0,nIndex+1);
else
aResult = OUString();
aResult.clear();
}
return aResult;
}

24
framework/inc/classes/filtercachedata.hxx
View File

@ -88,9 +88,9 @@ struct FileType
inline void impl_clear()
{
bPreferred = false;
sName = OUString();
sMediaType = OUString();
sClipboardFormat = OUString();
sName.clear();
sMediaType.clear();
sClipboardFormat.clear();
nDocumentIconID = 0;
lUINames.free ();
lURLPattern.free();
@ -148,14 +148,14 @@ struct Filter
inline void impl_clear()
{
nOrder = 0;
sName = OUString();
sType = OUString();
sDocumentService = OUString();
sFilterService = OUString();
sUIComponent = OUString();
sName.clear();
sType.clear();
sDocumentService.clear();
sFilterService.clear();
sUIComponent.clear();
nFlags = 0;
nFileFormatVersion = 0;
sTemplateName = OUString();
sTemplateName.clear();
lUINames.free ();
lUserData.free ();
}
@ -215,7 +215,7 @@ struct Detector
inline void impl_clear()
{
sName = OUString();
sName.clear();
lTypes.free();
}
@ -256,7 +256,7 @@ struct Loader
inline void impl_clear()
{
sName = OUString();
sName.clear();
lUINames.free ();
lTypes.free ();
}
@ -299,7 +299,7 @@ struct ContentHandler
inline void impl_clear()
{
sName = OUString();
sName.clear();
lTypes.free();
}

2
framework/inc/queries.h
View File

@ -131,7 +131,7 @@ class QueryBuilder
void resetAll()
{
m_sBase = OUString();
m_sBase.clear();
resetParams();
}

2
framework/source/accelerators/presethandler.cxx
View File

@ -777,7 +777,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openLocalizedPat
if (xLocalePath.is())
sPath = sLocalizedPath;
else
sPath = OUString();
sPath.clear();
return xLocalePath;
}

2
framework/source/fwe/xml/xmlnamespaces.cxx
View File

@ -51,7 +51,7 @@ void XMLNamespaces::addNamespace( const OUString& aName, const OUString& aValue
{
if ( aNamespaceName.getLength() == nXMLNamespaceLength )
{
aNamespaceName = OUString();
aNamespaceName.clear();
}
else if ( aNamespaceName.getLength() >= nXMLNamespaceLength+2 )
{

4
framework/source/helper/persistentwindowstate.cxx
View File

@ -158,7 +158,7 @@ OUString PersistentWindowState::implst_identifyModule(const css::uno::Reference<
catch(const css::uno::RuntimeException&)
{ throw; }
catch(const css::uno::Exception&)
{ sModuleName = OUString(); }
{ sModuleName.clear(); }
return sModuleName;
}
@ -188,7 +188,7 @@ OUString PersistentWindowState::implst_getWindowStateFromConfig(const css::uno::
catch(const css::uno::RuntimeException&)
{ throw; }
catch(const css::uno::Exception&)
{ sWindowState = OUString(); }
{ sWindowState.clear(); }
return sWindowState;
}

2
framework/source/helper/statusindicatorfactory.cxx
View File

@ -157,7 +157,7 @@ void StatusIndicatorFactory::reset(const css::uno::Reference< css::task::XStatus
if (pItem != m_aStack.end())
{
pItem->m_nValue = 0;
pItem->m_sText = OUString();
(pItem->m_sText).clear();
}
css::uno::Reference< css::task::XStatusIndicator > xActive = m_xActiveChild;

2
framework/source/helper/vclstatusindicator.cxx
View File

@ -82,7 +82,7 @@ void SAL_CALL VCLStatusIndicator::end()
{
SolarMutexGuard aSolarGuard;
m_sText = OUString();
m_sText.clear();
m_nRange = 0;
m_nValue = 0;

6
framework/source/jobs/helponstartup.cxx
View File

@ -207,7 +207,7 @@ OUString HelpOnStartup::its_getModuleIdFromEnv(const css::uno::Sequence< css::be
catch(const css::uno::RuntimeException&)
{ throw; }
catch(const css::uno::Exception&)
{ sModuleId = OUString(); }
{ sModuleId.clear(); }
return sModuleId;
}
@ -248,7 +248,7 @@ OUString HelpOnStartup::its_getCurrentHelpURL()
catch(const css::uno::RuntimeException&)
{ throw; }
catch(const css::uno::Exception&)
{ sCurrentHelpURL = OUString(); }
{ sCurrentHelpURL.clear(); }
return sCurrentHelpURL;
}
@ -331,7 +331,7 @@ OUString HelpOnStartup::its_checkIfHelpEnabledAndGetURL(const OUString& sModule)
catch(const css::uno::RuntimeException&)
{ throw; }
catch(const css::uno::Exception&)
{ sHelpURL = OUString(); }
{ sHelpURL.clear(); }
return sHelpURL;
}

12
framework/source/jobs/joburl.cxx
View File

@ -128,7 +128,7 @@ bool JobURL::getEvent( /*OUT*/ OUString& sEvent ) const
{
SolarMutexGuard g;
sEvent = OUString();
sEvent.clear();
bool bSet = ((m_eRequest & E_EVENT) == E_EVENT);
if (bSet)
sEvent = m_sEvent;
@ -156,7 +156,7 @@ bool JobURL::getAlias( /*OUT*/ OUString& sAlias ) const
{
SolarMutexGuard g;
sAlias = OUString();
sAlias.clear();
bool bSet = ((m_eRequest & E_ALIAS) == E_ALIAS);
if (bSet)
sAlias = m_sAlias;
@ -184,7 +184,7 @@ bool JobURL::getService( /*OUT*/ OUString& sService ) const
{
SolarMutexGuard g;
sService = OUString();
sService.clear();
bool bSet = ((m_eRequest & E_SERVICE) == E_SERVICE);
if (bSet)
sService = m_sService;
@ -541,7 +541,7 @@ sal_Bool JobURL::getServiceArgs( /*OUT*/ OUString& sServiceArgs ) const
{
SolarMutexGuard g;
sServiceArgs = OUString();
sServiceArgs.clear();
sal_Bool bSet = ((m_eRequest & E_SERVICE) == E_SERVICE);
if (bSet)
sServiceArgs = m_sServiceArgs;
@ -553,7 +553,7 @@ sal_Bool JobURL::getEventArgs( /*OUT*/ OUString& sEventArgs ) const
{
SolarMutexGuard g;
sEventArgs = OUString();
sEventArgs.clear();
sal_Bool bSet = ((m_eRequest & E_EVENT) == E_EVENT);
if (bSet)
sEventArgs = m_sEventArgs;
@ -565,7 +565,7 @@ sal_Bool JobURL::getAliasArgs( /*OUT*/ OUString& sAliasArgs ) const
{
SolarMutexGuard g;
sAliasArgs = OUString();
sAliasArgs.clear();
sal_Bool bSet = ((m_eRequest & E_ALIAS) == E_ALIAS);
if (bSet)
sAliasArgs = m_sAliasArgs;

2
framework/source/layoutmanager/helpers.cxx
View File

@ -93,7 +93,7 @@ OUString retrieveToolbarNameFromHelpURL( vcl::Window* pWindow )
if ( !aToolbarName.isEmpty() && ( i > 0 ) && (( i + 1 ) < aToolbarName.getLength() ))
aToolbarName = aToolbarName.copy( i+1 ); // Remove ".HelpId:" protocol from toolbar name
else
aToolbarName = OUString();
aToolbarName.clear();
}
}
return aToolbarName;

4
framework/source/layoutmanager/layoutmanager.cxx
View File

@ -367,7 +367,7 @@ void LayoutManager::implts_reset( bool bAttached )
xModuleCfgMgr.clear();
xDocCfgMgr.clear();
xPersistentWindowState.clear();
aModuleIdentifier = OUString();
aModuleIdentifier.clear();
}
Reference< XUIConfigurationManager > xModCfgMgr( xModuleCfgMgr, UNO_QUERY );
@ -813,7 +813,7 @@ void LayoutManager::implts_destroyStatusBar()
Reference< XComponent > xCompStatusBar;
SolarMutexClearableGuard aWriteLock;
m_aStatusBarElement.m_aName = OUString();
m_aStatusBarElement.m_aName.clear();
xCompStatusBar = Reference< XComponent >( m_aStatusBarElement.m_xUIElement, UNO_QUERY );
m_aStatusBarElement.m_xUIElement.clear();
aWriteLock.clear();

Some files were not shown because too many files have changed in this diff Show More