summaryrefslogtreecommitdiff
path: root/sw/source/ui/misc
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/ui/misc')
-rw-r--r--sw/source/ui/misc/bookmark.cxx4
-rw-r--r--sw/source/ui/misc/glosbib.cxx6
-rw-r--r--sw/source/ui/misc/glosdoc.cxx14
-rw-r--r--sw/source/ui/misc/glossary.cxx5
-rw-r--r--sw/source/ui/misc/linenum.cxx8
-rw-r--r--sw/source/ui/misc/num.cxx2
-rw-r--r--sw/source/ui/misc/numberingtypelistbox.cxx3
-rw-r--r--sw/source/ui/misc/outline.cxx6
-rw-r--r--sw/source/ui/misc/pggrid.cxx6
-rw-r--r--sw/source/ui/misc/redlndlg.cxx4
-rw-r--r--sw/source/ui/misc/srtdlg.cxx5
11 files changed, 30 insertions, 33 deletions
diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx
index 05ccf296c5bb..90a2d41e3d55 100644
--- a/sw/source/ui/misc/bookmark.cxx
+++ b/sw/source/ui/misc/bookmark.cxx
@@ -31,7 +31,7 @@
#include "IMark.hxx"
#include "globals.hrc"
-const String BookmarkCombo::aForbiddenChars = rtl::OUString("/\\@:*?\";,.#");
+const String BookmarkCombo::aForbiddenChars = OUString("/\\@:*?\";,.#");
IMPL_LINK( SwInsertBookmarkDlg, ModifyHdl, BookmarkCombo *, pBox )
{
@@ -227,7 +227,7 @@ long BookmarkCombo::PreNotify( NotifyEvent& rNEvt )
if( EVENT_KEYINPUT == rNEvt.GetType() &&
rNEvt.GetKeyEvent()->GetCharCode() )
{
- rtl::OUString sKey( rNEvt.GetKeyEvent()->GetCharCode() );
+ OUString sKey( rNEvt.GetKeyEvent()->GetCharCode() );
if(STRING_NOTFOUND != aForbiddenChars.Search(sKey))
nHandled = 1;
}
diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx
index c3ef20f16d40..4ecc12e743db 100644
--- a/sw/source/ui/misc/glosbib.cxx
+++ b/sw/source/ui/misc/glosbib.cxx
@@ -156,11 +156,11 @@ void SwGlossaryGroupDlg::Apply()
for (OUVector_t::const_iterator it(m_RenamedArr.begin());
it != m_RenamedArr.end(); ++it)
{
- ::rtl::OUString const sOld(
+ OUString const sOld(
::comphelper::string::getToken(*it, 0, RENAME_TOKEN_DELIM));
String sNew(
::comphelper::string::getToken(*it, 1, RENAME_TOKEN_DELIM));
- ::rtl::OUString const sTitle(
+ OUString const sTitle(
::comphelper::string::getToken(*it, 2, RENAME_TOKEN_DELIM));
pGlosHdl->RenameGroup(sOld, sNew, sTitle);
if (it == m_RenamedArr.begin())
@@ -239,7 +239,7 @@ IMPL_LINK( SwGlossaryGroupDlg, DeleteHdl, Button*, pButton )
return 0;
}
GlosBibUserData* pUserData = (GlosBibUserData*)pEntry->GetUserData();
- ::rtl::OUString const sEntry(pUserData->sGroupName);
+ OUString const sEntry(pUserData->sGroupName);
// if the name to be deleted is among the new ones - get rid of it
bool bDelete = true;
for (OUVector_t::iterator it(m_InsertedArr.begin());
diff --git a/sw/source/ui/misc/glosdoc.cxx b/sw/source/ui/misc/glosdoc.cxx
index 46f214c21692..38be8d4c9476 100644
--- a/sw/source/ui/misc/glosdoc.cxx
+++ b/sw/source/ui/misc/glosdoc.cxx
@@ -78,7 +78,7 @@ static String lcl_CheckFileName( const String& rNewFilePath,
{
String rSG = SwGlossaries::GetExtension();
//generate generic name
- utl::TempFile aTemp(rtl::OUString("group"),
+ utl::TempFile aTemp(OUString("group"),
&rSG, &rNewFilePath );
aTemp.EnableKillingFile();
@@ -93,7 +93,7 @@ static String lcl_CheckFileName( const String& rNewFilePath,
------------------------------------------------------------------------*/
String SwGlossaries::GetDefName()
{
- return rtl::OUString("standard");
+ return OUString("standard");
}
@@ -475,7 +475,7 @@ void SwGlossaries::ShowError()
String SwGlossaries::GetExtension()
{
- return rtl::OUString(".bau");
+ return OUString(".bau");
}
void SwGlossaries::RemoveFileFromList( const String& rGroup )
@@ -487,7 +487,7 @@ void SwGlossaries::RemoveFileFromList( const String& rGroup )
{
if (*it == rGroup)
{
- rtl::OUString aUName = rGroup;
+ OUString aUName = rGroup;
{
// tell the UNO AutoTextGroup object that it's not valid anymore
for ( UnoAutoTextGroups::iterator aLoop = m_aGlossaryGroups.begin();
@@ -537,7 +537,7 @@ void SwGlossaries::RemoveFileFromList( const String& rGroup )
}
}
-String SwGlossaries::GetCompleteGroupName( const rtl::OUString& GroupName )
+String SwGlossaries::GetCompleteGroupName( const OUString& GroupName )
{
sal_uInt16 nCount = GetGroupCnt();
// when the group name was created internally the path is here as well
@@ -590,7 +590,7 @@ void SwGlossaries::InvalidateUNOOjects()
m_aGlossaryEntries.swap( aTmpe );
}
-Reference< text::XAutoTextGroup > SwGlossaries::GetAutoTextGroup( const ::rtl::OUString& _rGroupName, bool _bCreate )
+Reference< text::XAutoTextGroup > SwGlossaries::GetAutoTextGroup( const OUString& _rGroupName, bool _bCreate )
{
// first, find the name with path-extension
String sCompleteGroupName = GetCompleteGroupName( _rGroupName );
@@ -644,7 +644,7 @@ Reference< text::XAutoTextGroup > SwGlossaries::GetAutoTextGroup( const ::rtl::O
return xGroup;
}
-Reference< text::XAutoTextEntry > SwGlossaries::GetAutoTextEntry( const String& _rCompleteGroupName, const ::rtl::OUString& _rGroupName, const ::rtl::OUString& _rEntryName,
+Reference< text::XAutoTextEntry > SwGlossaries::GetAutoTextEntry( const String& _rCompleteGroupName, const OUString& _rGroupName, const OUString& _rEntryName,
bool _bCreate )
{
//standard must be created
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index 02fe69133241..b55516c8c069 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -78,7 +78,6 @@ using namespace ::com::sun::star::ucb;
using namespace ::com::sun::star::ui::dialogs;
using namespace ::comphelper;
using namespace ::ucbhelper;
-using ::rtl::OUString;
using namespace ::sfx2;
static String lcl_GetValidShortCut( const String& rName )
@@ -92,7 +91,7 @@ static String lcl_GetValidShortCut( const String& rName )
while( rName.GetChar( nStart-1 ) == ' ' && nStart < nSz )
nStart++;
- String aBuf = rtl::OUString(rName.GetChar(nStart-1));
+ String aBuf = OUString(rName.GetChar(nStart-1));
for( ; nStart < nSz; ++nStart )
{
@@ -568,7 +567,7 @@ IMPL_LINK( SwGlossaryDlg, MenuHdl, Menu *, pMn )
xFP->setDisplayDirectory(aPathOpt.GetWorkPath() );
uno::Reference<XFilterManager> xFltMgr(xFP, UNO_QUERY);
- SfxFilterMatcher aMatcher( rtl::OUString::createFromAscii(SwDocShell::Factory().GetShortName()) );
+ SfxFilterMatcher aMatcher( OUString::createFromAscii(SwDocShell::Factory().GetShortName()) );
SfxFilterMatcherIter aIter( aMatcher );
const SfxFilter* pFilter = aIter.First();
while ( pFilter )
diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx
index 4a7b87e6d4b5..5aa6859f807a 100644
--- a/sw/source/ui/misc/linenum.cxx
+++ b/sw/source/ui/misc/linenum.cxx
@@ -55,17 +55,17 @@ SwLineNumberingDlg::SwLineNumberingDlg(SwView *pVw)
get(m_pNumberingOnCB, "shownumbering");
String sIntervalName = m_pDivIntervalFT->GetAccessibleName();
- sIntervalName += rtl::OUString("(");
+ sIntervalName += OUString("(");
sIntervalName += m_pDivRowsFT->GetAccessibleName();
- sIntervalName += rtl::OUString(")");
+ sIntervalName += OUString(")");
m_pDivIntervalNF->SetAccessibleName(sIntervalName);
Window *pNumIntervalFT = get<Window>("interval");
Window *pNumRowsFT = get<Window>("intervallines");
sIntervalName = pNumIntervalFT->GetAccessibleName();
- sIntervalName += rtl::OUString("(");
+ sIntervalName += OUString("(");
sIntervalName += pNumRowsFT->GetAccessibleName();
- sIntervalName += rtl::OUString(")");
+ sIntervalName += OUString(")");
m_pNumIntervalNF->SetAccessibleName(sIntervalName);
// char styles
diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx
index 7b0aa290f323..02335fd19f53 100644
--- a/sw/source/ui/misc/num.cxx
+++ b/sw/source/ui/misc/num.cxx
@@ -151,7 +151,7 @@ SwNumPositionTabPage::SwNumPositionTabPage(Window* pParent,
// insert levels
for(sal_uInt16 i = 1; i <= MAXLEVEL; i++)
m_pLevelLB->InsertEntry(OUString::number(i));
- String sEntry(rtl::OUString("1 - "));
+ String sEntry(OUString("1 - "));
sEntry += OUString::number(MAXLEVEL);
m_pLevelLB->InsertEntry(sEntry);
m_pLevelLB->SelectEntry(sEntry);
diff --git a/sw/source/ui/misc/numberingtypelistbox.cxx b/sw/source/ui/misc/numberingtypelistbox.cxx
index 8c2618bc4654..7b837f5a2fea 100644
--- a/sw/source/ui/misc/numberingtypelistbox.cxx
+++ b/sw/source/ui/misc/numberingtypelistbox.cxx
@@ -30,7 +30,6 @@
using namespace com::sun::star;
-using ::rtl::OUString;
struct SwNumberingTypeListBox_Impl
{
@@ -59,7 +58,7 @@ SwNumberingTypeListBox::SwNumberingTypeListBox( Window* pWin, WinBits nStyle ) :
pImpl->xInfo = uno::Reference<text::XNumberingTypeInfo>(xDefNum, uno::UNO_QUERY);
}
-bool SwNumberingTypeListBox::set_property(const rtl::OString &rKey, const rtl::OString &rValue)
+bool SwNumberingTypeListBox::set_property(const OString &rKey, const OString &rValue)
{
if (rKey.equalsL(RTL_CONSTASCII_STRINGPARAM("type")))
Reload(rValue.toInt32());
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index f460f79d6923..073b7acd7942 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -874,7 +874,7 @@ static sal_uInt16 lcl_DrawBullet(VirtualDevice* pVDev,
aFont.SetSize(rSize);
aFont.SetTransparent(sal_True);
pVDev->SetFont( aFont );
- rtl::OUString aText(rFmt.GetBulletChar());
+ OUString aText(rFmt.GetBulletChar());
pVDev->DrawText( Point(nXStart, nYStart), aText );
sal_uInt16 nRet = (sal_uInt16)pVDev->GetTextWidth(aText);
@@ -1033,7 +1033,7 @@ void NumberingPreview::Paint( const Rectangle& /*rRect*/ )
rFmt.GetLabelFollowedBy() == SvxNumberFormat::SPACE )
{
pVDev->SetFont(aStdFont);
- rtl::OUString aText(' ');
+ OUString aText(' ');
pVDev->DrawText( Point(nNumberXPos, nYStart), aText );
nBulletWidth = nBulletWidth + (sal_uInt16)pVDev->GetTextWidth(aText);
}
@@ -1140,7 +1140,7 @@ void NumberingPreview::Paint( const Rectangle& /*rRect*/ )
Point(nXStart + nTextOffset, nYStart),
(pOutlineNames == 0
? utl::ConfigManager::getProductName()
- : rtl::OUString(pOutlineNames[nLevel])));
+ : OUString(pOutlineNames[nLevel])));
}
}
}
diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx
index 4480b58d925c..695205758b2b 100644
--- a/sw/source/ui/misc/pggrid.cxx
+++ b/sw/source/ui/misc/pggrid.cxx
@@ -368,9 +368,9 @@ void SwTextGridPage::UpdatePageSize(const SfxItemSet& rSet)
void SwTextGridPage::SetLinesOrCharsRanges(FixedText & rField, const sal_Int32 nValue )
{
- String aFieldStr = rtl::OUString("( 1 -");
- aFieldStr += rtl::OUString::valueOf(nValue);
- aFieldStr += rtl::OUString(" )");
+ String aFieldStr = OUString("( 1 -");
+ aFieldStr += OUString::valueOf(nValue);
+ aFieldStr += OUString(" )");
rField.SetText( aFieldStr );
}
diff --git a/sw/source/ui/misc/redlndlg.cxx b/sw/source/ui/misc/redlndlg.cxx
index 06b13574a0f4..a961620e71ef 100644
--- a/sw/source/ui/misc/redlndlg.cxx
+++ b/sw/source/ui/misc/redlndlg.cxx
@@ -1058,7 +1058,7 @@ IMPL_LINK_NOARG(SwRedlineAcceptDlg, CommandHdl)
const_cast<SwRedline&>(rRedline).Broadcast(SwRedlineHint(&rRedline,SWREDLINE_FOCUS));
*/
- rtl::OUString sComment = convertLineEnd(rRedline.GetComment(), GetSystemLineEnd());
+ OUString sComment = convertLineEnd(rRedline.GetComment(), GetSystemLineEnd());
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "Dialogdiet fail!");
::DialogGetRanges fnGetRange = pFact->GetDialogGetRangesFunc();
@@ -1154,7 +1154,7 @@ void SwRedlineAcceptDlg::Initialize(const String& rExtraData)
{
if (rExtraData.Len())
{
- sal_uInt16 nPos = rExtraData.Search(rtl::OUString("AcceptChgDat:"));
+ sal_uInt16 nPos = rExtraData.Search(OUString("AcceptChgDat:"));
// try to read the alignment string "ALIGN:(...)"; if none existing,
// it's an old version
diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx
index 7855c879e11c..aba0a8e62d3a 100644
--- a/sw/source/ui/misc/srtdlg.cxx
+++ b/sw/source/ui/misc/srtdlg.cxx
@@ -65,7 +65,6 @@ static sal_Unicode cDeli = '\t';
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star;
-using ::rtl::OUString;
static void lcl_ClearLstBoxAndDelUserData( ListBox& rLstBox )
{
@@ -223,7 +222,7 @@ SwSortDlg::SwSortDlg(Window* pParent, SwWrtShell &rShell)
m_pDelimTabRB->Check(cDeli == '\t');
if(!m_pDelimTabRB->IsChecked())
{
- m_pDelimEdt->SetText(rtl::OUString(cDeli));
+ m_pDelimEdt->SetText(OUString(cDeli));
m_pDelimFreeRB->Check(sal_True);
DelimHdl(m_pDelimFreeRB);
}
@@ -380,7 +379,7 @@ IMPL_LINK_NOARG(SwSortDlg, DelimCharHdl)
{
SFX_ITEMSET_ARG( pMap->GetOutputItemSet(), pItem, SfxInt32Item, SID_ATTR_CHAR, sal_False );
if ( pItem )
- m_pDelimEdt->SetText( rtl::OUString(pItem->GetValue()) );
+ m_pDelimEdt->SetText( OUString(pItem->GetValue()) );
}
delete pMap;
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 18:02:42 +0000