LibreOffice Gerrit News for core on 2014-03-10
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + fdo#68849 Add header guards to bridges/* files. in https://gerrit.libreoffice.org/8500 from Jason Gerlowski about module bridges End of freshness + WIP: Converting ExtensionUpdate dialog for new format in https://gerrit.libreoffice.org/8506 from Rodolfo Ribeiro Gomes about module desktop, extras * Merged changes on master for project core changed in the last 25 hours: + fdo#70422 Moved the linked files from sw/source/ui to a new core/uibase d in https://gerrit.libreoffice.org/8447 from Roopak T J + fdo#63154 Remove old solar.h references in https://gerrit.libreoffice.org/8480 from Alexandre Vicenzi + fdo#63154 Remove unused solar.h reference in tools in https://gerrit.libreoffice.org/8505 from Alexandre Vicenzi * Abandoned changes on master for project core changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: + fdo#71984 fix first line indentation in footnotes for MS Word documents in https://gerrit.libreoffice.org/8160 from Andras Timar + fd0#74150:Numbered list getting display after RT -table-within-table-1.do in https://gerrit.libreoffice.org/7767 from Rajashri Udhoji + fdo#74111 3D Rotation is wrong after Round trip for pie chart in https://gerrit.libreoffice.org/7718 from Priyanka Gaikwad + Lots of changes to Tango icons in https://gerrit.libreoffice.org/7987 from Miroslav Mazel + sw/docx export: fix handling of document with header and section(s) in https://gerrit.libreoffice.org/6248 from Pierre-Eric Pelloux-Prayer + fdo#51525 Fix duplicate Paste Special entries in Calc. in https://gerrit.libreoffice.org/7784 from Andrzej Hunt + fdo#72661: Check ‘Hyphenation active’ automatically in https://gerrit.libreoffice.org/7291 from Jiwoong Youn + sa/l add release_assert() and assert that stay even in release code in https://gerrit.libreoffice.org/7625 from Norbert Thiebaud + fdo#69407: On transparent frames, shadows are painted in foreground. in https://gerrit.libreoffice.org/7070 from Mohamed-Ali BEN MANSOUR + add a header to provide posix compatible wrapper for platform lacking in https://gerrit.libreoffice.org/6837 from Norbert Thiebaud + WIP fdo#72987 Use firebird backup format for .odb in https://gerrit.libreoffice.org/7299 from Andrzej Hunt + sw/export docx: add unit test for document with header and section(s) in https://gerrit.libreoffice.org/6249 from Pierre-Eric Pelloux-Prayer + fix for exporting of text watermark to DOCX in https://gerrit.libreoffice.org/5568 from Adam CloudOn + WIP: fdo#33980 Preserve selection across all slide sorters. in https://gerrit.libreoffice.org/6633 from Andrzej Hunt + startcenter: Make SC open faster by timeouting thumbnails in https://gerrit.libreoffice.org/6102 from Krisztian Pinter + Simplify oslThreadIdentifier on Linux 32. in https://gerrit.libreoffice.org/5553 from Arnaud Versini + fdo#36791 : fix for import of greeting card in https://gerrit.libreoffice.org/4240 from Adam CloudOn + Positional Tab additions in https://gerrit.libreoffice.org/5387 from Adam CloudOn Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Review of two gerrit patches
Hi all, I was wondering if the following two gerrit patches could be reviewed? https://gerrit.libreoffice.org/#/c// This separates moves the inititialization of ImplGetGraphics() into it's own function, ImplInitGraphics(), which I feel is more intuitive. This is because currently, to initialize the graphics object, we have to run ImplGetGraphics(). I really feel it's better to initialize in it's own function, this helps readibility. And we can actually initialize graphics with a proper function down the track. I have documented it here: https://gerrit.libreoffice.org/#/c/8030/ If there are any objections, as always I'm not that proud of my work that I won't listen to advise :-) Many thanks in advance (in particular, to Caolon who worked in my suggestion to change to AcquireGraphics - but he did it in a more sensible fashion!). Thanks, Chris Sherlock ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 3 commits - include/xmloff package/inc package/source qadevOOo/runner xmloff/source
include/xmloff/PropertySetInfoHash.hxx | 59
include/xmloff/PropertySetInfoKey.hxx | 61 -
include/xmloff/SinglePropertySetInfoCache.hxx | 21 +++
package/inc/ZipPackageFolder.hxx |2
package/inc/ZipPackageStream.hxx |2
package/source/zippackage/ZipPackageFolder.cxx | 10 +--
package/source/zippackage/ZipPackageStream.cxx | 11 +--
qadevOOo/runner/util/dbg.java | 23 ---
xmloff/source/style/SinglePropertySetInfoCache.cxx | 51 -
xmloff/source/style/xmlexppr.cxx | 51 -
10 files changed, 46 insertions(+), 245 deletions(-)
New commits:
commit 1349f49a72be947aa708e7bcbc7de773894c5684
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Mar 10 08:58:16 2014 +0100
Use cppu::OImplementationId for XUnoTunnel IDs
Change-Id: I564ec761b7a7b3488682acfb3aff56beb3f68213
diff --git a/package/inc/ZipPackageFolder.hxx b/package/inc/ZipPackageFolder.hxx
index db0a6aa..251c934 100644
--- a/package/inc/ZipPackageFolder.hxx
+++ b/package/inc/ZipPackageFolder.hxx
@@ -74,7 +74,7 @@ public:
throw(::com::sun::star::container::NoSuchElementException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
static void copyZipEntry( ZipEntry rDest, const ZipEntry rSource);
-static const ::com::sun::star::uno::Sequence sal_Int8
static_getImplementationId();
+static ::com::sun::star::uno::Sequence sal_Int8
static_getImplementationId();
void setPackageFormat_Impl( sal_Int32 nFormat ) { m_nFormat = nFormat; }
void setRemoveOnInsertMode_Impl( sal_Bool bRemove ) {
this-mbAllowRemoveOnInsert = bRemove; }
diff --git a/package/inc/ZipPackageStream.hxx b/package/inc/ZipPackageStream.hxx
index 1e25d12..56ed22c 100644
--- a/package/inc/ZipPackageStream.hxx
+++ b/package/inc/ZipPackageStream.hxx
@@ -155,7 +155,7 @@ public:
::com::sun::star::uno::Reference ::com::sun::star::io::XInputStream
SAL_CALL getRawData()
throw(::com::sun::star::uno::RuntimeException);
-static const ::com::sun::star::uno::Sequence sal_Int8
static_getImplementationId();
+static ::com::sun::star::uno::Sequence sal_Int8
static_getImplementationId();
// XActiveDataSink
virtual void SAL_CALL setInputStream( const
::com::sun::star::uno::Reference ::com::sun::star::io::XInputStream aStream
)
diff --git a/package/source/zippackage/ZipPackageFolder.cxx
b/package/source/zippackage/ZipPackageFolder.cxx
index d4d1374..b71d34a 100644
--- a/package/source/zippackage/ZipPackageFolder.cxx
+++ b/package/source/zippackage/ZipPackageFolder.cxx
@@ -28,6 +28,7 @@
#include com/sun/star/packages/zip/ZipConstants.hpp
#include com/sun/star/embed/StorageFormats.hpp
#include cppuhelper/supportsservice.hxx
+#include cppuhelper/typeprovider.hxx
#include osl/diagnose.h
#include osl/time.h
#include rtl/digest.h
@@ -57,7 +58,7 @@ using namespace ::com::sun::star;
#define THROW_WHERE
#endif
-namespace { struct lcl_CachedImplId : public rtl::Static uno::Sequence
sal_Int8 , lcl_CachedImplId {}; }
+namespace { struct lcl_CachedImplId : public rtl::Static
cppu::OImplementationId, lcl_CachedImplId {}; }
ZipPackageFolder::ZipPackageFolder ( sal_Int32 nFormat,
sal_Bool bAllowRemoveOnInsert )
@@ -74,9 +75,6 @@ ZipPackageFolder::ZipPackageFolder ( sal_Int32 nFormat,
aEntry.nCompressedSize = 0;
aEntry.nSize= 0;
aEntry.nOffset = -1;
-uno::Sequence sal_Int8 rCachedImplId = lcl_CachedImplId::get();
-if ( !rCachedImplId.getLength() )
-rCachedImplId = getImplementationId();
}
ZipPackageFolder::~ZipPackageFolder()
@@ -178,9 +176,9 @@ void ZipPackageFolder::copyZipEntry( ZipEntry rDest, const
ZipEntry rSource)
rDest.nExtraLen = rSource.nExtraLen;
}
-const ::com::sun::star::uno::Sequence sal_Int8
ZipPackageFolder::static_getImplementationId()
+::com::sun::star::uno::Sequence sal_Int8
ZipPackageFolder::static_getImplementationId()
{
-return lcl_CachedImplId::get();
+return lcl_CachedImplId::get().getImplementationId();
}
// XNameContainer
diff --git a/package/source/zippackage/ZipPackageStream.cxx
b/package/source/zippackage/ZipPackageStream.cxx
index d635576..02e8047 100644
--- a/package/source/zippackage/ZipPackageStream.cxx
+++ b/package/source/zippackage/ZipPackageStream.cxx
@@ -42,6 +42,7 @@
#include comphelper/seekableinput.hxx
#include comphelper/storagehelper.hxx
#include cppuhelper/supportsservice.hxx
+#include cppuhelper/typeprovider.hxx
#include rtl/instance.hxx
@@ -60,11 +61,11 @@ using namespace cppu;
#define THROW_WHERE
#endif
-namespace { struct lcl_CachedImplId : public rtl::Static Sequence sal_Int8
, lcl_CachedImplId {}; }
+namespace { struct lcl_CachedImplId : public rtl::Static
[Libreoffice-commits] core.git: animations/Library_animcore.mk animations/source include/animations offapi/com offapi/UnoApi_offapi.mk slideshow/inc slideshow/Library_slideshow.mk slideshow/source
animations/Library_animcore.mk |1
animations/source/animcore/animcore.component |3
animations/source/animcore/factreg.cxx |1
animations/source/animcore/factreg.hxx |1
animations/source/animcore/targetpropertiescreator.cxx | 486
--
include/animations/animationnodehelper.hxx | 44
offapi/UnoApi_offapi.mk |2
offapi/com/sun/star/animations/TargetPropertiesCreator.idl | 35
offapi/com/sun/star/animations/XTargetPropertiesCreator.idl | 63 -
slideshow/Library_slideshow.mk |1
slideshow/inc/pch/precompiled_slideshow.hxx |1
slideshow/source/engine/animationnodes/animationnodefactory.cxx |9
slideshow/source/engine/slide/slideimpl.cxx | 44
slideshow/source/engine/slide/targetpropertiescreator.cxx | 365 +++
slideshow/source/engine/slide/targetpropertiescreator.hxx | 47
slideshow/source/inc/tools.hxx | 54 +
16 files changed, 471 insertions(+), 686 deletions(-)
New commits:
commit b8183958e6b5367eeebd5d07fa5f26561fa1dc4a
Author: Marcos Paulo de Souza marcos.souza@gmail.com
Date: Fri Feb 28 02:22:12 2014 -0300
fdo#60698: Split out slideshow code from animations
Also remove the TargetPropertiesCreator service since just slideshow uses
this.
Change-Id: I80816f6225b7bd9fb18f48e69eb5dfd6709b6e56
diff --git a/animations/Library_animcore.mk b/animations/Library_animcore.mk
index 4cfca54..2f08ae3 100644
--- a/animations/Library_animcore.mk
+++ b/animations/Library_animcore.mk
@@ -35,7 +35,6 @@ $(eval $(call gb_Library_use_libraries,animcore,\
$(eval $(call gb_Library_add_exception_objects,animcore,\
animations/source/animcore/animcore \
animations/source/animcore/factreg \
-animations/source/animcore/targetpropertiescreator \
))
# vim: set noet sw=4 ts=4:
diff --git a/animations/source/animcore/animcore.component
b/animations/source/animcore/animcore.component
index 4b3030e..ceb6288 100644
--- a/animations/source/animcore/animcore.component
+++ b/animations/source/animcore/animcore.component
@@ -49,9 +49,6 @@
implementation name=animcore::SequenceTimeContainer
service name=com.sun.star.animations.SequenceTimeContainer/
/implementation
- implementation name=animcore::TargetPropertiesCreator
-service name=com.sun.star.animations.TargetPropertiesCreator/
- /implementation
implementation name=animcore::TransitionFilter
service name=com.sun.star.animations.TransitionFilter/
/implementation
diff --git a/animations/source/animcore/factreg.cxx
b/animations/source/animcore/factreg.cxx
index d957981..3757e76 100644
--- a/animations/source/animcore/factreg.cxx
+++ b/animations/source/animcore/factreg.cxx
@@ -53,7 +53,6 @@ static const struct ImplementationEntry g_entries[] =
IMPLEMENTATION_ENTRY( TRANSITIONFILTER ),
IMPLEMENTATION_ENTRY( AUDIO ),
IMPLEMENTATION_ENTRY( COMMAND ),
-IMPLEMENTATION_ENTRY( TargetPropertiesCreator ),
{ 0, 0, 0, 0, 0, 0 }
};
diff --git a/animations/source/animcore/factreg.hxx
b/animations/source/animcore/factreg.hxx
index a6ede62..9d503de 100644
--- a/animations/source/animcore/factreg.hxx
+++ b/animations/source/animcore/factreg.hxx
@@ -38,7 +38,6 @@ DECL_NODE_FACTORY( ANIMATETRANSFORM );
DECL_NODE_FACTORY( TRANSITIONFILTER );
DECL_NODE_FACTORY( AUDIO );
DECL_NODE_FACTORY( COMMAND );
-DECL_NODE_FACTORY( TargetPropertiesCreator );
}
diff --git a/include/animations/animationnodehelper.hxx
b/include/animations/animationnodehelper.hxx
index d6f000d..840dadd 100644
--- a/include/animations/animationnodehelper.hxx
+++ b/include/animations/animationnodehelper.hxx
@@ -36,50 +36,6 @@ namespace anim
// only a function pointer, and a thin templated wrapper around
// that which converts member functions into that.
-/** Apply given functor to every animation node child.
-
-@param xNode
-Parent node
-
-@param rFunctor
-Functor to apply. The functor must have an appropriate
-operator()( const ::com::sun::star::uno::Reference
-::com::sun::star::animations::XAnimationNode ) member.
-
-@return true, if the functor was successfully applied to
-all children, false otherwise.
-*/
-template typename Functor inline bool for_each_childNode( const
::com::sun::star::uno::Reference ::com::sun::star::animations::XAnimationNode
xNode,
- Functor
rFunctor )
-{
-try
-{
-// get an XEnumerationAccess to the children
-::com::sun::star::uno::Reference
[Bug 72606] [EasyHack] Consistently call Unicode Win32 functions, and define UNICODE globally
https://bugs.freedesktop.org/show_bug.cgi?id=72606 --- Comment #1 from vancuvit vitek.c...@seznam.cz --- Hello, I would like to participate on this bug, is there any progress made by someone else (to cooperate work...)? Thanks for feedback -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 46200] [RFE] Use the Scroll Lock key as a toggling lock key like Excel
https://bugs.freedesktop.org/show_bug.cgi?id=46200 --- Comment #5 from Tomas Prochazka tpher...@seznam.cz --- Hi, I am a student of FEE CTU.This semester we have a subject called Open Source Programming.So I would like to solve this bug. Sincerely, Tomas. -- 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 - sw/CppunitTest_sw_ooxmlimport.mk sw/qa writerfilter/source
sw/CppunitTest_sw_ooxmlimport.mk |1
sw/qa/extras/ooxmlimport/data/strict-lockedcanvas.docx |binary
sw/qa/extras/ooxmlimport/data/strict.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 21 -
writerfilter/source/ooxml/model.xml|4 +++
5 files changed, 25 insertions(+), 1 deletion(-)
New commits:
commit c98d649117dc776ac51807be3376924d1fce2035
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Mon Mar 10 10:33:54 2014 +0100
DOCX strict import: handle math
Change-Id: I8b1419cb71ef67f91bfa532faa283204dae0e25c
diff --git a/sw/CppunitTest_sw_ooxmlimport.mk b/sw/CppunitTest_sw_ooxmlimport.mk
index 1171001..2c4682b 100644
--- a/sw/CppunitTest_sw_ooxmlimport.mk
+++ b/sw/CppunitTest_sw_ooxmlimport.mk
@@ -69,6 +69,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_ooxmlimport,\
sw/util/swd \
sw/util/msword \
sfx2/util/sfx \
+ starmath/util/sm \
svl/source/fsstor/fsstorage \
svl/util/svl \
svtools/util/svt \
diff --git a/sw/qa/extras/ooxmlimport/data/strict.docx
b/sw/qa/extras/ooxmlimport/data/strict.docx
index 8586f37..b46ce94 100644
Binary files a/sw/qa/extras/ooxmlimport/data/strict.docx and
b/sw/qa/extras/ooxmlimport/data/strict.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index d09631be..f788f92 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1929,6 +1929,10 @@ DECLARE_OOXMLIMPORT_TEST(testStrict, strict.docx)
// Chart was missing.
xServiceInfo.set(getShape(3), uno::UNO_QUERY);
CPPUNIT_ASSERT(xServiceInfo-supportsService(com.sun.star.text.TextEmbeddedObject));
+
+// Math was missing.
+xServiceInfo.set(getShape(4), uno::UNO_QUERY);
+
CPPUNIT_ASSERT(xServiceInfo-supportsService(com.sun.star.text.TextEmbeddedObject));
}
DECLARE_OOXMLIMPORT_TEST(testStrictLockedcanvas, strict-lockedcanvas.docx)
diff --git a/writerfilter/source/ooxml/model.xml
b/writerfilter/source/ooxml/model.xml
index 12936ba..e0d3bb4 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -41,6 +41,7 @@
namespace-alias
name=http://schemas.openxmlformats.org/wordprocessingml/2006/main;
alias=wordprocessingml id=doc/
namespace-alias name=http://purl.oclc.org/ooxml/wordprocessingml/main;
alias=wordprocessingml id=doc/
namespace-alias
name=http://schemas.openxmlformats.org/officeDocument/2006/math; alias=math
id=officeMath/
+ namespace-alias name=http://purl.oclc.org/ooxml/officeDocument/math;
alias=math id=officeMath/
namespace-alias
name=http://schemas.openxmlformats.org/schemaLibrary/2006/main;
alias=schemaLibrary id=schema/
namespace-alias
name=http://schemas.openxmlformats.org/markup-compatibility/2006; alias=mce
id=mce/
namespace-alias
name=http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing;
alias=wp14 id=wp14/
commit d795fb224e52c66c4585ed1e079a2b7601a07eda
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Mon Mar 10 10:10:21 2014 +0100
DOCX strict import: handle lockedCanvas
Change-Id: I44c936a8972e1ae101aeab62ace61f4470d92b34
diff --git a/sw/qa/extras/ooxmlimport/data/strict-lockedcanvas.docx
b/sw/qa/extras/ooxmlimport/data/strict-lockedcanvas.docx
new file mode 100644
index 000..d31be7e
Binary files /dev/null and
b/sw/qa/extras/ooxmlimport/data/strict-lockedcanvas.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 8c7d97a..d09631be 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1931,6 +1931,12 @@ DECLARE_OOXMLIMPORT_TEST(testStrict, strict.docx)
CPPUNIT_ASSERT(xServiceInfo-supportsService(com.sun.star.text.TextEmbeddedObject));
}
+DECLARE_OOXMLIMPORT_TEST(testStrictLockedcanvas, strict-lockedcanvas.docx)
+{
+// locked canvas shape was missing.
+getShape(1);
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/ooxml/model.xml
b/writerfilter/source/ooxml/model.xml
index 97e9cfa..12936ba 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -32,6 +32,7 @@
namespace-alias
name=http://schemas.openxmlformats.org/drawingml/2006/diagram; alias=diagram
id=dmlDiagram/
namespace-alias name=http://purl.oclc.org/ooxml/drawingml/diagram;
alias=diagram id=dmlDiagram/
namespace-alias
name=http://schemas.openxmlformats.org/drawingml/2006/lockedCanvas;
alias=lockedCanvas id=dmlLockedCanvas/
+ namespace-alias name=http://purl.oclc.org/ooxml/drawingml/lockedCanvas;
alias=lockedCanvas id=dmlLockedCanvas/
namespace-alias
name=http://schemas.microsoft.com/office/word/2010/wordprocessingShape;
alias=wps id=wps/
namespace-alias
name=http://schemas.microsoft.com/office/word/2010/wordprocessingGroup;
alias=wpg id=wpg/
[Libreoffice-commits] core.git: solenv/bin
solenv/bin/native-code.py |1 + 1 file changed, 1 insertion(+) New commits: commit bbd7d3a2629a9352374c5d3a1377f9a2bfef8933 Author: Tor Lillqvist t...@collabora.com Date: Mon Mar 10 11:49:28 2014 +0200 Need libi18npool to render non-Latin text Change-Id: I7d0a42a89dff1e701627453ea4d337d21fbf6056 diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py index 12162cc..a1c7098 100755 --- a/solenv/bin/native-code.py +++ b/solenv/bin/native-code.py @@ -28,6 +28,7 @@ core_factory_list = [ (libfilterconfiglo.a, filterconfig1_component_getFactory), (libfsstoragelo.a, fsstorage_component_getFactory), (libhyphenlo.a, hyphen_component_getFactory), +(libi18npoollo.a, i18npool_component_getFactory), (liblnglo.a, lng_component_getFactory), (liblnthlo.a, lnth_component_getFactory), (liblocalebe1lo.a, localebe1_component_getFactory), ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - framework/source instsetoo_native/util
framework/source/layoutmanager/toolbarlayoutmanager.cxx | 235 +++-
framework/source/layoutmanager/toolbarlayoutmanager.hxx |1
instsetoo_native/util/openoffice.lst|8
3 files changed, 118 insertions(+), 126 deletions(-)
New commits:
commit 69dbe9b758a4b095d878e76d58300ee3ec4f9584
Author: Oliver-Rainer Wittmann o...@apache.org
Date: Mon Mar 10 09:45:00 2014 +
provide intermediate UpdateURL for current trunk
diff --git a/instsetoo_native/util/openoffice.lst
b/instsetoo_native/util/openoffice.lst
old mode 100644
new mode 100755
index 2017ef0..e2e8401
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -70,7 +70,7 @@ Apache_OpenOffice
ABOUTBOXPRODUCTVERSION 4.1.0
BASEPRODUCTVERSION 4.1
PCPFILENAME openoffice.pcp
-UPDATEURL https://ooo-updates.apache.org/aoo410/check.Update
+UPDATEURL https://ooo-updates.apache.org/aoonext/check.Update
ADD_INCLUDE_FILES
cliureversion.mk,clioootypesversion.mk,userland.txt,version.lst
REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
ADDSYSTEMINTEGRATION 1
@@ -129,7 +129,7 @@ Apache_OpenOffice_wJRE
USERDIRPRODUCTVERSION 4
ABOUTBOXPRODUCTVERSION 4.1.0
BASEPRODUCTVERSION 4.1
-UPDATEURL https://ooo-updates.apache.org/aoo410/check.Update
+UPDATEURL https://ooo-updates.apache.org/aoonext/check.Update
ADD_INCLUDE_FILES
cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
ADDSYSTEMINTEGRATION 1
@@ -196,7 +196,7 @@ Apache_OpenOffice_Dev
UREPACKAGEPREFIX aoodev
SOLSUREPACKAGEPREFIX aoodev
REGISTRYLAYERNAME LayerDev
-UPDATEURL https://ooo-updates.apache.org/aoo410/check.Update
+UPDATEURL https://ooo-updates.apache.org/aoonextdev/check.Update
ADD_INCLUDE_FILES
cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
EVAL
PACKAGEVERSION 4.1.0
@@ -409,7 +409,7 @@ Apache_OpenOffice_Beta
USERDIRPRODUCTVERSION 4
ABOUTBOXPRODUCTVERSION 4.1.0
BASEPRODUCTVERSION 4.1
-UPDATEURL https://ooo-updates.apache.org/aoo410/check.Update
+UPDATEURL https://ooo-updates.apache.org/aoonextbeta/check.Update
ADD_INCLUDE_FILES
cliureversion.mk,clioootypesversion.mk,userland.txt,version.lst
REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
ADDSYSTEMINTEGRATION 0
commit bf8d8d38c88ca16e7156c81c9ec4fce4adb791e0
Author: Oliver-Rainer Wittmann o...@apache.org
Date: Mon Mar 10 09:37:02 2014 +
124355: Toolbarmanager: correct show/hide of toolbars; correct calculation
of docking area sizes
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
index 2e25588..f267684 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
@@ -266,103 +266,100 @@ bool
ToolbarLayoutManager::implts_isParentWindowVisible() const
return bVisible;
}
-Rectangle ToolbarLayoutManager::implts_calcDockingArea()
+namespace
{
-ReadGuard aReadLock( m_aLock );
-UIElementVector aWindowVector( m_aUIElements );
-aReadLock.unlock();
+void insertDockingAreaSize(
+const UIElement rUIElement,
+const awt::Rectangle rUIElementPosSize,
+std::vector sal_Int32 rDockingAreaData )
+{
+sal_Int32 nAreaPos = 0;
+sal_Int32 nSize = 0;
+if ( isHorizontalDockingArea( rUIElement.m_aDockedData.m_nDockedArea )
)
+{
+nAreaPos = rUIElement.m_aDockedData.m_aPos.Y();
+nSize = rUIElementPosSize.Height;
+}
+else
+{
+nAreaPos = rUIElement.m_aDockedData.m_aPos.X();
+nSize = rUIElementPosSize.Width;
+}
-RectangleaBorderSpace;
-sal_Int32nCurrRowColumn( 0 );
-sal_Int32nCurrPos( 0 );
-sal_Int32nCurrDockingArea( ui::DockingArea_DOCKINGAREA_TOP
);
-std::vector sal_Int32 aRowColumnSizes[DOCKINGAREAS_COUNT];
-UIElementVector::const_iterator pConstIter;
+const sal_uInt32 nIndexPos = nAreaPos = 0 ? static_cast sal_uInt32
(nAreaPos) : 0;
+if ( rDockingAreaData.size() nIndexPos + 1 )
+{
+rDockingAreaData.resize( nIndexPos + 1, 0 );
+}
-// initialize rectangle with zero values!
-aBorderSpace.setWidth(0);
-aBorderSpace.setHeight(0);
+if ( rDockingAreaData[nIndexPos] nSize )
+{
+rDockingAreaData[nIndexPos] = nSize;
+}
+}
-aRowColumnSizes[nCurrDockingArea].clear();
-
[Bug 32664] Keyboard volume keys don't work when LibreOffice is in focus
https://bugs.freedesktop.org/show_bug.cgi?id=32664 --- Comment #40 from Alex hinsta...@yandex.ru --- FIX IT PLZ I have this problem on Windows 8.1 with LibreOffice 4.2 Play pause button does not work It have been about 4 years since this bug was reported Is it actually so hard to fix? Which widget library you use guys? GTK? Qt? Then maybe widgetset is to blame -- 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: sfx2/source
sfx2/source/doc/oleprops.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3ba58a22bdd51cd4221547e0a0e95b6d2b987358 Author: Tarun Kumar tk7ua1...@gmail.com Date: Fri Mar 7 13:50:40 2014 +0530 fdo#75243: MSO export: save custom properties with empty value LO removes empty properties while saving the doc. This is required in some business scenarios. bSkipEmpty is set to false by default to enable LibreOffice to save even empty properties. Change-Id: I7aafe0c0be02a98fa6e72d73e9e4348a015da61f diff --git a/sfx2/source/doc/oleprops.hxx b/sfx2/source/doc/oleprops.hxx index 8e09a5b..de15a66 100644 --- a/sfx2/source/doc/oleprops.hxx +++ b/sfx2/source/doc/oleprops.hxx @@ -310,7 +310,7 @@ public: voidSetBoolValue( sal_Int32 nPropId, bool bValue ); /** Inserts a string property with the passed value. @return true = Property inserted; false = String was empty, property not inserted. */ -boolSetStringValue( sal_Int32 nPropId, const OUString rValue, bool bSkipEmpty = true ); +boolSetStringValue( sal_Int32 nPropId, const OUString rValue, bool bSkipEmpty = false ); /** Inserts a time stamp property with the passed value. */ voidSetFileTimeValue( sal_Int32 nPropId, const ::com::sun::star::util::DateTime rValue ); /** Inserts a date property with the passed value. */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sfx2/source
sfx2/source/doc/oleprops.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c3813789af24ae53153e0014ce5e4fff880197a2 Author: Tarun Kumar tk7ua1...@gmail.com Date: Fri Mar 7 13:50:40 2014 +0530 fdo#75243: MSO export: save custom properties with empty value LO removes empty properties while saving the doc. This is required in some business scenarios. bSkipEmpty is set to false by default to enable LibreOffice to save even empty properties. Change-Id: I7aafe0c0be02a98fa6e72d73e9e4348a015da61f (cherry picked from commit 3ba58a22bdd51cd4221547e0a0e95b6d2b987358) Signed-off-by: Michael Stahl mst...@redhat.com diff --git a/sfx2/source/doc/oleprops.hxx b/sfx2/source/doc/oleprops.hxx index 76d1619..f10c004 100644 --- a/sfx2/source/doc/oleprops.hxx +++ b/sfx2/source/doc/oleprops.hxx @@ -310,7 +310,7 @@ public: voidSetBoolValue( sal_Int32 nPropId, bool bValue ); /** Inserts a string property with the passed value. @return true = Property inserted; false = String was empty, property not inserted. */ -boolSetStringValue( sal_Int32 nPropId, const OUString rValue, bool bSkipEmpty = true ); +boolSetStringValue( sal_Int32 nPropId, const OUString rValue, bool bSkipEmpty = false ); /** Inserts a time stamp property with the passed value. */ voidSetFileTimeValue( sal_Int32 nPropId, const ::com::sun::star::util::DateTime rValue ); /** Inserts a date property with the passed value. */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Re: [PATCH] FILESAVE: Empty custom properties are lost while saving in .doc format
On 09/03/14 17:30, Tarun Kumar K wrote: Here I go :-) Hi Michael, I have attached the patch in the email as well. I Hope now I understand the steps as how to contribute the patch. Feels good to learn and contribute. thanks, pushed to master and libreoffice-4-2 branch. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - oox/source
oox/source/drawingml/textcharacterproperties.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 8ad2aec13205d308341da8519e15a3187b633b91
Author: Björgvin Ragnarsson nifgr...@gmail.com
Date: Wed Dec 4 14:30:43 2013 +0100
fdo#72481 drawingml import: don't set CharEscapementHeight unconditionally
Commit 840a8573c8cebe67ddd3c9fe106c7dbd789bb334 (Fix fdo#70220
Superscript not imported from pptx., 2013-10-07) made it possible to set
CharEscapementHeight even if moBaseline is not set, but this causes
problems in the docx importer + not necessary, according to the bugdoc;
so just don't do that.
Conflicts:
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
Commit and message cherry picked from:
commit 798a563db133ebed3876c245459d90ef54ee7c9a
Author: Miklos Vajna vmik...@collabora.co.uk
Change-Id: Ib95ac449bd8fdf6376261ddc86108f0d23f2200e
Reviewed-on: https://gerrit.libreoffice.org/8415
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/oox/source/drawingml/textcharacterproperties.cxx
b/oox/source/drawingml/textcharacterproperties.cxx
index a8a8806..febb28c 100644
--- a/oox/source/drawingml/textcharacterproperties.cxx
+++ b/oox/source/drawingml/textcharacterproperties.cxx
@@ -116,7 +116,7 @@ void TextCharacterProperties::pushToPropMap( PropertyMap
rPropMap, const XmlFil
rPropMap[ PROP_CharStrikeout ] = GetFontStrikeout( moStrikeout.get(
XML_noStrike ) );
rPropMap[ PROP_CharCaseMap ] = GetCaseMap( moCaseMap.get( XML_none ) );
-if( !bUseOptional || moBaseline.has() ) {
+if( moBaseline.has() ) {
rPropMap[ PROP_CharEscapement ] = sal_Int16(moBaseline.get( 0 ) /
1000);
rPropMap[ PROP_CharEscapementHeight ] = sal_Int8(DFLT_ESC_PROP);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source
cui/source/dialogs/hldoctp.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit fc4ce3f5d0c630623eca5b55f8083d54e5be Author: Maxim Monastirsky momonas...@gmail.com Date: Mon Mar 10 12:05:32 2014 +0200 fdo#75968 Fix OUString conversion Change-Id: Ie865b16c163d47de34ab2fe23bb7432b7710877f Reviewed-on: https://gerrit.libreoffice.org/8510 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx index c216d25..8148680 100644 --- a/cui/source/dialogs/hldoctp.cxx +++ b/cui/source/dialogs/hldoctp.cxx @@ -100,7 +100,7 @@ void SvxHyperlinkDocTp::FillDlgFields(const OUString rStrURL) // set target in document at editfield OUString aStrMark; if ( nPos != -1 nPos rStrURL.getLength()-1 ) -aStrMark = rStrURL.copy( nPos+1, rStrURL.getLength() ); +aStrMark = rStrURL.copy( nPos+1, rStrURL.getLength() - nPos - 1 ); maEdTarget.SetText ( aStrMark ); ModifiedPathHdl_Impl ( NULL ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 69/dbe9b758a4b095d878e76d58300ee3ec4f9584
69/dbe9b758a4b095d878e76d58300ee3ec4f9584 |1 + 1 file changed, 1 insertion(+) New commits: commit 110256684f3c5487a3066bdcd5e14da32fdbe64c Author: Caolán McNamara caol...@redhat.com Date: Mon Mar 10 10:48:55 2014 + Notes added by 'git notes add' diff --git a/69/dbe9b758a4b095d878e76d58300ee3ec4f9584 b/69/dbe9b758a4b095d878e76d58300ee3ec4f9584 new file mode 100644 index 000..8e5c182 --- /dev/null +++ b/69/dbe9b758a4b095d878e76d58300ee3ec4f9584 @@ -0,0 +1 @@ +ignore: aoo ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - sfx2/source
sfx2/source/doc/oleprops.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 748a8e9c79760def8ab3d25312dc5118492b501a Author: Tarun Kumar tk7ua1...@gmail.com Date: Fri Mar 7 13:50:40 2014 +0530 fdo#75243: MSO export: save custom properties with empty value LO removes empty properties while saving the doc. This is required in some business scenarios. bSkipEmpty is set to false by default to enable LibreOffice to save even empty properties. (cherry picked from commit 3ba58a22bdd51cd4221547e0a0e95b6d2b987358) Signed-off-by: Michael Stahl mst...@redhat.com Conflicts: sfx2/source/doc/oleprops.hxx Change-Id: I7aafe0c0be02a98fa6e72d73e9e4348a015da61f diff --git a/sfx2/source/doc/oleprops.hxx b/sfx2/source/doc/oleprops.hxx index f61ce8a..bd49417 100644 --- a/sfx2/source/doc/oleprops.hxx +++ b/sfx2/source/doc/oleprops.hxx @@ -305,7 +305,7 @@ public: voidSetBoolValue( sal_Int32 nPropId, bool bValue ); /** Inserts a string property with the passed value. @return true = Property inserted; false = String was empty, property not inserted. */ -boolSetStringValue( sal_Int32 nPropId, const String rValue, bool bSkipEmpty = true ); +boolSetStringValue( sal_Int32 nPropId, const String rValue, bool bSkipEmpty = false ); /** Inserts a time stamp property with the passed value. */ voidSetFileTimeValue( sal_Int32 nPropId, const ::com::sun::star::util::DateTime rValue ); /** Inserts a date property with the passed value. */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - bf/8d8d38c88ca16e7156c81c9ec4fce4adb791e0
bf/8d8d38c88ca16e7156c81c9ec4fce4adb791e0 |1 + 1 file changed, 1 insertion(+) New commits: commit 725c3673a1c57cfcab218078ddf405a1fd14921c Author: Caolán McNamara caol...@redhat.com Date: Mon Mar 10 10:54:31 2014 + Notes added by 'git notes add' diff --git a/bf/8d8d38c88ca16e7156c81c9ec4fce4adb791e0 b/bf/8d8d38c88ca16e7156c81c9ec4fce4adb791e0 new file mode 100644 index 000..e839218 --- /dev/null +++ b/bf/8d8d38c88ca16e7156c81c9ec4fce4adb791e0 @@ -0,0 +1 @@ +prefer: 986644335c3f9e99ec3c6bebc0b75cca0acdf79b ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - cui/source
cui/source/dialogs/hldoctp.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7b3b1717546deb4956d322f05a16bcaba0f78cda Author: Maxim Monastirsky momonas...@gmail.com Date: Mon Mar 10 12:05:32 2014 +0200 fdo#75968 Fix OUString conversion Change-Id: Ie865b16c163d47de34ab2fe23bb7432b7710877f Reviewed-on: https://gerrit.libreoffice.org/8510 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com (cherry picked from commit fc4ce3f5d0c630623eca5b55f8083d54e5be) Reviewed-on: https://gerrit.libreoffice.org/8511 diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx index 865b0e5..38d4995 100644 --- a/cui/source/dialogs/hldoctp.cxx +++ b/cui/source/dialogs/hldoctp.cxx @@ -100,7 +100,7 @@ void SvxHyperlinkDocTp::FillDlgFields(const OUString rStrURL) // set target in document at editfield OUString aStrMark; if ( nPos != -1 nPos rStrURL.getLength()-1 ) -aStrMark = rStrURL.copy( nPos+1, rStrURL.getLength() ); +aStrMark = rStrURL.copy( nPos+1, rStrURL.getLength() - nPos - 1 ); maEdTarget.SetText ( aStrMark ); ModifiedPathHdl_Impl ( NULL ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - 3 commits - sc/source sfx2/source sfx2/uiconfig sw/source
sc/source/core/data/funcdesc.cxx|4 ++--
sfx2/source/dialog/mgetempl.cxx |5 +
sfx2/uiconfig/ui/managestylepage.ui | 10 +++---
sw/source/filter/html/parcss1.cxx |2 +-
4 files changed, 11 insertions(+), 10 deletions(-)
New commits:
commit 4ac6f748bb636b2f21866d93d0a9a93219ef108a
Author: Jan Holesovsky ke...@collabora.com
Date: Mon Feb 17 20:49:24 2014 +0100
Fix crash in css rgb color handling.
Crashing since 2000 (or earlier).
Change-Id: I9f91d56f380be2421370b0acbee351461e1f0973
Reviewed-on: https://gerrit.libreoffice.org/8092
Tested-by: David Tardon dtar...@redhat.com
Reviewed-by: David Tardon dtar...@redhat.com
diff --git a/sw/source/filter/html/parcss1.cxx
b/sw/source/filter/html/parcss1.cxx
index 8455ab1..24c32b9 100644
--- a/sw/source/filter/html/parcss1.cxx
+++ b/sw/source/filter/html/parcss1.cxx
@@ -1281,7 +1281,7 @@ sal_Bool CSS1Expression::GetColor( Color rColor ) const
')' == aValue.GetChar( aValue.Len()-1),
keine gueltiges RGB(...) );
-String aColorStr( aValue.Copy( 4, aValue.Len()-1 ) );
+String aColorStr( aValue.Copy( 4, aValue.Len()-5 ) );
xub_StrLen nPos = 0;
sal_uInt16 nCol = 0;
commit 51307daaf694416b51f2ec9c68cac0015ffd6bff
Author: Caolán McNamara caol...@redhat.com
Date: Mon Feb 17 12:44:14 2014 +
Resolves: fdo#72233 too long style names over-stretch dialog
Change-Id: Id6f102a3def1928ad8f6b4d27eb32f8c69bdba49
(cherry picked from commit a95888e6e62a702f4b9af4a68c44339b51dc283e)
Reviewed-on: https://gerrit.libreoffice.org/8085
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Tested-by: Kohei Yoshida libreoff...@kohei.us
diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index 0d6755d..932fddd 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -54,16 +54,21 @@ SfxManageStyleSheetPage::SfxManageStyleSheetPage(Window*
pParent, const SfxItemS
{
get(m_pNameRo, namero);
get(m_pNameRw, namerw);
+m_pNameRo-set_width_request(m_pNameRw-get_preferred_size().Width());
get(m_pAutoCB, autoupdate);
get(m_pFollowFt, nextstyleft);
get(m_pFollowLb, nextstyle);
m_pFollowLb-SetStyle(m_pFollowLb-GetStyle() | WB_SORT);
+const sal_Int32 nMaxWidth(62);
+m_pFollowLb-setMaxWidthChars(nMaxWidth);
get(m_pBaseFt, linkedwithft);
get(m_pBaseLb, linkedwith);
m_pBaseLb-SetStyle(m_pBaseLb-GetStyle() | WB_SORT);
+m_pBaseLb-setMaxWidthChars(nMaxWidth);
get(m_pFilterFt, categoryft);
get(m_pFilterLb, category);
m_pFilterLb-SetStyle(m_pFilterLb-GetStyle() | WB_SORT);
+m_pFilterLb-setMaxWidthChars(nMaxWidth);
get(m_pDescFt, desc);
// this Page needs ExchangeSupport
diff --git a/sfx2/uiconfig/ui/managestylepage.ui
b/sfx2/uiconfig/ui/managestylepage.ui
index 551f2d3..9bd0671 100644
--- a/sfx2/uiconfig/ui/managestylepage.ui
+++ b/sfx2/uiconfig/ui/managestylepage.ui
@@ -1,6 +1,7 @@
?xml version=1.0 encoding=UTF-8?
+!-- Generated with glade 3.16.1 --
interface
- !-- interface-requires gtk+ 3.0 --
+ requires lib=gtk+ version=3.0/
object class=GtkBox id=ManageStylePage
property name=visibleTrue/property
property name=can_focusFalse/property
@@ -100,8 +101,6 @@
property name=can_focusFalse/property
property name=valigncenter/property
property name=hexpandTrue/property
-property name=entry_text_column0/property
-property name=id_column1/property
/object
packing
property name=left_attach1/property
@@ -116,8 +115,6 @@
property name=can_focusFalse/property
property name=valigncenter/property
property name=hexpandTrue/property
-property name=entry_text_column0/property
-property name=id_column1/property
/object
packing
property name=left_attach1/property
@@ -132,8 +129,6 @@
property name=can_focusFalse/property
property name=valigncenter/property
property name=hexpandTrue/property
-property name=entry_text_column0/property
-property name=id_column1/property
/object
packing
property name=left_attach1/property
@@ -187,6 +182,7 @@
property name=valigncenter/property
property name=hexpandTrue/property
property name=invisible_charâ/property
+property name=width_chars52/property
/object
packing
property
[Libreoffice-commits] core.git: filter/source officecfg/registry
filter/source/pdf/pdfexport.cxx|2 +- officecfg/registry/schema/org/openoffice/Office/Common.xcs |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit b6588bd7c831ce88a29131ca7ea8d3f3e082564e Author: Samuel Mehrbrodt s.mehrbr...@gmail.com Date: Sun Mar 2 16:48:18 2014 +0100 Reduce image resolution by default in PDF Export PDF Files can quickly become very big when a user inserts some images. Most users don't know how to reduce the size of their images. This patch enables the resolution reduction for PDF Export to 300DPI by default. Change-Id: I3ce5191de35561b59169e52e2e2efbc4a343f025 Reviewed-on: https://gerrit.libreoffice.org/8422 Tested-by: Caolán McNamara caol...@redhat.com Reviewed-by: Caolán McNamara caol...@redhat.com diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx index 39c5d22..1ebe0fe 100644 --- a/filter/source/pdf/pdfexport.cxx +++ b/filter/source/pdf/pdfexport.cxx @@ -106,7 +106,7 @@ PDFExport::PDFExport( const Reference XComponent rxSrcDoc, mbExportHiddenSlides( sal_False ), mnOpenBookmarkLevels( -1 ), mbUseLosslessCompression( sal_False ), -mbReduceImageResolution ( sal_False ), +mbReduceImageResolution ( sal_True ), mbSkipEmptyPages( sal_True ), mbAddStream ( sal_False ), mnMaxImageResolution( 300 ), diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index 1e681e9..2fd0fe1 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -5001,7 +5001,7 @@ descSpecifies if the resolution of each image is reduced to the resolution specified by the property MaxImageResolution./desc /info -valuefalse/value +valuetrue/value /prop prop oor:name=MaxImageResolution oor:type=xs:int oor:nillable=false info ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - 3 commits - sc/source swext/mediawiki sw/qa writerfilter/source
sc/source/ui/app/inputhdl.cxx |8 +
sc/source/ui/inc/inputhdl.hxx |3
sc/source/ui/view/tabvwsh4.cxx|3
sw/qa/extras/rtfimport/data/rhbz1065629.rtf | 81 ++
sw/qa/extras/rtfimport/rtfimport.cxx | 21 +++
swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java |4
writerfilter/source/rtftok/rtfdocumentimpl.cxx| 14 ++
writerfilter/source/rtftok/rtfdocumentimpl.hxx|1
8 files changed, 132 insertions(+), 3 deletions(-)
New commits:
commit d98ae159392c0cd4373f40d3da31ecb0f8516938
Author: Julien Nabet serval2...@yahoo.fr
Date: Wed Feb 19 22:23:58 2014 +0100
Resolves: fdo#69925 Wiki Publisher Extension is not working
Regression from
http://cgit.freedesktop.org/libreoffice/core/commit/?id=b80d8c695e6b6ded231e67ed9a80bcd1f1250c03
compareTo has been replaced by ==, so we compared the equality ot the
pointers on the objects instead of the content of the strings
To make it simple and since we compare String objects, let's simply use
equals method
Change-Id: I65bc1a87751297411fdbe722d3f49bce5e291638
(cherry picked from commit 9e2d1d21f9a58e320444f6eaea2f006530bbd2cb)
Signed-off-by: Michael Stahl mst...@redhat.com
diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java
b/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java
index ff9f85a..4cad2f6 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java
@@ -134,7 +134,7 @@ public final class WikiEditorImpl extends WeakBase
{
final com.sun.star.util.URL myURL = aURL;
//logger.log( Level.INFO, received dispatch request for:
+aURL.Complete );
-if ( aURL.Protocol == protocolName )
+if ( aURL.Protocol.equals(protocolName) )
{
/*
synchronized( this )
@@ -146,7 +146,7 @@ public final class WikiEditorImpl extends WeakBase
try
{
-if ( myURL.Path == send )
+if ( myURL.Path.equals(send) )
{
sendArticle();
}
commit 9eb6e9516bed2d966717a473354a930b894b5bdb
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Fri Feb 14 12:28:03 2014 -0500
fdo#73773: Check if the *document* is closing, not the *app*.
Otherwise it would crash if the app has multiple document instances open
and only one of them is being closed.
(cherry picked from commit 76bdf523981d2bd983dac4e01bc5cc934118a73f)
Conflicts:
sc/source/ui/app/inputhdl.cxx
Change-Id: Ib6e370037ab6097c9c6eff8035249663944b3a6c
Reviewed-on: https://gerrit.libreoffice.org/8055
Tested-by: Caolán McNamara caol...@redhat.com
Reviewed-by: Caolán McNamara caol...@redhat.com
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index b31489c..a45ac8f 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -298,6 +298,11 @@ handle_r1c1:
}
}
+void ScInputHandler::SetDocumentDisposing( bool b )
+{
+mbDocumentDisposing = b;
+}
+
static void lcl_Replace( EditView* pView, const String rNewStr, const
ESelection rOldSel )
{
if ( pView )
@@ -519,6 +524,7 @@ ScInputHandler::ScInputHandler()
bProtected( false ),
bCellHasPercentFormat( false ),
bLastIsSymbol( false ),
+mbDocumentDisposing(false),
nValidation( 0 ),
eAttrAdjust( SVX_HOR_JUSTIFY_STANDARD ),
aScaleX( 1,1 ),
@@ -542,7 +548,7 @@ ScInputHandler::~ScInputHandler()
// Wenn dies der Applikations-InputHandler ist, wird der dtor erst nach
SfxApplication::Main
// gerufen, darf sich also auf keine Sfx-Funktionen mehr verlassen
-if ( !SFX_APP()-IsDowning() ) // inplace
+if (!mbDocumentDisposing) // inplace
EnterHandler(); // Eingabe noch abschliessen
if (SC_MOD()-GetRefInputHdl()==this)
diff --git a/sc/source/ui/inc/inputhdl.hxx b/sc/source/ui/inc/inputhdl.hxx
index 8d0d44f..0bb4fda 100644
--- a/sc/source/ui/inc/inputhdl.hxx
+++ b/sc/source/ui/inc/inputhdl.hxx
@@ -100,6 +100,7 @@ private:
boolbProtected:1;
boolbCellHasPercentFormat:1;
boolbLastIsSymbol:1;
+boolmbDocumentDisposing:1;
sal_uLong nValidation;
SvxCellHorJustify eAttrAdjust;
@@ -256,6 +257,8 @@ public:
// actually private, public for SID_INPUT_SUM
voidInitRangeFinder( const String rFormula );
+void SetDocumentDisposing( bool b );
+
static void SetAutoComplete(bool bSet) { bAutoComplete = bSet; }
};
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
[Bug 72606] [EasyHack] Consistently call Unicode Win32 functions, and define UNICODE globally
https://bugs.freedesktop.org/show_bug.cgi?id=72606 vancuvit vitek.c...@seznam.cz changed: What|Removed |Added Assignee|libreoffice-b...@lists.free |vitek.c...@seznam.cz |desktop.org | -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - 3 commits - oox/source sw/source ucb/qa
oox/source/core/xmlfilterbase.cxx | 13 +
sw/source/ui/frmdlg/uiborder.cxx |6 +++---
sw/source/ui/inc/uiborder.hxx |2 +-
ucb/qa/complex/ucb/UCB.java |2 +-
4 files changed, 18 insertions(+), 5 deletions(-)
New commits:
commit 5097245599c9471b3f796c4ef092c08763fd0a94
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Thu Feb 27 09:57:52 2014 +0100
fdo#73159 Make border dialog work again
It seems converting to SfxSingleTabDialog makes it work.
Similar conversions were made on master branch.
Change-Id: I49985bed56f12460d289c7f0d4e1c1435aa4674e
Reviewed-on: https://gerrit.libreoffice.org/8377
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/sw/source/ui/frmdlg/uiborder.cxx b/sw/source/ui/frmdlg/uiborder.cxx
index 2f4b1ef..8925786 100644
--- a/sw/source/ui/frmdlg/uiborder.cxx
+++ b/sw/source/ui/frmdlg/uiborder.cxx
@@ -34,7 +34,7 @@
SwBorderDlg::SwBorderDlg(Window* pParent, SfxItemSet rSet, sal_uInt16 nType) :
-SfxNoLayoutSingleTabDialog(pParent, rSet, 0)
+SfxSingleTabDialog(pParent, rSet)
{
SetText(SW_RESSTR(STR_FRMUI_BORDER));
@@ -45,13 +45,13 @@ SwBorderDlg::SwBorderDlg(Window* pParent, SfxItemSet rSet,
sal_uInt16 nType) :
::CreateTabPage fnCreatePage = pFact-GetTabPageCreatorFunc(
RID_SVXPAGE_BORDER );
if ( fnCreatePage )
{
-SfxTabPage* pNewPage = (*fnCreatePage)( this, rSet );
+SfxTabPage* pNewPage = (*fnCreatePage)( get_content_area(), rSet );
SfxAllItemSet aSet(*(rSet.GetPool()));
aSet.Put (SfxUInt16Item(SID_SWMODE_TYPE,nType));
if(SW_BORDER_MODE_TABLE == nType)
aSet.Put (SfxUInt32Item(SID_FLAG_TYPE,SVX_HIDESHADOWCTL));
pNewPage-PageCreated(aSet);
-SetTabPage(pNewPage);
+setTabPage(pNewPage);
}
}
diff --git a/sw/source/ui/inc/uiborder.hxx b/sw/source/ui/inc/uiborder.hxx
index 20e5e87..a8890b4 100644
--- a/sw/source/ui/inc/uiborder.hxx
+++ b/sw/source/ui/inc/uiborder.hxx
@@ -24,7 +24,7 @@
class Window;
class SfxItemSet;
-class SwBorderDlg : public SfxNoLayoutSingleTabDialog
+class SwBorderDlg : public SfxSingleTabDialog
{
public:
commit 4822b425acc7cca4f2f330d83d6b0125b6c0006b
Author: Armin Le Grand a...@apache.org
Date: Mon Feb 24 20:25:26 2014 +
Resolves: #i118640# force early destruction of last FragmentHandler...
to not let it use an already destroyed RelationsMap instance
(cherry picked from commit 190444f7fd3fa9cfcd1955b3f5dcd916184d02f4)
Conflicts:
oox/source/core/xmlfilterbase.cxx
Change-Id: Ibd09ff9fcba8f919df0704c8e3a64423518b932f
(cherry picked from commit b071ce32befcc84a57a7ecd39667cb6658c0c866)
diff --git a/oox/source/core/xmlfilterbase.cxx
b/oox/source/core/xmlfilterbase.cxx
index fe2055e..fe222d9 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -104,6 +104,7 @@ struct XmlFilterBaseImpl
TextFieldStack maTextFieldStack;
explicitXmlFilterBaseImpl( const Reference XComponentContext
rxContext ) throw( RuntimeException );
+~XmlFilterBaseImpl();
};
//
@@ -188,6 +189,10 @@ XmlFilterBaseImpl::XmlFilterBaseImpl( const Reference
XComponentContext rxCo
maFastParser.registerNamespace( ids[i].Second );
}
+XmlFilterBaseImpl::~XmlFilterBaseImpl()
+{
+}
+
XmlFilterBase::XmlFilterBase( const Reference XComponentContext rxContext
) throw( RuntimeException ) :
FilterBase( rxContext ),
mxImpl( new XmlFilterBaseImpl( rxContext ) ),
@@ -198,6 +203,14 @@ XmlFilterBase::XmlFilterBase( const Reference
XComponentContext rxContext )
XmlFilterBase::~XmlFilterBase()
{
+// #i118640# Reset the DocumentHandler at the FastSaxParser manually; this
is
+// needed since the mechanism is that instances of FragmentHandler execute
+// their stuff (creating objects, setting attributes, ...) on being
destroyed.
+// They get destroyed by setting a new DocumentHandler. This also happens
in
+// the following implicit destruction chain of ~XmlFilterBaseImpl, but in
that
+// case it's member RelationsMap maRelationsMap will be destroyed, but
maybe
+// still be used by ~FragmentHandler - crash.
+mxImpl-maFastParser.setDocumentHandler( 0 );
}
//
commit 1855e8e354f4875fc4ad67504007df55bd0fbc23
Author: Caolán McNamara caol...@redhat.com
Date: Sat Feb 22 19:29:19 2014 +
my upc router automatically adds .net to the domain search path
i.e. I get handed an /etc/resolv.conf of
domain net
search net ...
and so nohost resolves to nohost.net which actually exists, so I get an
authentication request which is unexpected by this test which therefore
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - 2 commits - filter/CppunitTest_filter_xslt.mk filter/Module_filter.mk filter/qa filter/source sw/qa writerfilter/source
filter/CppunitTest_filter_xslt.mk | 46 + filter/Module_filter.mk |4 filter/qa/cppunit/data/xslt/copy.xslt |9 + filter/qa/cppunit/xslt-test.cxx | 193 ++ filter/source/xsltfilter/LibXSLTTransformer.cxx |5 sw/qa/extras/ooxmlexport/data/fdo65655.docx |binary sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 16 + writerfilter/source/dmapper/DomainMapper_Impl.cxx | 10 - 8 files changed, 280 insertions(+), 3 deletions(-) New commits: commit db04610862bf50e709bee11adba74da561df7f9e Author: Michael Stahl mst...@redhat.com Date: Tue Mar 4 17:59:45 2014 +0100 filter: make LibXSLTTransformer init backward compatible As reported by Fernand Vanrie, initializing the XSLT service can fail because the LibXSLTTransformer::initialize was changed to require the parameters as a nested Sequence; accept previous parameter convention as a fall-back. (regression from ca0ea73a4ab104031a16b5bac7a9bb6e57c77ba0) (cherry picked from commit 6967da019b69767a15116de101d33a16b95c8a44) filter: and we learn that BootstrapFixture requires boost headers (cherry picked from commit bfdd18eb35f5c8bf7f713910ec35b853c7456969) filter: don't wait forever if the xslt test fails (cherry picked from commit 8af7a8953248dd184cd620b934ee6abc147f4076) I imagine this should have a SAL_CALL decoration (cherry picked from commit 62d6252d2cde33f6ef0e627c3192a63d43ba2a87) filter: sigh... fix the xslt test to run on WNT too (cherry picked from commit 4fcd5534348adcb61ab85b93478c272b8d9e8f8c) Change-Id: I136e6e6338f11ffecf9f856f0736d1d0e6b17c3f Reviewed-on: https://gerrit.libreoffice.org/8456 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/filter/CppunitTest_filter_xslt.mk b/filter/CppunitTest_filter_xslt.mk new file mode 100644 index 000..90af9b0 --- /dev/null +++ b/filter/CppunitTest_filter_xslt.mk @@ -0,0 +1,46 @@ +# -*- 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,filter_xslt)) + +$(eval $(call gb_CppunitTest_use_api,filter_xslt,\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_CppunitTest_use_ure,filter_xslt)) + +$(eval $(call gb_CppunitTest_use_configuration,filter_xslt)) + +$(eval $(call gb_CppunitTest_use_external,filter_xslt,boost_headers)) + +$(eval $(call gb_CppunitTest_use_libraries,filter_xslt, \ + comphelper \ + test \ + unotest \ + cppuhelper \ + cppu \ + sal \ + $(gb_UWINAPI) \ +)) + +$(eval $(call gb_CppunitTest_use_components,filter_xslt,\ + configmgr/source/configmgr \ + fileaccess/source/fileacc \ + filter/source/xsltfilter/xsltfilter \ + i18npool/util/i18npool \ + ucb/source/core/ucb1 \ + ucb/source/ucp/file/ucpfile1 \ +)) + +$(eval $(call gb_CppunitTest_add_exception_objects,filter_xslt, \ + filter/qa/cppunit/xslt-test \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/filter/Module_filter.mk b/filter/Module_filter.mk index 559fb65..85480f7 100644 --- a/filter/Module_filter.mk +++ b/filter/Module_filter.mk @@ -75,6 +75,10 @@ $(eval $(call gb_Module_add_targets,filter,\ )) endif +$(eval $(call gb_Module_add_check_targets,filter,\ +CppunitTest_filter_xslt \ +)) + ifneq ($(DISABLE_CVE_TESTS),TRUE) $(eval $(call gb_Module_add_check_targets,filter,\ CppunitTest_filter_pict_test \ diff --git a/filter/qa/cppunit/data/xslt/copy.xslt b/filter/qa/cppunit/data/xslt/copy.xslt new file mode 100644 index 000..d46172a --- /dev/null +++ b/filter/qa/cppunit/data/xslt/copy.xslt @@ -0,0 +1,9 @@ +?xml version=1.0 encoding=UTF-8? +xsl:stylesheet version=1.0 +xmlns:xsl=http://www.w3.org/1999/XSL/Transform; + +xsl:template match=/ + xsl:copy-of select=// +/xsl:template + +/xsl:stylesheet diff --git a/filter/qa/cppunit/xslt-test.cxx b/filter/qa/cppunit/xslt-test.cxx new file mode 100644 index 000..509d37c --- /dev/null +++ b/filter/qa/cppunit/xslt-test.cxx @@ -0,0 +1,193 @@ +/* -*- 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 limits + +#include cppunit/TestAssert.h +#include cppunit/TestFixture.h +#include cppunit/extensions/HelperMacros.h +#include cppunit/plugin/TestPlugIn.h + +#include sal/types.h +
[Bug 72606] [EasyHack] Consistently call Unicode Win32 functions, and define UNICODE globally
https://bugs.freedesktop.org/show_bug.cgi?id=72606 --- Comment #2 from Tor Lillqvist t...@iki.fi --- Please don't assign a bug to yourself unless you are very sure that you actually will be fixing it in a reasonable timeframe. If you just want to try, but don't know if you will succeed or not, it's enough to leave a comment. (The above is obviously just my personal opinion, not some official rule.) -- 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 72606] [EasyHack] Consistently call Unicode Win32 functions, and define UNICODE globally
https://bugs.freedesktop.org/show_bug.cgi?id=72606 vancuvit vitek.c...@seznam.cz changed: What|Removed |Added Assignee|vitek.c...@seznam.cz|libreoffice-b...@lists.free ||desktop.org -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 72606] [EasyHack] Consistently call Unicode Win32 functions, and define UNICODE globally
https://bugs.freedesktop.org/show_bug.cgi?id=72606 --- Comment #3 from vancuvit vitek.c...@seznam.cz --- (In reply to comment #2) Please don't assign a bug to yourself unless you are very sure that you actually will be fixing it in a reasonable timeframe. If you just want to try, but don't know if you will succeed or not, it's enough to leave a comment. (The above is obviously just my personal opinion, not some official rule.) Ok sorry for that, i changed it back. I will work on that... -- 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 'distro/collabora/cp-4.1' - 6 commits - sc/source sot/source sw/qa sw/source vcl/source writerfilter/source
sc/source/core/data/validat.cxx | 12
sot/source/base/formats.cxx | 18 +++
sw/qa/extras/ooxmlimport/data/rhbz988516.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 14 +
sw/qa/extras/ww8import/data/bnc821208.doc |binary
sw/qa/extras/ww8import/ww8import.cxx | 11
sw/source/filter/ww8/ww8par2.cxx |5 ++
vcl/source/window/splitwin.cxx| 63 --
writerfilter/source/ooxml/model.xml |4 +
9 files changed, 85 insertions(+), 42 deletions(-)
New commits:
commit 16c45ac52e84ffc34092cee271e6602ac710db9a
Author: Andrzej Hunt andrzej.h...@collabora.com
Date: Fri Feb 7 18:18:42 2014 +
fdo#52547 SOT: Prefer embedding image data to embedding linked image.
When copying an image from e.g. Firefox or Chromium the clipboard
will contain both the image itself, and the url of the image --
presumably it makes more sense to store the image data itself if
it is available -- the order of the items in the *_FREE_AREA_Copy
defines the order of preference for which data in the clipboard
should be used.
Change-Id: Id8b862a9f2fce3a34adbb16509e9b7372500a239
Reviewed-on: https://gerrit.libreoffice.org/7928
Tested-by: Caolán McNamara caol...@redhat.com
Reviewed-by: Caolán McNamara caol...@redhat.com
(cherry picked from commit c47db038f98aaf7aec3cbe57c4e5683591afa23e)
Reviewed-on: https://gerrit.libreoffice.org/8384
(cherry picked from commit 91a55de7be6a23685a875517495c1af67f3a8b60)
Reviewed-on: https://gerrit.libreoffice.org/8499
diff --git a/sot/source/base/formats.cxx b/sot/source/base/formats.cxx
index f4d473f..115d3bc 100644
--- a/sot/source/base/formats.cxx
+++ b/sot/source/base/formats.cxx
@@ -825,9 +825,6 @@ static SotAction_Impl const
aEXCHG_DEST_SWDOC_FREE_AREA_Copy[] = \
{ SOT_FORMATSTR_ID_SD_OLE, EXCHG_OUT_ACTION_INSERT_OLE |
EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL,
0 },\
{ SOT_FORMATSTR_ID_EMBED_SOURCE, EXCHG_OUT_ACTION_INSERT_OLE |
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
{ SOT_FORMATSTR_ID_EMBEDDED_OBJ, EXCHG_OUT_ACTION_INSERT_OLE |
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
-{ SOT_FORMATSTR_ID_HTML, EXCHG_OUT_ACTION_INSERT_HTML |
EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL,
0 },\
-{ SOT_FORMATSTR_ID_HTML_NO_COMMENT, EXCHG_OUT_ACTION_INSERT_HTML |
EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL,
0 },\
-{ SOT_FORMATSTR_ID_HTML_SIMPLE, EXCHG_OUT_ACTION_INSERT_HTML |
EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL,
0 },\
{ SOT_FORMAT_RTF, EXCHG_IN_ACTION_COPY |
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
{ SOT_FORMATSTR_ID_NETSCAPE_IMAGE, EXCHG_IN_ACTION_COPY |
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
{ SOT_FORMAT_STRING, EXCHG_OUT_ACTION_INSERT_STRING |
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
@@ -838,6 +835,9 @@ static SotAction_Impl const
aEXCHG_DEST_SWDOC_FREE_AREA_Copy[] = \
{ SOT_FORMAT_BITMAP, EXCHG_OUT_ACTION_INSERT_BITMAP |
EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL,
0 },\
{ SOT_FORMATSTR_ID_EMBED_SOURCE_OLE, EXCHG_OUT_ACTION_INSERT_OLE |
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
{ SOT_FORMATSTR_ID_EMBEDDED_OBJ_OLE, EXCHG_OUT_ACTION_INSERT_OLE |
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
+{ SOT_FORMATSTR_ID_HTML, EXCHG_OUT_ACTION_INSERT_HTML |
EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL,
0 },\
+{ SOT_FORMATSTR_ID_HTML_NO_COMMENT, EXCHG_OUT_ACTION_INSERT_HTML |
EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL,
0 },\
+{ SOT_FORMATSTR_ID_HTML_SIMPLE, EXCHG_OUT_ACTION_INSERT_HTML |
EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL,
0 },\
{ SOT_FORMATSTR_ID_LINK, EXCHG_OUT_ACTION_INSERT_DDE |
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
{ SOT_FORMATSTR_ID_SVIM, EXCHG_OUT_ACTION_INSERT_IMAGEMAP |
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
{ 0x, 0, 0 }
\
@@ -998,9 +998,6 @@ static SotAction_Impl const
aEXCHG_DEST_SCDOC_FREE_AREA_Copy[] = \
{ SOT_FORMATSTR_ID_EMBEDDED_OBJ, EXCHG_OUT_ACTION_INSERT_OLE |
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
{ SOT_FORMATSTR_ID_BIFF_5, EXCHG_IN_ACTION_COPY |
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
{ SOT_FORMATSTR_ID_BIFF__5,EXCHG_IN_ACTION_COPY |
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
-{ SOT_FORMATSTR_ID_HTML, EXCHG_OUT_ACTION_INSERT_HTML |
[Libreoffice-commits] core.git: 27 commits - filter/source idl/source include/tools include/vcl sal/qa sc/source sfx2/source svl/unx svtools/source svx/source sw/inc sw/source tools/source unusedcode.
filter/source/msfilter/util.cxx |2
idl/source/prj/database.cxx | 69 +--
include/tools/errinf.hxx| 10 --
include/vcl/combobox.hxx|1
include/vcl/lstbox.hxx |1
sal/qa/osl/file/osl_File.cxx| 12 ++-
sc/source/core/opencl/formulagroupcl.cxx|5 -
sc/source/core/tool/platforminfo.cxx|8 +-
sc/source/ui/optdlg/calcoptionsdlg.cxx |6 +
sfx2/source/appl/appinit.cxx|6 -
sfx2/source/appl/appquit.cxx|3
sfx2/source/inc/appdata.hxx |3
svl/unx/source/svdde/ddedummy.cxx | 20 +
svtools/source/config/accessibilityoptions.cxx | 85
svx/source/items/numfmtsh.cxx | 13 +--
sw/inc/unocrsrhelper.hxx|7 +
sw/source/core/edit/autofmt.cxx |2
sw/source/core/frmedt/fefly1.cxx|9 +-
sw/source/core/uibase/app/docstyle.cxx |2
sw/source/core/unocore/unocrsrhelper.cxx|8 +-
sw/source/filter/html/swhtml.cxx|1
sw/source/filter/ww8/wrtw8nds.cxx |8 --
tools/source/ref/errinf.cxx | 32 -
unusedcode.easy |8 --
vcl/source/control/combobox.cxx |5 -
vcl/source/control/lstbox.cxx |6 -
writerfilter/source/dmapper/StyleSheetTable.cxx |2
writerfilter/source/ooxml/OOXMLDocumentImpl.cxx |8 +-
xmloff/source/draw/shapeimport.cxx |6 +
29 files changed, 109 insertions(+), 239 deletions(-)
New commits:
commit f8c8d6131334e4723a50147348a6e7d049be2f89
Author: Caolán McNamara caol...@redhat.com
Date: Mon Mar 10 10:32:13 2014 +
coverity#736008 Dereference after null check
Change-Id: I87977322458b6f22816bdfefb44795609c8159a4
diff --git a/xmloff/source/draw/shapeimport.cxx
b/xmloff/source/draw/shapeimport.cxx
index acca562..3a20ad8 100644
--- a/xmloff/source/draw/shapeimport.cxx
+++ b/xmloff/source/draw/shapeimport.cxx
@@ -466,13 +466,15 @@ SvXMLShapeContext*
XMLShapeImportHelper::Create3DSceneChildContext(
void XMLShapeImportHelper::SetStylesContext(SvXMLStylesContext* pNew)
{
mpStylesContext = pNew;
-mpStylesContext-AddRef();
+if (mpStylesContext)
+mpStylesContext-AddRef();
}
void XMLShapeImportHelper::SetAutoStylesContext(SvXMLStylesContext* pNew)
{
mpAutoStylesContext = pNew;
-mpAutoStylesContext-AddRef();
+if (mpAutoStylesContext)
+mpAutoStylesContext-AddRef();
}
SvXMLShapeContext* XMLShapeImportHelper::CreateGroupChildContext(
commit 997b3c5f7b6cc303bb2802afe5bd777b8f0a6056
Author: Caolán McNamara caol...@redhat.com
Date: Mon Mar 10 10:26:10 2014 +
coverity#708871 Unused pointer value
Change-Id: I10aa4e053f5f709144ef516c6c4a00df8d3a1f08
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx
b/sw/source/filter/ww8/wrtw8nds.cxx
index b986b0c..b10ece7 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -2270,11 +2270,7 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode
rNode )
}
}
-bool bParaRTL = false;
-const SvxFrameDirectionItem* pItem = (const SvxFrameDirectionItem*)
-rNode.GetSwAttrSet().GetItem(RES_FRAMEDIR);
-if ( aAttrIter.IsParaRTL())
-bParaRTL = true;
+bool bParaRTL = aAttrIter.IsParaRTL();
int nNumberLevel = -1;
if (rNode.IsNumbered())
@@ -2355,7 +2351,7 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode
rNode )
cannot export that, its its ltr then that's ok as thats word's
default. Otherwise we must add a RTL attribute to our export list
*/
-pItem = (const SvxFrameDirectionItem*)
+const SvxFrameDirectionItem* pItem = (const SvxFrameDirectionItem*)
rNode.GetSwAttrSet().GetItem(RES_FRAMEDIR);
if (
(!pItem || pItem-GetValue() == FRMDIR_ENVIRONMENT)
commit 7e6054c7d41e459490fbccd77794d110b437329d
Author: Caolán McNamara caol...@redhat.com
Date: Mon Mar 10 10:19:43 2014 +
coverity#1157794 Unchecked dynamic_cast
Change-Id: Idda6698a0fc53c1b59b2a7d2e88e24dac55a0fbd
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
index 71331e1..60ac009 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
@@ -656,7 +656,7 @@ void OOXMLDocumentImpl::resolveGlossaryStream(Stream
/*rStream*/)
void OOXMLDocumentImpl::resolveEmbeddingsStream(Stream /*rStream*/)
{
uno::Referenceembed::XRelationshipAccess mxRelationshipAccess;
-
[Libreoffice-commits] core.git: include/vcl vcl/source
include/vcl/outdev.hxx|8
vcl/source/gdi/outdev.cxx | 30 +++---
2 files changed, 19 insertions(+), 19 deletions(-)
New commits:
commit 4a1bb12034fc76b2d26291c373da7309bc26f9bc
Author: Chris Sherlock chris.sherloc...@gmail.com
Date: Mon Mar 10 19:05:26 2014 +1100
Stick to function naming conventions in OutputDevice
Function name changes for consistency in OutputDevice:
* impPaintLineGeometryWithEvtlExpand -
ImplPaintLineGeometryWithEvtlExpand
* ImpDrawPolyPolygonWithB2DPolyPolygon -
ImplDrawPolyPolygonWithB2DPolyPolygon
* ImpTryDrawPolyLineDirect- ImplTryDrawPolyLineDirect
* ImpDrawPolyLineWithLineInfo - ImplDrawPolyLineWithLineInfo
Change-Id: Iae1ce07036856902259cef0a05afb57fd657325e
Reviewed-on: https://gerrit.libreoffice.org/8509
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 6ee194b..9188568 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -638,11 +638,11 @@ public:
// #i101491#
// Helper which holds the old line geometry creation and is extended to
use AA when
// switched on. Advantage is that line geometry is only temporarily used
for paint
-SAL_DLLPRIVATE void ImpDrawPolyLineWithLineInfo(const Polygon
rPoly, const LineInfo rLineInfo);
+SAL_DLLPRIVATE void ImplDrawPolyLineWithLineInfo(const Polygon
rPoly, const LineInfo rLineInfo);
// #i101491#
// Helper who tries to use SalGDI's DrawPolyLine direct and returns it's
bool. Contains no AA check.
-SAL_DLLPRIVATE bool ImpTryDrawPolyLineDirect(
+SAL_DLLPRIVATE bool ImplTryDrawPolyLineDirect(
const basegfx::B2DPolygon rB2DPolygon,
double fLineWidth = 0.0,
double fTransparency = 0.0,
@@ -650,7 +650,7 @@ public:
css::drawing::LineCap eLineCap =
css::drawing::LineCap_BUTT);
// Helper for line geometry paint with support for graphic expansion
(pattern and fat_to_area)
-voidimpPaintLineGeometryWithEvtlExpand(const
LineInfo rInfo, basegfx::B2DPolyPolygon aLinePolyPolygon);
+voidImplPaintLineGeometryWithEvtlExpand(const
LineInfo rInfo, basegfx::B2DPolyPolygon aLinePolyPolygon);
///@}
/** @name Polygon functions
@@ -662,7 +662,7 @@ public:
// #i101491#
// Helper who implements the DrawPolyPolygon functionality for
basegfx::B2DPolyPolygon
// without MetaFile processing
-SAL_DLLPRIVATE void ImpDrawPolyPolygonWithB2DPolyPolygon(const
basegfx::B2DPolyPolygon rB2DPolyPoly);
+SAL_DLLPRIVATE void ImplDrawPolyPolygonWithB2DPolyPolygon(const
basegfx::B2DPolyPolygon rB2DPolyPoly);
///@}
diff --git a/vcl/source/gdi/outdev.cxx b/vcl/source/gdi/outdev.cxx
index 3d412a2..f721054 100644
--- a/vcl/source/gdi/outdev.cxx
+++ b/vcl/source/gdi/outdev.cxx
@@ -1409,7 +1409,7 @@ void OutputDevice::DrawLine( const Point rStartPt, const
Point rEndPt )
mpAlphaVDev-DrawLine( rStartPt, rEndPt );
}
-void OutputDevice::impPaintLineGeometryWithEvtlExpand(
+void OutputDevice::ImplPaintLineGeometryWithEvtlExpand(
const LineInfo rInfo,
basegfx::B2DPolyPolygon aLinePolyPolygon)
{
@@ -1585,7 +1585,7 @@ void OutputDevice::DrawLine( const Point rStartPt, const
Point rEndPt,
aLinePolygon.append(basegfx::B2DPoint(aStartPt.X(), aStartPt.Y()));
aLinePolygon.append(basegfx::B2DPoint(aEndPt.X(), aEndPt.Y()));
-impPaintLineGeometryWithEvtlExpand(aInfo,
basegfx::B2DPolyPolygon(aLinePolygon));
+ImplPaintLineGeometryWithEvtlExpand(aInfo,
basegfx::B2DPolyPolygon(aLinePolygon));
}
else
{
@@ -1663,7 +1663,7 @@ void OutputDevice::DrawPolyLine( const Polygon rPoly )
IsLineColor());
// use b2dpolygon drawing if possible
-if(bTryAA ImpTryDrawPolyLineDirect(rPoly.getB2DPolygon()))
+if(bTryAA ImplTryDrawPolyLineDirect(rPoly.getB2DPolygon()))
{
basegfx::B2DPolygon aB2DPolyLine(rPoly.getB2DPolygon());
const ::basegfx::B2DHomMatrix aTransform =
ImplGetDeviceTransformation();
@@ -1727,10 +1727,10 @@ void OutputDevice::DrawPolyLine( const Polygon rPoly,
const LineInfo rLineInfo
if ( mpMetaFile )
mpMetaFile-AddAction( new MetaPolyLineAction( rPoly, rLineInfo ) );
-ImpDrawPolyLineWithLineInfo(rPoly, rLineInfo);
+ImplDrawPolyLineWithLineInfo(rPoly, rLineInfo);
}
-void OutputDevice::ImpDrawPolyLineWithLineInfo(const Polygon rPoly, const
LineInfo rLineInfo)
+void OutputDevice::ImplDrawPolyLineWithLineInfo(const Polygon rPoly, const
LineInfo rLineInfo)
{
sal_uInt16 nPoints(rPoly.GetSize());
@@ -1773,7 +1773,7 @@ void
Re: Review of two gerrit patches
On Mon, 2014-03-10 at 18:58 +1100, Chris Sherlock wrote: Hi all, I was wondering if the following two gerrit patches could be reviewed? https://gerrit.libreoffice.org/#/c// I'm working on them. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/vcl vcl/source
include/vcl/outdev.hxx| 11 ++-
vcl/source/gdi/outdev.cxx | 39 ++-
2 files changed, 44 insertions(+), 6 deletions(-)
New commits:
commit 9d64cdc4cf2122bcbcf1fb670bd1103d09bbc7b3
Author: Chris Sherlock chris.sherloc...@gmail.com
Date: Sun Feb 2 23:51:27 2014 +1100
Seperate initialization of OutputDevice instance
I have split OutputDevice::ImplInitGraphics() from
OutputDevice::ImplGetGraphics(). In future, we need to further
seperate out this initialization function into it's own seperate
classes. Note that ImplGetGraphics still initializes if mpGraphics
is not set.
Change-Id: I17d4778f735aa9d03bf9b37079a9d695bf95866b
Reviewed-on: https://gerrit.libreoffice.org/
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 9188568..9b012cc 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -359,9 +359,18 @@ public:
/** Get the graphic context that the output device uses to draw on.
+ If no graphics device exists, then initialize it.
+
@returns SalGraphics instance.
*/
-SAL_DLLPRIVATE SalGraphics* ImplGetGraphics() const;
+SAL_DLLPRIVATE SalGraphics const *ImplGetGraphics() const;
+SAL_DLLPRIVATE SalGraphics* ImplGetGraphics();
+
+/** Initialize the graphics device that the output device uses to draw on.
+
+ @returns true if was able to initialize the graphics device, false
otherwise.
+ */
+SAL_DLLPRIVATE bool ImplInitGraphics() const;
/** Release the graphics device, and remove it from the graphics device
list.
diff --git a/vcl/source/gdi/outdev.cxx b/vcl/source/gdi/outdev.cxx
index f721054..c1f42d7 100644
--- a/vcl/source/gdi/outdev.cxx
+++ b/vcl/source/gdi/outdev.cxx
@@ -183,7 +183,7 @@ bool OutputDevice::ImplSelectClipRegion( const Region
rRegion, SalGraphics* pGr
if( !pGraphics )
{
if( !mpGraphics )
-if( !ImplGetGraphics() )
+if( !ImplInitGraphics() )
return false;
pGraphics = mpGraphics;
}
@@ -520,12 +520,39 @@ voidOutputDevice::ReMirror( Region rRegion ) const
}
-SalGraphics* OutputDevice::ImplGetGraphics() const
+SalGraphics* OutputDevice::ImplGetGraphics()
{
DBG_TESTSOLARMUTEX();
-if ( mpGraphics )
-return mpGraphics;
+if ( !mpGraphics )
+{
+if ( !ImplInitGraphics() )
+{
+SAL_WARN(vcl, No mpGraphics set);
+}
+}
+
+return mpGraphics;
+}
+
+SalGraphics const *OutputDevice::ImplGetGraphics() const
+{
+DBG_TESTSOLARMUTEX();
+
+if ( !mpGraphics )
+{
+if ( !ImplInitGraphics() )
+{
+SAL_WARN(vcl, No mpGraphics set);
+}
+}
+
+return mpGraphics;
+}
+
+bool OutputDevice::ImplInitGraphics() const
+{
+DBG_TESTSOLARMUTEX();
mbInitLineColor = true;
mbInitFillColor = true;
@@ -534,6 +561,8 @@ SalGraphics* OutputDevice::ImplGetGraphics() const
mbInitClipRegion= true;
ImplSVData* pSVData = ImplGetSVData();
+
+// TODO: move this out of OutputDevice and into subclasses
if ( meOutDevType == OUTDEV_WINDOW )
{
Window* pWindow = (Window*)this;
@@ -667,7 +696,7 @@ SalGraphics* OutputDevice::ImplGetGraphics() const
mpGraphics-setAntiAliasB2DDraw(mnAntialiasing
ANTIALIASING_ENABLE_B2DDRAW);
}
-return mpGraphics;
+return mpGraphics ? true : false;
}
void OutputDevice::ImplReleaseGraphics( bool bRelease )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl
include/vcl/outdev.hxx | 15 +++ 1 file changed, 15 insertions(+) New commits: commit 11ca83d180aa37f927f341cdc1726ff1491fcc49 Author: Chris Sherlock chris.sherloc...@gmail.com Date: Fri Feb 14 01:36:30 2014 +1100 Update the documentation for ImplInitGraphics() Better explain the whys and wherefores of the graphics LRU and how it is used. Change-Id: I345cd91044bc533c9650e2d17bf53d2879af3e39 Reviewed-on: https://gerrit.libreoffice.org/8030 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 9b012cc..8595400 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -368,6 +368,21 @@ public: /** Initialize the graphics device that the output device uses to draw on. + There is an LRU of OutputDevices that is used to get the graphics. The + actual creation of a SalGraphics instance is done via the SalFrame + implementation. + + However, the SalFrame instance will only return a valid SalGraphics + instance if it is not in use or there wasn't one in the first place. When + this happens, ImplInitGraphics finds the least recently used OutputDevice + in a different frame and steals it (releases it then starts using it). + + If there are no frames to steal an OutputDevice's SalGraphics instance from + then it blocks until the graphics is released. + + Once it has acquired a graphics instance, then we add the OutputDevice to + the LRU. + @returns true if was able to initialize the graphics device, false otherwise. */ SAL_DLLPRIVATE bool ImplInitGraphics() const; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/suse-3.6-6'
Tag 'suse-3.6-6' created by Andras Timar andras.ti...@collabora.com at 2014-03-10 12:58 -0700 suse-3.6-6 Changes since suse-3.6-0: Fridrich Å trba (1): Branch libreoffice-3-6-3 Petr Mladek (1): Merge remote-tracking branch 'origin/libreoffice-3-6-3' into suse-3.6 --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/suse-3.6-6'
Tag 'suse-3.6-6' created by Andras Timar andras.ti...@collabora.com at 2014-03-10 12:58 -0700 suse-3.6-6 Changes since suse-3.6-0-286: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/suse-3.6-6'
Tag 'suse-3.6-6' created by Andras Timar andras.ti...@collabora.com at 2014-03-10 12:58 -0700 suse-3.6-6 Changes since suse-3.6-0: Fridrich Å trba (1): Branch libreoffice-3-6-3 Petr Mladek (1): Merge remote-tracking branch 'origin/libreoffice-3-6-3' into suse-3.6 Stephan Bergmann (1): fdo#51074: Start table cells with | | --- helpcontent2/to-wiki/wikiconv2.py |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/suse-3.6-6'
Tag 'suse-3.6-6' created by Andras Timar andras.ti...@collabora.com at 2014-03-10 12:58 -0700 suse-3.6-6 Changes since suse-3.6-0-3: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/suse-3.6-6'
Tag 'suse-3.6-6' created by Andras Timar andras.ti...@collabora.com at 2014-03-10 12:58 -0700 suse-3.6-6 Changes since suse-3.6-0-3: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/suse-3.6-7'
Tag 'suse-3.6-7' created by Andras Timar andras.ti...@collabora.com at 2014-03-10 13:01 -0700 suse-3.6-7 Changes since suse-3.6-6-4: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/suse-3.6-7'
Tag 'suse-3.6-7' created by Andras Timar andras.ti...@collabora.com at 2014-03-10 13:01 -0700 suse-3.6-7 Changes since suse-3.6-0: Fridrich Å trba (1): Branch libreoffice-3-6-3 Petr Mladek (1): Merge remote-tracking branch 'origin/libreoffice-3-6-3' into suse-3.6 --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/suse-3.6-7'
Tag 'suse-3.6-7' created by Andras Timar andras.ti...@collabora.com at 2014-03-10 13:01 -0700 suse-3.6-7 Changes since suse-3.6-0: Fridrich Å trba (1): Branch libreoffice-3-6-3 Petr Mladek (1): Merge remote-tracking branch 'origin/libreoffice-3-6-3' into suse-3.6 Stephan Bergmann (1): fdo#51074: Start table cells with | | --- helpcontent2/to-wiki/wikiconv2.py |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/suse-3.6-7'
Tag 'suse-3.6-7' created by Andras Timar andras.ti...@collabora.com at 2014-03-10 13:01 -0700 suse-3.6-7 Changes since suse-3.6-0-3: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/suse-3.6-7'
Tag 'suse-3.6-7' created by Andras Timar andras.ti...@collabora.com at 2014-03-10 13:01 -0700 suse-3.6-7 Changes since suse-3.6-0-3: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Integration Libreoffice on Mac OS
Hi Shin, I hope you don't mind I again add the development mailing list to CC :-) Shin Nguyễn píše v So 08. 03. 2014 v 23:04 +0700: I used Libreoffice api to open and view documents, and I also integrated the viewer of documents into the same window of main application. Using visual studio I have done on windows , but I don't know to begin on Mac OS. My goal is use Xcode to write an application can open and view documents through Libreoffice api, build on Mac OS. Can you give me some suggestions? So if you've done the embedding using the createSystemChild() API (from XSystemChildFactory interface), it should work similar way for OSX as it does for Windows; just instead of providing it with window handle, you should provide it with (NSView*) pointer. Regarding how to do OSX development in general - I don't develop on OSX myself, so unfortunately cannot help you :-( But hopefully a bit of googling will get you somewhere; or maybe somebody in the list will help. Either way - hope that you'll achieve what you need! All the best, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/suse-3.6-8'
Tag 'suse-3.6-8' created by Andras Timar andras.ti...@collabora.com at 2014-03-10 13:15 -0700 suse-3.6-8 Changes since suse-3.6-0-3: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/suse-3.6-8'
Tag 'suse-3.6-8' created by Andras Timar andras.ti...@collabora.com at 2014-03-10 13:15 -0700 suse-3.6-8 Changes since suse-3.6-0: Fridrich Å trba (1): Branch libreoffice-3-6-3 Petr Mladek (1): Merge remote-tracking branch 'origin/libreoffice-3-6-3' into suse-3.6 Stephan Bergmann (1): fdo#51074: Start table cells with | | --- helpcontent2/to-wiki/wikiconv2.py |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/suse-3.6-8'
Tag 'suse-3.6-8' created by Andras Timar andras.ti...@collabora.com at 2014-03-10 13:15 -0700 suse-3.6-8 Changes since suse-3.6-0-3: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/suse-3.6-8'
Tag 'suse-3.6-8' created by Andras Timar andras.ti...@collabora.com at 2014-03-10 13:15 -0700 suse-3.6-8 Changes since suse-3.6-0: Fridrich Å trba (1): Branch libreoffice-3-6-3 Petr Mladek (1): Merge remote-tracking branch 'origin/libreoffice-3-6-3' into suse-3.6 --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/suse-3.6-8'
Tag 'suse-3.6-8' created by Andras Timar andras.ti...@collabora.com at 2014-03-10 13:15 -0700 suse-3.6-8 Changes since suse-3.6-7-1: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/suse-3.6-9'
Tag 'suse-3.6-9' created by Andras Timar andras.ti...@collabora.com at 2014-03-10 13:21 -0700 suse-3.6-9 Changes since suse-3.6-0-3: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/suse-3.6-9'
Tag 'suse-3.6-9' created by Andras Timar andras.ti...@collabora.com at 2014-03-10 13:21 -0700 suse-3.6-9 Changes since suse-3.6-0: Fridrich Å trba (1): Branch libreoffice-3-6-3 Petr Mladek (1): Merge remote-tracking branch 'origin/libreoffice-3-6-3' into suse-3.6 Stephan Bergmann (1): fdo#51074: Start table cells with | | --- helpcontent2/to-wiki/wikiconv2.py |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/suse-3.6-9'
Tag 'suse-3.6-9' created by Andras Timar andras.ti...@collabora.com at 2014-03-10 13:21 -0700 suse-3.6-9 Changes since suse-3.6-0: Fridrich Å trba (1): Branch libreoffice-3-6-3 Petr Mladek (1): Merge remote-tracking branch 'origin/libreoffice-3-6-3' into suse-3.6 --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/suse-3.6-9'
Tag 'suse-3.6-9' created by Andras Timar andras.ti...@collabora.com at 2014-03-10 13:21 -0700 suse-3.6-9 Changes since suse-3.6-0-3: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/suse-3.6-9'
Tag 'suse-3.6-9' created by Andras Timar andras.ti...@collabora.com at 2014-03-10 13:21 -0700 suse-3.6-9 Changes since suse-3.6-8-4: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/suse-3.6-5'
Tag 'suse-3.6-5' created by Andras Timar andras.ti...@collabora.com at 2014-03-10 13:23 -0700 suse-3.6-5 Changes since suse-3.6-0-3: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/suse-3.6-5'
Tag 'suse-3.6-5' created by Andras Timar andras.ti...@collabora.com at 2014-03-10 13:23 -0700 suse-3.6-5 Changes since suse-3.6-0-284: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/suse-3.6-5'
Tag 'suse-3.6-5' created by Andras Timar andras.ti...@collabora.com at 2014-03-10 13:23 -0700 suse-3.6-5 Changes since suse-3.6-0: Fridrich Å trba (1): Branch libreoffice-3-6-3 Petr Mladek (1): Merge remote-tracking branch 'origin/libreoffice-3-6-3' into suse-3.6 --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/suse-3.6-5'
Tag 'suse-3.6-5' created by Andras Timar andras.ti...@collabora.com at 2014-03-10 13:23 -0700 suse-3.6-5 Changes since suse-3.6-0: Fridrich Å trba (1): Branch libreoffice-3-6-3 Petr Mladek (1): Merge remote-tracking branch 'origin/libreoffice-3-6-3' into suse-3.6 Stephan Bergmann (1): fdo#51074: Start table cells with | | --- helpcontent2/to-wiki/wikiconv2.py |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/suse-3.6-5'
Tag 'suse-3.6-5' created by Andras Timar andras.ti...@collabora.com at 2014-03-10 13:23 -0700 suse-3.6-5 Changes since suse-3.6-0-3: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/suse-3.6-appup-3'
Tag 'suse-3.6-appup-3' created by Andras Timar andras.ti...@collabora.com at 2014-03-10 13:28 -0700 suse-3.6-appup-3 Changes since suse-3.6-5: Petr Mladek (1): Release SUSE 3.6-3, build id 303, Linux version 3.6.3.2.3, tag suse-3.6-3 --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/suse-3.6-appup-3'
Tag 'suse-3.6-appup-3' created by Andras Timar andras.ti...@collabora.com at 2014-03-10 13:28 -0700 suse-3.6-appup-3 Changes since suse-3.6-5: Petr Mladek (1): Release SUSE 3.6-3, build id 303, Linux version 3.6.3.2.3, tag suse-3.6-3 --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/suse-3.6-appup-3'
Tag 'suse-3.6-appup-3' created by Andras Timar andras.ti...@collabora.com at 2014-03-10 13:28 -0700 suse-3.6-appup-3 Changes since suse-3.6-5: Petr Mladek (1): Release SUSE 3.6-3, build id 303, Linux version 3.6.3.2.3, tag suse-3.6-3 --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/suse-3.6-appup-3'
Tag 'suse-3.6-appup-3' created by Andras Timar andras.ti...@collabora.com at 2014-03-10 13:28 -0700 suse-3.6-appup-3 Changes since suse-3.6-3-1: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/suse-3.6-appup-3'
Tag 'suse-3.6-appup-3' created by Andras Timar andras.ti...@collabora.com at 2014-03-10 13:28 -0700 suse-3.6-appup-3 Changes since suse-3.6-5: Petr Mladek (1): Release SUSE 3.6-3, build id 303, Linux version 3.6.3.2.3, tag suse-3.6-3 --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/suse-3.6-appup-4'
Tag 'suse-3.6-appup-4' created by Andras Timar andras.ti...@collabora.com at 2014-03-10 13:32 -0700 suse-3.6-appup-4 Changes since suse-3.6-5: Petr Mladek (1): Release SUSE 3.6-3, build id 303, Linux version 3.6.3.2.3, tag suse-3.6-3 --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/suse-3.6-appup-4'
Tag 'suse-3.6-appup-4' created by Andras Timar andras.ti...@collabora.com at 2014-03-10 13:32 -0700 suse-3.6-appup-4 Changes since suse-3.6-5: Petr Mladek (1): Release SUSE 3.6-3, build id 303, Linux version 3.6.3.2.3, tag suse-3.6-3 --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/suse-3.6-appup-4'
Tag 'suse-3.6-appup-4' created by Andras Timar andras.ti...@collabora.com at 2014-03-10 13:32 -0700 suse-3.6-appup-4 Changes since suse-3.6-appup-3-36: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/suse-3.6-appup-4'
Tag 'suse-3.6-appup-4' created by Andras Timar andras.ti...@collabora.com at 2014-03-10 13:32 -0700 suse-3.6-appup-4 Changes since suse-3.6-5: Petr Mladek (1): Release SUSE 3.6-3, build id 303, Linux version 3.6.3.2.3, tag suse-3.6-3 --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/suse-3.6-appup-4'
Tag 'suse-3.6-appup-4' created by Andras Timar andras.ti...@collabora.com at 2014-03-10 13:32 -0700 suse-3.6-appup-4 Changes since suse-3.6-5: Petr Mladek (1): Release SUSE 3.6-3, build id 303, Linux version 3.6.3.2.3, tag suse-3.6-3 --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Integration Libreoffice on Mac OS
Using visual studio I have done on windows , but I don't know to begin on Mac OS. My goal is use Xcode to write an application can open and view documents through Libreoffice api, build on Mac OS. It is a bit confusing that you keep bringing up Visual Studio and Xcode; those are just IDEs. and have no impact on what the code you use does, right? I.e., it's not like Visual Studio would have some magic button Integrate LibreOffice; you had to write actual code to do it. That you then happened to write that code using Visual Studio as editor, and run the compiler from VS, is not really relevant from the LibreOffice developer point of view. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: formula/source include/formula sc/inc sc/qa sc/source
formula/source/core/resource/core_resource.src | 21 +
include/formula/compiler.hrc |5 +
include/formula/opcode.hxx |3
sc/inc/helpids.h |3
sc/qa/unit/subsequent_filters-test.cxx |6 -
sc/qa/unit/ucalc.cxx |3
sc/source/core/inc/interpre.hxx|2
sc/source/core/tool/interpr2.cxx | 66 +
sc/source/core/tool/interpr4.cxx |3
sc/source/filter/excel/xlformula.cxx |3
sc/source/filter/oox/formulabase.cxx |5 +
sc/source/ui/src/scfuncs.src | 96 +
12 files changed, 211 insertions(+), 5 deletions(-)
New commits:
commit ed778238375b45d3d1fb384ed3c78ce250f1c28d
Author: Winfried Donkers winfrieddonk...@libreoffice.org
Date: Fri Mar 7 09:48:44 2014 +0100
fdo#71720 Add Excel 2010 functions
CEILING.PRECISE, ISO.CEILING, FLOOR.PRECISE
Change-Id: I047b65ca3adafb89fce9b6493948aa851ddca765
Reviewed-on: https://gerrit.libreoffice.org/8488
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
diff --git a/formula/source/core/resource/core_resource.src
b/formula/source/core/resource/core_resource.src
index a6de271..30e8d16 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -148,6 +148,9 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_ODFF
String SC_OPCODE_FORMULA { Text = FORMULA; };
String SC_OPCODE_ARC_TAN_2 { Text = ATAN2 ; };
String SC_OPCODE_CEIL { Text = CEILING ; };
+String SC_OPCODE_CEIL_MS { Text = COM.MICROSOFT.CEILING.PRECISE ; };
+String SC_OPCODE_CEIL_ISO { Text = COM.MICROSOFT.ISO.CEILING ; };
+String SC_OPCODE_FLOOR_MS { Text = COM.MICROSOFT.FLOOR.PRECISE ; };
String SC_OPCODE_FLOOR { Text = FLOOR ; };
String SC_OPCODE_ROUND { Text = ROUND ; };
String SC_OPCODE_ROUND_UP { Text = ROUNDUP ; };
@@ -546,6 +549,9 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML
String SC_OPCODE_FORMULA { Text = _xlfn.FORMULATEXT; };
String SC_OPCODE_ARC_TAN_2 { Text = ATAN2 ; };
String SC_OPCODE_CEIL { Text = CEILING ; };
+String SC_OPCODE_CEIL_MS { Text = _xlfn.CEILING.PRECISE ; };
+String SC_OPCODE_CEIL_ISO { Text = _xlfn.ISO.CEILING ; };
+String SC_OPCODE_FLOOR_MS { Text = _xlfn.FLOOR.PRECISE ; };
String SC_OPCODE_FLOOR { Text = FLOOR ; };
String SC_OPCODE_ROUND { Text = ROUND ; };
String SC_OPCODE_ROUND_UP { Text = ROUNDUP ; };
@@ -946,6 +952,9 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH
String SC_OPCODE_FORMULA { Text = FORMULA; };
String SC_OPCODE_ARC_TAN_2 { Text = ATAN2 ; };
String SC_OPCODE_CEIL { Text = CEILING ; };
+String SC_OPCODE_CEIL_MS { Text = CEILING.PRECISE ; };
+String SC_OPCODE_CEIL_ISO { Text = ISO.CEILING ; };
+String SC_OPCODE_FLOOR_MS { Text = FLOOR.PRECISE ; };
String SC_OPCODE_FLOOR { Text = FLOOR ; };
String SC_OPCODE_ROUND { Text = ROUND ; };
String SC_OPCODE_ROUND_UP { Text = ROUNDUP ; };
@@ -1648,6 +1657,18 @@ Resource RID_STRLIST_FUNCTION_NAMES
{
Text [ en-US ] = CEILING ;
};
+String SC_OPCODE_CEIL_MS
+{
+Text = CEILING.PRECISE ;
+};
+String SC_OPCODE_CEIL_ISO
+{
+Text = ISO.CEILING ;
+};
+String SC_OPCODE_FLOOR_MS
+{
+Text = FLOOR.PRECISE ;
+};
String SC_OPCODE_FLOOR
{
Text [ en-US ] = FLOOR ;
diff --git a/include/formula/compiler.hrc b/include/formula/compiler.hrc
index 4566c00..23eedf3 100644
--- a/include/formula/compiler.hrc
+++ b/include/formula/compiler.hrc
@@ -460,8 +460,11 @@
#define SC_OPCODE_MODAL_VALUE_MULTI 462
#define SC_OPCODE_NEG_BINOM_DIST_MS 463
#define SC_OPCODE_Z_TEST_MS 464
+#define SC_OPCODE_CEIL_MS 465
+#define SC_OPCODE_CEIL_ISO 466
+#define SC_OPCODE_FLOOR_MS 467
-#define SC_OPCODE_STOP_2_PAR465 /* last function with two or more
parameters' OpCode + 1 */
+#define SC_OPCODE_STOP_2_PAR468 /* last function with two or more
parameters' OpCode + 1 */
#define SC_OPCODE_STOP_FUNCTION SC_OPCODE_STOP_2_PAR/* last
function's OpCode + 1 */
#define SC_OPCODE_LAST_OPCODE_ID(SC_OPCODE_STOP_FUNCTION - 1) /* last
OpCode */
diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx
index 19f644d..13daeff 100644
--- a/include/formula/opcode.hxx
+++ b/include/formula/opcode.hxx
@@ -189,6 +189,9 @@ enum OpCodeEnum
// Functions with more than one parameters
ocArcTan2 = SC_OPCODE_ARC_TAN_2,
ocCeil = SC_OPCODE_CEIL,
+ocCeil_MS = SC_OPCODE_CEIL_MS,
+ocCeil_ISO = SC_OPCODE_CEIL_ISO,
+ocFloor_MS = SC_OPCODE_FLOOR_MS,
ocFloor = SC_OPCODE_FLOOR,
[Libreoffice-commits] core.git: 3 commits - include/xmloff oox/source xmloff/source
include/xmloff/xmltoken.hxx |2 +
oox/source/drawingml/graphicshapecontext.cxx | 14 +---
xmloff/source/chart/SchXMLExport.cxx | 45 +--
xmloff/source/core/xmltoken.cxx |2 +
4 files changed, 56 insertions(+), 7 deletions(-)
New commits:
commit 5b12e2bb76d8e9af30672cc34b884c54b5e639f5
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Mon Mar 10 14:56:26 2014 +0100
fix OOXML strict chart import
Change-Id: I84a2fd575ced64d4774147063f13ebb8605c100f
diff --git a/oox/source/drawingml/graphicshapecontext.cxx
b/oox/source/drawingml/graphicshapecontext.cxx
index 3f45f4b..ebd2028 100644
--- a/oox/source/drawingml/graphicshapecontext.cxx
+++ b/oox/source/drawingml/graphicshapecontext.cxx
@@ -122,17 +122,21 @@ ContextHandlerRef
GraphicalObjectFrameContext::onCreateContext( sal_Int32 aEleme
case XML_graphicData : // CT_GraphicalObjectData
{
OUString sUri( rAttribs.getString( XML_uri ).get() );
-if ( sUri ==
http://schemas.openxmlformats.org/presentationml/2006/ole; )
+if ( sUri ==
http://schemas.openxmlformats.org/presentationml/2006/ole; ||
+sUri == http://purl.oclc.org/ooxml/presentationml/ole; )
return new OleObjectGraphicDataContext( *this, mpShapePtr );
-else if ( sUri ==
http://schemas.openxmlformats.org/drawingml/2006/diagram; )
+else if ( sUri ==
http://schemas.openxmlformats.org/drawingml/2006/diagram; ||
+sUri == http://purl.oclc.org/ooxml/drawingml/diagram; )
return new DiagramGraphicDataContext( *this, mpShapePtr );
-else if ( sUri ==
http://schemas.openxmlformats.org/drawingml/2006/chart; )
+else if ( sUri ==
http://schemas.openxmlformats.org/drawingml/2006/chart; ||
+sUri == http://purl.oclc.org/ooxml/drawingml/chart; )
return new ChartGraphicDataContext( *this, mpShapePtr,
mbEmbedShapesInChart );
-else if ( sUri.equalsAscii(
http://schemas.openxmlformats.org/drawingml/2006/table; ) )
+else if ( sUri ==
http://schemas.openxmlformats.org/drawingml/2006/table; ||
+sUri == http://purl.oclc.org/ooxml/drawingml/table; )
return new table::TableContext( *this, mpShapePtr );
else
{
-OSL_TRACE( OOX: Ignore graphicsData of %s, OUSTRING_TO_CSTR(
sUri ) );
+SAL_WARN(oox, OOX: Ignore graphicsData of : sUri );
return 0;
}
}
commit 37b437dcd686de72e6c78703f351a56e23aef073
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Mon Mar 10 01:01:24 2014 +0100
support export of property mapping
Change-Id: I9529eedb9c9c002bfc2fee638938082cef59f185
diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index 39a6dc9..83d766d 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -3212,6 +3212,8 @@ namespace xmloff { namespace token {
XML_MARGIN, // #i117001#
+XML_PROPERTY_MAPPING,
+
// regina, ODF1.2 additional symbols in charts
XML_STAR,
XML_ASTERISK,
diff --git a/xmloff/source/chart/SchXMLExport.cxx
b/xmloff/source/chart/SchXMLExport.cxx
index fd0b08c..6c369ac 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -207,6 +207,11 @@ public:
const ::com::sun::star::awt::Size rPageSize,
sal_Bool bExportContent,
sal_Bool bHasTwoYAxes );
+
+void exportPropertyMapping(
+const com::sun::star::uno::Reference
com::sun::star::chart2::data::XDataSource xSource,
+Sequence OUString rSupportedMappings );
+
void exportCandleStickSeries(
const ::com::sun::star::uno::Sequence
::com::sun::star::uno::Reference
@@ -2874,6 +2879,13 @@ void SchXMLExportHelper_Impl::exportSeries(
uno::Reference beans::XPropertySet (
aSeriesSeq[nSeriesIdx], uno::UNO_QUERY ),
nSeriesLength, xNewDiagram, bExportContent );
+const SvtSaveOptions::ODFDefaultVersion
nCurrentODFVersion( SvtSaveOptions().GetODFDefaultVersion() );
+if( bExportContent nCurrentODFVersion
SvtSaveOptions::ODFVER_012 )//do not export to ODF 1.2 or older
+{
+Sequence OUString aSupportedMappings =
aCTSeq[nCTIdx]-getSupportedPropertyRoles();
+exportPropertyMapping( xSource, aSupportedMappings );
+}
+
// close series element
delete pSeries;
}
@@ -2883,6 +2895,36 @@ void SchXMLExportHelper_Impl::exportSeries(
}
}
+void SchXMLExportHelper_Impl::exportPropertyMapping(
+const Reference chart2::data::XDataSource xSource,
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source
sc/source/core/data/dpoutput.cxx |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit c57cac9d9255c46dbab925535b563885d57675cc Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Sun Mar 9 21:28:05 2014 -0400 fdo#75962: Avoid unwanted number detection when placing page field name. Change-Id: I1a3c57ec029e03198b8f190acfa8d59e142acaba (cherry picked from commit 0919979bd1da3379e030b353a097d8fe1fd8341a) Reviewed-on: https://gerrit.libreoffice.org/8508 Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx index cb43ecc..c03b8ce 100644 --- a/sc/source/core/data/dpoutput.cxx +++ b/sc/source/core/data/dpoutput.cxx @@ -1003,7 +1003,9 @@ void ScDPOutput::Output() else if (n 1) aPageValue = ScResId(SCSTR_MULTIPLE).toString(); -pDoc-SetString( nFldCol, nHdrRow, nTab, aPageValue ); +ScSetStringParam aParam; +aParam.setTextInput(); +pDoc-SetString(nFldCol, nHdrRow, nTab, aPageValue, aParam); lcl_SetFrame( pDoc,nTab, nFldCol,nHdrRow, nFldCol,nHdrRow, 20 ); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source
sc/source/core/tool/interpr6.cxx | 42 +++
1 file changed, 38 insertions(+), 4 deletions(-)
New commits:
commit e26f0c815cbb3ca2c912b9ed85470d7666564027
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Fri Mar 7 18:03:24 2014 -0500
fdo#75628: SUM should inherit error if one is present in its references.
Change-Id: I94017fe91295dbb929f57be5e3fb26edf5032a8f
(cherry picked from commit d658c092f488fc0d4cb924fe3e34cab997db76e2)
Reviewed-on: https://gerrit.libreoffice.org/8504
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
diff --git a/sc/source/core/tool/interpr6.cxx b/sc/source/core/tool/interpr6.cxx
index a32b3c1..b98fb9b 100644
--- a/sc/source/core/tool/interpr6.cxx
+++ b/sc/source/core/tool/interpr6.cxx
@@ -210,8 +210,10 @@ namespace {
class NumericCellAccumulator
{
double mfSum;
+sal_uInt16 mnError;
+
public:
-NumericCellAccumulator() : mfSum(0.0) {}
+NumericCellAccumulator() : mfSum(0.0), mnError(0) {}
void operator() (size_t, double fVal)
{
@@ -220,11 +222,28 @@ public:
void operator() (size_t, const ScFormulaCell* pCell)
{
+if (mnError)
+// Skip all the rest if we have an error.
+return;
+
+double fVal = 0.0;
+sal_uInt16 nErr = 0;
ScFormulaCell rCell = const_castScFormulaCell(*pCell);
-if (rCell.IsValue())
-mfSum += rCell.GetValue();
+if (!rCell.GetErrorOrValue(nErr, fVal))
+// The cell has neither error nor value. Perhaps string result.
+return;
+
+if (nErr)
+{
+// Cell has error.
+mnError = nErr;
+return;
+}
+
+mfSum += fVal;
}
+sal_uInt16 getError() const { return mnError; }
double getSum() const { return mfSum; }
};
@@ -299,10 +318,11 @@ class FuncSum : public sc::ColumnSpanSet::ColumnAction
sc::ColumnBlockConstPosition maPos;
ScColumn* mpCol;
double mfSum;
+sal_uInt16 mnError;
sal_uInt32 mnNumFmt;
public:
-FuncSum() : mpCol(0), mfSum(0.0), mnNumFmt(0) {}
+FuncSum() : mpCol(0), mfSum(0.0), mnError(0), mnNumFmt(0) {}
virtual void startColumn(ScColumn* pCol)
{
@@ -315,12 +335,20 @@ public:
if (!bVal)
return;
+if (mnError)
+return;
+
NumericCellAccumulator aFunc;
maPos.miCellPos = sc::ParseFormulaNumeric(maPos.miCellPos,
mpCol-GetCellStore(), nRow1, nRow2, aFunc);
+mnError = aFunc.getError();
+if (mnError)
+return;
+
mfSum += aFunc.getSum();
mnNumFmt = mpCol-GetNumberFormat(nRow2);
};
+sal_uInt16 getError() const { return mnError; }
double getSum() const { return mfSum; }
sal_uInt32 getNumberFormat() const { return mnNumFmt; }
};
@@ -806,6 +834,12 @@ void ScInterpreter::ScSum()
FuncSum aAction;
aSet.executeColumnAction(*pDok, aAction);
+sal_uInt16 nErr = aAction.getError();
+if (nErr)
+{
+SetError(nErr);
+return;
+}
fRes += aAction.getSum();
// Get the number format of the last iterated cell.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sw/qa sw/source
sw/qa/extras/ww8import/data/cp139.doc |binary
sw/qa/extras/ww8import/ww8import.cxx |6 ++
sw/source/filter/ww8/ww8par6.cxx |5 +
3 files changed, 11 insertions(+)
New commits:
commit 487b0b2829b94213eed83350a4a3825871de6387
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Thu Mar 6 09:48:54 2014 +0100
cp#139 DOC import: ignore symbol charset of the symbol font
Otherwise characters unhandled by our OpenSymbol font (like Arabic 0-9
numbers) won't be rendered using an other font, as no other font
provides the symbol charset. Do this in
SwWW8ImplReader::GetFontParams(), where we already have font name -
font family mappings for a few well-known fonts.
The DOCX filter does the same for quite some time, and that's how Arabic
numbers in text using the Symbol font were rendered, instead of little
rectangles.
Change-Id: Ib794cac19ad7b073e39f3cbd7d4bad3994151c14
(cherry picked from commit 8556cd881270823865662e9a7700da58d11c2785)
Reviewed-on: https://gerrit.libreoffice.org/8474
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com
diff --git a/sw/qa/extras/ww8import/data/cp139.doc
b/sw/qa/extras/ww8import/data/cp139.doc
new file mode 100755
index 000..70cad3c
Binary files /dev/null and b/sw/qa/extras/ww8import/data/cp139.doc differ
diff --git a/sw/qa/extras/ww8import/ww8import.cxx
b/sw/qa/extras/ww8import/ww8import.cxx
index cc107e0..875c039 100644
--- a/sw/qa/extras/ww8import/ww8import.cxx
+++ b/sw/qa/extras/ww8import/ww8import.cxx
@@ -243,6 +243,12 @@ DECLARE_WW8IMPORT_TEST(testBnc821208, bnc821208.doc)
CPPUNIT_ASSERT_EQUAL(beans::PropertyState_DEFAULT_VALUE, ePropertyState);
}
+DECLARE_WW8IMPORT_TEST(testCp139, cp139.doc)
+{
+// This was RTL_TEXTENCODING_SYMBOL, causing 1 rendered as a placeholder
rectangle.
+CPPUNIT_ASSERT_EQUAL(sal_Int16(RTL_TEXTENCODING_DONTKNOW),
getPropertysal_Int16(getRun(getParagraph(1), 1), CharFontCharSet));
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 7283840..685feae 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -3396,6 +3396,11 @@ bool SwWW8ImplReader::GetFontParams( sal_uInt16 nFCode,
FontFamily reFamily,
reCharSet = rtl_getTextEncodingFromWindowsCharset( pF-chs );
}
+// Make sure charset is not set in case of Symbol, otherwise in case a
+// character is missing in our OpenSymbol, the character won't be replaced.
+if (reCharSet == RTL_TEXTENCODING_SYMBOL rName == Symbol)
+reCharSet = RTL_TEXTENCODING_DONTKNOW;
+
// make sure Font Family Code is set correctly
// at least for the most important fonts
// ( might be set wrong when Doc was not created by
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: editeng/source
editeng/source/editeng/impedit4.cxx | 47 +++-
1 file changed, 25 insertions(+), 22 deletions(-)
New commits:
commit 4de3859d884549ef9f6e141b71592e69d51f6f94
Author: Tobias Lippert d...@fastmail.fm
Date: Thu Feb 27 12:10:14 2014 +0100
RTF writing now uses SfxStyleSheetIterator to iterate over style sheets
Change-Id: I9d5e86eecf1849d8ae7f9e7052c434844e27ddfd
Reviewed-on: https://gerrit.libreoffice.org/8481
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/editeng/source/editeng/impedit4.cxx
b/editeng/source/editeng/impedit4.cxx
index 06a94e5..8605877 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -78,6 +78,8 @@
#include vector
#include boost/scoped_ptr.hpp
+#include boost/make_shared.hpp
+#include boost/unordered_map.hpp
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -307,19 +309,6 @@ sal_uInt32 ImpEditEngine::WriteXML( SvStream rOutput,
EditSelection aSel )
return 0;
}
-static sal_uInt16 getStylePos( const SfxStyles rStyles, SfxStyleSheet* pSheet
)
-{
-sal_uInt16 nNumber = 0;
-SfxStyles::const_iterator iter( rStyles.begin() );
-while( iter != rStyles.end() )
-{
-if( (*iter++).get() == pSheet )
-return nNumber;
-++nNumber;
-}
-return 0;
-}
-
sal_uInt32 ImpEditEngine::WriteRTF( SvStream rOutput, EditSelection aSel )
{
DBG_ASSERT( GetUpdateMode(), WriteRTF for UpdateMode = sal_False! );
@@ -456,19 +445,31 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream rOutput,
EditSelection aSel )
rOutput.WriteChar( '}' );
rOutput endl;
+boost::unordered_mapSfxStyleSheetBase*, sal_uInt32 aStyleSheetToIdMap;
// StyleSheets...
if ( GetStyleSheetPool() )
{
-sal_uInt16 nStyles =
(sal_uInt16)GetStyleSheetPool()-GetStyles().size();
-if ( nStyles )
+SfxStyleSheetIteratorPtr aSSSIterator =
boost::make_sharedSfxStyleSheetIterator(GetStyleSheetPool(),
+SFX_STYLE_FAMILY_ALL);
+// fill aStyleSheetToIdMap
+sal_uInt32 nId = 1;
+for ( SfxStyleSheetBase* pStyle = aSSSIterator-First(); pStyle;
+ pStyle = aSSSIterator-Next() )
{
+aStyleSheetToIdMap[pStyle] = nId;
+nId++;
+}
+
+if ( aSSSIterator-Count() )
+{
+
+sal_uInt32 nStyle = 0;
rOutput.WriteChar( '{' ).WriteCharPtr(
OOO_STRING_SVTOOLS_RTF_STYLESHEET );
-for ( sal_uInt16 nStyle = 0; nStyle nStyles; nStyle++ )
+for ( SfxStyleSheetBase* pStyle = aSSSIterator-First(); pStyle;
+ pStyle = aSSSIterator-Next() )
{
-SfxStyleSheet* pStyle =
(SfxStyleSheet*)GetStyleSheetPool()-GetStyles()[ nStyle ].get();
-
rOutput endl;
rOutput.WriteChar( '{' ).WriteCharPtr(
OOO_STRING_SVTOOLS_RTF_S );
sal_uInt32 nNumber = nStyle + 1;
@@ -490,23 +491,25 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream rOutput,
EditSelection aSel )
SfxStyleSheet* pParent =
(SfxStyleSheet*)GetStyleSheetPool()-Find( pStyle-GetParent(),
pStyle-GetFamily() );
DBG_ASSERT( pParent, Parent not found! );
rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_SBASEDON );
-nNumber = getStylePos( GetStyleSheetPool()-GetStyles(),
pParent ) + 1;
+nNumber = aStyleSheetToIdMap.find(pParent)-second;
rOutput.WriteNumber( nNumber );
}
// Next Style ... (more)
-SfxStyleSheet* pNext = pStyle;
+// we assume that we have only SfxStyleSheet in the pool
+SfxStyleSheet* pNext = static_castSfxStyleSheet*(pStyle);
if ( !pStyle-GetFollow().isEmpty() ( pStyle-GetFollow()
!= pStyle-GetName() ) )
pNext = (SfxStyleSheet*)GetStyleSheetPool()-Find(
pStyle-GetFollow(), pStyle-GetFamily() );
DBG_ASSERT( pNext, Next ot found! );
rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_SNEXT );
-nNumber = getStylePos( GetStyleSheetPool()-GetStyles(), pNext
) + 1;
+nNumber = aStyleSheetToIdMap.find(pNext)-second;
rOutput.WriteNumber( nNumber );
// Name of the template ...
rOutput.WriteCharPtr( ).WriteCharPtr(
OUStringToOString(pStyle-GetName(), eDestEnc).getStr() );
rOutput.WriteCharPtr( ;} );
+nStyle++;
}
rOutput.WriteChar( '}' );
rOutput endl;
@@ -546,7 +549,7 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream rOutput,
EditSelection aSel )
{
// Number of template
rOutput.WriteCharPtr(
[Libreoffice-commits] core.git: 20 commits - include/toolkit sc/source sfx2/source sw/source toolkit/source tools/source
include/toolkit/controls/formattedcontrol.hxx | 12 ++-
sc/source/ui/dbgui/dbnamdlg.cxx | 17 -
sfx2/source/appl/fileobj.cxx | 23 ---
sfx2/source/appl/linksrc.cxx |7 +-
sfx2/source/bastyp/sfxhtml.cxx|8 +-
sw/source/core/txtnode/fmtatr2.cxx|3
sw/source/core/uibase/shells/drwbassh.cxx |6 +
sw/source/core/uibase/uiview/uivwimp.cxx | 25
sw/source/core/uibase/uno/unomod.cxx | 21 +++---
sw/source/filter/html/wrthtml.cxx | 25
sw/source/filter/ww8/wrtww8.cxx | 79 ++
sw/source/filter/ww8/ww8par2.cxx | 17 -
toolkit/source/awt/vclxdevice.cxx |5 -
toolkit/source/awt/vclxwindows.cxx|1
toolkit/source/helper/accessibilityclient.cxx |1
tools/source/generic/poly.cxx |1
tools/source/inet/inetstrm.cxx| 12 ++-
tools/source/memtools/multisel.cxx|9 ++
tools/source/ref/errinf.cxx |9 +-
19 files changed, 199 insertions(+), 82 deletions(-)
New commits:
commit ba74c03f4a15d2f0f2ca20d1350128449c1405c2
Author: Caolán McNamara caol...@redhat.com
Date: Mon Mar 10 12:55:53 2014 +
coverity#708153 Uninitialized scalar field
Change-Id: Ifd4e3f792a01d0f806b9d49355463eae79b877ab
diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx
index 8e95e56..f06cbc8 100644
--- a/sfx2/source/bastyp/sfxhtml.cxx
+++ b/sfx2/source/bastyp/sfxhtml.cxx
@@ -63,9 +63,11 @@ static HTMLOptionEnum const aAreaShapeOptEnums[] =
};
SfxHTMLParser::SfxHTMLParser( SvStream rStream, sal_Bool bIsNewDoc,
- SfxMedium *pMed ) :
-HTMLParser( rStream, bIsNewDoc ),
-pMedium( pMed ), pDLMedium( 0 )
+ SfxMedium *pMed )
+: HTMLParser(rStream, bIsNewDoc)
+, pMedium(pMed)
+, pDLMedium(0)
+, eScriptType(STARBASIC)
{
DBG_ASSERT( RTL_TEXTENCODING_UTF8 == GetSrcEncoding( ),
SfxHTMLParser::SfxHTMLParser: From where comes ZS? );
commit c9bb64be4f8ef475491b1fd13aff31daa5ff682b
Author: Caolán McNamara caol...@redhat.com
Date: Mon Mar 10 12:54:06 2014 +
coverity#708146 Uninitialized scalar field
Change-Id: I5c1cb12572100b736152540d1453c7f25dc7a790
diff --git a/sfx2/source/appl/linksrc.cxx b/sfx2/source/appl/linksrc.cxx
index 7b29f37..ae0f213 100644
--- a/sfx2/source/appl/linksrc.cxx
+++ b/sfx2/source/appl/linksrc.cxx
@@ -178,7 +178,12 @@ struct SvLinkSource_Impl
m_xInputStreamToLoadFrom;
sal_Bool m_bIsReadOnly;
-SvLinkSource_Impl() : pTimer( 0 ), nTimeout( 3000 ) {}
+SvLinkSource_Impl()
+: pTimer(0)
+, nTimeout(3000)
+, m_bIsReadOnly(false)
+{
+}
~SvLinkSource_Impl();
void Closed();
commit 0cd511153b4dc4fb3378fb04641e8c3c2ea8543b
Author: Caolán McNamara caol...@redhat.com
Date: Mon Mar 10 12:50:48 2014 +
coverity#708144 Uninitialized scalar field
Change-Id: Idbea2d2d0d282cbe131d1b96a0d7bafde3886c3a
diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx
index c53000f..55ecb52 100644
--- a/sfx2/source/appl/fileobj.cxx
+++ b/sfx2/source/appl/fileobj.cxx
@@ -63,18 +63,23 @@ struct Impl_DownLoadData
}
};
-
-
-
-SvFileObject::SvFileObject() :
-pDownLoadData( NULL ), pOldParent( NULL ), nType( FILETYPE_TEXT )
+SvFileObject::SvFileObject()
+: pDownLoadData(NULL)
+, pOldParent(NULL)
+, nType(FILETYPE_TEXT)
+, bLoadAgain(true)
+, bSynchron(false)
+, bLoadError(false)
+, bWaitForData(false)
+, bInNewData(false)
+, bDataReady(false)
+, bNativFormat(false)
+, bClearMedium(false)
+, bStateChangeCalled(false)
+, bInCallDownLoad(false)
{
-bLoadAgain = sal_True;
-bSynchron = bLoadError = bWaitForData = bDataReady = bNativFormat =
-bClearMedium = bStateChangeCalled = bInCallDownLoad = sal_False;
}
-
SvFileObject::~SvFileObject()
{
if ( xMed.Is() )
commit e5c05f4977818ea48e14a0e59560e3e14aa378b4
Author: Caolán McNamara caol...@redhat.com
Date: Mon Mar 10 12:47:38 2014 +
coverity#708086 Uninitialized scalar field
Change-Id: I7d8967f90da3ad19c82a313636910279d6ef0f73
diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx
index e5b9194..b1d01b3 100644
--- a/sc/source/ui/dbgui/dbnamdlg.cxx
+++ b/sc/source/ui/dbgui/dbnamdlg.cxx
@@ -53,10 +53,19 @@ class DBSaveData
public:
DBSaveData( Edit rEd, CheckBox rHdr, CheckBox rSize, CheckBox rFmt,
CheckBox rStrip, ScRange rArea )
-: rEdAssign(rEd),
- rBtnHeader(rHdr), rBtnSize(rSize), rBtnFormat(rFmt),
rBtnStrip(rStrip),
- rCurArea(rArea),
- bHeader(false), bSize(false), bFormat(false), bDirty(false) {}
+:
[Libreoffice-commits] core.git: include/svl
include/svl/style.hxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit d7e34f117cfd0f651d3e723baa09528968daf2dd
Author: Tobias Lippert d...@fastmail.fm
Date: Wed Mar 5 20:12:40 2014 +0100
Add comment to StyleSheetIterator
Change-Id: I06db79b9c497d9dac4c4c8cff1f3ed3b36f0023f
Reviewed-on: https://gerrit.libreoffice.org/8487
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/include/svl/style.hxx b/include/svl/style.hxx
index c597eca..cbe7d42 100644
--- a/include/svl/style.hxx
+++ b/include/svl/style.hxx
@@ -160,6 +160,9 @@ class SVL_DLLPUBLIC SfxStyleSheetIterator
{
public:
+/** Constructor.
+ * The iterator will only iterate over style sheets which have the family
\p eFam
+ */
SfxStyleSheetIterator(SfxStyleSheetBasePool *pBase,
SfxStyleFamily eFam, sal_uInt16 n=SFXSTYLEBIT_ALL );
virtual sal_uInt16 GetSearchMask() const;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: formula/source sc/qa sc/source
formula/source/core/resource/core_resource.src |2 +-
sc/qa/unit/subsequent_filters-test.cxx |2 +-
sc/source/filter/excel/xlformula.cxx | 14 --
sc/source/filter/oox/formulabase.cxx |6 +++---
4 files changed, 13 insertions(+), 11 deletions(-)
New commits:
commit d4cc603a5f80af746a5f381f28cfa049af5b314a
Author: Eike Rathke er...@redhat.com
Date: Mon Mar 10 16:12:53 2014 +0100
ISO.CEILING without _xlfn. prefix, it is defined in OOXML, fdo#71720
follow-up
Change-Id: I486261d34d62bc5eda0a202cbb1dcb875ffcf39b
diff --git a/formula/source/core/resource/core_resource.src
b/formula/source/core/resource/core_resource.src
index 30e8d16..28ecee3 100644
--- a/formula/source/core/resource/core_resource.src
+++ b/formula/source/core/resource/core_resource.src
@@ -550,7 +550,7 @@ Resource RID_STRLIST_FUNCTION_NAMES_ENGLISH_OOXML
String SC_OPCODE_ARC_TAN_2 { Text = ATAN2 ; };
String SC_OPCODE_CEIL { Text = CEILING ; };
String SC_OPCODE_CEIL_MS { Text = _xlfn.CEILING.PRECISE ; };
-String SC_OPCODE_CEIL_ISO { Text = _xlfn.ISO.CEILING ; };
+String SC_OPCODE_CEIL_ISO { Text = ISO.CEILING ; };
String SC_OPCODE_FLOOR_MS { Text = _xlfn.FLOOR.PRECISE ; };
String SC_OPCODE_FLOOR { Text = FLOOR ; };
String SC_OPCODE_ROUND { Text = ROUND ; };
diff --git a/sc/qa/unit/subsequent_filters-test.cxx
b/sc/qa/unit/subsequent_filters-test.cxx
index 2c257a8..f22e1e2 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -425,7 +425,7 @@ void ScFiltersTest::testFunctionsExcel2010()
{ 7, true },
{ 8, true },
{ 9, true },
-{ 10, false }, //fdo71720 to be set to true once
functions-Excel-2010.xlsx has been rectified
+{ 10, true },
{ 11, true },
{ 12, true },
{ 13, true },
diff --git a/sc/source/filter/excel/xlformula.cxx
b/sc/source/filter/excel/xlformula.cxx
index 2ac4b69..c000ff1 100644
--- a/sc/source/filter/excel/xlformula.cxx
+++ b/sc/source/filter/excel/xlformula.cxx
@@ -380,6 +380,11 @@ static const XclFunctionInfo saFuncTable_8[] =
{ ocEuroConvert,255,4, 6, V, { RO_E, RO },
EXC_FUNCFLAG_EXPORTONLY, EUROCONVERT }
};
+
+#define EXC_FUNCENTRY_V_VR( opcode, minparam, maxparam, flags, asciiname ) \
+{ opcode, NOID, minparam, maxparam, V, { VR },
EXC_FUNCFLAG_IMPORTONLY|(flags), EXC_FUNCNAME( asciiname ) }, \
+{ opcode, 255, (minparam)+1, (maxparam)+1, V, { RO_E, RO },
EXC_FUNCFLAG_EXPORTONLY|(flags), EXC_FUNCNAME( asciiname ) }
+
/** Functions new in OOXML. */
static const XclFunctionInfo saFuncTable_Oox[] =
{
@@ -392,13 +397,11 @@ static const XclFunctionInfo saFuncTable_Oox[] =
{ ocAverageIfs, NOID, 3, MX, V, { RO, RO, VR },
EXC_FUNCFLAG_IMPORTONLY|EXC_FUNCFLAG_PARAMPAIRS, EXC_FUNCNAME( AVERAGEIFS ) },
{ ocAverageIfs, 255,4, MX, V, { RO_E, RO, RO, VR },
EXC_FUNCFLAG_EXPORTONLY|EXC_FUNCFLAG_PARAMPAIRS, EXC_FUNCNAME( AVERAGEIFS ) },
{ ocIfError,NOID, 2, 2, V, { VO, RO },
EXC_FUNCFLAG_IMPORTONLY, EXC_FUNCNAME( IFERROR ) },
-{ ocIfError,255,3, 3, V, { RO_E, VO, RO },
EXC_FUNCFLAG_EXPORTONLY, EXC_FUNCNAME( IFERROR ) }
-};
+{ ocIfError,255,3, 3, V, { RO_E, VO, RO },
EXC_FUNCFLAG_EXPORTONLY, EXC_FUNCNAME( IFERROR ) },
+EXC_FUNCENTRY_V_VR( ocCeil_ISO, 2, 2, 0, ISO.CEILING ),
+};
-#define EXC_FUNCENTRY_V_VR( opcode, minparam, maxparam, flags, asciiname ) \
-{ opcode, NOID, minparam, maxparam, V, { VR },
EXC_FUNCFLAG_IMPORTONLY|(flags), EXC_FUNCNAME( asciiname ) }, \
-{ opcode, 255, (minparam)+1, (maxparam)+1, V, { RO_E, RO },
EXC_FUNCFLAG_EXPORTONLY|(flags), EXC_FUNCNAME( asciiname ) }
#define EXC_FUNCENTRY_V_VR_IMPORT( opcode, minparam, maxparam, flags,
asciiname ) \
{ opcode, NOID, minparam, maxparam, V, { VR },
EXC_FUNCFLAG_IMPORTONLY|(flags), EXC_FUNCNAME( asciiname ) }
@@ -483,7 +486,6 @@ static const XclFunctionInfo saFuncTable_2010[] =
EXC_FUNCENTRY_V_VR( ocNegBinomDist_MS, 4, 4, 0, NEGBINOM.DIST ),
EXC_FUNCENTRY_V_VR( ocZTest_MS, 2, 3, 0, Z.TEST ),
EXC_FUNCENTRY_V_VR( ocCeil_MS, 2, 2, 0, CEILING.PRECISE ),
-EXC_FUNCENTRY_V_VR( ocCeil_ISO, 2, 2, 0, ISO.CEILING ),
EXC_FUNCENTRY_V_VR( ocFloor_MS, 2, 2, 0, FLOOR.PRECISE )
};
diff --git a/sc/source/filter/oox/formulabase.cxx
b/sc/source/filter/oox/formulabase.cxx
index 4b8ed7e..b44f605 100644
--- a/sc/source/filter/oox/formulabase.cxx
+++ b/sc/source/filter/oox/formulabase.cxx
@@ -197,7 +197,7 @@ const size_t FUNCINFO_PARAMINFOCOUNT= 5;///
Number of parameter
const sal_uInt16 FUNCFLAG_VOLATILE = 0x0001; /// Result is volatile
(e.g. NOW() function).
const sal_uInt16 FUNCFLAG_IMPORTONLY= 0x0002; /// Only used in
import
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/kde4/KDEXLib.cxx | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
New commits:
commit aeda478a02523cec146f6af69710f0391061db56
Author: Jan-Marek Glogowski glo...@fbihome.de
Date: Mon Mar 10 14:44:05 2014 +
fdo#73115: Always run timeouts as events
Right-click popup menus run click events throught the LO main loop.
In case of KDE4 the LO main loop is run by a timer in the main thread,
with Qt::DirectConnection execution.
If the timeout actually starts a nested event loop for a new dialog,
the timer is blocked, the nested mainloop detects it was started
from the timeout and drops the blocked timout from polling, which
blocks any further LibreOffice event loop processing.
This changes the timers to Qt::QueuedConnection, so they always
generate an event and are processed by the Qt event loop.
Change-Id: Ie626b22be3d8f9b8934bcc5e9e0e67a365549cfc
diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx
index d914caa..29797a1 100644
--- a/vcl/unx/kde4/KDEXLib.cxx
+++ b/vcl/unx/kde4/KDEXLib.cxx
@@ -61,9 +61,13 @@ KDEXLib::KDEXLib() :
eventLoopType( LibreOfficeEventLoop ),
m_bYieldFrozen( false ), m_frameWidth( -1 )
{
-// the timers created here means they belong to the main thread
-connect( timeoutTimer, SIGNAL( timeout()), this, SLOT(
timeoutActivated()));
-connect( userEventTimer, SIGNAL( timeout()), this, SLOT(
userEventActivated()));
+// the timers created here means they belong to the main thread.
+// As the timeoutTimer runs the LO event queue, which may block on a
dialog,
+// the timer has to use a Qt::QueuedConnection, otherwise the nested event
+// loop will detect the blocking timer and drop it from the polling
+// freezing LO X11 processing.
+connect( timeoutTimer, SIGNAL( timeout()), this, SLOT(
timeoutActivated()), Qt::QueuedConnection );
+connect( userEventTimer, SIGNAL( timeout()), this, SLOT(
userEventActivated()), Qt::QueuedConnection );
// QTimer::start() can be called only in its (here main) thread, so this
will
// forward between threads if needed
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - include/sal unotools/source vcl/headless vcl/quartz vcl/source
include/sal/log-areas.dox |1
unotools/source/config/fltrcfg.cxx | 17 +-
vcl/headless/svpgdi.cxx| 17 ++
vcl/headless/svpinst.cxx |2 -
vcl/headless/svpvd.cxx |4 ++
vcl/quartz/salgdi.cxx | 13 +++
vcl/quartz/salgdicommon.cxx| 62 ++---
vcl/quartz/salvd.cxx | 50 ++---
vcl/source/gdi/alpha.cxx |3 +
vcl/source/window/window.cxx | 32 ++-
10 files changed, 120 insertions(+), 81 deletions(-)
New commits:
commit 440b90c9949631846c1d1c886d2ea029b17d0ffa
Author: Tor Lillqvist t...@collabora.com
Date: Mon Mar 10 17:27:25 2014 +0200
Avoid delayed rendering in the tiled rendering case
Obviously, when using tiled rendering, all of the tile should be
rendered at once during the call to lo_touch_draw_tile(). Nothing
should be delayed to happen later (when the PaintTimer fires). The
main culprit causing such delayed rendering, at least in a certain
test document, seems to be SmartArt objects.
It is not 100% clear how to determine whether tiled rendering is being
used, though. For now, let's assume it is always the case on
non-desktop (i.e. iOS and Android, even if for Android we dont
actually do it). For desktop platforms, including liblibreoffice, will
have to figure out later how we want to do it, assume never for now.
Change-Id: I0f7e7172e7a699a0c6752ee465776f9da5c3098e
diff --git a/unotools/source/config/fltrcfg.cxx
b/unotools/source/config/fltrcfg.cxx
index f8e1f84..54e5453 100644
--- a/unotools/source/config/fltrcfg.cxx
+++ b/unotools/source/config/fltrcfg.cxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include config_features.h
#include unotools/fltrcfg.hxx
#include tools/debug.hxx
@@ -601,10 +602,24 @@ void SvtFilterOptions::SetImpress2PowerPoint( bool bFlag )
SetModified();
}
-
+static bool lcl_DoTiledRendering()
+{
+#if !HAVE_FEATURE_DESKTOP
+// We do tiled rendering only for iOS at the moment, actually, but
+// let's see what happens if we assume it for Android, too.
+return true;
+#else
+// We need some way to know globally if this process will use
+// tiled rendering or not. Or should this be a per-window setting?
+// Or what?
+return false;
+#endif
+}
bool SvtFilterOptions::IsSmartArt2Shape() const
{
+if (lcl_DoTiledRendering())
+return true;
return pImp-IsFlag( FILTERCFG_SMARTART_SHAPE_LOAD );
}
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 20518ca..bb2e652 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -731,6 +731,20 @@ void Window::ImplInitWindowData( WindowType nType )
+static bool ImplDoTiledRendering()
+{
+#if !HAVE_FEATURE_DESKTOP
+// We do tiled rendering only for iOS at the moment, actually, but
+// let's see what happens if we assume it for Android, too.
+return true;
+#else
+// We need some way to know globally if this process will use
+// tiled rendering or not. Or should this be a per-window setting?
+// Or what?
+return false;
+#endif
+}
+
void Window::ImplInit( Window* pParent, WinBits nStyle, SystemParentData*
pSystemParentData )
{
DBG_ASSERT( mpWindowImpl-mbFrame || pParent, Window::Window(): pParent
== NULL );
@@ -906,10 +920,13 @@ void Window::ImplInit( Window* pParent, WinBits nStyle,
SystemParentData* pSyste
mpWindowImpl-mpFrameData-mbInSysObjFocusHdl = false;
mpWindowImpl-mpFrameData-mbInSysObjToTopHdl = false;
mpWindowImpl-mpFrameData-mbSysObjFocus = false;
-mpWindowImpl-mpFrameData-maPaintTimer.SetTimeout( 30 );
-mpWindowImpl-mpFrameData-maPaintTimer.SetTimeoutHdl( LINK( this,
Window, ImplHandlePaintHdl ) );
-mpWindowImpl-mpFrameData-maResizeTimer.SetTimeout( 50 );
-mpWindowImpl-mpFrameData-maResizeTimer.SetTimeoutHdl( LINK( this,
Window, ImplHandleResizeTimerHdl ) );
+if (!ImplDoTiledRendering())
+{
+mpWindowImpl-mpFrameData-maPaintTimer.SetTimeout( 30 );
+mpWindowImpl-mpFrameData-maPaintTimer.SetTimeoutHdl( LINK( this,
Window, ImplHandlePaintHdl ) );
+mpWindowImpl-mpFrameData-maResizeTimer.SetTimeout( 50 );
+mpWindowImpl-mpFrameData-maResizeTimer.SetTimeoutHdl( LINK(
this, Window, ImplHandleResizeTimerHdl ) );
+}
mpWindowImpl-mpFrameData-mbInternalDragGestureRecognizer = false;
if ( pRealParent IsTopWindow() )
@@ -2580,7 +2597,7 @@ void Window::ImplCallOverlapPaint()
void Window::ImplPostPaint()
{
-if ( !mpWindowImpl-mpFrameData-maPaintTimer.IsActive() )
+if ( !ImplDoTiledRendering()
!mpWindowImpl-mpFrameData-maPaintTimer.IsActive() )
mpWindowImpl-mpFrameData-maPaintTimer.Start();
}
@@ -2589,14
[Libreoffice-commits] core.git: ios/experimental
ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj |
356 +-
1 file changed, 352 insertions(+), 4 deletions(-)
New commits:
commit 5133e0e0e818e0a572181ec0e18972e2c60040ea
Author: Tor Lillqvist t...@collabora.com
Date: Mon Mar 10 17:38:59 2014 +0200
Add more source files for convenient breakpoint setting
Change-Id: I88d6176f919de90b5014f328fdad84d017b3bb55
diff --git
a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
index bf29e9a..e226f13 100644
---
a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
+++
b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
@@ -215,13 +215,159 @@
BE82C3A518C752E20050EB79 /* time.c */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.c.c; name = time.c; path =
../../../sal/osl/unx/time.c; sourceTree = group; };
BE82C3A618C752E20050EB79 /* uunxapi.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = uunxapi.cxx;
path = ../../../sal/osl/unx/uunxapi.cxx; sourceTree = group; };
BE82C3A718C752E20050EB79 /* uunxapi.mm */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = uunxapi.mm;
path = ../../../sal/osl/unx/uunxapi.mm; sourceTree = group; };
+ BE82C42918CA18610050EB79 /* ActionDescriptionProvider.cxx */ =
{isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
ActionDescriptionProvider.cxx; path =
../../../svx/source/svdraw/ActionDescriptionProvider.cxx; sourceTree =
group; };
+ BE82C42A18CA18610050EB79 /* charthelper.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
charthelper.cxx; path = ../../../svx/source/svdraw/charthelper.cxx; sourceTree
= group; };
+ BE82C42B18CA18610050EB79 /* clonelist.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = clonelist.cxx;
path = ../../../svx/source/svdraw/clonelist.cxx; sourceTree = group; };
+ BE82C42C18CA18610050EB79 /* gradtrns.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = gradtrns.cxx;
path = ../../../svx/source/svdraw/gradtrns.cxx; sourceTree = group; };
+ BE82C42D18CA18610050EB79 /* gradtrns.hxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = gradtrns.hxx;
path = ../../../svx/source/svdraw/gradtrns.hxx; sourceTree = group; };
+ BE82C42E18CA18610050EB79 /* polypolygoneditor.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
polypolygoneditor.cxx; path = ../../../svx/source/svdraw/polypolygoneditor.cxx;
sourceTree = group; };
+ BE82C42F18CA18610050EB79 /* sdrhittesthelper.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
sdrhittesthelper.cxx; path = ../../../svx/source/svdraw/sdrhittesthelper.cxx;
sourceTree = group; };
+ BE82C43018CA18610050EB79 /* sdrmasterpagedescriptor.cxx */ =
{isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
sdrmasterpagedescriptor.cxx; path =
../../../svx/source/svdraw/sdrmasterpagedescriptor.cxx; sourceTree = group;
};
+ BE82C43118CA18610050EB79 /* sdrpagewindow.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
sdrpagewindow.cxx; path = ../../../svx/source/svdraw/sdrpagewindow.cxx;
sourceTree = group; };
+ BE82C43218CA18610050EB79 /* sdrpaintwindow.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
sdrpaintwindow.cxx; path = ../../../svx/source/svdraw/sdrpaintwindow.cxx;
sourceTree = group; };
+ BE82C43318CA18610050EB79 /* sdrundomanager.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
sdrundomanager.cxx; path = ../../../svx/source/svdraw/sdrundomanager.cxx;
sourceTree = group; };
+ BE82C43418CA18610050EB79 /* selectioncontroller.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
selectioncontroller.cxx; path =
../../../svx/source/svdraw/selectioncontroller.cxx; sourceTree = group; };
+ BE82C43518CA18610050EB79 /* svdattr.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = svdattr.cxx;
path = ../../../svx/source/svdraw/svdattr.cxx; sourceTree = group; };
+ BE82C43618CA18610050EB79 /* svdcrtv.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = svdcrtv.cxx;
path = ../../../svx/source/svdraw/svdcrtv.cxx; sourceTree = group; };
+ BE82C43718CA18610050EB79 /* svddrag.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = svddrag.cxx;
path = ../../../svx/source/svdraw/svddrag.cxx; sourceTree = group; };
+
[Libreoffice-commits] core.git: 4 commits - editeng/source include/editeng include/oox oox/Library_oox.mk oox/source writerfilter/source
editeng/source/editeng/eerdll.cxx |4
include/editeng/eeitem.hxx | 18
include/editeng/unotext.hxx |4
include/oox/drawingml/textcharacterproperties.hxx |2
include/oox/drawingml/texteffectscontext.hxx| 50 ++
include/oox/helper/grabbagstack.hxx |1
oox/Library_oox.mk |1
oox/source/drawingml/textcharacterproperties.cxx| 23 +
oox/source/drawingml/textcharacterpropertiescontext.cxx | 17
oox/source/drawingml/texteffectscontext.cxx | 303
oox/source/helper/grabbagstack.cxx |5
oox/source/token/properties.txt |1
writerfilter/source/dmapper/TextEffectsHandler.cxx | 14
13 files changed, 425 insertions(+), 18 deletions(-)
New commits:
commit 7a9d4cd51ee9b1ce6cdf076caeeed6d2ae07fb92
Author: Tomaž Vajngerl tomaz.vajng...@collabora.com
Date: Mon Mar 10 17:04:07 2014 +0100
writerfilter: stylistic change to TextEffectsHandler
Change-Id: I5be926394dd97897dfb5ef3d4c03bb9ad9865a35
diff --git a/writerfilter/source/dmapper/TextEffectsHandler.cxx
b/writerfilter/source/dmapper/TextEffectsHandler.cxx
index ef8efc8..36db317 100644
--- a/writerfilter/source/dmapper/TextEffectsHandler.cxx
+++ b/writerfilter/source/dmapper/TextEffectsHandler.cxx
@@ -27,7 +27,7 @@ using namespace css::beans;
namespace
{
-OUString getNameForElementId(sal_uInt32 aId)
+OUString lclGetNameForElementId(sal_uInt32 aId)
{
static std::mapsal_uInt32, OUString aIdMap;
if(aIdMap.empty())
@@ -69,6 +69,8 @@ OUString getNameForElementId(sal_uInt32 aId)
return aIdMap[aId];
}
+const char constAttributesSequenceName[] = attributes;
+
}
OUString TextEffectsHandler::getSchemeColorValTypeString(sal_Int32 nType)
@@ -496,8 +498,8 @@ boost::optionalPropertyIds
TextEffectsHandler::getGrabBagPropertyId()
void TextEffectsHandler::lcl_attribute(Id aName, Value aValue)
{
-if (mpGrabBagStack-getCurrentName() != attributes)
-mpGrabBagStack-push(attributes);
+if (mpGrabBagStack-getCurrentName() != constAttributesSequenceName)
+mpGrabBagStack-push(constAttributesSequenceName);
switch(aName)
{
@@ -720,11 +722,11 @@ void TextEffectsHandler::lcl_attribute(Id aName, Value
aValue)
void TextEffectsHandler::lcl_sprm(Sprm rSprm)
{
-if (mpGrabBagStack-getCurrentName() == attributes)
+if (mpGrabBagStack-getCurrentName() == constAttributesSequenceName)
mpGrabBagStack-pop();
sal_uInt32 nSprmId = rSprm.getId();
-OUString aElementName = getNameForElementId(nSprmId);
+OUString aElementName = lclGetNameForElementId(nSprmId);
if(aElementName.isEmpty())
{
// Element is unknown - leave.
@@ -739,7 +741,7 @@ void TextEffectsHandler::lcl_sprm(Sprm rSprm)
pProperties.get()-resolve( *this );
-if (mpGrabBagStack-getCurrentName() == attributes)
+if (mpGrabBagStack-getCurrentName() == constAttributesSequenceName)
mpGrabBagStack-pop();
mpGrabBagStack-pop();
commit fc46b5acc4ae354f712f5afcb6a42c2f09e03e96
Author: Tomaž Vajngerl tomaz.vajng...@collabora.com
Date: Mon Mar 10 17:03:01 2014 +0100
editeng: Add CharInteropGrabBag to editeng.
Change-Id: I91c816499f463febc536d79e4a9fd9804f74df00
diff --git a/editeng/source/editeng/eerdll.cxx
b/editeng/source/editeng/eerdll.cxx
index 2045105..05d1bfb 100644
--- a/editeng/source/editeng/eerdll.cxx
+++ b/editeng/source/editeng/eerdll.cxx
@@ -39,6 +39,7 @@
#include editeng/scriptspaceitem.hxx
#include editeng/numdef.hxx
#include svl/itempool.hxx
+#include svl/grabbagitem.hxx
#include vcl/virdev.hxx
#include editeng/autokernitem.hxx
@@ -160,8 +161,9 @@ SfxPoolItem** GlobalEditData::GetDefItems()
ppDefItems[50] = new SfxVoidItem( EE_FEATURE_LINEBR );
ppDefItems[51] = new SvxCharSetColorItem( Color( COL_RED ),
RTL_TEXTENCODING_DONTKNOW, EE_FEATURE_NOTCONV );
ppDefItems[52] = new SvxFieldItem( SvxFieldData(), EE_FEATURE_FIELD );
+ppDefItems[53] = new SfxGrabBagItem( EE_CHAR_GRABBAG );
-DBG_ASSERT( EDITITEMCOUNT == 53, ITEMCOUNT geaendert, DefItems nicht
angepasst! );
+DBG_ASSERT( EDITITEMCOUNT == 54, ITEMCOUNT geaendert, DefItems nicht
angepasst! );
// Init DefFonts:
GetDefaultFonts( *(SvxFontItem*)ppDefItems[EE_CHAR_FONTINFO -
EE_ITEMS_START],
diff --git a/include/editeng/eeitem.hxx b/include/editeng/eeitem.hxx
index 5a239927..5d90714 100644
--- a/include/editeng/eeitem.hxx
+++ b/include/editeng/eeitem.hxx
@@ -79,17 +79,17 @@
#define EE_CHAR_XMLATTRIBS (EE_ITEMS_START+46)
#define EE_CHAR_OVERLINE(EE_ITEMS_START+47)
#define EE_CHAR_CASEMAP (EE_ITEMS_START+48)
-#define EE_CHAR_END (EE_ITEMS_START+48)
+#define EE_CHAR_GRABBAG (EE_ITEMS_START+49)
[Libreoffice-commits] core.git: sc/source
sc/source/ui/app/inputwin.cxx | 70 --
1 file changed, 41 insertions(+), 29 deletions(-)
New commits:
commit ed6b8c9f8d1b932300ce16d6188d10036827f676
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Mon Mar 10 12:08:45 2014 -0400
Select the whole text when the named range box gets focus.
Not doing this had been bugging me for a long time since I use
Shift-Ctrl-F5 to define named ranges a lot. Small usability improvement.
Change-Id: Ib1a4e4e26e15667598a603443dde05e08fdbe3b7
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 7bda59d..544a7f1 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -2484,43 +2484,55 @@ void ScPosWnd::DoEnter()
bool ScPosWnd::Notify( NotifyEvent rNEvt )
{
-bool nHandled = false;
+bool bHandled = true;
-if ( rNEvt.GetType() == EVENT_KEYINPUT )
+switch (rNEvt.GetType())
{
-const KeyEvent* pKEvt = rNEvt.GetKeyEvent();
-
-switch ( pKEvt-GetKeyCode().GetCode() )
+case EVENT_KEYINPUT:
{
-case KEY_RETURN:
-DoEnter();
-nHandled = true;
-break;
+const KeyEvent* pKEvt = rNEvt.GetKeyEvent();
-case KEY_ESCAPE:
-if (nTipVisible)
-{
-// escape when the tip help is shown: only hide the tip
-HideTip();
-}
-else
-{
-if (!bFormulaMode)
-SetText( aPosStr );
-ReleaseFocus_Impl();
-}
-nHandled = true;
-break;
+switch ( pKEvt-GetKeyCode().GetCode() )
+{
+case KEY_RETURN:
+DoEnter();
+break;
+
+case KEY_ESCAPE:
+if (nTipVisible)
+{
+// escape when the tip help is shown: only hide the tip
+HideTip();
+}
+else
+{
+if (!bFormulaMode)
+SetText( aPosStr );
+ReleaseFocus_Impl();
+}
+break;
+}
}
+break;
+case EVENT_GETFOCUS:
+{
+// Select the whole text upon focus.
+OUString aStr = GetText();
+SetSelection(Selection(0, aStr.getLength()));
+}
+break;
+case EVENT_LOSEFOCUS:
+HideTip();
+bHandled = false;
+break;
+default:
+bHandled = false;
}
-if ( !nHandled )
-nHandled = ComboBox::Notify( rNEvt );
-
-if ( rNEvt.GetType() == EVENT_LOSEFOCUS )
-HideTip();
+if (!bHandled)
+bHandled = ComboBox::Notify(rNEvt);
-return nHandled;
+return bHandled;
}
void ScPosWnd::ReleaseFocus_Impl()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/core/stlfamily.cxx | 94 ++-
1 file changed, 57 insertions(+), 37 deletions(-)
New commits:
commit 40251681256456bec10d92bfc464e90135d3191e
Author: Tobias Lippert d...@fastmail.fm
Date: Tue Mar 4 19:18:07 2014 +0100
Use SfxStyleSheetIterator to iterate over SfxStyles in sd/stlfamily.cxx
Change-Id: I535b47de0fb4e66dc4b02d4c75b6631eb7d87ed4
Reviewed-on: https://gerrit.libreoffice.org/8482
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sd/source/core/stlfamily.cxx b/sd/source/core/stlfamily.cxx
index 07ae6c0..376b202 100644
--- a/sd/source/core/stlfamily.cxx
+++ b/sd/source/core/stlfamily.cxx
@@ -37,6 +37,7 @@
#include sdpage.hxx
#include glob.hxx
+#include boost/make_shared.hpp
#include map
using namespace ::com::sun::star::uno;
@@ -75,12 +76,21 @@ PresStyleMap SdStyleFamilyImpl::getStyleSheets()
{
maStyleSheets.clear();
-const SfxStyles rStyles = mxPool-GetStyles();
-for( SfxStyles::const_iterator iter( rStyles.begin() ); iter !=
rStyles.end(); ++iter )
+// The iterator will return only style sheets of family master page
+SfxStyleSheetIteratorPtr aSSSIterator =
boost::make_sharedSfxStyleSheetIterator(mxPool.get(),
SD_STYLE_FAMILY_MASTERPAGE);
+for ( SfxStyleSheetBase* pStyle = aSSSIterator-First(); pStyle;
+ pStyle = aSSSIterator-Next() )
{
-SdStyleSheet* pStyle = static_cast SdStyleSheet* (
(*iter).get() );
-if( pStyle (pStyle-GetFamily() ==
SD_STYLE_FAMILY_MASTERPAGE) pStyle-GetName().startsWith(aLayoutName) )
-maStyleSheets[ pStyle-GetApiName() ] = rtl::Reference
SdStyleSheet ( pStyle );
+// we assume that we have only SdStyleSheets
+SdStyleSheet* pSdStyle = static_cast SdStyleSheet* ( pStyle
);
+if (!pSdStyle)
+{
+continue;
+}
+if (pSdStyle-GetName().startsWith(aLayoutName))
+{
+maStyleSheets[ pSdStyle-GetApiName() ] = rtl::Reference
SdStyleSheet ( pSdStyle );
+}
}
}
}
@@ -137,8 +147,6 @@ SdStyleSheet* SdStyleFamily::GetValidNewSheet( const Any
rElement ) throw(Illeg
return pStyle;
}
-
-
SdStyleSheet* SdStyleFamily::GetSheetByName( const OUString rName )
throw(NoSuchElementException, WrappedTargetException )
{
SdStyleSheet* pRet = 0;
@@ -153,13 +161,15 @@ SdStyleSheet* SdStyleFamily::GetSheetByName( const
OUString rName ) throw(NoSuc
}
else
{
-const SfxStyles rStyles = mxPool-GetStyles();
-for( SfxStyles::const_iterator iter( rStyles.begin() ); iter !=
rStyles.end(); ++iter )
+SfxStyleSheetIteratorPtr aSSSIterator =
boost::make_sharedSfxStyleSheetIterator(mxPool.get(), mnFamily);
+for ( SfxStyleSheetBase* pStyle = aSSSIterator-First(); pStyle;
+ pStyle = aSSSIterator-Next() )
{
-SdStyleSheet* pStyle = static_cast SdStyleSheet* (
(*iter).get() );
-if( pStyle (pStyle-GetFamily() == mnFamily)
(pStyle-GetApiName() == rName) )
+// we assume that we have only SdStyleSheets
+SdStyleSheet* pSdStyle = static_cast SdStyleSheet* ( pStyle
);
+if( pSdStyle pSdStyle-GetApiName() == rName)
{
-pRet = pStyle;
+pRet = pSdStyle;
break;
}
}
@@ -258,12 +268,16 @@ Sequence OUString SAL_CALL
SdStyleFamily::getElementNames() throw(RuntimeExce
else
{
std::vector OUString aNames;
-const SfxStyles rStyles = mxPool-GetStyles();
-for( SfxStyles::const_iterator iter( rStyles.begin() ); iter !=
rStyles.end(); ++iter )
+SfxStyleSheetIteratorPtr aSSSIterator =
boost::make_sharedSfxStyleSheetIterator(mxPool.get(), mnFamily);
+for ( SfxStyleSheetBase* pStyle = aSSSIterator-First(); pStyle;
+ pStyle = aSSSIterator-Next() )
{
-SdStyleSheet* pStyle = static_cast SdStyleSheet* ( (*iter).get()
);
-if( pStyle (pStyle-GetFamily() == mnFamily) )
-aNames.push_back( pStyle-GetApiName() );
+// we assume that we have only SdStyleSheets
+SdStyleSheet* pSdStyle = static_cast SdStyleSheet* ( pStyle );
+if( pSdStyle )
+{
+aNames.push_back( pSdStyle-GetApiName() );
+}
}
return Sequence OUString ( (*aNames.begin()), aNames.size() );
}
@@ -286,12 +300,19 @@ sal_Bool SAL_CALL SdStyleFamily::hasByName( const
OUString aName ) throw(Runtim
}
[Libreoffice-commits] core.git: 6 commits - filter/source
filter/source/graphicfilter/icgm/elements.cxx |3 +++
filter/source/graphicfilter/idxf/dxf2mtf.cxx | 12 +++-
filter/source/graphicfilter/idxf/dxfblkrd.cxx |3 ++-
filter/source/graphicfilter/idxf/dxftblrd.cxx |7 ---
filter/source/msfilter/viscache.hxx |2 ++
filter/source/svg/svgfilter.cxx |2 ++
6 files changed, 24 insertions(+), 5 deletions(-)
New commits:
commit fc225f32d95f87ceaa6984339f9b5a2ebd3d3682
Author: Caolán McNamara caol...@redhat.com
Date: Mon Mar 10 16:16:26 2014 +
coverity#707857 Uninitialized scalar field
Change-Id: I5ac6a1807f1c7f9041b768c96e5f2ffdc3a07a86
diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx
index 5039305..d8703da 100644
--- a/filter/source/svg/svgfilter.cxx
+++ b/filter/source/svg/svgfilter.cxx
@@ -67,6 +67,8 @@ SVGFilter::SVGFilter( const Reference XComponentContext
rxCtx ) :
mpSdrModel( NULL ),
mbPresentation( sal_False ),
mbExportAll( sal_False ),
+mbSinglePage( sal_False ),
+mnVisiblePage( -1 ),
mpObjects( NULL )
{
}
commit 4b99d7ebe0b78c46e22f78c4f7005901904711b9
Author: Caolán McNamara caol...@redhat.com
Date: Mon Mar 10 16:13:25 2014 +
coverity#707856 Uninitialized scalar field
Change-Id: Ib57a4703dfb20aab3b5976fab0331b93e4983c05
diff --git a/filter/source/msfilter/viscache.hxx
b/filter/source/msfilter/viscache.hxx
index 0d1049e..5745f9e 100644
--- a/filter/source/msfilter/viscache.hxx
+++ b/filter/source/msfilter/viscache.hxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include sfx2/objsh.hxx
#include tools/stream.hxx
#include vcl/gdimtf.hxx
#include vcl/bitmap.hxx
@@ -35,6 +36,7 @@ class Impl_OlePres
public:
Impl_OlePres( sal_uLong nF )
: nFormat( nF )
+, nAspect( ASPECT_CONTENT )
, pBmp( NULL )
, pMtf( NULL )
, nAdvFlags( 0x2 ) // in Dokument gefunden
commit aace6e19e2e5d72918a04b88697dcb829887fc27
Author: Caolán McNamara caol...@redhat.com
Date: Mon Mar 10 16:08:20 2014 +
coverity#707818 Uninitialized scalar field
Change-Id: I4c099d0e91cb1b90807a94d4e3ac17747a4b4b92
diff --git a/filter/source/graphicfilter/idxf/dxftblrd.cxx
b/filter/source/graphicfilter/idxf/dxftblrd.cxx
index eff5663..be1d6c0 100644
--- a/filter/source/graphicfilter/idxf/dxftblrd.cxx
+++ b/filter/source/graphicfilter/idxf/dxftblrd.cxx
@@ -24,10 +24,11 @@
//--DXFLType---
DXFLType::DXFLType()
+: pSucc(NULL)
+, nFlags(0)
+, nDashCount(0)
+, fPatternLength(0.0)
{
-pSucc=NULL;
-nFlags=0;
-nDashCount=0;
}
void DXFLType::Read(DXFGroupReader rDGR)
commit 10041dc7c378901d51c6a72afed155528ed79de0
Author: Caolán McNamara caol...@redhat.com
Date: Mon Mar 10 16:06:56 2014 +
coverity#707815 Uninitialized scalar field
Change-Id: If2f267f0815570c0484a78c2cc58cfba64a32a9b
diff --git a/filter/source/graphicfilter/idxf/dxfblkrd.cxx
b/filter/source/graphicfilter/idxf/dxfblkrd.cxx
index eb100bd..d84a2fa 100644
--- a/filter/source/graphicfilter/idxf/dxfblkrd.cxx
+++ b/filter/source/graphicfilter/idxf/dxfblkrd.cxx
@@ -28,8 +28,9 @@
DXFBlock::DXFBlock()
+: pSucc(NULL)
+, nFlags(0)
{
-pSucc=NULL;
}
commit a65c80aae1bfa1f71329737d37216f0de763c70f
Author: Caolán McNamara caol...@redhat.com
Date: Mon Mar 10 16:03:11 2014 +
coverity#707814 Uninitialized scalar field
Change-Id: I5d4482eddc51b3c92a5ffb02d6048f3ae528184a
diff --git a/filter/source/graphicfilter/idxf/dxf2mtf.cxx
b/filter/source/graphicfilter/idxf/dxf2mtf.cxx
index 592eef5..31f33fb 100644
--- a/filter/source/graphicfilter/idxf/dxf2mtf.cxx
+++ b/filter/source/graphicfilter/idxf/dxf2mtf.cxx
@@ -751,7 +751,17 @@ void DXF2GDIMetaFile::DrawEntities(const DXFEntities
rEntities,
}
-DXF2GDIMetaFile::DXF2GDIMetaFile():pVirDev(NULL), pDXF(NULL), nBlockColor(0),
nParentLayerColor(0)
+DXF2GDIMetaFile::DXF2GDIMetaFile()
+: pVirDev(NULL)
+, pDXF(NULL)
+, bStatus(false)
+, OptPointsPerCircle(0)
+, nMinPercent(0)
+, nMaxPercent(0)
+, nLastPercent(0)
+, nMainEntitiesCount(0)
+, nBlockColor(0)
+, nParentLayerColor(0)
{
}
commit 24627a99fbab0dda15ab90c9bdc39810566c2dd7
Author: Caolán McNamara caol...@redhat.com
Date: Mon Mar 10 15:58:42 2014 +
coverity#707813 Uninitialized scalar field
Change-Id: Ia32de1febc5d4c139a7369d6b069a25ceac5e266
diff --git a/filter/source/graphicfilter/icgm/elements.cxx
b/filter/source/graphicfilter/icgm/elements.cxx
index 0f41040..6b2bc38 100644
--- a/filter/source/graphicfilter/icgm/elements.cxx
+++ b/filter/source/graphicfilter/icgm/elements.cxx
@@ -281,6 +281,9 @@ void CGMElements::Init()
nBackGroundColor =
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 37/9afae15286916aa7a9b01ba7bca6fea8511004
37/9afae15286916aa7a9b01ba7bca6fea8511004 |1 + 1 file changed, 1 insertion(+) New commits: commit 519fe955300a4ea308a9103b9a6c2096deb42359 Author: Caolán McNamara caol...@redhat.com Date: Mon Mar 10 16:19:04 2014 + Notes added by 'git notes add' diff --git a/37/9afae15286916aa7a9b01ba7bca6fea8511004 b/37/9afae15286916aa7a9b01ba7bca6fea8511004 new file mode 100644 index 000..30fac4e --- /dev/null +++ b/37/9afae15286916aa7a9b01ba7bca6fea8511004 @@ -0,0 +1 @@ +prefer: 1ea46226297d51cebd56b17bca36fc58bd258901 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 59/76126939502bbec48eafbb0e38a823e7da1d10
59/76126939502bbec48eafbb0e38a823e7da1d10 |1 + 1 file changed, 1 insertion(+) New commits: commit 64fc0f52a8f96db72671134e32bff53bb3f9efb2 Author: Caolán McNamara caol...@redhat.com Date: Mon Mar 10 16:19:53 2014 + Notes added by 'git notes add' diff --git a/59/76126939502bbec48eafbb0e38a823e7da1d10 b/59/76126939502bbec48eafbb0e38a823e7da1d10 new file mode 100644 index 000..8ebbe55 --- /dev/null +++ b/59/76126939502bbec48eafbb0e38a823e7da1d10 @@ -0,0 +1 @@ +ignore: obsolete ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 4a/e98b5ab5c2183f42495ad3cdec83b2d38526c4
4a/e98b5ab5c2183f42495ad3cdec83b2d38526c4 |1 + 1 file changed, 1 insertion(+) New commits: commit 65b343e923d268a4caa83629f9494019146f06b0 Author: Caolán McNamara caol...@redhat.com Date: Mon Mar 10 16:21:26 2014 + Notes added by 'git notes add' diff --git a/4a/e98b5ab5c2183f42495ad3cdec83b2d38526c4 b/4a/e98b5ab5c2183f42495ad3cdec83b2d38526c4 new file mode 100644 index 000..8a2345e --- /dev/null +++ b/4a/e98b5ab5c2183f42495ad3cdec83b2d38526c4 @@ -0,0 +1 @@ +ignore: fixed ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - d4/c19269f9c1d79f3521d1df9004679cb6c671a4
d4/c19269f9c1d79f3521d1df9004679cb6c671a4 |1 + 1 file changed, 1 insertion(+) New commits: commit f42a4ee690b2f9026b1b1992e788eb84ab15940f Author: Caolán McNamara caol...@redhat.com Date: Mon Mar 10 16:22:52 2014 + Notes added by 'git notes add' diff --git a/d4/c19269f9c1d79f3521d1df9004679cb6c671a4 b/d4/c19269f9c1d79f3521d1df9004679cb6c671a4 new file mode 100644 index 000..dab0497 --- /dev/null +++ b/d4/c19269f9c1d79f3521d1df9004679cb6c671a4 @@ -0,0 +1 @@ +prefer: 6bea5311d70f518444fe3218cf0b6f49bd93cc34 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 87/53d6352563aeb8b78e970cb5bd1ef89725ccfb
87/53d6352563aeb8b78e970cb5bd1ef89725ccfb |1 + 1 file changed, 1 insertion(+) New commits: commit 3e81e09b39d6309040d2341c77793fc0c6bc2d17 Author: Caolán McNamara caol...@redhat.com Date: Mon Mar 10 16:24:35 2014 + Notes added by 'git notes add' diff --git a/87/53d6352563aeb8b78e970cb5bd1ef89725ccfb b/87/53d6352563aeb8b78e970cb5bd1ef89725ccfb new file mode 100644 index 000..10cfe92 --- /dev/null +++ b/87/53d6352563aeb8b78e970cb5bd1ef89725ccfb @@ -0,0 +1 @@ +prefer: 91e181ea585855bea97a07823f7334d0b98b20d5 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 7b/cecbe55bf6f1b6fd81519ee49f5bdc0e2f22a8
7b/cecbe55bf6f1b6fd81519ee49f5bdc0e2f22a8 |1 + 1 file changed, 1 insertion(+) New commits: commit efb7e0bd49b700c82959e7a5ca2eb4085dea430b Author: Caolán McNamara caol...@redhat.com Date: Mon Mar 10 16:26:35 2014 + Notes added by 'git notes add' diff --git a/7b/cecbe55bf6f1b6fd81519ee49f5bdc0e2f22a8 b/7b/cecbe55bf6f1b6fd81519ee49f5bdc0e2f22a8 new file mode 100644 index 000..8a2345e --- /dev/null +++ b/7b/cecbe55bf6f1b6fd81519ee49f5bdc0e2f22a8 @@ -0,0 +1 @@ +ignore: fixed ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - c2/00d482e2e19c2c9df4d3c74f7d85bce1370a50
c2/00d482e2e19c2c9df4d3c74f7d85bce1370a50 |1 + 1 file changed, 1 insertion(+) New commits: commit 3d41e519d0a2da9ee06ceb889117d91ebf62e993 Author: Caolán McNamara caol...@redhat.com Date: Mon Mar 10 16:27:24 2014 + Notes added by 'git notes add' diff --git a/c2/00d482e2e19c2c9df4d3c74f7d85bce1370a50 b/c2/00d482e2e19c2c9df4d3c74f7d85bce1370a50 new file mode 100644 index 000..8a2345e --- /dev/null +++ b/c2/00d482e2e19c2c9df4d3c74f7d85bce1370a50 @@ -0,0 +1 @@ +ignore: fixed ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/filter/ppt/pptin.cxx |9 +
1 file changed, 5 insertions(+), 4 deletions(-)
New commits:
commit 0b291d42e7fc3c787af0e88ee7c5499c333b14b2
Author: Tobias Lippert d...@fastmail.fm
Date: Tue Mar 4 22:20:54 2014 +0100
Use SfxStyleSheetIterator to iterate over SfxStyles in sd/pptin.cxx
Change-Id: I99534efdd52644882f2e2960bdafce58bf632804
Reviewed-on: https://gerrit.libreoffice.org/8483
Tested-by: Caolán McNamara caol...@redhat.com
Reviewed-by: Caolán McNamara caol...@redhat.com
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index b6f1c66..e80fc82 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -91,6 +91,8 @@
#include comphelper/string.hxx
#include oox/ole/olehelper.hxx
+#include boost/make_shared.hpp
+
using namespace ::com::sun::star;
SdPPTImport::SdPPTImport( SdDrawDocument* pDocument, SvStream rDocStream,
SvStorage rStorage, SfxMedium rMedium )
@@ -137,13 +139,12 @@ SdPPTImport::SdPPTImport( SdDrawDocument* pDocument,
SvStream rDocStream, SvSto
{
// iterate over all styles
SdStyleSheetPool* pStyleSheetPool = pDocument-GetSdStyleSheetPool();
+SfxStyleSheetIteratorPtr aIter =
+boost::make_sharedSfxStyleSheetIterator(pStyleSheetPool,
SFX_STYLE_FAMILY_ALL);
-sal_uInt32 nStyles = pStyleSheetPool ?
pStyleSheetPool-GetStyles().size() : 0;
-for (sal_uInt32 nStyle = 0; nStyle nStyles; nStyle++)
+for (SfxStyleSheetBase *pSheet = aIter-First(); pSheet; pSheet =
aIter-Next())
{
-SfxStyleSheet* pSheet = static_castSfxStyleSheet*(
pStyleSheetPool-GetStyles()[nStyle].get() );
SfxItemSet rSet = pSheet-GetItemSet();
-
// if autokerning is set in style, override it, ppt has no
autokerning
if( rSet.GetItemState( EE_CHAR_PAIRKERNING, false ) ==
SFX_ITEM_SET )
rSet.ClearItem( EE_CHAR_PAIRKERNING );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source
cui/source/dialogs/hldoctp.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f52ae6a8da2c2965e0c07020fda367095cea00e3 Author: Stephan Bergmann sberg...@redhat.com Date: Mon Mar 10 18:00:56 2014 +0100 Simplify use of OUString::copy Change-Id: I2220ae614d8bc2f231947ec9336ef42e0e9398f1 diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx index 8148680..f91f89c 100644 --- a/cui/source/dialogs/hldoctp.cxx +++ b/cui/source/dialogs/hldoctp.cxx @@ -100,7 +100,7 @@ void SvxHyperlinkDocTp::FillDlgFields(const OUString rStrURL) // set target in document at editfield OUString aStrMark; if ( nPos != -1 nPos rStrURL.getLength()-1 ) -aStrMark = rStrURL.copy( nPos+1, rStrURL.getLength() - nPos - 1 ); +aStrMark = rStrURL.copy( nPos+1 ); maEdTarget.SetText ( aStrMark ); ModifiedPathHdl_Impl ( NULL ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/core/stlsheet.cxx | 17 -
1 file changed, 8 insertions(+), 9 deletions(-)
New commits:
commit e955433c3574cb602dedba96bc645898f97858bf
Author: Tobias Lippert d...@fastmail.fm
Date: Wed Mar 5 19:51:58 2014 +0100
Use SfxStyleSheetIterator to iterate over style sheets in sd/stlsheet.cxx
It is not possible to access n#708518. We must hope that this
is not a regression
Change-Id: I4500d72cc7d6fc488fb015aa8b7907238fa09ac0
Reviewed-on: https://gerrit.libreoffice.org/8484
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 3611ce2..ce7fbf1 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -56,6 +56,7 @@
#include ../ui/inc/ViewShellBase.hxx
#include editeng/boxitem.hxx
+#include boost/make_shared.hpp
using ::osl::MutexGuard;
using ::osl::ClearableMutexGuard;
@@ -970,19 +971,17 @@ void SAL_CALL SdStyleSheet::setParentStyle( const
OUString rParentName ) throw
if( !rParentName.isEmpty() )
{
-const SfxStyles rStyles = mxPool-GetStyles();
-
-/* Use reverse iterator to find the parents quicker - most probably
its inserted recently.
- * Also avoids/fixes the issue n#708518
- * To fix it completely its probably wiser to compare this-GetName()
and pStyle-GetName() or use complete names for styles (?)
- */
-for( SfxStyles::const_reverse_iterator iter( rStyles.rbegin() ); iter
!= rStyles.rend(); ++iter )
+SfxStyleSheetIteratorPtr aSSSI =
boost::make_sharedSfxStyleSheetIterator(mxPool.get(), nFamily,
SFX_STYLE_FAMILY_ALL);
+for (SfxStyleSheetBase *pStyle = aSSSI-First(); pStyle; pStyle =
aSSSI-Next())
{
-SdStyleSheet* pStyle = static_cast SdStyleSheet* ( (*iter).get()
);
-if( pStyle (pStyle-nFamily == nFamily) (pStyle-msApiName
== rParentName) )
+// we hope that we have only sd style sheets
+SdStyleSheet* pSdStyleSheet = static_castSdStyleSheet*(pStyle);
+if (pSdStyleSheet-msApiName == rParentName)
{
if( pStyle != this )
+{
SetParent( pStyle-GetName() );
+}
return;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - vcl/unx
vcl/unx/kde4/KDEXLib.cxx | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
New commits:
commit 7dba6e0a71d090f06a6a1a39e87572674593b48a
Author: Jan-Marek Glogowski glo...@fbihome.de
Date: Mon Mar 10 14:44:05 2014 +
fdo#73115: Always run timeouts as events
Right-click popup menus run click events throught the LO main loop.
In case of KDE4 the LO main loop is run by a timer in the main thread,
with Qt::DirectConnection execution.
If the timeout actually starts a nested event loop for a new dialog,
the timer is blocked, the nested mainloop detects it was started
from the timeout and drops the blocked timout from polling, which
blocks any further LibreOffice event loop processing.
This changes the timers to Qt::QueuedConnection, so they always
generate an event and are processed by the Qt event loop.
Change-Id: Ie626b22be3d8f9b8934bcc5e9e0e67a365549cfc
(cherry picked from commit aeda478a02523cec146f6af69710f0391061db56)
Reviewed-on: https://gerrit.libreoffice.org/8514
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx
index b4be6d6..4a9b70b 100644
--- a/vcl/unx/kde4/KDEXLib.cxx
+++ b/vcl/unx/kde4/KDEXLib.cxx
@@ -67,9 +67,13 @@ KDEXLib::KDEXLib() :
eventLoopType( LibreOfficeEventLoop ),
m_bYieldFrozen( false )
{
-// the timers created here means they belong to the main thread
-connect( timeoutTimer, SIGNAL( timeout()), this, SLOT(
timeoutActivated()));
-connect( userEventTimer, SIGNAL( timeout()), this, SLOT(
userEventActivated()));
+// the timers created here means they belong to the main thread.
+// As the timeoutTimer runs the LO event queue, which may block on a
dialog,
+// the timer has to use a Qt::QueuedConnection, otherwise the nested event
+// loop will detect the blocking timer and drop it from the polling
+// freezing LO X11 processing.
+connect( timeoutTimer, SIGNAL( timeout()), this, SLOT(
timeoutActivated()), Qt::QueuedConnection );
+connect( userEventTimer, SIGNAL( timeout()), this, SLOT(
userEventActivated()), Qt::QueuedConnection );
// QTimer::start() can be called only in its (here main) thread, so this
will
// forward between threads if needed
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - chart2/qa drawinglayer/source include/drawinglayer sd/qa
chart2/qa/extras/chart2import.cxx | 13 +
chart2/qa/extras/data/xlsx/strict_chart.xlsx|binary
drawinglayer/source/primitive2d/epsprimitive2d.cxx |2 --
include/drawinglayer/primitive2d/epsprimitive2d.hxx |4
sd/qa/unit/data/strict_ooxml.pptx |binary
sd/qa/unit/import-tests.cxx | 16
6 files changed, 29 insertions(+), 6 deletions(-)
New commits:
commit ed3fc457e1fbdfd2cff808e259d62d1d537a01ce
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Mon Mar 10 18:16:18 2014 +0100
add strict OOXML pptx import test
Change-Id: I2e4f17b7b7ab1e14c5cb0f6ce90e771d7c20a5c8
diff --git a/sd/qa/unit/data/strict_ooxml.pptx
b/sd/qa/unit/data/strict_ooxml.pptx
new file mode 100644
index 000..534b483
Binary files /dev/null and b/sd/qa/unit/data/strict_ooxml.pptx differ
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 0f5732c..eb3b56d 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -60,6 +60,7 @@ public:
void testN821567();
void testFdo68594();
void testFdo72998();
+void testStrictOOXML();
CPPUNIT_TEST_SUITE(SdFiltersTest);
CPPUNIT_TEST(testDocumentLayout);
@@ -76,6 +77,7 @@ public:
CPPUNIT_TEST(testN821567);
CPPUNIT_TEST(testFdo68594);
CPPUNIT_TEST(testFdo72998);
+CPPUNIT_TEST(testStrictOOXML);
CPPUNIT_TEST_SUITE_END();
};
@@ -538,6 +540,20 @@ void SdFiltersTest::testFdo71075()
CPPUNIT_ASSERT_MESSAGE( Invalid Series count,
aValues.getConstArray()[i] == values[i]);
}
+void SdFiltersTest::testStrictOOXML()
+{
+::sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc(/sd/qa/unit/data/strict_ooxml.pptx));
+CPPUNIT_ASSERT_MESSAGE( failed to load, xDocShRef.Is() );
+CPPUNIT_ASSERT_MESSAGE( not in destruction,
!xDocShRef-IsInDestruction() );
+
+SdDrawDocument *pDoc = xDocShRef-GetDoc();
+CPPUNIT_ASSERT_MESSAGE( no document, pDoc != NULL );
+uno::Reference drawing::XDrawPagesSupplier
xDoc(xDocShRef-GetDoc()-getUnoModel(), uno::UNO_QUERY_THROW );
+uno::Reference drawing::XDrawPage
xPage(xDoc-getDrawPages()-getByIndex(0), uno::UNO_QUERY_THROW );
+uno::Reference drawing::XShape xShape(xPage-getByIndex(0),
uno::UNO_QUERY_THROW );
+CPPUNIT_ASSERT_MESSAGE( failed to load shape, xShape.is() );
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(SdFiltersTest);
CPPUNIT_PLUGIN_IMPLEMENT();
commit 2ce06d07bb7682dfe8483a047dfc23a3bf87a079
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Mon Mar 10 18:02:43 2014 +0100
test case for strict OOXML chart import
Change-Id: Ie000dda7b04615c2e79376c5da5dc96b4ea40db0
diff --git a/chart2/qa/extras/chart2import.cxx
b/chart2/qa/extras/chart2import.cxx
index 2d4259b..bdebe51 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -34,6 +34,7 @@ public:
void testPPTChartSeries();
void testODPChartSeries();
void testBnc864396();
+void testSimpleStrictXLSX();
CPPUNIT_TEST_SUITE(Chart2ImportTest);
CPPUNIT_TEST(Fdo60083);
@@ -55,6 +56,7 @@ public:
CPPUNIT_TEST(testPPTXChartSeries);
CPPUNIT_TEST(testODPChartSeries);
CPPUNIT_TEST(testBnc864396);
+CPPUNIT_TEST(testSimpleStrictXLSX);
CPPUNIT_TEST_SUITE_END();
private:
@@ -298,6 +300,17 @@ void Chart2ImportTest::testBnc864396()
}
}
+void Chart2ImportTest::testSimpleStrictXLSX()
+{
+load(/chart2/qa/extras/data/xlsx/, strict_chart.xlsx);
+uno::Reference chart2::XChartDocument xChartDoc = getChartDocFromSheet(
0, mxComponent );
+CPPUNIT_ASSERT(xChartDoc.is());
+
+Reference chart2::XDataSeries xDataSeries = getDataSeriesFromDoc(
xChartDoc, 0 );
+CPPUNIT_ASSERT(xDataSeries.is());
+
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ImportTest);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/chart2/qa/extras/data/xlsx/strict_chart.xlsx
b/chart2/qa/extras/data/xlsx/strict_chart.xlsx
new file mode 100644
index 000..4378933
Binary files /dev/null and b/chart2/qa/extras/data/xlsx/strict_chart.xlsx differ
commit 2f59eae88abcdfce72e7d116a4bec4547ad43498
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Mon Mar 10 15:29:16 2014 +0100
remove whitespace
Change-Id: Ie03ffe6e02fe7c4d67a5a6752bc6fa24377da7cd
diff --git a/drawinglayer/source/primitive2d/epsprimitive2d.cxx
b/drawinglayer/source/primitive2d/epsprimitive2d.cxx
index 0cac329..6e25403 100644
--- a/drawinglayer/source/primitive2d/epsprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/epsprimitive2d.cxx
@@ -21,8 +21,6 @@
#include drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx
#include drawinglayer/primitive2d/metafileprimitive2d.hxx
-
-
namespace drawinglayer
{
namespace primitive2d
diff --git a/include/drawinglayer/primitive2d/epsprimitive2d.hxx
b/include/drawinglayer/primitive2d/epsprimitive2d.hxx
index
[Libreoffice-commits] core.git: Changes to 'origin/for/libreoffice-4-2'
New branch 'origin/for/libreoffice-4-2' available with the following commits: commit baf0ddb44d3060736e1f9c17a0ec9ce73a71dd58 Author: Caolán McNamara caol...@redhat.com Date: Tue Jan 28 16:09:58 2014 + Related: fdo#73051 make font size drop down of optimal width presumably keithcu felt the font size was too wide, so lets try and implement the desired effect of an optimal width. Change-Id: Idc1741de04b3559fa415ebcf2289f96ba240ca8f commit 3484f9592d10aa5eed8d8bd523233706e86e67db Author: Keith Curtis keit...@gmail.com Date: Thu Jan 2 16:01:07 2014 -0500 hidpi: Sidebar, fontwork, autoformat and other improvements. This is a second batch of HiDPI changes. It fixes the following areas: Sidebar * Impress Master pages preview * deck title height * tab (icon) bar * valueset dropdown control * wider maximum width * Draw and other misc. buttons which didn't get fixed by earlier change to Toolbar.SetItemImage There are several more sidebar issues, but it is much improved. Other changes * Writer and Calc auto-format dialog text * file-properties document image * fontwork gallery preview size * Calc table border control Change-Id: I95a0169a3b011836b1c75b3dcacb2733c9567ef3 commit f4a652efab915079a7d4297a578fe3d5739e8c60 Author: Jan Holesovsky ke...@collabora.com Date: Thu Mar 6 18:40:36 2014 +0100 hidpi: Nicer painting of the waved lines. Change-Id: I8773b47967bc1aa8cf33b9a1edc4f826291d3554 commit 692673cfc9255ef3b016963c2bc52632319ee925 Author: Jan Holesovsky ke...@collabora.com Date: Thu Mar 6 18:42:14 2014 +0100 hidpi: Make many places Hi-DPI aware. This also introduces a getter for the mnDPIScaleFactor variable. Change-Id: I02ba6858fb1842f911d62976f4c54afc3bfa337f commit d02ab15c57893a00b1605b2fefaaa7b5eba18b4f Author: Jan Holesovsky ke...@collabora.com Date: Thu Mar 6 18:39:51 2014 +0100 Introduce DPI scale factor for Hi-DPI displays. This is supposed to stay 1 (no scale) for printers and default virtual devices, but should be set accordingly (2 or 3) for windows and virtual devices derived from windows. Various VCL widgets or paint operations should incrementally become aware of this, and changed so that they draw nicely on the Hi-DPI displays. This patch only introduces the behavior for waved lines. The default is currently being set depending on the DPI setting only; could be changed to a more clever way if necessary. Change-Id: I71118f9ab6b64028d176e860e999d5cd9d19 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
