diff options
| author | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2011-02-14 16:17:22 +0100 |
|---|---|---|
| committer | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2011-02-14 16:17:22 +0100 |
| commit | 1fb042333fe6287756ff1fac11d18cd7c150730d (patch) | |
| tree | 595de5d187177832ce656d7832af9dce9dce2d99 /sfx2/inc/macro.hxx | |
| parent | 5b3e910e926c7dd1e8dcfe8e0a5c6cb5bd17480a (diff) | |
| parent | cd0d6a5a6775f197fdb7e78b54c8133074a7a236 (diff) | |
rebase to DEV300_m100
Diffstat (limited to 'sfx2/inc/macro.hxx')
| -rw-r--r-- | sfx2/inc/macro.hxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sfx2/inc/macro.hxx b/sfx2/inc/macro.hxx index 79af6b7302dc..b6a0a2a655d5 100644 --- a/sfx2/inc/macro.hxx +++ b/sfx2/inc/macro.hxx @@ -16,17 +16,17 @@ class SfxMacro; class SfxMacroStatement { - USHORT nSlotId; // ausgef"uhrte Slot-Id oder 0, wenn manuell + sal_uInt16 nSlotId; // ausgef"uhrte Slot-Id oder 0, wenn manuell ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue > aArgs; // aktuelle Parameter, falls nSlotId != 0 String aStatement; // Statement in BASIC-Syntax (ggf. mit CR/LF) - BOOL bDone; // auskommentieren wenn kein Done() gerufen + sal_Bool bDone; // auskommentieren wenn kein Done() gerufen void* pDummy; // f"ur alle F"alle zum kompatibel bleiben #ifdef _SFXMACRO_HXX private: void GenerateNameAndArgs_Impl( SfxMacro *pMacro, const SfxSlot &rSlot, - BOOL bRequestDone, + sal_Bool bRequestDone, ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& aArgs ); #endif @@ -35,28 +35,28 @@ public: SfxMacroStatement( const String &rTarget, const SfxSlot &rSlot, - BOOL bRequestDone, + sal_Bool bRequestDone, ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& aArgs ); SfxMacroStatement( const SfxShell &rShell, const String &rTarget, - BOOL bAbsolute, + sal_Bool bAbsolute, const SfxSlot &rSlot, - BOOL bRequestDone, + sal_Bool bRequestDone, ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& aArgs ); SfxMacroStatement( const String &rStatment ); ~SfxMacroStatement(); - USHORT GetSlotId() const; + sal_uInt16 GetSlotId() const; const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& GetArgs() const; - BOOL IsDone() const; + sal_Bool IsDone() const; const String& GetStatement() const; }; //-------------------------------------------------------------------- -inline USHORT SfxMacroStatement::GetSlotId() const +inline sal_uInt16 SfxMacroStatement::GetSlotId() const /* [Beschreibung] @@ -89,7 +89,7 @@ inline const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::Property //-------------------------------------------------------------------- -inline BOOL SfxMacroStatement::IsDone() const +inline sal_Bool SfxMacroStatement::IsDone() const /* [Beschreibung] |