[Libreoffice-commits] core.git: Changes to 'refs/changes/45/3445/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/45/3445/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/45/3345/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Wiki page
Hello Gergõ, Great tutorial. It's things like this that will make new LO developers (like me) life a lot easier. Eric On Thursday 18 April 2013 11:47:51 Gergő Mocsi wrote: Dear developers, I've created a wiki page on request wit title Create new dialog in Impress. It is a so- called tutorial on how to integrat new dialog windows into Impress UI. The URL is here: https://wiki.documentfoundation.org/Development/Create_new_dialog_in_Impres s[1] Please, someone could check it out? thx, Gergő Mocsi [1] https://wiki.documentfoundation.org/Development/Create_new_dialog_in_Impress ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: chart2/uiconfig
chart2/uiconfig/ui/steppedlinesdlg.ui | 15 +++ 1 file changed, 15 insertions(+) New commits: commit ff547f4646c88c739118bf3058823b8642a275ae Author: Eric Seynaeve git...@nosperse.com Date: Thu Apr 18 00:24:05 2013 +0200 fdo#61135: adding help button to stepped lines dialog. Change-Id: I2ab4882e6c1e98ffa5a297a49e6968b629051be0 diff --git a/chart2/uiconfig/ui/steppedlinesdlg.ui b/chart2/uiconfig/ui/steppedlinesdlg.ui index 4cc351f..ff1b5c0 100644 --- a/chart2/uiconfig/ui/steppedlinesdlg.ui +++ b/chart2/uiconfig/ui/steppedlinesdlg.ui @@ -209,6 +209,20 @@ property name=position1/property /packing /child +child + object class=GtkButton id=help +property name=labelgtk-help/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_stockTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position2/property + /packing +/child /object packing property name=expandFalse/property @@ -222,6 +236,7 @@ action-widgets action-widget response=0ok/action-widget action-widget response=0cancel/action-widget + action-widget response=0help/action-widget /action-widgets /object /interface ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
fdo#61135 adding help text for stepped lines dialog
Hello Markus, here is my patch for the help text changes in the stepped lines dialog. For some reason, I can't push it to gerrit. I guess I messed something up in my git setup. There is also a smaller change that is linked to this: https://gerrit.libreoffice.org/3445 Can you review it ? Thanks, EricFrom d4e380958a354c95f85326490851429441e7e703 Mon Sep 17 00:00:00 2001 From: Eric Seynaeve git...@nosperse.com Date: Thu, 18 Apr 2013 00:21:11 +0200 Subject: [PATCH] fdo#61135 Adding stepped lines: changes to help system. Change-Id: I9b285d4043ab412105d607a8daa6a6b250ba59c2 --- AllLangHelp_schart.mk | 1 + source/text/schart/00/0004.xhp| 4 +- source/text/schart/01/smooth_line_properties.xhp | 2 +- source/text/schart/01/stepped_line_properties.xhp | 53 +++ source/text/schart/01/type_line.xhp | 4 +- source/text/schart/01/type_xy.xhp | 24 +- source/text/schart/01/wiz_chart_type.xhp | 6 +-- 7 files changed, 86 insertions(+), 8 deletions(-) create mode 100644 source/text/schart/01/stepped_line_properties.xhp diff --git a/AllLangHelp_schart.mk b/AllLangHelp_schart.mk index 0ddceff..dcf2984 100644 --- a/AllLangHelp_schart.mk +++ b/AllLangHelp_schart.mk @@ -48,6 +48,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,schart,\ helpcontent2/source/text/schart/01/0512 \ helpcontent2/source/text/schart/01/choose_chart_type \ helpcontent2/source/text/schart/01/smooth_line_properties \ +helpcontent2/source/text/schart/01/stepped_line_properties \ helpcontent2/source/text/schart/01/three_d_view \ helpcontent2/source/text/schart/01/type_area \ helpcontent2/source/text/schart/01/type_bubble \ diff --git a/source/text/schart/00/0004.xhp b/source/text/schart/00/0004.xhp index d89f7e1..c6d9c0e 100644 --- a/source/text/schart/00/0004.xhp +++ b/source/text/schart/00/0004.xhp @@ -242,7 +242,9 @@ /caseinline/switchinline Chart /paragraph paragraph role=paragraph id=par_id1096530 xml-lang=en-US l10n=NEWDouble-click a chart, then choose Format - Data Ranges/paragraph /section -paragraph role=paragraph id=par_id733359 xml-lang=en-US l10n=NEWvariable id=slpIn the Chart Type dialog of a Line chart or XY chart that displays lines, mark Smooth lines checkbox, then click the Properties button. +paragraph role=paragraph id=par_id733359 xml-lang=en-US l10n=NEWvariable id=smlpIn the Chart Type dialog of a Line chart or XY chart that displays lines, choose Smooth in the Lines type dropdown, then click the Properties button. +/variable/paragraph +paragraph role=paragraph id=par_id8513095 xml-lang=en-US l10n=NEWvariable id=stlpIn the Chart Type dialog of a Line chart or XY chart that displays lines, choose Stepped in the Lines type dropdown, then click the Properties button. /variable/paragraph /body /helpdocument diff --git a/source/text/schart/01/smooth_line_properties.xhp b/source/text/schart/01/smooth_line_properties.xhp index f614391..dfd8701 100644 --- a/source/text/schart/01/smooth_line_properties.xhp +++ b/source/text/schart/01/smooth_line_properties.xhp @@ -38,7 +38,7 @@ paragraph role=heading id=hd_id3050325 xml-lang=en-US level=1 l10n=NEWSmooth Line Properties/paragraph paragraph role=paragraph id=par_id9421979 xml-lang=en-US l10n=NEWIn a chart that displays lines (Line type or XY type), you can choose to show curves instead of straight lines. Some options control the properties of those curves.commentmost possibly these curves are not Bezier curves./comment/paragraph section id=howtoget - embed href=text/schart/00/0004.xhp#slp/ + embed href=text/schart/00/0004.xhp#stlp/ /section embed href=text/shared/00/0001.xhp#ShiftF1/ paragraph role=heading id=hd_id1228370 xml-lang=en-US level=2 l10n=NEWTo change line properties/paragraph diff --git a/source/text/schart/01/stepped_line_properties.xhp b/source/text/schart/01/stepped_line_properties.xhp new file mode 100644 index 000..09eb5f1 --- /dev/null +++ b/source/text/schart/01/stepped_line_properties.xhp @@ -0,0 +1,53 @@ +?xml version=1.0 encoding=UTF-8? + + +!-- + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + -- + +helpdocument version=1.0 +meta +topic id=textschart01stepped_line_propertiesxml indexer=include status=PUBLISH +title id=tit xml-lang=en-USSmooth Line Properties/title +filename/text/schart/01/stepped_line_properties.xhp/filename +/topic +history +created date=2013-04-17T21:30:00Eric Seynaeve/created +lastedited date=2013-04-17T21:30:00First version/lastedited +/history +/meta +body +bookmark xml-lang=en-US branch=hid/modules/schart/ui/steppedlinesdlg/SteppedLinesDialog id=bm_id1738954 localize=false/ +bookmark xml-lang=en-US branch=index id
[PATCH] fdo#61135: adding help button to stepped lines dialog.
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3445 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/45/3445/1 fdo#61135: adding help button to stepped lines dialog. Change-Id: I2ab4882e6c1e98ffa5a297a49e6968b629051be0 --- M chart2/uiconfig/ui/steppedlinesdlg.ui 1 file changed, 15 insertions(+), 0 deletions(-) diff --git a/chart2/uiconfig/ui/steppedlinesdlg.ui b/chart2/uiconfig/ui/steppedlinesdlg.ui index 4cc351f..ff1b5c0 100644 --- a/chart2/uiconfig/ui/steppedlinesdlg.ui +++ b/chart2/uiconfig/ui/steppedlinesdlg.ui @@ -209,6 +209,20 @@ property name=position1/property /packing /child +child + object class=GtkButton id=help +property name=labelgtk-help/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_stockTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position2/property + /packing +/child /object packing property name=expandFalse/property @@ -222,6 +236,7 @@ action-widgets action-widget response=0ok/action-widget action-widget response=0cancel/action-widget + action-widget response=0help/action-widget /action-widgets /object /interface -- To view, visit https://gerrit.libreoffice.org/3445 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2ab4882e6c1e98ffa5a297a49e6968b629051be0 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Eric Seynaeve git...@nosperse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: chart2/source chart2/uiconfig chart2/UIConfig_chart2.mk icon-themes/galaxy
chart2/UIConfig_chart2.mk |1
chart2/source/controller/dialogs/Bitmaps.hrc| 17
chart2/source/controller/dialogs/Bitmaps.src| 57 ++
chart2/source/controller/dialogs/ChartTypeDialogController.cxx | 125 +++--
chart2/source/controller/dialogs/Strings.src|5
chart2/source/controller/dialogs/Strings_AdditionalControls.src | 15
chart2/source/controller/dialogs/tp_ChartType.cxx | 211
-
chart2/source/controller/dialogs/tp_ChartType.hrc |2
chart2/source/controller/dialogs/tp_ChartType.src | 19
chart2/source/inc/Strings.hrc |5
chart2/uiconfig/ui/steppedlinesdlg.ui | 227
++
icon-themes/galaxy/chart2/res/nostackstepped3d_52x60.png|binary
icon-themes/galaxy/chart2/res/nostacksteppedboth_52x60.png |binary
icon-themes/galaxy/chart2/res/nostacksteppedlines_52x60.png |binary
icon-themes/galaxy/chart2/res/nostacksteppedpoints_52x60.png|binary
icon-themes/galaxy/chart2/res/stackstepped3d_52x60.png |binary
icon-themes/galaxy/chart2/res/stacksteppedboth_52x60.png|binary
icon-themes/galaxy/chart2/res/stacksteppedlines_52x60.png |binary
icon-themes/galaxy/chart2/res/stacksteppedpoints_52x60.png |binary
icon-themes/galaxy/chart2/res/step_center_x_30.png |binary
icon-themes/galaxy/chart2/res/step_center_y_30.png |binary
icon-themes/galaxy/chart2/res/step_end_30.png |binary
icon-themes/galaxy/chart2/res/step_start_30.png |binary
icon-themes/galaxy/chart2/res/valueaxisstepped3d_52x60.png |binary
icon-themes/galaxy/chart2/res/valueaxissteppedboth_52x60.png|binary
icon-themes/galaxy/chart2/res/valueaxissteppedlines_52x60.png |binary
26 files changed, 609 insertions(+), 75 deletions(-)
New commits:
commit edc3bfd558f3065a5444ad3f5c456da9546d16c4
Author: Eric Seynaeve git...@nosperse.com
Date: Wed Apr 10 00:15:43 2013 +0200
Adding the dialog for setting stepped lines.
The UI changes still need some more tweaking:
- adjusting the vertical alignment in the splineresourcegroup
- put the images in the radio buttons instead of in front of them
Change-Id: I4bc5ebe5167eca9a5b1341d9328a7d74b62cf819
diff --git a/chart2/UIConfig_chart2.mk b/chart2/UIConfig_chart2.mk
index da90c19..48d1561 100644
--- a/chart2/UIConfig_chart2.mk
+++ b/chart2/UIConfig_chart2.mk
@@ -31,6 +31,7 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/schart,\
$(eval $(call gb_UIConfig_add_uifiles,modules/schart,\
chart2/uiconfig/ui/smoothlinesdlg \
+ chart2/uiconfig/ui/steppedlinesdlg \
))
# vim: set noet sw=4 ts=4:
diff --git a/chart2/source/controller/dialogs/Bitmaps.hrc
b/chart2/source/controller/dialogs/Bitmaps.hrc
index e1f5710..ced4537 100644
--- a/chart2/source/controller/dialogs/Bitmaps.hrc
+++ b/chart2/source/controller/dialogs/Bitmaps.hrc
@@ -39,6 +39,10 @@
#define IMG_TYPE_NET(RID_APP_START + 8)
#define IMG_TYPE_STOCK (RID_APP_START + 9)
#define IMG_TYPE_COLUMN_LINE (RID_APP_START + 10)
+#define IMG_STEP_START (RID_APP_START + 11)
+#define IMG_STEP_END(RID_APP_START + 12)
+#define IMG_STEP_CENTER_X (RID_APP_START + 13)
+#define IMG_STEP_CENTER_Y (RID_APP_START + 14)
//-
//Chart Subtypes
@@ -115,6 +119,7 @@
#define BMP_POINTS_XVALUES (RID_APP_START + 47)
#define BMP_POINTS_XCATEGORY (RID_APP_START + 48)
#define BMP_POINTS_STACKED (RID_APP_START + 49)
+#define BMP_POINTS_STACKED (RID_APP_START + 49)
#define BMP_LINE_P_XVALUES (RID_APP_START + 50)
@@ -141,6 +146,18 @@
#define BMP_LINE_O_STACKED_SMOOTH (RID_APP_START + 66)
#define BMP_LINE3D_STACKED_SMOOTH (RID_APP_START + 67)
+#define BMP_LINE_P_XVALUES_STEPPED (RID_APP_START + 97)
+#define BMP_LINE_O_XVALUES_STEPPED (RID_APP_START + 98)
+#define BMP_LINE3D_XVALUES_STEPPED (RID_APP_START + 99)
+
+#define BMP_LINE_P_XCATEGORY_STEPPED (RID_APP_START + 100)
+#define BMP_LINE_O_XCATEGORY_STEPPED (RID_APP_START + 101)
+#define BMP_LINE3D_XCATEGORY_STEPPED (RID_APP_START + 102)
+
+#define BMP_LINE_P_STACKED_STEPPED (RID_APP_START + 103)
+#define BMP_LINE_O_STACKED_STEPPED (RID_APP_START + 104)
+#define BMP_LINE3D_STACKED_STEPPED (RID_APP_START + 105)
+
//--
// Area Chart Subtypes
diff --git a/chart2/source/controller/dialogs/Bitmaps.src
b/chart2/source/controller/dialogs/Bitmaps.src
index b4b3360..e566ec4 100644
--- a/chart2/source/controller/dialogs/Bitmaps.src
+++ b/chart2/source/controller/dialogs/Bitmaps.src
@@ -68,6 +68,26 @@ Image IMG_TYPE_BUBBLE
ImageBitmap = Bitmap { File = typebubble_16.png ; };
MaskColor = STD_MASKCOLOR;
};
+Image IMG_STEP_START
+{
+ImageBitmap = Bitmap { File = step_start_30.png ; };
+MaskColor
[PATCH] Adding the dialog for setting stepped lines.
..e3ae666 --- /dev/null +++ b/icon-themes/galaxy/chart2/res/.directory @@ -0,0 +1,5 @@ +[Dolphin] +PreviewsShown=true +Timestamp=2013,4,9,22,38,20 +Version=3 +ViewMode=1 diff --git a/icon-themes/galaxy/chart2/res/nostackstepped3d_52x60.png b/icon-themes/galaxy/chart2/res/nostackstepped3d_52x60.png new file mode 100644 index 000..7356c25 --- /dev/null +++ b/icon-themes/galaxy/chart2/res/nostackstepped3d_52x60.png Binary files differ diff --git a/icon-themes/galaxy/chart2/res/nostacksteppedboth_52x60.png b/icon-themes/galaxy/chart2/res/nostacksteppedboth_52x60.png new file mode 100644 index 000..572ce0e --- /dev/null +++ b/icon-themes/galaxy/chart2/res/nostacksteppedboth_52x60.png Binary files differ diff --git a/icon-themes/galaxy/chart2/res/nostacksteppedlines_52x60.png b/icon-themes/galaxy/chart2/res/nostacksteppedlines_52x60.png new file mode 100644 index 000..1f312c6 --- /dev/null +++ b/icon-themes/galaxy/chart2/res/nostacksteppedlines_52x60.png Binary files differ diff --git a/icon-themes/galaxy/chart2/res/nostacksteppedpoints_52x60.png b/icon-themes/galaxy/chart2/res/nostacksteppedpoints_52x60.png new file mode 100644 index 000..04210d5 --- /dev/null +++ b/icon-themes/galaxy/chart2/res/nostacksteppedpoints_52x60.png Binary files differ diff --git a/icon-themes/galaxy/chart2/res/stackstepped3d_52x60.png b/icon-themes/galaxy/chart2/res/stackstepped3d_52x60.png new file mode 100644 index 000..942fcca --- /dev/null +++ b/icon-themes/galaxy/chart2/res/stackstepped3d_52x60.png Binary files differ diff --git a/icon-themes/galaxy/chart2/res/stacksteppedboth_52x60.png b/icon-themes/galaxy/chart2/res/stacksteppedboth_52x60.png new file mode 100644 index 000..6a80a74 --- /dev/null +++ b/icon-themes/galaxy/chart2/res/stacksteppedboth_52x60.png Binary files differ diff --git a/icon-themes/galaxy/chart2/res/stacksteppedlines_52x60.png b/icon-themes/galaxy/chart2/res/stacksteppedlines_52x60.png new file mode 100644 index 000..c1dc250 --- /dev/null +++ b/icon-themes/galaxy/chart2/res/stacksteppedlines_52x60.png Binary files differ diff --git a/icon-themes/galaxy/chart2/res/stacksteppedpoints_52x60.png b/icon-themes/galaxy/chart2/res/stacksteppedpoints_52x60.png new file mode 100644 index 000..b9128b0 --- /dev/null +++ b/icon-themes/galaxy/chart2/res/stacksteppedpoints_52x60.png Binary files differ diff --git a/icon-themes/galaxy/chart2/res/step_center_x_30.png b/icon-themes/galaxy/chart2/res/step_center_x_30.png new file mode 100644 index 000..68af1d7 --- /dev/null +++ b/icon-themes/galaxy/chart2/res/step_center_x_30.png Binary files differ diff --git a/icon-themes/galaxy/chart2/res/step_center_y_30.png b/icon-themes/galaxy/chart2/res/step_center_y_30.png new file mode 100644 index 000..f64e30c --- /dev/null +++ b/icon-themes/galaxy/chart2/res/step_center_y_30.png Binary files differ diff --git a/icon-themes/galaxy/chart2/res/step_end_30.png b/icon-themes/galaxy/chart2/res/step_end_30.png new file mode 100644 index 000..c4ccd93 --- /dev/null +++ b/icon-themes/galaxy/chart2/res/step_end_30.png Binary files differ diff --git a/icon-themes/galaxy/chart2/res/step_start_30.png b/icon-themes/galaxy/chart2/res/step_start_30.png new file mode 100644 index 000..48713ba --- /dev/null +++ b/icon-themes/galaxy/chart2/res/step_start_30.png Binary files differ diff --git a/icon-themes/galaxy/chart2/res/valueaxisstepped3d_52x60.png b/icon-themes/galaxy/chart2/res/valueaxisstepped3d_52x60.png new file mode 100644 index 000..2a7e90e --- /dev/null +++ b/icon-themes/galaxy/chart2/res/valueaxisstepped3d_52x60.png Binary files differ diff --git a/icon-themes/galaxy/chart2/res/valueaxissteppedboth_52x60.png b/icon-themes/galaxy/chart2/res/valueaxissteppedboth_52x60.png new file mode 100644 index 000..6f19623 --- /dev/null +++ b/icon-themes/galaxy/chart2/res/valueaxissteppedboth_52x60.png Binary files differ diff --git a/icon-themes/galaxy/chart2/res/valueaxissteppedlines_52x60.png b/icon-themes/galaxy/chart2/res/valueaxissteppedlines_52x60.png new file mode 100644 index 000..bb76d06 --- /dev/null +++ b/icon-themes/galaxy/chart2/res/valueaxissteppedlines_52x60.png Binary files differ -- To view, visit https://gerrit.libreoffice.org/3345 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4bc5ebe5167eca9a5b1341d9328a7d74b62cf819 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Eric Seynaeve git...@nosperse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Converting spline dialog box to glade.
+ /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position2/property + /packing +/child + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=pack_typeend/property +property name=position0/property + /packing +/child + /object +/child +action-widgets + action-widget response=0OKButton/action-widget + action-widget response=0CancelButton/action-widget + action-widget response=0HelpButton/action-widget +/action-widgets + /object +/interface -- To view, visit https://gerrit.libreoffice.org/3102 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I945445ab703b146b048cd45768d256d8b6a833d5 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Eric Seynaeve git...@nosperse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Converting Smooth Lines dialog to glade
=margin_left6/property +property name=margin_right12/property +property name=label translatable=yes_Resolution:/property property name=use_underlineTrue/property property name=mnemonic_widgetResolutionSpinbutton/property /object @@ -105,7 +99,9 @@ property name=visibleTrue/property property name=can_focusFalse/property property name=halignstart/property -property name=label translatable=yes_Degree of polynomials/property +property name=margin_left6/property +property name=margin_right12/property +property name=label translatable=yes_Degree of polynomials:/property property name=use_underlineTrue/property property name=mnemonic_widgetPolynomialsSpinButton/property /object @@ -122,6 +118,7 @@ property name=can_focusTrue/property property name=halignstart/property property name=invisible_char●/property +property name=invisible_char_setTrue/property property name=adjustmentResolutionAdjustment/property /object packing @@ -137,6 +134,7 @@ property name=can_focusTrue/property property name=halignstart/property property name=invisible_char●/property +property name=invisible_char_setTrue/property property name=adjustmentPolynomialsAdjustment/property /object packing @@ -163,10 +161,11 @@ child internal-child=action_area object class=GtkButtonBox id=dialog-action_area1 property name=can_focusFalse/property +property name=margin_top12/property property name=homogeneousTrue/property -property name=layout_stylespread/property +property name=layout_styleend/property child - object class=GtkButton id=OKButton + object class=GtkButton id=ok property name=labelgtk-ok/property property name=visibleTrue/property property name=can_focusTrue/property @@ -182,7 +181,7 @@ /packing /child child - object class=GtkButton id=CancelButton + object class=GtkButton id=cancel property name=labelgtk-cancel/property property name=visibleTrue/property property name=can_focusTrue/property @@ -196,7 +195,7 @@ /packing /child child - object class=GtkButton id=HelpButton + object class=GtkButton id=help property name=labelgtk-help/property property name=visibleTrue/property property name=can_focusTrue/property @@ -220,9 +219,27 @@ /object /child action-widgets - action-widget response=0OKButton/action-widget - action-widget response=0CancelButton/action-widget - action-widget response=0HelpButton/action-widget + action-widget response=0ok/action-widget + action-widget response=0cancel/action-widget + action-widget response=0help/action-widget /action-widgets /object + object class=GtkListStore id=SplineTypeModel +columns + !-- column-name TypeName -- + column type=gchararray/ + !-- column-name TypeInt -- + column type=gint/ +/columns +data + row +col id=0 translatable=yesCubic Spline/col +col id=10/col + /row + row +col id=0 translatable=yesB-Spline/col +col id=11/col + /row +/data + /object /interface -- To view, visit https://gerrit.libreoffice.org/3103 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I098267a4b11322df84f4a10e83f3c47a69418371 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Eric Seynaeve git...@nosperse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-ux-advise] Review asked of Smooth Lines dialog
Hello everyone, I'm busy converting the Smooth Lines dialog from the chartwizard in Calc to glade. I checked the item's from Caolán's list and from me it looks fine. But a second opinion would be nice :-) I also have a second question. The current dialog is located in chart2/source/controller/dialogs/tp_ChartType.cxx but I didn't succeed to get the dialog loaded. I created a chart2/UI_chart2.mk but no luck. Adding it to sc/uiconfig/scalc/ui/ did work out. Is this OK ? Thanks, Eric smoothlinesdlg.ui Description: application/designer ___ Libreoffice-ux-advise mailing list Libreoffice-ux-advise@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-ux-advise
Re: Re: fdo#61135 New feature in Calc: Stepped Lines graphs - first part of code submitted
Hello Markus, thanks for your review. On Wednesday 06 March 2013 17:00:56 Markus Mohrhard wrote: First we need to move the new values in CurveStyle.idl to the end and remove all the GNM_* values. Moving the values to the end ensures that the old values stay unchanged which causes as little trouble for extension developers using the API as possible. OK. I wasn't aware that the last value there was not a sentinel but needed to remain the same. The import for files written by gnumeric should map the values to the corresponding ODF values and during export we only want to export them as ODF and never into the gnumeric namespace. This also means to OK. I thought that it would be nice for somebody that wrote the file with Gnumeric not to silently convert it to something that might not be read back the same in Gnumeric. That's why I added all these GNM_* values. But I can understand your POV. remove all the references to the GNM_* values in the other source files. For that to correctly work we need to register the gnumeric namespace and map the elements in the chart namespace and the elements in the gnumeric namesapce to the same UNO attributes. Could you explain this a bit more. Are we talking about the XML namespace or the C++ namespace ? I see some references in the code related to Gnumeric and a link with orcus. into the gnumeric namespace. Additionally we need to take care of the ODF version during export and make sure we only export it into ODF1.2 extended. I think Thorsten was fine with exporting the elements into the chart namespace but only for ODF 1.2 extended. First a general question. I found the option for selecting the ODF type. But how does that work when somebody requires, e.g., strict ODF1.2 or lower compliance. Is there a warning given when the file is written ? Do we hide the option for stepped lines then ? Secondly, can you point to an example where the above is done ? Then I can implement something similar. Additionally it would be nice if you would provide at least one of your test documents from gnumeric and one of your test documents for normal ODF as MPL/LGPL licensed test documents that we can add to our test file repository. If you are interested it would also be nice if you could add a test case for it to our new chart2 import test at chart2/qa/extras/chart2import.cxx. There is a Gnumeric file attached to the bugzilla. I hereby place it under MPL/LGPL. Once I'm further, I will also add a similar file created fully in LO. I'll have a look at the test cases and what is done there. Thanks a lot for your great work. It is highly appreciated and feel free to ask for any help you need. :-) For the UI part of the task it might make sense to first convert the relevant dialog to the new UI format and then add the new elements into it. As indicated in the UI ML, I will use a seperate dialog. As for getting up to speed with Glade, I was thinking about converting the existing dialog for the spline option first. Then, I know better how to create a new one. But first I'll amend the existing patch with the code changes you requested above. Once those are accepted I'll tackle the UI. Regards, Markus Thanks, Eric___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-ux-advise] fdo#61135 Advise wanted on changes in Chart Wizard
Hello everyone, in my work on fdo#61135, I have to make changes to the chart wizard. It needs to include stepped lines as an option (next to the normal lines and the smooth lines). I have added the current situation and a mock-up to the bugzilla since I don't know if posting png files is allowed for this list. Can someone let me know if the mock-up is OK. The properties for the stepped lines would be where the stepping is done: at the start of the line, at the end, in the middle (X position) or to halfway (Y position). This would be shown in a seperate dialog box. Thanks, Eric___ Libreoffice-ux-advise mailing list Libreoffice-ux-advise@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-ux-advise
Re: Re: fdo#61135 New feature in Calc: Stepped Lines graphs - first part of code submitted
Hello Markus, I also want to add some debug code in what I have done, mainly to print a warning if new curve types are fed to LO. What's the best way to do that ? From https://wiki.documentfoundation.org/Development/How_to_debug#Macros_Contro lling_Debug_Code I would think to add the code in #ifdef SAL_LOG_WARN or use the SAL_WARN macro. You should use SAL_WARN and SAL_INFO for these tasks. Additionally we are using more and more assert if we really want an abort for a special condition. THere is also SAL_WARN_IF and SAL_INFO_IF for conditional debug statements. Thanks for the pointers. Looks like SAL_WARN_IF is what I want. I have amended the patch with this already. Anyway, I will now create a mock for the UI and discuss this on the UI list. Once this is done, what would be the best way to add the new UI functionality ? A friendly push in the right direction would save me quite some time ;-) You should design the dialogs nowadays with Glade. We are switching from our old dialog descriptions to new glade xml files. Caolan wrote a nice wiki page about widgetllayout (https://wiki.documentfoundation.org/Development/WidgetLayout). While it focuses mostly on transfering old dialogs to the new format it should give you a basic idea how to create a new one. If you need one of the custom widgets that we have somewhere in the code or other customization of an existing widget we can help you implement that. I'm with you on new Dialogs. I could convert the existing dialog (ChartTypeDialog?) to glade, but it seems a bit ambitious at the moment for my knowledge in LO. Maybe later after getting more experience with simpler dialogs. I saw Caolan's talk on FOSDEM and it seemed not too difficult for the simpler dialogs. Eric___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
fdo#61135 New feature in Calc: Stepped Lines graphs - first part of code submitted
Hello everyone, I have added my first real code for submission to LO :-) It's in gerrit: https://gerrit.libreoffice.org/2476. It took me a while to find my way around the code and also to get used to the new possibilities in C++. I looked on the LO website to find some pointers around in the code, but didn't really found it. My main helpers were OpenGrok and gdb. Did I miss a nice overview of where to find which functionality ? Secondly, what would you recommend as a primer on the C++ functionalities used in LO code + how they are used ? I didn't do that advanced C++ coding before that I know a lot about templates and namespaces. I also want to add some debug code in what I have done, mainly to print a warning if new curve types are fed to LO. What's the best way to do that ? From https://wiki.documentfoundation.org/Development/How_to_debug#Macros_Controlling_Debug_Code I would think to add the code in #ifdef SAL_LOG_WARN or use the SAL_WARN macro. Anyway, I will now create a mock for the UI and discuss this on the UI list. Once this is done, what would be the best way to add the new UI functionality ? A friendly push in the right direction would save me quite some time ;-) Thanks, Eric___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#61135 stepped lines graph: handle ods files
::XML_TOKEN_INVALID,0 }
+{ ::xmloff::token::XML_NONE, 0 },
+{ ::xmloff::token::XML_CUBIC_SPLINE, 1 },
+{ ::xmloff::token::XML_B_SPLINE, 2 },
+{ ::xmloff::token::XML_STEP_START, 3 },
+{ ::xmloff::token::XML_STEP_END, 4 },
+{ ::xmloff::token::XML_STEP_CENTER_X, 5 },
+{ ::xmloff::token::XML_STEP_CENTER_Y, 6 },
+{ ::xmloff::token::XML_GNM_STEP_START, 7 },
+{ ::xmloff::token::XML_GNM_STEP_END, 8 },
+{ ::xmloff::token::XML_GNM_STEP_CENTER_X, 9 },
+{ ::xmloff::token::XML_GNM_STEP_CENTER_Y, 10 },
+{ ::xmloff::token::XML_TOKEN_INVALID, 0 }
};
SvXMLEnumMapEntry aXMLChartDataLabelPlacementEnumMap[] =
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index afd52ba..c2d94d4 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -2556,6 +2556,15 @@
TOKEN( interpolation,XML_INTERPOLATION ),
TOKEN( cubic-spline, XML_CUBIC_SPLINE ),
TOKEN( b-spline, XML_B_SPLINE ),
+TOKEN( step-start, XML_STEP_START ),
+TOKEN( step-end, XML_STEP_END ),
+TOKEN( step-center-x,XML_STEP_CENTER_X ),
+TOKEN( step-center-y,XML_STEP_CENTER_Y ),
+// also understand the older Gnumeric tookens
+TOKEN( gnm:step-start, XML_GNM_STEP_START ),
+TOKEN( gnm:step-end, XML_GNM_STEP_END ),
+TOKEN( gnm:step-center-x,XML_GNM_STEP_CENTER_X ),
+TOKEN( gnm:step-center-y,XML_GNM_STEP_CENTER_Y ),
TOKEN( urn:oasis:names:tc:opendocument:xmlns:database:1.0,
XML_N_DB_OASIS ),
TOKEN( show-filter-button, XML_SHOW_FILTER_BUTTON
),
diff --git a/xmloff/source/transform/StyleOASISTContext.cxx
b/xmloff/source/transform/StyleOASISTContext.cxx
index 6f7caf7..f5fc845 100644
--- a/xmloff/source/transform/StyleOASISTContext.cxx
+++ b/xmloff/source/transform/StyleOASISTContext.cxx
@@ -315,18 +315,26 @@
break;
case XML_OPTACTION_INTERPOLATION:
{
-// 0: none
-sal_Int32 nSplineType = 0;
+// 0: none (default)
+sal_Int32 nLineType = 0;
if( IsXMLToken( rAttrValue, XML_CUBIC_SPLINE ))
-nSplineType = 1;
+nLineType = 1;
else if( IsXMLToken( rAttrValue, XML_B_SPLINE ))
-nSplineType = 2;
+nLineType = 2;
+else if( IsXMLToken( rAttrValue, XML_STEP_START )
|| IsXMLToken( rAttrValue, XML_GNM_STEP_START ) )
+nLineType = 3;
+else if( IsXMLToken( rAttrValue, XML_STEP_END )
|| IsXMLToken( rAttrValue, XML_GNM_STEP_END ) )
+nLineType = 4;
+else if( IsXMLToken( rAttrValue, XML_STEP_CENTER_X )
|| IsXMLToken( rAttrValue, XML_GNM_STEP_CENTER_X ) )
+nLineType = 5;
+else if( IsXMLToken( rAttrValue, XML_STEP_CENTER_Y )
|| IsXMLToken( rAttrValue, XML_GNM_STEP_CENTER_Y ) )
+nLineType = 6;
pAttrList-AddAttribute(
GetTransformer().GetNamespaceMap().GetQNameByKey(
XML_NAMESPACE_CHART,
GetXMLToken( XML_SPLINES )),
-OUString::valueOf( nSplineType ));
+OUString::valueOf( nLineType ));
}
break;
case XML_OPTACTION_INTERVAL_MAJOR:
--
To view, visit https://gerrit.libreoffice.org/2476
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0f04a779de4b65326ed7ce6de56191f11b51c596
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Eric Seynaeve git...@nosperse.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Re: New feature in Calc: Stepped Lines graphs
On Wednesday 20 February 2013 11:09:06 Regina Henschel wrote: In Gnumeric I see an interpolation with stepped lines. Is it that, what you want to get? If yes, then I would not implement them as new chart type in LO, but use the same way as in Gnumeric and make it a new kind of interpolation. I looked it up and indeed, this shows what I want. I have taken screenshots of how it looks in Gnumeric and in my code (so far). Also, I have saved the Gnumeric file as ODF. All of this is attached to the bug report for posterity ;-) There exists already a request for ODF1.3 to specify such interpolation. If LO will implement them too, it will become more likely, that they will be specified in ODF1.3. Nice. Can I have a look at this proposal somewhere online or do you need to be an OASIS member ? Thanks a lot for the information Regina. Eric___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Re: New feature in Calc: Stepped Lines graphs
On Wednesday 20 February 2013 11:09:06 Regina Henschel wrote: The specification is not written in a way, that some people image cool new features, but they look, what existing programs do. And those things which are common are standardized. Therefore LO has ODF1.2 extended and Gnumeric with foreign elements. Regina, I looked at the xml in Gnumeric. It indicates it as follows: style:style ... style:chart-properties chart:interpolation=gnm:step-end.../ /style:style I guess the 'gnm:step-end' is a foreign element/attribute. Should I implement something similar for LO ? If yes, what to use instead of gnm:. If no, can you point me in the right direction. Thanks a lot. Eric___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
New feature in Calc: Stepped Lines graphs
Hello everyone, in order to scratch my own itch, I started working on a stepped lines feature for XY graphs (and Line graphs) in Calc. See bugzilla 61135. This is my first coding in LO :-) Next steps would be to expose this functionality in the UI and check that it would be saved and read in the file format. However, before spending more time, I would like to know about the following: - can we just add a new type of graph ? Don't we have to follow the ODF 1.2 specification ? - if I add this, what about compatibility with older LO/OOo versions and other spreadsheets using ODF (Gnumeric, KOffice, ...) ? - how to handle UI changes ? Can I create a patch/proposal independently ? Thanks for the answers, Eric ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Re: New feature in Calc: Stepped Lines graphs
On Wednesday 20 February 2013 14:04:12 Jan Holesovsky wrote: If you want to have user experience input on the changes, the best is to involve the guys at libreoffice-ux-adv...@lists.freedesktop.org, either to check what you have already done, or to work with them on the design. I'll do that once I have a mockup. Please let us know when you have finalized the patch by sending a [PATCH] mail to this ML, or via gerrit. And of course, should you have any questions, just ask, or reach us at the IRC (#libreoffice-dev at irc.freenode.net). Will do. Thanks for the compliment as well Jan. This makes me want to do more :-) Eric___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED] Translated german comments
Hello Michael, all of my past future contributions to LibreOffice may be licensed under the MPL/LGPLv3+ dual license. Greetings, Tobias On Wednesday 06 February 2013 19:46:31 Michael Meeks wrote: Hi Eric, Thanks for that ! looks lovely. Such translation is much appreciated - good of you to get involved. It'd be great to have an MPLv2/LGPLv3+ license statement on the public list that we can link into the wiki here: http://wiki.documentfoundation.org/Development/Developers Otherwise - looking forward to your next contribution ! :-) All the best, Michael.___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Translated german comments
From 296b85124bd1b7392ea6fc44b0f35b37311dc199 Mon Sep 17 00:00:00 2001
From: EricSeynaeve git...@nosperse.com
Date: Mon, 4 Feb 2013 22:45:06 +0100
Subject: [PATCH] Translated german comments
Change-Id: Idc31ebc5bb2d11345f68b7275b7fc4d335b633c1
---
sc/source/core/data/column.cxx | 89 --
1 file changed, 43 insertions(+), 46 deletions(-)
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index f29dc2d..ce65100 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -420,7 +420,7 @@ void ScColumn::ApplyPattern( SCROW nRow, const ScPatternAttr rPatAttr )
const ScPatternAttr* pPattern = pAttrArray-GetPattern( nRow );
-// true = alten Eintrag behalten
+// true = keep old content
ScPatternAttr* pNewPattern = (ScPatternAttr*) aCache.ApplyTo( *pPattern, true );
ScDocumentPool::CheckRef( *pPattern );
@@ -543,7 +543,7 @@ const ScStyleSheet* ScColumn::GetSelectionStyle( const ScMarkData rMark, bool
rFound = false;
if (!rMark.IsMultiMarked())
{
-OSL_FAIL(ScColumn::GetSelectionStyle ohne Selektion);
+OSL_FAIL(No selection in ScColumn::GetSelectionStyle);
return NULL;
}
@@ -566,7 +566,7 @@ const ScStyleSheet* ScColumn::GetSelectionStyle( const ScMarkData rMark, bool
pNewStyle = pPattern-GetStyleSheet();
rFound = true;
if ( !pNewStyle || ( pStyle pNewStyle != pStyle ) )
-bEqual = false; // unterschiedliche
+bEqual = false; // difference
pStyle = pNewStyle;
}
}
@@ -593,7 +593,7 @@ const ScStyleSheet* ScColumn::GetAreaStyle( bool rFound, SCROW nRow1, SCROW nRo
pNewStyle = pPattern-GetStyleSheet();
rFound = true;
if ( !pNewStyle || ( pStyle pNewStyle != pStyle ) )
-bEqual = false; // unterschiedliche
+bEqual = false; // difference
pStyle = pNewStyle;
}
@@ -644,8 +644,8 @@ void ScColumn::SetPatternArea( SCROW nStartRow, SCROW nEndRow,
void ScColumn::ApplyAttr( SCROW nRow, const SfxPoolItem rAttr )
{
-// um nur ein neues SetItem zu erzeugen, brauchen wir keinen SfxItemPoolCache.
-//! Achtung: der SfxItemPoolCache scheint zuviele Refs fuer das neue SetItem zu erzeugen ??
+// in order to only create a new SetItem, we don't need SfxItemPoolCache.
+//! Warning: SfxItemPoolCache seems to create to many Refs for the new SetItem ??
ScDocumentPool* pDocPool = pDocument-GetPool();
@@ -657,11 +657,9 @@ void ScColumn::ApplyAttr( SCROW nRow, const SfxPoolItem rAttr )
if ( pNewPattern != pOldPattern )
pAttrArray-SetPattern( nRow, pNewPattern );
else
-pDocPool-Remove( *pNewPattern ); // ausser Spesen nichts gewesen
+pDocPool-Remove( *pNewPattern ); // free up resources
delete pTemp;
-
-// alte Version mit SfxItemPoolCache:
}
bool ScColumn::Search( SCROW nRow, SCSIZE nIndex ) const
@@ -771,7 +769,6 @@ void ScColumn::Resize( SCSIZE nSize )
maItems.reserve(nSize);
}
-// SwapRow zum Sortieren
namespace {
@@ -789,6 +786,7 @@ void lclTakeBroadcaster( ScBaseCell* rpCell, SvtBroadcaster* pBC )
} // namespace
+// SwapRow for sorting
void ScColumn::SwapRow(SCROW nRow1, SCROW nRow2)
{
/* Simple swap of cell pointers does not work if broadcasters exist (crash
@@ -883,7 +881,7 @@ void ScColumn::SwapRow(SCROW nRow1, SCROW nRow2)
ScTokenArray* pCode1 = pFmlaCell1-GetCode();
ScTokenArray* pCode2 = pFmlaCell2-GetCode();
-if (pCode1-GetLen() == pCode2-GetLen()) // nicht-UPN
+if (pCode1-GetLen() == pCode2-GetLen()) // not-UPN
{
bool bEqual = true;
sal_uInt16 nLen = pCode1-GetLen();
@@ -967,10 +965,10 @@ void ScColumn::SwapCell( SCROW nRow, ScColumn rCol)
if ( pCell2 )
{
-// Tauschen
+// swap
maItems[nIndex1].pCell = pCell2;
rCol.maItems[nIndex2].pCell = pCell1;
-// Referenzen aktualisieren
+// update references
SCsCOL dx = rCol.nCol - nCol;
if ( pFmlaCell1 )
{
@@ -989,9 +987,9 @@ void ScColumn::SwapCell( SCROW nRow, ScColumn rCol)
}
else
{
-// Loeschen
+// remove
maItems.erase(maItems.begin() + nIndex1);
-// Referenzen aktualisieren
+// update references
SCsCOL dx = rCol.nCol - nCol;
if ( pFmlaCell1 )
{
@@ -1000,7 +998,7 @@ void ScColumn::SwapCell( SCROW nRow, ScColumn rCol)
pFmlaCell1-aPos.SetCol( rCol.nCol );
pFmlaCell1-UpdateReference(URM_MOVE, aRange, dx, 0, 0);
}
-// Einfuegen
+// insert
rCol.Insert(nRow, pCell1);
[Libreoffice-commits] core.git: 2 commits - sc/source
sc/source/core/data/column.cxx | 89 ++---
sc/source/core/data/column2.cxx | 163 +++-
2 files changed, 123 insertions(+), 129 deletions(-)
New commits:
commit f60708de8a73cb716cc73e95ded7b0032a47be72
Author: Eric Seynaeve git...@nosperse.com
Date: Tue Feb 5 22:08:36 2013 +0100
Translated german comments
Change-Id: I9ee25faa57397ec2d0e7e9bb77aabade4404e32d
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 5f30ebd..21f7784 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -74,7 +74,7 @@ inline bool IsAmbiguousScript( sal_uInt8 nScript )
//
-
//
-// Datei-Operationen
+// Data operations
//
//
-
@@ -95,8 +95,8 @@ long ScColumn::GetNeededSize(
if (!pPattern)
pPattern = pAttrArray-GetPattern( nRow );
-// zusammengefasst?
-// Merge nicht in bedingter Formatierung
+// merged?
+// Do not merge in conditional formatting
const ScMergeAttr* pMerge = (const
ScMergeAttr*)pPattern-GetItem(ATTR_MERGE);
const ScMergeFlagAttr* pFlag = (const
ScMergeFlagAttr*)pPattern-GetItem(ATTR_MERGE_FLAG);
@@ -116,10 +116,10 @@ long ScColumn::GetNeededSize(
return 0;
}
-// bedingte Formatierung
+// conditional formatting
const SfxItemSet* pCondSet = pDocument-GetCondResult( nCol, nRow,
nTab );
-// Zeilenumbruch?
+// line break?
const SfxPoolItem* pCondItem;
SvxCellHorJustify eHorJust;
@@ -179,7 +179,7 @@ long ScColumn::GetNeededSize(
pPattern-GetItem(ATTR_ROTATE_MODE)).GetValue();
if ( nRotate == 18000 )
-eRotMode = SVX_ROTATE_MODE_STANDARD;// keinen Ueberlauf
+eRotMode = SVX_ROTATE_MODE_STANDARD;// no overflow
}
}
@@ -229,7 +229,7 @@ long ScColumn::GetNeededSize(
IsAmbiguousScript( nScript ) ||
((eCellType == CELLTYPE_FORMULA)
((ScFormulaCell*)pCell)-IsMultilineResult()) );
-if (!bEditEngine) // direkte Ausgabe
+if (!bEditEngine) // direct output
{
Color* pColor;
rtl::OUString aValStr;
@@ -238,7 +238,7 @@ long ScColumn::GetNeededSize(
true, rOptions.bFormula, ftCheck );
if (!aValStr.isEmpty())
{
-// SetFont ist nach oben verschoben
+// SetFont is moved up
Size aSize( pDev-GetTextWidth( aValStr ),
pDev-GetTextHeight() );
if ( eOrient != SVX_ORIENTATION_STANDARD )
@@ -249,9 +249,9 @@ long ScColumn::GetNeededSize(
}
else if ( nRotate )
{
-//! unterschiedliche Skalierung X/Y beruecksichtigen
+//! take different X/Y scaling into consideration
-double nRealOrient = nRotate * F_PI18000; // nRotate
sind 1/100 Grad
+double nRealOrient = nRotate * F_PI18000; // nRotate is
in 1/100 Grad
double nCosAbs = fabs( cos( nRealOrient ) );
double nSinAbs = fabs( sin( nRealOrient ) );
long nHeight = (long)( aSize.Height() * nCosAbs +
aSize.Width() * nSinAbs );
@@ -262,14 +262,14 @@ long ScColumn::GetNeededSize(
{
nWidth = (long) ( pDocument-GetColWidth( nCol,nTab )
* nPPT );
bAddMargin = false;
-// nur nach rechts:
-//! unterscheiden nach Ausrichtung oben/unten (nur
Text/ganze Hoehe)
+// only to the right:
+//! differ on direction up/down (only Text/whole
height)
if ( pPattern-GetRotateDir( pCondSet ) ==
SC_ROTDIR_RIGHT )
nWidth += (long)( pDocument-GetRowHeight(
nRow,nTab ) *
nPPT * nCosAbs / nSinAbs );
}
else
-nWidth = (long)( aSize.Height() / nSinAbs ); //!
begrenzen?
+nWidth = (long)( aSize.Height() / nSinAbs ); //!
limit?
if ( bBreak !rOptions.bTotalSize )
{
@@ -297,18 +297,18 @@ long ScColumn::GetNeededSize(
(long) ( pMargin-GetBottomMargin() * nPPT
