summaryrefslogtreecommitdiff
path: root/sw/source/ui/index
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/ui/index')
-rw-r--r--sw/source/ui/index/cntex.cxx23
-rw-r--r--sw/source/ui/index/cnttab.cxx37
-rw-r--r--sw/source/ui/index/swuiidxmrk.cxx1
3 files changed, 29 insertions, 32 deletions
diff --git a/sw/source/ui/index/cntex.cxx b/sw/source/ui/index/cntex.cxx
index a695b02cb2db..33c1d906f2b8 100644
--- a/sw/source/ui/index/cntex.cxx
+++ b/sw/source/ui/index/cntex.cxx
@@ -62,7 +62,6 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::ucb;
using namespace ::com::sun::star::uno;
using namespace com::sun::star::ui::dialogs;
-using ::rtl::OUString;
#ifdef SW_PROP_NAME_STR
@@ -74,7 +73,7 @@ static void lcl_SetProp( uno::Reference< XPropertySetInfo > & xInfo,
uno::Reference< XPropertySet > & xProps,
const char* pPropName, const String& rValue)
{
- OUString uPropName(rtl::OUString::createFromAscii(pPropName));
+ OUString uPropName(OUString::createFromAscii(pPropName));
if(xInfo->hasPropertyByName(uPropName))
{
uno::Any aValue;
@@ -94,7 +93,7 @@ static void lcl_SetProp( uno::Reference< XPropertySetInfo > & xInfo,
uno::Reference< XPropertySet > & xProps,
sal_uInt16 nId, sal_Int16 nValue )
{
- OUString uPropName(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(nId)));
+ OUString uPropName(OUString::createFromAscii(SW_PROP_NAME_STR(nId)));
if(xInfo->hasPropertyByName(uPropName))
{
uno::Any aValue;
@@ -108,7 +107,7 @@ static void lcl_SetBOOLProp(
uno::Reference< beans::XPropertySet > & xProps,
sal_uInt16 nId, sal_Bool bValue )
{
- OUString uPropName(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(nId)));
+ OUString uPropName(OUString::createFromAscii(SW_PROP_NAME_STR(nId)));
if(xInfo->hasPropertyByName(uPropName))
{
uno::Any aValue;
@@ -136,7 +135,7 @@ IMPL_LINK_NOARG(SwMultiTOXTabDialog, CreateExample_Hdl)
uno::Reference< container::XNameAccess > xSections =
xSectionSupplier->getTextSections();
- rtl::OUString sSectionName("IndexSection_");
+ OUString sSectionName("IndexSection_");
for(int i = 0; i < 7; ++i )
{
String sTmp( sSectionName ); sTmp += OUString::number(i);
@@ -207,7 +206,7 @@ void SwMultiTOXTabDialog::CreateOrUpdateExample(
uno::Reference< text::XTextRange > xRg(xCrsr, uno::UNO_QUERY);
xCrsr->getText()->insertTextContent(xRg, xContent, sal_False);
}
- OUString uIsVisible(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_IS_VISIBLE)));
+ OUString uIsVisible(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_IS_VISIBLE)));
for(sal_uInt16 i = 0 ; i <= TOX_AUTHORITIES; i++)
{
uno::Reference< beans::XPropertySet > xSectPr(pxIndexSectionsArr[i]->xContainerSection, uno::UNO_QUERY);
@@ -233,10 +232,10 @@ void SwMultiTOXTabDialog::CreateOrUpdateExample(
//stylenames
sal_uInt16 nContentOptions = rDesc.GetContentOptions();
- if(xInfo->hasPropertyByName(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_LEVEL_PARAGRAPH_STYLES))))
+ if(xInfo->hasPropertyByName(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_LEVEL_PARAGRAPH_STYLES))))
{
sal_Bool bOn = 0!=(nContentOptions&nsSwTOXElement::TOX_TEMPLATE );
- uno::Any aStyleNames(xIdxProps->getPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_LEVEL_PARAGRAPH_STYLES))));
+ uno::Any aStyleNames(xIdxProps->getPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_LEVEL_PARAGRAPH_STYLES))));
uno::Reference< container::XIndexReplace > xAcc;
aStyleNames >>= xAcc;
@@ -309,7 +308,7 @@ void SwMultiTOXTabDialog::CreateOrUpdateExample(
nEndLevel = pForm->GetFormMax() - 1;
}
- if(xInfo->hasPropertyByName(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_LEVEL_FORMAT))))
+ if(xInfo->hasPropertyByName(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_LEVEL_FORMAT))))
{
for(sal_uInt16 nCurrLevel = nStartLevel; nCurrLevel <= nEndLevel; nCurrLevel++)
{
@@ -406,7 +405,7 @@ void SwMultiTOXTabDialog::CreateOrUpdateExample(
}
aSequPropVals.realloc(nTokenIndex);
- uno::Any aFormatAccess = xIdxProps->getPropertyValue(rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_LEVEL_FORMAT)));
+ uno::Any aFormatAccess = xIdxProps->getPropertyValue(OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_LEVEL_FORMAT)));
OSL_ENSURE(aFormatAccess.getValueType() == ::getCppuType((uno::Reference<container::XIndexReplace>*)0),
"wrong property type");
@@ -439,11 +438,11 @@ void SwMultiTOXTabDialog::CreateOrUpdateExample(
}
for(sal_uInt16 i = 1; i < nEndLevel; i++)
{
- String sPropName(rtl::OUString("ParaStyleLevel"));
+ String sPropName(OUString("ParaStyleLevel"));
sPropName += OUString::number( i );
lcl_SetProp(xInfo,
xIdxProps,
- rtl::OUStringToOString(sPropName, RTL_TEXTENCODING_ASCII_US).getStr(),
+ OUStringToOString(sPropName, RTL_TEXTENCODING_ASCII_US).getStr(),
pForm->GetTemplate(i + nOffset));
}
}
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 7d516a3f4fde..73089dae4c53 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -82,14 +82,13 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::uno;
using namespace com::sun::star::ui::dialogs;
-using ::rtl::OUString;
using namespace ::sfx2;
#include <svtools/editbrowsebox.hxx>
static const sal_Unicode aDeliStart = '['; // for the form
static const sal_Unicode aDeliEnd = ']'; // for the form
-#define IDX_FILE_EXTENSION rtl::OUString("*.sdi")
+#define IDX_FILE_EXTENSION OUString("*.sdi")
static String lcl_CreateAutoMarkFileDlg( const String& rURL,
const String& rFileString, bool bOpen )
@@ -298,7 +297,7 @@ SwMultiTOXTabDialog::SwMultiTOXTabDialog(Window* pParent, const SfxItemSet& rSet
}
else
{
- pDescArr[nArrayIndex]->SetAuthBrackets(rtl::OUString("[]"));
+ pDescArr[nArrayIndex]->SetAuthBrackets(OUString("[]"));
}
}
}
@@ -439,14 +438,14 @@ SwTOXDescription& SwMultiTOXTabDialog::GetTOXDescription(CurTOXType eType)
rSh.GetFldType(RES_AUTHORITY, aEmptyStr);
if(pFType)
{
- String sBrackets = rtl::OUString(pFType->GetPrefix());
+ String sBrackets = OUString(pFType->GetPrefix());
sBrackets += pFType->GetSuffix();
pDescArr[nIndex]->SetAuthBrackets(sBrackets);
pDescArr[nIndex]->SetAuthSequence(pFType->IsSequence());
}
else
{
- pDescArr[nIndex]->SetAuthBrackets(rtl::OUString("[]"));
+ pDescArr[nIndex]->SetAuthBrackets(OUString("[]"));
}
}
else if(TOX_INDEX == eType.eType)
@@ -491,7 +490,7 @@ IMPL_LINK( SwMultiTOXTabDialog, ShowPreviewHdl, CheckBox *, pBox )
if(!pExampleFrame && !bExampleCreated)
{
bExampleCreated = sal_True;
- String sTemplate(rtl::OUString("internal"));
+ String sTemplate(OUString("internal"));
sTemplate += INET_PATH_TOKEN;
sTemplate.AppendAscii( RTL_CONSTASCII_STRINGPARAM("idxexample") );
String sTemplateWithoutExt( sTemplate );
@@ -1963,10 +1962,10 @@ SwTOXEntryTabPage::SwTOXEntryTabPage(Window* pParent, const SfxItemSet& rAttrSet
aSortDocPosRB.Check();
aFillCharCB.SetMaxTextLen(1);
- aFillCharCB.InsertEntry(rtl::OUString(' '));
- aFillCharCB.InsertEntry(rtl::OUString('.'));
- aFillCharCB.InsertEntry(rtl::OUString('-'));
- aFillCharCB.InsertEntry(rtl::OUString('_'));
+ aFillCharCB.InsertEntry(OUString(' '));
+ aFillCharCB.InsertEntry(OUString('.'));
+ aFillCharCB.InsertEntry(OUString('-'));
+ aFillCharCB.InsertEntry(OUString('_'));
aButtonPositions[0] = aEntryNoPB.GetPosPixel();
aButtonPositions[1] = aEntryPB.GetPosPixel();
@@ -2347,7 +2346,7 @@ IMPL_LINK(SwTOXEntryTabPage, RemoveInsertAuthHdl, PushButton*, pButton)
String sToInsert(aAuthFieldsLB.GetSelectEntry());
SwFormToken aInsert(TOKEN_AUTHORITY);
aInsert.nAuthorityField = (sal_uInt16)(sal_uIntPtr)aAuthFieldsLB.GetEntryData(nSelPos);
- aTokenWIN.InsertAtSelection(rtl::OUString::createFromAscii(
+ aTokenWIN.InsertAtSelection(OUString::createFromAscii(
SwForm::aFormAuth), aInsert);
aAuthFieldsLB.RemoveEntry(sToInsert);
aAuthFieldsLB.SelectEntryPos( nSelPos ? nSelPos - 1 : 0);
@@ -2579,7 +2578,7 @@ IMPL_LINK(SwTOXEntryTabPage, TokenSelectedHdl, SwFormToken*, pToken)
{
aTabPosMF.SetValue(aTabPosMF.Normalize(pToken->nTabStopPosition), FUNIT_TWIP);
aAutoRightCB.Check(SVX_TAB_ADJUST_END == pToken->eTabAlign);
- aFillCharCB.SetText(rtl::OUString(pToken->cTabFillChar));
+ aFillCharCB.SetText(OUString(pToken->cTabFillChar));
aTabPosFT.Enable(!aAutoRightCB.IsChecked());
aTabPosMF.Enable(!aAutoRightCB.IsChecked());
}
@@ -2903,8 +2902,8 @@ void SwTokenWindow::SetForm(SwForm& rForm, sal_uInt16 nL)
default:; //prevent warning
}
- InsertItem( pTmp ? rtl::OUString::createFromAscii(pTmp)
- : rtl::OUString(), aToken );
+ InsertItem( pTmp ? OUString::createFromAscii(pTmp)
+ : OUString(), aToken );
bLastWasText = false;
}
@@ -3327,9 +3326,9 @@ IMPL_LINK(SwTokenWindow, ScrollHdl, ImageButton*, pBtn )
const long nSpace = aCtrlParentWin.GetSizePixel().Width();
#if OSL_DEBUG_LEVEL > 1
//find all start/end positions and print it
- String sMessage(rtl::OUString("Space: "));
+ String sMessage(OUString("Space: "));
sMessage += OUString::number(nSpace);
- sMessage += rtl::OUString(" | ");
+ sMessage += OUString(" | ");
for (ctrl_const_iterator it = aControlList.begin(); it != aControlList.end(); ++it)
{
@@ -3339,9 +3338,9 @@ IMPL_LINK(SwTokenWindow, ScrollHdl, ImageButton*, pBtn )
long nDebugWidth = pDebugCtrl->GetSizePixel().Width();
sMessage += OUString::number( nDebugXPos );
- sMessage += rtl::OUString(" ");
+ sMessage += OUString(" ");
sMessage += OUString::number(nDebugXPos + nDebugWidth);
- sMessage += rtl::OUString(" | ");
+ sMessage += OUString(" | ");
}
#endif
@@ -4116,7 +4115,7 @@ void SwEntryBrowseBox::WriteEntries(SvStream& rOutStr)
AutoMarkEntry* pEntry = &aEntryArr[i];
if(pEntry->sComment.Len())
{
- String sWrite = rtl::OUString('#');
+ String sWrite = OUString('#');
sWrite += pEntry->sComment;
rOutStr.WriteByteStringLine( sWrite, eTEnc );
}
diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index f0069317db12..c5b5abf7a183 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -74,7 +74,6 @@ using namespace com::sun::star;
using namespace com::sun::star::i18n;
using namespace com::sun::star::lang;
using namespace com::sun::star::util;
-using ::rtl::OUString;
using namespace ::comphelper;
using namespace ::com::sun::star;
generated by cgit (git 2.34.1) at 2024-08-02 10:19:11 +0000