summaryrefslogtreecommitdiff
path: root/sfx2/source/inc
diff options
context:
space:
mode:
Diffstat (limited to 'sfx2/source/inc')
-rw-r--r--sfx2/source/inc/appdata.hxx4
-rw-r--r--sfx2/source/inc/applet.hxx4
-rw-r--r--sfx2/source/inc/eventsupplier.hxx50
-rw-r--r--sfx2/source/inc/helpid.hrc5
-rw-r--r--sfx2/source/inc/iframe.hxx4
-rw-r--r--sfx2/source/inc/objshimp.hxx4
-rw-r--r--sfx2/source/inc/plugin.hxx4
-rw-r--r--sfx2/source/inc/sfxlocal.hrc5
-rw-r--r--sfx2/source/inc/sfxpicklist.hxx2
-rw-r--r--sfx2/source/inc/templdgi.hxx6
-rw-r--r--sfx2/source/inc/virtmenu.hxx2
-rw-r--r--sfx2/source/inc/workwin.hxx2
12 files changed, 48 insertions, 44 deletions
diff --git a/sfx2/source/inc/appdata.hxx b/sfx2/source/inc/appdata.hxx
index 402ca3bdae..555b2cc498 100644
--- a/sfx2/source/inc/appdata.hxx
+++ b/sfx2/source/inc/appdata.hxx
@@ -32,7 +32,7 @@
#include <tools/link.hxx>
#include <tools/list.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
#include <vcl/timer.hxx>
#include <tools/string.hxx>
#include "rtl/ref.hxx"
@@ -58,7 +58,6 @@ class SfxFilterMatcher;
class SfxCancelManager;
class SfxStatusDispatcher;
class SfxDdeTriggerTopic_Impl;
-class SfxMiscCfg;
class SfxDocumentTemplates;
class SfxFrameArr_Impl;
class SvtSaveOptions;
@@ -122,7 +121,6 @@ public:
SfxEventConfiguration* pEventConfig;
SvUShorts* pDisabledSlotList;
SvStrings* pSecureURLs;
- SfxMiscCfg* pMiscConfig;
SvtSaveOptions* pSaveOptions;
SvtUndoOptions* pUndoOptions;
SvtHelpOptions* pHelpOptions;
diff --git a/sfx2/source/inc/applet.hxx b/sfx2/source/inc/applet.hxx
index ee53c7dd66..73c9092ff5 100644
--- a/sfx2/source/inc/applet.hxx
+++ b/sfx2/source/inc/applet.hxx
@@ -43,8 +43,8 @@
#include <cppuhelper/implbase6.hxx>
#include <rtl/ustring.hxx>
-#include <svtools/ownlist.hxx>
-#include <svtools/itemprop.hxx>
+#include <svl/ownlist.hxx>
+#include <svl/itemprop.hxx>
namespace com { namespace sun { namespace star { namespace uno {
class XComponentContext;
diff --git a/sfx2/source/inc/eventsupplier.hxx b/sfx2/source/inc/eventsupplier.hxx
index f1a10d7b5f..e6a2c96608 100644
--- a/sfx2/source/inc/eventsupplier.hxx
+++ b/sfx2/source/inc/eventsupplier.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -57,8 +57,8 @@
#include <vos/mutex.hxx>
#include <cppuhelper/interfacecontainer.hxx>
-#include <svtools/lstner.hxx>
-#include <svtools/eventcfg.hxx>
+#include <svl/lstner.hxx>
+#include <unotools/eventcfg.hxx>
//--------------------------------------------------------------------------------------------------------
@@ -143,10 +143,10 @@ struct ModelCollectionMutexBase
typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > > TModelList;
//=============================================================================
-class ModelCollectionEnumeration : public ModelCollectionMutexBase
+class ModelCollectionEnumeration : public ModelCollectionMutexBase
, public ::cppu::WeakImplHelper1< ::com::sun::star::container::XEnumeration >
{
-
+
//-------------------------------------------------------------------------
// member
//-------------------------------------------------------------------------
@@ -154,7 +154,7 @@ class ModelCollectionEnumeration : public ModelCollectionMutexBase
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xSMGR;
TModelList m_lModels;
TModelList::iterator m_pEnumerationIt;
-
+
//-------------------------------------------------------------------------
// native interface
//-------------------------------------------------------------------------
@@ -162,16 +162,16 @@ class ModelCollectionEnumeration : public ModelCollectionMutexBase
ModelCollectionEnumeration(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xSMGR);
virtual ~ModelCollectionEnumeration();
void setModelList(const TModelList& rList);
-
+
//-------------------------------------------------------------------------
- // uno interface
+ // uno interface
//-------------------------------------------------------------------------
public:
-
+
// css.container.XEnumeration
virtual sal_Bool SAL_CALL hasMoreElements()
throw(::com::sun::star::uno::RuntimeException);
-
+
virtual ::com::sun::star::uno::Any SAL_CALL nextElement()
throw(::com::sun::star::container::NoSuchElementException,
::com::sun::star::lang::WrappedTargetException ,
@@ -179,7 +179,7 @@ class ModelCollectionEnumeration : public ModelCollectionMutexBase
};
//=============================================================================
-class SfxGlobalEvents_Impl : public ModelCollectionMutexBase
+class SfxGlobalEvents_Impl : public ModelCollectionMutexBase
, public ::cppu::WeakImplHelper7< ::com::sun::star::lang::XServiceInfo
, ::com::sun::star::document::XEventsSupplier
, ::com::sun::star::document::XEventBroadcaster
@@ -193,22 +193,22 @@ class SfxGlobalEvents_Impl : public ModelCollectionMutexBase
::com::sun::star::uno::WeakReference< ::com::sun::star::document::XEventListener > m_xJobExecutorListener;
OINTERFACECONTAINERHELPER m_aLegacyListeners;
OINTERFACECONTAINERHELPER m_aDocumentListeners;
- TModelList m_lModels;
+ TModelList m_lModels;
GlobalEventConfig* pImp;
public:
SfxGlobalEvents_Impl(const com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory >& xSMGR);
virtual ~SfxGlobalEvents_Impl();
-
+
SFX_DECL_XSERVICEINFO
-
+
// css.document.XEventBroadcaster
virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents()
throw(::com::sun::star::uno::RuntimeException);
-
+
virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::document::XEventListener >& xListener)
throw(::com::sun::star::uno::RuntimeException);
-
+
virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XEventListener >& xListener)
throw(::com::sun::star::uno::RuntimeException);
@@ -216,23 +216,23 @@ public:
virtual void SAL_CALL addDocumentEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentEventListener >& _Listener ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL removeDocumentEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentEventListener >& _Listener ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL notifyDocumentEvent( const ::rtl::OUString& _EventName, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController2 >& _ViewController, const ::com::sun::star::uno::Any& _Supplement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException);
-
+
// css.document.XEventListener
virtual void SAL_CALL notifyEvent(const ::com::sun::star::document::EventObject& aEvent)
throw(::com::sun::star::uno::RuntimeException);
// css.document.XDocumentEventListener
virtual void SAL_CALL documentEventOccured( const ::com::sun::star::document::DocumentEvent& Event ) throw (::com::sun::star::uno::RuntimeException);
-
+
// css.container.XSet
virtual sal_Bool SAL_CALL has(const ::com::sun::star::uno::Any& aElement)
throw(::com::sun::star::uno::RuntimeException);
-
+
virtual void SAL_CALL insert(const ::com::sun::star::uno::Any& aElement)
throw(::com::sun::star::lang::IllegalArgumentException ,
::com::sun::star::container::ElementExistException,
::com::sun::star::uno::RuntimeException );
-
+
virtual void SAL_CALL remove(const ::com::sun::star::uno::Any& aElement)
throw(::com::sun::star::lang::IllegalArgumentException ,
::com::sun::star::container::NoSuchElementException,
@@ -241,25 +241,25 @@ public:
// css.container.XEnumerationAccess
virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration()
throw(::com::sun::star::uno::RuntimeException);
-
+
// css.container.XElementAccess
virtual ::com::sun::star::uno::Type SAL_CALL getElementType()
throw(::com::sun::star::uno::RuntimeException);
-
+
virtual sal_Bool SAL_CALL hasElements()
throw(::com::sun::star::uno::RuntimeException);
-
+
// css.lang.XEventListener
virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& aEvent)
throw(::com::sun::star::uno::RuntimeException);
-
+
private:
// threadsafe
void implts_notifyJobExecution(const ::com::sun::star::document::EventObject& aEvent);
void implts_checkAndExecuteEventBindings(const ::com::sun::star::document::DocumentEvent& aEvent);
void implts_notifyListener(const ::com::sun::star::document::DocumentEvent& aEvent);
-
+
// not threadsafe
TModelList::iterator impl_searchDoc(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel);
};
diff --git a/sfx2/source/inc/helpid.hrc b/sfx2/source/inc/helpid.hrc
index 8e7643975d..9185f0c114 100644
--- a/sfx2/source/inc/helpid.hrc
+++ b/sfx2/source/inc/helpid.hrc
@@ -32,7 +32,7 @@
// include ------------------------------------------------------------------
-#include <svtools/solar.hrc>
+#include <svl/solar.hrc>
// Help-Ids -----------------------------------------------------------------
@@ -346,8 +346,9 @@
#define HID_TP_CUSTOMPROPERTIES (HID_SFX_START + 324)
#define HID_CTRL_CUSTOMPROPERTIES (HID_SFX_START + 325)
#define HID_CTRL_CUSTOMPROPS_YES_NO (HID_SFX_START + 326)
+#define HID_DLG_CUSTOMPROPS_DURATION (HID_SFX_START + 327)
-#define ACT_SFX_HID_END HID_CTRL_CUSTOMPROPS_YES_NO
+#define ACT_SFX_HID_END HID_DLG_CUSTOMPROPS_DURATION
// "Uberlaufpr"ufung --------------------------------------------------------
diff --git a/sfx2/source/inc/iframe.hxx b/sfx2/source/inc/iframe.hxx
index 332aaa171f..f67ec1f591 100644
--- a/sfx2/source/inc/iframe.hxx
+++ b/sfx2/source/inc/iframe.hxx
@@ -45,8 +45,8 @@
#include <cppuhelper/implbase6.hxx>
#include <rtl/ustring.hxx>
-#include <svtools/ownlist.hxx>
-#include <svtools/itemprop.hxx>
+#include <svl/ownlist.hxx>
+#include <svl/itemprop.hxx>
#include <sfx2/sfxuno.hxx>
#include <sfx2/frmdescr.hxx>
diff --git a/sfx2/source/inc/objshimp.hxx b/sfx2/source/inc/objshimp.hxx
index 8ee3b79a6f..07421d0934 100644
--- a/sfx2/source/inc/objshimp.hxx
+++ b/sfx2/source/inc/objshimp.hxx
@@ -38,7 +38,7 @@
#include <com/sun/star/logging/XSimpleLogRing.hpp>
#include <tools/datetime.hxx>
-#include <svtools/securityoptions.hxx>
+#include <unotools/securityoptions.hxx>
#include <sfx2/objsh.hxx>
#include "sfx2/docmacromode.hxx"
#include "bitset.hxx"
@@ -180,7 +180,7 @@ struct SfxObjectShell_Impl : public ::sfx2::IMacroDocumentAccess
virtual ~SfxObjectShell_Impl();
static sal_Bool NeedsOfficeUpdateDialog();
-
+
// IMacroDocumentAccess overridables
virtual sal_Int16 getCurrentMacroExecMode() const;
virtual sal_Bool setCurrentMacroExecMode( sal_uInt16 nMacroMode );
diff --git a/sfx2/source/inc/plugin.hxx b/sfx2/source/inc/plugin.hxx
index 6c545e2fb2..f2dbfbdb03 100644
--- a/sfx2/source/inc/plugin.hxx
+++ b/sfx2/source/inc/plugin.hxx
@@ -45,8 +45,8 @@
#include <cppuhelper/implbase5.hxx>
#include <rtl/ustring.hxx>
-#include <svtools/ownlist.hxx>
-#include <svtools/itemprop.hxx>
+#include <svl/ownlist.hxx>
+#include <svl/itemprop.hxx>
#include <sfx2/sfxuno.hxx>
diff --git a/sfx2/source/inc/sfxlocal.hrc b/sfx2/source/inc/sfxlocal.hrc
index 0c0c8a4250..932204440a 100644
--- a/sfx2/source/inc/sfxlocal.hrc
+++ b/sfx2/source/inc/sfxlocal.hrc
@@ -60,6 +60,11 @@
#define SFX_QB_WRONG_TYPE (RID_SFX_SFXLOCAL_START + 7)
#define SFX_IMG_PROPERTY_REMOVE (RID_SFX_SFXLOCAL_START + 8)
#define SFX_IMG_PROPERTY_REMOVE_HC (RID_SFX_SFXLOCAL_START + 9)
+#define SFX_FLD_DATE (RID_SFX_SFXLOCAL_START + 10)
+#define SFX_FLD_TIME (RID_SFX_SFXLOCAL_START + 11)
+#define SFX_FLD_DURATION (RID_SFX_SFXLOCAL_START + 12)
+#define SFX_ST_DURATION_FORMAT (RID_SFX_SFXLOCAL_START + 13)
+
#endif
diff --git a/sfx2/source/inc/sfxpicklist.hxx b/sfx2/source/inc/sfxpicklist.hxx
index 5097112f6a..618bb0b2c1 100644
--- a/sfx2/source/inc/sfxpicklist.hxx
+++ b/sfx2/source/inc/sfxpicklist.hxx
@@ -34,7 +34,7 @@
#include <osl/mutex.hxx>
#include <tools/string.hxx>
#include <vcl/menu.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
#include <com/sun/star/util/XStringWidth.hpp>
#include <vector>
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
index 55e7a317d2..f7f7740264 100644
--- a/sfx2/source/inc/templdgi.hxx
+++ b/sfx2/source/inc/templdgi.hxx
@@ -41,12 +41,12 @@ class SfxTemplateControllerItem;
#ifndef _LSTBOX_HXX //autogen
#include <vcl/lstbox.hxx>
#endif
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
#include <svtools/svtreebx.hxx>
-#include <svtools/eitem.hxx>
+#include <svl/eitem.hxx>
#define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx> // SvUShorts
+#include <svl/svstdarr.hxx> // SvUShorts
#include <rsc/rscsfx.hxx>
#include <tools/rtti.hxx>
diff --git a/sfx2/source/inc/virtmenu.hxx b/sfx2/source/inc/virtmenu.hxx
index 5e2436db51..f939ac775d 100644
--- a/sfx2/source/inc/virtmenu.hxx
+++ b/sfx2/source/inc/virtmenu.hxx
@@ -32,7 +32,7 @@
#define _SFXVIRTMENU_HXX
-#include <svtools/svarray.hxx>
+#include <svl/svarray.hxx>
#include <sfx2/mnuitem.hxx>
#include "mnucfga.hxx"
diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx
index dc231c1af7..8735e24b90 100644
--- a/sfx2/source/inc/workwin.hxx
+++ b/sfx2/source/inc/workwin.hxx
@@ -42,7 +42,7 @@
#include <cppuhelper/propshlp.hxx>
#define _SVSTDARR_USHORTS
-#include <svtools/svstdarr.hxx> // SvUShorts
+#include <svl/svstdarr.hxx> // SvUShorts
#include <rtl/ustring.hxx>
#include <vos/mutex.hxx>
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 00:41:33 +0000