[Libreoffice-commits] core.git: sw/source

[Caolán McNamara]

 sw/source/ui/app/docst.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0aab2230395bb8d2b021359218f481754c6a58c3
Author: Caolán McNamara <caol...@redhat.com>
Date:   Thu Aug 15 10:42:13 2013 +0100

    gagh, NULL is an acceptable OString ctor argument
    
    Change-Id: I592af9986a0512f4dc4cb0aea4cd78f675f4fead

diff --git a/sw/source/ui/app/docst.cxx b/sw/source/ui/app/docst.cxx
index 8f0dece..f359420 100644
--- a/sw/source/ui/app/docst.cxx
+++ b/sw/source/ui/app/docst.cxx
@@ -283,7 +283,7 @@ void SwDocShell::ExecStyleSheet( SfxRequest& rReq )
                 sal_False, &pItem ))
                 sParent = ((const SfxStringItem*)pItem)->GetValue();
 
-            nRet = Edit( sName, sParent, nFamily, nMask, sal_True, 0, 0, 
rReq.IsAPI() );
+            nRet = Edit( sName, sParent, nFamily, nMask, sal_True, OString(), 
0, rReq.IsAPI() );
         }
         break;
 
@@ -445,7 +445,7 @@ void SwDocShell::ExecStyleSheet( SfxRequest& rReq )
                 switch(nSlot)
                 {
                     case SID_STYLE_EDIT:
-                        nRet = Edit(aParam, aEmptyStr, nFamily, nMask, 
sal_False, 0, pActShell );
+                        nRet = Edit(aParam, aEmptyStr, nFamily, nMask, 
sal_False, OString(), pActShell );
                         break;
                     case SID_STYLE_DELETE:
                         nRet = Delete(aParam, nFamily);

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits