[Libreoffice-commits] .: Branch 'libreoffice-4-0' - 2 commits - basctl/uiconfig extensions/source framework/uiconfig officecfg/registry sc/sdi sc/uiconfig sd/sdi sd/source sd/uiconfig sfx2/AllLangResTarget_sfx2.mk sfx2/inc sfx2/Library_sfx.mk sfx2/Package_inc.mk sfx2/sdi sfx2/source sw/sdi sw/uiconfig
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Dec 21 00:07:45 PST 2012
basctl/uiconfig/basicide/menubar/menubar.xml | 7
extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml | 7
framework/uiconfig/startmodule/menubar/menubar.xml | 6
officecfg/registry/data/org/openoffice/Office/Common.xcu | 2
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 15
sc/sdi/drawsh.sdi | 1
sc/sdi/drtxtob.sdi | 1
sc/uiconfig/scalc/menubar/menubar.xml | 6
sd/sdi/SlideSorterController.sdi | 5
sd/sdi/outlnvsh.sdi | 5
sd/source/ui/slidesorter/controller/SlsSlotManager.cxx | 3
sd/source/ui/view/outlnvsh.cxx | 3
sd/uiconfig/sdraw/menubar/menubar.xml | 6
sd/uiconfig/simpress/menubar/menubar.xml | 6
sfx2/AllLangResTarget_sfx2.mk | 1
sfx2/Library_sfx.mk | 3
sfx2/Package_inc.mk | 1
sfx2/inc/docvor.hxx | 144
sfx2/inc/orgmgr.hxx | 95
sfx2/inc/sfx2/doctdlg.hxx | 75
sfx2/inc/sfx2/sfxcommands.h | 1
sfx2/inc/sfx2/sfxsids.hrc | 3
sfx2/inc/sfx2/templdlg.hxx | 14
sfx2/sdi/appslots.sdi | 4
sfx2/sdi/sfx.sdi | 50
sfx2/sdi/viwslots.sdi | 5
sfx2/source/appl/appserv.cxx | 13
sfx2/source/dialog/templdlg.cxx | 231
sfx2/source/dialog/templdlg.hrc | 13
sfx2/source/dialog/templdlg.src | 89
sfx2/source/doc/doctdlg.cxx | 206
sfx2/source/doc/doctdlg.hrc | 32
sfx2/source/doc/doctdlg.src | 108
sfx2/source/doc/docvor.cxx | 2380 ----------
sfx2/source/doc/objserv.cxx | 1
sfx2/source/inc/templdgi.hxx | 51
sfx2/source/view/orgmgr.cxx | 771 ---
sfx2/source/view/viewsh.cxx | 15
sw/sdi/_drwbase.sdi | 5
sw/sdi/annotsh.sdi | 6
sw/sdi/drwtxtsh.sdi | 5
sw/uiconfig/sglobal/menubar/menubar.xml | 6
sw/uiconfig/sweb/menubar/menubar.xml | 6
sw/uiconfig/swform/menubar/menubar.xml | 7
sw/uiconfig/swreport/menubar/menubar.xml | 6
sw/uiconfig/swriter/menubar/menubar.xml | 6
sw/uiconfig/swxform/menubar/menubar.xml | 6
47 files changed, 1 insertion(+), 4431 deletions(-)
New commits:
commit bc89e6f3a735401e67f23ab503492c275b2d6090
Author: Cédric Bosdonnat <cedric.bosdonnat at free.fr>
Date: Thu Dec 20 09:51:59 2012 +0100
Templates Manager: removed the old dialogs and menu entries
Conflicts:
basctl/uiconfig/basicide/menubar/menubar.xml
extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml
framework/uiconfig/startmodule/menubar/menubar.xml
sc/uiconfig/scalc/menubar/menubar.xml
sd/uiconfig/sdraw/menubar/menubar.xml
sd/uiconfig/simpress/menubar/menubar.xml
sfx2/inc/docvor.hxx
sfx2/inc/orgmgr.hxx
sfx2/source/doc/docvor.cxx
sfx2/source/view/orgmgr.cxx
sw/uiconfig/sglobal/menubar/menubar.xml
sw/uiconfig/sweb/menubar/menubar.xml
sw/uiconfig/swform/menubar/menubar.xml
sw/uiconfig/swreport/menubar/menubar.xml
sw/uiconfig/swriter/menubar/menubar.xml
sw/uiconfig/swxform/menubar/menubar.xml
Change-Id: I5aa9dd8c0bfb95c26bca14962f60041e892ea2ea
diff --git a/basctl/uiconfig/basicide/menubar/menubar.xml b/basctl/uiconfig/basicide/menubar/menubar.xml
index 43be03a..2c12262 100644
--- a/basctl/uiconfig/basicide/menubar/menubar.xml
+++ b/basctl/uiconfig/basicide/menubar/menubar.xml
@@ -32,13 +32,6 @@
<menu:menuitem menu:id=".uno:CheckOut"/>
<menu:menuitem menu:id=".uno:CancelCheckOut"/>
<menu:menuitem menu:id=".uno:CheckIn"/>
- <menu:menu menu:id=".uno:TemplateMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:Organizer"/>
- <menu:menuitem menu:id=".uno:SaveAsTemplate"/>
- <menu:menuitem menu:id=".uno:OpenTemplate"/>
- </menu:menupopup>
- </menu:menu>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:Signature"/>
<menu:menuseparator/>
diff --git a/extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml b/extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml
index 9f76961..39d113b 100644
--- a/extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml
+++ b/extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml
@@ -19,13 +19,6 @@
<menu:menuitem menu:id=".uno:SendToMenu"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SetDocumentProperties"/>
- <menu:menu menu:id=".uno:TemplateMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:Organizer"/>
- <menu:menuitem menu:id=".uno:SaveAsTemplate"/>
- <menu:menuitem menu:id=".uno:OpenTemplate"/>
- </menu:menupopup>
- </menu:menu>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:PrintPreview"/>
<menu:menuitem menu:id=".uno:Print"/>
diff --git a/framework/uiconfig/startmodule/menubar/menubar.xml b/framework/uiconfig/startmodule/menubar/menubar.xml
index a21bfc7..c9f9622 100644
--- a/framework/uiconfig/startmodule/menubar/menubar.xml
+++ b/framework/uiconfig/startmodule/menubar/menubar.xml
@@ -31,12 +31,6 @@
<menu:menuitem menu:id=".uno:SaveAll"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SendMail"/>
- <menu:menu menu:id=".uno:TemplateMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:Organizer"/>
- <menu:menuitem menu:id=".uno:OpenTemplate"/>
- </menu:menupopup>
- </menu:menu>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SetDocumentProperties"/>
<menu:menuseparator/>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index aa55b28..42188b6 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -2352,11 +2352,6 @@
<value>1</value>
</prop>
</node>
- <node oor:name=".uno:Organizer" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">~Organize...</value>
- </prop>
- </node>
<node oor:name=".uno:OutlineFormat" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Formatting On/Off</value>
@@ -2720,11 +2715,6 @@
<value xml:lang="en-US">Open Smart Tag Menu</value>
</prop>
</node>
- <node oor:name=".uno:StyleCatalog" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">~Catalog...</value>
- </prop>
- </node>
<node oor:name=".uno:InsertImage" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Insert from Image Editor</value>
@@ -5328,11 +5318,6 @@
<value xml:lang="en-US">~Tools</value>
</prop>
</node>
- <node oor:name=".uno:TemplateMenu" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">~Templates</value>
- </prop>
- </node>
<node oor:name=".uno:SpellingMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">~Spellcheck</value>
diff --git a/sc/sdi/drawsh.sdi b/sc/sdi/drawsh.sdi
index ab2337f..6c9ec0b 100644
--- a/sc/sdi/drawsh.sdi
+++ b/sc/sdi/drawsh.sdi
@@ -37,7 +37,6 @@ interface TableDraw
// andere:
SID_DRAW_CHART [ StateMethod = StateDisableItems; Export = FALSE; ]
//! SID_STYLE_DESIGNER [ StateMethod = StateDisableItems; Export = FALSE; ]
- SID_STYLE_CATALOG [ StateMethod = StateDisableItems; Export = FALSE; ]
//! SID_OPENDLG_FUNCTION[ StateMethod = StateDisableItems; Export = FALSE; ]
SID_STYLE_FAMILY2 [ StateMethod = StateDisableItems; Export = FALSE; ]
SID_STYLE_FAMILY4 [ StateMethod = StateDisableItems; Export = FALSE; ]
diff --git a/sc/sdi/drtxtob.sdi b/sc/sdi/drtxtob.sdi
index 0bb35fc..ebc0912 100644
--- a/sc/sdi/drtxtob.sdi
+++ b/sc/sdi/drtxtob.sdi
@@ -34,7 +34,6 @@ interface TableDrawText
SID_OPENDLG_EDIT_PRINTAREA [ StateMethod = StateDisableItems; Export = FALSE; ]
// andere:
SID_DRAW_CHART [ StateMethod = StateDisableItems; Export = FALSE; ]
- SID_STYLE_CATALOG [ StateMethod = StateDisableItems; Export = FALSE; ]
SID_OPENDLG_FUNCTION [ StateMethod = StateDisableItems; Export = FALSE; ]
SID_STYLE_FAMILY2 [ StateMethod = StateDisableItems; Export = FALSE; ]
SID_STYLE_FAMILY4 [ StateMethod = StateDisableItems; Export = FALSE; ]
diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml
index 93e9f4f..aabe873 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
@@ -52,12 +52,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SetDocumentProperties"/>
<menu:menuitem menu:id=".uno:Signature"/>
- <menu:menu menu:id=".uno:TemplateMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:Organizer"/>
- <menu:menuitem menu:id=".uno:OpenTemplate"/>
- </menu:menupopup>
- </menu:menu>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:WebHtml"/>
<menu:menuseparator/>
diff --git a/sd/sdi/SlideSorterController.sdi b/sd/sdi/SlideSorterController.sdi
index 53ea834..a71f431 100644
--- a/sd/sdi/SlideSorterController.sdi
+++ b/sd/sdi/SlideSorterController.sdi
@@ -200,11 +200,6 @@ interface SlideSorterView
ExecMethod = ExecCtrl ;
StateMethod = GetMenuState ;
]
- SID_STYLE_CATALOG // ole : no, status : ?
- [
- ExecMethod = FuTemporary ;
- StateMethod = GetMenuState ;
- ]
SID_SLIDE_TRANSITIONS_PANEL // ole : no, status : ?
[
ExecMethod = FuTemporary ;
diff --git a/sd/sdi/outlnvsh.sdi b/sd/sdi/outlnvsh.sdi
index 82e5fb7..b98cfdb 100644
--- a/sd/sdi/outlnvsh.sdi
+++ b/sd/sdi/outlnvsh.sdi
@@ -250,11 +250,6 @@ interface OutlineView
ExecMethod = FuTemporaryModify ;
StateMethod = GetMenuState ;
]
- SID_STYLE_CATALOG // ole : no, status : ?
- [
- ExecMethod = FuTemporary ;
- StateMethod = GetMenuState ;
- ]
// Vorlagen
// kein Menueeintrag
SID_STYLE_FAMILY2 // ole : no, status : ?
diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index 493ebdc..d3e20ce 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -527,9 +527,6 @@ void SlotManager::GetMenuState (SfxItemSet& rSet)
rSet.Put( SfxBoolItem( SID_NOTESMODE, sal_False ) );
rSet.Put( SfxBoolItem( SID_HANDOUTMODE, sal_False ) );
- // Vorlagenkatalog darf nicht aufgerufen werden
- rSet.DisableItem(SID_STYLE_CATALOG);
-
if (pShell!=NULL && pShell->IsMainViewShell())
{
rSet.DisableItem(SID_SPELL_DIALOG);
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index 5fbb6f3..6469ef0 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -780,9 +780,6 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet )
{
ViewShell::GetMenuState(rSet);
- // Style catalog must not be called
- rSet.DisableItem( SID_STYLE_CATALOG );
-
rSet.Put(SfxBoolItem(SID_DIAMODE, sal_False));
rSet.Put(SfxBoolItem(SID_DRAWINGMODE, sal_False));
rSet.Put(SfxBoolItem(SID_OUTLINEMODE, sal_True));
diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml
index 44cfa10..85ea0e0 100644
--- a/sd/uiconfig/sdraw/menubar/menubar.xml
+++ b/sd/uiconfig/sdraw/menubar/menubar.xml
@@ -48,12 +48,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SetDocumentProperties"/>
<menu:menuitem menu:id=".uno:Signature"/>
- <menu:menu menu:id=".uno:TemplateMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:Organizer"/>
- <menu:menuitem menu:id=".uno:OpenTemplate"/>
- </menu:menupopup>
- </menu:menu>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:WebHtml"/>
<menu:menuseparator/>
diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml
index 6035cdd..9fd07b1 100644
--- a/sd/uiconfig/simpress/menubar/menubar.xml
+++ b/sd/uiconfig/simpress/menubar/menubar.xml
@@ -50,12 +50,6 @@
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SetDocumentProperties"/>
<menu:menuitem menu:id=".uno:Signature"/>
- <menu:menu menu:id=".uno:TemplateMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:Organizer"/>
- <menu:menuitem menu:id=".uno:OpenTemplate"/>
- </menu:menupopup>
- </menu:menu>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:WebHtml"/>
<menu:menuseparator/>
diff --git a/sfx2/AllLangResTarget_sfx2.mk b/sfx2/AllLangResTarget_sfx2.mk
index 81ff3c7..63a2d3a 100644
--- a/sfx2/AllLangResTarget_sfx2.mk
+++ b/sfx2/AllLangResTarget_sfx2.mk
@@ -67,7 +67,6 @@ $(eval $(call gb_SrsTarget_add_files,sfx/res,\
sfx2/source/dialog/titledockwin.src \
sfx2/source/dialog/versdlg.src \
sfx2/source/doc/doc.src \
- sfx2/source/doc/doctdlg.src \
sfx2/source/doc/doctempl.src \
sfx2/source/doc/docvor.src \
sfx2/source/doc/graphhelp.src \
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index f252e5b..bab643a 100644
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -193,11 +193,9 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\
sfx2/source/doc/docinsert \
sfx2/source/doc/docmacromode \
sfx2/source/doc/docstoragemodifylistener \
- sfx2/source/doc/doctdlg \
sfx2/source/doc/doctempl \
sfx2/source/doc/doctemplates \
sfx2/source/doc/doctemplateslocal \
- sfx2/source/doc/docvor \
sfx2/source/doc/frmdescr \
sfx2/source/doc/graphhelp \
sfx2/source/doc/guisaveas \
@@ -237,7 +235,6 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\
sfx2/source/view/frame2 \
sfx2/source/view/frmload \
sfx2/source/view/ipclient \
- sfx2/source/view/orgmgr \
sfx2/source/view/printer \
sfx2/source/view/sfxbasecontroller \
sfx2/source/view/userinputinterception \
diff --git a/sfx2/Package_inc.mk b/sfx2/Package_inc.mk
index 05727d4..aa368b7 100644
--- a/sfx2/Package_inc.mk
+++ b/sfx2/Package_inc.mk
@@ -47,7 +47,6 @@ $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docinsert.hxx,sfx2/docinsert
$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dockwin.hxx,sfx2/dockwin.hxx))
$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docmacromode.hxx,sfx2/docmacromode.hxx))
$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docstoragemodifylistener.hxx,sfx2/docstoragemodifylistener.hxx))
-$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/doctdlg.hxx,sfx2/doctdlg.hxx))
$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/doctempl.hxx,sfx2/doctempl.hxx))
$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/event.hxx,sfx2/event.hxx))
$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/evntconf.hxx,sfx2/evntconf.hxx))
diff --git a/sfx2/inc/docvor.hxx b/sfx2/inc/docvor.hxx
deleted file mode 100644
index 6a2a001..0000000
--- a/sfx2/inc/docvor.hxx
+++ /dev/null
@@ -1,144 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef _SFXDOCVOR_HXX
-#define _SFXDOCVOR_HXX
-
-
-#include <vcl/dialog.hxx>
-#include <svtools/treelistbox.hxx>
-
-#include <sfx2/objsh.hxx>
-#include "orgmgr.hxx"
-
-//=========================================================================
-
-class SfxDocumentTemplates;
-class Path;
-
-//=========================================================================
-
-#ifndef _SFX_HXX
-
-class SfxOrganizeDlg_Impl;
-
-class SfxOrganizeListBox_Impl : public SvTreeListBox
-{
- enum BMPTYPE { BMPTYPE_FOLDER, BMPTYPE_DOC };
-
-friend class SfxOrganizeDlg_Impl;
-
- Image aOpenedFolderBmp;
- Image aClosedFolderBmp;
- Image aOpenedDocBmp;
- Image aClosedDocBmp;
-
- SfxOrganizeMgr* pMgr;
- SfxOrganizeDlg_Impl* pDlg;
-
- static sal_Bool bDropMoveOk;
-
- DECL_LINK( OnAsyncExecuteDrop, ExecuteDropEvent* );
-
-protected:
- virtual sal_Bool EditingEntry( SvTreeListEntry* pEntry, Selection & );
- virtual sal_Bool EditedEntry( SvTreeListEntry* pEntry, const rtl::OUString& rNewText );
- virtual sal_Bool NotifyMoving(SvTreeListEntry *pSource,
- SvTreeListEntry* pTarget,
- SvTreeListEntry *&pNewParent, sal_uIntPtr &);
- virtual sal_Bool NotifyCopying(SvTreeListEntry *pSource,
- SvTreeListEntry* pTarget,
- SvTreeListEntry *&pNewParent, sal_uIntPtr &);
- virtual void RequestingChildren( SvTreeListEntry* pParent );
- virtual long ExpandingHdl();
- virtual sal_Bool Select( SvTreeListEntry* pEntry, sal_Bool bSelect=sal_True );
-
- using SvTreeListBox::ExecuteDrop;
- // new d&d
- virtual DragDropMode NotifyStartDrag( TransferDataContainer&, SvTreeListEntry* );
- virtual sal_Bool NotifyAcceptDrop( SvTreeListEntry* );
- virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt );
- virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt );
- virtual void DragFinished( sal_Int8 nDropAction );
-
-public:
- using SvListView::Select;
- enum DataEnum { VIEW_TEMPLATES, VIEW_FILES } eViewType;
-
- SfxOrganizeListBox_Impl( SfxOrganizeDlg_Impl* pDlg, Window* pParent, WinBits, DataEnum );
-
- DataEnum GetViewType() const { return eViewType; }
- void SetViewType(DataEnum eType) { eViewType = eType; }
-
- void SetMgr(SfxOrganizeMgr *pM) { pMgr = pM; }
- void Reset();
- inline void SetBitmaps(
- const Image &rOFolderBmp, const Image &rCFolderBmp, const Image &rODocBmp, const Image &rCDocBmp
- );
- const Image &GetClosedBmp(sal_uInt16 nLevel) const;
- const Image &GetOpenedBmp(sal_uInt16 nLevel) const;
-
- virtual PopupMenu* CreateContextMenu();
-
-private:
- sal_Bool IsStandard_Impl( SvTreeListEntry *) const;
- sal_Bool MoveOrCopyTemplates(SvTreeListBox *pSourceBox,
- SvTreeListEntry *pSource,
- SvTreeListEntry* pTarget,
- SvTreeListEntry *&pNewParent,
- sal_uIntPtr &rIdx,
- sal_Bool bCopy);
- sal_Bool MoveOrCopyContents(SvTreeListBox *pSourceBox,
- SvTreeListEntry *pSource,
- SvTreeListEntry* pTarget,
- SvTreeListEntry *&pNewParent,
- sal_uIntPtr &rIdx,
- sal_Bool bCopy);
- inline sal_uInt16 GetDocLevel() const;
- SfxObjectShellRef GetObjectShell( const Path& );
- sal_Bool IsUniqName_Impl( const String &rText,
- SvTreeListEntry* pParent, SvTreeListEntry* pEntry = 0 ) const;
- sal_uInt16 GetLevelCount_Impl( SvTreeListEntry* pParent ) const;
-
- SvTreeListEntry* InsertEntryByBmpType( const XubString& rText, BMPTYPE eBmpType,
- SvTreeListEntry* pParent = NULL, sal_Bool bChildrenOnDemand = sal_False,
- sal_uIntPtr nPos = LIST_APPEND, void* pUserData = NULL );
-};
-
-#endif // _SFX_HXX
-
-//=========================================================================
-
-class SfxTemplateOrganizeDlg : public ModalDialog
-{
-friend class SfxOrganizeListBox_Impl;
-
- class SfxOrganizeDlg_Impl *pImp;
-
-public:
- SfxTemplateOrganizeDlg(Window * pParent, SfxDocumentTemplates* = 0);
- ~SfxTemplateOrganizeDlg();
-
-#define RET_EDIT_STYLE 100
-
- virtual short Execute();
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/orgmgr.hxx b/sfx2/inc/orgmgr.hxx
deleted file mode 100644
index 48c3ae3..0000000
--- a/sfx2/inc/orgmgr.hxx
+++ /dev/null
@@ -1,95 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef _SFX_ORGMGR_HXX
-#define _SFX_ORGMGR_HXX
-
-#include <o3tl/sorted_vector.hxx>
-
-class SfxDocumentTemplates;
-class SfxOrganizeListBox_Impl;
-struct _FileListEntry;
-
-//=========================================================================
-
-class SfxObjectList : public o3tl::sorted_vector<_FileListEntry*, o3tl::less_ptr_to<_FileListEntry> >
-{
-public:
- SfxObjectList();
- ~SfxObjectList();
-
- const String& GetBaseName( const _FileListEntry* p ) const;
-};
-
-class IntlWrapper;
-struct SfxOrganizeMgr_Impl
-{
- SfxObjectList* pDocList;
- IntlWrapper* pIntlWrapper;
-
- SfxOrganizeMgr_Impl() : pDocList( NULL ), pIntlWrapper( NULL ) {}
-};
-
-//=========================================================================
-
-class SfxOrganizeMgr
-{
-private:
- SfxOrganizeMgr_Impl* pImpl;
- SfxDocumentTemplates* pTemplates;
- SfxOrganizeListBox_Impl* pLeftBox;
- SfxOrganizeListBox_Impl* pRightBox;
- sal_Bool bDeleteTemplates :1;
- sal_Bool bModified :1;
-
- SfxOrganizeListBox_Impl* GetOther( SfxOrganizeListBox_Impl* );
-
-public:
- SfxOrganizeMgr( SfxOrganizeListBox_Impl* pLeft,
- SfxOrganizeListBox_Impl* pRight,
- SfxDocumentTemplates* pTempl = NULL );
- ~SfxOrganizeMgr();
-
- sal_Bool Copy( sal_uInt16 nTargetRegion, sal_uInt16 nTargetIdx, sal_uInt16 nSourceRegion, sal_uInt16 nSourceIdx );
- sal_Bool Move( sal_uInt16 nTargetRegion, sal_uInt16 nTargetIdx, sal_uInt16 nSourceRegion, sal_uInt16 nSourceIdx );
- sal_Bool Delete( SfxOrganizeListBox_Impl* pCaller, sal_uInt16 nRegion, sal_uInt16 nIdx );
- sal_Bool InsertDir( SfxOrganizeListBox_Impl* pCaller, const String& rName, sal_uInt16 nRegion );
- sal_Bool SetName( const String& rName, sal_uInt16 nRegion, sal_uInt16 nIdx = USHRT_MAX );
- sal_Bool CopyTo( sal_uInt16 nRegion, sal_uInt16 nIdx, const String& rName ) const;
- sal_Bool CopyFrom( SfxOrganizeListBox_Impl* pCaller, sal_uInt16 nRegion, sal_uInt16 nIdx, String& rName );
-
- sal_Bool Rescan();
- sal_Bool InsertFile( SfxOrganizeListBox_Impl* pCaller, const String& rFileName );
-
- sal_Bool IsModified() const { return bModified ? sal_True : sal_False; }
-
- const SfxDocumentTemplates* GetTemplates() const { return pTemplates; }
- SfxObjectList& GetObjectList() { return *pImpl->pDocList; }
- const SfxObjectList& GetObjectList() const { return *pImpl->pDocList; }
-
- SfxObjectShellRef CreateObjectShell( sal_uInt16 nIdx );
- SfxObjectShellRef CreateObjectShell( sal_uInt16 nRegion, sal_uInt16 nIdx );
- sal_Bool DeleteObjectShell( sal_uInt16 );
- sal_Bool DeleteObjectShell( sal_uInt16, sal_uInt16 );
- void SaveAll( Window* pParent );
-};
-
-#endif // #ifndef _SFX_ORGMGR_HXX
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/doctdlg.hxx b/sfx2/inc/sfx2/doctdlg.hxx
deleted file mode 100644
index 2c9520e..0000000
--- a/sfx2/inc/sfx2/doctdlg.hxx
+++ /dev/null
@@ -1,75 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef _SFXDOCTDLG_HXX
-#define _SFXDOCTDLG_HXX
-
-#include <comphelper/string.hxx>
-#include <sfx2/doctempl.hxx>
-#include <vcl/lstbox.hxx>
-#include <vcl/edit.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/button.hxx>
-#include <vcl/dialog.hxx>
-
-class SfxModalDefParentHelper;
-
-class SfxDocumentTemplateDlg : public ModalDialog
-{
-private:
-
- FixedLine aEditFL;
- Edit aNameEd;
- FixedLine aTemplateFL;
- FixedText aRegionFt;
- ListBox aRegionLb;
- FixedText aTemplateFt;
- ListBox aTemplateLb;
-
- OKButton aOkBt;
- CancelButton aCancelBt;
- HelpButton aHelpBt;
- PushButton aEditBt;
- PushButton aOrganizeBt;
-
- SfxDocumentTemplates *pTemplates;
-
- SfxModalDefParentHelper* pHelper;
-
- void Init();
-
- DECL_LINK( OrganizeHdl, Button * );
- DECL_LINK( OkHdl, Control * );
- DECL_LINK( RegionSelect, ListBox * );
- DECL_LINK( TemplateSelect, ListBox * );
- DECL_LINK( NameModify, Edit * );
- DECL_LINK( EditHdl, Button * );
-
-public:
- SfxDocumentTemplateDlg(Window * pParent, SfxDocumentTemplates* pTempl );
- ~SfxDocumentTemplateDlg();
-
- String GetTemplateName() const
- { return comphelper::string::stripStart(aNameEd.GetText(), ' '); }
- sal_uInt16 GetRegion() const { return aRegionLb.GetSelectEntryPos(); }
- String GetRegionName() const { return aRegionLb.GetSelectEntry(); }
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/sfxcommands.h b/sfx2/inc/sfx2/sfxcommands.h
index f054ca9..3f4df5c 100644
--- a/sfx2/inc/sfx2/sfxcommands.h
+++ b/sfx2/inc/sfx2/sfxcommands.h
@@ -62,7 +62,6 @@
#define CMD_SID_DOCTEMPLATE ".uno:SaveAsTemplate"
#define CMD_SID_SEARCH_DLG ".uno:SearchDialog"
#define CMD_SID_SHOW_BROWSER ".uno:ShowBrowser"
-#define CMD_SID_STYLE_CATALOG ".uno:StyleCatalog"
#define CMD_SID_STYLE_NEW_BY_EXAMPLE ".uno:StyleNewByExample"
#define CMD_SID_INET_DLG ".uno:InternetDialog"
diff --git a/sfx2/inc/sfx2/sfxsids.hrc b/sfx2/inc/sfx2/sfxsids.hrc
index 0dee088..9a18100 100644
--- a/sfx2/inc/sfx2/sfxsids.hrc
+++ b/sfx2/inc/sfx2/sfxsids.hrc
@@ -334,8 +334,6 @@
// Floating Window Template
#define SID_STYLE_DESIGNER (SID_SFX_START + 539)
-// Organizer
-#define SID_ORGANIZER (SID_SFX_START + 540)
#define SID_TEMPLATE_ADDRESSBOKSOURCE (SID_SFX_START + 1655)
// Ruby dialog
@@ -379,7 +377,6 @@
#define SID_ACTIVEDOCUMENT (SID_SFX_START + 570)
#define SID_DEFAULTFILEPATH (SID_SFX_START + 571)
-#define SID_STYLE_CATALOG (SID_SFX_START + 573)
#define SID_OBJECT (SID_SFX_START + 575)
// Doc-Properties
diff --git a/sfx2/inc/sfx2/templdlg.hxx b/sfx2/inc/sfx2/templdlg.hxx
index 92008b3..e9fb3a5 100644
--- a/sfx2/inc/sfx2/templdlg.hxx
+++ b/sfx2/inc/sfx2/templdlg.hxx
@@ -29,7 +29,6 @@
#include <sfx2/basedlgs.hxx>
class SfxTemplateDialog_Impl;
-class SfxTemplateCatalog_Impl;
// class ISfxTemplateCommon ----------------------------------------------
@@ -68,19 +67,6 @@ public:
void SetParagraphFamily();
};
-// class SfxTemplateCatalog ----------------------------------------------
-
-class SfxTemplateCatalog : public SfxModalDialog
-{
-private:
- SfxTemplateCatalog_Impl *pImpl;
-
-public:
- SfxTemplateCatalog(Window * pParent, SfxBindings *pBindings);
- ~SfxTemplateCatalog();
- friend class SfxTemplateCatalog_Impl;
-};
-
// class SfxTemplateDialogWrapper ----------------------------------------
class SFX2_DLLPUBLIC SfxTemplateDialogWrapper : public SfxChildWindow
diff --git a/sfx2/sdi/appslots.sdi b/sfx2/sdi/appslots.sdi
index 9f7d6cc..aa1da36 100644
--- a/sfx2/sdi/appslots.sdi
+++ b/sfx2/sdi/appslots.sdi
@@ -123,10 +123,6 @@ interface Application
ExecMethod = MiscExec_Impl ;
StateMethod = MiscState_Impl ;
]
- SID_ORGANIZER // ole(no) api(final/play/rec)
- [
- ExecMethod = MiscExec_Impl ;
- ]
SID_TEMPLATE_ADDRESSBOKSOURCE // ole(no) api(final/play/rec)
[
ExecMethod = MiscExec_Impl ;
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index 7c19226..607f206 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -4646,31 +4646,6 @@ SfxVoidItem TemplateManager SID_TEMPLATE_MANAGER
]
//--------------------------------------------------------------------------
-SfxVoidItem Organizer SID_ORGANIZER
-()
-[
- /* flags: */
- AutoUpdate = FALSE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = TRUE,
- Toggle = FALSE,
- Container = TRUE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Asynchron;
-
- /* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
- GroupId = GID_TEMPLATE;
-]
-
-//--------------------------------------------------------------------------
SfxTemplateItem PageStyle SID_STYLE_FAMILY4
[
@@ -6472,31 +6447,6 @@ SfxTemplateItem StyleApplyState SID_STYLE_APPLY
]
//--------------------------------------------------------------------------
-SfxVoidItem StyleCatalog SID_STYLE_CATALOG
-()
-[
- /* flags: */
- AutoUpdate = FALSE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = TRUE,
- ReadOnlyDoc = FALSE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Asynchron;
-
- /* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
- GroupId = GID_TEMPLATE;
-]
-
-//--------------------------------------------------------------------------
SfxVoidItem StyleNewByExample SID_STYLE_NEW_BY_EXAMPLE
(SfxStringItem Param SID_STYLE_NEW_BY_EXAMPLE,SfxUInt16Item Family SID_STYLE_FAMILY)
[
diff --git a/sfx2/sdi/viwslots.sdi b/sfx2/sdi/viwslots.sdi
index bfc770c..9413745 100644
--- a/sfx2/sdi/viwslots.sdi
+++ b/sfx2/sdi/viwslots.sdi
@@ -77,11 +77,6 @@ interface View
ExecMethod = ExecPrint_Impl ;
StateMethod = GetState_Impl ;
]
- SID_STYLE_CATALOG // ole(no) api(play/rec)
- [
- ExecMethod = ExecMisc_Impl ;
- StateMethod = GetState_Impl ;
- ]
SID_ACTIVATE_STYLE_APPLY
[
ExecMethod = ExecMisc_Impl ;
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index fd224a5..4a4fc90 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -96,9 +96,7 @@
#include <sfx2/docfac.hxx>
#include <sfx2/docfile.hxx>
#include <sfx2/docfilt.hxx>
-#include "docvor.hxx"
#include <sfx2/new.hxx>
-#include <sfx2/templdlg.hxx>
#include "sfxtypes.hxx"
#include <sfx2/tabdlg.hxx>
#include "arrdecl.hxx"
@@ -602,17 +600,6 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
break;
}
- // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- case SID_ORGANIZER:
- {
- SfxTemplateOrganizeDlg *pDlg =
- new SfxTemplateOrganizeDlg(NULL);
- pDlg->Execute();
- delete pDlg;
- bDone = true;
- break;
- }
-
case SID_TEMPLATE_ADDRESSBOKSOURCE:
{
svt::AddressBookSourceDialog aDialog(GetTopWindow(), ::comphelper::getProcessServiceFactory());
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index d497711..0af6d77 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -55,7 +55,6 @@
#include "fltfnc.hxx"
#include <sfx2/docfilt.hxx>
#include <sfx2/docfac.hxx>
-#include "docvor.hxx"
#include <sfx2/doctempl.hxx>
#include <sfx2/module.hxx>
#include "sfx2/imgmgr.hxx"
@@ -91,7 +90,6 @@ static sal_uInt16 nLastItemId = USHRT_MAX;
TYPEINIT0(SfxCommonTemplateDialog_Impl);
TYPEINIT1(SfxTemplateDialog_Impl,SfxCommonTemplateDialog_Impl);
-TYPEINIT1(SfxTemplateCatalog_Impl,SfxCommonTemplateDialog_Impl);
SFX_IMPL_DOCKINGWINDOW_WITHID(SfxTemplateDialogWrapper, SID_STYLE_DESIGNER)
@@ -230,21 +228,6 @@ SfxChildAlignment SfxTemplateDialog::CheckAlignment(SfxChildAlignment eActAlign,
//-------------------------------------------------------------------------
-SfxTemplateCatalog::SfxTemplateCatalog(Window *pParent, SfxBindings *pBindings)
- : SfxModalDialog(pParent,SfxResId(RID_STYLECATALOG))
-{
- pImpl = new SfxTemplateCatalog_Impl(pParent, pBindings, this);
-}
-
-//-------------------------------------------------------------------------
-
-SfxTemplateCatalog::~SfxTemplateCatalog()
-{
- delete pImpl;
-}
-
-//-------------------------------------------------------------------------
-
void DropListBox_Impl::MouseButtonDown( const MouseEvent& rMEvt )
{
nModifier = rMEvt.GetModifier();
@@ -2158,8 +2141,6 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, ApplyHdl, Control *, pControl )
GetSelectedEntry(), String(),
( sal_uInt16 )GetFamilyItem_Impl()->GetFamily(),
0, 0, &nModifier );
- if(ISA(SfxTemplateCatalog_Impl))
- ((SfxTemplateCatalog_Impl*) this)->pReal->EndDialog(RET_OK);
}
ResetFocus();
return 0;
@@ -2641,218 +2622,6 @@ IMPL_LINK( SfxTemplateDialog_Impl, MenuSelectHdl, Menu*, pMenu)
}
//-------------------------------------------------------------------------
-SfxTemplateCatalog_Impl::SfxTemplateCatalog_Impl( Window* /*pParent*/, SfxBindings* pB,
- SfxTemplateCatalog* pTmpWindow ) :
-
- SfxCommonTemplateDialog_Impl( pB, pTmpWindow ),
-
- aFamList ( pTmpWindow, SfxResId( BT_TOOL ) ),
- aOkBtn ( pTmpWindow, SfxResId( BT_OK ) ),
- aCancelBtn ( pTmpWindow, SfxResId( BT_CANCEL ) ),
- aNewBtn ( pTmpWindow, SfxResId( BT_NEW ) ),
- aChangeBtn ( pTmpWindow, SfxResId( BT_EDIT ) ),
- aDelBtn ( pTmpWindow, SfxResId( BT_DEL ) ),
- aOrgBtn ( pTmpWindow, SfxResId( BT_ORG ) ),
- aHelpBtn ( pTmpWindow, SfxResId( BT_HELP ) ),
- pReal ( pTmpWindow ),
- aHelper ( pTmpWindow )
-
-{
- aNewBtn.Disable();
- aDelBtn.Disable();
- aChangeBtn.Disable();
-
- SFX_APP()->Get_Impl()->pTemplateCommon = GetISfxTemplateCommon();
- pTmpWindow->FreeResource();
-
- Initialize();
-
- aFamList.SetSelectHdl( LINK( this, SfxTemplateCatalog_Impl, FamListSelect ) );
- aOkBtn.SetClickHdl( LINK( this, SfxTemplateCatalog_Impl, OkHdl ) );
- aCancelBtn.SetClickHdl( LINK( this, SfxTemplateCatalog_Impl, CancelHdl ) );
- aNewBtn.SetClickHdl( LINK( this, SfxTemplateCatalog_Impl, NewHdl ) );
- aDelBtn.SetClickHdl( LINK( this, SfxTemplateCatalog_Impl, DelHdl ) );
- aChangeBtn.SetClickHdl( LINK( this, SfxTemplateCatalog_Impl, ChangeHdl ) );
- aOrgBtn.SetClickHdl( LINK( this, SfxTemplateCatalog_Impl, OrgHdl ) );
-}
-
-//-------------------------------------------------------------------------
-
-SfxTemplateCatalog_Impl::~SfxTemplateCatalog_Impl()
-{
- SFX_APP()->Get_Impl()->pTemplateCommon = 0;
-}
-
-//-------------------------------------------------------------------------
-
-IMPL_LINK_INLINE_START( SfxTemplateCatalog_Impl, OkHdl, Button *, pButton )
-{
- (void)pButton; //unused
- ApplyHdl( NULL );
- pReal->EndDialog( RET_OK );
- return 0;
-}
-IMPL_LINK_INLINE_END( SfxTemplateCatalog_Impl, OkHdl, Button *, pButton )
-
-//-------------------------------------------------------------------------
-
-IMPL_LINK_INLINE_START( SfxTemplateCatalog_Impl, CancelHdl, Button *, pButton )
-{
- (void)pButton; //unused
- pReal->EndDialog( RET_CANCEL );
- return 0;
-}
-IMPL_LINK_INLINE_END( SfxTemplateCatalog_Impl, CancelHdl, Button *, pButton )
-
-//-------------------------------------------------------------------------
-
-IMPL_LINK_INLINE_START( SfxTemplateCatalog_Impl, NewHdl, Button *, pButton )
-{
- (void)pButton; //unused
- aCancelBtn.SetText( SfxResId(STR_CLOSE).toString() );
- SfxCommonTemplateDialog_Impl::NewHdl( NULL );
- return 0;
-}
-IMPL_LINK_INLINE_END( SfxTemplateCatalog_Impl, NewHdl, Button *, pButton )
-
-//-------------------------------------------------------------------------
-
-IMPL_LINK_INLINE_START( SfxTemplateCatalog_Impl, ChangeHdl, Button *, pButton )
-{
- (void)pButton; //unused
- aCancelBtn.SetText( SfxResId(STR_CLOSE).toString() );
- SfxCommonTemplateDialog_Impl::EditHdl( NULL );
- return 0;
-}
-IMPL_LINK_INLINE_END( SfxTemplateCatalog_Impl, ChangeHdl, Button *, pButton )
-
-//-------------------------------------------------------------------------
-
-IMPL_LINK_INLINE_START( SfxTemplateCatalog_Impl, DelHdl, Button *, pButton )
-{
- (void)pButton; //unused
- SfxCommonTemplateDialog_Impl::DeleteHdl( NULL );
- return 0;
-}
-IMPL_LINK_INLINE_END( SfxTemplateCatalog_Impl, DelHdl, Button *, pButton )
-
-//-------------------------------------------------------------------------
-
-IMPL_LINK( SfxTemplateCatalog_Impl, OrgHdl, Button *, pButton )
-{
- (void)pButton; //unused
- aCancelBtn.SetText( SfxResId(STR_CLOSE).toString() );
- SfxDocumentTemplates aTemplates;
- aTemplates.Construct();
- SfxTemplateOrganizeDlg* pDlg = new SfxTemplateOrganizeDlg( pReal, &aTemplates );
- const short nRet = pDlg->Execute();
- delete pDlg;
- if ( RET_OK == nRet )
- Update_Impl();
- else if ( RET_EDIT_STYLE == nRet )
- pReal->EndDialog( RET_CANCEL );
- return 0;
-}
-
-//-------------------------------------------------------------------------
-
-void SfxTemplateCatalog_Impl::EnableEdit( sal_Bool bEnable )
-{
- SfxCommonTemplateDialog_Impl::EnableEdit( bEnable );
- aChangeBtn.Enable( bEnable );
-}
-
-//-------------------------------------------------------------------------
-
-void SfxTemplateCatalog_Impl::EnableDel( sal_Bool bEnable )
-{
- SfxCommonTemplateDialog_Impl::EnableDel( bEnable );
- aDelBtn.Enable( bEnable );
-}
-
-void SfxTemplateCatalog_Impl::EnableNew(sal_Bool bEnable)
-{
- SfxCommonTemplateDialog_Impl::EnableNew( bEnable );
- aNewBtn.Enable( bEnable );
-}
-
-//-------------------------------------------------------------------------
-
-IMPL_LINK_INLINE_START( SfxTemplateCatalog_Impl, FamListSelect, ListBox *, pList )
-{
- const sal_uInt16 nEntry = aFamIds[pList->GetSelectEntryPos()];
- FamilySelect(nEntry);
- return 0;
-}
-IMPL_LINK_INLINE_END( SfxTemplateCatalog_Impl, FamListSelect, ListBox *, pList )
-
-//-------------------------------------------------------------------------
-
-void SfxTemplateCatalog_Impl::EnableItem( sal_uInt16 nMesId, sal_Bool bCheck )
-{
- if ( nMesId == SID_STYLE_WATERCAN )
- aOkBtn.Enable( bCheck );
- if ( nMesId > SFX_STYLE_FAMILY_PSEUDO || nMesId < SFX_STYLE_FAMILY_CHAR )
- return;
-}
-
-//-------------------------------------------------------------------------
-
-void SfxTemplateCatalog_Impl::CheckItem(sal_uInt16 nMesId, sal_Bool /*bCheck*/)
-{
- if ( nMesId > SFX_STYLE_FAMILY_PSEUDO || nMesId < SFX_STYLE_FAMILY_CHAR )
- return;
- sal_uInt16 i;
- for ( i = 0; i < aFamIds.size() && aFamIds[i] != nMesId; i++ ) ;
- aFamList.SelectEntryPos(i);
-}
-
-//-------------------------------------------------------------------------
-
-sal_Bool SfxTemplateCatalog_Impl::IsCheckedItem(sal_uInt16 nMesId)
-{
- if ( nMesId > SFX_STYLE_FAMILY_PSEUDO || nMesId < SFX_STYLE_FAMILY_CHAR )
- return sal_False;
- sal_uInt16 i;
- for ( i = 0; i < aFamIds.size() && aFamIds[i] != nMesId; i++ )
- ;
- return aFamList.IsEntrySelected( rtl::OUString::valueOf(static_cast<sal_Int32>(i)) );
-}
-
-//-------------------------------------------------------------------------
-// The list has only to master the disabling, since during his life time no
-// changes in selection can be made,
-void SfxTemplateCatalog_Impl::EnableFamilyItem( sal_uInt16 nId, sal_Bool bEnable )
-{
- if ( !bEnable )
- for ( sal_uInt16 nPos = aFamIds.size(); nPos--; )
- if ( aFamIds[ nPos ] == nId )
- {
- aFamIds.erase( aFamIds.begin() + nPos );
- aFamList.RemoveEntry( nPos );
- }
-}
-
-void SfxTemplateCatalog_Impl::InsertFamilyItem( sal_uInt16 nId, const SfxStyleFamilyItem* pItem )
-{
- if ( nId > SFX_STYLE_FAMILY_PSEUDO || nId < SFX_STYLE_FAMILY_CHAR )
- return;
- aFamList.InsertEntry( pItem->GetText(), 0 );
- aFamIds.insert( aFamIds.begin(), nId );
-}
-
-void SfxTemplateCatalog_Impl::ClearFamilyList()
-{
- aFamList.Clear();
- aFamIds.clear();
-}
-
-void SfxTemplateCatalog_Impl::PrepareDeleteAction()
-{
- aDelBtn.Disable();
- aCancelBtn.SetText( SfxResId(STR_CLOSE).toString() );
-}
-
void SfxCommonTemplateDialog_Impl::SetFamily( sal_uInt16 nId )
{
diff --git a/sfx2/source/dialog/templdlg.hrc b/sfx2/source/dialog/templdlg.hrc
index 6d33c29..4918d4c 100644
--- a/sfx2/source/dialog/templdlg.hrc
+++ b/sfx2/source/dialog/templdlg.hrc
@@ -15,20 +15,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#define LB_FMT 3
-#define BTN_EDIT 11
-#define BTN_DELETE 12
#define TB_ACTION 15
-#define BTN_NEW 10
-#define LB_FILTER 4
-#define BT_OK 1
-#define BT_CANCEL 2
-#define BT_ORG 3
-#define BT_DEL 4
-#define BT_EDIT 5
-#define BT_NEW 6
-#define BT_HELP 7
#define BT_FLIST 8
#define BT_VLIST 9
-#define BT_TOOL 10
diff --git a/sfx2/source/dialog/templdlg.src b/sfx2/source/dialog/templdlg.src
index 5e8d7ac..38a3604 100644
--- a/sfx2/source/dialog/templdlg.src
+++ b/sfx2/source/dialog/templdlg.src
@@ -34,95 +34,6 @@ ImageList DLG_STYLE_DESIGNER
IdCount = { 3 ; };
};
- // RID_STYLECATALOG ------------------------------------------------------
-ModalDialog RID_STYLECATALOG
-{
- HelpId = CMD_SID_STYLE_CATALOG ;
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Size = MAP_APPFONT ( 181 , 134 ) ;
- Text [ en-US ] = "Style Catalog" ;
- Moveable = TRUE ;
- OKButton BT_OK
- {
- DefButton = TRUE ;
- Pos = MAP_APPFONT ( 123 , 6 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- };
- CancelButton BT_CANCEL
- {
- Pos = MAP_APPFONT ( 123 , 23 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- };
- PushButton BT_ORG
- {
- HelpID = "sfx2:PushButton:RID_STYLECATALOG:BT_ORG";
- Pos = MAP_APPFONT ( 123 , 97 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- Text [ en-US ] = "~Organizer..." ;
- TabStop = TRUE ;
- };
- PushButton BT_DEL
- {
- HelpID = "sfx2:PushButton:RID_STYLECATALOG:BT_DEL";
- Pos = MAP_APPFONT ( 123 , 78 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- Text [ en-US ] = "~Delete..." ;
- TabStop = TRUE ;
- };
- PushButton BT_EDIT
- {
- HelpID = "sfx2:PushButton:RID_STYLECATALOG:BT_EDIT";
- Pos = MAP_APPFONT ( 123 , 60 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- Text [ en-US ] = "~Modify..." ;
- TabStop = TRUE ;
- };
- PushButton BT_NEW
- {
- HelpID = "sfx2:PushButton:RID_STYLECATALOG:BT_NEW";
- Pos = MAP_APPFONT ( 123 , 43 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- Text [ en-US ] = "~New..." ;
- TabStop = TRUE ;
- };
- HelpButton BT_HELP
- {
- Pos = MAP_APPFONT ( 123 , 114 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- };
- ListBox BT_TOOL
- {
- HelpID = "sfx2:ListBox:RID_STYLECATALOG:BT_TOOL";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 6 , 6 ) ;
- Size = MAP_APPFONT ( 110 , 55 ) ;
- TabStop = TRUE ;
- DropDown = TRUE ;
- };
- Control BT_VLIST
- {
- HelpId = HID_TEMPLATE_FMT ;
- Border = TRUE ;
- Pos = MAP_APPFONT ( 6 , 23 ) ;
- Size = MAP_APPFONT ( 110 , 89 ) ;
- TabStop = TRUE ;
- };
- ListBox BT_FLIST
- {
- HelpID = "sfx2:ListBox:RID_STYLECATALOG:BT_FLIST";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 6 , 114 ) ;
- Size = MAP_APPFONT ( 110 , 77 ) ;
- TabStop = TRUE ;
- Hide = TRUE ;
- DropDown = TRUE ;
- };
-};
-
// Strings ---------------------------------------------------------------
String STR_STYLE_ELEMTLIST
{
diff --git a/sfx2/source/doc/doctdlg.cxx b/sfx2/source/doc/doctdlg.cxx
deleted file mode 100644
index 0c15103..0000000
--- a/sfx2/source/doc/doctdlg.cxx
+++ /dev/null
@@ -1,206 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-
-#include <vcl/msgbox.hxx>
-#include <svl/stritem.hxx>
-
-#include <sfx2/doctdlg.hxx>
-#include "docvor.hxx"
-#include "sfx2/sfxresid.hxx"
-#include "sfxtypes.hxx"
-#include <sfx2/dispatch.hxx>
-#include <sfx2/app.hxx>
-
-#include <sfx2/sfx.hrc>
-#include "doc.hrc"
-#include "doctdlg.hrc"
-#include <sfx2/basedlgs.hxx>
-
-//=========================================================================
-
-SfxDocumentTemplateDlg::SfxDocumentTemplateDlg( Window * pParent, SfxDocumentTemplates* pTempl ) :
-
- ModalDialog( pParent, SfxResId( DLG_DOC_TEMPLATE ) ),
-
- aEditFL ( this, SfxResId( FL_EDIT ) ),
- aNameEd ( this, SfxResId( ED_NAME ) ),
- aTemplateFL ( this, SfxResId( FL_STYLESHEETS ) ),
- aRegionFt ( this, SfxResId( FT_SECTION ) ),
- aRegionLb ( this, SfxResId( LB_SECTION ) ),
- aTemplateFt ( this, SfxResId( FT_STYLESHEETS ) ),
- aTemplateLb ( this, SfxResId( LB_STYLESHEETS ) ),
-
- aOkBt ( this, SfxResId( BT_OK ) ),
- aCancelBt ( this, SfxResId( BT_CANCEL ) ),
- aHelpBt ( this, SfxResId( BT_HELP ) ),
- aEditBt ( this, SfxResId( BT_EDIT ) ),
- aOrganizeBt ( this, SfxResId( BT_ORGANIZE ) ),
-
- pTemplates ( pTempl ),
- pHelper ( NULL )
-
-{
- FreeResource();
-
- pHelper = new SfxModalDefParentHelper( this );
- aOrganizeBt.SetClickHdl(LINK(this, SfxDocumentTemplateDlg, OrganizeHdl));
- aNameEd.SetModifyHdl(LINK(this, SfxDocumentTemplateDlg, NameModify));
- aOkBt.SetClickHdl(LINK(this, SfxDocumentTemplateDlg, OkHdl));
- aEditBt.SetClickHdl(LINK(this, SfxDocumentTemplateDlg, EditHdl));
- Init();
-}
-
-//-------------------------------------------------------------------------
-
-SfxDocumentTemplateDlg::~SfxDocumentTemplateDlg()
-{
- delete pHelper;
-}
-
-//-------------------------------------------------------------------------
-
-IMPL_LINK( SfxDocumentTemplateDlg, EditHdl, Button *, pBut )
-{
- (void)pBut; //unused
- if ( !aRegionLb.GetSelectEntryCount() ||
- !aTemplateLb.GetSelectEntryCount())
- return 0;
-
- const SfxStringItem aRegion( SID_TEMPLATE_REGIONNAME, aRegionLb.GetSelectEntry() );
- const SfxStringItem aName( SID_TEMPLATE_NAME, aTemplateLb.GetSelectEntry() );
- SFX_APP()->GetAppDispatcher_Impl()->Execute( SID_OPENTEMPLATE, SFX_CALLMODE_ASYNCHRON|SFX_CALLMODE_RECORD, &aRegion, &aName, 0L );
- EndDialog(RET_EDIT_STYLE);
-
- return 0;
-}
-
-//-------------------------------------------------------------------------
-
-void SfxDocumentTemplateDlg::Init()
-{
- if(!pTemplates->IsConstructed())
- pTemplates->Construct();
-
- const sal_uInt16 nCount = pTemplates->GetRegionCount();
- for(sal_uInt16 i = 0; i < nCount; ++i)
- aRegionLb.InsertEntry(pTemplates->GetFullRegionName(i));
- if(!nCount)
- aRegionLb.InsertEntry(SfxResId(STR_STANDARD).toString());
- aRegionLb.SelectEntryPos(0);
- if(nCount)
- {
- aRegionLb.SetSelectHdl(LINK(this, SfxDocumentTemplateDlg, RegionSelect));
- RegionSelect(&aRegionLb);
- aTemplateLb.SetSelectHdl(LINK(this, SfxDocumentTemplateDlg, TemplateSelect));
- aTemplateLb.SetDoubleClickHdl(LINK(this, SfxDocumentTemplateDlg, EditHdl));
- }
- else {
- Link aLink;
- aTemplateLb.SetSelectHdl(aLink);
- aTemplateLb.SetDoubleClickHdl(aLink);
- }
-}
-
-//-------------------------------------------------------------------------
-
-IMPL_LINK( SfxDocumentTemplateDlg, OrganizeHdl, Button *, pButton )
-{
- (void)pButton; //unused
- SfxTemplateOrganizeDlg *pDlg =
- new SfxTemplateOrganizeDlg(this, pTemplates);
- const short nRet = pDlg->Execute();
- delete pDlg;
- if(RET_OK == nRet)
- {
- // View aktualisieren
- aRegionLb.SetUpdateMode( sal_False );
- aRegionLb.Clear();
- Init();
- aRegionLb.SetUpdateMode( sal_True );
- aRegionLb.Invalidate();
- aRegionLb.Update();
- aCancelBt.SetText(SfxResId(STR_CLOSE).toString());
- }
- else if(RET_EDIT_STYLE == nRet)
- EndDialog(RET_CANCEL);
- return 0;
-}
-
-//-------------------------------------------------------------------------
-
-IMPL_LINK( SfxDocumentTemplateDlg, OkHdl, Control *, pControl )
-{
- (void)pControl; //unused
- // Test whether a template with this name exists
- if(LISTBOX_ENTRY_NOTFOUND != aTemplateLb.GetEntryPos(
- GetTemplateName())) {
- QueryBox aQuery(this, SfxResId(MSG_CONFIRM_OVERWRITE_TEMPLATE));
- if(RET_NO == aQuery.Execute())
- return 0;
- }
- EndDialog(RET_OK);
- return 0;
-}
-
-//-------------------------------------------------------------------------
-
-IMPL_LINK( SfxDocumentTemplateDlg, RegionSelect, ListBox *, pBox )
-{
- const sal_uInt16 nRegion = pBox->GetSelectEntryPos();
- const sal_uInt16 nCount = pTemplates->GetCount(nRegion);
- aTemplateLb.SetUpdateMode(sal_False);
- aTemplateLb.Clear();
- for(sal_uInt16 i = 0; i < nCount; ++i)
- aTemplateLb.InsertEntry(pTemplates->GetName(nRegion, i));
- aTemplateLb.SelectEntryPos(0);
- aTemplateLb.SetUpdateMode(sal_True);
- aTemplateLb.Invalidate();
- aTemplateLb.Update();
- return 0;
-}
-
-//-------------------------------------------------------------------------
-
-IMPL_LINK_INLINE_START( SfxDocumentTemplateDlg, TemplateSelect, ListBox *, pBox )
-{
- aNameEd.SetText(pBox->GetSelectEntry());
- NameModify(&aNameEd);
- return 0;
-}
-IMPL_LINK_INLINE_END( SfxDocumentTemplateDlg, TemplateSelect, ListBox *, pBox )
-
-//-------------------------------------------------------------------------
-
-IMPL_LINK( SfxDocumentTemplateDlg, NameModify, Edit *, pBox )
-{
- const String &rText=pBox->GetText();
- if(!rText.Len())
- aEditBt.Enable();
- else
- {
- aTemplateLb.SelectEntry(rText);
- aEditBt.Enable( aTemplateLb.GetSelectEntry() == rText );
- }
-
- aOkBt.Enable( rText.Len() > 0 );
- return 0;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/doc/doctdlg.hrc b/sfx2/source/doc/doctdlg.hrc
deleted file mode 100644
index 219db5b..0000000
--- a/sfx2/source/doc/doctdlg.hrc
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#define FT_SECTION 1
-#define LB_SECTION 2
-#define FT_STYLESHEETS 3
-#define LB_STYLESHEETS 4
-#define BT_ORGANIZE 20
-#define BT_HELP 21
-#define FL_EDIT 5
-#define FT_NAME 6
-#define ED_NAME 7
-#define BT_OK 10
-#define BT_EDIT 12
-#define BT_NEW 13
-#define BT_DELETE 15
-#define BT_CANCEL 16
-#define FL_STYLESHEETS 17
diff --git a/sfx2/source/doc/doctdlg.src b/sfx2/source/doc/doctdlg.src
deleted file mode 100644
index 3aaf703..0000000
--- a/sfx2/source/doc/doctdlg.src
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <sfx2/sfx.hrc>
-#include "doc.hrc"
-#include "doctdlg.hrc"
-#include <sfx2/sfxcommands.h>
-
-ModalDialog DLG_DOC_TEMPLATE
-{
- HelpId = CMD_SID_DOCTEMPLATE ;
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Size = MAP_APPFONT ( 280 , 128 ) ;
- Text [ en-US ] = "Templates" ;
- Moveable = TRUE ;
- FixedLine FL_EDIT
- {
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 212 , 8 ) ;
- Text [ en-US ] = "New template" ;
- };
- Edit ED_NAME
- {
- HelpID = "sfx2:Edit:DLG_DOC_TEMPLATE:ED_NAME";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 12 , 14 ) ;
- Size = MAP_APPFONT ( 200 , 12 ) ;
- };
- FixedLine FL_STYLESHEETS
- {
- Pos = MAP_APPFONT ( 6 , 32 ) ;
- Size = MAP_APPFONT ( 212 , 8 ) ;
- Text [ en-US ] = "Templates" ;
- };
- FixedText FT_SECTION
- {
- Pos = MAP_APPFONT ( 12 , 43 ) ;
- Size = MAP_APPFONT ( 97 , 10 ) ;
- Text [ en-US ] = "~Categories" ;
- };
- ListBox LB_SECTION
- {
- HelpID = "sfx2:ListBox:DLG_DOC_TEMPLATE:LB_SECTION";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 12 , 56 ) ;
- Size = MAP_APPFONT ( 97 , 66 ) ;
- };
- FixedText FT_STYLESHEETS
- {
- Pos = MAP_APPFONT ( 115 , 43 ) ;
- Size = MAP_APPFONT ( 97 , 10 ) ;
- Text [ en-US ] = "~Templates" ;
- };
- ListBox LB_STYLESHEETS
- {
- HelpID = "sfx2:ListBox:DLG_DOC_TEMPLATE:LB_STYLESHEETS";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 115 , 56 ) ;
- Size = MAP_APPFONT ( 97 , 66 ) ;
- };
- OKButton BT_OK
- {
- Pos = MAP_APPFONT ( 224 , 6 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- DefButton = TRUE ;
- Disable = TRUE ;
- };
- CancelButton BT_CANCEL
- {
- Pos = MAP_APPFONT ( 224 , 23 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- };
- HelpButton BT_HELP
- {
- Pos = MAP_APPFONT ( 224 , 43 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- };
- PushButton BT_EDIT
- {
- HelpID = "sfx2:PushButton:DLG_DOC_TEMPLATE:BT_EDIT";
- Pos = MAP_APPFONT ( 224 , 62 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- Text [ en-US ] = "~Edit" ;
- };
- PushButton BT_ORGANIZE
- {
- HelpID = "sfx2:PushButton:DLG_DOC_TEMPLATE:BT_ORGANIZE";
- Pos = MAP_APPFONT ( 224 , 79 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- Text [ en-US ] = "~Organizer..." ;
- };
-};
diff --git a/sfx2/source/doc/docvor.cxx b/sfx2/source/doc/docvor.cxx
deleted file mode 100644
index 4ad9a10..0000000
--- a/sfx2/source/doc/docvor.cxx
+++ /dev/null
@@ -1,2380 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <com/sun/star/embed/XStorage.hpp>
-#include <com/sun/star/embed/ElementModes.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
-
-#include <stdio.h>
-
-#include <svtools/prnsetup.hxx>
-#include <vcl/cmdevt.hxx>
-#include <vcl/menubtn.hxx>
-#include <vcl/msgbox.hxx>
-#include <vcl/print.hxx>
-#include <svl/style.hxx>
-#include <svl/stritem.hxx>
-#include <svl/eitem.hxx>
-#include <svtools/sfxecode.hxx>
-#include <svtools/ehdl.hxx>
-#include <svtools/imagemgr.hxx>
-#include <vcl/waitobj.hxx>
-#include <tools/urlobj.hxx>
-#include <tools/color.hxx>
-#include <unotools/pathoptions.hxx>
-#include <unotools/moduleoptions.hxx>
-#include <sot/exchange.hxx>
-#include <comphelper/storagehelper.hxx>
-
-#include "helpid.hrc"
-#include "docvor.hxx"
-#include <sfx2/docfac.hxx>
-#include "orgmgr.hxx"
-#include <sfx2/doctempl.hxx>
-#include <sfx2/templdlg.hxx>
-#include "sfxtypes.hxx"
-#include <sfx2/app.hxx>
-#include <sfx2/dispatch.hxx>
-#include "sfx2/sfxresid.hxx"
-#include "doc.hrc"
-#include <sfx2/sfx.hrc>
-#include "docvor.hrc"
-#include <sfx2/docfilt.hxx>
-#include <sfx2/filedlghelper.hxx>
-#include <sfx2/fcontnr.hxx>
-#include <svtools/localresaccess.hxx>
-#include <svtools/addresstemplate.hxx>
-#include "svtools/treelistentry.hxx"
-#include <comphelper/processfactory.hxx>
-
-sal_Bool SfxOrganizeListBox_Impl::bDropMoveOk = sal_True;
-
-using namespace ::com::sun::star;
-
-//=========================================================================
-
-class SuspendAccel
-{
-public:
- Accelerator* pAccel;
-
- SuspendAccel( Accelerator* pA )
- {
- pAccel=pA;
- GetpApp()->RemoveAccel( pAccel );
- }
- ~SuspendAccel()
- {
- GetpApp()->InsertAccel( pAccel );
- }
-};
-
-//=========================================================================
-
-
-inline void SfxOrganizeListBox_Impl::SetBitmaps(
- const Image &rOFolder, const Image &rCFolder, const Image &rODoc, const Image &rCDoc )
-{
- aOpenedFolderBmp = rOFolder;
- aClosedFolderBmp = rCFolder;
- aOpenedDocBmp = rODoc;
- aClosedDocBmp = rCDoc;
-
-}
-
-//=========================================================================
-
-#define NO_DROP_ACTION ((sal_Int8)-1)
-
-class SfxOrganizeDlg_Impl
-{
-friend class SfxTemplateOrganizeDlg;
-friend class SfxOrganizeListBox_Impl;
-
- SuspendAccel* pSuspend;
- SfxTemplateOrganizeDlg* pDialog;
-
- SfxOrganizeListBox_Impl* pFocusBox;
- Printer* pPrt;
-
- // save pointer for asynchronous D&D
- SvTreeListBox* pSourceView;
- SvTreeListEntry* pTargetEntry;
- SfxOrganizeListBox_Impl* pFinishedBox;
- sal_Int8 nDropAction;
- bool bExecDropFinished;
-
- // save some variables for the asynchronous file dialog
- sal_uInt16 m_nRegion;
- sal_uInt16 m_nIndex;
- String m_sExtension4Save;
-
- SfxOrganizeListBox_Impl aLeftLb;
- ListBox aLeftTypLb;
-
- SfxOrganizeListBox_Impl aRightLb;
- ListBox aRightTypLb;
-
- OKButton aOkBtn;
- MenuButton aEditBtn;
- HelpButton aHelpBtn;
- PushButton aAddressTemplateBtn;
- PushButton aFilesBtn;
-
- Accelerator aEditAcc;
-
- String aLastDir;
- SfxOrganizeMgr aMgr;
- sfx2::FileDialogHelper* pFileDlg;
-
- std::vector<rtl::OUString> GetAllFactoryURLs_Impl() const;
- sal_Bool GetServiceName_Impl( String& rFactoryURL, String& rFileURL ) const;
- long Dispatch_Impl( sal_uInt16 nId, Menu* _pMenu );
- String GetPath_Impl( sal_Bool bOpen, const String& rFileName );
- ::com::sun::star::uno::Sequence< ::rtl::OUString >
- GetPaths_Impl( const String& rFileName );
- void InitBitmaps( void );
-
- DECL_LINK( GetFocus_Impl, SfxOrganizeListBox_Impl * );
- DECL_LINK( LeftListBoxSelect_Impl, ListBox * );
- DECL_LINK( RightListBoxSelect_Impl, ListBox * );
- DECL_LINK( AccelSelect_Impl, Accelerator * );
- DECL_LINK( MenuSelect_Impl, Menu * );
- DECL_LINK( MenuActivate_Impl, Menu * );
- DECL_LINK( AddFiles_Impl, Button * );
- DECL_LINK( OnAddressTemplateClicked, Button * );
-
- DECL_LINK(ImportHdl, void *);
- DECL_LINK(ExportHdl, void *);
- DECL_LINK(AddFilesHdl, void *);
-
- sal_Bool DontDelete_Impl( SvTreeListEntry* pEntry );
-
-public:
- SfxOrganizeDlg_Impl( SfxTemplateOrganizeDlg* pParent, SfxDocumentTemplates* pTempl );
- ~SfxOrganizeDlg_Impl();
-};
-
-//-------------------------------------------------------------------------
-
-SfxOrganizeDlg_Impl::SfxOrganizeDlg_Impl( SfxTemplateOrganizeDlg* pParent,
- SfxDocumentTemplates* pTempl ) :
-
- pSuspend ( NULL ),
- pDialog ( pParent ),
- pFocusBox ( NULL ),
- pPrt ( NULL ),
- pSourceView ( NULL ),
- pTargetEntry ( NULL ),
- pFinishedBox ( NULL ),
- nDropAction ( NO_DROP_ACTION ),
- bExecDropFinished ( true ),
-
- aLeftLb ( this, pParent, WB_BORDER | WB_TABSTOP | WB_HSCROLL, SfxOrganizeListBox_Impl::VIEW_TEMPLATES ),
- aLeftTypLb ( pParent, SfxResId( LB_LEFT_TYP ) ),
-
- aRightLb ( this, pParent, WB_BORDER | WB_TABSTOP | WB_HSCROLL, SfxOrganizeListBox_Impl::VIEW_FILES ),
- aRightTypLb ( pParent, SfxResId( LB_RIGHT_TYP ) ),
-
- aOkBtn ( pParent, SfxResId( BTN_OK ) ),
- aEditBtn ( pParent, SfxResId( BTN_EDIT ) ),
- aHelpBtn ( pParent, SfxResId( BTN_HELP ) ),
- aAddressTemplateBtn ( pParent, SfxResId( BTN_ADDRESSTEMPLATE ) ),
- aFilesBtn ( pParent, SfxResId( BTN_FILES ) ),
-
- aEditAcc ( SfxResId( ACC_EDIT ) ),
- aMgr ( &aLeftLb, &aRightLb, pTempl ),
- pFileDlg ( NULL )
-
-{
- // update the SfxDocumentTemplates the manager works with
- if ( aMgr.GetTemplates() ) // should never fail, but who knows ....
- {
- // for this, show a wait cursor (it may take a while)
- Window* pWaitObjectRange = pDialog ? pDialog->GetParent() : NULL;
- if ( !pWaitObjectRange )
- pWaitObjectRange = pDialog;
-
- WaitObject aWaitCursor( pWaitObjectRange );
- const_cast< SfxDocumentTemplates* >( aMgr.GetTemplates() )->Update( sal_True /* be smart */ );
- // this const_cast is a hack - but the alternative would be to
- // * have a method which returns the templates non-const
- // * use a new SfxDocumentTemplates instance for the update
- // (knowing that they all share the same implementation class)
- // * always work with an own instance, even if we get only NULL in this ctor
- }
-
- aLeftLb.SetHelpId( HID_CTL_ORGANIZER_LEFT );
- aRightLb.SetHelpId( HID_CTL_ORGANIZER_RIGHT );
-
- String aWorkPath = SvtPathOptions().GetWorkPath();
- if ( aWorkPath.Len() )
- {
- INetURLObject aObj( aWorkPath );
- DBG_ASSERT( aObj.GetProtocol() != INET_PROT_NOT_VALID, "Illegal URL !" );
- aObj.setFinalSlash();
- aLastDir = aObj.GetMainURL( INetURLObject::DECODE_TO_IURI );
- }
- else
- {
- // fallback
- String aProgURL = SvtPathOptions().SubstituteVariable( rtl::OUString("$(PROGURL)") );
- INetURLObject aObj( aProgURL );
- DBG_ASSERT( aObj.GetProtocol() != INET_PROT_NOT_VALID, "Illegal URL !" );
- aLastDir = aObj.GetMainURL( INetURLObject::DECODE_TO_IURI );
- }
-
- InitBitmaps();
-
- aEditBtn.GetPopupMenu()->SetSelectHdl( LINK( this, SfxOrganizeDlg_Impl, MenuSelect_Impl ) );
- aEditBtn.GetPopupMenu()->SetActivateHdl( LINK( this, SfxOrganizeDlg_Impl, MenuActivate_Impl ) );
- aEditAcc.SetSelectHdl( LINK( this, SfxOrganizeDlg_Impl, AccelSelect_Impl ) );
- GetpApp()->InsertAccel( &aEditAcc );
-
- aFilesBtn.SetClickHdl(
- LINK(this,SfxOrganizeDlg_Impl, AddFiles_Impl));
- aAddressTemplateBtn.SetClickHdl(
- LINK(this,SfxOrganizeDlg_Impl, OnAddressTemplateClicked));
- aLeftTypLb.SetSelectHdl(
- LINK(this, SfxOrganizeDlg_Impl, LeftListBoxSelect_Impl));
- aRightTypLb.SetSelectHdl(
- LINK(this, SfxOrganizeDlg_Impl, RightListBoxSelect_Impl));
- aLeftLb.SetGetFocusHdl(
- LINK(this, SfxOrganizeDlg_Impl, GetFocus_Impl));
- aRightLb.SetGetFocusHdl(
- LINK(this, SfxOrganizeDlg_Impl, GetFocus_Impl));
- aLeftLb.SetPosSizePixel(pParent->LogicToPixel(Point(3, 6), MAP_APPFONT),
- pParent->LogicToPixel(Size(94, 132), MAP_APPFONT));
- aRightLb.SetPosSizePixel(pParent->LogicToPixel(Point(103, 6), MAP_APPFONT),
- pParent->LogicToPixel(Size(94, 132), MAP_APPFONT));
-
- if ( !SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::E_SDATABASE) )
- aAddressTemplateBtn.Hide();
- Font aFont(aLeftLb.GetFont());
- aFont.SetWeight(WEIGHT_NORMAL);
- aLeftLb.SetFont(aFont);
- aRightLb.SetFont(aFont);
- const long nIndent = aLeftLb.GetIndent() / 2;
- aLeftLb.SetIndent( (short)nIndent );
- aRightLb.SetIndent( (short)nIndent );
-
- aLeftLb.SetMgr(&aMgr);
- aRightLb.SetMgr(&aMgr);
- aLeftLb.Reset();
- aRightLb.Reset();//SetModel(aLeftLb.GetModel());
-
- aLeftLb.Show();
- aRightLb.Show();
-
- aLeftLb.SelectAll( sal_False );
- aRightLb.SelectAll( sal_False );
- aRightLb.GrabFocus();
-}
-
-//-------------------------------------------------------------------------
-
-SfxOrganizeDlg_Impl::~SfxOrganizeDlg_Impl()
-{
- delete pFileDlg;
-}
-
-//-------------------------------------------------------------------------
-
-void SfxOrganizeDlg_Impl::InitBitmaps( void )
-{
- Image aOpenedFolderBmp( SfxResId( IMG_OPENED_FOLDER ) );
- Image aClosedFolderBmp( SfxResId( IMG_CLOSED_FOLDER ) );
- Image aOpenedDocBmp( SfxResId( IMG_OPENED_DOC ) );
- Image aClosedDocBmp( SfxResId( IMG_CLOSED_DOC ) );
-
- aLeftLb.SetBitmaps( aOpenedFolderBmp, aClosedFolderBmp, aOpenedDocBmp, aClosedDocBmp );
- aRightLb.SetBitmaps( aOpenedFolderBmp, aClosedFolderBmp, aOpenedDocBmp, aClosedDocBmp );
-}
-
-//=========================================================================
-
-sal_Bool QueryDelete_Impl(Window *pParent, // Parent to QueryBox
- sal_uInt16 nId, // Resource Id
- const String &rTemplateName) // Name of template to be deleted
-/* [Description]
-
- Delete Query
-
-*/
-{
- SfxResId aResId( nId );
- String aEntryText( aResId.toString() );
- aEntryText.SearchAndReplaceAscii( "$1", rTemplateName );
- QueryBox aBox( pParent, WB_YES_NO | WB_DEF_NO, aEntryText );
- return RET_NO != aBox.Execute();
-}
-
-//-------------------------------------------------------------------------
-
-void ErrorDelete_Impl(Window *pParent, const String &rName, sal_Bool bFolder = sal_False )
-
-/* [Description]
-
- User information that the template rName could not be deleted.
-*/
-{
- if ( bFolder )
- {
- rtl::OUString aText(SfxResId(STR_ERROR_DELETE_TEMPLATE_DIR).toString());
- ErrorBox( pParent, WB_OK, aText ).Execute();
- }
- else
- {
- String aText( SfxResId(STR_ERROR_DELETE_TEMPLATE).toString() );
- aText.SearchAndReplaceAscii( "$1", rName );
- ErrorBox( pParent, WB_OK, aText ).Execute();
- }
-}
-
-
-//=========================================================================
-
-/* [Description]
-
- Implementation class, the benchmark for sal_uInt16-Array
-*/
-
-struct ImpPath_Impl
-{
- std::vector<sal_uInt16> aUS;
- sal_uInt16 nRef;
-
- ImpPath_Impl();
- ImpPath_Impl( const ImpPath_Impl& rCopy );
-};
-
-//-------------------------------------------------------------------------
-
-ImpPath_Impl::ImpPath_Impl() : nRef(1)
-{
-}
-
-//-------------------------------------------------------------------------
-
-ImpPath_Impl::ImpPath_Impl( const ImpPath_Impl& rCopy ) :
-
- aUS(rCopy.aUS), nRef( 1 )
-
-{
-}
-
-//==========================================================================
-
-/* [Description]
-
- Implementation class, presentation of a position in the Outline-
- Listbox ass sal_uInt16-Array, this describes the position of each as
- Postions relative to the parent entry
-*/
-class Path
-{
- ImpPath_Impl *pData;
-public:
- Path(SvTreeListBox *pBox, SvTreeListEntry *pEntry);
- Path(const Path &rPath):
- pData(rPath.pData)
- {
- ++pData->nRef;
- }
- const Path &operator=(const Path &rPath)
- {
- if(&rPath != this)
- {
- if(!--pData->nRef)
- delete pData;
- pData = rPath.pData;
- pData->nRef++;
- }
- return *this;
- }
- ~Path()
- {
- if(!--pData->nRef)
- delete pData;
- }
- sal_uInt16 Count() const { return pData->aUS.size(); }
- sal_uInt16 operator[]( sal_uInt16 i ) const
- {
- return i < Count()? pData->aUS[i]: INDEX_IGNORE;
- }
-};
-
-//-------------------------------------------------------------------------
-
-Path::Path(SvTreeListBox *pBox, SvTreeListEntry *pEntry) :
- pData(new ImpPath_Impl)
-{
- DBG_ASSERT(pEntry != 0, "EntryPtr ist NULL");
- if(!pEntry)
- return;
- SvTreeListEntry *pParent = pBox->GetParent(pEntry);
- do {
- pData->aUS.insert(pData->aUS.begin(),
- (sal_uInt16)pBox->GetModel()->GetRelPos(pEntry));
- if(0 == pParent)
- break;
- pEntry = pParent;
- pParent = pBox->GetParent(pEntry);
- } while(1);
-}
-
-//-------------------------------------------------------------------------
-
-SvTreeListEntry *GetIndices_Impl(SvTreeListBox *pBox,
- SvTreeListEntry *pEntry,
- sal_uInt16 &rRegion,
- sal_uInt16 &rOffset)
-/* [Description]
-
- Region and position within a range for a template is determined.
-
- [Parameter]
-
- SvTreeListBox *pBox Listbox where the event occurred
- SvTreeListEntry *pEntry Entry whose position is to be determined
- sal_uInt16 &rRegion the region within the region of the
- document template (Out-Parameter)
- sal_uInt16 &rOffset the position within the region of the
- document template (Out-Parameter)
-
-
- [Cross-references]
-
- <class Path> (in certain circumstances this function can also be
- dispensed in favor of the Path)
-*/
-
-{
- if(!pEntry)
- {
- rRegion = rOffset = 0;
- return pEntry;
- }
- if(0 == pBox->GetModel()->GetDepth(pEntry))
- {
- rRegion = (sal_uInt16)pBox->GetModel()->GetRelPos(pEntry);
- rOffset = USHRT_MAX;
- return pEntry;
- }
- SvTreeListEntry *pParent = pBox->GetParent(pEntry);
- rRegion = (sal_uInt16)pBox->GetModel()->GetRelPos(pParent);
- rOffset = (sal_uInt16)pBox->GetModel()->GetRelPos(pEntry);
- return pEntry;
-}
-
-//-------------------------------------------------------------------------
-
-sal_Bool SfxOrganizeListBox_Impl::Select( SvTreeListEntry* pEntry, sal_Bool bSelect )
-{
- if(!bSelect)
- return SvTreeListBox::Select(pEntry,bSelect);
- sal_uInt16 nLevel = GetDocLevel();
- if(GetModel()->GetDepth(pEntry)+nLevel<3)
- return SvTreeListBox::Select(pEntry,bSelect);
-
- Path aPath(this, pEntry);
-
- // it is ok to use the SfxObjectShellRef here since the object that
- // provides it ( GetObjectShell() calls CreateObjectShell() ) has a lock on it
- GetObjectShell(aPath)->TriggerHelpPI(
- aPath[nLevel+1], aPath[nLevel+2]);
- return SvTreeListBox::Select(pEntry,bSelect);
-}
-
-//-------------------------------------------------------------------------
-
-sal_Bool SfxOrganizeListBox_Impl::MoveOrCopyTemplates(SvTreeListBox *pSourceBox,
- SvTreeListEntry *pSource,
- SvTreeListEntry* pTarget,
- SvTreeListEntry *&pNewParent,
- sal_uIntPtr &rIdx,
- sal_Bool bCopy)
-/* [Description]
-
- Move or copy a document templates
-
- [Parameter]
-
- SvTreeListBox *pSourceBox Source Listbox, at which the event occurred
- SvTreeListEntry* pTarget Target entry, to where it will be moved
- SvTreeListEntry *pSource Source entry, to be copied / moved
- SvTreeListEntry *&pNewParent the parent of the target position generated
- at entry (out parameter)
- sal_uIntPtr &rIdx Index of the target entry
- sal_Bool bCopy Flag for Copy / Move
-
-
- [Return value] sal_Bool: Success or failure
-
- [Cross-references]
-
- <SfxOrganizeListBox_Impl::MoveOrCopyContents(SvTreeListBox *pSourceBox,
- SvTreeListEntry *pSource,
- SvTreeListEntry* pTarget,
- SvTreeListEntry *&pNewParent,
- sal_uIntPtr &rIdx,
- sal_Bool bCopy)>
- <sal_Bool SfxOrganizeListBox_Impl::NotifyMoving(SvTreeListEntry *pTarget,
- SvTreeListEntry* pSource,
- SvTreeListEntry *&pNewParent,
- sal_uIntPtr &rIdx)>
- <sal_Bool SfxOrganizeListBox_Impl::NotifyCopying(SvTreeListEntry *pTarget,
- SvTreeListEntry* pSource,
- SvTreeListEntry *&pNewParent,
- sal_uIntPtr &rIdx)>
-*/
-
-{
- sal_Bool bOk = sal_False;
-
- if(pSource)
- {
- sal_uInt16 nTargetRegion = 0, nTargetIndex = 0;
- GetIndices_Impl(this, pTarget, nTargetRegion, nTargetIndex);
-
- sal_uInt16 nSourceRegion = 0, nSourceIndex = 0;
- GetIndices_Impl(pSourceBox, pSource, nSourceRegion, nSourceIndex);
-
- bOk = bCopy ?
- pMgr->Copy(nTargetRegion, nTargetIndex+1,
- nSourceRegion, nSourceIndex):
- pMgr->Move(nTargetRegion, nTargetIndex+1,
- nSourceRegion, nSourceIndex);
-
- if(bOk)
- {
- if(pSourceBox->GetModel()->GetDepth(pSource) == GetModel()->GetDepth(pTarget))
- {
- pNewParent = GetParent(pTarget);
- rIdx = GetModel()->GetRelPos(pTarget)+1;
- }
- else
- {
- if(nTargetIndex == USHRT_MAX)
- {
- pNewParent = pTarget;
- rIdx = 0;
- }
- else
- SvTreeListBox::NotifyCopying(
- pTarget, pSource, pNewParent, rIdx);
- }
- }
- else if ( bCopy )
- {
- // the template organizer always tries copy after the move, so no error is required for move case
- String aText( SfxResId( bCopy ? STR_ERROR_COPY_TEMPLATE : STR_ERROR_MOVE_TEMPLATE ).toString() );
- aText.SearchAndReplaceAscii( "$1",
- ( (SvTreeListBox *)pSourceBox )->GetEntryText( pSource ) );
- ErrorBox( this, WB_OK, aText ).Execute();
- }
- }
- return bOk;
-}
-
-//-------------------------------------------------------------------------
-
-sal_Bool SfxOrganizeListBox_Impl::MoveOrCopyContents(SvTreeListBox *pSourceBox,
- SvTreeListEntry *pSource,
- SvTreeListEntry* pTarget,
- SvTreeListEntry *&pNewParent,
- sal_uIntPtr &rIdx,
- sal_Bool bCopy)
-/* [Description]
-
- Move or copy document contents
-
- [Parameter]
-
- SvTreeListBox *pSourceBox Source Listbox, at which the event occurred
- SvTreeListEntry* pTarget Target entry, to where it will be moved
- SvTreeListEntry *pSource Source entry, to be copied / moved
- SvTreeListEntry *&pNewParent the parent of the target position generated
- at entry (out parameter)
- sal_uIntPtr &rIdx Index of the target entry
- sal_Bool bCopy Flag for Copy / Move
-
-
- [Return value] sal_Bool: Success or failure
-
- [Cross-references]
-
- <SfxOrganizeListBox_Impl::MoveOrCopyTemplates(SvTreeListBox *pSourceBox,
- SvTreeListEntry *pSource,
- SvTreeListEntry* pTarget,
- SvTreeListEntry *&pNewParent,
- sal_uIntPtr &rIdx,
- sal_Bool bCopy)>
- <sal_Bool SfxOrganizeListBox_Impl::NotifyMoving(SvTreeListEntry *pTarget,
- SvTreeListEntry* pSource,
- SvTreeListEntry *&pNewParent,
- sal_uIntPtr &rIdx)>
- <sal_Bool SfxOrganizeListBox_Impl::NotifyCopying(SvTreeListEntry *pTarget,
- SvTreeListEntry* pSource,
- SvTreeListEntry *&pNewParent,
- sal_uIntPtr &rIdx)>
-*/
-
-{
- SfxErrorContext aEc( ERRCTX_SFX_MOVEORCOPYCONTENTS, this);
- sal_Bool bOk = sal_False, bKeepExpansion = sal_False;
- sal_Bool bRemovedFromSource = sal_False;
- Path aSource(pSourceBox, pSource);
- Path aTarget(this, pTarget);
-
- // it is ok to use the SfxObjectShellRef here since the object that
- // provides it ( GetObjectShell() calls CreateObjectShell() ) has a lock on it
- SfxObjectShellRef aSourceDoc = ((SfxOrganizeListBox_Impl *)pSourceBox)->GetObjectShell(aSource);
- SfxObjectShellRef aTargetDoc = GetObjectShell(aTarget);
-
- const sal_uInt16 nSLevel =
- ((SfxOrganizeListBox_Impl *)pSourceBox)->GetDocLevel();
- const sal_uInt16 nTLevel = GetDocLevel();
-
- if(aSourceDoc.Is() && aTargetDoc.Is())
- {
- if (aSourceDoc->GetStyleSheetPool())
- aSourceDoc->GetStyleSheetPool()->SetSearchMask(
- SFX_STYLE_FAMILY_ALL, SFXSTYLEBIT_USERDEF | SFXSTYLEBIT_USED);
-
- if (aTargetDoc->GetStyleSheetPool())
- aTargetDoc->GetStyleSheetPool()->SetSearchMask(
- SFX_STYLE_FAMILY_ALL, SFXSTYLEBIT_USERDEF | SFXSTYLEBIT_USED);
- sal_uInt16 p[3];
- sal_uInt16 nIdxDeleted = INDEX_IGNORE;
- p[0]=aTarget[nTLevel+1];
- p[1]=aTarget[nTLevel+2];
- if(p[1]!=INDEX_IGNORE)p[1]++;
- p[2]=aTarget[nTLevel+3];
-
- bOk = aTargetDoc->Insert(
- *aSourceDoc, aSource[nSLevel+1],
- aSource[nSLevel+2], aSource[nSLevel+3],
- p[0], p[1], p[2], nIdxDeleted);
- // Evaluate Position correction
- // a = Document content
- // b = Position Sub-content 1
- // c = Position Sub-content 2
- // Delete duplicate entries
- if(bOk)
- {
- SvTreeListEntry *pParentIter = pTarget;
- // Up to the document level as
- // the general reference point
- while(GetModel()->GetDepth(pParentIter) != nTLevel)
- pParentIter = GetParent(pParentIter);
- if(pParentIter->HasChildrenOnDemand() &&
- !GetModel()->HasChildren(pParentIter))
- RequestingChildren(pParentIter);
- SvTreeListEntry *pChildIter = 0;
-
- sal_uInt16 i = 0;
- while(i < 2 && p[i+1] != INDEX_IGNORE)
- {
- pChildIter = FirstChild(pParentIter);
- // To the index of the current level
- for(sal_uInt16 j = 0; j < p[i]; ++j)
- pChildIter = NextSibling(pChildIter);
- // If possible, fill in Items onDemand
- ++i;
- if(i < 2 && p[i+1] != INDEX_IGNORE &&
- pChildIter->HasChildrenOnDemand() &&
- !GetModel()->HasChildren(pChildIter))
- RequestingChildren(pChildIter);
- pParentIter = pChildIter;
- }
- rIdx = p[i];
- pNewParent = pParentIter;
- if(!IsExpanded(pNewParent) &&
- pNewParent->HasChildrenOnDemand() &&
- !GetModel()->HasChildren(pNewParent))
- {
- bOk = sal_False;
- if(!bCopy)
- pSourceBox->GetModel()->Remove(pSource);
- }
- // Remove deleted items
- // (can be done by overwriting)
- if(nIdxDeleted != INDEX_IGNORE)
- {
- pChildIter = FirstChild(pParentIter);
- for(sal_uInt16 j = 0; j < nIdxDeleted; ++j)
- pChildIter = NextSibling(pChildIter);
- if( pChildIter && pChildIter != pSource )
- {
- bKeepExpansion = IsExpanded(pParentIter);
- GetModel()->Remove(pChildIter);
- }
- else
- bOk = sal_False;
- }
- if(!bCopy && &aSourceDoc != &aTargetDoc)
- {
- //pool styles that are moved produce
- //an rIdx == INDEX_IGNORE
- //the method has to return true to keep the box content consistent
- bRemovedFromSource = aSourceDoc->Remove(aSource[nSLevel+1],
- aSource[nSLevel+2],
- aSource[nSLevel+3]);
- }
- }
- }
- return (((rIdx != INDEX_IGNORE)|| bRemovedFromSource) && bOk )
- ? bKeepExpansion? (sal_Bool)2: sal_True: sal_False;
-}
-
-//-------------------------------------------------------------------------
-
-sal_Bool SfxOrganizeListBox_Impl::NotifyMoving(SvTreeListEntry *pTarget,
- SvTreeListEntry* pSource,
- SvTreeListEntry *&pNewParent,
- sal_uIntPtr &rIdx)
-
-/* [Description]
-
- Notification that an item will be moved.
- (SV-Handler)
-
- [Parameter]
-
- SvTreeListEntry* pTarget Target entry, to where it will be moved
- SvTreeListEntry *pSource Source entry, to be moved
- SvTreeListEntry *&pNewParent the parent of the target position generated
- at entry (out parameter)
- sal_uIntPtr &rIdx Index of the target entry
-
-
- [Return value] sal_Bool: Sucess or failure
-
- [Cross-references]
-
- <SfxOrganizeListBox_Impl::MoveOrCopyTemplates(SvTreeListBox *pSourceBox,
- SvTreeListEntry *pSource,
- SvTreeListEntry* pTarget,
- SvTreeListEntry *&pNewParent,
- sal_uIntPtr &rIdx,
- sal_Bool bCopy)>
- <SfxOrganizeListBox_Impl::MoveOrCopyContents(SvTreeListBox *pSourceBox,
- SvTreeListEntry *pSource,
- SvTreeListEntry* pTarget,
- SvTreeListEntry *&pNewParent,
- sal_uIntPtr &rIdx,
- sal_Bool bCopy)>
- <sal_Bool SfxOrganizeListBox_Impl::NotifyCopying(SvTreeListEntry *pTarget,
- SvTreeListEntry* pSource,
- SvTreeListEntry *&pNewParent,
- sal_uIntPtr &rIdx)>
-*/
-
-{
- sal_Bool bOk = sal_False;
- SvTreeListBox* pSourceBox = GetSourceView();
- if ( !pSourceBox )
- pSourceBox = pDlg->pSourceView;
- DBG_ASSERT( pSourceBox, "no source view" );
- if ( !pTarget )
- pTarget = pDlg->pTargetEntry;
-
- if ( pSourceBox->GetModel()->GetDepth( pSource ) <= GetDocLevel() &&
- GetModel()->GetDepth( pTarget ) <= GetDocLevel() )
- bOk = MoveOrCopyTemplates( pSourceBox, pSource, pTarget, pNewParent, rIdx, sal_False );
- else
- bOk = MoveOrCopyContents(pSourceBox, pSource, pTarget, pNewParent, rIdx, sal_False );
-
- return bOk;
-}
-
-//-------------------------------------------------------------------------
-
-sal_Bool SfxOrganizeListBox_Impl::NotifyCopying(SvTreeListEntry *pTarget,
- SvTreeListEntry* pSource,
- SvTreeListEntry *&pNewParent,
- sal_uIntPtr &rIdx)
-/* [Description]
-
- Notification that an item will be moved.
- (SV-Handler)
-
- [Parameter]
-
- SvTreeListEntry* pTarget Target entry, to where it will be copied
- SvTreeListEntry *pSource Source entry, to be copied
- SvTreeListEntry *&pNewParent the parent of the target position generated
- at entry (out parameter)
- sal_uIntPtr &rIdx Index of the target entry
-
- [Return value] sal_Bool: Sucess or failure
-
- [Cross-references]
-
- <SfxOrganizeListBox_Impl::MoveOrCopyTemplates(SvTreeListBox *pSourceBox,
- SvTreeListEntry *pSource,
- SvTreeListEntry* pTarget,
- SvTreeListEntry *&pNewParent,
- sal_uIntPtr &rIdx,
- sal_Bool bCopy)>
- <SfxOrganizeListBox_Impl::MoveOrCopyContents(SvTreeListBox *pSourceBox,
- SvTreeListEntry *pSource,
- SvTreeListEntry* pTarget,
- SvTreeListEntry *&pNewParent,
- sal_uIntPtr &rIdx,
- sal_Bool bCopy)>
- <sal_Bool SfxOrganizeListBox_Impl::NotifyMoving(SvTreeListEntry *pTarget,
- SvTreeListEntry* pSource,
- SvTreeListEntry *&pNewParent,
- sal_uIntPtr &rIdx)>
-*/
-{
- sal_Bool bOk = sal_False;
- SvTreeListBox* pSourceBox = GetSourceView();
- if ( !pSourceBox )
- pSourceBox = pDlg->pSourceView;
- DBG_ASSERT( pSourceBox, "no source view" );
- if ( !pTarget )
- pTarget = pDlg->pTargetEntry;
- if ( pSourceBox->GetModel()->GetDepth( pSource ) <= GetDocLevel() &&
- GetModel()->GetDepth( pTarget ) <= GetDocLevel() )
- bOk = MoveOrCopyTemplates( pSourceBox, pSource, pTarget, pNewParent, rIdx, sal_True );
- else
- bOk = MoveOrCopyContents( pSourceBox, pSource, pTarget, pNewParent, rIdx, sal_True );
-
- return bOk;
-}
-
-//-------------------------------------------------------------------------
-
-sal_Bool SfxOrganizeListBox_Impl::EditingEntry( SvTreeListEntry* pEntry, Selection& )
-
-/* [Description]
-
- Check whether an item can be edited
- (SV-Handler)
-
- [Cross-references]
- <SfxOrganizeListBox_Impl::EditedEntry(SvTreeListEntry* pEntry, const rtl::OUString& rText)>
-*/
-
-{
- if( VIEW_TEMPLATES == eViewType &&
- GetModel()->GetDepth(pEntry) < 2 )
- {
- pDlg->pSuspend = new SuspendAccel( &pDlg->aEditAcc );
- return sal_True;
- }
- return sal_False;
-}
-
-//-------------------------------------------------------------------------
-
-sal_Bool SfxOrganizeListBox_Impl::EditedEntry(SvTreeListEntry* pEntry, const rtl::OUString& rText)
-
-/* [Description]
-
- The name of an entry has been processed, if the name you entered is a
- valid name (length> 0) then the model is updated.
- (SV-Handler)
-
- [Return value]
-
- sal_Bool sal_True: The name in the display should be changed
- sal_False: The name should not be changed
-
- [Cross-references]
- <SfxOrganizeListBox_Impl::EditingEntry(SvTreeListEntry* pEntry, const String& rText)>
-*/
-
-{
- DBG_ASSERT(pEntry, "No Entry selected");
- delete pDlg->pSuspend;
- pDlg->pSuspend = NULL;
- SvTreeListEntry* pParent = GetParent(pEntry);
- if( rText.isEmpty() )
- {
- ErrorBox aBox( this, SfxResId( MSG_ERROR_EMPTY_NAME ) );
- aBox.GrabFocus();
- aBox.Execute();
- return sal_False;
- }
- if ( !IsUniqName_Impl( rText, pParent, pEntry ) )
- {
- ErrorBox aBox( this, SfxResId( MSG_ERROR_UNIQ_NAME ) );
- aBox.GrabFocus();
- aBox.Execute();
- return sal_False;
- }
- sal_uInt16 nRegion = 0, nIndex = 0;
- GetIndices_Impl( this, pEntry, nRegion, nIndex );
- String aOldName;
- if ( USHRT_MAX != nIndex )
- aOldName = pMgr->GetTemplates()->GetName( nRegion, nIndex );
- else
- aOldName = pMgr->GetTemplates()->GetRegionName( nRegion );
-
- if ( !pMgr->SetName( rText, nRegion, nIndex ) )
- {
- SfxResId aResId( USHRT_MAX != nIndex ? MSG_ERROR_RENAME_TEMPLATE
- : MSG_ERROR_RENAME_TEMPLATE_REGION );
- ErrorBox( this, aResId ).Execute();
- return sal_False;
- }
-
- return sal_True;
-}
-
-//-------------------------------------------------------------------------
-
-DragDropMode SfxOrganizeListBox_Impl::NotifyStartDrag( TransferDataContainer&, SvTreeListEntry* pEntry )
-{
- sal_uInt16 nSourceLevel = GetModel()->GetDepth( pEntry );
- if ( VIEW_FILES == GetViewType() )
- ++nSourceLevel;
- if ( nSourceLevel >= 2 )
- bDropMoveOk = sal_False;
- else
- bDropMoveOk = sal_True;
-
- return GetDragDropMode();
-}
-
-//-------------------------------------------------------------------------
-
-sal_Bool SfxOrganizeListBox_Impl::NotifyAcceptDrop( SvTreeListEntry* pEntry )
-{
- if(!pEntry)
- return sal_False;
- SvTreeListBox *pSource = GetSourceView();
- SvTreeListEntry *pSourceEntry = pSource->FirstSelected();
- if(pEntry == pSourceEntry)
- return sal_False;
- sal_uInt16 nSourceLevel = pSource->GetModel()->GetDepth(pSourceEntry);
- if(VIEW_FILES == ((SfxOrganizeListBox_Impl *)pSource)->GetViewType())
- ++nSourceLevel;
- sal_uInt16 nTargetLevel = GetModel()->GetDepth(pEntry);
- if(VIEW_FILES == GetViewType())
- ++nTargetLevel;
- Path aSource(pSource, pSourceEntry);
- Path aTarget(this, pEntry);
- const sal_uInt16 SL = ((SfxOrganizeListBox_Impl *)pSource)->GetDocLevel();
- const sal_uInt16 TL = GetDocLevel();
-
- return( (nSourceLevel == 1 && nTargetLevel == 0 &&
- VIEW_TEMPLATES ==
- ((SfxOrganizeListBox_Impl *)pSource)->GetViewType()) ||
- (nSourceLevel == 1 && nTargetLevel == 1 &&
- VIEW_TEMPLATES ==
- ((SfxOrganizeListBox_Impl *)pSource)->GetViewType() &&
- VIEW_TEMPLATES == GetViewType()) ||
- (nSourceLevel == 3 && nTargetLevel == 1) ||
- (nSourceLevel == 3 && nTargetLevel == 2 &&
- aSource[1+SL] == aTarget[1+TL]) ||
- (nSourceLevel == 3 && nTargetLevel == 3 &&
- aSource[1+SL] == aTarget[1+TL]) ||
- (nSourceLevel == 4 && nTargetLevel == 3 &&
- aSource[1+SL] == aTarget[1+TL] &&
- aSource[2+SL] == aTarget[2+TL]) ||
- (nSourceLevel == 4 && nTargetLevel == 4 &&
- aSource[1+SL] == aTarget[1+TL] &&
- aSource[2+SL] == aTarget[2+TL]));
-}
-
-//-------------------------------------------------------------------------
-
-sal_Int8 SfxOrganizeListBox_Impl::AcceptDrop( const AcceptDropEvent& rEvt )
-{
- sal_Bool bAccept = ( eViewType == VIEW_FILES && IsDropFormatSupported( SOT_FORMAT_FILE ) );
- if ( bAccept )
- return rEvt.mnAction;
- else
- return SvTreeListBox::AcceptDrop( rEvt );
-}
-
-//-------------------------------------------------------------------------
-
-sal_Int8 SfxOrganizeListBox_Impl::ExecuteDrop( const ExecuteDropEvent& rEvt )
-{
- TransferableDataHelper aHelper( rEvt.maDropEvent.Transferable );
- sal_uInt32 nFormatCount = aHelper.GetFormatCount();
- sal_Bool bSuccess = sal_False;
- for ( sal_uInt32 i = 0; i < nFormatCount; ++i )
- {
- String aFileName;
- SotFormatStringId nId = aHelper.GetFormat(i);
-
- if ( SOT_FORMAT_FILE == nId && aHelper.GetString( nId, aFileName ) )
- {
- INetURLObject aObj( aFileName, INET_PROT_FILE );
- bSuccess |= pMgr->InsertFile( this, aObj.GetMainURL(INetURLObject::DECODE_TO_IURI) );
- }
- }
- bDropMoveOk = sal_True;
- sal_Int8 nRet = rEvt.mnAction;
- if ( !bSuccess )
- {
- // asynchronous, because of MessBoxes
- pDlg->pSourceView = GetSourceView();
- pDlg->pTargetEntry = pTargetEntry;
- pDlg->pFinishedBox = NULL;
- pDlg->nDropAction = NO_DROP_ACTION;
- PostUserEvent( LINK( this, SfxOrganizeListBox_Impl, OnAsyncExecuteDrop ),
- new ExecuteDropEvent( rEvt ) );
- }
-
- return nRet;
-}
-
-//-------------------------------------------------------------------------
-
-void SfxOrganizeListBox_Impl::DragFinished( sal_Int8 nDropAction )
-{
- if ( pDlg->bExecDropFinished )
- {
- if ( pDlg->nDropAction != NO_DROP_ACTION )
- nDropAction = pDlg->nDropAction;
- SvTreeListBox::DragFinished( nDropAction );
- pDlg->nDropAction = NO_DROP_ACTION;
- }
- else
- pDlg->pFinishedBox = this;
-}
-
-//-------------------------------------------------------------------------
-
-inline sal_uInt16 SfxOrganizeListBox_Impl::GetDocLevel() const
-
-/* [Description]
-
- Determines on which level there are documents (in the template view or
- the document view)
-
- [Return value]
-
- sal_uInt16 Document level
-
-*/
-
-{
- return eViewType == VIEW_FILES? 0: 1;
-}
-
-//-------------------------------------------------------------------------
-
-SfxObjectShellRef SfxOrganizeListBox_Impl::GetObjectShell(const Path &rPath)
-
-/* [Description]
-
- Access to the ObjectShell to which the current entry is connected.
-
- [Parameter]
-
- const Path &rPath Description of the current entry
-
- [Return value]
-
- SfxObjectShellRef Reference to the ObjectShell
-
- [Cross-references]
-
- <class Path>
-
-*/
-
-{
- SfxObjectShellRef aDoc;
- if(eViewType == VIEW_FILES)
- aDoc = pMgr->CreateObjectShell(rPath[0]);
- else
- aDoc = pMgr->CreateObjectShell(rPath[0], rPath[1]);
- return aDoc;
-}
-
-//-------------------------------------------------------------------------
-
-void SfxOrganizeListBox_Impl::RequestingChildren( SvTreeListEntry* pEntry )
-
-/* [Description]
-
- Sent to the children of an entry that is going to be inserted.
- (SV-Handler)
-
- [Parameter]
-
- SvTreeListEntry* pEntry the entry whose children is requested
-*/
-
-{
- if ( !GetModel()->HasChildren( pEntry ) )
- {
- WaitObject aWaitCursor( this );
-
- // Choose the correct mask color dependent from eColorMode. This
- // must be adopted if we change the mask color for normal images, too!
- Color aMaskColor( COL_LIGHTMAGENTA );
-
- // Here are all the initial inserted
- SfxErrorContext aEc(ERRCTX_SFX_CREATEOBJSH, pDlg->pDialog);
- if(VIEW_TEMPLATES == GetViewType() && 0 == GetModel()->GetDepth(pEntry))
- {
- sal_uInt16 i = (sal_uInt16)GetModel()->GetRelPos(pEntry);
- const sal_uInt16 nEntryCount = pMgr->GetTemplates()->GetCount(i);
- for(sal_uInt16 j = 0; j < nEntryCount; ++j)
- InsertEntryByBmpType( pMgr->GetTemplates()->GetName( i, j ), BMPTYPE_DOC, pEntry, sal_True );
- }
- else
- {
- const sal_uInt16 nDocLevel = GetDocLevel();
- Path aPath(this, pEntry);
-
- // it is ok to use the SfxObjectShellRef here since the object that
- // provides it ( GetObjectShell() calls CreateObjectShell() ) has a lock on it
- SfxObjectShellRef aRef = GetObjectShell(aPath);
- if(aRef.Is())
- {
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list