[Libreoffice-commits] core.git: sw/source
sw/source/filter/html/htmltab.cxx | 140 ++ 1 file changed, 67 insertions(+), 73 deletions(-) New commits: commit 4ee996a863406dd3499194513ec5fc4df7b5d360 Author: Jennifer Liebel Date: Thu Sep 4 11:06:38 2014 + fdo#39468: Translate German comments Change-Id: Ia0a2a22353ad314617324e93b8a352ea306e3446 Reviewed-on: https://gerrit.libreoffice.org/11279 Reviewed-by: Miklos Vajna Tested-by: Miklos Vajna diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index dd5f71f..12e5293 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -380,89 +380,83 @@ class HTMLTable sal_uInt16 nCols; // number of columns sal_uInt16 nFilledCols; // number of filled columns -sal_uInt16 nCurRow; // aktuelle Zeile -sal_uInt16 nCurCol; // aktuelle Spalte +sal_uInt16 nCurRow; // current Row +sal_uInt16 nCurCol; // current Column -sal_uInt16 nLeftMargin; // Abstand zum linken Rand (aus Absatz) -sal_uInt16 nRightMargin;// Abstand zum rechten Rand (aus Absatz) +sal_uInt16 nLeftMargin; // Space to the left margin (from passage) +sal_uInt16 nRightMargin;// Space to the right margin (from passage) -sal_uInt16 nCellPadding;// Abstand Umrandung zum Text -sal_uInt16 nCellSpacing;// Abstand zwischen zwei Zellen +sal_uInt16 nCellPadding;// Space from border to Text +sal_uInt16 nCellSpacing;// Space between two cells sal_uInt16 nHSpace; sal_uInt16 nVSpace; -sal_uInt16 nBoxes; // Wievele Boxen enthaelt die Tabelle +sal_uInt16 nBoxes; // number of boxes in the table -const SwStartNode *pPrevStNd; // der Table-Node oder der Start-Node -// der vorhergehenden Section -const SwTable *pSwTable;// die SW-Tabelle (nur auf dem Top-Level) -SwTableBox *pBox1; // die TableBox, die beim Erstellen -// der Top-Level-Tabelle angelegt wird - -SwTableBoxFmt *pBoxFmt; // das frame::Frame-Format einer SwTableBox -SwTableLineFmt *pLineFmt; // das frame::Frame-Format einer SwTableLine +const SwStartNode *pPrevStNd; // the Table-Node or the Start-Node of the section before +const SwTable *pSwTable;// SW-Table (only on Top-Level) +SwTableBox *pBox1; // TableBox, generated when the Top-Level-Table was build +SwTableBoxFmt *pBoxFmt; // frame::Frame-Format from SwTableBox +SwTableLineFmt *pLineFmt; // frame::Frame-Format from SwTableLine SwTableLineFmt *pLineFrmFmtNoHeight; -SvxBrushItem *pBGBrush; // Hintergrund der Tabelle -SvxBrushItem *pInhBGBrush; // "geerbter" Hintergrund der Tabelle -const SwStartNode *pCaptionStartNode; // Start-Node der Tabellen-Ueberschrift - -SvxBorderLine aTopBorderLine; // die Linie fuer die Umrandung -SvxBorderLine aBottomBorderLine;// die Linie fuer die Umrandung -SvxBorderLine aLeftBorderLine; // die Linie fuer die Umrandung -SvxBorderLine aRightBorderLine; // die Linie fuer die Umrandung -SvxBorderLine aBorderLine; // die Linie fuer die Umrandung -SvxBorderLine aInhLeftBorderLine; // die Linie fuer die Umrandung -SvxBorderLine aInhRightBorderLine; // die Linie fuer die Umrandung -bool bTopBorder;// besitzt die Tabelle oben eine Linie -bool bRightBorder; // besitzt die Tabelle rechts eine Linie -bool bTopAlwd; // duerfen die Raender gesetzt werden? +SvxBrushItem *pBGBrush; // background of the table +SvxBrushItem *pInhBGBrush; // "inherited" background of the table +const SwStartNode *pCaptionStartNode; // Start-Node of the table-caption +//lines for the border +SvxBorderLine aTopBorderLine; +SvxBorderLine aBottomBorderLine; +SvxBorderLine aLeftBorderLine; +SvxBorderLine aRightBorderLine; +SvxBorderLine aBorderLine; +SvxBorderLine aInhLeftBorderLine; +SvxBorderLine aInhRightBorderLine; +bool bTopBorder;// is there a line on the top of the table +bool bRightBorder; // is there a line on the top right of the table +bool bTopAlwd; // is it allowed to set the border? bool bRightAlwd; -bool bFillerTopBorder; // bekommt eine linke/rechter Filler- -bool bFillerBottomBorder; // Zelle eine obere/untere Umrandung? +bool bFillerTopBorder; // gets the left/right filler-cell a border on the +bool bFillerBottomBorder; // top or in the bottom bool bInhLeftBorder; bool bInhRightBorder; -
[Libreoffice-commits] core.git: sw/sdi sw/source
sw/sdi/_grfsh.sdi | 12
sw/source/ui/app/mn.src |1 +
sw/source/uibase/shells/grfsh.cxx |3 +--
3 files changed, 14 insertions(+), 2 deletions(-)
New commits:
commit 24077ffc063990f9de11c6819432219a59d809f8
Author: Jennifer Liebel
Date: Tue Sep 2 12:40:20 2014 +
fdo#82496: Change picture option by rightclicking
Change-Id: I31fb1a1f89030610a9d11b9236e8cde22dbc0ca5
Reviewed-on: https://gerrit.libreoffice.org/11332
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/sdi/_grfsh.sdi b/sw/sdi/_grfsh.sdi
index 15c00cc..2eb2ab2 100644
--- a/sw/sdi/_grfsh.sdi
+++ b/sw/sdi/_grfsh.sdi
@@ -62,6 +62,13 @@ interface BaseTextGraphic
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
+SID_CHANGE_PICTURE
+[
+ExecMethod = Execute ;
+StateMethod = GetAttrState ;
+DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+]
+
SID_EXTERNAL_EDIT
[
ExecMethod = Execute ;
@@ -224,6 +231,11 @@ interface BaseTextGraphic
StateMethod = GetAttrState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
+SID_CHANGE_PICTURE
+[
+ExecMethod = FuTemporary ;
+StateMethod = GetMenuState ;
+]
SID_GRFFILTER_SOLARIZE // status(final|play|rec)
[
ExecMethod = ExecAttr ;
diff --git a/sw/source/ui/app/mn.src b/sw/source/ui/app/mn.src
index f62c8da..79b797d 100644
--- a/sw/source/ui/app/mn.src
+++ b/sw/source/ui/app/mn.src
@@ -1239,6 +1239,7 @@ Menu MN_GRF_POPUPMENU
MN_FRM_CAPTION_ITEM
SEPARATOR;
MenuItem { ITEM_SAVE_GRAPHIC };
+MenuItem { ITEM_CHANGE_PICTURE };
MenuItem { ITEM_COMPRESS_GRAPHIC };
MenuItem { ITEM_EXTERNAL_EDIT };
diff --git a/sw/source/uibase/shells/grfsh.cxx
b/sw/source/uibase/shells/grfsh.cxx
index d5ecec5..0e13b38 100644
--- a/sw/source/uibase/shells/grfsh.cxx
+++ b/sw/source/uibase/shells/grfsh.cxx
@@ -178,7 +178,6 @@ void SwGrfShell::Execute(SfxRequest &rReq)
}
}
break;
-
case SID_EXTERNAL_EDIT:
{
// When the graphic is selected to be opened via some external tool
@@ -191,7 +190,7 @@ void SwGrfShell::Execute(SfxRequest &rReq)
}
}
break;
-
+case SID_CHANGE_PICTURE:
case SID_INSERT_GRAPHIC:
{
// #i123922# implement slot independent from the two below to
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: forms/source include/svtools
forms/source/inc/FormComponent.hxx | 10 +++ include/svtools/brwbox.hxx | 47 + 2 files changed, 27 insertions(+), 30 deletions(-) New commits: commit 86aed3ca6a35aa78f3ce2a587d151d39d21f880f Author: Jennifer Liebel Date: Wed Sep 10 07:16:31 2014 +0200 fdo#39468: Translated German to English Change-Id: Ica935c641d3858ae875410efc7fe531835feadf8 Reviewed-on: https://gerrit.libreoffice.org/11373 Reviewed-by: Thomas Arnhold Tested-by: Thomas Arnhold diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx index db8e51e..deef763 100644 --- a/forms/source/inc/FormComponent.hxx +++ b/forms/source/inc/FormComponent.hxx @@ -931,10 +931,10 @@ protected: */ virtual voidonDisconnectedValidator( ); -/** nFieldType ist der Typ des Feldes, an das das Model gebunden werden soll. -Das Binden erfolgt genau dann, wenn Rueckgabewert sal_True. -Die Standard-Implementation erlaubt alles ausser den drei binary-Typen und -FieldType_OTHER. +/** nFieldType is the type of the field, on which the model will be linked. +The linking happens when sal_True is returned. +The default-implementation allows everything but the three binary types +and FieldType_OTHER. */ virtual boolapproveDbColumnType(sal_Int32 _nColumnType); @@ -1009,7 +1009,7 @@ public: } public: -// UNO Anbindung +// UNO link DECLARE_UNO3_AGG_DEFAULTS(OBoundControlModel, OControlModel) virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx index f16c001..4bbe97f 100644 --- a/include/svtools/brwbox.hxx +++ b/include/svtools/brwbox.hxx @@ -319,18 +319,18 @@ protected: sal_uInt16 ColCount() const; // software plug for database access -// Der RowCount wird jetzt intern automatisch gezaehlt -// (ueber RowInserted und RowRemoved), daher ist das Ueberladen -// dieser Methode ueberfluessig! +// RowCount is counted automatically +// (with the help of RowInserted and RowRemoved), so overloading of +// the method is needless public: virtual longGetRowCount() const SAL_OVERRIDE; protected: -// fuer Anzeige im VScrollBar z.B. auf "?" oder setzen +// for display in VScrollBar set it e.g. on "?" voidSetRealRowCount( const OUString &rRealRowCount ); -// Return Value muss immer sal_True sein - SeekRow *muss* klappen! -// (sonst ASSERT) MI: wer hat das eingebaut? Das darf nicht so sein! +// Return Value has to be sal_True always - SeekRow *has* to work! +// (else ASSERT) MI: who integrated that? It must not be like that! /** seeks for the given row position @param nRow @@ -342,39 +342,36 @@ protected: virtual voidPaintData( Window& rWin, const Rectangle& rRect ); virtual voidPaintField( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId ) const = 0; -// Benachrichtigung an die abgeleitete Klasse, dass sich der sichtbare -// Bereich von Rows geaendert hat. Aus dieser Methode heraus darf -// die abgeleitete Klasse Aenderungen des Model mit Hilfe der Methoden -// RowInserted und RowRemoved bekanntgeben. Mit sich daraus ergebenden -// neuen Zustand wird anschliessend ein Paint veranlasst (und entsprechend -// SeekRow etc. gerufen). +// Advice for the subclass: the visible scope of rows has changed. +// The subclass is able to announce changes of the model with the +// help of the methods RowInserted and RowRemoved. Because of the +// new status a paint is induced (SeekRow is called etc). // -// Parameter: nNewTopRow: Nr. der neuen TopRow (kann von VisibleRowsChanged -// durch Aufruf von RowInserted und RowDeleted noch veraendert werden). -// nNumRows: Anzahl der sichtbaren Rows (auch eine teilweise sichtbare Row -// wird mitgezaehlt). +// parameters: nNewTopRow: number of the new TopRow (can get changed from +// VisibleRowsChanged by request of RowInserted and RowDeleted). +// nNumRows: number of visible rows (a partial visible row is counted too) // -// Moegliche Ursachen fuer die Aenderung des sichtbaren Bereiches: -// - Vor dem sichtbaren Bereich sind Rows eingefuegt oder geloescht worden, -// dadurch aendert sich nur die Numerierung der sichtbaren Rows -// - Scrollen (und daraus resultierend eine andere erste sichtbare Row) -// - Resize des Fensters +// Possible reason for changing the visible scope: +// - in front of the visible scope rows were inserted or removed, so the +// numbering of the visible scope has change
[Libreoffice-commits] core.git: wizards/com wizards/source
wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py | 10 +-
wizards/com/sun/star/wizards/agenda/AgendaWizardDialogResources.py | 31
++-
wizards/source/formwizard/dbwizres.src | 40
++
3 files changed, 72 insertions(+), 9 deletions(-)
New commits:
commit 721f1eca1856ab42d1752bca22c87d87713cf1e7
Author: Jennifer Liebel
Date: Fri Sep 12 07:22:06 2014 +
fdo#75107: make colors and styles localizable in Agenda Wizard
Change-Id: I231370da5ee7185888ec95ba1fb64f678a7c8ea3
Reviewed-on: https://gerrit.libreoffice.org/11412
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py
b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py
index 99aced7..ede7aaa 100644
--- a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py
+++ b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogImpl.py
@@ -74,7 +74,7 @@ class AgendaWizardDialogImpl(AgendaWizardDialog):
self.myAgendaDoc = AgendaDocument(
self.xMSF, self.agenda, self.resources,
self.templateConsts, self.terminateListener)
-self.initializeTemplates()
+self.initializeTemplates()
self.myAgendaDoc.load(
self.agendaTemplates[1][self.agenda.cp_AgendaType])
@@ -187,7 +187,7 @@ class AgendaWizardDialogImpl(AgendaWizardDialog):
RadioDataAware.attachRadioButtons(
self.agenda, "cp_ProceedMethod",
(self.optCreateAgenda, self.optMakeChanges), True).updateUI()
-
+
def insertRoadmap(self):
self.addRoadmap()
self.insertRoadMapItems(
@@ -204,7 +204,7 @@ class AgendaWizardDialogImpl(AgendaWizardDialog):
try:
sAgendaPath = self.sTemplatePath + "/wizard/agenda"
self.agendaTemplates = FileAccess.getFolderTitles(
-self.xMSF, "aw", sAgendaPath)
+self.xMSF, "aw", sAgendaPath, self.resources.dictPageDesign)
return True
except NoValidPathException:
traceback.print_exc()
@@ -311,7 +311,7 @@ class AgendaWizardDialogImpl(AgendaWizardDialog):
# user said: no, do not overwrite
endWizard = False
return False
-
+
xDocProps = self.myAgendaDoc.xTextDocument.DocumentProperties
xDocProps.Title = self.txtTemplateName.Text
self.myAgendaDoc.setWizardTemplateDocInfo( \
@@ -372,7 +372,7 @@ class AgendaWizardDialogImpl(AgendaWizardDialog):
def drawConstants(self):
'''Localise the template'''
constRangeList = self.myAgendaDoc.searchFillInItems(1)
-
+
for i in constRangeList:
text = i.String.lower()
aux = TextElement(i, self.resources.dictConstants[text])
diff --git a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogResources.py
b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogResources.py
index 4f2fe2b..292059c 100644
--- a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogResources.py
+++ b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialogResources.py
@@ -17,7 +17,7 @@
#
class AgendaWizardDialogResources(object):
-
+
RID_AGENDAWIZARDDIALOG_START = 5000
RID_AGENDAWIZARDROADMAP_START = 5049
RID_COMMON_START = 500
@@ -153,7 +153,7 @@ class AgendaWizardDialogResources(object):
self.resButtonUp = oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 70)
self.resButtonDown = oWizardResource.getResText(
-AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 71)
+AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 71)
#Create a dictionary for localised string in the template
self.dictConstants = {
@@ -188,11 +188,34 @@ class AgendaWizardDialogResources(object):
"#deadline#" : oWizardResource.getResText(
AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 86)}
+#Create a dictionary for localising the page design
+self.dictPageDesign = {
+"Blue" : oWizardResource.getResText(
+AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 87),
+"Classic" : oWizardResource.getResText(
+AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 88),
+"Colorful" : oWizardResource.getResText(
+AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 89),
+"Elegant" : oWizardResource.getResText(
+AgendaWizardDialogResources.RID_AGENDAWIZARDDIALOG_START + 90),
+"Green" : oWizardResource.getResT
[Libreoffice-commits] core.git: include/svx
include/svx/sxmbritm.hxx |8
include/svx/xfltrit.hxx |2 +-
include/svx/xpoly.hxx| 32 +++-
include/svx/xtable.hxx |6 +++---
4 files changed, 23 insertions(+), 25 deletions(-)
New commits:
commit ca4333e9c807bf9169e34a693a22cb6c00f855a8
Author: Jennifer Liebel
Date: Wed Sep 17 13:36:08 2014 +
fdo#39468: Translated German comments
Change-Id: I10d334d85f80bbb4a46436914c79c91fc0282b35
Reviewed-on: https://gerrit.libreoffice.org/11485
Reviewed-by: Samuel Mehrbrodt
Tested-by: Samuel Mehrbrodt
diff --git a/include/svx/sxmbritm.hxx b/include/svx/sxmbritm.hxx
index 9ea61b2..dc7c394 100644
--- a/include/svx/sxmbritm.hxx
+++ b/include/svx/sxmbritm.hxx
@@ -23,10 +23,10 @@
#include
-// Die Masslinie unterhalb der Bezugskante
-// Zur Bemassung einer Objektunterkante
-// (Redundant zum drehen der Bezugskante um 180deg +
-// TextUpsideDown, jedoch besser bedienbar)
+// dimension line below the reference edge
+// for dimensioning the lower edge of the object
+// (redundant to turn the referece edge through 180deg +
+// TextUpsideDown, but easily operated)
// laesst sich auch draggen, indem man den Masslinienabstand
// (SdrMeasureLineDistItem) ueber die Bezugskante hinwegdraggt
class SdrMeasureBelowRefEdgeItem: public SdrYesNoItem {
diff --git a/include/svx/xfltrit.hxx b/include/svx/xfltrit.hxx
index cb55673..8ba5db6 100644
--- a/include/svx/xfltrit.hxx
+++ b/include/svx/xfltrit.hxx
@@ -25,7 +25,7 @@
/*
|*
-|* Transparenz-Item fuer Fuellungen (Solid)
+|* transparency-Item for contents (Solid)
|*
\/
diff --git a/include/svx/xpoly.hxx b/include/svx/xpoly.hxx
index a57fb89..57c9432 100644
--- a/include/svx/xpoly.hxx
+++ b/include/svx/xpoly.hxx
@@ -32,18 +32,17 @@ class OutputDevice;
#define XPOLYPOLY_APPEND 0x
#define XPOLY_APPEND 0x
-#define XPOLY_MAXPOINTS 0xFFF0 /* Auch fuer die 32-Bitter etwas Luft
lassen */
+#define XPOLY_MAXPOINTS 0xFFF0 /* Let space for the 32-Bit systems too */
-// Punktstile im XPolygon:
-// NORMAL : Anfangs- oder Endpunkt einer Kurve oder Linie
-// SMOOTH : Glatter Uebergang zwischen Kurven
-// SYMMTR : glatter und symmetrischer Uebergang zwischen Kurven
-// CONTROL: Kontrollpunkt einer Bezierkurve
+// point-styles in XPolygon:
+// NORMAL : start-/endpoint of a curve or a line
+// SMOOTH : smooth transition between curves
+// SYMMTR : smooth and symmetrical transition between curves
+// CONTROL: control handles of a Bezier curve
enum XPolyFlags { XPOLY_NORMAL, XPOLY_SMOOTH, XPOLY_CONTROL, XPOLY_SYMMTR };
-// Klasse XPolygon; hat neben dem Point-Array noch ein Array mit Flags,
-// die Informationen ueber den jeweiligen Punkt enthalten
+// Class XPolygon;has a point-array and a flag-array, which contains
information about a particular point
class ImpXPolygon;
@@ -52,10 +51,10 @@ class SVX_DLLPUBLIC XPolygon
protected:
ImpXPolygon*pImpXPolygon;
-// ImpXPolygon-ReferenceCount pruefen und ggf. abkoppeln
+// check ImpXPolygon-ReferenceCount and decouple if necessary
voidCheckReference();
-// Hilfsfunktionen fuer Bezierkonvertierung
+// auxiliary functions for Bezier conversion
voidSubdivideBezier(sal_uInt16 nPos, bool bCalcFirst, double fT);
voidGenBezArc(const Point& rCenter, long nRx, long nRy,
long nXHdl, long nYHdl, sal_uInt16 nStart, sal_uInt16
nEnd,
@@ -95,15 +94,15 @@ public:
boolIsControl(sal_uInt16 nPos) const;
boolIsSmooth(sal_uInt16 nPos) const;
-// Abstand zwischen zwei Punkten
+// distance between two points
double CalcDistance(sal_uInt16 nP1, sal_uInt16 nP2);
-// Bezierkonvertierungen
+// Bezier conversion
void CalcSmoothJoin(sal_uInt16 nCenter, sal_uInt16 nDrag, sal_uInt16 nPnt);
void CalcTangent(sal_uInt16 nCenter, sal_uInt16 nPrev, sal_uInt16 nNext);
void PointsToBezier(sal_uInt16 nFirst);
-// Transformationen
+// transformations
void Translate(const Point& rTrans);
void Scale(double fSx, double fSy);
void Distort(const Rectangle& rRefRect, const XPolygon& rDistortedRect);
@@ -116,8 +115,7 @@ public:
explicit XPolygon(const basegfx::B2DPolygon& rPolygon);
};
-// Klasse XPolyPolygon; wie PolyPolygon, nur statt aus Polygonen aus
-// XPolygonen bestehend
+// Class XPolyPolygon; like PolyPolygon, composed of XPolygons instead of
Polygons
class ImpXPolyPolygon;
@@ -126,7 +124,7 @@ class SVX_DLLPUBLIC XPolyPolygon
protected:
ImpXPolyPolygon* pImpXPolyPolygon;
-// ImpXPolyPolygon-ReferenceCount pruefen und ggf. abkoppeln
+// check ImpXPolyPolygon-ReferenceCount and decouple if necessary
voidCheckReference();
public:
@@ -155,7 +153,7 @@ public:
bool
[Libreoffice-commits] core.git: editeng/source include/editeng offapi/com officecfg/registry scripting/workben sd/inc sd/sdi sd/source sd/uiconfig
editeng/source/items/flditem.cxx |
36 ++
include/editeng/flditem.hxx |
13 +++
offapi/com/sun/star/text/textfield/Type.idl |
1
officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu |
5 +
scripting/workben/bindings/impressmenubar.xml|
1
sd/inc/app.hrc |
1
sd/sdi/_drvwsh.sdi |
5 +
sd/sdi/outlnvsh.sdi |
5 +
sd/sdi/sdraw.sdi |
24 ++
sd/source/ui/app/sdmod2.cxx |
27 +++
sd/source/ui/view/drviews2.cxx |
8 ++
sd/source/ui/view/drviews7.cxx |
1
sd/source/ui/view/outlnvs2.cxx |
5 +
sd/uiconfig/sdraw/menubar/menubar.xml|
1
sd/uiconfig/simpress/menubar/menubar.xml |
5 -
15 files changed, 136 insertions(+), 2 deletions(-)
New commits:
commit e16c8534f446a7cc311d6d5026aae5457e4f8e6c
Author: Jennifer Liebel
Date: Tue Sep 23 09:14:21 2014 +
fdo#47302: Added insert->fields->page title button
Change-Id: Iebc8298a7e6a7d423d2667eec8a46a936cc4d2cd
Reviewed-on: https://gerrit.libreoffice.org/11599
Reviewed-by: Samuel Mehrbrodt
Tested-by: Samuel Mehrbrodt
diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx
index 69a1b2c..73074e8 100644
--- a/editeng/source/items/flditem.cxx
+++ b/editeng/source/items/flditem.cxx
@@ -117,6 +117,8 @@ SvxFieldData* SvxFieldData::Create(const
uno::Reference& xTe
return new SvxPageField();
case text::textfield::Type::PAGES:
return new SvxPagesField();
+case text::textfield::Type::PAGE_TITLE:
+return new SvxPageTitleField();
case text::textfield::Type::DOCINFO_TITLE:
return new SvxFileField();
case text::textfield::Type::TABLE:
@@ -607,7 +609,40 @@ MetaAction* SvxURLField::createBeginComment() const
2*aURL.getLength() );
}
+//
+// SvxPageTitleField methods
+//
+SV_IMPL_PERSIST1( SvxPageTitleField, SvxFieldData );
+
+SvxPageTitleField::SvxPageTitleField() {}
+
+SvxFieldData* SvxPageTitleField::Clone() const
+{
+return new SvxPageTitleField();
+}
+
+bool SvxPageTitleField::operator==( const SvxFieldData& rCmp ) const
+{
+return ( rCmp.Type() == TYPE(SvxPageTitleField) );
+}
+
+void SvxPageTitleField::Load( SvPersistStream & /*rStm*/ )
+{
+}
+
+void SvxPageTitleField::Save( SvPersistStream & /*rStm*/ )
+{
+}
+
+MetaAction* SvxPageTitleField::createBeginComment() const
+{
+return new MetaCommentAction( "FIELD_SEQ_BEGIN;PageTitleField" );
+}
+
+//
+// SvxPagesField
+//
// The fields that were removed from Calc:
@@ -1152,6 +1187,7 @@ SvClassManager& SvxFieldItem::GetClassManager()
pClassMgr->Register(SvxURLField::StaticClassId(),
SvxURLField::CreateInstance);
pClassMgr->Register(SvxDateField::StaticClassId(),
SvxDateField::CreateInstance);
pClassMgr->Register(SvxPageField::StaticClassId(),
SvxPageField::CreateInstance);
+pClassMgr->Register(SvxPageTitleField::StaticClassId(),
SvxPageTitleField::CreateInstance);
pClassMgr->Register(SvxTimeField::StaticClassId(),
SvxTimeField::CreateInstance);
pClassMgr->Register(SvxExtTimeField::StaticClassId(),
SvxExtTimeField::CreateInstance);
pClassMgr->Register(SvxExtFileField::StaticClassId(),
SvxExtFileField::CreateInstance);
diff --git a/include/editeng/flditem.hxx b/include/editeng/flditem.hxx
index 961b5e0..96720fe 100644
--- a/include/editeng/flditem.hxx
+++ b/include/editeng/flditem.hxx
@@ -25,6 +25,7 @@
#include
#include
#include
+#include <../sd/inc/sdpage.hxx> // for Page Title field
#include
@@ -191,6 +192,18 @@ public:
virtual MetaAction* createBeginComment() const SAL_OVERRIDE;
};
+class EDITENG_DLLPUBLIC SvxPageTitleField : public SvxFieldData
+{
+public:
+SV_DECL_PERSIST1( SvxPageTitleField, SvxFieldData,
com::sun::star::text::textfield::Type::PAGE_TITLE )
+SvxPageTitleField();
+
+virtual SvxFieldData* Clone() const SAL_OVERRIDE;
+virtual booloperator==( const SvxFieldData& ) const
SAL_OVERRIDE;
+
+virtual MetaAction* createBeginComment() const SAL_OVERRIDE;
+};
+
class EDITENG_DLLPUBLIC SvxPagesField : public SvxFieldData
{
public:
diff --git a/offapi/com/sun/star/text/textfield/Type.idl
b/offapi/com/sun/star
[Libreoffice-commits] core.git: include/svtools include/svx sc/source
include/svtools/wizdlg.hxx | 36 +++-
include/svx/sxmtfitm.hxx | 10 +-
include/svx/sxmuitm.hxx |4 ++--
include/svx/tabline.hxx | 12 ++--
include/svx/viewpt3d.hxx | 34 +-
include/svx/xflbmsxy.hxx | 12
sc/source/filter/excel/impop.cxx | 24
7 files changed, 61 insertions(+), 71 deletions(-)
New commits:
commit 9b94cf75499bf9fbb9f0072cbba0152c7bfdc387
Author: Jennifer Liebel
Date: Thu Sep 25 08:25:27 2014 +
fdo#39468: translation
Change-Id: I8ee3c1cf551f5b242d20cf244d728b79e68616ed
Reviewed-on: https://gerrit.libreoffice.org/11637
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/include/svtools/wizdlg.hxx b/include/svtools/wizdlg.hxx
index e65d596..480032d 100644
--- a/include/svtools/wizdlg.hxx
+++ b/include/svtools/wizdlg.hxx
@@ -37,30 +37,24 @@ Beschreibung
class WizardDialog
-Diese Klasse dient als Basis fuer einen WizardDialog. Als
-Basisfunktionalitaet wird das Anordnen der Controls angeboten und
-Hilfesmethoden fuer das Umschalten von TabPages. Der Dialog
-ordnet bei einer Groessenanderung die Controls auch wieder
-entsprechend an.
+This class is the base for WizardDialog. The basic functionality is to
+order the Controls. Besides it's a helper method for switching the TabPages.
+The dialog orders the Controls when their size changed.
--
-Mit SetPageSizePixel() kann als Groesse die Groesse der groessten
-TabPage vorgegeben werden. Wenn der Dialog angezeigt wird, wird
-zu dem Zeitpunkt wenn noch keine Groesse gesetzt wurde, dafuer
-die entsprechende Dialoggroesse berechnet und gesetzt. Wenn mit
-SetPageSizePixel() keine Groesse gesetzt wurde, wird als Groesse
-die maximale Groesse der zu diesem Zeitpunkt zugewiesenen TabPages
-berechnet und genommen.
-
-ShowPrevPage()/ShowNextPage() zeigt die vorherige/naechste TabPage
-an. Dazu wird zuerst der Deactivate-Handler vom Dialog gerufen und
-wenn dieser sal_True zurueckgegeben hat, wird der Acivate-Handler
-vom Dialog gerufen und die entsprechende TabPage angezeigt.
-Finnsh() kann gerufen werden, wenn der Finnish-Button betaetigt
-wird. Dort wird dann auch noch der Deactivate-Page-Handler vom
-Dialog und der aktuellen TabPage gerufen und dann der Dialog
-beendet (Close() oder EndDialog()).
+SetPageSizePixel() sets the biggest TabPage size. When the dialog
+should be displayed, first the dialog size is calculated and set.
+If there is no size set with SetPageSizePixel(), max size of the
+current TabPage is set as default.
+
+ShowPrevPage()/ShowNextPage() shows the previous/next TabPage.
+First the Deactivate-Handler is called by dialog and if the return
+value is sal_True the Active-Handler is called by dialog and the
+corresponding TabPage is showed. Finnish() can only be called
+if the Finnish-Button is activated. Then the Deactivate-Page-Handler
+is called by dialog and by the current TabPage. Now the dialog ends
+(Close() or EndDialog()).
Mit AddPage()/RemovePage()/SetPage() koennen die TabPages dem Wizard
bekannt gemacht werden. Es wird immer die TabPage des aktuellen Levels
diff --git a/include/svx/sxmtfitm.hxx b/include/svx/sxmtfitm.hxx
index 0024913..b8c788e 100644
--- a/include/svx/sxmtfitm.hxx
+++ b/include/svx/sxmtfitm.hxx
@@ -23,17 +23,17 @@
#include
#include
-// die 2 folgenden sind noch nicht implementiert!
-// Text auf einen wirklich fixen Winkel festnageln.
-// Der Textwinkel ist dann auch unabhaengig vom Winkel der Masslinie.
-// Setzt TextUpsideDown, TextRota90 sowie TextAutoAngle ausser Kraft. (n.i.)
+// The two following are not implemented yet!
+// Nail text down to a fix angle.
+// The text angle is independet of the dimension line.
+// Abrogate TextUpsideDown, TextRota90 and TextAutoAngle. (n.i.)
class SdrMeasureTextIsFixedAngleItem: public SdrYesNoItem {
public:
SdrMeasureTextIsFixedAngleItem(bool bOn=false):
SdrYesNoItem(SDRATTR_MEASURETEXTISFIXEDANGLE,bOn) {}
SdrMeasureTextIsFixedAngleItem(SvStream& rIn):
SdrYesNoItem(SDRATTR_MEASURETEXTISFIXEDANGLE,rIn) {}
};
-// Der Winkel des Textes in 1/100deg. 0=Horizontal von links nach rechts zu
lesen. (n.i.)
+//Angle of the text in 1/100deg. 0=horizontal; read from left to right. (n.i.)
class SdrMeasureTextFixedAngleItem: public SdrAngleItem {
public:
SdrMeasureTextFixedAngleItem(long nVal=0):
SdrAngleItem(SDRATTR_MEASURETEXTFIXEDANGLE,nVal) {}
diff --git a/include/svx/sxmuitm.hxx b/include/svx/sxmuitm.hxx
index 57c8c1d..bcc7c28 100644
--- a/include/svx/sxmuitm.hxx
+++ b/include/svx/sxmuitm.hxx
@@ -24,8 +24,8 @@
#include
#include
-// Vorgabe einer Masseinheit. Der Zahlenwert wird in diese Einheit umgerechnet
-// (ausgehend von der MapUnit des Models). Diese Einheit wird dann ggf. auch
angezeigt.
+// specification of
Jennifer Liebel license statement
Hi, all my current and past contributions made to the LibreOffice project may be licensed under the MPLv2/LGPLv3+ dual license. Until further notice, all my future contributions to the LibreOffice project are available under the MPLv2/LGPLv3+ dual license. Best regards, Jennifer Liebel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/interpr2.cxx | 27 +--
1 file changed, 13 insertions(+), 14 deletions(-)
New commits:
commit 5605a36a31081875087ff5cb28b84790845ba695
Author: Jennifer Liebel
Date: Fri Aug 29 12:41:40 2014 +
fdo#39674: Improved translation
Conflicts:
sc/source/core/tool/interpr2.cxx
Change-Id: Ib80472a1670b61fdea61bdee4d52b19e28b85d63
Reviewed-on: https://gerrit.libreoffice.org/11192
Reviewed-by: Thomas Arnhold
Tested-by: Thomas Arnhold
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index ac6d71e..1971e56 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -94,8 +94,6 @@ double ScInterpreter::GetDateSerial( sal_Int16 nYear,
sal_Int16 nMonth, sal_Int1
}
}
-// Funktionen
-
void ScInterpreter::ScGetActDate()
{
nFuncFmtType = NUMBERFORMAT_DATE;
@@ -1399,9 +1397,9 @@ void ScInterpreter::ScVDB()
else
{
-double fDauer1=fDauer;
+double fTimeLength1=fTimeLength;
-//@Die Frage aller Fragen: "Ist das hier richtig"
+//@ The question of all questions: 'Is this right'
if(!::rtl::math::approxEqual(fAnfang,::rtl::math::approxFloor(fAnfang)))
{
if(fFactor>1)
@@ -2173,18 +2171,18 @@ void ScInterpreter::ScStyle()
sal_uInt8 nParamCount = GetByte();
if (nParamCount >= 1 && nParamCount <= 3)
{
-OUString aStyle2; // Vorlage nach Timer
+OUString aStyle2; // Template after timer
if (nParamCount >= 3)
aStyle2 = GetString().getString();
long nTimeOut = 0; // Timeout
if (nParamCount >= 2)
nTimeOut = (long)(GetDouble()*1000.0);
-OUString aStyle1 = GetString().getString(); // Vorlage
fuer sofort
+OUString aStyle1 = GetString().getString(); // Template
for immediate
if (nTimeOut < 0)
nTimeOut = 0;
-// Request ausfuehren, um Vorlage anzuwenden
+// Execute request to apply template
if ( !pDok->IsClipOrUndo() )
{
@@ -2254,7 +2252,7 @@ void ScInterpreter::ScDde()
return;
}
-// Nach dem Laden muss neu interpretiert werden (Verknuepfungen
aufbauen)
+// Need to reinterpret after loading (build links)
if ( rArr.IsRecalcModeNormal() )
rArr.SetExclusiveRecalcModeOnLoad();
@@ -2265,7 +2263,7 @@ void ScInterpreter::ScDde()
bool bOldEnabled = pDok->IsIdleEnabled();
pDok->EnableIdle(false);
-// Link-Objekt holen / anlegen
+// Get/ Create link object
ScDdeLink* pLink = lcl_GetDdeLink( pLinkMgr, aAppl, aTopic, aItem,
nMode );
@@ -2285,8 +2283,8 @@ void ScInterpreter::ScDde()
pBindings->Invalidate( SID_LINKS ); //
Link-Manager enablen
}
-//! asynchron auswerten ???
-pLink->TryUpdate(); // TryUpdate ruft Update nicht mehrfach
auf
+//! evaluate asynchron ???
+pLink->TryUpdate(); // TryUpdate doesn't call Update multiple
times
if (pMyFormulaCell)
{
@@ -2392,9 +2390,9 @@ void ScInterpreter::ScBase()
bool bDirt = false;
while ( fVal && p > pBuf )
{
-//! mit fmod Rundungsfehler ab 2**48
+//! roundoff error starting with numbers greater than 2**48
// double fDig = ::rtl::math::approxFloor( fmod( fVal, fBase
) );
-// so ist es etwas besser
+// a little bit better:
double fInt = ::rtl::math::approxFloor( fVal / fBase );
double fMult = fInt * fBase;
#if OSL_DEBUG_LEVEL > 1
@@ -2523,7 +2521,8 @@ void ScInterpreter::ScConvert()
if ( nGlobalError )
PushError( nGlobalError);
else
-{ // erst die angegebene Reihenfolge suchen, wenn nicht gefunden den
Kehrwert
+{
+// first of all search for the given order; if it can't be found
then search for the inverse
double fConv;
if ( ScGlobal::GetUnitConverter()->GetValue( fConv, aFromUnit,
aToUnit ) )
PushDouble( fVal * fConv );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/interpr2.cxx | 429 +++
1 file changed, 213 insertions(+), 216 deletions(-)
New commits:
commit e886f9ad66cf0e1961deebb30a97e0b35bb5a816
Author: Jennifer Liebel
Date: Fri Aug 29 07:51:29 2014 +
fdo#39674: translated German to English
Conflicts:
sc/source/core/tool/interpr2.cxx
Change-Id: Ib063cafa895abd7d792ca068d727ea161946679c
Reviewed-on: https://gerrit.libreoffice.org/11184
Reviewed-by: Thomas Arnhold
Tested-by: Thomas Arnhold
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index 1971e56..0657007 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -56,7 +56,7 @@ using namespace formula;
#define SCdEpsilon1.0E-7
-// Datum und Zeit
+// Date and Time
double ScInterpreter::GetDateSerial( sal_Int16 nYear, sal_Int16 nMonth,
sal_Int16 nDay,
bool bStrict, bool bCheckGregorian )
@@ -963,7 +963,7 @@ void ScInterpreter::ScNPV()
if ( MustHaveParamCount( nParamCount, 2, 31 ) )
{
double nVal = 0.0;
-// Wir drehen den Stack um!!
+//We turn the stack upside down!
FormulaToken* pTemp[ 31 ];
for( short i = 0; i < nParamCount; i++ )
pTemp[ i ] = pStack[ sp - i - 1 ];
@@ -971,7 +971,7 @@ void ScInterpreter::ScNPV()
if (nGlobalError == 0)
{
double nCount = 1.0;
-double nZins = GetDouble();
+double nInterest = GetDouble();
--nParamCount;
size_t nRefInList = 0;
ScRange aRange;
@@ -981,7 +981,7 @@ void ScInterpreter::ScNPV()
{
case svDouble :
{
-nVal += (GetDouble() / pow(1.0 + nZins,
(double)nCount));
+nVal += (GetDouble() / pow(1.0 + nInterest,
(double)nCount));
nCount++;
}
break;
@@ -994,7 +994,7 @@ void ScInterpreter::ScNPV()
if (!aCell.hasEmptyValue() && aCell.hasNumeric())
{
double nCellVal = GetCellValue(aAdr, aCell);
-nVal += (nCellVal / pow(1.0 + nZins,
(double)nCount));
+nVal += (nCellVal / pow(1.0 + nInterest,
(double)nCount));
nCount++;
}
}
@@ -1008,7 +1008,7 @@ void ScInterpreter::ScNPV()
ScHorizontalValueIterator aValIter( pDok, aRange );
while ((nErr == 0) && aValIter.GetNext(nCellVal, nErr))
{
-nVal += (nCellVal / pow(1.0 + nZins,
(double)nCount));
+nVal += (nCellVal / pow(1.0 + nInterest,
(double)nCount));
nCount++;
}
if ( nErr != 0 )
@@ -1025,22 +1025,22 @@ void ScInterpreter::ScNPV()
void ScInterpreter::ScIRR()
{
-double fSchaetzwert;
+double fEstimated;
nFuncFmtType = NUMBERFORMAT_PERCENT;
sal_uInt8 nParamCount = GetByte();
if ( !MustHaveParamCount( nParamCount, 1, 2 ) )
return;
if (nParamCount == 2)
-fSchaetzwert = GetDouble();
+fEstimated = GetDouble();
else
-fSchaetzwert = 0.1;
-sal_uInt16 sPos = sp; // Stack-Position merken
+fEstimated = 0.1;
+sal_uInt16 sPos = sp; //memory the position of the
stack
double fEps = 1.0;
-double x, xNeu, fWert, fZaehler, fNenner, nCount;
-if (fSchaetzwert == -1.0)
-x = 0.1;// default gegen Nulldivisionen
+double x, xNew, fValue, fNom, fDenom, nCount;
+if (fEstimated == -1.0)
+x = 0.1;// default result for divion by
zero
else
-x = fSchaetzwert; // Startwert
+x = fEstimated; // startvalue
switch (GetStackType())
{
case svDoubleRef :
@@ -1055,34 +1055,34 @@ void ScInterpreter::ScIRR()
sal_uInt16 nItCount = 0;
ScRange aRange;
while (fEps > SCdEpsilon && nItCount < nIterationsMax)
-{ // Newton-Verfahren:
-sp = sPos; // Stack zuruecksetzen
+{ // Newtons method:
+sp = sPos; // reset stack
nCount = 0.0;
-fZaehler = 0.0;
-fNenner = 0.0;
+fNom = 0.0;
+fDenom = 0.0;
sal_uInt16 nErr = 0;
PopDoubleRef( aRange );
ScValueIterator aValIter(pDok, aRange, mnSubTotalFlags);
-if (aValIter.GetFirst(fWert, nErr))
+if (aValIter.GetFirst(fValue, nErr))
[Libreoffice-commits] core.git: Changes to 'refs/changes/85/11485/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/85/11485/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/changes/92/11192/3'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
