fpicker/Library_fps_office.mk | 1 +
fpicker/source/office/RemoteFilesDialog.hxx | 2 +-
fpicker/source/office/autocmpledit.cxx | 2 +-
fpicker/source/office/autocmpledit.hxx | 7 ++-----
solenv/clang-format/blacklist | 4 ++--
svtools/Library_svt.mk | 1 -
sw/uiconfig/swriter/ui/columnpage.ui | 12 +++++++-----
7 files changed, 14 insertions(+), 15 deletions(-)
New commits:
commit 5e6ea97a59ce2464042b2a7a9244dd30ffb2c1c0
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Oct 21 09:29:00 2019 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Oct 21 11:33:09 2019 +0200
fix "invalid cast from 'GtkImage' to 'GtkLabel'" warnings
Change-Id: I63b62952060f0c498dfa9284ce3ae075414f8cdd
Reviewed-on: https://gerrit.libreoffice.org/81210
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sw/uiconfig/swriter/ui/columnpage.ui
b/sw/uiconfig/swriter/ui/columnpage.ui
index 770befebe23a..e3a93ae903e2 100644
--- a/sw/uiconfig/swriter/ui/columnpage.ui
+++ b/sw/uiconfig/swriter/ui/columnpage.ui
@@ -12,12 +12,12 @@
<object class="GtkAdjustment" id="adjustment2">
<property name="lower">0.01</property>
<property name="upper">56</property>
- <property name="step_increment">0.10000000000000001</property>
+ <property name="step_increment">0.1</property>
<property name="page_increment">1</property>
</object>
<object class="GtkAdjustment" id="adjustment3">
<property name="upper">56</property>
- <property name="step_increment">0.10000000000000001</property>
+ <property name="step_increment">0.1</property>
<property name="page_increment">1</property>
</object>
<object class="GtkAdjustment" id="adjustment4">
@@ -37,18 +37,18 @@
<object class="GtkAdjustment" id="adjustment6">
<property name="lower">0.01</property>
<property name="upper">56</property>
- <property name="step_increment">0.10000000000000001</property>
+ <property name="step_increment">0.1</property>
<property name="page_increment">1</property>
</object>
<object class="GtkAdjustment" id="adjustment7">
<property name="lower">0.01</property>
<property name="upper">56</property>
- <property name="step_increment">0.10000000000000001</property>
+ <property name="step_increment">0.1</property>
<property name="page_increment">1</property>
</object>
<object class="GtkAdjustment" id="adjustment8">
<property name="upper">56</property>
- <property name="step_increment">0.10000000000000001</property>
+ <property name="step_increment">0.1</property>
<property name="page_increment">1</property>
</object>
<object class="GtkImage" id="image7">
@@ -453,6 +453,7 @@
<property name="receives_default">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
+ <property name="label" translatable="no"></property>
<child>
<placeholder/>
</child>
@@ -507,6 +508,7 @@
<property name="receives_default">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
+ <property name="label" translatable="no"></property>
<child>
<placeholder/>
</child>
commit 976d595a0f1c5d6a4e60b408f8c0e2340339e770
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Sun Oct 20 20:43:25 2019 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Oct 21 11:32:55 2019 +0200
move AutocompleteEdit to fpicker
Change-Id: I00b1b4f21ffcb183d098b8af296e1dea64a2a482
Reviewed-on: https://gerrit.libreoffice.org/81177
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/fpicker/Library_fps_office.mk b/fpicker/Library_fps_office.mk
index 626f357a98b3..eff3f5ebe84f 100644
--- a/fpicker/Library_fps_office.mk
+++ b/fpicker/Library_fps_office.mk
@@ -43,6 +43,7 @@ $(eval $(call gb_Library_use_libraries,fps_office,\
$(eval $(call gb_Library_add_exception_objects,fps_office,\
fpicker/source/office/asyncfilepicker \
+ fpicker/source/office/autocmpledit \
fpicker/source/office/breadcrumb \
fpicker/source/office/commonpicker \
fpicker/source/office/contentenumeration \
diff --git a/fpicker/source/office/RemoteFilesDialog.hxx
b/fpicker/source/office/RemoteFilesDialog.hxx
index 5331107018d5..e37e9a37f7e4 100644
--- a/fpicker/source/office/RemoteFilesDialog.hxx
+++ b/fpicker/source/office/RemoteFilesDialog.hxx
@@ -10,7 +10,7 @@
#ifndef INCLUDED_SVTOOLS_REMOTEFILESDIALOG_HXX
#define INCLUDED_SVTOOLS_REMOTEFILESDIALOG_HXX
-#include <svtools/autocmpledit.hxx>
+#include "autocmpledit.hxx"
#include <svtools/place.hxx>
#include <svtools/PlaceEditDialog.hxx>
diff --git a/svtools/source/control/autocmpledit.cxx
b/fpicker/source/office/autocmpledit.cxx
similarity index 98%
rename from svtools/source/control/autocmpledit.cxx
rename to fpicker/source/office/autocmpledit.cxx
index 9c60a830c10d..d7b5f6359da3 100644
--- a/svtools/source/control/autocmpledit.cxx
+++ b/fpicker/source/office/autocmpledit.cxx
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include <svtools/autocmpledit.hxx>
+#include "autocmpledit.hxx"
#include <vcl/svapp.hxx>
#include <vcl/event.hxx>
diff --git a/include/svtools/autocmpledit.hxx
b/fpicker/source/office/autocmpledit.hxx
similarity index 86%
rename from include/svtools/autocmpledit.hxx
rename to fpicker/source/office/autocmpledit.hxx
index 78777a176320..89b431ebc9e0 100644
--- a/include/svtools/autocmpledit.hxx
+++ b/fpicker/source/office/autocmpledit.hxx
@@ -10,20 +10,17 @@
#ifndef INCLUDED_SVTOOLS_AUTOCMPLEDIT_HXX
#define INCLUDED_SVTOOLS_AUTOCMPLEDIT_HXX
-#include <svtools/svtdllapi.h>
-
#include <vcl/edit.hxx>
-
#include <vector>
-class SVT_DLLPUBLIC AutocompleteEdit : public Edit
+class AutocompleteEdit : public Edit
{
private:
std::vector< OUString > m_aEntries;
std::vector< OUString > m_aMatching;
std::vector< OUString >::size_type m_nCurrent;
- DECL_DLLPRIVATE_LINK(AutoCompleteHdl_Impl, Edit&, void);
+ DECL_LINK(AutoCompleteHdl_Impl, Edit&, void);
bool Match( const OUString& rText );
bool PreNotify( NotifyEvent& rNEvt ) override;
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index 0db65dd1969b..0adda72cfef0 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -4970,6 +4970,8 @@ fpicker/source/office/RemoteFilesDialog.cxx
fpicker/source/office/RemoteFilesDialog.hxx
fpicker/source/office/asyncfilepicker.cxx
fpicker/source/office/asyncfilepicker.hxx
+fpicker/source/office/autocmpledit.cxx
+fpicker/source/office/autocmpledit.hxx
fpicker/source/office/breadcrumb.cxx
fpicker/source/office/breadcrumb.hxx
fpicker/source/office/commonpicker.cxx
@@ -6900,7 +6902,6 @@ include/svtools/accessibleruler.hxx
include/svtools/addresstemplate.hxx
include/svtools/apearcfg.hxx
include/svtools/asynclink.hxx
-include/svtools/autocmpledit.hxx
include/svtools/bindablecontrolhelper.hxx
include/svtools/borderhelper.hxx
include/svtools/borderline.hxx
@@ -13673,7 +13674,6 @@ svtools/source/contnr/templwin.cxx
svtools/source/contnr/templwin.hxx
svtools/source/control/accessibleruler.cxx
svtools/source/control/asynclink.cxx
-svtools/source/control/autocmpledit.cxx
svtools/source/control/calendar.cxx
svtools/source/control/collatorres.cxx
svtools/source/control/ctrlbox.cxx
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index 6b0c994041c0..95486e42b328 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -92,7 +92,6 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
svtools/source/contnr/templwin \
svtools/source/control/accessibleruler \
svtools/source/control/asynclink \
- svtools/source/control/autocmpledit \
svtools/source/control/calendar \
svtools/source/control/collatorres \
svtools/source/control/ctrlbox \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
