Bug #79587#: use unknow as redline author if no one name is configurated

4 files changed, 21 insertions, 19 deletions

diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
index c24b5c733a21..475ee6e4e87b 100644
--- a/sw/source/ui/app/app.src
+++ b/sw/source/ui/app/app.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: app.src,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: jp $ $Date: 2000-10-05 12:11:35 $
+ *  last change: $Author: jp $ $Date: 2000-10-20 13:03:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -2962,3 +2962,9 @@ String STR_PAGEBREAK
     Text[ language_user1 ] = " ";
 };
 
+String STR_REDLINE_UNKNOWN_AUTHOR
+{
+    Text = "unbekannt" ;
+    Text [ ENGLISH ] = "unknown" ;
+};
+
diff --git a/sw/source/ui/app/apphdl.cxx b/sw/source/ui/app/apphdl.cxx
index 1c31fdb4f6a7..5c69093464f4 100644
--- a/sw/source/ui/app/apphdl.cxx
+++ b/sw/source/ui/app/apphdl.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: apphdl.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: os $ $Date: 2000-10-19 08:29:12 $
+ *  last change: $Author: jp $ $Date: 2000-10-20 13:03:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1000,14 +1000,9 @@ void SwModule::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
                 pList->Update();
         }
 
-        const SfxPoolItem* pItem = 0;
-
-        if( SFX_ITEM_SET == ((SfxItemSetHint&)rHint).GetItemSet().GetItemState(SID_ATTR_ADDRESS, sal_False, &pItem))
-        {
-            sActAuthor = ((const SvxAddressItem*)pItem)->GetFirstName();
-            sActAuthor += ' ';
-            sActAuthor += ((const SvxAddressItem*)pItem)->GetName();
-        }
+        if( SFX_ITEM_SET == ((SfxItemSetHint&)rHint).GetItemSet().
+                    GetItemState( SID_ATTR_ADDRESS, sal_False ))
+            bAuthorInitialised = FALSE;
     }
     else if(rHint.ISA(SfxSimpleHint) &&
         ((SfxSimpleHint&)rHint).GetId() == SFX_HINT_DEINITIALIZING)
diff --git a/sw/source/ui/app/swmodul1.cxx b/sw/source/ui/app/swmodul1.cxx
index e88492b41cda..9ec4c33c75f5 100644
--- a/sw/source/ui/app/swmodul1.cxx
+++ b/sw/source/ui/app/swmodul1.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: swmodul1.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: jp $ $Date: 2000-10-09 10:49:36 $
+ *  last change: $Author: jp $ $Date: 2000-10-20 13:03:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -729,11 +729,11 @@ sal_uInt16 SwModule::GetRedlineAuthor()
     if (!bAuthorInitialised)
     {
         SvtUserOptions aOpt;
-        sActAuthor = aOpt.GetFullName();
+        if( !(sActAuthor = aOpt.GetFullName()).Len() )
+            sActAuthor = String( SW_RES( STR_REDLINE_UNKNOWN_AUTHOR ));
         bAuthorInitialised = sal_True;
     }
-
-    return InsertRedlineAuthor(sActAuthor);
+    return InsertRedlineAuthor( sActAuthor );
 }
 
 /*--------------------------------------------------------------------
diff --git a/sw/source/ui/inc/app.hrc b/sw/source/ui/inc/app.hrc
index 11a0ad808cb1..1f2c3c728d9c 100644
--- a/sw/source/ui/inc/app.hrc
+++ b/sw/source/ui/inc/app.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: app.hrc,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:38 $
+ *  last change: $Author: jp $ $Date: 2000-10-20 13:03:45 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -114,6 +114,7 @@
 #define RES_STD_HELP_STRING         (RC_APP_BEGIN + 73)
 #define STR_PAGEOFFSET              (RC_APP_BEGIN + 74)
 #define STR_PAGEBREAK               (RC_APP_BEGIN + 75)
+#define STR_REDLINE_UNKNOWN_AUTHOR  (RC_APP_BEGIN + 76)
 
 
 #define SID_TOGGLETOOLBOX           (RC_APP_BEGIN + 89)