[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - 5 commits - icon-themes/sifr svl/source writerfilter/qa writerfilter/source

Caolán McNamara caolanm at redhat.com
Mon Aug 15 08:29:47 UTC 2016


 icon-themes/sifr/cmd/32/connector.png                            |binary
 icon-themes/sifr/cmd/32/selectobject.png                         |binary
 icon-themes/sifr/cmd/lc_absoluterecord.png                       |binary
 icon-themes/sifr/cmd/lc_addwatch.png                             |binary
 icon-themes/sifr/cmd/lc_basicstepinto.png                        |binary
 icon-themes/sifr/cmd/lc_basicstepout.png                         |binary
 icon-themes/sifr/cmd/lc_basicstepover.png                        |binary
 icon-themes/sifr/cmd/lc_basicstop.png                            |binary
 icon-themes/sifr/cmd/lc_choosemacro.png                          |binary
 icon-themes/sifr/cmd/lc_matchgroup.png                           |binary
 icon-themes/sifr/cmd/lc_showtrackedchanges.png                   |binary
 icon-themes/sifr/cmd/sc_addwatch.png                             |binary
 icon-themes/sifr/cmd/sc_showtrackedchanges.png                   |binary
 icon-themes/sifr/links.txt                                       |    4 ++++
 svl/source/numbers/zforscan.cxx                                  |    8 +++++++-
 writerfilter/qa/cppunittests/rtftok/data/fail/tablemanager-5.rtf |binary
 writerfilter/source/dmapper/DomainMapper_Impl.cxx                |    4 +---
 17 files changed, 12 insertions(+), 4 deletions(-)

New commits:
commit eeccb464806ccf039a42f97ebed7b56657e7bfcf
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Aug 7 16:58:22 2016 +0100

    fftester: guard against empty table manager stack
    
    (cherry picked from commit 145e2dfc4501cb3fa01a1771cb6829b5945df4a6)
    
    Reviewed-on: https://gerrit.libreoffice.org/27938
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: David Tardon <dtardon at redhat.com>
    (cherry picked from commit 329f8d8b96d8abdaed31b8a5bcc417604d388931)
    
    Change-Id: Ibb4cadb58aa17eacfc9741f7f13c780be347cd8b

diff --git a/writerfilter/qa/cppunittests/rtftok/data/fail/tablemanager-5.rtf b/writerfilter/qa/cppunittests/rtftok/data/fail/tablemanager-5.rtf
new file mode 100644
index 0000000..a03be13
Binary files /dev/null and b/writerfilter/qa/cppunittests/rtftok/data/fail/tablemanager-5.rtf differ
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 5afc5d7..b8e8883 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1297,7 +1297,6 @@ void DomainMapper_Impl::appendTextPortion( const OUString& rString, PropertyMapP
     }
 }
 
