ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

Replace all OUString("") with OUString()

Browse Source 
Change-Id: Ie14c4d76cb61cfbe0410103adfc1afc8ade0f3e0
Reviewed-on: https://gerrit.libreoffice.org/37146
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Arnaud Versini
2017-05-04 08:39:18 +02:00
committed by Noel Grandin
parent 0025fc13d8
commit 1fdb0e1897
57 changed files with 125 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files
chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
+1 -1
View File
@@ -293,7 +293,7 @@ void CharacterPropertyItemConverter::FillSpecialItem(
rOutItemSet.Put( SfxStringItem( nWhichId, aString ) );
}
else
rOutItemSet.Put( SfxStringItem( nWhichId, OUString("") ) );
rOutItemSet.Put( SfxStringItem( nWhichId, OUString() ) );
}
break;
comphelper/qa/string/test_string.cxx
+1 -1
View File
@@ -401,7 +401,7 @@ void TestString::testRemoveAny()
sal_Unicode const test6 [] = { 'X', 0 };
CPPUNIT_ASSERT_EQUAL(in, removeAny(in, test6));
sal_Unicode const test7 [] = { 'A', 'B', 'C', 'a', 'b', 'c', 0 };
CPPUNIT_ASSERT_EQUAL(OUString(""), removeAny(in, test7));
CPPUNIT_ASSERT_EQUAL(OUString(), removeAny(in, test7));
}
CPPUNIT_TEST_SUITE_REGISTRATION(TestString);
connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
+2 -2
View File
@@ -268,9 +268,9 @@ ODatabaseMetaDataResultSet::ORows& OEvoabDatabaseMetaData::getColumnRows( const
// ****************************************************
// Catalog
aRow[1] = new ORowSetValueDecorator(OUString(""));
aRow[1] = new ORowSetValueDecorator(OUString());
// Schema
aRow[2] = new ORowSetValueDecorator(OUString(""));
aRow[2] = new ORowSetValueDecorator(OUString());
// COLUMN_SIZE
aRow[7] = new ORowSetValueDecorator(s_nCOLUMN_SIZE);
// BUFFER_LENGTH, not used
connectivity/source/drivers/mork/MDatabaseMetaData.cxx
+2 -2
View File
@@ -77,9 +77,9 @@ ODatabaseMetaDataResultSet::ORows& SAL_CALL ODatabaseMetaData::getColumnRows(
// ****************************************************
// Catalog
aRow[1] = new ORowSetValueDecorator(OUString(""));
aRow[1] = new ORowSetValueDecorator(OUString());
// Schema
aRow[2] = new ORowSetValueDecorator(OUString(""));
aRow[2] = new ORowSetValueDecorator(OUString());
// DATA_TYPE
aRow[5] = new ORowSetValueDecorator(static_cast<sal_Int16>(DataType::VARCHAR));
// TYPE_NAME, not used
dtrans/source/win32/clipb/WinClipboard.cxx
+1 -1
View File
@@ -97,7 +97,7 @@ OUString SAL_CALL CWinClipboard::getName( )
if ( nullptr != m_pImpl.get( ) )
return m_pImpl->getName( );
return OUString("");
return OUString();
}
// XFlushableClipboard
editeng/qa/unit/core-test.cxx
+5 -5
View File
@@ -397,7 +397,7 @@ void Test::testHyperlinkCopyPaste()
// New instance must be empty - no initial text
CPPUNIT_ASSERT_EQUAL( sal_uLong(0), rDoc.GetTextLen() );
CPPUNIT_ASSERT_EQUAL( OUString(""), rDoc.GetParaAsString(sal_Int32(0)) );
CPPUNIT_ASSERT_EQUAL( OUString(), rDoc.GetParaAsString(sal_Int32(0)) );
// Get corresponding Field Item for inserting URLs in text
// URL 1
@@ -524,7 +524,7 @@ void Test::testCopyPaste()
// Initially no text should be there
CPPUNIT_ASSERT_EQUAL( sal_uLong(0), rDoc.GetTextLen() );
CPPUNIT_ASSERT_EQUAL( OUString(""), rDoc.GetParaAsString(sal_Int32(0)) );
CPPUNIT_ASSERT_EQUAL( OUString(), rDoc.GetParaAsString(sal_Int32(0)) );
// Set initial text
OUString aText = "This is custom initial text";
@@ -556,7 +556,7 @@ void Test::testTabsCopyPaste()
// New instance must be empty - no initial text
CPPUNIT_ASSERT_EQUAL( sal_uLong(0), rDoc.GetTextLen() );
CPPUNIT_ASSERT_EQUAL( OUString(""), rDoc.GetParaAsString(sal_Int32(0)) );
CPPUNIT_ASSERT_EQUAL( OUString(), rDoc.GetParaAsString(sal_Int32(0)) );
// Get corresponding Item for inserting tabs in the text
SfxVoidItem aTab( EE_FEATURE_TAB );
@@ -725,7 +725,7 @@ void Test::testBoldItalicCopyPaste()
// New instance must be empty - no initial text
CPPUNIT_ASSERT_EQUAL( sal_uLong(0), rDoc.GetTextLen() );
CPPUNIT_ASSERT_EQUAL( OUString(""), rDoc.GetParaAsString(sal_Int32(0)) );
CPPUNIT_ASSERT_EQUAL( OUString(), rDoc.GetParaAsString(sal_Int32(0)) );
// Get corresponding ItemSet for inserting Bold/Italic text
std::unique_ptr<SfxItemSet> pSet( new SfxItemSet(aEditEngine.GetEmptyItemSet()) );
@@ -931,7 +931,7 @@ void Test::testUnderlineCopyPaste()
// New instance must be empty - no initial text
CPPUNIT_ASSERT_EQUAL( sal_uLong(0), rDoc.GetTextLen() );
CPPUNIT_ASSERT_EQUAL( OUString(""), rDoc.GetParaAsString(sal_Int32(0)) );
CPPUNIT_ASSERT_EQUAL( OUString(), rDoc.GetParaAsString(sal_Int32(0)) );
// Get corresponding ItemSet for inserting Underline text
std::unique_ptr<SfxItemSet> pSet( new SfxItemSet(aEditEngine.GetEmptyItemSet()) );
fpicker/source/office/RemoteFilesDialog.cxx
+1 -1
View File
@@ -435,7 +435,7 @@ OUString lcl_GetServiceType( const ServicePtr& pService )
case INetProtocol::Generic:
return OUString( "SSH" );
default:
return OUString( "" );
return OUString();
}
}
i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
+2 -2
View File
@@ -627,10 +627,10 @@ DefaultNumberingProvider::makeNumberingString( const Sequence<beans::PropertyVal
result += OUString::number( number );
break;
case NUMBER_NONE:
return OUString(""); // ignore prefix and suffix
return OUString(); // ignore prefix and suffix
case CHAR_SPECIAL:
// apparently, we're supposed to return an empty string in this case...
return OUString(""); // ignore prefix and suffix
return OUString(); // ignore prefix and suffix
case PAGE_DESCRIPTOR:
case BITMAP:
OSL_ASSERT(false);
include/vcl/ITiledRenderable.hxx
+1 -1
View File
@@ -80,7 +80,7 @@ public:
virtual OUString getPartName(int nPart)
{
(void) nPart;
return OUString("");
return OUString();
}
/**
lotuswordpro/source/filter/lwpchangemgr.cxx
+1 -1
View File
@@ -109,7 +109,7 @@ OUString LwpChangeMgr::GetChangeID(LwpFrib* pFrib)
std::map<LwpFrib*,OUString>::iterator iter;
iter = m_pFribMap->find(pFrib);
if (iter == m_pFribMap->end())
return OUString("");
return OUString();
else
return iter->second;
}
lotuswordpro/source/filter/lwpglobalmgr.cxx
+1 -1
View File
@@ -136,7 +136,7 @@ OUString LwpGlobalMgr::GetEditorName(sal_uInt8 nID)
auto iter = m_EditorAttrMap.find(nID);
if (iter != m_EditorAttrMap.end())
return iter->second->cName.str();
return OUString("");
return OUString();
}
XFColor LwpGlobalMgr::GetHighlightColor(sal_uInt8 nID)
lotuswordpro/source/filter/lwpmarker.cxx
+2 -2
View File
@@ -94,7 +94,7 @@ OUString LwpMarker::GetNamedProperty(const OUString& name)
if (pProp)
return pProp->GetNamedProperty(name);
else
return OUString("");
return OUString();
}
LwpStoryMarker::LwpStoryMarker(LwpObjectHeader &objHdr, LwpSvStream *pStrm)
@@ -147,7 +147,7 @@ OUString LwpCHBlkMarker::GetPromptText()
pStory = dynamic_cast<LwpStory*>(m_objPromptStory.obj().get());
if (pStory)
return pStory->GetContentText();
return OUString("");
return OUString();
}
void LwpCHBlkMarker::ConvertCHBlock(XFContentContainer* pXFPara, sal_uInt8 nType)
lotuswordpro/source/filter/lwpproplist.cxx
+3 -3
View File
@@ -90,7 +90,7 @@ OUString LwpPropList::GetNamedProperty(const OUString& name)
{
return pProp->GetValue().str();
}
return OUString("");
return OUString();
}
LwpPropListElement* LwpPropList::FindPropByName(const OUString& name)
@@ -125,7 +125,7 @@ OUString LwpPropList::EnumNamedProperty(OUString& name,OUString& value)
if(pElement)
return pElement->GetName().str();
}
return OUString("");
return OUString();
}
else
{
@@ -137,7 +137,7 @@ OUString LwpPropList::EnumNamedProperty(OUString& name,OUString& value)
if(pElement)
return pElement->GetName().str();
}
return OUString("");
return OUString();
}
}
lotuswordpro/source/filter/lwpstory.cxx
+4 -4
View File
@@ -436,11 +436,11 @@ OUString LwpStory::GetContentText(bool bAllText)
{
LwpPara* pPara = dynamic_cast<LwpPara*>(pObj.get());
if (!pPara || pPara->GetNext().obj() != nullptr)
return OUString("");
return OUString();
pPara->SetFoundry(m_pFoundry);
return pPara->GetContentText();
}
return OUString("");
return OUString();
}
}
@@ -448,7 +448,7 @@ OUString LwpStory::RegisterFirstFribStyle()
{
LwpPara* pPara = dynamic_cast<LwpPara*>(GetFirstPara().obj().get());
if (!pPara)
return OUString("");
return OUString();
pPara->SetFoundry(m_pFoundry);
LwpFribPtr& rFribs = pPara->GetFribs();
LwpFrib* pFirstFrib = rFribs.GetFribs();
@@ -456,7 +456,7 @@ OUString LwpStory::RegisterFirstFribStyle()
XFStyleManager* pXFStyleManager = LwpGlobalMgr::GetInstance()->GetXFStyleManager();
XFTextStyle* pBaseStyle = pXFStyleManager->FindTextStyle(pFirstFrib->GetStyleName());
if (pBaseStyle == nullptr)
return OUString("");
return OUString();
XFTextStyle* pStyle = new XFTextStyle;
*pStyle = *pBaseStyle;
OUString sName = "Ruby" + pFirstFrib->GetStyleName();
lotuswordpro/source/filter/xfilter/xfcell.cxx
+2 -2
View File
@@ -137,12 +137,12 @@ OUString XFCell::GetCellName()
XFRow *pRow = m_pOwnerRow;
if( !pRow )
return OUString("");
return OUString();
XFTable *pTable = pRow->GetOwnerTable();
if( !pTable )
return OUString("");
return OUString();
OUString name;
if( pTable->IsSubTable() )
lotuswordpro/source/filter/xfilter/xfutil.cxx
+12 -12
View File
@@ -149,7 +149,7 @@ OUString GetUnderlineName(enumXFUnderline type)
return OUString("samll-wave");
break;
}
return OUString("");
return OUString();
}
OUString GetReliefName(enumXFRelief type)
@@ -165,7 +165,7 @@ OUString GetReliefName(enumXFRelief type)
default:
break;
}
return OUString("");
return OUString();
}
OUString GetCrossoutName(enumXFCrossout type)
@@ -190,7 +190,7 @@ OUString GetCrossoutName(enumXFCrossout type)
default:
break;
}
return OUString("");
return OUString();
}
OUString GetTransformName(enumXFTransform type)
@@ -211,7 +211,7 @@ OUString GetTransformName(enumXFTransform type)
default:
break;
}
return OUString("");
return OUString();
}
OUString GetEmphasizeName(enumXFEmphasize type)
@@ -232,7 +232,7 @@ OUString GetEmphasizeName(enumXFEmphasize type)
default:
break;
}
return OUString("");
return OUString();
}
OUString GetTextDirName(enumXFTextDir dir)
@@ -266,7 +266,7 @@ OUString GetTextDirName(enumXFTextDir dir)
default:
break;
}
return OUString("");
return OUString();
}
OUString GetFrameXPos(enumXFFrameXPos pos)
@@ -288,7 +288,7 @@ OUString GetFrameXPos(enumXFFrameXPos pos)
default:
break;
}
return OUString("");
return OUString();
}
OUString GetFrameXRel(enumXFFrameXRel rel)
@@ -337,7 +337,7 @@ OUString GetFrameXRel(enumXFFrameXRel rel)
default:
break;
}
return OUString("");
return OUString();
}
OUString GetFrameYPos(enumXFFrameYPos pos)
@@ -355,7 +355,7 @@ OUString GetFrameYPos(enumXFFrameYPos pos)
case enumXFFrameYPosBelow:
return OUString("below");
}
return OUString("");
return OUString();
}
OUString GetFrameYRel(enumXFFrameYRel rel)
@@ -383,7 +383,7 @@ OUString GetFrameYRel(enumXFFrameYRel rel)
case enumXFFrameYRelText:
return OUString("text");
}
return OUString("");
return OUString();
}
OUString GetAlignName(enumXFAlignType align)
@@ -405,7 +405,7 @@ OUString GetAlignName(enumXFAlignType align)
else if( align == enumXFALignMargins )
return OUString("margins");
return OUString("");
return OUString();
}
OUString GetPageUsageName(enumXFPageUsage usage)
@@ -478,7 +478,7 @@ OUString GetColorMode(enumXFColorMode mode)
case enumXFColorMono:
return OUString("mono");
}
return OUString("");
return OUString();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sal/qa/rtl/oustring/rtl_ustr.cxx
+1 -1
View File
@@ -466,7 +466,7 @@ namespace rtl_ustr
/* sal_Int32 */ nIndex = rtl_ustr_lastIndexOfStr( aStr1.getStr(), aSearchStr.getStr() );
CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == 0);
/* rtl::OString */ aSearchStr = rtl::OUString("");
/* rtl::OString */ aSearchStr = rtl::OUString();
/* sal_Int32 */ nIndex = rtl_ustr_lastIndexOfStr( aStr1.getStr(), aSearchStr.getStr() );
CPPUNIT_ASSERT_MESSAGE("index is wrong.", nIndex == -1);
}
sax/qa/cppunit/xmlimport.cxx
+2 -2
View File
@@ -125,7 +125,7 @@ OUString TestDocumentHandler::canonicalform(const OUString &sName, const OUStrin
return sDefaultns + ":" + sName;
}
}
return OUString("");
return OUString();
}
OUString TestDocumentHandler::getNamespace(const OUString &sName)
@@ -136,7 +136,7 @@ OUString TestDocumentHandler::getNamespace(const OUString &sName)
if (aPair.first == sName)
return aPair.second;
}
return OUString("");
return OUString();
}
void SAL_CALL TestDocumentHandler::startDocument()
sc/qa/unit/helper/qahelper.cxx
+1 -1
View File
@@ -625,7 +625,7 @@ OUString EnsureSeparator(const OUStringBuffer& rFilePath)
{
return (rFilePath.getLength() == 0) || (rFilePath[rFilePath.getLength() - 1] != '/') ?
OUString("/") :
OUString("");
OUString();
}
}
sc/qa/unit/subsequent_export-test.cxx
+1 -1
View File
@@ -3909,7 +3909,7 @@ void ScExportTest::testExtendedLCIDXLSX()
rDoc.GetNumberFormat(nCol, nRow, 0, nNumberFormat);
const SvNumberformat* pNumberFormat = pNumFormatter->GetEntry(nNumberFormat);
const OUString& rFormatStr = pNumberFormat->GetFormatstring();
const OUString aExpectedFormatStr = aLang[nRow-1] + ( (nCol==2 && nRow!=3) ? OUString("[NatNum1]") : OUString("") ) + aCalendar[nRow-1];
const OUString aExpectedFormatStr = aLang[nRow-1] + ( (nCol==2 && nRow!=3) ? OUString("[NatNum1]") : OUString() ) + aCalendar[nRow-1];
CPPUNIT_ASSERT_EQUAL_MESSAGE("Number format lost extended LCID during Excel export", aExpectedFormatStr, rFormatStr);
}
sc/qa/unit/ucalc_formula.cxx
+1 -1
View File
@@ -7694,7 +7694,7 @@ void Test::testMatConcat()
CPPUNIT_ASSERT_EQUAL(OUString("x"),aStr);
aPos.IncRow();
aStr = m_pDoc->GetString(aPos);
CPPUNIT_ASSERT_EQUAL(OUString(""),aStr);
CPPUNIT_ASSERT_EQUAL(OUString(),aStr);
aPos.IncRow();
aStr = m_pDoc->GetString(aPos);
CPPUNIT_ASSERT_EQUAL(OUString("er"),aStr);
sc/source/core/data/dptabsrc.cxx
+2 -2
View File
@@ -1622,9 +1622,9 @@ uno::Any SAL_CALL ScDPDimension::getPropertyValue( const OUString& aPropertyName
aRet <<= uno::Sequence<sheet::TableFilterField>(0);
}
else if (aPropertyName == SC_UNO_DP_LAYOUTNAME)
aRet <<= mpLayoutName.get() ? *mpLayoutName : OUString("");
aRet <<= mpLayoutName.get() ? *mpLayoutName : OUString();
else if (aPropertyName == SC_UNO_DP_FIELD_SUBTOTALNAME)
aRet <<= mpSubtotalName.get() ? *mpSubtotalName : OUString("");
aRet <<= mpSubtotalName.get() ? *mpSubtotalName : OUString();
else if (aPropertyName == SC_UNO_DP_HAS_HIDDEN_MEMBER)
aRet <<= mbHasHiddenMember;
else if (aPropertyName == SC_UNO_DP_FLAGS)
sc/source/filter/orcus/filterdetect.cxx
+1 -1
View File
@@ -46,7 +46,7 @@ OrcusFormatDetect::OrcusFormatDetect()
OUString OrcusFormatDetect::getImplementationName()
{
return OUString("");
return OUString();
}
sal_Bool OrcusFormatDetect::supportsService(const OUString& /*rServiceName*/)
sc/source/ui/condformat/condformathelper.cxx
+1 -1
View File
@@ -33,7 +33,7 @@ OUString getTextForType(ScCondFormatEntryType eType)
break;
}
return OUString("");
return OUString();
}
OUString getExpression(sal_Int32 nIndex)
sd/qa/unit/import-tests.cxx
+1 -1
View File
@@ -1207,7 +1207,7 @@ void SdImportTest::testBulletSuffix()
const EditTextObject& aEdit = pTxtObj->GetOutlinerParaObject()->GetTextObject();
const SvxNumBulletItem *pNumFmt = dynamic_cast<const SvxNumBulletItem *>(aEdit.GetParaAttribs(1).GetItem(EE_PARA_NUMBULLET));
CPPUNIT_ASSERT(pNumFmt);
CPPUNIT_ASSERT_EQUAL_MESSAGE( "Bullet's suffix is wrong!", OUString(pNumFmt->GetNumRule()->GetLevel(0).GetSuffix()), OUString("") );
CPPUNIT_ASSERT_EQUAL_MESSAGE( "Bullet's suffix is wrong!", OUString(pNumFmt->GetNumRule()->GetLevel(0).GetSuffix()), OUString() );
xDocShRef->DoClose();
}
sd/qa/unit/tiledrendering/tiledrendering.cxx
+1 -1
View File
@@ -1432,7 +1432,7 @@ void SdTiledRenderingTest::testTdf103083()
CPPUNIT_ASSERT(pView->GetTextEditObject());
EditView& rEditView2 = pView->GetTextEditOutlinerView()->GetEditView();
rEditView2.SetSelection(ESelection(2, 0, 2, 10)); // start para, start char, end para, end char.
CPPUNIT_ASSERT_EQUAL(OUString(""), rEditView2.GetSelected());
CPPUNIT_ASSERT_EQUAL(OUString(), rEditView2.GetSelected());
// paste contents of bullet item
comphelper::dispatchCommand(".uno:Paste", uno::Sequence<beans::PropertyValue>());
sd/source/core/TransitionPreset.cxx
+1 -1
View File
@@ -160,7 +160,7 @@ bool TransitionPreset::importTransitionsFile( TransitionPresetList& rList,
}
pPreset->maSetLabel = sSet;
SAL_INFO("sd.transitions", aPresetId << ": " << sGroup << "/" << sSet << (sVariant.isEmpty() ? OUString("") : OUString("/" + sVariant)));
SAL_INFO("sd.transitions", aPresetId << ": " << sGroup << "/" << sSet << (sVariant.isEmpty() ? OUString() : OUString("/" + sVariant)));
rList.push_back( pPreset );
}
sfx2/source/appl/appserv.cxx
+1 -1
View File
@@ -170,7 +170,7 @@ namespace
return OUString( "Draw" );
break;
default:
return OUString( "" );
return OUString();
break;
}
}
sfx2/source/dialog/filedlghelper.cxx
+1 -1
View File
@@ -1575,7 +1575,7 @@ void FileDialogHelper_Impl::getRealFilter( OUString& _rFilter ) const
{
std::shared_ptr<const SfxFilter> pFilter =
mpMatcher->GetFilter4UIName( _rFilter, m_nMustFlags, m_nDontFlags );
_rFilter = pFilter ? pFilter->GetFilterName() : OUString("");
_rFilter = pFilter ? pFilter->GetFilterName() : OUString();
}
}
sfx2/source/doc/oleprops.cxx
+1 -1
View File
@@ -672,7 +672,7 @@ SfxOleDictionaryProperty::SfxOleDictionaryProperty( const SfxOleTextEncoding& rT
OUString SfxOleDictionaryProperty::GetPropertyName( sal_Int32 nPropId ) const
{
SfxOlePropNameMap::const_iterator aIt = maPropNameMap.find( nPropId );
return (aIt == maPropNameMap.end()) ? OUString("") : aIt->second;
return (aIt == maPropNameMap.end()) ? OUString() : aIt->second;
}
void SfxOleDictionaryProperty::SetPropertyName( sal_Int32 nPropId, const OUString& rPropName )
sfx2/source/notebookbar/SfxNotebookBar.cxx
+1 -1
View File
@@ -71,7 +71,7 @@ static OUString lcl_getAppName( vcl::EnumContext::Application eApp )
return OUString( "Impress" );
break;
default:
return OUString( "" );
return OUString();
break;
}
}
stoc/test/uriproc/test_uriproc.cxx
+1 -1
View File
@@ -239,7 +239,7 @@ void Test::testParse() {
data[i].pathSegmentCount, uriRef->getPathSegmentCount());
TEST_ASSERT_EQUAL(
"testParse", i, data[i].uriReference,
OUString(""), uriRef->getPathSegment(-1));
OUString(), uriRef->getPathSegment(-1));
TEST_ASSERT_EQUAL(
"testParse", i, data[i].uriReference,
OUString::createFromAscii(data[i].pathSegment0),
sw/qa/core/macros-test.cxx
+2 -2
View File
@@ -563,7 +563,7 @@ void SwMacrosTest::testFindReplace()
opts, false, SwDocPositions::Curr, SwDocPositions::End, bCancel);
CPPUNIT_ASSERT(bFound);
CPPUNIT_ASSERT(pPaM->HasMark());
CPPUNIT_ASSERT_EQUAL(OUString(""), pPaM->GetText());
CPPUNIT_ASSERT_EQUAL(OUString(), pPaM->GetText());
// now do another Find, inside the selection from the first Find
// opts.searchFlags = 71680;
@@ -571,7 +571,7 @@ void SwMacrosTest::testFindReplace()
opts, false, SwDocPositions::Curr, SwDocPositions::End, bCancel, FindRanges::InSel);
CPPUNIT_ASSERT(bFound);
CPPUNIT_ASSERT(pPaM->HasMark());
CPPUNIT_ASSERT_EQUAL(OUString(""), pPaM->GetText());
CPPUNIT_ASSERT_EQUAL(OUString(), pPaM->GetText());
rIDCO.ReplaceRange(*pPaM, " ", true);
sw/qa/extras/htmlimport/htmlimport.cxx
+2 -2
View File
@@ -106,7 +106,7 @@ DECLARE_HTMLIMPORT_TEST(testInlinedImagesPageAndParagraph, "PageAndParagraphFill
// due to being loaded embedded. BitmapMode is repeat.
uno::Reference<beans::XPropertySet> xPageProperties1(getStyles("PageStyles")->getByName("HTML"), uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_BITMAP, getProperty<drawing::FillStyle>(xPageProperties1, "FillStyle"));
CPPUNIT_ASSERT_EQUAL(OUString(""), getProperty<OUString>(xPageProperties1, "FillBitmapName"));
CPPUNIT_ASSERT_EQUAL(OUString(), getProperty<OUString>(xPageProperties1, "FillBitmapName"));
CPPUNIT_ASSERT_EQUAL(drawing::BitmapMode_REPEAT, getProperty<drawing::BitmapMode>(xPageProperties1, "FillBitmapMode"));
// we should have one paragraph
@@ -121,7 +121,7 @@ DECLARE_HTMLIMPORT_TEST(testInlinedImagesPageAndParagraph, "PageAndParagraphFill
// check for Bitmap FillStyle, name empty, repeat
CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_BITMAP, getProperty<drawing::FillStyle>(xParagraphProperties, "FillStyle"));
CPPUNIT_ASSERT_EQUAL(OUString(""), getProperty<OUString>(xParagraphProperties, "FillBitmapName"));
CPPUNIT_ASSERT_EQUAL(OUString(), getProperty<OUString>(xParagraphProperties, "FillBitmapName"));
CPPUNIT_ASSERT_EQUAL(drawing::BitmapMode_REPEAT, getProperty<drawing::BitmapMode>(xParagraphProperties, "FillBitmapMode"));
}
}
sw/qa/extras/mailmerge/mailmerge.cxx
+2 -2
View File
@@ -440,13 +440,13 @@ DECLARE_FILE_MAILMERGE_TEST(test2Pages, "simple-mail-merge-2pages.odt", "10-test
CPPUNIT_ASSERT_EQUAL( OUString( "Fixed text." ), getRun( getParagraph( 1 ), 1 )->getString());
CPPUNIT_ASSERT_EQUAL( lastname, getRun( getParagraph( 2 ), 1 )->getString());
CPPUNIT_ASSERT_EQUAL( OUString( "Another fixed text." ), getRun( getParagraph( 3 ), 1 )->getString());
CPPUNIT_ASSERT_EQUAL( OUString( "" ), getRun( getParagraph( 4 ), 1 )->getString()); // empty para at the end of page 1
CPPUNIT_ASSERT_EQUAL( OUString(), getRun( getParagraph( 4 ), 1 )->getString()); // empty para at the end of page 1
CPPUNIT_ASSERT_EQUAL( OUString( "Second page." ), getRun( getParagraph( 5 ), 1 )->getString());
CPPUNIT_ASSERT_EQUAL( firstname, getRun( getParagraph( 6 ), 1 )->getString());
// Also verify the layout.
CPPUNIT_ASSERT_EQUAL( lastname, parseDump("/root/page[1]/body/txt[2]/Special", "rText"));
CPPUNIT_ASSERT_EQUAL( OUString( "Fixed text." ), parseDump("/root/page[1]/body/txt[1]", ""));
CPPUNIT_ASSERT_EQUAL( OUString( "" ), parseDump("/root/page[1]/body/txt[4]", ""));
CPPUNIT_ASSERT_EQUAL( OUString(), parseDump("/root/page[1]/body/txt[4]", ""));
CPPUNIT_ASSERT_EQUAL( OUString( "Second page." ), parseDump("/root/page[2]/body/txt[1]", ""));
CPPUNIT_ASSERT_EQUAL( firstname, parseDump("/root/page[2]/body/txt[2]/Special", "rText"));
}
sw/qa/extras/odfexport/odfexport.cxx
+5 -5
View File
@@ -863,14 +863,14 @@ DECLARE_ODFEXPORT_TEST(testWhitespace, "whitespace.odt")
CPPUNIT_ASSERT_EQUAL(OUString("X "), xPortion->getString());
xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(OUString("Ruby"), getProperty<OUString>(xPortion, "TextPortionType"));
CPPUNIT_ASSERT_EQUAL(OUString(""), xPortion->getString());
CPPUNIT_ASSERT_EQUAL(OUString(), xPortion->getString());
CPPUNIT_ASSERT_EQUAL(OUString("foo"), getProperty<OUString>(xPortion, "RubyText"));
xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(OUString("Text"), getProperty<OUString>(xPortion, "TextPortionType"));
CPPUNIT_ASSERT_EQUAL(OUString(" "), xPortion->getString());
xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(OUString("Ruby"), getProperty<OUString>(xPortion, "TextPortionType"));
CPPUNIT_ASSERT_EQUAL(OUString(""), xPortion->getString());
CPPUNIT_ASSERT_EQUAL(OUString(), xPortion->getString());
xPortion.set(xPortions->nextElement(), uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(OUString("Text"), getProperty<OUString>(xPortion, "TextPortionType"));
CPPUNIT_ASSERT_EQUAL(OUString(" X"), xPortion->getString());
@@ -1318,7 +1318,7 @@ DECLARE_ODFEXPORT_TEST(testTableStyles2, "table_styles_2.odt")
xCell1Style->getPropertyValue("CharFontName") >>= sString;
CPPUNIT_ASSERT_EQUAL(OUString("Courier"), sString);
xCell1Style->getPropertyValue("CharFontStyleName") >>= sString;
CPPUNIT_ASSERT_EQUAL(OUString(""), sString);
CPPUNIT_ASSERT_EQUAL(OUString(), sString);
xCell1Style->getPropertyValue("CharFontFamily") >>= nInt16;
CPPUNIT_ASSERT_EQUAL(sal_Int16(2), nInt16);
xCell1Style->getPropertyValue("CharFontPitch") >>= nInt16;
@@ -1379,7 +1379,7 @@ DECLARE_ODFEXPORT_TEST(testTableStyles2, "table_styles_2.odt")
xCell1Style->getPropertyValue("CharFontName") >>= sString;
CPPUNIT_ASSERT_EQUAL(OUString("Liberation Serif"), sString);
xCell1Style->getPropertyValue("CharFontStyleName") >>= sString;
CPPUNIT_ASSERT_EQUAL(OUString(""), sString);
CPPUNIT_ASSERT_EQUAL(OUString(), sString);
xCell1Style->getPropertyValue("CharFontFamily") >>= nInt16;
CPPUNIT_ASSERT_EQUAL(sal_Int16(3), nInt16);
xCell1Style->getPropertyValue("CharFontPitch") >>= nInt16;
@@ -1440,7 +1440,7 @@ DECLARE_ODFEXPORT_TEST(testTableStyles2, "table_styles_2.odt")
xCell1Style->getPropertyValue("CharFontName") >>= sString;
CPPUNIT_ASSERT_EQUAL(OUString("Open Sans"), sString);
xCell1Style->getPropertyValue("CharFontStyleName") >>= sString;
CPPUNIT_ASSERT_EQUAL(OUString(""), sString);
CPPUNIT_ASSERT_EQUAL(OUString(), sString);
xCell1Style->getPropertyValue("CharFontFamily") >>= nInt16;
CPPUNIT_ASSERT_EQUAL(sal_Int16(0), nInt16);
xCell1Style->getPropertyValue("CharFontPitch") >>= nInt16;
sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
+1 -1
View File
@@ -1789,7 +1789,7 @@ DECLARE_OOXMLEXPORT_TEST(testFdo85542, "fdo85542.docx")
// B3 -- testing a collapsed bookmark
uno::Reference<text::XTextContent> xContent3(xBookmarksByName->getByName("B3"), uno::UNO_QUERY);
uno::Reference<text::XTextRange> xRange3(xContent3->getAnchor(), uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(xRange3->getString(), OUString(""));
CPPUNIT_ASSERT_EQUAL(xRange3->getString(), OUString());
uno::Reference<text::XText> xText(xRange3->getText( ), uno::UNO_QUERY);
uno::Reference<text::XTextCursor> xNeighborhoodCursor(xText->createTextCursor( ), uno::UNO_QUERY);
xNeighborhoodCursor->gotoRange(xRange3, false);
sw/qa/extras/rtfexport/rtfexport.cxx
+3 -3
View File
@@ -519,9 +519,9 @@ DECLARE_RTFEXPORT_TEST(testBookmark, "bookmark.rtf")
DECLARE_RTFEXPORT_TEST(testHyperlink, "hyperlink.rtf")
{
CPPUNIT_ASSERT_EQUAL(OUString(""), getProperty<OUString>(getRun(getParagraph(1), 1, "Hello"), "HyperLinkURL"));
CPPUNIT_ASSERT_EQUAL(OUString(), getProperty<OUString>(getRun(getParagraph(1), 1, "Hello"), "HyperLinkURL"));
CPPUNIT_ASSERT_EQUAL(OUString("http://en.wikipedia.org/wiki/World"), getProperty<OUString>(getRun(getParagraph(1), 2, "world"), "HyperLinkURL"));
CPPUNIT_ASSERT_EQUAL(OUString(""), getProperty<OUString>(getRun(getParagraph(1), 3, "!"), "HyperLinkURL"));
CPPUNIT_ASSERT_EQUAL(OUString(), getProperty<OUString>(getRun(getParagraph(1), 3, "!"), "HyperLinkURL"));
}
DECLARE_RTFEXPORT_TEST(testHyperlinkTdf100105, "hyperlink_empty.rtf")
@@ -532,7 +532,7 @@ DECLARE_RTFEXPORT_TEST(testHyperlinkTdf100105, "hyperlink_empty.rtf")
xCursor->gotoStart(false);
CPPUNIT_ASSERT_EQUAL(OUString("http://example.net"), getProperty<OUString>(xCursor, "HyperLinkURL"));
// getRun doesn't provide a 0-length hyperlink
CPPUNIT_ASSERT_EQUAL(OUString(""), getProperty<OUString>(getRun(getParagraph(1), 1, "foobar"), "HyperLinkURL"));
CPPUNIT_ASSERT_EQUAL(OUString(), getProperty<OUString>(getRun(getParagraph(1), 1, "foobar"), "HyperLinkURL"));
}
DECLARE_RTFEXPORT_TEST(test78758, "fdo78758.rtf")
sw/qa/extras/rtfimport/rtfimport.cxx
+1 -1
View File
@@ -1734,7 +1734,7 @@ DECLARE_RTFIMPORT_TEST(testContSectionPageBreak, "cont-section-pagebreak.rtf")
// actually not sure how many paragraph there should be between
// SECOND and THIRD - important is that the page break is on there
uno::Reference<text::XTextRange> xParaNext = getParagraph(3);
CPPUNIT_ASSERT_EQUAL(OUString(""), xParaNext->getString());
CPPUNIT_ASSERT_EQUAL(OUString(), xParaNext->getString());
//If PageDescName is not empty, a page break / switch to page style is defined
CPPUNIT_ASSERT(uno::Any() != getProperty<OUString>(xParaNext, "PageDescName"));
uno::Reference<text::XTextRange> xParaThird = getParagraph(4);
sw/qa/extras/uiwriter/uiwriter.cxx
+6 -6
View File
@@ -2115,7 +2115,7 @@ void SwUiWriterTest::testSearchWithTransliterate()
//transliteration option set so that at least one of the search strings is not found
sal_uLong case1 = pWrtShell->SearchPattern(SearchOpt,true,SwDocPositions::Start,SwDocPositions::End);
SwShellCursor* pShellCursor = pWrtShell->getShellCursor(true);
CPPUNIT_ASSERT_EQUAL(OUString(""),pShellCursor->GetText());
CPPUNIT_ASSERT_EQUAL(OUString(),pShellCursor->GetText());
CPPUNIT_ASSERT_EQUAL(0,(int)case1);
SearchOpt.searchString = "paragraph";
SearchOpt.transliterateFlags = TransliterationFlags::IGNORE_KASHIDA_CTL;
@@ -3553,7 +3553,7 @@ void SwUiWriterTest::testTdf87922()
struct PortionItem
{
PortionItem(OUString const & sItemType, sal_Int32 nLength = 0,
sal_uInt16 nTextType = 0, OUString const & sText = OUString(""))
sal_uInt16 nTextType = 0, OUString const & sText = OUString())
: msItemType(sItemType)
, mnLength(nLength)
, mnTextType(nTextType)
@@ -4639,10 +4639,10 @@ void SwUiWriterTest::testMsWordCompTrailingBlanks()
calcLayout();
// Check that trailing spaces spans have no width if option is enabled
CPPUNIT_ASSERT_EQUAL( OUString( "" ), parseDump( "/root/page/body/txt[2]/Text[4]", "nWidth" ) );
CPPUNIT_ASSERT_EQUAL( OUString( "" ), parseDump( "/root/page/body/txt[2]/Text[5]", "nWidth" ) );
CPPUNIT_ASSERT_EQUAL( OUString( "" ), parseDump( "/root/page/body/txt[3]/Text[4]", "nWidth" ) );
CPPUNIT_ASSERT_EQUAL( OUString( "" ), parseDump( "/root/page/body/txt[3]/Text[5]", "nWidth" ) );
CPPUNIT_ASSERT_EQUAL( OUString(), parseDump( "/root/page/body/txt[2]/Text[4]", "nWidth" ) );
CPPUNIT_ASSERT_EQUAL( OUString(), parseDump( "/root/page/body/txt[2]/Text[5]", "nWidth" ) );
CPPUNIT_ASSERT_EQUAL( OUString(), parseDump( "/root/page/body/txt[3]/Text[4]", "nWidth" ) );
CPPUNIT_ASSERT_EQUAL( OUString(), parseDump( "/root/page/body/txt[3]/Text[5]", "nWidth" ) );
// The option is false in settings.xml
pDoc = createDoc( "MsWordCompTrailingBlanksFalse.odt" );
sw/qa/extras/ww8export/ww8export.cxx
+5 -5
View File
@@ -1223,20 +1223,20 @@ DECLARE_WW8EXPORT_TEST(testCommentExport, "comment-export.odt")
{OUString("Text"), OUString("[B x "), 0},
{OUString("Annotation"), OUString("Comment on [C..C]"), 2},
{OUString("Text"), OUString("[C x B]"), 0},
{OUString("AnnotationEnd"), OUString(""), 1},
{OUString("AnnotationEnd"), OUString(), 1},
{OUString("Text"), OUString(" x C]"), 0},
{OUString("AnnotationEnd"), OUString(""), 2},
{OUString("AnnotationEnd"), OUString(), 2},
{OUString("Text"), OUString(" xx A]"), 0},
{OUString("AnnotationEnd"), OUString(""), 0},
{OUString("AnnotationEnd"), OUString(), 0},
{OUString("Text"), OUString(" Comment on a point"), 0},
{OUString("Annotation"), OUString("Comment on point"), 3},
{OUString("Text"), OUString("x "), 0},
{OUString("Annotation"), OUString("Comment on AA...BB"), 4},
{OUString("Annotation"), OUString("Comment on AAAAAA"), 5},
{OUString("Text"), OUString("AAAAAA"), 0},
{OUString("AnnotationEnd"), OUString(""), 5},
{OUString("AnnotationEnd"), OUString(), 5},
{OUString("Text"), OUString(" BBBBBB"), 0},
{OUString("AnnotationEnd"), OUString(""), 4}
{OUString("AnnotationEnd"), OUString(), 4}
};
OUString sNames[6];
sw/source/filter/ww8/ww8par3.cxx
+1 -1
View File
@@ -2483,7 +2483,7 @@ static void lcl_AddToPropertyContainer
{
uno::Reference<beans::XPropertyContainer>
xPropContainer(xPropSet, uno::UNO_QUERY);
uno::Any aAny(OUString(""));
uno::Any aAny((OUString()));
xPropContainer->addProperty
(rPropertyName,
static_cast<sal_Int16>(beans::PropertyAttribute::BOUND |
test/source/sheet/xsheetoutline.cxx
+8 -8
View File
@@ -79,14 +79,14 @@ void XSheetOutline::testHideDetail()
aSheetOutline->hideDetail(aLevelRangeAddress);
CPPUNIT_ASSERT_EQUAL_MESSAGE("Column level 2 not hidden",
getVisibleAdress(aSheet, colLevel2), OUString(""));
getVisibleAdress(aSheet, colLevel2), OUString());
// Row Level 2
aLevelRangeAddress = getAddressFromRangeString(aSheet, rowLevel2);
aSheetOutline->hideDetail(aLevelRangeAddress);
CPPUNIT_ASSERT_EQUAL_MESSAGE("Row level 2 not hidden",
getVisibleAdress(aSheet, rowLevel2), OUString(""));
getVisibleAdress(aSheet, rowLevel2), OUString());
}
@@ -145,7 +145,7 @@ void XSheetOutline::testShowLevel()
CPPUNIT_ASSERT_EQUAL_MESSAGE("testShowLevel Column", OUString("OutlineSheet.A1:D1"), getVisibleAdress(aSheet, "OutlineSheet.A1:D1"));
CPPUNIT_ASSERT_EQUAL_MESSAGE("testShowLevel Column", OUString("OutlineSheet.V1:Z1"), getVisibleAdress(aSheet, "OutlineSheet.V1:Z1"));
CPPUNIT_ASSERT_EQUAL_MESSAGE("testShowLevel Column", OUString(""), getVisibleAdress(aSheet, colLevel3));
CPPUNIT_ASSERT_EQUAL_MESSAGE("testShowLevel Column", OUString(), getVisibleAdress(aSheet, colLevel3));
/* FIXME !!
@@ -178,7 +178,7 @@ void XSheetOutline::testShowLevel()
CPPUNIT_ASSERT_EQUAL_MESSAGE("testShowLevel Row", OUString("OutlineSheet.A1:A4"), getVisibleAdress("OutlineSheet.A1:A4"));
CPPUNIT_ASSERT_EQUAL_MESSAGE("testShowLevel Row", OUString("OutlineSheet.A25:A30"), getVisibleAdress("OutlineSheet.A25:A30"));
CPPUNIT_ASSERT_EQUAL_MESSAGE("testShowLevel Row", OUString(""), getVisibleAdress(rowLevel3));
CPPUNIT_ASSERT_EQUAL_MESSAGE("testShowLevel Row", OUString(), getVisibleAdress(rowLevel3));
*/
@@ -197,7 +197,7 @@ void XSheetOutline::testGroup()
aSheetOutline->hideDetail(aLevelRangeAddress);
CPPUNIT_ASSERT_EQUAL_MESSAGE("testGroup Column still visible", getVisibleAdress(aSheet, aNewString), OUString(""));
CPPUNIT_ASSERT_EQUAL_MESSAGE("testGroup Column still visible", getVisibleAdress(aSheet, aNewString), OUString());
// Row Level 2
aNewString = "OutlineSheet.A50:A60";
@@ -206,7 +206,7 @@ void XSheetOutline::testGroup()
aSheetOutline->hideDetail(aLevelRangeAddress);
CPPUNIT_ASSERT_EQUAL_MESSAGE("testGroup Row still visible", getVisibleAdress(aSheet, aNewString), OUString(""));
CPPUNIT_ASSERT_EQUAL_MESSAGE("testGroup Row still visible", getVisibleAdress(aSheet, aNewString), OUString());
}
@@ -226,7 +226,7 @@ void XSheetOutline::testUngroup()
aSheetOutline->showDetail(aLevelRangeAddress);
// should remain hidden ?
CPPUNIT_ASSERT_EQUAL_MESSAGE("testUnGroup Column becomes visible after ungroup", getVisibleAdress(aSheet, aNewString), OUString(""));
CPPUNIT_ASSERT_EQUAL_MESSAGE("testUnGroup Column becomes visible after ungroup", getVisibleAdress(aSheet, aNewString), OUString());
// New Row level
aNewString = "OutlineSheet.A70:A80";
@@ -239,7 +239,7 @@ void XSheetOutline::testUngroup()
aSheetOutline->showDetail(aLevelRangeAddress);
// should remain hidden ?
CPPUNIT_ASSERT_EQUAL_MESSAGE("testUnGroup Row becomes visible after ungroup", getVisibleAdress(aSheet, aNewString), OUString(""));
CPPUNIT_ASSERT_EQUAL_MESSAGE("testUnGroup Row becomes visible after ungroup", getVisibleAdress(aSheet, aNewString), OUString());
}
tools/qa/cppunit/test_color.cxx
+1 -1
View File
@@ -82,7 +82,7 @@ OUString createTintShade(sal_uInt8 nR, sal_uInt8 nG, sal_uInt8 nB, OUString cons
{
Color aColor(nR, nG, nB);
if (sReference != aColor.AsRGBHexString())
return OUString("");
return OUString();
aColor.ApplyTintOrShade(nTintShade);
return aColor.AsRGBHexString();
}
unotools/source/config/compatibility.cxx
+2 -2
View File
@@ -44,8 +44,8 @@ SvtCompatibilityEntry::SvtCompatibilityEntry()
: m_aPropertyValue( SvtCompatibilityEntry::getElementCount() )
{
/* Should be in the start. Do not remove it. */
setValue<OUString>( Index::Name, OUString("") );
setValue<OUString>( Index::Module, OUString("") );
setValue<OUString>( Index::Name, OUString() );
setValue<OUString>( Index::Module, OUString() );
/* Editable list of default values. Sync it with the SvtCompatibilityEntry::Index enum class. */
setValue<bool>( Index::UsePrtMetrics, false );
vcl/headless/svpinst.cxx
+1 -1
View File
@@ -417,7 +417,7 @@ SalSession* SvpSalInstance::CreateSalSession()
OUString SvpSalInstance::GetConnectionIdentifier()
{
return OUString("");
return OUString();
}
void SvpSalInstance::StopTimer()
vcl/osx/salinst.cxx
+1 -1
View File
@@ -916,7 +916,7 @@ void AquaSalInstance::DestroyInfoPrinter( SalInfoPrinter* pPrinter )
OUString AquaSalInstance::GetConnectionIdentifier()
{
return OUString("");
return OUString();
}
// We need to re-encode file urls because osl_getFileURLFromSystemPath converts
vcl/source/app/IconThemeInfo.cxx
+1 -1
View File
@@ -31,7 +31,7 @@ filename_from_url(const OUString& url)
{
sal_Int32 slashPosition = url.lastIndexOf( '/' );
if (slashPosition < 0) {
return OUString("");
return OUString();
}
OUString filename = url.copy( slashPosition+1 );
return filename;
vcl/source/app/svapp.cxx
+1 -1
View File
@@ -1229,7 +1229,7 @@ OUString Application::GetDisplayName()
else if ( pSVData->maWinData.mpAppWin )
return pSVData->maWinData.mpAppWin->GetText();
else
return OUString("");
return OUString();
}
unsigned int Application::GetScreenCount()
vcl/source/edit/vclmedit.cxx
+3 -3
View File
@@ -1220,17 +1220,17 @@ void VclMultiLineEdit::SetText( const OUString& rStr )
OUString VclMultiLineEdit::GetText() const
{
return pImpVclMEdit ? pImpVclMEdit->GetText() : OUString("");
return pImpVclMEdit ? pImpVclMEdit->GetText() : OUString();
}
OUString VclMultiLineEdit::GetText( LineEnd aSeparator ) const
{
return pImpVclMEdit ? pImpVclMEdit->GetText( aSeparator ) : OUString("");
return pImpVclMEdit ? pImpVclMEdit->GetText( aSeparator ) : OUString();
}
OUString VclMultiLineEdit::GetTextLines( LineEnd aSeparator ) const
{
return pImpVclMEdit ? pImpVclMEdit->GetTextLines( aSeparator ) : OUString("");
return pImpVclMEdit ? pImpVclMEdit->GetTextLines( aSeparator ) : OUString();
}
void VclMultiLineEdit::Resize()
vcl/source/filter/FilterConfigCache.cxx
+14 -14
View File
@@ -313,7 +313,7 @@ OUString FilterConfigCache::GetImportFilterName( sal_uInt16 nFormat )
{
if( nFormat < aImport.size() )
return aImport[ nFormat ].sFilterName;
return OUString("");
return OUString();
}
sal_uInt16 FilterConfigCache::GetImportFormatNumber( const OUString& rFormatName )
@@ -369,42 +369,42 @@ OUString FilterConfigCache::GetImportFormatName( sal_uInt16 nFormat )
{
if( nFormat < aImport.size() )
return aImport[ nFormat ].sUIName;
return OUString("");
return OUString();
}
OUString FilterConfigCache::GetImportFormatMediaType( sal_uInt16 nFormat )
{
if( nFormat < aImport.size() )
return aImport[ nFormat ].sMediaType;
return OUString("");
return OUString();
}
OUString FilterConfigCache::GetImportFormatShortName( sal_uInt16 nFormat )
{
if( nFormat < aImport.size() )
return aImport[ nFormat ].GetShortName();
return OUString("");
return OUString();
}
OUString FilterConfigCache::GetImportFormatExtension( sal_uInt16 nFormat, sal_Int32 nEntry )
{
if ( (nFormat < aImport.size()) && (nEntry < aImport[ nFormat ].lExtensionList.getLength()) )
return aImport[ nFormat ].lExtensionList[ nEntry ];
return OUString("");
return OUString();
}
OUString FilterConfigCache::GetImportFilterType( sal_uInt16 nFormat )
{
if( nFormat < aImport.size() )
return aImport[ nFormat ].sType;
return OUString("");
return OUString();
}
OUString FilterConfigCache::GetImportFilterTypeName( sal_uInt16 nFormat )
{
if( nFormat < aImport.size() )
return aImport[ nFormat ].sFilterType;
return OUString("");
return OUString();
}
OUString FilterConfigCache::GetExternalFilterName(sal_uInt16 nFormat, bool bExport)
@@ -419,7 +419,7 @@ OUString FilterConfigCache::GetExternalFilterName(sal_uInt16 nFormat, bool bExpo
if (nFormat < aImport.size())
return aImport[nFormat].sExternalFilterName;
}
return OUString("");
return OUString();
}
OUString FilterConfigCache::GetImportWildcard(sal_uInt16 nFormat, sal_Int32 nEntry)
@@ -439,7 +439,7 @@ OUString FilterConfigCache::GetExportFilterName( sal_uInt16 nFormat )
{
if( nFormat < aExport.size() )
return aExport[ nFormat ].sFilterName;
return OUString("");
return OUString();
}
sal_uInt16 FilterConfigCache::GetExportFormatNumber(const OUString& rFormatName)
@@ -491,35 +491,35 @@ OUString FilterConfigCache::GetExportFormatName( sal_uInt16 nFormat )
{
if( nFormat < aExport.size() )
return aExport[ nFormat ].sUIName;
return OUString("");
return OUString();
}
OUString FilterConfigCache::GetExportFormatMediaType( sal_uInt16 nFormat )
{
if( nFormat < aExport.size() )
return aExport[ nFormat ].sMediaType;
return OUString("");
return OUString();
}
OUString FilterConfigCache::GetExportFormatShortName( sal_uInt16 nFormat )
{
if( nFormat < aExport.size() )
return aExport[ nFormat ].GetShortName();
return OUString("");
return OUString();
}
OUString FilterConfigCache::GetExportFormatExtension( sal_uInt16 nFormat, sal_Int32 nEntry )
{
if ( (nFormat < aExport.size()) && (nEntry < aExport[ nFormat ].lExtensionList.getLength()) )
return aExport[ nFormat ].lExtensionList[ nEntry ];
return OUString("");
return OUString();
}
OUString FilterConfigCache::GetExportInternalFilterName( sal_uInt16 nFormat )
{
if( nFormat < aExport.size() )
return aExport[ nFormat ].sInternalFilterName;
return OUString("");
return OUString();
}
OUString FilterConfigCache::GetExportWildcard( sal_uInt16 nFormat, sal_Int32 nEntry )
vcl/unx/generic/app/salinst.cxx
+1 -1
View File
@@ -176,7 +176,7 @@ SalYieldResult X11SalInstance::DoYield(bool bWait, bool bHandleAllCurrentEvents,
OUString X11SalInstance::GetConnectionIdentifier()
{
static const char* pDisplay = getenv( "DISPLAY" );
return pDisplay ? OUString::createFromAscii(pDisplay) : OUString("");
return pDisplay ? OUString::createFromAscii(pDisplay) : OUString();
}
SalFrame *X11SalInstance::CreateFrame( SalFrame *pParent, SalFrameStyleFlags nSalFrameStyle )
vcl/win/app/salinst.cxx
+1 -1
View File
@@ -892,7 +892,7 @@ void WinSalInstance::DestroyObject( SalObject* pObject )
OUString WinSalInstance::GetConnectionIdentifier()
{
return OUString("");
return OUString();
}
/** Add a file to the system shells recent document list if there is any.
writerfilter/source/dmapper/DomainMapper_Impl.cxx
+1 -1
View File
@@ -2961,7 +2961,7 @@ if(!bFilled)
{OUString("BIBLIOGRAPHY"), "com.sun.star.text.Bibliography", FIELD_BIBLIOGRAPHY},
{OUString("CITATION"), "com.sun.star.text.TextField.Bibliography", FIELD_CITATION},
// {OUString(""), "", "", FIELD_},
// {OUString(), "", "", FIELD_},
};
size_t nConversions = SAL_N_ELEMENTS(aFields);
writerfilter/source/dmapper/ThemeTable.cxx
+1 -1
View File
@@ -552,7 +552,7 @@ OUString ThemeTable::fromLCIDToScriptTag(LanguageType lang)
case 0x478 : // lidYi
return OUString("Yiii");
default:
return OUString("");
return OUString();
}
}
writerfilter/source/filter/WriterFilter.cxx
+1 -1
View File
@@ -153,7 +153,7 @@ sal_Bool WriterFilter::filter(const uno::Sequence< beans::PropertyValue >& aDesc
{
utl::MediaDescriptor aMediaDesc(aDescriptor);
bool bRepairStorage = aMediaDesc.getUnpackedValueOrDefault("RepairPackage", false);
bool bSkipImages = aMediaDesc.getUnpackedValueOrDefault("FilterOptions", OUString("")) == "SkipImages";
bool bSkipImages = aMediaDesc.getUnpackedValueOrDefault("FilterOptions", OUString()) == "SkipImages";
uno::Reference< io::XInputStream > xInputStream;
try
xmlsecurity/source/gpg/SecurityEnvironment.cxx
+1 -1
View File
@@ -54,7 +54,7 @@ const Sequence< sal_Int8>& SecurityEnvironmentGpg::getUnoTunnelId() {
OUString SecurityEnvironmentGpg::getSecurityEnvironmentInformation()
{
return OUString("");
return OUString();
}
Sequence< Reference < XCertificate > > SecurityEnvironmentGpg::getPersonalCertificates()