summaryrefslogtreecommitdiff
path: root/sw/source/ui/config
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/ui/config')
-rw-r--r--sw/source/ui/config/barcfg.cxx3
-rw-r--r--sw/source/ui/config/caption.cxx2
-rw-r--r--sw/source/ui/config/dbconfig.cxx3
-rw-r--r--sw/source/ui/config/fontcfg.cxx3
-rw-r--r--sw/source/ui/config/mailconfigpage.cxx7
-rw-r--r--sw/source/ui/config/modcfg.cxx19
-rw-r--r--sw/source/ui/config/optcomp.cxx16
-rw-r--r--sw/source/ui/config/optload.cxx8
-rw-r--r--sw/source/ui/config/optpage.cxx10
-rw-r--r--sw/source/ui/config/prtopt.cxx3
-rw-r--r--sw/source/ui/config/uinums.cxx4
-rw-r--r--sw/source/ui/config/usrpref.cxx11
-rw-r--r--sw/source/ui/config/viewopt.cxx2
13 files changed, 42 insertions, 49 deletions
diff --git a/sw/source/ui/config/barcfg.cxx b/sw/source/ui/config/barcfg.cxx
index 95da3e4c6204..f9c4db5a81fd 100644
--- a/sw/source/ui/config/barcfg.cxx
+++ b/sw/source/ui/config/barcfg.cxx
@@ -26,7 +26,6 @@
#include <unomid.h>
using namespace utl;
-using rtl::OUString;
using namespace com::sun::star::uno;
#define SEL_TYPE_TABLE_TEXT 0
@@ -123,6 +122,6 @@ void SwToolbarConfigItem::Commit()
PutProperties(aNames, aValues);
}
-void SwToolbarConfigItem::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {}
+void SwToolbarConfigItem::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/config/caption.cxx b/sw/source/ui/config/caption.cxx
index 44f4b693cf01..951e791228d5 100644
--- a/sw/source/ui/config/caption.cxx
+++ b/sw/source/ui/config/caption.cxx
@@ -30,7 +30,7 @@ InsCaptionOpt::InsCaptionOpt(const SwCapObjType eType, const SvGlobalName* pOleI
sNumberSeparator(RTL_CONSTASCII_USTRINGPARAM((". "))),
nPos(1),
nLevel(0),
- sSeparator( rtl::OUString(": ") ),
+ sSeparator( OUString(": ") ),
bIgnoreSeqOpts(false),
bCopyAttributes(sal_False)
{
diff --git a/sw/source/ui/config/dbconfig.cxx b/sw/source/ui/config/dbconfig.cxx
index b6469980e86a..ac732a81811d 100644
--- a/sw/source/ui/config/dbconfig.cxx
+++ b/sw/source/ui/config/dbconfig.cxx
@@ -26,7 +26,6 @@
#include <unomid.h>
using namespace utl;
-using rtl::OUString;
using namespace com::sun::star::uno;
/*--------------------------------------------------------------------
@@ -116,7 +115,7 @@ const SwDBData& SwDBConfig::GetBibliographySource()
}
void SwDBConfig::Commit() {}
-void SwDBConfig::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {}
+void SwDBConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/config/fontcfg.cxx b/sw/source/ui/config/fontcfg.cxx
index 22be0e3a00fc..fd36d345633d 100644
--- a/sw/source/ui/config/fontcfg.cxx
+++ b/sw/source/ui/config/fontcfg.cxx
@@ -30,7 +30,6 @@
#include <unomid.h>
using namespace utl;
-using rtl::OUString;
using namespace com::sun::star::uno;
static inline LanguageType lcl_LanguageOfType(sal_Int16 nType, sal_Int16 eWestern, sal_Int16 eCJK, sal_Int16 eCTL)
@@ -317,6 +316,6 @@ sal_Int32 SwStdFontConfig::GetFontHeight( sal_uInt8 nFont, sal_uInt8 nScriptType
return nRet;
}
-void SwStdFontConfig::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {}
+void SwStdFontConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx
index 1528670b0ca0..cdd999c71b25 100644
--- a/sw/source/ui/config/mailconfigpage.cxx
+++ b/sw/source/ui/config/mailconfigpage.cxx
@@ -41,7 +41,6 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::mail;
using namespace ::com::sun::star::beans;
-using ::rtl::OUString;
class SwTestAccountSettingsDialog : public SfxModalDialog
{
@@ -320,7 +319,7 @@ void SwTestAccountSettingsDialog::Test()
{
uno::Reference<uno::XComponentContext> xContext = ::comphelper::getProcessComponentContext();
- rtl::OUString sException;
+ OUString sException;
bool bIsLoggedIn = false;
bool bIsServer = false;
@@ -357,7 +356,7 @@ void SwTestAccountSettingsDialog::Test()
new SwConnectionContext(
m_pParent->m_pConfigItem->GetInServerName(),
m_pParent->m_pConfigItem->GetInServerPort(),
- ::rtl::OUString("Insecure"));
+ OUString("Insecure"));
xInMailService->connect(xConnectionContext, xAuthenticator);
}
if(m_bStop)
@@ -419,7 +418,7 @@ void SwTestAccountSettingsDialog::Test()
if(!bIsServer || !bIsLoggedIn )
{
- rtl::OUStringBuffer aErrorMessage(m_sErrorServer);
+ OUStringBuffer aErrorMessage(m_sErrorServer);
if (!sException.isEmpty())
aErrorMessage.appendAscii(RTL_CONSTASCII_STRINGPARAM("\n--\n")).append(sException);
m_eErrorsED.SetText(aErrorMessage.makeStringAndClear());
diff --git a/sw/source/ui/config/modcfg.cxx b/sw/source/ui/config/modcfg.cxx
index f9d35bdf9903..aebce5f424b6 100644
--- a/sw/source/ui/config/modcfg.cxx
+++ b/sw/source/ui/config/modcfg.cxx
@@ -38,7 +38,6 @@
#include <unomid.h>
using namespace utl;
-using rtl::OUString;
using namespace com::sun::star::uno;
#define GLOB_NAME_CALC 0
@@ -293,7 +292,7 @@ static sal_Int32 lcl_ConvertAttrToCfg(const AuthorCharAttr& rAttr)
return nRet;
}
-void SwRevisionConfig::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {}
+void SwRevisionConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
void SwRevisionConfig::Commit()
{
@@ -584,9 +583,9 @@ const Sequence<OUString>& SwInsertConfig::GetPropertyNames()
OUString* pWebNames = aWebNames.getArray();
int i;
for(i = 0; i < nCount; i++)
- pNames[i] = rtl::OUString::createFromAscii(aPropNames[i]);
+ pNames[i] = OUString::createFromAscii(aPropNames[i]);
for(i = 0; i < nWebCount; i++)
- pWebNames[i] = rtl::OUString::createFromAscii(aPropNames[i]);
+ pWebNames[i] = OUString::createFromAscii(aPropNames[i]);
}
return bIsWeb ? aWebNames : aNames;
}
@@ -635,12 +634,12 @@ static void lcl_WriteOpt(const InsCaptionOpt& rOpt, Any* pValues, sal_Int32 nPro
case 5: pValues[nProp] <<= OUString(rOpt.GetSeparator());break;//Delimiter",
case 6: pValues[nProp] <<= (sal_Int32)rOpt.GetLevel(); break;//Level",
case 7: pValues[nProp] <<= (sal_Int32)rOpt.GetPos(); break;//Position",
- case 8: pValues[nProp] <<= (::rtl::OUString&)rOpt.GetCharacterStyle(); break; //CharacterStyle
+ case 8: pValues[nProp] <<= (OUString&)rOpt.GetCharacterStyle(); break; //CharacterStyle
case 9: pValues[nProp] <<= rOpt.CopyAttributes(); break; //ApplyAttributes
}
}
-void SwInsertConfig::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {}
+void SwInsertConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
void SwInsertConfig::Commit()
{
@@ -873,7 +872,7 @@ static void lcl_ReadOpt(InsCaptionOpt& rOpt, const Any* pValues, sal_Int32 nProp
break;//Position",
case 8 : //CharacterStyle
{
- ::rtl::OUString sTemp; pValues[nProp] >>= sTemp;
+ OUString sTemp; pValues[nProp] >>= sTemp;
rOpt.SetCharacterStyle( sTemp );
}
break;
@@ -1148,7 +1147,7 @@ SwTableConfig::~SwTableConfig()
{
}
-void SwTableConfig::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {}
+void SwTableConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
void SwTableConfig::Commit()
{
@@ -1246,12 +1245,12 @@ const Sequence<OUString>& SwMiscConfig::GetPropertyNames()
};
OUString* pNames = aNames.getArray();
for(int i = 0; i < nCount; i++)
- pNames[i] = rtl::OUString::createFromAscii(aPropNames[i]);
+ pNames[i] = OUString::createFromAscii(aPropNames[i]);
}
return aNames;
}
-void SwMiscConfig::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {}
+void SwMiscConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
void SwMiscConfig::Commit()
{
diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx
index 6d562702ecb5..fa3ebd859886 100644
--- a/sw/source/ui/config/optcomp.cxx
+++ b/sw/source/ui/config/optcomp.cxx
@@ -171,18 +171,18 @@ SwCompatibilityOptPage::~SwCompatibilityOptPage()
void SwCompatibilityOptPage::ReplaceFormatName( String& rEntry )
{
- rtl::OUString sFormatName(utl::ConfigManager::getProductName());
- rtl::OUString sFormatVersion;
+ OUString sFormatName(utl::ConfigManager::getProductName());
+ OUString sFormatVersion;
bool bOpenOffice = ( sFormatName == "OpenOffice.org" );
if ( bOpenOffice )
- sFormatVersion = rtl::OUString("1.1");
+ sFormatVersion = OUString("1.1");
else
- sFormatVersion = rtl::OUString("6.0/7");
+ sFormatVersion = OUString("6.0/7");
if ( !bOpenOffice && ( sFormatName != "StarSuite" ) )
- sFormatName = rtl::OUString("StarOffice");
+ sFormatName = OUString("StarOffice");
- rEntry.SearchAndReplace( rtl::OUString("%FORMATNAME"), sFormatName );
- rEntry.SearchAndReplace( rtl::OUString("%FORMATVERSION"), sFormatVersion );
+ rEntry.SearchAndReplace( OUString("%FORMATNAME"), sFormatName );
+ rEntry.SearchAndReplace( OUString("%FORMATVERSION"), sFormatVersion );
}
sal_uLong convertBools2Ulong_Impl
@@ -264,7 +264,7 @@ void SwCompatibilityOptPage::InitControls( const SfxItemSet& rSet )
m_aDefaultPB.Disable();
}
String sText = m_aMainFL.GetText();
- sText.SearchAndReplace( rtl::OUString("%DOCNAME"), sDocTitle );
+ sText.SearchAndReplace( OUString("%DOCNAME"), sDocTitle );
m_aMainFL.SetText( sText );
// loading file formats
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index d5a1f59dbb81..0b68d0ca5255 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -480,7 +480,7 @@ SwCaptionOptPage::SwCaptionOptPage( Window* pParent, const SfxItemSet& rSet )
aLbLevel.InsertEntry(OUString::number(i + 1));
sal_Unicode nLvl = MAXLEVEL;
- rtl::OUString sDelim(": ");
+ OUString sDelim(": ");
if (pSh)
{
@@ -574,9 +574,9 @@ void SwCaptionOptPage::Reset( const SfxItemSet& rSet)
SetOptions(nPos++, GRAPHIC_CAP);
// get Productname and -version
- rtl::OUString sWithoutVersion( utl::ConfigManager::getProductName() );
- rtl::OUString sComplete(
- sWithoutVersion + rtl::OUString(" ") +
+ OUString sWithoutVersion( utl::ConfigManager::getProductName() );
+ OUString sComplete(
+ sWithoutVersion + OUString(" ") +
utl::ConfigManager::getProductVersion() );
SvObjectServerList aObjS;
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index e67d58dd2eac..bfe09fee95ca 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -497,7 +497,7 @@ void SwAddPrinterTabPage::PageCreated (SfxAllItemSet aSet)
if (pListItem && pListItem->GetValue())
{
std::vector<String> aFaxList;
- const std::vector<rtl::OUString>& rPrinters = Printer::GetPrinterQueues();
+ const std::vector<OUString>& rPrinters = Printer::GetPrinterQueues();
for (unsigned int i = 0; i < rPrinters.size(); ++i)
aFaxList.insert(aFaxList.begin(), rPrinters[i]);
SetFax( aFaxList );
@@ -1770,10 +1770,10 @@ SwRedlineOptionsTabPage::SwRedlineOptionsTabPage( Window* pParent,
aMarkColorLB.SetSelectHdl( aLk );
//solution: set different accessible name of four color box
- aInsertColorLB.SetAccessibleName(::rtl::OUString( aInsertFT.GetDisplayText()) + ::rtl::OUString(aInsertColorFT.GetDisplayText()));
- aDeletedColorLB.SetAccessibleName(::rtl::OUString( aDeletedFT.GetDisplayText()) + ::rtl::OUString( aDeletedColorFT.GetDisplayText()));
- aChangedColorLB.SetAccessibleName(::rtl::OUString( aChangedFT.GetDisplayText()) + ::rtl::OUString( aChangedColorFT.GetDisplayText()));
- aMarkColorLB.SetAccessibleName(::rtl::OUString( aMarkPosFT.GetDisplayText()) + ::rtl::OUString( aMarkColorFT.GetDisplayText()));
+ aInsertColorLB.SetAccessibleName(OUString( aInsertFT.GetDisplayText()) + OUString(aInsertColorFT.GetDisplayText()));
+ aDeletedColorLB.SetAccessibleName(OUString( aDeletedFT.GetDisplayText()) + OUString( aDeletedColorFT.GetDisplayText()));
+ aChangedColorLB.SetAccessibleName(OUString( aChangedFT.GetDisplayText()) + OUString( aChangedColorFT.GetDisplayText()));
+ aMarkColorLB.SetAccessibleName(OUString( aMarkPosFT.GetDisplayText()) + OUString( aMarkColorFT.GetDisplayText()));
}
SwRedlineOptionsTabPage::~SwRedlineOptionsTabPage()
diff --git a/sw/source/ui/config/prtopt.cxx b/sw/source/ui/config/prtopt.cxx
index 01bd2dfe7b8d..ca075300dfbe 100644
--- a/sw/source/ui/config/prtopt.cxx
+++ b/sw/source/ui/config/prtopt.cxx
@@ -28,7 +28,6 @@
using namespace utl;
-using rtl::OUString;
using namespace com::sun::star::uno;
/*--------------------------------------------------------------------
@@ -132,7 +131,7 @@ SwPrintOptions::~SwPrintOptions()
}
-void SwPrintOptions::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {}
+void SwPrintOptions::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
void SwPrintOptions::Commit()
{
diff --git a/sw/source/ui/config/uinums.cxx b/sw/source/ui/config/uinums.cxx
index b9207bb3cf7f..dc153b8ea5f8 100644
--- a/sw/source/ui/config/uinums.cxx
+++ b/sw/source/ui/config/uinums.cxx
@@ -160,7 +160,7 @@ int SwBaseNumRules::Load(SvStream &rStream)
}
SwChapterNumRules::SwChapterNumRules() :
- SwBaseNumRules(rtl::OUString(CHAPTER_FILENAME))
+ SwBaseNumRules(OUString(CHAPTER_FILENAME))
{
}
@@ -390,7 +390,7 @@ SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( SvStream& rStream,
if( VERSION_53A > nVersion )
{
sal_Char cEncoded(aFmt.GetBulletChar());
- aFmt.SetBulletChar(rtl::OUString(&cEncoded, 1, nCharSet).toChar());
+ aFmt.SetBulletChar(OUString(&cEncoded, 1, nCharSet).toChar());
}
}
diff --git a/sw/source/ui/config/usrpref.cxx b/sw/source/ui/config/usrpref.cxx
index ee01698dd906..286ca229d6c5 100644
--- a/sw/source/ui/config/usrpref.cxx
+++ b/sw/source/ui/config/usrpref.cxx
@@ -37,7 +37,6 @@ using namespace utl;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-using ::rtl::OUString;
void SwMasterUsrPref::SetUsrPref(const SwViewOption &rCopy)
@@ -358,7 +357,7 @@ void SwLayoutViewConfig::Load()
}
}
-void SwLayoutViewConfig::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {}
+void SwLayoutViewConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
Sequence<OUString> SwGridConfig::GetPropertyNames()
{
@@ -452,7 +451,7 @@ void SwGridConfig::Load()
}
}
-void SwGridConfig::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {}
+void SwGridConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
Sequence<OUString> SwCursorConfig::GetPropertyNames()
{
@@ -466,7 +465,7 @@ Sequence<OUString> SwCursorConfig::GetPropertyNames()
Sequence<OUString> aNames(nCount);
OUString* pNames = aNames.getArray();
for(int i = 0; i < nCount; i++)
- pNames[i] = rtl::OUString::createFromAscii(aPropNames[i]);
+ pNames[i] = OUString::createFromAscii(aPropNames[i]);
return aNames;
}
@@ -534,7 +533,7 @@ void SwCursorConfig::Load()
}
}
-void SwCursorConfig::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {}
+void SwCursorConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
SwWebColorConfig::SwWebColorConfig(SwMasterUsrPref& rPar) :
ConfigItem("Office.WriterWeb/Background",
@@ -563,7 +562,7 @@ void SwWebColorConfig::Commit()
PutProperties(aPropNames, aValues);
}
-void SwWebColorConfig::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {}
+void SwWebColorConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
void SwWebColorConfig::Load()
{
diff --git a/sw/source/ui/config/viewopt.cxx b/sw/source/ui/config/viewopt.cxx
index b0003d3feee2..a365e47091e5 100644
--- a/sw/source/ui/config/viewopt.cxx
+++ b/sw/source/ui/config/viewopt.cxx
@@ -128,7 +128,7 @@ void SwViewOption::DrawRectPrinter( OutputDevice *pOut,
sal_uInt16 SwViewOption::GetPostItsWidth( const OutputDevice *pOut ) const
{
OSL_ENSURE( pOut, "no Outdev" );
- return sal_uInt16(pOut->GetTextWidth( rtl::OUString(aPostItStr )));
+ return sal_uInt16(pOut->GetTextWidth( OUString(aPostItStr )));
}
void SwViewOption::PaintPostIts( OutputDevice *pOut, const SwRect &rRect, sal_Bool bIsScript ) const
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-18 14:45:01 +0000