ByteString->rtl::OString and destupid-api a bit

5 files changed, 8 insertions, 7 deletions

diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx
index 3101b11f893b..9ae96955dee5 100755
--- a/sw/source/ui/app/docsh2.cxx
+++ b/sw/source/ui/app/docsh2.cxx
@@ -812,7 +812,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
                                 ( pFlt->GetUserData().EqualsAscii("CXML") ||
                                   pFlt->GetUserData().EqualsAscii("CXMLV") ) )
                             {
-                                const String sWild = ((WildCard&)pFlt->GetWildcard()).GetWildCard();
+                                const String sWild = pFlt->GetWildcard().getGlob();
                                 xFltMgr->appendFilter( pFlt->GetUIName(), sWild );
                             }
                             pFlt = aIter.Next();
@@ -825,7 +825,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
                         // make sure the default file format is also available
                         if(bWeb)
                         {
-                            const String sWild = ((WildCard&)pOwnFlt->GetWildcard()).GetWildCard();
+                            const String sWild = pOwnFlt->GetWildcard().getGlob();
                             xFltMgr->appendFilter( pOwnFlt->GetUIName(), sWild );
                         }
 
@@ -1244,7 +1244,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
                     if( pFlt )
                     {
                         uno::Reference<XFilterManager> xFltMgr(xFP, UNO_QUERY);
-                        const String sWild = ((WildCard&)pFlt->GetWildcard()).GetWildCard();
+                        const String sWild = pFlt->GetWildcard().getGlob();
                         xFltMgr->appendFilter( pFlt->GetUIName(), sWild );
                         try
                         {
diff --git a/sw/source/ui/dbui/mmdocselectpage.cxx b/sw/source/ui/dbui/mmdocselectpage.cxx
index 1fcfbaa61035..3a15860da151 100644
--- a/sw/source/ui/dbui/mmdocselectpage.cxx
+++ b/sw/source/ui/dbui/mmdocselectpage.cxx
@@ -158,7 +158,7 @@ IMPL_LINK(SwMailMergeDocSelectPage, FileSelectHdl, PushButton*, pButton)
         {
             if( pFlt && pFlt->IsAllowedAsTemplate() )
             {
-                const String sWild = ((WildCard&)pFlt->GetWildcard()).GetWildCard();
+                const String sWild = pFlt->GetWildcard().getGlob();
                 xFltMgr->appendFilter( pFlt->GetUIName(), sWild );
 
                 // #i40125
diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx
index 41b4dc5554c7..1c6917b1d568 100644
--- a/sw/source/ui/dbui/mmoutputpage.cxx
+++ b/sw/source/ui/dbui/mmoutputpage.cxx
@@ -79,6 +79,7 @@
 #include <sfx2/app.hxx>
 #include <statstr.hrc>
 #include <unomid.h>
+#include <comphelper/string.hxx>
 
 using namespace svt;
 using namespace ::com::sun::star;
@@ -778,7 +779,7 @@ IMPL_LINK(SwMailMergeOutputPage, SaveOutputHdl_Impl, PushButton*, pButton)
             String sExtension = aURL.getExtension();
             if(!sExtension.Len())
             {
-                sExtension = pSfxFlt->GetWildcard()().GetToken(1, '.');
+                sExtension = comphelper::string::getToken(pSfxFlt->GetWildcard().getGlob(), 1, '.');
                 sPath += '.';
                 sPath += sExtension;
             }
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index 75901c0df0c0..683c3bbee8b4 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -632,7 +632,7 @@ IMPL_LINK( SwGlossaryDlg, MenuHdl, Menu *, pMn )
                 if( pFilter->GetUserData() == sWW8 )
                 {
                     xFltMgr->appendFilter( pFilter->GetUIName(),
-                                ((WildCard&)pFilter->GetWildcard()).GetWildCard() );
+                                pFilter->GetWildcard().getGlob() );
                     xFltMgr->setCurrentFilter( pFilter->GetUIName() ) ;
                 }
 
diff --git a/sw/source/ui/uiview/srcview.cxx b/sw/source/ui/uiview/srcview.cxx
index 542c436e7202..afad29712d83 100644
--- a/sw/source/ui/uiview/srcview.cxx
+++ b/sw/source/ui/uiview/srcview.cxx
@@ -322,7 +322,7 @@ void SwSrcView::Execute(SfxRequest& rReq)
                 // filter found -> use its uiname and wildcard
                 const String& rUIName = pFilter->GetUIName();
                 const WildCard& rCard = pFilter->GetWildcard();
-                xFltMgr->appendFilter( rUIName, rCard() );
+                xFltMgr->appendFilter( rUIName, rCard.getGlob() );
                 xFltMgr->setCurrentFilter( rUIName ) ;
             }
             else