lotuswordpro/source/filter/lwplayout.hxx | 2 +-
sw/inc/helpid.h | 1 -
sw/source/filter/ww8/rtfattributeoutput.cxx | 2 ++
sw/source/ui/dbui/createaddresslistdialog.cxx | 2 +-
sw/uiconfig/swriter/ui/createaddresslist.ui | 12 ++++++------
5 files changed, 10 insertions(+), 9 deletions(-)
New commits:
commit bcca34ed26d82cc79b796ae16ef946fc13f0b1cf
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Jun 9 14:08:35 2014 +0100
fallback to DefaultEncoding when eCurrentEncoding is unknown
as seen when saving abi10092-1 to rtf
sal/rtl/string.cxx:186: OSL_ASSERT: pTarget != NULL && (pSource != NULL ||
nLength == 0) && nLength >= 0 && (nLength == 0 ||
rtl_isOctetTextEncoding(nEncoding))
Change-Id: I638b94041899145f42ecd80982d8e7c0330b35c0
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 834996e..41e06be 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -2074,6 +2074,8 @@ void RtfAttributeOutput::CharFont(const SvxFontItem&
rFont)
m_aStylesEnd.append(OOO_STRING_SVTOOLS_RTF_F);
m_aStylesEnd.append((sal_Int32)m_rExport.maFontHelper.GetId(rFont));
m_rExport.eCurrentEncoding =
rtl_getTextEncodingFromWindowsCharset(rtl_getBestWindowsCharsetFromTextEncoding(rFont.GetCharSet()));
+ if (m_rExport.eCurrentEncoding == RTL_TEXTENCODING_DONTKNOW)
+ m_rExport.eCurrentEncoding = m_rExport.eDefaultEncoding;
}
void RtfAttributeOutput::CharFontSize(const SvxFontHeightItem& rFontSize)
commit c7d70ec415750de34a632d523111774e47046a06
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Jun 9 11:59:46 2014 +0100
fix build error
Change-Id: I9db006805bfd457663762e2fd2863d096b2547b4
diff --git a/lotuswordpro/source/filter/lwplayout.hxx
b/lotuswordpro/source/filter/lwplayout.hxx
index ac0ee3a..6571b73 100644
--- a/lotuswordpro/source/filter/lwplayout.hxx
+++ b/lotuswordpro/source/filter/lwplayout.hxx
@@ -79,6 +79,7 @@
#include "lwplayoutdef.hxx"
#include "xfilter/xfdefs.hxx"
+#include "xfilter/xffont.hxx"
#include "xfilter/xfpagemaster.hxx"
#include "xfilter/xfcolumns.hxx"
#include "xfilter/xfborders.hxx"
@@ -397,7 +398,6 @@ public:
virtual LwpVirtualLayout* GetContainerLayout() SAL_OVERRIDE;
};
-class XFFont;
class LwpPlacableLayout : public LwpLayout
{
public:
commit 39b09b67019b562a0ce0a47e18ce3264f5b65350
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Jun 9 10:46:45 2014 +0100
use ok, cancel, help like everywhere else
Change-Id: Ibc4a5ee29fd9a6e734bef7ab9ce404aa8beaaaac
diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx
b/sw/source/ui/dbui/createaddresslistdialog.cxx
index 19440b8..005d951 100755
--- a/sw/source/ui/dbui/createaddresslistdialog.cxx
+++ b/sw/source/ui/dbui/createaddresslistdialog.cxx
@@ -408,7 +408,7 @@ SwCreateAddressListDialog::SwCreateAddressListDialog(
m_pSetNoNF->SetMin(1);
get(m_pNextPB, "NEXT");
get(m_pEndPB, "END");
- get(m_pOK, "OK");
+ get(m_pOK, "ok");
get(m_pAddressControl, "CONTAINER");
m_pNewPB->SetClickHdl(LINK(this, SwCreateAddressListDialog, NewHdl_Impl));
diff --git a/sw/uiconfig/swriter/ui/createaddresslist.ui
b/sw/uiconfig/swriter/ui/createaddresslist.ui
index 7d31c79..a746fe3 100644
--- a/sw/uiconfig/swriter/ui/createaddresslist.ui
+++ b/sw/uiconfig/swriter/ui/createaddresslist.ui
@@ -18,7 +18,7 @@
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
- <object class="GtkButton" id="OK">
+ <object class="GtkButton" id="ok">
<property name="label">gtk-ok</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
@@ -33,7 +33,7 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="CANCEL">
+ <object class="GtkButton" id="cancel">
<property name="label">gtk-cancel</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
@@ -48,7 +48,7 @@
</packing>
</child>
<child>
- <object class="GtkButton" id="HELP">
+ <object class="GtkButton" id="help">
<property name="label">gtk-help</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
@@ -322,9 +322,9 @@
</object>
</child>
<action-widgets>
- <action-widget response="0">OK</action-widget>
- <action-widget response="0">CANCEL</action-widget>
- <action-widget response="0">HELP</action-widget>
+ <action-widget response="0">ok</action-widget>
+ <action-widget response="0">cancel</action-widget>
+ <action-widget response="0">help</action-widget>
</action-widgets>
</object>
</interface>
commit ed53e00d0e3eafe06f7d8739cced0ed8029d2eb6
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Jun 9 10:34:07 2014 +0100
drop unused helpid
Change-Id: Iaaa129d1baaab485e9700776182cd8d28b134b88
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 3aa3b22..d66cc8ed 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -367,7 +367,6 @@
#define HID_MM_SELECTDBTABLEDDIALOG
"SW_HID_MM_SELECTDBTABLEDDIALOG"
#define HID_MM_SELECTDBTABLEDDIALOG_LISTBOX
"SW_HID_MM_SELECTDBTABLEDDIALOG_LISTBOX"
#define HID_MM_DBTABLEPREVIEWDIALOG
"SW_HID_MM_DBTABLEPREVIEWDIALOG"
-#define HID_MM_CREATEADDRESSLIST
"SW_HID_MM_CREATEADDRESSLIST"
#define HID_MM_ASSIGNFIELDS
"SW_HID_MM_ASSIGNFIELDS"
#define HID_MM_ADDRESSLIST_HB
"SW_HID_MM_ADDRESSLIST_HB"
#define HID_MM_MAILBODY
"SW_HID_MM_MAILBODY"
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
