summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sw/source/ui/inc/cnttab.hxx8
-rw-r--r--sw/source/ui/index/cnttab.cxx10
-rw-r--r--sw/source/ui/index/toxmgr.cxx21
-rw-r--r--sw/source/ui/shells/textidx.cxx155
-rw-r--r--sw/source/ui/utlui/content.cxx18
5 files changed, 55 insertions, 157 deletions
diff --git a/sw/source/ui/inc/cnttab.hxx b/sw/source/ui/inc/cnttab.hxx
index e8a301214f80..214faa87240d 100644
--- a/sw/source/ui/inc/cnttab.hxx
+++ b/sw/source/ui/inc/cnttab.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: cnttab.hxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-18 17:14:39 $
+ * last change: $Author: os $ $Date: 2000-11-03 11:25:50 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -159,6 +159,8 @@ class SwMultiTOXTabDialog : public SfxTabDialog
SwForm** pFormArr; //
SwIndexSections_Impl** pxIndexSectionsArr;
+ SwTOXBase* pParamTOXBase;
+
CurTOXType eCurrentTOXType;
String sUserDefinedIndex;
@@ -178,7 +180,7 @@ class SwMultiTOXTabDialog : public SfxTabDialog
public:
SwMultiTOXTabDialog(Window* pParent, const SfxItemSet& rSet,
SwWrtShell &rShell,
- const SwTOXBase* pCurTOX, USHORT nToxType = USHRT_MAX,
+ SwTOXBase* pCurTOX, USHORT nToxType = USHRT_MAX,
BOOL bGlobal = FALSE);
~SwMultiTOXTabDialog();
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index d789fcfc642a..c014c8ccba89 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: cnttab.cxx,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: jp $ $Date: 2000-10-31 21:24:21 $
+ * last change: $Author: os $ $Date: 2000-11-03 11:29:16 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -437,7 +437,7 @@ IdxExampleResource::IdxExampleResource(const ResId& rResId) :
--------------------------------------------------*/
SwMultiTOXTabDialog::SwMultiTOXTabDialog(Window* pParent, const SfxItemSet& rSet,
SwWrtShell &rShell,
- const SwTOXBase* pCurTOX,
+ SwTOXBase* pCurTOX,
sal_uInt16 nToxType, sal_Bool bGlobal) :
SfxTabDialog( pParent, SW_RES(DLG_MULTI_TOX), &rSet),
aExampleContainerWIN(this, ResId(WIN_EXAMPLE)),
@@ -445,6 +445,7 @@ SwMultiTOXTabDialog::SwMultiTOXTabDialog(Window* pParent, const SfxItemSet& rSet
aShowExampleCB( this, ResId(CB_SHOWEXAMPLE)),
sUserDefinedIndex(ResId(ST_USERDEFINEDINDEX)),
pMgr( new SwTOXMgr( &rShell ) ),
+ pParamTOXBase(pCurTOX),
rSh(rShell),
nInitialTOXType(nToxType),
bEditTOX(sal_False),
@@ -604,6 +605,9 @@ short SwMultiTOXTabDialog::Ok()
if(!bGlobalFlag)
pMgr->UpdateOrInsertTOX(
rDesc, 0, GetOutputItemSet());
+ else if(bEditTOX)
+ pMgr->UpdateOrInsertTOX(
+ rDesc, &pParamTOXBase, GetOutputItemSet());
if(!eCurrentTOXType.nIndex)
rSh.SetDefaultTOXBase(aNewDef);
diff --git a/sw/source/ui/index/toxmgr.cxx b/sw/source/ui/index/toxmgr.cxx
index cd937c8b2f01..b7c13002d3bf 100644
--- a/sw/source/ui/index/toxmgr.cxx
+++ b/sw/source/ui/index/toxmgr.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: toxmgr.cxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-18 17:14:44 $
+ * last change: $Author: os $ $Date: 2000-11-03 11:29:16 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -573,7 +573,7 @@ BOOL SwTOXMgr::UpdateOrInsertTOX(const SwTOXDescription& rDesc,
{
SwWait aWait( *pSh->GetView().GetDocShell(), TRUE );
BOOL bRet = TRUE;
- const SwTOXBase* pCurTOX = GetCurTOX();
+ const SwTOXBase* pCurTOX = ppBase && *ppBase ? *ppBase : GetCurTOX();
SwTOXBase* pTOX = (SwTOXBase*)pCurTOX;
TOXTypes eCurTOXType = rDesc.GetTOXType();
if(pCurTOX && !ppBase && pSh->HasSelection())
@@ -583,7 +583,7 @@ BOOL SwTOXMgr::UpdateOrInsertTOX(const SwTOXDescription& rDesc,
{
case TOX_INDEX :
{
- if(!pCurTOX || ppBase)
+ if(!pCurTOX || (ppBase && !(*ppBase)))
{
const SwTOXType* pType = pSh->GetTOXType(eCurTOXType, 0);
SwForm aForm(eCurTOXType);
@@ -597,7 +597,7 @@ BOOL SwTOXMgr::UpdateOrInsertTOX(const SwTOXDescription& rDesc,
break;
case TOX_CONTENT :
{
- if(!pCurTOX || ppBase)
+ if(!pCurTOX || (ppBase && !(*ppBase)))
{
const SwTOXType* pType = pSh->GetTOXType(eCurTOXType, 0);
SwForm aForm(eCurTOXType);
@@ -609,7 +609,7 @@ BOOL SwTOXMgr::UpdateOrInsertTOX(const SwTOXDescription& rDesc,
break;
case TOX_USER :
{
- if(!pCurTOX || ppBase)
+ if(!pCurTOX || (ppBase && !(*ppBase)))
{
USHORT nPos = 0;
USHORT nSize = pSh->GetTOXTypeCount(eCurTOXType);
@@ -660,7 +660,7 @@ BOOL SwTOXMgr::UpdateOrInsertTOX(const SwTOXDescription& rDesc,
}
}
// TODO: consider properties of the current TOXType
- if(!pCurTOX || ppBase)
+ if(!pCurTOX || (ppBase && !(*ppBase)))
{
const SwTOXType* pType = pSh->GetTOXType(eCurTOXType, 0);
SwForm aForm(eCurTOXType);
@@ -670,7 +670,7 @@ BOOL SwTOXMgr::UpdateOrInsertTOX(const SwTOXDescription& rDesc,
}
else
{
- if(pSh->HasSelection())
+ if((!ppBase || !(*ppBase)) && pSh->HasSelection())
pSh->DelRight();
pTOX = (SwTOXBase*)pCurTOX;
}
@@ -697,7 +697,7 @@ BOOL SwTOXMgr::UpdateOrInsertTOX(const SwTOXDescription& rDesc,
pTOX->SetTitle(*rDesc.GetTitle());
if(rDesc.GetForm())
pTOX->SetTOXForm(*rDesc.GetForm());
- if(!pCurTOX || ppBase)
+ if(!pCurTOX || (ppBase && !(*ppBase)) )
{
// wird ppBase uebergeben, dann wird das TOXBase hier nur erzeugt
// und dann ueber den Dialog in ein Globaldokument eingefuegt
@@ -762,6 +762,9 @@ void SwTOXDescription::ApplyTo(SwTOXBase& rTOXBase)
/*------------------------------------------------------------------------
$Log: not supported by cvs2svn $
+ Revision 1.1.1.1 2000/09/18 17:14:44 hr
+ initial import
+
Revision 1.59 2000/09/18 16:05:53 willem.vandorp
OpenOffice header added.
diff --git a/sw/source/ui/shells/textidx.cxx b/sw/source/ui/shells/textidx.cxx
index ddbb82a1e0e0..6695b826d138 100644
--- a/sw/source/ui/shells/textidx.cxx
+++ b/sw/source/ui/shells/textidx.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: textidx.cxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: hr $ $Date: 2000-09-18 17:14:47 $
+ * last change: $Author: os $ $Date: 2000-11-03 11:31:19 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -97,7 +97,9 @@
#ifndef _FLDBAS_HXX
#include <fldbas.hxx>
#endif
-
+#ifndef _UIITEMS_HXX
+#include <uiitems.hxx>
+#endif
#include "viewopt.hxx"
#include "cmdid.h"
#include "view.hxx"
@@ -192,7 +194,15 @@ void SwTextShell::ExecIdx(SfxRequest &rReq)
aSet.Put(SwFmtFrmSize(ATT_VAR_SIZE, nWidth));
// Hoehe=Breite fuer konsistentere Vorschau (analog zu Bereich bearbeiten)
aSet.Put(SvxSizeItem(SID_ATTR_PAGE_SIZE, Size(nWidth, nWidth)));
- const SwTOXBase* pCurTOX = rSh.GetCurTOX();
+ const SwTOXBase* pCurTOX = 0;
+ BOOL bGlobal = FALSE;
+ if(pItem)
+ {
+ pCurTOX = (const SwTOXBase* )((SwPtrItem*)pItem)->GetValue();
+ bGlobal = TRUE;
+ }
+ else
+ pCurTOX = rSh.GetCurTOX();
if(pCurTOX)
{
const SfxItemSet* pSet = pCurTOX->GetAttrSet();
@@ -200,7 +210,8 @@ void SwTextShell::ExecIdx(SfxRequest &rReq)
aSet.Put(*pSet);
}
- SwMultiTOXTabDialog* pDlg = new SwMultiTOXTabDialog(pMDI, aSet, rSh, pCurTOX);
+ SwMultiTOXTabDialog* pDlg = new SwMultiTOXTabDialog(pMDI, aSet, rSh, (SwTOXBase* )pCurTOX,
+ USHRT_MAX, bGlobal);
pDlg->Execute();
delete pDlg;
}
@@ -300,138 +311,4 @@ void SwTextShell::GetIdxState(SfxItemSet &rSet)
}
// -----------------------------------------------------------------------
-/*------------------------------------------------------------------------
-
- $Log: not supported by cvs2svn $
- Revision 1.42 2000/09/18 16:06:06 willem.vandorp
- OpenOffice header added.
-
- Revision 1.41 2000/09/08 08:12:52 os
- Change: Set/Toggle/Has/Knows/Show/GetChildWindow
-
- Revision 1.40 2000/05/26 07:21:33 os
- old SW Basic API Slots removed
-
- Revision 1.39 2000/02/11 14:57:51 hr
- #70473# changes for unicode ( patched by automated patchtool )
-
- Revision 1.38 2000/01/17 13:33:00 os
- #70703# apply to all similar texts: search options case sensitive and word only
-
- Revision 1.37 1999/12/10 15:17:04 os
- #70711# readonly check for index entries now in GetIdxState
-
- Revision 1.36 1999/10/15 11:44:08 os
- new: FN_REMOVE_TOX
-
- Revision 1.35 1999/10/06 12:15:01 os
- edit tox entry dialogs now modal
-
- Revision 1.34 1999/09/15 13:57:53 os
- dialog for authorities
-
- Revision 1.33 1999/09/08 12:43:18 os
- GetIdxState corrected
-
- Revision 1.32 1999/09/07 13:55:52 os
- Insert/EditIndexEntry as FloatingWindow
-
- Revision 1.31 1999/08/25 13:27:20 OS
- extended indexes: remove old code
-
-
- Rev 1.30 25 Aug 1999 15:27:20 OS
- extended indexes: remove old code
-
- Rev 1.29 23 Aug 1999 09:51:52 OS
- extended indexes: InsertTOXMark simplified
-
- Rev 1.28 17 Aug 1999 13:59:02 OS
- extended indexes: get/set section attributes
-
- Rev 1.27 30 Jul 1999 13:14:36 OS
- indexes: check readonly in status method
-
- Rev 1.26 07 Jul 1999 08:13:46 OS
- extended indexes: SwTOXMgr interface changed
-
- Rev 1.25 02 Jul 1999 11:07:50 OS
- extended indexes: smaller interface SwTOXMgr
-
- Rev 1.24 21 Jun 1999 10:00:52 OS
- extended indexes
-
- Rev 1.23 29 Mar 1999 14:37:24 OS
- #63929# Range fuer ItemSet festlegen
-
- Rev 1.22 29 Mar 1999 12:19:30 OS
- #63929# neuer Verzeichnisdialog vollstaendig
-
- Rev 1.21 26 Mar 1999 11:38:26 OS
- #63929# Neuer Verzeichnisdialog
-
- Rev 1.20 20 Jan 1999 11:35:58 OS
- #60881# Verzeichniseintraege mehrfach einf?gen
-
- Rev 1.19 24 Nov 1997 09:47:10 MA
- includes
-
- Rev 1.18 03 Nov 1997 13:55:44 MA
- precomp entfernt
-
- Rev 1.17 05 Sep 1997 13:36:00 OS
- pBase initialisieren, Rahmenslektion schliesst TextShell aus
-
- Rev 1.16 28 Aug 1997 19:48:02 JP
- GetIdxState: optimiert, im Verzeichnis InsertEntry abklemmen
-
- Rev 1.15 23 Jul 1997 21:28:56 HJS
- includes
-
- Rev 1.14 07 Jul 1997 09:39:34 OS
- fuer Userverzeichnisse aus Vorlagen muss immer ein Strin uebergeben werden
-
- Rev 1.13 03 Jul 1997 09:16:42 JP
- FN_INSERT_CNTNTIDX_ENTRY: Level auf 1 defaulten
-
- Rev 1.12 16 Jun 1997 12:02:26 OS
- Verzeichnisfunktionen und -dialoge ohne Record-Flag
-
- Rev 1.11 07 Apr 1997 17:44:46 MH
- chg: header
-
- Rev 1.10 27 Jan 1997 16:30:36 OS
- HtmlMode entfernt
-
- Rev 1.9 11 Dec 1996 10:50:56 MA
- Warnings
-
- Rev 1.8 23 Nov 1996 13:24:46 OS
- im HtmlMode Verzeichnis einfuegen disabled
-
- Rev 1.7 24 Oct 1996 20:59:38 JP
- State: bei Selektion darf kein VerzeichnisEintrag bearbeitet werden
-
- Rev 1.6 09 Sep 1996 21:16:28 MH
- Umstellungen wg. internal Compiler Errors
-
- Rev 1.5 28 Aug 1996 15:54:52 OS
- includes
-
- Rev 1.4 07 Jun 1996 09:12:44 OS
- CreateForm fuer Inhaltsverzeichnis abgesichert Bug #28429#
-
- Rev 1.3 03 Jun 1996 10:18:06 OS
- vohandene Verzeichnisse beim Einfuegen updaten (Basic) Bug #28233#
-
- Rev 1.2 22 Mar 1996 15:29:32 TRI
- sfxiiter.hxx included
-
- Rev 1.1 30 Nov 1995 15:09:58 OM
- Segs
-
- Rev 1.0 30 Nov 1995 14:26:00 OM
- Initial revision.
-
-------------------------------------------------------------------------*/
diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx
index 78d47f3b8809..cefd46dd4daa 100644
--- a/sw/source/ui/utlui/content.cxx
+++ b/sw/source/ui/utlui/content.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: content.cxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: jp $ $Date: 2000-10-20 13:42:18 $
+ * last change: $Author: os $ $Date: 2000-11-03 11:32:31 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -97,6 +97,9 @@
#include <vcl/sound.hxx>
#endif
+#ifndef _UIITEMS_HXX
+#include <uiitems.hxx>
+#endif
#ifndef _FMTINFMT_HXX //autogen
#include <fmtinfmt.hxx>
#endif
@@ -2850,7 +2853,13 @@ void SwContentTree::EditEntry(SvLBoxEntry* pEntry, sal_uInt8 nMode)
{
case EDIT_MODE_EDIT:
if(pBase)
- nSlot = FN_INSERT_MULTI_TOX;
+ {
+ SwPtrItem aPtrItem( FN_INSERT_MULTI_TOX, (void*)pBase);
+ pActiveShell->GetView().GetViewFrame()->
+ GetDispatcher()->Execute(FN_INSERT_MULTI_TOX,
+ SFX_CALLMODE_ASYNCHRON, &aPtrItem, 0);
+
+ }
break;
case EDIT_MODE_UPD_IDX:
nSlot = FN_UPDATE_CUR_TOX;
@@ -3171,6 +3180,9 @@ void SwContentLBoxString::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16 nFl
/*------------------------------------------------------------------------
$Log: not supported by cvs2svn $
+ Revision 1.2 2000/10/20 13:42:18 jp
+ use correct INetURL-Decode enum
+
Revision 1.1.1.1 2000/09/18 17:14:50 hr
initial import