summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-09-25 15:36:40 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-09-25 17:20:31 +0100
commit892a7be963f5ffdb5af86a9de1cf8a613fbdc162 (patch)
treefad8ae447fea44c295abe8d5b74562659b655793
parentd61fc0b8946eba921d6b9c6d5fcd76fca83c85d7 (diff)
Resolves: fdo#83010 remove svx::WrapField
in favour of a wrap property on NumericField Change-Id: I62c6bdb69a16f37ae6018a2fe41070fb18dbe4a0
-rw-r--r--chart2/source/controller/dialogs/res_DataLabel.hxx3
-rw-r--r--chart2/source/controller/dialogs/tp_AxisLabel.hxx3
-rw-r--r--chart2/source/controller/dialogs/tp_TitleRotation.hxx3
-rw-r--r--chart2/uiconfig/ui/dlg_DataLabel.ui183
-rw-r--r--chart2/uiconfig/ui/titlerotationtabpage.ui2
-rw-r--r--chart2/uiconfig/ui/tp_DataLabel.ui6
-rw-r--r--chart2/uiconfig/ui/tp_PolarOptions.ui7
-rw-r--r--chart2/uiconfig/ui/tp_axisLabel.ui6
-rw-r--r--cui/source/inc/align.hxx3
-rw-r--r--cui/uiconfig/ui/cellalignment.ui2
-rw-r--r--extras/source/glade/libreoffice-catalog.xml.in3
-rw-r--r--include/svx/wrapfield.hxx50
-rw-r--r--svx/Library_svx.mk1
-rw-r--r--svx/source/dialog/wrapfield.cxx51
14 files changed, 109 insertions, 214 deletions
diff --git a/chart2/source/controller/dialogs/res_DataLabel.hxx b/chart2/source/controller/dialogs/res_DataLabel.hxx
index 0044e4a9d26e..9d6d0e01cd90 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.hxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.hxx
@@ -26,7 +26,6 @@
#include <svl/itemset.hxx>
#include "TextDirectionListBox.hxx"
#include <svx/dialcontrol.hxx>
-#include <svx/wrapfield.hxx>
#include <sfx2/tabdlg.hxx>
class SvNumberFormatter;
@@ -64,7 +63,7 @@ private:
VclHBox* m_pBxOrientation;
svx::DialControl* m_pDC_Dial;
FixedText* m_pFT_Dial;
- svx::WrapField* m_pNF_Degrees;
+ NumericField* m_pNF_Degrees;
VclHBox* m_pBxTextDirection;
TextDirectionListBox* m_pLB_TextDirection;
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.hxx b/chart2/source/controller/dialogs/tp_AxisLabel.hxx
index 059215b911b8..8da5eafcf9c7 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.hxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.hxx
@@ -23,7 +23,6 @@
#include <vcl/button.hxx>
#include <vcl/fixed.hxx>
#include <svx/dialcontrol.hxx>
-#include <svx/wrapfield.hxx>
#include <svx/orienthelper.hxx>
#include "TextDirectionListBox.hxx"
@@ -51,7 +50,7 @@ private:
FixedText* m_pFlOrient;
svx::DialControl* m_pCtrlDial;
FixedText* m_pFtRotate;
- svx::WrapField* m_pNfRotate;
+ NumericField* m_pNfRotate;
TriStateBox* m_pCbStacked;
svx::OrientationHelper* m_pOrientHlp;
diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.hxx b/chart2/source/controller/dialogs/tp_TitleRotation.hxx
index dd3ceb0902d6..0bd5c976b4e3 100644
--- a/chart2/source/controller/dialogs/tp_TitleRotation.hxx
+++ b/chart2/source/controller/dialogs/tp_TitleRotation.hxx
@@ -21,7 +21,6 @@
#include <sfx2/tabdlg.hxx>
#include <svx/dialcontrol.hxx>
-#include <svx/wrapfield.hxx>
#include <svx/orienthelper.hxx>
#include <vcl/fixed.hxx>
#include "TextDirectionListBox.hxx"
@@ -34,7 +33,7 @@ class SchAlignmentTabPage : public SfxTabPage
private:
svx::DialControl* m_pCtrlDial;
FixedText* m_pFtRotate;
- svx::WrapField* m_pNfRotate;
+ NumericField* m_pNfRotate;
TriStateBox* m_pCbStacked;
svx::OrientationHelper* m_pOrientHlp;
FixedText* m_pFtTextDirection;
diff --git a/chart2/uiconfig/ui/dlg_DataLabel.ui b/chart2/uiconfig/ui/dlg_DataLabel.ui
index 2910aba77ba1..cd35953f7f80 100644
--- a/chart2/uiconfig/ui/dlg_DataLabel.ui
+++ b/chart2/uiconfig/ui/dlg_DataLabel.ui
@@ -1,12 +1,101 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.1 -->
<interface>
- <!-- interface-requires gtk+ 3.0 -->
+ <requires lib="gtk+" version="3.0"/>
<!-- interface-requires LibreOffice 1.0 -->
<object class="GtkAdjustment" id="adjustmentDEGREE">
<property name="upper">359</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
+ <object class="GtkListStore" id="liststorePLACEMENT">
+ <columns>
+ <!-- column-name gchararray1 -->
+ <column type="gchararray"/>
+ <!-- column-name guint1 -->
+ <column type="guint"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">Best fit</col>
+ <col id="1">0</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Center</col>
+ <col id="1">1</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Above</col>
+ <col id="1">2</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Top left</col>
+ <col id="1">3</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Left</col>
+ <col id="1">4</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Bottom left</col>
+ <col id="1">5</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Below</col>
+ <col id="1">6</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Bottom right</col>
+ <col id="1">7</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Right</col>
+ <col id="1">8</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Top right</col>
+ <col id="1">9</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Inside</col>
+ <col id="1">10</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Outside</col>
+ <col id="1">11</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Near origin</col>
+ <col id="1">12</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="liststoreSEPARATOR">
+ <columns>
+ <!-- column-name gchararray1 -->
+ <column type="gchararray"/>
+ <!-- column-name guint1 -->
+ <column type="guint"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">Space</col>
+ <col id="1">0</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Comma</col>
+ <col id="1">1</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Semicolon</col>
+ <col id="1">2</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">New line</col>
+ <col id="1">3</col>
+ </row>
+ </data>
+ </object>
<object class="GtkDialog" id="dlg_DataLabels">
<property name="can_focus">False</property>
<property name="border_width">6</property>
@@ -366,13 +455,13 @@
</packing>
</child>
<child>
- <object class="svxlo-WrapField" id="NF_LABEL_DEGREES">
+ <object class="GtkSpinButton" id="NF_LABEL_DEGREES">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="invisible_char">•</property>
- <property name="invisible_char_set">True</property>
<property name="adjustment">adjustmentDEGREE</property>
+ <property name="wrap">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -474,94 +563,6 @@
<action-widget response="0">help</action-widget>
</action-widgets>
</object>
- <object class="GtkListStore" id="liststorePLACEMENT">
- <columns>
- <!-- column-name gchararray1 -->
- <column type="gchararray"/>
- <!-- column-name guint1 -->
- <column type="guint"/>
- </columns>
- <data>
- <row>
- <col id="0" translatable="yes">Best fit</col>
- <col id="1">0</col>
- </row>
- <row>
- <col id="0" translatable="yes">Center</col>
- <col id="1">1</col>
- </row>
- <row>
- <col id="0" translatable="yes">Above</col>
- <col id="1">2</col>
- </row>
- <row>
- <col id="0" translatable="yes">Top left</col>
- <col id="1">3</col>
- </row>
- <row>
- <col id="0" translatable="yes">Left</col>
- <col id="1">4</col>
- </row>
- <row>
- <col id="0" translatable="yes">Bottom left</col>
- <col id="1">5</col>
- </row>
- <row>
- <col id="0" translatable="yes">Below</col>
- <col id="1">6</col>
- </row>
- <row>
- <col id="0" translatable="yes">Bottom right</col>
- <col id="1">7</col>
- </row>
- <row>
- <col id="0" translatable="yes">Right</col>
- <col id="1">8</col>
- </row>
- <row>
- <col id="0" translatable="yes">Top right</col>
- <col id="1">9</col>
- </row>
- <row>
- <col id="0" translatable="yes">Inside</col>
- <col id="1">10</col>
- </row>
- <row>
- <col id="0" translatable="yes">Outside</col>
- <col id="1">11</col>
- </row>
- <row>
- <col id="0" translatable="yes">Near origin</col>
- <col id="1">12</col>
- </row>
- </data>
- </object>
- <object class="GtkListStore" id="liststoreSEPARATOR">
- <columns>
- <!-- column-name gchararray1 -->
- <column type="gchararray"/>
- <!-- column-name guint1 -->
- <column type="guint"/>
- </columns>
- <data>
- <row>
- <col id="0" translatable="yes">Space</col>
- <col id="1">0</col>
- </row>
- <row>
- <col id="0" translatable="yes">Comma</col>
- <col id="1">1</col>
- </row>
- <row>
- <col id="0" translatable="yes">Semicolon</col>
- <col id="1">2</col>
- </row>
- <row>
- <col id="0" translatable="yes">New line</col>
- <col id="1">3</col>
- </row>
- </data>
- </object>
<object class="GtkSizeGroup" id="sizegroup1">
<widgets>
<widget name="FT_TEXT_SEPARATOR"/>
diff --git a/chart2/uiconfig/ui/titlerotationtabpage.ui b/chart2/uiconfig/ui/titlerotationtabpage.ui
index 7ee9e7a0c948..6e0eb4356e5e 100644
--- a/chart2/uiconfig/ui/titlerotationtabpage.ui
+++ b/chart2/uiconfig/ui/titlerotationtabpage.ui
@@ -33,7 +33,7 @@
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
<child>
- <object class="svxlo-WrapField" id="OrientDegree">
+ <object class="GtkSpinButton" id="OrientDegree">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="margin_top">40</property>
diff --git a/chart2/uiconfig/ui/tp_DataLabel.ui b/chart2/uiconfig/ui/tp_DataLabel.ui
index 798c9350edbc..b31bb2e1f895 100644
--- a/chart2/uiconfig/ui/tp_DataLabel.ui
+++ b/chart2/uiconfig/ui/tp_DataLabel.ui
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.1 -->
<interface>
- <!-- interface-requires gtk+ 3.0 -->
+ <requires lib="gtk+" version="3.0"/>
<!-- interface-requires LibreOffice 1.0 -->
<object class="GtkAdjustment" id="adjustmentDEGREE">
<property name="upper">359</property>
@@ -387,12 +388,13 @@
</packing>
</child>
<child>
- <object class="svxlo-WrapField" id="NF_LABEL_DEGREES">
+ <object class="GtkSpinButton" id="NF_LABEL_DEGREES">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="invisible_char">•</property>
<property name="adjustment">adjustmentDEGREE</property>
+ <property name="wrap">True</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/chart2/uiconfig/ui/tp_PolarOptions.ui b/chart2/uiconfig/ui/tp_PolarOptions.ui
index edf84f0a02d7..6f5d8d85ebc9 100644
--- a/chart2/uiconfig/ui/tp_PolarOptions.ui
+++ b/chart2/uiconfig/ui/tp_PolarOptions.ui
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.1 -->
<interface>
- <!-- interface-requires gtk+ 3.0 -->
+ <requires lib="gtk+" version="3.0"/>
<!-- interface-requires LibreOffice 1.0 -->
<object class="GtkAdjustment" id="adjustmentDEGREE">
<property name="upper">359</property>
@@ -85,13 +86,13 @@
</packing>
</child>
<child>
- <object class="svxlo-WrapField" id="NF_STARTING_ANGLE">
+ <object class="GtkSpinButton" id="NF_STARTING_ANGLE">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="invisible_char">•</property>
- <property name="invisible_char_set">True</property>
<property name="adjustment">adjustmentDEGREE</property>
+ <property name="wrap">True</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/chart2/uiconfig/ui/tp_axisLabel.ui b/chart2/uiconfig/ui/tp_axisLabel.ui
index 4727c9d40eea..74d6fa5f315c 100644
--- a/chart2/uiconfig/ui/tp_axisLabel.ui
+++ b/chart2/uiconfig/ui/tp_axisLabel.ui
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.1 -->
<interface>
- <!-- interface-requires gtk+ 3.0 -->
+ <requires lib="gtk+" version="3.0"/>
<!-- interface-requires LibreOffice 1.0 -->
<object class="GtkAdjustment" id="adjustmentSpinDegrees">
<property name="upper">359</property>
@@ -255,12 +256,11 @@
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
<child>
- <object class="svxlo-WrapField" id="OrientDegree">
+ <object class="GtkSpinButton" id="OrientDegree">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="margin_top">40</property>
<property name="invisible_char">•</property>
- <property name="invisible_char_set">True</property>
<property name="progress_pulse_step">1</property>
<property name="adjustment">adjustmentSpinDegrees</property>
<property name="wrap">True</property>
diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx
index bb249b5822ce..fb5e07ee9338 100644
--- a/cui/source/inc/align.hxx
+++ b/cui/source/inc/align.hxx
@@ -45,7 +45,6 @@
#include <sfx2/tabdlg.hxx>
#include <svtools/valueset.hxx>
#include <svx/dialcontrol.hxx>
-#include <svx/wrapfield.hxx>
#include <svx/frmdirlbox.hxx>
namespace svx {
@@ -86,7 +85,7 @@ private:
DialControl* m_pCtrlDial;
FixedText* m_pFtRotate;
- WrapField* m_pNfRotate;
+ NumericField* m_pNfRotate;
FixedText* m_pFtRefEdge;
ValueSet* m_pVsRefEdge;
TriStateBox* m_pCbStacked;
diff --git a/cui/uiconfig/ui/cellalignment.ui b/cui/uiconfig/ui/cellalignment.ui
index c4557284d1c5..9e754e34dbf2 100644
--- a/cui/uiconfig/ui/cellalignment.ui
+++ b/cui/uiconfig/ui/cellalignment.ui
@@ -79,7 +79,7 @@
</packing>
</child>
<child>
- <object class="svxlo-WrapField" id="spinDegrees">
+ <object class="GtkSpinButton" id="spinDegrees">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">•</property>
diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in
index 98e5e2679fb9..2d1bb2425f90 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -591,9 +591,6 @@
<glade-widget-class title="Sidebar Dial Control" name="svxlo-SidebarDialControl"
generic-name="Sidebar Dial Control" parent="GtkSpinner"
icon-name="widget-gtk-spinner"/>
- <glade-widget-class title="Wrap Field" name="svxlo-WrapField"
- generic-name="Wrap Field" parent="GtkSpinButton"
- icon-name="widget-gtk-spinbutton"/>
<glade-widget-class title="Relative Numeric Field" name="svxlo-SvxRelativeField"
generic-name="Relative Numeric Field" parent="GtkSpinButton"
icon-name="widget-gtk-spinbutton"/>
diff --git a/include/svx/wrapfield.hxx b/include/svx/wrapfield.hxx
deleted file mode 100644
index ff7cf3ada785..000000000000
--- a/include/svx/wrapfield.hxx
+++ /dev/null
@@ -1,50 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_SVX_WRAPFIELD_HXX
-#define INCLUDED_SVX_WRAPFIELD_HXX
-
-#include <vcl/field.hxx>
-#include <svx/svxdllapi.h>
-
-namespace svx {
-
-
-
-/** A numeric spin field that wraps around the value on limits.
- @descr Note: Use type "NumericField" in resources. */
-class SVX_DLLPUBLIC WrapField : public NumericField
-{
-public:
- explicit WrapField( vcl::Window* pParent, WinBits nBits );
-
-protected:
- /** Up event with wrap-around functionality. */
- virtual void Up() SAL_OVERRIDE;
- /** Down event with wrap-around functionality. */
- virtual void Down() SAL_OVERRIDE;
-};
-
-
-
-} // namespace svx
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index ccea64fb5b29..f5e5deda67ad 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -150,7 +150,6 @@ $(eval $(call gb_Library_add_exception_objects,svx,\
svx/source/dialog/swframeposstrings \
svx/source/dialog/txencbox \
svx/source/dialog/txenctab \
- svx/source/dialog/wrapfield \
svx/source/engine3d/float3d \
svx/source/items/algitem \
svx/source/items/hlnkitem \
diff --git a/svx/source/dialog/wrapfield.cxx b/svx/source/dialog/wrapfield.cxx
deleted file mode 100644
index c33ca311563f..000000000000
--- a/svx/source/dialog/wrapfield.cxx
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "svx/wrapfield.hxx"
-#include <vcl/builder.hxx>
-
-namespace svx {
-
-WrapField::WrapField( vcl::Window* pParent, WinBits nBits ) :
- NumericField( pParent, nBits )
-{
-}
-
-extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeWrapField(vcl::Window *pParent, VclBuilder::stringmap &)
-{
- return new WrapField(pParent, WB_SPIN|WB_REPEAT|WB_BORDER|WB_TABSTOP);
-}
-
-void WrapField::Up()
-{
- SetValue( ((GetValue() + GetSpinSize() - GetMin()) % (GetMax() + 1)) + GetMin() );
- GetUpHdl().Call( this );
-}
-
-void WrapField::Down()
-{
- SetValue( ((GetValue() - GetSpinSize() + GetMax() + 1 - GetMin()) % (GetMax() + 1)) + GetMin() );
- GetDownHdl().Call( this );
-}
-
-
-
-} // namespace svx
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */