icon-themes/colibre/links.txt | 3 +++
icon-themes/colibre/res/sx18022.png |binary
icon-themes/colibre/res/sx18027.png |binary
icon-themes/colibre/svtools/res/ed09.png |binary
include/vcl/field.hxx | 2 +-
vcl/source/control/field.cxx | 12 +++---------
6 files changed, 7 insertions(+), 10 deletions(-)
New commits:
commit f717b7b5fb6c00aee127f94aba3b8f7e25160134
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed May 9 14:26:52 2018 +0100
ImplNumericReformat always returns true
Change-Id: Icfb555a59d0a221bdbdcf17601440fda43680d4b
Reviewed-on: https://gerrit.libreoffice.org/54032
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx
index 615421153a0d..b0a7f45680e4 100644
--- a/include/vcl/field.hxx
+++ b/include/vcl/field.hxx
@@ -183,7 +183,7 @@ protected:
void FieldFirst();
void FieldLast();
- SAL_DLLPRIVATE bool ImplNumericReformat( const OUString& rStr,
sal_Int64& rValue, OUString& rOutStr );
+ SAL_DLLPRIVATE void ImplNumericReformat( const OUString& rStr,
sal_Int64& rValue, OUString& rOutStr );
SAL_DLLPRIVATE void ImplNewFieldValue( sal_Int64 nNewValue );
SAL_DLLPRIVATE void ImplSetUserValue( sal_Int64 nNewValue, Selection
const * pNewSelection = nullptr );
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 706a56a93a93..b2bd446fe521 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -474,17 +474,13 @@ bool FormatterBase::IsEmptyFieldValue() const
return (!mpField || mpField->GetText().isEmpty());
}
-bool NumericFormatter::ImplNumericReformat( const OUString& rStr, sal_Int64&
rValue,
+void NumericFormatter::ImplNumericReformat( const OUString& rStr, sal_Int64&
rValue,
OUString& rOutStr )
{
- if ( !ImplNumericGetValue( rStr, rValue, GetDecimalDigits(),
ImplGetLocaleDataWrapper() ) )
- return true;
- else
+ if (ImplNumericGetValue(rStr, rValue, GetDecimalDigits(),
ImplGetLocaleDataWrapper()))
{
sal_Int64 nTempVal = ClipAgainstMinMax(rValue);
-
rOutStr = CreateFieldText( nTempVal );
- return true;
}
}
@@ -650,10 +646,8 @@ void NumericFormatter::Reformat()
OUString aStr;
sal_Int64 nTemp = mnLastValue;
- bool bOK = ImplNumericReformat( GetField()->GetText(), nTemp, aStr );
+ ImplNumericReformat(GetField()->GetText(), nTemp, aStr);
mnLastValue = nTemp;
- if ( !bOK )
- return;
if ( !aStr.isEmpty() )
ImplSetText( aStr );
commit 9479e5c63f7ce9e46093eebde2ac5a89518e8c04
Author: andreas kainz <kain...@gmail.com>
Date: Wed May 9 17:08:25 2018 +0200
Colibre icons: ALL galaxy icons are available in colibre
Change-Id: I3da8a928a14529f7ba6839a37b823b1df84b99f8
Reviewed-on: https://gerrit.libreoffice.org/54038
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: andreas_kainz <kain...@gmail.com>
diff --git a/icon-themes/colibre/links.txt b/icon-themes/colibre/links.txt
index 6520f6bd9995..a410fcb6c3f5 100644
--- a/icon-themes/colibre/links.txt
+++ b/icon-themes/colibre/links.txt
@@ -1568,6 +1568,7 @@ sw/res/sc20557.png cmd/sc_cancel.png
sw/res/sc20558.png cmd/sc_ok.png
sw/res/sc_datainrows.png cmd/sc_datainrows.png
+sw/res/sc20247.png cmd/sc_dataimport.png
sw/res/sf01.png cmd/sc_controlcodes.png
sw/res/sf02.png cmd/sc_charfontname.png
@@ -1597,6 +1598,8 @@ sw/res/sr20017.png cmd/sc_insertindexesentry.png
sw/res/sr20018.png cmd/sc_inserttable.png
sw/res/sr20019.png cmd/sc_remove.png
+sw/res/sx01.png cmd/sc_dbqueryedit.png
+sw/res/sx02.png cmd/sc_freezepanesfirstrow.png
sw/res/sx03.png cmd/sc_dbqueryedit.png
svx/res/reload.png cmd/sc_reload.png
svx/res/time.png cmd/sc_timefield.png
diff --git a/icon-themes/colibre/res/sx18022.png
b/icon-themes/colibre/res/sx18022.png
new file mode 100644
index 000000000000..f37655a887bf
Binary files /dev/null and b/icon-themes/colibre/res/sx18022.png differ
diff --git a/icon-themes/colibre/res/sx18027.png
b/icon-themes/colibre/res/sx18027.png
new file mode 100644
index 000000000000..fb47bc50620d
Binary files /dev/null and b/icon-themes/colibre/res/sx18027.png differ
diff --git a/icon-themes/colibre/svtools/res/ed09.png
b/icon-themes/colibre/svtools/res/ed09.png
new file mode 100644
index 000000000000..674cfc034026
Binary files /dev/null and b/icon-themes/colibre/svtools/res/ed09.png differ
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
