rtl::OUString -> OUString

Change-Id: Id435edc2d2f8801bde4be6e4acbe42608e0be179

sfx2/inc/sfx2/templateabstractview.hxx

@@ -112,7 +112,7 @@ public:
 
     static BitmapEx scaleImg (const BitmapEx &rImg, long width, long height);
 
-    static BitmapEx fetchThumbnail (const rtl::OUString &msURL, long width, long height);
+    static BitmapEx fetchThumbnail (const OUString &msURL, long width, long height);
 
 protected:
 

sfx2/inc/sfx2/templatelocalview.hxx

@@ -37,7 +37,7 @@ public:
 
     virtual void reload ();
 
-    std::vector<rtl::OUString> getFolderNames ();
+    std::vector<OUString> getFolderNames ();
 
     virtual void showOverlay (bool bVisible);
 
@@ -46,7 +46,7 @@ public:
     std::vector<TemplateItemProperties>
         getFilteredItems (const boost::function<bool (const TemplateItemProperties&) > &rFunc) const;
 
-    sal_uInt16 createRegion (const rtl::OUString &rName);
+    sal_uInt16 createRegion (const OUString &rName);
 
     bool removeRegion (const sal_uInt16 nItemId);
 
@@ -59,7 +59,7 @@ public:
 
     bool copyFrom (const sal_uInt16 nRegionItemId, const BitmapEx &rThumbnail, const OUString &rPath);
 
-    bool copyFrom(TemplateLocalViewItem *pItem, const rtl::OUString &rPath);
+    bool copyFrom(TemplateLocalViewItem *pItem, const OUString &rPath);
 
     bool exportTo (const sal_uInt16 nItemId, const sal_uInt16 nRegionItemId, const OUString &rName);
 

sfx2/inc/sfx2/templateview.hxx

@@ -29,9 +29,9 @@ public:
 
     sal_uInt16 getId () const { return mnId; }
 
-    void setName (const rtl::OUString &rName);
+    void setName (const OUString &rName);
 
-    const rtl::OUString& getName () const { return maName; }
+    const OUString& getName () const { return maName; }
 
     virtual void Paint (const Rectangle &rRect);
 
@@ -58,7 +58,7 @@ private:
     Image maCloseImg;
     bool mbRenderTitle;
     sal_uInt16 mnId;
-    rtl::OUString maName;
+    OUString maName;
     Link maDblClickHdl;
     Link maChangeNameHdl;
     Link maCloseHdl;

sfx2/inc/sfx2/thumbnailview.hxx

@@ -180,7 +180,7 @@ public:
     virtual ~ThumbnailView ();
 
     void InsertItem( sal_uInt16 nItemId,
-                     const BitmapEx &rImage, const rtl::OUString &rStr,
+                     const BitmapEx &rImage, const OUString &rStr,
                      size_t nPos = THUMBNAILVIEW_APPEND );
 
     void RemoveItem( sal_uInt16 nItemId );
@@ -223,7 +223,7 @@ public:
 
     void deselectItems ();
 
-    rtl::OUString GetItemText( sal_uInt16 nItemId ) const;
+    OUString GetItemText( sal_uInt16 nItemId ) const;
 
     void SetColor( const Color& rColor );
 

sfx2/source/control/templateabstractview.cxx

@@ -141,7 +141,7 @@ BitmapEx TemplateAbstractView::scaleImg (const BitmapEx &rImg, long width, long
     return aImg;
 }
 
-BitmapEx TemplateAbstractView::fetchThumbnail (const rtl::OUString &msURL, long width, long height)
+BitmapEx TemplateAbstractView::fetchThumbnail (const OUString &msURL, long width, long height)
 {
     using namespace ::com::sun::star;
     using namespace ::com::sun::star::uno;

sfx2/source/control/templatelocalview.cxx

@@ -71,7 +71,7 @@ public:
         return meApp != FILTER_APP_NONE ? nVisCount : true ;
     }
 
