mass removal of rtl:: prefixes for O(U)String*

Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk
have kept them, in order not to break external API (the automatic using declaration
is LO-internal).

Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09

10 files changed, 39 insertions, 44 deletions

diff --git a/sw/source/ui/envelp/envimg.cxx b/sw/source/ui/envelp/envimg.cxx
index d7760d8fc150..3597753d2dc0 100644
--- a/sw/source/ui/envelp/envimg.cxx
+++ b/sw/source/ui/envelp/envimg.cxx
@@ -36,7 +36,7 @@
 #include <unomid.h>
 
 #ifdef WNT
-#define NEXTLINE  rtl::OUString("\r\n")
+#define NEXTLINE  OUString("\r\n")
 #else
 #define NEXTLINE  '\n'
 #endif
@@ -44,7 +44,6 @@
 using namespace utl;
 using namespace ::com::sun::star::uno;
 
-using ::rtl::OUString;
 
 
 TYPEINIT1_AUTOFACTORY( SwEnvItem, SfxPoolItem );
@@ -269,9 +268,9 @@ void    SwEnvCfgItem::Commit()
     PutProperties(aNames, aValues);
 }
 
-void SwEnvCfgItem::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {}
+void SwEnvCfgItem::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
 
-Sequence<rtl::OUString> SwEnvCfgItem::GetPropertyNames()
+Sequence<OUString> SwEnvCfgItem::GetPropertyNames()
 {
     static const char* aPropNames[] =
     {
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index 9ffa4154c3cf..ab201c2d9750 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -72,7 +72,7 @@ void SwLabDlg::_ReplaceGroup( const String &rMake )
 {
     // Remove old entries
     pRecs->erase(pRecs->begin() + 1, pRecs->end());
-    aLabelsCfg.FillLabels(rtl::OUString(rMake), *pRecs);
+    aLabelsCfg.FillLabels(OUString(rMake), *pRecs);
     aLstGroup = rMake;
 }
 
@@ -153,7 +153,7 @@ SwLabDlg::SwLabDlg(Window* pParent, const SfxItemSet& rSet,
         pRecs->insert( pRecs->begin(), pRec );
 
     sal_uInt16 nLstGroup = 0;
-    const std::vector<rtl::OUString>& rMan = aLabelsCfg.GetManufacturers();
+    const std::vector<OUString>& rMan = aLabelsCfg.GetManufacturers();
     for(sal_uInt16 nMan = 0; nMan < rMan.size(); nMan++)
     {
         aMakes.push_back(rMan[nMan]);
@@ -274,7 +274,7 @@ SwLabPage::SwLabPage(Window* pParent, const SfxItemSet& rSet) :
     const sal_uInt16 nCount = (sal_uInt16)GetParentSwLabDlg()->Makes().size();
     for(size_t i = 0; i < nCount; ++i)
     {
-        rtl::OUString& rStr = GetParentSwLabDlg()->Makes()[i];
+        OUString& rStr = GetParentSwLabDlg()->Makes()[i];
         aMakeBox.InsertEntry( rStr );
 
         if ( rStr == aItem.aLstMake)
@@ -489,8 +489,8 @@ void SwLabPage::InitDatabaseBox()
     if( GetNewDBMgr() )
     {
         aDatabaseLB.Clear();
-        ::com::sun::star::uno::Sequence<rtl::OUString> aDataNames = SwNewDBMgr::GetExistingDatabaseNames();
-        const rtl::OUString* pDataNames = aDataNames.getConstArray();
+        ::com::sun::star::uno::Sequence<OUString> aDataNames = SwNewDBMgr::GetExistingDatabaseNames();
+        const OUString* pDataNames = aDataNames.getConstArray();
         for (long i = 0; i < aDataNames.getLength(); i++)
             aDatabaseLB.InsertEntry(pDataNames[i]);
         String sDBName = sActDBName.GetToken( 0, DB_DELIM );
@@ -558,7 +558,7 @@ void SwLabPage::Reset(const SfxItemSet& rSet)
     aAddrBox    .Check      ( aItem.bAddr );
     aWritingEdit.SetText    ( aWriting );
 
-    for(std::vector<rtl::OUString>::const_iterator i = GetParentSwLabDlg()->Makes().begin(); i != GetParentSwLabDlg()->Makes().end(); ++i)
+    for(std::vector<OUString>::const_iterator i = GetParentSwLabDlg()->Makes().begin(); i != GetParentSwLabDlg()->Makes().end(); ++i)
     {
         if(aMakeBox.GetEntryPos(String(*i)) == LISTBOX_ENTRY_NOTFOUND)
             aMakeBox.InsertEntry(*i);
@@ -600,7 +600,7 @@ void SwVisitingCardPage::ClearUserData()
 }
 
 void SwVisitingCardPage::SetUserData( sal_uInt32 nCnt,
-                const rtl::OUString* pNames, const rtl::OUString* pValues )
+                const OUString* pNames, const OUString* pValues )
 {
     for( sal_uInt32 i = 0; i < nCnt; ++i )
     {
diff --git a/sw/source/ui/envelp/labelcfg.cxx b/sw/source/ui/envelp/labelcfg.cxx
index eb7cd6b6ab19..6aaee0be304b 100644
--- a/sw/source/ui/envelp/labelcfg.cxx
+++ b/sw/source/ui/envelp/labelcfg.cxx
@@ -132,8 +132,8 @@ SwLabelConfig::SwLabelConfig() :
     assert(res == xmlreader::XmlReader::RESULT_DONE);
 
     // add to m_aLabels and m_aManufacturers the custom labels
-    const Sequence<rtl::OUString>& rMan = GetNodeNames( OUString() );
-    const rtl::OUString* pMan = rMan.getConstArray();
+    const Sequence<OUString>& rMan = GetNodeNames( OUString() );
+    const OUString* pMan = rMan.getConstArray();
     for ( sal_Int32 nMan = 0; nMan < rMan.getLength(); nMan++ )
     {
         sManufacturer = pMan[nMan];
@@ -169,7 +169,7 @@ SwLabelConfig::~SwLabelConfig()
 // the config item is not writable ?:
 void SwLabelConfig::Commit() {}
 
-void SwLabelConfig::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {}
+void SwLabelConfig::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
 
 static SwLabRec* lcl_CreateSwLabRec(const OUString& rType, const OUString& rMeasure, const OUString& rManufacturer)
 {
@@ -257,7 +257,7 @@ void    SwLabelConfig::FillLabels(const OUString& rManufacturer, SwLabRecs& rLab
         rLabArr.push_back( lcl_CreateSwLabRec(it->first, it->second.m_aMeasure, rManufacturer) );
 }
 
-sal_Bool    SwLabelConfig::HasLabel(const rtl::OUString& rManufacturer, const rtl::OUString& rType)
+sal_Bool    SwLabelConfig::HasLabel(const OUString& rManufacturer, const OUString& rType)
 {
     return ( ( m_aLabels.find(rManufacturer) != m_aLabels.end() ) &&
              ( m_aLabels[rManufacturer].find(rType) != m_aLabels[rManufacturer].end() ) );
@@ -274,8 +274,8 @@ static bool lcl_Exists(const OUString& rNode, const Sequence<OUString>& rLabels)
 
 // label is always saved as a custom label
 // predefined labels can NOT be overwritten by custom labels with same manufacturer/name
-void SwLabelConfig::SaveLabel( const rtl::OUString& rManufacturer,
-        const rtl::OUString& rType, const SwLabRec& rRec )
+void SwLabelConfig::SaveLabel( const OUString& rManufacturer,
+        const OUString& rType, const SwLabRec& rRec )
 {
     OUString sFoundNode;
     bool bManufacturerNodeFound;
diff --git a/sw/source/ui/envelp/labelexp.cxx b/sw/source/ui/envelp/labelexp.cxx
index f3ae13ffa629..eb8384e89b30 100644
--- a/sw/source/ui/envelp/labelexp.cxx
+++ b/sw/source/ui/envelp/labelexp.cxx
@@ -36,7 +36,6 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::uno;
 using namespace ::comphelper;
-using ::rtl::OUString;
 
 #ifdef SW_PROP_NAME_STR
 #undef SW_PROP_NAME_STR
@@ -57,7 +56,7 @@ void SwVisitingCardPage::InitFrameControl()
 
     uno::Sequence<OUString> aNames = m_xAutoText->getElementNames();
     const OUString* pGroups = aNames.getConstArray();
-    OUString uTitleName( rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_TITLE)) );
+    OUString uTitleName( OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_TITLE)) );
 
     for(sal_uInt16 i = 0; i < aNames.getLength(); i++)
     {
@@ -184,7 +183,7 @@ void SwLabDlg::UpdateFieldInformation(uno::Reference< frame::XModel > & xModel,
 
     static const struct _SwLabItemMap {
         const char* pName;
-        rtl::OUString SwLabItem:: *pValue;
+        OUString SwLabItem:: *pValue;
     }  aArr[] = {
         { "BC_PRIV_FIRSTNAME"  , &SwLabItem::aPrivFirstName },
         { "BC_PRIV_NAME"       , &SwLabItem::aPrivName },
@@ -223,8 +222,8 @@ void SwLabDlg::UpdateFieldInformation(uno::Reference< frame::XModel > & xModel,
 
     try
     {
-        rtl::OUString sFldName("com.sun.star.text.FieldMaster.User.");
-        OUString uCntName( rtl::OUString::createFromAscii( SW_PROP_NAME_STR(UNO_NAME_CONTENT )));
+        OUString sFldName("com.sun.star.text.FieldMaster.User.");
+        OUString uCntName( OUString::createFromAscii( SW_PROP_NAME_STR(UNO_NAME_CONTENT )));
         for( const _SwLabItemMap* p = aArr; p->pName; ++p )
         {
             String sCurFldName( sFldName );
diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx
index 7cfe36022b79..93e71b16c4d1 100644
--- a/sw/source/ui/envelp/labfmt.cxx
+++ b/sw/source/ui/envelp/labfmt.cxx
@@ -36,7 +36,6 @@ using namespace utl;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 
-using ::rtl::OUString;
 
 #define ROUND(x) ((sal_uInt16) ((x) + .5))
 
@@ -83,7 +82,7 @@ SwLabPreview::SwLabPreview( const SwLabFmtPage* pParent, const ResId& rResID ) :
     lPWidthWidth  = GetTextWidth(aPWidthStr);
     lPHeightWidth = GetTextWidth(aPHeightStr);
     lXHeight = GetTextHeight();
-    lXWidth  = GetTextWidth(rtl::OUString('X'));
+    lXWidth  = GetTextWidth(OUString('X'));
 
     // Scale factor
     float fx = (float)(lOutWPix - (2 * (lLeftWidth + 15))) / (float)lOutWPix;
@@ -577,7 +576,7 @@ IMPL_LINK_NOARG(SwLabFmtPage, SaveHdl)
     {
         bModified = false;
         const std::vector<OUString>& rMan = GetParentSwLabDlg()->GetLabelsConfig().GetManufacturers();
-        std::vector<rtl::OUString>& rMakes(GetParentSwLabDlg()->Makes());
+        std::vector<OUString>& rMakes(GetParentSwLabDlg()->Makes());
         if(rMakes.size() < rMan.size())
         {
             rMakes = rMan;
@@ -637,8 +636,8 @@ IMPL_LINK_NOARG(SwSaveLabelDlg, OkHdl)
         }
         String sTmp(aQueryMB.GetMessText());
         String sQuery(sTmp);
-        sQuery.SearchAndReplace(rtl::OUString("%1"), sMake);
-        sQuery.SearchAndReplace(rtl::OUString("%2"), sType);
+        sQuery.SearchAndReplace(OUString("%1"), sMake);
+        sQuery.SearchAndReplace(OUString("%2"), sType);
         aQueryMB.SetMessText(sQuery);
 
         short eRet = aQueryMB.Execute();
diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx
index b22159b1d553..2ecf0676c1f7 100644
--- a/sw/source/ui/envelp/labfmt.hxx
+++ b/sw/source/ui/envelp/labfmt.hxx
@@ -161,7 +161,7 @@ class SwSaveLabelDlg : public ModalDialog
 public:
     SwSaveLabelDlg(SwLabFmtPage* pParent, SwLabRec& rRec);
 
-    void    SetLabel(const rtl::OUString& rMake, const rtl::OUString& rType)
+    void    SetLabel(const OUString& rMake, const OUString& rType)
         {
             aMakeCB.SetText(String(rMake));
             aTypeED.SetText(String(rType));
diff --git a/sw/source/ui/envelp/labimg.cxx b/sw/source/ui/envelp/labimg.cxx
index 112776b3ceeb..a5b29cd4e752 100644
--- a/sw/source/ui/envelp/labimg.cxx
+++ b/sw/source/ui/envelp/labimg.cxx
@@ -32,7 +32,6 @@
 using namespace utl;
 using namespace ::com::sun::star::uno;
 
-using ::rtl::OUString;
 
 SwLabItem::SwLabItem() :
 
@@ -192,7 +191,7 @@ SfxPoolItem* SwLabItem::Clone(SfxItemPool*) const
     return new SwLabItem(*this);
 }
 
-Sequence<rtl::OUString> SwLabCfgItem::GetPropertyNames()
+Sequence<OUString> SwLabCfgItem::GetPropertyNames()
 {
     static const char* aLabelPropNames[] =
     {
@@ -397,7 +396,7 @@ SwLabCfgItem::SwLabCfgItem(sal_Bool bLabel) :
     }
 }
 
-void SwLabCfgItem::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {}
+void SwLabCfgItem::Notify( const ::com::sun::star::uno::Sequence< OUString >& ) {}
 
 void    SwLabCfgItem::Commit()
 {
diff --git a/sw/source/ui/envelp/labprt.cxx b/sw/source/ui/envelp/labprt.cxx
index 810adf4599f7..de6a37ed61d3 100644
--- a/sw/source/ui/envelp/labprt.cxx
+++ b/sw/source/ui/envelp/labprt.cxx
@@ -60,7 +60,7 @@ SwLabPrtPage::SwLabPrtPage(Window* pParent, const SfxItemSet& rSet) :
     SvtCommandOptions aCmdOpts;
     if ( aCmdOpts.Lookup(
              SvtCommandOptions::CMDOPTION_DISABLED,
-             rtl::OUString( "Print"  ) ) )
+             OUString( "Print"  ) ) )
     {
         aPrinterInfo.Hide();
         aPrtSetup.Hide();
diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx
index c7dba1a214f6..d6c235048c78 100644
--- a/sw/source/ui/envelp/mailmrge.cxx
+++ b/sw/source/ui/envelp/mailmrge.cxx
@@ -74,7 +74,6 @@ using namespace ::com::sun::star::form;
 using namespace ::com::sun::star::view;
 using namespace ::com::sun::star::ui::dialogs;
 
-using ::rtl::OUString;
 
 struct SwMailMergeDlg_Impl
 {
@@ -369,7 +368,7 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell,
     for(sal_uInt16 nEntry = 0; nEntry < aAddressFldLB.GetEntryCount(); nEntry++)
         aColumnLB.InsertEntry(aAddressFldLB.GetEntry(nEntry));
 
-    aAddressFldLB.SelectEntry(rtl::OUString("EMAIL"));
+    aAddressFldLB.SelectEntry(OUString("EMAIL"));
 
     String sPath(pModOpt->GetMailingPath());
     if(!sPath.Len())
@@ -385,7 +384,7 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell,
 
     if (!bColumn )
     {
-        aColumnLB.SelectEntry(rtl::OUString("NAME"));
+        aColumnLB.SelectEntry(OUString("NAME"));
     }
     else
         aColumnLB.SelectEntry(pModOpt->GetNameFromColumn());
@@ -416,7 +415,7 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell,
         sCommand += OUString::number(SFX_FILTER_NOTINFILEDLG);
         sCommand += ":default_first";
         uno::Reference< container::XEnumeration > xList = xQuery->createSubSetEnumerationByQuery(sCommand);
-        const ::rtl::OUString sName("Name");
+        const OUString sName("Name");
         sal_uInt16 nODT = USHRT_MAX;
         while(xList->hasMoreElements())
         {
@@ -426,7 +425,7 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell,
             uno::Any aProps = xFilterFactory->getByName(sFilter);
             uno::Sequence< beans::PropertyValue > aFilterProperties;
             aProps >>= aFilterProperties;
-            ::rtl::OUString sUIName2;
+            OUString sUIName2;
             const beans::PropertyValue* pFilterProperties = aFilterProperties.getConstArray();
             for(int nProp = 0; nProp < aFilterProperties.getLength(); nProp++)
             {
@@ -441,7 +440,7 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell,
                 sal_uInt16 nFilter = aFilterLB.InsertEntry( sUIName2 );
                 if( 0 == sFilter.compareToAscii("writer8") )
                     nODT = nFilter;
-                aFilterLB.SetEntryData( nFilter, new ::rtl::OUString( sFilter ) );
+                aFilterLB.SetEntryData( nFilter, new OUString( sFilter ) );
             }
         }
         aFilterLB.SelectEntryPos( nODT );
@@ -463,7 +462,7 @@ SwMailMergeDlg::~SwMailMergeDlg()
 
     for( sal_uInt16 nFilter = 0; nFilter < aFilterLB.GetEntryCount(); ++nFilter )
     {
-        ::rtl::OUString* pData = reinterpret_cast< ::rtl::OUString* >( aFilterLB.GetEntryData(nFilter) );
+        OUString* pData = reinterpret_cast< OUString* >( aFilterLB.GetEntryData(nFilter) );
         delete pData;
     }
     delete pImpl;
@@ -679,7 +678,7 @@ bool SwMailMergeDlg::ExecQryShell()
             URIHelper::SmartRel2Abs(
                 aAbs, aPathED.GetText(), URIHelper::GetMaybeFileHdl()));
         pModOpt->SetMailingPath(sPath);
-        String sDelim = rtl::OUString(INET_PATH_TOKEN);
+        String sDelim = OUString(INET_PATH_TOKEN);
 
         if (sPath.Len() >= sDelim.Len() &&
             sPath.Copy(sPath.Len()-sDelim.Len()).CompareTo(sDelim) != COMPARE_EQUAL)
@@ -692,12 +691,12 @@ bool SwMailMergeDlg::ExecQryShell()
             pMgr->SetEMailColumn(aColumnLB.GetSelectEntry());
             pModOpt->SetNameFromColumn(aColumnLB.GetSelectEntry());
             if( aFilterLB.GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND)
-                m_sSaveFilter = *static_cast<const ::rtl::OUString*>(aFilterLB.GetEntryData( aFilterLB.GetSelectEntryPos() ));
+                m_sSaveFilter = *static_cast<const OUString*>(aFilterLB.GetEntryData( aFilterLB.GetSelectEntryPos() ));
         }
         else
         {
             //#i97667# reset column name - otherwise it's remembered from the last run
-            pMgr->SetEMailColumn(::rtl::OUString());
+            pMgr->SetEMailColumn(OUString());
             //start save as dialog
             String sFilter;
             sPath = SwMailMergeHelper::CallSaveAsDialog(sFilter);
diff --git a/sw/source/ui/envelp/swuilabimp.hxx b/sw/source/ui/envelp/swuilabimp.hxx
index 7b439450ed15..70fb0c3bc317 100644
--- a/sw/source/ui/envelp/swuilabimp.hxx
+++ b/sw/source/ui/envelp/swuilabimp.hxx
@@ -117,8 +117,8 @@ class SwVisitingCardPage : public SfxTabPage
 
     using SfxTabPage::SetUserData;
     void            SetUserData( sal_uInt32 nCnt,
-                                    const rtl::OUString* pNames,
-                                    const rtl::OUString* pValues );
+                                    const OUString* pNames,
+                                    const OUString* pValues );
 
     SwVisitingCardPage(Window* pParent, const SfxItemSet& rSet);
     ~SwVisitingCardPage();