[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 3 commits - jvmfwk/source vcl/source

[Stephan Bergmann]

 jvmfwk/source/framework.hxx |    3 ++-
 vcl/source/gdi/outdev3.cxx  |    6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 629eac17fda6b875a87f96d86ba468359b73c29d
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Dec 3 09:23:43 2013 +0100

    Call getLineBreak with null XHyphenator unless TEXT_DRAW_WORDBREAK_HYPHENATION
    
    So no longer instantiate XLinguServiceManager (which might e.g. bootstrap
    Python) unless explicitly requested, which e.g. removes a noticable delay when
    switching to the Options dialog's "Security" page (which causes size
    calculations of FixedText controls that use TEXT_DRAW_WORDBREAK but not
    TEXT_DRAW_WORDBREAK_HYPHENATION).
    
    Change-Id: Ib0a28d3d7d7718faf6df7a138f5a86b8b2fd7713

diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index a8cb7fc..d707888 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -4729,8 +4729,10 @@ long OutputDevice::ImplGetTextLines( ImplMultiTextLineInfo& rLineInfo,
         // get service provider
         uno::Reference< uno::XComponentContext > xContext( comphelper::getProcessComponentContext() );
 
+        bool bHyphenate = (nStyle & TEXT_DRAW_WORDBREAK_HYPHENATION)
+            == TEXT_DRAW_WORDBREAK_HYPHENATION;
         uno::Reference< linguistic2::XHyphenator > xHyph;
-        if ( nStyle & TEXT_DRAW_WORDBREAK )
+        if ( bHyphenate )
         {
             uno::Reference< linguistic2::XLinguServiceManager2> xLinguMgr = linguistic2::LinguServiceManager::create(xContext);
             xHyph = xLinguMgr->getHyphenator();
@@ -4762,7 +4764,7 @@ long OutputDevice::ImplGetTextLines( ImplMultiTextLineInfo& rLineInfo,
                     nBreakPos = (xub_StrLen)aLBR.breakIndex;
                     if ( nBreakPos <= nPos )
                         nBreakPos = nSoftBreak;
-                    if ( (nStyle & TEXT_DRAW_WORDBREAK_HYPHENATION) == TEXT_DRAW_WORDBREAK_HYPHENATION )
+                    if ( bHyphenate )
                     {
                         // Whether hyphen or not: Put the word after the hyphen through
                         // word boundary.
commit 9d91e2b652922a362fdcf5f3716b48946d5865b3
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Sep 3 10:20:31 2014 +0200

    Nothrow dtor
    
    Change-Id: I1793d2eab568f4a65813fca7257c74e1a85a0090

diff --git a/jvmfwk/source/framework.hxx b/jvmfwk/source/framework.hxx
index c0ebc79..ddf826f 100644
--- a/jvmfwk/source/framework.hxx
+++ b/jvmfwk/source/framework.hxx
@@ -113,6 +113,7 @@ public:
         errorCode(err), message(msg)
         {
         }
+    virtual ~FrameworkException() throw () {}
     javaFrameworkError errorCode;
     OString message;
 };
commit 09afbc349341c06cb48cff6be7a18ce2e00b2ddf
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Sep 2 15:30:54 2014 +0100

    coverity#707200 Uncaught exception
    
    Change-Id: Iaf115f1f11aef69ef5dba7023f4126c22d1f49ff

diff --git a/jvmfwk/source/framework.hxx b/jvmfwk/source/framework.hxx
index a884cd8..c0ebc79 100644
--- a/jvmfwk/source/framework.hxx
+++ b/jvmfwk/source/framework.hxx
@@ -105,7 +105,7 @@ public:
     sal_uInt64 getFeatures() const;
 };
 
-class FrameworkException
+class FrameworkException : public std::exception
 {
 public: