summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorOliver Specht <os@openoffice.org>2001-02-15 07:58:48 +0000
committerOliver Specht <os@openoffice.org>2001-02-15 07:58:48 +0000
commitd676f50ac4ca81da8b55b059b597d2f71ad973e6 (patch)
tree3cf542e75f493c39581c3757cc50d4a38e5fa7ce /sw
parentb7643afabab3becf514231e87e3a3e4169584dd3 (diff)
#83369# FormLetter: status method changed
Diffstat (limited to 'sw')
-rw-r--r--sw/sdi/wrtapp.sdi7
-rw-r--r--sw/source/ui/app/apphdl.cxx12
2 files changed, 14 insertions, 5 deletions
diff --git a/sw/sdi/wrtapp.sdi b/sw/sdi/wrtapp.sdi
index 25aebdba00db..cbbf3582a3a0 100644
--- a/sw/sdi/wrtapp.sdi
+++ b/sw/sdi/wrtapp.sdi
@@ -2,7 +2,7 @@
$Workfile: wrtapp.sdi $
- $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/sdi/wrtapp.sdi,v 1.1.1.1 2000-09-18 17:14:31 hr Exp $
+ $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/sdi/wrtapp.sdi,v 1.2 2001-02-15 08:57:16 os Exp $
Beschreibung: IDL - File SwWriterApp - Shell fuer Sw3
@@ -90,7 +90,7 @@ interface StarWriter : Module
FN_QRY_MERGE // status()
[
ExecMethod = ExecDB ;
- StateMethod = StateIsView ;
+ StateMethod = StateOther ;
DisableFlags="SW_DISABLE_ON_MAILBOX_EDITOR";
]
@@ -248,6 +248,9 @@ shell SwModule
/*------------------------------------------------------------------------
$Log: not supported by cvs2svn $
+ Revision 1.1.1.1 2000/09/18 17:14:31 hr
+ initial import
+
Revision 1.136 2000/05/26 07:06:20 os
old SW Basic API Slots removed
diff --git a/sw/source/ui/app/apphdl.cxx b/sw/source/ui/app/apphdl.cxx
index 72e0e7c9b446..b8020989779d 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.11 $
+ * $Revision: 1.12 $
*
- * last change: $Author: jp $ $Date: 2001-02-02 17:44:40 $
+ * last change: $Author: os $ $Date: 2001-02-15 08:58:48 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -520,7 +520,13 @@ void SwModule::StateOther(SfxItemSet &rSet)
rSet.Put( SfxBoolItem( nWhich, pModuleConfig->
IsInsTblFormatNum( bWebView )));
break;
-
+ case FN_QRY_MERGE:
+ {
+ SwView *pView = ::GetActiveView();
+ if(!pView || !GetView()->GetWrtShell().GetDBName().Len())
+ rSet.DisableItem(nWhich);
+ }
+ break;
default:
DBG_ERROR("::StateOther: default");
}