[Libreoffice-commits] core.git: include/svtools
Michael Weghorn
m.weghorn at posteo.de
Tue Dec 16 12:37:31 PST 2014
include/svtools/htmlkywd.hxx | 56 +++++++++++++++++++++----------------------
include/svtools/htmlout.hxx | 4 +--
include/svtools/imap.hxx | 40 +++++++++++++-----------------
include/svtools/imapcirc.hxx | 6 ++--
include/svtools/imaprect.hxx | 6 ++--
5 files changed, 54 insertions(+), 58 deletions(-)
New commits:
commit 390c62dfe435469fe550ff223be55cf0d1026253
Author: Michael Weghorn <m.weghorn at posteo.de>
Date: Tue Dec 16 18:32:29 2014 +0100
fdo#39468 translate German comments
Change-Id: I0a70863a9227cfc7e7b5616fe8fc8d14434ec9ce
Reviewed-on: https://gerrit.libreoffice.org/13496
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/include/svtools/htmlkywd.hxx b/include/svtools/htmlkywd.hxx
index 63c3f70..d114da8 100644
--- a/include/svtools/htmlkywd.hxx
+++ b/include/svtools/htmlkywd.hxx
@@ -25,7 +25,7 @@
#define OOO_STRING_SVTOOLS_HTML_doctype40 \
"HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\""
-// diese werden nur eingeschaltet
+// these are only switched on
#define OOO_STRING_SVTOOLS_HTML_area "area"
#define OOO_STRING_SVTOOLS_HTML_base "base"
#define OOO_STRING_SVTOOLS_HTML_comment "!--"
@@ -43,7 +43,7 @@
#define OOO_STRING_SVTOOLS_HTML_param "param"
#define OOO_STRING_SVTOOLS_HTML_spacer "spacer"
-// diese werden wieder abgeschaltet
+// these are switched off again
#define OOO_STRING_SVTOOLS_HTML_abbreviation "abbrev"
#define OOO_STRING_SVTOOLS_HTML_acronym "acronym"
#define OOO_STRING_SVTOOLS_HTML_address "address"
@@ -143,7 +143,7 @@
#define OOO_STRING_SVTOOLS_HTML_plaintext2 "plaintext"
#define OOO_STRING_SVTOOLS_HTML_sdfield "sdfield"
-// die Namen fuer alle Zeichen
+// names for all characters
#define OOO_STRING_SVTOOLS_HTML_C_lt "lt"
#define OOO_STRING_SVTOOLS_HTML_C_gt "gt"
#define OOO_STRING_SVTOOLS_HTML_C_amp "amp"
@@ -400,9 +400,9 @@
#define OOO_STRING_SVTOOLS_HTML_S_zwj "zwj"
#define OOO_STRING_SVTOOLS_HTML_S_zwnj "zwnj"
-// HTML Attribut-Token (=Optionen)
+// HTML attribute tokens (=options)
-// Attribute ohne Wert
+// attributes without value
#define OOO_STRING_SVTOOLS_HTML_O_checked "checked"
#define OOO_STRING_SVTOOLS_HTML_O_compact "compact"
#define OOO_STRING_SVTOOLS_HTML_O_declare "declare"
@@ -417,7 +417,7 @@
#define OOO_STRING_SVTOOLS_HTML_O_sdfixed "sdfixed"
#define OOO_STRING_SVTOOLS_HTML_O_selected "selected"
-// Attribute mit einem String als Wert
+// attributes with a string as value
#define OOO_STRING_SVTOOLS_HTML_O_accesskey "accesskey"
#define OOO_STRING_SVTOOLS_HTML_O_accept "accept"
#define OOO_STRING_SVTOOLS_HTML_O_alt "alt"
@@ -447,12 +447,12 @@
#define OOO_STRING_SVTOOLS_HTML_O_sdevent "sdevent-"
#define OOO_STRING_SVTOOLS_HTML_O_sdaddparam "sdaddparam-"
-// Attribute mit einem SGML-Identifier als Wert
+// attributes with an SGML identifier as value
#define OOO_STRING_SVTOOLS_HTML_O_id "id"
#define OOO_STRING_SVTOOLS_HTML_O_target "target"
#define OOO_STRING_SVTOOLS_HTML_O_to "to"
-// Attribute mit einem URI als Wert
+// attributes with an URI as value
#define OOO_STRING_SVTOOLS_HTML_O_action "action"
#define OOO_STRING_SVTOOLS_HTML_O_archive "archive"
#define OOO_STRING_SVTOOLS_HTML_O_background "background"
@@ -464,7 +464,7 @@
#define OOO_STRING_SVTOOLS_HTML_O_src "src"
#define OOO_STRING_SVTOOLS_HTML_O_usemap "usemap"
-// Attribute mit einer Farbe als Wert (alle Netscape)
+// attributes with a colour as value (all Netscape)
#define OOO_STRING_SVTOOLS_HTML_O_alink "alink"
#define OOO_STRING_SVTOOLS_HTML_O_bgcolor "bgcolor"
#define OOO_STRING_SVTOOLS_HTML_O_bordercolor "bordercolor"
@@ -475,7 +475,7 @@
#define OOO_STRING_SVTOOLS_HTML_O_text "text"
#define OOO_STRING_SVTOOLS_HTML_O_vlink "vlink"
-// Attribute mit einem numerischen Wert
+// attributes with a numerical value
#define OOO_STRING_SVTOOLS_HTML_O_border "border"
#define OOO_STRING_SVTOOLS_HTML_O_cellspacing "cellspacing"
#define OOO_STRING_SVTOOLS_HTML_O_cellpadding "cellpadding"
@@ -499,7 +499,7 @@
#define OOO_STRING_SVTOOLS_HTML_O_width "width"
#define OOO_STRING_SVTOOLS_HTML_O_zindex "z-index"
-// Attribute mit Enum-Werten
+// attributes with enum values
#define OOO_STRING_SVTOOLS_HTML_O_behavior "behavior"
#define OOO_STRING_SVTOOLS_HTML_O_clear "clear"
#define OOO_STRING_SVTOOLS_HTML_O_dir "dir"
@@ -519,7 +519,7 @@
#define OOO_STRING_SVTOOLS_HTML_O_valuetype "valuetype"
#define OOO_STRING_SVTOOLS_HTML_O_wrap "wrap"
-// Attribute mit Script-Code als Wert
+// attributes with script code as value
#define OOO_STRING_SVTOOLS_HTML_O_onblur "onblur"
#define OOO_STRING_SVTOOLS_HTML_O_onchange "onchange"
#define OOO_STRING_SVTOOLS_HTML_O_onclick "onclick"
@@ -547,7 +547,7 @@
#define OOO_STRING_SVTOOLS_HTML_O_SDonerror "sdonerror"
#define OOO_STRING_SVTOOLS_HTML_O_SDonmouseout "sdonmouseout"
-// Attribute mit Kontext-abhaengigen Werten
+// attributes with context-dependent values
#define OOO_STRING_SVTOOLS_HTML_O_align "align"
#define OOO_STRING_SVTOOLS_HTML_O_cols "cols"
#define OOO_STRING_SVTOOLS_HTML_O_rows "rows"
@@ -555,7 +555,7 @@
#define OOO_STRING_SVTOOLS_HTML_O_size "size"
#define OOO_STRING_SVTOOLS_HTML_O_units "units"
-// Werte von <INPUT TYPE=...>
+// values of <INPUT TYPE=...>
#define OOO_STRING_SVTOOLS_HTML_IT_text "text"
#define OOO_STRING_SVTOOLS_HTML_IT_password "password"
#define OOO_STRING_SVTOOLS_HTML_IT_checkbox "checkbox"
@@ -569,7 +569,7 @@
#define OOO_STRING_SVTOOLS_HTML_IT_reset "reset"
#define OOO_STRING_SVTOOLS_HTML_IT_button "button"
-// Werte von <TABLE FRAME=...>
+// values of <TABLE FRAME=...>
#define OOO_STRING_SVTOOLS_HTML_TF_void "void"
#define OOO_STRING_SVTOOLS_HTML_TF_above "above"
#define OOO_STRING_SVTOOLS_HTML_TF_below "below"
@@ -580,14 +580,14 @@
#define OOO_STRING_SVTOOLS_HTML_TF_box "box"
#define OOO_STRING_SVTOOLS_HTML_TF_border "border"
-// Werte von <TABLE RULES=...>
+// values of <TABLE RULES=...>
#define OOO_STRING_SVTOOLS_HTML_TR_none "none"
#define OOO_STRING_SVTOOLS_HTML_TR_groups "groups"
#define OOO_STRING_SVTOOLS_HTML_TR_rows "rows"
#define OOO_STRING_SVTOOLS_HTML_TR_cols "cols"
#define OOO_STRING_SVTOOLS_HTML_TR_all "all"
-// Werte von <P, H?, TR, TH, TD ALIGN=...>
+// values of <P, H?, TR, TH, TD ALIGN=...>
#define OOO_STRING_SVTOOLS_HTML_AL_left "left"
#define OOO_STRING_SVTOOLS_HTML_AL_center "center"
#define OOO_STRING_SVTOOLS_HTML_AL_middle "middle"
@@ -597,7 +597,7 @@
#define OOO_STRING_SVTOOLS_HTML_AL_all "all"
#define OOO_STRING_SVTOOLS_HTML_AL_none "none"
-// Werte von <TR VALIGN=...>, <IMG ALIGN=...>
+// values of <TR VALIGN=...>, <IMG ALIGN=...>
#define OOO_STRING_SVTOOLS_HTML_VA_top "top"
#define OOO_STRING_SVTOOLS_HTML_VA_middle "middle"
#define OOO_STRING_SVTOOLS_HTML_VA_bottom "bottom"
@@ -606,7 +606,7 @@
#define OOO_STRING_SVTOOLS_HTML_VA_absmiddle "absmiddle"
#define OOO_STRING_SVTOOLS_HTML_VA_absbottom "absbottom"
-// Werte von <AREA SHAPE=...>
+// values of <AREA SHAPE=...>
#define OOO_STRING_SVTOOLS_HTML_SH_rect "rect"
#define OOO_STRING_SVTOOLS_HTML_SH_rectangle "rectangle"
#define OOO_STRING_SVTOOLS_HTML_SH_circ "circ"
@@ -620,15 +620,15 @@
#define OOO_STRING_SVTOOLS_HTML_LG_javascript11 "javascript1.1"
#define OOO_STRING_SVTOOLS_HTML_LG_livescript "livescript"
-// ein par Werte fuer unser StarBASIC-Support
+// a few values for StarBASIC-Support
#define OOO_STRING_SVTOOLS_HTML_SB_library "$LIBRARY:"
#define OOO_STRING_SVTOOLS_HTML_SB_module "$MODULE:"
-// Werte von <FORM METHOD=...>
+// values of <FORM METHOD=...>
#define OOO_STRING_SVTOOLS_HTML_METHOD_get "get"
#define OOO_STRING_SVTOOLS_HTML_METHOD_post "post"
-// Werte von <META CONTENT/HTTP-EQUIV=...>
+// values of <META CONTENT/HTTP-EQUIV=...>
#define OOO_STRING_SVTOOLS_HTML_META_refresh "refresh"
#define OOO_STRING_SVTOOLS_HTML_META_generator "generator"
#define OOO_STRING_SVTOOLS_HTML_META_author "author"
@@ -643,33 +643,33 @@
#define OOO_STRING_SVTOOLS_HTML_META_sdendnote "sdendnote"
#define OOO_STRING_SVTOOLS_HTML_META_sdfootnote "sdfootnote"
-// Werte von <UL TYPE=...>
+// values of <UL TYPE=...>
#define OOO_STRING_SVTOOLS_HTML_ULTYPE_disc "disc"
#define OOO_STRING_SVTOOLS_HTML_ULTYPE_square "square"
#define OOO_STRING_SVTOOLS_HTML_ULTYPE_circle "circle"
-// Werte von <FRAMESET SCROLLING=...>
+// values of <FRAMESET SCROLLING=...>
#define OOO_STRING_SVTOOLS_HTML_SCROLL_yes "yes"
#define OOO_STRING_SVTOOLS_HTML_SCROLL_no "no"
#define OOO_STRING_SVTOOLS_HTML_SCROLL_auto "auto"
-// Werte von <MULTICOL TYPE=...>
+// values of <MULTICOL TYPE=...>
#define OOO_STRING_SVTOOLS_HTML_MCTYPE_horizontal "horizontal"
#define OOO_STRING_SVTOOLS_HTML_MCTYPE_vertical "vertical"
#define OOO_STRING_SVTOOLS_HTML_MCTYPE_box "box"
-// Werte von <MARQUEE BEHAVIOUR=...>
+// values of <MARQUEE BEHAVIOUR=...>
#define OOO_STRING_SVTOOLS_HTML_BEHAV_scroll "scroll"
#define OOO_STRING_SVTOOLS_HTML_BEHAV_slide "slide"
#define OOO_STRING_SVTOOLS_HTML_BEHAV_alternate "alternate"
-// Werte von <MARQUEE LOOP=...>
+// values of <MARQUEE LOOP=...>
#define OOO_STRING_SVTOOLS_HTML_LOOP_infinite "infinite"
#define OOO_STRING_SVTOOLS_HTML_SPTYPE_block "block"
#define OOO_STRING_SVTOOLS_HTML_SPTYPE_horizontal "horizontal"
#define OOO_STRING_SVTOOLS_HTML_SPTYPE_vertical "vertical"
-// interne Grafik-Namen
+// internal graphics names
#define OOO_STRING_SVTOOLS_HTML_private_image "private:image/"
#define OOO_STRING_SVTOOLS_HTML_internal_gopher "internal-gopher-"
#define OOO_STRING_SVTOOLS_HTML_internal_icon "internal-icon-"
diff --git a/include/svtools/htmlout.hxx b/include/svtools/htmlout.hxx
index 5612207..671565f 100644
--- a/include/svtools/htmlout.hxx
+++ b/include/svtools/htmlout.hxx
@@ -91,8 +91,8 @@ struct HTMLOutFuncs
rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252,
OUString *pNonConvertableChars = 0 );
- // der 3. Parameter ist ein Array von HTMLOutEvents, das mit einem
- // nur aus 0 bestehen Eintrag terminiert ist.
+ // the 3rd parameter is an array of HTMLOutEvents which is terminated
+ // by an entry that consists only of 0s
SVT_DLLPUBLIC static SvStream& Out_Events( SvStream&, const SvxMacroTableDtor&,
const HTMLOutEvent*, bool bOutStarBasic,
rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252,
diff --git a/include/svtools/imap.hxx b/include/svtools/imap.hxx
index 951251d..140aadc 100644
--- a/include/svtools/imap.hxx
+++ b/include/svtools/imap.hxx
@@ -41,11 +41,11 @@ private:
protected:
- // Binaer laden/speichern
+ // binary saving/loading
void ImpWriteImageMap( SvStream& rOStm, const OUString& ) const ;
void ImpReadImageMap( SvStream& rIStm, size_t nCount, const OUString& );
- // Im-/Export
+ // Import/Export
void ImpWriteCERN( SvStream& rOStm, const OUString& rBaseURL ) const;
void ImpWriteNCSA( SvStream& rOStm, const OUString& rBaseURL ) const;
sal_uLong ImpReadCERN( SvStream& rOStm, const OUString& rBaseURL );
@@ -70,56 +70,52 @@ public:
ImageMap( const OUString& rName );
ImageMap( const ImageMap& rImageMap );
- // Der Dtor gibt den intern belegten
- // Speicher wieder frei;
- // alle IMapObjekte werden im Dtor zerstoert;
+ // all IMapObjects are destroyed in the destructor
virtual ~ImageMap();
- // Zuweisungsoperator
ImageMap& operator=( const ImageMap& rImageMap );
- // Vergleichsoperator (es wird alles auf Gleichheit geprueft)
+ // comparison (everything is checked for equality)
bool operator==( const ImageMap& rImageMap );
bool operator!=( const ImageMap& rImageMap );
- // In die Map wird ein neues IMap-Obkekt ans Ende eingefuegt
+ // a new IMap object is inserted at the end of the Map
void InsertIMapObject( const IMapObject& rIMapObject );
- // Zugriff auf einzelne IMapObjekte; die Objekte
- // duerfen von aussen _nicht_ zerstoert werden
+ // access to the single ImapObjects; the objects may
+ // not be destroyed from outside
IMapObject* GetIMapObject( size_t nPos ) const
{
return ( nPos < maList.size() ) ? maList[ nPos ] : NULL;
}
- // Gibt das Objekt zurueck, das zuerst getroffen wurde oder NULL;
- // Groessen- und Positionsangaben sind in 1/100mm;
- // rTotalSize ist die Originalgroesse des Bildes;
- // rDisplaySize die aktuelle Darstellungsgroesse;
- // rRelPoint bezieht sich auf die Darstellungsgroesse
- // und die linke oebere Ecke des Bildes
+ // returns the object which was hit first or NULL;
+ // size and position values are in 1/100mm;
+ // rTotalSize is the original size of the image
+ // rDisplaySize is the current size;
+ // rRelPoint relates to the display size and the upper left
+ // corener of the image
IMapObject* GetHitIMapObject( const Size& rOriginalSize,
const Size& rDisplaySize,
const Point& rRelHitPoint,
sal_uLong nFlags = 0 );
- // Gibt die Gesamtanzahl der IMap-Objekte zurueck
+ // returns the total amount of IMap objects
size_t GetIMapObjectCount() const { return maList.size(); }
- // Loescht alle internen Objekte
+ // deletes all internal objects
void ClearImageMap();
- // liefert die aktuelle Versionsnummer
+ // returns the current version number
sal_uInt16 GetVersion() const;
- // liefert / setzt den Namen der ImageMap
const OUString& GetName() const { return aName; }
void SetName( const OUString& rName ) { aName = rName; }
- // skaliert alle Objekte der ImageMap entpr. dem uebergebenen Faktor
+ // scales all objects of the ImageMap according to the given factor
void Scale( const Fraction& rFractX, const Fraction& rFracY );
- // Im-/Export
+ // Import/Export
void Write ( SvStream& rOStm, const OUString& rBaseURL ) const;
void Read( SvStream& rIStm, const OUString& rBaseURL );
diff --git a/include/svtools/imapcirc.hxx b/include/svtools/imapcirc.hxx
index 2ce4127..8b6b194 100644
--- a/include/svtools/imapcirc.hxx
+++ b/include/svtools/imapcirc.hxx
@@ -34,7 +34,7 @@ class SVT_DLLPUBLIC IMapCircleObject : public IMapObject
protected:
- // Binaer-Im-/Export
+ // binary import/export
virtual void WriteIMapObject( SvStream& rOStm ) const SAL_OVERRIDE;
virtual void ReadIMapObject( SvStream& rIStm ) SAL_OVERRIDE;
@@ -57,7 +57,7 @@ public:
Point GetCenter( bool bPixelCoords = true ) const;
sal_uLong GetRadius( bool bPixelCoords = true ) const;
- // liefert das BoundRect des Kreis-Objektes in 1/100mm
+ // returns the BoundRect of the circle object in 1/100mm
virtual Rectangle GetBoundRect() const SAL_OVERRIDE;
void Scale( const Fraction& rFractX, const Fraction& rFracY );
@@ -65,7 +65,7 @@ public:
using IMapObject::IsEqual;
bool IsEqual( const IMapCircleObject& rEqObj );
- // Im-/Export
+ // import/export
void WriteCERN( SvStream& rOStm, const OUString& rBaseURL ) const;
void WriteNCSA( SvStream& rOStm, const OUString& rBaseURL ) const;
};
diff --git a/include/svtools/imaprect.hxx b/include/svtools/imaprect.hxx
index 17c9684..632d38e 100644
--- a/include/svtools/imaprect.hxx
+++ b/include/svtools/imaprect.hxx
@@ -33,7 +33,7 @@ class SVT_DLLPUBLIC IMapRectangleObject : public IMapObject
protected:
- // Binaer-Im-/Export
+ // binary import/export
virtual void WriteIMapObject( SvStream& rOStm ) const SAL_OVERRIDE;
virtual void ReadIMapObject( SvStream& rIStm ) SAL_OVERRIDE;
@@ -55,7 +55,7 @@ public:
Rectangle GetRectangle( bool bPixelCoords = true ) const;
- // liefert das BoundRect des Rechteck-Objektes in 1/100mm
+ // returns the BoundRect of the rectangle object in 1/100mm
virtual Rectangle GetBoundRect() const SAL_OVERRIDE { return aRect; }
void Scale( const Fraction& rFractX, const Fraction& rFracY );
@@ -63,7 +63,7 @@ public:
using IMapObject::IsEqual;
bool IsEqual( const IMapRectangleObject& rEqObj );
- // Im-/Export
+ // import/export
void WriteCERN( SvStream& rOStm, const OUString& rBaseURL ) const;
void WriteNCSA( SvStream& rOStm, const OUString& rBaseURL ) const;
};
More information about the Libreoffice-commits
mailing list