LibreOffice Gerrit News for core on 2014-03-02
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + sal: fix link error - Undefined symbols: "_posix_memalign" in https://gerrit.libreoffice.org/8405 from Douglas Mencken about module sal + fdo#75200:Libreoffice crash while opening the file in https://gerrit.libreoffice.org/8127 from Priyanka Gaikwad about module chart2, oox + Icon redux 01: Optimised help images in https://gerrit.libreoffice.org/8404 from Andrew Dent about module icon-themes End of freshness + fdo#60698: Split out slideshow code from animations in https://gerrit.libreoffice.org/8389 from Marcos Paulo de Souza about module animations, include, slideshow + Add CoinMP external as an alternative to lpsolve. in https://gerrit.libreoffice.org/8383 from Matúš Kukan about module build, external * Merged changes on master for project core changed in the last 25 hours: + Merge HTML detection to text detection service in https://gerrit.libreoffice.org/8213 from Maxim Monastirsky + curl (bundled): with-darwinssl option is not compatible with OSX SDK 10.5 in https://gerrit.libreoffice.org/8386 from Douglas Mencken + fdo#71043 - Use STACK lint tool to clean code in https://gerrit.libreoffice.org/6529 from José Guilherme Vanz + Remove visual noise from include in https://gerrit.libreoffice.org/8272 from Alexander Wilms + libcmis (bundled): add patch with missing definition for HTML_PARSE_RECOV in https://gerrit.libreoffice.org/8387 from Douglas Mencken + fdo#74064 The filename gets properly highlighted in the Save As dialog. in https://gerrit.libreoffice.org/8364 from Rachit Gupta + Remove visual noise from sal in https://gerrit.libreoffice.org/8297 from Alexander Wilms + Remove visual noise from bridges in https://gerrit.libreoffice.org/8237 from Alexander Wilms * Abandoned changes on master for project core changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: + fd0#74150:Numbered list getting display after RT -table-within-table-1.do in https://gerrit.libreoffice.org/7767 from Rajashri Udhoji + fdo#74111 3D Rotation is wrong after Round trip for pie chart in https://gerrit.libreoffice.org/7718 from Priyanka Gaikwad + Lots of changes to Tango icons in https://gerrit.libreoffice.org/7987 from Miroslav Mazel + sw/docx export: fix handling of document with header and section(s) in https://gerrit.libreoffice.org/6248 from Pierre-Eric Pelloux-Prayer + fdo#51525 Fix duplicate "Paste Special" entries in Calc. in https://gerrit.libreoffice.org/7784 from Andrzej Hunt + fdo#72661: Check ‘Hyphenation active’ automatically in https://gerrit.libreoffice.org/7291 from Jiwoong Youn + sa/l add release_assert() and assert that stay even in release code in https://gerrit.libreoffice.org/7625 from Norbert Thiebaud + fdo#69407: On transparent frames, shadows are painted in foreground. in https://gerrit.libreoffice.org/7070 from Mohamed-Ali BEN MANSOUR + add a header to provide posix compatible wrapper for platform lacking in https://gerrit.libreoffice.org/6837 from Norbert Thiebaud + upgrade liborcus in https://gerrit.libreoffice.org/7310 from Markus Mohrhard + WIP fdo#72987 Use firebird backup format for .odb in https://gerrit.libreoffice.org/7299 from Andrzej Hunt + sw/export docx: add unit test for document with header and section(s) in https://gerrit.libreoffice.org/6249 from Pierre-Eric Pelloux-Prayer + fix for exporting of text watermark to DOCX in https://gerrit.libreoffice.org/5568 from Adam CloudOn + WIP: fdo#33980 Preserve selection across all slide sorters. in https://gerrit.libreoffice.org/6633 from Andrzej Hunt + Increase number of remembered recent documents from 10 to 25 in https://gerrit.libreoffice.org/6101 from Krisztian Pinter + startcenter: Make SC open faster by timeouting thumbnails in https://gerrit.libreoffice.org/6102 from Krisztian Pinter + Simplify oslThreadIdentifier on Linux 32. in https://gerrit.libreoffice.org/5553 from Arnaud Versini + fdo#36791 : fix for import of greeting card in https://gerrit.libreoffice.org/4240 from Adam CloudOn + Positional Tab additions in https://gerrit.libreoffice.org/5387 from Adam CloudOn Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: winaccessibility/source
winaccessibility/source/UAccCOM/EnumVariant.cxx |9 +++--
1 file changed, 3 insertions(+), 6 deletions(-)
New commits:
commit 09155190d817dd880cc96a106114618b46a5a7e5
Author: Julien Nabet
Date: Sat Mar 1 23:16:10 2014 +0100
Variable not used but remove some wrong characters
Change-Id: I2206225309becff134e8f719959d976f71fcde27
diff --git a/winaccessibility/source/UAccCOM/EnumVariant.cxx
b/winaccessibility/source/UAccCOM/EnumVariant.cxx
index cf403fa..e47e5e5 100644
--- a/winaccessibility/source/UAccCOM/EnumVariant.cxx
+++ b/winaccessibility/source/UAccCOM/EnumVariant.cxx
@@ -36,7 +36,7 @@ using namespace com::sun::star::accessibility;
* enumarate method,get next element
* @param cElements The number of elements to be returned.
* @param pvar An array of at least size celt in which the elements
are to be returned.
- * @param pcElementFetched Pointer to the number of elements returned in
rgVar, or Null¡£
+ * @param pcElementFetched Pointer to the number of elements returned in
rgVar, or Null
* @return Result.
*/
HRESULT STDMETHODCALLTYPE CEnumVariant::Next(ULONG cElements,VARIANT __RPC_FAR
*pvar,ULONG __RPC_FAR *pcElementFetched)
@@ -125,7 +125,7 @@ HRESULT STDMETHODCALLTYPE CEnumVariant::Reset( void)
*copy current enumaration container and its state to
*the new object
*AT will use the copy object to get elements
- * @param ppenum On return, pointer to the location of the clone enumerator¡£
+ * @param ppenum On return, pointer to the location of the clone enumerator
* @return Result.
*/
HRESULT STDMETHODCALLTYPE CEnumVariant::Clone(IEnumVARIANT __RPC_FAR
*__RPC_FAR *ppenum)
@@ -205,13 +205,10 @@ STDMETHODIMP CEnumVariant::ClearEnumeration()
*/
static Reference GetXAccessibleSelection(XAccessible*
pXAcc)
{
-XAccessibleSelection* pSelection = NULL;
-Reference< XAccessibleContext > pRContext;
-
if( pXAcc == NULL)
return NULL;
-pRContext = pXAcc->getAccessibleContext();
+Reference< XAccessibleContext > pRContext = pXAcc->getAccessibleContext();
if( !pRContext.is() )
return NULL;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 75053, which changed state. Bug 75053 Summary: CTRL+Z undo of a column deletion does not correctly restore all cell formulas https://bugs.freedesktop.org/show_bug.cgi?id=75053 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: filter/Library_htmlfd.mk filter/Library_textfd.mk filter/Module_filter.mk filter/source postprocess/Rdb_services.mk Repository.mk solenv/gbuild sw/CppunitTest_sw_htmlex
Repository.mk |1 filter/Library_htmlfd.mk | 36 -- filter/Library_textfd.mk |5 filter/Module_filter.mk |1 filter/source/config/fragments/types/generic_HTML.xcu |2 filter/source/htmlfilterdetect/fdcomp.cxx | 36 -- filter/source/htmlfilterdetect/filterdetect.cxx | 232 -- filter/source/htmlfilterdetect/filterdetect.hxx | 64 filter/source/htmlfilterdetect/htmlfd.component | 15 - filter/source/textfilterdetect/filterdetect.cxx | 178 + postprocess/Rdb_services.mk |1 solenv/gbuild/extensions/pre_MergedLibsList.mk|1 sw/CppunitTest_sw_htmlexport.mk |2 13 files changed, 128 insertions(+), 446 deletions(-) New commits: commit d5890e87ab5e298e9a74ed0d552b01a98e59b1fa Author: Maxim Monastirsky Date: Sat Mar 1 20:03:41 2014 +0200 Merge HTML detection to text detection service Setting the filter name explicitly is not really required, because TypeDetection::impl_checkResultsAndAddBestFilter is able to select the correct filter anyway. But it seems that other detection services also do it, so I followed that way. Change-Id: I6e73fa79c6867d82f98d63e8d2b7865446f088ef Reviewed-on: https://gerrit.libreoffice.org/8213 Reviewed-by: Kohei Yoshida Tested-by: Kohei Yoshida diff --git a/Repository.mk b/Repository.mk index ba433f3..671f0dc 100644 --- a/Repository.mk +++ b/Repository.mk @@ -271,7 +271,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ $(if $(ENABLE_DIRECTX),gdipluscanvas) \ guesslang \ $(if $(filter DESKTOP,$(BUILD_TYPE)),helplinker) \ - htmlfd \ i18npool \ i18nsearch \ hyphen \ diff --git a/filter/Library_htmlfd.mk b/filter/Library_htmlfd.mk deleted file mode 100644 index cfb708b..000 --- a/filter/Library_htmlfd.mk +++ /dev/null @@ -1,36 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -#* -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -#* - -$(eval $(call gb_Library_Library,htmlfd)) - -$(eval $(call gb_Library_set_componentfile,htmlfd,filter/source/htmlfilterdetect/htmlfd)) - -$(eval $(call gb_Library_use_external,htmlfd,boost_headers)) - -$(eval $(call gb_Library_use_sdk_api,htmlfd)) - -$(eval $(call gb_Library_use_libraries,htmlfd,\ - ucbhelper \ - cppuhelper \ - cppu \ - sal \ - tl \ - utl \ - svt \ - $(gb_UWINAPI) \ -)) - -$(eval $(call gb_Library_add_exception_objects,htmlfd,\ - filter/source/htmlfilterdetect/fdcomp \ - filter/source/htmlfilterdetect/filterdetect \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/filter/Library_textfd.mk b/filter/Library_textfd.mk index ac1cda3..ef470b7 100644 --- a/filter/Library_textfd.mk +++ b/filter/Library_textfd.mk @@ -13,14 +13,19 @@ $(eval $(call gb_Library_Library,textfd)) $(eval $(call gb_Library_set_componentfile,textfd,filter/source/textfilterdetect/textfd)) +$(eval $(call gb_Library_use_external,textfd,boost_headers)) + $(eval $(call gb_Library_use_sdk_api,textfd)) $(eval $(call gb_Library_use_libraries,textfd,\ + comphelper \ ucbhelper \ cppuhelper \ cppu \ sal \ tl \ + utl \ + svt \ $(gb_UWINAPI) \ )) diff --git a/filter/Module_filter.mk b/filter/Module_filter.mk index 58307b4..403184a 100644 --- a/filter/Module_filter.mk +++ b/filter/Module_filter.mk @@ -34,7 +34,6 @@ $(eval $(call gb_Module_add_targets,filter,\ Library_exp) \ Library_filterconfig \ Library_flash \ - Library_htmlfd \ Library_icd \ Library_icg \ Library_idx \ diff --git a/filter/source/config/fragments/types/generic_HTML.xcu b/filter/source/config/fragments/types/generic_HTML.xcu index 58ffedc..b00b048 100644 --- a/filter/source/config/fragments/types/generic_HTML.xcu +++ b/filter/source/config/fragments/types/generic_HTML.xcu @@ -16,7 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -com.sun.star.comp.filters.HtmlFilterDetect +com.sun.star.comp.filters.PlainTextFilterDetect private:factory/swriter/web* html htm text/html diff --git a/filter/source/htmlfilterdetect/fdcomp.cxx b/filter/source/htmlfilterdetect/fdcomp.cxx deleted file mode 100644 index 40360e9..000 --- a/filter/source/htmlfilterdetect/fdcom
[Libreoffice-commits] core.git: 3 commits - comphelper/source connectivity/source include/rtl sal/qa sal/rtl svgio/source xmloff/source
comphelper/source/misc/storagehelper.cxx|7
connectivity/source/drivers/postgresql/pq_tools.cxx |6
include/rtl/uri.h | 32 --
sal/qa/rtl/uri/rtl_testuri.cxx | 72 ++---
sal/rtl/uri.cxx | 257 +---
svgio/source/svgreader/svgimagenode.cxx |6
xmloff/source/draw/shapeexport.cxx | 10
7 files changed, 169 insertions(+), 221 deletions(-)
New commits:
commit d739b01b9f20b1a7fd4b313b28e4dd4e5edd9193
Author: Stephan Bergmann
Date: Sat Mar 1 19:25:38 2014 +0100
Adapt rtl_uriConvertRelToAbs to RFC 3986
...which updates RFC 2396, removes the requirement that the base URI's path
starts with a slash, and clarifies how to treat excess "." and ".."
segments.
This nicely allows handling of those odd vnd.sun.star.Package URLs as
intended
now, so that making absolute relative to base URL
yields
instead of provoking a MalformedUriException.
Change-Id: Ice84303a57698a2c05d3a45541fe78b67450fa3c
diff --git a/include/rtl/uri.h b/include/rtl/uri.h
index a4e1d37..248a0d4 100644
--- a/include/rtl/uri.h
+++ b/include/rtl/uri.h
@@ -294,39 +294,27 @@ SAL_DLLPUBLIC void SAL_CALL rtl_uriDecode(
rtl_uString ** pResult)
SAL_THROW_EXTERN_C();
-/** Convert a relative URI reference into an absolute one.
+/** Convert a relative URI reference into an absolute URI.
-A URI reference is a URI plus an optional @<"#" fragment> part.
-
-This function uses the algorithm described in RFC 2396, section 5.2, with
-the following clarifications: (1) Backwards-compatible relative URIs
-starting with a scheme component (see RFC 2396, section 5.2, step 3) are
not
-supported. (2) Segments "." and ".." within the path of the base URI are
-not considered special, RFC 2396 seems a bit unlcear about that point.
-(3) Erroneous excess segments ".." within the path of the relative URI (if
-it is indeed relative) are left intact, as the examples in RFC 2396,
-section C.2, suggest. (4) If the relative URI is a reference to the
-"current document," the "current document" is taken to be the base URI.
+This function uses the strict parser algorithm described in RFC 3986,
+section 5.2.
This function signals exceptions by returning false and letting pException
point to a message explaining the exception.
@param pBaseUriRef
-An absolute, hierarchical URI reference that serves as the base URI. If it
-has to be inspected (i.e., pRelUriRef is not an absolute URI already), and
-if it either is not an absolute URI (i.e., does not begin with a
-@ part) or has a path that is non-empty but does not start
-with "/", an exception will be signaled.
+An absolute URI that serves as the base URI. If it has to be inspected
+(i.e., pRelUriRef is not an absolute URI already), and it is not an
absolute
+URI (i.e., does not begin with a @ part), an exception will be
+signaled.
@param pRelUriRef
An URI reference that may be either absolute or relative. If it is
-absolute, it will be returned unmodified (and it need not be hierarchical
-then).
+absolute, it will be returned unmodified.
@param pResult
-Returns an absolute URI reference. Must itself not be null, and must point
-to either null or a valid string. If an exception is signalled, it is left
-unchanged.
+Returns an absolute URI. Must itself not be null, and must point to either
+null or a valid string. If an exception is signalled, it is left
unchanged.
@param pException
Returns an explanatory message in case an exception is signalled. Must
diff --git a/sal/qa/rtl/uri/rtl_testuri.cxx b/sal/qa/rtl/uri/rtl_testuri.cxx
index b230d43..fce4aa5 100644
--- a/sal/qa/rtl/uri/rtl_testuri.cxx
+++ b/sal/qa/rtl/uri/rtl_testuri.cxx
@@ -279,14 +279,14 @@ void Test::test_Uri() {
char const * pAbs;
};
static RelToAbsTest const aRelToAbsTest[]
-= { // The following tests are taken from RFC 2396:
+= { // The following tests are taken from RFC 3986:
{ "http://a/b/c/d;p?q";, "g:h", "g:h" },
{ "http://a/b/c/d;p?q";, "g", "http://a/b/c/g"; },
{ "http://a/b/c/d;p?q";, "./g", "http://a/b/c/g"; },
{ "http://a/b/c/d;p?q";, "g/", "http://a/b/c/g/"; },
{ "http://a/b/c/d;p?q";, "/g", "http://a/g"; },
{ "http://a/b/c/d;p?q";, "//g", "http://g"; },
-{ "http://a/b/c/d;p?q";, "?y", "http://a/b/c/?y"; },
+{ "http://a/b/c/d;p?q";, "?y", "http://a/b/c/d;p?y"; },
{ "http://a/b/c/d;p?q";, "g?y", "http://a/b/c/g?y"; },
{ "http://a/b/c/d;p?q";, "#s", "http://a/b/c/d;p?q#s"; },
{ "http://a/b/c/d;p?q";, "g#s", "http://a/b/c/g#s"; },
@@ -294,6 +294,7 @@ void Test::t
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 V Stuart Foote changed: What|Removed |Added Depends on||75376 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: cui/source include/svl include/svx sc/source svl/Library_svl.mk svl/source
cui/source/tabpages/border.cxx |8 +++
include/svl/int64item.hxx | 56 +
include/svx/svxids.hrc |3 -
sc/source/ui/view/tabvwsha.cxx |8 ++-
svl/Library_svl.mk |1
svl/source/items/int64item.cxx | 109 +
6 files changed, 183 insertions(+), 2 deletions(-)
New commits:
commit 2f527738ea4f8e93acafdd7f0ae06de1678cfdd8
Author: Kohei Yoshida
Date: Sat Mar 1 12:54:43 2014 -0500
Set the default cell border line width to 0.75 pt in Calc.
0.75 pt provides a better interop with Excel documents.
Change-Id: Ic1d2cbbe4e35dc0793a0e35d3836261d91138f7c
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index a2d19a5..3f8881b 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -41,6 +41,7 @@
#include
#include
#include
+#include
#include
#include
#include "borderconn.hxx"
@@ -167,6 +168,13 @@ SvxBorderTabPage::SvxBorderTabPage(Window* pParent, const
SfxItemSet& rCoreAttrs
maUsedBorderStyles.insert(static_cast(aUsedStyles[i]));
}
+if (rCoreAttrs.HasItem(SID_ATTR_BORDER_DEFAULT_WIDTH, &pItem))
+{
+// The caller specifies default line width. Honor it.
+const SfxInt64Item* p = static_cast(pItem);
+m_pLineWidthMF->SetValue(p->GetValue());
+}
+
// set metric
FieldUnit eFUnit = GetModuleFieldUnit( rCoreAttrs );
diff --git a/include/svl/int64item.hxx b/include/svl/int64item.hxx
new file mode 100644
index 000..2d6fd67
--- /dev/null
+++ b/include/svl/int64item.hxx
@@ -0,0 +1,56 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_SVL_INT64ITEM_HXX
+#define INCLUDED_SVL_INT64ITEM_HXX
+
+#include
+#include
+
+class SVL_DLLPUBLIC SfxInt64Item : public SfxPoolItem
+{
+sal_Int64 mnValue;
+
+public:
+SfxInt64Item( sal_uInt16 nWhich = 0, sal_Int64 nVal = 0 );
+SfxInt64Item( sal_uInt16 nWhich, SvStream & rStream );
+SfxInt64Item( const SfxInt64Item& rItem );
+
+virtual ~SfxInt64Item();
+
+virtual bool operator== ( const SfxPoolItem& rItem ) const;
+
+virtual int Compare( const SfxPoolItem& r ) const;
+virtual int Compare( const SfxPoolItem& r, const IntlWrapper& rIntlWrapper
) const;
+
+virtual SfxItemPresentation GetPresentation(
+SfxItemPresentation, SfxMapUnit, SfxMapUnit,
+OUString& rText, const IntlWrapper* pIntlWrapper = NULL ) const;
+
+virtual bool QueryValue(
+com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+
+virtual bool PutValue(
+const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
+
+virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nItemVersion )
const;
+
+virtual SvStream& Store( SvStream& rStream, sal_uInt16 nItemVersion )
const;
+
+virtual SfxPoolItem* Clone( SfxItemPool* pOther = NULL ) const;
+
+sal_Int64 GetValue() const;
+
+void SetValue( sal_Int64 nVal );
+};
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index ae66d26..fdfae53 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -958,10 +958,11 @@
#define SID_SW_ATTR_FILL_GRADIENT ( SID_SVX_START + 1139
)
#define SID_ATTR_BORDER_STYLES ( SID_SVX_START + 1140
)
+#define SID_ATTR_BORDER_DEFAULT_WIDTH ( SID_SVX_START + 1141
)
// IMPORTANT NOTE: adjust SID_SVX_FIRSTFREE, when adding new slot id
-#define SID_SVX_FIRSTFREE
(SID_ATTR_BORDER_STYLES + 1)
+#define SID_SVX_FIRSTFREE
(SID_ATTR_BORDER_DEFAULT_WIDTH + 1)
// Overflow check for slot IDs
diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx
index 57abb07..7bd88ac 100644
--- a/sc/source/ui/view/tabvwsha.cxx
+++ b/sc/source/ui/view/tabvwsha.cxx
@@ -25,6 +25,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -480,6 +481,8 @@ void ScTabViewShell::ExecuteCellFormatDlg(SfxRequest& rReq,
const OString &rName
boost::scoped_ptr pOldSet(new
SfxItemSet(pOldAttrs->GetItemSet()));
boost::scoped_ptr pNumberInfoItem;
+pOldSet->MergeRange(SID_ATTR_BORDER_STYLES, SID_ATTR_BORDER_DEFAULT_WIDTH);
+
// We only allow these border line types.
std::vector aBorderStyles;
aBorderStyles.reserve(5);
@@ -490,9 +493,12 @@ void ScTabViewShell::ExecuteCellFormatDlg(SfxRequest&
rReq, const OString &rName
aBorderStyles.push_back(table::BorderLineStyle::DOUBLE);
SfxIntegerListItem aBorderStyles
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 mike.h...@onepoyle.net changed: What|Removed |Added CC||mike.h...@onepoyle.net --- Comment #105 from mike.h...@onepoyle.net --- Should not bug 51819 be added here - critical security issue? I can't see it being followed elsewhere, apologies if I am mistaken. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/DomainMapperTableHandler.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d3f96d7458d74c5ec14b1a4f03f4244350cfeea6 Author: Miklos Vajna Date: Sat Mar 1 17:33:10 2014 +0100 DomainMapperTableHandler::endTable: fix this comment Change-Id: I0c22123d8b1707092938474891e2469e32a1823d diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx index 22f3052..a9a4221 100644 --- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx @@ -953,7 +953,7 @@ void DomainMapperTableHandler::endTable(unsigned int nestedTableLevel) // SectionPropertyMap::CloseSectionGroup(), so we'll have no idea // about the text area width, nor can fix this by delaying the text // frame conversion: just do it here. -// Also, we the anchor is within a table, then do it here as well, +// Also, when the anchor is within a table, then do it here as well, // as xStart/xEnd would not point to the start/end at conversion // time anyway. sal_Int32 nTableWidth = 0; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/TablePropertiesHandler.cxx |3
writerfilter/source/doctok/resources.xmi | 62 -
writerfilter/source/ooxml/model.xml|4 -
writerfilter/source/rtftok/rtfdocumentimpl.cxx |2
4 files changed, 4 insertions(+), 67 deletions(-)
New commits:
commit cd79d4a25df3a7d7b2241a4239a2714b50dcf0be
Author: Miklos Vajna
Date: Sat Mar 1 17:08:34 2014 +0100
writerfilter: remove last sprm tokens from ooxml/model.xml
Change-Id: I3b18ed95bd0144240a586fefb2b1deb0bcd658c4
diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.cxx
b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
index 37e99b2..323f288 100644
--- a/writerfilter/source/dmapper/TablePropertiesHandler.cxx
+++ b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
@@ -169,8 +169,7 @@ namespace dmapper {
}
}
break;
-case 0x3403: // sprmTFCantSplit
-case NS_sprm::LN_TCantSplit: // 0x3644
+case NS_ooxml::LN_CT_TrPrBase_cantSplit:
{
//row can't break across pages if nIntValue == 1
TablePropertyMapPtr pPropMap( new TablePropertyMap );
diff --git a/writerfilter/source/doctok/resources.xmi
b/writerfilter/source/doctok/resources.xmi
index b80eb20..d6539ee 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -7,37 +7,6 @@
-
-
-
-
-
-
-
- 0x3644
-
-
-
-
-
-
-
-
rtf:sprmTCantSplit
-
-
-
-
-
-
-
- table
-
-
-
-
-
-
-
@@ -410,37 +379,6 @@
-
-
-
-
-
-
-
- 0x0818
-
-
-
-
-
-
-
-
rtf:sprmCFspecVanish
-
-
-
-
-
-
-
- character
-
-
-
-
-
-
-
diff --git a/writerfilter/source/ooxml/model.xml
b/writerfilter/source/ooxml/model.xml
index ab7215e..9e2296b 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -24393,7 +24393,7 @@
-
+
@@ -24693,7 +24693,7 @@
-
+
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 9381cb1..6c9511b 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2654,7 +2654,7 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
case RTF_TRKEEP:
{
RTFValue::Pointer_t pValue(new RTFValue(1));
-m_aStates.top().aTableRowSprms.set(NS_sprm::LN_TCantSplit,
pValue);
+
m_aStates.top().aTableRowSprms.set(NS_ooxml::LN_CT_TrPrBase_cantSplit, pValue);
}
case RTF_SECTUNLOCKED:
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/osl
sal/osl/unx/pipe.c | 12 ++--
1 file changed, 10 insertions(+), 2 deletions(-)
New commits:
commit f6141d884b7a89a856a34dc93991dbe01ded0b6b
Author: José Guilherme Vanz
Date: Sat Nov 2 17:49:16 2013 -0200
fdo#71043 - Use STACK lint tool to clean code
The code is using a pointer without check if it is not null.
Change-Id: Icb2dcf8d41a35514e18a5881f59399951b3e0493
Reviewed-on: https://gerrit.libreoffice.org/6529
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/sal/osl/unx/pipe.c b/sal/osl/unx/pipe.c
index e271e94..79e847e 100644
--- a/sal/osl/unx/pipe.c
+++ b/sal/osl/unx/pipe.c
@@ -98,6 +98,8 @@ oslPipe __osl_createPipeImpl()
oslPipe pPipeImpl;
pPipeImpl = (oslPipe)calloc(1, sizeof(struct oslPipeImpl));
+if (pPipeImpl == NULL)
+return NULL;
pPipeImpl->m_nRefCount =1;
pPipeImpl->m_bClosed = sal_False;
#if defined(LINUX)
@@ -230,7 +232,13 @@ oslPipe SAL_CALL osl_psz_createPipe(const sal_Char
*pszPipeName, oslPipeOptions
}
/* alloc memory */
-pPipe= __osl_createPipeImpl();
+pPipe = __osl_createPipeImpl();
+
+if (pPipe == NULL)
+{
+OSL_TRACE("__osl_createPipe socket failed");
+return NULL;
+}
/* create socket */
pPipe->m_Socket = socket(AF_UNIX, SOCK_STREAM, 0);
@@ -467,7 +475,7 @@ oslPipe SAL_CALL osl_acceptPipe(oslPipe pPipe)
else
{
/* alloc memory */
-pAcceptedPipe= __osl_createPipeImpl();
+pAcceptedPipe = __osl_createPipeImpl();
OSL_ASSERT(pAcceptedPipe);
if(pAcceptedPipe==NULL)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 71043] Use STACK lint tool to clean code ...
https://bugs.freedesktop.org/show_bug.cgi?id=71043 Commit Notification changed: What|Removed |Added Whiteboard|EasyHack DifficultyBeginner |EasyHack DifficultyBeginner |SkillCpp TopicCleanup |SkillCpp TopicCleanup ||target:4.3.0 --- Comment #15 from Commit Notification --- Jose Guilherme Vanz committed a patch related to this issue. It has been pushed to "master": http://cgit.freedesktop.org/libreoffice/core/commit/?id=f6141d884b7a89a856a34dc93991dbe01ded0b6b fdo#71043 - Use STACK lint tool to clean code The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 75240] improve coding style in bitmap3.cxx
https://bugs.freedesktop.org/show_bug.cgi?id=75240 Mihai Varga changed: What|Removed |Added Assignee|mihai.m...@gmail.com|libreoffice-b...@lists.free ||desktop.org -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/filter/inc/sheetdatabuffer.hxx |2 ++
sc/source/filter/oox/sheetdatabuffer.cxx | 13 +
sc/source/filter/oox/sheetdatacontext.cxx |3 +++
3 files changed, 18 insertions(+)
New commits:
commit dff29fadfe418421f2af9fd4f1dccc8a9b4cd545
Author: Markus Mohrhard
Date: Sat Mar 1 16:36:18 2014 +0100
import date cells from OOXML
Change-Id: Id0b9ec034d559d489ca4ee2d1d6aca1bdf1beb9d
diff --git a/sc/source/filter/inc/sheetdatabuffer.hxx
b/sc/source/filter/inc/sheetdatabuffer.hxx
index ceb3a80..f84f91c 100644
--- a/sc/source/filter/inc/sheetdatabuffer.hxx
+++ b/sc/source/filter/inc/sheetdatabuffer.hxx
@@ -133,6 +133,8 @@ public:
voidsetErrorCell( const CellModel& rModel, sal_uInt8
nErrorCode );
/** Inserts a formula cell into the sheet. */
voidsetFormulaCell( const CellModel& rModel, const
ApiTokenSequence& rTokens );
+/** Inserts a ISO 8601 date cell into the sheet. */
+voidsetDateCell( const CellModel& rModel, const OUString&
rDateString );
/** Inserts the passed token array as array formula. */
voidcreateArrayFormula(
diff --git a/sc/source/filter/oox/sheetdatabuffer.cxx
b/sc/source/filter/oox/sheetdatabuffer.cxx
index b4839b2..668a74e 100644
--- a/sc/source/filter/oox/sheetdatabuffer.cxx
+++ b/sc/source/filter/oox/sheetdatabuffer.cxx
@@ -223,6 +223,19 @@ void SheetDataBuffer::setErrorCell( const CellModel&
rModel, sal_uInt8 nErrorCod
setCellFormat( rModel );
}
+void SheetDataBuffer::setDateCell( const CellModel& rModel, const OUString&
rDateString )
+{
+ScDocument& rDoc = getScDocument();
+SvNumberFormatter* pFormatter = rDoc.GetFormatTable();
+
+double fValue = 0.0;
+sal_uInt32 nFormatIndex;
+bool bValid = pFormatter->IsNumberFormat( rDateString, nFormatIndex,
fValue );
+
+if(bValid)
+setValueCell( rModel, fValue );
+}
+
void SheetDataBuffer::setFormulaCell( const CellModel& rModel, const
ApiTokenSequence& rTokens )
{
mbPendingSharedFmla = false;
diff --git a/sc/source/filter/oox/sheetdatacontext.cxx
b/sc/source/filter/oox/sheetdatacontext.cxx
index 227c1d9..c22930f 100644
--- a/sc/source/filter/oox/sheetdatacontext.cxx
+++ b/sc/source/filter/oox/sheetdatacontext.cxx
@@ -215,6 +215,9 @@ void SheetDataContext::onEndElement()
case XML_s:
mrSheetData.setStringCell( maCellData,
maCellValue.toInt32() );
break;
+case XML_d:
+mrSheetData.setDateCell( maCellData, maCellValue );
+break;
}
else if( (maCellData.mnCellType == XML_inlineStr) &&
mxInlineStr.get() )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 5 commits - include/oox oox/CustomTarget_generated.mk oox/source sc/source
include/oox/core/contexthandler.hxx |1
include/oox/core/filterbase.hxx |5 +
include/oox/core/relations.hxx | 11 +++
include/oox/core/xmlfilterbase.hxx |2
include/oox/token/namespacemap.hxx | 11 +++
oox/CustomTarget_generated.mk |2
oox/source/core/contexthandler.cxx |5 +
oox/source/core/fastparser.cxx | 19 +-
oox/source/core/filterdetect.cxx|3 -
oox/source/core/relations.cxx | 39 ++---
oox/source/core/xmlfilterbase.cxx | 36 +++-
oox/source/export/vmlexport.cxx |1
oox/source/token/namespacemap.cxx | 12 +++-
oox/source/token/namespaces-strict.hxx.head | 27 +
oox/source/token/namespaces-strict.hxx.tail | 62 +
oox/source/token/namespaces-strict.pl | 70 +++
oox/source/token/namespaces-strict.txt | 82
sc/source/filter/oox/excelfilter.cxx|2
sc/source/filter/oox/workbookfragment.cxx | 17 +++--
sc/source/filter/oox/worksheetfragment.cxx |8 +-
20 files changed, 384 insertions(+), 31 deletions(-)
New commits:
commit 6471204afda1de1bad014635bfd0fccc18f15946
Author: Markus Mohrhard
Date: Sat Mar 1 13:18:45 2014 +0100
remove empty lines after comment removal
Change-Id: Iad5cb7303f3797c06a53651b0f0c7e7c2273ef55
diff --git a/oox/source/core/relations.cxx b/oox/source/core/relations.cxx
index 3742531..d2e1b28 100644
--- a/oox/source/core/relations.cxx
+++ b/oox/source/core/relations.cxx
@@ -25,11 +25,6 @@
namespace oox {
namespace core {
-
-
-
-
-
namespace {
OUString lclRemoveFileName( const OUString& rPath )
@@ -57,9 +52,6 @@ OUString createOfficeDocRelationTypeStrict(const OUString&
rType)
}
-
-
-
Relations::Relations( const OUString& rFragmentPath ) :
maFragmentPath( rFragmentPath )
{
commit e34870c2396db160c15e3e9bbf3efabf55ee2839
Author: Markus Mohrhard
Date: Sat Mar 1 12:44:03 2014 +0100
support OOXML strict documents in Calc
Change-Id: I277d76aeec28e173d913ccc1506464afe4d09c6d
diff --git a/include/oox/core/contexthandler.hxx
b/include/oox/core/contexthandler.hxx
index 272927a..2dda012 100644
--- a/include/oox/core/contexthandler.hxx
+++ b/include/oox/core/contexthandler.hxx
@@ -71,6 +71,7 @@ public:
OUString getFragmentPathFromRelId( const OUString& rRelId ) const;
/** Returns the full fragment path for the first relation of the passed
type. */
OUString getFragmentPathFromFirstType( const OUString& rType ) const;
+OUString getFragmentPathFromFirstTypeFromOfficeDoc( const OUString&
rType ) const;
// com.sun.star.xml.sax.XFastContextHandler interface -
diff --git a/include/oox/core/filterbase.hxx b/include/oox/core/filterbase.hxx
index 96e488c..45c1ef5 100644
--- a/include/oox/core/filterbase.hxx
+++ b/include/oox/core/filterbase.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_OOX_CORE_FILTERBASE_HXX
#define INCLUDED_OOX_CORE_FILTERBASE_HXX
-#include
#include
#include
#include
@@ -37,6 +36,8 @@
#include
#include
+#include
+
namespace com { namespace sun { namespace star {
namespace awt { struct DeviceInfo; }
namespace frame { class XFrame; }
@@ -283,7 +284,7 @@ private:
const ::com::sun::star::uno::Reference<
::com::sun::star::io::XStream >& rxOutStream ) const = 0;
private:
-::std::auto_ptr< FilterBaseImpl > mxImpl;
+boost::scoped_ptr< FilterBaseImpl > mxImpl;
};
//
diff --git a/include/oox/core/relations.hxx b/include/oox/core/relations.hxx
index c94e293..05d00ad 100644
--- a/include/oox/core/relations.hxx
+++ b/include/oox/core/relations.hxx
@@ -30,11 +30,16 @@ namespace core {
//
-/** Expands to an OUString containing an 'officeDocument' relation type created
+/** Expands to an OUString containing an 'officeDocument' transitional
relation type created
from the passed literal(!) ASCII(!) character array. */
#define CREATE_OFFICEDOC_RELATION_TYPE( ascii ) \
( "http://schemas.openxmlformats.org/officeDocument/2006/relationships/";
ascii )
+/** Expands to an OUString containing an 'officeDocument' strict relation type
created
+from the passed literal(!) ASCII(!) character array. */
+#define CREATE_OFFICEDOC_RELATION_TYPE_STRICT( ascii ) \
+( "http://purl.oclc.org/ooxml/officeDocument/relationships/"; ascii )
+
/** Expands to an OUString containing a 'package' relation type created from
the passed literal(!) ASCII(!) character array. */
#define CREATE_PACKAGE_RELATION_TYPE( ascii ) \
@@ -74,8 +79,11 @@ public:
const Relation* getRelationFromRelId( const OUString& rId ) const;
/** Returns the fir
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sot/source
sot/source/base/formats.cxx | 18 +-
1 file changed, 9 insertions(+), 9 deletions(-)
New commits:
commit 91a55de7be6a23685a875517495c1af67f3a8b60
Author: Andrzej Hunt
Date: Fri Feb 7 18:18:42 2014 +
fdo#52547 SOT: Prefer embedding image data to embedding linked image.
When copying an image from e.g. Firefox or Chromium the clipboard
will contain both the image itself, and the url of the image --
presumably it makes more sense to store the image data itself if
it is available -- the order of the items in the *_FREE_AREA_Copy
defines the order of preference for which data in the clipboard
should be used.
Change-Id: Id8b862a9f2fce3a34adbb16509e9b7372500a239
Reviewed-on: https://gerrit.libreoffice.org/7928
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
(cherry picked from commit c47db038f98aaf7aec3cbe57c4e5683591afa23e)
Reviewed-on: https://gerrit.libreoffice.org/8384
diff --git a/sot/source/base/formats.cxx b/sot/source/base/formats.cxx
index 7f7d101..5ea6bd8 100644
--- a/sot/source/base/formats.cxx
+++ b/sot/source/base/formats.cxx
@@ -825,9 +825,6 @@ static SotAction_Impl const
aEXCHG_DEST_SWDOC_FREE_AREA_Copy[] = \
{ SOT_FORMATSTR_ID_SD_OLE, EXCHG_OUT_ACTION_INSERT_OLE |
EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL,
0 },\
{ SOT_FORMATSTR_ID_EMBED_SOURCE, EXCHG_OUT_ACTION_INSERT_OLE |
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
{ SOT_FORMATSTR_ID_EMBEDDED_OBJ, EXCHG_OUT_ACTION_INSERT_OLE |
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
-{ SOT_FORMATSTR_ID_HTML, EXCHG_OUT_ACTION_INSERT_HTML |
EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL,
0 },\
-{ SOT_FORMATSTR_ID_HTML_NO_COMMENT, EXCHG_OUT_ACTION_INSERT_HTML |
EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL,
0 },\
-{ SOT_FORMATSTR_ID_HTML_SIMPLE, EXCHG_OUT_ACTION_INSERT_HTML |
EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL,
0 },\
{ SOT_FORMAT_RTF, EXCHG_IN_ACTION_COPY |
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
{ SOT_FORMATSTR_ID_NETSCAPE_IMAGE, EXCHG_IN_ACTION_COPY |
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
{ SOT_FORMAT_STRING, EXCHG_OUT_ACTION_INSERT_STRING |
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
@@ -838,6 +835,9 @@ static SotAction_Impl const
aEXCHG_DEST_SWDOC_FREE_AREA_Copy[] = \
{ SOT_FORMAT_BITMAP, EXCHG_OUT_ACTION_INSERT_BITMAP |
EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL,
0 },\
{ SOT_FORMATSTR_ID_EMBED_SOURCE_OLE, EXCHG_OUT_ACTION_INSERT_OLE |
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
{ SOT_FORMATSTR_ID_EMBEDDED_OBJ_OLE, EXCHG_OUT_ACTION_INSERT_OLE |
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
+{ SOT_FORMATSTR_ID_HTML, EXCHG_OUT_ACTION_INSERT_HTML |
EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL,
0 },\
+{ SOT_FORMATSTR_ID_HTML_NO_COMMENT, EXCHG_OUT_ACTION_INSERT_HTML |
EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL,
0 },\
+{ SOT_FORMATSTR_ID_HTML_SIMPLE, EXCHG_OUT_ACTION_INSERT_HTML |
EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL,
0 },\
{ SOT_FORMATSTR_ID_LINK, EXCHG_OUT_ACTION_INSERT_DDE |
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
{ SOT_FORMATSTR_ID_SVIM, EXCHG_OUT_ACTION_INSERT_IMAGEMAP |
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
{ 0x, 0, 0 }
\
@@ -998,9 +998,6 @@ static SotAction_Impl const
aEXCHG_DEST_SCDOC_FREE_AREA_Copy[] = \
{ SOT_FORMATSTR_ID_EMBEDDED_OBJ, EXCHG_OUT_ACTION_INSERT_OLE |
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
{ SOT_FORMATSTR_ID_BIFF_5, EXCHG_IN_ACTION_COPY |
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
{ SOT_FORMATSTR_ID_BIFF__5,EXCHG_IN_ACTION_COPY |
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
-{ SOT_FORMATSTR_ID_HTML, EXCHG_OUT_ACTION_INSERT_HTML |
EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL,
0 },\
-{ SOT_FORMATSTR_ID_HTML_NO_COMMENT, EXCHG_OUT_ACTION_INSERT_HTML |
EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL,
0 },\
-{ SOT_FORMATSTR_ID_HTML_SIMPLE, EXCHG_OUT_ACTION_INSERT_HTML |
EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL,
0 },\
{ SOT_FORMAT_STRING, EXCHG_OUT_ACTION_INSERT_STRING |
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
{ SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK,
EXCHG_OUT_ACTION_INSERT_HYPERLINK | EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP |
EXCHG_OUT_ACTION_FLAG_I
[Libreoffice-commits] core.git: external/libcmis
external/libcmis/UnpackedTarball_cmis.mk |3 ++-
external/libcmis/libcmis-libxml2_compatibility.patch | 14 ++
2 files changed, 16 insertions(+), 1 deletion(-)
New commits:
commit 1c9453cdf25ce6079be8489b77dbb75036bde908
Author: Douglas Mencken
Date: Fri Feb 28 09:04:21 2014 -0500
libcmis (bundled): add patch with missing definition for HTML_PARSE_RECOVER
Change-Id: I4c3760808b92c066181ce7e1294ee9e6dd9ea016
Reviewed-on: https://gerrit.libreoffice.org/8387
Tested-by: LibreOffice gerrit bot
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/external/libcmis/UnpackedTarball_cmis.mk
b/external/libcmis/UnpackedTarball_cmis.mk
index bbac1ac..8744951 100644
--- a/external/libcmis/UnpackedTarball_cmis.mk
+++ b/external/libcmis/UnpackedTarball_cmis.mk
@@ -16,7 +16,8 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,cmis,0))
$(eval $(call gb_UnpackedTarball_add_patches,cmis, \
external/libcmis/libcmis-0.4.1.patch \
external/libcmis/libcmis-0.4.1-empty-path.patch \
-
external/libcmis/libcmis-0.4.1-properties-fix.patch))
+
external/libcmis/libcmis-0.4.1-properties-fix.patch \
+
external/libcmis/libcmis-libxml2_compatibility.patch))
ifeq ($(OS)$(COM),WNTMSC)
$(eval $(call
gb_UnpackedTarball_add_patches,cmis,external/libcmis/boost-win.patch))
diff --git a/external/libcmis/libcmis-libxml2_compatibility.patch
b/external/libcmis/libcmis-libxml2_compatibility.patch
new file mode 100644
index 000..85db97e
--- /dev/null
+++ b/external/libcmis/libcmis-libxml2_compatibility.patch
@@ -0,0 +1,14 @@
+# -*- Mode: Diff -*-
+--- src/libcmis/oauth2-providers.cxx
src/libcmis/oauth2-providers.cxx
+@@ -34,6 +34,10 @@
+
+ using namespace std;
+
++#if LIBXML_VERSION < 20621
++#define HTML_PARSE_RECOVER 0
++#endif
++
+ string OAuth2Providers::OAuth2Gdrive( BaseSession* session, const string&
authUrl,
+ const string& username, const string&
password )
+ {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/curl
external/curl/ExternalProject_curl.mk |9 +++-- 1 file changed, 7 insertions(+), 2 deletions(-) New commits: commit 4e8ab2198819551d07f303f80d2bd5f5ae53bc6e Author: Douglas Mencken Date: Thu Feb 27 13:34:06 2014 -0500 curl (bundled): with-darwinssl option is not compatible with OSX SDK 10.5 Change-Id: I3e8576926df875d73de10d5212adde2685c3a799 Reviewed-on: https://gerrit.libreoffice.org/8386 Tested-by: LibreOffice gerrit bot Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/external/curl/ExternalProject_curl.mk b/external/curl/ExternalProject_curl.mk index 3f3336b..e1d8c07 100644 --- a/external/curl/ExternalProject_curl.mk +++ b/external/curl/ExternalProject_curl.mk @@ -36,14 +36,19 @@ curl_CPPFLAGS += -I$(call gb_UnpackedTarball_get_dir,nss)/dist/public/nss endif # use --with-darwinssl on Mac to get a native UI for SSL certs for CMIS usage +# (note that --with-darwinssl option is not very compatible) $(call gb_ExternalProject_get_state_target,curl,build): $(call gb_ExternalProject_run,build,\ CPPFLAGS="$(curl_CPPFLAGS)" \ LDFLAGS=$(curl_LDFLAGS) \ ./configure \ - $(if $(filter MACOSX IOS,$(OS)),\ - --with-darwinssl, \ + $(if $(filter IOS,$(OS)),\ + --with-darwinssl \ --with-nss$(if $(SYSTEM_NSS),,="$(call gb_UnpackedTarball_get_dir,nss)/dist/out")) \ + $(if $(filter MACOSX,$(OS)),\ + $(if $(filter 1050,$(MAC_OS_X_VERSION_MIN_REQUIRED)),--without-nss,\ + --with-darwinssl \ + --with-nss$(if $(SYSTEM_NSS),,="$(call gb_UnpackedTarball_get_dir,nss)/dist/out"))) \ --without-ssl \ --without-libidn --enable-ftp --enable-ipv6 --enable-http --disable-gopher \ --disable-file --disable-ldap --disable-telnet --disable-dict --without-libssh2 \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
New commits:
commit 55eb86699d7d4b2151530e9a0b3ca2e99033595b
Author: Rachit Gupta
Date: Wed Feb 26 19:12:08 2014 +0530
fdo#74064 The filename gets properly highlighted in the Save As dialog.
The filename was missing the extension which was causing problems.
The extension is retained now by disabling the autoextension checkbox.
Change-Id: If913124c22265da2bacb043d83386fd8f5710ca8
Reviewed-on: https://gerrit.libreoffice.org/8364
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
index 2365565..6e524b9 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -1345,9 +1345,13 @@ void SAL_CALL SalGtkFilePicker::setValue( sal_Int16
nControlId, sal_Int16 nContr
OSL_TRACE("enable unknown control %d", nControlId);
else if( tType == GTK_TYPE_TOGGLE_BUTTON )
{
-bool bChecked = false;
-rValue >>= bChecked;
-gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( pWidget ), bChecked );
+// fdo#74064, not activating the auto_extension checkbox so that
proper filename is highlighted.
+if(nControlId != ExtendedFilePickerElementIds::CHECKBOX_AUTOEXTENSION)
+{
+bool bChecked = false;
+rValue >>= bChecked;
+gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( pWidget ),
bChecked );
+}
}
else if( tType == GTK_TYPE_COMBO_BOX )
HandleSetListValue(GTK_COMBO_BOX(pWidget), nControlAction, rValue);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 53472] FORMATTING: Integral Symbols too small for some integrands
https://bugs.freedesktop.org/show_bug.cgi?id=53472 --- Comment #14 from Matteo Campanelli --- Hi all, so I worked a little on dynamically-sized integrals and I have something working. I added a new command "intd" for the purpose. An user can still use the old "int" to have the usual effect. The picture at the URL below shows how the integral sign with "intd" resizes according to its body argument. Notice that the last line is an ordinary "int" and is there for comparison purposes. http://i.imgur.com/Oc5N5Qy.png The code I currently have should be easily adapted to sum, products and so forth. Best, Matteo -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2f/6673f38d76df1a26c658b20e9c180c7bfd4d14
2f/6673f38d76df1a26c658b20e9c180c7bfd4d14 |1 + 1 file changed, 1 insertion(+) New commits: commit b4bb6a3b0854394ee2c8c094fd9549e7b02fba22 Author: Caolán McNamara Date: Sat Mar 1 11:30:34 2014 + Notes added by 'git notes add' diff --git a/2f/6673f38d76df1a26c658b20e9c180c7bfd4d14 b/2f/6673f38d76df1a26c658b20e9c180c7bfd4d14 new file mode 100644 index 000..2c9ce0e --- /dev/null +++ b/2f/6673f38d76df1a26c658b20e9c180c7bfd4d14 @@ -0,0 +1 @@ +merged as: f586542c3d3e5fda3a73c736ceaee3719859942d ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/view/drviews5.cxx | 11 +++
1 file changed, 11 insertions(+)
New commits:
commit f586542c3d3e5fda3a73c736ceaee3719859942d
Author: Armin Le Grand
Date: Fri Feb 28 20:27:32 2014 +
Related: #i57936# Added refresh to update LayerTabBar...
when attributes like Layer visibility were set
(cherry picked from commit 2f6673f38d76df1a26c658b20e9c180c7bfd4d14)
Change-Id: Iafc6be8070b69a01a80425fdafa2c55e7560f924
diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx
index 8555b8e..fd3fe88 100644
--- a/sd/source/ui/view/drviews5.cxx
+++ b/sd/source/ui/view/drviews5.cxx
@@ -289,6 +289,17 @@ void DrawViewShell::ReadFrameViewData(FrameView* pView)
EditMode eNewEditMode = pView->GetViewShEditMode(mePageKind);
sal_Bool bNewLayerMode = pView->IsLayerMode();
+
+if(IsLayerModeActive() && bNewLayerMode)
+{
+// #i57936# Force mbIsLayerModeActive to false so that ChangeEditMode
+// below does something regarding LayerTabBar content refresh. That
refresh
+// is only done when IsLayerModeActive changes. It needs to be done
+// since e.g. Layer vsisibility was changed above and this may need
+// a refresh to show the correct graphical representation
+mbIsLayerModeActive = false;
+}
+
ChangeEditMode(eNewEditMode, bNewLayerMode);
SwitchPage(nSelectedPage);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/tools tools/source unusedcode.easy
include/tools/resmgr.hxx |2 ++
tools/source/rc/resmgr.cxx |6 --
unusedcode.easy|7 ++-
3 files changed, 8 insertions(+), 7 deletions(-)
New commits:
commit 875129a8d4eca6b8ac184c4ae3539ffce8194e39
Author: Caolán McNamara
Date: Sat Mar 1 10:59:01 2014 +
callcatcher: update unused code
Change-Id: I429eeb3fc0dd0d0c55612eb482d99ab4ceda2f56
diff --git a/include/tools/resmgr.hxx b/include/tools/resmgr.hxx
index 2aef810..b25cc0a 100644
--- a/include/tools/resmgr.hxx
+++ b/include/tools/resmgr.hxx
@@ -137,8 +137,10 @@ public:
static ResMgr* CreateResMgr( const sal_Char* pPrefixName,
LanguageTag aLocale = LanguageTag(
LANGUAGE_SYSTEM) );
+#ifdef DBG_UTIL
/// Test whether resource still exists
voidTestStack( const Resource * );
+#endif
/// Check whether resource is available
boolIsAvailable( const ResId& rId,
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index ae9cd4c..e56a5d9 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.cxx
@@ -922,12 +922,6 @@ void ResMgr::TestStack( const Resource* pResObj )
}
}
-#else
-
-void ResMgr::TestStack( const Resource* )
-{
-}
-
#endif
bool ResMgr::IsAvailable( const ResId& rId, const Resource* pResObj ) const
diff --git a/unusedcode.easy b/unusedcode.easy
index 86cb448..8043786 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -41,6 +41,8 @@ OutputDevice::PixelToLogic(Region const&, MapMode const&)
const
SalGraphics::drawTransformedBitmap(basegfx::B2DPoint const&, basegfx::B2DPoint
const&, basegfx::B2DPoint const&, SalBitmap const&, SalBitmap const*)
ScDocument::CreateFormatTable() const
ScExtIButton::GetSelected() const
+ScSimpleRefDlg::GetRefString() const
+ScTable::GetCellCount(short) const
ScVbaFormat::getAddIndent()
ScVbaFormat::setAddIndent(com::sun::star::uno::Any
const&)
SdrItemBrowser::ForceParent()
@@ -57,6 +59,7 @@ SmFontPickList::Contains(Font const&) const
SmParser::Insert(rtl::OUString const&, int)
SotFactory::Find(SvGlobalName const&)
StyleSettings::SetActiveColor2(Color const&)
+StyleSettings::SetCursorSize(long)
StyleSettings::SetDeactiveColor2(Color const&)
StyleSettings::SetFloatTitleHeight(long)
StyleSettings::SetHideDisabledMenuItems(bool)
@@ -244,9 +247,11 @@ connectivity::sdbcx::OGroup::OGroup(unsigned char)
drawinglayer::attribute::SdrFillGraphicAttribute::getLogSize() const
editeng::MisspellRange::MisspellRange()
editeng::Section::Section()
+formula::DoubleVectorRefToken::GetRequestedArrayLength() const
formula::FormulaDlg::CheckMatrix()
formula::FormulaTokenArray::AddString(unsigned short const*)
-formula::SingleVectorRefToken::SingleVectorRefToken(double const*, unsigned
long)
+formula::SingleVectorRefToken::GetRequestedArrayLength() const
+formula::SingleVectorRefToken::SingleVectorRefToken(double const*, unsigned
long, unsigned long)
oglcanvas::CanvasHelper::flush() const
oglcanvas::TextLayout::draw(com::sun::star::rendering::ViewState const&,
com::sun::star::rendering::RenderState const&,
com::sun::star::uno::Reference
const&) const
oox::AttributeConversion::decodeDouble(rtl::OUString const&)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/DomainMapper.cxx | 10 +-
writerfilter/source/doctok/resources.xmi | 124 -
writerfilter/source/ooxml/model.xml|8 -
writerfilter/source/rtftok/rtfdocumentimpl.cxx |4
4 files changed, 11 insertions(+), 135 deletions(-)
New commits:
commit c3c6d7f886088b57869b6978309e7a39cba32bbb
Author: Miklos Vajna
Date: Sat Mar 1 10:45:08 2014 +0100
writerfilter: convert sprm:C{Shd,FBiDi,ComplexScript,Kcd}
Change-Id: Ia1dd99f0850d444fe9521fdcd0645e92bfc905a5
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index aa81f65..8aa8e64 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1307,9 +1307,9 @@ void DomainMapper::sprmWithProps( Sprm& rSprm,
PropertyMapPtr rContext, SprmType
rContext->Insert(PROP_CHAR_BACK_COLOR, uno::makeAny(
mnBackgroundColor ));
}
break;
-case NS_sprm::LN_CKcd:
+case NS_ooxml::LN_EG_RPrBase_em:
rContext->Insert(PROP_CHAR_EMPHASIS, uno::makeAny ( getEmphasisValue
(nIntValue)));
-break; // sprmCKcd
+break;
case NS_ooxml::LN_EG_RPrBase_emboss:
case NS_ooxml::LN_EG_RPrBase_b:
case NS_ooxml::LN_EG_RPrBase_bCs:
@@ -1590,9 +1590,9 @@ void DomainMapper::sprmWithProps( Sprm& rSprm,
PropertyMapPtr rContext, SprmType
else
rContext->Insert(PROP_CHAR_FLASH, uno::makeAny( false ));
break;
-case NS_sprm::LN_CFBiDi:
-break; // sprmCFBiDi
-case NS_sprm::LN_CShd:
+case NS_ooxml::LN_EG_RPrBase_rtl:
+break;
+case NS_ooxml::LN_EG_RPrBase_shd:
{
//contains fore color, back color and shadow percentage, results
in a brush
writerfilter::Reference::Pointer_t pProperties =
rSprm.getProps();
diff --git a/writerfilter/source/doctok/resources.xmi
b/writerfilter/source/doctok/resources.xmi
index 2a9e933..b80eb20 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -224,37 +224,6 @@
-
-
-
-
-
-
-
- 0x2A34
-
-
-
-
-
-
-
-
rtf:sprmCKcd
-
-
-
-
-
-
-
- character
-
-
-
-
-
-
-
@@ -472,68 +441,6 @@
-
-
-
-
-
-
-
- 0x882
-
-
-
-
-
-
-
-
rtf:sprmCComplexScript
-
-
-
-
-
-
-
- character
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0x085A
-
-
-
-
-
-
-
-
rtf:sprmCFBiDi
-
-
-
-
-
-
-
- character
-
-
-
-
-
-
-
@@ -565,37 +472,6 @@
-
-
-
-
-
-
-
- 0x4866
-
-
-
-
-
-
-
-
rtf:sprmCShd
-
-
-
-
-
-
-
- character
-
-
-
-
-
-
-
diff --git a/writerfilter/source/ooxml/model.xml
b/writerfilter/source/ooxml/model.xml
index 187820f..ab7215e 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -24385,12 +24385,12 @@
-
+
-
-
-
+
+
+
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index b70784a..9381cb1 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -3201,7 +3201,7 @@ int RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword,
int nParam)
case RTF_CHCBPAT:
{
RTFValue::P
[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-4-2-milestone-7'
Tag 'libreoffice-4-2-milestone-7' created by Markus Mohrhard at 2014-03-01 08:57 -0800 milestone 7 Changes since libreoffice-4-2-milestone-6: Wei Wei (1): GPU-Calc: remove Alloc_Host_Ptr for clmem of NAN vector --- sc/source/core/opencl/formulagroupcl.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
