summaryrefslogtreecommitdiff
path: root/sfx2/source/inc
diff options
context:
space:
mode:
Diffstat (limited to 'sfx2/source/inc')
-rw-r--r--sfx2/source/inc/appbas.hxx2
-rw-r--r--sfx2/source/inc/appdata.hxx28
-rwxr-xr-xsfx2/source/inc/docundomanager.hxx116
-rw-r--r--sfx2/source/inc/eventsupplier.hxx13
-rw-r--r--sfx2/source/inc/fltfnc.hxx2
-rw-r--r--sfx2/source/inc/helper.hxx2
-rw-r--r--sfx2/source/inc/mailmodel.hxx2
-rw-r--r--sfx2/source/inc/mnucfga.hxx2
-rw-r--r--sfx2/source/inc/nfltdlg.hxx2
-rw-r--r--sfx2/source/inc/nochaos.hxx2
-rw-r--r--sfx2/source/inc/objmnctl.hxx4
-rw-r--r--sfx2/source/inc/recfloat.hxx4
-rw-r--r--sfx2/source/inc/sfxlocal.hrc10
-rw-r--r--sfx2/source/inc/sfxpicklist.hxx4
-rw-r--r--sfx2/source/inc/sfxtypes.hxx18
-rw-r--r--sfx2/source/inc/sfxurlrelocator.hxx5
-rw-r--r--sfx2/source/inc/slotserv.hxx12
-rw-r--r--sfx2/source/inc/splitwin.hxx66
-rw-r--r--sfx2/source/inc/statcach.hxx8
-rw-r--r--sfx2/source/inc/templdgi.hxx96
-rw-r--r--sfx2/source/inc/tplcitem.hxx6
-rw-r--r--sfx2/source/inc/versdlg.hxx2
-rw-r--r--sfx2/source/inc/virtmenu.hxx66
-rw-r--r--sfx2/source/inc/workwin.hxx164
24 files changed, 377 insertions, 259 deletions
diff --git a/sfx2/source/inc/appbas.hxx b/sfx2/source/inc/appbas.hxx
index 8b10fcb843de..05c182419514 100644
--- a/sfx2/source/inc/appbas.hxx
+++ b/sfx2/source/inc/appbas.hxx
@@ -36,7 +36,7 @@ class SbxObject;
//=========================================================================
SbxVariable* MakeVariable( StarBASIC *pBas, SbxObject *pObject,
- const char *pName, ULONG nSID, SbxDataType eType=SbxOBJECT,
+ const char *pName, sal_uIntPtr nSID, SbxDataType eType=SbxOBJECT,
SbxClassType = SbxCLASS_PROPERTY );
diff --git a/sfx2/source/inc/appdata.hxx b/sfx2/source/inc/appdata.hxx
index bd12f3db80dc..7da892ca89c9 100644
--- a/sfx2/source/inc/appdata.hxx
+++ b/sfx2/source/inc/appdata.hxx
@@ -116,7 +116,6 @@ public:
// global pointers
SfxItemPool* pPool;
- SfxEventConfiguration* pEventConfig;
SvUShorts* pDisabledSlotList;
SvStrings* pSecureURLs;
SvtSaveOptions* pSaveOptions;
@@ -127,12 +126,11 @@ public:
SfxProgress* pProgress;
ISfxTemplateCommon* pTemplateCommon;
- USHORT nDocModalMode; // counts documents in modal mode
- USHORT nAutoTabPageId;
- USHORT nBasicCallLevel;
- USHORT nRescheduleLocks;
- USHORT nInReschedule;
- USHORT nAsynchronCalls;
+ sal_uInt16 nDocModalMode; // counts documents in modal mode
+ sal_uInt16 nAutoTabPageId;
+ sal_uInt16 nRescheduleLocks;
+ sal_uInt16 nInReschedule;
+ sal_uInt16 nAsynchronCalls;
rtl::Reference< sfx2::appl::ImeStatusWindow > m_xImeStatusWindow;
@@ -154,19 +152,19 @@ public:
SfxDispatcher* pAppDispat; // Dispatcher falls kein Doc
SfxInterface** pInterfaces;
- USHORT nDocNo; // Laufende Doc-Nummer (AutoName)
- USHORT nInterfaces;
+ sal_uInt16 nDocNo; // Laufende Doc-Nummer (AutoName)
+ sal_uInt16 nInterfaces;
- BOOL bDispatcherLocked:1; // nichts ausf"uhren
- BOOL bDowning:1; // TRUE ab Exit und danach
- BOOL bInQuit : 1;
- BOOL bInvalidateOnUnlock : 1;
- BOOL bODFVersionWarningLater : 1;
+ sal_Bool bDispatcherLocked:1; // nichts ausf"uhren
+ sal_Bool bDowning:1; // sal_True ab Exit und danach
+ sal_Bool bInQuit : 1;
+ sal_Bool bInvalidateOnUnlock : 1;
+ sal_Bool bODFVersionWarningLater : 1;
SfxAppData_Impl( SfxApplication* );
~SfxAppData_Impl();
- void UpdateApplicationSettings( BOOL bDontHide );
+ void UpdateApplicationSettings( sal_Bool bDontHide );
SfxDocumentTemplates* GetDocumentTemplates();
void DeInitDDE();
diff --git a/sfx2/source/inc/docundomanager.hxx b/sfx2/source/inc/docundomanager.hxx
new file mode 100755
index 000000000000..9b37671662fd
--- /dev/null
+++ b/sfx2/source/inc/docundomanager.hxx
@@ -0,0 +1,116 @@
+/*************************************************************************
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef DOCUMENT_UNDO_MANAGER_HXX
+#define DOCUMENT_UNDO_MANAGER_HXX
+
+#include "sfx2/sfxbasemodel.hxx"
+
+/** === begin UNO includes === **/
+#include <com/sun/star/document/XUndoManager.hpp>
+/** === end UNO includes === **/
+
+#include <cppuhelper/implbase1.hxx>
+
+#include <boost/scoped_ptr.hpp>
+#include <boost/noncopyable.hpp>
+
+namespace svl
+{
+ class IUndoManager;
+}
+
+//......................................................................................................................
+namespace sfx2
+{
+//......................................................................................................................
+
+ //==================================================================================================================
+ //= DocumentUndoManager
+ //==================================================================================================================
+ typedef ::cppu::ImplHelper1 < ::com::sun::star::document::XUndoManager
+ > DocumentUndoManager_Base;
+ struct DocumentUndoManager_Impl;
+ class DocumentUndoManager :public DocumentUndoManager_Base
+ ,public SfxModelSubComponent
+ ,public ::boost::noncopyable
+ {
+ friend struct DocumentUndoManager_Impl;
+
+ public:
+ DocumentUndoManager( SfxBaseModel& i_document );
+ virtual ~DocumentUndoManager();
+
+ // SfxModelSubComponent overridables
+ virtual void disposing();
+
+ // non-UNO API for our owner
+ /** determines whether we have an open Undo context. No mutex locking within this method, no disposal check - this
+ is the responsibility of the owner.
+ */
+ bool isInContext() const;
+
+ // XInterface
+ virtual void SAL_CALL acquire( ) throw ();
+ virtual void SAL_CALL release( ) throw ();
+
+ // XUndoManager
+ virtual void SAL_CALL enterUndoContext( const ::rtl::OUString& i_title ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL enterHiddenUndoContext( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL leaveUndoContext( ) throw (::com::sun::star::util::InvalidStateException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL addUndoAction( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoAction >& i_action ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL undo( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL redo( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException);
+ virtual ::sal_Bool SAL_CALL isUndoPossible( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual ::sal_Bool SAL_CALL isRedoPossible( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual ::rtl::OUString SAL_CALL getCurrentUndoActionTitle( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException);
+ virtual ::rtl::OUString SAL_CALL getCurrentRedoActionTitle( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAllUndoActionTitles( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAllRedoActionTitles( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL clear( ) throw (::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL clearRedo( ) throw (::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL reset( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL addUndoManagerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManagerListener >& i_listener ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL removeUndoManagerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManagerListener >& i_listener ) throw (::com::sun::star::uno::RuntimeException);
+
+ // XLockable, base of XUndoManager
+ virtual void SAL_CALL lock( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL unlock( ) throw (::com::sun::star::util::NotLockedException, ::com::sun::star::uno::RuntimeException);
+ virtual ::sal_Bool SAL_CALL isLocked( ) throw (::com::sun::star::uno::RuntimeException);
+
+ // XChild, base of XUndoManager
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException);
+
+ private:
+ ::boost::scoped_ptr< DocumentUndoManager_Impl > m_pImpl;
+ };
+
+//......................................................................................................................
+} // namespace sfx2
+//......................................................................................................................
+
+#endif // DOCUMENT_UNDO_MANAGER_HXX
diff --git a/sfx2/source/inc/eventsupplier.hxx b/sfx2/source/inc/eventsupplier.hxx
index e012eea39c2d..4964cf30233d 100644
--- a/sfx2/source/inc/eventsupplier.hxx
+++ b/sfx2/source/inc/eventsupplier.hxx
@@ -57,6 +57,11 @@
#include <svl/lstner.hxx>
#include <unotools/eventcfg.hxx>
+namespace comphelper
+{
+ class NamedValueCollection;
+}
+
//--------------------------------------------------------------------------------------------------------
#define NOSUCHELEMENTEXCEPTION ::com::sun::star::container::NoSuchElementException
@@ -125,8 +130,12 @@ public:
virtual void SAL_CALL disposing( const EVENTOBJECT& Source )
throw( RUNTIMEEXCEPTION );
- static SvxMacro* ConvertToMacro( const ANY& rElement, SfxObjectShell* pDoc, BOOL bBlowUp );
- static void BlowUpMacro( const ANY& rIn, ANY& rOut, SfxObjectShell* pDoc );
+ static SvxMacro* ConvertToMacro( const ANY& rElement, SfxObjectShell* pDoc, sal_Bool bNormalizeMacro );
+ static void NormalizeMacro( const ANY& rIn, ANY& rOut, SfxObjectShell* pDoc );
+ static void NormalizeMacro(
+ const ::comphelper::NamedValueCollection& i_eventDescriptor,
+ ::comphelper::NamedValueCollection& o_normalizedDescriptor,
+ SfxObjectShell* i_document );
};
//=============================================================================
diff --git a/sfx2/source/inc/fltfnc.hxx b/sfx2/source/inc/fltfnc.hxx
index 0a078a33c5be..bac498b6f765 100644
--- a/sfx2/source/inc/fltfnc.hxx
+++ b/sfx2/source/inc/fltfnc.hxx
@@ -29,7 +29,7 @@
#include <sfx2/fcontnr.hxx>
-BOOL SfxIsHelpEntryURL( const String &rURL, const String &rExtMask );
+sal_Bool SfxIsHelpEntryURL( const String &rURL, const String &rExtMask );
#endif
diff --git a/sfx2/source/inc/helper.hxx b/sfx2/source/inc/helper.hxx
index 45aed74b154a..6e0061a69cf2 100644
--- a/sfx2/source/inc/helper.hxx
+++ b/sfx2/source/inc/helper.hxx
@@ -66,7 +66,7 @@ public:
static sal_Bool MakeFolder( const String& rFolder );
static ErrCode QueryDiskSpace( const String& rPath, sal_Int64& rFreeBytes );
- static ULONG GetSize( const String& rContent );
+ static sal_uIntPtr GetSize( const String& rContent );
// please don't use this!
static sal_Bool Exists( const String& rContent );
diff --git a/sfx2/source/inc/mailmodel.hxx b/sfx2/source/inc/mailmodel.hxx
index 43e938d46800..148c99095edb 100644
--- a/sfx2/source/inc/mailmodel.hxx
+++ b/sfx2/source/inc/mailmodel.hxx
@@ -100,6 +100,6 @@ public:
SendMailResult Send( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, const rtl::OUString& rType );
};
-BOOL CreateFromAddress_Impl( String& rFrom );
+sal_Bool CreateFromAddress_Impl( String& rFrom );
#endif // INCLUDED_SFX_MAILMODEL_HXX
diff --git a/sfx2/source/inc/mnucfga.hxx b/sfx2/source/inc/mnucfga.hxx
index bbc3c1cd63ac..609661e638e9 100644
--- a/sfx2/source/inc/mnucfga.hxx
+++ b/sfx2/source/inc/mnucfga.hxx
@@ -38,7 +38,7 @@ class SfxMenuCfgItemArr;
struct SfxMenuCfgItem
{
- USHORT nId; // id of the binding or 0 if none
+ sal_uInt16 nId; // id of the binding or 0 if none
String aTitle; // title of the item
String aHelpText; // Hilfetext
String aCommand;
diff --git a/sfx2/source/inc/nfltdlg.hxx b/sfx2/source/inc/nfltdlg.hxx
index 371fa96c57a2..09a5c0a2c5ec 100644
--- a/sfx2/source/inc/nfltdlg.hxx
+++ b/sfx2/source/inc/nfltdlg.hxx
@@ -57,7 +57,7 @@ public:
SfxFilterDialog( Window * pParent,
SfxMedium* pMed,
const SfxFilterMatcher &rMatcher,
- const String *pDefFilter, BOOL bShowConvert = TRUE );
+ const String *pDefFilter, sal_Bool bShowConvert = sal_True );
String GetSelectEntry() const;
};
diff --git a/sfx2/source/inc/nochaos.hxx b/sfx2/source/inc/nochaos.hxx
index 4b5d7fb1f40e..daa06f8e4371 100644
--- a/sfx2/source/inc/nochaos.hxx
+++ b/sfx2/source/inc/nochaos.hxx
@@ -33,7 +33,7 @@ class NoChaos
{
public:
static SfxItemPool* GetItemPool();
- static USHORT ReleaseItemPool();
+ static sal_uInt16 ReleaseItemPool();
};
#endif
diff --git a/sfx2/source/inc/objmnctl.hxx b/sfx2/source/inc/objmnctl.hxx
index e58c6cd5592d..cac1da05fd48 100644
--- a/sfx2/source/inc/objmnctl.hxx
+++ b/sfx2/source/inc/objmnctl.hxx
@@ -44,10 +44,10 @@ class SfxObjectVerbsControl: public SfxMenuControl
private:
void FillMenu();
DECL_LINK( MenuSelect, Menu * );
- virtual void StateChanged( USHORT, SfxItemState, const SfxPoolItem* pState );
+ virtual void StateChanged( sal_uInt16, SfxItemState, const SfxPoolItem* pState );
public:
- SfxObjectVerbsControl(USHORT, Menu&, SfxBindings&);
+ SfxObjectVerbsControl(sal_uInt16, Menu&, SfxBindings&);
~SfxObjectVerbsControl();
virtual PopupMenu* GetPopup() const;
SFX_DECL_MENU_CONTROL();
diff --git a/sfx2/source/inc/recfloat.hxx b/sfx2/source/inc/recfloat.hxx
index 5667a6c1e67a..b8e5bb35068c 100644
--- a/sfx2/source/inc/recfloat.hxx
+++ b/sfx2/source/inc/recfloat.hxx
@@ -38,7 +38,7 @@ class SfxRecordingFloatWrapper_Impl : public SfxChildWindow
SfxBindings* pBindings;
public:
SfxRecordingFloatWrapper_Impl( Window* pParent ,
- USHORT nId ,
+ sal_uInt16 nId ,
SfxBindings* pBindings ,
SfxChildWinInfo* pInfo );
~SfxRecordingFloatWrapper_Impl();
@@ -57,7 +57,7 @@ public:
SfxChildWindow* pChildWin ,
Window* pParent );
virtual ~SfxRecordingFloat_Impl();
- virtual BOOL Close();
+ virtual sal_Bool Close();
virtual void FillInfo( SfxChildWinInfo& rInfo ) const;
virtual void StateChanged( StateChangedType nStateChange );
diff --git a/sfx2/source/inc/sfxlocal.hrc b/sfx2/source/inc/sfxlocal.hrc
index 202ed6f6f00f..615445bd919e 100644
--- a/sfx2/source/inc/sfxlocal.hrc
+++ b/sfx2/source/inc/sfxlocal.hrc
@@ -24,13 +24,9 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-//============================================================================
-// Lokale Resourcen
-//
-// (C) 1996 - 2000 Star Division GmbH, Hamburg, Germany
-// $Author: rt $ $Date: 2008-07-30 09:24:39 $ $Revision: 1.8 $
-// $Logfile: T:/sfx2/source/inc/sfxlocal.hrv $ $Workfile: SFXLOCAL.HRC $
-//----------------------------------------------------------------------------
+
+// local resources
+
#ifndef _SFXLOCAL_HRC
#define _SFXLOCAL_HRC
diff --git a/sfx2/source/inc/sfxpicklist.hxx b/sfx2/source/inc/sfxpicklist.hxx
index 8b5069f20296..830ba2e3b810 100644
--- a/sfx2/source/inc/sfxpicklist.hxx
+++ b/sfx2/source/inc/sfxpicklist.hxx
@@ -63,7 +63,7 @@ class SfxPickList : public SfxListener
static osl::Mutex* GetOrCreateMutex();
- void CreatePicklistMenuTitle( Menu* pMenu, USHORT nItemId, const String& aURL, sal_uInt32 nNo );
+ void CreatePicklistMenuTitle( Menu* pMenu, sal_uInt16 nItemId, const String& aURL, sal_uInt32 nNo );
PickListEntry* GetPickListEntry( sal_uInt32 nIndex );
void CreatePickListEntries();
void RemovePickListEntries();
@@ -76,7 +76,7 @@ class SfxPickList : public SfxListener
sal_uInt32 GetAllowedMenuSize() { return m_nAllowedMenuSize; }
sal_uInt32 GetNumOfEntries() const { return m_aPicklistVector.size(); }
void CreateMenuEntries( Menu* pMenu );
- void ExecuteMenuEntry( USHORT nId );
+ void ExecuteMenuEntry( sal_uInt16 nId );
void ExecuteEntry( sal_uInt32 nIndex );
String GetMenuEntryTitle( sal_uInt32 nIndex );
diff --git a/sfx2/source/inc/sfxtypes.hxx b/sfx2/source/inc/sfxtypes.hxx
index 73014121541e..5c01b0d53259 100644
--- a/sfx2/source/inc/sfxtypes.hxx
+++ b/sfx2/source/inc/sfxtypes.hxx
@@ -62,12 +62,6 @@
class SfxShell;
class Timer;
-#if !defined(_SFX_APPCTOR_CXX) && defined(WNT)
-#ifndef _DLL_
-#error _DLL_ mal wieder nicht defined => GetpApp() == 0
-#endif
-#endif
-
//------------------------------------------------------------------------
// Macro fuer den Call-Profiler unter WinNT
@@ -161,29 +155,29 @@ struct StringList_Impl : private Resource
ResId aResId;
- StringList_Impl( const ResId& rErrIdP, USHORT nId)
+ StringList_Impl( const ResId& rErrIdP, sal_uInt16 nId)
: Resource( rErrIdP ),aResId(nId, *rErrIdP.GetResMgr()){}
~StringList_Impl() { FreeResource(); }
String GetString(){ return String( aResId ); }
- operator BOOL(){return IsAvailableRes(aResId.SetRT(RSC_STRING));}
+ operator sal_Bool(){return IsAvailableRes(aResId.SetRT(RSC_STRING));}
};
#define SFX_DEL_PTRARR(pArr) \
{ \
- for ( USHORT n = (pArr)->Count(); n--; ) \
+ for ( sal_uInt16 n = (pArr)->Count(); n--; ) \
delete (pArr)->GetObject(n); \
DELETEX(pArr); \
}
class SfxBoolResetter
{
- BOOL& _rVar;
- BOOL _bOld;
+ sal_Bool& _rVar;
+ sal_Bool _bOld;
public:
- SfxBoolResetter( BOOL &rVar )
+ SfxBoolResetter( sal_Bool &rVar )
: _rVar( rVar ),
_bOld( rVar )
{}
diff --git a/sfx2/source/inc/sfxurlrelocator.hxx b/sfx2/source/inc/sfxurlrelocator.hxx
index 8acc674b3568..5ab1125b7cb6 100644
--- a/sfx2/source/inc/sfxurlrelocator.hxx
+++ b/sfx2/source/inc/sfxurlrelocator.hxx
@@ -30,6 +30,7 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/util/XOfficeInstallationDirectories.hpp>
+#include <com/sun/star/util/XMacroExpander.hpp>
#include <rtl/ustring.hxx>
#include <osl/mutex.hxx>
@@ -39,6 +40,7 @@ class SfxURLRelocator_Impl
::osl::Mutex maMutex;
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxFactory;
::com::sun::star::uno::Reference< ::com::sun::star::util::XOfficeInstallationDirectories > mxOfficeInstDirs;
+ ::com::sun::star::uno::Reference< ::com::sun::star::util::XMacroExpander > mxMacroExpander;
public:
static bool propertyCanContainOfficeDir( const rtl::OUString & rPropName );
@@ -48,6 +50,9 @@ public:
SfxURLRelocator_Impl( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xFactory );
~SfxURLRelocator_Impl();
+
+private:
+ void implExpandURL( ::rtl::OUString& io_url );
};
#endif
diff --git a/sfx2/source/inc/slotserv.hxx b/sfx2/source/inc/slotserv.hxx
index 9b0a8e94733c..afef5e926f5f 100644
--- a/sfx2/source/inc/slotserv.hxx
+++ b/sfx2/source/inc/slotserv.hxx
@@ -35,14 +35,14 @@ class SfxSlotServer
{
private:
const SfxSlot* _pSlot;
- USHORT _nShellLevel;
+ sal_uInt16 _nShellLevel;
public:
- SfxSlotServer( const SfxSlot &rSlot, USHORT nShell );
+ SfxSlotServer( const SfxSlot &rSlot, sal_uInt16 nShell );
SfxSlotServer();
- USHORT GetShellLevel() const;
- void SetShellLevel(USHORT nLevel) { _nShellLevel = nLevel; }
+ sal_uInt16 GetShellLevel() const;
+ void SetShellLevel(sal_uInt16 nLevel) { _nShellLevel = nLevel; }
void SetSlot(const SfxSlot* pSlot) {
_pSlot = pSlot;
}
@@ -52,7 +52,7 @@ public:
//--------------------------------------------------------------------
-inline SfxSlotServer::SfxSlotServer( const SfxSlot &rSlot, USHORT nShell ):
+inline SfxSlotServer::SfxSlotServer( const SfxSlot &rSlot, sal_uInt16 nShell ):
_pSlot( &rSlot),
_nShellLevel( nShell )
{
@@ -68,7 +68,7 @@ inline SfxSlotServer::SfxSlotServer():
//--------------------------------------------------------------------
-inline USHORT SfxSlotServer::GetShellLevel() const
+inline sal_uInt16 SfxSlotServer::GetShellLevel() const
{
return _nShellLevel;
}
diff --git a/sfx2/source/inc/splitwin.hxx b/sfx2/source/inc/splitwin.hxx
index 5105d27dd536..4c4ad9cf9390 100644
--- a/sfx2/source/inc/splitwin.hxx
+++ b/sfx2/source/inc/splitwin.hxx
@@ -46,21 +46,21 @@ private:
SfxChildAlignment eAlign;
SfxWorkWindow* pWorkWin;
SfxDockArr_Impl* pDockArr;
- BOOL bLocked;
- BOOL bPinned;
+ sal_Bool bLocked;
+ sal_Bool bPinned;
SfxEmptySplitWin_Impl* pEmptyWin;
SfxDockingWindow* pActive;
void InsertWindow_Impl( SfxDock_Impl* pDockWin,
const Size& rSize,
- USHORT nLine,
- USHORT nPos,
- BOOL bNewLine=FALSE );
+ sal_uInt16 nLine,
+ sal_uInt16 nPos,
+ sal_Bool bNewLine=sal_False );
DECL_LINK( TimerHdl, Timer* );
- BOOL CursorIsOverRect( BOOL bForceAdding = FALSE ) const;
- void SetPinned_Impl( BOOL );
- void SetFadeIn_Impl( BOOL );
+ sal_Bool CursorIsOverRect( sal_Bool bForceAdding = sal_False ) const;
+ void SetPinned_Impl( sal_Bool );
+ void SetFadeIn_Impl( sal_Bool );
void SaveConfig_Impl();
void FadeOut_Impl();
@@ -74,57 +74,57 @@ protected:
public:
SfxSplitWindow( Window* pParent, SfxChildAlignment eAl,
- SfxWorkWindow *pW, BOOL bWithButtons,
+ SfxWorkWindow *pW, sal_Bool bWithButtons,
WinBits nBits = WB_BORDER | WB_SIZEABLE | WB_3DLOOK );
~SfxSplitWindow();
- void ReleaseWindow_Impl(SfxDockingWindow *pWin, BOOL bSaveConfig=TRUE);
+ void ReleaseWindow_Impl(SfxDockingWindow *pWin, sal_Bool bSaveConfig=sal_True);
void InsertWindow( SfxDockingWindow* pDockWin,
const Size& rSize);
void InsertWindow( SfxDockingWindow* pDockWin,
const Size& rSize,
- USHORT nLine,
- USHORT nPos,
- BOOL bNewLine=FALSE );
+ sal_uInt16 nLine,
+ sal_uInt16 nPos,
+ sal_Bool bNewLine=sal_False );
void MoveWindow( SfxDockingWindow* pDockWin,
const Size& rSize,
- USHORT nLine,
- USHORT nPos,
- BOOL bNewLine=FALSE );
+ sal_uInt16 nLine,
+ sal_uInt16 nPos,
+ sal_Bool bNewLine=sal_False );
- void RemoveWindow( SfxDockingWindow* pDockWin, BOOL bHide=TRUE);
+ void RemoveWindow( SfxDockingWindow* pDockWin, sal_Bool bHide=sal_True);
- void Lock( BOOL bLock=TRUE )
+ void Lock( sal_Bool bLock=sal_True )
{
bLocked = bLock;
SetUpdateMode( !bLock );
}
using Window::IsLocked;
- BOOL IsLocked() const { return bLocked; }
- BOOL GetWindowPos( const SfxDockingWindow* pWindow,
- USHORT& rLine, USHORT& rPos ) const;
- BOOL GetWindowPos( const Point& rTestPos,
- USHORT& rLine, USHORT& rPos ) const;
- USHORT GetLineCount() const;
- long GetLineSize( USHORT ) const;
- USHORT GetWindowCount(USHORT nLine) const;
- USHORT GetWindowCount() const;
-
- BOOL IsPinned() const { return bPinned; }
- BOOL IsFadeIn() const;
- BOOL IsAutoHide( BOOL bSelf = FALSE ) const;
+ sal_Bool IsLocked() const { return bLocked; }
+ sal_Bool GetWindowPos( const SfxDockingWindow* pWindow,
+ sal_uInt16& rLine, sal_uInt16& rPos ) const;
+ sal_Bool GetWindowPos( const Point& rTestPos,
+ sal_uInt16& rLine, sal_uInt16& rPos ) const;
+ sal_uInt16 GetLineCount() const;
+ long GetLineSize( sal_uInt16 ) const;
+ sal_uInt16 GetWindowCount(sal_uInt16 nLine) const;
+ sal_uInt16 GetWindowCount() const;
+
+ sal_Bool IsPinned() const { return bPinned; }
+ sal_Bool IsFadeIn() const;
+ sal_Bool IsAutoHide( sal_Bool bSelf = sal_False ) const;
SplitWindow* GetSplitWindow();
virtual void AutoHide();
virtual void FadeOut();
virtual void FadeIn();
void Show_Impl();
- void Pin_Impl( BOOL bPinned );
- BOOL ActivateNextChild_Impl( BOOL bForward = TRUE );
+ void Pin_Impl( sal_Bool bPinned );
+ sal_Bool ActivateNextChild_Impl( sal_Bool bForward = sal_True );
void SetActiveWindow_Impl( SfxDockingWindow* pWin );
};
diff --git a/sfx2/source/inc/statcach.hxx b/sfx2/source/inc/statcach.hxx
index 03b0d72dac61..19e1c3e12587 100644
--- a/sfx2/source/inc/statcach.hxx
+++ b/sfx2/source/inc/statcach.hxx
@@ -95,7 +95,7 @@ friend class BindDispatch_Impl;
private:
SfxStateCache( const SfxStateCache& rOrig ); // n.i.
- void SetState_Impl( SfxItemState, const SfxPoolItem*, BOOL bMaybeDirty=FALSE );
+ void SetState_Impl( SfxItemState, const SfxPoolItem*, sal_Bool bMaybeDirty=sal_False );
public:
SfxStateCache( sal_uInt16 nFuncId );
@@ -113,11 +113,11 @@ public:
SfxPoolItem* GetItem() const { return pLastItem; }
void ClearCache();
- void SetState( SfxItemState, const SfxPoolItem*, BOOL bMaybeDirty=FALSE );
- void SetCachedState(BOOL bAlways = FALSE);
+ void SetState( SfxItemState, const SfxPoolItem*, sal_Bool bMaybeDirty=sal_False );
+ void SetCachedState(sal_Bool bAlways = sal_False);
void DeleteFloatingWindows();
void Invalidate( sal_Bool bWithSlot );
- void SetVisibleState( BOOL bShow=TRUE );
+ void SetVisibleState( sal_Bool bShow=sal_True );
SfxControllerItem* ChangeItemLink( SfxControllerItem* pNewBinding );
SfxControllerItem* GetItemLink() const;
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
index 116f56163681..64c9b539d2be 100644
--- a/sfx2/source/inc/templdgi.hxx
+++ b/sfx2/source/inc/templdgi.hxx
@@ -75,7 +75,7 @@ private:
protected:
SfxCommonTemplateDialog_Impl* pDialog;
- USHORT nModifier;
+ sal_uInt16 nModifier;
public:
DropListBox_Impl( Window* pParent, const ResId& rId, SfxCommonTemplateDialog_Impl* pD ) :
@@ -88,7 +88,7 @@ public:
using SvLBox::ExecuteDrop;
virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt );
- USHORT GetModifier() const { return nModifier; }
+ sal_uInt16 GetModifier() const { return nModifier; }
virtual long Notify( NotifyEvent& rNEvt );
};
@@ -166,11 +166,11 @@ protected:
ListBox aFilterLb;
Size aSize;
- USHORT nActFamily; // Id in der ToolBox = Position - 1
- USHORT nActFilter; // FilterIdx
- USHORT nAppFilter; // Filter, den die Applikation gesetzt hat (fuer automatisch)
+ sal_uInt16 nActFamily; // Id in der ToolBox = Position - 1
+ sal_uInt16 nActFilter; // FilterIdx
+ sal_uInt16 nAppFilter; // Filter, den die Applikation gesetzt hat (fuer automatisch)
- BOOL bDontUpdate :1,
+ sal_Bool bDontUpdate :1,
bIsWater :1,
bEnabled :1,
bUpdate :1,
@@ -192,14 +192,14 @@ protected:
DECL_LINK( TimeOut, Timer * );
- virtual void EnableItem( USHORT /*nMesId*/, BOOL /*bCheck*/ = TRUE ) {}
- virtual void CheckItem( USHORT /*nMesId*/, BOOL /*bCheck*/ = TRUE ) {}
- virtual BOOL IsCheckedItem( USHORT /*nMesId*/ ) { return TRUE; }
+ virtual void EnableItem( sal_uInt16 /*nMesId*/, sal_Bool /*bCheck*/ = sal_True ) {}
+ virtual void CheckItem( sal_uInt16 /*nMesId*/, sal_Bool /*bCheck*/ = sal_True ) {}
+ virtual sal_Bool IsCheckedItem( sal_uInt16 /*nMesId*/ ) { return sal_True; }
virtual void LoadedFamilies() {}
virtual void Update() { UpdateStyles_Impl(UPDATE_FAMILY_LIST); }
virtual void InvalidateBindings();
- virtual void InsertFamilyItem( USHORT nId, const SfxStyleFamilyItem* pIten ) = 0;
- virtual void EnableFamilyItem( USHORT nId, BOOL bEnabled = TRUE ) = 0;
+ virtual void InsertFamilyItem( sal_uInt16 nId, const SfxStyleFamilyItem* pIten ) = 0;
+ virtual void EnableFamilyItem( sal_uInt16 nId, sal_Bool bEnabled = sal_True ) = 0;
virtual void ClearFamilyList() = 0;
virtual void ReplaceUpdateButtonByMenu();
@@ -207,37 +207,37 @@ protected:
void EditHdl( void* );
void DeleteHdl( void* );
- BOOL Execute_Impl( USHORT nId, const String& rStr, const String& rRefStr,
- USHORT nFamily, USHORT nMask = 0,
- USHORT* pIdx = NULL, const USHORT* pModifier = NULL );
+ sal_Bool Execute_Impl( sal_uInt16 nId, const String& rStr, const String& rRefStr,
+ sal_uInt16 nFamily, sal_uInt16 nMask = 0,
+ sal_uInt16* pIdx = NULL, const sal_uInt16* pModifier = NULL );
- void UpdateStyles_Impl(USHORT nFlags);
+ void UpdateStyles_Impl(sal_uInt16 nFlags);
const SfxStyleFamilyItem* GetFamilyItem_Impl() const;
- BOOL IsInitialized() { return nActFamily != 0xffff; }
+ sal_Bool IsInitialized() { return nActFamily != 0xffff; }
void ResetFocus();
void EnableDelete();
void Initialize();
- void FilterSelect( USHORT nFilterIdx, BOOL bForce = FALSE );
- void SetFamilyState( USHORT nSlotId, const SfxTemplateItem* );
+ void FilterSelect( sal_uInt16 nFilterIdx, sal_Bool bForce = sal_False );
+ void SetFamilyState( sal_uInt16 nSlotId, const SfxTemplateItem* );
void SetWaterCanState( const SfxBoolItem* pItem );
void SelectStyle( const String& rStyle );
- BOOL HasSelectedStyle() const;
+ sal_Bool HasSelectedStyle() const;
void FillTreeBox();
void Update_Impl();
void UpdateFamily_Impl();
// In welchem FamilyState muss ich nachsehen, um die Info der i-ten
// Family in der pStyleFamilies zu bekommen.
- USHORT StyleNrToInfoOffset( USHORT i );
- USHORT InfoOffsetToStyleNr( USHORT i );
+ sal_uInt16 StyleNrToInfoOffset( sal_uInt16 i );
+ sal_uInt16 InfoOffsetToStyleNr( sal_uInt16 i );
void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
- void FamilySelect( USHORT nId );
- void SetFamily( USHORT nId );
- void ActionSelect( USHORT nId );
+ void FamilySelect( sal_uInt16 nId );
+ void SetFamily( sal_uInt16 nId );
+ void ActionSelect( sal_uInt16 nId );
sal_Int32 LoadFactoryStyleFilter( SfxObjectShell* i_pObjSh );
void SaveFactoryStyleFilter( SfxObjectShell* i_pObjSh, sal_Int32 i_nFilter );
@@ -251,31 +251,31 @@ public:
DECL_LINK( MenuSelectHdl, Menu * );
- virtual void EnableEdit( BOOL b = TRUE ) { bCanEdit = b; }
- virtual void EnableDel( BOOL b = TRUE ) { bCanDel = b; }
- virtual void EnableNew( BOOL b = TRUE ) { bCanNew = b; }
+ virtual void EnableEdit( sal_Bool b = sal_True ) { bCanEdit = b; }
+ virtual void EnableDel( sal_Bool b = sal_True ) { bCanDel = b; }
+ virtual void EnableNew( sal_Bool b = sal_True ) { bCanNew = b; }
ISfxTemplateCommon* GetISfxTemplateCommon() { return &aISfxTemplateCommon; }
Window* GetWindow() { return pWindow; }
- void EnableTreeDrag( BOOL b = TRUE );
+ void EnableTreeDrag( sal_Bool b = sal_True );
void ExecuteContextMenu_Impl( const Point& rPos, Window* pWin );
- void EnableExample_Impl( USHORT nId, BOOL bEnable );
+ void EnableExample_Impl( sal_uInt16 nId, sal_Bool bEnable );
SfxStyleFamily GetActualFamily() const;
String GetSelectedEntry() const;
SfxObjectShell* GetObjectShell() const { return pCurObjShell; }
virtual void PrepareDeleteAction(); // disable buttons, change button text, etc. when del is going to happen
- inline BOOL CanEdit( void ) const { return bCanEdit; }
- inline BOOL CanDel( void ) const { return bCanDel; }
- inline BOOL CanNew( void ) const { return bCanNew; }
+ inline sal_Bool CanEdit( void ) const { return bCanEdit; }
+ inline sal_Bool CanDel( void ) const { return bCanDel; }
+ inline sal_Bool CanNew( void ) const { return bCanNew; }
// normaly for derivates from SvTreeListBoxes, but in this case the dialog handles context menus
virtual PopupMenu* CreateContextMenu( void );
// Rechnet von den SFX_STYLE_FAMILY Ids auf 1-5 um
- static USHORT SfxFamilyIdToNId( SfxStyleFamily nFamily );
+ static sal_uInt16 SfxFamilyIdToNId( SfxStyleFamily nFamily );
void SetAutomaticFilter();
};
@@ -303,7 +303,7 @@ private:
friend class DropToolBox_Impl;
SfxTemplateDialog* m_pFloat;
- BOOL m_bZoomIn;
+ sal_Bool m_bZoomIn;
DropToolBox_Impl m_aActionTbL;
ToolBox m_aActionTbR;
@@ -314,13 +314,13 @@ private:
protected:
virtual void Command( const CommandEvent& rMEvt );
- virtual void EnableEdit( BOOL = TRUE );
- virtual void EnableItem( USHORT nMesId, BOOL bCheck = TRUE );
- virtual void CheckItem( USHORT nMesId, BOOL bCheck = TRUE );
- virtual BOOL IsCheckedItem( USHORT nMesId );
+ virtual void EnableEdit( sal_Bool = sal_True );
+ virtual void EnableItem( sal_uInt16 nMesId, sal_Bool bCheck = sal_True );
+ virtual void CheckItem( sal_uInt16 nMesId, sal_Bool bCheck = sal_True );
+ virtual sal_Bool IsCheckedItem( sal_uInt16 nMesId );
virtual void LoadedFamilies();
- virtual void InsertFamilyItem( USHORT nId, const SfxStyleFamilyItem* pIten );
- virtual void EnableFamilyItem( USHORT nId, BOOL bEnabled = TRUE );
+ virtual void InsertFamilyItem( sal_uInt16 nId, const SfxStyleFamilyItem* pIten );
+ virtual void EnableFamilyItem( sal_uInt16 nId, sal_Bool bEnabled = sal_True );
virtual void ClearFamilyList();
virtual void ReplaceUpdateButtonByMenu();
@@ -360,15 +360,15 @@ private:
SfxModalDefParentHelper aHelper;
protected:
- virtual void EnableItem( USHORT nMesId, BOOL bCheck = TRUE );
- virtual void CheckItem( USHORT nMesId, BOOL bCheck = TRUE );
- virtual BOOL IsCheckedItem( USHORT nMesId );
- virtual void InsertFamilyItem( USHORT nId, const SfxStyleFamilyItem* pIten );
- virtual void EnableFamilyItem( USHORT nId, BOOL bEnabled = TRUE );
+ virtual void EnableItem( sal_uInt16 nMesId, sal_Bool bCheck = sal_True );
+ virtual void CheckItem( sal_uInt16 nMesId, sal_Bool bCheck = sal_True );
+ virtual sal_Bool IsCheckedItem( sal_uInt16 nMesId );
+ virtual void InsertFamilyItem( sal_uInt16 nId, const SfxStyleFamilyItem* pIten );
+ virtual void EnableFamilyItem( sal_uInt16 nId, sal_Bool bEnabled = sal_True );
virtual void ClearFamilyList();
- virtual void EnableEdit( BOOL = TRUE );
- virtual void EnableDel( BOOL = TRUE );
- virtual void EnableNew( BOOL = TRUE );
+ virtual void EnableEdit( sal_Bool = sal_True );
+ virtual void EnableDel( sal_Bool = sal_True );
+ virtual void EnableNew( sal_Bool = sal_True );
using SfxCommonTemplateDialog_Impl::NewHdl;
DECL_LINK( FamListSelect, ListBox * );
diff --git a/sfx2/source/inc/tplcitem.hxx b/sfx2/source/inc/tplcitem.hxx
index f97d7f89868c..af2ede51701d 100644
--- a/sfx2/source/inc/tplcitem.hxx
+++ b/sfx2/source/inc/tplcitem.hxx
@@ -34,17 +34,17 @@ class SfxCommonTemplateDialog_Impl;
class SfxTemplateControllerItem: public SfxControllerItem {
SfxCommonTemplateDialog_Impl &rTemplateDlg;
- BYTE nWaterCanState;
+ sal_uInt8 nWaterCanState;
long nUserEventId;
DECL_STATIC_LINK(SfxTemplateControllerItem, SetWaterCanStateHdl_Impl,
SfxTemplateControllerItem*);
protected:
- virtual void StateChanged( USHORT, SfxItemState, const SfxPoolItem* pState );
+ virtual void StateChanged( sal_uInt16, SfxItemState, const SfxPoolItem* pState );
public:
- SfxTemplateControllerItem( USHORT nId, SfxCommonTemplateDialog_Impl &rDlg, SfxBindings &);
+ SfxTemplateControllerItem( sal_uInt16 nId, SfxCommonTemplateDialog_Impl &rDlg, SfxBindings &);
~SfxTemplateControllerItem();
};
diff --git a/sfx2/source/inc/versdlg.hxx b/sfx2/source/inc/versdlg.hxx
index 73b686d91252..0203d7744e9e 100644
--- a/sfx2/source/inc/versdlg.hxx
+++ b/sfx2/source/inc/versdlg.hxx
@@ -103,7 +103,7 @@ class SfxViewVersionDialog_Impl : public SfxModalDialog
public:
SfxViewVersionDialog_Impl( Window *pParent,
- SfxVersionInfo& rInfo, BOOL bEdit );
+ SfxVersionInfo& rInfo, sal_Bool bEdit );
};
#endif
diff --git a/sfx2/source/inc/virtmenu.hxx b/sfx2/source/inc/virtmenu.hxx
index 4b000133d11c..c54a627e2a78 100644
--- a/sfx2/source/inc/virtmenu.hxx
+++ b/sfx2/source/inc/virtmenu.hxx
@@ -54,21 +54,21 @@ private:
PopupMenu* pPickMenu;
PopupMenu* pAddonsMenu;
Timer* pAutoDeactivate; // Hack fuer QAP-Bug
- USHORT nVisibleItems;
- USHORT nId;
- USHORT nCount;
- USHORT nLocks;
- BOOL bResCtor : 1; // SV Menu created from resource
- BOOL bOLE : 1; // InPlaceMenu
- BOOL bHelpInitialized : 1;
- BOOL bIsActive : 1;
- BOOL bControllersUnBound : 1;
- BOOL bWasHighContrast : 1;
- BOOL bIsAddonPopupMenu : 1;
+ sal_uInt16 nVisibleItems;
+ sal_uInt16 nId;
+ sal_uInt16 nCount;
+ sal_uInt16 nLocks;
+ sal_Bool bResCtor : 1; // SV Menu created from resource
+ sal_Bool bOLE : 1; // InPlaceMenu
+ sal_Bool bHelpInitialized : 1;
+ sal_Bool bIsActive : 1;
+ sal_Bool bControllersUnBound : 1;
+ sal_Bool bWasHighContrast : 1;
+ sal_Bool bIsAddonPopupMenu : 1;
private:
void Construct_Impl();
- FASTBOOL Bind_Impl( Menu *pMenu );
+ bool Bind_Impl( Menu *pMenu );
inline SfxMenuCtrlArr_Impl& GetAppCtrl_Impl()
{
return pAppCtrl? *pAppCtrl: *(pAppCtrl = new SfxMenuCtrlArr_Impl) ;
@@ -77,8 +77,8 @@ private:
void BindControllers();
protected:
- SfxVirtualMenu( USHORT nOwnId, SfxVirtualMenu* pParent, Menu& rMenu, BOOL bWithHelp,
- SfxBindings &rBind, BOOL bOLEServer=FALSE, BOOL bRes=FALSE, BOOL bIsAddonMenu=FALSE );
+ SfxVirtualMenu( sal_uInt16 nOwnId, SfxVirtualMenu* pParent, Menu& rMenu, sal_Bool bWithHelp,
+ SfxBindings &rBind, sal_Bool bOLEServer=sal_False, sal_Bool bRes=sal_False, sal_Bool bIsAddonMenu=sal_False );
void CreateFromSVMenu();
DECL_LINK( Highlight, Menu * );
@@ -93,22 +93,22 @@ protected:
public:
~SfxVirtualMenu();
- SfxVirtualMenu( Menu *pStarViewMenu, BOOL bWithHelp,
- SfxBindings &rBind, BOOL bOLEServer=FALSE, BOOL bRes=FALSE, BOOL bIsAddonMenu=FALSE );
- void CheckItem( USHORT nItemId, BOOL bCheck );
- void EnableItem( USHORT nItemId, BOOL bEnable );
- void SetItemText( USHORT nItemId, const String& rText );
+ SfxVirtualMenu( Menu *pStarViewMenu, sal_Bool bWithHelp,
+ SfxBindings &rBind, sal_Bool bOLEServer=sal_False, sal_Bool bRes=sal_False, sal_Bool bIsAddonMenu=sal_False );
+ void CheckItem( sal_uInt16 nItemId, sal_Bool bCheck );
+ void EnableItem( sal_uInt16 nItemId, sal_Bool bEnable );
+ void SetItemText( sal_uInt16 nItemId, const String& rText );
- USHORT GetItemPos( USHORT nItemId ) const;
+ sal_uInt16 GetItemPos( sal_uInt16 nItemId ) const;
- USHORT GetItemCount() const;
+ sal_uInt16 GetItemCount() const;
Menu* GetSVMenu() const;
- SfxMenuControl& operator[]( USHORT nPos ) const;
+ SfxMenuControl& operator[]( sal_uInt16 nPos ) const;
- USHORT GetItemId( USHORT nPos ) const;
- SfxVirtualMenu* GetPopupMenu( USHORT nId ) const;
- String GetItemText( USHORT nId ) const;
- String GetItemHelpText( USHORT nId ) const;
+ sal_uInt16 GetItemId( sal_uInt16 nPos ) const;
+ SfxVirtualMenu* GetPopupMenu( sal_uInt16 nId ) const;
+ String GetItemText( sal_uInt16 nId ) const;
+ String GetItemHelpText( sal_uInt16 nId ) const;
//void InvalidateKeyCodes();
@@ -116,15 +116,15 @@ public:
void SetParentMenu( SfxVirtualMenu* pNewParent )
{ pParent = pNewParent; }
- void SetPopupMenu( USHORT nId, PopupMenu *pMenu );
- BOOL IsFromResource() const
+ void SetPopupMenu( sal_uInt16 nId, PopupMenu *pMenu );
+ sal_Bool IsFromResource() const
{ return bResCtor; }
- void InitPopup(USHORT nPos, BOOL bOLE = TRUE);
+ void InitPopup(sal_uInt16 nPos, sal_Bool bOLE = sal_True);
void InitializeHelp();
void SetResMgr(ResMgr* pMgr) {pResMgr = pMgr; }
ResMgr* GetResMgr() { return pResMgr; }
void SetHelpIds( ResMgr* );
- BOOL IsHiContrastMode() const;
+ sal_Bool IsHiContrastMode() const;
void UpdateImages();
DECL_LINK( Select, Menu * );
@@ -134,7 +134,7 @@ public:
// return the number of virtual items in this menu
-inline USHORT SfxVirtualMenu::GetItemCount() const
+inline sal_uInt16 SfxVirtualMenu::GetItemCount() const
{
return nCount;
}
@@ -142,7 +142,7 @@ inline USHORT SfxVirtualMenu::GetItemCount() const
//
-inline SfxMenuControl& SfxVirtualMenu::operator[]( USHORT nPos ) const
+inline SfxMenuControl& SfxVirtualMenu::operator[]( sal_uInt16 nPos ) const
{
return *(pItems+nPos);
}
@@ -150,7 +150,7 @@ inline SfxMenuControl& SfxVirtualMenu::operator[]( USHORT nPos ) const
// returns the item id at position nPos in the menu (or 0 if sep.)
-inline USHORT SfxVirtualMenu::GetItemId( USHORT nPos ) const
+inline sal_uInt16 SfxVirtualMenu::GetItemId( sal_uInt16 nPos ) const
{
return pItems ? pItems[nPos].GetId() : 0;
}
diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx
index 0e263a58b90e..8c06e1233297 100644
--- a/sfx2/source/inc/workwin.hxx
+++ b/sfx2/source/inc/workwin.hxx
@@ -61,10 +61,10 @@ class SfxWorkWindow;
struct SfxObjectBar_Impl
{
- USHORT nId; // Resource - und ConfigId der Toolbox
- USHORT nMode; // spezielle Sichtbarkeitsflags
- USHORT nPos;
- USHORT nIndex;
+ sal_uInt16 nId; // Resource - und ConfigId der Toolbox
+ sal_uInt16 nMode; // spezielle Sichtbarkeitsflags
+ sal_uInt16 nPos;
+ sal_uInt16 nIndex;
sal_Bool bDestroy;
String aName;
SfxInterface* pIFace;
@@ -81,14 +81,14 @@ struct SfxObjectBar_Impl
// Dieser struct h"alt alle relevanten Informationen "uber die Statuszeile bereit.
struct SfxStatBar_Impl
{
- USHORT nId;
- BOOL bOn;
- BOOL bTemp;
+ sal_uInt16 nId;
+ sal_Bool bOn;
+ sal_Bool bTemp;
SfxStatBar_Impl() :
nId(0),
- bOn(TRUE),
- bTemp(FALSE)
+ bOn(sal_True),
+ bTemp(sal_False)
{}
};
@@ -106,15 +106,15 @@ struct SfxChild_Impl
Window* pWin;
Size aSize;
SfxChildAlignment eAlign;
- USHORT nVisible;
- BOOL bResize;
- BOOL bCanGetFocus;
- BOOL bSetFocus;
+ sal_uInt16 nVisible;
+ sal_Bool bResize;
+ sal_Bool bCanGetFocus;
+ sal_Bool bSetFocus;
SfxChild_Impl( Window& rChild, const Size& rSize,
- SfxChildAlignment eAlignment, BOOL bIsVisible ):
- pWin(&rChild), aSize(rSize), eAlign(eAlignment), bResize(FALSE),
- bCanGetFocus( FALSE ), bSetFocus( FALSE )
+ SfxChildAlignment eAlignment, sal_Bool bIsVisible ):
+ pWin(&rChild), aSize(rSize), eAlign(eAlignment), bResize(sal_False),
+ bCanGetFocus( sal_False ), bSetFocus( sal_False )
{
nVisible = bIsVisible ? CHILD_VISIBLE : CHILD_NOT_VISIBLE;
}
@@ -126,34 +126,34 @@ class SfxChildWinController_Impl : public SfxControllerItem
SfxWorkWindow* pWorkwin;
public:
- SfxChildWinController_Impl( USHORT nId, SfxWorkWindow *pWin );
- virtual void StateChanged( USHORT nSID, SfxItemState eState,
+ SfxChildWinController_Impl( sal_uInt16 nId, SfxWorkWindow *pWin );
+ virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState );
};
struct SfxChildWin_Impl
{
- USHORT nSaveId; // die ChildWindow-Id
- USHORT nInterfaceId; // der aktuelle Context
- USHORT nId; // aktuelle Id
+ sal_uInt16 nSaveId; // die ChildWindow-Id
+ sal_uInt16 nInterfaceId; // der aktuelle Context
+ sal_uInt16 nId; // aktuelle Id
SfxChildWindow* pWin;
- BOOL bCreate;
+ sal_Bool bCreate;
SfxChildWinInfo aInfo;
SfxChild_Impl* pCli; // != 0 bei direkten Children
- USHORT nVisibility;
- BOOL bEnable;
- BOOL bDisabled;
+ sal_uInt16 nVisibility;
+ sal_Bool bEnable;
+ sal_Bool bDisabled;
SfxChildWin_Impl( sal_uInt32 nID ) :
- nSaveId((USHORT) (nID & 0xFFFF) ),
- nInterfaceId((USHORT) (nID >> 16)),
+ nSaveId((sal_uInt16) (nID & 0xFFFF) ),
+ nInterfaceId((sal_uInt16) (nID >> 16)),
nId(nSaveId),
pWin(0),
- bCreate(FALSE),
+ bCreate(sal_False),
pCli(0),
- nVisibility( FALSE ),
- bEnable( TRUE ),
- bDisabled( FALSE )
+ nVisibility( sal_False ),
+ bEnable( sal_True ),
+ bDisabled( sal_False )
{}
};
@@ -180,9 +180,9 @@ DECL_PTRARRAY( SfxChildWindows_Impl, SfxChildWin_Impl*, 2, 2 )
struct SfxObjectBarList_Impl
{
std::deque<SfxObjectBar_Impl> aArr;
- USHORT nAct;
+ sal_uInt16 nAct;
- SfxObjectBar_Impl operator[] ( USHORT n )
+ SfxObjectBar_Impl operator[] ( sal_uInt16 n )
{ return aArr[n]; }
SfxObjectBar_Impl Actual()
{ return aArr[nAct]; }
@@ -258,15 +258,15 @@ protected:
Window* pWorkWin;
SfxShell* pConfigShell;
Window* pActiveChild;
- USHORT nUpdateMode;
- USHORT nChilds;
- USHORT nOrigMode;
- BOOL bSorted : 1;
- BOOL bDockingAllowed : 1;
- BOOL bInternalDockingAllowed : 1;
- BOOL bAllChildsVisible : 1;
- BOOL bIsFullScreen : 1;
- BOOL bShowStatusBar : 1;
+ sal_uInt16 nUpdateMode;
+ sal_uInt16 nChilds;
+ sal_uInt16 nOrigMode;
+ sal_Bool bSorted : 1;
+ sal_Bool bDockingAllowed : 1;
+ sal_Bool bInternalDockingAllowed : 1;
+ sal_Bool bAllChildsVisible : 1;
+ sal_Bool bIsFullScreen : 1;
+ sal_Bool bShowStatusBar : 1;
sal_Int32 m_nLock;
rtl::OUString m_aStatusBarResName;
rtl::OUString m_aLayoutManagerPropName;
@@ -275,13 +275,13 @@ protected:
::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > m_xLayoutManagerListener;
protected:
- void CreateChildWin_Impl(SfxChildWin_Impl*,BOOL);
+ void CreateChildWin_Impl(SfxChildWin_Impl*,sal_Bool);
void RemoveChildWin_Impl(SfxChildWin_Impl*);
void Sort_Impl();
void AlignChild_Impl( Window& rWindow, const Size& rNewSize,
SfxChildAlignment eAlign );
SfxChild_Impl* FindChild_Impl( const Window& rWindow ) const;
- virtual BOOL RequestTopToolSpacePixel_Impl( SvBorder aBorder );
+ virtual sal_Bool RequestTopToolSpacePixel_Impl( SvBorder aBorder );
virtual Rectangle GetTopRect_Impl();
SvBorder Arrange_Impl();
virtual void SaveStatus_Impl(SfxChildWindow*, const SfxChildWinInfo&);
@@ -295,14 +295,14 @@ public:
{ return *pBindings; }
Window* GetWindow() const
{ return pWorkWin; }
- Rectangle GetFreeArea( BOOL bAutoHide ) const;
- void SetDockingAllowed(BOOL bSet)
+ Rectangle GetFreeArea( sal_Bool bAutoHide ) const;
+ void SetDockingAllowed(sal_Bool bSet)
{ bDockingAllowed = bSet; }
- void SetInternalDockingAllowed(BOOL bSet)
+ void SetInternalDockingAllowed(sal_Bool bSet)
{ bInternalDockingAllowed = bSet; }
- BOOL IsDockingAllowed() const
+ sal_Bool IsDockingAllowed() const
{ return bDockingAllowed; }
- BOOL IsInternalDockingAllowed() const
+ sal_Bool IsInternalDockingAllowed() const
{ return bInternalDockingAllowed; }
SfxWorkWindow* GetParent_Impl() const
{ return pParent; }
@@ -311,64 +311,64 @@ public:
// Methoden f"ur alle Child-Fenster
void DataChanged_Impl( const DataChangedEvent& rDCEvt );
void ReleaseChild_Impl( Window& rWindow );
- SfxChild_Impl* RegisterChild_Impl( Window& rWindow, SfxChildAlignment eAlign, BOOL bCanGetFocus=FALSE );
+ SfxChild_Impl* RegisterChild_Impl( Window& rWindow, SfxChildAlignment eAlign, sal_Bool bCanGetFocus=sal_False );
void ShowChilds_Impl();
void HideChilds_Impl();
void Close_Impl();
- BOOL PrepareClose_Impl();
- virtual void ArrangeChilds_Impl( BOOL bForce = TRUE );
+ sal_Bool PrepareClose_Impl();
+ virtual void ArrangeChilds_Impl( sal_Bool bForce = sal_True );
void DeleteControllers_Impl();
void SaveStatus_Impl();
- void HidePopups_Impl(BOOL bHide, BOOL bParent=FALSE, USHORT nId=0);
+ void HidePopups_Impl(sal_Bool bHide, sal_Bool bParent=sal_False, sal_uInt16 nId=0);
void ConfigChild_Impl(SfxChildIdentifier,
- SfxDockingConfig, USHORT);
- void MakeChildsVisible_Impl( BOOL bVis );
+ SfxDockingConfig, sal_uInt16);
+ void MakeChildsVisible_Impl( sal_Bool bVis );
void ArrangeAutoHideWindows( SfxSplitWindow *pSplit );
- BOOL IsAutoHideMode( const SfxSplitWindow *pSplit );
+ sal_Bool IsAutoHideMode( const SfxSplitWindow *pSplit );
void EndAutoShow_Impl( Point aPos );
- void SetFullScreen_Impl( BOOL bSet ) { bIsFullScreen = bSet; }
- BOOL IsFullScreen_Impl() const { return bIsFullScreen; }
+ void SetFullScreen_Impl( sal_Bool bSet ) { bIsFullScreen = bSet; }
+ sal_Bool IsFullScreen_Impl() const { return bIsFullScreen; }
// Methoden f"ur Objectbars
virtual void UpdateObjectBars_Impl();
void ResetObjectBars_Impl();
- void SetObjectBar_Impl( USHORT nPos, sal_uInt32 nResId,
+ void SetObjectBar_Impl( sal_uInt16 nPos, sal_uInt32 nResId,
SfxInterface *pIFace, const String* pName=0 );
- Window* GetObjectBar_Impl( USHORT nPos, sal_uInt32 nResId );
- FASTBOOL KnowsObjectBar_Impl( USHORT nPos ) const;
- BOOL IsVisible_Impl();
- void MakeVisible_Impl( BOOL );
- void SetObjectBarVisibility_Impl( USHORT nVis );
- BOOL IsContainer_Impl() const;
- void Lock_Impl( BOOL );
- void NextObjectBar_Impl( USHORT nPos );
- USHORT HasNextObjectBar_Impl( USHORT nPos, String* pStr=0 );
- void SetObjectBarCustomizeMode_Impl( BOOL );
+ Window* GetObjectBar_Impl( sal_uInt16 nPos, sal_uInt32 nResId );
+ bool KnowsObjectBar_Impl( sal_uInt16 nPos ) const;
+ sal_Bool IsVisible_Impl();
+ void MakeVisible_Impl( sal_Bool );
+ void SetObjectBarVisibility_Impl( sal_uInt16 nVis );
+ sal_Bool IsContainer_Impl() const;
+ void Lock_Impl( sal_Bool );
+ void NextObjectBar_Impl( sal_uInt16 nPos );
+ sal_uInt16 HasNextObjectBar_Impl( sal_uInt16 nPos, String* pStr=0 );
+ void SetObjectBarCustomizeMode_Impl( sal_Bool );
// Methoden f"ur ChildWindows
void UpdateChildWindows_Impl();
void ResetChildWindows_Impl();
- void SetChildWindowVisible_Impl( sal_uInt32, BOOL, USHORT );
- void ToggleChildWindow_Impl(USHORT,BOOL);
- BOOL HasChildWindow_Impl(USHORT);
- BOOL KnowsChildWindow_Impl(USHORT);
- void ShowChildWindow_Impl(USHORT, BOOL bVisible, BOOL bSetFocus);
- void SetChildWindow_Impl(USHORT, BOOL bOn, BOOL bSetFocus);
- SfxChildWindow* GetChildWindow_Impl(USHORT);
+ void SetChildWindowVisible_Impl( sal_uInt32, sal_Bool, sal_uInt16 );
+ void ToggleChildWindow_Impl(sal_uInt16,sal_Bool);
+ sal_Bool HasChildWindow_Impl(sal_uInt16);
+ sal_Bool KnowsChildWindow_Impl(sal_uInt16);
+ void ShowChildWindow_Impl(sal_uInt16, sal_Bool bVisible, sal_Bool bSetFocus);
+ void SetChildWindow_Impl(sal_uInt16, sal_Bool bOn, sal_Bool bSetFocus);
+ SfxChildWindow* GetChildWindow_Impl(sal_uInt16);
virtual void InitializeChild_Impl(SfxChildWin_Impl*);
SfxSplitWindow* GetSplitWindow_Impl(SfxChildAlignment);
- BOOL IsVisible_Impl( USHORT nMode ) const;
- void DisableChildWindow_Impl( USHORT nId, BOOL bDisable );
- BOOL IsFloating( USHORT nId );
+ sal_Bool IsVisible_Impl( sal_uInt16 nMode ) const;
+ void DisableChildWindow_Impl( sal_uInt16 nId, sal_Bool bDisable );
+ sal_Bool IsFloating( sal_uInt16 nId );
void ChangeWindow_Impl( Window *pNew );
void SetActiveChild_Impl( Window *pChild );
Window* GetActiveChild_Impl();
- virtual BOOL ActivateNextChild_Impl( BOOL bForward = TRUE );
+ virtual sal_Bool ActivateNextChild_Impl( sal_Bool bForward = sal_True );
bool AllowChildWindowCreation_Impl( const SfxChildWin_Impl& i_rCW ) const;
// Methoden f"ur StatusBar
- void SetTempStatusBar_Impl( BOOL bSet );
+ void SetTempStatusBar_Impl( sal_Bool bSet );
void ResetStatusBar_Impl();
void SetStatusBar_Impl(sal_uInt32 nResId, SfxShell *pShell, SfxBindings& );
void UpdateStatusBar_Impl();
@@ -382,7 +382,7 @@ class SfxFrameWorkWin_Impl : public SfxWorkWindow
SfxFrame* pFrame;
public:
SfxFrameWorkWin_Impl( Window* pWin, SfxFrame* pFrm, SfxFrame* pMaster );
- virtual void ArrangeChilds_Impl( BOOL bForce = TRUE );
+ virtual void ArrangeChilds_Impl( sal_Bool bForce = sal_True );
virtual void UpdateObjectBars_Impl();
virtual Rectangle GetTopRect_Impl();
};
generated by cgit (git 2.34.1) at 2024-07-12 09:11:15 +0000