LibreOffice Gerrit News 2013-09-10
Moin! * Open changes on master for project core changed in the last 25 hours: + Parsing 'presobj' properties from 'objectlist.xml': gsoc-impresslayout in https://gerrit.libreoffice.org/5652 from Vishv Brahmbhatt + String to OUString in https://gerrit.libreoffice.org/5895 from Thomas Arnhold + Remove String::SearchChar() in https://gerrit.libreoffice.org/5894 from Thomas Arnhold + String to OUString in https://gerrit.libreoffice.org/5893 from Thomas Arnhold + Fix remote clients duplicates. in https://gerrit.libreoffice.org/5816 from Artur Dryomov + [Sidebar]: Correcting anomalous mouse behaviour while resizing in https://gerrit.libreoffice.org/5864 from Prashant Pandey + Improve border equal check in filter tests 2. in https://gerrit.libreoffice.org/5885 from Zolnai Tamás + Resolves: fdo#34987 skip autoheight reset if it will be set to the same v in https://gerrit.libreoffice.org/5887 from Caolán McNamara + Make libatomic_ops buildable and enable on non-X86. in https://gerrit.libreoffice.org/5812 from Andrzej J.R. Hunt + fdo#39881 change find all behaviour in Calc in https://gerrit.libreoffice.org/5886 from Matúš Kukan + Remove sal_char* from dbexception and some cleanup. in https://gerrit.libreoffice.org/5881 from Andrzej J.R. Hunt * Merged changes on master for project core changed in the last 25 hours: + vcl/pdfwriter: export linear/axial gradients as PDF gradients in https://gerrit.libreoffice.org/5799 from Pierre-Eric Pelloux-Prayer + CID#1079181 initialize buffer in https://gerrit.libreoffice.org/5889 from Caolán McNamara + CID#1078725: Dereference null return value in https://gerrit.libreoffice.org/5862 from Julien Nabet + Various improvements Expert Config in https://gerrit.libreoffice.org/5714 from Efe Gürkan Yalaman + Fix fdo#67746 SIDEBAR Feature request: RTL\LTR buttons in https://gerrit.libreoffice.org/5871 from abdulmajeed ahmed + Make SvtHistoryOptions not return files if they can't be opened in https://gerrit.libreoffice.org/5841 from Krisztian Pinter + Convert dimension lines tab page to widget UI in https://gerrit.libreoffice.org/5879 from Olivier Hallot + Cleanup findColumn. (firebird-sdbc) in https://gerrit.libreoffice.org/5884 from Andrzej J.R. Hunt + drawinglayer: added dumping of InteropGrabBag prop in https://gerrit.libreoffice.org/5848 from Andres Gomez + String to OUstring in https://gerrit.libreoffice.org/5876 from Matteo Casalin + callcatcher: update unused code in https://gerrit.libreoffice.org/5882 from Caolán McNamara + String to OUString in https://gerrit.libreoffice.org/5875 from Matteo Casalin + Stop transition preview if No transition is selected. in https://gerrit.libreoffice.org/5877 from Andrzej J.R. Hunt * Abandoned changes on master for project core changed in the last 25 hours: + Expert config page moved to advanced page in https://gerrit.libreoffice.org/5653 from Efe Gürkan Yalaman + fdo#66577: non-fractional widths with Core Text in https://gerrit.libreoffice.org/5023 from Khaled Hosny * Open changes needing tweaks, but being untouched for more than a week: + Switch sw style names to non-localized ones internally in https://gerrit.libreoffice.org/5747 from Bosdonnat Cedric + Dynamically align toolbars in LibreOffice in https://gerrit.libreoffice.org/5655 from Prashant Pandey + fdo#36791 : fix for import of greeting card in https://gerrit.libreoffice.org/4240 from Adam CloudOn + fdo#66401: fix for combined characters in https://gerrit.libreoffice.org/5018 from Adam CloudOn + more debug logs, extra debug layer, file is not used in p3k in https://gerrit.libreoffice.org/5267 from James Michael Dupont + fdo#66279 - MathML export: use the operator dictionary in https://gerrit.libreoffice.org/4671 from Frédéric Wang + Remove old outdated gallery images and sounds in https://gerrit.libreoffice.org/4993 from Samuel Mehrbrodt + fix for text watermark in https://gerrit.libreoffice.org/5568 from Adam CloudOn + Don't use osl_createSuspendedThread anymore in https://gerrit.libreoffice.org/5565 from Arnaud Versini + Positional Tab additions in https://gerrit.libreoffice.org/5387 from Adam CloudOn + Change oslThreadIdentifier to uintptr_t and use THREAD_VALUE on Unix. in https://gerrit.libreoffice.org/5553 from Arnaud Versini + fdo#64817 : fix for rectangle with image fill in https://gerrit.libreoffice.org/4718 from Adam CloudOn Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - extensions.lst
extensions.lst |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit f5c3f1a0fba83206f0ee5b434d27d844282718dc Author: Andrea Pescetti pesce...@apache.org Date: Tue Sep 10 05:33:01 2013 + #123152# Update bundled Italian it dictionary diff --git a/extensions.lst b/extensions.lst index e7a5ebe..9e47b4f 100644 --- a/extensions.lst +++ b/extensions.lst @@ -59,7 +59,7 @@ # Italian dictionary. [ language=it || language=de || language=de_DE ] -e7ad2666a727b594948cb672a31ba22d http://sourceforge.net/projects/aoo-extensions/files/1204/11/dict-it.oxt/download dict-it.oxt +67eb02751dda7b2d312a66bcb0505fd2 http://sourceforge.net/projects/aoo-extensions/files/1204/13/dict-it.oxt/download dict-it.oxt # Spanish dictionary. [ language=es ] commit 964b63c906438e21c649667de8b9b7e03394cc24 Author: Andrea Pescetti pesce...@apache.org Date: Tue Sep 10 05:25:22 2013 + #123214# Update bundled Gaelic gd dictionary diff --git a/extensions.lst b/extensions.lst index a4aef09..e7a5ebe 100644 --- a/extensions.lst +++ b/extensions.lst @@ -100,7 +100,7 @@ # Scottish Gaelic. [ language=gd ] -867d5509958a867fec1096b445fe4cec http://sourceforge.net/projects/aoo-extensions/files/4587/8/hunspell-gd-2.6.oxt/download hunspell-gd-2.6.oxt +88d92378c2bcf22f87f49bf594130238 http://sourceforge.net/projects/aoo-extensions/files/4587/9/hunspell-gd-2.7.oxt/download hunspell-gd-2.7.oxt # Basque. [ language=eu ] ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - lcms2/ExternalPackage_lcms2.mk RepositoryExternal.mk solenv/gbuild unotools/source unusedcode.easy
RepositoryExternal.mk |5 -
lcms2/ExternalPackage_lcms2.mk |2
solenv/gbuild/ExternalPackage.mk |5 +
unotools/source/config/xmlaccelcfg.cxx | 140 -
unusedcode.easy|2
5 files changed, 6 insertions(+), 148 deletions(-)
New commits:
commit 1ea33a8cfc5bc51d0cf83989702b8be82cf52c49
Author: Matúš Kukan matus.ku...@gmail.com
Date: Tue Sep 10 01:04:39 2013 +0200
fix lcms2 library in solver
This commit repairs broken link liblcms2.so - liblcms2.so.2.0.4 as
liblcms2.so - liblcms2.so.2.
Change-Id: Idccd65bba5cec822d285859f609e222c84f2fad9
diff --git a/lcms2/ExternalPackage_lcms2.mk b/lcms2/ExternalPackage_lcms2.mk
index d132619..395be9a 100644
--- a/lcms2/ExternalPackage_lcms2.mk
+++ b/lcms2/ExternalPackage_lcms2.mk
@@ -26,7 +26,7 @@ $(eval $(call gb_ExternalPackage_add_file,lcms2,lib/lcms2$(if
$(MSVC_USE_DEBUG_R
$(eval $(call
gb_ExternalPackage_add_library_for_install,lcms2,bin/lcms2.dll,bin/lcms2$(if
$(MSVC_USE_DEBUG_RUNTIME),d).dll))
endif
else
-$(eval $(call
gb_ExternalPackage_add_file,lcms2,lib/liblcms2.so,src/.libs/liblcms2.so))
+$(eval $(call
gb_ExternalPackage_add_symbolic_link,lcms2,lib/liblcms2.so,liblcms2.so.2))
$(eval $(call
gb_ExternalPackage_add_library_for_install,lcms2,lib/liblcms2.so.2,src/.libs/liblcms2.so.2.0.4))
endif
# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/ExternalPackage.mk b/solenv/gbuild/ExternalPackage.mk
index 7ec30cb..9d6a52c 100644
--- a/solenv/gbuild/ExternalPackage.mk
+++ b/solenv/gbuild/ExternalPackage.mk
@@ -102,6 +102,11 @@ $(foreach file,$(2),$(call
gb_ExternalProject_mark_generated_file,$(1),$(file)))
endef
+define gb_ExternalPackage_add_symbolic_link
+$(call gb_Package_add_symbolic_link,$(1),$(2),$(3))
+
+endef
+
# Add a file
#
# See gb_Package_add_file for details.
commit be4d2cdc23c20a11a195cab8fb6a45312a814341
Author: Matúš Kukan matus.ku...@gmail.com
Date: Mon Sep 9 17:11:03 2013 +0200
unusedcode: remove AttributeListImpl
Change-Id: I9c3c0d742bc2941fcf40ad69bfb744a57b3e7be6
diff --git a/unotools/source/config/xmlaccelcfg.cxx
b/unotools/source/config/xmlaccelcfg.cxx
index 719cbf7..bd598d2 100644
--- a/unotools/source/config/xmlaccelcfg.cxx
+++ b/unotools/source/config/xmlaccelcfg.cxx
@@ -35,146 +35,6 @@ using namespace com::sun::star::xml::sax;
#define ATTRIBUTE_MODIFIER modifier
#define ATTRIBUTE_URL url
-namespace {
-
-struct AttributeListImpl_impl;
-class AttributeListImpl : public ::cppu::WeakImplHelper1
::com::sun::star::xml::sax::XAttributeList
-{
-protected:
-~AttributeListImpl();
-
-public:
-AttributeListImpl();
-AttributeListImpl( const AttributeListImpl );
-
-public:
-virtual sal_Int16 SAL_CALL getLength(void) throw
(::com::sun::star::uno::RuntimeException);
-virtual OUString SAL_CALL getNameByIndex(sal_Int16 i) throw
(::com::sun::star::uno::RuntimeException);
-virtual OUString SAL_CALL getTypeByIndex(sal_Int16 i) throw
(::com::sun::star::uno::RuntimeException);
-virtual OUString SAL_CALL getTypeByName(const OUString aName) throw
(::com::sun::star::uno::RuntimeException);
-virtual OUString SAL_CALL getValueByIndex(sal_Int16 i) throw
(::com::sun::star::uno::RuntimeException);
-virtual OUString SAL_CALL getValueByName(const OUString aName) throw
(::com::sun::star::uno::RuntimeException);
-
-public:
-void addAttribute( const OUString sName , const OUString sType , const
OUString sValue );
-
-private:
-struct AttributeListImpl_impl *m_pImpl;
-};
-
-struct TagAttribute
-{
-TagAttribute(){}
-TagAttribute( const OUString aName, const OUString aType , const
OUString aValue )
-{
-sName = aName;
-sType = aType;
-sValue = aValue;
-}
-
-OUString sName;
-OUString sType;
-OUString sValue;
-};
-
-struct AttributeListImpl_impl
-{
-AttributeListImpl_impl()
-{
-// performance improvement during adding
-vecAttribute.reserve(20);
-}
-::std::vectorstruct TagAttribute vecAttribute;
-};
-
-
-
-sal_Int16 SAL_CALL AttributeListImpl::getLength(void) throw (RuntimeException)
-{
-return sal::static_int_cast sal_Int16 (m_pImpl-vecAttribute.size());
-}
-
-
-AttributeListImpl::AttributeListImpl( const AttributeListImpl r ) :
-cppu::WeakImplHelper1com::sun::star::xml::sax::XAttributeList(r)
-{
-m_pImpl = new AttributeListImpl_impl;
-*m_pImpl = *(r.m_pImpl);
-}
-
-OUString AttributeListImpl::getNameByIndex(sal_Int16 i) throw
(RuntimeException)
-{
-if( i sal::static_int_castsal_Int16(m_pImpl-vecAttribute.size()) ) {
-return m_pImpl-vecAttribute[i].sName;
-}
-return OUString();
-}
-
-
-OUString AttributeListImpl::getTypeByIndex(sal_Int16 i) throw
(RuntimeException)
-{
-if( i sal::static_int_castsal_Int16(m_pImpl-vecAttribute.size()) ) {
-return m_pImpl-vecAttribute[i].sType;
-}
-
[Libreoffice-commits] core.git: scp2/source solenv/bin
scp2/source/ooo/ure.scp | 16 --
solenv/bin/modules/installer/windows/file.pm | 30 ---
2 files changed, 46 deletions(-)
New commits:
commit f5248b4f4e83d491347749cb6731a12a9509b560
Author: Andras Timar andras.ti...@collabora.com
Date: Tue Sep 10 08:47:38 2013 +0200
CompID is not in use in scp2 files
Change-Id: I3d5b92d9890d6525b05575760a9fb4b4db65172b
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 12b55a5..425b487 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -99,7 +99,6 @@ File gid_File_Dl_Cppu
Dir = SCP2_URE_DL_DIR;
Name = SCP2_URE_DL_UNO_VER(cppu, 3);
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-// CompID = 36C01AC6-BB0A-4181-A8B8-50B793ADEDB7;
End
#ifdef AIX
@@ -117,7 +116,6 @@ File gid_File_Dl_Cppuhelper
Dir = SCP2_URE_DL_DIR;
Name = SCP2_URE_DL_UNO_COMID_VER(cppuhelper, 3);
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-// CompID = D2A191E6-2023-41F5-9032-B98C50C37964;
End
#ifdef AIX
@@ -135,7 +133,6 @@ File gid_File_Dl_PurpEnvHelper
Dir = SCP2_URE_DL_DIR;
Name = SCP2_URE_DL_UNO_COMID_VER(purpenvhelper, 3);
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-// CompID = C80146A8-A14C-44D1-AB9F-D9D8BF22277E;
End
#ifdef AIX
@@ -153,7 +150,6 @@ File gid_File_Dl_Sal
Dir = SCP2_URE_DL_DIR;
Name = SCP2_URE_DL_UNO_VER(sal, 3);
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-// CompID = B1EF3AB6-611E-4027-958A-736583EB82E6;
End
#ifdef AIX
@@ -171,7 +167,6 @@ File gid_File_Dl_Salhelper
Dir = SCP2_URE_DL_DIR;
Name = SCP2_URE_DL_UNO_COMID_VER(salhelper, 3);
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-// CompID = 879B80E0-F6E1-4931-8EE6-7CF867CB6AA5;
End
#ifdef AIX
@@ -274,7 +269,6 @@ File gid_File_ure_install
Dir = FILELIST_DIR;
Name = ure_install.filelist;
Styles = (FILELIST, USE_INTERNAL_RIGHTS, PACKED,
VERSION_INDEPENDENT_COMP_ID);
-// CompID = 1124A984-F905-47DC-ACEF-EDEC037F9B38;
End
@@ -284,7 +278,6 @@ File gid_File_Dl_JrepropertiesClass
Dir = FILELIST_DIR;
Name = jvmfwk_jreproperties.filelist;
Styles = (FILELIST, PACKED, VERSION_INDEPENDENT_COMP_ID);
-// CompID = 0C4B8DCF-18D1-47D9-8BB7-A5C1D9268016;
End
#endif
@@ -452,7 +445,6 @@ File gid_File_Dl_Jpipe
Dir = SCP2_URE_DL_DIR;
Name = SCP2_URE_JDL_NORMAL(jpipe);
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-// CompID = B1A60DD4-51D7-4898-B899-9BD05DE2DA8F;
End
#endif
@@ -481,7 +473,6 @@ File gid_File_Dl_Libxml2
Name = SCP2_URE_DL_VER(xml2, 2);
#endif
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-// CompID = BE6FAD97-F84C-43E3-8392-6FE2CDA04D8E;
End
#endif
@@ -529,7 +520,6 @@ File gid_File_Java_UnoloaderJar
Dir = GID_DIR_URE_JAVA;
Name = unoloader.jar;
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-// CompID = 90F99ED3-814C-4B45-894B-D9248848CEB4;
End
#endif
@@ -539,7 +529,6 @@ File gid_File_Java_JuhJar
Dir = GID_DIR_URE_JAVA;
Name = juh.jar;
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-// CompID = E77CC8B5-0345-4B7F-ABED-5EB9DC94E492;
End
#endif
@@ -549,7 +538,6 @@ File gid_File_Java_JurtJar
Dir = GID_DIR_URE_JAVA;
Name = jurt.jar;
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-// CompID = EA63EDCC-9152-4560-AB7A-BFC367442E50;
End
#endif
@@ -559,7 +547,6 @@ File gid_File_Java_RidlJar
Dir = GID_DIR_URE_JAVA;
Name = ridl.jar;
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-// CompID = 4A915C83-6BE3-41B9-BAF9-13AA27034955;
End
#endif
@@ -571,7 +558,6 @@ File gid_File_Java_JavaUnoJar
Dir = GID_DIR_URE_JAVA;
Name = java_uno.jar;
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-// CompID = ABDC8DDA-5D2B-424C-ABD8-FD22D59658FE;
End
#endif
@@ -583,7 +569,6 @@ File gid_File_Misc_TypesRdb
Name = udkapi.rdb;
InstallName = types.rdb;
Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID, SUBST_FILENAME);
-// CompID = E5086F6A-855B-4CAE-AD3A-A85A21C5AE44;
End
File gid_File_Misc_ServicesRdb
@@ -601,7 +586,6 @@ File gid_File_Misc_JavavendorsXml
Dir = FILELIST_DIR;
Name = jvmfwk_javavendors.filelist;
Styles = (FILELIST, PACKED, VERSION_INDEPENDENT_COMP_ID);
-// CompID = 403FCCFE-545B-44F6-91D1-5C75F846E587;
End
#endif
diff --git a/solenv/bin/modules/installer/windows/file.pm
b/solenv/bin/modules/installer/windows/file.pm
index 15c0af9..2bf02fc 100644
--- a/solenv/bin/modules/installer/windows/file.pm
+++ b/solenv/bin/modules/installer/windows/file.pm
@@ -924,36 +924,6 @@ sub create_files_table
$installer::globals::base_independent_components{$onefile-{'componentname'}} =
1;
}
-# Collecting all component ids, that are defined at files in scp
project (should not be used anymore)
-if ( $onefile-{'CompID'} )
-{
-
Re: [ANN] feature/instdir pushed to master
Hi, On Mon, Sep 09, 2013 at 10:18:32PM +0200, Michael Stahl mst...@redhat.com wrote: i've just pushed Matúš' feature/instdir branch to master, which makes the instdir an actually runnable office installation. Cool! :) Nitpick: dev-install tweaks bootstraprc, so UserInstallation points to $SYSUSERCONFIG/libreoffice/4, not $SYSUSERCONFIG/libreofficedev/4 as instdir currently has it. Is this intentional? Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/htmlexport/htmlexport.cxx | 16 +++-
sw/qa/extras/inc/swmodeltestbase.hxx | 22 +++--
sw/qa/extras/odfexport/odfexport.cxx | 40 +++
sw/qa/extras/ooxmlexport/ooxmlexport.cxx |8 +++---
sw/qa/extras/rtfexport/rtfexport.cxx |8 +++---
sw/qa/extras/ww8export/ww8export.cxx |8 +++---
6 files changed, 51 insertions(+), 51 deletions(-)
New commits:
commit f4dad76732328dfaa0ff16f810d6ee0a3bfd0d8c
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date: Mon Sep 9 12:49:13 2013 +0200
Improve border equal check in filter tests 2.
Change the order of words BORDER and EQUAL in the
macro name to become consistent with other macro names.
e.g. CPPUNIT_ASSERT_DOUBLES_EQUAL
Use a function inside the macro to make it type safe.
Add additional message to make clear why the test failed.
Change-Id: I9fc7a5813adf2cac36ae831d438cec498232b06c
Reviewed-on: https://gerrit.libreoffice.org/5885
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx
b/sw/qa/extras/htmlexport/htmlexport.cxx
index b2dfcf0..6ebaad5 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -57,18 +57,10 @@ void Test::testCharacterBorder()
uno::Referencebeans::XPropertySet xRun(getRun(getParagraph(1),1),
uno::UNO_QUERY);
// Different Border
{
-CPPUNIT_ASSERT_EQUAL_BORDER(
-table::BorderLine2(0xFF,12,12,12,3,37),
-getPropertytable::BorderLine2(xRun,CharTopBorder));
-CPPUNIT_ASSERT_EQUAL_BORDER(
-table::BorderLine2(0xFF9900,0,99,0,2,99),
-getPropertytable::BorderLine2(xRun,CharLeftBorder));
-CPPUNIT_ASSERT_EQUAL_BORDER(
-table::BorderLine2(0xFF,0,169,0,1,169),
-getPropertytable::BorderLine2(xRun,CharBottomBorder));
-CPPUNIT_ASSERT_EQUAL_BORDER(
-table::BorderLine2(0xFF,0,169,0,0,169),
-getPropertytable::BorderLine2(xRun,CharRightBorder));
+
CPPUNIT_ASSERT_BORDER_EQUAL(table::BorderLine2(0xFF,12,12,12,3,37),
getPropertytable::BorderLine2(xRun,CharTopBorder));
+CPPUNIT_ASSERT_BORDER_EQUAL(table::BorderLine2(0xFF9900,0,99,0,2,99),
getPropertytable::BorderLine2(xRun,CharLeftBorder));
+
CPPUNIT_ASSERT_BORDER_EQUAL(table::BorderLine2(0xFF,0,169,0,1,169),
getPropertytable::BorderLine2(xRun,CharBottomBorder));
+
CPPUNIT_ASSERT_BORDER_EQUAL(table::BorderLine2(0xFF,0,169,0,0,169),
getPropertytable::BorderLine2(xRun,CharRightBorder));
}
// Different Padding
diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx
b/sw/qa/extras/inc/swmodeltestbase.hxx
index 254aabe..353cd63 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -37,13 +37,6 @@
using namespace com::sun::star;
#define DEFAULT_STYLE Default Style
-#define CPPUNIT_ASSERT_EQUAL_BORDER(aExpected, aActual) \
-CPPUNIT_ASSERT_EQUAL(aExpected.Color, aActual.Color); \
-CPPUNIT_ASSERT_EQUAL(aExpected.InnerLineWidth,
aActual.InnerLineWidth); \
-CPPUNIT_ASSERT_EQUAL(aExpected.LineDistance, aActual.LineDistance); \
-CPPUNIT_ASSERT_EQUAL(aExpected.LineStyle, aActual.LineStyle); \
-CPPUNIT_ASSERT_EQUAL(aExpected.LineWidth, aActual.LineWidth); \
-CPPUNIT_ASSERT_EQUAL(aExpected.OuterLineWidth, aActual.OuterLineWidth);
/// Base class for filter tests loading or roundtriping a document, then
asserting the document model.
class SwModelTestBase : public test::BootstrapFixture, public
unotest::MacrosTest
@@ -366,4 +359,19 @@ protected:
sal_uInt32 m_nStartTime;
};
+inline void assertBorderEqual(
+const table::BorderLine2 rExpected, const table::BorderLine2 rActual,
+const CppUnit::SourceLine rSourceLine )
+{
+CPPUNIT_NS::assertEqualsutil::Color( rExpected.Color, rActual.Color,
rSourceLine, different Color );
+CPPUNIT_NS::assertEqualssal_Int16( rExpected.InnerLineWidth,
rActual.InnerLineWidth, rSourceLine, different InnerLineWidth );
+CPPUNIT_NS::assertEqualssal_Int16( rExpected.OuterLineWidth,
rActual.OuterLineWidth, rSourceLine, different OuterLineWidth );
+CPPUNIT_NS::assertEqualssal_Int16( rExpected.LineDistance,
rActual.LineDistance, rSourceLine, different LineDistance );
+CPPUNIT_NS::assertEqualssal_Int16( rExpected.LineStyle,
rActual.LineStyle, rSourceLine, different LineStyle );
+CPPUNIT_NS::assertEqualssal_Int32( rExpected.LineWidth,
rActual.LineWidth, rSourceLine, different LineWidth );
+}
+
+#define CPPUNIT_ASSERT_BORDER_EQUAL(aExpected, aActual) \
+assertBorderEqual( aExpected, aActual, CPPUNIT_SOURCELINE() ) \
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/qa/extras/odfexport/odfexport.cxx
b/sw/qa/extras/odfexport/odfexport.cxx
index 35d51fe..437d2c2
[Libreoffice-commits] core.git: sw/qa unusedcode.easy
sw/qa/extras/ooxmlexport/ooxmlexport.cxx |6 +++---
unusedcode.easy |1 -
2 files changed, 3 insertions(+), 4 deletions(-)
New commits:
commit 7cb5537be8836652ea4dc6f63f17dc773d0feeba
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Sep 10 09:36:07 2013 +0200
CppunitTest_sw_ooxmlexport: do not build failing testcase
Change-Id: Iec2db10104e79406cb2b9b6bac81d64dbe597d8d
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 298c10e..66b3935 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -70,7 +70,7 @@ public:
void testTableBorders();
void testFdo51550();
void testN789482();
-void test1Table1Page();
+//void test1Table1Page();
void testTextFrames();
void testTextFrameBorders();
void testTextframeGradient();
@@ -640,7 +640,7 @@ void Test::testN789482()
getRun(xParagraph, 5, After.);
}
-void Test::test1Table1Page()
+/*void Test::test1Table1Page()
{
// 2 problem for this document after export:
// - invalid sectPr inserted at the beginning of the page
@@ -650,7 +650,7 @@ void Test::test1Table1Page()
uno::Referencetext::XPageCursor
xCursor(xTextViewCursorSupplier-getViewCursor(), uno::UNO_QUERY);
xCursor-jumpToLastPage();
CPPUNIT_ASSERT_EQUAL(sal_Int16(1), xCursor-getPage());
-}
+}*/
void Test::testTextFrames()
{
diff --git a/unusedcode.easy b/unusedcode.easy
index de647fb..2b6498b 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -69,7 +69,6 @@ SvtAccessibilityOptions::SetListBoxMaximumLineCount(short)
SvtAccessibilityOptions::SetPreviewUsesCheckeredBackground(unsigned char)
SvxNumRule::Create(SvStream)
SvxNumberFormat::Create(SvStream)
-Test::test1Table1Page()
TextEngine::GetLeftMargin() const
ThumbnailView::DeselectItem(unsigned short)
ThumbnailView::GetItemText(unsigned short) const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/Bootstrap
android/Bootstrap/Makefile.shared |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d344d46cd4cd0e4811ac5ebd01d29cc4547f7f3e Author: Tor Lillqvist t...@collabora.com Date: Tue Sep 10 10:42:33 2013 +0300 I don't think the map file is that useful to generate every time Change-Id: I15ba6f0ffc645746be8deb83bc623a340b76bda9 diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared index 5b93eea..e7c7d1f 100644 --- a/android/Bootstrap/Makefile.shared +++ b/android/Bootstrap/Makefile.shared @@ -88,7 +88,7 @@ WHOLELIBS = \ $(OBJLOCAL)/liblo-native-code.so : $(wildcard $(OUTDIR)/lib/lib*.a) native-code.cxx mkdir -p $(OBJLOCAL) - $(CXX) -Wl,-Map,liblo-native-code.map -Wl,--gc-sections -Wl,--version-script=../../Bootstrap/version.map -Wl,--no-keep-files-mapped -Wl,--no-undefined -DANDROID -DDISABLE_DYNLOADING -shared -o $(OBJLOCAL)/liblo-native-code.so -I$(SRCDIR)/include -I$(OUTDIR)/inc native-code.cxx -L$(OUTDIR)/lib $(WHOLELIBS) $(LIBS) -lgnustl_static -landroid -ljnigraphics -llog -lz + $(CXX) -Wl,--gc-sections -Wl,--version-script=../../Bootstrap/version.map -Wl,--no-keep-files-mapped -Wl,--no-undefined -DANDROID -DDISABLE_DYNLOADING -shared -o $(OBJLOCAL)/liblo-native-code.so -I$(SRCDIR)/include -I$(OUTDIR)/inc native-code.cxx -L$(OUTDIR)/lib $(WHOLELIBS) $(LIBS) -lgnustl_static -landroid -ljnigraphics -llog -lz $(SODEST)/liblo-native-code.so : $(OBJLOCAL)/liblo-native-code.so mkdir -p $(SODEST) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - dbaccess/CppunitTest_dbaccess_firebird_test.mk dbaccess/Module_dbaccess.mk dbaccess/qa
dbaccess/CppunitTest_dbaccess_firebird_test.mk | 67 +++
dbaccess/Module_dbaccess.mk |3
dbaccess/qa/unit/data/firebird_empty.odb |binary
dbaccess/qa/unit/data/firebird_integer_x64le.odb |binary
dbaccess/qa/unit/firebird.cxx| 137 +++
5 files changed, 207 insertions(+)
New commits:
commit 3f114eb4a2f3994b980aa607f2d4afc58e5aaa1d
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date: Tue Sep 10 08:35:51 2013 +0100
Implement firebird integer loading test.
This is mainly in order to determine whether the firebird ODS is safely
portable -- if testIntegerDatabase fails on non x64 / non Linux / non LE
platforms then this isn't the case.
Change-Id: I44eb7a774650cec27748b2058e9bb153f32742dc
diff --git a/dbaccess/qa/unit/data/firebird_integer_x64le.odb
b/dbaccess/qa/unit/data/firebird_integer_x64le.odb
new file mode 100644
index 000..da2ec14
Binary files /dev/null and b/dbaccess/qa/unit/data/firebird_integer_x64le.odb
differ
diff --git a/dbaccess/qa/unit/firebird.cxx b/dbaccess/qa/unit/firebird.cxx
index c1a72ff..fb8234d 100644
--- a/dbaccess/qa/unit/firebird.cxx
+++ b/dbaccess/qa/unit/firebird.cxx
@@ -14,8 +14,12 @@
#include com/sun/star/frame/XModel.hpp
#include com/sun/star/frame/Desktop.hpp
#include com/sun/star/sdb/XOfficeDatabaseDocument.hpp
+#include com/sun/star/sdbc/XColumnLocate.hpp
#include com/sun/star/sdbc/XConnection.hpp
#include com/sun/star/sdbc/XDataSource.hpp
+#include com/sun/star/sdbc/XResultSet.hpp
+#include com/sun/star/sdbc/XRow.hpp
+#include com/sun/star/sdbc/XStatement.hpp
using namespace ::com::sun::star;
using namespace ::com::sun::star::frame;
@@ -31,16 +35,17 @@ public:
virtual void setUp();
virtual void tearDown();
-/**
- * Test that we connect to the database with an empty .odb file.
- */
void testEmptyDBConnection();
+void testIntegerDatabase();
CPPUNIT_TEST_SUITE(FirebirdTest);
CPPUNIT_TEST(testEmptyDBConnection);
+CPPUNIT_TEST(testIntegerDatabase);
CPPUNIT_TEST_SUITE_END();
};
+// TODO: refactor the load file - get Connection stuff into a separate class
+
/**
* Test the loading of an empty file, i.e. the embedded database has not yet
* been initialised (as occurs when a new .odb is created and opened by base).
@@ -63,6 +68,54 @@ void FirebirdTest::testEmptyDBConnection()
CPPUNIT_ASSERT(xConnection.is());
}
+/**
+ * Test reading of integers from a known .odb to verify that the data
+ * can still be read on all systems.
+ */
+void FirebirdTest::testIntegerDatabase()
+{
+const OUString
sFileName(/dbaccess/qa/unit/data/firebird_integer_x64le.odb);
+
+uno::Reference lang::XComponent xComponent = loadFromDesktop(
+getSrcRootURL() +
sFileName);
+CPPUNIT_ASSERT(xComponent.is());
+
+uno::Reference XOfficeDatabaseDocument xDocument(xComponent, UNO_QUERY);
+CPPUNIT_ASSERT(xDocument.is());
+
+uno::Reference XDataSource xDataSource = xDocument-getDataSource();
+CPPUNIT_ASSERT(xDataSource.is());
+
+uno::Reference XConnection xConnection =
xDataSource-getConnection(,);
+CPPUNIT_ASSERT(xConnection.is());
+
+uno::Reference XStatement xStatement = xConnection-createStatement();
+CPPUNIT_ASSERT(xStatement.is());
+
+uno::Reference XResultSet xResultSet = xStatement-executeQuery(
+SELECT * FROM TESTTABLE);
+CPPUNIT_ASSERT(xResultSet.is());
+CPPUNIT_ASSERT(xResultSet-next());
+
+uno::Reference XRow xRow(xResultSet, UNO_QUERY);
+CPPUNIT_ASSERT(xRow.is());
+uno::Reference XColumnLocate xColumnLocate(xRow, UNO_QUERY);
+CPPUNIT_ASSERT(xColumnLocate.is());
+
+CPPUNIT_ASSERT(sal_Int16(-3) ==
+xRow-getShort(xColumnLocate-findColumn(_SMALLINT)));
+CPPUNIT_ASSERT(sal_Int32(-21) ==
+xRow-getInt(xColumnLocate-findColumn(_INT)));
+CPPUNIT_ASSERT(sal_Int64(-900) ==
+xRow-getLong(xColumnLocate-findColumn(_BIGINT)));
+CPPUNIT_ASSERT(OUString(5) ==
+xRow-getString(xColumnLocate-findColumn(_CHAR)));
+CPPUNIT_ASSERT(OUString(5) ==
+xRow-getString(xColumnLocate-findColumn(_VARCHAR)));
+
+CPPUNIT_ASSERT(!xResultSet-next()); // Should only be one row
+}
+
void FirebirdTest::setUp()
{
::test::BootstrapFixture::setUp();
commit 65fc052b89b029ad1e853a139f6b3817ac24452a
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date: Sat Sep 7 17:32:20 2013 +0100
Add simple embedded firebird .odb loading test.
This opens an empty firebird-based .odb and tests that it is possible
for the firebird-sdbc driver to open the embedded database.
empty denotes that the .odb is marked as using embedded firebird
but doesn't in fact contain any .fdb file within. This is usual state
of a .odb directly after creation using the New Database dialog when
the sdbc driver first
[Libreoffice-commits] core.git: dbaccess/CppunitTest_dbaccess_firebird_test.mk
dbaccess/CppunitTest_dbaccess_firebird_test.mk |2 ++ 1 file changed, 2 insertions(+) New commits: commit da8d7533f8547f57476a69849331c6c1781ce326 Author: Andrzej J.R. Hunt andr...@ahunt.org Date: Tue Sep 10 08:56:08 2013 +0100 Try to fix Mac/Win Tinderboxes. Change-Id: Ibfd017c23cf510bf481d60b1e836654fd7240df0 diff --git a/dbaccess/CppunitTest_dbaccess_firebird_test.mk b/dbaccess/CppunitTest_dbaccess_firebird_test.mk index c91bdb7..92c6083 100644 --- a/dbaccess/CppunitTest_dbaccess_firebird_test.mk +++ b/dbaccess/CppunitTest_dbaccess_firebird_test.mk @@ -9,6 +9,8 @@ $(eval $(call gb_CppunitTest_CppunitTest,dbaccess_firebird_test)) +$(eval $(call gb_CppunitTest_use_external,basic_coverage,boost_headers)) + $(eval $(call gb_CppunitTest_add_exception_objects,dbaccess_firebird_test, \ dbaccess/qa/unit/firebird \ )) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/CppunitTest_dbaccess_firebird_test.mk
dbaccess/CppunitTest_dbaccess_firebird_test.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8dc5941064c50fe0a61490e274d61eccb43fd089 Author: Andrzej J.R. Hunt andr...@ahunt.org Date: Tue Sep 10 09:05:04 2013 +0100 Fix typo. Change-Id: I34df96334478b10f151e630188f45e6ce0487f1a diff --git a/dbaccess/CppunitTest_dbaccess_firebird_test.mk b/dbaccess/CppunitTest_dbaccess_firebird_test.mk index 92c6083..3f5df09 100644 --- a/dbaccess/CppunitTest_dbaccess_firebird_test.mk +++ b/dbaccess/CppunitTest_dbaccess_firebird_test.mk @@ -9,7 +9,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,dbaccess_firebird_test)) -$(eval $(call gb_CppunitTest_use_external,basic_coverage,boost_headers)) +$(eval $(call gb_CppunitTest_use_external,dbaccess_firebird_test,boost_headers)) $(eval $(call gb_CppunitTest_add_exception_objects,dbaccess_firebird_test, \ dbaccess/qa/unit/firebird \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [ANN] feature/instdir pushed to master
On Mon, Sep 09, 2013 at 10:18:32PM +0200, Michael Stahl wrote: i've just pushed Matúš' feature/instdir branch to master, which makes the instdir an actually runnable office installation. ... and there was much rejoicing! Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - android/CustomTarget_android_desktop.mk android/CustomTarget_docloader.mk android/CustomTarget_lo4android.mk android/experimental android/Module_android.mk
android/CustomTarget_android_desktop.mk |6 ++---
android/CustomTarget_docloader.mk | 37
android/CustomTarget_lo4android.mk | 15 ++--
android/Module_android.mk |1
android/experimental/desktop/Makefile | 20 -
5 files changed, 20 insertions(+), 59 deletions(-)
New commits:
commit be4b57b6da08231635f843529fed6fa53c931d02
Author: Tor Lillqvist t...@collabora.com
Date: Tue Sep 10 11:35:20 2013 +0300
Copy some stuff from INSTDIR, not OUTDIR
Some of it is not in OUTDIR at all any more.
Change-Id: I1afbaafa0fe5a355158b44fcafd3d3e190fce79c
diff --git a/android/experimental/desktop/Makefile
b/android/experimental/desktop/Makefile
index 4d4fe6d..25cc0fb 100644
--- a/android/experimental/desktop/Makefile
+++ b/android/experimental/desktop/Makefile
@@ -114,7 +114,7 @@ copy-stuff:
# Pieces not from DocumentLoader
# tango artwork / icons
mkdir -p assets/share/config
- cp -R $(OUTDIR)/bin/images_tango.zip assets/share/config
+ cp -R $(INSTDIR)/$(LIBO_SHARE_FOLDER)/config/images_tango.zip
assets/share/config
# shell / splash images
mkdir -p assets/program
cp -r $(SRC_ROOT)/icon-themes/galaxy/brand/* assets/program
@@ -142,15 +142,15 @@ setup-jars:
#
# Copy jar files we need
#
- for F in $(strip \
- java_uno \
- juh \
- jurt \
- ridl \
- unoil \
- unoloader \
- ); do \
- $(call COPYJAR,$(OUTDIR)/bin/$${F}.jar); \
+ for F in java_uno \
+juh \
+jurt \
+ridl \
+unoloader; do \
+ $(call COPYJAR,$(INSTDIR)/$(LIBO_URE_SHARE_JAVA_FOLDER)/$${F}.jar);
\
+ done
+ for F in unoil; do \
+ $(call COPYJAR,$(INSTDIR)/$(LIBO_SHARE_JAVA_FOLDER)/$${F}.jar); \
done
build-ant: android_version_setup copy-stuff link-so properties setup-jars
commit 3b9f9a5a4baa06607110db644eff3af146802326
Author: Tor Lillqvist t...@collabora.com
Date: Tue Sep 10 11:25:00 2013 +0300
Don't bother building the DocumentLoader Android app every time
Change-Id: I90a96420c3261ce14f337dae3dfddfc01ac2436e
diff --git a/android/CustomTarget_android_desktop.mk
b/android/CustomTarget_android_desktop.mk
index a1e12d7..1bb0446 100644
--- a/android/CustomTarget_android_desktop.mk
+++ b/android/CustomTarget_android_desktop.mk
@@ -17,9 +17,9 @@ $(call gb_CustomTarget_get_target,android/desktop) : \
# in Module_android.mk, so lo4android_DIR is defined. We want that to
# be built completely first, so that we can serialize Ant access to
# Bootstrap and abs-lib, which are used by Desktop (this makefile),
-# LibreOffice4Android, DocumentLoader and sdremote. We don't want one
-# Ant to be cleaning out one place while another is building stuff
-# that depends on it. Yeah, this sucks
+# LibreOffice4Android and sdremote. We don't want one Ant to be
+# cleaning out one place while another is building stuff that depends
+# on it. Yeah, this sucks
$(android_desktop_DIR)/done : $(lo4android_DIR)/done
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,2)
diff --git a/android/CustomTarget_docloader.mk
b/android/CustomTarget_docloader.mk
deleted file mode 100644
index badcabd..000
--- a/android/CustomTarget_docloader.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-$(eval $(call gb_CustomTarget_CustomTarget,android/docloader))
-
-docloader_DIR := $(call
gb_CustomTarget_get_workdir,android/experimental/DocumentLoader)
-
-$(call gb_CustomTarget_get_target,android/docloader) : \
- $(docloader_DIR)/done
-
-# We know that CustomTarget_sdremote.mk is included first, so
-# sdremote_DIR is defined. We want that to be built completely first,
-# so that we can serialize Ant access to Bootstrap, which is used both
-# by DocumentLoader and sdremote. We don't want one Ant to be cleaning
-# out Bootstrap while another is building stuff that depends on it.
-# Yeah, this sucks
-
-$(docloader_DIR)/done : $(sdremote_DIR)/done $(call
gb_Postprocess_get_target,AllModulesButInstsetNative)
- $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,2)
- cd $(SRCDIR)/android/experimental/DocumentLoader $(MAKE) all
-# If SRCDIR==BUILDDIR, copy to $(SRCDIR)/instsetoo_native/$(INPATH)/bin as
that is where the tinderbox build script
-# still looks for the .apk, and we want fresh daily builds to be uploaded.
- if test $(SRCDIR) = $(BUILDDIR); then \
- mkdir -p
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Michael Meeks michael.me...@collabora.com changed: What|Removed |Added Depends on|51976 | -- 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 54157] LibreOffice 4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Michael Meeks michael.me...@collabora.com changed: What|Removed |Added Depends on||51976 -- 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 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Michael Meeks michael.me...@collabora.com changed: What|Removed |Added Depends on|33302 | -- 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 54157] LibreOffice 4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Michael Meeks michael.me...@collabora.com changed: What|Removed |Added Depends on||33302 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: minutes of ESC call ...
On Tue, 2013-09-10 at 00:37 +0200, bjoern wrote: * Bibisected bugs open: whiteboard 'bibsected' + 35/140 36/167 37/137 41/137 33/128 33/125 34/124 34/123 36/122 38/119 + http://bit.ly/VQfF3Q Dumb question: Whats that second number on the bibisected bugs stats, btw ? As with the MAB; it is open vs. total. So in the last week 27 bibisected bugs (either open or closed) where eaten by a grue? (167 - 140) I guess so ;-) or bugzilla changed in some way, or someone went on a rampage removing the 'bibisect' keyword (or whatever). The stats are generated by: dev-tools/scripts/esc-bug-stats.pl It's not the most beautiful script / approach in the world but - it produces a consistent, and longer-term series (of whatever merit) and is automated = saving me a lot of time ;-) Improvements to the script [ that don't break the historic series for bugs etc. ] appreciated :-) HTH, Michael. -- michael.me...@collabora.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
OpenOffice and AppData files
Hi all. I'm the developer for PackageKit and gnome-software. The community has already written a set of LibreOffice AppData files for Fedora, would you be interested to including them upstream? This will allow us to feature LibreOffice on the front page in the future. See http://people.freedesktop.org/~hughsient/appdata/ for more details about AppStream and AppData. So far hundred of upstream projects have included AppData files in their tarballs. The files are here: https://raw.github.com/hughsie/fedora-appstream/master/appdata-extra/libreoffice-writer.appdata.xml https://raw.github.com/hughsie/fedora-appstream/master/appdata-extra/libreoffice-base.appdata.xml https://raw.github.com/hughsie/fedora-appstream/master/appdata-extra/libreoffice-calc.appdata.xml https://raw.github.com/hughsie/fedora-appstream/master/appdata-extra/libreoffice-draw.appdata.xml https://raw.github.com/hughsie/fedora-appstream/master/appdata-extra/libreoffice-impress.appdata.xml But I'm sure these need checking and perhaps needs some more filling in. If you've got any questions, please don't hesitate to ask. Thanks! Richard. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: configmgr/Library_configmgr.mk configmgr/source scp2/source
configmgr/Library_configmgr.mk|5 -
configmgr/source/components.cxx | 23 -
configmgr/source/winreg.cxx | 174 ++
configmgr/source/winreg.hxx | 22
configmgr/source/writemodfile.cxx |5 -
configmgr/source/writemodfile.hxx |4
scp2/source/ooo/common_brand.scp |4
7 files changed, 230 insertions(+), 7 deletions(-)
New commits:
commit 5a02076358a547bae8a9b596d9722a7cd2d46c34
Author: Janos Farago farago.ja...@andrews.hu
Date: Tue Sep 3 09:42:44 2013 +0200
Windows registry configuration backend
The goal is to manage LibreOffice configuration centrally
in the enterprise. In Windows Server environment using
Group Policies is a common solution for configuration
management. Therefore it is required that LibreOffice can
read configuration data from Windows registry, too.
Windows registry is another configuration layer on the
top of normal xml based configuration.
For example the following registry setting:
[HKEY_LOCAL_MACHINE\SOFTWARE\Policies\LibreOffice\org.openoffice.UserProfile\Data\o]
Value=Example Corp.
Final=dword:0001
becomes the following in configuration:
item oor:path=/org.openoffice.UserProfile/Data
prop oor:name=o oor:finalized=true
valueExample Corp./value
/prop
/item
Change-Id: I2cdd83fc93922bf2806417bfd1b83f85cc926d4c
Signed-off-by: Stephan Bergmann sberg...@redhat.com
diff --git a/configmgr/Library_configmgr.mk b/configmgr/Library_configmgr.mk
index 791782d..2243350 100644
--- a/configmgr/Library_configmgr.mk
+++ b/configmgr/Library_configmgr.mk
@@ -36,6 +36,7 @@ $(eval $(call gb_Library_add_exception_objects,configmgr, \
configmgr/source/type \
configmgr/source/update \
configmgr/source/valueparser \
+$(if $(filter $(OS),WNT), configmgr/source/winreg ) \
configmgr/source/writemodfile \
configmgr/source/xcdparser \
configmgr/source/xcsparser \
@@ -54,8 +55,8 @@ $(eval $(call gb_Library_use_libraries,configmgr, \
sal \
salhelper \
xmlreader \
- i18nlangtag \
- $(gb_UWINAPI) \
+i18nlangtag \
+$(gb_UWINAPI) \
))
$(eval $(call
gb_Library_set_componentfile,configmgr,configmgr/source/configmgr))
diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index 4a1b719..b5b38b5 100644
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -66,6 +66,9 @@
#include xcdparser.hxx
#include xcuparser.hxx
#include xcsparser.hxx
+#ifdef WNT
+#include winreg.hxx
+#endif
namespace configmgr {
@@ -541,7 +544,25 @@ Components::Components(
}
modificationFileUrl_ = url;
parseModificationLayer(url);
-} else {
+}
+#ifdef WNT
+else if ( type == winreg )
+{
+if (!url.isEmpty()) {
+SAL_WARN(
+configmgr,
+winreg URL is not empty, URL handling is not implemented
for winreg);
+}
+OUString aTempFileURL;
+if ( dumpWindowsRegistry(aTempFileURL) )
+{
+parseFileLeniently(parseXcuFile, aTempFileURL, layer, data_,
0, 0, 0);
+layer++;
+osl::File::remove(aTempFileURL);
+}
+}
+#endif
+else {
throw css::uno::RuntimeException(
CONFIGURATION_LAYERS: unknown layer type \ + type + \,
css::uno::Reference css::uno::XInterface ());
diff --git a/configmgr/source/winreg.cxx b/configmgr/source/winreg.cxx
new file mode 100644
index 000..b68b9d2
--- /dev/null
+++ b/configmgr/source/winreg.cxx
@@ -0,0 +1,174 @@
+/* -*- 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 cwchar
+#ifdef _MSC_VER
+#pragma warning(push, 1) /* disable warnings within system headers */
+#endif
+#define WIN32_LEAN_AND_MEAN
+#include windows.h
+#include msiquery.h
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
+#include com/sun/star/uno/Any.hxx
+#include com/sun/star/uno/Reference.hxx
+#include com/sun/star/uno/RuntimeException.hpp
+#include com/sun/star/uno/Sequence.hxx
+#include com/sun/star/uno/XInterface.hpp
+#include rtl/ustring.hxx
+#include osl/file.h
+#include osl/file.hxx
+#include winreg.hxx
+#include writemodfile.hxx
+
+#define MAX_KEY_LENGTH 255
+
+namespace configmgr {
+
+namespace {
+// This is not a generic registry reader. We assume the following structure:
+// Last element of Key becomes prop, first part is the path.
+// Values can be the following: Value (string) and Final (dword, optional)
+// For example the
Re: minutes of ESC call ...
Hi, On Tue, Sep 10, 2013 at 09:56:57AM +0100, Michael Meeks wrote: I guess so ;-) or bugzilla changed in some way, or someone went on a rampage removing the 'bibisect' keyword (or whatever). The stats are generated by: dev-tools/scripts/esc-bug-stats.pl Hmm, looks sane to me -- still wonder what happened to the total. Improvements to the script [ that don't break the historic series for bugs etc. ] appreciated :-) FWIW, I had a bibisected charting query sometime ago, you find it in bugzilla-reports-new charts and then select the LibreOffice-LibreOffice-bibsected-unresolved. I just added a bibisected-total there too, so one can now get these as extremely ugly plots out of bugzilla itself (on a positive note, you can also download the history as CSV there). Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] dev-tools.git: 2 commits - scripts/esc-bug-stats.pl
scripts/esc-bug-stats.pl | 13 ++---
1 file changed, 10 insertions(+), 3 deletions(-)
New commits:
commit 072933624f42e007b017667517cf72c765ccfc52
Author: Michael Meeks michael.me...@collabora.com
Date: Tue Sep 10 10:46:58 2013 +0100
3.6 open MAB should have no data in future.
diff --git a/scripts/esc-bug-stats.pl b/scripts/esc-bug-stats.pl
index bbd823f..7bc1501 100755
--- a/scripts/esc-bug-stats.pl
+++ b/scripts/esc-bug-stats.pl
@@ -262,7 +262,7 @@ print EOF
/table:table-cell
table:table-cell/
table:table-cell table:formula=of:=[.L2]-[.B2]
office:value-type=float calcext:value-type=float/
- table:table-cell office:value-type=float
office:value=$ver_open{'3.6'} calcext:value-type=float/
+ table:table-cell/
table:table-cell table:formula=of:=[.M2]-[.D2]
office:value-type=float calcext:value-type=float/
table:table-cell office:value-type=float
office:value=$ver_open{'4.0'} calcext:value-type=float/
table:table-cell table:formula=of:=[.N2]-[.F2]
office:value-type=float calcext:value-type=float/
commit 29ccb8460750008351b49956dbae3d579c3c8608
Author: Michael Meeks michael.me...@collabora.com
Date: Tue Sep 10 09:44:44 2013 +0100
parse some more bugzilla edge cases.
diff --git a/scripts/esc-bug-stats.pl b/scripts/esc-bug-stats.pl
index 9375352..bbd823f 100755
--- a/scripts/esc-bug-stats.pl
+++ b/scripts/esc-bug-stats.pl
@@ -32,9 +32,13 @@ sub get_deps($)
my $bug_count = -1;
while (my $line = shift (@bugs)) {
- if ($line =~ m/^\s*depends on\s*$/) {
+ if ($line =~ m/does not depend on any open bugs/) {
+ $bug_count = 0;
+ last;
+ }
+ elsif ($line =~ m/^\s*depends on\s*$/) {
$line = shift @bugs;
-# print STDERR Have depends on\n;
+# print STDERR Have depends on '$line'\n;
if ($line =~ m/^\s*(\d+)\s*$/) {
my $num = $1;
$line = shift @bugs;
@@ -43,6 +47,9 @@ sub get_deps($)
$bug_count = $num;
last;
}
+ } elsif ($line =~ m/\s+one\s+/) { # special case for one
+ $bug_count = 1;
+ last;
} else {
print STDERR odd depends on follow-on: '$line'\n;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Please regenerate api.libreoffice.org from libreoffice-4-1 branch
Hi, On Monday, 2013-09-09 10:38:16 +0200, Lionel Elie Mamane wrote: Actually, it could make sense to document the API available in each version, that is, have something like: http://api.libreoffice.org/docs/3.3/idl/ http://api.libreoffice.org/docs/3.6/idl/ http://api.libreoffice.org/docs/4.0/idl/ http://api.libreoffice.org/docs/4.1/idl/ http://api.libreoffice.org/docs/4.2/idl/ http://api.libreoffice.org/docs/current/idl/ Ditto for doc/cpp, etc. Since we are breaking ~all deep links anyway, now is as good a time as ever to switch to such a scheme. I favour this one, it preserves all information and gives the user a chance to compare changes. For future releases when the doxygen changes will have calmed down we could even generate diffs between versions. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A For key transition see http://erack.de/key-transition-2013-01-10.txt.asc Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgpjAEbzz52Um.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - avmedia/source Repository.mk
Repository.mk |2 +-
avmedia/source/vlc/vlcmanager.cxx | 13 -
avmedia/source/vlc/vlcuno.cxx |4 ++--
3 files changed, 15 insertions(+), 4 deletions(-)
New commits:
commit a3b56a9b963189cb22e7d34e87f860412ed3332f
Author: Michael Meeks michael.me...@collabora.com
Date: Tue Sep 10 10:57:49 2013 +0100
avmedia: vlc - cleanup debug churn.
Change-Id: Id0a3e0ecb49b11e119188b6ccce04269917442b8
diff --git a/avmedia/source/vlc/vlcmanager.cxx
b/avmedia/source/vlc/vlcmanager.cxx
index 4179ce2..1c7c645 100644
--- a/avmedia/source/vlc/vlcmanager.cxx
+++ b/avmedia/source/vlc/vlcmanager.cxx
@@ -1,3 +1,12 @@
+/* -*- 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 boost/algorithm/string.hpp
#include boost/lexical_cast.hpp
#include vlcmanager.hxx
@@ -43,7 +52,6 @@ Manager::Manager( const uno::Reference
lang::XMultiServiceFactory rxMgr )
std::vectorstd::string verComponents;
const std::string str(Common::Version());
-std::cout str std::endl;
boost::split(verComponents,
str,
boost::is_any_of(. ));
@@ -52,8 +60,11 @@ Manager::Manager( const uno::Reference
lang::XMultiServiceFactory rxMgr )
|| (boost::lexical_castint(verComponents[1]) == 0
boost::lexical_castint(verComponents[2]) 8))
{
+SAL_WARN(avmedia, VLC version ' str ' is too old);
m_is_vlc_found = false;
}
+else
+SAL_INFO(avmedia, VLC version ' str ' is acceptable);
}
if (m_is_vlc_found)
diff --git a/avmedia/source/vlc/vlcuno.cxx b/avmedia/source/vlc/vlcuno.cxx
index d41b2df..312b85a 100644
--- a/avmedia/source/vlc/vlcuno.cxx
+++ b/avmedia/source/vlc/vlcuno.cxx
@@ -27,7 +27,7 @@ using namespace ::com::sun::star;
static uno::Reference uno::XInterface SAL_CALL create_MediaPlayer( const
uno::Reference lang::XMultiServiceFactory rxFact )
{
-fprintf (stderr, create VLC Media player !\n);
+SAL_INFO(avmedia, create VLC Media player !\n);
static uno::Reference uno::XInterface manager( *new
::avmedia::vlc::Manager( rxFact ) );
return manager;
}
@@ -37,7 +37,7 @@ extern C SAL_DLLPUBLIC_EXPORT void* SAL_CALL
avmediavlc_component_getFactory(
uno::Reference lang::XSingleServiceFactory xFactory;
void* pRet = 0;
-fprintf (stderr, Create VLC Media component: '%s'\n, pImplName);
+SAL_INFO(avmedia, Create VLC Media component: ' pImplName '\n);
if( rtl_str_compare( pImplName, IMPL_NAME ) == 0 )
{
const OUString aServiceName( SERVICE_NAME );
commit d8655d03583a775f9cf986e053b67032b6d433e0
Author: Michael Meeks michael.me...@collabora.com
Date: Tue Sep 10 10:57:25 2013 +0100
tubes: auto-package DSO as part of calc.
Change-Id: Iee3005e9a7bc97d491012eb0c81c9f8e49d423c7
diff --git a/Repository.mk b/Repository.mk
index df62e78..cff654b 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -156,6 +156,7 @@ $(eval $(call
gb_Helper_register_libraries_for_install,OOOLIBS,calc, \
scui \
solver \
$(if $(DISABLE_SCRIPTING),,vbaobj) \
+ $(if $(ENABLE_TELEPATHY),tubes) \
))
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,graphicfilter, \
@@ -332,7 +333,6 @@ $(eval $(call
gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
textfd \
tk \
tl \
- $(if $(ENABLE_TELEPATHY),tubes) \
ucpexpand1 \
ucpext \
ucpcmis1 \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
GSOC - VLC bits ...
i there, Great to play with the latest work; it seems seeking works reasonably well, but there are some quite grim lifecycle issues around the place; also getting parenting right of the X window under X seems intermittent. + audio during keyframe capture + sadly we have synchronous keyframe fetch, which means starting / loading flying_boy.odp I get a hang during which music plays ;-) before I get the keyframe. + intermittent play in a separate window + clean re-start / load flying_boy.odp sometimes it pops out. + provoke it with: + F9 to present: no video shows / plays + after F9 - playing video pops it out to a separate window + F9 to present: should render the video ... :-) + I see ~nothing - not even a grey box. + grey X window with no content obscuring the video preview / keyframe. + I -guess- that this is an un-rendered X window occluding the preview + Deleting a playing video + audio carries on playing in the background :-) I guess it'd be really good to get some of these fixed; clearly the priority is Windows here not Linux, but it'd be nice to get this lot working on Linux too for debugging purposes etc. I pushed some debug cleanup pieces to master too. Thanks ! Michael. -- michael.me...@collabora.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Makefile.in solenv/bin solenv/Module_solenv.mk solenv/Package_gdb_install.mk solenv/Package_gdb.mk
Makefile.in |3 +++ solenv/Module_solenv.mk |1 - solenv/Package_gdb.mk | 22 +- solenv/Package_gdb_install.mk | 27 --- solenv/bin/install-gdb-printers | 11 +-- 5 files changed, 21 insertions(+), 43 deletions(-) New commits: commit f44f94b95b435ee0ec71c73133daeb88cd2539b1 Author: Matúš Kukan matus.ku...@gmail.com Date: Tue Sep 10 11:37:16 2013 +0200 fix gdb pretty printers for --enable-mergelibs And install them into $(INSTDIR) at the end of build, as it is done in dev-install case. Change-Id: I1a9852684361a12333046fa58f83720aa2c835da diff --git a/Makefile.in b/Makefile.in index f1d5b37..5598af4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -230,6 +230,9 @@ bootstrap: compilerplugins # build: bootstrap fetch $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-toolset) $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild +ifneq ($(filter-out WNT MACOSX IOS ANDROID,$(OS)),) + install-gdb-printers -a $(INSTDIR) +endif ifeq ($(OS),IOS) $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) ios endif diff --git a/solenv/Module_solenv.mk b/solenv/Module_solenv.mk index c3c1386..4e78021 100644 --- a/solenv/Module_solenv.mk +++ b/solenv/Module_solenv.mk @@ -26,7 +26,6 @@ ifneq ($(filter-out WNT IOS ANDROID,$(OS)),) $(eval $(call gb_Module_add_targets,solenv,\ CustomTarget_gdb \ Package_gdb \ - Package_gdb_install \ )) endif diff --git a/solenv/Package_gdb.mk b/solenv/Package_gdb.mk index aced144..ab086f2 100644 --- a/solenv/Package_gdb.mk +++ b/solenv/Package_gdb.mk @@ -9,21 +9,25 @@ $(eval $(call gb_Package_Package,solenv_gdb,$(call gb_CustomTarget_get_workdir,solenv/gdb))) +# keep in sync with solenv/bin/install-gdb-printers $(eval $(call gb_Package_add_files,solenv_gdb,lib,\ $(if $(MERGELIBS), \ - $(if $(filter ALL,$(MERGELIBS)), \ - $(call gb_Library_get_runtime_filename,urelibs)-gdb.py, \ + $(call gb_Library_get_runtime_filename,merged)-gdb.py \ + $(if $(filter ALL,$(MERGELIBS)), \ + $(call gb_Library_get_runtime_filename,urelibs)-gdb.py \ + , \ + $(call gb_Library_get_runtime_filename,cppu).3-gdb.py \ + $(call gb_Library_get_runtime_filename,sal).3-gdb.py \ + $(call gb_Library_get_runtime_filename,sw)-gdb.py \ + ) \ + , \ + $(call gb_Library_get_runtime_filename,basegfx).3-gdb.py \ $(call gb_Library_get_runtime_filename,cppu).3-gdb.py \ $(call gb_Library_get_runtime_filename,sal).3-gdb.py \ + $(call gb_Library_get_runtime_filename,svl)-gdb.py \ $(call gb_Library_get_runtime_filename,sw)-gdb.py \ - $(call gb_Library_get_runtime_filename,writerfilter)-gdb.py \ + $(call gb_Library_get_runtime_filename,tl)-gdb.py \ ) \ - $(call gb_Library_get_runtime_filename,merged)-gdb.py, \ - $(call gb_Library_get_runtime_filename,cppu).3-gdb.py \ - $(call gb_Library_get_runtime_filename,sal).3-gdb.py \ - $(call gb_Library_get_runtime_filename,svl)-gdb.py \ - $(call gb_Library_get_runtime_filename,sw)-gdb.py \ - $(call gb_Library_get_runtime_filename,tl)-gdb.py) \ $(call gb_Library_get_runtime_filename,writerfilter)-gdb.py \ )) diff --git a/solenv/Package_gdb_install.mk b/solenv/Package_gdb_install.mk deleted file mode 100644 index af67cb5..000 --- a/solenv/Package_gdb_install.mk +++ /dev/null @@ -1,27 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_Package_Package,solenv_gdb_install,$(call gb_CustomTarget_get_workdir,solenv/gdb))) - -$(eval $(call gb_Package_set_outdir,solenv_gdb_install,$(INSTDIR))) - -$(eval $(call gb_Package_add_files,solenv_gdb_install,$(gb_PROGRAMDIRNAME),\ - $(call gb_Library_get_runtime_filename,svl)-gdb.py \ - $(call gb_Library_get_runtime_filename,sw)-gdb.py \ - $(call gb_Library_get_runtime_filename,tl)-gdb.py \ -)) - -$(eval $(call gb_Package_add_files,solenv_gdb_install,ure/lib,\ - $(call gb_Library_get_runtime_filename,cppu).3-gdb.py \ - $(call gb_Library_get_runtime_filename,sal).3-gdb.py \ -)) - -$(eval $(call gb_Package_use_custom_target,solenv_gdb_install,solenv/gdb)) - -# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/solenv/bin/install-gdb-printers b/solenv/bin/install-gdb-printers index 4125fe5..4c2aa39 100755 --- a/solenv/bin/install-gdb-printers +++ b/solenv/bin/install-gdb-printers @@ -156,25
Re: Gerrit migration
Hi, just as a short reminder for tomorrow evening (European time), when we do the migration - this is what is missing and where we need your help with. Theming and SSL cert can be fixed from infra side, for the rest your help is appreciated as soon as the new VM is up. Florian Bjoern Michaelsen wrote on 2013-07-18 15:26: So, I did a quick check of basic operations: - website is working - check - LibreOffice theming is missing (not mission critical) - gitweb is missing (not mission critical) - SSL cert warning - sign in with OpenID - check - ssh login for git pushes - check - ACL/groups - at least some groups are missing it seems - I expect direct pushes to master not to work as-is (no group committers) - buildbot - missing it seems - admin login on box - failed - thus I cannot check if the gerritbot sending mails to the dev-list is set-up. - I havent checked where the gerritircbot is running. So the ACLs for the committer group seem mission critial to me. @Norbert: Any input on that? buildbot, gitweb, adminaccess for Bjoern (and others) to check gerritbot, check gerritircbot, theming are the remaining things in order of importance, none of those mission critical IMHO. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - dbaccess/CppunitTest_dbaccess_firebird_test.mk dbaccess/qa
dbaccess/CppunitTest_dbaccess_firebird_test.mk |1
dbaccess/qa/unit/dbtest_base.cxx | 86 +
dbaccess/qa/unit/firebird.cxx | 63 ++
3 files changed, 96 insertions(+), 54 deletions(-)
New commits:
commit e4b07b2917154d68019e37b4eadf81a8b73d666b
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date: Tue Sep 10 11:27:15 2013 +0100
Add missing component to firebird unit test.
(Windows throws an Error on this.)
Change-Id: Ica3aeac294d3a32a4faa6837309a0fb5d8d15b92
diff --git a/dbaccess/CppunitTest_dbaccess_firebird_test.mk
b/dbaccess/CppunitTest_dbaccess_firebird_test.mk
index 3f5df09..4237e0d 100644
--- a/dbaccess/CppunitTest_dbaccess_firebird_test.mk
+++ b/dbaccess/CppunitTest_dbaccess_firebird_test.mk
@@ -48,6 +48,7 @@ $(eval $(call
gb_CppunitTest_use_components,dbaccess_firebird_test,\
filter/source/config/cache/filterconfig1 \
framework/util/fwk \
i18npool/util/i18npool \
+linguistic/source/lng \
package/source/xstor/xstor \
package/util/package2 \
sax/source/expatwrap/expwrap \
commit f7383e8b58903410210ff72348636976f9229be2
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date: Tue Sep 10 10:19:26 2013 +0100
Split reusable parts of Firebird unit test into DBTestBase.
Change-Id: I6b2d131e0e4b53bb6b4cec69c5b0e99b8b9e74a7
diff --git a/dbaccess/qa/unit/dbtest_base.cxx b/dbaccess/qa/unit/dbtest_base.cxx
new file mode 100644
index 000..4b4e3a3
--- /dev/null
+++ b/dbaccess/qa/unit/dbtest_base.cxx
@@ -0,0 +1,86 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include comphelper/processfactory.hxx
+#include test/bootstrapfixture.hxx
+#include unotest/macros_test.hxx
+
+#include com/sun/star/frame/XModel.hpp
+#include com/sun/star/frame/Desktop.hpp
+#include com/sun/star/sdb/XOfficeDatabaseDocument.hpp
+#include com/sun/star/sdbc/XConnection.hpp
+#include com/sun/star/sdbc/XDataSource.hpp
+
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::frame;
+using namespace ::com::sun::star::sdb;
+using namespace ::com::sun::star::sdbc;
+using namespace ::com::sun::star::uno;
+
+class DBTestBase
+: public ::test::BootstrapFixture
+, public ::unotest::MacrosTest
+{
+private:
+static OUString our_sFilePath;
+public:
+virtual void setUp();
+virtual void tearDown();
+
+uno::Reference XOfficeDatabaseDocument
+getDocumentForFileName(OUString sFileName);
+
+uno::Reference XConnection
+getConnectionForDocument(
+uno::Reference XOfficeDatabaseDocument xDocument);
+};
+
+OUString DBTestBase::our_sFilePath(/dbaccess/qa/unit/data/);
+
+uno::Reference XOfficeDatabaseDocument
+DBTestBase::getDocumentForFileName(OUString sFileName)
+{
+uno::Reference lang::XComponent xComponent =
+loadFromDesktop(getSrcRootURL() + our_sFilePath + sFileName);
+CPPUNIT_ASSERT(xComponent.is());
+
+uno::Reference XOfficeDatabaseDocument xDocument(xComponent, UNO_QUERY);
+CPPUNIT_ASSERT(xDocument.is());
+
+return xDocument;
+}
+
+uno::Reference XConnection DBTestBase::getConnectionForDocument(
+uno::Reference XOfficeDatabaseDocument xDocument)
+{
+uno::Reference XDataSource xDataSource = xDocument-getDataSource();
+CPPUNIT_ASSERT(xDataSource.is());
+
+uno::Reference XConnection xConnection =
xDataSource-getConnection(,);
+CPPUNIT_ASSERT(xConnection.is());
+
+return xConnection;
+}
+
+
+void DBTestBase::setUp()
+{
+::test::BootstrapFixture::setUp();
+
+mxDesktop = ::com::sun::star::frame::Desktop::create(
+::comphelper::getProcessComponentContext());
+CPPUNIT_ASSERT(mxDesktop.is());
+}
+
+void DBTestBase::tearDown()
+{
+test::BootstrapFixture::tearDown();
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/qa/unit/firebird.cxx b/dbaccess/qa/unit/firebird.cxx
index fb8234d..183d83d 100644
--- a/dbaccess/qa/unit/firebird.cxx
+++ b/dbaccess/qa/unit/firebird.cxx
@@ -7,34 +7,24 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include comphelper/processfactory.hxx
-#include test/bootstrapfixture.hxx
-#include unotest/macros_test.hxx
+#include dbtest_base.cxx
-#include com/sun/star/frame/XModel.hpp
-#include com/sun/star/frame/Desktop.hpp
#include com/sun/star/sdb/XOfficeDatabaseDocument.hpp
#include com/sun/star/sdbc/XColumnLocate.hpp
#include com/sun/star/sdbc/XConnection.hpp
-#include com/sun/star/sdbc/XDataSource.hpp
#include com/sun/star/sdbc/XResultSet.hpp
#include com/sun/star/sdbc/XRow.hpp
#include com/sun/star/sdbc/XStatement.hpp
using namespace ::com::sun::star;
-using
Re: License statement
On 09/02/2013 11:07 AM, Farago Janos wrote: All of my past and future contributions to LibreOffice may be licensed under the MPL/LGPLv3+ dual license. recorded at https://wiki.documentfoundation.org/index.php?title=Development/Developersoldid=74276 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: minutes of ESC call ...
On Tue, 2013-09-10 at 11:37 +0200, bjoern wrote: FWIW, I had a bibisected charting query sometime ago, you find it in bugzilla-reports-new charts and then select the LibreOffice-LibreOffice-bibsected-unresolved. I just added a bibisected-total there too, so one can now get these as extremely ugly plots out of bugzilla itself (on a positive note, you can also download the history as CSV there). Neato :-) well - anyone that wants to do the automating of that lot and generation of pretty charts with long data series so that I don't have to is more than welcome to. Having said that - I guess investing more cycles into a dashboard / homepage for developers that shows where the fires are burning, the new MAB's etc. would prolly be a more useful investment of time. Thanks, Michael. -- michael.me...@collabora.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: solenv/Package_gdb.mk
solenv/Package_gdb.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5d486c4b8d352ebefc7d3af125864228af188756 Author: Matúš Kukan matus.ku...@gmail.com Date: Tue Sep 10 12:45:36 2013 +0200 fix typo Change-Id: If47c5d77b0f05415e5fb38e0f825474892d628dc diff --git a/solenv/Package_gdb.mk b/solenv/Package_gdb.mk index ab086f2..5c4d618 100644 --- a/solenv/Package_gdb.mk +++ b/solenv/Package_gdb.mk @@ -21,7 +21,7 @@ $(eval $(call gb_Package_add_files,solenv_gdb,lib,\ $(call gb_Library_get_runtime_filename,sw)-gdb.py \ ) \ , \ - $(call gb_Library_get_runtime_filename,basegfx).3-gdb.py \ + $(call gb_Library_get_runtime_filename,basegfx)-gdb.py \ $(call gb_Library_get_runtime_filename,cppu).3-gdb.py \ $(call gb_Library_get_runtime_filename,sal).3-gdb.py \ $(call gb_Library_get_runtime_filename,svl)-gdb.py \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configmgr/source
configmgr/source/writemodfile.cxx | 296 +++---
configmgr/source/writemodfile.hxx |1
2 files changed, 152 insertions(+), 145 deletions(-)
New commits:
commit b1e464999e387e44f0e021d52f2673c2fe7822a0
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Sep 10 13:02:15 2013 +0200
Some clean up
...post 5a02076358a547bae8a9b596d9722a7cd2d46c34 Windows registry
configuration
backend.
Change-Id: I4d27c17d4f26254bce175910a76f0076639581e8
diff --git a/configmgr/source/writemodfile.cxx
b/configmgr/source/writemodfile.cxx
index 82d6240..d42bf22 100644
--- a/configmgr/source/writemodfile.cxx
+++ b/configmgr/source/writemodfile.cxx
@@ -21,6 +21,7 @@
#include cassert
+#include boost/noncopyable.hpp
#include com/sun/star/uno/Any.hxx
#include com/sun/star/uno/Reference.hxx
#include com/sun/star/uno/RuntimeException.hpp
@@ -101,9 +102,7 @@ TempFile::~TempFile() {
}
}
-}
-
-void writeData(oslFileHandle handle, char const * begin, sal_Int32 length) {
+void writeData_(oslFileHandle handle, char const * begin, sal_Int32 length) {
assert(length = 0);
sal_uInt64 n;
if ((osl_writeFile(handle, begin, static_cast sal_uInt32 (length), n) !=
@@ -115,166 +114,83 @@ void writeData(oslFileHandle handle, char const * begin,
sal_Int32 length) {
}
}
-void writeData(oslFileHandle handle, OString const text) {
-writeData(handle, text.getStr(), text.getLength());
-}
-
-void writeAttributeValue(oslFileHandle handle, OUString const value) {
-sal_Int32 i = 0;
-sal_Int32 j = i;
-for (; j value.getLength(); ++j) {
-assert(
-value[j] == 0x0009 || value[j] == 0x000A || value[j] == 0x000D ||
-(value[j] = 0x0020 value[j] != 0xFFFE value[j] != 0x));
-switch(value[j]) {
-case '\x09':
-writeData(handle, convertToUtf8(value, i, j - i));
-writeData(handle, RTL_CONSTASCII_STRINGPARAM(#9;));
-i = j + 1;
-break;
-case '\x0A':
-writeData(handle, convertToUtf8(value, i, j - i));
-writeData(handle, RTL_CONSTASCII_STRINGPARAM(#xA;));
-i = j + 1;
-break;
-case '\x0D':
-writeData(handle, convertToUtf8(value, i, j - i));
-writeData(handle, RTL_CONSTASCII_STRINGPARAM(#xD;));
-i = j + 1;
-break;
-case '':
-writeData(handle, convertToUtf8(value, i, j - i));
-writeData(handle, RTL_CONSTASCII_STRINGPARAM(quot;));
-i = j + 1;
-break;
-case '':
-writeData(handle, convertToUtf8(value, i, j - i));
-writeData(handle, RTL_CONSTASCII_STRINGPARAM(amp;));
-i = j + 1;
-break;
-case '':
-writeData(handle, convertToUtf8(value, i, j - i));
-writeData(handle, RTL_CONSTASCII_STRINGPARAM(lt;));
-i = j + 1;
-break;
-default:
-break;
-}
-}
-writeData(handle, convertToUtf8(value, i, j - i));
-}
-
-void writeValueContent(oslFileHandle handle, sal_Bool value) {
+void writeValueContent_(oslFileHandle handle, sal_Bool value) {
if (value) {
-writeData(handle, RTL_CONSTASCII_STRINGPARAM(true));
+writeData_(handle, RTL_CONSTASCII_STRINGPARAM(true));
} else {
-writeData(handle, RTL_CONSTASCII_STRINGPARAM(false));
+writeData_(handle, RTL_CONSTASCII_STRINGPARAM(false));
}
}
-void writeValueContent(oslFileHandle handle, sal_Int16 value) {
+void writeValueContent_(oslFileHandle handle, sal_Int16 value) {
writeData(handle, OString::number(value));
}
-void writeValueContent(oslFileHandle handle, sal_Int32 value) {
+void writeValueContent_(oslFileHandle handle, sal_Int32 value) {
writeData(handle, OString::number(value));
}
-void writeValueContent(oslFileHandle handle, sal_Int64 value) {
+void writeValueContent_(oslFileHandle handle, sal_Int64 value) {
writeData(handle, OString::number(value));
}
-void writeValueContent(oslFileHandle handle, double value) {
+void writeValueContent_(oslFileHandle handle, double value) {
writeData(handle, OString::number(value));
}
-void writeValueContent(oslFileHandle handle, OUString const value) {
-sal_Int32 i = 0;
-sal_Int32 j = i;
-for (; j value.getLength(); ++j) {
-sal_Unicode c = value[j];
-if ((c 0x0020 c != 0x0009 c != 0x000A c != 0x000D) ||
-c == 0xFFFE || c == 0x)
-{
-writeData(handle, convertToUtf8(value, i, j - i));
-writeData(
-handle, RTL_CONSTASCII_STRINGPARAM(unicode oor:scalar=\));
-writeData(
-handle, OString::number(c));
-writeData(handle, RTL_CONSTASCII_STRINGPARAM(\/));
-i = j + 1;
-} else if (c == '\x0D') {
-writeData(handle, convertToUtf8(value, i, j - i));
[Libreoffice-commits] core.git: comphelper/Library_comphelper.mk comphelper/source include/comphelper officecfg/registry sd/inc sd/Package_xml.mk sd/source sd/xml test/Package_unittest.mk test/user-te
comphelper/Library_comphelper.mk |1
comphelper/source/misc/expandmacro.cxx | 59 ++
include/comphelper/expandmacro.hxx | 57 ++
officecfg/registry/schema/org/openoffice/Office/Impress.xcs| 14
sd/Package_xml.mk |1
sd/inc/drawdoc.hxx |8
sd/source/core/drawdoc.cxx | 64 +-
sd/source/core/sdpage.cxx | 271
+-
sd/xml/objectlist.xml | 56 +-
test/Package_unittest.mk |1
test/user-template/user/config/soffice.cfg/simpress/objectlist.xml | 41 +
11 files changed, 417 insertions(+), 156 deletions(-)
New commits:
commit d50bd55c5d78dc10d40be502f8d6638bcc0ce890
Author: Vishv Brahmbhatt vishvbrahmbhat...@gmail.com
Date: Wed Aug 28 01:52:17 2013 +0530
Parsing master presentation objects from 'objectlist.xml'
Parsing the property values of master presentation objects.
Also new functions added to comphelper module for expanding
filepaths macro to appropriate system file paths(for
configuration files present at 'Impress.xcs')
Change-Id: If0381a12155673e85103ddb5d51c34ae53fe2ecb
diff --git a/comphelper/Library_comphelper.mk b/comphelper/Library_comphelper.mk
index 09a6889..4b30338 100644
--- a/comphelper/Library_comphelper.mk
+++ b/comphelper/Library_comphelper.mk
@@ -86,6 +86,7 @@ $(eval $(call gb_Library_add_exception_objects,comphelper,\
comphelper/source/misc/documentiologring \
comphelper/source/misc/evtlistenerhlp \
comphelper/source/misc/evtmethodhelper \
+comphelper/source/misc/expandmacro \
comphelper/source/misc/ihwrapnofilter \
comphelper/source/misc/instancelocker \
comphelper/source/misc/interaction \
diff --git a/comphelper/source/misc/expandmacro.cxx
b/comphelper/source/misc/expandmacro.cxx
new file mode 100644
index 000..a7eae4b
--- /dev/null
+++ b/comphelper/source/misc/expandmacro.cxx
@@ -0,0 +1,59 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include comphelper/expandmacro.hxx
+
+#include com/sun/star/uno/Reference.hxx
+#include com/sun/star/uno/XComponentContext.hpp
+#include com/sun/star/util/theMacroExpander.hpp
+#include rtl/ustring.hxx
+#include rtl/uri.hxx
+#include osl/file.h
+#include comphelper/processfactory.hxx
+
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::uno;
+using ::com::sun::star::lang::XMultiServiceFactory;
+
+namespace comphelper
+{
+rtl::OUString getExpandedFilePath(const rtl::OUString filepath)
+{
+const ReferenceXComponentContext xContext(
::comphelper::getProcessComponentContext() );
+return getExpandedFilePath(filepath, xContext);
+}
+
+rtl::OUString getExpandedFilePath(const rtl::OUString filepath, const
ReferenceXComponentContext xContext)
+{
+Reference util::XMacroExpander xMacroExpander =
util::theMacroExpander::get( xContext );
+
+rtl::OUString aFilename = filepath;
+
+if( aFilename.startsWith( vnd.sun.star.expand: ) )
+{
+// cut protocol
+rtl::OUString aMacro( aFilename.copy( sizeof (
vnd.sun.star.expand: ) -1 ) );
+
+// decode uric class chars
+aMacro = rtl::Uri::decode( aMacro, rtl_UriDecodeWithCharset,
RTL_TEXTENCODING_UTF8 );
+
+// expand macro string
+aFilename = xMacroExpander-expandMacros( aMacro );
+}
+
+if( aFilename.startsWith( file:// ) )
+{
+rtl::OUString aSysPath;
+if( osl_getSystemPathFromFileURL( aFilename.pData, aSysPath.pData
) == osl_File_E_None )
+aFilename = aSysPath;
+}
+
+return aFilename;
+}
+}
diff --git a/include/comphelper/expandmacro.hxx
b/include/comphelper/expandmacro.hxx
new file mode 100644
index 000..efd2552
--- /dev/null
+++ b/include/comphelper/expandmacro.hxx
@@ -0,0 +1,57 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef COMPHELPER_EXPANDMACRO_HXX_INCLUDED
+#define COMPHELPER_EXPANDMACRO_HXX_INCLUDED
+
+#include rtl/ustring.hxx
+#include comphelper/comphelperdllapi.h
+#include
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - svtools/source
svtools/source/filter/wmf/enhwmf.cxx | 20
svtools/source/filter/wmf/winmtf.cxx | 13 +
svtools/source/filter/wmf/winmtf.hxx |1 +
svtools/source/filter/wmf/wmf.cxx|7 +++
4 files changed, 29 insertions(+), 12 deletions(-)
New commits:
commit d0ebb70c004761552016b0fa0a259ef35a01f840
Author: Armin Le Grand a...@apache.org
Date: Tue Sep 10 11:48:33 2013 +
i123216 No FontScaling by WorldTransform on WMF import
diff --git a/svtools/source/filter/wmf/enhwmf.cxx
b/svtools/source/filter/wmf/enhwmf.cxx
index dc6472f..e03137a 100644
--- a/svtools/source/filter/wmf/enhwmf.cxx
+++ b/svtools/source/filter/wmf/enhwmf.cxx
@@ -1023,14 +1023,18 @@ sal_Bool EnhWMFReader::ReadEnhWMF()
}
aLogFont.alfFaceName = UniString( lfFaceName );
-// #121382# Need to apply WorldTransform to
FontHeight/Width; this should be completely
-// chnaged to basegfx::B2DHomMatrix instead of 'struct
XForm', but not now due to time
-// constraints and dangers
-const XForm rXF = pOut-GetWorldTransform();
-const basegfx::B2DHomMatrix aWT(rXF.eM11, rXF.eM21,
rXF.eDx, rXF.eM12, rXF.eM22, rXF.eDy);
-const basegfx::B2DVector aTransVec(aWT *
basegfx::B2DVector(aLogFont.lfWidth, aLogFont.lfHeight));
-aLogFont.lfWidth = aTransVec.getX();
-aLogFont.lfHeight = aTransVec.getY();
+// #123216# Not used in the test case of #121382# (always
identity in XForm), also
+// no hints in ms docu if FontSize should be scaled with
WT. Using with the example
+// from #123216# creates errors, so removing.
+//
+// // #121382# Need to apply WorldTransform to
FontHeight/Width; this should be completely
+// // chnaged to basegfx::B2DHomMatrix instead of 'struct
XForm', but not now due to time
+// // constraints and dangers
+// const XForm rXF = pOut-GetWorldTransform();
+// const basegfx::B2DHomMatrix aWT(rXF.eM11, rXF.eM21,
rXF.eDx, rXF.eM12, rXF.eM22, rXF.eDy);
+// const basegfx::B2DVector aTransVec(aWT *
basegfx::B2DVector(aLogFont.lfWidth, aLogFont.lfHeight));
+// aLogFont.lfWidth = aTransVec.getX();
+// aLogFont.lfHeight = aTransVec.getY();
pOut-CreateObject( nIndex, GDI_FONT, new WinMtfFontStyle(
aLogFont ) );
}
diff --git a/svtools/source/filter/wmf/winmtf.cxx
b/svtools/source/filter/wmf/winmtf.cxx
index 5be172e..bdfaf85 100644
--- a/svtools/source/filter/wmf/winmtf.cxx
+++ b/svtools/source/filter/wmf/winmtf.cxx
@@ -2055,10 +2055,10 @@ void WinMtfOutput::ModifyWorldTransform( const XForm
rXForm, sal_uInt32 nMode )
{
case MWT_IDENTITY :
{
-maXForm.eM11 = maXForm.eM12 = maXForm.eM21 = maXForm.eM22 = 1.0f;
-maXForm.eDx = maXForm.eDy = 0.0f;
+maXForm.eM11 = maXForm.eM22 = 1.0f;
+maXForm.eM12 = maXForm.eM21 = maXForm.eDx = maXForm.eDy = 0.0f;
+break;
}
-break;
case MWT_RIGHTMULTIPLY :
case MWT_LEFTMULTIPLY :
@@ -2117,8 +2117,13 @@ void WinMtfOutput::ModifyWorldTransform( const XForm
rXForm, sal_uInt32 nMode )
maXForm.eM22 = cF[1][1];
maXForm.eDx = cF[2][0];
maXForm.eDy = cF[2][1];
+break;
+}
+case MWT_SET:
+{
+SetWorldTransform(rXForm);
+break;
}
-break;
}
}
diff --git a/svtools/source/filter/wmf/winmtf.hxx
b/svtools/source/filter/wmf/winmtf.hxx
index d850aef..499244a 100644
--- a/svtools/source/filter/wmf/winmtf.hxx
+++ b/svtools/source/filter/wmf/winmtf.hxx
@@ -68,6 +68,7 @@
#define MWT_IDENTITY1
#define MWT_LEFTMULTIPLY2
#define MWT_RIGHTMULTIPLY 3
+#define MWT_SET 4
#define ENHMETA_STOCK_OBJECT0x8000
diff --git a/svtools/source/filter/wmf/wmf.cxx
b/svtools/source/filter/wmf/wmf.cxx
index a5906dc..1a16173 100644
--- a/svtools/source/filter/wmf/wmf.cxx
+++ b/svtools/source/filter/wmf/wmf.cxx
@@ -50,6 +50,13 @@ sal_Bool ConvertWMFToGDIMetaFile( SvStream rStreamWMF,
GDIMetaFile rGDIMetaF
{
WMFReader( rStreamWMF, rGDIMetaFile, pConfigItem ).ReadWMF();
}
+
+#ifdef DBG_UTIL
+// #123216# allow a look at CheckSum and ByteSize for debugging
+const sal_uLong aC(rGDIMetaFile.GetChecksum());
+const sal_uLong aB(rGDIMetaFile.GetSizeBytes());
+#endif
+
rStreamWMF.SetNumberFormatInt( nOrigNumberFormat );
return !rStreamWMF.GetError();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
[Libreoffice-commits] core.git: basic/source
basic/source/sbx/sbxvalue.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 9b60eeac516db4be2f3ab70526f2de84e1c9b9d4
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Mon Sep 9 19:35:42 2013 +0200
janitorial: c++-style cast
Change-Id: I746eff36778e30e36b975e24c70712301c3c71cb
diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx
index 5978020..1921c51 100644
--- a/basic/source/sbx/sbxvalue.cxx
+++ b/basic/source/sbx/sbxvalue.cxx
@@ -322,7 +322,7 @@ sal_Bool SbxValue::Get( SbxValues rRes ) const
else
{
// If an object or a VARIANT is requested, don't search the real values
-SbxValue* p = (SbxValue*) this;
+SbxValue* p = const_castSbxValue*(this);
if( rRes.eType != SbxOBJECT rRes.eType != SbxVARIANT )
p = TheRealValue();
if( p )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/kohei/formula-opencl-work' - sc/source
sc/source/core/data/document.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3a4b281ee1b5078430df81ead2eedd60aa714f74 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Tue Sep 10 09:17:12 2013 -0400 Oops I forgot a return statement. Change-Id: Ifdea804b178ccf5c25ef21fba2642f31a90e4061 diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index d161910..7bda1da 100644 --- a/sc/source/core/data/document.cxx +++ b/sc/source/core/data/document.cxx @@ -1024,7 +1024,7 @@ SCROW ScDocument::GetLastDataRow( SCTAB nTab, SCCOL nCol1, SCCOL nCol2 ) const if (!pTab) return -1; -pTab-GetLastDataRow(nCol1, nCol2); +return pTab-GetLastDataRow(nCol1, nCol2); } // connected area ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [ANN] feature/instdir pushed to master
Hi, On 10 September 2013 09:13, Miklos Vajna vmik...@collabora.co.uk wrote: Hi, On Mon, Sep 09, 2013 at 10:18:32PM +0200, Michael Stahl mst...@redhat.com wrote: i've just pushed Matúš' feature/instdir branch to master, which makes the instdir an actually runnable office installation. Cool! :) Thanks to Michael for many fixes, testing, integrating.. Nitpick: dev-install tweaks bootstraprc, so UserInstallation points to $SYSUSERCONFIG/libreoffice/4, not $SYSUSERCONFIG/libreofficedev/4 as instdir currently has it. Is this intentional? No such change is intentional. It should produce the same directory structure modulo some missing files. (or some which should not be there) It should be the same as PRODUCTNAME, --enable-dbgutil has 'dev' suffix. Are you sure both files are generated with the same autogen parameters ? Thanks, Matus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter-2' - 11 commits - formula/source include/formula sc/inc sc/source
formula/source/core/api/vectortoken.cxx |2
include/formula/vectortoken.hxx |4
sc/inc/document.hxx |7 +
sc/inc/formulacell.hxx |1
sc/inc/formulagroup.hxx |7 +
sc/inc/formularesult.hxx |1
sc/inc/table.hxx |2
sc/source/core/data/column2.cxx | 173 ---
sc/source/core/data/document.cxx |9 +
sc/source/core/data/formulacell.cxx | 39 ++
sc/source/core/data/table1.cxx | 15 ++
sc/source/core/opencl/formulagroupcl.cxx | 33 +++--
sc/source/core/tool/formulagroup.cxx | 142 -
sc/source/core/tool/formularesult.cxx| 49
sc/source/core/tool/interpr6.cxx |2
15 files changed, 422 insertions(+), 64 deletions(-)
New commits:
commit 30f2a24ba7f1a0e1a39ab7491013615a25080909
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Sep 10 09:17:12 2013 -0400
Oops I forgot a return statement.
Change-Id: Ifdea804b178ccf5c25ef21fba2642f31a90e4061
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index cf8c4fd..e6fa7c4 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -1024,7 +1024,7 @@ SCROW ScDocument::GetLastDataRow( SCTAB nTab, SCCOL
nCol1, SCCOL nCol2 ) const
if (!pTab)
return -1;
-pTab-GetLastDataRow(nCol1, nCol2);
+return pTab-GetLastDataRow(nCol1, nCol2);
}
// connected area
commit 0ff9cdec746c016002fa55c62be76dffc1ceca28
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Sep 10 00:11:13 2013 -0400
Fix several logic errors in required array size calculation.
Change-Id: Ife05e21583d14c873d38c09d78e964cdb3817d6c
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index 1954ffe..0a66ddc 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -3446,7 +3446,7 @@ public:
case svDoubleRef:
{
ScComplexRefData aRef = pToken-GetDoubleRef();
-ScRange aAbs = aRef.toAbs(mrCell.aPos);
+ScRange aAbs = aRef.toAbs(mrPos);
// Check for self reference.
if (aRef.Ref1.IsRowRel())
@@ -3472,12 +3472,16 @@ public:
size_t nCols = aAbs.aEnd.Col() - aAbs.aStart.Col() + 1;
std::vectorformula::VectorRefArray aArrays;
aArrays.reserve(nCols);
-SCROW nArrayLength = nLen;
SCROW nRefRowSize = aAbs.aEnd.Row() - aAbs.aStart.Row() +
1;
+SCROW nArrayLength = nRefRowSize;
if (!bAbsLast)
{
// range end position is relative. Extend the array
length.
-nArrayLength += nRefRowSize - 1;
+SCROW nLastRefRowOffset = aAbs.aEnd.Row() -
mrPos.Row();
+SCROW nLastRefRow = mrPos.Row() + nLen - 1 +
nLastRefRowOffset;
+SCROW nNewLength = nLastRefRow - aAbs.aStart.Row() + 1;
+if (nNewLength nArrayLength)
+nArrayLength = nNewLength;
}
// Trim trailing empty rows.
diff --git a/sc/source/core/tool/formulagroup.cxx
b/sc/source/core/tool/formulagroup.cxx
index 5dff3d9..1dbe5bd 100644
--- a/sc/source/core/tool/formulagroup.cxx
+++ b/sc/source/core/tool/formulagroup.cxx
@@ -204,9 +204,14 @@ bool
FormulaGroupInterpreterSoftware::interpret(ScDocument rDoc, const ScAddres
nRowEnd += i;
size_t nRowSize = nRowEnd - nRowStart + 1;
ScMatrixRef pMat(new ScMatrix(nColSize, nRowSize));
-if (p2-GetArrayLength() nRowSize)
-// Data array is shorter than the row size of the
reference. Truncate it.
-nRowSize = p2-GetArrayLength();
+
+size_t nDataRowEnd = p2-GetArrayLength() - 1;
+if (nRowStart nDataRowEnd)
+// Referenced rows are all empty.
+nRowSize = 0;
+else if (nRowEnd nDataRowEnd)
+// Data array is shorter than the row size of the
reference. Truncate it to the data.
+nRowSize -= nRowEnd - nDataRowEnd;
for (size_t nCol = 0; nCol nColSize; ++nCol)
{
commit 0a61d4af7502f1e0274b71cda0b40778ab51d742
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Mon Sep 9 23:14:19 2013 -0400
Trim data array length to remove trailing empty rows.
Change-Id: I61a6a289ad1c2c757fcea490ada5d40fee08e840
diff --git a/sc/inc/document.hxx
[Libreoffice-commits] core.git: codemaker/source
codemaker/source/javamaker/javaoptions.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4b0a692668e37f55ea8b4c10af4d31fb314f9d0b Author: Stephan Bergmann sberg...@redhat.com Date: Tue Sep 10 15:48:03 2013 +0200 Stray space at end of usage text line Change-Id: I886c543d9de63595a9183f4e5f108f08b2ba25ef diff --git a/codemaker/source/javamaker/javaoptions.cxx b/codemaker/source/javamaker/javaoptions.cxx index ef57eec..db7d896 100644 --- a/codemaker/source/javamaker/javaoptions.cxx +++ b/codemaker/source/javamaker/javaoptions.cxx @@ -246,7 +246,7 @@ OString JavaOptions::prepareHelp() help += -Opath = path describes the root directory for the generated output.\n; help += The output directory tree is generated under this directory.\n; help += -Tname = name specifies a type or a list of types. The output for this\n; -help += [t1;...] type and all dependent types are generated. If no '-T' option is \n; +help += [t1;...] type and all dependent types are generated. If no '-T' option is\n; help += specified, then output for all types is generated.\n; help += Example: 'com.sun.star.uno.XInterface' is a valid type.\n; help += -nD= no dependent types are generated.\n; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
doxygen API doc: list of uses?
On Wed, Sep 04, 2013 at 11:56:07PM +0200, Andras Timar wrote: I updated api.libreoffice.org from master. We seem to have lost the feature of e.g. http://www.openoffice.org/api/docs/common/ref/com/sun/star/util/Date-xref.html that is the list of all the places in the API where this type is used. The references in the Developer's guide of this section were interesting, too. I don't find that feature in the Doxygen output. Is it just my blindness or have we voluntarily regressed here? -- Lionel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - vcl/source
vcl/source/gdi/pngread.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit 9bab8d99eab92b6ea0e171ac18d45e2283b86e19
Author: Herbert Dürr h...@apache.org
Date: Tue Sep 10 13:55:38 2013 +
#i122985#Â fix compile error in pngreader.cxx for product build with debug
enabled
diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx
index 62a424c..43d3545 100644
--- a/vcl/source/gdi/pngread.cxx
+++ b/vcl/source/gdi/pngread.cxx
@@ -1414,8 +1414,10 @@ void PNGReaderImpl::ImplDrawScanline( sal_uInt32
nXStart, sal_uInt32 nXAdd )
{
OSL_ENSURE(mpScanline, No Scanline allocated (!));
OSL_ENSURE(mpScanlineAlpha, No ScanlineAlpha allocated
(!));
+#ifdef DBG_UTIL
OSL_ENSURE(mnAllocSizeScanline = maOrigSize.Width() * 3,
Allocated Scanline too small (!));
OSL_ENSURE(mnAllocSizeScanlineAlpha = maOrigSize.Width(),
Allocated ScanlineAlpha too small (!));
+#endif
sal_uInt8* pScanline(mpScanline);
sal_uInt8* pScanlineAlpha(mpScanlineAlpha);
@@ -1549,7 +1551,9 @@ void PNGReaderImpl::ImplDrawScanline( sal_uInt32 nXStart,
sal_uInt32 nXAdd )
if(bDoDirectScanline)
{
OSL_ENSURE(mpScanline, No Scanline allocated (!));
+#ifdef DBG_UTIL
OSL_ENSURE(mnAllocSizeScanline = maOrigSize.Width() * 3,
Allocated Scanline too small (!));
+#endif
sal_uInt8* pScanline(mpScanline);
for(sal_uInt32 nX(0); nX maOrigSize.Width(); nX++, pTmp
+= 3)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-qa] minutes of ESC call ...
On Tue, Sep 10, 2013 at 11:37:59AM +0100, Michael Meeks wrote: Having said that - I guess investing more cycles into a dashboard / homepage for developers that shows where the fires are burning, the new MAB's etc. would prolly be a more useful investment of time. Fully agree there -- that would be totally awesome. Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter-2' - sc/inc sc/source
sc/inc/column.hxx |1 +
sc/inc/document.hxx | 13 +
sc/inc/table.hxx|2 +-
sc/source/core/data/column2.cxx | 13 +
sc/source/core/data/document.cxx|4 ++--
sc/source/core/data/formulacell.cxx |3 ++-
sc/source/core/data/table1.cxx | 12 ++--
7 files changed, 34 insertions(+), 14 deletions(-)
New commits:
commit 70a6fc011edda68d84aeadf2f5c006ec616b7340
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Sep 10 11:16:22 2013 -0400
Add ability to specify starting row when querying for last non-empty row.
And it can only go upwards from there.
Change-Id: I4c8037f687dfdd0b6c937463696d628e78e4a8bf
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index f1b53c3..5ea06c6 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -182,6 +182,7 @@ public:
bool HasVisibleDataAt(SCROW nRow) const;
SCROW GetFirstDataPos() const;
SCROW GetLastDataPos() const;
+SCROW GetLastDataPos( SCROW nLastRow ) const;
bool GetPrevDataPos(SCROW rRow) const;
bool GetNextDataPos(SCROW rRow) const;
void FindDataAreaPos(SCROW rRow, bool bDown) const; //
(without Broadcaster)
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 29fe96c..f6bdb33 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1024,11 +1024,16 @@ public:
SCCOL rEndCol, SCROW rEndRow, bool
bColumnsOnly ) const;
/**
- * Return the last non-empty row position in given columns, or 0 if the
- * columns are empty. A negative value is returned if the given sheet or
- * column positions are invalid.
+ * Return the last non-empty row position in given columns that's no
+ * greater than the initial last row position, or 0 if the columns are
+ * empty. A negative value is returned if the given sheet or column
+ * positions are invalid.
+ *
+ * pIt starts from the specified last row position, and finds the first
+ * non-empty row position in the upward direction if the start row
+ * position is empty./p
*/
-SCROW GetLastDataRow( SCTAB nTab, SCCOL nCol1, SCCOL nCol2 ) const;
+SCROW GetLastDataRow( SCTAB nTab, SCCOL nCol1, SCCOL nCol2, SCROW nLastRow
) const;
SC_DLLPUBLIC void GetDataArea( SCTAB nTab, SCCOL rStartCol,
SCROW rStartRow,
SCCOL rEndCol, SCROW rEndRow, bool
bIncludeOld, bool bOnlyDown ) const;
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 205df2c..8429c3e 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -470,7 +470,7 @@ public:
boolShrinkToUsedDataArea( bool o_bShrunk, SCCOL rStartCol,
SCROW rStartRow,
SCCOL rEndCol, SCROW rEndRow, bool
bColumnsOnly ) const;
-SCROW GetLastDataRow( SCCOL nCol1, SCCOL nCol2 ) const;
+SCROW GetLastDataRow( SCCOL nCol1, SCCOL nCol2, SCROW nLastRow ) const;
SCSIZE GetEmptyLinesInBlock( SCCOL nStartCol, SCROW nStartRow,
SCCOL nEndCol, SCROW nEndRow,
ScDirection eDir ) const;
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index c846d62..3ab5e64 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -1281,6 +1281,19 @@ SCROW ScColumn::GetLastDataPos() const
return MAXROW - static_castSCROW(it-size);
}
+SCROW ScColumn::GetLastDataPos( SCROW nLastRow ) const
+{
+sc::CellStoreType::const_position_type aPos = maCells.position(nLastRow);
+if (aPos.first-type != sc::element_type_empty)
+return nLastRow;
+
+if (aPos.first == maCells.begin())
+// This is the first block, and is empty.
+return 0;
+
+return static_castSCROW(aPos.first-position - 1);
+}
+
bool ScColumn::GetPrevDataPos(SCROW rRow) const
{
std::pairsc::CellStoreType::const_iterator,size_t aPos =
maCells.position(rRow);
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index e6fa7c4..eb7672a 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -1018,13 +1018,13 @@ bool ScDocument::ShrinkToUsedDataArea( bool o_bShrunk,
SCTAB nTab, SCCOL rStar
return maTabs[nTab]-ShrinkToUsedDataArea( o_bShrunk, rStartCol,
rStartRow, rEndCol, rEndRow, bColumnsOnly);
}
-SCROW ScDocument::GetLastDataRow( SCTAB nTab, SCCOL nCol1, SCCOL nCol2 ) const
+SCROW ScDocument::GetLastDataRow( SCTAB nTab, SCCOL nCol1, SCCOL nCol2, SCROW
nLastRow ) const
{
const ScTable* pTab = FetchTable(nTab);
if (!pTab)
return -1;
-return pTab-GetLastDataRow(nCol1, nCol2);
+return pTab-GetLastDataRow(nCol1, nCol2, nLastRow);
}
// connected area
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
[Libreoffice-commits] core.git: Branch 'private/kohei/formula-opencl-work' - sc/inc sc/source
sc/inc/column.hxx |1 +
sc/inc/document.hxx | 13 +
sc/inc/table.hxx|2 +-
sc/source/core/data/column2.cxx | 13 +
sc/source/core/data/document.cxx|4 ++--
sc/source/core/data/formulacell.cxx |3 ++-
sc/source/core/data/table1.cxx | 12 ++--
7 files changed, 34 insertions(+), 14 deletions(-)
New commits:
commit b68f673ffdd820fd6f359c904bc2f5690ef46a80
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Sep 10 11:16:22 2013 -0400
Add ability to specify starting row when querying for last non-empty row.
And it can only go upwards from there.
Change-Id: I4c8037f687dfdd0b6c937463696d628e78e4a8bf
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index ba79c23..6d09ad1 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -184,6 +184,7 @@ public:
bool HasVisibleDataAt(SCROW nRow) const;
SCROW GetFirstDataPos() const;
SCROW GetLastDataPos() const;
+SCROW GetLastDataPos( SCROW nLastRow ) const;
bool GetPrevDataPos(SCROW rRow) const;
bool GetNextDataPos(SCROW rRow) const;
void FindDataAreaPos(SCROW rRow, bool bDown) const; //
(without Broadcaster)
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 4cbf06a..6993abb 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1028,11 +1028,16 @@ public:
SCCOL rEndCol, SCROW rEndRow, bool
bColumnsOnly ) const;
/**
- * Return the last non-empty row position in given columns, or 0 if the
- * columns are empty. A negative value is returned if the given sheet or
- * column positions are invalid.
+ * Return the last non-empty row position in given columns that's no
+ * greater than the initial last row position, or 0 if the columns are
+ * empty. A negative value is returned if the given sheet or column
+ * positions are invalid.
+ *
+ * pIt starts from the specified last row position, and finds the first
+ * non-empty row position in the upward direction if the start row
+ * position is empty./p
*/
-SCROW GetLastDataRow( SCTAB nTab, SCCOL nCol1, SCCOL nCol2 ) const;
+SCROW GetLastDataRow( SCTAB nTab, SCCOL nCol1, SCCOL nCol2, SCROW nLastRow
) const;
SC_DLLPUBLIC void GetDataArea( SCTAB nTab, SCCOL rStartCol,
SCROW rStartRow,
SCCOL rEndCol, SCROW rEndRow, bool
bIncludeOld, bool bOnlyDown ) const;
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 9bf3f90..fc8ae3a 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -469,7 +469,7 @@ public:
boolShrinkToUsedDataArea( bool o_bShrunk, SCCOL rStartCol,
SCROW rStartRow,
SCCOL rEndCol, SCROW rEndRow, bool
bColumnsOnly ) const;
-SCROW GetLastDataRow( SCCOL nCol1, SCCOL nCol2 ) const;
+SCROW GetLastDataRow( SCCOL nCol1, SCCOL nCol2, SCROW nLastRow ) const;
SCSIZE GetEmptyLinesInBlock( SCCOL nStartCol, SCROW nStartRow,
SCCOL nEndCol, SCROW nEndRow,
ScDirection eDir ) const;
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 42c5469..eda83ff 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -1255,6 +1255,19 @@ SCROW ScColumn::GetLastDataPos() const
return MAXROW - static_castSCROW(it-size);
}
+SCROW ScColumn::GetLastDataPos( SCROW nLastRow ) const
+{
+sc::CellStoreType::const_position_type aPos = maCells.position(nLastRow);
+if (aPos.first-type != sc::element_type_empty)
+return nLastRow;
+
+if (aPos.first == maCells.begin())
+// This is the first block, and is empty.
+return 0;
+
+return static_castSCROW(aPos.first-position - 1);
+}
+
bool ScColumn::GetPrevDataPos(SCROW rRow) const
{
std::pairsc::CellStoreType::const_iterator,size_t aPos =
maCells.position(rRow);
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 7bda1da..dc7db44 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -1018,13 +1018,13 @@ bool ScDocument::ShrinkToUsedDataArea( bool o_bShrunk,
SCTAB nTab, SCCOL rStar
return maTabs[nTab]-ShrinkToUsedDataArea( o_bShrunk, rStartCol,
rStartRow, rEndCol, rEndRow, bColumnsOnly);
}
-SCROW ScDocument::GetLastDataRow( SCTAB nTab, SCCOL nCol1, SCCOL nCol2 ) const
+SCROW ScDocument::GetLastDataRow( SCTAB nTab, SCCOL nCol1, SCCOL nCol2, SCROW
nLastRow ) const
{
const ScTable* pTab = FetchTable(nTab);
if (!pTab)
return -1;
-return pTab-GetLastDataRow(nCol1, nCol2);
+return pTab-GetLastDataRow(nCol1, nCol2, nLastRow);
}
// connected area
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
Re: dbaccess::ODatabaseContext cleaning its cache too late?
On Mon, Sep 09, 2013 at 03:35:22PM +0200, Stephan Bergmann wrote: On 09/07/2013 09:46 AM, Lionel Elie Mamane wrote: On Tue, Aug 20, 2013 at 10:57:06AM +0200, Stephan Bergmann wrote: On 08/16/2013 03:46 PM, Lionel Elie Mamane wrote: On Fri, Aug 16, 2013 at 02:55:35PM +0200, Stephan Bergmann wrote: No real insight into any of this, but would it make sense to rely on some explicit commit stimulus to do that committing, instead of doing it upon dispose I don't understand what commit stimulus is. I was thinking of some close function (analogous to how, say, a Java class representing a file should have an explicit close() method rather than relying on a finalizer). It seems the shutdown of ODatabaseContext at dispose time creates other problems... E.g. https://bugs.freedesktop.org/69036 So I tried to look into this, and using a close that would be called earlier makes sense to me, but in the context of application shutdown, I don't see *who* would call it when :-| I'm a bit stuck there. But wouldn't every database context be tied to some open window, I don't see why that would be, unless we create a fake window in headless situations or for things that don't have a UI window. I'm thinking of this scenario: 1) run soffice -accept=socket,host=localhost,port=2002;urp; or soffice -accept=socket,host=localhost,port=2002;urp; --nodefault or soffice -accept=socket,host=localhost,port=2002;urp; --headless or soffice -accept=socket,host=localhost,port=2002;urp; --headless --nodefault or some such. 2) Run a python script like import uno localContext = uno.getComponentContext() resolver = localContext.ServiceManager.createInstanceWithContext( com.sun.star.bridge.UnoUrlResolver, localContext ) ctx = resolver.resolve(uno:socket,host=localhost,port=2002;urp;StarOffice.ComponentContext ) smgr = ctx.ServiceManager dbCtx = smgr.createInstanceWithContext( com.sun.star.sdb.DatabaseContext,ctx) The ODatabaseContext that just got created, to what window would it be tied? or some shell in sfx2 speak, Is the notion of shell different than window? Would the above scenario have a shell, but no window? In the context of https://bugs.freedesktop.org/69036, I would like to see who holds a reference to the DatabaseContext that gets closed. It is my understanding that (because we have reference-counting garbage collection), dispose() should actually be called as soon as nobody holds a reference to it anymore (unless we have a reference cycle). How can I find that out? Anything better than breaking on the constructor and going a few frames up, and reading the code to try to guess where the reference is leaked / stored / ..., and then breaking on any function that returns the reference as result, etc? My end goal is to see if I cannot rather close the putative reference leak or break the putative cycle, so that the DatabaseContext is disposed as soon as it is not used anymore. I grepped through some code creating DatabaseContext, it seems to usually hold the reference for only a *short* time. -- Lionel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/formularesult.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 486353651aee653b149170013c7e1d168644f508 Author: Caolán McNamara caol...@redhat.com Date: Tue Sep 10 18:21:13 2013 +0100 WaE: enumeration values not handled in switch Change-Id: I89564800ee81d1e406a5f5fc12ec32dded161274 diff --git a/sc/source/core/tool/formularesult.cxx b/sc/source/core/tool/formularesult.cxx index ef6c15a..c0876cd 100644 --- a/sc/source/core/tool/formularesult.cxx +++ b/sc/source/core/tool/formularesult.cxx @@ -263,6 +263,8 @@ inline bool isString( formula::StackVar sv ) case formula::svHybridCell: case formula::svHybridValueCell: return true; +default: +break; } return false; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/text/itratr.cxx | 24 ++---
sw/source/core/text/porfld.cxx |8 ++--
sw/source/core/text/porlay.cxx | 26 +++---
sw/source/core/text/txtdrop.cxx |2 -
sw/source/core/text/txtfld.cxx | 56 +--
sw/source/core/txtnode/atrfld.cxx|4 +-
sw/source/core/txtnode/ndtxt.cxx | 13 +++
sw/source/ui/sidebar/PageSizeControl.cxx | 30 +++-
8 files changed, 76 insertions(+), 87 deletions(-)
New commits:
commit 114efed42daa7de5e7d650cb713ba91c0c3117bd
Author: Thomas Arnhold tho...@arnhold.org
Date: Mon Sep 9 15:15:00 2013 +0200
String to OUString
Change-Id: If859505c52b7166e9e586008b40a6aff3a2ccf3c
Reviewed-on: https://gerrit.libreoffice.org/5893
Reviewed-by: Andrzej J.R. Hunt andr...@ahunt.org
Tested-by: Andrzej J.R. Hunt andr...@ahunt.org
diff --git a/sw/source/core/text/itratr.cxx b/sw/source/core/text/itratr.cxx
index 347c196..74bf883 100644
--- a/sw/source/core/text/itratr.cxx
+++ b/sw/source/core/text/itratr.cxx
@@ -374,7 +374,7 @@ public:
void NewWord() { nWordAdd = nWordWidth = 0; }
};
-static sal_Bool lcl_MinMaxString( SwMinMaxArgs rArg, SwFont* pFnt, const
XubString rTxt,
+static sal_Bool lcl_MinMaxString( SwMinMaxArgs rArg, SwFont* pFnt, const
OUString rTxt,
xub_StrLen nIdx, xub_StrLen nEnd )
{
sal_Bool bRet = sal_False;
@@ -385,7 +385,7 @@ static sal_Bool lcl_MinMaxString( SwMinMaxArgs rArg,
SwFont* pFnt, const XubStr
LanguageType eLang = pFnt-GetLanguage();
if( g_pBreakIt-GetBreakIter().is() )
{
-bClear = CH_BLANK == rTxt.GetChar( nStop );
+bClear = CH_BLANK == rTxt[ nStop ];
Boundary aBndry( g_pBreakIt-GetBreakIter()-getWordBoundary(
rTxt, nIdx,
g_pBreakIt-GetLocale( eLang ),
WordType::DICTIONARY_WORD, sal_True ) );
@@ -399,13 +399,13 @@ static sal_Bool lcl_MinMaxString( SwMinMaxArgs rArg,
SwFont* pFnt, const XubStr
}
else
{
-while( nStop nEnd CH_BLANK != rTxt.GetChar( nStop ) )
+while( nStop nEnd CH_BLANK != rTxt[ nStop ] )
++nStop;
bClear = nStop == nIdx;
if ( bClear )
{
rArg.NewWord();
-while( nStop nEnd CH_BLANK == rTxt.GetChar( nStop ) )
+while( nStop nEnd CH_BLANK == rTxt[ nStop ] )
++nStop;
}
}
@@ -762,18 +762,18 @@ void SwTxtNode::GetMinMaxSize( sal_uLong nIndex,
sal_uLong rMin, sal_uLong rMa
}
case RES_TXTATR_FTN :
{
-const XubString aTxt = pHint-GetFtn().GetNumStr();
+const OUString aTxt = pHint-GetFtn().GetNumStr();
if( lcl_MinMaxString( aArg, aIter.GetFnt(), aTxt, 0,
-aTxt.Len() ) )
+aTxt.getLength() ) )
nAdd = 20;
break;
}
case RES_TXTATR_FIELD :
{
SwField *pFld = (SwField*)pHint-GetFld().GetFld();
-const String aTxt = pFld-ExpandField(true);
+const OUString aTxt = pFld-ExpandField(true);
if( lcl_MinMaxString( aArg, aIter.GetFnt(), aTxt, 0,
-aTxt.Len() ) )
+aTxt.getLength() ) )
nAdd = 20;
break;
}
@@ -965,8 +965,8 @@ sal_uInt16 SwTxtNode::GetScalingOfSelectedText( xub_StrLen
nStt, xub_StrLen nEnd
{
case RES_TXTATR_FTN :
{
-const XubString aTxt = pHint-GetFtn().GetNumStr();
-SwDrawTextInfo aDrawInf( pSh, *pOut, 0, aTxt, 0,
aTxt.Len() );
+const OUString aTxt = pHint-GetFtn().GetNumStr();
+SwDrawTextInfo aDrawInf( pSh, *pOut, 0, aTxt, 0,
aTxt.getLength() );
nProWidth += aIter.GetFnt()-_GetTxtSize( aDrawInf
).Width();
break;
@@ -974,8 +974,8 @@ sal_uInt16 SwTxtNode::GetScalingOfSelectedText( xub_StrLen
nStt, xub_StrLen nEnd
case RES_TXTATR_FIELD :
{
SwField *pFld = (SwField*)pHint-GetFld().GetFld();
-String const aTxt = pFld-ExpandField(true);
-SwDrawTextInfo aDrawInf( pSh, *pOut, 0, aTxt, 0,
aTxt.Len() );
+OUString const aTxt = pFld-ExpandField(true);
+SwDrawTextInfo aDrawInf( pSh, *pOut, 0, aTxt, 0,
aTxt.getLength() );
nProWidth += aIter.GetFnt()-_GetTxtSize( aDrawInf
).Width();
[Libreoffice-commits] core.git: configmgr/CppunitTest_configmgr_unit.mk
configmgr/CppunitTest_configmgr_unit.mk |7 --- 1 file changed, 4 insertions(+), 3 deletions(-) New commits: commit ed1eed600b2e4afd9364ee8dacf775f897df3849 Author: Michael Meeks michael.me...@collabora.com Date: Tue Sep 10 17:50:02 2013 +0100 configmgr: more makefile cleanup. Change-Id: I672077a2096cc51e7a3668f5873a91299fd00ca1 diff --git a/configmgr/CppunitTest_configmgr_unit.mk b/configmgr/CppunitTest_configmgr_unit.mk index 500051c..ed84ff4 100644 --- a/configmgr/CppunitTest_configmgr_unit.mk +++ b/configmgr/CppunitTest_configmgr_unit.mk @@ -32,18 +32,19 @@ $(eval $(call gb_CppunitTest_use_libraries,configmgr_unit, \ $(gb_UWINAPI) \ )) +$(eval $(call gb_CppunitTest_use_ure,configmgr_unit)) + +$(eval $(call gb_CppunitTest_use_configuration,configmgr_unit)) + $(eval $(call gb_CppunitTest_use_components,configmgr_unit,\ configmgr/source/configmgr \ fileaccess/source/fileacc \ -framework/util/fwk \ i18npool/util/i18npool \ i18npool/source/search/i18nsearch \ sax/source/expatwrap/expwrap \ -sfx2/util/sfx \ ucb/source/core/ucb1 \ ucb/source/ucp/file/ucpfile1 \ unoxml/source/service/unoxml \ -uui/util/uui \ )) $(eval $(call gb_CppunitTest_use_externals,configmgr_unit,\ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/qa
writerfilter/qa/cppunittests/odiapi/ExternalViewLogger.cxx | 194 ---
writerfilter/qa/cppunittests/odiapi/ExternalViewLogger.hxx | 82 -
writerfilter/qa/cppunittests/odiapi/FileLoggerImpl.cxx | 73 -
writerfilter/qa/cppunittests/odiapi/FileLoggerImpl.hxx | 51
writerfilter/qa/cppunittests/odiapi/export.exp |1
writerfilter/qa/cppunittests/odiapi/export.map | 25
writerfilter/qa/cppunittests/odiapi/testCore.cxx | 166 ---
writerfilter/qa/cppunittests/odiapi/testProperty.cxx | 675 -
8 files changed, 1267 deletions(-)
New commits:
commit 529f9cf52fd01f140892852584f77572b0e43a29
Author: Jelle van der Waa je...@vdwaa.nl
Date: Tue Sep 10 17:58:02 2013 +0200
writerfilter: remove old unit tests
Change-Id: Icaa0560b812b96e41c52d7a43267873fe364ceb7
Reviewed-on: https://gerrit.libreoffice.org/5904
Reviewed-by: Andrzej J.R. Hunt andr...@ahunt.org
Tested-by: Andrzej J.R. Hunt andr...@ahunt.org
diff --git a/writerfilter/qa/cppunittests/odiapi/ExternalViewLogger.cxx
b/writerfilter/qa/cppunittests/odiapi/ExternalViewLogger.cxx
deleted file mode 100644
index a894030..000
--- a/writerfilter/qa/cppunittests/odiapi/ExternalViewLogger.cxx
+++ /dev/null
@@ -1,194 +0,0 @@
-/* -*- 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the License); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include ExternalViewLogger.hxx
-#include iostream
-#include boost/assert.hpp
-#include stdio.h
-
-#ifdef WNT
-#define SNPRINTF(buffer, size, format, args) _snprintf(buffer, size,
format, args)
-#else
-#define SNPRINTF(buffer, size, format, args) snprintf(buffer, size,
format, args)
-#endif
-
-using namespace std;
-
-namespace util
-{
-
- NodeDescription::NodeDescription(const string parent, const string
refersTo, const string value, bool inUse) :
-mParentNodeId(parent),
-mRefersToNodeId(refersTo),
-mNodeValue(value),
-mInUse(inUse)
- {}
-
- ExternalViewLoggerImpl::ExternalViewLoggerImpl(const string fileName) :
-mFileName(fileName),
-mFile(fileName.c_str())
- {
-if (!mFile)
- throw Cannot open file;
- }
-
- string ExternalViewLoggerImpl::getNewStyleName()
- {
-static int i = 0;
-char buff[20];
-SNPRINTF(buff, sizeof(buff), Style_%d, i++);
-return string(buff);
- }
-
- void ExternalViewLoggerImpl::beginTree()
- {
-mParentNodeStack.push();
- }
-
- void ExternalViewLoggerImpl::dumpNodeContainer(const std::string fileName)
- {
-std::ofstream file(fileName.c_str());
-NodeContainer_t::iterator iter = mNodeContainer.begin();
-NodeContainer_t::iterator iter_end = mNodeContainer.end();
-for (; iter != iter_end; ++iter)
-{
-file iter-first string( ) iter-second-mParentNodeId
string( ) iter-second-mRefersToNodeId string( )
iter-second-mNodeValue endl;
-}
- }
-
- void ExternalViewLoggerImpl::endTree()
- {
-mFile digraph { endl;
-mFile Root [shape=box, color=grey]; endl;
-
-while (!mParentNodeStack.empty())
- mParentNodeStack.pop();
-
-mParentNodeStack.push(Root);
-
-NodeContainer_t::iterator iter = mNodeContainer.begin();
-NodeContainer_t::iterator iter_end = mNodeContainer.end();
-for (; iter != iter_end; ++iter)
-{
- if (isUnreferencedLeaf(iter-first))
- {
-string newStyleName = getNewStyleName();
-mFile newStyleName [shape=box]; endl;
-mFile mParentNodeStack.top() - newStyleName endl;
-mParentNodeStack.push(newStyleName);
-dumpTree(iter-first);
-mParentNodeStack.pop();
- }
-}
-
-mFile } endl;
- }
-
- void ExternalViewLoggerImpl::beginNode(const std::string nodeId, const
std::string value, const std::string refersToNodeId, bool inUse)
- {
-mNodeContainer.insert(
-NodeContainer_t::value_type(nodeId,
-NodeDescription::Pointer_t(new NodeDescription(mParentNodeStack.top(),
refersToNodeId, value, inUse;
-mParentNodeStack.push(nodeId);
- }
-
- void ExternalViewLoggerImpl::endNode(const std::string nodeId)
- {
-mParentNodeStack.pop();
- }
-
- bool
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/ww8par5.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit ff50e9ac7145e0d1accf980560ef50c272e427dd
Author: Caolán McNamara caol...@redhat.com
Date: Tue Sep 10 18:32:15 2013 +0100
CID#1078790 Resource leak
Change-Id: I1c5af09932a5004c5c76080fd490e53d8927c285
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 0c3a0c9..ff9bf59 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -3437,7 +3437,10 @@ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF,
OUString rStr )
}
}
if ( pForm )
+{
pBase-SetTOXForm( *pForm );
+delete pForm;
+}
}
if (eCreateFrom)
___
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' - 2 commits - 96/4b63c906438e21c649667de8b9b7e03394cc24 f5/c3f1a0fba83206f0ee5b434d27d844282718dc
96/4b63c906438e21c649667de8b9b7e03394cc24 |1 + f5/c3f1a0fba83206f0ee5b434d27d844282718dc |1 + 2 files changed, 2 insertions(+) New commits: commit 4b49083f182766220d8837d277f8863e3635c7a4 Author: Caolán McNamara caol...@redhat.com Date: Tue Sep 10 18:40:14 2013 +0100 Notes added by 'git notes add' diff --git a/f5/c3f1a0fba83206f0ee5b434d27d844282718dc b/f5/c3f1a0fba83206f0ee5b434d27d844282718dc new file mode 100644 index 000..8e5c182 --- /dev/null +++ b/f5/c3f1a0fba83206f0ee5b434d27d844282718dc @@ -0,0 +1 @@ +ignore: aoo commit dc3cfa98c7a5c52485e2bb5ff749fcc32196534d Author: Caolán McNamara caol...@redhat.com Date: Tue Sep 10 18:40:00 2013 +0100 Notes added by 'git notes add' diff --git a/96/4b63c906438e21c649667de8b9b7e03394cc24 b/96/4b63c906438e21c649667de8b9b7e03394cc24 new file mode 100644 index 000..8e5c182 --- /dev/null +++ b/96/4b63c906438e21c649667de8b9b7e03394cc24 @@ -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: 12 commits - formula/source include/formula sc/inc sc/source
formula/source/core/api/vectortoken.cxx |2
include/formula/vectortoken.hxx |4
sc/inc/column.hxx|1
sc/inc/document.hxx | 12 ++
sc/inc/formulacell.hxx |1
sc/inc/formulagroup.hxx |7 +
sc/inc/formularesult.hxx |1
sc/inc/table.hxx |2
sc/source/core/data/column2.cxx | 186 +--
sc/source/core/data/document.cxx |9 +
sc/source/core/data/formulacell.cxx | 40 ++
sc/source/core/data/table1.cxx | 15 ++
sc/source/core/opencl/formulagroupcl.cxx | 33 ++---
sc/source/core/tool/formulagroup.cxx | 142 ++-
sc/source/core/tool/formularesult.cxx| 49
sc/source/core/tool/interpr6.cxx |2
16 files changed, 442 insertions(+), 64 deletions(-)
New commits:
commit a66aeace78f366800ba5bc8be0d334ea823179ab
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Sep 10 11:16:22 2013 -0400
Add ability to specify starting row when querying for last non-empty row.
And it can only go upwards from there.
Change-Id: I4c8037f687dfdd0b6c937463696d628e78e4a8bf
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index ba79c23..6d09ad1 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -184,6 +184,7 @@ public:
bool HasVisibleDataAt(SCROW nRow) const;
SCROW GetFirstDataPos() const;
SCROW GetLastDataPos() const;
+SCROW GetLastDataPos( SCROW nLastRow ) const;
bool GetPrevDataPos(SCROW rRow) const;
bool GetNextDataPos(SCROW rRow) const;
void FindDataAreaPos(SCROW rRow, bool bDown) const; //
(without Broadcaster)
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 4cbf06a..6993abb 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1028,11 +1028,16 @@ public:
SCCOL rEndCol, SCROW rEndRow, bool
bColumnsOnly ) const;
/**
- * Return the last non-empty row position in given columns, or 0 if the
- * columns are empty. A negative value is returned if the given sheet or
- * column positions are invalid.
+ * Return the last non-empty row position in given columns that's no
+ * greater than the initial last row position, or 0 if the columns are
+ * empty. A negative value is returned if the given sheet or column
+ * positions are invalid.
+ *
+ * pIt starts from the specified last row position, and finds the first
+ * non-empty row position in the upward direction if the start row
+ * position is empty./p
*/
-SCROW GetLastDataRow( SCTAB nTab, SCCOL nCol1, SCCOL nCol2 ) const;
+SCROW GetLastDataRow( SCTAB nTab, SCCOL nCol1, SCCOL nCol2, SCROW nLastRow
) const;
SC_DLLPUBLIC void GetDataArea( SCTAB nTab, SCCOL rStartCol,
SCROW rStartRow,
SCCOL rEndCol, SCROW rEndRow, bool
bIncludeOld, bool bOnlyDown ) const;
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 9bf3f90..fc8ae3a 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -469,7 +469,7 @@ public:
boolShrinkToUsedDataArea( bool o_bShrunk, SCCOL rStartCol,
SCROW rStartRow,
SCCOL rEndCol, SCROW rEndRow, bool
bColumnsOnly ) const;
-SCROW GetLastDataRow( SCCOL nCol1, SCCOL nCol2 ) const;
+SCROW GetLastDataRow( SCCOL nCol1, SCCOL nCol2, SCROW nLastRow ) const;
SCSIZE GetEmptyLinesInBlock( SCCOL nStartCol, SCROW nStartRow,
SCCOL nEndCol, SCROW nEndRow,
ScDirection eDir ) const;
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 42c5469..eda83ff 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -1255,6 +1255,19 @@ SCROW ScColumn::GetLastDataPos() const
return MAXROW - static_castSCROW(it-size);
}
+SCROW ScColumn::GetLastDataPos( SCROW nLastRow ) const
+{
+sc::CellStoreType::const_position_type aPos = maCells.position(nLastRow);
+if (aPos.first-type != sc::element_type_empty)
+return nLastRow;
+
+if (aPos.first == maCells.begin())
+// This is the first block, and is empty.
+return 0;
+
+return static_castSCROW(aPos.first-position - 1);
+}
+
bool ScColumn::GetPrevDataPos(SCROW rRow) const
{
std::pairsc::CellStoreType::const_iterator,size_t aPos =
maCells.position(rRow);
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 7bda1da..dc7db44 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -1018,13 +1018,13 @@ bool ScDocument::ShrinkToUsedDataArea( bool o_bShrunk,
SCTAB nTab, SCCOL rStar
return maTabs[nTab]-ShrinkToUsedDataArea( o_bShrunk, rStartCol,
rStartRow,
[Libreoffice-commits] core.git: i18nlangtag/qa i18nlangtag/source
i18nlangtag/qa/cppunit/test_languagetag.cxx|5 +
i18nlangtag/source/languagetag/languagetag.cxx |1 +
2 files changed, 6 insertions(+)
New commits:
commit 7dc7d77cd0b142ea3fde93368334d1e4909d94da
Author: Eike Rathke er...@redhat.com
Date: Tue Sep 10 19:16:33 2013 +0200
include language-only in ISO-only fallback strings
Change-Id: I6da1b2b46c724c72bff3b1ee9739f2625a0321c2
diff --git a/i18nlangtag/qa/cppunit/test_languagetag.cxx
b/i18nlangtag/qa/cppunit/test_languagetag.cxx
index 6fb0de2..5ddc9b8 100644
--- a/i18nlangtag/qa/cppunit/test_languagetag.cxx
+++ b/i18nlangtag/qa/cppunit/test_languagetag.cxx
@@ -209,6 +209,11 @@ void TestLanguageTag::testAllTags()
CPPUNIT_ASSERT( de_DE.getCountry() == DE );
CPPUNIT_ASSERT( de_DE.getScript() == );
CPPUNIT_ASSERT( de_DE.getLanguageAndScript() == de );
+::std::vector OUString de_DE_Fallbacks( de_DE.getFallbackStrings(
true));
+CPPUNIT_ASSERT( de_DE_Fallbacks.size() == 2);
+CPPUNIT_ASSERT( de_DE_Fallbacks[0] == de-DE);
+CPPUNIT_ASSERT( de_DE_Fallbacks[1] == de);
+CPPUNIT_ASSERT( de_DE.makeFallback().getBcp47() == de-DE);
}
{
diff --git a/i18nlangtag/source/languagetag/languagetag.cxx
b/i18nlangtag/source/languagetag/languagetag.cxx
index 40098a9..b356833 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -1238,6 +1238,7 @@ LanguageTag LanguageTag::makeFallback()
else if (aCountry != CN)
aVec.push_back( aLanguage + -CN);
}
+aVec.push_back( aLanguage);
}
else if (bIncludeFullBcp47)
aVec.push_back( aLanguage);
___
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' - d0/ebb70c004761552016b0fa0a259ef35a01f840
d0/ebb70c004761552016b0fa0a259ef35a01f840 |1 + 1 file changed, 1 insertion(+) New commits: commit c1fc7615260762bd6ea9f4295032488f461112e8 Author: Caolán McNamara caol...@redhat.com Date: Tue Sep 10 18:48:15 2013 +0100 Notes added by 'git notes add' diff --git a/d0/ebb70c004761552016b0fa0a259ef35a01f840 b/d0/ebb70c004761552016b0fa0a259ef35a01f840 new file mode 100644 index 000..062bbb3 --- /dev/null +++ b/d0/ebb70c004761552016b0fa0a259ef35a01f840 @@ -0,0 +1 @@ +merged as: ae8cbeeba09607d34c3e0209bda3ccfdd71f0cbb ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx svx/source
include/svx/nbdtmg.hxx| 12 ++--
svx/source/sidebar/nbdtmg.cxx |7 +--
2 files changed, 11 insertions(+), 8 deletions(-)
New commits:
commit 7a0ac3d38f521ffee36d90f24b4574f22745bf4f
Author: Caolán McNamara caol...@redhat.com
Date: Tue Sep 10 18:51:44 2013 +0100
CID#1038283 Resource leak
Change-Id: I7f8433a76079dc76d888fd250b3033d772887e4d
diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx
index ecf8d19..f52897e 100644
--- a/include/svx/nbdtmg.hxx
+++ b/include/svx/nbdtmg.hxx
@@ -338,7 +338,7 @@ class SVX_DLLPUBLIC NumberingTypeMgr: public NBOTypeMgrBase
public:
NumberingTypeMgr(const NBOType aType);
NumberingTypeMgr(const NumberingTypeMgr aTypeMgr);
-virtual ~NumberingTypeMgr() {}
+virtual ~NumberingTypeMgr();
virtual void Init();
virtual sal_uInt16 GetNBOIndexForNumRule(SvxNumRule aNum,sal_uInt16
mLevel,sal_uInt16 nFromIndex=0);
virtual sal_Bool RelplaceNumRule(SvxNumRule aNum,sal_uInt16
nIndex,sal_uInt16 mLevel=(sal_uInt16)0x);
@@ -347,12 +347,12 @@ class SVX_DLLPUBLIC NumberingTypeMgr: public
NBOTypeMgrBase
virtual sal_Bool IsCustomized(sal_uInt16 nIndex);
static NumberingTypeMgr* GetInstance()
{
- if ( _instance == 0 )
-{
-_instance = new NumberingTypeMgr(eNBOType::NUMBERING);
-}
+if ( _instance == 0 )
+{
+_instance = new NumberingTypeMgr(eNBOType::NUMBERING);
+}
-return _instance;
+return _instance;
}
};
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index 92f9a76..e5a6a2b 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -1318,7 +1318,6 @@ NumberingTypeMgr* NumberingTypeMgr::_instance = 0;
NumberingTypeMgr::NumberingTypeMgr(const NBOType aType):
NBOTypeMgrBase(aType),
-//pNumSettingsArr( new NumSettingsArr_Impl ),
pNumberSettingsArr (new NumberSettingsArr_Impl)
{
Init();
@@ -1331,12 +1330,16 @@ NumberingTypeMgr::NumberingTypeMgr(const NBOType aType):
NumberingTypeMgr::NumberingTypeMgr(const NumberingTypeMgr aTypeMgr):
NBOTypeMgrBase(aTypeMgr),
-//pNumSettingsArr( new NumSettingsArr_Impl ),
pNumberSettingsArr (new NumberSettingsArr_Impl)
{
ImplLoad(OUString(standard.syb));
}
+NumberingTypeMgr::~NumberingTypeMgr()
+{
+delete pNumberSettingsArr;
+}
+
void NumberingTypeMgr::Init()
{
Reference XComponentContext xContext =
::comphelper::getProcessComponentContext();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configmgr/CppunitTest_configmgr_unit.mk configmgr/qa
configmgr/CppunitTest_configmgr_unit.mk |2
configmgr/qa/unit/test.cxx | 77 +++-
2 files changed, 39 insertions(+), 40 deletions(-)
New commits:
commit e9b808bd2de9183daa31bfa9c93d6539ddcb0b62
Author: Michael Meeks michael.me...@collabora.com
Date: Tue Sep 10 16:56:18 2013 +0100
configmgr: cleanup unit test pieces.
Change-Id: I3d849a1676c638d431a15672c5a7253b70f4e610
diff --git a/configmgr/CppunitTest_configmgr_unit.mk
b/configmgr/CppunitTest_configmgr_unit.mk
index 15647b6..500051c 100644
--- a/configmgr/CppunitTest_configmgr_unit.mk
+++ b/configmgr/CppunitTest_configmgr_unit.mk
@@ -19,7 +19,7 @@ $(eval $(call
gb_CppunitTest_use_library_objects,configmgr_unit,configmgr))
$(eval $(call gb_CppunitTest_use_sdk_api,configmgr_unit,))
-$(eval $(call gb_Library_use_libraries,configmgr_unit, \
+$(eval $(call gb_CppunitTest_use_libraries,configmgr_unit, \
comphelper \
cppu \
cppuhelper \
diff --git a/configmgr/qa/unit/test.cxx b/configmgr/qa/unit/test.cxx
index bf119b4..fa32488 100644
--- a/configmgr/qa/unit/test.cxx
+++ b/configmgr/qa/unit/test.cxx
@@ -52,9 +52,8 @@
#include rtl/ustring.h
#include rtl/ustring.hxx
#include sal/types.h
-#include cppunit/TestFixture.h
-#include cppunit/extensions/HelperMacros.h
-#include cppunit/plugin/TestPlugIn.h
+#include comphelper/processfactory.hxx
+#include unotest/bootstrapfixturebase.hxx
namespace {
@@ -141,11 +140,13 @@ TestThread::TestThread(
stop_(stop), success_(true)
{}
-bool TestThread::getSuccess() const {
+bool TestThread::getSuccess() const
+{
return success_;
}
-void TestThread::run() {
+void TestThread::run()
+{
try {
while (!stop_.check()) {
if (!iteration()) {
@@ -179,7 +180,8 @@ ReaderThread::ReaderThread(
create();
}
-bool ReaderThread::iteration() {
+bool ReaderThread::iteration()
+{
return test_.getKey(path_, relative_).hasValue();
}
@@ -251,7 +253,8 @@ RecursiveTest::RecursiveTest(
test_(theTest), count_(count), destroyed_(destroyed)
{}
-void RecursiveTest::test() {
+void RecursiveTest::test()
+{
properties_ = css::uno::Reference css::beans::XPropertySet (
test_.createUpdateAccess(
OUString(
@@ -267,7 +270,8 @@ void RecursiveTest::test() {
properties_, css::uno::UNO_QUERY_THROW)-dispose();
}
-RecursiveTest::~RecursiveTest() {
+RecursiveTest::~RecursiveTest()
+{
*destroyed_ = true;
}
@@ -301,7 +305,8 @@ SimpleRecursiveTest::SimpleRecursiveTest(
RecursiveTest(theTest, count, destroyed)
{}
-void SimpleRecursiveTest::step() const {
+void SimpleRecursiveTest::step() const
+{
test_.setKey(
OUString(
RTL_CONSTASCII_USTRINGPARAM(
@@ -324,7 +329,8 @@ CrossThreadTest::CrossThreadTest(
RecursiveTest(theTest, count, destroyed)
{}
-void CrossThreadTest::step() const {
+void CrossThreadTest::step() const
+{
osl::Condition stop;
stop.set();
WriterThread(
@@ -342,32 +348,18 @@ void CrossThreadTest::step() const {
OUString(Label));
}
-void Test::setUp() {
-char const * forward = getForwardString();
-rtl_uString * registry = 0;
-CPPUNIT_ASSERT(
-rtl_convertStringToUString(
-registry, forward, rtl_str_getLength(forward),
-osl_getThreadTextEncoding(),
-(RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_ERROR |
- RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_ERROR |
- RTL_TEXTTOUNICODE_FLAGS_INVALID_ERROR)));
-context_ = css::uno::Reference css::uno::XComponentContext (
-css::uno::Reference css::beans::XPropertySet (
-cppu::createRegistryServiceFactory(
-OUString(registry, SAL_NO_ACQUIRE)),
-css::uno::UNO_QUERY_THROW)-getPropertyValue(
-OUString(DefaultContext)),
-css::uno::UNO_QUERY_THROW);
-provider_ = css::configuration::theDefaultProvider::get(context_);
+void Test::setUp()
+{
+provider_ = css::configuration::theDefaultProvider::get(
+comphelper::getProcessComponentContext() );
}
-void Test::tearDown() {
-css::uno::Reference css::lang::XComponent (
-context_, css::uno::UNO_QUERY_THROW)-dispose();
+void Test::tearDown()
+{
}
-void Test::testKeyFetch() {
+void Test::testKeyFetch()
+{
OUString s;
CPPUNIT_ASSERT(
getKey(
@@ -381,7 +373,8 @@ void Test::testKeyFetch() {
s);
}
-void Test::testKeySet() {
+void Test::testKeySet()
+{
setKey(
OUString(/org.openoffice.Setup/Test),
OUString(AString),
@@ -395,7 +388,8 @@ void Test::testKeySet() {
CPPUNIT_ASSERT( s == baa );
}
-void Test::testKeyReset() {
+void Test::testKeyReset()
+{
if (resetKey(
OUString(/org.openoffice.Setup/Test),
OUString(AString)))
@@ -410,7 +404,8 @@ void Test::testKeyReset() {
}
}
-void Test::testSetSetMemberName() {
+void
[Libreoffice-commits] core.git: vcl/source
vcl/source/filter/wmf/enhwmf.cxx | 20
vcl/source/filter/wmf/winmtf.cxx | 13 +
vcl/source/filter/wmf/winmtf.hxx |1 +
vcl/source/filter/wmf/wmf.cxx|7 +++
4 files changed, 29 insertions(+), 12 deletions(-)
New commits:
commit ae8cbeeba09607d34c3e0209bda3ccfdd71f0cbb
Author: Armin Le Grand a...@apache.org
Date: Tue Sep 10 11:48:33 2013 +
Resolves: #i123216# No FontScaling by WorldTransform on WMF import
(cherry picked from commit d0ebb70c004761552016b0fa0a259ef35a01f840)
Conflicts:
svtools/source/filter/wmf/enhwmf.cxx
svtools/source/filter/wmf/winmtf.cxx
svtools/source/filter/wmf/winmtf.hxx
svtools/source/filter/wmf/wmf.cxx
Change-Id: I3e85dcc019028b83eb2f650f1527333f2d5cf9dc
diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx
index c09b317..6ceecc9 100644
--- a/vcl/source/filter/wmf/enhwmf.cxx
+++ b/vcl/source/filter/wmf/enhwmf.cxx
@@ -1174,14 +1174,18 @@ sal_Bool EnhWMFReader::ReadEnhWMF()
}
aLogFont.alfFaceName = OUString( lfFaceName );
-// #i121382# Need to apply WorldTransform to
FontHeight/Width; this should be completely
-// changed to basegfx::B2DHomMatrix instead of 'struct
XForm', but not now due to time
-// constraints and dangers
-const XForm rXF = pOut-GetWorldTransform();
-const basegfx::B2DHomMatrix aWT(rXF.eM11, rXF.eM21,
rXF.eDx, rXF.eM12, rXF.eM22, rXF.eDy);
-const basegfx::B2DVector aTransVec(aWT *
basegfx::B2DVector(aLogFont.lfWidth, aLogFont.lfHeight));
-aLogFont.lfWidth = aTransVec.getX();
-aLogFont.lfHeight = aTransVec.getY();
+// #i123216# Not used in the test case of #121382#
(always identity in XForm), also
+// no hints in ms docu if FontSize should be scaled
with WT. Using with the example
+// from #i123216# creates errors, so removing.
+//
+// // #i121382# Need to apply WorldTransform to
FontHeight/Width; this should be completely
+// // changed to basegfx::B2DHomMatrix instead of
'struct XForm', but not now due to time
+// // constraints and dangers
+// const XForm rXF = pOut-GetWorldTransform();
+// const basegfx::B2DHomMatrix aWT(rXF.eM11, rXF.eM21,
rXF.eDx, rXF.eM12, rXF.eM22, rXF.eDy);
+// const basegfx::B2DVector aTransVec(aWT *
basegfx::B2DVector(aLogFont.lfWidth, aLogFont.lfHeight));
+// aLogFont.lfWidth = aTransVec.getX();
+// aLogFont.lfHeight = aTransVec.getY();
pOut-CreateObject( nIndex, GDI_FONT, new
WinMtfFontStyle( aLogFont ) );
}
diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx
index 0972dcd..e189e0c 100644
--- a/vcl/source/filter/wmf/winmtf.cxx
+++ b/vcl/source/filter/wmf/winmtf.cxx
@@ -2069,10 +2069,10 @@ void WinMtfOutput::ModifyWorldTransform( const XForm
rXForm, sal_uInt32 nMode )
{
case MWT_IDENTITY :
{
-maXForm.eM11 = maXForm.eM12 = maXForm.eM21 = maXForm.eM22 = 1.0f;
-maXForm.eDx = maXForm.eDy = 0.0f;
+maXForm.eM11 = maXForm.eM22 = 1.0f;
+maXForm.eM12 = maXForm.eM21 = maXForm.eDx = maXForm.eDy = 0.0f;
+break;
}
-break;
case MWT_RIGHTMULTIPLY :
case MWT_LEFTMULTIPLY :
@@ -2131,8 +2131,13 @@ void WinMtfOutput::ModifyWorldTransform( const XForm
rXForm, sal_uInt32 nMode )
maXForm.eM22 = cF[1][1];
maXForm.eDx = cF[2][0];
maXForm.eDy = cF[2][1];
+break;
+}
+case MWT_SET:
+{
+SetWorldTransform(rXForm);
+break;
}
-break;
}
}
diff --git a/vcl/source/filter/wmf/winmtf.hxx b/vcl/source/filter/wmf/winmtf.hxx
index df64f2a..3d3ee97 100644
--- a/vcl/source/filter/wmf/winmtf.hxx
+++ b/vcl/source/filter/wmf/winmtf.hxx
@@ -52,6 +52,7 @@
#define MWT_IDENTITY1
#define MWT_LEFTMULTIPLY2
#define MWT_RIGHTMULTIPLY 3
+#define MWT_SET 4
#define ENHMETA_STOCK_OBJECT0x8000
diff --git a/vcl/source/filter/wmf/wmf.cxx b/vcl/source/filter/wmf/wmf.cxx
index 3c06d55..c0e2f46 100644
--- a/vcl/source/filter/wmf/wmf.cxx
+++ b/vcl/source/filter/wmf/wmf.cxx
@@ -45,6 +45,13 @@ sal_Bool ConvertWMFToGDIMetaFile( SvStream rStreamWMF,
GDIMetaFile rGDIMetaF
{
WMFReader( rStreamWMF, rGDIMetaFile, pConfigItem, pExtHeader
).ReadWMF( );
}
+
+#ifdef DBG_UTIL
+// #i123216# allow a look at CheckSum and ByteSize for
[Libreoffice-commits] core.git: sd/source
sd/source/core/sdpage.cxx | 41 +
1 file changed, 25 insertions(+), 16 deletions(-)
New commits:
commit 6eb71f711e84cd285fe997bebdb5896f7e16b33f
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Sep 10 14:36:13 2013 -0400
We can use plain char array for these, only to avoid C++11 construct.
Hopefully this will keep our tinderboxes happy.
Change-Id: I3f7d398407fea2da858a1567c264f4c9bc35ff7b
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index bd806ee..6e21aef 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -850,16 +850,23 @@ void SdPage::CreateTitleAndLayout(sal_Bool bInit,
sal_Bool bCreate )
}
}
-static const std::vectorrtl::OUString PageKindVector =
{PK_STANDARD,PK_NOTES , PK_HANDOUT};
-static const std::vectorrtl::OUString PresObjKindVector = {PRESOBJ_NONE,
PRESOBJ_TITLE, PRESOBJ_OUTLINE,
- PRESOBJ_TEXT
,PRESOBJ_GRAPHIC , PRESOBJ_OBJECT,
- PRESOBJ_CHART,
PRESOBJ_ORGCHART, PRESOBJ_TABLE,
- PRESOBJ_IMAGE,
PRESOBJ_PAGE, PRESOBJ_HANDOUT,
-
PRESOBJ_NOTES,PRESOBJ_HEADER, PRESOBJ_FOOTER,
-
PRESOBJ_DATETIME, PRESOBJ_SLIDENUMBER, PRESOBJ_CALC,
- PRESOBJ_MEDIA,
PRESOBJ_MAX };
-
-void getPresObjProp( SdPage rPage, const rtl::OUString sObjKind, const
rtl::OUString sPageKind, double presObjPropValue[])
+namespace {
+
+const char* PageKindVector[] = {
+PK_STANDARD,PK_NOTES , PK_HANDOUT
+};
+
+const char* PresObjKindVector[] = {
+PRESOBJ_NONE, PRESOBJ_TITLE, PRESOBJ_OUTLINE,
+PRESOBJ_TEXT ,PRESOBJ_GRAPHIC , PRESOBJ_OBJECT,
+PRESOBJ_CHART, PRESOBJ_ORGCHART, PRESOBJ_TABLE,
+PRESOBJ_IMAGE, PRESOBJ_PAGE, PRESOBJ_HANDOUT,
+PRESOBJ_NOTES,PRESOBJ_HEADER, PRESOBJ_FOOTER,
+PRESOBJ_DATETIME, PRESOBJ_SLIDENUMBER, PRESOBJ_CALC,
+PRESOBJ_MEDIA, PRESOBJ_MAX
+};
+
+void getPresObjProp( SdPage rPage, const char* sObjKind, const char*
sPageKind, double presObjPropValue[] )
{
bool bNoObjectFound = true; //used to break from outer loop
@@ -873,7 +880,7 @@ void getPresObjProp( SdPage rPage, const rtl::OUString
sObjKind, const rtl::OUS
ReferenceXNode objectattr = objectattrlist-getNamedItem(type);
rtl::OUString sObjType = objectattr-getNodeValue();
-if(sObjType == sObjKind)
+if (sObjType.equalsAscii(sObjKind))
{
ReferenceXNodeList objectChildren =
objectNode-getChildNodes();
const int objSize = objectChildren-getLength();
@@ -890,7 +897,7 @@ void getPresObjProp( SdPage rPage, const rtl::OUString
sObjKind, const rtl::OUS
ReferenceXNode ObjPageKind =
ObjAttributes-getNamedItem(pagekind);
rtl::OUString sObjPageKind =
ObjPageKind-getNodeValue();
-if(sObjPageKind == sPageKind)
+if (sObjPageKind.equalsAscii(sPageKind))
{
ReferenceXNode ObjSizeHeight =
ObjAttributes-getNamedItem(relative-height);
rtl::OUString sValue =
ObjSizeHeight-getNodeValue();
@@ -920,6 +927,8 @@ void getPresObjProp( SdPage rPage, const rtl::OUString
sObjKind, const rtl::OUS
}
}
+}
+
SdrObject* SdPage::CreateDefaultPresObj(PresObjKind eObjKind, bool bInsert)
{
double propvalue[] = {0,0,0,0};
@@ -941,8 +950,8 @@ SdrObject* SdPage::CreateDefaultPresObj(PresObjKind
eObjKind, bool bInsert)
}
else if( (eObjKind == PRESOBJ_FOOTER) || (eObjKind == PRESOBJ_DATETIME) ||
(eObjKind == PRESOBJ_SLIDENUMBER) || (eObjKind == PRESOBJ_HEADER ) )
{
-rtl::OUString sObjKind = PresObjKindVector[eObjKind];
-rtl::OUString sPageKind = PageKindVector[mePageKind];
+const char* sObjKind = PresObjKindVector[eObjKind];
+const char* sPageKind = PageKindVector[mePageKind];
// create footer objects for standard master page
if( mePageKind == PK_STANDARD )
{
@@ -1026,7 +1035,7 @@ Rectangle SdPage::GetTitleRect() const
Size aTitleSize ( GetSize() );
aTitleSize.Width() -= GetLftBorder() + GetRgtBorder();
aTitleSize.Height() -= GetUppBorder() + GetLwrBorder();
-rtl::OUString sPageKind = PageKindVector[mePageKind];
+const char* sPageKind = PageKindVector[mePageKind];
if (mePageKind == PK_STANDARD)
{
@@ -1107,7 +1116,7 @@ Rectangle SdPage::GetLayoutRect() const
Size aLayoutSize ( GetSize() );
aLayoutSize.Width() -= GetLftBorder() + GetRgtBorder();
aLayoutSize.Height() -= GetUppBorder() + GetLwrBorder();
-
[Libreoffice-commits] core.git: 2 commits - connectivity/source dbaccess/Library_dba.mk
connectivity/source/drivers/firebird/Connection.hxx |1
connectivity/source/drivers/firebird/PreparedStatement.cxx | 39 +++
connectivity/source/drivers/firebird/ResultSet.cxx | 56 +--
connectivity/source/drivers/firebird/ResultSet.hxx |2
connectivity/source/drivers/firebird/Statement.cxx |7 -
connectivity/source/drivers/firebird/StatementCommonBase.cxx | 10 -
connectivity/source/drivers/firebird/StatementCommonBase.hxx |2
dbaccess/Library_dba.mk |6 -
8 files changed, 62 insertions(+), 61 deletions(-)
New commits:
commit ca247672c53418eb46c574e8ce5eae453b1969bd
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date: Tue Sep 10 12:57:00 2013 +0100
Remove unneeded lines.
Change-Id: Ica14f151653f57f01dfd46754b705231e8423fac
diff --git a/dbaccess/Library_dba.mk b/dbaccess/Library_dba.mk
index 27d2e99..3946776 100644
--- a/dbaccess/Library_dba.mk
+++ b/dbaccess/Library_dba.mk
@@ -20,12 +20,6 @@ $(eval $(call gb_Library_add_defs,dba,\
-DOOO_DLLIMPLEMENTATION_DBA \
))
-ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE)
-$(eval $(call gb_Library_add_defs,dba,\
--DENABLE_FIREBIRD_SDBC \
-))
-endif
-
$(eval $(call gb_Library_use_external,dba,boost_headers))
$(eval $(call gb_Library_use_sdk_api,dba))
commit 87bd0c8c8f2b6d66c32781d5dc81e7b9029ff544
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date: Tue Sep 10 07:10:20 2013 +0100
Reintroduce Statement specific mutexes. (firebird-sdbc)
This replaces the erronous Connection wide mutex. Libfbembed
is multithreaded hence we don't need a connection wide mutex.
Change-Id: Ifae79cdefecfe6597a535e36bda318563092bf6c
diff --git a/connectivity/source/drivers/firebird/Connection.hxx
b/connectivity/source/drivers/firebird/Connection.hxx
index 4a5c9e5..c20e6f6 100644
--- a/connectivity/source/drivers/firebird/Connection.hxx
+++ b/connectivity/source/drivers/firebird/Connection.hxx
@@ -167,7 +167,6 @@ namespace connectivity
::rtl::OUString getConnectionURL() const {return
m_sConnectionURL;}
sal_BoolisEmbedded()const {return m_bIsEmbedded;}
::rtl::OUString getUserName() const {return m_sUser;}
-::osl::Mutex getMutex() {return m_aMutex;}
isc_db_handle getDBHandle() {return m_aDBHandle;}
isc_tr_handle getTransaction()
throw(::com::sun::star::sdbc::SQLException);
diff --git a/connectivity/source/drivers/firebird/PreparedStatement.cxx
b/connectivity/source/drivers/firebird/PreparedStatement.cxx
index 29d0f00..d60fa28 100644
--- a/connectivity/source/drivers/firebird/PreparedStatement.cxx
+++ b/connectivity/source/drivers/firebird/PreparedStatement.cxx
@@ -66,7 +66,7 @@ OPreparedStatement::OPreparedStatement( Connection*
_pConnection,
void OPreparedStatement::ensurePrepared()
throw (SQLException, RuntimeException)
{
-MutexGuard aGuard(m_pConnection-getMutex());
+MutexGuard aGuard(m_aMutex);
checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed);
if (m_aStatementHandle)
@@ -147,7 +147,7 @@ uno::Sequence Type SAL_CALL
OPreparedStatement::getTypes()
Reference XResultSetMetaData SAL_CALL OPreparedStatement::getMetaData()
throw(SQLException, RuntimeException)
{
-::osl::MutexGuard aGuard( m_pConnection-getMutex() );
+::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed);
ensurePrepared();
@@ -159,7 +159,7 @@ Reference XResultSetMetaData SAL_CALL
OPreparedStatement::getMetaData()
void SAL_CALL OPreparedStatement::close() throw(SQLException, RuntimeException)
{
-MutexGuard aGuard( m_pConnection-getMutex() );
+MutexGuard aGuard( m_aMutex );
checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed);
OStatementCommonBase::close();
@@ -189,7 +189,7 @@ void SAL_CALL OPreparedStatement::setString(sal_Int32
nParameterIndex,
SAL_INFO(connectivity.firebird,
setString( nParameterIndex , x ));
-MutexGuard aGuard( m_pConnection-getMutex() );
+MutexGuard aGuard( m_aMutex );
checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed);
ensurePrepared();
@@ -234,7 +234,7 @@ void SAL_CALL OPreparedStatement::setString(sal_Int32
nParameterIndex,
Reference XConnection SAL_CALL OPreparedStatement::getConnection()
throw(SQLException, RuntimeException)
{
-MutexGuard aGuard( m_pConnection-getMutex() );
+MutexGuard aGuard( m_aMutex );
checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed);
return Reference XConnection (m_pConnection);
@@ -246,7 +246,7 @@ sal_Bool SAL_CALL OPreparedStatement::execute()
SAL_INFO(connectivity.firebird, executeQuery().
Got called with sql:m_sSqlStatement);
-MutexGuard aGuard( m_pConnection-getMutex() );
+MutexGuard
[Libreoffice-commits] core.git: cui/source
cui/source/options/treeopt.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 7b1a2641083085cb616e235a893f99387b569dff Author: Caolán McNamara caol...@redhat.com Date: Tue Sep 10 20:23:57 2013 +0100 CID#736321 resource leak Change-Id: Ic91875370809fb85f50af38b9db5ce8a5025e866 diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index d3c0b00..47cdb64 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -2034,6 +2034,7 @@ Module* OfaTreeOptionsDialog::LoadModule( } } } +break; } } return pModule; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: wizards/com
wizards/com/sun/star/wizards/ui/event/DataAware.py |3 +++ 1 file changed, 3 insertions(+) New commits: commit 6c3a09b3b3ca9ad0c81a55efaaedad35c39de767 Author: Xisco Fauli aniste...@gmail.com Date: Tue Sep 10 21:09:09 2013 +0200 pywizards: fix the switch between elements in the listboxs Change-Id: I4603232d158ad3adb60697dbf1425eb5dfe5d71f diff --git a/wizards/com/sun/star/wizards/ui/event/DataAware.py b/wizards/com/sun/star/wizards/ui/event/DataAware.py index 323257a..0fae91a 100644 --- a/wizards/com/sun/star/wizards/ui/event/DataAware.py +++ b/wizards/com/sun/star/wizards/ui/event/DataAware.py @@ -131,6 +131,9 @@ class DataAware(object): if useUno: uno.invoke(self._dataObject, set + self._field, (ui,)) else: +if isinstance(ui,tuple): +#Listbox Element +ui = ui[0] setattr(self._dataObject, self._field, ui) self.enableControls(ui) except Exception: ___ 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/sdpage.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 8243dd551e47182e4be429ab61f0a398044d3aa1
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Sep 10 20:50:39 2013 +0200
const
Change-Id: I0fdc9fd7592bae44e54c8e68c67f31ee0767d26e
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 6e21aef..099e8aa 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -852,11 +852,11 @@ void SdPage::CreateTitleAndLayout(sal_Bool bInit,
sal_Bool bCreate )
namespace {
-const char* PageKindVector[] = {
-PK_STANDARD,PK_NOTES , PK_HANDOUT
+const char* const PageKindVector[] = {
+PK_STANDARD, PK_NOTES, PK_HANDOUT
};
-const char* PresObjKindVector[] = {
+const char* const PresObjKindVector[] = {
PRESOBJ_NONE, PRESOBJ_TITLE, PRESOBJ_OUTLINE,
PRESOBJ_TEXT ,PRESOBJ_GRAPHIC , PRESOBJ_OBJECT,
PRESOBJ_CHART, PRESOBJ_ORGCHART, PRESOBJ_TABLE,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx
include/svx/swframevalidation.hxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 20235b5910a7dfa4d69f2391d0452ab81131757b
Author: Caolán McNamara caol...@redhat.com
Date: Tue Sep 10 20:43:59 2013 +0100
CID#738542 uninitialized member
Change-Id: I77a08ab89aa4cdc5895fdd5152154ede8de10ba2
diff --git a/include/svx/swframevalidation.hxx
b/include/svx/swframevalidation.hxx
index a42906e..4296f86 100644
--- a/include/svx/swframevalidation.hxx
+++ b/include/svx/swframevalidation.hxx
@@ -70,6 +70,7 @@ struct SvxSwFrameValidation
nMinWidth(0),
nMaxWidth(SAL_MAX_INT32),
nHeight( 283 ), //0.5 cm
+nMinHeight(0),
nMaxHeight(SAL_MAX_INT32)
{
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configmgr/CppunitTest_configmgr_unit.mk configmgr/Module_configmgr.mk configmgr/qa
configmgr/CppunitTest_configmgr_unit.mk | 53
configmgr/Module_configmgr.mk |4 ++
configmgr/qa/unit/test.cxx | 11 +++---
3 files changed, 63 insertions(+), 5 deletions(-)
New commits:
commit e8c26959deac60eb2b7bec7a36fccacd95914304
Author: Jelle van der Waa je...@vdwaa.nl
Date: Tue Sep 10 17:28:03 2013 +0200
fdo#46723 enable configmgr unit tests
Change-Id: Id2a10374d207fc079093cdb9a78ac30171251e46
diff --git a/configmgr/CppunitTest_configmgr_unit.mk
b/configmgr/CppunitTest_configmgr_unit.mk
new file mode 100644
index 000..15647b6
--- /dev/null
+++ b/configmgr/CppunitTest_configmgr_unit.mk
@@ -0,0 +1,53 @@
+# -*- 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,configmgr_unit))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,configmgr_unit, \
+configmgr/qa/unit/test \
+))
+
+$(eval $(call gb_CppunitTest_use_library_objects,configmgr_unit,configmgr))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,configmgr_unit,))
+
+$(eval $(call gb_Library_use_libraries,configmgr_unit, \
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+ salhelper \
+ test \
+ unotest \
+ xmlreader \
+ i18nlangtag \
+ $(gb_UWINAPI) \
+))
+
+$(eval $(call gb_CppunitTest_use_components,configmgr_unit,\
+configmgr/source/configmgr \
+fileaccess/source/fileacc \
+framework/util/fwk \
+i18npool/util/i18npool \
+i18npool/source/search/i18nsearch \
+sax/source/expatwrap/expwrap \
+sfx2/util/sfx \
+ucb/source/core/ucb1 \
+ucb/source/ucp/file/ucpfile1 \
+unoxml/source/service/unoxml \
+uui/util/uui \
+))
+
+$(eval $(call gb_CppunitTest_use_externals,configmgr_unit,\
+boost_headers \
+icu_headers \
+icudata \
+))
diff --git a/configmgr/Module_configmgr.mk b/configmgr/Module_configmgr.mk
index d465efb..eb40178 100644
--- a/configmgr/Module_configmgr.mk
+++ b/configmgr/Module_configmgr.mk
@@ -17,4 +17,8 @@ $(eval $(call
gb_Module_add_subsequentcheck_targets,configmgr,\
JunitTest_configmgr_unoapi \
))
+#$(eval $(call gb_Module_add_check_targets,configmgr,\
+# CppunitTest_configmgr_unit \
+#))
+
# vim: set noet sw=4 ts=4:
diff --git a/configmgr/qa/unit/test.cxx b/configmgr/qa/unit/test.cxx
index 1e609a3..bf119b4 100644
--- a/configmgr/qa/unit/test.cxx
+++ b/configmgr/qa/unit/test.cxx
@@ -41,7 +41,6 @@
#include com/sun/star/uno/XInterface.hpp
#include com/sun/star/util/XChangesBatch.hpp
#include cppuhelper/implbase1.hxx
-#include cppuhelper/servicefactory.hxx
#include osl/conditn.hxx
#include osl/thread.h
#include osl/thread.hxx
@@ -53,7 +52,9 @@
#include rtl/ustring.h
#include rtl/ustring.hxx
#include sal/types.h
-#include testshl/simpleheader.hxx
+#include cppunit/TestFixture.h
+#include cppunit/extensions/HelperMacros.h
+#include cppunit/plugin/TestPlugIn.h
namespace {
@@ -478,7 +479,7 @@ void Test::testReadCommands() {
}
}
n = osl_getGlobalTimer() - n;
-t_print(Reading elements took % SAL_PRIuUINT32 ms\n, n);
+printf(Reading elements took % SAL_PRIuUINT32 ms\n, n);
css::uno::Reference css::lang::XComponent (
access, css::uno::UNO_QUERY_THROW)-dispose();
}
@@ -629,10 +630,10 @@ css::uno::Reference css::uno::XInterface
Test::createUpdateAccess(
css::uno::Sequence css::uno::Any (arg, 1));
}
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Test, alltest);
+CPPUNIT_TEST_SUITE_REGISTRATION(Test);
}
-NOADDITIONAL;
+CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 4 commits - cppuhelper/source filter/Configuration_filter.mk i18npool/CustomTarget_localedata.mk RepositoryExternal.mk scp2/inc scp2/source solenv/gbuild testtools/Cust
RepositoryExternal.mk | 10 +- cppuhelper/source/unorc|2 +- filter/Configuration_filter.mk |3 +-- i18npool/CustomTarget_localedata.mk|2 +- scp2/inc/macros.inc|2 +- scp2/source/base/postgresqlsdbc.scp|2 +- scp2/source/extensions/file_extensions.scp |4 ++-- scp2/source/ooo/file_ooo.scp | 12 ++-- scp2/source/ooo/ure.scp|2 +- scp2/source/python/file_python.scp |2 +- solenv/gbuild/AllLangResTarget.mk | 10 -- solenv/gbuild/Configuration.mk | 19 +++ solenv/gbuild/CppunitTest.mk |4 ++-- solenv/gbuild/Gallery.mk |2 +- solenv/gbuild/Pagein.mk| 24 +--- solenv/gbuild/Rdb.mk | 22 -- solenv/gbuild/TargetLocations.mk |7 ++- testtools/CustomTarget_bridgetest.mk |8 testtools/CustomTarget_uno_test.mk |6 +++--- 19 files changed, 64 insertions(+), 79 deletions(-) New commits: commit 36a619e7e5303294c6d1dffd75e6cee5ee668d0f Author: Matúš Kukan matus.ku...@gmail.com Date: Mon May 27 16:31:01 2013 +0200 gbuild: bin obsoleted gb_Configuration__get_source Change-Id: If6f125b83114643430fcc02a2ec7f59ab406da7b diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk index b671626..b986390 100644 --- a/filter/Configuration_filter.mk +++ b/filter/Configuration_filter.mk @@ -257,8 +257,7 @@ endef # $(call filter_Configuration_add_ui_filter,configuration,prefix,xcufile) define filter_Configuration_add_ui_filter ifeq ($(WITH_LANG),) -$(filter_XcuFilterUiTarget) : \ - $(call gb_Configuration__get_source,$(1),$(2)/$(3)) +$(filter_XcuFilterUiTarget) : $(SRCDIR)/$(2)/$(3) else $(call gb_XcuMergeTarget_XcuMergeTarget,$(2)/$(3),$(1),$(2),$(3)) $(filter_XcuFilterUiTarget) : \ diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk index ca62c72..a82d3e1 100644 --- a/solenv/gbuild/Configuration.mk +++ b/solenv/gbuild/Configuration.mk @@ -40,9 +40,6 @@ # = *.po #= XcsTarget (schema) -# TODO: This is obsolete--we do not have multiple repos anymore. Drop -# the first arugment of gb_Configuration__get_source and clean up its -# uses. Or just replace it by $(SRCDIR)/... . # Per-repo pattern rules for each repository do not work for all targets # because the prerequisites of some targets need to have the stem mangled # and this does not seem to be possible in GNU make because when the stem is @@ -54,7 +51,6 @@ # Targets where % rule per repo works: XcsTarget XcuDataTarget XcuMergeTarget # fails: XcuModuleTarget XcuLangpackTarget XcuResTarget # -gb_Configuration__get_source = $(SRCDIR)/$(2) # The main LibreOffice registry (cf. officecfg/Configuration_officecfg.mk): gb_Configuration_PRIMARY_REGISTRY_NAME := registry @@ -158,7 +154,7 @@ $(call gb_XcuDataTarget_get_clean_target,%) : # XcuModuleTarget class define gb_XcuDataSource_for_XcuModuleTarget -$(call gb_Configuration__get_source,$(1),$(basename $(subst -,.,$(basename $(2.xcu) +$(SRCDIR)/$(basename $(subst -,.,$(basename $(1.xcu endef define gb_XcsTarget_for_XcuModuleTarget @@ -253,7 +249,7 @@ $(call gb_XcuMergeTarget_get_clean_target,%) : # $(call gb_XcuMergeTarget_XcuMergeTarget,target,configuration,prefix,xcufile) define gb_XcuMergeTarget_XcuMergeTarget $(call gb_XcuMergeTarget_get_target,$(1)) : \ - $(call gb_Configuration__get_source,$(2),$(3)/$(4)) \ + $(SRCDIR)/$(3)/$(4) \ $(wildcard $(foreach lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $(1))).po)) $(call gb_XcuMergeTarget_get_target,$(1)) : \ POFILES := $(foreach lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $(1))).po) @@ -291,8 +287,7 @@ $(call gb_XcuResTarget_get_clean_target,%) : # this depends either on the source or on the merge target (if WITH_LANG) define gb_XcuResTarget_XcuResTarget ifeq ($(strip $(gb_WITH_LANG)),) -$(call gb_XcuResTarget_get_target,$(1)) : \ - $(call gb_Configuration__get_source,$(2),$(3)/$(4)) +$(call gb_XcuResTarget_get_target,$(1)) : $(SRCDIR)/$(3)/$(4) else $(call gb_XcuResTarget_get_target,$(1)) : \ $(call gb_XcuMergeTarget_get_target,$(3)/$(4)) @@ -338,7 +333,7 @@ define gb_Configuration_add_schema $(call gb_Configuration_get_clean_target,$(1)) : \ $(call gb_XcsTarget_get_clean_target,$(2)/$(3)) $(call gb_XcsTarget_get_target,$(2)/$(3)) : \ - $(call gb_Configuration__get_source,$(1),$(2)/$(3)) \ + $(SRCDIR)/$(2)/$(3) \ $(call gb_Configuration_get_preparation_target,$(1)) $(call gb_XcsTarget_get_target,$(2)/$(3)) : PRIMARY_REGISTRY := $(filter $(1),$(gb_Configuration_PRIMARY_REGISTRY_NAME)) $(call gb_XcsTarget_get_target,$(2)/$(3)) : XCSFILE
[Libreoffice-commits] core.git: Branch 'private/kohei/formula-opencl-work' - sc/source
sc/source/core/opencl/formulagroupcl.cxx | 14 +
sc/source/core/opencl/oclkernels.hxx |5 +
sc/source/core/opencl/openclwrapper.cxx | 39 --
sc/source/core/opencl/openclwrapper.hxx | 84 +++
sc/source/core/tool/formulagroup.cxx |2
5 files changed, 75 insertions(+), 69 deletions(-)
New commits:
commit ef1cd0c12eaddc6f1f30e73c37cf301c1fbe430d
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Sep 10 17:01:15 2013 -0400
Put all opencl related code inside sc::opencl namespace.
Change-Id: Ia6c1fd88ed08022347c60af33a8620b9cf278c12
diff --git a/sc/source/core/opencl/formulagroupcl.cxx
b/sc/source/core/opencl/formulagroupcl.cxx
index 279ac2d..62d70de 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -7,7 +7,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include config_features.h
#include formulagroup.hxx
#include document.hxx
#include formulacell.hxx
@@ -23,12 +22,11 @@
#define SINGLEARRAYLEN 100
#define DOUBLEARRAYLEN 100
#define SVDOUBLELEN 100
-namespace sc {
+
+namespace sc { namespace opencl {
// A single public entry point for a factory function:
-namespace opencl {
-extern sc::FormulaGroupInterpreter *createFormulaGroupInterpreter();
-}
+extern sc::FormulaGroupInterpreter *createFormulaGroupInterpreter();
/time test dbg
double getTimeDiff(const TimeValue t1, const TimeValue t2)
@@ -1063,17 +1061,15 @@ bool
FormulaGroupInterpreterGroundwater::interpret(ScDocument rDoc, const ScAdd
return true;
}
-namespace opencl {
-
sc::FormulaGroupInterpreter *createFormulaGroupInterpreter()
{
if (getenv(SC_SOFTWARE))
return NULL;
if (getenv(SC_GROUNDWATER))
-return new sc::FormulaGroupInterpreterGroundwater();
+return new FormulaGroupInterpreterGroundwater();
-return new sc::FormulaGroupInterpreterOpenCL();
+return new FormulaGroupInterpreterOpenCL();
}
} // namespace opencl
diff --git a/sc/source/core/opencl/oclkernels.hxx
b/sc/source/core/opencl/oclkernels.hxx
index 53917b3..3e0af5b 100644
--- a/sc/source/core/opencl/oclkernels.hxx
+++ b/sc/source/core/opencl/oclkernels.hxx
@@ -12,6 +12,9 @@
#ifndef USE_EXTERNAL_KERNEL
#define KERNEL( ... )# __VA_ARGS__
+
+namespace sc { namespace opencl {
+
// Double precision is a default of spreadsheets
// cl_khr_fp64: Khronos extension
// cl_amd_fp64: AMD extension
@@ -380,6 +383,8 @@ __kernel void oclSub( fp_t ltData, __global fp_t *rtData,
__global fp_t *outData
}
);
+}}
+
#endif // USE_EXTERNAL_KERNEL
#endif //_OCL_KERNEL_H_
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/opencl/openclwrapper.cxx
b/sc/source/core/opencl/openclwrapper.cxx
index 6db498b..75e991b 100644
--- a/sc/source/core/opencl/openclwrapper.cxx
+++ b/sc/source/core/opencl/openclwrapper.cxx
@@ -7,24 +7,19 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include stdio.h
-#include stdlib.h
-#include string.h
-#include cmath
+#include openclwrapper.hxx
+
#include sal/config.h
#include random.hxx
-#include openclwrapper.hxx
#include oclkernels.hxx
-#ifdef SAL_WIN32
-#include Windows.h
-#endif
-//#define USE_MAP_BUFFER
-using namespace std;
-GPUEnv OpenclDevice::gpuEnv;
-int OpenclDevice::isInited =0;
+#include stdio.h
+#include stdlib.h
+#include string.h
+#include cmath
-#ifdef SAL_WIN32
+#ifdef WIN32
+#include Windows.h
#define OPENCL_DLL_NAME opencllo.dll
#define OCLERR -1
@@ -40,6 +35,16 @@ int OpenclDevice::isInited =0;
#define OCL_CHECK(value1,value2,str) \
if(value1!=value2) \
fprintf(stderr,[OCL_ERROR] %s\n,str);
+#endif
+
+using namespace std;
+
+namespace sc { namespace opencl {
+
+GPUEnv OpenclDevice::gpuEnv;
+int OpenclDevice::isInited =0;
+
+#ifdef WIN32
HINSTANCE HOpenclDll = NULL;
void * OpenclDll = NULL;
@@ -69,7 +74,7 @@ void OpenclDevice::freeOpenclDll()
int OpenclDevice::initEnv()
{
-#ifdef SAL_WIN32
+#ifdef WIN32
while( 1 )
{
if( 1 == loadOpencl() )
@@ -83,14 +88,14 @@ int OpenclDevice::initEnv()
int OpenclDevice::releaseOpenclRunEnv()
{
releaseOpenclEnv( gpuEnv );
-#ifdef SAL_WIN32
+#ifdef WIN32
freeOpenclDll();
#endif
return 1;
}
///
///
-inline int OpenclDevice::addKernelConfig( int kCount, const char *kName )
+int OpenclDevice::addKernelConfig( int kCount, const char *kName )
{
if ( kCount 1 )
fprintf(stderr,Error: ( KCount 1 ) SAL_DETAIL_WHERE
addKernelConfig\n );
@@ -2660,4 +2665,6 @@ int OclCalc::oclHostMatrixInverse32Bits( const char*
aKernelName, float *fpOclMa
return 0;
}
+}}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/opencl/openclwrapper.hxx
b/sc/source/core/opencl/openclwrapper.hxx
index cf3b4f1..d1e8925
XRowLocate::findColumn API definition ambiguities
Hi everyone, The definition of XRowLocate::findColumn, and its implementations, all seem to be slightly confused. XRowLocate doesn't specify what should happen what happens if findColumn is called for an invalid column name. Currently some drivers return -1, some drivers return the number of columns + 1 (they loop over all the columns and don't check for this case). A number of implementations actually have comments to the effect that they should return -1 or throw an Exception. In the case of JDBC drivers: the JDBC specification states that an SQLException should be thrown in this case. This is therefore probably what happens with any JDBC driver since findColumn is just passed directly to JDBC (this also includes the HSQLDB driver which runs via JDBC). This means that any user of findColumn has to expect either an exception or various invalid numerical values. (IMHO the Exception is most correct and is what I've done for now with the Firebird driver.) Is it OK if I rewrite the specification of findColumn to mirror that of the JDBC specification, perhaps with a note that some drivers may still return invalid values instead? (Of course I'd also upgrade all the drivers to reflect the new specification -- so this note would only apply to any external drivers -- are there any?) Cheers, Andrzej ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 21eae1933ccbaf3399dd63df2db44ad0f302edf4 Author: Michael Stahl mst...@redhat.com Date: Tue Sep 10 22:49:19 2013 +0200 configure: PRODUCTNAME changes on --enable-release-build, ... not on --enable-dbgutil as erroneously assumed in 2c1f814d36d7d61b28cca2740d916cfb841095c7. Apparently the other (non-naming) changes of omitting --enable-release-build are DEVELOPMENTPRODUCT 1 which causes WRITE_REGISTRY to be set to 0 and LOCALUSERDIR $ORIGIN/... Change-Id: Ib3ea3b7f21523773490836853d155985b68719ee diff --git a/configure.ac b/configure.ac index 3219584..e3f8543 100644 --- a/configure.ac +++ b/configure.ac @@ -12139,7 +12139,7 @@ fi AC_SUBST(WITH_COMPAT_OOWRAPPERS) AC_MSG_CHECKING([for product name]) -if test -n $enable_dbgutil -a $enable_dbgutil != no; then +if test $enable_release_build = -o $enable_release_build = no; then PRODUCTNAME=AC_PACKAGE_NAMEDev else PRODUCTNAME=AC_PACKAGE_NAME ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/kohei/formula-opencl-work' - sc/source
sc/source/core/opencl/formulagroupcl.cxx |8
sc/source/core/tool/formulagroup.cxx |2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
New commits:
commit 9e4a6760a5a2045696f86bdf26913d26699e4ac3
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Sep 10 17:10:15 2013 -0400
Disable dummy and groundwater interpreters from the default build.
They are of no use in the default build.
Change-Id: Ie3b874a5c78123436736318357fa48baafd991f3
diff --git a/sc/source/core/opencl/formulagroupcl.cxx
b/sc/source/core/opencl/formulagroupcl.cxx
index 62d70de..dada7e0 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -18,6 +18,8 @@
#include openclwrapper.hxx
+#define USE_GROUNDWATER_INTERPRETER 0
+
#define SRCDATASIZE 100
#define SINGLEARRAYLEN 100
#define DOUBLEARRAYLEN 100
@@ -947,6 +949,8 @@ bool FormulaGroupInterpreterOpenCL::interpret( ScDocument
rDoc, const ScAddress
return false;
}
+#if USE_GROUNDWATER_INTERPRETER
+
/// Special case of formula compiler for groundwatering
class FormulaGroupInterpreterGroundwater : public
FormulaGroupInterpreterSoftware
{
@@ -1061,13 +1065,17 @@ bool
FormulaGroupInterpreterGroundwater::interpret(ScDocument rDoc, const ScAdd
return true;
}
+#endif
+
sc::FormulaGroupInterpreter *createFormulaGroupInterpreter()
{
if (getenv(SC_SOFTWARE))
return NULL;
+#if USE_GROUNDWATER_INTERPRETER
if (getenv(SC_GROUNDWATER))
return new FormulaGroupInterpreterGroundwater();
+#endif
return new FormulaGroupInterpreterOpenCL();
}
diff --git a/sc/source/core/tool/formulagroup.cxx
b/sc/source/core/tool/formulagroup.cxx
index d8ba564..04bec4f 100644
--- a/sc/source/core/tool/formulagroup.cxx
+++ b/sc/source/core/tool/formulagroup.cxx
@@ -21,7 +21,7 @@
#include vector
#include boost/unordered_map.hpp
-#define USE_DUMMY_INTERPRETER 1
+#define USE_DUMMY_INTERPRETER 0
#if USE_DUMMY_INTERPRETER
#include cstdio
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter-2' - sc/source
sc/source/core/opencl/formulagroupcl.cxx |8
sc/source/core/tool/formulagroup.cxx |2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
New commits:
commit 69df845f854d49f86e05ee9266054b38540726b3
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Sep 10 17:10:15 2013 -0400
Disable dummy and groundwater interpreters from the default build.
They are of no use in the default build.
Change-Id: Ie3b874a5c78123436736318357fa48baafd991f3
diff --git a/sc/source/core/opencl/formulagroupcl.cxx
b/sc/source/core/opencl/formulagroupcl.cxx
index 352d0bf..4fe03ae 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -18,6 +18,8 @@
#include openclwrapper.hxx
+#define USE_GROUNDWATER_INTERPRETER 0
+
#define SRCDATASIZE 100
#define SINGLEARRAYLEN 100
#define DOUBLEARRAYLEN 100
@@ -954,6 +956,8 @@ bool FormulaGroupInterpreterOpenCL::interpret( ScDocument
rDoc, const ScAddress
return false;
}
+#if USE_GROUNDWATER_INTERPRETER
+
/// Special case of formula compiler for groundwatering
class FormulaGroupInterpreterGroundwater : public
FormulaGroupInterpreterSoftware
{
@@ -1068,13 +1072,17 @@ bool
FormulaGroupInterpreterGroundwater::interpret(ScDocument rDoc, const ScAdd
return true;
}
+#endif
+
sc::FormulaGroupInterpreter *createFormulaGroupInterpreter()
{
if (getenv(SC_SOFTWARE))
return NULL;
+#if USE_GROUNDWATER_INTERPRETER
if (getenv(SC_GROUNDWATER))
return new FormulaGroupInterpreterGroundwater();
+#endif
return new FormulaGroupInterpreterOpenCL();
}
diff --git a/sc/source/core/tool/formulagroup.cxx
b/sc/source/core/tool/formulagroup.cxx
index d8ba564..04bec4f 100644
--- a/sc/source/core/tool/formulagroup.cxx
+++ b/sc/source/core/tool/formulagroup.cxx
@@ -21,7 +21,7 @@
#include vector
#include boost/unordered_map.hpp
-#define USE_DUMMY_INTERPRETER 1
+#define USE_DUMMY_INTERPRETER 0
#if USE_DUMMY_INTERPRETER
#include cstdio
___
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' - 9b/ab8d99eab92b6ea0e171ac18d45e2283b86e19
9b/ab8d99eab92b6ea0e171ac18d45e2283b86e19 |1 + 1 file changed, 1 insertion(+) New commits: commit 0690363f552cef6208e67801975311a93145031b Author: Caolán McNamara caol...@redhat.com Date: Tue Sep 10 18:41:03 2013 +0100 Notes added by 'git notes add' diff --git a/9b/ab8d99eab92b6ea0e171ac18d45e2283b86e19 b/9b/ab8d99eab92b6ea0e171ac18d45e2283b86e19 new file mode 100644 index 000..592a6bc --- /dev/null +++ b/9b/ab8d99eab92b6ea0e171ac18d45e2283b86e19 @@ -0,0 +1 @@ +prefer: a7403bf7c12048b8c7eefadd63b021a71cfa5de0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit bc273e9e0d7b3a8c17beffa71a3165eb1c034d82 Author: Eike Rathke er...@redhat.com Date: Tue Sep 10 23:21:09 2013 +0200 Updated core Project: translations c4768e4b398b6090f524ae801d74ad55879239ca diff --git a/translations b/translations index 54fd99c..c4768e4 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 54fd99cf0cda479641a91bb9e7f2ebe8a8384b1c +Subproject commit c4768e4b398b6090f524ae801d74ad55879239ca ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter-2' - sc/source
sc/source/core/opencl/formulagroupcl.cxx | 14 +
sc/source/core/opencl/oclkernels.hxx |5 +
sc/source/core/opencl/openclwrapper.cxx | 39 --
sc/source/core/opencl/openclwrapper.hxx | 84 +++
sc/source/core/tool/formulagroup.cxx |2
5 files changed, 75 insertions(+), 69 deletions(-)
New commits:
commit 3e8fab98560f1e0b250bc1478ce84bd8ad9a8d41
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Sep 10 17:01:15 2013 -0400
Put all opencl related code inside sc::opencl namespace.
Change-Id: Ia6c1fd88ed08022347c60af33a8620b9cf278c12
diff --git a/sc/source/core/opencl/formulagroupcl.cxx
b/sc/source/core/opencl/formulagroupcl.cxx
index 33eb834..352d0bf 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -7,7 +7,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include config_features.h
#include formulagroup.hxx
#include document.hxx
#include formulacell.hxx
@@ -23,12 +22,11 @@
#define SINGLEARRAYLEN 100
#define DOUBLEARRAYLEN 100
#define SVDOUBLELEN 100
-namespace sc {
+
+namespace sc { namespace opencl {
// A single public entry point for a factory function:
-namespace opencl {
-extern sc::FormulaGroupInterpreter *createFormulaGroupInterpreter();
-}
+extern sc::FormulaGroupInterpreter *createFormulaGroupInterpreter();
/time test dbg
double getTimeDiff(const TimeValue t1, const TimeValue t2)
@@ -1070,17 +1068,15 @@ bool
FormulaGroupInterpreterGroundwater::interpret(ScDocument rDoc, const ScAdd
return true;
}
-namespace opencl {
-
sc::FormulaGroupInterpreter *createFormulaGroupInterpreter()
{
if (getenv(SC_SOFTWARE))
return NULL;
if (getenv(SC_GROUNDWATER))
-return new sc::FormulaGroupInterpreterGroundwater();
+return new FormulaGroupInterpreterGroundwater();
-return new sc::FormulaGroupInterpreterOpenCL();
+return new FormulaGroupInterpreterOpenCL();
}
} // namespace opencl
diff --git a/sc/source/core/opencl/oclkernels.hxx
b/sc/source/core/opencl/oclkernels.hxx
index 53917b3..3e0af5b 100644
--- a/sc/source/core/opencl/oclkernels.hxx
+++ b/sc/source/core/opencl/oclkernels.hxx
@@ -12,6 +12,9 @@
#ifndef USE_EXTERNAL_KERNEL
#define KERNEL( ... )# __VA_ARGS__
+
+namespace sc { namespace opencl {
+
// Double precision is a default of spreadsheets
// cl_khr_fp64: Khronos extension
// cl_amd_fp64: AMD extension
@@ -380,6 +383,8 @@ __kernel void oclSub( fp_t ltData, __global fp_t *rtData,
__global fp_t *outData
}
);
+}}
+
#endif // USE_EXTERNAL_KERNEL
#endif //_OCL_KERNEL_H_
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/opencl/openclwrapper.cxx
b/sc/source/core/opencl/openclwrapper.cxx
index 6db498b..75e991b 100644
--- a/sc/source/core/opencl/openclwrapper.cxx
+++ b/sc/source/core/opencl/openclwrapper.cxx
@@ -7,24 +7,19 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include stdio.h
-#include stdlib.h
-#include string.h
-#include cmath
+#include openclwrapper.hxx
+
#include sal/config.h
#include random.hxx
-#include openclwrapper.hxx
#include oclkernels.hxx
-#ifdef SAL_WIN32
-#include Windows.h
-#endif
-//#define USE_MAP_BUFFER
-using namespace std;
-GPUEnv OpenclDevice::gpuEnv;
-int OpenclDevice::isInited =0;
+#include stdio.h
+#include stdlib.h
+#include string.h
+#include cmath
-#ifdef SAL_WIN32
+#ifdef WIN32
+#include Windows.h
#define OPENCL_DLL_NAME opencllo.dll
#define OCLERR -1
@@ -40,6 +35,16 @@ int OpenclDevice::isInited =0;
#define OCL_CHECK(value1,value2,str) \
if(value1!=value2) \
fprintf(stderr,[OCL_ERROR] %s\n,str);
+#endif
+
+using namespace std;
+
+namespace sc { namespace opencl {
+
+GPUEnv OpenclDevice::gpuEnv;
+int OpenclDevice::isInited =0;
+
+#ifdef WIN32
HINSTANCE HOpenclDll = NULL;
void * OpenclDll = NULL;
@@ -69,7 +74,7 @@ void OpenclDevice::freeOpenclDll()
int OpenclDevice::initEnv()
{
-#ifdef SAL_WIN32
+#ifdef WIN32
while( 1 )
{
if( 1 == loadOpencl() )
@@ -83,14 +88,14 @@ int OpenclDevice::initEnv()
int OpenclDevice::releaseOpenclRunEnv()
{
releaseOpenclEnv( gpuEnv );
-#ifdef SAL_WIN32
+#ifdef WIN32
freeOpenclDll();
#endif
return 1;
}
///
///
-inline int OpenclDevice::addKernelConfig( int kCount, const char *kName )
+int OpenclDevice::addKernelConfig( int kCount, const char *kName )
{
if ( kCount 1 )
fprintf(stderr,Error: ( KCount 1 ) SAL_DETAIL_WHERE
addKernelConfig\n );
@@ -2660,4 +2665,6 @@ int OclCalc::oclHostMatrixInverse32Bits( const char*
aKernelName, float *fpOclMa
return 0;
}
+}}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/opencl/openclwrapper.hxx
b/sc/source/core/opencl/openclwrapper.hxx
index cf3b4f1..d1e8925
[Libreoffice-commits] core.git: 2 commits - i18nlangtag/qa i18nlangtag/README i18nlangtag/source i18npool/Library_localedata_euro.mk i18npool/source instsetoo_native/util l10ntools/source setup_native
i18nlangtag/README | 66 i18nlangtag/qa/cppunit/test_languagetag.cxx | 34 +- i18nlangtag/source/isolang/isolang.cxx | 23 - i18nlangtag/source/languagetag/languagetag.cxx | 22 + i18npool/Library_localedata_euro.mk |6 i18npool/source/localedata/data/sh_ME.xml | 58 --- i18npool/source/localedata/data/sh_RS.xml | 256 --- i18npool/source/localedata/data/sh_YU.xml | 58 --- i18npool/source/localedata/data/sr_Latn_ME.xml | 59 +++ i18npool/source/localedata/data/sr_Latn_RS.xml | 257 i18npool/source/localedata/data/sr_Latn_YU.xml | 59 +++ i18npool/source/localedata/localedata.cxx |6 instsetoo_native/util/pack.lst |6 l10ntools/source/ulfconv/msi-encodinglist.txt |2 setup_native/source/packinfo/spellchecker_selection.txt |4 solenv/inc/langlist.mk |2 16 files changed, 514 insertions(+), 404 deletions(-) New commits: commit e759a9864677d10b936f8e50dc87dd3a214435c5 Author: Eike Rathke er...@redhat.com Date: Tue Sep 10 23:16:16 2013 +0200 added description of tag change process Change-Id: Ib539961099561d3b8d437f8f21dbe363f17b0ded diff --git a/i18nlangtag/README b/i18nlangtag/README index 88ca43b..edb8dc8 100644 --- a/i18nlangtag/README +++ b/i18nlangtag/README @@ -1,3 +1,67 @@ Code for language tags, LanguageTag wrapper for liblangtag and converter between BCP47 language tags, Locale(Language,Country,Variant) and MS-LangIDs. -Basic functionality used by almost every other module including comphelper, so even don't use that string helpers in this code to not create circular dependencies. Stick with sal! +Basic functionality used by almost every other module including comphelper, so even don't use that string helpers in this code to not create circular dependencies. Stick with sal and rtl! + + + +If Microsoft introduced a new LCID for a locale that we previously defined as LANGUAGE_USER_..., for example LANGUAGE_CATALAN_VALENCIAN that we had as LANGUAGE_USER_CATALAN_VALENCIAN: + +* include/i18nlangtag/lang.h +** add the new LANGUAGE_... value as defined by MS, here LANGUAGE_CATALAN_VALENCIAN +** rename the LANGUAGE_USER_... definition to LANGUAGE_OBSOLETE_USER_..., here LANGUAGE_USER_CATALAN_VALENCIAN to LANGUAGE_OBSOLETE_USER_CATALAN_VALENCIAN +** add a #define LANGUAGE_USER_CATALAN_VALENCIAN LANGUAGE_CATALAN_VALENCIAN +*** so svtools/source/misc/langtab.src (where the defined name is an identifier) and other places using LANGUAGE_USER_CATALAN_VALENCIAN do not need to be changed + +* i18nlangtag/source/isolang/isolang.cxx +** insert a mapping with LANGUAGE_CATALAN_VALENCIAN before (!) the existing LANGUAGE_USER_CATALAN_VALENCIAN +** rename the LANGUAGE_USER_CATALAN_VALENCIAN to LANGUAGE_OBSOLETE_USER_CATALAN_VALENCIAN +*** so converting the tag maps to the new LANGUAGE_CATALAN_VALENCIAN and converting the old LANGUAGE_OBSOLETE_USER_CATALAN_VALENCIAN still maps to the tag. + +* i18nlangtag/source/isolang/mslangid.cxx +** add an entry to MsLangId::getReplacementForObsoleteLanguage() to convert LANGUAGE_OBSOLETE_USER_CATALAN_VALENCIAN to LANGUAGE_CATALAN_VALENCIAN + + + +When changing a (translation's) language tag (for example, 'ca-XV' to 'ca-valencia' or 'sh' to 'sr-Latn'): + +* solenv/inc/langlist.mk +** replace the tag and sort alphabetically + +* in translations/source do git mv old-tag new-tag +** note that translations is a git submodule so https://wiki.documentfoundation.org/Development/Submodules applies + +* i18nlangtag/source/isolang/isolang.cxx +** maintain the old tag's mapping entry in aImplIsoLangEntries to be able to read existing documents using that code +** add the new tag's mapping to aImplBcp47CountryEntries or aImplIsoLangScriptEntries +** change mbOverrideExists from false to true in aImplIsoLangScriptEntries + +* i18nlangtag/source/languagetag/languagetag.cxx +** add the new tag's fallback strings to the fallback of the old tag in LanguageTag::getFallbackStrings() + +* i18nlangtag/qa/cppunit/test_languagetag.cxx +** add a unit test for the new tag and old tag + +* instsetoo_native/util/pack.lst +** replace the tag in List_of_languages and sort alphabetically + +* l10ntools/source/ulfconv/msi-encodinglist.txt +** replace the tag and sort alphabetically + +* setup_native/source/packinfo/spellchecker_selection.txt +** replace the tag + +If locale data exists: + +* i18npool/source/localedata/data/*.xml for example i18npool/source/localedata/data/sh_RS.xml +** in the LC_INFO element +*** change LangID to 'qlt' +*** after the Country element add a Variant element with the new full BCP 47 tag, for example 'sr-Latn-RS' + note that Variant has no VariantID or DefaultName child elements +** if any of the other *.xml
[Libreoffice-commits] core.git: 8 commits - android/sdremote
android/sdremote/AndroidManifest.xml
| 10
android/sdremote/res/drawable-hdpi/ic_action_resume.png
|binary
android/sdremote/res/drawable-mdpi/ic_action_resume.png
|binary
android/sdremote/res/drawable-xhdpi/ic_action_resume.png
|binary
android/sdremote/res/layout-land/fragment_empty_slide.xml
|8
android/sdremote/res/layout-land/fragment_slides_pager.xml
|9
android/sdremote/res/layout/fragment_empty_slide.xml
| 23
android/sdremote/res/layout/fragment_slides_pager.xml
| 75 +--
android/sdremote/res/menu/menu_action_bar_slide_show.xml
| 11
android/sdremote/res/values/colors.xml
|1
android/sdremote/res/values/dimens.xml
|1
android/sdremote/res/values/strings.xml
|7
android/sdremote/src/org/libreoffice/impressremote/activity/SlideShowActivity.java
| 75 ++-
android/sdremote/src/org/libreoffice/impressremote/adapter/SlidesPagerAdapter.java
| 10
android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java
| 47 +
android/sdremote/src/org/libreoffice/impressremote/fragment/ComputersFragment.java
| 247 +-
android/sdremote/src/org/libreoffice/impressremote/fragment/EmptySlideFragment.java
| 30 +
android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesPagerFragment.java
| 71 ++
android/sdremote/src/org/libreoffice/impressremote/util/BluetoothOperator.java
| 40 +
android/sdremote/src/org/libreoffice/impressremote/util/Fragments.java
|2
android/sdremote/src/org/libreoffice/impressremote/util/SavedStates.java
|2
21 files changed, 470 insertions(+), 199 deletions(-)
New commits:
commit 06b632f0d367178b7266e50c6f140ef36984733f
Author: Artur Dryomov artur.dryo...@gmail.com
Date: Wed Sep 11 01:17:51 2013 +0300
Fix notes jumps.
* Remove empty spaces not reset while changing text via TextSwitcher.
* Scroll notes to the top on changes because outer ScrollView remembers
current position not respecting TextSwitcher state of course.
Change-Id: I3e9ba458e4ce6b13e5b02675ca28d6c7c5829f00
diff --git a/android/sdremote/res/layout/fragment_slides_pager.xml
b/android/sdremote/res/layout/fragment_slides_pager.xml
index d572db0..04a6294 100644
--- a/android/sdremote/res/layout/fragment_slides_pager.xml
+++ b/android/sdremote/res/layout/fragment_slides_pager.xml
@@ -28,6 +28,7 @@
android:paddingTop=@dimen/padding_header/
ScrollView
+android:id=@+id/scroll_notes
android:layout_width=wrap_content
android:layout_height=wrap_content
@@ -35,6 +36,7 @@
android:id=@+id/text_switcher_notes
android:inAnimation=@android:anim/fade_in
android:outAnimation=@android:anim/fade_out
+android:measureAllChildren=false
android:paddingTop=@dimen/padding_slide_notes
android:paddingLeft=@dimen/padding_slide_notes
android:paddingRight=@dimen/padding_slide_notes
diff --git
a/android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesPagerFragment.java
b/android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesPagerFragment.java
index aa86de0..29de294 100644
---
a/android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesPagerFragment.java
+++
b/android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesPagerFragment.java
@@ -24,6 +24,7 @@ import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import android.widget.ScrollView;
import android.widget.TextSwitcher;
import com.actionbarsherlock.app.SherlockFragment;
@@ -143,6 +144,7 @@ public class SlidesPagerFragment extends SherlockFragment
implements ServiceConn
if (areSlideNotesAvailable(aSlideIndex)) {
showSlideNotes(aSlideIndex);
+scrollSlideNotes();
}
else {
hideSlideNotes();
@@ -172,6 +174,12 @@ public class SlidesPagerFragment extends SherlockFragment
implements ServiceConn
return (TextSwitcher) getView().findViewById(R.id.text_switcher_notes);
}
+private void scrollSlideNotes() {
+ScrollView aSlideNotesScroll = (ScrollView)
getView().findViewById(R.id.scroll_notes);
+
+aSlideNotesScroll.scrollTo(0, 0);
+}
+
private void hideSlideNotes() {
[Libreoffice-commits] core.git: 2 commits - desktop/Package_scripts_install.mk desktop/Package_scripts.mk desktop/scripts readlicense_oo/CustomTarget_readme.mk
desktop/Package_scripts.mk|6 +-
desktop/Package_scripts_install.mk|6 +-
desktop/scripts/ure-link |1 -
readlicense_oo/CustomTarget_readme.mk |2 +-
4 files changed, 3 insertions(+), 12 deletions(-)
New commits:
commit 242668950059744d1ef6b54d30bf91fc10cd273d
Author: Michael Stahl mst...@redhat.com
Date: Tue Sep 10 18:00:20 2013 +0200
desktop: ure-link is installed by ure/Packge_install.mk already
Change-Id: Ic575d340d0b3b42dc9b07790ab094c8ce6016329
diff --git a/desktop/Package_scripts.mk b/desktop/Package_scripts.mk
index aa6dc5d..f47fc8c 100644
--- a/desktop/Package_scripts.mk
+++ b/desktop/Package_scripts.mk
@@ -9,11 +9,7 @@
$(eval $(call gb_Package_Package,desktop_scripts,$(SRCDIR)/desktop/scripts))
-ifeq ($(OS),WNT)
-
-$(eval $(call gb_Package_add_file,desktop_scripts,bin/ure-link,ure-link))
-
-else
+ifneq ($(OS),WNT)
$(eval $(call gb_Package_add_file,desktop_scripts,bin/gdbtrace,gdbtrace))
$(eval $(call gb_Package_add_file,desktop_scripts,bin/sbase,sbase.sh))
diff --git a/desktop/Package_scripts_install.mk
b/desktop/Package_scripts_install.mk
index 3c7fbcb..c64c2bd 100644
--- a/desktop/Package_scripts_install.mk
+++ b/desktop/Package_scripts_install.mk
@@ -11,11 +11,7 @@ $(eval $(call
gb_Package_Package,desktop_scripts_install,$(SRCDIR)/desktop/scrip
$(eval $(call gb_Package_set_outdir,desktop_scripts_install,$(INSTDIR)))
-ifeq ($(OS),WNT)
-
-$(eval $(call
gb_Package_add_file,desktop_scripts_install,bin/ure-link,ure-link))
-
-else
+ifneq ($(OS),WNT)
$(eval $(call
gb_Package_add_file,desktop_scripts_install,$(gb_PROGRAMDIRNAME)/gdbtrace,gdbtrace))
$(eval $(call
gb_Package_add_file,desktop_scripts_install,$(gb_PROGRAMDIRNAME)/sbase,sbase.sh))
diff --git a/desktop/scripts/ure-link b/desktop/scripts/ure-link
deleted file mode 100755
index 122de34..000
--- a/desktop/scripts/ure-link
+++ /dev/null
@@ -1 +0,0 @@
-URE
\ No newline at end of file
commit 18976a2d90f5dd000ad1f685ac7b8c42ed2b401c
Author: Michael Stahl mst...@redhat.com
Date: Tue Sep 10 17:03:17 2013 +0200
use $(PRODUCTNAME) variable for README
Change-Id: I0314112570ed9ef2090b25f1e19cb2c0a853da76
diff --git a/readlicense_oo/CustomTarget_readme.mk
b/readlicense_oo/CustomTarget_readme.mk
index a16becc..0d9c5ee 100644
--- a/readlicense_oo/CustomTarget_readme.mk
+++ b/readlicense_oo/CustomTarget_readme.mk
@@ -42,7 +42,7 @@ $(readlicense_oo_DIR)/readme.xrm : \
endif
readlicense_oo_README_SED := \
- -e 's,$${PRODUCTNAME},LibreOffice,g' \
+ -e 's,$${PRODUCTNAME},$(PRODUCTNAME),g' \
-e 's,$${PRODUCTVERSION},$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR),g'
\
$(readlicense_oo_DIR)/$(call gb_README,%) : \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - cui/source lotuswordpro/source
cui/source/options/treeopt.cxx |2 ++
lotuswordpro/source/filter/lwptable.cxx | 21 +
2 files changed, 7 insertions(+), 16 deletions(-)
New commits:
commit 890a48813134a43de31afd8ac3939fa454b610fe
Author: Caolán McNamara caol...@redhat.com
Date: Tue Sep 10 20:32:36 2013 +0100
CID#736398 resource leak
Change-Id: Ie1fc0aa191950bdf26fd376ec1e2c8ae69acde83
diff --git a/lotuswordpro/source/filter/lwptable.cxx
b/lotuswordpro/source/filter/lwptable.cxx
index a8d328c..1a3022f 100644
--- a/lotuswordpro/source/filter/lwptable.cxx
+++ b/lotuswordpro/source/filter/lwptable.cxx
@@ -197,7 +197,6 @@ void LwpGlossary::Read()
sal_uInt16 FiledEntries = m_pObjStrm-QuickReaduInt16();
sal_uInt16 NumIndexRows = GetNumIndexRows();
-sal_uInt16 * cpIndex = NULL;
if (FiledEntries NumIndexRows)
{
/* We'll have to do sequential (slow) searches. */
@@ -207,23 +206,13 @@ void LwpGlossary::Read()
{
if (NumIndexRows)
{
-sal_uInt16 EntriesRead, EntryCount;
-sal_uInt16 *pRowID;
+sal_uInt16 EntriesRead = (FiledEntries NumIndexRows)?
NumIndexRows:FiledEntries;
-cpIndex = new sal_uInt16[NumIndexRows];
+for (sal_uInt16 EntryCount = 1; EntryCount = EntriesRead;
EntryCount++)
+m_pObjStrm-QuickReaduInt16();
-if (cpIndex)
-{
-pRowID = cpIndex;
-
-EntriesRead = (FiledEntries NumIndexRows)?
NumIndexRows:FiledEntries;
-
-for (EntryCount = 1; EntryCount = EntriesRead; EntryCount++)
-*pRowID++ = m_pObjStrm-QuickReaduInt16();
-
-if (FiledEntries EntriesRead)
-m_pObjStrm-SeekRel((FiledEntries - EntriesRead)*
sizeof(sal_uInt16));
-}
+if (FiledEntries EntriesRead)
+m_pObjStrm-SeekRel((FiledEntries - EntriesRead)*
sizeof(sal_uInt16));
}
else
m_pObjStrm-SeekRel(FiledEntries * sizeof(sal_uInt16));
commit 2e96061e6d796110ea74513b71aee560ac01cd57
Author: Caolán McNamara caol...@redhat.com
Date: Tue Sep 10 20:29:12 2013 +0100
CID#736323 resource leak
Change-Id: I264011a8371e71e28bda8ed853894088f680cd71
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 47cdb64..3602995 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -2155,6 +2155,8 @@ VectorOfNodes OfaTreeOptionsDialog::LoadNodes(
{
pModule ? aNodeList.push_back( pNode ) :
aOutNodeList.push_back( pNode );
}
+else
+delete pNode;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: dbaccess::ODatabaseContext cleaning its cache too late?
On 10/09/13 18:40, Lionel Elie Mamane wrote: 2) Run a python script like import uno localContext = uno.getComponentContext() resolver = localContext.ServiceManager.createInstanceWithContext( com.sun.star.bridge.UnoUrlResolver, localContext ) ctx = resolver.resolve(uno:socket,host=localhost,port=2002;urp;StarOffice.ComponentContext ) smgr = ctx.ServiceManager dbCtx = smgr.createInstanceWithContext( com.sun.star.sdb.DatabaseContext,ctx) The ODatabaseContext that just got created, to what window would it be tied? or some shell in sfx2 speak, Is the notion of shell different than window? Would the above scenario have a shell, but no window? specifically some SfxViewShell or SfxObjectShell... which dbaccess doesn't use. it probably has some other implementation of css;:frame::XFrame/XModel though. but in this case of course there's no XFrame in sight; one could expect the service instance to be destroyed when dbCtx is reset... unless it needs an explicit close() or dispose()... the question is when this happens in end user scenario like the below bug report, is the database context tied to some document or not; perhaps the document is _also_ leaked? (see also http://wiki.openoffice.org/wiki/Documentation/DevGuide/OfficeDev/Closing_Documents ) In the context of https://bugs.freedesktop.org/69036, I would like to see who holds a reference to the DatabaseContext that gets closed. It is my understanding that (because we have reference-counting garbage collection), dispose() should actually be called as soon as nobody holds a reference to it anymore (unless we have a reference cycle). dispose() may sometimes be used as a way of breaking a reference cycle, causing one of the reference to be released. How can I find that out? Anything better than breaking on the constructor and going a few frames up, and reading the code to try to guess where the reference is leaked / stored / ..., and then breaking on any function that returns the reference as result, etc? you could override the acquire()/relese() methods on the service implementation class and set breakpoints there. but that may get frustrating if it's passed around a lot... i guess tools like valgrind can only tell you if it's leaked, not what continues to hold on to it. My end goal is to see if I cannot rather close the putative reference leak or break the putative cycle, so that the DatabaseContext is disposed as soon as it is not used anymore. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [ANN] feature/instdir pushed to master
On 10/09/13 15:18, Matúš Kukan wrote: On 10 September 2013 09:13, Miklos Vajna vmik...@collabora.co.uk wrote: Nitpick: dev-install tweaks bootstraprc, so UserInstallation points to $SYSUSERCONFIG/libreoffice/4, not $SYSUSERCONFIG/libreofficedev/4 as instdir currently has it. Is this intentional? No such change is intentional. It should produce the same directory structure modulo some missing files. (or some which should not be there) It should be the same as PRODUCTNAME, --enable-dbgutil has 'dev' suffix. Are you sure both files are generated with the same autogen parameters ? actually i noticed that configure.ac always set PRODUCTNAME to LibreOffice and changed it to LibreOfficeDev for --enable-dbgutil like it used to be in instsetoo_native/util/openoffice.lst.in; this changed not only the README etc. files that were touched in the branch, but also other pre-existing uses like the above config dir, which i suspect were wrong. unless of course there is some consensus that using a different name for dbgutil builds is silly and should be removed. i don't actually care either way. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - include/svx svx/source
include/svx/nbdtmg.hxx| 70 +--
svx/source/sidebar/nbdtmg.cxx | 234 ++
svx/source/sidebar/nbdtmgfact.cxx | 22 ++-
3 files changed, 139 insertions(+), 187 deletions(-)
New commits:
commit e938e65cbbe63d33c07cdd3594086136e2c6ba09
Author: Caolán McNamara caol...@redhat.com
Date: Tue Sep 10 20:17:03 2013 +0100
CID#1038282 Resource leak in sidebar
Change-Id: I959b0b975f32158bcc0377a1a92c6c9c1b9190b6
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index 71ce3a0..e118198 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -1313,9 +1313,10 @@ NumberingTypeMgr::NumberingTypeMgr()
ImplLoad(OUString(standard.syb));
}
-NumberingTypeMgr::NumberingTypeMgr(const NumberingTypeMgr rTypeMgr):
-NBOTypeMgrBase(rTypeMgr),
-pNumberSettingsArr (new NumberSettingsArr_Impl)
+NumberingTypeMgr::NumberingTypeMgr(const NumberingTypeMgr rTypeMgr)
+: NBOTypeMgrBase(rTypeMgr)
+, pNumberSettingsArr (new NumberSettingsArr_Impl)
+, pDefaultNumberSettingsArr(NULL)
{
ImplLoad(OUString(standard.syb));
}
@@ -1323,6 +1324,7 @@ NumberingTypeMgr::NumberingTypeMgr(const
NumberingTypeMgr rTypeMgr):
NumberingTypeMgr::~NumberingTypeMgr()
{
delete pNumberSettingsArr;
+delete pDefaultNumberSettingsArr;
}
class theNumberingTypeMgr : public rtl::StaticNumberingTypeMgr,
theNumberingTypeMgr {};
commit 020e29fb95d742b160feab1df6751e59d4108239
Author: Caolán McNamara caol...@redhat.com
Date: Tue Sep 10 19:12:15 2013 +0100
convert singletons to preferred rtl::Static pattern
Change-Id: I44c4f742027124c517a37fd8b6a62fc69f62d55f
diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx
index f52897e..c736abd 100644
--- a/include/svx/nbdtmg.hxx
+++ b/include/svx/nbdtmg.hxx
@@ -242,9 +242,8 @@ class SVX_DLLPUBLIC BulletsTypeMgr: public NBOTypeMgrBase
static sal_Unicode aDynamicBulletTypes[DEFAULT_BULLET_TYPES];
static sal_Unicode aDynamicRTLBulletTypes[DEFAULT_BULLET_TYPES];
static BulletsSettings_Impl* pActualBullets[DEFAULT_BULLET_TYPES];
-static BulletsTypeMgr* _instance;
public:
-BulletsTypeMgr(const NBOType aType);
+BulletsTypeMgr();
BulletsTypeMgr(const BulletsTypeMgr aTypeMgr);
virtual ~BulletsTypeMgr() {}
virtual void Init();
@@ -255,16 +254,7 @@ class SVX_DLLPUBLIC BulletsTypeMgr: public NBOTypeMgrBase
virtual sal_Bool IsCustomized(sal_uInt16 nIndex);
sal_Unicode GetBulChar(sal_uInt16 nIndex);
Font GetBulCharFont(sal_uInt16 nIndex);
-static BulletsTypeMgr* GetInstance()
-{
- if ( _instance == 0 )
-{
-_instance = new BulletsTypeMgr(eNBOType::BULLETS);
-}
-
-return _instance;
-}
-
+static BulletsTypeMgr GetInstance();
};
class SVX_DLLPUBLIC GraphyicBulletsTypeMgr: public NBOTypeMgrBase
@@ -274,9 +264,8 @@ class SVX_DLLPUBLIC GraphyicBulletsTypeMgr: public
NBOTypeMgrBase
public:
typedef std::vectorGrfBulDataRelation* ListType;
ListType aGrfDataLst;
-static GraphyicBulletsTypeMgr* _instance;
public:
-GraphyicBulletsTypeMgr(const NBOType aType);
+GraphyicBulletsTypeMgr();
GraphyicBulletsTypeMgr(const GraphyicBulletsTypeMgr aTypeMgr);
virtual ~GraphyicBulletsTypeMgr();
virtual void Init();
@@ -286,16 +275,7 @@ class SVX_DLLPUBLIC GraphyicBulletsTypeMgr: public
NBOTypeMgrBase
virtual OUString GetDescription(sal_uInt16 nIndex,sal_Bool
isDefault=false);
virtual sal_Bool IsCustomized(sal_uInt16 nIndex);
OUString GetGrfName(sal_uInt16 nIndex);
-static GraphyicBulletsTypeMgr* GetInstance()
-{
- if ( _instance == 0 )
-{
-_instance = new
GraphyicBulletsTypeMgr(eNBOType::BULLETS);
-}
-
-return _instance;
-}
-
+static GraphyicBulletsTypeMgr GetInstance();
};
class SVX_DLLPUBLIC MixBulletsTypeMgr: public NBOTypeMgrBase
@@ -305,9 +285,8 @@ class SVX_DLLPUBLIC MixBulletsTypeMgr: public NBOTypeMgrBase
public:
static MixBulletsSettings_Impl* pActualBullets[DEFAULT_BULLET_TYPES];
static MixBulletsSettings_Impl*
pDefaultActualBullets[DEFAULT_BULLET_TYPES];
-static MixBulletsTypeMgr* _instance;
public:
-MixBulletsTypeMgr(const NBOType aType);
+MixBulletsTypeMgr();
MixBulletsTypeMgr(const MixBulletsTypeMgr aTypeMgr);
virtual ~MixBulletsTypeMgr() {}
virtual void Init();
@@ -316,27 +295,16 @@ class SVX_DLLPUBLIC MixBulletsTypeMgr: public
NBOTypeMgrBase
virtual sal_Bool ApplyNumRule(SvxNumRule aNum,sal_uInt16
nIndex,sal_uInt16 mLevel=(sal_uInt16)0x,sal_Bool isDefault=false,sal_Bool
isResetSize=false);
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Bug 60270 depends on bug 65022, which changed state. Bug 65022 Summary: Format - Paragraph/Page = Silent Crash https://bugs.freedesktop.org/show_bug.cgi?id=65022 What|Removed |Added Status|RESOLVED|REOPENED Resolution|FIXED |--- -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'private/kohei/formula-opencl-work' - Repository.mk RepositoryModule_host.mk sc/inc sc/Library_sc.mk sc/Library_scopencl.mk sc/Module_sc.mk sc/source
Repository.mk |1 RepositoryModule_host.mk|2 - sc/Library_sc.mk|9 --- sc/Library_scopencl.mk | 37 sc/Module_sc.mk |6 + sc/inc/document.hxx |2 - sc/source/core/opencl/openclwrapper.cxx |1 sc/source/core/tool/formulagroup.cxx| 16 + 8 files changed, 62 insertions(+), 12 deletions(-) New commits: commit 518bbf0560ed96b9f87bea4e9fb38617344c2939 Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Tue Sep 10 21:09:24 2013 -0400 First step toward splitting the opencl code into own shared library. Change-Id: I44fa3ded8d48b2972af17b78ab6c0af03e024f36 diff --git a/Repository.mk b/Repository.mk index cff654b..4d5125b 100644 --- a/Repository.mk +++ b/Repository.mk @@ -155,6 +155,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,calc, \ scfilt \ scui \ solver \ + $(if $(ENABLE_OPENCL),scopencl) \ $(if $(DISABLE_SCRIPTING),,vbaobj) \ $(if $(ENABLE_TELEPATHY),tubes) \ )) diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index c577734..0b22952 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -246,7 +246,7 @@ endef # the default goal is all (see Module.mk) ifeq (,$(filter-out all,$(MAKECMDGOALS))) $(eval $(call repositorymodule_serialize,\ - scfilt \ + scfilt scopencl \ $(if $(filter SCRIPTING,$(BUILD_TYPE)),vbaobj) \ sc msword swui sw sd \ $(if $(filter DBCONNECTIVITY,$(BUILD_TYPE)),dbu) \ diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk index bd1a9a3..d198737 100644 --- a/sc/Library_sc.mk +++ b/sc/Library_sc.mk @@ -54,15 +54,6 @@ $(eval $(call gb_Library_add_exception_objects,sc,\ )) endif -ifeq ($(ENABLE_OPENCL),TRUE) -$(eval $(call gb_Library_use_externals,sc,opencl)) - -$(eval $(call gb_Library_add_exception_objects,sc,\ - sc/source/core/opencl/formulagroupcl \ - sc/source/core/opencl/openclwrapper \ -)) -endif - $(eval $(call gb_Library_use_libraries,sc,\ avmedia \ basegfx \ diff --git a/sc/Library_scopencl.mk b/sc/Library_scopencl.mk new file mode 100644 index 000..f30f9c4 --- /dev/null +++ b/sc/Library_scopencl.mk @@ -0,0 +1,37 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Library_Library,scopencl)) + +$(eval $(call gb_Library_set_include,scopencl,\ + -I$(SRCDIR)/sc/source/core/inc \ + -I$(SRCDIR)/sc/inc \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_Library_set_precompiled_header,scopencl,$(SRCDIR)/sc/inc/pch/precompiled_scopencl)) + +$(eval $(call gb_Library_use_sdk_api,scopencl)) + +$(eval $(call gb_Library_use_libraries,scopencl,\ + for \ + forui \ + sal \ + sc \ + $(gb_UWINAPI) \ +)) + +$(eval $(call gb_Library_use_externals,scopencl,opencl)) + +$(eval $(call gb_Library_add_exception_objects,scopencl,\ + sc/source/core/opencl/formulagroupcl \ + sc/source/core/opencl/openclwrapper \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk index 35f1fc1..6522862 100644 --- a/sc/Module_sc.mk +++ b/sc/Module_sc.mk @@ -19,6 +19,12 @@ $(eval $(call gb_Module_add_targets,sc,\ UIConfig_scalc \ )) +ifeq ($(ENABLE_OPENCL),TRUE) +$(eval $(call gb_Module_add_targets,sc,\ + Library_scopencl \ +)) +endif + ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) $(eval $(call gb_Module_add_targets,sc,\ Library_scqahelper \ diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index 6993abb..1e720a8 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -1745,7 +1745,7 @@ public: * @param pResults array of numeric results. * @param nLen length of numeric results. */ -void SetFormulaResults( const ScAddress rTopPos, const double* pResults, size_t nLen ); +void SC_DLLPUBLIC SetFormulaResults( const ScAddress rTopPos, const double* pResults, size_t nLen ); private: ScDocument(const ScDocument r); // disabled with no definition diff --git a/sc/source/core/opencl/openclwrapper.cxx b/sc/source/core/opencl/openclwrapper.cxx index 75e991b..c46bdce 100644 --- a/sc/source/core/opencl/openclwrapper.cxx +++ b/sc/source/core/opencl/openclwrapper.cxx @@ -10,7 +10,6 @@ #include openclwrapper.hxx #include sal/config.h -#include random.hxx #include oclkernels.hxx #include stdio.h diff --git a/sc/source/core/tool/formulagroup.cxx b/sc/source/core/tool/formulagroup.cxx index 04bec4f..98ef4a9 100644 --- a/sc/source/core/tool/formulagroup.cxx +++ b/sc/source/core/tool/formulagroup.cxx @@
[Libreoffice-commits] calc/xlsx-import
calc/xlsx-import/shared-formula/1.xlsx |binary 1 file changed New commits: commit 06d71b65f2be94f2033a913d8c54d932e7b2ffbf Author: Kohei Yoshida kohei.yosh...@gmail.com Date: Tue Sep 10 21:35:49 2013 -0400 For shared formula import. This one crashes. diff --git a/calc/xlsx-import/shared-formula/1.xlsx b/calc/xlsx-import/shared-formula/1.xlsx new file mode 100644 index 000..c0b2c50 Binary files /dev/null and b/calc/xlsx-import/shared-formula/1.xlsx differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] calc/xls-import
calc/xls-import/shared-formula/1.xls |binary 1 file changed New commits: commit 89736326436377038415c075d6aa25eff424caac Author: Kohei Yoshida kohei.yosh...@gmail.com Date: Tue Sep 10 21:32:23 2013 -0400 For shared formula import. diff --git a/calc/xls-import/shared-formula/1.xls b/calc/xls-import/shared-formula/1.xls new file mode 100644 index 000..0100ff5 Binary files /dev/null and b/calc/xls-import/shared-formula/1.xls differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/inc
sd/inc/drawdoc.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 02b0d09ee02ea3ed3b489c2637f87c5e42aea71b
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Sep 10 23:54:11 2013 -0400
This syntax is C++11 only.
Change-Id: Ic14f5c0724b392f8864cca6661be8157c6358c1c
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index 85f4ab2..47be488 100644
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@ -278,7 +278,7 @@ public:
/// load xml-based impress master presentation object definitions into
document
void InitObjectVector();
/// return reference to vector of master presentation object definitions
-const
std::vectorcom::sun::star::uno::Referencecom::sun::star::xml::dom::XNode
GetObjectVector() const { return maPresObjectInfo; }
+const
std::vectorcom::sun::star::uno::Referencecom::sun::star::xml::dom::XNode
GetObjectVector() const { return maPresObjectInfo; }
/** Insert pages into this document
This method inserts whole pages into this document, either
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/filter/oox/formulabuffer.cxx |5 - 1 file changed, 4 insertions(+), 1 deletion(-) New commits: commit d66ae92ade617b390c879ac99d9bbca8a7b6617f Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Wed Sep 11 00:25:27 2013 -0400 Fix crashers on xlsx import, due to shared formula range being wrong. Shared formula range that Excel gives is incorrect about half the time. It's better to ignore that altogether. Change-Id: I2302c6dd1b5883e32305d4c511f942bf4cebca3a diff --git a/sc/source/filter/oox/formulabuffer.cxx b/sc/source/filter/oox/formulabuffer.cxx index 0651071..21e383f 100644 --- a/sc/source/filter/oox/formulabuffer.cxx +++ b/sc/source/filter/oox/formulabuffer.cxx @@ -166,7 +166,7 @@ void FormulaBuffer::applySharedFormulas( sal_Int32 nTab ) // shared formulas across multiple columns. ScFormulaCellGroupRef xNewGroup(new ScFormulaCellGroup); xNewGroup-mnStart = rRange.StartRow; -xNewGroup-mnLength = rRange.EndRow - rRange.StartRow + 1; +xNewGroup-mnLength = 1; // Length gets updated as we go. xNewGroup-setCode(*pArray); aGroups.set(nId, nCol, xNewGroup); } @@ -200,6 +200,9 @@ void FormulaBuffer::applySharedFormulas( sal_Int32 nTab ) continue; } +// Update the length of shared formula span as we go. The length +// that Excel gives is not always correct. +xGroup-mnLength = aPos.Row() - xGroup-mnStart + 1; pCell-StartListeningTo(rDoc); if (it-maCellValue.isEmpty()) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/filter/excel/excform.cxx | 37 ++--
sc/source/filter/excel/namebuff.cxx |3 --
2 files changed, 20 insertions(+), 20 deletions(-)
New commits:
commit 6ebb9a3bf4c00df694df844345748a1b736791b0
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Wed Sep 11 01:04:18 2013 -0400
Handle import of shared formula from xls more gracefully.
Many xls documents contain shared formula entries that don't follow
the spec. We still need to be able to handle them.
Change-Id: Ia7d01101a6759967d9ebb27b6540dcb67607d13f
diff --git a/sc/source/filter/excel/excform.cxx
b/sc/source/filter/excel/excform.cxx
index 56a18f8..82a3ae5 100644
--- a/sc/source/filter/excel/excform.cxx
+++ b/sc/source/filter/excel/excform.cxx
@@ -115,27 +115,28 @@ void ImportExcel::Formula(
{
// This is a shared formula. Get the token array from the shared
formula pool.
ScFormulaCellGroupRef xGroup = pFormConv-GetSharedFormula(maStrm,
aScPos.Col(), nFormLen);
-if (!xGroup)
-return;
-
-if (xGroup-mnStart == aScPos.Row())
-// Generate code for the top cell only.
-xGroup-compileCode(*pD, aScPos,
formula::FormulaGrammar::GRAM_DEFAULT);
-
-ScFormulaCell* pCell = new ScFormulaCell(pD, aScPos, xGroup);
-pD-EnsureTable(aScPos.Tab());
-bool bInserted = pD-SetGroupFormulaCell(aScPos, pCell);
-if (!bInserted)
+if (xGroup)
{
-delete pCell;
+if (xGroup-mnStart == aScPos.Row())
+// Generate code for the top cell only.
+xGroup-compileCode(*pD, aScPos,
formula::FormulaGrammar::GRAM_DEFAULT);
+
+ScFormulaCell* pCell = new ScFormulaCell(pD, aScPos, xGroup);
+pD-EnsureTable(aScPos.Tab());
+bool bInserted = pD-SetGroupFormulaCell(aScPos, pCell);
+if (!bInserted)
+{
+delete pCell;
+return;
+}
+xGroup-mnLength = aScPos.Row() - xGroup-mnStart + 1;
+pCell-SetNeedNumberFormat(false);
+if (!rtl::math::isNan(fCurVal))
+pCell-SetResultDouble(fCurVal);
+
+GetXFRangeBuffer().SetXF(aScPos, nXF);
return;
}
-pCell-SetNeedNumberFormat(false);
-if (!rtl::math::isNan(fCurVal))
-pCell-SetResultDouble(fCurVal);
-
-GetXFRangeBuffer().SetXF(aScPos, nXF);
-return;
}
ConvErr eErr = pFormConv-Convert( pResult, maStrm, nFormLen, true,
FT_CellFormula);
diff --git a/sc/source/filter/excel/namebuff.cxx
b/sc/source/filter/excel/namebuff.cxx
index 4e47c09..4c75d64 100644
--- a/sc/source/filter/excel/namebuff.cxx
+++ b/sc/source/filter/excel/namebuff.cxx
@@ -79,7 +79,6 @@ void SharedFormulaBuffer::Clear()
void SharedFormulaBuffer::Store( const ScRange rRange, const ScTokenArray
rArray )
{
-SCROW nGroupLen = rRange.aEnd.Row() - rRange.aStart.Row() + 1;
for (SCCOL i = rRange.aStart.Col(); i = rRange.aEnd.Col(); ++i)
{
// Create one group per column.
@@ -88,7 +87,7 @@ void SharedFormulaBuffer::Store( const ScRange rRange, const
ScTokenArray rArr
ScFormulaCellGroupRef xNewGroup(new ScFormulaCellGroup);
xNewGroup-mnStart = rRange.aStart.Row();
-xNewGroup-mnLength = nGroupLen;
+xNewGroup-mnLength = 1;
xNewGroup-setCode(rArray);
maFormulaGroups.insert(FormulaGroupsType::value_type(aPos, xNewGroup));
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: readlicense_oo/docs
readlicense_oo/docs/readme.xrm | 34 +-
1 file changed, 1 insertion(+), 33 deletions(-)
New commits:
commit 6557d9217e36f08e46af1de368cda3586a674192
Author: Tor Lillqvist t...@collabora.com
Date: Wed Sep 11 08:20:48 2013 +0300
Bin outdated and overly specific requirements for OS X and Windows
Surely we list better requirements on a website anyway. The ones
listed here were either plainly wrong or of historical interest
only. These requirements have no legal meaning anyway, so surely we
can just assume common sense instead of trying to figure out if we
require 256 megabytes of RAM or 512.
Somebody please have the courage to edit the Linux section, too. It is
woefully out of date, over-specific and misleading.
Change-Id: Id9c7208538e55ece5a16dae2c120e77dd7839b04
diff --git a/readlicense_oo/docs/readme.xrm b/readlicense_oo/docs/readme.xrm
index 018f29d..bae4f26 100755
--- a/readlicense_oo/docs/readme.xrm
+++ b/readlicense_oo/docs/readme.xrm
@@ -34,23 +34,7 @@
div class=MAC id=SystemRequirements_OSX
ul
li
- p id=macxiOSX
xml:lang=en-USMacOSX 10.4 (Tiger) or higher/p
- /li
-
- li
- p id=macxicpu
xml:lang=en-USIntel or PowerPC processor/p
- /li
-
- li
- p id=macxiRAM
xml:lang=en-US512 MB RAM/p
- /li
-
- li
- p id=macxHardDiksSpace
xml:lang=en-USUp to 800 MB available hard disk space/p
- /li
-
- li
- p id=macxivideo
xml:lang=en-US1024 x 768 graphic device with 256 colors (higher resolution
recommended)/p
+ p id=macxiOSX
xml:lang=en-USMacOSX 10.6 or higher/p
/li
/ul
/div
@@ -59,22 +43,6 @@
li
p id=s2s3sdf21
xml:lang=en-USMicrosoft Windows XP, Vista, Windows 7, or Windows 8/p
/li
-
- li
- p id=utzu6
xml:lang=en-USPentium compatible PC (Pentium III or Athlon recommended)/p
- /li
-
- li
- p id=ghuj67
xml:lang=en-US256 MB RAM (512 MB RAM recommended)/p
- /li
-
- li
- p id=jzjtzu6
xml:lang=en-USUp to 1.5 GB available hard disk space/p
- /li
-
- li
- p id=jtzu56
xml:lang=en-US1024x768 resolution (higher resolution recommended), at least
256 colors/p
- /li
/ul
p class=note id=edssc3d
xml:lang=en-USPlease be aware that administrator rights are needed for the
installation process./p
p id=MSOReg1 xml:lang=en-USRegistration
of ${PRODUCTNAME} as default application for Microsoft Office formats can be
forced or suppressed by using the following command line switches with the
installer:/p
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-qa] minutes of ESC call ...
On Tue, 2013-09-10 at 00:37 +0200, bjoern wrote: * Bibisected bugs open: whiteboard 'bibsected' + 35/140 36/167 37/137 41/137 33/128 33/125 34/124 34/123 36/122 38/119 + http://bit.ly/VQfF3Q Dumb question: Whats that second number on the bibisected bugs stats, btw ? As with the MAB; it is open vs. total. So in the last week 27 bibisected bugs (either open or closed) where eaten by a grue? (167 - 140) I guess so ;-) or bugzilla changed in some way, or someone went on a rampage removing the 'bibisect' keyword (or whatever). The stats are generated by: dev-tools/scripts/esc-bug-stats.pl It's not the most beautiful script / approach in the world but - it produces a consistent, and longer-term series (of whatever merit) and is automated = saving me a lot of time ;-) Improvements to the script [ that don't break the historic series for bugs etc. ] appreciated :-) HTH, Michael. -- michael.me...@collabora.com , Pseudo Engineer, itinerant idiot ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] minutes of ESC call ...
Hi, On Tue, Sep 10, 2013 at 09:56:57AM +0100, Michael Meeks wrote: I guess so ;-) or bugzilla changed in some way, or someone went on a rampage removing the 'bibisect' keyword (or whatever). The stats are generated by: dev-tools/scripts/esc-bug-stats.pl Hmm, looks sane to me -- still wonder what happened to the total. Improvements to the script [ that don't break the historic series for bugs etc. ] appreciated :-) FWIW, I had a bibisected charting query sometime ago, you find it in bugzilla-reports-new charts and then select the LibreOffice-LibreOffice-bibsected-unresolved. I just added a bibisected-total there too, so one can now get these as extremely ugly plots out of bugzilla itself (on a positive note, you can also download the history as CSV there). Best, Bjoern ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] minutes of ESC call ...
On Tue, 2013-09-10 at 11:37 +0200, bjoern wrote: FWIW, I had a bibisected charting query sometime ago, you find it in bugzilla-reports-new charts and then select the LibreOffice-LibreOffice-bibsected-unresolved. I just added a bibisected-total there too, so one can now get these as extremely ugly plots out of bugzilla itself (on a positive note, you can also download the history as CSV there). Neato :-) well - anyone that wants to do the automating of that lot and generation of pretty charts with long data series so that I don't have to is more than welcome to. Having said that - I guess investing more cycles into a dashboard / homepage for developers that shows where the fires are burning, the new MAB's etc. would prolly be a more useful investment of time. Thanks, Michael. -- michael.me...@collabora.com , Pseudo Engineer, itinerant idiot ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Triaging Fun :)
Hi Joel, Joel Madero wrote (09-09-13 17:24) A bug a day (you choose which one ;) ) shouldn't take more than 10ish minutes. Hopefully despite busy schedules we can make the commitment - ultimately we still need 25 people making this commitment to keep up with demand (or a few people able to commit to a higher number). Thanks for this encouraging idea (one a day saves me a lot of time :-p ) and your good work help! Apart from keeping the number_of_unconfirmed low, I also find it useful to try to make summaries as clear as possible: looking at the result of a query, that helps a lot to pick the right issues to look e.g. for duplicates. Kind regards, Cor -- - Cor Nouws - http://nl.libreoffice.org - The Document Foundation Membership Committee Member ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Triaging Fun :)
On Tue, 10 Sep 2013 21:11:54 +0200, Cor Nouws oo...@nouenoff.nl wrote: Apart from keeping the number_of_unconfirmed low, I also find it useful to try to make summaries as clear as possible: looking at the result of a query, that helps a lot to pick the right issues to look e.g. for duplicates. Kind regards, Cor +1 a good summary description is crucial ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-bugs] [Bug 43533] FILESAVE: line position get lost
https://bugs.freedesktop.org/show_bug.cgi?id=43533 --- Comment #7 from Erdal Mutlu erdalmu...@yahoo.com --- Yes I have tested with arch linux (64bit) 4.1.1.2 and the attached file. This bug is related to https://bugs.freedesktop.org/show_bug.cgi?id=68104 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 69156] EDITING: I insert a row. The new row is unformatted
https://bugs.freedesktop.org/show_bug.cgi?id=69156 Cor Nouws c...@nouenoff.nl changed: What|Removed |Added CC||c...@nouenoff.nl --- Comment #2 from Cor Nouws c...@nouenoff.nl --- (In reply to comment #0) The new row should open above the current row and carry the formatting of the current row with it. Can you pls attach your sample file + steps? For me it's always the opposite. The option mentioned by Marisov, makes that a range is extended at the edge where a row/column is insterted. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 69157] When moving frame, contents are moved instead of frame
https://bugs.freedesktop.org/show_bug.cgi?id=69157 Cor Nouws c...@nouenoff.nl changed: What|Removed |Added CC||c...@nouenoff.nl --- Comment #1 from Cor Nouws c...@nouenoff.nl --- Hi tmacalp, thanks for the issue. Can you pls attach a sample file showing the issue? Best, Cor -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 68797] FILEOPEN lost position of lines anchored to cell
https://bugs.freedesktop.org/show_bug.cgi?id=68797 sophie gautier.sop...@gmail.com changed: What|Removed |Added CC||gw1...@web.de --- Comment #2 from sophie gautier.sop...@gmail.com --- *** Bug 69136 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 69136] FILESAVE:Line position is not saved correctly when the anchor is set to cell
https://bugs.freedesktop.org/show_bug.cgi?id=69136 sophie gautier.sop...@gmail.com changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |DUPLICATE CC||gautier.sop...@gmail.com --- Comment #1 from sophie gautier.sop...@gmail.com --- *** This bug has been marked as a duplicate of bug 68797 *** -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 55697] impossible to define data ranges beyond actual filled cells
https://bugs.freedesktop.org/show_bug.cgi?id=55697 --- Comment #10 from Joachim Manke joachim.ma...@mankenet.de --- I have found, that in Release 4.1.1.2 the bug is still existant. I also think it should be fixed asap!! -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 59667] LibreOffice Writer doesn't display a graphic in a certain doc file correctly on Page 2 of the file.
https://bugs.freedesktop.org/show_bug.cgi?id=59667 --- Comment #23 from Cor Nouws c...@nouenoff.nl --- the problem is that the picture(s) at page (1 and) 2 are not covering the full sheet? -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
