summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sw/inc/IDocumentContentOperations.hxx1
-rw-r--r--sw/inc/IDocumentMarkAccess.hxx4
-rw-r--r--sw/source/core/access/accnotexthyperlink.hxx2
-rw-r--r--sw/source/core/access/accpara.cxx2
-rw-r--r--sw/source/core/crsr/annotationmark.cxx7
-rw-r--r--sw/source/core/doc/docbm.cxx4
-rw-r--r--sw/source/core/fields/expfld.cxx2
-rw-r--r--sw/source/core/inc/MarkManager.hxx4
-rw-r--r--sw/source/core/inc/annotationmark.hxx2
-rw-r--r--sw/source/core/inc/wrong.hxx4
-rw-r--r--sw/source/core/text/wrong.cxx4
-rw-r--r--sw/source/core/unocore/unotextmarkup.cxx2
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.cxx40
-rw-r--r--sw/source/filter/ww8/ww8par5.cxx7
-rw-r--r--sw/source/uibase/misc/glosdoc.cxx10
-rw-r--r--sw/source/uibase/sidebar/PageMarginControl.cxx20
-rw-r--r--sw/source/uibase/sidebar/SwPanelFactory.cxx4
-rw-r--r--sw/source/uibase/uiview/view2.cxx2
-rw-r--r--sw/source/uibase/utlui/navipi.cxx2
-rw-r--r--sw/source/uibase/wrtsh/wrtsh2.cxx2
20 files changed, 61 insertions, 64 deletions
diff --git a/sw/inc/IDocumentContentOperations.hxx b/sw/inc/IDocumentContentOperations.hxx
index dbdcd720bac2..2f956c6029ae 100644
--- a/sw/inc/IDocumentContentOperations.hxx
+++ b/sw/inc/IDocumentContentOperations.hxx
@@ -22,7 +22,6 @@
#include <sal/types.h>
#include <rtl/ustring.hxx>
-using rtl::OUString;
class SwPaM;
struct SwPosition;
diff --git a/sw/inc/IDocumentMarkAccess.hxx b/sw/inc/IDocumentMarkAccess.hxx
index e7500feafe31..07af6701ce8c 100644
--- a/sw/inc/IDocumentMarkAccess.hxx
+++ b/sw/inc/IDocumentMarkAccess.hxx
@@ -88,7 +88,7 @@ class IDocumentMarkAccess
virtual sw::mark::IMark* makeAnnotationMark(
const SwPaM& rPaM,
- const ::rtl::OUString& rName ) = 0;
+ const OUString& rName ) = 0;
/** Returns a mark in the document for a paragraph.
If there is none, a mark will be created.
@@ -255,7 +255,7 @@ class IDocumentMarkAccess
virtual const_iterator_t getAnnotationMarksBegin() const = 0;
virtual const_iterator_t getAnnotationMarksEnd() const = 0;
virtual sal_Int32 getAnnotationMarksCount() const = 0;
- virtual const_iterator_t findAnnotationMark( const ::rtl::OUString& rName ) const = 0;
+ virtual const_iterator_t findAnnotationMark( const OUString& rName ) const = 0;
virtual sw::mark::IMark* getAnnotationMarkFor(const SwPosition& rPosition) const = 0;
/** Returns the MarkType used to create the mark
diff --git a/sw/source/core/access/accnotexthyperlink.hxx b/sw/source/core/access/accnotexthyperlink.hxx
index fe7df6d0354f..4ebeebfce888 100644
--- a/sw/source/core/access/accnotexthyperlink.hxx
+++ b/sw/source/core/access/accnotexthyperlink.hxx
@@ -51,7 +51,7 @@ public:
virtual sal_Bool SAL_CALL doAccessibleAction( sal_Int32 nIndex )
throw (::com::sun::star::lang::IndexOutOfBoundsException,
::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual ::rtl::OUString SAL_CALL getAccessibleActionDescription(
+ virtual OUString SAL_CALL getAccessibleActionDescription(
sal_Int32 nIndex )
throw (::com::sun::star::lang::IndexOutOfBoundsException,
::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index e01e23d6642b..e2b282911c0c 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -1468,7 +1468,7 @@ OUString SwAccessibleParagraph::GetFieldTypeNameAtIndex(sal_Int32 nIndex)
{
strTypeName = SwFieldType::GetTypeStr(pField->GetTypeId());
const sal_uInt16 nWhich = pField->GetTyp()->Which();
- rtl::OUString sEntry;
+ OUString sEntry;
sal_Int32 subType = 0;
switch (nWhich)
{
diff --git a/sw/source/core/crsr/annotationmark.cxx b/sw/source/core/crsr/annotationmark.cxx
index cccc3c420251..f6b81a607f71 100644
--- a/sw/source/core/crsr/annotationmark.cxx
+++ b/sw/source/core/crsr/annotationmark.cxx
@@ -36,7 +36,7 @@ namespace sw { namespace mark
{
AnnotationMark::AnnotationMark(
const SwPaM& rPaM,
- const ::rtl::OUString& rName )
+ const OUString& rName )
: MarkBase( rPaM, rName )
{
if ( rName.getLength() == 0 )
@@ -67,7 +67,7 @@ namespace sw { namespace mark
// - the annotation field has an empty annotation name or
// - the annotation mark's name differs (on mark creation a name clash had been detected)
if ( pPostItField->GetName().isEmpty()
- || rtl::OUString( pPostItField->GetName() ) != GetName() )
+ || OUString( pPostItField->GetName() ) != GetName() )
{
const_cast<SwPostItField*>(pPostItField)->SetName( GetName() );
}
@@ -99,8 +99,7 @@ namespace sw { namespace mark
if ( pFmtFld->IsFldInDoc() )
{
const SwPostItField* pPostItField = dynamic_cast< const SwPostItField* >(pFmtFld->GetField());
- if ( pPostItField != NULL
- && rtl::OUString( pPostItField->GetName() ) == GetName() )
+ if (pPostItField != NULL && pPostItField->GetName() == GetName())
{
pAnnotationFmtFld = pFmtFld;
break;
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index 510c5acf1acc..bc55a9bcf6eb 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -510,7 +510,7 @@ namespace sw { namespace mark
sw::mark::IMark* MarkManager::makeAnnotationMark(
const SwPaM& rPaM,
- const ::rtl::OUString& rName )
+ const OUString& rName )
{
return makeMark( rPaM, rName, IDocumentMarkAccess::ANNOTATIONMARK );
}
@@ -1064,7 +1064,7 @@ namespace sw { namespace mark
return m_vAnnotationMarks.size();
}
- IDocumentMarkAccess::const_iterator_t MarkManager::findAnnotationMark( const ::rtl::OUString& rName ) const
+ IDocumentMarkAccess::const_iterator_t MarkManager::findAnnotationMark( const OUString& rName ) const
{
return lcl_FindMarkByName( rName, m_vAnnotationMarks.begin(), m_vAnnotationMarks.end() );
}
diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx
index a200cb7638be..a67a9512bf1a 100644
--- a/sw/source/core/fields/expfld.cxx
+++ b/sw/source/core/fields/expfld.cxx
@@ -1094,7 +1094,7 @@ bool SwSetExpField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const
rAny <<= GetInputFlag();
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/inc/MarkManager.hxx b/sw/source/core/inc/MarkManager.hxx
index 4e820b5efbc4..bd252535eab1 100644
--- a/sw/source/core/inc/MarkManager.hxx
+++ b/sw/source/core/inc/MarkManager.hxx
@@ -48,7 +48,7 @@ namespace sw {
virtual sw::mark::IMark* makeAnnotationMark(
const SwPaM& rPaM,
- const ::rtl::OUString& rName ) SAL_OVERRIDE;
+ const OUString& rName ) SAL_OVERRIDE;
virtual void repositionMark(::sw::mark::IMark* io_pMark, const SwPaM& rPaM) SAL_OVERRIDE;
virtual bool renameMark(::sw::mark::IMark* io_pMark, const OUString& rNewName) SAL_OVERRIDE;
@@ -90,7 +90,7 @@ namespace sw {
virtual const_iterator_t getAnnotationMarksBegin() const SAL_OVERRIDE;
virtual const_iterator_t getAnnotationMarksEnd() const SAL_OVERRIDE;
virtual sal_Int32 getAnnotationMarksCount() const SAL_OVERRIDE;
- virtual const_iterator_t findAnnotationMark( const ::rtl::OUString& rName ) const SAL_OVERRIDE;
+ virtual const_iterator_t findAnnotationMark( const OUString& rName ) const SAL_OVERRIDE;
virtual sw::mark::IMark* getAnnotationMarkFor(const SwPosition& rPos) const SAL_OVERRIDE;
virtual void assureSortedMarkContainers() const SAL_OVERRIDE;
diff --git a/sw/source/core/inc/annotationmark.hxx b/sw/source/core/inc/annotationmark.hxx
index 72feeda14b0f..948ced6b19a8 100644
--- a/sw/source/core/inc/annotationmark.hxx
+++ b/sw/source/core/inc/annotationmark.hxx
@@ -32,7 +32,7 @@ namespace sw { namespace mark
public:
AnnotationMark(
const SwPaM& rPaM,
- const ::rtl::OUString& rName );
+ const OUString& rName );
virtual ~AnnotationMark();
diff --git a/sw/source/core/inc/wrong.hxx b/sw/source/core/inc/wrong.hxx
index f15e1a8bea7a..8d48da9ca232 100644
--- a/sw/source/core/inc/wrong.hxx
+++ b/sw/source/core/inc/wrong.hxx
@@ -83,7 +83,7 @@ private:
{
if (xPropertyBag.is())
{
- const ::rtl::OUString colorKey("LineColor");
+ const OUString colorKey("LineColor");
com::sun::star::uno::Any aLineColor = xPropertyBag->getValue(colorKey).get< com::sun::star::uno::Any>();
com::sun::star::util::Color lineColor = 0;
@@ -109,7 +109,7 @@ private:
{
if (xPropertyBag.is())
{
- const ::rtl::OUString typeKey("LineType");
+ const OUString typeKey("LineType");
com::sun::star::uno::Any aLineType = xPropertyBag->getValue(typeKey).get< com::sun::star::uno::Any>();
::sal_Int16 lineType = 0;
diff --git a/sw/source/core/text/wrong.cxx b/sw/source/core/text/wrong.cxx
index 031a5e56e465..0ea4c52c3a79 100644
--- a/sw/source/core/text/wrong.cxx
+++ b/sw/source/core/text/wrong.cxx
@@ -22,7 +22,7 @@
#include "SwGrammarMarkUp.hxx"
#include <osl/diagnose.h>
-SwWrongArea::SwWrongArea( const rtl::OUString& rType, WrongListType listType,
+SwWrongArea::SwWrongArea( const OUString& rType, WrongListType listType,
com::sun::star::uno::Reference< com::sun::star::container::XStringKeyMap > xPropertyBag,
sal_Int32 nPos,
sal_Int32 nLen)
@@ -32,7 +32,7 @@ SwWrongArea::SwWrongArea( const rtl::OUString& rType, WrongListType listType,
mLineType = getWrongAreaLineType(listType, xPropertyBag);
}
-SwWrongArea::SwWrongArea( const rtl::OUString& rType,
+SwWrongArea::SwWrongArea( const OUString& rType,
com::sun::star::uno::Reference< com::sun::star::container::XStringKeyMap > xPropertyBag,
sal_Int32 nPos,
sal_Int32 nLen,
diff --git a/sw/source/core/unocore/unotextmarkup.cxx b/sw/source/core/unocore/unotextmarkup.cxx
index bc1cceb410fe..e8fddbdf681a 100644
--- a/sw/source/core/unocore/unotextmarkup.cxx
+++ b/sw/source/core/unocore/unotextmarkup.cxx
@@ -60,7 +60,7 @@ uno::Reference< container::XStringKeyMap > SAL_CALL SwXTextMarkup::getMarkupInfo
return xProp;
}
-void SAL_CALL SwXTextMarkup::commitTextRangeMarkup(::sal_Int32 nType, const ::rtl::OUString & aIdentifier, const uno::Reference< text::XTextRange> & xRange,
+void SAL_CALL SwXTextMarkup::commitTextRangeMarkup(::sal_Int32 nType, const OUString & aIdentifier, const uno::Reference< text::XTextRange> & xRange,
const uno::Reference< container::XStringKeyMap > & xMarkupInfoContainer) throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index a1c9832065ef..faaa740f496a 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -634,7 +634,7 @@ void DocxAttributeOutput::WriteSdtBlock( sal_Int32& nSdtPrToken,
for( sal_Int32 i=0; i < aChildren.getLength(); ++i )
m_pSerializer->singleElement( aChildren[i].Token,
FSNS(XML_w, XML_val),
- rtl::OUStringToOString( aChildren[i].Value, RTL_TEXTENCODING_UTF8 ).getStr(),
+ OUStringToOString( aChildren[i].Value, RTL_TEXTENCODING_UTF8 ).getStr(),
FSEND );
}
@@ -4479,11 +4479,11 @@ void DocxAttributeOutput::WritePostponedFormControl(const SdrObject* pObject)
m_pSerializer->singleElementNS(XML_w, XML_dateFormat,
FSNS(XML_w, XML_val),
- rtl::OUStringToOString( sDateFormat, RTL_TEXTENCODING_UTF8 ).getStr(),
+ OUStringToOString( sDateFormat, RTL_TEXTENCODING_UTF8 ).getStr(),
FSEND);
m_pSerializer->singleElementNS(XML_w, XML_lid,
FSNS(XML_w, XML_val),
- rtl::OUStringToOString( sLocale, RTL_TEXTENCODING_UTF8 ).getStr(),
+ OUStringToOString( sLocale, RTL_TEXTENCODING_UTF8 ).getStr(),
FSEND);
m_pSerializer->singleElementNS(XML_w, XML_storeMappedDataAs,
FSNS(XML_w, XML_val), "dateTime",
@@ -4529,9 +4529,9 @@ void DocxAttributeOutput::WritePostponedFormControl(const SdrObject* pObject)
{
m_pSerializer->singleElementNS(XML_w, XML_listItem,
FSNS(XML_w, XML_displayText),
- rtl::OUStringToOString( aItems[i], RTL_TEXTENCODING_UTF8 ).getStr(),
+ OUStringToOString( aItems[i], RTL_TEXTENCODING_UTF8 ).getStr(),
FSNS(XML_w, XML_value),
- rtl::OUStringToOString( aItems[i], RTL_TEXTENCODING_UTF8 ).getStr(),
+ OUStringToOString( aItems[i], RTL_TEXTENCODING_UTF8 ).getStr(),
FSEND);
}
@@ -7546,7 +7546,7 @@ void DocxAttributeOutput::FormatBackground( const SvxBrushItem& rBrush )
else if ( !m_rExport.bOutPageDescs )
{
// compare fill color with the original fill color
- OString sOriginalFill = rtl::OUStringToOString(
+ OString sOriginalFill = OUStringToOString(
m_sOriginalBackgroundColor, RTL_TEXTENCODING_UTF8 );
if( !m_pBackgroundAttrList )
@@ -7996,11 +7996,11 @@ void DocxAttributeOutput::ParaGrabBag(const SfxGrabBagItem& rItem)
if (aGrabBag[j].Name == "ooxml:CT_SdtDocPart_docPartGallery")
AddToAttrList( m_pParagraphSdtPrTokenChildren,
FSNS( XML_w, XML_docPartGallery ),
- rtl::OUStringToOString( sValue, RTL_TEXTENCODING_UTF8 ).getStr() );
+ OUStringToOString( sValue, RTL_TEXTENCODING_UTF8 ).getStr() );
else if (aGrabBag[j].Name == "ooxml:CT_SdtDocPart_docPartCategory")
AddToAttrList( m_pParagraphSdtPrTokenChildren,
FSNS( XML_w, XML_docPartCategory ),
- rtl::OUStringToOString( sValue, RTL_TEXTENCODING_UTF8 ).getStr() );
+ OUStringToOString( sValue, RTL_TEXTENCODING_UTF8 ).getStr() );
else if (aGrabBag[j].Name == "ooxml:CT_SdtDocPart_docPartUnique")
AddToAttrList( m_pParagraphSdtPrTokenChildren, FSNS( XML_w, XML_docPartUnique ), "" );
}
@@ -8025,15 +8025,15 @@ void DocxAttributeOutput::ParaGrabBag(const SfxGrabBagItem& rItem)
if (aGrabBag[j].Name == "ooxml:CT_DataBinding_prefixMappings")
AddToAttrList( m_pParagraphSdtPrDataBindingAttrs,
FSNS( XML_w, XML_prefixMappings ),
- rtl::OUStringToOString( sValue, RTL_TEXTENCODING_UTF8 ).getStr() );
+ OUStringToOString( sValue, RTL_TEXTENCODING_UTF8 ).getStr() );
else if (aGrabBag[j].Name == "ooxml:CT_DataBinding_xpath")
AddToAttrList( m_pParagraphSdtPrDataBindingAttrs,
FSNS( XML_w, XML_xpath ),
- rtl::OUStringToOString( sValue, RTL_TEXTENCODING_UTF8 ).getStr() );
+ OUStringToOString( sValue, RTL_TEXTENCODING_UTF8 ).getStr() );
else if (aGrabBag[j].Name == "ooxml:CT_DataBinding_storeItemID")
AddToAttrList( m_pParagraphSdtPrDataBindingAttrs,
FSNS( XML_w, XML_storeItemID ),
- rtl::OUStringToOString( sValue, RTL_TEXTENCODING_UTF8 ).getStr() );
+ OUStringToOString( sValue, RTL_TEXTENCODING_UTF8 ).getStr() );
}
}
else if (aPropertyValue.Name == "ooxml:CT_SdtPr_alias" && m_aParagraphSdtPrAlias.isEmpty())
@@ -8053,15 +8053,15 @@ void DocxAttributeOutput::ParaGrabBag(const SfxGrabBagItem& rItem)
if (aGrabBag[j].Name == "ooxml:CT_SdtCheckbox_checked")
AddToAttrList( m_pParagraphSdtPrTokenChildren,
FSNS( XML_w14, XML_checked ),
- rtl::OUStringToOString( sValue, RTL_TEXTENCODING_UTF8 ).getStr() );
+ OUStringToOString( sValue, RTL_TEXTENCODING_UTF8 ).getStr() );
else if (aGrabBag[j].Name == "ooxml:CT_SdtCheckbox_checkedState")
AddToAttrList( m_pParagraphSdtPrTokenChildren,
FSNS( XML_w14, XML_checkedState ),
- rtl::OUStringToOString( sValue, RTL_TEXTENCODING_UTF8 ).getStr() );
+ OUStringToOString( sValue, RTL_TEXTENCODING_UTF8 ).getStr() );
else if (aGrabBag[j].Name == "ooxml:CT_SdtCheckbox_uncheckedState")
AddToAttrList( m_pParagraphSdtPrTokenChildren,
FSNS( XML_w14, XML_uncheckedState ),
- rtl::OUStringToOString( sValue, RTL_TEXTENCODING_UTF8 ).getStr() );
+ OUStringToOString( sValue, RTL_TEXTENCODING_UTF8 ).getStr() );
}
}
else if (aPropertyValue.Name == "ooxml:CT_SdtPr_id")
@@ -8239,15 +8239,15 @@ void DocxAttributeOutput::CharGrabBag( const SfxGrabBagItem& rItem )
if (aGrabBag[j].Name == "ooxml:CT_SdtCheckbox_checked")
AddToAttrList( m_pRunSdtPrTokenChildren,
FSNS( XML_w14, XML_checked ),
- rtl::OUStringToOString( sValue, RTL_TEXTENCODING_UTF8 ).getStr() );
+ OUStringToOString( sValue, RTL_TEXTENCODING_UTF8 ).getStr() );
else if (aGrabBag[j].Name == "ooxml:CT_SdtCheckbox_checkedState")
AddToAttrList( m_pRunSdtPrTokenChildren,
FSNS( XML_w14, XML_checkedState ),
- rtl::OUStringToOString( sValue, RTL_TEXTENCODING_UTF8 ).getStr() );
+ OUStringToOString( sValue, RTL_TEXTENCODING_UTF8 ).getStr() );
else if (aGrabBag[j].Name == "ooxml:CT_SdtCheckbox_uncheckedState")
AddToAttrList( m_pRunSdtPrTokenChildren,
FSNS( XML_w14, XML_uncheckedState ),
- rtl::OUStringToOString( sValue, RTL_TEXTENCODING_UTF8 ).getStr() );
+ OUStringToOString( sValue, RTL_TEXTENCODING_UTF8 ).getStr() );
}
}
else if (aPropertyValue.Name == "ooxml:CT_SdtPr_dataBinding" && m_pRunSdtPrDataBindingAttrs == NULL)
@@ -8260,15 +8260,15 @@ void DocxAttributeOutput::CharGrabBag( const SfxGrabBagItem& rItem )
if (aGrabBag[j].Name == "ooxml:CT_DataBinding_prefixMappings")
AddToAttrList( m_pRunSdtPrDataBindingAttrs,
FSNS( XML_w, XML_prefixMappings ),
- rtl::OUStringToOString( sValue, RTL_TEXTENCODING_UTF8 ).getStr() );
+ OUStringToOString( sValue, RTL_TEXTENCODING_UTF8 ).getStr() );
else if (aGrabBag[j].Name == "ooxml:CT_DataBinding_xpath")
AddToAttrList( m_pRunSdtPrDataBindingAttrs,
FSNS( XML_w, XML_xpath ),
- rtl::OUStringToOString( sValue, RTL_TEXTENCODING_UTF8 ).getStr() );
+ OUStringToOString( sValue, RTL_TEXTENCODING_UTF8 ).getStr() );
else if (aGrabBag[j].Name == "ooxml:CT_DataBinding_storeItemID")
AddToAttrList( m_pRunSdtPrDataBindingAttrs,
FSNS( XML_w, XML_storeItemID ),
- rtl::OUStringToOString( sValue, RTL_TEXTENCODING_UTF8 ).getStr() );
+ OUStringToOString( sValue, RTL_TEXTENCODING_UTF8 ).getStr() );
}
}
else if (aPropertyValue.Name == "ooxml:CT_SdtPr_alias" && m_aRunSdtPrAlias.isEmpty())
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 97b0ed55a967..0517499c3443 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -95,17 +95,16 @@ using namespace sw::mark;
using namespace std; // #i24377#
using namespace nsSwDocInfoSubType;
-// Bookmarks
-
+// Bookmarks
namespace
{
// #120879# - helper method to identify a bookmark name to match the internal TOC bookmark naming convention
- bool IsTOCBookmarkName( const ::rtl::OUString& rName )
+ bool IsTOCBookmarkName(const OUString& rName)
{
return rName.startsWith("_Toc") || rName.startsWith(IDocumentMarkAccess::GetCrossRefHeadingBookmarkNamePrefix());
}
- ::rtl::OUString EnsureTOCBookmarkName( const ::rtl::OUString& rName )
+ OUString EnsureTOCBookmarkName(const OUString& rName)
{
OUString sTmp = rName;
if ( IsTOCBookmarkName ( rName ) )
diff --git a/sw/source/uibase/misc/glosdoc.cxx b/sw/source/uibase/misc/glosdoc.cxx
index 8acbe1e754df..eb375626b297 100644
--- a/sw/source/uibase/misc/glosdoc.cxx
+++ b/sw/source/uibase/misc/glosdoc.cxx
@@ -342,11 +342,11 @@ SwGlossaries::SwGlossaries()
}
// set new path and recreate internal array
-rtl::OUString lcl_makePath(const std::vector<rtl::OUString>& rPaths)
+OUString lcl_makePath(const std::vector<OUString>& rPaths)
{
- std::vector<rtl::OUString>::const_iterator aIt(rPaths.begin());
- const std::vector<rtl::OUString>::const_iterator aEnd(rPaths.end());
- rtl::OUStringBuffer aPath(*aIt);
+ std::vector<OUString>::const_iterator aIt(rPaths.begin());
+ const std::vector<OUString>::const_iterator aEnd(rPaths.end());
+ OUStringBuffer aPath(*aIt);
for (++aIt; aIt != aEnd; ++aIt)
{
aPath.append(SVT_SEARCHPATH_DELIMITER);
@@ -368,7 +368,7 @@ void SwGlossaries::UpdateGlosPath(bool bFull)
m_PathArr.clear();
std::vector<OUString> aDirArr;
- std::vector<rtl::OUString> aInvalidPaths;
+ std::vector<OUString> aInvalidPaths;
if (!m_aPath.isEmpty())
{
sal_Int32 nIndex = 0;
diff --git a/sw/source/uibase/sidebar/PageMarginControl.cxx b/sw/source/uibase/sidebar/PageMarginControl.cxx
index da77563d6525..6e80bb081c71 100644
--- a/sw/source/uibase/sidebar/PageMarginControl.cxx
+++ b/sw/source/uibase/sidebar/PageMarginControl.cxx
@@ -418,7 +418,7 @@ bool PageMarginControl::GetUserCustomValues()
if ( aWinOpt.Exists() )
{
::com::sun::star::uno::Sequence < ::com::sun::star::beans::NamedValue > aSeq = aWinOpt.GetUserData();
- ::rtl::OUString aTmp;
+ OUString aTmp;
if ( aSeq.getLength())
aSeq[0].Value >>= aTmp;
OUString aWinData( aTmp );
@@ -430,7 +430,7 @@ bool PageMarginControl::GetUserCustomValues()
if ( aWinOpt2.Exists() )
{
::com::sun::star::uno::Sequence < ::com::sun::star::beans::NamedValue > aSeq = aWinOpt2.GetUserData();
- ::rtl::OUString aTmp;
+ OUString aTmp;
if ( aSeq.getLength())
aSeq[0].Value >>= aTmp;
OUString aWinData( aTmp );
@@ -442,7 +442,7 @@ bool PageMarginControl::GetUserCustomValues()
if ( aWinOpt3.Exists() )
{
::com::sun::star::uno::Sequence < ::com::sun::star::beans::NamedValue > aSeq = aWinOpt3.GetUserData();
- ::rtl::OUString aTmp;
+ OUString aTmp;
if ( aSeq.getLength())
aSeq[0].Value >>= aTmp;
OUString aWinData( aTmp );
@@ -454,7 +454,7 @@ bool PageMarginControl::GetUserCustomValues()
if ( aWinOpt4.Exists() )
{
::com::sun::star::uno::Sequence < ::com::sun::star::beans::NamedValue > aSeq = aWinOpt4.GetUserData();
- ::rtl::OUString aTmp;
+ OUString aTmp;
if ( aSeq.getLength())
aSeq[0].Value >>= aTmp;
OUString aWinData( aTmp );
@@ -466,7 +466,7 @@ bool PageMarginControl::GetUserCustomValues()
if ( aWinOpt5.Exists() )
{
::com::sun::star::uno::Sequence < ::com::sun::star::beans::NamedValue > aSeq = aWinOpt5.GetUserData();
- ::rtl::OUString aTmp;
+ OUString aTmp;
if ( aSeq.getLength())
aSeq[0].Value >>= aTmp;
OUString aWinData( aTmp );
@@ -488,27 +488,27 @@ void PageMarginControl::StoreUserCustomValues()
SvtViewOptions aWinOpt( E_WINDOW, SWPAGE_LEFT_GVALUE );
aSeq[0].Name = "mnPageLeftMargin";
- aSeq[0].Value <<= ::rtl::OUString::number( mnPageLeftMargin );
+ aSeq[0].Value <<= OUString::number( mnPageLeftMargin );
aWinOpt.SetUserData( aSeq );
SvtViewOptions aWinOpt2( E_WINDOW, SWPAGE_RIGHT_GVALUE );
aSeq[0].Name = "mnPageRightMargin";
- aSeq[0].Value <<= ::rtl::OUString::number( mnPageRightMargin );
+ aSeq[0].Value <<= OUString::number( mnPageRightMargin );
aWinOpt2.SetUserData( aSeq );
SvtViewOptions aWinOpt3( E_WINDOW, SWPAGE_TOP_GVALUE );
aSeq[0].Name = "mnPageTopMargin";
- aSeq[0].Value <<= ::rtl::OUString::number( mnPageTopMargin );
+ aSeq[0].Value <<= OUString::number( mnPageTopMargin );
aWinOpt3.SetUserData( aSeq );
SvtViewOptions aWinOpt4( E_WINDOW, SWPAGE_DOWN_GVALUE );
aSeq[0].Name = "mnPageBottomMargin";
- aSeq[0].Value <<= ::rtl::OUString::number( mnPageBottomMargin );
+ aSeq[0].Value <<= OUString::number( mnPageBottomMargin );
aWinOpt4.SetUserData( aSeq );
SvtViewOptions aWinOpt5( E_WINDOW, SWPAGE_MIRROR_GVALUE );
aSeq[0].Name = "mbMirrored";
- aSeq[0].Value <<= ::rtl::OUString::number( (mbMirrored ? 1 : 0) );
+ aSeq[0].Value <<= OUString::number( (mbMirrored ? 1 : 0) );
aWinOpt5.SetUserData( aSeq );
}
diff --git a/sw/source/uibase/sidebar/SwPanelFactory.cxx b/sw/source/uibase/sidebar/SwPanelFactory.cxx
index 20e2296e91e5..4fc7d8d11b9a 100644
--- a/sw/source/uibase/sidebar/SwPanelFactory.cxx
+++ b/sw/source/uibase/sidebar/SwPanelFactory.cxx
@@ -56,7 +56,7 @@ public:
// XUIElementFactory
css::uno::Reference<css::ui::XUIElement> SAL_CALL createUIElement(
- const ::rtl::OUString& rsResourceURL,
+ const OUString& rsResourceURL,
const css::uno::Sequence<css::beans::PropertyValue>& rArguments)
throw(
css::container::NoSuchElementException,
@@ -74,7 +74,7 @@ SwPanelFactory::~SwPanelFactory (void)
}
Reference<ui::XUIElement> SAL_CALL SwPanelFactory::createUIElement (
- const ::rtl::OUString& rsResourceURL,
+ const OUString& rsResourceURL,
const css::uno::Sequence<css::beans::PropertyValue>& rArguments)
throw(
container::NoSuchElementException,
diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx
index 6451d6bd2b9a..f74f21728761 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -1912,7 +1912,7 @@ bool SwView::JumpToSwMark( const OUString& rMark )
if( !sCmp.isEmpty() )
{
- rtl::OUString sName( sMark.copy( 0, nPos ) );
+ OUString sName( sMark.copy( 0, nPos ) );
sCmp = sCmp.toAsciiLowerCase();
FlyCntType eFlyType = FLYCNTTYPE_ALL;
diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx
index be7b4c2cc975..5b17227521e5 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -506,7 +506,7 @@ void SwNavigationPI::MakeMark()
IDocumentMarkAccess* const pMarkAccess = rSh.getIDocumentMarkAccess();
// collect and sort navigator reminder names
- ::std::vector< ::rtl::OUString > vNavMarkNames;
+ ::std::vector< OUString > vNavMarkNames;
for(IDocumentMarkAccess::const_iterator_t ppMark = pMarkAccess->getAllMarksBegin();
ppMark != pMarkAccess->getAllMarksEnd();
++ppMark)
diff --git a/sw/source/uibase/wrtsh/wrtsh2.cxx b/sw/source/uibase/wrtsh/wrtsh2.cxx
index 1f78a7b22f7c..44b9183fabe0 100644
--- a/sw/source/uibase/wrtsh/wrtsh2.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh2.cxx
@@ -120,7 +120,7 @@ void SwWrtShell::Insert(SwField &rFld)
if ( GetDoc() != NULL )
{
IDocumentMarkAccess* pMarksAccess = GetDoc()->getIDocumentMarkAccess();
- pMarksAccess->makeAnnotationMark( *pAnnotationTextRange, ::rtl::OUString() );
+ pMarksAccess->makeAnnotationMark( *pAnnotationTextRange, OUString() );
}
pAnnotationTextRange.reset();
}
generated by cgit (git 2.34.1) at 2024-05-02 19:35:46 +0000