-    bool isValid (const rtl::OUString &rType) const
+    bool isValid (const OUString &rType) const
     {
         bool bRet = true;
 
@@ -120,7 +120,7 @@ void TemplateLocalView::Populate ()
     sal_uInt16 nCount = mpDocTemplates->GetRegionCount();
     for (sal_uInt16 i = 0; i < nCount; ++i)
     {
-        rtl::OUString aRegionName(mpDocTemplates->GetFullRegionName(i));
+        OUString aRegionName(mpDocTemplates->GetFullRegionName(i));
 
         if ((sal_uInt32)aRegionName.getLength() > mpItemAttrs->nMaxTextLenght)
         {
@@ -137,9 +137,9 @@ void TemplateLocalView::Populate ()
 
         for (sal_uInt16 j = 0; j < nEntries; ++j)
         {
-            rtl::OUString aName = mpDocTemplates->GetName(i,j);
-            rtl::OUString aURL = mpDocTemplates->GetPath(i,j);
-            rtl::OUString aType = SvFileInformationManager::GetDescription(INetURLObject(aURL));
+            OUString aName = mpDocTemplates->GetName(i,j);
+            OUString aURL = mpDocTemplates->GetPath(i,j);
+            OUString aType = SvFileInformationManager::GetDescription(INetURLObject(aURL));
 
             if ((sal_uInt32)aName.getLength() > mpItemAttrs->nMaxTextLenght)
             {
@@ -196,10 +196,10 @@ void TemplateLocalView::reload ()
     }
 }
 
-std::vector<rtl::OUString> TemplateLocalView::getFolderNames()
+std::vector<OUString> TemplateLocalView::getFolderNames()
 {
     size_t n = mItemList.size();
-    std::vector<rtl::OUString> ret(n);
+    std::vector<OUString> ret(n);
 
     for (size_t i = 0; i < n; ++i)
         ret[i] = mItemList[i]->maTitle;
@@ -263,14 +263,14 @@ TemplateLocalView::getFilteredItems(const boost::function<bool (const TemplateIt
     return aItems;
 }
 
-sal_uInt16 TemplateLocalView::createRegion(const rtl::OUString &rName)
+sal_uInt16 TemplateLocalView::createRegion(const OUString &rName)
 {
     sal_uInt16 nRegionId = mpDocTemplates->GetRegionCount();    // Next regionId
 
     if (!mpDocTemplates->InsertDir(rName,nRegionId))
         return false;
 
-    rtl::OUString aRegionName = rName;
+    OUString aRegionName = rName;
 
     if ((sal_uInt32)aRegionName.getLength() > mpItemAttrs->nMaxTextLenght)
     {
@@ -576,7 +576,7 @@ bool TemplateLocalView::copyFrom(const sal_uInt16 nRegionItemId, const BitmapEx
     return false;
 }
 
-bool TemplateLocalView::copyFrom (TemplateLocalViewItem *pItem, const rtl::OUString &rPath)
+bool TemplateLocalView::copyFrom (TemplateLocalViewItem *pItem, const OUString &rPath)
 {
     sal_uInt16 nId = 0;
     sal_uInt16 nDocId = 0;

sfx2/source/control/templateremoteview.cxx

@@ -70,10 +70,10 @@ void TemplateRemoteView::Populate()
     uno::Reference < uno::XComponentContext > m_context(comphelper::getProcessComponentContext());
 
     // Load from user settings
-    com::sun::star::uno::Sequence< rtl::OUString >  aUrls =
+    com::sun::star::uno::Sequence<OUString>  aUrls =
             officecfg::Office::Common::Misc::TemplateRepositoryUrls::get(m_context);
 
-    com::sun::star::uno::Sequence< rtl::OUString > aNames =
+    com::sun::star::uno::Sequence<OUString> aNames =
             officecfg::Office::Common::Misc::TemplateRepositoryNames::get(m_context);
 
     for (sal_Int32 i = 0; i < aUrls.getLength() && i < aNames.getLength(); ++i)
@@ -143,12 +143,12 @@ bool TemplateRemoteView::loadRepository (const sal_uInt16 nRepositoryId, bool bR
     mpItemView->setId(nRepositoryId);
     mpItemView->setName(pItem->maTitle);
 
-    rtl::OUString aURL = static_cast<TemplateRemoteViewItem*>(pItem)->getURL();
+    OUString aURL = static_cast<TemplateRemoteViewItem*>(pItem)->getURL();
 
     try
     {
 
-        uno::Sequence< rtl::OUString > aProps(8);
+        uno::Sequence<OUString> aProps(8);
 
         aProps[0] = "Title";
         aProps[1] = "Size";
@@ -197,11 +197,11 @@ bool TemplateRemoteView::loadRepository (const sal_uInt16 nRepositoryId, bool bR
                         bContainsDate = !xRow->wasNull();
                     }
 
-                    rtl::OUString aContentURL = xContentAccess->queryContentIdentifierString();
-                    rtl::OUString aTargetURL = xRow->getString( ROW_TARGET_URL );
+                    OUString aContentURL = xContentAccess->queryContentIdentifierString();
+                    OUString aTargetURL = xRow->getString( ROW_TARGET_URL );
                     bool bHasTargetURL = !xRow->wasNull() && !aTargetURL.isEmpty();
 
-                    rtl::OUString sRealURL = bHasTargetURL ? aTargetURL : aContentURL;
+                    OUString sRealURL = bHasTargetURL ? aTargetURL : aContentURL;
 
                     TemplateItemProperties aTemplateItem;
                     aTemplateItem.nId = nIdx+1;

sfx2/source/control/templatesearchview.cxx

@@ -21,8 +21,8 @@ TemplateSearchView::~TemplateSearchView ()
 }
 
 void TemplateSearchView::AppendItem(sal_uInt16 nItemId, sal_uInt16 nRegionId, sal_uInt16 nIdx,
-                                    const rtl::OUString &rTitle, const rtl::OUString &rSubtitle,
-                                    const rtl::OUString &rPath,
+                                    const OUString &rTitle, const OUString &rSubtitle,
+                                    const OUString &rPath,
                                     const BitmapEx &rImage)
 {
     TemplateSearchViewItem *pItem = new TemplateSearchViewItem(*this,this);

sfx2/source/control/templateview.cxx

@@ -46,10 +46,10 @@ TemplateView::~TemplateView ()
     delete mpEditName;
 }
 
-void TemplateView::setName (const rtl::OUString &rName)
+void TemplateView::setName (const OUString &rName)
 {
     maName = rName;
-    mpEditName->SetText(rtl::OUString());
+    mpEditName->SetText(OUString());
 }
 
 void TemplateView::Paint (const Rectangle &rRect)
@@ -153,7 +153,7 @@ void TemplateView::MouseButtonDown (const MouseEvent &rMEvt)
             mbRenderTitle = true;
 
             // Update name if its not empty
-            rtl::OUString aTmp = mpEditName->GetText();
+            OUString aTmp = mpEditName->GetText();
 
             if (!aTmp.isEmpty())
             {
@@ -161,7 +161,7 @@ void TemplateView::MouseButtonDown (const MouseEvent &rMEvt)
             }
             else
             {
-                mpEditName->SetText(rtl::OUString());
+                mpEditName->SetText(OUString());
                 Invalidate();
             }
 
@@ -215,13 +215,13 @@ void TemplateView::OnItemDblClicked(ThumbnailViewItem *pItem)
 
 IMPL_LINK_NOARG(TemplateView, ChangeNameHdl)
 {
-    rtl::OUString aTmp = maName;
+    OUString aTmp = maName;
     maName = mpEditName->GetText();
 
     if (!maChangeNameHdl.Call(this))
         maName = aTmp;
 
-    mpEditName->SetText(rtl::OUString());
+    mpEditName->SetText(OUString());
 
     Invalidate();
     return 0;

sfx2/source/control/thumbnailview.cxx

@@ -791,7 +791,7 @@ void ThumbnailView::DataChanged( const DataChangedEvent& rDCEvt )
 }
 
 void ThumbnailView::InsertItem( sal_uInt16 nItemId, const BitmapEx& rImage,
-                           const rtl::OUString& rText, size_t nPos )
+                           const OUString& rText, size_t nPos )
 {
     ThumbnailViewItem* pItem = new ThumbnailViewItem( *this, this );
     pItem->mnId     = nItemId;
@@ -1041,14 +1041,14 @@ void ThumbnailView::deselectItems()
         Invalidate();
 }
 
-rtl::OUString ThumbnailView::GetItemText( sal_uInt16 nItemId ) const
+OUString ThumbnailView::GetItemText( sal_uInt16 nItemId ) const
 {
     size_t nPos = GetItemPos( nItemId );
 
     if ( nPos != THUMBNAILVIEW_ITEM_NOTFOUND )
         return mItemList[nPos]->maTitle;
 
-    return rtl::OUString();
+    return OUString();
 }
 
 void ThumbnailView::SetColor( const Color& rColor )

sfx2/source/doc/templatedlg.cxx

@@ -85,7 +85,7 @@ class SearchView_Keyword
 {
 public:
 
-    SearchView_Keyword (const rtl::OUString &rKeyword)
+    SearchView_Keyword (const OUString &rKeyword)
         : maKeyword(rKeyword)
     {}
 
@@ -96,7 +96,7 @@ public:
 
 private:
 
-    rtl::OUString maKeyword;
+    OUString maKeyword;
 };
 
 SfxTemplateManagerDlg::SfxTemplateManagerDlg (Window *parent)
@@ -441,7 +441,7 @@ IMPL_LINK(SfxTemplateManagerDlg, TBXDropdownHdl, ToolBox*, pBox)
     {
         pBox->SetItemDown( nCurItemId, true );
 
-        std::vector<rtl::OUString> aNames = maView->getFolderNames();
+        std::vector<OUString> aNames = maView->getFolderNames();
 
         PopupMenu *pMoveMenu = new PopupMenu;
         pMoveMenu->SetSelectHdl(LINK(this,SfxTemplateManagerDlg,MoveMenuSelectHdl));
@@ -669,7 +669,7 @@ IMPL_LINK(SfxTemplateManagerDlg, OpenTemplateHdl, ThumbnailViewItem*, pItem)
 
         try
         {
-            mxDesktop->loadComponentFromURL(pTemplateItem->getPath(),rtl::OUString("_default"), 0, aArgs );
+            mxDesktop->loadComponentFromURL(pTemplateItem->getPath(),"_default", 0, aArgs );
         }
         catch( const uno::Exception& )
         {
@@ -691,7 +691,7 @@ IMPL_LINK_NOARG(SfxTemplateManagerDlg, SearchUpdateHdl)
         mpCurView->Hide();
     }
 
-    rtl::OUString aKeyword = mpSearchEdit->GetText();
+    OUString aKeyword = mpSearchEdit->GetText();
 
     if (!aKeyword.isEmpty())
     {
@@ -756,8 +756,8 @@ void SfxTemplateManagerDlg::OnTemplateImport ()
                         DEFINE_CONST_UNICODE(FILEDIALOG_FILTER_ALL) );
 
     // add template filter
-    rtl::OUString sFilterExt;
-    rtl::OUString sFilterName( SfxResId( STR_TEMPLATE_FILTER ).toString() );
+    OUString sFilterExt;
+    OUString sFilterName( SfxResId( STR_TEMPLATE_FILTER ).toString() );
 
     // add filters of modules which are installed
     SvtModuleOptions aModuleOpt;
@@ -804,7 +804,7 @@ void SfxTemplateManagerDlg::OnTemplateImport ()
 
     if ( nCode == ERRCODE_NONE )
     {
-        com::sun::star::uno::Sequence< ::rtl::OUString > aFiles = aFileDlg.GetSelectedFiles();
+        com::sun::star::uno::Sequence<OUString> aFiles = aFileDlg.GetSelectedFiles();
 
         if (aFiles.hasElements())
         {
@@ -956,7 +956,7 @@ void SfxTemplateManagerDlg::OnTemplateSearch ()
     }
 
     mpSearchEdit->Show(!bVisible);
-    mpSearchEdit->SetText(rtl::OUString());
+    mpSearchEdit->SetText(OUString());
 
     // display all templates if we hide the search bar
     if (bVisible && mpCurView->isOverlayVisible())
@@ -978,7 +978,7 @@ void SfxTemplateManagerDlg::OnTemplateEdit ()
         try
         {
             xStorable = uno::Reference< XStorable >(
-                        mxDesktop->loadComponentFromURL(pItem->getPath(),rtl::OUString("_blank"), 0, aArgs ),
+                        mxDesktop->loadComponentFromURL(pItem->getPath(),"_blank", 0, aArgs ),
                         uno::UNO_QUERY );
         }
         catch( const uno::Exception& )
@@ -1320,7 +1320,7 @@ void SfxTemplateManagerDlg::localMoveTo(sal_uInt16 nMenuId)
 
         if (ret)
         {
-            rtl::OUString aName = dlg.getEntryText();
+            OUString aName = dlg.getEntryText();
 
             if (!aName.isEmpty())
                 nItemId = maView->createRegion(aName);
@@ -1369,7 +1369,7 @@ void SfxTemplateManagerDlg::remoteMoveTo(const sal_uInt16 nMenuId)
 
         if (ret)
         {
-            rtl::OUString aName = dlg.getEntryText();
+            OUString aName = dlg.getEntryText();
 
             if (!aName.isEmpty())
                 nItemId = maView->createRegion(aName);
@@ -1423,7 +1423,7 @@ void SfxTemplateManagerDlg::localSearchMoveTo(sal_uInt16 nMenuId)
 
         if (ret)
         {
-            rtl::OUString aName = dlg.getEntryText();
+            OUString aName = dlg.getEntryText();
 
             if (!aName.isEmpty())
                 nItemId = maView->createRegion(aName);

sfx2/source/inc/templatesearchview.hxx

@@ -21,8 +21,8 @@ public:
     virtual ~TemplateSearchView();
 
     void AppendItem(sal_uInt16 nItemId, sal_uInt16 nRegionId, sal_uInt16 nIdx,
-                    const rtl::OUString &rTitle, const rtl::OUString &rSubtitle,
-                    const rtl::OUString &rPath, const BitmapEx &rImage );
+                    const OUString &rTitle, const OUString &rSubtitle,
+                    const OUString &rPath, const BitmapEx &rImage );
 };
 
 #endif // __SFX2_TEMPLATESEARCHVIEW_HXX__