[Libreoffice-commits] .: 9 commits - lingucomponent/source

[Jan Holesovsky]

 lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fbfd9ea9380f869cfd96ca2e6ab3adced35ecb73
Merge: d92d281... b163e90...
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Thu Jul 28 18:37:18 2011 +0200

    Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/components

commit d92d2815caba8eb904fb58c65d0a779434ee9743
Merge: 8414da9... db4a649...
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Thu Jul 28 10:14:00 2011 +0200

    Merge commit 'libreoffice-3.4.2.3'

commit db4a649f741ecab0e2d6ff3d54595aa772c8dfd3
Author: Petr Mladek <pmladek at suse.cz>
Date:   Mon Jul 25 20:28:41 2011 +0200

    Version 3.4.2.3, tag libreoffice-3.4.2.3 (3.4.2-rc3)
commit 0f299484b50c8412599c7839883013018e554236
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Jul 19 17:07:57 2011 +0200

    Version 3.4.2.2, tag libreoffice-3.4.2.2 (3.4.2-rc2)
commit e30afb70dcdf47941d6318541b1346485de420c2
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Jul 12 16:41:08 2011 +0200

    Branch libreoffice-3-4-2
    
    This is 'libreoffice-3-4-2' - the stable branch for the 3.4.2 release.
    Only very safe changes, reviewed by three people are allowed.
    
    If you want to commit more complicated fix for the next 3.4.x release,
    please use the 'libreoffice-3-4' branch.
    
    If you want to build something cool, unstable, and risky, use master.
commit 4de48205dc3108f7aaaf2aaa937a05c204b8572e
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Jul 12 15:49:39 2011 +0200

    Version 3.4.2.1, tag libreoffice-3.4.2.1 (3.4.2-rc1)
commit 5fc91f492910073f47a3fe646264cbc412905547
Author: Laszlo Nemeth <nemeth at numbertext.org>
Date:   Mon Jul 11 14:09:52 2011 +0200

    fix wrong capitalization in case of non-standard hyphenation
    
    Signed-off-by: Andras Timar <atimar at suse.com>

diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
index 95282ac..627e5cf 100644
--- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
+++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
@@ -487,7 +487,7 @@ Reference< XHyphenatedWord > SAL_CALL Hyphenator::hyphenate( const ::rtl::OUStri
                     }
                     case CAPTYPE_INITCAP:
                     {
-                        if (nHyphenationPosAlt == 0) 
+                        if (nHyphenationPosAlt == -1)
                             repHyph = makeInitCap(repHyphlow, pCC);
                         else 
                              repHyph = repHyphlow;
commit 532dc8d685fb9aa1319a589b2e0ed77d85563005
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Apr 4 14:54:15 2011 +0100

    fix --enable-dbgutil build
    (cherry picked from commit 3764b31aae43883c6b13b91c6ad8d0daa59f4ba5)
    
    Signed-off-by: Thorsten Behrens <tbehrens at novell.com>

diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx
index f5c25dc..422c720 100644
--- a/cui/source/options/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -234,7 +234,7 @@ IMPL_LINK( SvxDefaultColorOptPage, RemoveChartColor, PushButton*, pButton )
 
     if( pColorConfig )
     {
-        DBG_ASSERT(pColorConfig.size() > 1, "don't delete the last chart color");
+        OSL_ENSURE(pColorConfig->GetColorTable().size() > 1, "don't delete the last chart color");
         QueryBox aQuery(pButton, CUI_RES(RID_OPTQB_COLOR_CHART_DELETE));
         aQuery.SetText(String(CUI_RES(RID_OPTSTR_COLOR_CHART_DELETE)));
         if(RET_YES == aQuery.Execute())
commit 6ae96da3506850bb3dac3ede65364887fdc45220
Author: Andras Timar <atimar at suse.com>
Date:   Tue Jun 21 14:34:12 2011 +0200

    fix label of Save Keyboard Configuration dialog fdo#31353
    
    Signed-off-by: Tor Lillqvist <tlillqvist at novell.com>

diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index a35ace8..fa46fb4 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -1041,7 +1041,7 @@ IMPL_LINK( SfxAcceleratorConfigPage, Load, Button*, EMPTYARG )
 //-----------------------------------------------
 IMPL_LINK( SfxAcceleratorConfigPage, Save, Button*, EMPTYARG )
 {
-    StartFileDialog( WB_SAVEAS | WB_STDMODAL | WB_3DLOOK, aLoadAccelConfigStr );
+    StartFileDialog( WB_SAVEAS | WB_STDMODAL | WB_3DLOOK, aSaveAccelConfigStr );
     return 0;
 }