[Libreoffice-commits] core.git: accessibility/source avmedia/source basctl/source basegfx/source
accessibility/source/extended/accessiblelistboxentry.cxx |5 ++---
avmedia/source/gstreamer/gstplayer.cxx |3 +--
basctl/source/basicide/basides1.cxx |2 +-
basctl/source/basicide/basobj2.cxx |3 ++-
basctl/source/basicide/bastype3.cxx |2 +-
basctl/source/basicide/moduldl2.cxx |2 +-
basctl/source/dlged/dlged.cxx|3 ++-
basegfx/source/polygon/b2dpolygonclipper.cxx |6 ++
basegfx/source/polygon/b3dpolygontools.cxx |2 +-
9 files changed, 13 insertions(+), 15 deletions(-)
New commits:
commit 3338f479182a5face7f143bdc4b9ea9067028887
Author: Michael Weghorn m.wegh...@posteo.de
Date: Sat Dec 6 01:07:11 2014 +0100
reduce scope of local variables
This eliminates some of the warnings from Cppcheck report of
2014-11-29.
Change-Id: Id5bf885de12a6de262d2cca9fa71627ac67f50d9
Reviewed-on: https://gerrit.libreoffice.org/13330
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com
diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx
b/accessibility/source/extended/accessiblelistboxentry.cxx
index fc296b4..a0aa0a7 100644
--- a/accessibility/source/extended/accessiblelistboxentry.cxx
+++ b/accessibility/source/extended/accessiblelistboxentry.cxx
@@ -460,12 +460,11 @@ namespace accessibility
sal_uInt16 iRealItemCount = 0;
sal_uInt16 iCount = 0;
sal_uInt16 iTotleItemCount = pEntry-ItemCount();
-SvLBoxItem* pItem;
while( iCount iTotleItemCount )
{
-pItem = pEntry-GetItem( iCount );
+const SvLBoxItem* pItem = pEntry-GetItem( iCount );
if ( pItem-GetType() == SV_ITEM_ID_LBOXSTRING
- !static_castSvLBoxString*( pItem )-GetText().isEmpty() )
+ !static_castconst SvLBoxString*( pItem
)-GetText().isEmpty() )
{
iRealItemCount++;
}
diff --git a/avmedia/source/gstreamer/gstplayer.cxx
b/avmedia/source/gstreamer/gstplayer.cxx
index cc44a4a..88e62cf 100644
--- a/avmedia/source/gstreamer/gstplayer.cxx
+++ b/avmedia/source/gstreamer/gstplayer.cxx
@@ -304,14 +304,13 @@ GstBusSyncReply Player::processSyncMessage( GstMessage
*message )
}
if( mnWidth == 0 ) {
GstPad *pad = NULL;
-GstCaps *caps;
g_signal_emit_by_name( mpPlaybin, get-video-pad, 0, pad );
if( pad ) {
int w = 0, h = 0;
-caps = gst_pad_get_current_caps( pad );
+GstCaps *caps = gst_pad_get_current_caps( pad );
if( gst_structure_get( gst_caps_get_structure( caps, 0 ),
width, G_TYPE_INT, w,
diff --git a/basctl/source/basicide/basides1.cxx
b/basctl/source/basicide/basides1.cxx
index d981296..e5d4da4 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -87,7 +87,6 @@ void Shell::ExecuteCurrent( SfxRequest rReq )
// memorize item because of the adjustments...
GetExtraData()-SetSearchItem(rSearchItem);
sal_Int32 nFound = 0;
-bool bCanceled = false;
if (rSearchItem.GetCommand() == SVX_SEARCHCMD_REPLACE_ALL)
{
sal_uInt16 nActModWindows = 0;
@@ -115,6 +114,7 @@ void Shell::ExecuteCurrent( SfxRequest rReq )
}
else
{
+bool bCanceled = false;
nFound = pCurWin-StartSearchAndReplace(rSearchItem);
if ( !nFound !rSearchItem.GetSelection() )
{
diff --git a/basctl/source/basicide/basobj2.cxx
b/basctl/source/basicide/basobj2.cxx
index 28a781c..9834875 100644
--- a/basctl/source/basicide/basobj2.cxx
+++ b/basctl/source/basicide/basobj2.cxx
@@ -240,7 +240,6 @@ OUString ChooseMacro( const uno::Reference frame::XModel
rxLimitToDocument,
GetExtraData()-ChoosingMacro() = true;
OUString aScriptURL;
-bool bError = false;
SbMethod* pMethod = NULL;
boost::scoped_ptr MacroChooser pChooser( new MacroChooser( NULL, true )
);
@@ -259,6 +258,8 @@ OUString ChooseMacro( const uno::Reference frame::XModel
rxLimitToDocument,
{
case Macro_OkRun:
{
+bool bError = false;
+
pMethod = pChooser-GetMacro();
if ( !pMethod pChooser-GetMode() == MacroChooser::Recording )
pMethod = pChooser-CreateMacro();
diff --git a/basctl/source/basicide/bastype3.cxx
b/basctl/source/basicide/bastype3.cxx
index 8cb3b2f..24122ea 100644
--- a/basctl/source/basicide/bastype3.cxx
+++ b/basctl/source/basicide/bastype3.cxx
@@ -190,9 +190,9 @@ SbxVariable* TreeListBox::FindVariable( SvTreeListEntry*
pEntry )
}
SbxVariable* pVar = 0;
-bool
[Libreoffice-commits] core.git: bridges/source
bridges/source/jni_uno/jni_info.h |9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 2ecec9d08cdb61494ca7d6b72e9342a3a01171f7
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Dec 8 09:16:43 2014 +0100
Mark classes as noncopyable
Change-Id: I4262fb56d681c70a089638b876dc07b1f472f583
diff --git a/bridges/source/jni_uno/jni_info.h
b/bridges/source/jni_uno/jni_info.h
index 2f10191..e030602 100644
--- a/bridges/source/jni_uno/jni_info.h
+++ b/bridges/source/jni_uno/jni_info.h
@@ -20,6 +20,9 @@
#ifndef INCLUDED_BRIDGES_SOURCE_JNI_UNO_JNI_INFO_H
#define INCLUDED_BRIDGES_SOURCE_JNI_UNO_JNI_INFO_H
+#include sal/config.h
+
+#include boost/noncopyable.hpp
#include boost/unordered_map.hpp
#include jni_base.h
@@ -58,7 +61,7 @@ inline bool is_XInterface( typelib_TypeDescriptionReference *
type )
OUString::unacquired( type-pTypeName ) ==
com.sun.star.uno.XInterface);
}
-struct JNI_type_info
+struct JNI_type_info: private boost::noncopyable
{
::com::sun::star::uno::TypeDescription m_td;
jclass m_class;
@@ -103,7 +106,7 @@ private:
virtual ~JNI_compound_type_info() {}
};
-struct JNI_type_info_holder
+struct JNI_type_info_holder: private boost::noncopyable
{
JNI_type_info * m_info;
inline JNI_type_info_holder()
@@ -114,7 +117,7 @@ struct JNI_type_info_holder
typedef ::boost::unordered_map
OUString, JNI_type_info_holder, OUStringHash t_str2type;
-class JNI_info
+class JNI_info: private boost::noncopyable
{
mutable ::osl::Mutexm_mutex;
mutable t_str2type m_type_map;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - editeng/source include/editeng sw/qa sw/source writerfilter/source
editeng/source/items/textitem.cxx |8
include/editeng/wghtitem.hxx |2 ++
sw/qa/extras/rtfimport/data/fdo86750.rtf |4
sw/qa/extras/rtfimport/rtfimport.cxx |6 ++
sw/source/core/docnode/nodedump.cxx |9 ++---
writerfilter/source/dmapper/DomainMapper_Impl.cxx |9 +
6 files changed, 35 insertions(+), 3 deletions(-)
New commits:
commit 4517c94000153eab6c034ea548698953dd93f794
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Mon Dec 8 09:16:22 2014 +0100
fdo#86750 RTF import: fix table of contents links
Change-Id: I0f3d35a0e64c9ce5646fa63eda317bee42de5540
diff --git a/sw/qa/extras/rtfimport/data/fdo86750.rtf
b/sw/qa/extras/rtfimport/data/fdo86750.rtf
new file mode 100644
index 000..29f0b84
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo86750.rtf
@@ -0,0 +1,4 @@
+{\rtf1
+{\field{\*\fldinst { HYPERLINK \\l anchor }}{\fldrslt click}}\par
+{\*\bkmkstart anchor}target{\*\bkmkend anchor}\par
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index e0b5100..0829057 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -2213,6 +2213,12 @@ DECLARE_RTFIMPORT_TEST(testFdo72031, fdo72031.rtf)
CPPUNIT_ASSERT_EQUAL(aExpected, getRun(getParagraph(1), 1)-getString());
}
+DECLARE_RTFIMPORT_TEST(testFdo86750, fdo86750.rtf)
+{
+// This was 'HYPERLINK#anchor', the URL of the hyperlink had the field
type as a prefix, leading to broken links.
+CPPUNIT_ASSERT_EQUAL(OUString(#anchor),
getPropertyOUString(getRun(getParagraph(1), 1), HyperLinkURL));
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index ac7af0d..7176485 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -3656,6 +3656,15 @@ void DomainMapper_Impl::CloseFieldCommand()
case FIELD_HYPERLINK:
{
::std::vectorOUString aParts =
pContext-GetCommandParts();
+
+// Syntax is either:
+// HYPERLINK \l link
+// or
+// HYPERLINK \l link
+// Make sure HYPERLINK doesn't end up as part of
link in the second case.
+if (!aParts.empty() aParts[0] == HYPERLINK)
+aParts.erase(aParts.begin());
+
::std::vectorOUString::const_iterator aItEnd =
aParts.end();
::std::vectorOUString::const_iterator aPartIt =
aParts.begin();
commit 193c7ba9be48f00b46f9e789f233db577e7b3303
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Mon Dec 8 09:15:41 2014 +0100
Factor out SvxWeightItem::dumpAsXml() from sw
Change-Id: I97ccc04190b1f75c54e725e0612724a2ef62fe3e
diff --git a/editeng/source/items/textitem.cxx
b/editeng/source/items/textitem.cxx
index 5ccc7c7..6ccbf9b 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -722,6 +722,14 @@ bool SvxWeightItem::PutValue( const uno::Any rVal,
sal_uInt8 nMemberId )
return true;
}
+void SvxWeightItem::dumpAsXml(xmlTextWriterPtr pWriter) const
+{
+xmlTextWriterStartElement(pWriter, BAD_CAST(svxWeightItem));
+xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST(whichId), %d,
Which());
+xmlTextWriterWriteAttribute(pWriter, BAD_CAST(presentation),
BAD_CAST(GetValueTextByPos(GetValue()).toUtf8().getStr()));
+xmlTextWriterEndElement(pWriter);
+}
+
// class SvxFontHeightItem ---
SvxFontHeightItem::SvxFontHeightItem( const sal_uLong nSz,
diff --git a/include/editeng/wghtitem.hxx b/include/editeng/wghtitem.hxx
index 7ecca57..4f0c795 100644
--- a/include/editeng/wghtitem.hxx
+++ b/include/editeng/wghtitem.hxx
@@ -69,6 +69,8 @@ public:
{ return (FontWeight)GetValue(); }
voidSetWeight( FontWeight eNew )
{ SetValue( (sal_uInt16)eNew ); }
+
+void dumpAsXml(struct _xmlTextWriter* pWriter) const;
};
#endif // INCLUDED_EDITENG_WGHTITEM_HXX
diff --git a/sw/source/core/docnode/nodedump.cxx
b/sw/source/core/docnode/nodedump.cxx
index f0be0e2..ab35ecb 100644
--- a/sw/source/core/docnode/nodedump.cxx
+++ b/sw/source/core/docnode/nodedump.cxx
@@ -46,6 +46,7 @@
#include editeng/editobj.hxx
#include editeng/outlobj.hxx
#include editeng/postitem.hxx
+#include editeng/wghtitem.hxx
#include svx/xdef.hxx
#include svx/svdpage.hxx
#include svx/svdmodel.hxx
@@ -395,6 +396,11 @@ void lcl_dumpSfxItemSet(WriterHelper writer, const
SfxItemSet* pSet)
case RES_CHRATR_CTL_POSTURE:
[Bug 64945] inconvenient localized symbol code
https://bugs.freedesktop.org/show_bug.cgi?id=64945 tommy27 ba...@quipo.it changed: What|Removed |Added CC||ba...@quipo.it --- Comment #19 from tommy27 ba...@quipo.it --- I don't have a French LibO version to test. however I see that in LO 4.3.4.1 (italian version) and 4.5.0.0alpha (english version) the %OMEGA works fine if I want to type Ω. please French users, give an update of this bug status with recent LO versions. if bug is still there, please move if to mab4.3 list (Bug 75025) since 4.2.x is END OF LIFE -- 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 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on|55018 | -- 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 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on||55018 -- 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 64945] inconvenient localized symbol code
https://bugs.freedesktop.org/show_bug.cgi?id=64945 --- Comment #20 from Frederic Parrenin parrenin@gmail.com --- This bug is still present on a french version of LO 4.3.4.1 (tested on debian 7). -- 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 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on||57215 -- 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 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on|57215 | -- 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 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on|59886 | -- 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 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on||59886 -- 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: clew/Library_clew.mk clew/Makefile clew/Module_clew.mk clew/source configure.ac cui/Library_cui.mk download.lst external/clcc external/Module_external.mk include/clew i
Makefile.fetch |1 Repository.mk |2 RepositoryExternal.mk | 11 RepositoryModule_host.mk |1 clew/Library_clew.mk | 35 clew/Makefile |7 clew/Module_clew.mk| 16 clew/source/clew.c | 326 configure.ac | 19 cui/Library_cui.mk |4 download.lst |2 external/Module_external.mk|1 external/clcc/Library_clew.mk | 35 external/clcc/Makefile |7 external/clcc/Module_clcc.mk | 17 external/clcc/UnpackedTarball_clcc.mk | 25 external/clcc/clew-non-static.patch| 52 - include/clew/clew.h| 1320 + include/opencl/openclwrapper.hxx |2 include/opencl/platforminfo.hxx|2 opencl/Library_opencl.mk |2 opencl/inc/opencl_device_selection.h |3 sc/CppunitTest_sc_opencl_test.mk |2 sc/CppunitTest_sc_ucalc.mk |3 sc/Library_sc.mk |3 sc/Library_scui.mk |3 sc/Module_sc.mk|2 sc/source/core/opencl/opbase.hxx |2 sc/source/ui/optdlg/calcoptionsdlg.hxx |2 sc/workben/opencl/platform_detect.cxx |2 30 files changed, 1726 insertions(+), 183 deletions(-) New commits: commit bf6544c0ab0625e5ce5918f6d861763d4fa87aba Author: Tor Lillqvist t...@collabora.com Date: Mon Dec 8 09:29:28 2014 +0200 Don't treat clew as part of an external clcc module There is no obvious authoritative upstream for clew anyway, so it causes philosophical problems for distros. For a while, we used to use a zip archive from the clcc project on SourceForge that included clew.c and clew.h. (Before that we also just had clew.c and clew.h in our source repo.) So, drop the external/clcc module and have clew.c and clew.h in the source repo again. But this time clew is in a module of its own, not in sc. This re-introduces No need to have OpenCL optional at configure-time This reverts commit 764836cb00e8e6dfd2ab48e080a166ec90359e01. Change-Id: I413142f4f9f8399489f9c3e5327132822f07a454 Reviewed-on: https://gerrit.libreoffice.org/13368 Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com diff --git a/Makefile.fetch b/Makefile.fetch index 84e5f80..7aee66a 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -115,7 +115,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) $(call fetch_Optional,CAIRO,CAIRO_TARBALL) \ $(call fetch_Optional,CAIRO,PIXMAN_TARBALL) \ $(call fetch_Optional,CDR,CDR_TARBALL) \ - $(call fetch_Optional,CLCC,CLCC_TARBALL) \ $(call fetch_Optional,CLUCENE,CLUCENE_TARBALL) \ $(call fetch_Optional,CMIS,CMIS_TARBALL) \ $(call fetch_Optional,COINMP,COINMP_TARBALL) \ diff --git a/Repository.mk b/Repository.mk index 2b9a179..b851dfd 100644 --- a/Repository.mk +++ b/Repository.mk @@ -316,7 +316,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ chartcore \ chartcontroller \ chartopengl \ - $(call gb_Helper_optional,CLCC,clew) \ + $(call gb_Helper_optional,OPENCL,clew) \ $(if $(filter $(OS),WNT),,cmdmail) \ cppcanvas \ configmgr \ diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index c8f093e..b32b06d 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -279,17 +279,6 @@ endef endif # SYSTEM_GLEW -define gb_LinkTarget__use_clew -$(call gb_LinkTarget_set_include,$(1),\ - -I$(call gb_UnpackedTarball_get_dir,clcc)/src \ - $$(INCLUDE) \ -) -$(call gb_LinkTarget_use_libraries,$(1),\ - clew \ -) - -endef - define gb_LinkTarget__use_iconv $(call gb_LinkTarget_add_libs,$(1),-liconv) diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index 4ad30ff..a3567c4 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -26,6 +26,7 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ bridges \ canvas \ chart2 \ + $(call gb_Helper_optional,OPENCL,clew) \ cli_ure \ $(call gb_Helper_optional,DESKTOP,codemaker) \ comphelper \ diff --git a/external/clcc/Library_clew.mk b/clew/Library_clew.mk similarity index 88% rename from external/clcc/Library_clew.mk rename to clew/Library_clew.mk index 8841ab9..2e1ed6f 100644 --- a/external/clcc/Library_clew.mk +++ b/clew/Library_clew.mk @@ -28,8 +28,8 @@ $(eval $(call gb_Library_add_libs,clew,\ )) endif -$(eval $(call gb_Library_add_generated_cobjects,clew,\ -
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on|60533 | -- 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 'libreoffice-4-3' - xmloff/source
xmloff/source/draw/shapeexport.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit e5b5d928f5cae0f0d0c833d425ee07e5f5c66ef8 Author: Markus Mohrhard markus.mohrh...@collabora.co.uk Date: Sat Dec 6 08:21:50 2014 +0100 the xlink:type attribute is mandatory, related fdo#79449 Change-Id: I03c4217f786bc10aa915780dc10ea52d94019b6e Reviewed-on: https://gerrit.libreoffice.org/13356 Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index ec8adfa..23da8ec 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -1743,6 +1743,7 @@ void XMLShapeExport::ImpExportEvents( const uno::Reference drawing::XShape x XML_NAMESPACE_DOM, OUString( click ) ) ); mrExport.AddAttribute( XML_NAMESPACE_SCRIPT, XML_EVENT_NAME, aEventQName ); mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, aStrMacro ); +mrExport.AddAttribute( XML_NAMESPACE_XLINK, XML_TYPE, simple ); SvXMLElementExport aEventElemt(mrExport, XML_NAMESPACE_SCRIPT, XML_EVENT_LISTENER, true, true); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libvisio.git: src/lib
src/lib/VSDMetaData.cpp |1 +
src/lib/VSDPages.cpp |2 +-
src/lib/VSDXMetaData.cpp |1 +
3 files changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 109540e113867fd140838e5be79ca0e41c13d85c
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Mon Dec 8 10:13:30 2014 +0100
Some Werror stuff fixing
Change-Id: I6fbcf7168480590c1922e6f4ccd180e1605086dd
diff --git a/src/lib/VSDMetaData.cpp b/src/lib/VSDMetaData.cpp
index 61f01a9..616bdcc 100644
--- a/src/lib/VSDMetaData.cpp
+++ b/src/lib/VSDMetaData.cpp
@@ -13,6 +13,7 @@
#include ctime
libvisio::VSDMetaData::VSDMetaData()
+ : m_idsAndOffsets(), m_typedPropertyValues(), m_metaData()
{
}
diff --git a/src/lib/VSDPages.cpp b/src/lib/VSDPages.cpp
index 544123b..08c4073 100644
--- a/src/lib/VSDPages.cpp
+++ b/src/lib/VSDPages.cpp
@@ -54,7 +54,7 @@ void libvisio::VSDPage::draw(librevenge::RVNGDrawingInterface
*painter) const
}
libvisio::VSDPages::VSDPages()
- : m_pages(), m_backgroundPages()
+ : m_pages(), m_backgroundPages(), m_metaData()
{
}
diff --git a/src/lib/VSDXMetaData.cpp b/src/lib/VSDXMetaData.cpp
index 19c9709..fafa998 100644
--- a/src/lib/VSDXMetaData.cpp
+++ b/src/lib/VSDXMetaData.cpp
@@ -12,6 +12,7 @@
#include libvisio_utils.h
libvisio::VSDXMetaData::VSDXMetaData()
+ : m_metaData()
{
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on||62073 -- 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 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on|62073 | -- 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 'libreoffice-4-3' - include/xmloff sc/source xmloff/source
include/xmloff/xmltoken.hxx |1 -
sc/source/filter/xml/XMLExportDataPilot.cxx |2 --
xmloff/source/core/xmltoken.cxx |1 -
3 files changed, 4 deletions(-)
New commits:
commit addb0bb5bb197808146811a024f6b79ce5cb57d3
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Sun Dec 7 00:41:44 2014 +0100
remove invalid attribute that is not read anyway
Change-Id: Id7770ffda49ba7bc0ebc780c67c56b81152213f7
Reviewed-on: https://gerrit.libreoffice.org/13357
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index e03dcfd..549446c 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -2617,7 +2617,6 @@ namespace xmloff { namespace token {
XML_DATE_START,
XML_DATE_END,
XML_STEP,
-XML_IS_GROUP_FIELD,
XML_DATA_PILOT_GROUPS,
XML_DATA_PILOT_GROUP,
diff --git a/sc/source/filter/xml/XMLExportDataPilot.cxx
b/sc/source/filter/xml/XMLExportDataPilot.cxx
index cd711d4..4b9c913 100644
--- a/sc/source/filter/xml/XMLExportDataPilot.cxx
+++ b/sc/source/filter/xml/XMLExportDataPilot.cxx
@@ -599,7 +599,6 @@ void ScXMLExportDataPilot::WriteGroupDimAttributes(const
ScDPSaveGroupDimension*
if (pGroupDim)
{
OUString aSrcFieldName =
ScDPUtil::getSourceDimensionName(pGroupDim-GetSourceDimName());
-rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_IS_GROUP_FIELD,
XML_TRUE);
rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_SOURCE_FIELD_NAME,
aSrcFieldName);
if (pGroupDim-GetDatePart())
{
@@ -613,7 +612,6 @@ void ScXMLExportDataPilot::WriteNumGroupDim(const
ScDPSaveNumGroupDimension* pNu
{
if (pNumGroupDim)
{
-rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_IS_GROUP_FIELD,
XML_TRUE);
if (pNumGroupDim-GetDatePart())
{
WriteDatePart(pNumGroupDim-GetDatePart());
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index 6c4c098..5833f04 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -2622,7 +2622,6 @@ namespace xmloff { namespace token {
TOKEN( date-start, XML_DATE_START ),
TOKEN( date-end, XML_DATE_END ),
TOKEN( step, XML_STEP ),
-TOKEN( is-group-field, XML_IS_GROUP_FIELD ),
TOKEN( data-pilot-groups,XML_DATA_PILOT_GROUPS ),
TOKEN( data-pilot-group, XML_DATA_PILOT_GROUP ),
TOKEN( japanese-candle-stick,XML_JAPANESE_CANDLE_STICK ),
___
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 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on|67712 | -- 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 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on||67712 -- 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
Re: [Libreoffice-commits] core.git: 2 commits - desktop/source reportdesign/source
Hi Michael, On Fri, Dec 05, 2014 at 02:12:17PM -0800, Michael Stahl mst...@redhat.com wrote: commit dce74be2bab7a6924578e8f6f6ce37aa593cc481 Author: Michael Stahl mst...@redhat.com Date: Fri Dec 5 20:57:20 2014 +0100 desktop: avoid starting with new writer doc if OOO_DISABLE_RECOVERY set Better to show the start center, same as when --norestore is given. A side-effect of this is the following scenario: 1) Start Writer, type something, save it as test.odt 2) Exit from LO by pressing ^C on the console 3) Start './soffice', test.odt is opened automatically Is that intended? ;-) Regards, Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: codemaker/source
codemaker/source/cppumaker/cpputype.cxx | 12
1 file changed, 4 insertions(+), 8 deletions(-)
New commits:
commit 9d5e53b67c7c131ab4cdc8e103373be2be7830c2
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Dec 8 10:34:21 2014 +0100
protected - private
Change-Id: I807b31eaa0b0cd68e0ca018b6df4269c1aab5763
diff --git a/codemaker/source/cppumaker/cpputype.cxx
b/codemaker/source/cppumaker/cpputype.cxx
index ccd908d..5c015c9 100644
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -1039,17 +1039,13 @@ public:
void dumpAttributesCppuDecl(FileStream out, std::set OUString * seen);
void dumpMethodsCppuDecl(FileStream out, std::set OUString * seen);
-protected:
+private:
virtual void addComprehensiveGetCppuTypeIncludes(
codemaker::cppumaker::Includes includes) const SAL_OVERRIDE;
virtual sal_uInt32 checkInheritedMemberCount() const SAL_OVERRIDE
{ return BaseOffset(m_typeMgr, entity_).get(); }
-sal_uInt32 m_inheritedMemberCount;
-boolm_isDeprecated;
-
-private:
void dumpExceptionSpecification(
FileStream out, std::vector OUString const exceptions,
bool runtimeException);
@@ -1063,16 +1059,16 @@ private:
std::vector OUString const exceptions, bool runtimeException);
rtl::Reference unoidl::InterfaceTypeEntity entity_;
+bool m_isDeprecated;
};
InterfaceType::InterfaceType(
rtl::Reference unoidl::InterfaceTypeEntity const entity,
OUString const name, rtl::Reference TypeManager const typeMgr):
-CppuType(name, typeMgr), entity_(entity)
+CppuType(name, typeMgr), entity_(entity),
+m_isDeprecated(isDeprecated(entity-getAnnotations()))
{
assert(entity.is());
-m_inheritedMemberCount = 0;
-m_isDeprecated = isDeprecated(entity-getAnnotations());
}
void InterfaceType::dumpDeclaration(FileStream out) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on||72072 -- 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 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on|72072 | -- 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 'libreoffice-4-4' - sw/qa writerfilter/source
sw/qa/extras/rtfimport/data/fdo86750.rtf |4
sw/qa/extras/rtfimport/rtfimport.cxx |6 ++
writerfilter/source/dmapper/DomainMapper_Impl.cxx |9 +
3 files changed, 19 insertions(+)
New commits:
commit 7b16cf0f554680adadef19dfdf82c52243313e03
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Mon Dec 8 09:16:22 2014 +0100
fdo#86750 RTF import: fix table of contents links
Change-Id: I0f3d35a0e64c9ce5646fa63eda317bee42de5540
(cherry picked from commit 4517c94000153eab6c034ea548698953dd93f794)
diff --git a/sw/qa/extras/rtfimport/data/fdo86750.rtf
b/sw/qa/extras/rtfimport/data/fdo86750.rtf
new file mode 100644
index 000..29f0b84
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo86750.rtf
@@ -0,0 +1,4 @@
+{\rtf1
+{\field{\*\fldinst { HYPERLINK \\l anchor }}{\fldrslt click}}\par
+{\*\bkmkstart anchor}target{\*\bkmkend anchor}\par
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 0e916d3..1edf58c 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -2212,6 +2212,12 @@ DECLARE_RTFIMPORT_TEST(testFdo72031, fdo72031.rtf)
CPPUNIT_ASSERT_EQUAL(aExpected, getRun(getParagraph(1), 1)-getString());
}
+DECLARE_RTFIMPORT_TEST(testFdo86750, fdo86750.rtf)
+{
+// This was 'HYPERLINK#anchor', the URL of the hyperlink had the field
type as a prefix, leading to broken links.
+CPPUNIT_ASSERT_EQUAL(OUString(#anchor),
getPropertyOUString(getRun(getParagraph(1), 1), HyperLinkURL));
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index b4fa15b..20bd4ce 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -3645,6 +3645,15 @@ void DomainMapper_Impl::CloseFieldCommand()
case FIELD_HYPERLINK:
{
::std::vectorOUString aParts =
pContext-GetCommandParts();
+
+// Syntax is either:
+// HYPERLINK \l link
+// or
+// HYPERLINK \l link
+// Make sure HYPERLINK doesn't end up as part of
link in the second case.
+if (!aParts.empty() aParts[0] == HYPERLINK)
+aParts.erase(aParts.begin());
+
::std::vectorOUString::const_iterator aItEnd =
aParts.end();
::std::vectorOUString::const_iterator aPartIt =
aParts.begin();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - filter/source
filter/source/xsltdialog/xmlfiltersettingsdialog.cxx |7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 40d11c282cae31bd82e87fd0a0ea54c162e7e53c
Author: Caolán McNamara caol...@redhat.com
Date: Mon Dec 8 09:50:52 2014 +
Related: rhbz#1164614 better default size for no xslt entries case
Change-Id: I75dd1210b4e8e5e7cb2c2ce1e83e085a9c480b91
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index fc0da39..7c32e25 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -1390,7 +1390,12 @@ void SvxPathControl::Resize()
Size SvxPathControl::GetOptimalSize() const
{
-return m_pVBox-GetOptimalSize();
+Size aDefSize(LogicToPixel(Size(150, 0), MapMode(MAP_APPFONT)));
+Size aOptSize(m_pVBox-GetOptimalSize());
+long nRowHeight(GetTextHeight());
+aOptSize.Height() = nRowHeight * 10;
+aOptSize.Width() = std::max(aDefSize.Width(), aOptSize.Width());
+return aOptSize;
}
SvxPathControl::~SvxPathControl()
___
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 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on|72075 | -- 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 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on||72075 -- 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: 2 commits - connectivity/source filter/source include/connectivity include/sfx2 jvmfwk/source sfx2/source sw/inc unusedcode.easy
connectivity/source/commontools/predicateinput.cxx | 50 ---
filter/source/xsltdialog/xmlfiltersettingsdialog.cxx |7 +
include/connectivity/predicateinput.hxx |5 -
include/sfx2/lnkbase.hxx |3
jvmfwk/source/fwkutil.cxx| 12 --
jvmfwk/source/fwkutil.hxx|4
sfx2/source/appl/lnkbase2.cxx| 85 +--
sw/inc/swbaslnk.hxx |7 -
unusedcode.easy |3
9 files changed, 52 insertions(+), 124 deletions(-)
New commits:
commit cca2e7be89a29bd06a65ea85f2feca3783e62d6a
Author: Caolán McNamara caol...@redhat.com
Date: Mon Dec 8 09:50:52 2014 +
Related: rhbz#1164614 better default size for no xslt entries case
Change-Id: I75dd1210b4e8e5e7cb2c2ce1e83e085a9c480b91
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index 02143c4..c021300 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -1390,7 +1390,12 @@ void SvxPathControl::Resize()
Size SvxPathControl::GetOptimalSize() const
{
-return m_pVBox-GetOptimalSize();
+Size aDefSize(LogicToPixel(Size(150, 0), MapMode(MAP_APPFONT)));
+Size aOptSize(m_pVBox-GetOptimalSize());
+long nRowHeight(GetTextHeight());
+aOptSize.Height() = nRowHeight * 10;
+aOptSize.Width() = std::max(aDefSize.Width(), aOptSize.Width());
+return aOptSize;
}
SvxPathControl::~SvxPathControl()
commit 6d8b06224cf1819c8af543927d7a80e937c50a94
Author: Caolán McNamara caol...@redhat.com
Date: Mon Dec 8 09:16:06 2014 +
callcatcher: update unused code
Change-Id: I3cd65d112339fa9c67ed462fe39acbbef91d4d8d
diff --git a/connectivity/source/commontools/predicateinput.cxx
b/connectivity/source/commontools/predicateinput.cxx
index 94a4d3d..bbb0863 100644
--- a/connectivity/source/commontools/predicateinput.cxx
+++ b/connectivity/source/commontools/predicateinput.cxx
@@ -387,56 +387,6 @@ namespace dbtools
return Any();
}
-Any OPredicateInputController::getPredicateValue(
-const OUString _sField, const OUString _rPredicateValue, OUString*
_pErrorMessage ) const
-{
-OUString sError;
-OUString sField = _sField;
-sal_Int32 nIndex = 0;
-sField = sField.getToken(0,'(',nIndex);
-if(nIndex == -1)
-sField = _sField;
-sal_Int32 nType =
::connectivity::OSQLParser::getFunctionReturnType(sField,m_aParser.getContext());
-if ( nType == DataType::OTHER || sField.isEmpty() )
-{
-// first try the international version
-OUString sSql = SELECT * FROM x WHERE + sField +
_rPredicateValue;
-boost::scoped_ptrOSQLParseNode pParseNode( const_cast
OSQLParser ( m_aParser ).parseTree( sError, sSql, true ) );
-nType = DataType::DOUBLE;
-if ( pParseNode.get() )
-{
-OSQLParseNode* pColumnRef =
pParseNode-getByRule(OSQLParseNode::column_ref);
-if ( pColumnRef )
-{
-}
-}
-}
-
-ReferenceXDatabaseMetaData xMeta = m_xConnection-getMetaData();
-parse::OParseColumn* pColumn = new parse::OParseColumn( sField,
-OUString(),
-OUString(),
-OUString(),
-
ColumnValue::NULLABLE_UNKNOWN,
-0,
-0,
-nType,
-false,
-false,
-xMeta.is()
xMeta-supportsMixedCaseQuotedIdentifiers(),
-OUString(),
-OUString(),
-OUString());
-ReferenceXPropertySet xColumn = pColumn;
-pColumn-setFunction(true);
-pColumn-setRealName(sField);
-
-OSQLParseNode* pParseNode = implPredicateTree( sError,
_rPredicateValue, xColumn );
-if ( _pErrorMessage )
-*_pErrorMessage = sError;
-return pParseNode ? implParseNode(pParseNode, false) : Any();
-}
-
Any OPredicateInputController::implParseNode(OSQLParseNode* pParseNode,
bool _bForStatementUse) const
{
if (
[Libreoffice-commits] core.git: dbaccess/source include/registry jurt/com xmlsecurity/source
dbaccess/source/core/api/RowSetBase.hxx |2 +-
include/registry/reflwrit.hxx |2 +-
jurt/com/sun/star/lib/util/AsynchronousFinalizer.java |2 +-
xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx |4
++--
xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx |2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 147ff66242451309951ceb40f463b17dcf82a1b2
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Dec 8 11:11:30 2014 +0100
Typo mehtod - method
Change-Id: I49f3f59c76bd4dd078f7014b6a0450241214db7f
diff --git a/dbaccess/source/core/api/RowSetBase.hxx
b/dbaccess/source/core/api/RowSetBase.hxx
index 4509d6e..00bb7cd 100644
--- a/dbaccess/source/core/api/RowSetBase.hxx
+++ b/dbaccess/source/core/api/RowSetBase.hxx
@@ -195,7 +195,7 @@ namespace dbaccess
@param _aCheckFunctor
Return TRUE/ when we already stand on the row we want to.
@param _aMovementFunctor
-The mehtod used to move.
+The method used to move.
@return
TRUE/ if movement was successful.
*/
diff --git a/include/registry/reflwrit.hxx b/include/registry/reflwrit.hxx
index fa866fe..f97574d 100644
--- a/include/registry/reflwrit.hxx
+++ b/include/registry/reflwrit.hxx
@@ -183,7 +183,7 @@ public:
const rtl::OUString name,
RTParamModemode);
-/** sets the data for the specified exception of a mehtod.
+/** sets the data for the specified exception of a method.
@param index indicates the index of the method.
@param excIndex specifies the index of the exception.
diff --git a/jurt/com/sun/star/lib/util/AsynchronousFinalizer.java
b/jurt/com/sun/star/lib/util/AsynchronousFinalizer.java
index 2c884c8..4dcd69a 100644
--- a/jurt/com/sun/star/lib/util/AsynchronousFinalizer.java
+++ b/jurt/com/sun/star/lib/util/AsynchronousFinalizer.java
@@ -32,7 +32,7 @@ import java.util.LinkedList;
* in both cases finalizers lead to synchronous UNO release calls)./p
*
* pIf JVMs are getting more mature and should no longer have problems with
- * long-running finalize mehtods, this class could be removed again./p
+ * long-running finalize methods, this class could be removed again./p
*/
public final class AsynchronousFinalizer {
/**
diff --git
a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx
b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx
index 84d35b6..b0d74d5 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx
@@ -156,7 +156,7 @@ class SecurityEnvironment_MSCryptImpl : public
::cppu::WeakImplHelper3
static const ::com::sun::star::uno::Sequence sal_Int8
getUnoTunnelId() ;
static SecurityEnvironment_MSCryptImpl* getImplementation( const
::com::sun::star::uno::Reference ::com::sun::star::uno::XInterface xObj ) ;
-//Native mehtods
+//Native methods
virtual HCRYPTPROV getCryptoProvider() throw(
::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ;
virtual void setCryptoProvider( HCRYPTPROV aProv ) throw(
::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ;
@@ -184,7 +184,7 @@ class SecurityEnvironment_MSCryptImpl : public
::cppu::WeakImplHelper3
virtual void enableDefaultCrypt( sal_Bool enable ) throw(
::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ;
virtual sal_Bool defaultEnabled() throw(
::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ;
-//Native mehtods
+//Native methods
virtual xmlSecKeysMngrPtr createKeysManager() throw(
::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ;
virtual void destroyKeysManager(xmlSecKeysMngrPtr pKeysMngr) throw(
::com::sun::star::uno::Exception , ::com::sun::star::uno::RuntimeException ) ;
diff --git a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx
b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx
index 03c64f8..d85cfbd 100644
--- a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx
+++ b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx
@@ -105,7 +105,7 @@ class XMLSecurityContext_NssImpl : public
::cppu::WeakImplHelper2
static const ::com::sun::star::uno::Sequence sal_Int8
getUnoTunnelId() ;
static XMLSecurityContext_NssImpl* getImplementation( const
::com::sun::star::uno::Reference ::com::sun::star::uno::XInterface xObj ) ;
-//Native mehtods
+//Native methods
virtual xmlSecKeysMngrPtr keysManager() throw(
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - clew/Library_clew.mk clew/Makefile clew/Module_clew.mk clew/source configure.ac cui/Library_cui.mk download.lst external/clcc external/Module
Makefile.fetch |1 Repository.mk |2 RepositoryExternal.mk | 11 RepositoryModule_host.mk |1 clew/Library_clew.mk | 35 clew/Makefile |7 clew/Module_clew.mk| 16 clew/source/clew.c | 326 configure.ac | 19 cui/Library_cui.mk |4 download.lst |2 external/Module_external.mk|1 external/clcc/Library_clew.mk | 35 external/clcc/Makefile |7 external/clcc/Module_clcc.mk | 17 external/clcc/UnpackedTarball_clcc.mk | 25 external/clcc/clew-non-static.patch| 52 - include/clew/clew.h| 1320 + include/opencl/openclwrapper.hxx |2 include/opencl/platforminfo.hxx|2 opencl/Library_opencl.mk |2 opencl/inc/opencl_device_selection.h |3 sc/CppunitTest_sc_opencl_test.mk |2 sc/CppunitTest_sc_ucalc.mk |3 sc/Library_sc.mk |3 sc/Library_scui.mk |3 sc/Module_sc.mk|2 sc/source/core/opencl/opbase.hxx |2 sc/source/ui/optdlg/calcoptionsdlg.hxx |2 sc/workben/opencl/platform_detect.cxx |2 30 files changed, 1726 insertions(+), 183 deletions(-) New commits: commit e22526a1852a8986afe8926ac538ea2cb4f2a240 Author: Tor Lillqvist t...@collabora.com Date: Mon Dec 8 09:29:28 2014 +0200 Don't treat clew as part of an external clcc module There is no obvious authoritative upstream for clew anyway, so it causes philosophical problems for distros. For a while, we used to use a zip archive from the clcc project on SourceForge that included clew.c and clew.h. (Before that we also just had clew.c and clew.h in our source repo.) So, drop the external/clcc module and have clew.c and clew.h in the source repo again. But this time clew is in a module of its own, not in sc. This re-introduces No need to have OpenCL optional at configure-time This reverts commit 764836cb00e8e6dfd2ab48e080a166ec90359e01. Change-Id: I413142f4f9f8399489f9c3e5327132822f07a454 Reviewed-on: https://gerrit.libreoffice.org/13368 Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com diff --git a/Makefile.fetch b/Makefile.fetch index 84e5f80..7aee66a 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -115,7 +115,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) $(call fetch_Optional,CAIRO,CAIRO_TARBALL) \ $(call fetch_Optional,CAIRO,PIXMAN_TARBALL) \ $(call fetch_Optional,CDR,CDR_TARBALL) \ - $(call fetch_Optional,CLCC,CLCC_TARBALL) \ $(call fetch_Optional,CLUCENE,CLUCENE_TARBALL) \ $(call fetch_Optional,CMIS,CMIS_TARBALL) \ $(call fetch_Optional,COINMP,COINMP_TARBALL) \ diff --git a/Repository.mk b/Repository.mk index 41650b1..58359d7 100644 --- a/Repository.mk +++ b/Repository.mk @@ -316,7 +316,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ chartcore \ chartcontroller \ chartopengl \ - $(call gb_Helper_optional,CLCC,clew) \ + $(call gb_Helper_optional,OPENCL,clew) \ $(if $(filter $(OS),WNT),,cmdmail) \ cppcanvas \ configmgr \ diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index fb3a1a4..47f6e90 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -279,17 +279,6 @@ endef endif # SYSTEM_GLEW -define gb_LinkTarget__use_clew -$(call gb_LinkTarget_set_include,$(1),\ - -I$(call gb_UnpackedTarball_get_dir,clcc)/src \ - $$(INCLUDE) \ -) -$(call gb_LinkTarget_use_libraries,$(1),\ - clew \ -) - -endef - define gb_LinkTarget__use_iconv $(call gb_LinkTarget_add_libs,$(1),-liconv) diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index 4ad30ff..a3567c4 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -26,6 +26,7 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ bridges \ canvas \ chart2 \ + $(call gb_Helper_optional,OPENCL,clew) \ cli_ure \ $(call gb_Helper_optional,DESKTOP,codemaker) \ comphelper \ diff --git a/external/clcc/Library_clew.mk b/clew/Library_clew.mk similarity index 88% rename from external/clcc/Library_clew.mk rename to clew/Library_clew.mk index 8841ab9..2e1ed6f 100644 --- a/external/clcc/Library_clew.mk +++ b/clew/Library_clew.mk @@ -28,8 +28,8 @@ $(eval $(call gb_Library_add_libs,clew,\ )) endif -$(eval $(call gb_Library_add_generated_cobjects,clew,\ -
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - xmloff/source
xmloff/source/text/XMLTextMarkImportContext.cxx | 49
1 file changed, 34 insertions(+), 15 deletions(-)
New commits:
commit b903e2a7ac730865d9a6ee48fb0392ecff2c7d30
Author: Michael Stahl mst...@redhat.com
Date: Fri Dec 5 18:04:39 2014 +0100
fdo#86795: xmloff: ODF import: do not import checkbox fieldmark ...
... if it has start/end, because Writer will become grumpy and crash.
(cherry picked from commit 25fd11e78279aef5a6b7656347758e5c67a9c45a)
Conflicts:
xmloff/source/text/XMLTextMarkImportContext.cxx
Change-Id: I6024051249eeac6ed9e43856fa77db969287f888
Reviewed-on: https://gerrit.libreoffice.org/13319
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/xmloff/source/text/XMLTextMarkImportContext.cxx
b/xmloff/source/text/XMLTextMarkImportContext.cxx
index 8aaa952..d8f8bef 100644
--- a/xmloff/source/text/XMLTextMarkImportContext.cxx
+++ b/xmloff/source/text/XMLTextMarkImportContext.cxx
@@ -143,7 +143,7 @@ static const char *lcl_getFormFieldmarkName(OUString name)
return NULL;
}
-static OUString lcl_getFieldmarkName(OUString name)
+static OUString lcl_getFieldmarkName(OUString const name)
{
static const char sFormtext[]=ODF_FORMTEXT;
if (name.equalsAscii(msoffice.field.FORMTEXT) ||
@@ -288,19 +288,40 @@ void XMLTextMarkImportContext::EndElement()
bool
bImportAsField=((lcl_MarkType)nTmp==TypeFieldmarkEnd
m_rHelper.hasCurrentFieldCtx());
-// insert reference
-const ReferenceXInterface xContent(
-CreateAndInsertMark(GetImport(),
-
(bImportAsField?sAPI_fieldmark:sAPI_bookmark),
-m_sBookmarkName,
-xInsertionCursor,
-m_sXmlId) );
-if (pRDFaAttributes)
+// fdo#86795 check if it's actually a checkbox
first
+bool isInvalid(false);
+OUString fieldmarkTypeName;
+if (bImportAsField
m_rHelper.hasCurrentFieldCtx())
{
-const Referencerdf::XMetadatable
-xMeta(xContent, UNO_QUERY);
-GetImport().GetRDFaImportHelper().AddRDFa(
-xMeta, pRDFaAttributes);
+
+OUString const
type(m_rHelper.getCurrentFieldType());
+fieldmarkTypeName = lcl_getFieldmarkName(type);
+if (fieldmarkTypeName == ODF_FORMCHECKBOX ||
+fieldmarkTypeName == ODF_FORMDROPDOWN)
+{ // sw can't handle checkbox with start+end
+SAL_INFO(xmloff.text, invalid
fieldmark-start/fieldmark-end ignored);
+isInvalid = true;
+}
+}
+
+ReferenceXInterface xContent;
+if (!isInvalid)
+{
+// insert reference
+xContent = CreateAndInsertMark(GetImport(),
+(bImportAsField
+? OUString(sAPI_fieldmark)
+: OUString(sAPI_bookmark)),
+m_sBookmarkName,
+xInsertionCursor,
+m_sXmlId);
+if (pRDFaAttributes)
+{
+const Referencerdf::XMetadatable
+xMeta(xContent, UNO_QUERY);
+GetImport().GetRDFaImportHelper().AddRDFa(
+xMeta, pRDFaAttributes);
+}
}
if ((lcl_MarkType)nTmp==TypeFieldmarkEnd) {
@@ -308,8 +329,6 @@ void XMLTextMarkImportContext::EndElement()
// setup fieldmark...
Reference
::com::sun::star::text::XFormField xFormField(xContent, UNO_QUERY);
if (xFormField.is()
m_rHelper.hasCurrentFieldCtx()) {
-OUString
givenTypeName=m_rHelper.getCurrentFieldType();
-OUString
fieldmarkTypeName=lcl_getFieldmarkName(givenTypeName);
[Bug 64945] inconvenient localized symbol code
https://bugs.freedesktop.org/show_bug.cgi?id=64945 tommy27 ba...@quipo.it changed: What|Removed |Added Blocks|65675 |75025 -- 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 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on||64945 -- 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 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on|64945 | -- 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: 2 commits - editeng/source
editeng/source/editeng/impedit2.cxx |2 +-
editeng/source/editeng/textconv.cxx |9 -
2 files changed, 5 insertions(+), 6 deletions(-)
New commits:
commit 6d10a42d5b1690b3b1ed81d99a3a1bc9b65c30d9
Author: Caolán McNamara caol...@redhat.com
Date: Mon Dec 8 10:36:10 2014 +
Resolves: fdo#86931 wrong offsets used to set language
after Chinese conversion. the _aOldSel is the one
that has the start and end index set to the end of the
replacement text and so the calculation only makes
sense on that selection
Change-Id: I152067550d7741579bfc6ca026072b16ac7c2dd6
diff --git a/editeng/source/editeng/impedit2.cxx
b/editeng/source/editeng/impedit2.cxx
index cf226c1..4233b3e 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -3956,7 +3956,7 @@ long ImpEditEngine::GetXPos(
if( pLine-GetCharPosArray().size() )
{
sal_Int32 nPos = nIndex - 1 - pLine-GetStart();
-if( nPos = (sal_Int32)pLine-GetCharPosArray().size() )
+if (nPos 0 || nPos =
(sal_Int32)pLine-GetCharPosArray().size())
{
nPos = pLine-GetCharPosArray().size()-1;
OSL_FAIL(svx::ImpEditEngine::GetXPos(), index out of
range!);
diff --git a/editeng/source/editeng/textconv.cxx
b/editeng/source/editeng/textconv.cxx
index ea3181a..f22478e 100644
--- a/editeng/source/editeng/textconv.cxx
+++ b/editeng/source/editeng/textconv.cxx
@@ -373,11 +373,11 @@ void TextConvWrapper::ReplaceUnit(
// remember current original language for later use
ImpEditEngine *pImpEditEng = m_pEditView-GetImpEditEngine();
-ESelection _aOldSel = m_pEditView-GetSelection();
+ESelection aOldSel = m_pEditView-GetSelection();
//EditSelection aOldEditSel =
pEditView-GetImpEditView()-GetEditSelection();
#ifdef DBG_UTIL
-LanguageType nOldLang = pImpEditEng-GetLanguage(
pImpEditEng-CreateSel( _aOldSel ).Min() );
+LanguageType nOldLang = pImpEditEng-GetLanguage(
pImpEditEng-CreateSel( aOldSel ).Min() );
#endif
pImpEditEng-UndoActionStart( EDITUNDO_INSERT );
@@ -387,7 +387,7 @@ void TextConvWrapper::ReplaceUnit(
// Thus we do this only for Chinese translation...
bool bIsChineseConversion = IsChinese( GetSourceLanguage() );
if (bIsChineseConversion)
-ChangeText( aNewTxt, rOrigText, rOffsets, _aOldSel );
+ChangeText( aNewTxt, rOrigText, rOffsets, aOldSel );
else
ChangeText( aNewTxt, rOrigText, NULL, NULL );
@@ -397,7 +397,6 @@ void TextConvWrapper::ReplaceUnit(
DBG_ASSERT( GetTargetLanguage() == LANGUAGE_CHINESE_SIMPLIFIED ||
GetTargetLanguage() == LANGUAGE_CHINESE_TRADITIONAL,
TextConvWrapper::ReplaceUnit : unexpected target language );
-ESelection aOldSel = m_pEditView-GetSelection();
ESelection aNewSel( aOldSel );
aNewSel.nStartPos = aNewSel.nStartPos - aNewTxt.getLength();
commit f3c24b488388032d069bee0a7e0d88f6e61430e2
Author: Caolán McNamara caol...@redhat.com
Date: Mon Dec 8 10:25:37 2014 +
kater-later
Change-Id: If9eaf54c2d706144e2b7c34a3004ad9604dd420f
diff --git a/editeng/source/editeng/textconv.cxx
b/editeng/source/editeng/textconv.cxx
index 8a057cc..ea3181a 100644
--- a/editeng/source/editeng/textconv.cxx
+++ b/editeng/source/editeng/textconv.cxx
@@ -371,7 +371,7 @@ void TextConvWrapper::ReplaceUnit(
}
m_nUnitOffset = m_nUnitOffset + nUnitStart + aNewTxt.getLength();
-// remember current original language for kater use
+// remember current original language for later use
ImpEditEngine *pImpEditEng = m_pEditView-GetImpEditEngine();
ESelection _aOldSel = m_pEditView-GetSelection();
//EditSelection aOldEditSel =
pEditView-GetImpEditView()-GetEditSelection();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - editeng/source
editeng/source/editeng/impedit2.cxx |2 +-
editeng/source/editeng/textconv.cxx |7 +++
2 files changed, 4 insertions(+), 5 deletions(-)
New commits:
commit 45be83689bc661a9b3077dd7c8e5563fdf7f04db
Author: Caolán McNamara caol...@redhat.com
Date: Mon Dec 8 10:36:10 2014 +
Resolves: fdo#86931 wrong offsets used to set language
after Chinese conversion. the _aOldSel is the one
that has the start and end index set to the end of the
replacement text and so the calculation only makes
sense on that selection
Change-Id: I152067550d7741579bfc6ca026072b16ac7c2dd6
(cherry picked from commit 6d10a42d5b1690b3b1ed81d99a3a1bc9b65c30d9)
diff --git a/editeng/source/editeng/impedit2.cxx
b/editeng/source/editeng/impedit2.cxx
index 3f030d1..7a0ade2 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -3956,7 +3956,7 @@ long ImpEditEngine::GetXPos(
if( pLine-GetCharPosArray().size() )
{
sal_Int32 nPos = nIndex - 1 - pLine-GetStart();
-if( nPos = (sal_Int32)pLine-GetCharPosArray().size() )
+if (nPos 0 || nPos =
(sal_Int32)pLine-GetCharPosArray().size())
{
nPos = pLine-GetCharPosArray().size()-1;
OSL_FAIL(svx::ImpEditEngine::GetXPos(), index out of
range!);
diff --git a/editeng/source/editeng/textconv.cxx
b/editeng/source/editeng/textconv.cxx
index b7ac644..f2231c2 100644
--- a/editeng/source/editeng/textconv.cxx
+++ b/editeng/source/editeng/textconv.cxx
@@ -374,11 +374,11 @@ void TextConvWrapper::ReplaceUnit(
// remember current original language for kater use
ImpEditEngine *pImpEditEng = m_pEditView-GetImpEditEngine();
-ESelection _aOldSel = m_pEditView-GetSelection();
+ESelection aOldSel = m_pEditView-GetSelection();
//EditSelection aOldEditSel =
pEditView-GetImpEditView()-GetEditSelection();
#ifdef DBG_UTIL
-LanguageType nOldLang = pImpEditEng-GetLanguage(
pImpEditEng-CreateSel( _aOldSel ).Min() );
+LanguageType nOldLang = pImpEditEng-GetLanguage(
pImpEditEng-CreateSel( aOldSel ).Min() );
#endif
pImpEditEng-UndoActionStart( EDITUNDO_INSERT );
@@ -388,7 +388,7 @@ void TextConvWrapper::ReplaceUnit(
// Thus we do this only for Chinese translation...
bool bIsChineseConversion = IsChinese( GetSourceLanguage() );
if (bIsChineseConversion)
-ChangeText( aNewTxt, rOrigText, rOffsets, _aOldSel );
+ChangeText( aNewTxt, rOrigText, rOffsets, aOldSel );
else
ChangeText( aNewTxt, rOrigText, NULL, NULL );
@@ -398,7 +398,6 @@ void TextConvWrapper::ReplaceUnit(
DBG_ASSERT( GetTargetLanguage() == LANGUAGE_CHINESE_SIMPLIFIED ||
GetTargetLanguage() == LANGUAGE_CHINESE_TRADITIONAL,
TextConvWrapper::ReplaceUnit : unexpected target language );
-ESelection aOldSel = m_pEditView-GetSelection();
ESelection aNewSel( aOldSel );
aNewSel.nStartPos = aNewSel.nStartPos - aNewTxt.getLength();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on||73805 -- 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 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on|73805 | -- 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
Re: [Libreoffice-commits] core.git: 2 commits - desktop/source reportdesign/source
On 08.12.2014 10:23, Miklos Vajna wrote: Hi Michael, On Fri, Dec 05, 2014 at 02:12:17PM -0800, Michael Stahl mst...@redhat.com wrote: commit dce74be2bab7a6924578e8f6f6ce37aa593cc481 Author: Michael Stahl mst...@redhat.com Date: Fri Dec 5 20:57:20 2014 +0100 desktop: avoid starting with new writer doc if OOO_DISABLE_RECOVERY set Better to show the start center, same as when --norestore is given. A side-effect of this is the following scenario: 1) Start Writer, type something, save it as test.odt 2) Exit from LO by pressing ^C on the console 3) Start './soffice', test.odt is opened automatically Is that intended? ;-) not really but presumably OOO_DISABLE_RECOVERY should just disable the recovery dialog? what i don't understand is, why does LO open a new writer document if you don't restore the session. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sw/qa writerfilter/source
sw/qa/extras/rtfimport/data/fdo86750.rtf |4
sw/qa/extras/rtfimport/rtfimport.cxx |6 ++
writerfilter/source/dmapper/DomainMapper_Impl.cxx |9 +
3 files changed, 19 insertions(+)
New commits:
commit 3a2a74a48405d6d3423c06f9752c2254684d7770
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Mon Dec 8 09:16:22 2014 +0100
fdo#86750 RTF import: fix table of contents links
(cherry picked from commit 4517c94000153eab6c034ea548698953dd93f794)
Change-Id: I0f3d35a0e64c9ce5646fa63eda317bee42de5540
Reviewed-on: https://gerrit.libreoffice.org/13372
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/qa/extras/rtfimport/data/fdo86750.rtf
b/sw/qa/extras/rtfimport/data/fdo86750.rtf
new file mode 100644
index 000..29f0b84
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo86750.rtf
@@ -0,0 +1,4 @@
+{\rtf1
+{\field{\*\fldinst { HYPERLINK \\l anchor }}{\fldrslt click}}\par
+{\*\bkmkstart anchor}target{\*\bkmkend anchor}\par
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index e3fddac..416b01a 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -2054,6 +2054,12 @@ DECLARE_RTFIMPORT_TEST(testFdo72031, fdo72031.rtf)
CPPUNIT_ASSERT_EQUAL(aExpected, getRun(getParagraph(1), 1)-getString());
}
+DECLARE_RTFIMPORT_TEST(testFdo86750, fdo86750.rtf)
+{
+// This was 'HYPERLINK#anchor', the URL of the hyperlink had the field
type as a prefix, leading to broken links.
+CPPUNIT_ASSERT_EQUAL(OUString(#anchor),
getPropertyOUString(getRun(getParagraph(1), 1), HyperLinkURL));
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index c3343f1..1654744 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -3577,6 +3577,15 @@ void DomainMapper_Impl::CloseFieldCommand()
case FIELD_HYPERLINK:
{
::std::vectorOUString aParts =
pContext-GetCommandParts();
+
+// Syntax is either:
+// HYPERLINK \l link
+// or
+// HYPERLINK \l link
+// Make sure HYPERLINK doesn't end up as part of
link in the second case.
+if (!aParts.empty() aParts[0] == HYPERLINK)
+aParts.erase(aParts.begin());
+
::std::vectorOUString::const_iterator aItEnd =
aParts.end();
::std::vectorOUString::const_iterator aPartIt =
aParts.begin();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sax/source
sax/source/fastparser/fastparser.cxx | 11 ---
1 file changed, 4 insertions(+), 7 deletions(-)
New commits:
commit 848adf433a2408fd37f333b66413b94be97e1f7a
Author: Matúš Kukan matus.ku...@collabora.com
Date: Mon Dec 8 11:41:34 2014 +0100
fastparser: Redundant check after assert
Change-Id: Ibc56102831d4d36392bea4e4e088e207cef99429
diff --git a/sax/source/fastparser/fastparser.cxx
b/sax/source/fastparser/fastparser.cxx
index fc1f5a9..a0e99b9 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -623,15 +623,12 @@ void FastSaxParserImpl::DefineNamespace( const OString
rPrefix, const OUString
{
Entity rEntity = getEntity();
assert(!rEntity.maNamespaceCount.empty()); // need a context!
-if( !rEntity.maNamespaceCount.empty() )
-{
-sal_uInt32 nOffset = rEntity.maNamespaceCount.top()++;
-if( rEntity.maNamespaceDefines.size() = nOffset )
-rEntity.maNamespaceDefines.resize(
rEntity.maNamespaceDefines.size() + 64 );
+sal_uInt32 nOffset = rEntity.maNamespaceCount.top()++;
+if( rEntity.maNamespaceDefines.size() = nOffset )
+rEntity.maNamespaceDefines.resize( rEntity.maNamespaceDefines.size() +
64 );
-rEntity.maNamespaceDefines[nOffset].reset( new NamespaceDefine(
rPrefix, GetNamespaceToken( namespaceURL ), namespaceURL ) );
-}
+rEntity.maNamespaceDefines[nOffset].reset( new NamespaceDefine( rPrefix,
GetNamespaceToken( namespaceURL ), namespaceURL ) );
}
sal_Int32 FastSaxParserImpl::GetToken( const xmlChar* pName, sal_Int32 nameLen
/* = 0 */ )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/source
framework/source/uielement/toolbarmanager.cxx | 17 -
1 file changed, 12 insertions(+), 5 deletions(-)
New commits:
commit eae0dda3e2eddb55b4e2032136541c15ba87fa09
Author: Caolán McNamara caol...@redhat.com
Date: Mon Dec 8 12:10:37 2014 +
Resolves: fdo#86820 executing toolbar menu entry can destroy menu
Change-Id: Ide0ea8f8ff145d487e409b0091918b59f1f83405
diff --git a/framework/source/uielement/toolbarmanager.cxx
b/framework/source/uielement/toolbarmanager.cxx
index f18bc3f..c966532 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -1792,17 +1792,24 @@ IMPL_LINK( ToolBarManager, Command, CommandEvent*,
pCmdEvt )
// overflow and context menus). If we set these Hdls permanently rather
// than just when the context menu is showing, then events are
duplicated
// when the menu is being used as an overflow menu.
-m_pToolBar-GetMenu()-SetSelectHdl( LINK( this, ToolBarManager,
MenuSelect ) );
-m_pToolBar-GetMenu()-SetDeactivateHdl( LINK( this, ToolBarManager,
MenuDeactivate ) );
+Menu *pManagerMenu = m_pToolBar-GetMenu();
+pManagerMenu-SetSelectHdl( LINK( this, ToolBarManager, MenuSelect ) );
+pManagerMenu-SetDeactivateHdl( LINK( this, ToolBarManager,
MenuDeactivate ) );
// make sure all disabled entries will be shown
pMenu-SetMenuFlags( pMenu-GetMenuFlags() |
MENU_FLAG_ALWAYSSHOWDISABLEDENTRIES );
::Point aPoint( pCmdEvt-GetMousePosPixel() );
pMenu-Execute( m_pToolBar, aPoint );
-// Unlink our listeners again -- see above for why.
-m_pToolBar-GetMenu()-SetSelectHdl( Link() );
-m_pToolBar-GetMenu()-SetDeactivateHdl( Link() );
+//fdo#86820 We may have been disposed and so have a NULL m_pToolBar by
+//executing a menu entry, e.g. inserting a chart replaces the toolbars
+pManagerMenu = m_bDisposed ? NULL : m_pToolBar-GetMenu();
+if (pManagerMenu)
+{
+// Unlink our listeners again -- see above for why.
+pManagerMenu-SetSelectHdl( Link() );
+pManagerMenu-SetDeactivateHdl( Link() );
+}
}
return 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/qa dbaccess/source include/toolkit toolkit/source vbahelper/source writerfilter/source xmloff/source
dbaccess/qa/unit/dbtest_base.cxx |2
dbaccess/source/ui/misc/indexcollection.cxx | 14 +--
include/toolkit/helper/servicenames.hxx |1
toolkit/source/controls/grid/defaultgriddatamodel.cxx |4 -
toolkit/source/controls/tree/treedatamodel.cxx| 10 +-
toolkit/source/helper/servicenames.cxx|1
vbahelper/source/vbahelper/vbaglobalbase.cxx |7 -
writerfilter/source/rtftok/rtfsdrimport.cxx |8 +-
xmloff/source/forms/elementexport.cxx | 72 +-
xmloff/source/forms/elementimport.cxx | 16 ++--
xmloff/source/forms/layerexport.cxx |2
11 files changed, 64 insertions(+), 73 deletions(-)
New commits:
commit 2979ff295c9fafdb92cb56cd1f5ddb0a6b56cf20
Author: Noel Grandin n...@peralex.com
Date: Fri Dec 5 16:28:32 2014 +0200
fdo#38835 strip out OUString globals
Change-Id: I1a435214af102461e02217f7d95248dac14e5f1a
diff --git a/dbaccess/qa/unit/dbtest_base.cxx b/dbaccess/qa/unit/dbtest_base.cxx
index 1f226c1..d3b07f8 100644
--- a/dbaccess/qa/unit/dbtest_base.cxx
+++ b/dbaccess/qa/unit/dbtest_base.cxx
@@ -25,8 +25,6 @@ using namespace ::com::sun::star::uno;
class DBTestBase
: public UnoApiTest
{
-protected:
-static const OUString our_sFilePath;
public:
DBTestBase() : UnoApiTest(dbaccess/qa/unit/data) {};
diff --git a/dbaccess/source/ui/misc/indexcollection.cxx
b/dbaccess/source/ui/misc/indexcollection.cxx
index 7557d6cc..5049e2a 100644
--- a/dbaccess/source/ui/misc/indexcollection.cxx
+++ b/dbaccess/source/ui/misc/indexcollection.cxx
@@ -150,9 +150,9 @@ namespace dbaui
}
// set the properties
-static const OUString s_sUniquePropertyName = IsUnique;
-static const OUString s_sSortPropertyName = IsAscending;
-static const OUString s_sNamePropertyName = Name;
+static const char s_sUniquePropertyName[] = IsUnique;
+static const char s_sSortPropertyName[] = IsAscending;
+static const char s_sNamePropertyName[] = Name;
// the index' own props
xIndexDescriptor-setPropertyValue(s_sUniquePropertyName,
css::uno::makeAny(_rPos-bUnique));
xIndexDescriptor-setPropertyValue(s_sNamePropertyName,
makeAny(_rPos-sName));
@@ -252,10 +252,10 @@ namespace dbaui
void OIndexCollection::implFillIndexInfo(OIndex _rIndex, Reference
XPropertySet _rxDescriptor)
{
-static const OUString s_sPrimaryIndexPropertyName =
IsPrimaryKeyIndex;
-static const OUString s_sUniquePropertyName = IsUnique;
-static const OUString s_sSortPropertyName = IsAscending;
-static const OUString s_sCatalogPropertyName = Catalog;
+static const char s_sPrimaryIndexPropertyName[] = IsPrimaryKeyIndex;
+static const char s_sUniquePropertyName[] = IsUnique;
+static const char s_sSortPropertyName[] = IsAscending;
+static const char s_sCatalogPropertyName[] = Catalog;
_rIndex.bPrimaryKey =
::cppu::any2bool(_rxDescriptor-getPropertyValue(s_sPrimaryIndexPropertyName));
_rIndex.bUnique =
::cppu::any2bool(_rxDescriptor-getPropertyValue(s_sUniquePropertyName));
diff --git a/include/toolkit/helper/servicenames.hxx
b/include/toolkit/helper/servicenames.hxx
index b007a87..cc81567 100644
--- a/include/toolkit/helper/servicenames.hxx
+++ b/include/toolkit/helper/servicenames.hxx
@@ -87,7 +87,6 @@ extern const sal_Char szServiceName_UnoSpinButtonControl[],
szServiceName_UnoSpi
extern const sal_Char szServiceName_TreeControl[];
extern const sal_Char szServiceName_TreeControlModel[];
-extern const sal_Char szServiceName_MutableTreeDataModel[];
extern const sal_Char szServiceName_GridControl[];
extern const sal_Char szServiceName_GridControlModel[];
diff --git a/toolkit/source/controls/grid/defaultgriddatamodel.cxx
b/toolkit/source/controls/grid/defaultgriddatamodel.cxx
index 883d3e4..aa830e4 100644
--- a/toolkit/source/controls/grid/defaultgriddatamodel.cxx
+++ b/toolkit/source/controls/grid/defaultgriddatamodel.cxx
@@ -495,8 +495,8 @@ private:
Sequence OUString SAL_CALL
DefaultGridDataModel::getSupportedServiceNames( ) throw (RuntimeException,
std::exception)
{
-static const OUString
aServiceName(com.sun.star.awt.grid.DefaultGridDataModel);
-static const Sequence OUString aSeq( aServiceName, 1 );
+Sequence OUString aSeq( 1 );
+aSeq[0] = com.sun.star.awt.grid.DefaultGridDataModel;
return aSeq;
}
diff --git a/toolkit/source/controls/tree/treedatamodel.cxx
b/toolkit/source/controls/tree/treedatamodel.cxx
index ee1468f..3f50b3d 100644
--- a/toolkit/source/controls/tree/treedatamodel.cxx
+++ b/toolkit/source/controls/tree/treedatamodel.cxx
@@ -258,9 +258,8 @@ sal_Bool SAL_CALL MutableTreeDataModel::supportsService(
const OUString Service
Sequence OUString
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - framework/source
framework/source/uielement/toolbarmanager.cxx | 17 -
1 file changed, 12 insertions(+), 5 deletions(-)
New commits:
commit cefe3c60f29b021f621dc6045467519e3a56aa6a
Author: Caolán McNamara caol...@redhat.com
Date: Mon Dec 8 12:10:37 2014 +
Resolves: fdo#86820 executing toolbar menu entry can destroy menu
Change-Id: Ide0ea8f8ff145d487e409b0091918b59f1f83405
(cherry picked from commit eae0dda3e2eddb55b4e2032136541c15ba87fa09)
diff --git a/framework/source/uielement/toolbarmanager.cxx
b/framework/source/uielement/toolbarmanager.cxx
index f18bc3f..c966532 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -1792,17 +1792,24 @@ IMPL_LINK( ToolBarManager, Command, CommandEvent*,
pCmdEvt )
// overflow and context menus). If we set these Hdls permanently rather
// than just when the context menu is showing, then events are
duplicated
// when the menu is being used as an overflow menu.
-m_pToolBar-GetMenu()-SetSelectHdl( LINK( this, ToolBarManager,
MenuSelect ) );
-m_pToolBar-GetMenu()-SetDeactivateHdl( LINK( this, ToolBarManager,
MenuDeactivate ) );
+Menu *pManagerMenu = m_pToolBar-GetMenu();
+pManagerMenu-SetSelectHdl( LINK( this, ToolBarManager, MenuSelect ) );
+pManagerMenu-SetDeactivateHdl( LINK( this, ToolBarManager,
MenuDeactivate ) );
// make sure all disabled entries will be shown
pMenu-SetMenuFlags( pMenu-GetMenuFlags() |
MENU_FLAG_ALWAYSSHOWDISABLEDENTRIES );
::Point aPoint( pCmdEvt-GetMousePosPixel() );
pMenu-Execute( m_pToolBar, aPoint );
-// Unlink our listeners again -- see above for why.
-m_pToolBar-GetMenu()-SetSelectHdl( Link() );
-m_pToolBar-GetMenu()-SetDeactivateHdl( Link() );
+//fdo#86820 We may have been disposed and so have a NULL m_pToolBar by
+//executing a menu entry, e.g. inserting a chart replaces the toolbars
+pManagerMenu = m_bDisposed ? NULL : m_pToolBar-GetMenu();
+if (pManagerMenu)
+{
+// Unlink our listeners again -- see above for why.
+pManagerMenu-SetSelectHdl( Link() );
+pManagerMenu-SetDeactivateHdl( Link() );
+}
}
return 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 38835] strip out non-trivial globals before main
https://bugs.freedesktop.org/show_bug.cgi?id=38835 --- Comment #17 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Noel Grandin committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=2979ff295c9fafdb92cb56cd1f5ddb0a6b56cf20 fdo#38835 strip out OUString globals It will be available in 4.5.0. 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
Re: QA Meeting Minutes - 2014-12-03
Hi, On Saturday, 2014-12-06 21:18:05 -0500, Robinson Tryon wrote: * If a bug is fixed on the Master branch (or in Fresh), but is still present on Fresh/Still, it can be helpful to tag the bug and bibisect it, in addition to resolving it as WFM. I'll send out a separate email to the QA list with some advice from the devs. IMHO a bug should not be resolved as WFM then, it is still a bug in the release reported. If it is fixed in master then even better, hopefully it was one commit that can be cherry-picked, so a bibisect indeed would be welcomed. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key ID 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Better use 64-bit 0x6A6CD5B765632D3A here is why: https://evil32.com/ Care about Free Software, support the FSFE https://fsfe.org/support/?erack pgpcfPpXqElar.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
New Defects reported by Coverity Scan for LibreOffice
Hi,
Please find the latest report on new defect(s) introduced to LibreOffice found
with Coverity Scan.
9 new defect(s) introduced to LibreOffice found with Coverity Scan.
7 defect(s), reported by Coverity Scan earlier, were marked fixed in the recent
build analyzed by Coverity Scan.
New defect(s) Reported-by: Coverity Scan
Showing 9 of 9 defect(s)
** CID 1186125: Big parameter passed by value (PASS_BY_VALUE)
/usr/include/c++/4.8.3/bits/stl_algo.h: 4647 in
std::count_if__gnu_cxx::__normal_iteratorconst
boost::shared_ptrslideshow::internal::ViewShape *,
std::vectorboost::shared_ptrslideshow::internal::ViewShape,
std::allocatorboost::shared_ptrslideshow::internal::ViewShape,
boost::_bi::bind_tbool, boost::_mfi::cmf4bool,
slideshow::internal::ViewShape, const boost::shared_ptrGDIMetaFile , const
slideshow::internal::ViewShape::RenderArgs , int, bool,
boost::_bi::list5boost::arg(int)1, boost::reference_wrapperconst
boost::shared_ptrGDIMetaFile,
boost::_bi::valueslideshow::internal::ViewShape::RenderArgs,
boost::_bi::valueint, boost::_bi::valuebool(T1, T1, T2)()
** CID 1257107: Unchecked dynamic_cast (FORWARD_NULL)
/sw/source/core/crsr/viscrs.cxx: 542 in SwShellCrsr::Show()()
** CID 1257108: Null pointer dereference (FORWARD_NULL)
/sw/source/core/draw/dpage.cxx: 98 in SwDPage::Clone(SdrModel *) const()
/sw/source/core/draw/dpage.cxx: 101 in SwDPage::Clone(SdrModel *) const()
** CID 1257109: Unchecked dynamic_cast (FORWARD_NULL)
/sw/source/core/draw/dpage.cxx: 84 in SwDPage::lateInit(const SwDPage,
SwDrawModel *)()
** CID 1257110: Big parameter passed by value (PASS_BY_VALUE)
/usr/include/boost/bind/bind.hpp: 1338 in boost::bindbool,
boost::_mfi::cmf4bool, slideshow::internal::ViewShape, const
boost::shared_ptrGDIMetaFile , const
slideshow::internal::ViewShape::RenderArgs , int, bool, boost::arg(int)1,
boost::reference_wrapperconst boost::shared_ptrGDIMetaFile,
slideshow::internal::ViewShape::RenderArgs, int, bool(T2, T3, T4, T5, T6, T7)()
** CID 1257111: Uninitialized pointer field (UNINIT_CTOR)
/sc/source/core/data/table3.cxx: 873 in
unnamed::ListenerStartAction::ListenerStartAction(ScDocument )()
** CID 1257112: Uninitialized scalar field (UNINIT_CTOR)
/sd/source/core/sdpage2.cxx: 405 in SdPage::SdPage(const SdPage)()
** CID 1257113: Uninitialized scalar field (UNINIT_CTOR)
/desktop/source/lib/init.cxx: 267 in
LibLibreOffice_Impl::LibLibreOffice_Impl()()
** CID 1257114: Result is not floating-point (UNINTENDED_INTEGER_DIVISION)
/sc/qa/unit/ucalc.cxx: 4507 in Test::testAutoFillSimple()()
*** CID 1186125: Big parameter passed by value (PASS_BY_VALUE)
/usr/include/c++/4.8.3/bits/stl_algo.h: 4647 in
std::count_if__gnu_cxx::__normal_iteratorconst
boost::shared_ptrslideshow::internal::ViewShape *,
std::vectorboost::shared_ptrslideshow::internal::ViewShape,
std::allocatorboost::shared_ptrslideshow::internal::ViewShape,
boost::_bi::bind_tbool, boost::_mfi::cmf4bool,
slideshow::internal::ViewShape, const boost::shared_ptrGDIMetaFile , const
slideshow::internal::ViewShape::RenderArgs , int, bool,
boost::_bi::list5boost::arg(int)1, boost::reference_wrapperconst
boost::shared_ptrGDIMetaFile,
boost::_bi::valueslideshow::internal::ViewShape::RenderArgs,
boost::_bi::valueint, boost::_bi::valuebool(T1, T1, T2)()
4641* @param __pred A predicate.
4642* @return The number of iterators @c i in the range @p
[__first,__last)
4643* for which @p __pred(*i) is true.
4644 */
4645 templatetypename _InputIterator, typename _Predicate
4646 typename iterator_traits_InputIterator::difference_type
CID 1186125: Big parameter passed by value (PASS_BY_VALUE)
Passing parameter __pred of type boost::_bi::bind_tbool,
boost::_mfi::cmf4bool, slideshow::internal::ViewShape,
boost::shared_ptrGDIMetaFile const ,
slideshow::internal::ViewShape::RenderArgs const , int, bool,
boost::_bi::list5boost::arg1,
boost::reference_wrapperboost::shared_ptrGDIMetaFile const,
boost::_bi::valueslideshow::internal::ViewShape::RenderArgs,
boost::_bi::valueint, boost::_bi::valuebool (size 184 bytes) by
value.
4647 count_if(_InputIterator __first, _InputIterator __last, _Predicate
__pred)
4648 {
4649 // concept requirements
4650
__glibcxx_function_requires(_InputIteratorConcept_InputIterator)
4651 __glibcxx_function_requires(_UnaryPredicateConcept_Predicate,
4652typename iterator_traits_InputIterator::value_type)
*** CID 1257107: Unchecked dynamic_cast (FORWARD_NULL)
/sw/source/core/crsr/viscrs.cxx: 542 in SwShellCrsr::Show()()
536 GetShell()-GetLayout()-CalcFrmRects( *this );
537 }
538
539 void SwShellCrsr::Show()
540 {
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 Robinson Tryon (qubit) qu...@runcibility.com changed: What|Removed |Added Depends on||66209 -- 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 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Robinson Tryon (qubit) qu...@runcibility.com changed: What|Removed |Added Depends on|66209 | -- 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: 4 commits - desktop/source sc/source sd/source sw/source
desktop/source/lib/init.cxx|1 +
sc/source/core/data/table3.cxx |1 +
sd/source/core/sdpage2.cxx |2 ++
sw/source/core/crsr/viscrs.cxx |2 +-
4 files changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 9215ab03476f56f626f926702208f62b9bf2e16d
Author: Caolán McNamara caol...@redhat.com
Date: Mon Dec 8 13:45:56 2014 +
coverity#1257107 Unchecked dynamic_cast
Change-Id: Ica45049aa7e6656c0882484ffa4ff80b6d699373
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index bf8da34..80af294 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -539,7 +539,7 @@ void SwShellCrsr::FillRects()
void SwShellCrsr::Show()
{
for(SwPaM rTmp : GetRingContainer())
-dynamic_castSwShellCrsr*(rTmp)-SwSelPaintRects::Show();
+dynamic_castSwShellCrsr(rTmp).SwSelPaintRects::Show();
}
// This rectangle gets painted anew, therefore the SSelection in this
commit 32e38e1ec703dcdcff484eae3634a69e0d9c864e
Author: Caolán McNamara caol...@redhat.com
Date: Mon Dec 8 13:44:25 2014 +
coverity#1257111 Uninitialized pointer field
Change-Id: I82c771f0ca7d2593a6f34dd84689cf055f9cf3f3
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 04e9d08..f520cd6 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -868,6 +868,7 @@ class ListenerStartAction : public
sc::ColumnSpanSet::ColumnAction
public:
ListenerStartAction( ScDocument rDoc ) :
+mpCol(0),
mpPosSet(new sc::ColumnBlockPositionSet(rDoc)),
maStartCxt(rDoc, mpPosSet),
maEndCxt(rDoc, mpPosSet) {}
commit d15d0ec6de566f8a2dc2e9c575ecf4e19c070ade
Author: Caolán McNamara caol...@redhat.com
Date: Mon Dec 8 13:43:56 2014 +
coverity#1257112 Uninitialized scalar field
Change-Id: I79063c103707e91f04c22a284f7af035fef6d21d
diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx
index 57f4699..5b4987f 100644
--- a/sd/source/core/sdpage2.cxx
+++ b/sd/source/core/sdpage2.cxx
@@ -402,6 +402,8 @@ SdPage::SdPage(const SdPage rSrcPage)
meOrientation= rSrcPage.meOrientation;
mpPageLink = NULL;// is set when inserting via ConnectLink()
+
+mbIsPrecious = false;
}
void SdPage::lateInit(const SdPage rSrcPage)
commit f137588d0d8605ab48e2a7a8675784f965a230a7
Author: Caolán McNamara caol...@redhat.com
Date: Mon Dec 8 13:41:35 2014 +
coverity#1257113 Uninitialized scalar field
Change-Id: Ie813165995df47d466eaef09720901a33362fd23
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 61a715a..c12bf46 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -251,6 +251,7 @@ struct LibLibreOffice_Impl : public _LibreOfficeKit
pthread_t maThread;
LibLibreOffice_Impl()
+: maThread(0)
{
if(!(m_pOfficeClass = gOfficeClass.lock())) {
m_pOfficeClass.reset(new LibreOfficeKitClass);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 Alex Thurgood ipla...@yahoo.co.uk changed: What|Removed |Added Depends on||36799 -- 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: 9 commits - sw/qa sw/source
sw/qa/extras/uiwriter/data/merge-change1.odt |binary
sw/qa/extras/uiwriter/data/merge-change2.odt |binary
sw/qa/extras/uiwriter/uiwriter.cxx | 31 +++
sw/source/core/crsr/viscrs.cxx | 21
sw/source/core/doc/doccomp.cxx | 70 ++-
5 files changed, 71 insertions(+), 51 deletions(-)
New commits:
commit 8e00e0056e3c3dfdb35206ba5061a647d821edce
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Mon Dec 8 15:01:01 2014 +0100
coverity#1257107: handle these consistently
Change-Id: I5f432eea235bdca05132cf553d9bc15e2b825509
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index 80af294..13bbd29 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -538,8 +538,12 @@ void SwShellCrsr::FillRects()
void SwShellCrsr::Show()
{
-for(SwPaM rTmp : GetRingContainer())
-dynamic_castSwShellCrsr(rTmp).SwSelPaintRects::Show();
+for(SwPaM rPaM : GetRingContainer())
+{
+SwShellCrsr* pShCrsr = dynamic_castSwShellCrsr*(rPaM);
+if(pShCrsr)
+pShCrsr-SwSelPaintRects::Show();
+}
}
// This rectangle gets painted anew, therefore the SSelection in this
@@ -558,13 +562,12 @@ void SwShellCrsr::Invalidate( const SwRect rRect )
void SwShellCrsr::Hide()
{
-SwShellCrsr * pTmp = this;
-// TODO: this doesnt look sane: if the dynamic_cast ever returns a nullptr,
-// the next pTmp-GetNext() call is a nullptr deref
-do {
-if (pTmp)
-pTmp-SwSelPaintRects::Hide();
-} while( this != ( pTmp = dynamic_castSwShellCrsr*(pTmp-GetNext()) ) );
+for(SwPaM rPaM : GetRingContainer())
+{
+SwShellCrsr* pShCrsr = dynamic_castSwShellCrsr*(rPaM);
+if(pShCrsr)
+pShCrsr-SwSelPaintRects::Hide();
+}
}
SwCursor* SwShellCrsr::Create( SwPaM* pRing ) const
commit df87cec5ad59605d057ade2a0203e590d2aadc8d
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Mon Dec 8 15:00:51 2014 +0100
deque is never used
Change-Id: I223c85999a0ed1a62aece67f0d730b8e2e097ac9
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index 156eb08..1fab4e4 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -45,7 +45,6 @@
#include vector
#include list
-#include deque
#include cctype
#include boost/scoped_array.hpp
commit 23c802b85aad6b44da7d7cb630e2e76e6da033a8
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Sat Dec 6 03:19:05 2014 +0100
make InsertRedline() non-static again
Change-Id: I2eda267b56bc1548930add9c5ef83ad268f881a4
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index f9af771..156eb08 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -1835,7 +1835,7 @@ namespace
const SwRangeRedline* pSrcRedl;
SwRangeRedline* pDestRedl;
SaveMergeRedline( const SwNode rDstNd, const SwRangeRedline
rSrcRedl);
-static sal_uInt16 InsertRedline(const SwRangeRedline* pSrcRedl,
SwRangeRedline* pDestRedl, SwPaM* pLastDestRedline);
+sal_uInt16 InsertRedline(SwPaM* pLastDestRedline);
};
}
@@ -1865,7 +1865,7 @@ SaveMergeRedline::SaveMergeRedline( const SwNode rDstNd,
}
}
-sal_uInt16 SaveMergeRedline::InsertRedline(const SwRangeRedline* pSrcRedl,
SwRangeRedline* pDestRedl, SwPaM* pLastDestRedline)
+sal_uInt16 SaveMergeRedline::InsertRedline(SwPaM* pLastDestRedline)
{
sal_uInt16 nIns = 0;
SwDoc* pDoc = pDestRedl-GetDoc();
@@ -2058,7 +2058,7 @@ long SwDoc::MergeDoc( const SwDoc rDoc )
SwPaM* pLastDestRedline(nullptr);
for(SaveMergeRedline rRedline: vRedlines)
{
-nRet += SaveMergeRedline::InsertRedline(rRedline.pSrcRedl,
rRedline.pDestRedl, pLastDestRedline);
+nRet += rRedline.InsertRedline(pLastDestRedline);
pLastDestRedline = rRedline.pDestRedl;
}
}
commit a71fb1c911b7104ede9365e7b16513896492ffa8
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Sat Dec 6 03:14:36 2014 +0100
rename to simple SaveMergeRedline and put in namespace
Change-Id: Ibc36dcde1778ee02b9ac173d9da8419b69854af6
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index cdcbdbf..f9af771 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -1828,15 +1828,18 @@ long SwDoc::CompareDoc( const SwDoc rDoc )
return nRet;
}
-struct _SaveMergeRedlines
+namespace
{
-const SwRangeRedline* pSrcRedl;
-SwRangeRedline* pDestRedl;
-_SaveMergeRedlines( const SwNode rDstNd, const SwRangeRedline rSrcRedl);
-static sal_uInt16 InsertRedline(const SwRangeRedline* pSrcRedl,
SwRangeRedline* pDestRedl, SwPaM* pLastDestRedline);
-};
+struct SaveMergeRedline
+{
+const
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on|36799 | -- 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 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on|79546 | -- 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 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Robinson Tryon (qubit) qu...@runcibility.com changed: What|Removed |Added Depends on|72604 | -- 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 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 Robinson Tryon (qubit) qu...@runcibility.com changed: What|Removed |Added Depends on||72604 -- 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 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 81416, which changed state. Bug 81416 Summary: FILESAVE - writing to external storage corrupts ODF file https://bugs.freedesktop.org/show_bug.cgi?id=81416 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |WORKSFORME -- 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
Re: minutes of ESC call ...
Hi Lubos, On Fri, Dec 05, 2014 at 06:46:17PM +0100, Lubos Lunak wrote: On Thursday 04 of December 2014, Michael Meeks wrote: * Large scale renames (Kendy) ... + if cleanup there; perhaps some improved naming too. http://qt-project.org/wiki/API-Design-Principles#d8bc4b5cb3e68ae6e38b29e371b7f734 would be a very worthwhile reading here. good link, thanks! I think the problem -- at least in Writer -- is a bit deeper, no only naming: the classes in sw/ have somewhat muddy purposes and arent too well defined in their scope. The naming is just the topping on the cake (What is a SwFmtFrmSize and how is (if at all) it related to a SwFrmFmt?). IMHO, the best way out of this mess would be to: 1/ find groups of around ~5 classes as a batch and define (and doxygen-document) the single responsiblity of each of those well. It likely makes sense to refer to the old ::SwFoo StarOffice/OpenOffice.org class name in doxygen too. 2/ move this set of classes a name matching the defined responsiblity in namespace sw That would mean we would try to start some consistent well-scoped naming in namespace sw, while the global (top-level) namespace still contains the old wild west naming. And them we would step by step grow the pocket by adding stuff in a ordered fashion to it. And yeah, as a start, it would likely mean sw::Frame would need to be ranamed to something else as sw::Frame should be the natural place for the class that is currently called SwFrm ... Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - 2 commits - sc/source sd/source
sc/source/core/data/table3.cxx |1 +
sd/source/core/sdpage2.cxx |2 ++
2 files changed, 3 insertions(+)
New commits:
commit 72888d56b7821614912736a2b6a41f512f98442b
Author: Caolán McNamara caol...@redhat.com
Date: Mon Dec 8 13:44:25 2014 +
coverity#1257111 Uninitialized pointer field
Change-Id: I82c771f0ca7d2593a6f34dd84689cf055f9cf3f3
(cherry picked from commit 32e38e1ec703dcdcff484eae3634a69e0d9c864e)
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 1b818c5..4637e74 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -866,6 +866,7 @@ class ListenerStartAction : public
sc::ColumnSpanSet::ColumnAction
public:
ListenerStartAction( ScDocument rDoc ) :
+mpCol(0),
mpPosSet(new sc::ColumnBlockPositionSet(rDoc)),
maStartCxt(rDoc, mpPosSet),
maEndCxt(rDoc, mpPosSet) {}
commit 18c90a46f745d7017f23cbb06e010ee93f572349
Author: Caolán McNamara caol...@redhat.com
Date: Mon Dec 8 13:43:56 2014 +
coverity#1257112 Uninitialized scalar field
Change-Id: I79063c103707e91f04c22a284f7af035fef6d21d
(cherry picked from commit d15d0ec6de566f8a2dc2e9c575ecf4e19c070ade)
diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx
index 57f4699..5b4987f 100644
--- a/sd/source/core/sdpage2.cxx
+++ b/sd/source/core/sdpage2.cxx
@@ -402,6 +402,8 @@ SdPage::SdPage(const SdPage rSrcPage)
meOrientation= rSrcPage.meOrientation;
mpPageLink = NULL;// is set when inserting via ConnectLink()
+
+mbIsPrecious = false;
}
void SdPage::lateInit(const SdPage rSrcPage)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/data/org/openoffice/Office/Accelerators.xcu | 20 -- 1 file changed, 16 insertions(+), 4 deletions(-) New commits: commit 27d006e512028cfbc8aae00c5409d873259297d2 Author: Mattias Põldaru mahf...@gmail.com Date: Sat Dec 6 01:52:03 2014 +0200 fdo#87042 Add Ctrl+Shift+R as toggle for ruler Remove RefreshView (redraw) from some components, as it's supposedly little used. Components which would have this shortcut are DrawingDocument, GlobalDocument, PresentationDocument, WebDocument, FormDesign, TextReportDesign, TextDocument, XMLFormDocument. Change-Id: Ic730d390b4e4a1e6bcc76b1932b198e5b82c diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu index 25ecc99..e66bd64 100644 --- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu @@ -1634,6 +1634,12 @@ value xml:lang=en-US.uno:RightPara/value /prop /node +node oor:name=R_SHIFT_MOD1 oor:op=replace + prop oor:name=Command +value xml:lang=x-no-translateI10N SHORTCUTS - NO TRANSLATE/value +value xml:lang=en-US.uno:ShowRuler/value + /prop +/node node oor:name=SPACE_SHIFT_MOD1 oor:op=replace prop oor:name=Command value xml:lang=x-no-translateI10N SHORTCUTS - NO TRANSLATE/value @@ -2381,7 +2387,7 @@ node oor:name=R_SHIFT_MOD1 oor:op=replace prop oor:name=Command value xml:lang=x-no-translateI10N SHORTCUTS - NO TRANSLATE/value -value xml:lang=en-US.uno:RefreshView/value +value xml:lang=en-US.uno:Ruler/value /prop /node node oor:name=SPACE_SHIFT_MOD1 oor:op=replace @@ -2887,6 +2893,12 @@ value xml:lang=en-US.uno:RightPara/value /prop /node +node oor:name=R_SHIFT_MOD1 oor:op=replace + prop oor:name=Command +value xml:lang=x-no-translateI10N SHORTCUTS - NO TRANSLATE/value +value xml:lang=en-US.uno:ShowRuler/value + /prop +/node node oor:name=SPACE_SHIFT_MOD1 oor:op=replace prop oor:name=Command value xml:lang=x-no-translateI10N SHORTCUTS - NO TRANSLATE/value @@ -3708,7 +3720,7 @@ node oor:name=R_SHIFT_MOD1 oor:op=replace prop oor:name=Command value xml:lang=x-no-translateI10N SHORTCUTS - NO TRANSLATE/value -value xml:lang=en-US.uno:RefreshView/value +value xml:lang=en-US.uno:Ruler/value /prop /node node oor:name=SPACE_SHIFT_MOD1 oor:op=replace @@ -6003,7 +6015,7 @@ node oor:name=R_SHIFT_MOD1 oor:op=replace prop oor:name=Command value xml:lang=x-no-translateI10N SHORTCUTS - NO TRANSLATE/value -value xml:lang=en-US.uno:RefreshView/value +value xml:lang=en-US.uno:Ruler/value /prop /node node oor:name=SPACE_SHIFT_MOD1 oor:op=replace @@ -6776,7 +6788,7 @@ node oor:name=R_SHIFT_MOD1 oor:op=replace prop oor:name=Command value xml:lang=x-no-translateI10N SHORTCUTS - NO TRANSLATE/value -value xml:lang=en-US.uno:RefreshView/value +value xml:lang=en-US.uno:Ruler/value /prop /node node oor:name=SPACE_SHIFT_MOD1 oor:op=replace ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[ANNOUNCE] libreoffice-4.4.0.0.beta2 (on branch libreoffice-4-4) created
Hi all, The tag libreoffice-4.4.0.0.beta2 (AKA 4.4.0 Beta2) on the corresponding branch libreoffice-4-4 has been created last week. The branch will be used for fine tuning of the 4.4 codeline. Branch-off marks feature freeze, see https://wiki.documentfoundation.org/ReleasePlan/4.4#4.4.0_release for the detailed schedule of the 4.4.0 release. Master will be used for development of LibreOffice 4.5.x The following rules apply: + 4.4.0 beta phase: + any bug fixes are allowed without review + late features need approval by 3 people with different affiliation + 4.4.0 rc phase and later: + fixes need approval by one reviewer + late features need approval by 3 more people with different affiliation IMPORTANT: Every developer is responsible for pushing the fixes into all appropriate branches. Note that we do not plan any merge from this branch to master or vice versa. Please, help use to make stable and usable release. If you want to build something cool, unstable, and risky, use master. The 'libreoffice-4-3' branch is still active and will be used for the 4.3.6 bugfix release. Please read more at http://wiki.documentfoundation.org/ReleasePlan/4.3#4.3.6_release http://wiki.documentfoundation.org/Development/Branches http://wiki.documentfoundation.org/Release_Criteria Now, if you want to switch your clone to the branch, please do: ./g pull -r ./g checkout -b libreoffice-4-4 origin/libreoffice-4-4 To checkout the tag, use ./g fetch --tags ./g checkout -b tag-libreoffice-4.4.0.0.beta2 libreoffice-4.4.0.0.beta2 Hopefully it will work for you :-) Most probably, you will also want to do (if you haven't done it yet): git config --global push.default tracking When you do git push with this, git will push only the branch you are on; e.g. libreoffice-4-4 when you have switched to it. This will save you some git shouting at you. Linux distro packages might find source tarballs at http://dev-builds.libreoffice.org/pre-releases/src/ They will soon be available from the official page together with the builds. Attached is the list of changes against 4.4.0 Beta1 Happy hacking, Christian + the assert seems to just want the attrs to be sorted (bnc#467459) [Caolán McNamara] + wrong background color shown in format table in impress (bnc#882627) [Caolán McNamara] + text(box) is rendered white on white when it is not (bnc#904423) [Zolnai Tamás] + unchecked return value (cid#1255906) [Tor Lillqvist] + busted loop condition and Resource leak (coverity#1255390) [Caolán McNamara] + buffer not null terminated (coverity#1255905) [Caolán McNamara] + explicit null dereferenced (coverity#1255907) [Caolán McNamara] + uninitialized scalar field (coverity#1255909) [Caolán McNamara] + uninitialized scalar field (coverity#1255910) [Caolán McNamara] + fix SQL view to be editable (coverity#706316) [Caolán McNamara] + revert Logically dead code (coverity#735424) [Lionel Elie Mamane] + mirror fixes for and into icu (deb#766788) [Caolán McNamara] + avoid empty style names in ww2 docs (fdo#36514) [Caolán McNamara] + go back to the old way of doing things (fdo#48846) [Caolán McNamara] + reintroduce embedded picture for form components (fdo#53001) [Lionel Elie Mamane] + don't call XLSX methods in XLS export, related (fdo#59762) [Markus Mohrhard] + reintroduce embedded picture for form components (fdo#65163) [Lionel Elie Mamane] + export more numbering types correctly into HTML (fdo#68684) [Andras Timar] + fix crash on loading (fdo#70157) [Caolán McNamara] + cui: fix crash in SvxExtParagraphTabPage (fdo#70861) [Michael Stahl] + RTF import: bogus call to getBestTextEncodingFromLocale() (fdo#72031) [Miklos Vajna] + improving on existing icons and adding entries into links.txt (fdo#75256) [Matthias Freund, Yousuf Philips] + go back to the old way of doing things (fdo#75408) [Caolán McNamara] + check internal and external sheet references in both modes (fdo#77018) [Eike Rathke] + related: only make outline, title and subtitle read-only (fdo#78151) [Caolán McNamara] + mirror fixes for and into icu (fdo#78906) [Caolán McNamara] + accept args for .uno:InsertAnnotation (fdo#78980) [Maxim Monastirsky] + revert SwToSfxPageDescAttr: fix call to ... (fdo#79303) [Michael Stahl] + fix again and keep references to other sheets during sort (fdo#79441) [Eike Rathke] + duplicate acceserator keys in spell checking dialog (fdo#79707) [Caolán McNamara] + make sure to check for formula first, (fdo#80301) [Julien Nabet] + fix SQL view to be editable (fdo#80938) [Caolán McNamara] + removal of font name, font size and text alignment from context menus (fdo#81132) [Yousuf Philips] + rearrange, add and remove entries from toolbars (fdo#81475) [Yousuf Philips, Maxim Monastirsky] + RTF filter: import \sbauto and \saauto
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - officecfg/registry
officecfg/registry/data/org/openoffice/Office/Accelerators.xcu | 20 -- 1 file changed, 16 insertions(+), 4 deletions(-) New commits: commit a1571dcad2e656d5a5d9184ca138e58c0b73e182 Author: Mattias Põldaru mahf...@gmail.com Date: Sat Dec 6 01:52:03 2014 +0200 fdo#87042 Add Ctrl+Shift+R as toggle for ruler Remove RefreshView (redraw) from some components, as it's supposedly little used. Components which would have this shortcut are DrawingDocument, GlobalDocument, PresentationDocument, WebDocument, FormDesign, TextReportDesign, TextDocument, XMLFormDocument. Change-Id: Ic730d390b4e4a1e6bcc76b1932b198e5b82c diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu index 25ecc99..e66bd64 100644 --- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu @@ -1634,6 +1634,12 @@ value xml:lang=en-US.uno:RightPara/value /prop /node +node oor:name=R_SHIFT_MOD1 oor:op=replace + prop oor:name=Command +value xml:lang=x-no-translateI10N SHORTCUTS - NO TRANSLATE/value +value xml:lang=en-US.uno:ShowRuler/value + /prop +/node node oor:name=SPACE_SHIFT_MOD1 oor:op=replace prop oor:name=Command value xml:lang=x-no-translateI10N SHORTCUTS - NO TRANSLATE/value @@ -2381,7 +2387,7 @@ node oor:name=R_SHIFT_MOD1 oor:op=replace prop oor:name=Command value xml:lang=x-no-translateI10N SHORTCUTS - NO TRANSLATE/value -value xml:lang=en-US.uno:RefreshView/value +value xml:lang=en-US.uno:Ruler/value /prop /node node oor:name=SPACE_SHIFT_MOD1 oor:op=replace @@ -2887,6 +2893,12 @@ value xml:lang=en-US.uno:RightPara/value /prop /node +node oor:name=R_SHIFT_MOD1 oor:op=replace + prop oor:name=Command +value xml:lang=x-no-translateI10N SHORTCUTS - NO TRANSLATE/value +value xml:lang=en-US.uno:ShowRuler/value + /prop +/node node oor:name=SPACE_SHIFT_MOD1 oor:op=replace prop oor:name=Command value xml:lang=x-no-translateI10N SHORTCUTS - NO TRANSLATE/value @@ -3708,7 +3720,7 @@ node oor:name=R_SHIFT_MOD1 oor:op=replace prop oor:name=Command value xml:lang=x-no-translateI10N SHORTCUTS - NO TRANSLATE/value -value xml:lang=en-US.uno:RefreshView/value +value xml:lang=en-US.uno:Ruler/value /prop /node node oor:name=SPACE_SHIFT_MOD1 oor:op=replace @@ -6003,7 +6015,7 @@ node oor:name=R_SHIFT_MOD1 oor:op=replace prop oor:name=Command value xml:lang=x-no-translateI10N SHORTCUTS - NO TRANSLATE/value -value xml:lang=en-US.uno:RefreshView/value +value xml:lang=en-US.uno:Ruler/value /prop /node node oor:name=SPACE_SHIFT_MOD1 oor:op=replace @@ -6776,7 +6788,7 @@ node oor:name=R_SHIFT_MOD1 oor:op=replace prop oor:name=Command value xml:lang=x-no-translateI10N SHORTCUTS - NO TRANSLATE/value -value xml:lang=en-US.uno:RefreshView/value +value xml:lang=en-US.uno:Ruler/value /prop /node node oor:name=SPACE_SHIFT_MOD1 oor:op=replace ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 5 commits - sc/qa sd/qa svx/source sw/CppunitTest_sw_globalfilter.mk sw/qa
dev/null |binary
sc/qa/unit/data/ods/images_with_special_IDs.ods|binary
sc/qa/unit/subsequent_export-test.cxx | 74 +
sd/qa/unit/data/odp/images_with_special_IDs.odp|binary
sd/qa/unit/export-tests.cxx| 82 ++
svx/source/svdraw/svdograf.cxx |2
sw/CppunitTest_sw_globalfilter.mk |1
sw/qa/extras/globalfilter/data/graphic_shape.odt |binary
sw/qa/extras/globalfilter/data/images_with_special_IDs.odt |binary
sw/qa/extras/globalfilter/globalfilter.cxx | 174 +
sw/qa/extras/odfexport/odfexport.cxx | 47 ---
11 files changed, 332 insertions(+), 48 deletions(-)
New commits:
commit 9ff7aac6c8f1fa6bce8df8b95f20993d789a51a7
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Mon Dec 8 03:38:36 2014 +0100
Test for Writer import / export of graphic shapes
Graphic shapes are those images which are created not in
Writer (but e.g. Impress, Calc) and moved to Writer later
(e.g. copypaste).
Embedded image is ok, but MS filters broke the linked
graphic shape.
Change-Id: I0c86a5d09afb3e40f7d9e5986c05801457d4c13f
diff --git a/sw/CppunitTest_sw_globalfilter.mk
b/sw/CppunitTest_sw_globalfilter.mk
index f02bd41..fd2001e 100644
--- a/sw/CppunitTest_sw_globalfilter.mk
+++ b/sw/CppunitTest_sw_globalfilter.mk
@@ -63,6 +63,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_globalfilter,\
forms/util/frm \
framework/util/fwk \
i18npool/util/i18npool \
+ linguistic/source/lng \
oox/util/oox \
package/source/xstor/xstor \
package/util/package2 \
diff --git a/sw/qa/extras/globalfilter/data/graphic_shape.odt
b/sw/qa/extras/globalfilter/data/graphic_shape.odt
new file mode 100644
index 000..425e8c2
Binary files /dev/null and b/sw/qa/extras/globalfilter/data/graphic_shape.odt
differ
diff --git a/sw/qa/extras/globalfilter/globalfilter.cxx
b/sw/qa/extras/globalfilter/globalfilter.cxx
index 23695a2..c4b9811 100644
--- a/sw/qa/extras/globalfilter/globalfilter.cxx
+++ b/sw/qa/extras/globalfilter/globalfilter.cxx
@@ -27,11 +27,13 @@ public:
void testSwappedOutImageExport();
void testLinkedGraphicRT();
void testImageWithSpecialID();
+void testGraphicShape();
CPPUNIT_TEST_SUITE(Test);
CPPUNIT_TEST(testSwappedOutImageExport);
CPPUNIT_TEST(testLinkedGraphicRT);
CPPUNIT_TEST(testImageWithSpecialID);
+CPPUNIT_TEST(testGraphicShape);
CPPUNIT_TEST_SUITE_END();
};
@@ -261,6 +263,94 @@ void Test::testImageWithSpecialID()
}
}
+void Test::testGraphicShape()
+{
+// There are two kind of images in Writer: 1) Writer specific handled by
SwGrfNode and
+// 2) graphic shape handled by SdrGrafObj (e.g. after copypaste from
Impress).
+
+const OUString aFilterNames[] = {
+writer8,
+Rich Text Format,
+MS Word 97,
+Office Open XML Text,
+};
+
+// Trigger swap out mechanism to test swapped state factor too.
+boost::shared_ptr comphelper::ConfigurationChanges
batch(comphelper::ConfigurationChanges::create());
+
officecfg::Office::Common::Cache::GraphicManager::TotalCacheSize::set(sal_Int32(1),
batch);
+batch-commit();
+
+for( size_t nFilter = 0; nFilter SAL_N_ELEMENTS(aFilterNames); ++nFilter
)
+{
+if (mxComponent.is())
+mxComponent-dispose();
+mxComponent =
loadFromDesktop(getURLFromSrc(/sw/qa/extras/globalfilter/data/graphic_shape.odt),
com.sun.star.text.TextDocument);
+
+// Export the document and import again for a check
+uno::Referenceframe::XStorable xStorable(mxComponent,
uno::UNO_QUERY);
+
+utl::MediaDescriptor aMediaDescriptor;
+aMediaDescriptor[FilterName] = aFilterNames[nFilter];
+
+utl::TempFile aTempFile;
+aTempFile.EnableKillingFile();
+xStorable-storeToURL(aTempFile.GetURL(),
aMediaDescriptor.getAsConstPropertyValueList());
+uno::Reference lang::XComponent xComponent(xStorable,
uno::UNO_QUERY);
+xComponent-dispose();
+mxComponent = loadFromDesktop(aTempFile.GetURL(),
com.sun.star.text.TextDocument);
+
+// Check whether graphic exported well
+uno::Referencedrawing::XDrawPageSupplier
xDrawPageSupplier(mxComponent, uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess
xDraws(xDrawPageSupplier-getDrawPage(), uno::UNO_QUERY);
+
+const OString sFailedMessage = OString(Failed on filter: )
++ OUStringToOString(aFilterNames[nFilter],
RTL_TEXTENCODING_ASCII_US);
+CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
static_castsal_Int32(2), xDraws-getCount());
+
+uno::Referencedrawing::XShape xImage = getShape(1);
+uno::Reference beans::XPropertySet XPropSet( xImage,
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/appl/lnkbase2.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 8ab56d59735048836f0b121e45638b3c5ad1b252
Author: Tor Lillqvist t...@collabora.com
Date: Mon Dec 8 16:34:09 2014 +0200
WaE: Unreferenced function definition
Change-Id: I2e405a8a02ef81b82b4762bd826769c2491b3aec
diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx
index 8b5b0e5..a5e1d8c 100644
--- a/sfx2/source/appl/lnkbase2.cxx
+++ b/sfx2/source/appl/lnkbase2.cxx
@@ -100,10 +100,12 @@ class ImplDdeItem : public DdeGetPutItem
bool bIsValidData : 1;
bool bIsInDTOR : 1;
public:
+#if defined WNT
ImplDdeItem( SvBaseLink rLink, const OUString rStr )
: DdeGetPutItem( rStr ), pLink( rLink ), bIsValidData( false ),
bIsInDTOR( false )
{}
+#endif
virtual ~ImplDdeItem();
virtual DdeData* Get( sal_uIntPtr ) SAL_OVERRIDE;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: README.Android
README.Android | 23 +-- 1 file changed, 5 insertions(+), 18 deletions(-) New commits: commit 1256809ba235e1813b38bb7e96d8f1a6c5b6499f Author: Miklos Vajna vmik...@collabora.co.uk Date: Mon Dec 8 16:25:49 2014 +0100 README.Android: mention ndk-gdb --start Change-Id: Ib131c480b53665fc9e9a38388e3cc179eac249c2 diff --git a/README.Android b/README.Android index 9ae7fd3..98a109d 100644 --- a/README.Android +++ b/README.Android @@ -46,27 +46,14 @@ know. But don't seem to be necessary on a real device anyway? * Debugging - Install the .apk to the device, start the application, and: + Install the .apk to the device, and: cd android/experimental/LOAndroid3 - android-ndk-r9d/ndk-gdb --adb=android-sdk-linux/platform-tools/adb + android-ndk-r10d/ndk-gdb --adb=android-sdk-linux/platform-tools/adb --start - Some versions of the NDK had a broken gdb in the way that it can see -symbols only for shlibs that were already loaded when the debuggee was -attached, so you need to carefully guess where to put: - - fprintf(stderr, Sleeping NOW!\n); ::sleep(20); - - into the code; and when you see that in logcat, you have time -to run: ndk-gdb and it will attach the process. - - thread 12 # or perhaps 13 - backtrace - - may show you the native code trace. - - In r8b the ndk-gdb seems to work a bit better, and I think it isn't -necessary to use the mingw-and-ndk ndb-gdb any longer. + It seems that the have to start the app before gdb can connect to it +and the pending breakpoints do not work problems are now resolved with the +current NDK. * Getting the symbols ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/globalfilter/globalfilter.cxx | 16 +++-
1 file changed, 7 insertions(+), 9 deletions(-)
New commits:
commit ab61d71c8b59facc0910016dc098cdf78ebd47b4
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Mon Dec 8 10:46:01 2014 -0500
Build fix (for gcc 4.7).
Change-Id: Ib52cfc8ba45361277ef8e0b6021a03c3ff8ae668
diff --git a/sw/qa/extras/globalfilter/globalfilter.cxx
b/sw/qa/extras/globalfilter/globalfilter.cxx
index c4b9811..43b213b 100644
--- a/sw/qa/extras/globalfilter/globalfilter.cxx
+++ b/sw/qa/extras/globalfilter/globalfilter.cxx
@@ -186,7 +186,7 @@ void Test::testImageWithSpecialID()
// Check how LO handles when the imported graphic's ID is different from
that one
// which is generated by LO.
-const OUString aFilterNames[] = {
+const char* aFilterNames[] = {
writer8,
Rich Text Format,
MS Word 97,
@@ -208,7 +208,7 @@ void Test::testImageWithSpecialID()
uno::Referenceframe::XStorable xStorable(mxComponent,
uno::UNO_QUERY);
utl::MediaDescriptor aMediaDescriptor;
-aMediaDescriptor[FilterName] = aFilterNames[nFilter];
+aMediaDescriptor[FilterName] =
OUString::createFromAscii(aFilterNames[nFilter]);
utl::TempFile aTempFile;
aTempFile.EnableKillingFile();
@@ -221,8 +221,7 @@ void Test::testImageWithSpecialID()
uno::Referencedrawing::XDrawPageSupplier
xDrawPageSupplier(mxComponent, uno::UNO_QUERY);
uno::Referencecontainer::XIndexAccess
xDraws(xDrawPageSupplier-getDrawPage(), uno::UNO_QUERY);
-const OString sFailedMessage = OString(Failed on filter: )
-+ OUStringToOString(aFilterNames[nFilter],
RTL_TEXTENCODING_ASCII_US);
+const OString sFailedMessage = OString(Failed on filter: ) +
aFilterNames[nFilter];
CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
static_castsal_Int32(2), xDraws-getCount());
uno::Referencedrawing::XShape xImage = getShape(1);
@@ -268,7 +267,7 @@ void Test::testGraphicShape()
// There are two kind of images in Writer: 1) Writer specific handled by
SwGrfNode and
// 2) graphic shape handled by SdrGrafObj (e.g. after copypaste from
Impress).
-const OUString aFilterNames[] = {
+const char* aFilterNames[] = {
writer8,
Rich Text Format,
MS Word 97,
@@ -290,7 +289,7 @@ void Test::testGraphicShape()
uno::Referenceframe::XStorable xStorable(mxComponent,
uno::UNO_QUERY);
utl::MediaDescriptor aMediaDescriptor;
-aMediaDescriptor[FilterName] = aFilterNames[nFilter];
+aMediaDescriptor[FilterName] =
OUString::createFromAscii(aFilterNames[nFilter]);
utl::TempFile aTempFile;
aTempFile.EnableKillingFile();
@@ -303,8 +302,7 @@ void Test::testGraphicShape()
uno::Referencedrawing::XDrawPageSupplier
xDrawPageSupplier(mxComponent, uno::UNO_QUERY);
uno::Referencecontainer::XIndexAccess
xDraws(xDrawPageSupplier-getDrawPage(), uno::UNO_QUERY);
-const OString sFailedMessage = OString(Failed on filter: )
-+ OUStringToOString(aFilterNames[nFilter],
RTL_TEXTENCODING_ASCII_US);
+const OString sFailedMessage = OString(Failed on filter: ) +
aFilterNames[nFilter];
CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(),
static_castsal_Int32(2), xDraws-getCount());
uno::Referencedrawing::XShape xImage = getShape(1);
@@ -327,7 +325,7 @@ void Test::testGraphicShape()
}
// MS filters make this kind of linked images broken !?
-if( aFilterNames[nFilter] != writer8 )
+if( OUString::createFromAscii(aFilterNames[nFilter]) !=
OUString(writer8) )
return;
// Second image is a linked one
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 4 commits - sc/qa sc/source sw/qa sw/source writerfilter/source
sc/qa/unit/ucalc.cxx |2 -
sc/source/core/data/dptabres.cxx |3 +-
sw/qa/core/data/ooxml/pass/fdo63164-1.docx|binary
sw/source/core/draw/dpage.cxx |4 +-
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 32 +++---
writerfilter/source/dmapper/DomainMapper_Impl.hxx |2 +
6 files changed, 35 insertions(+), 8 deletions(-)
New commits:
commit af64f430181088460d5c574683dd1fdfd377ebcd
Author: Caolán McNamara caol...@redhat.com
Date: Mon Dec 8 16:11:41 2014 +
writer won't allow us to enter multiple CrossRefBookmarks on the same node
e.g. fdo63164-1.docx and loads more like that, and the .docx genuinely has
multiple bookmarks at the same place, so just allow the first one and
discard
the following ones
Change-Id: Ida2f5d79fdef4ed3e2d8c1e96ca6a086004f6c7d
diff --git a/sw/qa/core/data/ooxml/pass/fdo63164-1.docx
b/sw/qa/core/data/ooxml/pass/fdo63164-1.docx
new file mode 100644
index 000..768ec6c
Binary files /dev/null and b/sw/qa/core/data/ooxml/pass/fdo63164-1.docx differ
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 7176485..6c7bbdb 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -55,6 +55,7 @@
#include com/sun/star/text/XParagraphCursor.hpp
#include com/sun/star/text/XRedline.hpp
#include com/sun/star/text/XTextFieldsSupplier.hpp
+#include com/sun/star/text/XTextRangeCompare.hpp
#include com/sun/star/style/DropCapFormat.hpp
#include com/sun/star/util/NumberFormatter.hpp
#include com/sun/star/util/XNumberFormatsSupplier.hpp
@@ -4416,11 +4417,34 @@ void DomainMapper_Impl::StartOrEndBookmark( const
OUString rId )
{
xCursor-goLeft( 1, false );
}
+
uno::Reference container::XNamed xBkmNamed( xBookmark,
uno::UNO_QUERY_THROW );
-assert(!aBookmarkIter-second.m_sBookmarkName.isEmpty());
-//todo: make sure the name is not used already!
-xBkmNamed-setName( aBookmarkIter-second.m_sBookmarkName );
-xTextAppend-insertTextContent( uno::Reference
text::XTextRange ( xCursor, uno::UNO_QUERY_THROW), xBookmark,
!xCursor-isCollapsed() );
+
+bool bAllowInsert = true;
+uno::Referencetext::XTextRange xRange(xCursor,
uno::UNO_QUERY_THROW);
+if (m_xPrevBookmark.is())
+{
+fprintf(stderr, ok here\n);
+uno::Referencetext::XTextRangeCompare
xTextRangeCompare(xRange-getText(), uno::UNO_QUERY_THROW);
+fprintf(stderr, still ok here\n);
+
+if
(xTextRangeCompare-compareRegionStarts(m_xPrevBookmark, xRange) == 0
+xTextRangeCompare-compareRegionEnds(m_xPrevBookmark,
xRange) == 0)
+{
+SAL_WARN(writerfilter, Cannot insert bookmark
aBookmarkIter-second.m_sBookmarkName
+ because another one is
already inserted at this point);
+bAllowInsert = false;
+}
+}
+
+if (bAllowInsert)
+{
+assert(!aBookmarkIter-second.m_sBookmarkName.isEmpty());
+//todo: make sure the name is not used already!
+xBkmNamed-setName( aBookmarkIter-second.m_sBookmarkName
);
+xTextAppend-insertTextContent(xRange, xBookmark,
!xCursor-isCollapsed());
+m_xPrevBookmark = xRange;
+}
}
m_aBookmarkMap.erase( aBookmarkIter );
m_sCurrentBkmkId.clear();
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 11e58cd..c218f53 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -349,6 +349,8 @@ private:
LineNumberSettings
m_aLineNumberSettings;
BookmarkMap_t
m_aBookmarkMap;
+/// Detect attempt to insert multiple bookmarks at the same position
+css::uno::Referencecss::text::XTextRange
m_xPrevBookmark;
OUString
m_sCurrentBkmkId;
OUString
m_sCurrentBkmkName;
commit 93913ce2a71c66f57c9fe6a4b12c12ca6f7f473e
Author: Caolán McNamara caol...@redhat.com
Date: Mon Dec 8 14:56:44 2014 +
coverity#735379 annotate to dismiss Copy-paste error
on the basis that it
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - xmloff/source
xmloff/source/chart/PropertyMap.hxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit 80fc80ae704e3ba3587cde3d146829dc012d29a1 Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Sun Dec 7 00:01:30 2014 +0100 import part for: related fdo#45266, don't write extension elements into ... ODF namespaces See master commit 88d3931d92bc89519acf95f0510f6f2a6ff7c72c Change-Id: I8ec31d026f5c6fdc4b7fc573060e7837a337d50b Signed-off-by: Michael Stahl mst...@redhat.com diff --git a/xmloff/source/chart/PropertyMap.hxx b/xmloff/source/chart/PropertyMap.hxx index a876c2b..af19843 100644 --- a/xmloff/source/chart/PropertyMap.hxx +++ b/xmloff/source/chart/PropertyMap.hxx @@ -140,6 +140,9 @@ const XMLPropertyMapEntry aXMLChartPropMap[] = MAP_ENTRY_ODF12( DataTableHBorder, CHART, XML_CHART_DTABLE_SHOWHORZBORDER, XML_TYPE_BOOL ), MAP_ENTRY_ODF12( DataTableVBorder, CHART, XML_CHART_DTABLE_SHOWVERTBORDER, XML_TYPE_BOOL ), MAP_ENTRY_ODF12( DataTableOutline, CHART, XML_CHART_DTABLE_SHOWOUTLINE, XML_TYPE_BOOL ), +MAP_ENTRY_ODF_EXT_IMPORT( DataTableHBorder, LO_EXT, XML_CHART_DTABLE_SHOWHORZBORDER, XML_TYPE_BOOL ), +MAP_ENTRY_ODF_EXT_IMPORT( DataTableVBorder, LO_EXT, XML_CHART_DTABLE_SHOWVERTBORDER, XML_TYPE_BOOL ), +MAP_ENTRY_ODF_EXT_IMPORT( DataTableOutline, LO_EXT, XML_CHART_DTABLE_SHOWOUTLINE, XML_TYPE_BOOL ), // Chart display units flags MAP_ENTRY_ODF_EXT( DisplayUnits, LO_EXT, XML_CHART_DUNITS_DISPLAYUNITS, XML_TYPE_BOOL ), MAP_ENTRY_ODF_EXT( BuiltInUnit, LO_EXT, XML_CHART_DUNITS_BUILTINUNIT, XML_TYPE_STRING ), ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sc/source
sc/source/filter/xml/xmlbodyi.cxx |5 +
sc/source/filter/xml/xmlimprt.cxx |1 +
2 files changed, 6 insertions(+)
New commits:
commit b8159be15ae420d58dbf27dff0af80f2856a038f
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Mon Dec 8 00:42:08 2014 +0100
import part for put that attribute into an extension namespace
See master commit 6f55edf340ea83d02e5ba60d05df868a4a04a2c0
Change-Id: Ie3618e44416a0765877e4b09e41e058d2808cdee
Signed-off-by: Michael Stahl mst...@redhat.com
diff --git a/sc/source/filter/xml/xmlbodyi.cxx
b/sc/source/filter/xml/xmlbodyi.cxx
index 56dba8c..5abc841 100644
--- a/sc/source/filter/xml/xmlbodyi.cxx
+++ b/sc/source/filter/xml/xmlbodyi.cxx
@@ -114,6 +114,11 @@ ScXMLBodyContext::ScXMLBodyContext( ScXMLImport rImport,
else if (IsXMLToken(aLocalName,
XML_PROTECTION_KEY_DIGEST_ALGORITHM_2))
meHash2 = ScPassHashHelper::getHashTypeFromURI(sValue);
}
+else if(nPrefix == XML_NAMESPACE_LO_EXT)
+{
+if (IsXMLToken(aLocalName, XML_PROTECTION_KEY_DIGEST_ALGORITHM_2))
+meHash2 = ScPassHashHelper::getHashTypeFromURI(sValue);
+}
}
}
diff --git a/sc/source/filter/xml/xmlimprt.cxx
b/sc/source/filter/xml/xmlimprt.cxx
index e1b73fe..379bb52 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -910,6 +910,7 @@ const SvXMLTokenMap ScXMLImport::GetTableAttrTokenMap()
{ XML_NAMESPACE_TABLE, XML_PROTECTION_KEY,
XML_TOK_TABLE_PASSWORD },
{ XML_NAMESPACE_TABLE, XML_PROTECTION_KEY_DIGEST_ALGORITHM,
XML_TOK_TABLE_PASSHASH },
{ XML_NAMESPACE_TABLE, XML_PROTECTION_KEY_DIGEST_ALGORITHM_2,
XML_TOK_TABLE_PASSHASH_2 },
+{ XML_NAMESPACE_LO_EXT, XML_PROTECTION_KEY_DIGEST_ALGORITHM_2,
XML_TOK_TABLE_PASSHASH_2 },
{ XML_NAMESPACE_TABLE, XML_PRINT, XML_TOK_TABLE_PRINT
},
XML_TOKEN_MAP_END
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/Library_vcl.mk vcl/win
vcl/Library_vcl.mk|8
vcl/win/source/app/salshl.cxx | 21 +
2 files changed, 1 insertion(+), 28 deletions(-)
New commits:
commit 322ca1cea29a0ef94696a6cd0807ad3bb5bf6edf
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Dec 8 17:59:03 2014 +0100
No idea why this would need to be an archaic LibMain
Change-Id: I4a41a2975f670b06159de5c94ab9a66ab204c725
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 7c8ccb5..69db0a3 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -694,14 +694,6 @@ $(eval $(call gb_Library_use_system_win32_libs,vcl,\
))
$(eval $(call gb_Library_add_nativeres,vcl,vcl/salsrc))
-
-ifeq ($(COM),MSC)
-ifeq ($(USE_MINGW),)
-$(eval $(call gb_Library_add_ldflags,vcl,\
-/ENTRY:LibMain@12 \
-))
-endif
-endif
endif
ifeq ($(OS),LINUX)
diff --git a/vcl/win/source/app/salshl.cxx b/vcl/win/source/app/salshl.cxx
index 0aa2b75..c418063 100644
--- a/vcl/win/source/app/salshl.cxx
+++ b/vcl/win/source/app/salshl.cxx
@@ -23,32 +23,13 @@
SalShlData aSalShlData;
-extern C
+extern C BOOL WINAPI DllMain(HINSTANCE hInst, DWORD nReason, LPVOID)
{
-
-#ifdef __MINGW32__
-bool WINAPI DllMain( HINSTANCE hInst, DWORD nReason, LPVOID pReserved )
-#else
-BOOL WINAPI _CRT_INIT( HINSTANCE hInst, DWORD nReason, LPVOID pReserved );
-
-BOOL WINAPI LibMain( HINSTANCE hInst, DWORD nReason, LPVOID pReserved )
-#endif
-{
-// Unsere DLL-Initialisierung
if ( nReason == DLL_PROCESS_ATTACH )
aSalShlData.mhInst = hInst;
-
-#ifndef __MINGW32__
-if ( !_CRT_INIT( hInst, nReason, pReserved ) )
-return 0;
-#else
-(void)pReserved;
-#endif
return 1;
}
-}
-
HCURSOR ImplLoadSalCursor( int nId )
{
DBG_ASSERT( aSalShlData.mhInst, no DLL instance handle );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sc/source
sc/source/filter/xml/XMLExportDataPilot.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e9681cc74fcb84ebd9d3e68bef8d3158cfbe45eb Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Sun Dec 7 00:55:48 2014 +0100 correct order of xml elements, related fdo#45266 (cherry-picked from a26222f5af55e8ffe9784dd411485d3c5c72e983) Signed-off-by: Michael Stahl mst...@redhat.com Change-Id: I03ea0e5bb064222e50dc08a682091ec3e23bf11d diff --git a/sc/source/filter/xml/XMLExportDataPilot.cxx b/sc/source/filter/xml/XMLExportDataPilot.cxx index 4b9c913..047934f 100644 --- a/sc/source/filter/xml/XMLExportDataPilot.cxx +++ b/sc/source/filter/xml/XMLExportDataPilot.cxx @@ -699,8 +699,8 @@ void ScXMLExportDataPilot::WriteDimension(ScDPSaveDimension* pDim, const ScDPDim rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_FUNCTION, sValueStr); SvXMLElementExport aElemDPF(rExport, XML_NAMESPACE_TABLE, XML_DATA_PILOT_FIELD, true, true); -WriteFieldReference(pDim); WriteLevels(pDim); +WriteFieldReference(pDim); if( pDim-GetOrientation() != sheet::DataPilotFieldOrientation_DATA ) WriteGroupDimElements(pDim, pDimData); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: slideshow/source
slideshow/source/engine/shapes/drawshape.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit dde94c73483af85cd3d8feed3282e785b80c988a Author: Caolán McNamara caol...@redhat.com Date: Mon Dec 8 16:53:07 2014 + coverity#1257110 Big parameter passed by value and coverity#1186125 Big parameter passed by value Change-Id: I6cb6863645647edf4fba114059195582679c30c4 diff --git a/slideshow/source/engine/shapes/drawshape.cxx b/slideshow/source/engine/shapes/drawshape.cxx index d7ef2b4..a3b89b7 100644 --- a/slideshow/source/engine/shapes/drawshape.cxx +++ b/slideshow/source/engine/shapes/drawshape.cxx @@ -168,6 +168,7 @@ namespace slideshow } // redraw all view shapes, by calling their update() method +ViewShape::RenderArgs renderArgs( getViewRenderArgs() ); if( ::std::count_if( maViewShapes.begin(), maViewShapes.end(), ::boost::bindbool( @@ -178,7 +179,7 @@ namespace slideshow // the extra mem_fn. WTF. _1, ::boost::cref( mpCurrMtf ), - getViewRenderArgs(), + ::boost::cref( renderArgs ), nUpdateFlags, isVisible() ) ) != static_castViewShapeVector::difference_type(maViewShapes.size()) ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/doc/tblrwcl.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit ed759f9cc5ba0e49a122ce396e013a47554bf89f
Author: Caolán McNamara caol...@redhat.com
Date: Mon Dec 8 17:12:39 2014 +
bracket up this horror anyway
Change-Id: I7607ecd8c0e5d67a6e38e1930b416fa834906dd3
diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx
index 227091d..60cc5c8 100644
--- a/sw/source/core/doc/tblrwcl.cxx
+++ b/sw/source/core/doc/tblrwcl.cxx
@@ -3794,6 +3794,7 @@ bool SwTable::SetColWidth( SwTableBox rAktBox,
sal_uInt16 eType,
}
}
else
+{
for( n = aLines.size(); n; )
{
--n;
@@ -3802,6 +3803,7 @@ bool SwTable::SetColWidth( SwTableBox rAktBox,
sal_uInt16 eType,
(*fnOtherBox)( aLines[ n ], aParam1, nDistStt, false );
(*fnSelBox)( aLines[ n ], aParam, nDistStt, false );
}
+}
}
}
break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sw/inc
sw/inc/ring.hxx |7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
New commits:
commit d13501f194b3a8095e283e0a3d65d1db02e70dad
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Mon Dec 8 18:20:51 2014 +0100
typo
Change-Id: I5f6b2136f4eb5cdb4825a3df3fc7d2015d8a3d85
diff --git a/sw/inc/ring.hxx b/sw/inc/ring.hxx
index d1e46a6..e4c62f5 100644
--- a/sw/inc/ring.hxx
+++ b/sw/inc/ring.hxx
@@ -180,7 +180,7 @@ namespace sw
/**
* Merges two ring containers. All item from both ring containers
will
* be in the same ring container in the end.
- * Note: value_typehe items of this ring container will be
inserted just before
+ * Note: The items of this ring container will be inserted just
before
* item pDestRing
* @param pDestRing the container to merge this container with
*/
@@ -227,7 +227,7 @@ namespace sw
value_type dereference() const
{ return m_pCurrent ? *m_pCurrent : * m_pStart; }
/**
- * value_typehis is:
+ * value_type is is:
* - pointing to the current item in the iteration in general
* - nullptr if on the first item (begin())
* - m_pStart when beyond the last item (end())
commit bf4eca5b90e915a7273fe9f746187740683ceabe
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Mon Dec 8 18:18:06 2014 +0100
trying to make this fit in gcc-4.6s little brain
Change-Id: I0c247a0f316b6700017ae0668b41497811924577
diff --git a/sw/inc/ring.hxx b/sw/inc/ring.hxx
index 59c3981..d1e46a6 100644
--- a/sw/inc/ring.hxx
+++ b/sw/inc/ring.hxx
@@ -105,14 +105,15 @@ namespace sw
#if !defined(__clang__) defined(__GNUC__) (__GNUC__ == 4)
(__GNUC_MINOR__ 7)
// gcc 4.6 backwards compat hack, remove ASAP when we drop support
templatetypename gcc_hack_value friend class sw::RingContainer;
+templatetypename gcc_hack_value friend class sw::RingIterator;
#else
friend ring_container;
friend const_ring_container;
-#endif
friend typename ring_container::iterator;
friend typename ring_container::const_iterator;
friend typename const_ring_container::iterator;
friend typename const_ring_container::const_iterator;
+#endif
friend class boost::iterator_core_access;
typedef
boost::intrusive::circular_list_algorithmsRing_node_traits algo;
value_type* pNext;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sd/source
sd/source/core/stlpool.cxx |8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
New commits:
commit 447b9634a11c63bc8f08d6921a24d494d264daf6
Author: David Tardon dtar...@redhat.com
Date: Mon Dec 8 18:12:54 2014 +0100
limit scope of variable
Change-Id: I74ccd6c8a3cfd45929973f21418458f3a83243af
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index 94f8f96..29d5e98 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -640,8 +640,6 @@ struct HasFamilyPredicate : svl::StyleSheetPredicate
void SdStyleSheetPool::CopySheets(SdStyleSheetPool rSourcePool,
SfxStyleFamily eFamily, SdStyleSheetVector rCreatedSheets, OUString
rRenameSuffix)
{
-OUString aHelpFile;
-
std::vector std::pair rtl::Reference SfxStyleSheetBase , OUString
aNewStyles;
std::vector std::pair OUString, OUString aRenamedList;
@@ -700,7 +698,10 @@ void SdStyleSheetPool::CopySheets(SdStyleSheetPool
rSourcePool, SfxStyleFamily
aNewStyles.push_back( std::pair rtl::Reference
SfxStyleSheetBase , OUString ( xNewSheet, aParent ) );
if( !bAddToList )
+{
+OUString aHelpFile;
xNewSheet-SetHelpId( aHelpFile, xSheet-GetHelpId( aHelpFile
) );
+}
xNewSheet-GetItemSet().Put( xSheet-GetItemSet() );
rCreatedSheets.push_back( SdStyleSheetRef( static_cast
SdStyleSheet* ( xNewSheet.get() ) ) );
commit e4cf5d1a98469c17133f33fc8220e6b41f65e9a0
Author: David Tardon dtar...@redhat.com
Date: Mon Dec 8 18:06:01 2014 +0100
don't copy stylesheet's HelpID if this's a rename
This causes problems for renamed copies of std. styles, as they have
special handling in SdStyleSheet::SetHelpId, which would set the API
name to std. value too. That means that there would be two (or more)
stylesheets with the same API name. On export, only one of them would be
exported.
Change-Id: I19d243bd3f73995e8de2d251e3d8b7f93219c3a9
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index 095054e..94f8f96 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -699,7 +699,8 @@ void SdStyleSheetPool::CopySheets(SdStyleSheetPool
rSourcePool, SfxStyleFamily
if( !aParent.isEmpty() )
aNewStyles.push_back( std::pair rtl::Reference
SfxStyleSheetBase , OUString ( xNewSheet, aParent ) );
-xNewSheet-SetHelpId( aHelpFile, xSheet-GetHelpId( aHelpFile ) );
+if( !bAddToList )
+xNewSheet-SetHelpId( aHelpFile, xSheet-GetHelpId( aHelpFile
) );
xNewSheet-GetItemSet().Put( xSheet-GetItemSet() );
rCreatedSheets.push_back( SdStyleSheetRef( static_cast
SdStyleSheet* ( xNewSheet.get() ) ) );
___
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 raal r...@post.cz changed: What|Removed |Added Depends on|79332 | -- 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 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 Robinson Tryon (qubit) qu...@runcibility.com changed: What|Removed |Added Depends on||87111 -- 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/qa
sc/qa/unit/ucalc_sharedformula.cxx | 117 ++---
1 file changed, 84 insertions(+), 33 deletions(-)
New commits:
commit 72406d531c84d40a711bb4fbd0de1bc9e03d9ea4
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Mon Dec 8 13:51:08 2014 -0500
Convert some test cases to using insertRangeData().
To make sure they use range-based area listeners (when applicable) and
make sure that they still pass.
Change-Id: I75b73b6feb34057268277212733476ddede2b757
diff --git a/sc/qa/unit/ucalc_sharedformula.cxx
b/sc/qa/unit/ucalc_sharedformula.cxx
index 2ef7d88..677f4ff 100644
--- a/sc/qa/unit/ucalc_sharedformula.cxx
+++ b/sc/qa/unit/ucalc_sharedformula.cxx
@@ -274,10 +274,16 @@ void Test::testSharedFormulasRefUpdate()
m_pDoc-SetValue(ScAddress(0,10,0), 2);
m_pDoc-SetValue(ScAddress(0,11,0), 3);
-// Insert formulas that reference A10:A12 in B1:B3.
-m_pDoc-SetString(ScAddress(1,0,0), =A10);
-m_pDoc-SetString(ScAddress(1,1,0), =A11);
-m_pDoc-SetString(ScAddress(1,2,0), =A12);
+{
+// Insert formulas that reference A10:A12 in B1:B3.
+const char* pData[][1] = {
+{ =A10 },
+{ =A11 },
+{ =A12 }
+};
+
+insertRangeData(m_pDoc, ScAddress(1,0,0), pData,
SAL_N_ELEMENTS(pData));
+}
if (!checkFormula(*m_pDoc, ScAddress(1,0,0), A10))
CPPUNIT_FAIL(Wrong formula in B1);
@@ -420,9 +426,14 @@ void Test::testSharedFormulasRefUpdateMove()
CPPUNIT_ASSERT_EQUAL(2.0, m_pDoc-GetValue(ScAddress(1,2,0)));
CPPUNIT_ASSERT_EQUAL(3.0, m_pDoc-GetValue(ScAddress(1,3,0)));
+const char* aData[][1] = {
+{ =RC[-1] },
+{ =RC[-1] },
+{ =RC[-1] }
+};
+
// Set formulas in C2:C4 that reference B2:B4 individually.
-for (SCROW i = 1; i = 3; ++i)
-m_pDoc-SetString(ScAddress(2,i,0), =RC[-1]);
+insertRangeData(m_pDoc, ScAddress(2,1,0), aData, SAL_N_ELEMENTS(aData));
// Check the formula results.
CPPUNIT_ASSERT_EQUAL(1.0, m_pDoc-GetValue(ScAddress(2,1,0)));
@@ -480,11 +491,15 @@ void Test::testSharedFormulasRefUpdateMove2()
CPPUNIT_ASSERT_EQUAL(1.0, m_pDoc-GetValue(ScAddress(4,1,0)));
CPPUNIT_ASSERT_EQUAL(2.0, m_pDoc-GetValue(ScAddress(4,2,0)));
-// Set formulas in C2:C3 that reference B2:B4 individually, and F2:F3 to
E2:E3.
-for (SCROW i = 1; i = 2; ++i)
{
-m_pDoc-SetString(ScAddress(2,i,0), =RC[-1]);
-m_pDoc-SetString(ScAddress(5,i,0), =RC[-1]);
+// Set formulas in C2:C3 that reference B2:B3 individually, and F2:F3
to E2:E3.
+const char* pData[][1] = {
+{ =RC[-1] },
+{ =RC[-1] }
+};
+
+insertRangeData(m_pDoc, ScAddress(2,1,0), pData,
SAL_N_ELEMENTS(pData));
+insertRangeData(m_pDoc, ScAddress(5,1,0), pData,
SAL_N_ELEMENTS(pData));
}
m_pDoc-CalcFormulaTree(); // calculate manually.
@@ -537,10 +552,16 @@ void Test::testSharedFormulasRefUpdateRange()
m_pDoc-SetValue(ScAddress(0,3,0), 2);
m_pDoc-SetValue(ScAddress(0,4,0), 3);
-// Insert formulas to B3:B5.
-m_pDoc-SetString(ScAddress(1,2,0), =SUM($A$3:$A$5));
-m_pDoc-SetString(ScAddress(1,3,0), =SUM($A$3:$A$5));
-m_pDoc-SetString(ScAddress(1,4,0), =SUM($A$3:$A$5));
+{
+// Insert formulas to B3:B5.
+const char* pData[][1] = {
+{ =SUM($A$3:$A$5) },
+{ =SUM($A$3:$A$5) },
+{ =SUM($A$3:$A$5) }
+};
+
+insertRangeData(m_pDoc, ScAddress(1,2,0), pData,
SAL_N_ELEMENTS(pData));
+}
if (!checkFormula(*m_pDoc, ScAddress(1,2,0), SUM($A$3:$A$5)))
CPPUNIT_FAIL(Wrong formula);
@@ -700,12 +721,18 @@ void Test::testSharedFormulasRefUpdateExternal()
rExtDoc.SetString(ScAddress(0,1,0), B);
rExtDoc.SetString(ScAddress(0,2,0), C);
-// Insert formula cells in A7:A10 of the host document, referencing A1:A3
-// of the external document.
-m_pDoc-SetString(ScAddress(0,6,0), ='file:///extdata.fake'#$Data.A1);
-m_pDoc-SetString(ScAddress(0,7,0), ='file:///extdata.fake'#$Data.A2);
-m_pDoc-SetString(ScAddress(0,8,0), ='file:///extdata.fake'#$Data.A3);
-m_pDoc-SetString(ScAddress(0,9,0),
=COUNTA('file:///extdata.fake'#$Data.A1:A3));
+{
+// Insert formula cells in A7:A10 of the host document, referencing
A1:A3
+// of the external document.
+const char* pData[][1] = {
+{ ='file:///extdata.fake'#$Data.A1 },
+{ ='file:///extdata.fake'#$Data.A2 },
+{ ='file:///extdata.fake'#$Data.A3 },
+{ =COUNTA('file:///extdata.fake'#$Data.A1:A3) }
+};
+
+insertRangeData(m_pDoc, ScAddress(0,6,0), pData,
SAL_N_ELEMENTS(pData));
+}
// Check the formula results.
CPPUNIT_ASSERT_EQUAL(OUString(A), m_pDoc-GetString(ScAddress(0,6,0)));
@@ -845,9 +872,17 @@ void Test::testSharedFormulasInsertRow()
// Set value to A4.
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 Robinson Tryon (qubit) qu...@runcibility.com changed: What|Removed |Added Depends on||69495 -- 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 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Robinson Tryon (qubit) qu...@runcibility.com changed: What|Removed |Added Depends on|69495 | -- 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 'libreoffice-4-3' - writerfilter/source
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 11 +++
1 file changed, 7 insertions(+), 4 deletions(-)
New commits:
commit dcc914ab55feb844d5d71e6568801fa1ffd47f6c
Author: Caolán McNamara caol...@redhat.com
Date: Mon Dec 8 11:24:14 2014 +
Resolves: fdo#86662 don't crash on docx load
ok in master, so just don't crash in 4-3 series
Change-Id: I2dcb7b0434341ff8058bdbdfc065ad08bd0600bc
Reviewed-on: https://gerrit.libreoffice.org/13374
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 1654744..bc4ff52 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -3952,10 +3952,13 @@ void DomainMapper_Impl::CloseFieldCommand()
OUString aCode( pContext-GetCommand().trim() );
xFieldInterface =
m_xTextFactory-createInstance(com.sun.star.text.Fieldmark);
const uno::Referencetext::XTextContent
xTextContent(xFieldInterface, uno::UNO_QUERY_THROW);
-uno::Reference text::XTextAppend xTextAppend;
-xTextAppend = m_aTextAppendStack.top().xTextAppend;
-uno::Reference text::XTextCursor xCrsr =
xTextAppend-createTextCursorByRange(pContext-GetStartRange());
-if (xTextContent.is())
+uno::Reference text::XTextAppend xTextAppend;
+if (!m_aTextAppendStack.empty())
+xTextAppend = m_aTextAppendStack.top().xTextAppend;
+uno::Reference text::XTextCursor xCrsr;
+if (xTextAppend.is())
+xCrsr =
xTextAppend-createTextCursorByRange(pContext-GetStartRange());
+if (xTextAppend.is() xTextContent.is())
{
xTextAppend-insertTextContent(xCrsr,xTextContent,
sal_True);
}
___
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 72628, which changed state. Bug 72628 Summary: Different font substitutes used for view in Writer vs. export for PDF https://bugs.freedesktop.org/show_bug.cgi?id=72628 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |WORKSFORME -- 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 'libreoffice-4-3-5' - xmloff/source
xmloff/source/text/XMLTextMarkImportContext.cxx | 49
1 file changed, 34 insertions(+), 15 deletions(-)
New commits:
commit 1317e958f2195e2b05cdf72ca5eb1c04e64dc1bd
Author: Michael Stahl mst...@redhat.com
Date: Fri Dec 5 18:04:39 2014 +0100
fdo#86795: xmloff: ODF import: do not import checkbox fieldmark ...
... if it has start/end, because Writer will become grumpy and crash.
(cherry picked from commit 25fd11e78279aef5a6b7656347758e5c67a9c45a)
Conflicts:
xmloff/source/text/XMLTextMarkImportContext.cxx
Change-Id: I6024051249eeac6ed9e43856fa77db969287f888
Reviewed-on: https://gerrit.libreoffice.org/13319
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
(cherry picked from commit b903e2a7ac730865d9a6ee48fb0392ecff2c7d30)
Reviewed-on: https://gerrit.libreoffice.org/13376
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/xmloff/source/text/XMLTextMarkImportContext.cxx
b/xmloff/source/text/XMLTextMarkImportContext.cxx
index 8aaa952..d8f8bef 100644
--- a/xmloff/source/text/XMLTextMarkImportContext.cxx
+++ b/xmloff/source/text/XMLTextMarkImportContext.cxx
@@ -143,7 +143,7 @@ static const char *lcl_getFormFieldmarkName(OUString name)
return NULL;
}
-static OUString lcl_getFieldmarkName(OUString name)
+static OUString lcl_getFieldmarkName(OUString const name)
{
static const char sFormtext[]=ODF_FORMTEXT;
if (name.equalsAscii(msoffice.field.FORMTEXT) ||
@@ -288,19 +288,40 @@ void XMLTextMarkImportContext::EndElement()
bool
bImportAsField=((lcl_MarkType)nTmp==TypeFieldmarkEnd
m_rHelper.hasCurrentFieldCtx());
-// insert reference
-const ReferenceXInterface xContent(
-CreateAndInsertMark(GetImport(),
-
(bImportAsField?sAPI_fieldmark:sAPI_bookmark),
-m_sBookmarkName,
-xInsertionCursor,
-m_sXmlId) );
-if (pRDFaAttributes)
+// fdo#86795 check if it's actually a checkbox
first
+bool isInvalid(false);
+OUString fieldmarkTypeName;
+if (bImportAsField
m_rHelper.hasCurrentFieldCtx())
{
-const Referencerdf::XMetadatable
-xMeta(xContent, UNO_QUERY);
-GetImport().GetRDFaImportHelper().AddRDFa(
-xMeta, pRDFaAttributes);
+
+OUString const
type(m_rHelper.getCurrentFieldType());
+fieldmarkTypeName = lcl_getFieldmarkName(type);
+if (fieldmarkTypeName == ODF_FORMCHECKBOX ||
+fieldmarkTypeName == ODF_FORMDROPDOWN)
+{ // sw can't handle checkbox with start+end
+SAL_INFO(xmloff.text, invalid
fieldmark-start/fieldmark-end ignored);
+isInvalid = true;
+}
+}
+
+ReferenceXInterface xContent;
+if (!isInvalid)
+{
+// insert reference
+xContent = CreateAndInsertMark(GetImport(),
+(bImportAsField
+? OUString(sAPI_fieldmark)
+: OUString(sAPI_bookmark)),
+m_sBookmarkName,
+xInsertionCursor,
+m_sXmlId);
+if (pRDFaAttributes)
+{
+const Referencerdf::XMetadatable
+xMeta(xContent, UNO_QUERY);
+GetImport().GetRDFaImportHelper().AddRDFa(
+xMeta, pRDFaAttributes);
+}
}
if ((lcl_MarkType)nTmp==TypeFieldmarkEnd) {
@@ -308,8 +329,6 @@ void XMLTextMarkImportContext::EndElement()
// setup fieldmark...
Reference
::com::sun::star::text::XFormField xFormField(xContent, UNO_QUERY);
if (xFormField.is()
m_rHelper.hasCurrentFieldCtx()) {
-
[Libreoffice-commits] core.git: sw/source
sw/source/core/doc/tblrwcl.cxx |7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
New commits:
commit ae93dac18ec099282676c1434fa95420c0451761
Author: Caolán McNamara caol...@redhat.com
Date: Mon Dec 8 17:28:38 2014 +
coverity#1242459 Identical code for different branches
on the somewhat dubious logic of matching the otherwise
near-identical duplicate logic later on
Change-Id: Ic029cafbf2fa2a1fd3cf78464d58977f90bbc418
diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx
index 60cc5c8..ac310b4 100644
--- a/sw/source/core/doc/tblrwcl.cxx
+++ b/sw/source/core/doc/tblrwcl.cxx
@@ -3770,8 +3770,7 @@ bool SwTable::SetColWidth( SwTableBox rAktBox,
sal_uInt16 eType,
if( bInsDel )
{
aParam1.bBigger = !aParam.bBigger;
-xFndBox.reset(::lcl_SaveInsDelData( aParam, ppUndo,
-aTmpLst, nDistStt));
+xFndBox.reset(::lcl_SaveInsDelData(aParam, ppUndo,
aTmpLst, nDistStt));
if( ppUndo )
*ppUndo = aParam.CreateUndo(
aParam.bBigger ? UNDO_TABLE_DELBOX
@@ -3781,7 +3780,7 @@ bool SwTable::SetColWidth( SwTableBox rAktBox,
sal_uInt16 eType,
*ppUndo = new SwUndoAttrTbl( *aParam.pTblNd, true );
if( bInsDel
-? ( TBLFIX_CHGABS == eTblChgMode ? bLeft : bLeft )
+? ( TBLFIX_CHGABS == eTblChgMode ? (bBigger bLeft) :
bLeft )
: ( TBLFIX_CHGABS != eTblChgMode bLeft ) )
{
for( n = aLines.size(); n; )
@@ -3886,7 +3885,7 @@ bool SwTable::SetColWidth( SwTableBox rAktBox,
sal_uInt16 eType,
if( bInsDel )
{
aParam1.bBigger = !aParam.bBigger;
-xFndBox.reset(::lcl_SaveInsDelData( aParam, ppUndo,
aTmpLst, nDistStt ));
+xFndBox.reset(::lcl_SaveInsDelData(aParam, ppUndo,
aTmpLst, nDistStt));
if( ppUndo )
*ppUndo = aParam.CreateUndo(
aParam.bBigger ? UNDO_TABLE_DELBOX
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svl svl/source
include/svl/style.hxx | 16 --
svl/source/items/style.cxx | 103 +
2 files changed, 59 insertions(+), 60 deletions(-)
New commits:
commit 6163291b25d2dac74ac353c3879fdc520bee747e
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Mon Dec 8 15:24:45 2014 -0500
Move IndexedStyleSheets to the Imp(l) class.
And remove #include vector which wasn't really used.
Change-Id: I05bbc7848c753795f859f80725be6332d8e5ce46
diff --git a/include/svl/style.hxx b/include/svl/style.hxx
index 78c1bc4..34ba57b 100644
--- a/include/svl/style.hxx
+++ b/include/svl/style.hxx
@@ -24,7 +24,6 @@
#include com/sun/star/lang/XUnoTunnel.hpp
#include rtl/ref.hxx
-#include vector
#include comphelper/weak.hxx
#include cppuhelper/implbase2.hxx
#include svl/svldllapi.h
@@ -273,15 +272,6 @@ public:
* Not an actual public function. Do not call it from non-subclasses.
*/
SfxStyleSheetBase Add( const SfxStyleSheetBase );
-
-private:
-/** This member holds the indexed style sheets.
- *
- * @internal
- * This member is private and not protected in order to have more control
which style sheets are added
- * where. Ideally, all calls which add/remove/change style sheets are done
in the base class.
- */
-boost::shared_ptrsvl::IndexedStyleSheets mIndexedStyleSheets;
};
@@ -302,11 +292,7 @@ public:
virtual boolSetParent( const OUString ) SAL_OVERRIDE;
protected:
-SfxStyleSheet() // do not use! needed by MSVC at compile time to satisfy
ImplInheritanceHelper2
-: SfxStyleSheetBase(OUString(dummy), NULL, SFX_STYLE_FAMILY_ALL, 0)
-{
-assert(false);
-}
+SfxStyleSheet(); // do not use! needed by MSVC at compile time to satisfy
ImplInheritanceHelper2
virtual ~SfxStyleSheet();
};
diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx
index 0f460c5..9d78b6c 100644
--- a/svl/source/items/style.cxx
+++ b/svl/source/items/style.cxx
@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include svl/style.hxx
+
#include com/sun/star/lang/XComponent.hpp
#include tools/tenccvt.hxx
@@ -29,7 +31,6 @@
#include svl/itempool.hxx
#include svl/IndexedStyleSheets.hxx
#include svl/itemiter.hxx
-#include svl/style.hxx
#include unotools/syslocale.hxx
#include algorithm
#include comphelper/servicehelper.hxx
@@ -80,10 +81,21 @@ SfxStyleSheetHint::SfxStyleSheetHint
{}
-class SfxStyleSheetBasePool_Impl
+class SfxStyleSheetBasePool_Impl : boost::noncopyable
{
public:
SfxStyleSheetIteratorPtr pIter;
+
+/** This member holds the indexed style sheets.
+ *
+ * @internal
+ * This member is private and not protected in order to have more control
which style sheets are added
+ * where. Ideally, all calls which add/remove/change style sheets are done
in the base class.
+ */
+boost::shared_ptrsvl::IndexedStyleSheets mpIndexedStyleSheets;
+
+SfxStyleSheetBasePool_Impl() :
+mpIndexedStyleSheets(new svl::IndexedStyleSheets) {}
};
@@ -433,16 +445,16 @@ sal_uInt16 SfxStyleSheetIterator::Count()
sal_uInt16 n = 0;
if( IsTrivialSearch())
{
-n = (sal_uInt16)
pBasePool-mIndexedStyleSheets-GetNumberOfStyleSheets();
+n = (sal_uInt16)
pBasePool-pImp-mpIndexedStyleSheets-GetNumberOfStyleSheets();
}
else if(nMask == SFXSTYLEBIT_ALL)
{
-n =
static_castsal_uInt16(pBasePool-mIndexedStyleSheets-GetStyleSheetPositionsByFamily(nSearchFamily).size());
+n =
static_castsal_uInt16(pBasePool-pImp-mpIndexedStyleSheets-GetStyleSheetPositionsByFamily(nSearchFamily).size());
}
else
{
DoesStyleMatchStyleSheetPredicate predicate(this);
-n =
pBasePool-mIndexedStyleSheets-GetNumberOfStyleSheetsWithPredicate(predicate);
+n =
pBasePool-pImp-mpIndexedStyleSheets-GetNumberOfStyleSheetsWithPredicate(predicate);
}
return n;
}
@@ -452,14 +464,14 @@ SfxStyleSheetBase*
SfxStyleSheetIterator::operator[](sal_uInt16 nIdx)
SfxStyleSheetBase* retval = NULL;
if( IsTrivialSearch())
{
-retval =
pBasePool-mIndexedStyleSheets-GetStyleSheetByPosition(nIdx).get();
+retval =
pBasePool-pImp-mpIndexedStyleSheets-GetStyleSheetByPosition(nIdx).get();
nAktPosition = nIdx;
}
else if(nMask == SFXSTYLEBIT_ALL)
{
rtl::Reference SfxStyleSheetBase ref =
-pBasePool-mIndexedStyleSheets-GetStyleSheetByPosition(
-
pBasePool-mIndexedStyleSheets-GetStyleSheetPositionsByFamily(nSearchFamily).at(nIdx))
+pBasePool-pImp-mpIndexedStyleSheets-GetStyleSheetByPosition(
+
pBasePool-pImp-mpIndexedStyleSheets-GetStyleSheetPositionsByFamily(nSearchFamily).at(nIdx))
;
retval = ref.get();
nAktPosition = nIdx;
@@ -468,10 +480,10 @@ SfxStyleSheetBase*
Mattias Põldaru license statement
Hello World I hereby declare: All of my past future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. As for possible art-related work including templates, images, pictures and possibly other forms of art, to the extent possible under law, I waive all copyright and related or neighboring rights to my past future contributions to LibreOffice: http://creativecommons.org/publicdomain/zero/1.0 Regards Mattias Põldaru ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 32664] Keyboard volume keys don't work when LibreOffice is in focus
https://bugs.freedesktop.org/show_bug.cgi?id=32664 --- Comment #54 from Daniel dan...@nusalaska.com --- Just coming back to say that this bug still exists in 4.3.4.1 I am using Windows7 SP1 x64 bit. Tested with Spotify, Windows Media Player, Win Amp -- 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
[ANN] LIbreOffice 4.2.8 RC2 available
Dear Community, The Document Foundation is pleased to announce the second release candidate of LibreOffice 4.2.8. The upcoming 4.2.8 is an additional bugfix release to finish off the 4.2 codeline line. Feel free to give it a try instead of 4.2.7. The release is available for Windows, Linux and Mac OS X from our QA builds download page at http://www.libreoffice.org/download/pre-releases/ Developers and QA might also be interested in the symbol server for windows debug information (see the release notes linked below for details) Should you find bugs, please report them to the FreeDesktop Bugzilla: https://bugs.freedesktop.org A good way to assess the release candidate quality is to run some specific manual tests on it, our TCM wiki page has more details: http://wiki.documentfoundation.org/QA/Testing/Regression_Tests#Full_Regression_Test For other ways to get involved with this exciting project - you can e.g. contribute code: http://www.libreoffice.org/community/developers/ translate LibreOffice to your language: http://wiki.documentfoundation.org/LibreOffice_Localization_Guide or help with funding our operations: http://donate.libreoffice.org/ A list of known issues and fixed bugs with 4.2.8 RC2 is available from our wiki: http://wiki.documentfoundation.org/Releases/4.2.8/RC2 Let us close again with a BIG Thank You! to all of you having contributed to the LibreOffice project - this release would not have been possible without your help. On behalf of the Community, Christian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ANN] LibreOffice 4.4.0 Beta2 available
Dear Community, The Document Foundation is pleased to announce the second Beta release of LibreOffice 4.4.0. The upcoming 4.4.0 will be the ninth major release of LibreOffice, coming with a bunch of new features beside the usual bugfixes. The Beta2 can be installed alongside the stable version, so feel free to give it a try. Beta2 is not ready for production yet, and while Beta1 marks feature freeze, final UI and string freeze is yet to come, and translations are not complete. A work-in-progress list of new features in LibreOffice 4.4 can be found at https://wiki.documentfoundation.org/ReleaseNotes/4.4 The release is available for Windows, Linux and Mac OS X from our QA builds download page at http://www.libreoffice.org/download/pre-releases Developers and QA might also be interested in the symbol server for windows debug information (see the release notes linked below for details) Should you find bugs, please report them to the FreeDesktop Bugzilla: https://bugs.freedesktop.org A good way to assess the release candidate quality is to run some specific manual tests on it, our TCM wiki page has more details: http://wiki.documentfoundation.org/QA/Testing/Regression_Tests#Full_Regression_Test For other ways to get involved with this exciting project - you can e.g. contribute code: http://www.libreoffice.org/community/developers/ translate LibreOffice to your language: http://wiki.documentfoundation.org/LibreOffice_Localization_Guide or help with funding our operations: http://donate.libreoffice.org/ A list of known issues and fixed bugs with 4.4.0 Beta2 is available from our wiki: http://wiki.documentfoundation.org/Releases/4.4.0/Beta2 Let us close again with a BIG Thank You! to all of you having contributed to the LibreOffice project - this release would not have been possible without your help. On behalf of the Community, Christian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 4 commits - sc/inc sc/source
sc/inc/column.hxx | 12 +
sc/inc/table.hxx|2
sc/source/core/data/column.cxx | 73
sc/source/core/data/documen7.cxx| 44 -
sc/source/core/data/document.cxx|3 -
sc/source/core/data/formulacell.cxx |1
sc/source/core/data/table2.cxx |4 -
sc/source/core/data/table4.cxx |2
8 files changed, 109 insertions(+), 32 deletions(-)
New commits:
commit 887cb59ac4bfca94f310baee3e9da58ccf9cb3e3
Author: Eike Rathke er...@redhat.com
Date: Tue Dec 9 03:49:10 2014 +0100
assert the impossible
Change-Id: I5fd2c7635f204bda982f1df58b4c19fe9b12464a
diff --git a/sc/source/core/data/documen7.cxx b/sc/source/core/data/documen7.cxx
index 45c9416..5b6c3a4 100644
--- a/sc/source/core/data/documen7.cxx
+++ b/sc/source/core/data/documen7.cxx
@@ -365,18 +365,30 @@ void ScDocument::RemoveFromFormulaTree( ScFormulaCell*
pCell )
{
OSL_ENSURE( pCell, RemoveFromFormulaTree: pCell Null );
ScFormulaCell* pPrev = pCell-GetPrevious();
-// wenn die Zelle die erste oder sonstwo ist
+assert(pPrev != pCell); // pointing to itself?!?
+// if the cell is first or somwhere in chain
if ( pPrev || pFormulaTree == pCell )
{
ScFormulaCell* pNext = pCell-GetNext();
+assert(pNext != pCell); // pointing to itself?!?
if ( pPrev )
-pPrev-SetNext( pNext );// gibt Vorlaeufer
+{
+assert(pFormulaTree != pCell); // if this cell is also head
something's wrong
+pPrev-SetNext( pNext );// predecessor exists, set
successor
+}
else
-pFormulaTree = pNext; // ist erste Zelle
+{
+pFormulaTree = pNext; // this cell was first cell
+}
if ( pNext )
-pNext-SetPrevious( pPrev );// gibt Nachfolger
+{
+assert(pEOFormulaTree != pCell); // if this cell is also tail
something's wrong
+pNext-SetPrevious( pPrev );// sucessor exists, set predecessor
+}
else
-pEOFormulaTree = pPrev; // ist letzte Zelle
+{
+pEOFormulaTree = pPrev; // this cell was last cell
+}
pCell-SetPrevious( 0 );
pCell-SetNext( 0 );
sal_uInt16 nRPN = pCell-GetCode()-GetCodeLen();
@@ -543,18 +555,30 @@ void ScDocument::RemoveFromFormulaTrack( ScFormulaCell*
pCell )
{
OSL_ENSURE( pCell, RemoveFromFormulaTrack: pCell Null );
ScFormulaCell* pPrev = pCell-GetPreviousTrack();
-// wenn die Zelle die erste oder sonstwo ist
+assert(pPrev != pCell); // pointing to itself?!?
+// if the cell is first or somwhere in chain
if ( pPrev || pFormulaTrack == pCell )
{
ScFormulaCell* pNext = pCell-GetNextTrack();
+assert(pNext != pCell); // pointing to itself?!?
if ( pPrev )
-pPrev-SetNextTrack( pNext ); // gibt Vorlaeufer
+{
+assert(pFormulaTrack != pCell); // if this cell is also head
something's wrong
+pPrev-SetNextTrack( pNext ); // predecessor exists, set
successor
+}
else
-pFormulaTrack = pNext; // ist erste Zelle
+{
+pFormulaTrack = pNext; // this cell was first cell
+}
if ( pNext )
-pNext-SetPreviousTrack( pPrev ); // gibt Nachfolger
+{
+assert(pEOFormulaTrack != pCell); // if this cell is also tail
something's wrong
+pNext-SetPreviousTrack( pPrev ); // sucessor exists, set
predecessor
+}
else
-pEOFormulaTrack = pPrev;// ist letzte Zelle
+{
+pEOFormulaTrack = pPrev;// this cell was last cell
+}
pCell-SetPreviousTrack( 0 );
pCell-SetNextTrack( 0 );
--nFormulaTrackCount;
commit 1e9aa174865cc65b132a8b3e728b8a5adbcd8b90
Author: Eike Rathke er...@redhat.com
Date: Tue Dec 9 03:00:47 2014 +0100
in ScFormulaCell dtor remove cell also from FormulaTrack
It could happen that during a SetDirty/Notify cycle a formula cell is
appended to the formula track but not tracked yet so doesn't end up in
the formula tree. If it was deleted then without removing it from the
track the cell pointer shortly after was moved into the tree, possibly
setting pFormulaTree (and/or pEOFormulaTree) to that cell if it was the
last cell, and if immediately after that a new ScFormulaCell was
allocated at exactly the same memory location it virtually ended up as a
successor of itself in the formula tree ... leading to a crash if pCode
was accessed in a subsequent RemoveFromFormulaTree because the cell was
assumed to be already in the tree.
Change-Id:
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sc/source
sc/source/core/data/formulacell.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 8cb37cc090f754c4dafe5731c827539f01743671
Author: Eike Rathke er...@redhat.com
Date: Tue Dec 9 03:00:47 2014 +0100
in ScFormulaCell dtor remove cell also from FormulaTrack
It could happen that during a SetDirty/Notify cycle a formula cell is
appended to the formula track but not tracked yet so doesn't end up in
the formula tree. If it was deleted then without removing it from the
track the cell pointer shortly after was moved into the tree, possibly
setting pFormulaTree (and/or pEOFormulaTree) to that cell if it was the
last cell, and if immediately after that a new ScFormulaCell was
allocated at exactly the same memory location it virtually ended up as a
successor of itself in the formula tree ... leading to a crash if pCode
was accessed in a subsequent RemoveFromFormulaTree because the cell was
assumed to be already in the tree.
Change-Id: I9d1885a26b85c2331a084b5f89a2d7373cf2df0f
(cherry picked from commit 1e9aa174865cc65b132a8b3e728b8a5adbcd8b90)
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index 65c21e4..b4e56b2 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -889,6 +889,7 @@ ScFormulaCell::ScFormulaCell( const ScFormulaCell rCell,
ScDocument rDoc, cons
ScFormulaCell::~ScFormulaCell()
{
+pDocument-RemoveFromFormulaTrack( this );
pDocument-RemoveFromFormulaTree( this );
pDocument-RemoveSubTotalCell(this);
if (pCode-HasOpCode(ocMacro))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 39440] cppcheck cleanliness
https://bugs.freedesktop.org/show_bug.cgi?id=39440 Commit Notification libreoffice-comm...@lists.freedesktop.org changed: What|Removed |Added Whiteboard|EasyHack DifficultyBeginner |EasyHack DifficultyBeginner |SkillCpp TopicCleanup |SkillCpp TopicCleanup |target:4.1.0 target:4.3.0 |target:4.1.0 target:4.3.0 ||target:4.5.0 -- 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: dbaccess/source
dbaccess/source/ui/dlg/ConnectionHelper.cxx|3 +--
dbaccess/source/ui/dlg/queryfilter.cxx |5 ++---
dbaccess/source/ui/dlg/tablespage.cxx |6 ++
dbaccess/source/ui/misc/WCPage.cxx |3 +--
dbaccess/source/ui/querydesign/JoinTableView.cxx |3 +--
dbaccess/source/ui/querydesign/querycontroller.cxx |2 +-
dbaccess/source/ui/tabledesign/TEditControl.cxx|3 +--
dbaccess/source/ui/tabledesign/TableController.cxx |3 +--
8 files changed, 10 insertions(+), 18 deletions(-)
New commits:
commit 141469eb831c054d6f4b56fcaa50a03e52429f11
Author: Michael Weghorn m.wegh...@posteo.de
Date: Mon Dec 8 21:09:53 2014 +0100
fdo#39440 reduce scope of local variables
This addresses some cppcheck warnings.
Change-Id: I8931ff46394923d672e08b3a5c9ab75bb6ffb0a9
Reviewed-on: https://gerrit.libreoffice.org/13385
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index 33863aa..7649be1 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@ -534,7 +534,6 @@ namespace dbaui
IS_PATH_EXIST OConnectionHelper::pathExists(const OUString _rURL, bool
bIsFile) const
{
::ucbhelper::Content aCheckExistence;
-bool bExists = false;
IS_PATH_EXIST eExists = PATH_NOT_EXIST;
Reference ::com::sun::star::task::XInteractionHandler
xInteractionHandler(
task::InteractionHandler::createWithParent(m_xORB, 0), UNO_QUERY );
@@ -545,7 +544,7 @@ namespace dbaui
try
{
aCheckExistence = ::ucbhelper::Content(_rURL, xCmdEnv,
comphelper::getProcessComponentContext());
-bExists = bIsFile? aCheckExistence.isDocument():
aCheckExistence.isFolder();
+const bool bExists = bIsFile? aCheckExistence.isDocument():
aCheckExistence.isFolder();
eExists = bExists? PATH_EXIST: PATH_NOT_EXIST;
}
catch(const Exception)
diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx
b/dbaccess/source/ui/dlg/queryfilter.cxx
index 7c3ad25..1274a03 100644
--- a/dbaccess/source/ui/dlg/queryfilter.cxx
+++ b/dbaccess/source/ui/dlg/queryfilter.cxx
@@ -297,11 +297,11 @@ bool DlgFilterCrit::getCondition(const ListBox
_rField,const ListBox _rComp,co
try
{
OUString sTableName;
-bool bFunction = false;
_rFilter.Name = _rField.GetSelectEntry();
Reference XPropertySet xColumn = getQueryColumn(_rFilter.Name);
if ( xColumn.is() )
{
+bool bFunction = false;
Reference XPropertySetInfo xInfo =
xColumn-getPropertySetInfo();
if ( xInfo-hasPropertyByName(PROPERTY_REALNAME) )
{
@@ -818,10 +818,9 @@ void DlgFilterCrit::fillLines(const
SequenceSequencePropertyValue _aValue
{
const SequencePropertyValue * pOrIter = _aValues.getConstArray();
const SequencePropertyValue * pOrEnd = pOrIter + _aValues.getLength();
-bool bOr = true;
for(sal_uInt16 i=0;pOrIter != pOrEnd; ++pOrIter)
{
-bOr = true;
+bool bOr = true;
const PropertyValue* pAndIter = pOrIter-getConstArray();
const PropertyValue* pAndEnd= pAndIter + pOrIter-getLength();
for(;pAndIter != pAndEnd; ++pAndIter)
diff --git a/dbaccess/source/ui/dlg/tablespage.cxx
b/dbaccess/source/ui/dlg/tablespage.cxx
index 9b8104c..ce9da40 100644
--- a/dbaccess/source/ui/dlg/tablespage.cxx
+++ b/dbaccess/source/ui/dlg/tablespage.cxx
@@ -162,8 +162,6 @@ namespace dbaui
OUString sCatalog, sSchema, sName;
SvTreeListEntry* pRootEntry = m_pTablesList-getAllObjectsEntry();
-bool bAllTables = false;
-bool bAllSchemas = false;
const OUString* pIncludeTable = _rTables.getConstArray();
for (sal_Int32 i=0; i_rTables.getLength(); ++i, ++pIncludeTable)
@@ -173,8 +171,8 @@ namespace dbaui
else
sName = pIncludeTable-getStr();
-bAllTables = (1 == sName.getLength()) ('%' == sName[0]);
-bAllSchemas = (1 == sSchema.getLength()) ('%' == sSchema[0]);
+bool bAllTables = (1 == sName.getLength()) ('%' == sName[0]);
+bool bAllSchemas = (1 == sSchema.getLength()) ('%' ==
sSchema[0]);
// the catalog entry
SvTreeListEntry* pCatalog =
m_pTablesList-GetEntryPosByName(sCatalog, pRootEntry);
diff --git a/dbaccess/source/ui/misc/WCPage.cxx
b/dbaccess/source/ui/misc/WCPage.cxx
index ae647cf..5d2b824 100644
--- a/dbaccess/source/ui/misc/WCPage.cxx
+++ b/dbaccess/source/ui/misc/WCPage.cxx
@@ -277,11 +277,10 @@ bool OCopyTable::checkAppendData()
ODatabaseExport::TColumnVector::const_iterator aDestIter=
rDestColumns.begin();
[Bug 39440] cppcheck cleanliness
https://bugs.freedesktop.org/show_bug.cgi?id=39440 --- Comment #22 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Michael Weghorn committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=141469eb831c054d6f4b56fcaa50a03e52429f11 fdo#39440 reduce scope of local variables It will be available in 4.5.0. 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
[Libreoffice-commits] core.git: cli_ure/source connectivity/source
cli_ure/source/uno_bridge/cli_data.cxx |4 +---
connectivity/source/drivers/dbase/DTable.cxx|6 ++
connectivity/source/drivers/dbase/dindexnode.cxx|3 +--
connectivity/source/drivers/file/FStatement.cxx |3 +--
connectivity/source/drivers/firebird/Util.cxx |2 +-
connectivity/source/drivers/hsqldb/HDriver.cxx |3 +--
connectivity/source/drivers/jdbc/PreparedStatement.cxx |3 ++-
connectivity/source/drivers/macab/MacabRecords.cxx |3 +--
connectivity/source/drivers/odbc/OPreparedStatement.cxx |5 +
9 files changed, 11 insertions(+), 21 deletions(-)
New commits:
commit 54cbb57d4c3ccf1e1c8455ac413183edbdeb3416
Author: Michael Weghorn m.wegh...@posteo.de
Date: Mon Dec 8 19:36:22 2014 +0100
fdo#39440 reduce scope of local variables
This addresses some cppcheck warnings.
Change-Id: Ib35eb591534c3f23adc3cb7b7fa9696dc5cbeabf
Reviewed-on: https://gerrit.libreoffice.org/13383
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
diff --git a/cli_ure/source/uno_bridge/cli_data.cxx
b/cli_ure/source/uno_bridge/cli_data.cxx
index c1671d7..3efd7a4 100644
--- a/cli_ure/source/uno_bridge/cli_data.cxx
+++ b/cli_ure/source/uno_bridge/cli_data.cxx
@@ -1058,12 +1058,10 @@ void Bridge::map_to_uno(void * uno_data,
System::Object^ cli_data,
sal_Int32 nPos = 0;
try
{
-typelib_TypeDescriptionReference * member_type= NULL;
-
OUString usUnoException(com.sun.star.uno.Exception);
for (; nPos nMembers; ++nPos)
{
-member_type= comp_td-ppTypeRefs[nPos];
+typelib_TypeDescriptionReference * member_type=
comp_td-ppTypeRefs[nPos];
System::Object^ val= nullptr;
if (cli_data != nullptr)
{
diff --git a/connectivity/source/drivers/dbase/DTable.cxx
b/connectivity/source/drivers/dbase/DTable.cxx
index 19fc244..8f10214 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -2551,12 +2551,11 @@ void ODbaseTable::copyData(ODbaseTable*
_pNewTable,sal_Int32 _nPos)
(aRow-get())[nPos]-setBound(false);
-bool bOk = true;
sal_Int32 nCurPos;
OValueRefVector::Vector::iterator aIter;
for(sal_uInt32 nRowPos = 0; nRowPos m_aHeader.db_anz;++nRowPos)
{
-bOk = seekRow( IResultSetHelper::BOOKMARK, nRowPos+1, nCurPos );
+bool bOk = seekRow( IResultSetHelper::BOOKMARK, nRowPos+1, nCurPos );
if ( bOk )
{
bOk = fetchRow( aRow, *m_aColumns, true, true);
@@ -2698,8 +2697,6 @@ End:
bool ODbaseTable::ReadMemo(sal_Size nBlockNo, ORowSetValue aVariable)
{
-bool bIsText = true;
-
m_pMemoStream-Seek(nBlockNo * m_aMemoHeader.db_size);
switch (m_aMemoHeader.db_typ)
{
@@ -2732,6 +2729,7 @@ bool ODbaseTable::ReadMemo(sal_Size nBlockNo,
ORowSetValue aVariable)
case MemoFoxPro:
case MemodBaseIV: // dBase IV-Memofield with length
{
+bool bIsText = true;
char sHeader[4];
m_pMemoStream-Read(sHeader,4);
// Foxpro stores text and binary data
diff --git a/connectivity/source/drivers/dbase/dindexnode.cxx
b/connectivity/source/drivers/dbase/dindexnode.cxx
index 01f66a9..65774cb 100644
--- a/connectivity/source/drivers/dbase/dindexnode.cxx
+++ b/connectivity/source/drivers/dbase/dindexnode.cxx
@@ -194,7 +194,6 @@ bool ONDXPage::Insert(ONDXNode rNode, sal_uInt32 nRowsLeft)
bool bAppend = nRowsLeft 0;
if (IsFull())
{
-bool bResult = true;
ONDXNode aSplitNode;
if (bAppend)
aSplitNode = rNode;
@@ -204,7 +203,7 @@ bool ONDXPage::Insert(ONDXNode rNode, sal_uInt32 nRowsLeft)
aSplitNode = (*this)[nCount-1];
if(rNode.GetKey() = aSplitNode.GetKey())
{
-
+bool bResult = true;
// this practically reduces the number of nodes by 1
if (IsLeaf() this == rIndex.m_aCurLeaf)
{
diff --git a/connectivity/source/drivers/file/FStatement.cxx
b/connectivity/source/drivers/file/FStatement.cxx
index d93fef8..d0d0ab2 100644
--- a/connectivity/source/drivers/file/FStatement.cxx
+++ b/connectivity/source/drivers/file/FStatement.cxx
@@ -574,11 +574,10 @@ void OStatement_Base::GetAssignValues()
OSL_ENSURE(pInsertAtomCommalist != NULL,OResultSet:
pInsertAtomCommalist darf nicht NULL sein!);
OSL_ENSURE(pInsertAtomCommalist-count() 0,OResultSet:
pInsertAtomCommalist = 0);
-OSQLParseNode * pRow_Value_Const;
sal_Int32 nIndex=0;
for (sal_uInt32 i = 0; i pInsertAtomCommalist-count(); i++)
{
-pRow_Value_Const =
[Bug 39440] cppcheck cleanliness
https://bugs.freedesktop.org/show_bug.cgi?id=39440 --- Comment #23 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Michael Weghorn committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=54cbb57d4c3ccf1e1c8455ac413183edbdeb3416 fdo#39440 reduce scope of local variables It will be available in 4.5.0. 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
[Libreoffice-commits] core.git: Repository.mk vcl/Executable_mtfdemo.mk vcl/Module_vcl.mk vcl/source vcl/workben
Repository.mk |1
vcl/Executable_mtfdemo.mk | 59 ++
vcl/Module_vcl.mk |3
vcl/source/gdi/gdimtf.cxx |4 +
vcl/workben/mtfdemo.cxx | 146 ++
5 files changed, 212 insertions(+), 1 deletion(-)
New commits:
commit 5757af8008cb6881e9a40ec2b4e28330bc4fef7f
Author: Chris Sherlock chris.sherloc...@gmail.com
Date: Tue Dec 9 14:21:33 2014 +1100
vcl: add new metafile viewer demo - mainly for fdo#80503
This is going to be very helpful troubleshooting problems with metafiles
that just won't display.
Change-Id: I661dd40e04434a9c64a0f59d9310d36444601989
diff --git a/Repository.mk b/Repository.mk
index b851dfd..3a65bc2 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -72,6 +72,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \
outdevgrind) \
vcldemo \
tiledrendering \
+mtfdemo \
$(if $(and $(ENABLE_GTK), $(filter LINUX,$(OS))), gtktiledviewer) \
))
diff --git a/vcl/Executable_mtfdemo.mk b/vcl/Executable_mtfdemo.mk
new file mode 100644
index 000..749547b
--- /dev/null
+++ b/vcl/Executable_mtfdemo.mk
@@ -0,0 +1,59 @@
+# -*- 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_Executable_Executable,mtfdemo))
+
+$(eval $(call gb_Executable_use_api,mtfdemo,\
+offapi \
+udkapi \
+))
+
+$(eval $(call gb_Executable_use_external,mtfdemo,boost_headers))
+
+$(eval $(call gb_Executable_set_include,mtfdemo,\
+$$(INCLUDE) \
+-I$(SRCDIR)/vcl/inc \
+-I$(SRCDIR)/solenv/inc \
+))
+
+$(eval $(call gb_Executable_use_libraries,mtfdemo,\
+ basegfx \
+tl \
+sal \
+vcl \
+cppu \
+cppuhelper \
+comphelper \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,mtfdemo,\
+vcl/workben/mtfdemo \
+))
+
+$(eval $(call gb_Executable_use_static_libraries,mtfdemo,\
+vclmain \
+))
+
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Executable_add_libs,mtfdemo,\
+ -lm \
+ -ldl \
+ -lpthread \
+-lGL \
+-lGLU \
+-lX11 \
+))
+
+$(eval $(call gb_Executable_use_static_libraries,mtfdemo,\
+ glxtest \
+))
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index 329740a..9cc9ee0 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -29,7 +29,8 @@ $(eval $(call gb_Module_add_targets,vcl,\
$(if $(filter LINUX MACOSX WNT,$(OS)), \
Executable_icontest \
Executable_outdevgrind \
- Executable_vcldemo )) \
+ Executable_vcldemo \
+Executable_mtfdemo )) \
$(if $(filter-out ANDROID IOS WNT,$(OS)), \
Executable_svdemo \
Executable_svptest \
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index cb71949..20e4c22 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -2807,6 +2807,10 @@ SvStream ReadGDIMetaFile( SvStream rIStm, GDIMetaFile
rGDIMetaFile )
rIStm.SetNumberFormatInt( nOldFormat );
}
+else
+{
+SAL_WARN(vcl.gdi, Stream error: rIStm.GetError());
+}
return rIStm;
}
diff --git a/vcl/workben/mtfdemo.cxx b/vcl/workben/mtfdemo.cxx
new file mode 100644
index 000..41b9fe7
--- /dev/null
+++ b/vcl/workben/mtfdemo.cxx
@@ -0,0 +1,146 @@
+/* -*- 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/.
+ */
+
+#include comphelper/processfactory.hxx
+#include comphelper/random.hxx
+#include cppuhelper/bootstrap.hxx
+#include com/sun/star/lang/XMultiServiceFactory.hpp
+#include com/sun/star/lang/XInitialization.hpp
+#include com/sun/star/registry/XSimpleRegistry.hpp
+#include com/sun/star/ucb/UniversalContentBroker.hpp
+
+#include vcl/vclmain.hxx
+#include vcl/layout.hxx
+#include vcl/gdimtf.hxx
+#include vcl/wmf.hxx
+
+#include tools/urlobj.hxx
+#include tools/stream.hxx
+#include tools/vcompat.hxx
+#include vcl/svapp.hxx
+#include vcl/wrkwin.hxx
+#include vcl/virdev.hxx
+
+#include tools/stream.hxx
+
+#include cstdlib
+
+using namespace com::sun::star;
+
+using namespace css;
+
+class DemoMtfWin : public WorkWindow
+{
+GDIMetaFile *mpMtf;
+
+public:
+DemoMtfWin(OUString aFileName) :
+WorkWindow(NULL, WB_APP | WB_STDWORK)
+{
+
+
+SvFileStream aFileStream(aFileName, STREAM_READ);
+
+if (aFileStream.IsOpen())
+{
+
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - filter/source
filter/source/xsltdialog/xmlfiltersettingsdialog.cxx | 15 +++
filter/source/xsltdialog/xmlfiltersettingsdialog.hxx |1 +
2 files changed, 16 insertions(+)
New commits:
commit 90452b4eb40086b98ad21a19b154c404251c08e6
Author: Caolán McNamara caol...@redhat.com
Date: Mon Dec 8 09:56:33 2014 +
Resolves: rhbz#1164614 xslt dialog crashes if there are no entries
Change-Id: Id7d967389cbc9f8ae120749bbe1c79bbbe46b212
Reviewed-on: https://gerrit.libreoffice.org/13370
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index 8d85688..e698688 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -1355,6 +1355,16 @@ SvxPathControl::SvxPathControl(Window* pParent)
#define ITEMID_NAME 1
#define ITEMID_TYPE 2
+Size SvxPathControl::GetOptimalSize() const
+{
+Size aDefSize(LogicToPixel(Size(150, 0), MapMode(MAP_APPFONT)));
+Size aOptSize(VclVBox::GetOptimalSize());
+long nRowHeight(GetTextHeight());
+aOptSize.Height() = nRowHeight * 10;
+aOptSize.Width() = std::max(aDefSize.Width(), aOptSize.Width());
+return aOptSize;
+}
+
void SvxPathControl::setAllocation(const Size rAllocation)
{
VclVBox::setAllocation(rAllocation);
@@ -1366,6 +1376,11 @@ void SvxPathControl::setAllocation(const Size
rAllocation)
{
std::vectorlong aWidths;
m_pFocusCtrl-getPreferredDimensions(aWidths);
+if (aWidths.empty())
+{
+bHasBeenShown = false;
+return;
+}
long nFirstColumnWidth = aWidths[1];
m_pHeaderBar-SetItemSize(ITEMID_NAME, nFirstColumnWidth);
m_pHeaderBar-SetItemSize(ITEMID_TYPE, 0x);
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
index 7fbd362..86828af 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
@@ -44,6 +44,7 @@ private:
HeaderBar* m_pHeaderBar;
XMLFilterListBox* m_pFocusCtrl;
protected:
+virtual Size GetOptimalSize() const SAL_OVERRIDE;
virtual void setAllocation(const Size rAllocation) SAL_OVERRIDE;
public:
SvxPathControl(Window* pParent);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
About fdo#70185 starmath: unit test writing
Hi, I am going to prepare a unit test for starmath's import filter, which is proposed in https://bugs.freedesktop.org/show_bug.cgi?id=70185. As a first step, I have made up the test case attached for importing a MathML file. Running the test case named starmath_import seems to finish reading the input .mml, but failed in the end with the following message. --- [build CUT] starmath_import warn:legacy.osl:5812:1:starmath/source/mathmlimport.cxx:537: So there *was* a uno problem after all /home/tabe/core/starmath/qa/extras/mmlimport-test.cxx:63:(anonymous namespace)::Test::testSimple assertion failed - Expression: bLoaded - failed to load file:///home/tabe/core/starmath/qa/extras/data/simple.mml mmlimport-test.cxx:63:Assertion Test name: (anonymous namespace)::Test::testSimple assertion failed - Expression: bLoaded - failed to load file:///home/tabe/core/starmath/qa/extras/data/simple.mml Failures !!! Run: 1 Failure total: 1 Failures: 1 Errors: 0 warn:fwk:5812:1:framework/source/services/desktop.cxx:1020: Desktop disposed before terminating it warn:tools.debug:5812:1:tools/source/debug/debug.cxx:297: no DbgTestSolarMutex function set warn:fwk:5812:1:framework/source/services/desktop.cxx:185: Desktop not terminated before being destructed warn:legacy.osl:5812:1:unotools/source/config/configmgr.cxx:167: OSL_ASSERT: items_.empty() Error: a unit test failed, please do one of: export DEBUGCPPUNIT=TRUE# for exception catching export CPPUNITTRACE=gdb --args# for interactive debugging on Linux export CPPUNITTRACE=\[full path to devenv.exe]\ /debugexe # for interactive debugging in Visual Studio export VALGRIND=memcheck# for memory checking and retry using: make CppunitTest_starmath_import --- As far as I see, in the following code around line 508 of starmath/source/mathmlimport.cxx --- uno::Reference frame::XModel xModel = GetModel(); uno::Reference lang::XUnoTunnel xTunnel; xTunnel = uno::Reference lang::XUnoTunnel (xModel,uno::UNO_QUERY); SmModel *pModel = reinterpret_castSmModel * (xTunnel-getSomething(SmModel::getUnoTunnelId())); --- pModel ended up being NULL, but I have no idea what really happens. Could you give me any clue? Thank you for your attention. Cheers, -- Takeshi Abe From f82e628f77151d118b555efc0d15a1a8e60c4e3b Mon Sep 17 00:00:00 2001 From: Takeshi Abe t...@fixedpoint.jp Date: Tue, 9 Dec 2014 11:40:54 +0900 Subject: [PATCH] prototype of unit test for importing a MathML file Change-Id: I19f38c85b6475c15679653c31413e7d0f6aef309 --- starmath/CppunitTest_starmath_import.mk | 93 +++ starmath/Module_starmath.mk |1 + starmath/qa/extras/data/simple.mml | 13 + starmath/qa/extras/mmlimport-test.cxx | 92 ++ 4 files changed, 199 insertions(+) create mode 100644 starmath/CppunitTest_starmath_import.mk create mode 100644 starmath/qa/extras/data/simple.mml create mode 100644 starmath/qa/extras/mmlimport-test.cxx diff --git a/starmath/CppunitTest_starmath_import.mk b/starmath/CppunitTest_starmath_import.mk new file mode 100644 index 000..d570b9b --- /dev/null +++ b/starmath/CppunitTest_starmath_import.mk @@ -0,0 +1,93 @@ +# -*- 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_CppunitTest_CppunitTest,starmath_import)) + +$(eval $(call gb_CppunitTest_set_include,starmath_import,\ +$$(INCLUDE) \ +-I$(SRCDIR)/starmath/inc \ +)) + +$(eval $(call gb_CppunitTest_use_external,starmath_import,boost_headers)) + +$(eval $(call gb_CppunitTest_use_api,starmath_import,\ +offapi \ +udkapi \ +)) + +$(eval $(call gb_CppunitTest_use_library_objects,starmath_import,\ +sm \ +smd \ +)) + +$(eval $(call gb_CppunitTest_use_libraries,starmath_import,\ +comphelper \ +cppu \ +cppuhelper \ +editeng \ +i18nlangtag \ +i18nutil \ +msfilter \ +oox \ +sal \ +salhelper \ +sax \ +sfx \ +sot \ +svl \ +svt \ +svx \ +svxcore \ +test \ +tk \ +tl \ +unotest \ +unoxml \ +utl \ +vcl \ +xo \ + $(gb_UWINAPI) \ +)) + +$(eval $(call gb_CppunitTest_add_exception_objects,starmath_import,\ +starmath/qa/extras/mmlimport-test \ +)) + +$(eval $(call gb_CppunitTest_use_ure,starmath_import)) +$(eval $(call gb_CppunitTest_use_vcl,starmath_import)) + +$(eval $(call gb_CppunitTest_use_components,starmath_import,\ +configmgr/source/configmgr \ +framework/util/fwk \ +i18npool/util/i18npool \ +package/source/xstor/xstor \ +package/util/package2 \ +sfx2/util/sfx \ +starmath/util/sm \ +starmath/util/smd \ +toolkit/util/tk \ +
