diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-19 12:24:29 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-19 12:24:29 +0200 |
commit | 92667c8edbaee9a252b1d5d221eb62849f76697c (patch) | |
tree | 8f1d329f2259b7d5bff054bc14d0965637df6961 /sfx2/inc/macro.hxx | |
parent | baecdfb578cb7bc992944857ad4d8882ef7e842c (diff) | |
parent | 48b4a99ce2451f1ddf2e8e128bbfcd6683072999 (diff) |
Merge branch 'master' into feature/gnumake4
Conflicts:
connectivity/source/cpool/Zregistration.cxx
connectivity/source/drivers/evoab/LCatalog.cxx
connectivity/source/drivers/evoab/LColumnAlias.cxx
connectivity/source/drivers/evoab/LColumnAlias.hxx
connectivity/source/drivers/evoab/LColumns.cxx
connectivity/source/drivers/evoab/LColumns.hxx
connectivity/source/drivers/evoab/LConfigAccess.cxx
connectivity/source/drivers/evoab/LConfigAccess.hxx
connectivity/source/drivers/evoab/LConnection.cxx
connectivity/source/drivers/evoab/LConnection.hxx
connectivity/source/drivers/evoab/LDatabaseMetaData.cxx
connectivity/source/drivers/evoab/LDatabaseMetaData.hxx
connectivity/source/drivers/evoab/LDriver.cxx
connectivity/source/drivers/evoab/LDriver.hxx
connectivity/source/drivers/evoab/LFolderList.cxx
connectivity/source/drivers/evoab/LFolderList.hxx
connectivity/source/drivers/evoab/LNoException.cxx
connectivity/source/drivers/evoab/LPreparedStatement.cxx
connectivity/source/drivers/evoab/LPreparedStatement.hxx
connectivity/source/drivers/evoab/LResultSet.cxx
connectivity/source/drivers/evoab/LResultSet.hxx
connectivity/source/drivers/evoab/LServices.cxx
connectivity/source/drivers/evoab/LStatement.cxx
connectivity/source/drivers/evoab/LStatement.hxx
connectivity/source/drivers/evoab/LTable.cxx
connectivity/source/drivers/evoab/LTable.hxx
connectivity/source/drivers/evoab/LTables.cxx
connectivity/source/drivers/evoab/LTables.hxx
connectivity/source/drivers/evoab/evoab.xml
connectivity/source/drivers/evoab/makefile.mk
editeng/Library_editeng.mk
framework/Library_fwe.mk
framework/test/test.cxx
idl/prj/d.lst
idl/util/idlpch.cxx
linguistic/Makefile
linguistic/Module_linguistic.mk
linguistic/inc/linguistic/lngdllapi.h
linguistic/inc/linguistic/lngprophelp.hxx
linguistic/inc/linguistic/misc.hxx
linguistic/prj/build.lst
linguistic/prj/d.lst
linguistic/qa/unoapi/Test.java
linguistic/source/grammarchecker.cxx
linguistic/source/grammarchecker.hxx
linguistic/source/hyphdta.cxx
linguistic/source/lngprophelp.cxx
linguistic/source/makefile.mk
linguistic/source/spelldta.cxx
sfx2/Library_qstart.mk
sfx2/Library_sfx.mk
sfx2/inc/sfx2/qswin32.h
sfx2/prj/build.lst
sfx2/qa/cppunit/makefile.mk
xmlscript/inc/xmlscript/xcrdllapi.h
xmlscript/prj/d.lst
xmlscript/util/makefile.mk
Diffstat (limited to 'sfx2/inc/macro.hxx')
-rw-r--r-- | sfx2/inc/macro.hxx | 102 |
1 files changed, 50 insertions, 52 deletions
diff --git a/sfx2/inc/macro.hxx b/sfx2/inc/macro.hxx index b6a0a2a655d5..b9e4b18dbe8d 100644 --- a/sfx2/inc/macro.hxx +++ b/sfx2/inc/macro.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ #ifndef _SFXMACRO_HXX #define _SFXMACRO_HXX @@ -16,11 +17,11 @@ class SfxMacro; class SfxMacroStatement { - 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) - sal_Bool bDone; // auskommentieren wenn kein Done() gerufen - void* pDummy; // f"ur alle F"alle zum kompatibel bleiben + sal_uInt16 nSlotId; // performed Slot-Id or 0, if manually + ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue > aArgs; // current Parameter, in case nSlotId != 0 + String aStatement; // Statement in BASIC-Syntax (if necessary with CR/LF) + sal_Bool bDone; // comment out if no Done() is called + void* pDummy; // for all cases, to remain compatible #ifdef _SFXMACRO_HXX private: @@ -58,11 +59,10 @@ public: inline sal_uInt16 SfxMacroStatement::GetSlotId() const -/* [Beschreibung] +/* [Description] - Liefert die Slot-Id die das Statement beim Abspielen wieder ausf"uhren - soll oder 0, falls das Statement manuell (<SFX_SLOT_RECORDMANUAL>) - aufgezeichnet wurde. + Returns the Slot-Id which the Statement should redo when called or 0 + if the Statement (<SFX_SLOT_RECORDMANUAL>) was recorded manually. */ { @@ -73,14 +73,13 @@ inline sal_uInt16 SfxMacroStatement::GetSlotId() const inline const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& SfxMacroStatement::GetArgs() const -/* [Beschreibung] +/* [Description] - Liefert die Parameter mit denen Statement ausgef"uhrt wurde oder 0, - falls das Statement manuell (<SFX_SLOT_RECORDMANUAL>) aufgezeichnet - wurde. + Returns the Parameter which was used in the call of the Statement or 0 + if the Statement (<SFX_SLOT_RECORDMANUAL>) was recorded manually - Der R"uckgabewert geh"ort dem SfxMacroStatement und ist nur im - unmittelbar aufrufenden Stackframe g"ultig. + The returned value belongs to the SfxMacroStatement and is only valid + to the Stackframe. */ { @@ -91,11 +90,11 @@ inline const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::Property inline sal_Bool SfxMacroStatement::IsDone() const -/* [Beschreibung] +/* [Description] - Liefert TRUE, wenn das Statement wirklich ausgef"uhrt wurde, - also z.B. nicht vom Benutzer abgebrochen wurde. Wurde es nicht - wirklich ausgef"uhrt, dann wird es im BASIC-Source auskommentiert. + Returns TRUE only if the Statement really was excecuted, so for instance + not if it was canceled by the user. If it was not excecuted the + BASIC-Source would be commented out. */ { @@ -104,18 +103,18 @@ inline sal_Bool SfxMacroStatement::IsDone() const //-------------------------------------------------------------------- -/* [Beschreibung] +/* [Description] - Liefert das Statement in BASIC-Syntax. Wurde das Makro manuell erzeugt, - wird genau der im Konstruktor angegebene String zur"uckgegeben, sonst - der generierte Source-Code. + Returns the Statement in BASIC-Syntax. If the Macro was created manually, + the string will be returned exactly as given in the constructor, else the + generated Source-Code is returned. - Bei beiden Arten ist es m"oglich, da\s mehrere BASIC-Statements, jeweils - mit CR/LF getrennt in dem String enthalten sind, da ein SFx-Statement - ggf. in mehrere BASIC-Statements "ubersetzt wird. + It is possible in both of the above cases that several BASIC-Statements, + each contains CR / LF separators in the string, since a SFx statement + is translated if necessary into several BASIC statements. - Statements f"ur die nicht <SfxRequest::Done()> gerufen wurde, werden - mit einem vorangestellten 'rem' gekennzeichnet. + Statements for which <SfxRequest::Done()> was not called are marked + with a preceding 'rem'. */ inline const String& SfxMacroStatement::GetStatement() const @@ -127,41 +126,38 @@ inline const String& SfxMacroStatement::GetStatement() const enum SfxMacroMode -/* [Beschreibung] +/* [Description] - Mit diesem enum wird bestimmt, ob eine <SfxMacro>-Instanz zum - absoluten oder relativen Recorden erzeugt wurde, oder um ein - existierendendes Makro zu Referenzieren. + By using this enum it is determined, if a <SfxMacro>-Instance was created + by absolute or relative recording, or to create a reference to a existing + macro. */ { - SFX_MACRO_EXISTING, /* es handelt sich um ein bereits - exitistierendes Makro, welches lediglich - referenziert wird */ - - SFX_MACRO_RECORDINGABSOLUTE,/* dieses Makro soll aufgezeichnet werden, - wobei die betroffenen Objekte m"oglichst - direkt angesprochen werden sollen - (Beispiel: "[doc.sdc]") */ - - SFX_MACRO_RECORDINGRELATIVE/* dieses Makro soll aufgezeichnet werden, - wobei die betroffenen Objekte so - angesprochen werden sollen, da\s sich das - Abspielen auf die dann g"ultige Selektion - bezieht (Beispiel: "ActiveDocument()") */ + SFX_MACRO_EXISTING, /* Indicates that it is a existing + macro, which will only referenced */ + + SFX_MACRO_RECORDINGABSOLUTE, /* This macro shall be recorded so that the + affected objects are to be addressed as + directly as possible (example: "[doc.sdc]") */ + + SFX_MACRO_RECORDINGRELATIVE /* This macro is recorded and the affected + objects are addressed in such a way so + that when running the macro it refers to + a vaild selection + (example:" active document () ") */ }; //==================================================================== class SfxMacro -/* [Beschreibung] +/* [Description] - "Uber diese Klasse (bzw. genaugenommen ihre Subklassen) wird zum - einen die Lokation einer BASIC-Funktion (also in welcher Library, - in welchem Modul sowie der Funktions-Name) beschrieben, als auch - ein aufzuzeichnendes Makro w"ahrend der Aufzeichnung zwischen- - gespeichert. + Through using this class (and in fact its subclasses) the location of a + BASIC function will be discribed (also in which Library, in which module + and the Function name) as well as temporary storing a macro during the + recording. */ { @@ -181,3 +177,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |