[Libreoffice-commits] core.git: Branch 'feature/tiledrendering' - 2 commits - sw/qa
Jan Holesovsky
kendy at collabora.com
Fri Oct 25 10:39:03 PDT 2013
sw/qa/tiledrendering/tiledrendering.cxx | 18 ++++++------------
sw/qa/tiledrendering/tiledrendering.ui | 11 +++++++++--
2 files changed, 15 insertions(+), 14 deletions(-)
New commits:
commit 900130c715e95462cc609a0f21ad64b7fd5cfa0c
Author: Jan Holesovsky <kendy at collabora.com>
Date: Fri Oct 25 19:27:02 2013 +0200
Tiled rendering: Update the adjustments in the test app .ui.
Change-Id: Ia791111bfeda1ba5c4044f75257e08ec4cce54b4
diff --git a/sw/qa/tiledrendering/tiledrendering.ui b/sw/qa/tiledrendering/tiledrendering.ui
index e5e6d8f..35a6bf6 100644
--- a/sw/qa/tiledrendering/tiledrendering.ui
+++ b/sw/qa/tiledrendering/tiledrendering.ui
@@ -13,6 +13,13 @@
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
+ <object class="GtkAdjustment" id="adjustment3">
+ <property name="lower">1</property>
+ <property name="upper">100000</property>
+ <property name="value">5000</property>
+ <property name="step_increment">100</property>
+ <property name="page_increment">10</property>
+ </object>
<object class="GtkWindow" id="TiledRendering">
<property name="can_focus">False</property>
<property name="border_width">12</property>
@@ -195,7 +202,7 @@
<property name="invisible_char">â¢</property>
<property name="invisible_char_set">True</property>
<property name="progress_pulse_step">1</property>
- <property name="adjustment">adjustment1</property>
+ <property name="adjustment">adjustment3</property>
<property name="numeric">True</property>
</object>
<packing>
@@ -213,7 +220,7 @@
<property name="width_chars">1</property>
<property name="invisible_char_set">True</property>
<property name="progress_pulse_step">1</property>
- <property name="adjustment">adjustment1</property>
+ <property name="adjustment">adjustment3</property>
<property name="numeric">True</property>
</object>
<packing>
commit 4bc75d825abd9b10dcbb5f75f72e749d2da8d688
Author: Jan Holesovsky <kendy at collabora.com>
Date: Fri Oct 25 19:12:43 2013 +0200
Tiled rendering: Better way to get the values in the test app.
Change-Id: I8c4b1cc1d6db3b6572bcf6d80e07567f667e975e
diff --git a/sw/qa/tiledrendering/tiledrendering.cxx b/sw/qa/tiledrendering/tiledrendering.cxx
index 389e997..3adbf83 100644
--- a/sw/qa/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/tiledrendering/tiledrendering.cxx
@@ -97,22 +97,16 @@ public:
DECL_LINK ( RenderHdl, Button * );
DECL_LINK ( ChooseDocumentHdl, Button * );
-
- int extractInt(const NumericField *pField)
- {
- OUString aString(pField->GetText());
- return aString.toInt32();
- }
};
IMPL_LINK ( TiledRenderingDialog, RenderHdl, Button *, EMPTYARG )
{
- int contextWidth = extractInt(mpContextWidth);
- int contextHeight = extractInt(mpContextHeight);
- int tilePosX = extractInt(mpTilePosX);
- int tilePosY = extractInt(mpTilePosY);
- int tileWidth = extractInt(mpTileWidth);
- int tileHeight = extractInt(mpTileHeight);
+ int contextWidth = mpContextWidth->GetValue();
+ int contextHeight = mpContextHeight->GetValue();
+ int tilePosX = mpTilePosX->GetValue();
+ int tilePosY = mpTilePosY->GetValue();
+ int tileWidth = mpTileWidth->GetValue();
+ int tileHeight = mpTileHeight->GetValue();
// do the same thing we are doing in touch_lo_draw_tile()
SwWrtShell *pViewShell = GetActiveWrtShell();
More information about the Libreoffice-commits
mailing list