-
 void DomainMapper_Impl::appendTextContent(
     const uno::Reference< text::XTextContent >& xContent,
     const uno::Sequence< beans::PropertyValue >& xPropertyValues
@@ -1308,7 +1307,7 @@ void DomainMapper_Impl::appendTextContent(
         return;
     uno::Reference< text::XTextAppendAndConvert >  xTextAppendAndConvert( m_aTextAppendStack.top().xTextAppend, uno::UNO_QUERY );
     OSL_ENSURE( xTextAppendAndConvert.is(), "trying to append a text content without XTextAppendAndConvert" );
-    if(xTextAppendAndConvert.is() && ! getTableManager( ).isIgnore())
+    if (xTextAppendAndConvert.is() && hasTableManager() && !getTableManager().isIgnore())
     {
         try
         {
@@ -1326,7 +1325,6 @@ void DomainMapper_Impl::appendTextContent(
     }
 }
 
-
 void DomainMapper_Impl::appendOLE( const OUString& rStreamName, OLEHandlerPtr pOLEHandler )
 {
     static const char sEmbeddedService[] = "com.sun.star.text.TextEmbeddedObject";
commit c388a3032ebf2d04f84ccdb5e354ac07f2f4d50f
Author: Matthias Freund <matti_lx at secure.mailbox.org>
Date:   Wed Aug 3 21:19:14 2016 +0200

    tdf#75256 Sifr icon update
    
    Change-Id: I6d08448056f42b80c9ba04a3b5d99a5679952c5e
    Reviewed-on: https://gerrit.libreoffice.org/27847
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: jan iversen <jani at documentfoundation.org>
    Tested-by: jan iversen <jani at documentfoundation.org>
    Reviewed-by: Yousuf Philips <philipz85 at hotmail.com>
    (cherry picked from commit a47aa43b5c6ad8bfbff2f052dd48555174150443)

diff --git a/icon-themes/sifr/cmd/32/connector.png b/icon-themes/sifr/cmd/32/connector.png
new file mode 100644
index 0000000..1f99c9e
Binary files /dev/null and b/icon-themes/sifr/cmd/32/connector.png differ
diff --git a/icon-themes/sifr/cmd/32/selectobject.png b/icon-themes/sifr/cmd/32/selectobject.png
index de10f5c..a7cf65a 100644
Binary files a/icon-themes/sifr/cmd/32/selectobject.png and b/icon-themes/sifr/cmd/32/selectobject.png differ
diff --git a/icon-themes/sifr/cmd/lc_absoluterecord.png b/icon-themes/sifr/cmd/lc_absoluterecord.png
new file mode 100644
index 0000000..41bfb8a
Binary files /dev/null and b/icon-themes/sifr/cmd/lc_absoluterecord.png differ
diff --git a/icon-themes/sifr/cmd/lc_addwatch.png b/icon-themes/sifr/cmd/lc_addwatch.png
new file mode 100644
index 0000000..b3fa196
Binary files /dev/null and b/icon-themes/sifr/cmd/lc_addwatch.png differ
diff --git a/icon-themes/sifr/cmd/lc_basicstepinto.png b/icon-themes/sifr/cmd/lc_basicstepinto.png
new file mode 100644
index 0000000..e27e2a4
Binary files /dev/null and b/icon-themes/sifr/cmd/lc_basicstepinto.png differ
diff --git a/icon-themes/sifr/cmd/lc_basicstepout.png b/icon-themes/sifr/cmd/lc_basicstepout.png
new file mode 100644
index 0000000..ef0d8e1
Binary files /dev/null and b/icon-themes/sifr/cmd/lc_basicstepout.png differ
diff --git a/icon-themes/sifr/cmd/lc_basicstepover.png b/icon-themes/sifr/cmd/lc_basicstepover.png
new file mode 100644
index 0000000..41f5d13
Binary files /dev/null and b/icon-themes/sifr/cmd/lc_basicstepover.png differ
diff --git a/icon-themes/sifr/cmd/lc_basicstop.png b/icon-themes/sifr/cmd/lc_basicstop.png
new file mode 100644
index 0000000..4798dff
Binary files /dev/null and b/icon-themes/sifr/cmd/lc_basicstop.png differ
diff --git a/icon-themes/sifr/cmd/lc_choosemacro.png b/icon-themes/sifr/cmd/lc_choosemacro.png
new file mode 100644
index 0000000..ae06762
Binary files /dev/null and b/icon-themes/sifr/cmd/lc_choosemacro.png differ
diff --git a/icon-themes/sifr/cmd/lc_matchgroup.png b/icon-themes/sifr/cmd/lc_matchgroup.png
new file mode 100644
index 0000000..c7ff153
Binary files /dev/null and b/icon-themes/sifr/cmd/lc_matchgroup.png differ
diff --git a/icon-themes/sifr/cmd/lc_showtrackedchanges.png b/icon-themes/sifr/cmd/lc_showtrackedchanges.png
new file mode 100644
index 0000000..dd61a3b
Binary files /dev/null and b/icon-themes/sifr/cmd/lc_showtrackedchanges.png differ
diff --git a/icon-themes/sifr/cmd/sc_addwatch.png b/icon-themes/sifr/cmd/sc_addwatch.png
new file mode 100644
index 0000000..609cc3a
Binary files /dev/null and b/icon-themes/sifr/cmd/sc_addwatch.png differ
diff --git a/icon-themes/sifr/cmd/sc_showtrackedchanges.png b/icon-themes/sifr/cmd/sc_showtrackedchanges.png
new file mode 100644
index 0000000..3afc460
Binary files /dev/null and b/icon-themes/sifr/cmd/sc_showtrackedchanges.png differ
commit 7dc3c90d2a34ffd57f8e2e21fe3c1171f01c0b57
Author: Yousuf Philips <philipz85 at hotmail.com>
Date:   Thu Aug 4 13:50:33 2016 +0400

    Sifr: Add thesaurus duplicate to links.txt
    
    Change-Id: I0cfecbef999bb251c1fd8829aed0a4f0268e176c
    Reviewed-on: https://gerrit.libreoffice.org/27870
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Yousuf Philips <philipz85 at hotmail.com>
    (cherry picked from commit c63aaa624aa6e949e127fb8ef00c4f3744c72b76)
    Reviewed-on: https://gerrit.libreoffice.org/27877
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit d936459505a081fbe3f608e52c7d110aee517548)

diff --git a/icon-themes/sifr/links.txt b/icon-themes/sifr/links.txt
index 160f85b..7b8b02c 100644
--- a/icon-themes/sifr/links.txt
+++ b/icon-themes/sifr/links.txt
@@ -54,6 +54,10 @@ sc/imglst/nc06.png cmd/sc_insertannotation.png
 sc/imglst/nc08.png cmd/sc_insertdraw.png
 sc/res/table.png cmd/sc_inserttable.png
 
+# Thesaurus
+cmd/lc_thesaurusdialog.png cmd/lc_thesaurus.png
+cmd/sc_thesaurusdialog.png cmd/sc_thesaurus.png
+
 # File Menu
 cmd/sc_exporttopdf.png cmd/sc_exportdirecttopdf.png
 
commit b6abb5722f5984cf9dc6a8d71d5275390f7c9882
Author: Laurent Balland-Poirier <laurent.balland-poirier at laposte.net>
Date:   Wed Aug 3 11:56:16 2016 +0200

    tdf#101147 New approach to fix minute/month detection
    
    Other formats may be differently interpreted
    HH YY/MM => Month expected
    HH DD/MM => Month expected
    
    Change-Id: Iabb17911bf2907c02b6b898052b6933692f8074a
    Reviewed-on: https://gerrit.libreoffice.org/27887
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Jenkins <ci at libreoffice.org>
    (cherry picked from commit 21639ac7f5b075808925186cdd5a102eb8d7a02a)

diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index 117c7f2..5803416 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -1162,6 +1162,8 @@ sal_Int32 ImpSvNumberformatScan::ScanType()
                    That are the Excel rules. BUT, we break it because certainly
                    in something like {HH YYYY-MM-DD} the MM is NOT meant to be
                    minute, so not if MM is between YY and DD or DD and YY.
+                   Actually not if any date specific keyword followed a time
+                   setting keyword.
                 */
                 nIndexPre = PreviousKeyword(i);
                 nIndexNex = NextKeyword(i);
@@ -1169,12 +1171,7 @@ sal_Int32 ImpSvNumberformatScan::ScanType()
                     nIndexPre == NF_KEY_HH  ||      // HH
                     nIndexNex == NF_KEY_S   ||      // S
                     nIndexNex == NF_KEY_SS  ||      // SS
-                    (bIsTimeDetected &&
-                     !(((nIndexPre == NF_KEY_YY || nIndexPre == NF_KEY_YYYY) &&
-                        (nIndexNex == NF_KEY_D  || nIndexNex == NF_KEY_DD)) ||
-                       ((nIndexPre == NF_KEY_D  || nIndexPre == NF_KEY_DD) &&
-                        (nIndexNex == NF_KEY_YY || nIndexNex == NF_KEY_YYYY)))
-                    )                       ||      // tdf#101147
+                    bIsTimeDetected         ||      // tdf#101147
                     PreviousChar(i) == '['  )       // [M
                 {
                     eNewType = css::util::NumberFormat::TIME;
@@ -1212,6 +1209,7 @@ sal_Int32 ImpSvNumberformatScan::ScanType()
             case NF_KEY_R :                         // R
             case NF_KEY_RR :                        // RR
                 eNewType = css::util::NumberFormat::DATE;
+                bIsTimeDetected = false;
                 break;
             case NF_KEY_CCC:                        // CCC
                 eNewType = css::util::NumberFormat::CURRENCY;
commit 56e4cffdb5c3ac465ac7ffce1dc327fffe220d48
Author: Eike Rathke <erack at redhat.com>
Date:   Tue Aug 2 23:46:22 2016 +0200

    break the Excel rule for YMD and DMY, tdf#101147 follow-up
    
    Clearly in {HH YYYY-MM-DD} the MM should not be minute. Also not in
    {HH DD.MM.YY}. Don't follow every bullshit. Period.
    
    It is debatable how to treat MDY, {HH:MM DD/YY} should be different from
    {HH MM/DD/YY}, Excel ironically takes both as minute, even in an en-US locale.
    
    (cherry picked from commit 88134dcba680418496f7a1c70a47fde0159ce390)
    
     Conflicts:
    	svl/qa/unit/svl.cxx
    
    Change-Id: I13d39a36294e3c40cc0e9bf72026804b299bb264
    Reviewed-on: https://gerrit.libreoffice.org/27814
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Laurent BP <laurent.balland-poirier at laposte.net>
    Reviewed-by: Eike Rathke <erack at redhat.com>
    (cherry picked from commit 97c0d2cf817d0d995dbc3d0901dbbfb4491e9664)

diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index 5fcddb0..117c7f2 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -1156,9 +1156,12 @@ sal_Int32 ImpSvNumberformatScan::ScanType()
                    Minute if one of:
                    * preceded by time keyword H (ignoring separators)
                    * followed by time keyword S (ignoring separators)
-                   * H or S was detected
+                   * H or S was detected and this is the first M following
                    * preceded by '[' amount bracket
                    Else month.
+                   That are the Excel rules. BUT, we break it because certainly
+                   in something like {HH YYYY-MM-DD} the MM is NOT meant to be
+                   minute, so not if MM is between YY and DD or DD and YY.
                 */
                 nIndexPre = PreviousKeyword(i);
                 nIndexNex = NextKeyword(i);
@@ -1166,7 +1169,12 @@ sal_Int32 ImpSvNumberformatScan::ScanType()
                     nIndexPre == NF_KEY_HH  ||      // HH
                     nIndexNex == NF_KEY_S   ||      // S
                     nIndexNex == NF_KEY_SS  ||      // SS
-                    bIsTimeDetected         ||      // tdf#101147
+                    (bIsTimeDetected &&
+                     !(((nIndexPre == NF_KEY_YY || nIndexPre == NF_KEY_YYYY) &&
+                        (nIndexNex == NF_KEY_D  || nIndexNex == NF_KEY_DD)) ||
+                       ((nIndexPre == NF_KEY_D  || nIndexPre == NF_KEY_DD) &&
+                        (nIndexNex == NF_KEY_YY || nIndexNex == NF_KEY_YYYY)))
+                    )                       ||      // tdf#101147
                     PreviousChar(i) == '['  )       // [M
                 {
                     eNewType = css::util::NumberFormat::TIME;


More information about the Libreoffice-commits mailing list