[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - 3 commits - sc/source sfx2/source sfx2/uiconfig sw/source
Jan Holesovsky
kendy at collabora.com
Mon Mar 10 03:58:30 PDT 2014
sc/source/core/data/funcdesc.cxx | 4 ++--
sfx2/source/dialog/mgetempl.cxx | 5 +++++
sfx2/uiconfig/ui/managestylepage.ui | 10 +++-------
sw/source/filter/html/parcss1.cxx | 2 +-
4 files changed, 11 insertions(+), 10 deletions(-)
New commits:
commit 4ac6f748bb636b2f21866d93d0a9a93219ef108a
Author: Jan Holesovsky <kendy at collabora.com>
Date: Mon Feb 17 20:49:24 2014 +0100
Fix crash in css rgb color handling.
Crashing since 2000 (or earlier).
Change-Id: I9f91d56f380be2421370b0acbee351461e1f0973
Reviewed-on: https://gerrit.libreoffice.org/8092
Tested-by: David Tardon <dtardon at redhat.com>
Reviewed-by: David Tardon <dtardon at redhat.com>
diff --git a/sw/source/filter/html/parcss1.cxx b/sw/source/filter/html/parcss1.cxx
index 8455ab1..24c32b9 100644
--- a/sw/source/filter/html/parcss1.cxx
+++ b/sw/source/filter/html/parcss1.cxx
@@ -1281,7 +1281,7 @@ sal_Bool CSS1Expression::GetColor( Color &rColor ) const
')' == aValue.GetChar( aValue.Len()-1),
"keine gueltiges RGB(...)" );
- String aColorStr( aValue.Copy( 4, aValue.Len()-1 ) );
+ String aColorStr( aValue.Copy( 4, aValue.Len()-5 ) );
xub_StrLen nPos = 0;
sal_uInt16 nCol = 0;
commit 51307daaf694416b51f2ec9c68cac0015ffd6bff
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Feb 17 12:44:14 2014 +0000
Resolves: fdo#72233 too long style names over-stretch dialog
Change-Id: Id6f102a3def1928ad8f6b4d27eb32f8c69bdba49
(cherry picked from commit a95888e6e62a702f4b9af4a68c44339b51dc283e)
Reviewed-on: https://gerrit.libreoffice.org/8085
Reviewed-by: Kohei Yoshida <libreoffice at kohei.us>
Tested-by: Kohei Yoshida <libreoffice at kohei.us>
diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index 0d6755d..932fddd 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -54,16 +54,21 @@ SfxManageStyleSheetPage::SfxManageStyleSheetPage(Window* pParent, const SfxItemS
{
get(m_pNameRo, "namero");
get(m_pNameRw, "namerw");
+ m_pNameRo->set_width_request(m_pNameRw->get_preferred_size().Width());
get(m_pAutoCB, "autoupdate");
get(m_pFollowFt, "nextstyleft");
get(m_pFollowLb, "nextstyle");
m_pFollowLb->SetStyle(m_pFollowLb->GetStyle() | WB_SORT);
+ const sal_Int32 nMaxWidth(62);
+ m_pFollowLb->setMaxWidthChars(nMaxWidth);
get(m_pBaseFt, "linkedwithft");
get(m_pBaseLb, "linkedwith");
m_pBaseLb->SetStyle(m_pBaseLb->GetStyle() | WB_SORT);
+ m_pBaseLb->setMaxWidthChars(nMaxWidth);
get(m_pFilterFt, "categoryft");
get(m_pFilterLb, "category");
m_pFilterLb->SetStyle(m_pFilterLb->GetStyle() | WB_SORT);
+ m_pFilterLb->setMaxWidthChars(nMaxWidth);
get(m_pDescFt, "desc");
// this Page needs ExchangeSupport
diff --git a/sfx2/uiconfig/ui/managestylepage.ui b/sfx2/uiconfig/ui/managestylepage.ui
index 551f2d3..9bd0671 100644
--- a/sfx2/uiconfig/ui/managestylepage.ui
+++ b/sfx2/uiconfig/ui/managestylepage.ui
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.1 -->
<interface>
- <!-- interface-requires gtk+ 3.0 -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkBox" id="ManageStylePage">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -100,8 +101,6 @@
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
- <property name="entry_text_column">0</property>
- <property name="id_column">1</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -116,8 +115,6 @@
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
- <property name="entry_text_column">0</property>
- <property name="id_column">1</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -132,8 +129,6 @@
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
- <property name="entry_text_column">0</property>
- <property name="id_column">1</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -187,6 +182,7 @@
<property name="valign">center</property>
<property name="hexpand">True</property>
<property name="invisible_char">â—</property>
+ <property name="width_chars">52</property>
</object>
<packing>
<property name="left_attach">1</property>
commit b7611743b9b7a7126ba263e077bdae16e09f90ee
Author: Winfried Donkers <winfrieddonkers at libreoffice.org>
Date: Fri Feb 14 17:54:20 2014 +0100
fdo#73800 fix incorrect separator in function description in Calc
Depending on locale, the function description with arguments did
show incorrect separator(s) for functions with PAIRED_VAR_ARGS.
Reviewed-on: https://gerrit.libreoffice.org/8052
Reviewed-by: Kohei Yoshida <libreoffice at kohei.us>
Tested-by: Kohei Yoshida <libreoffice at kohei.us>
(cherry picked from commit f38aa72c1d8f9e535d2b5cefbb2af7f6f37b81a8)
Conflicts:
sc/source/core/data/funcdesc.cxx
Reviewed-on: https://gerrit.libreoffice.org/8057
Tested-by: Kohei Yoshida <libreoffice at kohei.us>
Reviewed-by: Kohei Yoshida <libreoffice at kohei.us>
Conflicts:
sc/source/core/data/funcdesc.cxx
Change-Id: Ie493a77285360a099e5b07e8360ecb5c6c6c1aec
Reviewed-on: https://gerrit.libreoffice.org/8059
Reviewed-by: Kohei Yoshida <libreoffice at kohei.us>
Tested-by: Kohei Yoshida <libreoffice at kohei.us>
diff --git a/sc/source/core/data/funcdesc.cxx b/sc/source/core/data/funcdesc.cxx
index b6691c6..22ae5be 100644
--- a/sc/source/core/data/funcdesc.cxx
+++ b/sc/source/core/data/funcdesc.cxx
@@ -190,14 +190,14 @@ OUString ScFuncDesc::GetParamList() const
aSig.append(*(ppDefArgNames[nFix]));
aSig.append(sal_Unicode('1'));
- aSig.appendAscii( ", " );
+ aSig.append(sep);
aSig.append(*(ppDefArgNames[nFix+1]));
aSig.append(sal_Unicode('1'));
aSig.append(sep);
aSig.appendAscii( " " );
aSig.append(*(ppDefArgNames[nFix]));
aSig.append(sal_Unicode('2'));
- aSig.appendAscii( ", " );
+ aSig.append(sep);
aSig.append(*(ppDefArgNames[nFix+1]));
aSig.append(sal_Unicode('2'));
aSig.append(sep);
More information about the Libreoffice-commits
mailing list