summaryrefslogtreecommitdiff
path: root/sw/source/core/fields
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/core/fields')
-rw-r--r--sw/source/core/fields/authfld.cxx11
-rw-r--r--sw/source/core/fields/cellfml.cxx14
-rw-r--r--sw/source/core/fields/dbfld.cxx21
-rw-r--r--sw/source/core/fields/ddefld.cxx13
-rw-r--r--sw/source/core/fields/docufld.cxx79
-rw-r--r--sw/source/core/fields/expfld.cxx29
-rw-r--r--sw/source/core/fields/fldbas.cxx12
-rw-r--r--sw/source/core/fields/flddat.cxx6
-rw-r--r--sw/source/core/fields/flddropdown.cxx43
-rw-r--r--sw/source/core/fields/macrofld.cxx15
-rw-r--r--sw/source/core/fields/reffld.cxx13
-rw-r--r--sw/source/core/fields/scrptfld.cxx9
-rw-r--r--sw/source/core/fields/tblcalc.cxx11
-rw-r--r--sw/source/core/fields/textapi.cxx2
-rw-r--r--sw/source/core/fields/usrfld.cxx11
15 files changed, 139 insertions, 150 deletions
diff --git a/sw/source/core/fields/authfld.cxx b/sw/source/core/fields/authfld.cxx
index 8870c4e4710e..ab369586a8f7 100644
--- a/sw/source/core/fields/authfld.cxx
+++ b/sw/source/core/fields/authfld.cxx
@@ -43,7 +43,6 @@
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::lang;
-using rtl::OUString;
SwAuthEntry::SwAuthEntry(const SwAuthEntry& rCopy)
@@ -396,8 +395,8 @@ bool SwAuthorityFieldType::QueryValue( Any& rVal, sal_uInt16 nWhichId ) const
{
Sequence<PropertyValues> aRet(m_SortKeyArr.size());
PropertyValues* pValues = aRet.getArray();
- OUString sProp1( rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SORT_KEY)) ),
- sProp2( rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_IS_SORT_ASCENDING)));
+ OUString sProp1( OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_SORT_KEY)) ),
+ sProp2( OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_IS_SORT_ASCENDING)));
for(sal_uInt16 i = 0; i < m_SortKeyArr.size(); i++)
{
const SwTOXSortKey* pKey = &m_SortKeyArr[i];
@@ -580,7 +579,7 @@ const String& SwAuthorityField::GetFieldText(ToxAuthorityField eField) const
return pEntry->GetAuthorField( eField );
}
-void SwAuthorityField::SetPar1(const rtl::OUString& rStr)
+void SwAuthorityField::SetPar1(const OUString& rStr)
{
SwAuthorityFieldType* pInitType = (SwAuthorityFieldType* )GetTyp();
pInitType->RemoveField(m_nHandle);
@@ -638,7 +637,7 @@ bool SwAuthorityField::QueryValue( Any& rAny, sal_uInt16 /*nWhichId*/ ) const
PropertyValue* pValues = aRet.getArray();
for(sal_Int16 i = 0; i < AUTH_FIELD_END; i++)
{
- pValues[i].Name = rtl::OUString::createFromAscii(aFieldNames[i]);
+ pValues[i].Name = OUString::createFromAscii(aFieldNames[i]);
const String& rField = pAuthEntry->GetAuthorField((ToxAuthorityField) i);
if(i == AUTH_FIELD_AUTHORITY_TYPE)
pValues[i].Value <<= sal_Int16(rField.ToInt32());
@@ -667,7 +666,7 @@ bool SwAuthorityField::PutValue( const Any& rAny, sal_uInt16 /*nWhichId*/ )
if(!(rAny >>= aParam))
return false;
- rtl::OUStringBuffer sBuf;
+ OUStringBuffer sBuf;
comphelper::string::padToLength(sBuf, AUTH_FIELD_ISBN, TOX_STYLE_DELIMITER);
String sToSet(sBuf.makeStringAndClear());
const PropertyValue* pParam = aParam.getConstArray();
diff --git a/sw/source/core/fields/cellfml.cxx b/sw/source/core/fields/cellfml.cxx
index 44ca2e3323dd..1eb50c940dbe 100644
--- a/sw/source/core/fields/cellfml.cxx
+++ b/sw/source/core/fields/cellfml.cxx
@@ -411,7 +411,7 @@ void SwTableFormula::RelBoxNmsToPtr( const SwTable& rTbl, String& rNewStr,
if( pLastBox )
{
if( 0 != ( pRelBox = lcl_RelToBox( rTbl, pBox, *pLastBox )) )
- rNewStr += rtl::OUString::valueOf(static_cast<sal_Int64>((sal_PtrDiff)pRelBox));
+ rNewStr += OUString::valueOf(static_cast<sal_Int64>((sal_PtrDiff)pRelBox));
else
rNewStr += '0';
rNewStr += ':';
@@ -419,7 +419,7 @@ void SwTableFormula::RelBoxNmsToPtr( const SwTable& rTbl, String& rNewStr,
}
if( 0 != ( pRelBox = lcl_RelToBox( rTbl, pBox, rFirstBox )) )
- rNewStr += rtl::OUString::valueOf(static_cast<sal_Int64>((sal_PtrDiff)pRelBox));
+ rNewStr += OUString::valueOf(static_cast<sal_Int64>((sal_PtrDiff)pRelBox));
else
rNewStr += '0';
@@ -506,13 +506,13 @@ void SwTableFormula::BoxNmsToPtr( const SwTable& rTbl, String& rNewStr,
if( pLastBox )
{
pBox = rTbl.GetTblBox( *pLastBox );
- rNewStr += rtl::OUString::valueOf(static_cast<sal_Int64>((sal_PtrDiff)pBox));
+ rNewStr += OUString::valueOf(static_cast<sal_Int64>((sal_PtrDiff)pBox));
rNewStr += ':';
rFirstBox.Erase( 0, pLastBox->Len()+1 );
}
pBox = rTbl.GetTblBox( rFirstBox );
- rNewStr += rtl::OUString::valueOf(static_cast<sal_Int64>((sal_PtrDiff)pBox));
+ rNewStr += OUString::valueOf(static_cast<sal_Int64>((sal_PtrDiff)pBox));
// Kennung fuer Box erhalten
rNewStr += rFirstBox.GetChar( rFirstBox.Len() - 1 );
@@ -827,7 +827,7 @@ static String lcl_BoxNmToRel( const SwTable& rTbl, const SwTableNode& rTblNd,
// in die Externe Darstellung umwandeln.
SwTableBox* pBox = reinterpret_cast<SwTableBox*>(sal::static_int_cast<sal_IntPtr>(sTmp.ToInt64()));
if( rTbl.GetTabSortBoxes().find( pBox ) == rTbl.GetTabSortBoxes().end() )
- return rtl::OUString('?');
+ return OUString('?');
sTmp = pBox->GetName();
}
@@ -1175,8 +1175,8 @@ void SwTableFormula::_SplitMergeBoxNm( const SwTable& rTbl, String& rNewStr,
}
if( pLastBox )
- ( rNewStr += rtl::OUString::valueOf(static_cast<sal_Int64>((sal_PtrDiff)pEndBox)) ) += ':';
- ( rNewStr += rtl::OUString::valueOf(static_cast<sal_Int64>((sal_PtrDiff)pSttBox)) )
+ ( rNewStr += OUString::valueOf(static_cast<sal_Int64>((sal_PtrDiff)pEndBox)) ) += ':';
+ ( rNewStr += OUString::valueOf(static_cast<sal_Int64>((sal_PtrDiff)pSttBox)) )
+= rFirstBox.GetChar( rFirstBox.Len() - 1 );
}
diff --git a/sw/source/core/fields/dbfld.cxx b/sw/source/core/fields/dbfld.cxx
index bea128ecd751..c3c63381b527 100644
--- a/sw/source/core/fields/dbfld.cxx
+++ b/sw/source/core/fields/dbfld.cxx
@@ -42,7 +42,6 @@
using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star;
-using ::rtl::OUString;
/*--------------------------------------------------------------------
Beschreibung: Datenbanktrenner durch Punkte fuer Anzeige ersetzen
@@ -70,7 +69,7 @@ SwDBFieldType::SwDBFieldType(SwDoc* pDocPtr, const String& rNam, const SwDBData&
{
if(!aDBData.sDataSource.isEmpty() || !aDBData.sCommand.isEmpty())
{
- sName = rtl::OUStringBuffer(aDBData.sDataSource).append(DB_DELIM).
+ sName = OUStringBuffer(aDBData.sDataSource).append(DB_DELIM).
append(aDBData.sCommand).append(DB_DELIM).makeStringAndClear();
}
sName += GetColumnName();
@@ -88,7 +87,7 @@ SwFieldType* SwDBFieldType::Copy() const
}
//------------------------------------------------------------------------------
-const rtl::OUString& SwDBFieldType::GetName() const
+const OUString& SwDBFieldType::GetName() const
{
return sName;
}
@@ -205,7 +204,7 @@ void SwDBField::InitContent()
{
if (!IsInitialized())
{
- aContent = rtl::OUStringBuffer().append('<')
+ aContent = OUStringBuffer().append('<')
.append(((const SwDBFieldType*)GetTyp())->GetColumnName())
.append('>').makeStringAndClear();
}
@@ -364,7 +363,7 @@ void SwDBField::Evaluate()
Beschreibung: Namen erfragen
--------------------------------------------------------------------*/
-const rtl::OUString& SwDBField::GetPar1() const
+const OUString& SwDBField::GetPar1() const
{
return ((const SwDBFieldType*)GetTyp())->GetName();
}
@@ -640,12 +639,12 @@ void SwDBNextSetField::Evaluate(SwDoc* pDoc)
Beschreibung: Bedingung
--------------------------------------------------------------------*/
-const rtl::OUString& SwDBNextSetField::GetPar1() const
+const OUString& SwDBNextSetField::GetPar1() const
{
return aCond;
}
-void SwDBNextSetField::SetPar1(const rtl::OUString& rStr)
+void SwDBNextSetField::SetPar1(const OUString& rStr)
{
aCond = rStr;
}
@@ -743,12 +742,12 @@ void SwDBNumSetField::Evaluate(SwDoc* pDoc)
Beschreibung: LogDBName
--------------------------------------------------------------------*/
-const rtl::OUString& SwDBNumSetField::GetPar1() const
+const OUString& SwDBNumSetField::GetPar1() const
{
return aCond;
}
-void SwDBNumSetField::SetPar1(const rtl::OUString& rStr)
+void SwDBNumSetField::SetPar1(const OUString& rStr)
{
aCond = rStr;
}
@@ -757,12 +756,12 @@ void SwDBNumSetField::SetPar1(const rtl::OUString& rStr)
Beschreibung: Bedingung
--------------------------------------------------------------------*/
-rtl::OUString SwDBNumSetField::GetPar2() const
+OUString SwDBNumSetField::GetPar2() const
{
return aPar2;
}
-void SwDBNumSetField::SetPar2(const rtl::OUString& rStr)
+void SwDBNumSetField::SetPar2(const OUString& rStr)
{
aPar2 = rStr;
}
diff --git a/sw/source/core/fields/ddefld.cxx b/sw/source/core/fields/ddefld.cxx
index e11c113c1fb7..5f79e3c7823a 100644
--- a/sw/source/core/fields/ddefld.cxx
+++ b/sw/source/core/fields/ddefld.cxx
@@ -32,7 +32,6 @@
#include <unofldmid.h>
#include <hints.hxx>
-using rtl::OUString;
using namespace ::com::sun::star;
#define DDE_TXT_ENCODING osl_getThreadTextEncoding()
@@ -263,7 +262,7 @@ SwFieldType* SwDDEFieldType::Copy() const
return pType;
}
-const rtl::OUString& SwDDEFieldType::GetName() const
+const OUString& SwDDEFieldType::GetName() const
{
return aName;
}
@@ -333,7 +332,7 @@ bool SwDDEFieldType::QueryValue( uno::Any& rVal, sal_uInt16 nWhichId ) const
}
break;
case FIELD_PROP_PAR5:
- rVal <<= ::rtl::OUString(aExpansion);
+ rVal <<= OUString(aExpansion);
break;
default:
OSL_FAIL("illegal property");
@@ -358,7 +357,7 @@ bool SwDDEFieldType::PutValue( const uno::Any& rVal, sal_uInt16 nWhichId )
break;
case FIELD_PROP_PAR5:
{
- ::rtl::OUString sTemp;
+ OUString sTemp;
rVal >>= sTemp;
aExpansion = sTemp;
}
@@ -411,7 +410,7 @@ SwField* SwDDEField::Copy() const
Beschreibung: Parameter des Typen erfragen
Name
--------------------------------------------------------------------*/
-const rtl::OUString& SwDDEField::GetPar1() const
+const OUString& SwDDEField::GetPar1() const
{
return ((const SwDDEFieldType*)GetTyp())->GetName();
}
@@ -420,12 +419,12 @@ const rtl::OUString& SwDDEField::GetPar1() const
Beschreibung: Parameter des Typen erfragen
Commando
--------------------------------------------------------------------*/
-rtl::OUString SwDDEField::GetPar2() const
+OUString SwDDEField::GetPar2() const
{
return ((const SwDDEFieldType*)GetTyp())->GetCmd();
}
-void SwDDEField::SetPar2(const rtl::OUString& rStr)
+void SwDDEField::SetPar2(const OUString& rStr)
{
((SwDDEFieldType*)GetTyp())->SetCmd(rStr);
}
diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx
index 98bb00f9f77d..5783b506aae9 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -96,7 +96,6 @@
#define URL_DECODE INetURLObject::DECODE_UNAMBIGUOUS
-using ::rtl::OUString;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace nsSwDocInfoSubType;
@@ -236,12 +235,12 @@ SwField* SwPageNumberField::Copy() const
return pTmp;
}
-rtl::OUString SwPageNumberField::GetPar2() const
+OUString SwPageNumberField::GetPar2() const
{
return OUString::number(nOffset);
}
-void SwPageNumberField::SetPar2(const rtl::OUString& rStr)
+void SwPageNumberField::SetPar2(const OUString& rStr)
{
nOffset = (short)rStr.toInt32();
}
@@ -394,7 +393,7 @@ bool SwAuthorField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const
break;
case FIELD_PROP_PAR1:
- rAny <<= rtl::OUString(GetContent());
+ rAny <<= OUString(GetContent());
break;
default:
@@ -951,7 +950,7 @@ String SwDocInfoFieldType::Expand( sal_uInt16 nSub, sal_uInt32 nFormat,
break;
case DI_CUSTOM:
{
- ::rtl::OUString sVal;
+ OUString sVal;
try
{
uno::Any aAny;
@@ -1109,7 +1108,7 @@ String SwDocInfoField::Expand() const
if ( !IsFixed() )
{
// if the field is "fixed" we don't update it from the property
- ::rtl::OUString sVal;
+ OUString sVal;
uno::Reference < script::XTypeConverter > xConverter( script::Converter::create(comphelper::getProcessComponentContext()) );
util::Date aDate;
util::DateTime aDateTime;
@@ -1130,14 +1129,14 @@ String SwDocInfoField::Expand() const
}
else if( aAny >>= aDuration )
{
- String sText = aDuration.Negative ? rtl::OUString('-') : rtl::OUString('+');
+ String sText = aDuration.Negative ? OUString('-') : OUString('+');
sText += ViewShell::GetShellRes()->sDurationFormat;
- sText.SearchAndReplace(rtl::OUString("%1"), OUString::number( aDuration.Years ) );
- sText.SearchAndReplace(rtl::OUString("%2"), OUString::number( aDuration.Months ) );
- sText.SearchAndReplace(rtl::OUString("%3"), OUString::number( aDuration.Days ) );
- sText.SearchAndReplace(rtl::OUString("%4"), OUString::number( aDuration.Hours ) );
- sText.SearchAndReplace(rtl::OUString("%5"), OUString::number( aDuration.Minutes) );
- sText.SearchAndReplace(rtl::OUString("%6"), OUString::number( aDuration.Seconds) );
+ sText.SearchAndReplace(OUString("%1"), OUString::number( aDuration.Years ) );
+ sText.SearchAndReplace(OUString("%2"), OUString::number( aDuration.Months ) );
+ sText.SearchAndReplace(OUString("%3"), OUString::number( aDuration.Days ) );
+ sText.SearchAndReplace(OUString("%4"), OUString::number( aDuration.Hours ) );
+ sText.SearchAndReplace(OUString("%5"), OUString::number( aDuration.Minutes) );
+ sText.SearchAndReplace(OUString("%6"), OUString::number( aDuration.Seconds) );
sVal = sText;
}
else
@@ -1243,7 +1242,7 @@ bool SwDocInfoField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const
}
break;
case FIELD_PROP_PAR3:
- rAny <<= rtl::OUString(Expand());
+ rAny <<= OUString(Expand());
break;
case FIELD_PROP_BOOL2:
{
@@ -1488,13 +1487,13 @@ SwField* SwHiddenTxtField::Copy() const
Beschreibung: Bedingung setzen
--------------------------------------------------------------------*/
-void SwHiddenTxtField::SetPar1(const rtl::OUString& rStr)
+void SwHiddenTxtField::SetPar1(const OUString& rStr)
{
aCond = rStr;
bCanToggle = aCond.getLength() > 0;
}
-const rtl::OUString& SwHiddenTxtField::GetPar1() const
+const OUString& SwHiddenTxtField::GetPar1() const
{
return aCond;
}
@@ -1503,7 +1502,7 @@ const rtl::OUString& SwHiddenTxtField::GetPar1() const
Beschreibung: True/False Text
--------------------------------------------------------------------*/
-void SwHiddenTxtField::SetPar2(const rtl::OUString& rStr)
+void SwHiddenTxtField::SetPar2(const OUString& rStr)
{
if (nSubType == TYP_CONDTXTFLD)
{
@@ -1520,7 +1519,7 @@ void SwHiddenTxtField::SetPar2(const rtl::OUString& rStr)
aTRUETxt = rStr;
}
-rtl::OUString SwHiddenTxtField::GetPar2() const
+OUString SwHiddenTxtField::GetPar2() const
{
String aRet(aTRUETxt);
if(nSubType == TYP_CONDTXTFLD)
@@ -1538,7 +1537,7 @@ sal_uInt16 SwHiddenTxtField::GetSubType() const
bool SwHiddenTxtField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const
{
- const rtl::OUString* pOut = 0;
+ const OUString* pOut = 0;
switch( nWhichId )
{
case FIELD_PROP_PAR1:
@@ -1573,7 +1572,7 @@ bool SwHiddenTxtField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
{
case FIELD_PROP_PAR1:
{
- rtl::OUString sVal;
+ OUString sVal;
rAny >>= sVal;
SetPar1(sVal);
}
@@ -1710,12 +1709,12 @@ bool SwHiddenParaField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
Beschreibung: Bedingung setzen
--------------------------------------------------------------------*/
-void SwHiddenParaField::SetPar1(const rtl::OUString& rStr)
+void SwHiddenParaField::SetPar1(const OUString& rStr)
{
aCond = rStr;
}
-const rtl::OUString& SwHiddenParaField::GetPar1() const
+const OUString& SwHiddenParaField::GetPar1() const
{
return aCond;
}
@@ -1800,12 +1799,12 @@ SwField* SwPostItField::Copy() const
Beschreibung: Author setzen
--------------------------------------------------------------------*/
-void SwPostItField::SetPar1(const rtl::OUString& rStr)
+void SwPostItField::SetPar1(const OUString& rStr)
{
sAuthor = rStr;
}
-const rtl::OUString& SwPostItField::GetPar1() const
+const OUString& SwPostItField::GetPar1() const
{
return sAuthor;
}
@@ -1814,27 +1813,27 @@ const rtl::OUString& SwPostItField::GetPar1() const
Beschreibung: Text fuers PostIt setzen
--------------------------------------------------------------------*/
-void SwPostItField::SetPar2(const rtl::OUString& rStr)
+void SwPostItField::SetPar2(const OUString& rStr)
{
sTxt = rStr;
}
-rtl::OUString SwPostItField::GetPar2() const
+OUString SwPostItField::GetPar2() const
{
return sTxt;
}
-const rtl::OUString& SwPostItField::GetInitials() const
+const OUString& SwPostItField::GetInitials() const
{
return sInitials;
}
-void SwPostItField::SetName(const rtl::OUString& rName)
+void SwPostItField::SetName(const OUString& rName)
{
sName = rName;
}
-const rtl::OUString& SwPostItField::GetName() const
+const OUString& SwPostItField::GetName() const
{
return sName;
}
@@ -2146,12 +2145,12 @@ SwField* SwRefPageSetField::Copy() const
return new SwRefPageSetField( (SwRefPageSetFieldType*)GetTyp(), nOffset, bOn );
}
-rtl::OUString SwRefPageSetField::GetPar2() const
+OUString SwRefPageSetField::GetPar2() const
{
return OUString::number(GetOffset());
}
-void SwRefPageSetField::SetPar2(const rtl::OUString& rStr)
+void SwRefPageSetField::SetPar2(const OUString& rStr)
{
SetOffset( (short) rStr.toInt32() );
}
@@ -2477,7 +2476,7 @@ SwJumpEditField::SwJumpEditField( SwJumpEditFieldType* pTyp, sal_uInt32 nForm,
String SwJumpEditField::Expand() const
{
- return rtl::OUStringBuffer().append('<').
+ return OUStringBuffer().append('<').
append(sTxt).append('>').makeStringAndClear();
}
@@ -2489,24 +2488,24 @@ SwField* SwJumpEditField::Copy() const
// Platzhalter-Text
-const rtl::OUString& SwJumpEditField::GetPar1() const
+const OUString& SwJumpEditField::GetPar1() const
{
return sTxt;
}
-void SwJumpEditField::SetPar1(const rtl::OUString& rStr)
+void SwJumpEditField::SetPar1(const OUString& rStr)
{
sTxt = rStr;
}
// HinweisText
-rtl::OUString SwJumpEditField::GetPar2() const
+OUString SwJumpEditField::GetPar2() const
{
return sHelp;
}
-void SwJumpEditField::SetPar2(const rtl::OUString& rStr)
+void SwJumpEditField::SetPar2(const OUString& rStr)
{
sHelp = rStr;
}
@@ -2610,12 +2609,12 @@ SwField* SwCombinedCharField::Copy() const
sCharacters );
}
-const rtl::OUString& SwCombinedCharField::GetPar1() const
+const OUString& SwCombinedCharField::GetPar1() const
{
return sCharacters;
}
-void SwCombinedCharField::SetPar1(const rtl::OUString& rStr)
+void SwCombinedCharField::SetPar1(const OUString& rStr)
{
sCharacters = rStr.copy(0, std::min<sal_Int32>(rStr.getLength(), MAX_COMBINED_CHARACTERS));
}
@@ -2626,7 +2625,7 @@ bool SwCombinedCharField::QueryValue( uno::Any& rAny,
switch( nWhichId )
{
case FIELD_PROP_PAR1:
- rAny <<= rtl::OUString( sCharacters );
+ rAny <<= OUString( sCharacters );
break;
default:
OSL_FAIL("illegal property");
@@ -2641,7 +2640,7 @@ bool SwCombinedCharField::PutValue( const uno::Any& rAny,
{
case FIELD_PROP_PAR1:
{
- rtl::OUString sTmp;
+ OUString sTmp;
rAny >>= sTmp;
SetPar1(sTmp);
}
diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx
index 4407919bb519..fd7e96a12000 100644
--- a/sw/source/core/fields/expfld.cxx
+++ b/sw/source/core/fields/expfld.cxx
@@ -57,7 +57,6 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::text;
-using ::rtl::OUString;
//-----------------------------------------------------------------------------
static sal_Int16 lcl_SubTypeToAPI(sal_uInt16 nSubType)
@@ -386,12 +385,12 @@ void SwGetExpField::ChangeExpansion( const SwFrm& rFrm, const SwTxtFld& rFld )
}
}
-rtl::OUString SwGetExpField::GetPar2() const
+OUString SwGetExpField::GetPar2() const
{
return GetFormula();
}
-void SwGetExpField::SetPar2(const rtl::OUString& rStr)
+void SwGetExpField::SetPar2(const OUString& rStr)
{
SetFormula(rStr);
}
@@ -443,7 +442,7 @@ bool SwGetExpField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const
}
break;
case FIELD_PROP_PAR4:
- rAny <<= rtl::OUString(GetExpStr());
+ rAny <<= OUString(GetExpStr());
break;
default:
return SwField::QueryValue(rAny, nWhichId);
@@ -495,7 +494,7 @@ SwSetExpFieldType::SwSetExpFieldType( SwDoc* pDc, const String& rName, sal_uInt1
: SwValueFieldType( pDc, RES_SETEXPFLD ),
sName( rName ),
pOutlChgNd( 0 ),
- sDelim( rtl::OUString(".") ),
+ sDelim( OUString(".") ),
nType(nTyp), nLevel( UCHAR_MAX ),
bDeleted( sal_False )
{
@@ -513,7 +512,7 @@ SwFieldType* SwSetExpFieldType::Copy() const
return pNew;
}
-const rtl::OUString& SwSetExpFieldType::GetName() const
+const OUString& SwSetExpFieldType::GetName() const
{
return sName;
}
@@ -674,7 +673,7 @@ bool SwSetExpFieldType::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
if( ::GetString( rAny, sTmp ).Len() )
SetDelimiter( sTmp );
else
- SetDelimiter(rtl::OUString(" "));
+ SetDelimiter(OUString(" "));
}
break;
case FIELD_PROP_SHORT1:
@@ -944,12 +943,12 @@ xub_StrLen SwGetExpField::GetReferenceTextPos( const SwFmtFld& rFmt, SwDoc& rDoc
Beschreibung: Parameter setzen
--------------------------------------------------------------------*/
-const rtl::OUString& SwSetExpField::GetPar1() const
+const OUString& SwSetExpField::GetPar1() const
{
return ((const SwSetExpFieldType*)GetTyp())->GetName();
}
-rtl::OUString SwSetExpField::GetPar2() const
+OUString SwSetExpField::GetPar2() const
{
sal_uInt16 nType = ((SwSetExpFieldType*)GetTyp())->GetType();
@@ -958,7 +957,7 @@ rtl::OUString SwSetExpField::GetPar2() const
return GetExpandedFormula();
}
-void SwSetExpField::SetPar2(const rtl::OUString& rStr)
+void SwSetExpField::SetPar2(const OUString& rStr)
{
sal_uInt16 nType = ((SwSetExpFieldType*)GetTyp())->GetType();
@@ -1084,12 +1083,12 @@ bool SwInputField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
Beschreibung: Bedingung setzen
--------------------------------------------------------------------*/
-void SwInputField::SetPar1(const rtl::OUString& rStr)
+void SwInputField::SetPar1(const OUString& rStr)
{
aContent = rStr;
}
-const rtl::OUString& SwInputField::GetPar1() const
+const OUString& SwInputField::GetPar1() const
{
return aContent;
}
@@ -1098,12 +1097,12 @@ const rtl::OUString& SwInputField::GetPar1() const
Beschreibung: True/False Text
--------------------------------------------------------------------*/
-void SwInputField::SetPar2(const rtl::OUString& rStr)
+void SwInputField::SetPar2(const OUString& rStr)
{
aPText = rStr;
}
-rtl::OUString SwInputField::GetPar2() const
+OUString SwInputField::GetPar2() const
{
return aPText;
}
@@ -1200,7 +1199,7 @@ bool SwSetExpField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const
}
break;
case FIELD_PROP_PAR4:
- rAny <<= rtl::OUString(GetExpStr());
+ rAny <<= OUString(GetExpStr());
break;
default:
return SwField::QueryValue(rAny, nWhichId);
diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx
index 93532197dbdf..da56d0dd1446 100644
--- a/sw/source/core/fields/fldbas.cxx
+++ b/sw/source/core/fields/fldbas.cxx
@@ -141,7 +141,7 @@ SwFieldType::SwFieldType( sal_uInt16 nWhichId )
{
}
-const rtl::OUString& SwFieldType::GetName() const
+const OUString& SwFieldType::GetName() const
{
return aEmptyOUStr;
}
@@ -257,14 +257,14 @@ String SwField::GetFieldName() const
Beschreibung: Parameter setzen auslesen
--------------------------------------------------------------------*/
-const rtl::OUString& SwField::GetPar1() const
+const OUString& SwField::GetPar1() const
{
return aEmptyOUStr;
}
-rtl::OUString SwField::GetPar2() const
+OUString SwField::GetPar2() const
{
- return rtl::OUString();
+ return OUString();
}
String SwField::GetFormula() const
@@ -272,10 +272,10 @@ String SwField::GetFormula() const
return GetPar2();
}
-void SwField::SetPar1(const rtl::OUString& )
+void SwField::SetPar1(const OUString& )
{}
-void SwField::SetPar2(const rtl::OUString& )
+void SwField::SetPar2(const OUString& )
{}
sal_uInt16 SwField::GetSubType() const
diff --git a/sw/source/core/fields/flddat.cxx b/sw/source/core/fields/flddat.cxx
index 3d841e4be409..ddd92926b508 100644
--- a/sw/source/core/fields/flddat.cxx
+++ b/sw/source/core/fields/flddat.cxx
@@ -106,16 +106,16 @@ void SwDateTimeField::SetSubType(sal_uInt16 nType)
nSubType = nType;
}
-void SwDateTimeField::SetPar2(const rtl::OUString& rStr)
+void SwDateTimeField::SetPar2(const OUString& rStr)
{
nOffset = rStr.toInt32();
}
-rtl::OUString SwDateTimeField::GetPar2() const
+OUString SwDateTimeField::GetPar2() const
{
if (nOffset)
return OUString::number(nOffset);
- return rtl::OUString();
+ return OUString();
}
void SwDateTimeField::SetDateTime(const DateTime& rDT)
diff --git a/sw/source/core/fields/flddropdown.cxx b/sw/source/core/fields/flddropdown.cxx
index 31cd495d0c2e..417f5e6aa236 100644
--- a/sw/source/core/fields/flddropdown.cxx
+++ b/sw/source/core/fields/flddropdown.cxx
@@ -28,7 +28,6 @@
using namespace com::sun::star;
-using rtl::OUString;
using std::vector;
static String aEmptyString;
@@ -68,7 +67,7 @@ String SwDropDownField::Expand() const
String sSelect = GetSelectedItem();
if(!sSelect.Len())
{
- vector<rtl::OUString>::const_iterator aIt = aValues.begin();
+ vector<OUString>::const_iterator aIt = aValues.begin();
if ( aIt != aValues.end())
sSelect = *aIt;
}
@@ -83,27 +82,27 @@ SwField * SwDropDownField::Copy() const
return new SwDropDownField(*this);
}
-const rtl::OUString & SwDropDownField::GetPar1() const
+const OUString & SwDropDownField::GetPar1() const
{
return GetSelectedItem();
}
-rtl::OUString SwDropDownField::GetPar2() const
+OUString SwDropDownField::GetPar2() const
{
return GetName();
}
-void SwDropDownField::SetPar1(const rtl::OUString & rStr)
+void SwDropDownField::SetPar1(const OUString & rStr)
{
SetSelectedItem(rStr);
}
-void SwDropDownField::SetPar2(const rtl::OUString & rName)
+void SwDropDownField::SetPar2(const OUString & rName)
{
SetName(rName);
}
-void SwDropDownField::SetItems(const vector<rtl::OUString> & rItems)
+void SwDropDownField::SetItems(const vector<OUString> & rItems)
{
aValues = rItems;
aSelectedItem = aEmptyString;
@@ -125,7 +124,7 @@ uno::Sequence<OUString> SwDropDownField::GetItemSequence() const
uno::Sequence<OUString> aSeq( aValues.size() );
OUString* pSeq = aSeq.getArray();
int i = 0;
- vector<rtl::OUString>::const_iterator aIt;
+ vector<OUString>::const_iterator aIt;
for (aIt = aValues.begin(); aIt != aValues.end(); ++aIt)
{
@@ -136,50 +135,50 @@ uno::Sequence<OUString> SwDropDownField::GetItemSequence() const
return aSeq;
}
-const rtl::OUString & SwDropDownField::GetSelectedItem() const
+const OUString & SwDropDownField::GetSelectedItem() const
{
return aSelectedItem;
}
-const rtl::OUString & SwDropDownField::GetName() const
+const OUString & SwDropDownField::GetName() const
{
return aName;
}
-const rtl::OUString & SwDropDownField::GetHelp() const
+const OUString & SwDropDownField::GetHelp() const
{
return aHelp;
}
-const rtl::OUString & SwDropDownField::GetToolTip() const
+const OUString & SwDropDownField::GetToolTip() const
{
return aToolTip;
}
-sal_Bool SwDropDownField::SetSelectedItem(const rtl::OUString & rItem)
+sal_Bool SwDropDownField::SetSelectedItem(const OUString & rItem)
{
- vector<rtl::OUString>::const_iterator aIt =
+ vector<OUString>::const_iterator aIt =
std::find(aValues.begin(), aValues.end(), rItem);
if (aIt != aValues.end())
aSelectedItem = *aIt;
else
- aSelectedItem = rtl::OUString();
+ aSelectedItem = OUString();
return (aIt != aValues.end());
}
-void SwDropDownField::SetName(const rtl::OUString & rName)
+void SwDropDownField::SetName(const OUString & rName)
{
aName = rName;
}
-void SwDropDownField::SetHelp(const rtl::OUString & rHelp)
+void SwDropDownField::SetHelp(const OUString & rHelp)
{
aHelp = rHelp;
}
-void SwDropDownField::SetToolTip(const rtl::OUString & rToolTip)
+void SwDropDownField::SetToolTip(const OUString & rToolTip)
{
aToolTip = rToolTip;
}
@@ -219,7 +218,7 @@ bool SwDropDownField::PutValue(const uno::Any &rVal,
{
case FIELD_PROP_PAR1:
{
- rtl::OUString aTmpStr;
+ OUString aTmpStr;
rVal >>= aTmpStr;
SetSelectedItem(aTmpStr);
@@ -228,7 +227,7 @@ bool SwDropDownField::PutValue(const uno::Any &rVal,
case FIELD_PROP_PAR2:
{
- rtl::OUString aTmpStr;
+ OUString aTmpStr;
rVal >>= aTmpStr;
SetName(aTmpStr);
@@ -237,7 +236,7 @@ bool SwDropDownField::PutValue(const uno::Any &rVal,
case FIELD_PROP_PAR3:
{
- rtl::OUString aTmpStr;
+ OUString aTmpStr;
rVal >>= aTmpStr;
SetHelp(aTmpStr);
@@ -246,7 +245,7 @@ bool SwDropDownField::PutValue(const uno::Any &rVal,
case FIELD_PROP_PAR4:
{
- rtl::OUString aTmpStr;
+ OUString aTmpStr;
rVal >>= aTmpStr;
SetToolTip(aTmpStr);
diff --git a/sw/source/core/fields/macrofld.cxx b/sw/source/core/fields/macrofld.cxx
index c4a7e580bec3..d62f72a56d4d 100644
--- a/sw/source/core/fields/macrofld.cxx
+++ b/sw/source/core/fields/macrofld.cxx
@@ -29,7 +29,6 @@
using namespace ::com::sun::star;
-using ::rtl::OUString;
/*--------------------------------------------------------------------
Beschreibung: MacroFeldtypen
@@ -137,13 +136,13 @@ SvxMacro SwMacroField::GetSvxMacro() const
Beschreibung: LibName und MacroName
--------------------------------------------------------------------*/
-void SwMacroField::SetPar1(const rtl::OUString& rStr)
+void SwMacroField::SetPar1(const OUString& rStr)
{
aMacro = rStr;
bIsScriptURL = isScriptURL(aMacro);
}
-const rtl::OUString& SwMacroField::GetPar1() const
+const OUString& SwMacroField::GetPar1() const
{
return aMacro;
}
@@ -152,12 +151,12 @@ const rtl::OUString& SwMacroField::GetPar1() const
Beschreibung: Macrotext
--------------------------------------------------------------------*/
-void SwMacroField::SetPar2(const rtl::OUString& rStr)
+void SwMacroField::SetPar2(const OUString& rStr)
{
aText = rStr;
}
-rtl::OUString SwMacroField::GetPar2() const
+OUString SwMacroField::GetPar2() const
{
return aText;
}
@@ -186,7 +185,7 @@ bool SwMacroField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const
bool SwMacroField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
{
- rtl::OUString sTmp;
+ OUString sTmp;
switch( nWhichId )
{
case FIELD_PROP_PAR1:
@@ -213,14 +212,14 @@ bool SwMacroField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
// create an internally used macro name from the library and macro name parts
void SwMacroField::CreateMacroString(
- rtl::OUString& rMacro,
+ OUString& rMacro,
const String& rMacroName,
const String& rLibraryName )
{
// concatenate library and name; use dot only if both strings have content
rMacro = rLibraryName;
if ( rLibraryName.Len() > 0 && rMacroName.Len() > 0 )
- rMacro += rtl::OUString('.');
+ rMacro += OUString('.');
rMacro += rMacroName;
}
diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index 43eae4b57bd3..68a00d7a47a4 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -65,7 +65,6 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::text;
using namespace ::com::sun::star::lang;
-using ::rtl::OUString;
extern void InsertSort( std::vector<sal_uInt16>& rArr, sal_uInt16 nIdx, sal_uInt16* pInsPos = 0 );
@@ -294,7 +293,7 @@ void SwGetRefField::UpdateField( const SwTxtFld* pFldTxtAttr )
return ;
}
// where is the category name (e.g. "Illustration")?
- rtl::OUString const Text = pTxtNd->GetTxt();
+ OUString const Text = pTxtNd->GetTxt();
unsigned const nCatStart = Text.indexOf(sSetRefName);
unsigned const nCatEnd = nCatStart == unsigned(-1) ?
unsigned(-1) : nCatStart + sSetRefName.getLength();
@@ -585,19 +584,19 @@ SwField* SwGetRefField::Copy() const
--------------------------------------------------------------------*/
-const rtl::OUString& SwGetRefField::GetPar1() const
+const OUString& SwGetRefField::GetPar1() const
{
return sSetRefName;
}
-void SwGetRefField::SetPar1( const rtl::OUString& rName )
+void SwGetRefField::SetPar1( const OUString& rName )
{
sSetRefName = rName;
}
-rtl::OUString SwGetRefField::GetPar2() const
+OUString SwGetRefField::GetPar2() const
{
return Expand();
}
@@ -658,11 +657,11 @@ bool SwGetRefField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const
break;
}
}
- rAny <<= rtl::OUString(sTmp);
+ rAny <<= OUString(sTmp);
}
break;
case FIELD_PROP_PAR3:
- rAny <<= rtl::OUString(Expand());
+ rAny <<= OUString(Expand());
break;
case FIELD_PROP_SHORT1:
rAny <<= (sal_Int16)nSeqNo;
diff --git a/sw/source/core/fields/scrptfld.cxx b/sw/source/core/fields/scrptfld.cxx
index 4aa7bcc04841..8432bad839c0 100644
--- a/sw/source/core/fields/scrptfld.cxx
+++ b/sw/source/core/fields/scrptfld.cxx
@@ -23,7 +23,6 @@
#include <tools/resid.hxx>
using namespace ::com::sun::star;
-using ::rtl::OUString;
/*--------------------------------------------------------------------
Beschreibung: ScriptField
--------------------------------------------------------------------*/
@@ -68,12 +67,12 @@ SwField* SwScriptField::Copy() const
Beschreibung: Type setzen
--------------------------------------------------------------------*/
-void SwScriptField::SetPar1( const rtl::OUString& rStr )
+void SwScriptField::SetPar1( const OUString& rStr )
{
sType = rStr;
}
-const rtl::OUString& SwScriptField::GetPar1() const
+const OUString& SwScriptField::GetPar1() const
{
return sType;
}
@@ -82,13 +81,13 @@ const rtl::OUString& SwScriptField::GetPar1() const
Beschreibung: Code setzen
--------------------------------------------------------------------*/
-void SwScriptField::SetPar2( const rtl::OUString& rStr )
+void SwScriptField::SetPar2( const OUString& rStr )
{
sCode = rStr;
}
-rtl::OUString SwScriptField::GetPar2() const
+OUString SwScriptField::GetPar2() const
{
return sCode;
}
diff --git a/sw/source/core/fields/tblcalc.cxx b/sw/source/core/fields/tblcalc.cxx
index e2af9eccd654..8b425e03996b 100644
--- a/sw/source/core/fields/tblcalc.cxx
+++ b/sw/source/core/fields/tblcalc.cxx
@@ -30,7 +30,6 @@
#include <unofldmid.h>
using namespace ::com::sun::star;
-using ::rtl::OUString;
SwTblFieldType::SwTblFieldType(SwDoc* pDocPtr)
@@ -64,7 +63,7 @@ SwTblField::SwTblField( SwTblFieldType* pInitType, const String& rFormel,
: SwValueField( pInitType, nFmt ), SwTableFormula( rFormel ),
nSubType(nType)
{
- sExpand = rtl::OUString('0');
+ sExpand = OUString('0');
}
@@ -160,13 +159,13 @@ void SwTblField::SetValue( const double& rVal )
--------------------------------------------------------------------*/
-rtl::OUString SwTblField::GetPar2() const
+OUString SwTblField::GetPar2() const
{
return SwTableFormula::GetFormula();
}
-void SwTblField::SetPar2(const rtl::OUString& rStr)
+void SwTblField::SetPar2(const OUString& rStr)
{
SetFormula( rStr );
}
@@ -181,7 +180,7 @@ bool SwTblField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const
sal_uInt16 nOldSubType = nSubType;
SwTblField* pThis = (SwTblField*)this;
pThis->nSubType |= nsSwExtendedSubType::SUB_CMD;
- rAny <<= rtl::OUString( Expand() );
+ rAny <<= OUString( Expand() );
pThis->nSubType = nOldSubType;
}
break;
@@ -192,7 +191,7 @@ bool SwTblField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const
}
break;
case FIELD_PROP_PAR1:
- rAny <<= rtl::OUString(GetExpStr());
+ rAny <<= OUString(GetExpStr());
break;
case FIELD_PROP_FORMAT:
rAny <<= (sal_Int32)GetFormat();
diff --git a/sw/source/core/fields/textapi.cxx b/sw/source/core/fields/textapi.cxx
index 0ae5e2eb4541..fdc145ae461e 100644
--- a/sw/source/core/fields/textapi.cxx
+++ b/sw/source/core/fields/textapi.cxx
@@ -39,7 +39,7 @@ static const SvxItemPropertySet* ImplGetSvxTextPortionPropertySet()
SVX_UNOEDIT_OUTLINER_PROPERTIES,
SVX_UNOEDIT_PARA_PROPERTIES,
{MAP_CHAR_LEN("TextField"), EE_FEATURE_FIELD, &::getCppuType((const uno::Reference< text::XTextField >*)0), beans::PropertyAttribute::READONLY, 0 },
- {MAP_CHAR_LEN("TextPortionType"), WID_PORTIONTYPE, &::getCppuType((const ::rtl::OUString*)0), beans::PropertyAttribute::READONLY, 0 },
+ {MAP_CHAR_LEN("TextPortionType"), WID_PORTIONTYPE, &::getCppuType((const OUString*)0), beans::PropertyAttribute::READONLY, 0 },
{MAP_CHAR_LEN("TextUserDefinedAttributes"), EE_CHAR_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
{MAP_CHAR_LEN("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, &::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
{0,0,0,0,0,0}
diff --git a/sw/source/core/fields/usrfld.cxx b/sw/source/core/fields/usrfld.cxx
index aa5c181ebb77..df7253b60bcb 100644
--- a/sw/source/core/fields/usrfld.cxx
+++ b/sw/source/core/fields/usrfld.cxx
@@ -34,7 +34,6 @@
using namespace ::com::sun::star;
-using ::rtl::OUString;
/*--------------------------------------------------------------------
Beschreibung: Benutzerfelder
@@ -86,7 +85,7 @@ void SwUserField::SetValue( const double& rVal )
Beschreibung: Name
--------------------------------------------------------------------*/
-const rtl::OUString& SwUserField::GetPar1() const
+const OUString& SwUserField::GetPar1() const
{
return ((const SwUserFieldType*)GetTyp())->GetName();
}
@@ -95,12 +94,12 @@ const rtl::OUString& SwUserField::GetPar1() const
Beschreibung: Content
--------------------------------------------------------------------*/
-rtl::OUString SwUserField::GetPar2() const
+OUString SwUserField::GetPar2() const
{
return ((SwUserFieldType*)GetTyp())->GetContent(GetFormat());
}
-void SwUserField::SetPar2(const rtl::OUString& rStr)
+void SwUserField::SetPar2(const OUString& rStr)
{
((SwUserFieldType*)GetTyp())->SetContent(rStr, GetFormat());
}
@@ -212,7 +211,7 @@ SwFieldType* SwUserFieldType::Copy() const
return pTmp;
}
-const rtl::OUString& SwUserFieldType::GetName() const
+const OUString& SwUserFieldType::GetName() const
{
return aName;
}
@@ -301,7 +300,7 @@ bool SwUserFieldType::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const
rAny <<= (double) nValue;
break;
case FIELD_PROP_PAR2:
- rAny <<= rtl::OUString(aContent);
+ rAny <<= OUString(aContent);
break;
case FIELD_PROP_BOOL1:
{
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-30 18:41:32 +0000