Replaced String by rtl::OUString in SvxMacro

3 files changed, 9 insertions, 9 deletions

diff --git a/sw/source/ui/dochdl/gloshdl.cxx b/sw/source/ui/dochdl/gloshdl.cxx
index 401ae6b8c2ea..13d2d2ea2964 100644
--- a/sw/source/ui/dochdl/gloshdl.cxx
+++ b/sw/source/ui/dochdl/gloshdl.cxx
@@ -544,7 +544,7 @@ sal_Bool SwGlossaryHdl::Expand( const String& rShortName,
     // API-programs would hang.
     // Moreover the event macro must also not be called in an action
         pWrtShell->StartUndo(UNDO_INSGLOSSARY);
-        if( aStartMacro.GetMacName().Len() )
+        if( aStartMacro.HasMacro() )
             pWrtShell->ExecMacro( aStartMacro );
         if(pWrtShell->HasSelection())
             pWrtShell->DelLeft();
@@ -555,7 +555,7 @@ sal_Bool SwGlossaryHdl::Expand( const String& rShortName,
 
         pWrtShell->InsertGlossary(*pGlossary, aShortName);
         pWrtShell->EndAllAction();
-        if( aEndMacro.GetMacName().Len() )
+        if( aEndMacro.HasMacro() )
         {
             pWrtShell->ExecMacro( aEndMacro );
         }
@@ -590,7 +590,7 @@ sal_Bool SwGlossaryHdl::InsertGlossary(const String &rName)
     // otherwise the possible Shell change gets delayed and
     // API-programs would hang.
     // Moreover the event macro must also not be called in an action
-    if( aStartMacro.GetMacName().Len() )
+    if( aStartMacro.HasMacro() )
         pWrtShell->ExecMacro( aStartMacro );
     if( pWrtShell->HasSelection() )
         pWrtShell->DelRight();
@@ -601,7 +601,7 @@ sal_Bool SwGlossaryHdl::InsertGlossary(const String &rName)
 
     pWrtShell->InsertGlossary(*pGlos, rName);
     pWrtShell->EndAllAction();
-    if( aEndMacro.GetMacName().Len() )
+    if( aEndMacro.HasMacro() )
     {
         pWrtShell->ExecMacro( aEndMacro );
     }
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index 3ed816f8defd..e292e5ec73f1 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -585,9 +585,9 @@ IMPL_LINK( SwGlossaryDlg, MenuHdl, Menu *, pMn )
             pGlossaryHdl->GetMacros(aShortNameEdit.GetText(), aStart, aEnd );
 
             SvxMacroItem aItem(RES_FRMMACRO);
-            if( aStart.GetMacName().Len() )
+            if( aStart.HasMacro() )
                 aItem.SetMacro( SW_EVENT_START_INS_GLOSSARY, aStart );
-            if( aEnd.GetMacName().Len() )
+            if( aEnd.HasMacro() )
                 aItem.SetMacro( SW_EVENT_END_INS_GLOSSARY, aEnd );
 
             aSet.Put( aItem );
diff --git a/sw/source/ui/misc/glshell.cxx b/sw/source/ui/misc/glshell.cxx
index 30fe58dd4e76..29644eecefaf 100644
--- a/sw/source/ui/misc/glshell.cxx
+++ b/sw/source/ui/misc/glshell.cxx
@@ -121,10 +121,10 @@ sal_Bool lcl_Save( SwWrtShell& rSh, const String& rGroupName,
                                 rCfg.IsSaveRelFile(),
                                 pBlock->IsOnlyTextBlock( rShortNm ) );
 
-    if(aStart.GetMacName().Len() || aEnd.GetMacName().Len() )
+    if(aStart.HasMacro() || aEnd.HasMacro() )
     {
-        SvxMacro* pStart = aStart.GetMacName().Len() ? &aStart : 0;
-        SvxMacro* pEnd = aEnd.GetMacName().Len() ? &aEnd : 0;
+        SvxMacro* pStart = aStart.HasMacro() ? &aStart : 0;
+        SvxMacro* pEnd = aEnd.HasMacro() ? &aEnd : 0;
         pGlosHdl->SetMacros( rShortNm, pStart, pEnd, pBlock );
     }