LibreOffice Gerrit News for dev-tools on 2014-09-30
Moin! * Open changes on master for project dev-tools changed in the last 25 hours: + fdo#84227 Use only last patchset for modules in https://gerrit.libreoffice.org/11614 from Mathias M * Merged changes on master for project dev-tools changed in the last 25 hours: None * Abandoned changes on master for project dev-tools changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: None 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 Gerrit News for core on 2014-09-30
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + fdo#84405 TRACK CHANGES: New icons for the changes toolbar in https://gerrit.libreoffice.org/11681 from Yousuf Philips about module icon-themes, officecfg, sw + collada2gltf: drop tr1 support in https://gerrit.libreoffice.org/11695 from Jan-Marek Glogowski about module external + Improve Expert Configuration dialog in https://gerrit.libreoffice.org/11663 from Mihály Palenik about module cui, include, svtools End of freshness + vcl: Merge ImpFontCharMap with FontCharMap, use intrusive_ptr to manage in https://gerrit.libreoffice.org/11565 from Chris Sherlock about module cui, include, sc, starmath, svtools, svx, vcl + configure: limit javac VM usage in https://gerrit.libreoffice.org/11699 from Michael Stahl about module build + configure: limit JunitTest VM usage in https://gerrit.libreoffice.org/11698 from Michael Stahl about module build + fdo#84008: kill c++11 code from collada2gltf in https://gerrit.libreoffice.org/11697 from Zolnai Tamás about module avmedia, external + bump nss from 3.15.3 to 3.16.5 in https://gerrit.libreoffice.org/11700 from Caolán McNamara about module build, external + fdo#75757: remove inheritance to std::map in https://gerrit.libreoffice.org/11696 from Takeshi Abe about module sfx2 + loplugin: cstylecast in https://gerrit.libreoffice.org/11692 from Noel Grandin about module accessibility + DO NOT PUSH fdo#82577: Handle Region in https://gerrit.libreoffice.org/11664 from Noel Grandin about module basctl, canvas, chart2, cui, dbaccess, drawinglayer, editeng, extensions, external, filter, include, reportdesign, sc, sd, sfx2, starmath, svtools, svx, sw, toolkit, vcl + WIP fdo#82577: Handle PolyPolygon in https://gerrit.libreoffice.org/11683 from Noel Grandin about module basegfx, canvas, chart2, cppcanvas, drawinglayer, editeng, external, filter, include, oox, reportdesign, sc, svtools, svx, sw, toolkit, tools, vcl, xmloff + WIP fdo#82577: Handle Time in https://gerrit.libreoffice.org/11684 from Noel Grandin about module basic, connectivity, cui, editeng, extensions, filter, forms, fpicker, framework, i18npool, include, lotuswordpro, mysqlc, odk, oox, reportdesign, sal, salhelper, sc, sd, sfx2, shell, slideshow, svl, svtools, svx, sw, toolkit, tools, ucb, unotest, unotools, uui, vbahelper, vcl, xmloff, xmlscript, xmlsecurity * Merged changes on master for project core changed in the last 25 hours: + Rework the Compress Image dialog in https://gerrit.libreoffice.org/11671 from Adolfo Jayme Barrientos + fdo#59299 Personas for bottom toolbars in https://gerrit.libreoffice.org/11609 from Michael Jaumann + Fix java.util.Calendar.set in integration.forms.DateValidator in https://gerrit.libreoffice.org/11694 from Robert Antoni Buj i Gelonch + forms: getMonth() and getYear() are deprecated in java.util.Date in https://gerrit.libreoffice.org/11690 from Robert Antoni Buj i Gelonch + connectivity: Use chain of .append methods in https://gerrit.libreoffice.org/11688 from Robert Antoni Buj i Gelonch + forms: Pass array of length equal to the size of the collection in https://gerrit.libreoffice.org/11687 from Robert Antoni Buj i Gelonch + unotest: remove import from the same package in https://gerrit.libreoffice.org/11685 from Robert Antoni Buj i Gelonch * Abandoned changes on master for project core changed in the last 25 hours: + xmerge: Use static final when creating constants in https://gerrit.libreoffice.org/11702 from Robert Antoni Buj i Gelonch + DO NOT PUSH remove the versioning of the SvxPoolItem streams in https://gerrit.libreoffice.org/11628 from Noel Grandin * Open changes needing tweaks, but being untouched for more than a week: + fdo#82335. in https://gerrit.libreoffice.org/11555 from Sudarshan Rao + HIG-ification of GSoC Color Picker dialog in https://gerrit.libreoffice.org/11494 from Olivier Hallot + l10ntools-transex3: convert 'int' to 'bool' where it's logical in https://gerrit.libreoffice.org/11317 from Douglas Mencken + Perftest for loading autocorrect dictionaries (fdo#79761) in https://gerrit.libreoffice.org/11296 from Matúš Kukan + fdo#81956 : Rendering of vml group shape was wrong. in https://gerrit.libreoffice.org/11013 from sushil_shinde + fdo#79018: LO hangs while opening file. in https://gerrit.libreoffice.org/9564 from Yogesh Bharate + fdo#81426 : Data from header and footer is getting lost. in https://gerrit.libreoffice.org/10531 from Rajashri Udhoji + fdo#79541 :Corrupt: Shape enclosed within a floating table in https://gerrit.libreoffice.org/9914 from Rajashri Udhoji + fdo#80996:Fix for DataLabel not preserved for ColumnChart after RT in https://gerrit.libreoffice.org/10169 from Dushyant Bhalgami + fdo#77716 : Paragraph spacing is not preserved after RT. in https://gerrit.libreoffice.org/9197 from Tushar Bende +
[Libreoffice-commits] core.git: include/xmloff xmloff/source
include/xmloff/DocumentSettingsContext.hxx |2 +-
include/xmloff/txtparae.hxx|4 ++--
include/xmloff/xmluconv.hxx|2 +-
xmloff/source/core/xmlexp.cxx |2 +-
xmloff/source/core/xmlimp.cxx |4 ++--
xmloff/source/style/PageMasterImportPropMapper.cxx | 12 +++-
xmloff/source/text/XMLPropertyBackpatcher.cxx |8 +++-
xmloff/source/text/txtimppr.cxx|8 ++--
xmloff/source/text/txtparae.cxx| 10 --
9 files changed, 19 insertions(+), 33 deletions(-)
New commits:
commit 68daa8a22611605299ac3174a3632191f93236d9
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Sep 30 08:13:36 2014 +0200
xmloff: std::auto_ptr - std::unique_ptr
Change-Id: I8baa6c0573af3629bacbf1891c3196c165883d9e
diff --git a/include/xmloff/DocumentSettingsContext.hxx
b/include/xmloff/DocumentSettingsContext.hxx
index da3919e..24296f3 100644
--- a/include/xmloff/DocumentSettingsContext.hxx
+++ b/include/xmloff/DocumentSettingsContext.hxx
@@ -32,7 +32,7 @@ struct XMLDocumentSettingsContext_Data;
class XMLOFF_DLLPUBLIC XMLDocumentSettingsContext : public SvXMLImportContext
{
-::std::auto_ptr XMLDocumentSettingsContext_Data m_pData;
+::std::unique_ptr XMLDocumentSettingsContext_Data m_pData;
public:
XMLDocumentSettingsContext(SvXMLImport rImport, sal_uInt16 nPrfx, const
OUString rLName,
diff --git a/include/xmloff/txtparae.hxx b/include/xmloff/txtparae.hxx
index 2323660..37ec27b 100644
--- a/include/xmloff/txtparae.hxx
+++ b/include/xmloff/txtparae.hxx
@@ -76,7 +76,7 @@ class XMLOFF_DLLPUBLIC XMLTextParagraphExport : public
XMLStyleExport
rtl::Reference SvXMLExportPropertyMapper xSectionPropMapper;
rtl::Reference SvXMLExportPropertyMapper xRubyPropMapper;
-const ::std::auto_ptr ::xmloff::BoundFrameSets pBoundFrameSets;
+const ::std::unique_ptr ::xmloff::BoundFrameSets pBoundFrameSets;
XMLTextFieldExport *pFieldExport;
std::vectorOUString *pListElements;
XMLTextListAutoStylePool*pListAutoPool;
@@ -675,7 +675,7 @@ public:
void PopTextListsHelper();
private:
-XMLTextParagraphExport(XMLTextParagraphExport ); // private copy-ctor
because of explicit copy-ctor of auto_ptr
+XMLTextParagraphExport(XMLTextParagraphExport ); // private copy-ctor
because of explicit copy-ctor of unique_ptr
};
inline const XMLTextListAutoStylePool
diff --git a/include/xmloff/xmluconv.hxx b/include/xmloff/xmluconv.hxx
index 25ef7fc..f41e0d3 100644
--- a/include/xmloff/xmluconv.hxx
+++ b/include/xmloff/xmluconv.hxx
@@ -84,7 +84,7 @@ class XMLOFF_DLLPUBLIC SvXMLUnitConverter
{
private:
struct Impl;
-::std::auto_ptrImpl m_pImpl;
+::std::unique_ptrImpl m_pImpl;
public:
/** constructs a SvXMLUnitConverter. The core measure unit is the
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index d704318..8b35d5d 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -271,7 +271,7 @@ public:
/// counts depth (number of open elements/start tags)
long mDepth;
-::std::auto_ptr ::xmloff::RDFaExportHelper mpRDFaHelper;
+::std::unique_ptr ::xmloff::RDFaExportHelper mpRDFaHelper;
bool
mbExportTextNumberElement;
boolmbNullDateInitialized;
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 804e540..f9f1969 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -295,9 +295,9 @@ public:
uno::Reference embed::XStorage mxSourceStorage;
-std::auto_ptr xmloff::RDFaImportHelper mpRDFaHelper;
+std::unique_ptr xmloff::RDFaImportHelper mpRDFaHelper;
-std::auto_ptr DocumentInfo mpDocumentInfo;
+std::unique_ptr DocumentInfo mpDocumentInfo;
SvXMLImport_Impl( const uno::Reference uno::XComponentContext
rxContext,
OUString const theImplementationName)
diff --git a/xmloff/source/style/PageMasterImportPropMapper.cxx
b/xmloff/source/style/PageMasterImportPropMapper.cxx
index 46a5263..7073ab6 100644
--- a/xmloff/source/style/PageMasterImportPropMapper.cxx
+++ b/xmloff/source/style/PageMasterImportPropMapper.cxx
@@ -117,19 +117,13 @@ void
PageMasterImportPropertyMapper::finished(::std::vector XMLPropertyState
boost::scoped_ptrXMLPropertyState xFooterDynamic;
XMLPropertyState* pAllMarginProperty = NULL;
XMLPropertyState* pMargins[4] = { NULL, NULL, NULL, NULL };
-SAL_WNODEPRECATED_DECLARATIONS_PUSH
-::std::auto_ptrXMLPropertyState pNewMargins[4];
-SAL_WNODEPRECATED_DECLARATIONS_POP
+::std::unique_ptrXMLPropertyState pNewMargins[4];
XMLPropertyState* pAllHeaderMarginProperty = NULL;
XMLPropertyState* pHeaderMargins[4] = { NULL, NULL,
Build fails with --enable-eot
Hello, On pc Debian x86-64 with master sources updated today + make clean, I have got this: libtool: compile: /usr/bin/ccache gcc -DHAVE_CONFIG_H -I. -I./inc -O2 --std=c99 -DDECOMPRESS_ON -std=gnu89 -MT src/libeot_la-libeot.lo -MD -MP -MF src/.deps/libeot_la-libeot.Tpo -c src/libeot.c -fPIC -DPIC -o src/libeot_la-libeot.o libtool: compile: /usr/bin/ccache gcc -DHAVE_CONFIG_H -I. -I./inc -O2 --std=c99 -DDECOMPRESS_ON -std=gnu89 -MT src/libeot_la-EOT.lo -MD -MP -MF src/.deps/libeot_la-EOT.Tpo -c src/EOT.c -fPIC -DPIC -o src/libeot_la-EOT.o src/EOT.c: In function 'EOTgetString': src/EOT.c:59:5: error: 'for' loop initial declarations are only allowed in C99 or C11 mode for (unsigned i = 0; i *size / 2; ++i) ^ src/EOT.c:59:5: note: use option -std=c99, -std=gnu99, -std=c11 or -std=gnu11 to compile your code src/EOT.c: In function 'EOTgetByteArray': src/EOT.c:93:5: error: 'for' loop initial declarations are only allowed in C99 or C11 mode for (unsigned i = 0; i *size; ++i) ^ src/EOT.c: In function 'EOTfreeMetadata': src/EOT.c:126:5: error: 'for' loop initial declarations are only allowed in C99 or C11 mode for (unsigned i = 0; i d-numRootStrings; ++i) ^ src/EOT.c: In function 'EOTfillMetadataSpecifyingVersion': src/EOT.c:173:3: error: 'for' loop initial declarations are only allowed in C99 or C11 mode for (unsigned i = 0; i 4; ++i) ^ src/EOT.c:179:17: error: redefinition of 'i' for (unsigned i = 0; i 2; ++i) ^ src/EOT.c:173:17: note: previous definition of 'i' was here for (unsigned i = 0; i 4; ++i) ^ src/EOT.c:179:3: error: 'for' loop initial declarations are only allowed in C99 or C11 mode for (unsigned i = 0; i 2; ++i) ^ Makefile:639: recipe for target 'src/libeot_la-EOT.lo' failed make[3]: *** [src/libeot_la-EOT.lo] Error 1 Makefile:379: recipe for target 'all' failed make[2]: *** [all] Error 2 /home/julien/compile-libreoffice/libreoffice/external/libeot/ExternalProject_libeot.mk:17: recipe for target '/home/julien/compile-libreoffice/libreoffice/workdir/ExternalProject/libeot/build' failed Indeed, I use this: --enable-eot on my autogen.input Any idea? (disabling this option meanwhile) Julien -- View this message in context: http://nabble.documentfoundation.org/Build-fails-with-enable-eot-tp4124183.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Changes to 'refs/changes/05/11705/1'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/lof-4.3' - cppuhelper/source
cppuhelper/source/bootstrap.cxx |9 -
1 file changed, 8 insertions(+), 1 deletion(-)
New commits:
commit c655775fba137aaf037b6e78c3cd2005e667f420
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Sep 29 22:53:08 2014 +0200
Adapt cppu::bootstrap to new Mac OS X LibreOffice.app layout
Change-Id: I60db70c38d138455230ee56a26d840aa68885b44
diff --git a/cppuhelper/source/bootstrap.cxx b/cppuhelper/source/bootstrap.cxx
index ae2a9f0..b043758 100644
--- a/cppuhelper/source/bootstrap.cxx
+++ b/cppuhelper/source/bootstrap.cxx
@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include config_features.h
+
#include sal/config.h
#include cstring
@@ -119,7 +121,12 @@ Reference XComponentContext SAL_CALL bootstrap()
if (!Bootstrap::get(URE_BOOTSTRAP, uri)) {
Bootstrap::set(
URE_BOOTSTRAP,
-Bootstrap::encode(path + SAL_CONFIGFILE(fundamental)));
+Bootstrap::encode(
+path +
+#if HAVE_FEATURE_MACOSX_MACLIKE_APP_STRUCTURE
+../Resources/
+#endif
+SAL_CONFIGFILE(fundamental)));
}
// create default local component context
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/TablePropertiesHandler.cxx | 14 +++---
writerfilter/source/ooxml/model.xml|8
writerfilter/source/rtftok/rtfdocumentimpl.cxx |6 +++---
3 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit b69478acff4f5b7a9d334a765a1a528d44d7b3a4
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Sep 30 09:06:18 2014 +0200
Use constants for ST_VerticalJc values
Change-Id: Ib7d2ecfa2c5bcbda55859144af6b55bc8ef09c3d
diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.cxx
b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
index 1e3fa21..a46387f 100644
--- a/writerfilter/source/dmapper/TablePropertiesHandler.cxx
+++ b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
@@ -201,10 +201,10 @@ namespace dmapper {
case NS_ooxml::LN_CT_TcPrBase_vAlign://90694
{
sal_Int16 nVertOrient = text::VertOrientation::NONE;
-switch( nIntValue ) //0 - top 1 - center 3 - bottom
(ST_VerticalJc)
+switch( nIntValue )
{
-case 1: nVertOrient = text::VertOrientation::CENTER; break;
-case 3: nVertOrient = text::VertOrientation::BOTTOM; break;
+case NS_ooxml::LN_Value_ST_VerticalJc_center: nVertOrient
= text::VertOrientation::CENTER; break;
+case NS_ooxml::LN_Value_ST_VerticalJc_bottom: nVertOrient
= text::VertOrientation::BOTTOM; break;
default:;
};
TablePropertyMapPtr pCellPropMap( new TablePropertyMap() );
@@ -216,10 +216,10 @@ namespace dmapper {
OUString aVertOrient;
switch( nIntValue )
{
-case 0: aVertOrient = top; break;
-case 1: aVertOrient = center; break;
-case 2: aVertOrient = both; break;
-case 3: aVertOrient = bottom; break;
+case NS_ooxml::LN_Value_ST_VerticalJc_top: aVertOrient
= top; break;
+case NS_ooxml::LN_Value_ST_VerticalJc_center:
aVertOrient = center; break;
+case NS_ooxml::LN_Value_ST_VerticalJc_both:
aVertOrient = both; break;
+case NS_ooxml::LN_Value_ST_VerticalJc_bottom:
aVertOrient = bottom; break;
};
if (!aVertOrient.isEmpty())
{
diff --git a/writerfilter/source/ooxml/model.xml
b/writerfilter/source/ooxml/model.xml
index b5ec46c..ddfc717 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -17714,10 +17714,10 @@
element name=col tokenid=ooxml:CT_Columns_col/
/resource
resource name=ST_VerticalJc resource=List
- value tokenid=0top/value
- value tokenid=1center/value
- value tokenid=2both/value
- value tokenid=3bottom/value
+ value tokenid=ooxml:Value_ST_VerticalJc_toptop/value
+ value tokenid=ooxml:Value_ST_VerticalJc_centercenter/value
+ value tokenid=ooxml:Value_ST_VerticalJc_bothboth/value
+ value tokenid=ooxml:Value_ST_VerticalJc_bottombottom/value
/resource
resource name=CT_VerticalJc resource=Value
attribute name=val tokenid=ooxml:CT_VerticalJc_val
action=setValue/
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index d613449..33b83dd 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -3074,13 +3074,13 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
switch (nKeyword)
{
case RTF_CLVERTALT:
-nParam = 0;
+nParam = NS_ooxml::LN_Value_ST_VerticalJc_top;
break;
case RTF_CLVERTALC:
-nParam = 1;
+nParam = NS_ooxml::LN_Value_ST_VerticalJc_center;
break;
case RTF_CLVERTALB:
-nParam = 3;
+nParam = NS_ooxml::LN_Value_ST_VerticalJc_bottom;
break;
default:
break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [RFC] commits mailing list noise
On Mon, Sep 29, 2014 at 09:54:18PM +0200, Miklos Vajna vmik...@collabora.co.uk wrote: The traffic of the -commits mailing list is generated from changes pushed to the fdo git mirror. Norbert recently changed the replication so that the refs/changes/* namespace is also replicated (to help disaster recovery), though this currently creates quite some initial noise (just ~12K mails today) and I expect that even in the future there will be a considerable amount of noise. This has been changed back, so no change to the commits list scripts is necessary. signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Changes to 'refs/changes/92/11692/2'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'private/jmux/libreoffice-4-1-6+backports'
New branch 'private/jmux/libreoffice-4-1-6+backports' available with the following commits: commit ec3e220fe215b21df16294daf88426b23f3ab7b3 Author: Jan-Marek Glogowski glo...@fbihome.de Date: Sat Aug 9 00:22:00 2014 +0200 fdo#78611 Don't create automatic rules on reset As we reset all styles, there shouldn't be any unknown automatic SwNumRules, because all should have been created by the style copying! And in this case we also have to overwrite the existing automatic SwNumRules to get a consistent copy. In case of unknown automatic SwNumRules we just warn and ignore any inconsistence. Change-Id: I26e25bccc9a8c7be74f3dceb2e1f91894eac1d0a Reviewed-on: https://gerrit.libreoffice.org/10988 Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com Tested-by: Björn Michaelsen bjoern.michael...@canonical.com (cherry picked from commit 9fd7ca788bc8fd88b048c544edb0dc6518010e11) commit 2a76e7d6a871685458e4b074e2af10bd40466b64 Author: Jan-Marek Glogowski glo...@fbihome.de Date: Sun Aug 3 12:10:40 2014 +0200 fdo#81782 MM: copy most document properties Mail merge wasn't copying the document properties into the target document. It also has to copy most document properties into the working copy, as ConvertFieldsToText is called just there. Change-Id: I7e07fec712c225f667d960a94f4eb3fd0b83f041 Reviewed-on: https://gerrit.libreoffice.org/10987 Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com Tested-by: Björn Michaelsen bjoern.michael...@canonical.com (cherry picked from commit cde554a731596f1ca53a911656b6503c96dadcc7) Conflicts: sw/inc/doc.hxx sw/source/core/doc/docglos.cxx sw/source/uibase/dbui/dbmgr.cxx commit 699070c073804505496f1bf944baca15fe995e10 Author: Jan-Marek Glogowski glo...@fbihome.de Date: Tue Jul 29 15:38:32 2014 +0200 MM: restore the non-saving wizard behaviour The wizard didn't save the MM source document, even if it was modified. Change-Id: I0c7fb6abd31934bab7a33d7a9c93222af3e35ee5 Reviewed-on: https://gerrit.libreoffice.org/10986 Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com Tested-by: Björn Michaelsen bjoern.michael...@canonical.com (cherry picked from commit 3930c14be021e325c1efdb3fa7858069085286f8) Conflicts: sw/source/uibase/dbui/dbmgr.cxx commit 855f5bc2e020d877c2931c47ffca41ec9bc6c67c Author: Jan-Marek Glogowski glo...@fbihome.de Date: Tue Jul 29 15:36:51 2014 +0200 MM: add missing CreateMonitor handling The mail merge wizard uses a different progress dialog (CreateDialog) then the UNO functions (PrintDialog). This moves the CreateDialog code from the old mail merge function and unifies some of the dialog handling. This implements bc998e5e2cf43678462c8d7da8a9d6b1425ec492 without all the reverts. Change-Id: I06088140f604893a33f3ee37507e551b043a193d commit a23a9b548f388c15342febc148043b9601180a61 Author: Eilidh McAdam eilidh.mca...@gmail.com Date: Fri Jul 25 20:38:08 2014 +0100 Remove superfluous merge function. The only caller of MergeDocuments now uses MergeMailFiles instead, so MergeDocuments can be removed. Change-Id: I03903a7f85c8328ab3f28cb1d23130557a1be7b4 Reviewed-on: https://gerrit.libreoffice.org/10982 Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com Tested-by: Björn Michaelsen bjoern.michael...@canonical.com (cherry picked from commit 126b4407bade85298f983f545d6f507534fab61d) Conflicts: sw/source/uibase/dbui/dbmgr.cxx commit 139221df5e020fb4ec7a8192e6d908b713a448e7 Author: Eilidh McAdam eilidh.mca...@gmail.com Date: Fri Jul 25 20:35:43 2014 +0100 Make UNO and wizard mail merge use same function. Instead of MergeDocuments and MergeMailFiles duplicating largely the same functionality, the only user of MergeDocuments (MM wizard) now uses MergeMailFiles. Change-Id: Ifad183bdeabf5ca1eb08b4b1df557404a54a9fdd Reviewed-on: https://gerrit.libreoffice.org/10981 Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com Tested-by: Björn Michaelsen bjoern.michael...@canonical.com (cherry picked from commit 636718c960a36bc28d37a69ac102dd6cb696bfba) Conflicts: sw/inc/dbmgr.hxx sw/source/ui/dbui/mailmergewizard.cxx sw/source/uibase/dbui/dbmgr.cxx commit ed4dccedea55582daf4d21e939169b717023 Author: Jan-Marek Glogowski glo...@fbihome.de Date: Tue Jul 29 14:26:40 2014 +0200 MM: detect save error based on the return value There is actually GetError() and GetErrorCode(). While the error code can also be a warning, which isn't reported by GetError(), this detects the error based on the DoSaveAs return value (actually I got warnings in case of save failures in my MM unit tests). Change-Id:
[Libreoffice-commits] core.git: Changes to 'refs/changes/64/11664/4'
___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basctl/source canvas/source chart2/source cui/source dbaccess/source drawinglayer/source editeng/source extensions/source filter/source include/postwin.h include/postx.
basctl/source/dlged/dlged.cxx |2 canvas/source/cairo/cairo_canvashelper_text.cxx|6 canvas/source/directx/dx_textlayout_drawhelper.cxx |4 canvas/source/vcl/canvashelper.cxx |6 canvas/source/vcl/canvashelper_texturefill.cxx |6 canvas/source/vcl/spritecanvashelper.cxx |4 canvas/source/vcl/spritehelper.cxx |2 chart2/source/controller/dialogs/DataBrowser.cxx |2 chart2/source/controller/drawinglayer/DrawViewWrapper.cxx |2 chart2/source/controller/inc/DrawViewWrapper.hxx |2 chart2/source/controller/main/ChartController_Window.cxx |2 chart2/source/controller/main/ChartWindow.cxx |2 chart2/source/controller/main/ChartWindow.hxx |2 cui/source/dialogs/about.cxx |2 cui/source/options/connpooloptions.cxx |2 dbaccess/source/ui/control/RelationControl.cxx |2 dbaccess/source/ui/control/TableGrantCtrl.cxx |2 dbaccess/source/ui/dlg/indexfieldscontrol.cxx |2 dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx |2 dbaccess/source/ui/tabledesign/TEditControl.cxx|2 drawinglayer/source/primitive2d/metafileprimitive2d.cxx| 18 - drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx |4 editeng/source/editeng/editeng.cxx |2 editeng/source/editeng/impedit.cxx |6 editeng/source/editeng/impedit.hxx |2 editeng/source/editeng/impedit3.cxx|6 extensions/source/scanner/grid.cxx |2 extensions/source/update/ui/updatecheckui.cxx |6 filter/source/graphicfilter/eps/eps.cxx| 14 - filter/source/graphicfilter/icgm/class0.cxx|8 filter/source/graphicfilter/icgm/class3.cxx|2 filter/source/graphicfilter/icgm/class5.cxx|6 filter/source/graphicfilter/ios2met/ios2met.cxx|2 filter/source/graphicfilter/ipict/ipict.cxx|2 include/postwin.h |1 include/postx.h|1 include/prewin.h |1 include/prex.h |1 include/sfx2/sfxhtml.hxx |2 include/shell/kde_headers.h|2 include/shell/tde_headers.h|2 include/svtools/tabbar.hxx |4 include/svtools/valueset.hxx |2 include/svx/galtheme.hxx |2 include/svx/sdr/contact/displayinfo.hxx|6 include/svx/sdr/contact/viewobjectcontact.hxx |2 include/svx/sdr/overlay/overlaymanager.hxx |6 include/svx/sdrpagewindow.hxx |4 include/svx/sdrpaintwindow.hxx | 12 - include/svx/svdhdl.hxx |2 include/svx/svdpagv.hxx|4 include/svx/svdpntv.hxx| 10 include/toolkit/awt/vclxgraphics.hxx |4 include/toolkit/awt/vclxregion.hxx |6 include/toolkit/helper/vclunohelper.hxx|2 include/vcl/alpha.hxx |2 include/vcl/bitmap.hxx |4 include/vcl/image.hxx |2 include/vcl/metaact.hxx| 12 - include/vcl/metric.hxx |4 include/vcl/outdev.hxx | 32 +- include/vcl/outdevstate.hxx|2 include/vcl/print.hxx |2 include/vcl/region.hxx | 41 +-- include/vcl/toolbox.hxx|6 include/vcl/virdev.hxx |2 include/vcl/window.hxx | 86 +++ reportdesign/source/ui/dlg/GroupsSorting.cxx |2 reportdesign/source/ui/report/ReportSection.cxx|2
[Libreoffice-commits] core.git: Branch 'refs/notes/review' - 8d/bde0845a3989528614addb9bd0333f60c522a5
8d/bde0845a3989528614addb9bd0333f60c522a5 |3 +++ 1 file changed, 3 insertions(+) New commits: commit a031404b588b0fbbffba54ea673636ea7bf323b5 Author: Gerrit Code Review ger...@gerrit.libreoffice.org Date: Tue Sep 30 07:58:49 2014 + Update notes for submitted changes * fdo#82577: Handle Region diff --git a/8d/bde0845a3989528614addb9bd0333f60c522a5 b/8d/bde0845a3989528614addb9bd0333f60c522a5 new file mode 100644 index 000..577bdb0 --- /dev/null +++ b/8d/bde0845a3989528614addb9bd0333f60c522a5 @@ -0,0 +1,3 @@ +Reviewed-on: https://gerrit.libreoffice.org/11664 +Project: core +Branch: refs/heads/master ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 82577] get rid of prex.h / postx.h wrapper headers
https://bugs.freedesktop.org/show_bug.cgi?id=82577 --- Comment #11 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Noel Grandin committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=8dbde0845a3989528614addb9bd0333f60c522a5 fdo#82577: Handle Region The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/inc
vcl/inc/quartz/salgdi.h |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e4c996d3627f95df693cb702451201c277f04b18 Author: Noel Grandin n...@peralex.com Date: Tue Sep 30 10:16:11 2014 +0200 fix OSX build after commit 19a35bcd5beff8d1fede856c6c4078dd6716c1cf vcl: cleanup vcl/inc/quartz/salgdi.h Change-Id: I1f6334cb2751662b81d3ac027982ece4ccac4d34 diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h index 222a08f..8aad534 100644 --- a/vcl/inc/quartz/salgdi.h +++ b/vcl/inc/quartz/salgdi.h @@ -85,7 +85,7 @@ protected: private: const sal_IntPtrmnFontId; -mutable const FontCharMapPtrmpCharMap; +mutable const ImplFontCharMap* mpCharMap; mutable vcl::FontCapabilities maFontCapabilities; mutable boolmbOs2Read; // true if OS2-table related info is valid mutable boolmbHasOs2Table; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 7 commits - accessibility/source chart2/source codemaker/source compilerplugins/clang cppcanvas/source cppuhelper/source cui/source
accessibility/source/extended/AccessibleBrowseBox.cxx |6
accessibility/source/extended/AccessibleGridControl.cxx |6
accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx |2
accessibility/source/extended/accessibleeditbrowseboxcell.cxx |2
accessibility/source/extended/accessiblelistboxentry.cxx|2
accessibility/source/extended/accessibletabbarbase.cxx |2
accessibility/source/extended/accessibletabbarpagelist.cxx | 14 -
accessibility/source/extended/textwindowaccessibility.cxx |2
accessibility/source/standard/vclxaccessiblecheckbox.cxx|4
chart2/source/controller/inc/DrawViewWrapper.hxx|2
chart2/source/controller/inc/ObjectHierarchy.hxx|2
chart2/source/controller/inc/dlg_DataSource.hxx |4
chart2/source/controller/main/ChartController.cxx |2
chart2/source/controller/main/ChartController.hxx |6
chart2/source/controller/main/ControllerCommandDispatch.hxx |4
chart2/source/inc/ConfigColorScheme.hxx |2
chart2/source/view/main/VDataSeries.cxx |8 -
codemaker/source/codemaker/exceptiontree.cxx|2
codemaker/source/javamaker/javatype.cxx | 80
++
compilerplugins/clang/unusedvariablecheck.cxx |2
cppcanvas/source/mtfrenderer/implrenderer.cxx |5
cppcanvas/source/mtfrenderer/transparencygroupaction.cxx| 24 +--
cppcanvas/source/mtfrenderer/transparencygroupaction.hxx|8 -
cppuhelper/source/factory.cxx |2
cui/source/dialogs/scriptdlg.cxx| 32 +---
cui/source/factory/dlgfact.cxx |2
cui/source/inc/passwdomdlg.hxx |2
cui/source/inc/scriptdlg.hxx|4
28 files changed, 90 insertions(+), 143 deletions(-)
New commits:
commit 7561a0f9a2df9231596576af9f8b78f4f3621270
Author: Noel Grandin n...@peralex.com
Date: Mon Sep 29 10:26:14 2014 +0200
loplugin: cstylecast
Change-Id: Ie5cbad7ee18b0ecbca5df97808431be577449c32
Signed-off-by: Stephan Bergmann sberg...@redhat.com
diff --git a/accessibility/source/extended/AccessibleBrowseBox.cxx
b/accessibility/source/extended/AccessibleBrowseBox.cxx
index 1215c78..fbb8a02 100644
--- a/accessibility/source/extended/AccessibleBrowseBox.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBox.cxx
@@ -76,7 +76,7 @@ AccessibleBrowseBox::AccessibleBrowseBox(
void AccessibleBrowseBox::setCreator( const Reference XAccessible
_rxCreator )
{
#if OSL_DEBUG_LEVEL 0
-Reference XAccessible xCreator = (Reference XAccessible
)m_pImpl-m_aCreator;
+Reference XAccessible xCreator(m_pImpl-m_aCreator);
OSL_ENSURE( !xCreator.is(),
accessibility/extended/AccessibleBrowseBox::setCreator: creator already set!
);
#endif
m_pImpl-m_aCreator = _rxCreator;
@@ -250,7 +250,7 @@ AccessibleBrowseBox::implGetHeaderBar(
AccessibleBrowseBoxObjType eObjType )
if( !pxMember-is() )
{
AccessibleBrowseBoxHeaderBar* pHeaderBar = new
AccessibleBrowseBoxHeaderBar(
-(Reference XAccessible )m_pImpl-m_aCreator, *mpBrowseBox,
eObjType );
+m_pImpl-m_aCreator, *mpBrowseBox, eObjType );
if ( BBTYPE_COLUMNHEADERBAR == eObjType)
m_pImpl-m_pColumnHeaderBar = pHeaderBar;
@@ -286,7 +286,7 @@ AccessibleBrowseBox::implGetFixedChild( sal_Int32
nChildIndex )
AccessibleBrowseBoxTable* AccessibleBrowseBox::createAccessibleTable()
{
-Reference XAccessible xCreator = (Reference XAccessible
)m_pImpl-m_aCreator;
+Reference XAccessible xCreator(m_pImpl-m_aCreator);
OSL_ENSURE( xCreator.is(),
accessibility/extended/AccessibleBrowseBox::createAccessibleTable: my creator
died - how this? );
return new AccessibleBrowseBoxTable( xCreator, *mpBrowseBox );
}
diff --git a/accessibility/source/extended/AccessibleGridControl.cxx
b/accessibility/source/extended/AccessibleGridControl.cxx
index 23f2f9c..1f927ad 100644
--- a/accessibility/source/extended/AccessibleGridControl.cxx
+++ b/accessibility/source/extended/AccessibleGridControl.cxx
@@ -275,7 +275,7 @@ AccessibleGridControl::implGetHeaderBar(
AccessibleTableControlObjType eObjType
if( !pxMember-is() )
{
AccessibleGridControlHeader* pHeaderBar = new
AccessibleGridControlHeader(
-(Reference XAccessible )m_pImpl-m_aCreator, m_aTable,
eObjType );
+m_pImpl-m_aCreator, m_aTable, eObjType );
if ( TCTYPE_COLUMNHEADERBAR == eObjType)
m_pImpl-m_pColumnHeaderBar = pHeaderBar;
@@ -310,8 +310,8 @@ AccessibleGridControl::implGetFixedChild( sal_Int32
[Libreoffice-commits] core.git: external/libeot
external/libeot/ExternalProject_libeot.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 61a66b612eaeeb38d5d9f9aa83326be6b08c1b6f Author: Stephan Bergmann sberg...@redhat.com Date: Tue Sep 30 10:41:11 2014 +0200 external/libeot internally uses --std=c99, do not overrule that Change-Id: Ic265344935b9e2d41f0e054d29b01f352407a493 diff --git a/external/libeot/ExternalProject_libeot.mk b/external/libeot/ExternalProject_libeot.mk index 97e2800..dc6a987 100644 --- a/external/libeot/ExternalProject_libeot.mk +++ b/external/libeot/ExternalProject_libeot.mk @@ -22,6 +22,7 @@ $(call gb_ExternalProject_get_state_target,libeot,build) : --enable-static \ --disable-shared \ --disable-debug \ + CFLAGS='$(filter-out -std=gnu89,$(CFLAGS))' \ $(MAKE) $(if $(VERBOSE)$(verbose),V=1) \ ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Build fails with --enable-eot
On 09/30/2014 08:22 AM, julien2412 wrote: Indeed, I use this: --enable-eot on my autogen.input Any idea? (disabling this option meanwhile) http://cgit.freedesktop.org/libreoffice/core/commit/?id=61a66b612eaeeb38d5d9f9aa83326be6b08c1b6f external/libeot internally uses --std=c99, do not overrule that should fix that now Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: getting help with Bug 71248 - Excel VBA: ActiveDocument is not tracking currently selected document
On 30/09/14 03:05, Justin Luth wrote: On 10/09/14 04:58, Noel Power wrote: [...] Noel, Thanks for that information. I've attached a diff that seems to fix the problem of the GlobalUNOConstant/Standard library names 'ThisWordDoc' and 'ThisExcelDoc' not being updated when the active document changes. Are you willing to review this and enter it into master/4.3 if it is good? I spent two weeks just trying to understand what is going on here, so I don't feel competent to try and submit the patch myself. so you got it to work, with libreoffice code that's an achievement in itself :-) well done for that However... I don't think this is the correct fix (it's close though) and it gave me some hints to look quickly a little more. Also to submit patches you should investigate using gerrit (https://wiki.documentfoundation.org/Development/gerrit) I see in the bug comments you point to lclGetVBAGlobalConstName, SC_UNO_VBAGLOBNAME and the fact they don't seem to be set/used anywhere, this is probably the root cause. It looks like there is a disconnect between the name of the property in calc (SC_UNO_VBAGLOBNAME which is equal to VBAGlobalConstantName) used to transport the name of the basic constant to track the current document and the name used in 'lclGetVBAGlobalConstName' to retrieve the the name of the basic constant (ThisVBADocObj). I would imagine the name used should be the same for things to work. It would be worth testing if that fixes it, also would be worth chasing whether writer documents set up the same property correctly Thanks, Justin https://bugs.freedesktop.org/show_bug.cgi?id=71248 Noel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/shell vcl/unx
include/shell/kde_headers.h|5 -
vcl/unx/kde4/KDE4FilePicker.cxx|3 ---
vcl/unx/kde4/KDEData.cxx |2 --
vcl/unx/kde4/KDESalFrame.cxx |2 --
vcl/unx/kde4/KDESalGraphics.cxx|2 --
vcl/unx/kde4/KDESalGraphics.hxx|2 --
vcl/unx/kde4/KDEXLib.cxx |2 --
vcl/unx/kde4/VCLKDEApplication.hxx |2 --
vcl/unx/kde4/main.cxx |2 --
9 files changed, 22 deletions(-)
New commits:
commit 07385d97cee03e7d0913c4817a65fd65581c9505
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Sep 30 11:06:42 2014 +0200
Removed obsolete Region/QtXRegion nameclash workaround
Change-Id: Iccc59319ff2a7f5612017f4a146928afbac674ee
diff --git a/include/shell/kde_headers.h b/include/shell/kde_headers.h
index 8a1131f..9b4eeac 100644
--- a/include/shell/kde_headers.h
+++ b/include/shell/kde_headers.h
@@ -37,11 +37,6 @@
#pragma GCC system_header
#endif
-
-/* * Hack, but needed because of conflicting types... */
-#define vcl::Region QtXRegion
-
-
/* * Qt headers */
#include qaccessible.h
#include qcheckbox.h
diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx
index 04d6239..af3e3ee 100644
--- a/vcl/unx/kde4/KDE4FilePicker.cxx
+++ b/vcl/unx/kde4/KDE4FilePicker.cxx
@@ -40,9 +40,6 @@
#include FPServiceInfo.hxx
#include VCLKDEApplication.hxx
-/* * Hack, but needed because of conflicting types... */
-#define vcl::Region QtXRegion
-
#include kfiledialog.h
#include kwindowsystem.h
#include kapplication.h
diff --git a/vcl/unx/kde4/KDEData.cxx b/vcl/unx/kde4/KDEData.cxx
index 32c5b1f..b180695 100644
--- a/vcl/unx/kde4/KDEData.cxx
+++ b/vcl/unx/kde4/KDEData.cxx
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#define vcl::Region QtXRegion
-
#include QStyle
#include kapplication.h
diff --git a/vcl/unx/kde4/KDESalFrame.cxx b/vcl/unx/kde4/KDESalFrame.cxx
index ad4cb7c..cf525ff 100644
--- a/vcl/unx/kde4/KDESalFrame.cxx
+++ b/vcl/unx/kde4/KDESalFrame.cxx
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#define vcl::Region QtXRegion
-
#include QColor
#include QStyle
diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx
index 98f5280..6ced2f0 100644
--- a/vcl/unx/kde4/KDESalGraphics.cxx
+++ b/vcl/unx/kde4/KDESalGraphics.cxx
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#define vcl::Region QtXRegion
-
#include QStyle
#include QStyleOption
#include QPainter
diff --git a/vcl/unx/kde4/KDESalGraphics.hxx b/vcl/unx/kde4/KDESalGraphics.hxx
index d6e9a76..daa9111 100644
--- a/vcl/unx/kde4/KDESalGraphics.hxx
+++ b/vcl/unx/kde4/KDESalGraphics.hxx
@@ -23,9 +23,7 @@
#include unx/saldisp.hxx
#include unx/salgdi.h
-#define vcl::Region QtXRegion
#include QImage
-#undef Region
/** handles graphics drawings requests and performs the needed drawing
operations */
class KDESalGraphics : public X11SalGraphics
diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx
index cf2bf2d..a915fd4 100644
--- a/vcl/unx/kde4/KDEXLib.cxx
+++ b/vcl/unx/kde4/KDEXLib.cxx
@@ -420,9 +420,7 @@ uno::Reference ui::dialogs::XFilePicker2
KDEXLib::createFilePicker(
#endif
}
-#define vcl::Region QtXRegion
#include qframe.h
-#undef Region
int KDEXLib::getFrameWidth()
{
diff --git a/vcl/unx/kde4/VCLKDEApplication.hxx
b/vcl/unx/kde4/VCLKDEApplication.hxx
index 6db6321..07e2aed 100644
--- a/vcl/unx/kde4/VCLKDEApplication.hxx
+++ b/vcl/unx/kde4/VCLKDEApplication.hxx
@@ -23,8 +23,6 @@
#include sal/types.h
-#define vcl::Region QtXRegion
-
#include kapplication.h
#undef Region
diff --git a/vcl/unx/kde4/main.cxx b/vcl/unx/kde4/main.cxx
index a201800..8c13180 100644
--- a/vcl/unx/kde4/main.cxx
+++ b/vcl/unx/kde4/main.cxx
@@ -17,9 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#define vcl::Region QtXRegion
#include QApplication
-#undef Region
#include KDEData.hxx
#include KDESalInstance.hxx
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: icon-themes/galaxy icon-themes/tango officecfg/registry sw/uiconfig
icon-themes/galaxy/cmd/lc_accepttracedchange.png |binary icon-themes/galaxy/cmd/lc_accepttrackedchanges.png |binary icon-themes/galaxy/cmd/lc_commentchangetracking.png |binary icon-themes/galaxy/cmd/lc_comparedocuments.png |binary icon-themes/galaxy/cmd/lc_nexttrackedchange.png |binary icon-themes/galaxy/cmd/lc_previoustrackedchange.png |binary icon-themes/galaxy/cmd/lc_protecttracechangemode.png |binary icon-themes/galaxy/cmd/lc_rejecttracedchange.png |binary icon-themes/galaxy/cmd/lc_showtrackedchanges.png |binary icon-themes/galaxy/cmd/lc_trackchanges.png |binary icon-themes/galaxy/cmd/sc_protecttracechangemode.png |binary icon-themes/galaxy/cmd/sc_trackchanges.png |binary icon-themes/galaxy/links.txt | 10 + icon-themes/tango/cmd/lc_accepttracedchange.png |binary icon-themes/tango/cmd/lc_accepttrackedchanges.png|binary icon-themes/tango/cmd/lc_commentchangetracking.png |binary icon-themes/tango/cmd/lc_comparedocuments.png|binary icon-themes/tango/cmd/lc_nexttrackedchange.png |binary icon-themes/tango/cmd/lc_previoustrackedchange.png |binary icon-themes/tango/cmd/lc_protecttracechangemode.png |binary icon-themes/tango/cmd/lc_rejecttracedchange.png |binary icon-themes/tango/cmd/lc_showtrackedchanges.png |binary icon-themes/tango/cmd/lc_trackchanges.png|binary icon-themes/tango/cmd/lc_trackchanges.xcf.bz2|binary icon-themes/tango/cmd/sc_protecttracechangemode.png |binary icon-themes/tango/cmd/sc_trackchanges.png|binary icon-themes/tango/links.txt | 18 - officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |3 + sw/uiconfig/swriter/toolbar/changes.xml | 20 +- 29 files changed, 23 insertions(+), 28 deletions(-) New commits: commit f178c2c68d51087e0f348f3abbc131baeded8ccd Author: Yousuf Philips philip...@hotmail.com Date: Mon Sep 29 05:45:35 2014 +0400 fdo#84405 TRACK CHANGES: New icons for the changes toolbar Change-Id: I28c4677df53137d46cd103fe224a2747bc56e5ed Reviewed-on: https://gerrit.libreoffice.org/11681 Reviewed-by: Samuel Mehrbrodt s.mehrbr...@gmail.com Tested-by: Samuel Mehrbrodt s.mehrbr...@gmail.com diff --git a/icon-themes/galaxy/cmd/lc_accepttracedchange.png b/icon-themes/galaxy/cmd/lc_accepttracedchange.png new file mode 100644 index 000..176f2c5 Binary files /dev/null and b/icon-themes/galaxy/cmd/lc_accepttracedchange.png differ diff --git a/icon-themes/galaxy/cmd/lc_accepttrackedchanges.png b/icon-themes/galaxy/cmd/lc_accepttrackedchanges.png new file mode 100644 index 000..323754d Binary files /dev/null and b/icon-themes/galaxy/cmd/lc_accepttrackedchanges.png differ diff --git a/icon-themes/galaxy/cmd/lc_commentchangetracking.png b/icon-themes/galaxy/cmd/lc_commentchangetracking.png new file mode 100644 index 000..6ec8b68 Binary files /dev/null and b/icon-themes/galaxy/cmd/lc_commentchangetracking.png differ diff --git a/icon-themes/galaxy/cmd/lc_comparedocuments.png b/icon-themes/galaxy/cmd/lc_comparedocuments.png new file mode 100644 index 000..6d3cbda Binary files /dev/null and b/icon-themes/galaxy/cmd/lc_comparedocuments.png differ diff --git a/icon-themes/galaxy/cmd/lc_nexttrackedchange.png b/icon-themes/galaxy/cmd/lc_nexttrackedchange.png new file mode 100644 index 000..7abe09b Binary files /dev/null and b/icon-themes/galaxy/cmd/lc_nexttrackedchange.png differ diff --git a/icon-themes/galaxy/cmd/lc_previoustrackedchange.png b/icon-themes/galaxy/cmd/lc_previoustrackedchange.png new file mode 100644 index 000..45bbab0 Binary files /dev/null and b/icon-themes/galaxy/cmd/lc_previoustrackedchange.png differ diff --git a/icon-themes/galaxy/cmd/lc_protecttracechangemode.png b/icon-themes/galaxy/cmd/lc_protecttracechangemode.png new file mode 100644 index 000..3581a21 Binary files /dev/null and b/icon-themes/galaxy/cmd/lc_protecttracechangemode.png differ diff --git a/icon-themes/galaxy/cmd/lc_rejecttracedchange.png b/icon-themes/galaxy/cmd/lc_rejecttracedchange.png new file mode 100644 index 000..569f329 Binary files /dev/null and b/icon-themes/galaxy/cmd/lc_rejecttracedchange.png differ diff --git a/icon-themes/galaxy/cmd/lc_showtrackedchanges.png b/icon-themes/galaxy/cmd/lc_showtrackedchanges.png new file mode 100644 index 000..8b588ba Binary files /dev/null and b/icon-themes/galaxy/cmd/lc_showtrackedchanges.png
[Libreoffice-commits] core.git: include/shell
include/shell/tde_headers.h |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d17d4d48b5dc3332fd03f6ef186ed2bda4665e7c Author: Noel Grandin n...@peralex.com Date: Tue Sep 30 11:05:09 2014 +0200 fix TDE build after commit 8dbde0845a3989528614addb9bd0333f60c522a5 fdo#82577: Handle Region Change-Id: I9c3d0ff72de1d3ff2e5c16cf12869e753ec10857 diff --git a/include/shell/tde_headers.h b/include/shell/tde_headers.h index 8ffe6b0..c537ea3 100644 --- a/include/shell/tde_headers.h +++ b/include/shell/tde_headers.h @@ -24,7 +24,7 @@ /* * Hack, but needed because of conflicting types... */ -#define vcl::Region TQtXRegion +#define Region TQtXRegion /* * TQt headers */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: 4.3.x linux packages and collada support
2014-09-27 20:57 GMT+02:00 Michael Stahl mst...@redhat.com: On 27/09/14 16:05, Zolnai Tamás wrote: 2014-09-27 15:23 GMT+02:00 Miklos Vajna vmik...@collabora.co.uk mailto:vmik...@collabora.co.uk: On Sat, Sep 27, 2014 at 08:26:38AM +0200, Zolnai Tamás zolnaitamas2...@gmail.com mailto:zolnaitamas2...@gmail.com wrote: So the only question is: Is it possible to replace the 4.3.1 and 4.3.2 linux packages with new ones which are compiled with newer compilers? (expecting this is the problem) To fix the bug mentioned above. Isn't it possible to stick to boost::shared_ptr on -4-3, given that's what other code does? It's the collada2gltf code which uses std::shared_ptr at many places so it would be much work to replace all of them with boost::shared_ptr, but actually can be done if necessary. I just thought packages are created with newer compilers, since they generate more better output (in theory). Other thing is that I need to know whether this is the problem indeed. So can I know what compilers are used for packages? Are they support std::shared_ptr? for LO 4.3 and earlier releases the RHEL5 gcc is used, i don't remember if it is gcc 4.1 or 4.4; we're only switching to a C++11 compiler for LO 4.4. actually most users will use the distro provided LO packages anyway and those don't suffer from our ancient upstream RHEL5 baseline. anyway, std::shared_ptr and boost::shared_ptr should be mostly the same, so find ... | xargs sed -i ... should be able to fix things up quite quickly to get a patch for the 4.3 branch. Hi, So I replaced all C++11 code from collada2gltf and it compiles for me with --std=c++03 flag and the feature works as expected. Here is the patch for 4.3 branch: https://gerrit.libreoffice.org/#/c/11706/ It would be helpful to test whether it compiles and works with the old compilers used for packaging. Thanks, Tamás ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: basegfx/source canvas/source canvas/workben chart2/source cppcanvas/source drawinglayer/source editeng/source filter/source include/basegfx include/cppcanvas include/dr
basegfx/source/polygon/b2dlinegeometry.cxx |2 basegfx/source/polygon/b2dpolygonclipper.cxx|4 basegfx/source/polygon/b2dpolygontools.cxx |2 basegfx/source/polygon/b2dtrapezoid.cxx |2 basegfx/source/tools/unotools.cxx |2 canvas/source/cairo/cairo_canvashelper_text.cxx |4 canvas/source/directx/dx_textlayout_drawhelper.cxx |4 canvas/source/directx/dx_winstuff.hxx |1 canvas/source/vcl/canvashelper.cxx | 10 +- canvas/source/vcl/canvashelper_texturefill.cxx |6 - canvas/source/vcl/impltools.cxx |6 - canvas/source/vcl/impltools.hxx |4 canvas/source/vcl/spritehelper.cxx |4 canvas/workben/canvasdemo.cxx |2 chart2/source/view/main/ShapeFactory.cxx|2 cppcanvas/source/inc/implrenderer.hxx |4 cppcanvas/source/mtfrenderer/implrenderer.cxx |4 drawinglayer/source/primitive2d/metafileprimitive2d.cxx |2 drawinglayer/source/primitive2d/polygonprimitive2d.cxx |2 drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx |2 drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx | 22 ++-- drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx |2 drawinglayer/source/processor2d/vclpixelprocessor2d.cxx |6 - drawinglayer/source/processor2d/vclprocessor2d.cxx |4 editeng/source/editeng/impedit.cxx |6 - editeng/source/editeng/impedit.hxx |2 editeng/source/misc/txtrange.cxx| 12 +- filter/source/flash/swfwriter.cxx |6 - filter/source/flash/swfwriter.hxx | 18 ++-- filter/source/flash/swfwriter1.cxx | 34 +++ filter/source/flash/swfwriter2.cxx |2 filter/source/graphicfilter/eos2met/eos2met.cxx |6 - filter/source/graphicfilter/epict/epict.cxx | 10 +- filter/source/graphicfilter/eps/eps.cxx | 42 - filter/source/graphicfilter/icgm/actimpr.cxx|2 filter/source/graphicfilter/icgm/class4.cxx |2 filter/source/graphicfilter/icgm/outact.hxx |6 - filter/source/graphicfilter/idxf/dxf2mtf.cxx|2 filter/source/graphicfilter/ios2met/ios2met.cxx | 14 +-- filter/source/msfilter/escherex.cxx | 18 ++-- filter/source/msfilter/msdffimp.cxx |2 filter/source/svg/svgfontexport.cxx |4 filter/source/svg/svgwriter.cxx | 30 +++--- filter/source/svg/svgwriter.hxx | 14 +-- include/basegfx/polygon/b2dlinegeometry.hxx |2 include/basegfx/polygon/b2dpolygonclipper.hxx |8 - include/basegfx/polygon/b2dpolygoncutandtouch.hxx |2 include/basegfx/polygon/b2dpolygontools.hxx |2 include/basegfx/polygon/b2dpolypolygon.hxx |2 include/basegfx/polygon/b2dpolypolygoncutter.hxx|2 include/basegfx/polygon/b2dpolypolygontools.hxx |8 - include/basegfx/polygon/b2dtrapezoid.hxx|2 include/basegfx/polygon/b3dpolypolygon.hxx |2 include/cppcanvas/canvas.hxx|2 include/cppcanvas/canvasgraphic.hxx |2 include/cppcanvas/polypolygon.hxx |4 include/cppcanvas/vclfactory.hxx|2 include/drawinglayer/primitive2d/maskprimitive2d.hxx|6 - include/drawinglayer/primitive2d/patternfillprimitive2d.hxx |4 include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx | 20 ++-- include/drawinglayer/primitive2d/textprimitive2d.hxx|2 include/drawinglayer/primitive3d/polypolygonprimitive3d.hxx |4 include/drawinglayer/primitive3d/sdrextrudeprimitive3d.hxx |2 include/drawinglayer/primitive3d/sdrlatheprimitive3d.hxx|2 include/drawinglayer/processor2d/canvasprocessor.hxx|2 include/editeng/editeng.hxx |2 include/editeng/outliner.hxx|2 include/editeng/txtrange.hxx| 10 +- include/filter/msfilter/escherex.hxx|4 include/filter/msfilter/msdffimp.hxx|2 include/filter/msfilter/svdfppt.hxx |2 include/oox/export/drawingml.hxx
[Bug 82577] get rid of prex.h / postx.h wrapper headers
https://bugs.freedesktop.org/show_bug.cgi?id=82577 --- Comment #12 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Noel Grandin committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=c9d4a2887c13a5df244022276dd79a5bef8af0ea fdo#82577: Handle PolyPolygon The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: canvas/source
canvas/source/directx/dx_textlayout_drawhelper.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit cf86b3435bb9c4068ab4de6068a4b4ac99025619
Author: Noel Grandin n...@peralex.com
Date: Tue Sep 30 11:58:03 2014 +0200
fix windows build
after commit c9d4a2887c13a5df244022276dd79a5bef8af0ea
fdo#82577: Handle PolyPolygon
Change-Id: Iac00779e4f8d94bc93a4112f7ad6abf3db14fad5
diff --git a/canvas/source/directx/dx_textlayout_drawhelper.cxx
b/canvas/source/directx/dx_textlayout_drawhelper.cxx
index 0a61a84..ec20731 100644
--- a/canvas/source/directx/dx_textlayout_drawhelper.cxx
+++ b/canvas/source/directx/dx_textlayout_drawhelper.cxx
@@ -171,7 +171,7 @@ namespace dxcanvas
}
aClipPoly.transform(aMatrix);
-const vcl::Region rClipRegion =
vcl::Region(tools::PolyPolygon(aClipPoly));
+const vcl::Region rClipRegion =
vcl::Region(::tools::PolyPolygon(aClipPoly));
aVirtualDevice.IntersectClipRegion(rClipRegion);
}
@@ -179,7 +179,7 @@ namespace dxcanvas
{
::basegfx::B2DPolyPolygon
aClipPoly(dxcanvas::tools::polyPolygonFromXPolyPolygon2D(rRenderState.Clip));
aClipPoly.transform(aWorldTransform);
-const vcl::Region rClipRegion =
vcl::Region(tools::PolyPolygon(aClipPoly));
+const vcl::Region rClipRegion =
vcl::Region(::tools::PolyPolygon(aClipPoly));
aVirtualDevice.IntersectClipRegion(rClipRegion);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/source sd/qa
oox/source/drawingml/color.cxx| 30
sd/qa/unit/data/pptx/bnc584721_4.pptx |binary
sd/qa/unit/import-tests.cxx | 41 ++
3 files changed, 61 insertions(+), 10 deletions(-)
New commits:
commit cfe658c289de030dc3a8fecd3bac0a0004a18061
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Mon Sep 29 18:48:30 2014 +0200
bnc#584721: invisible text because of wrong color (white)
Color::getColor() method uses some caching mechanism which
works wrong when the result depend on one of the input parameters.
So avoid caching in these cases.
Change-Id: Ifa9221e21e685715454de86d5cec09ff6c266307
diff --git a/oox/source/drawingml/color.cxx b/oox/source/drawingml/color.cxx
index ffbca22..05cc58d 100644
--- a/oox/source/drawingml/color.cxx
+++ b/oox/source/drawingml/color.cxx
@@ -435,13 +435,10 @@ void Color::clearTransparence()
sal_Int32 Color::getColor( const GraphicHelper rGraphicHelper, sal_Int32
nPhClr ) const
{
-/* Special handling for theme style list placeholder colors (state
-COLOR_PH), Color::getColor() may be called with different placeholder
-colors in the nPhClr parameter. Therefore, the resolved color will not
-be stored in this object, thus the state COLOR_FINAL will not be
-reached and the transformation container will not be cleared, but the
-original COLOR_PH state will be restored instead. */
-bool bIsPh = false;
+const sal_Int32 nTempC1 = mnC1;
+const sal_Int32 nTempC2 = mnC2;
+const sal_Int32 nTempC3 = mnC3;
+const ColorMode eTempMode = meMode;
switch( meMode )
{
@@ -454,7 +451,7 @@ sal_Int32 Color::getColor( const GraphicHelper
rGraphicHelper, sal_Int32 nPhClr
case COLOR_SCHEME: setResolvedRgb( rGraphicHelper.getSchemeColor(
mnC1 ) );break;
case COLOR_PALETTE: setResolvedRgb( rGraphicHelper.getPaletteColor(
mnC1 ) ); break;
case COLOR_SYSTEM: setResolvedRgb( rGraphicHelper.getSystemColor(
mnC1, mnC2 ) ); break;
-case COLOR_PH: setResolvedRgb( nPhClr ); bIsPh = true;
break;
+case COLOR_PH: setResolvedRgb( nPhClr );
break;
case COLOR_FINAL: return mnC1;
}
@@ -590,10 +587,23 @@ sal_Int32 Color::getColor( const GraphicHelper
rGraphicHelper, sal_Int32 nPhClr
mnC1 = API_RGB_TRANSPARENT;
}
-meMode = bIsPh ? COLOR_PH : COLOR_FINAL;
+sal_Int32 nRet = mnC1;
+// Restore the original values when the color depends on one of the input
+// parameters (rGraphicHelper or nPhClr)
+if( eTempMode = COLOR_SCHEME eTempMode = COLOR_PH )
+{
+mnC1 = nTempC1;
+mnC2 = nTempC2;
+mnC3 = nTempC3;
+meMode = eTempMode;
+}
+else
+{
+meMode = COLOR_FINAL;
+}
if( meMode == COLOR_FINAL )
maTransforms.clear();
-return mnC1;
+return nRet;
}
bool Color::hasTransparency() const
diff --git a/sd/qa/unit/data/pptx/bnc584721_4.pptx
b/sd/qa/unit/data/pptx/bnc584721_4.pptx
new file mode 100644
index 000..102ee0b
Binary files /dev/null and b/sd/qa/unit/data/pptx/bnc584721_4.pptx differ
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index c654acb..4baad7a 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -83,6 +83,7 @@ public:
void testBnc584721_1();
void testBnc584721_2();
void testBnc584721_3();
+void testBnc584721_4();
CPPUNIT_TEST_SUITE(SdFiltersTest);
CPPUNIT_TEST(testDocumentLayout);
@@ -109,6 +110,7 @@ public:
CPPUNIT_TEST(testBnc584721_1);
CPPUNIT_TEST(testBnc584721_2);
CPPUNIT_TEST(testBnc584721_3);
+CPPUNIT_TEST(testBnc584721_4);
CPPUNIT_TEST_SUITE_END();
};
@@ -822,6 +824,45 @@ void SdFiltersTest::testBnc591147()
xDocShRef-DoClose();
}
+void SdFiltersTest::testBnc584721_4()
+{
+// Black text was imported as white because of wrong caching mechanism
+
+::sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc(/sd/qa/unit/data/pptx/bnc584721_4.pptx), PPTX);
+
+uno::Reference drawing::XDrawPagesSupplier xDoc(
+xDocShRef-GetDoc()-getUnoModel(), uno::UNO_QUERY_THROW );
+
+uno::Reference drawing::XDrawPage xPage(
+xDoc-getDrawPages()-getByIndex(1), uno::UNO_QUERY_THROW );
+
+uno::Reference beans::XPropertySet xShape(
+xPage-getByIndex(1), uno::UNO_QUERY );
+CPPUNIT_ASSERT_MESSAGE( no text shape, xShape.is() );
+
+// Get first paragraph of the text
+uno::Referencetext::XText xText =
uno::Referencetext::XTextRange(xShape, uno::UNO_QUERY)-getText();
+CPPUNIT_ASSERT_MESSAGE( no text shape, xText.is() );
+uno::Referencecontainer::XEnumerationAccess paraEnumAccess;
+paraEnumAccess.set(xText, uno::UNO_QUERY);
+uno::Referencecontainer::XEnumeration paraEnum =
[Libreoffice-commits] core.git: 2 commits - include/test sw/qa test/source
include/test/xmltesttools.hxx|4
sw/qa/extras/inc/swmodeltestbase.hxx |4 +++-
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 18 ++
test/source/xmltesttools.cxx | 12
4 files changed, 21 insertions(+), 17 deletions(-)
New commits:
commit 548b360c0e4693aac0cbdd2fcc1aab433fc54010
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Sep 30 11:48:59 2014 +0200
Factor out duplicated code to XmlTestTools::assertXPathNoAttribute()
Change-Id: I1eb3778e6bcdd8c44ffb9a7548add109331fc83b
diff --git a/include/test/xmltesttools.hxx b/include/test/xmltesttools.hxx
index 6709c1c..a3ac5d6 100644
--- a/include/test/xmltesttools.hxx
+++ b/include/test/xmltesttools.hxx
@@ -76,6 +76,10 @@ protected:
* Useful for checking that we do have a no child nodes to a specific node
(nNumberOfChildNodes == 0).
*/
void assertXPathChildren(xmlDocPtr pXmlDoc, const OString
rXPath, int nNumberOfChildNodes);
+/**
+ * Assert that rXPath exists, has exactly 1 child node and does *not* have
an attribute named rAttribute.
+ */
+void assertXPathNoAttribute(xmlDocPtr pXmlDoc, const OString
rXPath, const OString rAttribute);
};
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 207970d..d136875 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -134,14 +134,7 @@ DECLARE_OOXMLEXPORT_TEST(testParaShading,
para-shading.docx)
{
// Make sure the themeColor attribute is not written when it would be
empty.
if (xmlDocPtr pXmlDoc = parseExport(word/document.xml))
-{
-xmlXPathObjectPtr pXPath = getXPathNode(pXmlDoc,
/w:document/w:body/w:p/w:pPr/w:shd);
-xmlNodeSetPtr pXmlNodes = pXPath-nodesetval;
-CPPUNIT_ASSERT_EQUAL(1, xmlXPathNodeSetGetLength(pXmlNodes));
-xmlNodePtr pXmlNode = pXmlNodes-nodeTab[0];
-// The attribute existed, so xmlGetProp() returned non-NULL.
-CPPUNIT_ASSERT_EQUAL(static_castxmlChar*(0), xmlGetProp(pXmlNode,
BAD_CAST(themeColor)));
-}
+assertXPathNoAttribute(pXmlDoc, /w:document/w:body/w:p/w:pPr/w:shd,
themeColor);
}
DECLARE_OOXMLEXPORT_TEST(testFirstHeaderFooter, first-header-footer.docx)
@@ -294,14 +287,7 @@ DECLARE_OOXMLEXPORT_TEST(testDrawingmlFlipv,
drawingml-flipv.docx)
{
// The problem was that the shape had vertical flip only, but then we
added rotation as well on export.
if (xmlDocPtr pXmlDoc = parseExport(word/document.xml))
-{
-xmlXPathObjectPtr pXPath = getXPathNode(pXmlDoc, //a:xfrm);
-xmlNodeSetPtr pXmlNodes = pXPath-nodesetval;
-CPPUNIT_ASSERT_EQUAL(1, xmlXPathNodeSetGetLength(pXmlNodes));
-xmlNodePtr pXmlNode = pXmlNodes-nodeTab[0];
-// The attribute existed, so xmlGetProp() returned non-NULL.
-CPPUNIT_ASSERT_EQUAL(static_castxmlChar*(0), xmlGetProp(pXmlNode,
BAD_CAST(rot)));
-}
+assertXPathNoAttribute(pXmlDoc, //a:xfrm, rot);
}
DECLARE_OOXMLEXPORT_TEST(testRot90Fliph, rot90-fliph.docx)
diff --git a/test/source/xmltesttools.cxx b/test/source/xmltesttools.cxx
index 5ba9162..32908a0 100644
--- a/test/source/xmltesttools.cxx
+++ b/test/source/xmltesttools.cxx
@@ -114,6 +114,18 @@ void XmlTestTools::assertXPathChildren(xmlDocPtr pXmlDoc,
const OString rXPath,
#endif
}
+void XmlTestTools::assertXPathNoAttribute(xmlDocPtr pXmlDoc, const OString
rXPath, const OString rAttribute)
+{
+xmlXPathObjectPtr pXmlObj = getXPathNode(pXmlDoc, rXPath);
+xmlNodeSetPtr pXmlNodes = pXmlObj-nodesetval;
+CPPUNIT_ASSERT_EQUAL_MESSAGE(OString(In + OString(pXmlDoc-name) + ,
XPath ' + rXPath + ' number of nodes is incorrect).getStr(),
+ 1, xmlXPathNodeSetGetLength(pXmlNodes));
+xmlNodePtr pXmlNode = pXmlNodes-nodeTab[0];
+CPPUNIT_ASSERT_EQUAL_MESSAGE(OString(In + OString(pXmlDoc-name) + ,
XPath ' + rXPath + ' unexpected ' + rAttribute + ' attribute).getStr(),
+ static_castxmlChar*(0),
xmlGetProp(pXmlNode, BAD_CAST(rAttribute.getStr(;
+xmlXPathFreeObject(pXmlObj);
+}
+
int XmlTestTools::getXPathPosition(xmlDocPtr pXmlDoc, const OString rXPath,
const OUString rChildName)
{
xmlXPathObjectPtr pXmlObj = getXPathNode(pXmlDoc, rXPath);
commit a87d0bc0f5ace66c5d0d71f310f99ba9dbebc543
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Sep 30 11:48:08 2014 +0200
SwModelTestBase: include name of document in CPPUNIT_ASSERT msgs
Change-Id: Ice6834702419e6d2e8b7eb3051aeea2c9b596249
diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx
b/sw/qa/extras/inc/swmodeltestbase.hxx
index 2658f12..fdce9f1 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -654,7 +654,9 @@ protected:
uno::Referenceio::XInputStream
xInputStream(xNameAccess-getByName(rStreamName),
Re: ANNOUNCE: Renaming user-visible strings
Am 29.09.2014 um 21:27 schrieb Caolán McNamara: Don't think that'll scale well. Some sort of automation is called for there, not sure how of course, but we have stuff to suck out all the translatable strings so someone(tm) should be able to come up with a scheme to diff them e.g. once a week against the previous state. Not sure how much work that is, could this be an easy hack? However, until that someone (tm) will bring us a better solution, we can use the wiki page I guess. It's better than nothing. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 12 commits - desktop/source extensions/source forms/source framework/inc i18npool/inc idlc/source l10ntools/source linguistic/source lotuswordpro/source mysqlc/source p
desktop/source/app/app.cxx|4 +- desktop/source/deployment/gui/dp_gui_dialog2.cxx |2 - desktop/source/deployment/gui/dp_gui_service.cxx |2 - desktop/source/deployment/gui/license_dialog.cxx |2 - desktop/source/deployment/manager/dp_manager.h|2 - desktop/source/deployment/registry/component/dp_component.cxx |2 - desktop/source/deployment/registry/configuration/dp_configuration.cxx | 15 +++-- desktop/source/deployment/registry/executable/dp_executable.cxx |2 - desktop/source/deployment/registry/help/dp_help.cxx |2 - desktop/source/deployment/registry/package/dp_package.cxx |2 - desktop/source/deployment/registry/script/dp_script.cxx |2 - desktop/source/migration/migration_impl.hxx |4 +- desktop/source/migration/services/misc.hxx|2 - extensions/source/logging/filehandler.cxx |2 - extensions/source/propctrlr/browserlistbox.hxx|2 - extensions/source/propctrlr/cellbindinghandler.hxx|2 - extensions/source/propctrlr/composeduiupdate.hxx |2 - extensions/source/propctrlr/defaultforminspection.hxx |4 -- extensions/source/propctrlr/eformspropertyhandler.hxx |2 - extensions/source/propctrlr/eventhandler.cxx |2 - extensions/source/propctrlr/formcomponenthandler.hxx |2 - extensions/source/propctrlr/formlinkdialog.hxx| 10 ++ extensions/source/propctrlr/inspectormodelbase.cxx|2 - extensions/source/propctrlr/inspectormodelbase.hxx|2 - extensions/source/propctrlr/propcontroller.hxx|2 - extensions/source/propctrlr/propertycomposer.hxx |4 -- extensions/source/propctrlr/propertycontrolextender.hxx |2 - extensions/source/propctrlr/propertyhandler.hxx |2 - extensions/source/propctrlr/submissionhandler.hxx |2 - extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx |2 - forms/source/component/ComboBox.hxx |2 - forms/source/component/Edit.hxx |2 - forms/source/component/Pattern.hxx|2 - forms/source/component/cachedrowset.hxx |2 - forms/source/component/clickableimage.hxx |2 - forms/source/inc/controlfeatureinterception.hxx |4 -- forms/source/inc/formnavigation.hxx |8 + forms/source/richtext/richtextmodel.cxx |1 forms/source/richtext/richtextmodel.hxx |2 - forms/source/xforms/datatypes.cxx |4 -- forms/source/xforms/datatypes.hxx |2 - forms/source/xforms/submission/replace.cxx|6 +-- forms/source/xforms/submission/submission.hxx |2 - forms/source/xforms/submission/submission_post.cxx|2 - forms/source/xforms/submission/submission_put.cxx |2 - framework/inc/uiconfiguration/imagemanager.hxx|2 - framework/inc/uiconfiguration/moduleimagemanager.hxx |4 -- i18npool/inc/localedata.hxx |2 - idlc/source/astexpression.cxx | 10 +- l10ntools/source/helpmerge.cxx|2 - linguistic/source/convdic.hxx |4 +- lotuswordpro/source/filter/lwpbreaksoverride.cxx |2 - lotuswordpro/source/filter/lwpcharborderoverride.cxx |4 +- lotuswordpro/source/filter/lwpfilter.cxx |2 - lotuswordpro/source/filter/lwpoverride.cxx| 14 +++- lotuswordpro/source/filter/lwppara.cxx|2 - lotuswordpro/source/filter/lwppara1.cxx | 16 ++ lotuswordpro/source/filter/lwpparaborderoverride.cxx | 10 ++ lotuswordpro/source/filter/lwpparastyle.cxx |4 -- mysqlc/source/mysqlc_connection.cxx |2 - mysqlc/source/mysqlc_connection.hxx |2 - package/source/zippackage/ZipPackageFolder.cxx
[Libreoffice-commits] core.git: vcl/win
vcl/win/source/gdi/wntgdi.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d8c05aa3b9fb6d364511bf416f21e827438ad16b
Author: Noel Grandin n...@peralex.com
Date: Tue Sep 30 12:50:07 2014 +0200
fix windows build
after commit c9d4a2887c13a5df244022276dd79a5bef8af0ea
fdo#82577: Handle PolyPolygon
Change-Id: Id7b06bc1889bd84c37b1d4b7ddd542ad1d12ada2
diff --git a/vcl/win/source/gdi/wntgdi.cxx b/vcl/win/source/gdi/wntgdi.cxx
index d371c78..7beb176 100644
--- a/vcl/win/source/gdi/wntgdi.cxx
+++ b/vcl/win/source/gdi/wntgdi.cxx
@@ -45,7 +45,7 @@ extern C
{
BOOL WINAPI WIN_PolyPolygon( HDC hDC, CONST POINT * ppt, LPINT npcnt, int ncnt
)
{
-return tools::PolyPolygon( hDC, ppt, npcnt, ncnt );
+return PolyPolygon( hDC, ppt, npcnt, ncnt );
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/droid_calcimpress2' - 3 commits - android/Bootstrap android/experimental solenv/bin
android/Bootstrap/Makefile.shared |5 android/experimental/LOAndroid3/res/layout/about.xml | 47 ++ android/experimental/LOAndroid3/res/menu/main.xml |8 - android/experimental/LOAndroid3/res/values/strings.xml |8 - android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java | 72 +++--- solenv/bin/native-code.py |1 6 files changed, 118 insertions(+), 23 deletions(-) New commits: commit 614d94a515248b37045e27271c2d39bbe5b8fe3a Author: Tomaž Vajngerl tomaz.vajng...@collabora.com Date: Tue Sep 30 13:11:19 2014 +0200 android: about dialog in properties Change-Id: I82961efee6415f07248c79062f2b3b8c58266821 diff --git a/android/experimental/LOAndroid3/res/layout/about.xml b/android/experimental/LOAndroid3/res/layout/about.xml new file mode 100644 index 000..f1222dc --- /dev/null +++ b/android/experimental/LOAndroid3/res/layout/about.xml @@ -0,0 +1,47 @@ +?xml version=1.0 encoding=utf-8? + +LinearLayout xmlns:android=http://schemas.android.com/apk/res/android; + android:layout_width=match_parent + android:layout_height=match_parent + android:orientation=vertical + android:padding=20dip + +TextView +android:id=@+id/about_description +android:layout_width=match_parent +android:layout_height=wrap_content +android:text=@string/app_description +android:textColor=@android:color/secondary_text_light +android:textSize=16sp/ + +TextView +android:id=@+id/about_credits +android:layout_width=match_parent +android:layout_height=wrap_content +android:autoLink=web +android:paddingTop=20dip +android:text=@string/app_credits +android:textColor=@android:color/secondary_text_light +android:textSize=16dip/ + +LinearLayout xmlns:android=http://schemas.android.com/apk/res/android; + android:layout_width=match_parent + android:layout_height=wrap_content + android:orientation=horizontal + +Button +android:id=@+id/about_license_button +android:layout_width=wrap_content +android:layout_height=wrap_content +android:text=License +/ + +Button +android:id=@+id/about_notice_button +android:layout_width=wrap_content +android:layout_height=wrap_content +android:text=Notice +/ +/LinearLayout + +/LinearLayout \ No newline at end of file diff --git a/android/experimental/LOAndroid3/res/menu/main.xml b/android/experimental/LOAndroid3/res/menu/main.xml index d51872b..cdf83bb 100644 --- a/android/experimental/LOAndroid3/res/menu/main.xml +++ b/android/experimental/LOAndroid3/res/menu/main.xml @@ -3,11 +3,11 @@ xmlns:tools=http://schemas.android.com/tools; tools:context=org.libreoffice.MainActivity -item android:id=@+id/action_settings -android:title=@string/action_settings +item android:id=@+id/action_about +android:title=@string/action_about android:orderInCategory=100 / -item android:id=@+id/action_list - android:title=@string/action_list +item android:id=@+id/action_parts + android:title=@string/action_parts android:orderInCategory=100 / /menu diff --git a/android/experimental/LOAndroid3/res/values/strings.xml b/android/experimental/LOAndroid3/res/values/strings.xml index d69b331..74dee00 100644 --- a/android/experimental/LOAndroid3/res/values/strings.xml +++ b/android/experimental/LOAndroid3/res/values/strings.xml @@ -2,8 +2,9 @@ resources string name=app_nameLibreOffice/string -string name=action_settingsSettings/string -string name=action_listParts/string +string name=app_descriptionDescription/string +string name=app_creditsCredits/string + string name=browser_app_nameLibreOfficeUI/string string name=menu_searchSearch/string string name=list_viewList/string @@ -16,4 +17,7 @@ string name=EXPLORER_VIEW_TYPE_KEYEXPLORER_VIEW_TYPE/string string name=CURRENT_DIRECTORY_KEYCURRENT_DIRECTORY/string +string name=action_aboutAbout/string +string name=action_partsParts/string + /resources diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java index b6b892a..cc86e0b 100644 --- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java +++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java @@ -1,6 +1,9 @@ package org.libreoffice; import
[Libreoffice-commits] core.git: forms/qa
forms/qa/integration/forms/ControlValidation.java |6 --
forms/qa/integration/forms/RadioButtons.java|4
forms/qa/integration/forms/SingleControlValidation.java |2 --
forms/qa/integration/forms/SpreadsheetView.java |2 --
forms/qa/integration/forms/ValueBinding.java|2 --
5 files changed, 16 deletions(-)
New commits:
commit 62bd1d1783e60df69e592acfafb94b5dbc2e8d78
Author: Robert Antoni Buj i Gelonch robert@gmail.com
Date: Tue Sep 30 13:11:44 2014 +0200
forms: remove import from the same package
Change-Id: Ia15b4586e183bcd24a47c1a072c4d6e8ca280e98
Reviewed-on: https://gerrit.libreoffice.org/11714
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com
diff --git a/forms/qa/integration/forms/ControlValidation.java
b/forms/qa/integration/forms/ControlValidation.java
index f28031a..dce4a23 100644
--- a/forms/qa/integration/forms/ControlValidation.java
+++ b/forms/qa/integration/forms/ControlValidation.java
@@ -22,12 +22,6 @@ import com.sun.star.uno.*;
import com.sun.star.util.*;
import com.sun.star.lang.*;
import com.sun.star.beans.*;
-import integration.forms.DocumentHelper;
-import integration.forms.NumericValidator;
-import integration.forms.TextValidator;
-import integration.forms.BooleanValidator;
-import integration.forms.ListSelectionValidator;
-import integration.forms.SingleControlValidation;
public class ControlValidation extends complexlib.ComplexTestCase implements
com.sun.star.lang.XEventListener
{
diff --git a/forms/qa/integration/forms/RadioButtons.java
b/forms/qa/integration/forms/RadioButtons.java
index 9d6691a..0156e00 100644
--- a/forms/qa/integration/forms/RadioButtons.java
+++ b/forms/qa/integration/forms/RadioButtons.java
@@ -24,10 +24,6 @@ import com.sun.star.container.*;
import com.sun.star.beans.*;
import com.sun.star.awt.XRadioButton;
-import integration.forms.dbfTools;
-import integration.forms.DocumentHelper;
-import integration.forms.SpreadsheetDocument;
-
public class RadioButtons extends complexlib.ComplexTestCase
{
private DocumentHelper m_document; /// our current test
document
diff --git a/forms/qa/integration/forms/SingleControlValidation.java
b/forms/qa/integration/forms/SingleControlValidation.java
index 7796568..a24639b 100644
--- a/forms/qa/integration/forms/SingleControlValidation.java
+++ b/forms/qa/integration/forms/SingleControlValidation.java
@@ -22,8 +22,6 @@ import com.sun.star.uno.*;
import com.sun.star.beans.*;
import com.sun.star.form.validation.*;
-import integration.forms.DocumentHelper;
-
public class SingleControlValidation implements XFormComponentValidityListener
{
private DocumentHelper m_document; /// our current test
document
diff --git a/forms/qa/integration/forms/SpreadsheetView.java
b/forms/qa/integration/forms/SpreadsheetView.java
index dbc05d8..76934bc 100644
--- a/forms/qa/integration/forms/SpreadsheetView.java
+++ b/forms/qa/integration/forms/SpreadsheetView.java
@@ -29,8 +29,6 @@ import com.sun.star.frame.*;
import com.sun.star.sheet.*;
import com.sun.star.container.*;
-import integration.forms.DocumentHelper;
-
public class SpreadsheetView extends integration.forms.DocumentViewHelper
{
diff --git a/forms/qa/integration/forms/ValueBinding.java
b/forms/qa/integration/forms/ValueBinding.java
index 7f1a210..3b6e66b 100644
--- a/forms/qa/integration/forms/ValueBinding.java
+++ b/forms/qa/integration/forms/ValueBinding.java
@@ -27,8 +27,6 @@ import com.sun.star.text.XTextCursor;
import com.sun.star.form.binding.XValueBinding;
import com.sun.star.form.binding.XBindableValue;
-import integration.forms.TableCellTextBinding;
-
public class ValueBinding extends integration.forms.TestCase
{
/** Creates a new instance of ValueBinding */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: forms/qa
forms/qa/complex/forms/CheckOGroupBoxModel.java |5 +
forms/qa/integration/forms/FormLayer.java |2 +-
2 files changed, 2 insertions(+), 5 deletions(-)
New commits:
commit 1c70f59c133256f3ee0411a3b625916ad62a8603
Author: Robert Antoni Buj i Gelonch robert@gmail.com
Date: Tue Sep 30 13:01:02 2014 +0200
forms: the assigned value is never used
Change-Id: I8eadc27ba8880630ec93c68145969f3e8ba6c189
Reviewed-on: https://gerrit.libreoffice.org/11712
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com
diff --git a/forms/qa/complex/forms/CheckOGroupBoxModel.java
b/forms/qa/complex/forms/CheckOGroupBoxModel.java
index 6f048a6..b76cda3 100644
--- a/forms/qa/complex/forms/CheckOGroupBoxModel.java
+++ b/forms/qa/complex/forms/CheckOGroupBoxModel.java
@@ -127,8 +127,6 @@ public class CheckOGroupBoxModel
private String[] getBoundPropsToTest()
{
Property[] properties =
m_xPropSet.getPropertySetInfo().getProperties();
-String[] testPropsNames = null;
-
ArrayListString tNames = new ArrayListString();
for (int i = 0; i properties.length; i++)
@@ -151,8 +149,7 @@ public class CheckOGroupBoxModel
} // endfor
//get a array of bound properties
-testPropsNames = new String[tNames.size()];
-testPropsNames = tNames.toArray(testPropsNames);
+String[] testPropsNames = tNames.toArray(new String[tNames.size()]);
return testPropsNames;
}
diff --git a/forms/qa/integration/forms/FormLayer.java
b/forms/qa/integration/forms/FormLayer.java
index a86f6f1..e7c33a0 100644
--- a/forms/qa/integration/forms/FormLayer.java
+++ b/forms/qa/integration/forms/FormLayer.java
@@ -102,7 +102,7 @@ public class FormLayer
// insert the model into the form component hierarchy, if the caller
gave us a location
if ( null != _parentForm )
{
-XIndexContainer parentForm = null;
+XIndexContainer parentForm;
if ( _parentForm instanceof XIndexContainer )
parentForm = (XIndexContainer)_parentForm;
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 34555] Make cropping handles for images (as in Draw/Impress) available for all LibreOffice applications
https://bugs.freedesktop.org/show_bug.cgi?id=34555 --- Comment #46 from Sushil sushil.shi...@synerzip.com --- If anyone is not working on this ... then can I take this issue.. ? If possible also provide me more code pointers to add crop option in manu bar and to make it clickable.. -- 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: bean/com bean/Jar_officebean.mk
bean/Jar_officebean.mk |8
bean/com/sun/star/beans/ContainerFactory.java | 38 -
bean/com/sun/star/beans/JavaWindowPeerFake.java| 113 ---
bean/com/sun/star/beans/LocalOfficeConnection.java | 611 -
bean/com/sun/star/beans/LocalOfficeWindow.java | 304 --
bean/com/sun/star/beans/NativeConnection.java | 50 -
bean/com/sun/star/beans/NativeService.java | 27
bean/com/sun/star/beans/OfficeConnection.java | 69 --
bean/com/sun/star/beans/OfficeWindow.java | 46 -
9 files changed, 1266 deletions(-)
New commits:
commit 3aa70e21d7d5fdbf68aebe90a4967ec8350db43f
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Sep 30 14:40:05 2014 +0200
[API CHANGE] OfficeBean: remove deprecated com.sun.star.beans classes
https://wiki.openoffice.org/wiki/Documentation/DevGuide/JavaBean/The_Internal_Office_Bean_API:
Prior to OpenOffice.org 2.0 all Office Bean classes were in the
com.sun.star.bean package. As of OpenOffice.org 2.0 the classes are
contained
in the com.sun.star.comp.bean package. The classes of the com.sun.star.bean
package are still contained in the officebean.jar but they are deprecated.
Further development and bug fixing will occur only in the
com.sun.star.comp.bean
package.
Change-Id: I9421bfba941d9801a5cf8886ca971275740d178a
diff --git a/bean/Jar_officebean.mk b/bean/Jar_officebean.mk
index 85278831..12b895a 100644
--- a/bean/Jar_officebean.mk
+++ b/bean/Jar_officebean.mk
@@ -20,14 +20,6 @@ $(eval $(call gb_Jar_use_jars,officebean,\
$(eval $(call gb_Jar_set_packageroot,officebean,com))
$(eval $(call gb_Jar_add_sourcefiles,officebean,\
- bean/com/sun/star/beans/ContainerFactory \
- bean/com/sun/star/beans/JavaWindowPeerFake \
- bean/com/sun/star/beans/LocalOfficeConnection \
- bean/com/sun/star/beans/LocalOfficeWindow \
- bean/com/sun/star/beans/NativeConnection \
- bean/com/sun/star/beans/NativeService \
- bean/com/sun/star/beans/OfficeConnection \
- bean/com/sun/star/beans/OfficeWindow \
bean/com/sun/star/comp/beans/ContainerFactory \
bean/com/sun/star/comp/beans/Controller \
bean/com/sun/star/comp/beans/Frame \
diff --git a/bean/com/sun/star/beans/ContainerFactory.java
b/bean/com/sun/star/beans/ContainerFactory.java
deleted file mode 100644
index e3c0c9d..000
--- a/bean/com/sun/star/beans/ContainerFactory.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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 .
- */
-
-package com.sun.star.beans;
-
-import java.awt.Container;
-
-/**
- * This interface reprecents an AWT container factory.
- *
- * @see OfficeBean
- * @deprecated
- */
-
-public interface ContainerFactory
-{
-/**
- * Creates an AWT container.
- *
- * @return An AWT container.
- */
-Container createContainer();
-}
diff --git a/bean/com/sun/star/beans/JavaWindowPeerFake.java
b/bean/com/sun/star/beans/JavaWindowPeerFake.java
deleted file mode 100644
index efd57d0..000
--- a/bean/com/sun/star/beans/JavaWindowPeerFake.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * 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 .
- */
-
-package com.sun.star.beans;
-
-import com.sun.star.awt.*;
-
-/** pClass to pass the system window handle to the OpenOffice.org
toolkit./p
- * @deprecated
- */
-/* package */ class JavaWindowPeerFake
-
LibreOfficeKit bits ...
Hi Nicholas,
So - CC'ing the public dev list as I said I would; since this is
generally interesting (I hope ;-).
On Tue, 2014-09-30 at 08:25 -0400, nicholas ferguson wrote:
Sure sure - so; that's not -so- hard. You basically want the
equivalent of liblibreoffice I think - which currently works on
Linux only but is easy enough to tweak for Windows with a bit of
work / thought I think.
How do I get a liblibreoffice? I hadn't heard of it. which I presume
is Libreoffice full functionality available as a library? Is this the
libreoffice built with 'headless'
Sure - so, that is the goal; for Linux - yes headless; for Windows - we
need to do some more work to get headless-ness going nicely. Various
fonts pieces needed for eg. headless PDF rendering are associated with
window handles the like.
So - I lie; it's not called liblibreoffice anymore it is
LibreOfficeKit:
http://cgit.freedesktop.org/libreoffice/core/tree/include/LibreOfficeKit
Has the (so far rather spartan) API. We wrap a C++ API around some C
vtables - and the -idea- [ just to make you aware that we are trying to
care about ease of use ] - is that this would have zero compile-time
dependencies. Just cut/paste the dlopen type code in then de-reference
some vtables. The very minimal tiled rendering API there is not stable
yet.
[ incidentally do you want this for an automated service or a UI
spreadsheet debugging tool ?
automated service. A small app that would link with liblibreoffice.
This app would have functions to
open(excel)
analyze(excel)
close(excel)
Yep - so open close are already parts of LibreOfficeKit. I have a
plan to try to expose the UNO functionality with pre-compiled headers in
such a way that these are also dependency-less; ie. you don't need to
link to anything to use the programmatic API; but that needs a somewhat
tweaked UNO binding - again, not got to that yet.
And behind these functions are code from liblibreoffice. In a
sense...liblibreoffice would be this fat rich library of code.
Seems we share a vision =)
First round of accessement is to build an automated service that would
audit a spreadsheet. Automated means that an application is started,
it loads up an excel spreadsheet, then generates an output of its
analysis.
Sounds good to me; of course, we're also interested in internal
auditing tooling - I'd love that histogram + list of functions used,
visualized dependency graph stuff built right into calc myself: tons
of people would use it.
So if I use code from sc what function/file do I use that takes
as an argument, a url of an excel spreadsheet file and creates an
object that can allow access to all of the functionality in sc?
Oh - so, that is actually hard ;-) then again - I -guess- we could have
some fun here. If you want a -really- evil / dirty hack, you could -try-
copy/pasting/hacking (in an ABI compatible way) some of the calc
headers; using LibreOfficeKit and dynamic_casting your UNO object
suitably ;- [ URGH ! ;-]. Of course v. fragile, we don't support that
but might work for quick bootstrapping.
The hook to dlopen / call is in desktop/source/lib/init.cxx - see the:
SAL_DLLPUBLIC_EXPORT LibreOfficeKit *libreofficekit_hook(const char*
install_path)
Method - which is what returns that LOK class. Then by some horror of
dynamic_casting and ptr offsets, I suspect you could get from:
struct LibLODocument_Impl : public _LibreOfficeKitDocument
{
uno::Referencecss::lang::XComponent mxComponent;
To the:
sc/inc/docuno.hxx: public ::vcl::ITiledRenderable,
And from there - ripping out only a few headers to an ScDocument ;-)
Of course - that is all basically illegal; horribly fragile, none of
that ABI is stable - indeed we guarentee it will be horribly unstable
etc. =)
So - in general, you'd do far better to implement the code inside
LibreOffice - inside a clean Windows VM; and then we can discuss a patch
to see if there is some way that we can provide a nice API for this.
Then again - if you want to get something working first and then iterate
- that'd be cool.
I'd be open to a generic LibreOfficeKit API for introspecting
spreadsheets, their formulae etc. though it might be better to get a
sensible UNO bridge written first - and providing a UNO interface that
could be used generically at run-time.
ATB,
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: vcl/unx
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 9db2eeea92d3a1e0571ae91eb74e218662732be9 Author: Matthew J. Francis mjay.fran...@gmail.com Date: Mon Sep 29 12:38:05 2014 +0800 Avoid leaking a GtkMenu This is only freed on application exit, but in as far as there's a point to freeing it at all we should do it properly. Our handling of this GtkMenu is unique - it isn't owned by anything, and we paint it ourself manually. Therefore, in order to handle the refcounting correctly, we should sink the initially floating reference, and explicitly unreference it to finalise. Valgrind confirms that the leak is eliminated by doing this. Change-Id: I4c796c4d37dd8f514aff9768fab66168d36bae64 Reviewed-on: https://gerrit.libreoffice.org/11682 Reviewed-by: Michael Meeks michael.me...@collabora.com Tested-by: Michael Meeks michael.me...@collabora.com diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx index ee623bc..bab4f5c 100644 --- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx @@ -489,7 +489,7 @@ void GtkData::deInitNWF( void ) if( gWidgetData[i].gCacheWindow ) gtk_widget_destroy( gWidgetData[i].gCacheWindow ); if( gWidgetData[i].gMenuWidget ) -gtk_widget_destroy( gWidgetData[i].gMenuWidget ); +g_object_unref (gWidgetData[i].gMenuWidget); if( gWidgetData[i].gTooltipPopup ) gtk_widget_destroy( gWidgetData[i].gTooltipPopup ); if( gWidgetData[i].gDialog ) @@ -4400,6 +4400,8 @@ static void NWEnsureGTKMenu( SalX11Screen nScreen ) gWidgetData[nScreen].gMenuItemSeparatorMenuWidget = gtk_menu_item_new(); gWidgetData[nScreen].gImageMenuItem = gtk_image_menu_item_new(); +g_object_ref_sink (gWidgetData[nScreen].gMenuWidget); + gtk_menu_shell_append( GTK_MENU_SHELL( gWidgetData[nScreen].gMenuWidget ), gWidgetData[nScreen].gMenuItemMenuWidget ); gtk_menu_shell_append( GTK_MENU_SHELL( gWidgetData[nScreen].gMenuWidget ), gWidgetData[nScreen].gMenuItemCheckMenuWidget ); gtk_menu_shell_append( GTK_MENU_SHELL( gWidgetData[nScreen].gMenuWidget ), gWidgetData[nScreen].gMenuItemRadioMenuWidget ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
RE: LibreOfficeKit bits ...
Sure sure - so; that's not -so- hard. You basically want the equivalent of liblibreoffice I think - which currently works on Linux only but is easy enough to tweak for Windows with a bit of work / thought I think. [nicholas ferguson] I found a sample of working an excel sh in sc/qa/unit/filters_test.cxx and there is a loadDoc in sc/qa/unit/helper/qahelp.hxx and cxx My question... How do I transform filters_test.cxx into a console app, where filters_test.cxx would have a point of entry, a main function. When I try that..a console app gets hits with a series of aborts, undefined function ErrInfo::IsA... Or env not properly set, and does not result in a useable app. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
UNO sequence cleanup ...
Hi Matus,
So - to confirm; Stephan and I discussed this, and there is interest in
improving things.
Currently the uno::Sequence destructor (which reaches iDestructSequence
~34k times during startup with a sequence that has a ref-count 1) -
goes via:
template class E
inline Sequence E ::~Sequence()
{
const Type rType = ::cppu::getTypeFavourUnsigned( this );
::uno_type_destructData(
this, rType.getTypeLibType(), (uno_ReleaseFunc)cpp_release );
}
Which ends up in some wonderful type-informed way inside:
cppu/source/uno/destr.hxx (idestructSequence)
But it would be far more ideal to have:
template class E
inline Sequence E ::~Sequence()
{
if (!osl_atomic_decrement( rSeq._pSequence-nRefCount ))
doSomething () ...
}
Where 'doSomething' is left as the exercise for the hacker there but
ideally in-lines to a very small method call =) Quite possibly we'll
need a new
In the -most- ideal world, we could trivially special-case these
uno::Sequence sal_uInt8 types (and other basic type sequences) and
just do an rtl_freeMemory (or whatever) in there.
Anyhow - it'd be great if you could look into that as/when we get to
that item on the list :-) Quite possibly as a quick prototype hack; we
could just directly assign:
rSeq._pSequence-nRefCount = 1;
just before calling the destructData ;-) that's just a tad cheesy
though it'd be interesting to see the result on stripped code size
and/or startup perf.
Thanks !
Michael.
--
michael.me...@collabora.com , Pseudo Engineer, itinerant idiot
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: examples to manage docs using LibreOffice as a major component
On Tue, 2014-09-30 at 09:02 -0400, nicholas ferguson wrote: My question... How do I turn these files into a console app, where filters_test.cxx would have a point of entry, a main function. Suffice it to say that bootstrapping UNO and subsetting LibreOffice to the point that it does that is truly a difficult task; and (FWIW) I think building LibreOffice on Windows is a reasonably easy task ;-) When I try that..my console app gets hits with a series of aborts, undefined function ErrInfo.IsA... and does not result in a useabble app. I would be surprised if people are going to invest lots of time in remote debugging your bootstrapping issues here =) Please try using LibreOfficeKit - that should be reasonably trivial with a recent master Windows install and the headers copy/pasted from include/LibreOfficeKit. If you pass the path of your install into that, it should do all that bootstrapping logic for you. ATB, Michael. -- michael.me...@collabora.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
RE: examples to manage docs using LibreOffice as a major component
On Tue, 2014-09-30 at 09:02 -0400, nicholas ferguson wrote: My question... How do I turn these files into a console app, where filters_test.cxx would have a point of entry, a main function. I would be surprised if people are going to invest lots of time in remote debugging your bootstrapping issues here =) I am not asking for remote debugging. Where did I ask for remote debugging? Or where did I ask for anyone to invest time? My question is: What are the steps to turn a unit test, such as filters_test.cxx into an executable that has a point of entry main. has anyone done that in the libreoffice community. and if so...can you send me details on how to do it ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sc/source
sc/source/ui/dbgui/validate.cxx | 12 +++-
sc/source/ui/view/cellsh2.cxx |2 --
2 files changed, 11 insertions(+), 3 deletions(-)
New commits:
commit 50eac342603ca08d808f53dc9a32bb9d1dfba372
Author: Laurent Balland-Poirier laurent.balland-poir...@laposte.net
Date: Sat Sep 27 07:59:04 2014 +0200
fdo#53920 Switch back tab at RefButton closure time
Bug occurs because visible tab is not the initial tab. So, instead of
switching back to initial tab at dialog closure time (removed from
cellsh2.cxx), this commit proposes that switching back to initial tab
is operate when expanding the RefButton shrink dialog.
Reviewed-on: https://gerrit.libreoffice.org/11660
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Tested-by: Kohei Yoshida libreoff...@kohei.us
(cherry picked from commit 31432c4469e7e0d05516143533d6b5e0b411dda3)
Change-Id: I3cf7ed14054fa69881d4ecbc55c48dfbfc4356aa
diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
index e858bdf..665ed38 100644
--- a/sc/source/ui/dbgui/validate.cxx
+++ b/sc/source/ui/dbgui/validate.cxx
@@ -153,11 +153,21 @@ void ScTPValidationValue::RefInputDonePostHdl()
m_pBtnRef-SetParent( m_pRefGrid );
if ( ScValidationDlg *pValidationDlg = GetValidationDlg() )
+{
pValidationDlg-get_refinput_shrink_parent()-Hide();
+ScViewData* pViewData =
pValidationDlg-GetTabViewShell()-GetViewData();
+SCTAB nCurTab = pViewData-GetTabNo();
+SCTAB nRefTab = pViewData-GetRefTabNo();
+// If RefInput switched to a different sheet from the data sheet,
+// switch back: fdo#53920
+if ( nCurTab != nRefTab )
+{
+ pViewData-GetViewShell()-SetTabNo( nRefTab );
+}
+}
if( m_pRefEdit !m_pRefEdit-HasFocus() )
m_pRefEdit-GrabFocus();
-
}
bool ScValidationDlg::Close()
diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx
index 52ad408..9a0fc853 100644
--- a/sc/source/ui/view/cellsh2.cxx
+++ b/sc/source/ui/view/cellsh2.cxx
@@ -847,8 +847,6 @@ void ScCellShell::ExecuteDB( SfxRequest rReq )
assert(pDlg); //Dialog create fail!
short nResult = pDlg-Execute();
-//When picking Cell Range, other Tab may be switched. Need
restore the correct tab
-pTabViewShell-SetTabNo( nTab );
if ( nResult == RET_OK )
{
const SfxItemSet* pOutSet = pDlg-GetOutputItemSet();
___
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/ui/dbgui/validate.cxx | 12 +++-
sc/source/ui/view/cellsh2.cxx |2 --
2 files changed, 11 insertions(+), 3 deletions(-)
New commits:
commit 31432c4469e7e0d05516143533d6b5e0b411dda3
Author: Laurent Balland-Poirier laurent.balland-poir...@laposte.net
Date: Sat Sep 27 07:59:04 2014 +0200
fdo#53920 Switch back tab at RefButton closure time
Bug occurs because visible tab is not the initial tab. So, instead of
switching back to initial tab at dialog closure time (removed from
cellsh2.cxx), this commit proposes that switching back to initial tab
is operate when expanding the RefButton shrink dialog.
Change-Id: I3cf7ed14054fa69881d4ecbc55c48dfbfc4356aa
Reviewed-on: https://gerrit.libreoffice.org/11660
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Tested-by: Kohei Yoshida libreoff...@kohei.us
diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
index 31b2a08..cab 100644
--- a/sc/source/ui/dbgui/validate.cxx
+++ b/sc/source/ui/dbgui/validate.cxx
@@ -151,11 +151,21 @@ void ScTPValidationValue::RefInputDonePostHdl()
m_pBtnRef-SetParent( m_pRefGrid );
if ( ScValidationDlg *pValidationDlg = GetValidationDlg() )
+{
pValidationDlg-get_refinput_shrink_parent()-Hide();
+ScViewData rViewData =
pValidationDlg-GetTabViewShell()-GetViewData();
+SCTAB nCurTab = rViewData.GetTabNo();
+SCTAB nRefTab = rViewData.GetRefTabNo();
+// If RefInput switched to a different sheet from the data sheet,
+// switch back: fdo#53920
+if ( nCurTab != nRefTab )
+{
+ rViewData.GetViewShell()-SetTabNo( nRefTab );
+}
+}
if( m_pRefEdit !m_pRefEdit-HasFocus() )
m_pRefEdit-GrabFocus();
-
}
namespace {
diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx
index df91eeb..11e0166e 100644
--- a/sc/source/ui/view/cellsh2.cxx
+++ b/sc/source/ui/view/cellsh2.cxx
@@ -847,8 +847,6 @@ void ScCellShell::ExecuteDB( SfxRequest rReq )
assert(pDlg); //Dialog create fail!
short nResult = pDlg-Execute();
-//When picking Cell Range, other Tab may be switched. Need
restore the correct tab
-pTabViewShell-SetTabNo( nTab );
if ( nResult == RET_OK )
{
const SfxItemSet* pOutSet = pDlg-GetOutputItemSet();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 53920] EDITING: Data Validity Cell Range not being applied to multiple selected cells
https://bugs.freedesktop.org/show_bug.cgi?id=53920 Commit Notification libreoffice-comm...@lists.freedesktop.org changed: What|Removed |Added Whiteboard|EasyHack DifficultyBeginner |EasyHack DifficultyBeginner |SkillCpp SkillDebug |SkillCpp SkillDebug ||target:4.4.0 --- Comment #14 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Laurent Balland-Poirier committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=31432c4469e7e0d05516143533d6b5e0b411dda3 fdo#53920 Switch back tab at RefButton closure time The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 53920] EDITING: Data Validity Cell Range not being applied to multiple selected cells
https://bugs.freedesktop.org/show_bug.cgi?id=53920 Commit Notification libreoffice-comm...@lists.freedesktop.org changed: What|Removed |Added Whiteboard|EasyHack DifficultyBeginner |EasyHack DifficultyBeginner |SkillCpp SkillDebug |SkillCpp SkillDebug |target:4.4.0|target:4.4.0 target:4.3.3 --- Comment #15 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Laurent Balland-Poirier committed a patch related to this issue. It has been pushed to libreoffice-4-3: http://cgit.freedesktop.org/libreoffice/core/commit/?id=50eac342603ca08d808f53dc9a32bb9d1dfba372h=libreoffice-4-3 fdo#53920 Switch back tab at RefButton closure time It will be available in LibreOffice 4.3.3. The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source
sc/source/ui/dbgui/validate.cxx | 12 +++-
sc/source/ui/view/cellsh2.cxx |2 --
2 files changed, 11 insertions(+), 3 deletions(-)
New commits:
commit 8cdb25a38530319e0b08d97d2706ff019797fe08
Author: Laurent Balland-Poirier laurent.balland-poir...@laposte.net
Date: Sat Sep 27 07:59:04 2014 +0200
fdo#53920 Switch back tab at RefButton closure time
Bug occurs because visible tab is not the initial tab. So, instead of
switching back to initial tab at dialog closure time (removed from
cellsh2.cxx), this commit proposes that switching back to initial tab
is operate when expanding the RefButton shrink dialog.
Reviewed-on: https://gerrit.libreoffice.org/11660
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Tested-by: Kohei Yoshida libreoff...@kohei.us
(cherry picked from commit 31432c4469e7e0d05516143533d6b5e0b411dda3)
Change-Id: I3cf7ed14054fa69881d4ecbc55c48dfbfc4356aa
diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
index 84a62f88..055e81c 100644
--- a/sc/source/ui/dbgui/validate.cxx
+++ b/sc/source/ui/dbgui/validate.cxx
@@ -145,11 +145,21 @@ voidScTPValidationValue::RefInputDonePostHdl()
}
if ( ScValidationDlg *pValidationDlg = GetValidationDlg() )
+{
pValidationDlg-get_refinput_shrink_parent()-Hide();
+ScViewData* pViewData =
pValidationDlg-GetTabViewShell()-GetViewData();
+SCTAB nCurTab = pViewData-GetTabNo();
+SCTAB nRefTab = pViewData-GetRefTabNo();
+// If RefInput switched to a different sheet from the data sheet,
+// switch back: fdo#53920
+if ( nCurTab != nRefTab )
+{
+ pViewData-GetViewShell()-SetTabNo( nRefTab );
+}
+}
if( m_pRefEdit !m_pRefEdit-HasFocus() )
m_pRefEdit-GrabFocus();
-
}
sal_Bool ScValidationDlg::Close()
diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx
index a93761c..2e95cf1 100644
--- a/sc/source/ui/view/cellsh2.cxx
+++ b/sc/source/ui/view/cellsh2.cxx
@@ -852,8 +852,6 @@ void ScCellShell::ExecuteDB( SfxRequest rReq )
OSL_ENSURE(pDlg, Dialog create fail!);
short nResult = pDlg-Execute();
-//When picking Cell Range, other Tab may be switched. Need
restore the correct tab
-pTabViewShell-SetTabNo( nTab );
if ( nResult == RET_OK )
{
const SfxItemSet* pOutSet = pDlg-GetOutputItemSet();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: examples to manage docs using LibreOffice as a major component
On Tue, 2014-09-30 at 09:31 -0400, nicholas ferguson wrote: On Tue, 2014-09-30 at 09:02 -0400, nicholas ferguson wrote: My question... How do I turn these files into a console app, where filters_test.cxx would have a point of entry, a main function. ... I would be surprised if people are going to invest lots of time in remote debugging your bootstrapping issues here =) I am not asking for remote debugging. Where did I ask for remote debugging? Or where did I ask for anyone to invest time ? Questions on the mailing list take time to answer =) That process is hard to automate. To get what you want: My question is: What are the steps to turn a unit test, such as filters_test.cxx into an executable that has a point of entry main. you will need to solve a truck-load of bootstrapping issues - ie. exactly what I wrote above. ie. there is a big chunk of creaking infrastructure necessary to get things working inside LibreOffice. It is extremely unpleasant to debug, and you will hit a lot of corner-cases of no interest to ~anyone. OTOH it is getting quite a bit better over time possibly you will be lucky. has anyone done that in the libreoffice community. and if so...can you send me details on how to do it You might think that an easy approach to start here is to copy/paste the desktop/source/lib/init.cxx code that does this - but (almost certainly) you'd be fooling yourself. The LibreOffice bootstrap code magically 'knows' where your DLL is, and (unless your DLL is in instdir/program/) - this will almost certainly just get confused. Then again, it -might- be an interesting place to start. But - wait, if you do start - you will immediate hit a problem. This problem is known as a bootstrapping problem - getting LibreOffice infrastructure 'up' to the point that you can eg. read files (via our VFS, activate components like Calc etc.). It is exactly these corner case bootstrapping problems that (to re-iterate) are unlikely to be interesting to anyone else or possible to remotely debug. By remote debugging - I mean iteratively helping you to fix and/or workaround problems in your code - using E-mail as a transport. I hope that is clear. ATB, Michael. -- michael.me...@collabora.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 53920] EDITING: Data Validity Cell Range not being applied to multiple selected cells
https://bugs.freedesktop.org/show_bug.cgi?id=53920 Commit Notification libreoffice-comm...@lists.freedesktop.org changed: What|Removed |Added Whiteboard|EasyHack DifficultyBeginner |EasyHack DifficultyBeginner |SkillCpp SkillDebug |SkillCpp SkillDebug |target:4.4.0 target:4.3.3 |target:4.4.0 target:4.3.3 ||target:4.2.7 --- Comment #16 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Laurent Balland-Poirier committed a patch related to this issue. It has been pushed to libreoffice-4-2: http://cgit.freedesktop.org/libreoffice/core/commit/?id=8cdb25a38530319e0b08d97d2706ff019797fe08h=libreoffice-4-2 fdo#53920 Switch back tab at RefButton closure time It will be available in LibreOffice 4.2.7. The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/core/crsr/crsrsh.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e98e9fda34736731e4c539b1799abb4257219988
Author: Juergen Funk juergen.funk...@cib.de
Date: Tue Sep 30 15:59:06 2014 +0200
fdo#38884 Fix setting X position with dbgutil enabled
When the dbgutil switch is set, the code is not inline
but in the cxx-file.
Change-Id: I5a6aeb3c28c4567cfc97baccfb4872b056db609b
Reviewed-on: https://gerrit.libreoffice.org/11717
Reviewed-by: Samuel Mehrbrodt s.mehrbr...@gmail.com
Tested-by: Samuel Mehrbrodt s.mehrbr...@gmail.com
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 9016534f..0a1cdf8 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -325,7 +325,7 @@ void SwCrsrShell::SttCrsrMove()
void SwCrsrShell::EndCrsrMove( const bool bIdleEnd )
{
OSL_ENSURE( m_nCrsrMove, EndCrsrMove() without SttCrsrMove(). );
-EndAction( bIdleEnd );
+EndAction( bIdleEnd, true );
if( !--m_nCrsrMove )
m_bInCMvVisportChgd = false;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 38884] Improve Up/Down movement in writer
https://bugs.freedesktop.org/show_bug.cgi?id=38884 --- Comment #11 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Juergen Funk committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=e98e9fda34736731e4c539b1799abb4257219988 fdo#38884 Fix setting X position with dbgutil enabled The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: svx/source
svx/source/tbxctrls/tbcontrl.cxx | 64 +++
1 file changed, 52 insertions(+), 12 deletions(-)
New commits:
commit bda9193e7bb7c1315e79b904bff3c42abd81159f
Author: Juergen Funk juergen.funk...@cib.de
Date: Tue Sep 30 15:22:19 2014 +0200
Fix fdo#58161 UI: White Paragraph style invisible in Styles Drop-Down
Use the Color-Class-function IsDark and IsBright for decision to
make a change of the font-color with DecreaseContrast or DecreaseLuminance.
The change is only in the Styles Drop-Down
Change-Id: I65ac4a0bd2f72ab95e61ce2f70bca009e4f06725
Reviewed-on: https://gerrit.libreoffice.org/11716
Reviewed-by: Samuel Mehrbrodt s.mehrbr...@gmail.com
Tested-by: Samuel Mehrbrodt s.mehrbr...@gmail.com
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 16d9a54..8ca31d8 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -158,7 +158,7 @@ private:
PopupMenu m_aMenu;
voidReleaseFocus();
-
+Color TestColorsVisible(const Color FontCol, const Color
BackCol);
DECL_LINK( MenuSelectHdl, Menu * );
};
@@ -653,23 +653,38 @@ void SvxStyleBox_Impl::UserDraw( const UserDrawEvent
rUDEvt )
pDevice-SetFont( aFont );
-// text color, when we are not selected
+Color aFontCol, aBackCol;
+bool IsNotSelect = rUDEvt.GetItemId() != GetSelectEntryPos();
+
+// text color
pItem = aItemSet.GetItem( SID_ATTR_CHAR_COLOR );
-if ( pItem rUDEvt.GetItemId() != GetSelectEntryPos() )
-{
-Color aColor( static_cast const SvxColorItem* ( pItem
)-GetValue() );
-if ( aColor != COL_AUTO )
-pDevice-SetTextColor( aColor );
-}
+if ( NULL != pItem )
+aFontCol = Color( static_cast const SvxColorItem* (
pItem )-GetValue() );
+else
+aFontCol = COL_AUTO;
// background color
pItem = aItemSet.GetItem( SID_ATTR_BRUSH );
-if ( pItem rUDEvt.GetItemId() != GetSelectEntryPos() )
+if ( NULL != pItem )
+aBackCol = Color( static_cast const SvxBrushItem* (
pItem )-GetColor() );
+else
+aBackCol = COL_AUTO;
+
+// test is the font-, background-color not different, then
change the Font-Color
+if( (aFontCol != COL_AUTO) || (aBackCol != COL_AUTO) )
+aFontCol = TestColorsVisible(aFontCol, (aBackCol !=
COL_AUTO) ? aBackCol : pDevice-GetBackground().GetColor());
+
+// text color, when we are not selected
+if ( (aFontCol != COL_AUTO) IsNotSelect )
+pDevice-SetTextColor( aFontCol );
+
+// background color
+if (pItem IsNotSelect)
{
-Color aColor( static_cast const SvxBrushItem* ( pItem
)-GetColor() );
-if ( aColor != COL_AUTO )
+// background color, when we are not selected
+if ( aBackCol != COL_AUTO )
{
-pDevice-SetFillColor( aColor );
+pDevice-SetFillColor( aBackCol );
pDevice-DrawRect( rUDEvt.GetRect() );
}
@@ -732,6 +747,31 @@ void SvxStyleBox_Impl::UserDraw( const UserDrawEvent
rUDEvt )
}
}
+// test is the color between Font- and background-color to be identify
+// return is always the Font-Color
+//when both light or dark, change the Contrast
+//in other case do not change the origin color
+//when the color is R=G=B=128 the DecreaseContast make 128 the need a
exception
+Color SvxStyleBox_Impl::TestColorsVisible(const Color FontCol, const Color
BackCol)
+{
+const sal_uInt8 ChgVal = 60; // increase/decrease the Contrast
+
+Color retCol = FontCol;
+if ((FontCol.IsDark() == BackCol.IsDark()) (FontCol.IsBright() ==
BackCol.IsBright()))
+{
+sal_uInt8 lumi = retCol.GetLuminance();
+
+if((lumi 120) (lumi 140))
+retCol.DecreaseLuminance(ChgVal / 2);
+else
+retCol.DecreaseContrast(ChgVal);
+}
+
+return retCol;
+}
+
+
+
static bool lcl_GetDocFontList( const FontList** ppFontList,
SvxFontNameBox_Impl* pBox )
{
bool bChanged = false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/droid_calcimpress2' - 3 commits - android/experimental
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
|3 ++-
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
| 10 ++
android/experimental/LOAndroid3/src/java/org/libreoffice/MockTileProvider.java
|2 +-
android/experimental/LOAndroid3/src/java/org/libreoffice/TileProvider.java
|2 +-
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java
|4
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/MultiTileLayer.java
|8 ++--
6 files changed, 20 insertions(+), 9 deletions(-)
New commits:
commit 4eaf0b817f8ef01824d1a1912e60cba4af835599
Author: Tomaž Vajngerl tomaz.vajng...@collabora.com
Date: Tue Sep 30 13:30:45 2014 +0200
android: clear all tiles on part change (method clearAllTiles)
Change-Id: I4e18fed5167559284bc18235811cb2b1c6c62a4d
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
index baf1206..c6ee612 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
@@ -53,6 +53,7 @@ public class LOKitThread extends Thread {
private void changePart(int partIndex) throws InterruptedException {
mTileProvider.changePart(partIndex);
+mLayerClient.clearAllTiles();
refresh();
}
diff --git
a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java
b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java
index e847c01..28c2bbb 100644
---
a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java
+++
b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java
@@ -275,6 +275,10 @@ public class GeckoLayerClient implements
LayerView.Listener {
mRootLayer.reevaluateTiles(mLayerController.getViewportMetrics());
}
+public void clearAllTiles() {
+mRootLayer.clearAllTiles();
+}
+
private class AdjustRunnable implements Runnable {
public void run() {
mPendingViewportAdjust = false;
diff --git
a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/MultiTileLayer.java
b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/MultiTileLayer.java
index 14a08e2..eb1ab5c 100644
---
a/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/MultiTileLayer.java
+++
b/android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/MultiTileLayer.java
@@ -215,13 +215,13 @@ public class MultiTileLayer extends Layer {
if (tileViewPort != newTileViewPort) {
tileViewPort = newTileViewPort;
-cleanTiles();
+clearMarkedTiles();
addNewTiles(viewportMetrics);
markTiles(viewportMetrics);
}
}
-private void cleanTiles() {
+private void clearMarkedTiles() {
ListSubTile tilesToRemove = new ArrayListSubTile();
for(SubTile tile : mTiles) {
if (tile.markedForRemoval) {
@@ -269,5 +269,9 @@ public class MultiTileLayer extends Layer {
}
}
}
+
+public void clearAllTiles() {
+mTiles.clear();
+}
}
commit 61c587bfb20ec58d129f62ee8211fa63761968d7
Author: Tomaž Vajngerl tomaz.vajng...@collabora.com
Date: Tue Sep 30 13:28:45 2014 +0200
android: call destroy only if the document exists
Change-Id: Ia9459151ac46a8be0f9a3944f2bcd427435c284e
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
index 1b9cce7..44d438d 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
@@ -157,7 +157,9 @@ public class LOKitTileProvider implements TileProvider {
@Override
public void close() {
Log.i(LOGTAG, Document destroyed: + mInputFile);
-mDocument.destroy();
+if (mDocument != null) {
+mDocument.destroy();
+}
}
@Override
commit ec2f2a98c325261109560b9a075965f269a61079
Author: Tomaž Vajngerl tomaz.vajng...@collabora.com
Date: Tue Sep 30 13:25:26 2014 +0200
android: allow to set a size of the thumbnail
Change-Id: Ida8bbd74893f59c3737d28c264e7ed24b231e6ac
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
index 5c03c2b..baf1206 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
@@ -41,7
[Libreoffice-commits] core.git: Branch 'private/ajrhunt/c4' - 8 commits - sc/inc sc/source
sc/inc/document.hxx |5 -
sc/source/core/data/fillinfo.cxx | 49 ++-
sc/source/ui/view/gridwin.cxx|5 -
sc/source/ui/view/gridwin4.cxx | 47 +++---
sc/source/ui/view/printfun.cxx | 12 ++
sc/source/ui/view/viewdata.cxx | 169 +--
6 files changed, 191 insertions(+), 96 deletions(-)
New commits:
commit 48df6684d55f1565cd107638ef9ccab96150ce72
Author: Andrzej Hunt andrzej.h...@collabora.com
Date: Tue Sep 30 15:28:36 2014 +0100
TODO: printfun needs fixing (see previous commit).
We don't need this for tiled rendering for now though.
Change-Id: Iac9ed2a4327840ac0af00eb1903484e127fac2c8
diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx
index e78545a..1d68535 100644
--- a/sc/source/ui/view/printfun.cxx
+++ b/sc/source/ui/view/printfun.cxx
@@ -493,7 +493,9 @@ void ScPrintFunc::DrawToDev( ScDocument* pDoc,
OutputDevice* pDev, double /* nPr
ScTableInfo aTabInfo;
pDoc-FillInfo( aTabInfo, nX1, nY1, nX2, nY2, nTab,
-nScaleX, nScaleY, false, bFormula );
+nScaleX, nScaleY,
+pDev, MapMode(), // TODO: fix this -- use pViewData if
possible, otherwise?
+false, bFormula );
lcl_HidePrint( aTabInfo, nX1, nX2 );
if (bEmbed)
@@ -1337,7 +1339,9 @@ void ScPrintFunc::DrawBorder( long nScrX, long nScrY,
long nScrW, long nScrH,
ScTableInfo aTabInfo;
pBorderDoc-FillInfo( aTabInfo, 0,0, 0,0, 0,
-nScaleX, nScaleY, false, false );
+ nScaleX, nScaleY,
+ pDev, MapMode(), // TODO: same as above
+ false, false );
OSL_ENSURE(aTabInfo.mnArrCount,nArrCount == 0);
aTabInfo.mpRowInfo[1].nHeight = (sal_uInt16) nEffHeight;
@@ -1553,7 +1557,9 @@ void ScPrintFunc::PrintArea( SCCOL nX1, SCROW nY1, SCCOL
nX2, SCROW nY2,
ScTableInfo aTabInfo;
pDoc-FillInfo( aTabInfo, nX1, nY1, nX2, nY2, nPrintTab,
-nScaleX, nScaleY, true,
aTableParam.bFormulas );
+nScaleX, nScaleY,
+pDev, MapMode(), // TODO: same here
+true, aTableParam.bFormulas );
lcl_HidePrint( aTabInfo, nX1, nX2 );
if (bEmbed)
commit de11617acda45ec49562f7793e0b7b1dabc0b43c
Author: Andrzej Hunt andrzej.h...@collabora.com
Date: Tue Sep 30 15:28:03 2014 +0100
Use twips internally for FillInfo too.
Otherwise errors sum up leading to tile-mismatches
for tiled rendering.
Change-Id: I5328771a2d7c284870bb028b53fe69a61e00ba6d
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 9c462d7..8fa9b35 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -20,6 +20,7 @@
#ifndef INCLUDED_SC_INC_DOCUMENT_HXX
#define INCLUDED_SC_INC_DOCUMENT_HXX
+#include vcl/mapmod.hxx
#include vcl/prntypes.hxx
#include vcl/timer.hxx
#include com/sun/star/uno/Reference.hxx
@@ -1668,7 +1669,9 @@ public:
void FillInfo(
ScTableInfo rTabInfo, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW
nRow2,
-SCTAB nTab, double fColScale, double fRowScale, bool bPageMode, bool
bFormulaMode,
+SCTAB nTab, double fColScale, double fRowScale,
+const OutputDevice* pOutDev, const MapMode rMapMode,
+bool bPageMode, bool bFormulaMode,
const ScMarkData* pMarkData = NULL );
SC_DLLPUBLIC SvNumberFormatter* GetFormatTable() const;
diff --git a/sc/source/core/data/fillinfo.cxx b/sc/source/core/data/fillinfo.cxx
index 3688412..b3b0a42 100644
--- a/sc/source/core/data/fillinfo.cxx
+++ b/sc/source/core/data/fillinfo.cxx
@@ -195,7 +195,9 @@ public:
void ScDocument::FillInfo(
ScTableInfo rTabInfo, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
-SCTAB nTab, double fColScale, double fRowScale, bool bPageMode, bool
bFormulaMode,
+SCTAB nTab, double fColScale, double fRowScale,
+const OutputDevice* pOutDev, const MapMode rMapMode,
+bool bPageMode, bool bFormulaMode,
const ScMarkData* pMarkData )
{
OSL_ENSURE( maTabs[nTab], Table does not exist );
@@ -258,6 +260,7 @@ void ScDocument::FillInfo(
SCROW nYExtra = nRow2+1;
sal_uInt16 nDocHeight = ScGlobal::nStdRowHeight;
SCROW nDocHeightEndRow = -1;
+long nPosYTwips = 0;
for (nSignedY=((SCsROW)nRow1)-1; nSignedY=(SCsROW)nYExtra; nSignedY++)
{
if (nSignedY = 0)
@@ -278,7 +281,14 @@ void ScDocument::FillInfo(
RowInfo* pThisRowInfo = pRowInfo[nArrRow];
pThisRowInfo-pCellInfo = NULL; // wird unten
belegt
-sal_uInt16 nHeight = (sal_uInt16) ( nDocHeight * fRowScale );
+const long nPosStartTwips = nPosYTwips;
+nPosYTwips += nDocHeight;
+
+sal_uInt16 nHeight =
+pOutDev-LogicToPixel(
[Libreoffice-commits] core.git: Branch 'feature/droid_calcimpress2' - android/Bootstrap android/experimental
android/Bootstrap/Makefile.shared|8 +++- android/experimental/LOAndroid3/Makefile |1 + 2 files changed, 8 insertions(+), 1 deletion(-) New commits: commit c61cdec0f9b16798ba0d3f4f2c25bb29a141d869 Author: Michael Meeks michael.me...@collabora.com Date: Tue Sep 30 15:31:00 2014 +0100 android: disable packaging of un-needed UI files. Appears to save ~10Mb of apk size. Change-Id: I7c49da979e2868628bf3cf07937e898d717a5071 diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared index 7095530..7bc9615 100644 --- a/android/Bootstrap/Makefile.shared +++ b/android/Bootstrap/Makefile.shared @@ -135,9 +135,15 @@ copy-stuff: cp $(SRC_ROOT)/readlicense_oo/license/NOTICE assets/notice.txt cp $(WORKDIR)/ComponentTarget/i18npool/util/i18npool.component assets/ComponentTarget/i18npool/util # + rm -Rf assets/share # pre-clean it mkdir -p assets/share/config cp -R $(INSTDIR)/share/registry assets/share - cp -R $(INSTDIR)/share/config/soffice.cfg assets/share/config + if ! test z$(DISABLE_UI) = zTRUE; then \ + echo Copying UI files into the apk; \ + cp -R $(INSTDIR)/share/config/soffice.cfg assets/share/config; \ + else \ + echo Skipping UI files; \ + fi mkdir -p assets/unpack/program echo '[Bootstrap]' assets/unpack/program/sofficerc diff --git a/android/experimental/LOAndroid3/Makefile b/android/experimental/LOAndroid3/Makefile index 49879c0..a19fadc 100644 --- a/android/experimental/LOAndroid3/Makefile +++ b/android/experimental/LOAndroid3/Makefile @@ -9,6 +9,7 @@ all: build-ant # The package of this app APP_PACKAGE=org.libreoffice +DISABLE_UI=TRUE BOOTSTRAPDIR=../../Bootstrap include $(BOOTSTRAPDIR)/Makefile.shared ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/ajrhunt/c4' - sc/source
sc/source/ui/view/gridwin4.cxx |7 +++ 1 file changed, 7 insertions(+) New commits: commit 7f947e2eec8ee34086924734396e2b0910bb1808 Author: Andrzej Hunt andrzej.h...@collabora.com Date: Tue Sep 30 16:12:56 2014 +0100 Don't render infinitely large document if empty. Change-Id: I887d8cef0c24b1e5155969a9f571660ca54ef463 diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx index 302bcee..6811de4 100644 --- a/sc/source/ui/view/gridwin4.cxx +++ b/sc/source/ui/view/gridwin4.cxx @@ -410,6 +410,13 @@ Size ScGridWindow::GetDataAreaSize() // Actual data area pDoc-ShrinkToDataArea( nTab, nStartCol, nStartRow, nEndCol, nEndRow ); +// We need to ensure we have at least one cell, since a 0x0 document +// cannot be rendered. If we have no content then ShrinkToDataArea simply +// leaves nEndCol/Row at MAXCOL/ROW. +if ( nEndCol == MAXCOL ) +nEndCol = 1; +if ( nEndRow == MAXROW ) +nEndRow = 1; // Drawing layer area -- is completely independent of the data area. ScTabViewShell* pTabViewShell = pViewData-GetViewShell(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/droid_calcimpress2' - android/Bootstrap android/experimental
android/Bootstrap/src/org/libreoffice/kit/Document.java
|6 +++
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
| 17 +-
2 files changed, 22 insertions(+), 1 deletion(-)
New commits:
commit c2c976c802a8630a54931153b257eec058c81300
Author: Tomaž Vajngerl tomaz.vajng...@collabora.com
Date: Tue Sep 30 17:09:25 2014 +0200
android: better default part name (document type dependent)
Change-Id: I7ea1f1f5c249a4df250bde049cc52b4f392e4d38
diff --git a/android/Bootstrap/src/org/libreoffice/kit/Document.java
b/android/Bootstrap/src/org/libreoffice/kit/Document.java
index d8d5286..52b9bfd 100644
--- a/android/Bootstrap/src/org/libreoffice/kit/Document.java
+++ b/android/Bootstrap/src/org/libreoffice/kit/Document.java
@@ -18,6 +18,12 @@ public class Document {
public static final int PART_MODE_SLIDENOTES = 3;
public static final int PART_MODE_EMBEDDEDOBJ = 4;
+public static final int DOCTYPE_TEXT = 0;
+public static final int DOCTYPE_SPREADSHEET = 1;
+public static final int DOCTYPE_PRESENTATION = 2;
+public static final int DOCTYPE_DRAWING = 3;
+public static final int DOCTYPE_OTHER = 4;
+
private final long handle;
public Document(long handle) {
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
index 44d438d..7919a55 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
@@ -49,7 +49,22 @@ public class LOKitTileProvider implements TileProvider {
for (int i = 0; i parts; i++) {
String partName = mDocument.getPartName(i);
if (partName.isEmpty()) {
-partName = Part + (i + 1);
+switch (mDocument.getDocumentType()) {
+case Document.DOCTYPE_DRAWING:
+case Document.DOCTYPE_TEXT:
+partName = Page + (i + 1);
+break;
+case Document.DOCTYPE_SPREADSHEET:
+partName = Sheet + (i + 1);
+break;
+case Document.DOCTYPE_PRESENTATION:
+partName = Slide + (i + 1);
+break;
+case Document.DOCTYPE_OTHER:
+default:
+partName = Part + (i + 1);
+break;
+}
}
Log.i(LOGTAG, Document part + i + name:' + partName +
');
final DocumentPartView partView = new DocumentPartView(i,
partName);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svtools
include/svtools/fmtfield.hxx | 66 ++-
1 file changed, 29 insertions(+), 37 deletions(-)
New commits:
commit d0aba6a01c876a91d1c7ebb3800c7a8428534dec
Author: Florian Reisinger flo...@libreoffice.org
Date: Tue Sep 30 16:37:53 2014 +0100
German comment translation.
Change-Id: I2a0691724e6cf0248f9b5854b824f0d6d52308ba
diff --git a/include/svtools/fmtfield.hxx b/include/svtools/fmtfield.hxx
index 3c13f0f..8dcc0f7 100644
--- a/include/svtools/fmtfield.hxx
+++ b/include/svtools/fmtfield.hxx
@@ -36,9 +36,7 @@ typedef sal_uInt16 FORMAT_CHANGE_TYPE;
class SVT_DLLPUBLIC FormattedField : public SpinField
{
private:
-// Da ein SvNumberFormatter eine ziemlich teure (sowohl zeit- als auch
platz-maessig) Angelegenheit ist,
-// haelt sich nicht jedes Field, an dem kein Formatter gesetzt wurde, eine
eigenen Instanz, sondern es gibt nur eine
-// einzige statische.
+// A SvNumberFormatter is very expensive (regarding time and space), it is
a Singleton
class StaticFormatter
{
static SvNumberFormatter* s_cFormatter;
@@ -53,8 +51,8 @@ private:
protected:
OUString m_sLastValidText;
-// hat nichts mit dem current value zu tun, ist der letzte Text, der
waehrend einer Eingabe als gueltig erkannt
-// wurde (also durch CheckText geprueft, nicht durch den Formatter
gejagt)
+// Has nothing to do with the current value. It is the last text, which
was valid at input (checked by CheckText,
+// not yet through formatter)
Selection m_aLastSelection;
double m_dMinValue;
@@ -79,16 +77,14 @@ protected:
double m_dSpinFirst;
double m_dSpinLast;
-// es macht einen Unterschied, ob man bei eingestellter Textformatierung
beim LostFocus den aktuellen String durch
-// den Formatter jagt und das Ergebnis anzeigt oder erst aus dem String
ein double macht, das formatiert und dann
-// ausgibt
+// There is a difference, when text formatting is enabled, if LostFocus
fotmattes the curent String and display it,
+// or if a double is created from the String and then
boolm_bTreatAsNumber;
-// und mit den folgenden Members koennen wir das Ganze hier auch zur
formatierten Text-Ausgabe benutzen ...
+// And with the following members we can use it for formatted text output
as well ...
OUStringm_sCurrentTextValue;
OUStringm_sDefaultText;
-// die bei der letzten Ausgabe-Operation vom Formatter gelieferte Farbe
(nicht dass wir sie beachten wuerden, aber
-// man kann sie von aussen abfragen)
+// The last color from the Formatter at the last output operation (not we
would use it, but you can get it)
Color* m_pLastOutputColor;
boolm_bUseInputStringForFormatting;
@@ -97,7 +93,7 @@ public:
FormattedField(vcl::Window* pParent, WinBits nStyle = 0,
SvNumberFormatter* pInitialFormatter = NULL, sal_Int32 nFormatKey = 0);
virtual ~FormattedField();
-// Min-/Max-Verwaltung
+// Min-/Max-management
boolHasMinValue() const { return m_bHasMin; }
voidClearMinValue() { m_bHasMin = false; }
voidSetMinValue(double dMin);
@@ -108,33 +104,32 @@ public:
voidSetMaxValue(double dMax);
double GetMaxValue() const { return m_dMaxValue; }
-// aktueller Wert
+// Current value
virtual voidSetValue(double dVal);
virtual double GetValue();
-// die Standard-Implementierung jagt die Eingabe jeweils durch den
Formatter, so einer vorhanden ist
+// The default implementation uses a formatter, if available
voidGetColor() const;
voidSetTextValue(const OUString rText);
-// der String wird in ein double umgewandelt (durch den Formatter) und
anschliessen in SetValue gesteckt
+// The String is transformed to a double (with a formatter) and SetValue
is called afterwards
boolIsEmptyFieldEnabled() const { return m_bEnableEmptyField; }
voidEnableEmptyField(bool bEnable);
-// wenn nicht enabled, wird beim Verlassen des Feldes der Text auf den
letzten gueltigen zurueckgesetzt
+// If disabled, the value will be resetted to the last valid value on leave
voidSetDefaultValue(double dDefault){ m_dDefaultValue = dDefault;
m_bValueDirty = true; }
-// wenn der aktuelle String ungueltig ist, liefert GetValue() diesen
Default-Wert
+// If the current String is invalid, GetValue() returns this value
double GetDefaultValue() const { return m_dDefaultValue; }
-// Einstellungen fuer das Format
+// Settings for the format
sal_uLong GetFormatKey() const{ return m_nFormatKey; }
voidSetFormatKey(sal_uLong nFormatKey);
SvNumberFormatter* GetFormatter() const{ return m_pFormatter; }
[Libreoffice-commits] core.git: 9 commits - chart2/source include/vcl sc/qa scripting/source sc/source sd/source svl/source svx/source sw/source test/source
chart2/source/view/main/ChartView.cxx |4 +
include/vcl/svapp.hxx |8 +-
sc/qa/extras/scannotationobj.cxx |3 +
sc/qa/extras/scannotationshapeobj.cxx |1
sc/qa/extras/scannotationsobj.cxx |3 +
sc/qa/extras/sccellrangeobj.cxx|3 +
sc/qa/extras/scdatabaserangeobj.cxx|3 +
sc/qa/extras/scdatapilotfieldobj.cxx |3 +
sc/qa/extras/scdatapilottableobj.cxx |3 +
sc/qa/extras/sceditfieldobj-cell.cxx |1
sc/qa/extras/sceditfieldobj-header.cxx |1
sc/qa/extras/scmodelobj.cxx|3 +
sc/qa/extras/scnamedrangeobj.cxx |3 +
sc/qa/extras/scnamedrangesobj.cxx |3 +
sc/qa/extras/scoutlineobj.cxx |3 +
sc/qa/extras/scstyleloaderobj.cxx |6 ++
sc/qa/extras/sctablesheetsobj.cxx |3 +
sc/source/ui/unoobj/addruno.cxx|2
sc/source/ui/unoobj/cellsuno.cxx | 14
sc/source/ui/unoobj/chart2uno.cxx |6 ++
sc/source/ui/unoobj/chartuno.cxx |4 +
sc/source/ui/unoobj/confuno.cxx|2
sc/source/ui/unoobj/dapiuno.cxx|4 +
sc/source/ui/unoobj/datauno.cxx|8 ++
sc/source/ui/unoobj/defltuno.cxx |2
sc/source/ui/unoobj/docuno.cxx | 16 +
sc/source/ui/unoobj/drdefuno.cxx |2
sc/source/ui/unoobj/eventuno.cxx |2
sc/source/ui/unoobj/fielduno.cxx |2
sc/source/ui/unoobj/forbiuno.cxx |2
sc/source/ui/unoobj/linkuno.cxx| 12
sc/source/ui/unoobj/nameuno.cxx|8 ++
sc/source/ui/unoobj/notesuno.cxx |2
sc/source/ui/unoobj/styleuno.cxx |6 ++
sc/source/ui/unoobj/targuno.cxx|4 +
sc/source/ui/unoobj/tokenuno.cxx |2
sc/source/ui/view/tabvwshh.cxx |2
scripting/source/basprov/basscript.cxx |2
sd/source/ui/unoidl/unomodel.cxx |2
svl/source/notify/SfxBroadcaster.cxx |3 +
svx/source/unodraw/unoshape.cxx|1
sw/source/uibase/uno/unoatxt.cxx |1
test/source/sheet/xsheetoutline.cxx| 95 +++--
43 files changed, 205 insertions(+), 55 deletions(-)
New commits:
commit 78f7b8f67a7765fe103dbe1ac6b0e02ff6d5939b
Author: Michael Stahl mst...@redhat.com
Date: Tue Sep 30 17:25:10 2014 +0200
vcl: use DBG_UTIL for additional members in SolarMutexTryAndBuyGuard
... for consistency, and to keep the ODR police away.
Change-Id: Id4bf23be1e57cc29dfed9331d75034a33c2910f8
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index 64225ec..68dd3c7 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -1669,7 +1669,7 @@ class SolarMutexTryAndBuyGuard
{
private:
bool m_isAcquired;
-#if OSL_DEBUG_LEVEL 0
+#ifdef DBG_UTIL
bool m_isChecked;
#endif
comphelper::SolarMutex m_rSolarMutex;
@@ -1678,7 +1678,7 @@ class SolarMutexTryAndBuyGuard
SolarMutexTryAndBuyGuard()
: m_isAcquired(false)
-#if OSL_DEBUG_LEVEL 0
+#ifdef DBG_UTIL
, m_isChecked(false)
#endif
, m_rSolarMutex(Application::GetSolarMutex())
@@ -1689,7 +1689,7 @@ class SolarMutexTryAndBuyGuard
~SolarMutexTryAndBuyGuard()
{
-#if OSL_DEBUG_LEVEL 0
+#ifdef DBG_UTIL
assert(m_isChecked);
#endif
if (m_isAcquired)
@@ -1698,7 +1698,7 @@ class SolarMutexTryAndBuyGuard
bool isAcquired()
{
-#if OSL_DEBUG_LEVEL 0
+#ifdef DBG_UTIL
m_isChecked = true;
#endif
return m_isAcquired;
commit b98434d0170f2c1ff5b60f74d871ada81d897647
Author: Michael Stahl mst...@redhat.com
Date: Tue Sep 30 16:20:58 2014 +0200
SfxBroadcaster: add some SolarMutex asserts
It is extremely likely that calling SfxBroadcaster methods without
SolarMutex lock is a bug; in case somebody finds a counterexample, this
should be reverted.
Change-Id: I4706671cfa22a3cfaed9cd33d4a77b14a57bb661
diff --git a/svl/source/notify/SfxBroadcaster.cxx
b/svl/source/notify/SfxBroadcaster.cxx
index 581b07c..f7ae252 100644
--- a/svl/source/notify/SfxBroadcaster.cxx
+++ b/svl/source/notify/SfxBroadcaster.cxx
@@ -25,6 +25,7 @@
#include svl/SfxBroadcaster.hxx
#include algorithm
+#include tools/debug.hxx
TYPEINIT0(SfxBroadcaster);
@@ -85,6 +86,7 @@ SfxBroadcaster::SfxBroadcaster( const SfxBroadcaster rBC )
void SfxBroadcaster::AddListener( SfxListener rListener )
{
+DBG_TESTSOLARMUTEX();
if (m_RemovedPositions.empty()) {
m_Listeners.push_back(rListener);
}
@@ -122,6 +124,7 @@ void SfxBroadcaster::Forward(SfxBroadcaster rBC, const
SfxHint rHint)
void SfxBroadcaster::RemoveListener( SfxListener rListener )
{
+DBG_TESTSOLARMUTEX();
SfxListenerArr_Impl::iterator aIter = std::find(
m_Listeners.begin(), m_Listeners.end(), rListener);
assert(aIter != m_Listeners.end()); // RemoveListener: Listener unknown
commit 440b0985cb334f5e76cb0c3f3bcb17135936e035
Author: Michael
[Libreoffice-commits] core.git: 4 commits - include/o3tl reportdesign/inc reportdesign/source sal/qa sc/inc sc/qa sc/source svtools/source
include/o3tl/ptr_container.hxx | 61 +++ reportdesign/inc/UndoEnv.hxx |2 reportdesign/source/core/inc/ReportUndoFactory.hxx |2 reportdesign/source/core/inc/Shape.hxx |2 reportdesign/source/filter/xml/xmlExport.cxx |8 - reportdesign/source/filter/xml/xmlExport.hxx |4 reportdesign/source/filter/xml/xmlHelper.hxx |4 reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx |8 - reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx |4 reportdesign/source/filter/xml/xmlfilter.hxx | 28 ++--- reportdesign/source/ui/dlg/Navigator.cxx |2 reportdesign/source/ui/inc/AddField.hxx |2 reportdesign/source/ui/inc/DataProviderHandler.hxx |4 reportdesign/source/ui/inc/DefaultInspection.hxx |2 reportdesign/source/ui/inc/GeometryHandler.hxx |4 reportdesign/source/ui/inc/Navigator.hxx |2 reportdesign/source/ui/inc/ReportComponentHandler.hxx|4 reportdesign/source/ui/inc/ReportControllerObserver.hxx |2 reportdesign/source/ui/inc/ReportSection.hxx |2 reportdesign/source/ui/inc/ReportWindow.hxx |2 reportdesign/source/ui/misc/UITools.cxx | 20 --- reportdesign/source/ui/report/DesignView.cxx | 16 -- reportdesign/source/ui/report/ReportController.cxx | 16 -- reportdesign/source/ui/report/ReportSection.cxx |3 reportdesign/source/ui/report/propbrw.cxx|2 sal/qa/osl/file/osl_File.cxx | 10 - sc/inc/chartlock.hxx |2 sc/inc/dociter.hxx |4 sc/inc/document.hxx | 14 +- sc/inc/dptabsrc.hxx |4 sc/inc/editsrc.hxx |8 - sc/inc/macromgr.hxx |2 sc/inc/scextopt.hxx |2 sc/inc/segmenttree.hxx | 12 -- sc/qa/unit/ucalc.cxx |2 sc/source/core/data/documen2.cxx |4 sc/source/core/data/dpobject.cxx | 28 ++--- sc/source/core/data/dpsave.cxx |4 sc/source/core/data/dptabsrc.cxx |3 sc/source/core/data/postit.cxx |4 sc/source/core/inc/cellkeytranslator.hxx |2 sc/source/core/tool/cellkeytranslator.cxx|2 sc/source/core/tool/dbdata.cxx | 24 +--- sc/source/core/tool/doubleref.cxx|6 - sc/source/core/tool/interpr1.cxx | 30 + sc/source/core/tool/interpr4.cxx |6 - sc/source/filter/excel/xelink.cxx|4 sc/source/filter/excel/xichart.cxx | 36 ++ sc/source/filter/excel/xicontent.cxx | 37 ++ sc/source/filter/excel/xihelper.cxx |2 sc/source/filter/ftools/fprogressbar.cxx |1 sc/source/filter/html/htmlpars.cxx | 21 +-- sc/source/filter/inc/connectionsbuffer.hxx |2 sc/source/filter/inc/defnamesbuffer.hxx |4 sc/source/filter/inc/drawingfragment.hxx |2 sc/source/filter/inc/formulaparser.hxx |2 sc/source/filter/inc/fprogressbar.hxx|6 - sc/source/filter/inc/htmlpars.hxx|8 - sc/source/filter/inc/pagesettings.hxx|2 sc/source/filter/inc/stylesbuffer.hxx|2 sc/source/filter/inc/themebuffer.hxx |2 sc/source/filter/inc/worksheetfragment.hxx |2 sc/source/filter/inc/xcl97esc.hxx|6 - sc/source/filter/inc/xcl97rec.hxx|2 sc/source/filter/inc/xehelper.hxx|4 sc/source/filter/inc/xestyle.hxx |2 sc/source/filter/inc/xicontent.hxx |2 sc/source/filter/inc/xihelper.hxx|4 sc/source/filter/inc/xilink.hxx |6 - sc/source/filter/inc/xistyle.hxx |2 sc/source/filter/inc/xlpage.hxx
[Libreoffice-commits] core.git: Branch 'feature/droid_calcimpress2' - 2 commits - android/experimental
android/experimental/LOAndroid3/res/layout/activity_main.xml
| 12 ++
android/experimental/LOAndroid3/src/java/org/libreoffice/DocumentPartView.java
|9 ++-
android/experimental/LOAndroid3/src/java/org/libreoffice/DocumentPartViewListAdpater.java
|6 -
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
|7 +
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
|8 --
android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
|8 ++
android/experimental/LOAndroid3/src/java/org/libreoffice/MockTileProvider.java
|2 -
7 files changed, 46 insertions(+), 6 deletions(-)
New commits:
commit 5368184ec4402609b9f0b1ba5a016674adddfc83
Author: Tomaž Vajngerl tomaz.vajng...@collabora.com
Date: Tue Sep 30 18:00:54 2014 +0200
android: show loading animation until the document is loaded
Change-Id: I98eeafe30e90d039175daea65428526a95c9ff1e
diff --git a/android/experimental/LOAndroid3/res/layout/activity_main.xml
b/android/experimental/LOAndroid3/res/layout/activity_main.xml
index 1d09af9..9fa5e51 100644
--- a/android/experimental/LOAndroid3/res/layout/activity_main.xml
+++ b/android/experimental/LOAndroid3/res/layout/activity_main.xml
@@ -32,4 +32,16 @@
android:background=#9FFF
android:choiceMode=singleChoice/
+RelativeLayout
+android:id=@+id/loadingPanel
+android:layout_width=match_parent
+android:layout_height=match_parent
+android:gravity=center
+
+ProgressBar
+android:layout_width=wrap_content
+android:layout_height=wrap_content
+android:indeterminate=true /
+/RelativeLayout
+
/android.support.v4.widget.DrawerLayout
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
index c6ee612..4493e94 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
@@ -75,6 +75,13 @@ public class LOKitThread extends Thread {
boolean isReady = mTileProvider.isReady();
if (isReady) {
refresh();
+LOKitShell.getMainHandler().post(new Runnable() {
+@Override
+public void run() {
+LibreOfficeMainActivity.mAppContext.hideProgressBar();
+}
+});
+
}
return isReady;
}
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
index cc86e0b..3c53454 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
@@ -195,6 +195,14 @@ public class LibreOfficeMainActivity extends Activity {
}
+public void showProgressBar() {
+findViewById(R.id.loadingPanel).setVisibility(View.VISIBLE);
+}
+
+public void hideProgressBar() {
+findViewById(R.id.loadingPanel).setVisibility(View.GONE);
+}
+
private class DocumentPartClickListener implements
android.widget.AdapterView.OnItemClickListener {
@Override
public void onItemClick(AdapterView? parent, View view, int
position, long id) {
commit 114056c996519bc20390b087deae4ab1bdd917f4
Author: Tomaž Vajngerl tomaz.vajng...@collabora.com
Date: Tue Sep 30 17:50:35 2014 +0200
android: show thumbnails in DrawerLayout - parts side bar
Change-Id: Iae0ba5d7396f8f4d148fd2a298d0648dfc493b28
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/DocumentPartView.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/DocumentPartView.java
index e014e13..c5f6e33 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/DocumentPartView.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/DocumentPartView.java
@@ -1,13 +1,17 @@
package org.libreoffice;
+import android.graphics.Bitmap;
+
public class DocumentPartView {
private final int partIndex;
private final String partName;
+private final Bitmap thumbnail;
-public DocumentPartView(int partIndex, String partName) {
+public DocumentPartView(int partIndex, String partName, Bitmap thumbnail) {
this.partIndex = partIndex;
this.partName = partName;
+this.thumbnail = thumbnail;
}
public String getPartName() {
@@ -17,4 +21,7 @@ public class DocumentPartView {
public int getPartIndex() {
return partIndex;
}
+public Bitmap getThumbnail() {
+return thumbnail;
+}
}
diff --git
[Libreoffice-commits] core.git: android/Bootstrap android/experimental
android/Bootstrap/Makefile.shared|8 +++- android/experimental/LOAndroid3/Makefile |1 + 2 files changed, 8 insertions(+), 1 deletion(-) New commits: commit 28eec2207c763399d07fe01da8858b679d64b322 Author: Michael Meeks michael.me...@collabora.com Date: Tue Sep 30 15:31:00 2014 +0100 android: disable packaging of un-needed UI files. Appears to save ~10Mb of apk size. Change-Id: I7c49da979e2868628bf3cf07937e898d717a5071 diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared index a337a80..b5ca272 100644 --- a/android/Bootstrap/Makefile.shared +++ b/android/Bootstrap/Makefile.shared @@ -134,9 +134,15 @@ copy-stuff: assets cp $(WORKDIR)/ComponentTarget/i18npool/util/i18npool.component assets/ComponentTarget/i18npool/util # + rm -Rf assets/share # pre-clean it mkdir -p assets/share/config cp -R $(INSTDIR)/share/registry assets/share - cp -R $(INSTDIR)/share/config/soffice.cfg assets/share/config + if ! test z$(DISABLE_UI) = zTRUE; then \ + echo Copying UI files into the apk; \ + cp -R $(INSTDIR)/share/config/soffice.cfg assets/share/config; \ + else \ + echo Skipping UI files; \ + fi mkdir -p assets/unpack/program echo '[Bootstrap]' assets/unpack/program/sofficerc diff --git a/android/experimental/LOAndroid3/Makefile b/android/experimental/LOAndroid3/Makefile index 49879c0..a19fadc 100644 --- a/android/experimental/LOAndroid3/Makefile +++ b/android/experimental/LOAndroid3/Makefile @@ -9,6 +9,7 @@ all: build-ant # The package of this app APP_PACKAGE=org.libreoffice +DISABLE_UI=TRUE BOOTSTRAPDIR=../../Bootstrap include $(BOOTSTRAPDIR)/Makefile.shared ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/odfimport/data/fdo79269_header.odt |binary
sw/qa/extras/odfimport/odfimport.cxx| 17 +
2 files changed, 17 insertions(+)
New commits:
commit 88b671d3d879fb04fdd282f30264e6c6bfa019ee
Author: Michael Stahl mst...@redhat.com
Date: Tue Sep 30 18:07:47 2014 +0200
fdo#79269: add a unit test for first-page header too
Change-Id: I787c72cd219e16ca89a00dd9073448d8264e7bd8
diff --git a/sw/qa/extras/odfimport/data/fdo79269_header.odt
b/sw/qa/extras/odfimport/data/fdo79269_header.odt
new file mode 100644
index 000..6f1a839
Binary files /dev/null and b/sw/qa/extras/odfimport/data/fdo79269_header.odt
differ
diff --git a/sw/qa/extras/odfimport/odfimport.cxx
b/sw/qa/extras/odfimport/odfimport.cxx
index 94eeb83..bb6ee13 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -290,6 +290,23 @@ DECLARE_ODFIMPORT_TEST(testFdo79269, fdo79269.odt)
CPPUNIT_ASSERT_EQUAL(OUString(second), xFooter-getString());
}
+DECLARE_ODFIMPORT_TEST(testFdo79269_header, fdo79269_header.odt)
+{
+uno::Referenceframe::XModel xModel(mxComponent, uno::UNO_QUERY);
+uno::Referencetext::XTextViewCursorSupplier
xTextViewCursorSupplier(xModel-getCurrentController(), uno::UNO_QUERY);
+uno::Referencetext::XPageCursor
xCursor(xTextViewCursorSupplier-getViewCursor(), uno::UNO_QUERY);
+xCursor-jumpToLastPage();
+CPPUNIT_ASSERT_EQUAL(sal_Int16(2), xCursor-getPage());
+
+uno::Referencebeans::XPropertySet
xPropSet(getStyles(PageStyles)-getByName(DEFAULT_STYLE), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(false, getPropertybool(xPropSet, FirstIsShared));
+
+uno::Referencetext::XTextRange xFooter1 = getProperty
uno::Referencetext::XTextRange (xPropSet, HeaderTextFirst);
+CPPUNIT_ASSERT_EQUAL(OUString(forst), xFooter1-getString());
+uno::Referencetext::XTextRange xFooter = getProperty
uno::Referencetext::XTextRange (xPropSet, HeaderText);
+CPPUNIT_ASSERT_EQUAL(OUString(second), xFooter-getString());
+}
+
DECLARE_ODFIMPORT_TEST(testFdo56272, fdo56272.odt)
{
uno::Referencedrawing::XShape xShape = getShape(1);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 34555] Make cropping handles for images (as in Draw/Impress) available for all LibreOffice applications
https://bugs.freedesktop.org/show_bug.cgi?id=34555 Barry Broom bbr...@ipmail.org.uk changed: What|Removed |Added Assignee|bbr...@ipmail.org.uk|libreoffice-b...@lists.free ||desktop.org -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 34555] Make cropping handles for images (as in Draw/Impress) available for all LibreOffice applications
https://bugs.freedesktop.org/show_bug.cgi?id=34555 --- Comment #47 from Barry Broom bbr...@ipmail.org.uk --- Hi Sushil, I only got as far as figuring out how to add a crop button to the relevent toolbar. I did not get an event to fire to run some code after the button was pressed. You will need to edit this XML file for the toolbar. It's pretty easy to understand: /core/sw/uiconfig/swriter/toolbar/graphicobjectbar.xml. Since my son was born I don't have any free time to write code. Best of luck! I have assigned the bug to 'default' so you can take it. Cheers. -- 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: editeng/source include/editeng
editeng/source/rtf/rtfitem.cxx | 272 -
editeng/source/rtf/svxrtf.cxx | 34 +
include/editeng/svxrtf.hxx | 19 --
3 files changed, 152 insertions(+), 173 deletions(-)
New commits:
commit 9bcd96a36e323a1c70eeefa81f2c8ea595f59444
Author: Noel Grandin n...@peralex.com
Date: Tue Sep 30 09:00:55 2014 +0200
clean up some weird type-casting in SvxRTFParser
...it was casting between a std::vector and a struct.
Just store the struct.
Change-Id: I37afa2ea27aa45d0849e01b45837129719eaf138
Reviewed-on: https://gerrit.libreoffice.org/11705
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx
index 9ca6da8..8958a24 100644
--- a/editeng/source/rtf/rtfitem.cxx
+++ b/editeng/source/rtf/rtfitem.cxx
@@ -99,44 +99,40 @@ inline const SvxLRSpaceItem GetLRSpace(const SfxItemSet
rSet,sal_uInt16 nId,bo
inline const SvxULSpaceItem GetULSpace(const SfxItemSet rSet,sal_uInt16
nId,bool bInP=true)
{ return (const SvxULSpaceItem)rSet.Get( nId,bInP); }
-#define PARDID ((RTFPardAttrMapIds*)aPardMap[0])
-#define PLAINID ((RTFPlainAttrMapIds*)aPlainMap[0])
-
void SvxRTFParser::SetScriptAttr( RTF_CharTypeDef eType, SfxItemSet rSet,
SfxPoolItem rItem )
{
const sal_uInt16 *pNormal = 0, *pCJK = 0, *pCTL = 0;
-const RTFPlainAttrMapIds* pIds = (RTFPlainAttrMapIds*)aPlainMap[0];
switch( rItem.Which() )
{
case SID_ATTR_CHAR_FONT:
-pNormal = pIds-nFont;
-pCJK = pIds-nCJKFont;
-pCTL = pIds-nCTLFont;
+pNormal = aPlainMap.nFont;
+pCJK = aPlainMap.nCJKFont;
+pCTL = aPlainMap.nCTLFont;
break;
case SID_ATTR_CHAR_FONTHEIGHT:
-pNormal = pIds-nFontHeight;
-pCJK = pIds-nCJKFontHeight;
-pCTL = pIds-nCTLFontHeight;
+pNormal = aPlainMap.nFontHeight;
+pCJK = aPlainMap.nCJKFontHeight;
+pCTL = aPlainMap.nCTLFontHeight;
break;
case SID_ATTR_CHAR_POSTURE:
-pNormal = pIds-nPosture;
-pCJK = pIds-nCJKPosture;
-pCTL = pIds-nCTLPosture;
+pNormal = aPlainMap.nPosture;
+pCJK = aPlainMap.nCJKPosture;
+pCTL = aPlainMap.nCTLPosture;
break;
case SID_ATTR_CHAR_WEIGHT:
-pNormal = pIds-nWeight;
-pCJK = pIds-nCJKWeight;
-pCTL = pIds-nCTLWeight;
+pNormal = aPlainMap.nWeight;
+pCJK = aPlainMap.nCJKWeight;
+pCTL = aPlainMap.nCTLWeight;
break;
case SID_ATTR_CHAR_LANGUAGE:
-pNormal = pIds-nLanguage;
-pCJK = pIds-nCJKLanguage;
-pCTL = pIds-nCTLLanguage;
+pNormal = aPlainMap.nLanguage;
+pCJK = aPlainMap.nCJKLanguage;
+pCTL = aPlainMap.nCTLLanguage;
break;
case 0:
@@ -305,56 +301,56 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet
)
break;
case RTF_KEEP:
-if( PARDID-nSplit )
+if( aPardMap.nSplit )
{
-pSet-Put( SvxFmtSplitItem( false, PARDID-nSplit ));
+pSet-Put( SvxFmtSplitItem( false, aPardMap.nSplit ));
}
break;
case RTF_KEEPN:
-if( PARDID-nKeep )
+if( aPardMap.nKeep )
{
-pSet-Put( SvxFmtKeepItem( true, PARDID-nKeep ));
+pSet-Put( SvxFmtKeepItem( true, aPardMap.nKeep ));
}
break;
case RTF_LEVEL:
-if( PARDID-nOutlineLvl )
+if( aPardMap.nOutlineLvl )
{
-pSet-Put( SfxUInt16Item( PARDID-nOutlineLvl,
+pSet-Put( SfxUInt16Item( aPardMap.nOutlineLvl,
(sal_uInt16)nTokenValue ));
}
break;
case RTF_QL:
-if( PARDID-nAdjust )
+if( aPardMap.nAdjust )
{
-pSet-Put( SvxAdjustItem( SVX_ADJUST_LEFT, PARDID-nAdjust
));
+pSet-Put( SvxAdjustItem( SVX_ADJUST_LEFT,
aPardMap.nAdjust ));
}
break;
case RTF_QR:
-if( PARDID-nAdjust )
+if( aPardMap.nAdjust )
{
-pSet-Put( SvxAdjustItem( SVX_ADJUST_RIGHT,
PARDID-nAdjust ));
+pSet-Put( SvxAdjustItem( SVX_ADJUST_RIGHT,
aPardMap.nAdjust ));
}
break;
case RTF_QJ:
-if( PARDID-nAdjust )
+if( aPardMap.nAdjust )
{
-pSet-Put( SvxAdjustItem( SVX_ADJUST_BLOCK,
PARDID-nAdjust ));
+pSet-Put( SvxAdjustItem( SVX_ADJUST_BLOCK,
[Libreoffice-commits] core.git: Branch 'feature/droid_calcimpress2' - android/mobile-config.py
android/mobile-config.py | 99 +++
1 file changed, 99 insertions(+)
New commits:
commit 7a6f1025e86199b1700f11e5ef67a56237605d56
Author: Michael Meeks michael.me...@collabora.com
Date: Tue Sep 30 17:47:11 2014 +0100
android: first cut at shrinking the configuration for mobile.
There is no need to ship a truck-load of XML configuration that has
to be parsed at start for things we don't care about. An initial cut
at a tool to prune the worst of that.
Change-Id: Iee19a9235c20c365af2124e5f3e1be80963aa0bf
diff --git a/android/mobile-config.py b/android/mobile-config.py
new file mode 100755
index 000..6f29297
--- /dev/null
+++ b/android/mobile-config.py
@@ -0,0 +1,99 @@
+#!/usr/bin/python
+# 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 tool rips out configuration pieces that are not useful for
+# a mobile viewer / editing application without a full UI.
+#
+# ideally the postprocess/ makefile would cope with this but its
+# already over-complicated by rampant conditionals.
+
+import sys
+import xml.etree.ElementTree as ET
+
+
+main_xcd_discard = [
+'org.openoffice.Office/TableWizard', # huge
+
+'org.openoffice.Office/WebWizard',
+'org.openoffice.Office.DataAccess/Drivers', # no database
+'org.openoffice.Office/Addons', # no addons
+
+# no conventional UI; reverse sorted by size
+'org.openoffice.Office.UI/GenericCommands',
+'org.openoffice.Office/Accelerators',
+'org.openoffice.Office/UI',
+
+'org.openoffice.Office.UI/DrawImpressCommands',
+'org.openoffice.Office.UI/Sidebar',
+'org.openoffice.Office.UI/ChartCommands',
+'org.openoffice.Office.UI/DbuCommands',
+'org.openoffice.Office.UI/Controller',
+'org.openoffice.Office/UI',
+'org.openoffice.Office.UI/StartModuleCommands',
+'org.openoffice.Office.UI/BasicIDEWindowState',
+'org.openoffice.Office.UI/GenericCategories',
+'org.openoffice.Office.UI/ChartWindowState',
+'org.openoffice.Office.UI/Factories',
+'org.openoffice.Office.UI/BaseWindowState',
+'org.openoffice.Office.UI/BasicIDECommands',
+'org.openoffice.Office.UI/Sidebar',
+'org.openoffice.Office.UI/BibliographyCommands',
+'org.openoffice.Office.UI/DbQueryWindowState',
+'org.openoffice.Office.UI/WindowState',
+'org.openoffice.Office.UI/Controller',
+'org.openoffice.Office.UI/DbRelationWindowState',
+'org.openoffice.Office.UI/DbTableWindowState',
+'org.openoffice.Office.UI/DbTableDataWindowState',
+'org.openoffice.Office.UI/DbBrowserWindowState',
+'org.openoffice.Office.UI/WindowContentFactories',
+'org.openoffice.Office.UI/Factories',
+'org.openoffice.Office.UI/StartModuleWindowState',
+'org.openoffice.Office.UI/GlobalSettings',
+'org.openoffice.Office.UI/Commands',
+'org.openoffice.Office.UI/BibliographyCommands',
+'org.openoffice.Office.UI/StartModuleCommands',
+'org.openoffice.Office.UI/DrawImpressCommands',
+'org.openoffice.Office.UI/BasicIDECommands',
+'org.openoffice.Office.UI/GenericCommands',
+'org.openoffice.Office.UI/ChartCommands',
+'org.openoffice.Office.UI/DbuCommands',
+'org.openoffice.Office.UI/BibliographyWindowState',
+'org.openoffice.Office.UI/StartModuleWindowState',
+'org.openoffice.Office.UI/DbTableDataWindowState',
+'org.openoffice.Office.UI/DbRelationWindowState',
+'org.openoffice.Office.UI/DbBrowserWindowState',
+'org.openoffice.Office.UI/BasicIDEWindowState',
+'org.openoffice.Office.UI/DbTableWindowState',
+'org.openoffice.Office.UI/DbQueryWindowState',
+'org.openoffice.Office.UI/ChartWindowState',
+'org.openoffice.Office.UI/BaseWindowState',
+'org.openoffice.Office.UI/GenericCategories',
+'org.openoffice.Office.UI/Category',
+]
+
+
+if __name__ == '__main__':
+tree = ET.parse(sys.argv[1])
+root = tree.getroot()
+
+print Foo\n
+saved = 0
+total = 0
+for child in root:
+section = child.attrib['{http://openoffice.org/2001/registry}name']
+package = child.attrib['{http://openoffice.org/2001/registry}package']
+size = len(ET.tostring(child));
+total = total + size
+key = '%s/%s' % (package, section)
+if key in main_xcd_discard:
+root.remove(child)
+print 'removed %s - saving %d' % (key, size)
+saved = saved + size
+
+print saved %d of %d bytes: %2.f%% % (saved, total, saved*100.0/total)
+tree.write(sys.argv[2], 'UTF-8', True)
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'feature/droid_calcimpress3'
New branch 'feature/droid_calcimpress3' available with the following commits: commit e80b8e770bfcd7d27f75493594de2a67d8742a67 Author: Michael Meeks michael.me...@collabora.com Date: Tue Sep 30 17:47:11 2014 +0100 android: first cut at shrinking the configuration for mobile. There is no need to ship a truck-load of XML configuration that has to be parsed at start for things we don't care about. An initial cut at a tool to prune the worst of that. Change-Id: Iee19a9235c20c365af2124e5f3e1be80963aa0bf commit a7e97fd3c858a38cb258607de1987244d7647676 Author: Tomaž Vajngerl tomaz.vajng...@collabora.com Date: Tue Sep 30 17:50:35 2014 +0200 android: show thumbnails in DrawerLayout - parts side bar Change-Id: Iae0ba5d7396f8f4d148fd2a298d0648dfc493b28 commit 20ee0e86fa0125ff93a1eca5abe7de1e769ce7ac Author: Tomaž Vajngerl tomaz.vajng...@collabora.com Date: Tue Sep 30 17:09:25 2014 +0200 android: better default part name (document type dependent) Change-Id: I7ea1f1f5c249a4df250bde049cc52b4f392e4d38 commit a78a5349f060d5e983576cc9fee209b5a16a1778 Author: Michael Meeks michael.me...@collabora.com Date: Tue Sep 30 15:31:00 2014 +0100 android: disable packaging of un-needed UI files. Appears to save ~10Mb of apk size. Change-Id: I7c49da979e2868628bf3cf07937e898d717a5071 commit 84eab54dc49525b3b8a9c5e58ae8fccd0c5793e9 Author: Andrzej Hunt andrzej.h...@collabora.com Date: Tue Sep 30 16:12:56 2014 +0100 Don't render infinitely large document if empty. Change-Id: I887d8cef0c24b1e5155969a9f571660ca54ef463 commit b6ed2bd0fd6f510295d355e84c01d63a282e198f Author: Andrzej Hunt andrzej.h...@collabora.com Date: Tue Sep 30 15:28:36 2014 +0100 TODO: printfun needs fixing (see previous commit). We don't need this for tiled rendering for now though. Change-Id: Iac9ed2a4327840ac0af00eb1903484e127fac2c8 commit 954af1813302cff119e180e818ac1da4f3721569 Author: Andrzej Hunt andrzej.h...@collabora.com Date: Tue Sep 30 15:28:03 2014 +0100 Use twips internally for FillInfo too. Otherwise errors sum up leading to tile-mismatches for tiled rendering. Change-Id: I5328771a2d7c284870bb028b53fe69a61e00ba6d commit 961c2ceefd0a52f991375b01c81f709b70caca09 Author: Andrzej Hunt andrzej.h...@collabora.com Date: Tue Sep 30 15:24:25 2014 +0100 Adjust MapModes for gridwin tiled rendering. Change-Id: I8d31521d6b22f375c6de413f2070746f4758a431 commit 0a8cfbaa74db93b916d87f0fdd45e9c54c0faf5c Author: Andrzej Hunt andrzej.h...@collabora.com Date: Tue Sep 30 15:22:48 2014 +0100 Don't abort rendering if Android window 'minimized'. This simply has no relevance to tiled rendering. Change-Id: Iee348cf6792d83d364c33de81415a7cbe0be6a47 commit 67556b6a7711fc2a40224044c29def8b9b72ed4a Author: Andrzej Hunt andrzej.h...@collabora.com Date: Tue Sep 30 15:21:42 2014 +0100 We want to keep nPPTX/Y for our old scaling. Change-Id: Ia10baf8eebeb92c421066a392387a1ad71e56ce9 commit 8d5a31e9fd49a7b0662e8d594937831e6d628a00 Author: Andrzej Hunt andrzej.h...@collabora.com Date: Tue Sep 30 15:20:53 2014 +0100 Remove incorrect fudge factor. Change-Id: I3a8d2b2ca1f90a07bd9fffd9e33f59b23671569c commit f311b9f3f80537ed3858521099a52ddc5ad74d53 Author: Andrzej Hunt andrzej.h...@collabora.com Date: Tue Sep 30 15:20:07 2014 +0100 ScreenPos calculations in twips too. Change-Id: Ibc45f414a56e3c4cdf6c7f384d561938382c1653 commit 69a79502c7ea356c35dca6d92bb88ab107743ddd Author: Andrzej Hunt andrzej.h...@collabora.com Date: Tue Sep 30 15:19:30 2014 +0100 Use twips internally for GetScrPos. Change-Id: I48c674815c95f73722a427fd2d8d9a3dca9b3a6c commit 6fbedf0908b092deed4e5add6b31de4c7ed9acb8 Author: Andrzej Hunt andrzej.h...@collabora.com Date: Wed Aug 27 14:29:07 2014 +0200 Use GetScrPos so that col/row-headers match the grid. Without this we can still get single pixel errors which can sum up over multiple columns/row. Change-Id: Id428dafab1ca771c123c84d815261263a7d33fed commit 0425755a2a8136368efb0522eb03e8c1331fb556 Author: Andrzej Hunt andrzej.h...@collabora.com Date: Wed Aug 27 20:52:09 2014 +0200 Match TiledRendering scaling to the new ViewData PaintMapMode. This is a bit hacky, still need to figure out what's going wrong that we need this weird conversion. Change-Id: Id1c62401f9f85c6d436bdd73b51ccf126100cbc4 commit 8118127b6cc1fe6286caa76e4458f60ade256f38 Author: Andrzej Hunt andrzej.h...@collabora.com Date: Wed Aug 27 20:42:48 2014 +0200 Don't use UpdateVisibleRange for calc tiled rendering. Change-Id: Iaba02741acc280dfc4c500e0d08271b39560149b commit 5d4c9409a560a9c16b962c9b0387a6243a9575f3 Author: Andrzej Hunt andrzej.h...@collabora.com Date: Wed Aug 27 20:37:45 2014 +0200 Set visible range from origin for Calc Tiled Rendering.
[Libreoffice-commits] core.git: 2 commits - forms/qa
forms/qa/integration/forms/ListBox.java |6 +++---
forms/qa/integration/forms/RadioButtons.java | 12 ++--
2 files changed, 5 insertions(+), 13 deletions(-)
New commits:
commit 4badca074088b1f1a70b340d53fc464ec11e3d29
Author: Robert Antoni Buj i Gelonch robert@gmail.com
Date: Tue Sep 30 17:20:31 2014 +0200
forms: use Arrays.toString in integration.forms.RadioButtons
Change-Id: I797692857c874d879192ca9a4ff73b98ed5ebd86
Reviewed-on: https://gerrit.libreoffice.org/11721
Reviewed-by: Samuel Mehrbrodt s.mehrbr...@gmail.com
Tested-by: Samuel Mehrbrodt s.mehrbr...@gmail.com
diff --git a/forms/qa/integration/forms/RadioButtons.java
b/forms/qa/integration/forms/RadioButtons.java
index efcca58..4b6e5de 100644
--- a/forms/qa/integration/forms/RadioButtons.java
+++ b/forms/qa/integration/forms/RadioButtons.java
@@ -23,6 +23,7 @@ import com.sun.star.lang.*;
import com.sun.star.container.*;
import com.sun.star.beans.*;
import com.sun.star.awt.XRadioButton;
+import java.util.Arrays;
public class RadioButtons extends complexlib.ComplexTestCase
{
@@ -306,15 +307,6 @@ public class RadioButtons extends
complexlib.ComplexTestCase
}
/* -- */
-private String stateString( short[] states )
-{
-StringBuilder buf = new StringBuilder();
-for ( int i=0; istates.length; ++i )
-buf.append( states[i] );
-return buf.toString();
-}
-
-/* -- */
/** verifies a number of radio buttons for their states
*/
private boolean verifyRadios( XPropertySet[] radios, short[]
expectedStates, String errorMessage ) throws com.sun.star.uno.Exception
@@ -332,7 +324,7 @@ public class RadioButtons extends complexlib.ComplexTestCase
{
if ( actualStates[i] != expectedStates[i] )
{
-failed( errorMessage + (expected: + stateString(
expectedStates ) + , found: + stateString( actualStates ) + ) );
+failed( errorMessage + (expected: + Arrays.toString(
expectedStates ) + , found: + Arrays.toString( actualStates ) + ) );
return false;
}
}
commit 73d6c6b51ba690033b8fc8998b016a4709bf4b0b
Author: Robert Antoni Buj i Gelonch robert@gmail.com
Date: Tue Sep 30 17:05:09 2014 +0200
forms: replace StringBuffer with StringBuilder
Change-Id: Iee1b7ea214e5ed2fdd8bd5fe93dc16fbaaf312a8
Reviewed-on: https://gerrit.libreoffice.org/11720
Reviewed-by: Samuel Mehrbrodt s.mehrbr...@gmail.com
Tested-by: Samuel Mehrbrodt s.mehrbr...@gmail.com
diff --git a/forms/qa/integration/forms/ListBox.java
b/forms/qa/integration/forms/ListBox.java
index b4412a09..a6e5326 100644
--- a/forms/qa/integration/forms/ListBox.java
+++ b/forms/qa/integration/forms/ListBox.java
@@ -85,7 +85,7 @@ public class ListBox extends TestCase
formOperations.execute( FormFeature.MoveToFirst );
for ( int row=0; row2; ++row )
{
-StringBuffer failedFieldTypes = new StringBuffer();
+StringBuilder failedFieldTypes = new StringBuilder();
for ( int i=0; ifieldTypes.length; ++i )
{
final String columnFKName = fieldTypes[i] + _fk;
@@ -184,7 +184,7 @@ public class ListBox extends TestCase
ArrayList String[] foreignKeyValues = new ArrayList String[]
();
-StringBuffer foreignKeyInsertSQL = new StringBuffer();
+StringBuilder foreignKeyInsertSQL = new StringBuilder();
foreignKeyInsertSQL.append( INSERT INTO \ +
m_foreignKeyTableName + \ VALUES (? );
final String[] displayValues = impl_getDisplayValues();
@@ -203,7 +203,7 @@ public class ListBox extends TestCase
) );
// insert a few rows
-StringBuffer sql = new StringBuffer();
+StringBuilder sql = new StringBuilder();
sql.append( INSERT INTO \ );
sql.append( tableName );
sql.append( \ VALUES (?, ?));
diff --git a/forms/qa/integration/forms/RadioButtons.java
b/forms/qa/integration/forms/RadioButtons.java
index 0156e00..efcca58 100644
--- a/forms/qa/integration/forms/RadioButtons.java
+++ b/forms/qa/integration/forms/RadioButtons.java
@@ -308,7 +308,7 @@ public class RadioButtons extends complexlib.ComplexTestCase
/* -- */
private String stateString( short[] states )
{
-StringBuffer buf = new StringBuffer();
+StringBuilder buf = new StringBuilder();
for ( int i=0; istates.length; ++i )
buf.append( states[i] );
return buf.toString();
___
Libreoffice-commits mailing list
RE: examples to manage docs using LibreOffice as a major component
On Tue, 2014-09-30 at 09:31 -0400, nicholas ferguson wrote: On Tue, 2014-09-30 at 09:02 -0400, nicholas ferguson wrote: My question... How do I transform these unit test files into a console app, where for example filters_test.cxx would have a point of entry, a main function. Has someone done this? Can they send me a sample or instructions. ... you will need to solve a truck-load of bootstrapping issues - [nicholas ferguson] Wow. So in the past seven years, not a single successful attempt at transforming a unit test.. and spinning it off into a separate executable...a unit test like filters_test.cxx Hard to believe These unit tests have so much functionality exposed... some hacker would seem to be naturally attracted to transform them into an independent executable. Nick ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/svx include/vcl svx/source vcl/source
include/svx/dialogs.hrc |2 +-
include/vcl/menubtn.hxx |3 ++-
svx/source/tbxctrls/tbcontrl.cxx | 32 ++--
svx/source/tbxctrls/tbcontrl.src |8
vcl/source/control/menubtn.cxx | 10 +-
5 files changed, 26 insertions(+), 29 deletions(-)
New commits:
commit d59e33500a250824e713afacef2ea295576caba6
Author: Samuel Mehrbrodt s.mehrbr...@gmail.com
Date: Tue Sep 30 20:37:12 2014 +0200
fdo#62081 Improve split menu on style dropdown
* Remove Apply style
* Add Update Style Based on Selection
* A11y:
* Context menu key: Open submenu
* Return key: Apply style
Change-Id: Ib2960baa1412a05ea00b0e214d1af0a3d119e852
diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc
index 65e8087..d96bacb 100644
--- a/include/svx/dialogs.hrc
+++ b/include/svx/dialogs.hrc
@@ -185,7 +185,7 @@
// for Toolbox-Control style
#define RID_SVXTBX_STYLE(RID_SVX_START + 120)
#define RID_SVX_STYLE_MENU (RID_SVX_START + 121)
-#define RID_SVX_APPLY_STYLE (RID_SVX_START + 122)
+#define RID_SVX_UPDATE_STYLE(RID_SVX_START + 122)
#define RID_SVX_MODIFY_STYLE(RID_SVX_START + 123)
#define RID_SVXDLG_COMPRESSGRAPHICS (RID_SVX_START + 142)
diff --git a/include/vcl/menubtn.hxx b/include/vcl/menubtn.hxx
index 78209c8..83087ab 100644
--- a/include/vcl/menubtn.hxx
+++ b/include/vcl/menubtn.hxx
@@ -45,7 +45,6 @@ private:
LinkmaSelectHdl;
SAL_DLLPRIVATE voidImplInitMenuButtonData();
-SAL_DLLPRIVATE voidImplExecuteMenu();
DECL_DLLPRIVATE_LINK( ImplMenuTimeoutHdl, void* );
// Copy assignment is forbidden and not implemented.
@@ -66,6 +65,8 @@ public:
virtual voidActivate() SAL_OVERRIDE;
virtual voidSelect();
+voidExecuteMenu();
+
voidSetMenuMode( sal_uInt16 nMode );
sal_uInt16 GetMenuMode() const { return mnMenuMode; }
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 8ca31d8..fe8597d 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -345,24 +345,24 @@ void SvxStyleBox_Impl::ReleaseFocus()
IMPL_LINK( SvxStyleBox_Impl, MenuSelectHdl, Menu*, pMenu)
{
+ReleaseFocus();
+OUString sEntry = OUString( (GetEntry(GetSelectEntryPos())) );
+Sequence PropertyValue aArgs( 2 );
+aArgs[0].Name = Param;
+aArgs[0].Value = makeAny( sEntry );
+aArgs[1].Name = Family;
+aArgs[1].Value = makeAny( sal_Int16( eStyleFamily ));
+
sal_uInt16 nMenuId = pMenu-GetCurItemId();
switch(nMenuId) {
-case RID_SVX_APPLY_STYLE:
+case RID_SVX_UPDATE_STYLE:
{
-nCurSel = GetSelectEntryPos();
-SetText(GetEntry(nCurSel));
-Select();
+SfxToolBoxControl::Dispatch( m_xDispatchProvider,
+OUString( .uno:StyleUpdateByExample ), aArgs );
break;
}
case RID_SVX_MODIFY_STYLE:
{
-OUString sEntry = OUString( (GetEntry(GetSelectEntryPos())) );
-ReleaseFocus();
-Sequence PropertyValue aArgs( 2 );
-aArgs[0].Name = Param;
-aArgs[0].Value = makeAny( sEntry );
-aArgs[1].Name = Family;
-aArgs[1].Value = makeAny( sal_Int16( eStyleFamily ));
SfxToolBoxControl::Dispatch( m_xDispatchProvider,
OUString( .uno:EditStyle ), aArgs );
break;
@@ -484,22 +484,18 @@ bool SvxStyleBox_Impl::Notify( NotifyEvent rNEvt )
switch ( nCode )
{
-case KEY_RETURN:
+case KEY_CONTEXTMENU:
{
if(IsInDropDown())
{
sal_uInt16 nItem = GetSelectEntryPos() - 1;
if(nItem MAX_STYLES_ENTRIES)
-m_pButtons[nItem]-KeyInput(*rNEvt.GetKeyEvent());
-nHandled = true;
-}
-else
-{
+m_pButtons[nItem]-ExecuteMenu();
nHandled = true;
-Select();
}
break;
}
+case KEY_RETURN:
case KEY_TAB:
{
if ( KEY_TAB == nCode )
diff --git a/svx/source/tbxctrls/tbcontrl.src b/svx/source/tbxctrls/tbcontrl.src
index 59728c6..df42dca 100644
--- a/svx/source/tbxctrls/tbcontrl.src
+++ b/svx/source/tbxctrls/tbcontrl.src
@@ -79,7 +79,7 @@ String RID_SVXSTR_LINECOLOR
ComboBox RID_SVXTBX_STYLE
{
HelpId = HID_STYLE_LISTBOX ;
-Size = MAP_APPFONT ( 50 , 86 ) ;
+Size = MAP_APPFONT ( 60 , 86 ) ;
DropDown = TRUE ;
Sort = TRUE ;
AutoHScroll = TRUE ;
@@ -94,13 +94,13 @@ Menu RID_SVX_STYLE_MENU
{
MenuItem
{
-Identifier =
[Bug 62081] Add split menus to items in the style dropdown
https://bugs.freedesktop.org/show_bug.cgi?id=62081 --- Comment #10 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Samuel Mehrbrodt committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=d59e33500a250824e713afacef2ea295576caba6 fdo#62081 Improve split menu on style dropdown The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Justin Luth license statement
All of my past future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 62081] Add split menus to items in the style dropdown
https://bugs.freedesktop.org/show_bug.cgi?id=62081 --- Comment #11 from Samuel Mehrbrodt s.mehrbr...@gmail.com --- I've made some improvements to the dropdown, see screenshot. It would be good if right-click would open up that menu, rather than apply the current style, as right-click is the common button for context menu. This is not common on such dropdowns, I didn't implement this. Instead you can activate the dropdown with the context menu key. -- 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 62081] Add split menus to items in the style dropdown
https://bugs.freedesktop.org/show_bug.cgi?id=62081 --- Comment #12 from Samuel Mehrbrodt s.mehrbr...@gmail.com --- Created attachment 107149 -- https://bugs.freedesktop.org/attachment.cgi?id=107149action=edit Screenshot -- 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 62081] Add split menus to items in the style dropdown
https://bugs.freedesktop.org/show_bug.cgi?id=62081 --- Comment #13 from Samuel Mehrbrodt s.mehrbr...@gmail.com --- (In reply to comment #9) I tested the new dropdowns, but when I click them, the parent Styles menu disappears (leaving a floating submenu in a nonsensical position of the screen) On which OS did you test this? -- 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: examples to manage docs using LibreOffice as a major component
Hi Nicholas, On Tue, 2014-09-30 at 13:43 -0400, nicholas ferguson wrote: you will need to solve a truck-load of bootstrapping issues Wow. So in the past seven years, not a single successful attempt There are several successful attempts. It is certainly not impossible to do this. Those attempts have however been done by people skilled and experienced in the art of wrestling the LibreOffice octopus - I've personally broken the back of a couple of them. My concern here is not feasibility in the abstract, only the danger of yet more noisy and time-consuming remote debugging by mailing-list to no useful purpose - ie. ending up with something that is not contributed back. at transforming a unit test.. and spinning it off into a separate executable...a unit test like filters_test.cxx Sure - those unit tests run under cppunittester - a separate executable; as you can see if you read the make output and/or read the Makefiles ;-) Separately, if you use LibreOfficeKit (under Linux) you can write your own separate executable (eg. gtktiledviewer) really extremely easily - though you are limited by the currently exposed API there; failing that you can link the code into an Android or iOS binary for yet another incarnation. All of it is do-able (with some hard work). Hard to believe These unit tests have so much functionality exposed... some hacker would seem to be naturally attracted to transform them into an independent executable. They are already executed as shared libraries loaded into a separate executable post compilation. That however happens inside the warm, nurturing, and rather painfully constructed context of a live LibreOffice build tree. But of course - as with -any- community / code problem - you are by far more than welcome to contribute to fixing the situation and meeting your own need. Indeed, I encourage you to get stuck into fixing whatever perceived gaps there are, all of us are responsible for improving things here as their means allow :-) I look forward to your patches. ATB, Michael. -- michael.me...@collabora.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
RE: examples to manage docs using LibreOffice as a major component
I didn't understand your answer. I think you said you would not give me the samples of turning a cppunit test into a standalone executable ..because you find me unskilled and I would then ask too many questions Is it your english? And that first you want to see some contributions from me, to the LibreOffice code base patches... If I missunderstood your things... can you then tar up an example and send it to me. nick -Original Message- From: LibreOffice [mailto:libreoffice-boun...@lists.freedesktop.org] On Behalf Of Michael Meeks Sent: Tuesday, September 30, 2014 2:54 PM To: nicholas ferguson Cc: 'libreoffice-dev'; 'Tor Lillqvist' Subject: Re: examples to manage docs using LibreOffice as a major component Hi Nicholas, On Tue, 2014-09-30 at 13:43 -0400, nicholas ferguson wrote: you will need to solve a truck-load of bootstrapping issues Wow. So in the past seven years, not a single successful attempt There are several successful attempts. It is certainly not impossible to do this. Those attempts have however been done by people skilled and experienced in the art of wrestling the LibreOffice octopus - I've personally broken the back of a couple of them. My concern here is not feasibility in the abstract, only the danger of yet more noisy and time-consuming remote debugging by mailing-list to no useful purpose - ie. ending up with something that is not contributed back. at transforming a unit test.. and spinning it off into a separate executable...a unit test like filters_test.cxx Sure - those unit tests run under cppunittester - a separate executable; as you can see if you read the make output and/or read the Makefiles ;-) Separately, if you use LibreOfficeKit (under Linux) you can write your own separate executable (eg. gtktiledviewer) really extremely easily - though you are limited by the currently exposed API there; failing that you can link the code into an Android or iOS binary for yet another incarnation. All of it is do-able (with some hard work). Hard to believe These unit tests have so much functionality exposed... some hacker would seem to be naturally attracted to transform them into an independent executable. They are already executed as shared libraries loaded into a separate executable post compilation. That however happens inside the warm, nurturing, and rather painfully constructed context of a live LibreOffice build tree. But of course - as with -any- community / code problem - you are by far more than welcome to contribute to fixing the situation and meeting your own need. Indeed, I encourage you to get stuck into fixing whatever perceived gaps there are, all of us are responsible for improving things here as their means allow :-) I look forward to your patches. ATB, Michael. -- michael.me...@collabora.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'private/ajrhunt/c4' - sc/source
sc/source/ui/view/gridwin3.cxx | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit ff398161eab8735bb036b1e48779ea57798c9cad
Author: Andrzej Hunt andrzej.h...@collabora.com
Date: Tue Sep 30 20:03:26 2014 +0100
Temp: the DrView scaling will be completely wrong for tiled rendering.
(No idea why yet)
Change-Id: I9fcbd9055d82feb59b1c957234c9d7747f95ced9
diff --git a/sc/source/ui/view/gridwin3.cxx b/sc/source/ui/view/gridwin3.cxx
index e9ac6ca..d9343d1 100644
--- a/sc/source/ui/view/gridwin3.cxx
+++ b/sc/source/ui/view/gridwin3.cxx
@@ -249,10 +249,10 @@ MapMode ScGridWindow::GetDrawMapMode( bool bForce )
{
Fraction aScaleX;
Fraction aScaleY;
-if (pDrView)
-pDrView-GetScale( aScaleX, aScaleY );
-else
-{
+// if (pDrView)
+// pDrView-GetScale( aScaleX, aScaleY );
+// else
+// {
SCCOL nEndCol = 0;
SCROW nEndRow = 0;
pDoc-GetTableArea( nTab, nEndCol, nEndRow );
@@ -262,7 +262,7 @@ MapMode ScGridWindow::GetDrawMapMode( bool bForce )
pViewData-GetZoomX(),pViewData-GetZoomY(),
pViewData-GetPPTX(),pViewData-GetPPTY(),
aScaleX,aScaleY );
-}
+// }
aDrawMode.SetScaleX(aScaleX);
aDrawMode.SetScaleY(aScaleY);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/droid_calcimpress2' - 7 commits - android/experimental
android/experimental/LOAndroid3/res/layout/activity_main.xml
| 24 +--
android/experimental/LOAndroid3/src/java/org/libreoffice/LOEvent.java
| 30
android/experimental/LOAndroid3/src/java/org/libreoffice/LOEventFactory.java
| 37 ++
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitShell.java
|3
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
|9 -
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
| 61 +-
android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
|4
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java
|5
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/ViewTransform.java
| 19 ---
9 files changed, 101 insertions(+), 91 deletions(-)
New commits:
commit 3b288e1ddd5f84ac3ce34c6c63b848a68615c3f7
Author: Tomaž Vajngerl tomaz.vajng...@collabora.com
Date: Tue Sep 30 21:09:40 2014 +0200
android: clear all tiles in refresh
Change-Id: I6a7e9070160e8d4bbd6ad5cd1bfa2dc18e66a45d
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
index c11164b..54478bf 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
@@ -46,6 +46,8 @@ public class LOKitThread extends Thread {
mApplication.getLayerController().getView().changeCheckerboardBitmap(bitmap,
mTileProvider.getPageWidth(), mTileProvider.getPageHeight());
}
+mLayerClient.clearAllTiles();
+
RectF rect = new RectF(0, 0, mTileProvider.getPageWidth(),
mTileProvider.getPageHeight());
mController.setPageRect(rect, rect);
mController.setForceRedraw();
@@ -53,7 +55,6 @@ public class LOKitThread extends Thread {
private void changePart(int partIndex) {
mTileProvider.changePart(partIndex);
-mLayerClient.clearAllTiles();
refresh();
}
commit 09bb2d854995d36721948ff763223bec9c13aec5
Author: Tomaž Vajngerl tomaz.vajng...@collabora.com
Date: Tue Sep 30 21:07:30 2014 +0200
android: no need for throws InterruptedException
Change-Id: I93be9af0849a2515c27bc22892a201ec207d6775
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
index 4493e94..c11164b 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
@@ -25,7 +25,7 @@ public class LOKitThread extends Thread {
TileProviderFactory.initialize();
}
-private boolean draw() throws InterruptedException {
+private boolean draw() {
RectF rect = new RectF(0, 0, mTileProvider.getPageWidth(),
mTileProvider.getPageHeight());
DisplayMetrics displayMetrics =
LibreOfficeMainActivity.mAppContext.getResources().getDisplayMetrics();
mViewportMetrics = new ImmutableViewportMetrics(displayMetrics);
@@ -51,7 +51,7 @@ public class LOKitThread extends Thread {
mController.setForceRedraw();
}
-private void changePart(int partIndex) throws InterruptedException {
+private void changePart(int partIndex) {
mTileProvider.changePart(partIndex);
mLayerClient.clearAllTiles();
refresh();
@@ -95,7 +95,7 @@ public class LOKitThread extends Thread {
}
}
-private void processEvent(LOEvent event) throws InterruptedException {
+private void processEvent(LOEvent event) {
switch (event.mType) {
case LOEvent.LOAD:
load(event.getFilename());
commit 364d52ec760f3c6bdff38b31eddb67132e7d6d72
Author: Tomaž Vajngerl tomaz.vajng...@collabora.com
Date: Tue Sep 30 20:58:43 2014 +0200
android: redraw LOEvent
Change-Id: I6171f7a36c07f53eeec0cc83caa168ec97459d53
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOEvent.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOEvent.java
index 4b22d1f..3f39257 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOEvent.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOEvent.java
@@ -13,6 +13,7 @@ public class LOEvent {
public static final int DRAW = 4;
public static final int CHANGE_PART = 5;
public static final int LOAD = 6;
+public static final int REDRAW = 7;
public int mType;
private ImmutableViewportMetrics mViewportMetrics;
@@ -20,6 +21,10 @@ public class LOEvent {
private int mPartIndex;
private String mFilename;
+public LOEvent(int type) {
+mType =
[Bug 62081] Add split menus to items in the style dropdown
https://bugs.freedesktop.org/show_bug.cgi?id=62081 Samuel Mehrbrodt s.mehrbr...@gmail.com changed: What|Removed |Added CC|libreoffice@lists.freedeskt | |op.org | --- Comment #14 from Samuel Mehrbrodt s.mehrbr...@gmail.com --- Btw I also increased the width of the dropdown (+10px) to give the new button some space. -- 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 53920] EDITING: Data Validity Cell Range not being applied to multiple selected cells
https://bugs.freedesktop.org/show_bug.cgi?id=53920 Kohei Yoshida libreoff...@kohei.us changed: What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED --- Comment #17 from Kohei Yoshida libreoff...@kohei.us --- I'll mark this 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 'feature/droid_calcimpress2' - android/experimental
android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
|4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 056ef0b4ad3649c21eadd82be65178580a32be20
Author: Tomaž Vajngerl tomaz.vajng...@collabora.com
Date: Tue Sep 30 21:16:29 2014 +0200
android: don't return to open document if viewing license / notice
Change-Id: I12994aa60fa2476ef94153b5ba13000ece71d28b
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
index 886fbd9..a37438e 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
@@ -176,7 +176,7 @@ public class LibreOfficeMainActivity extends Activity {
@Override
public void onClick(View view) {
Intent intent = new Intent(view.getContext(),
LibreOfficeMainActivity.class);
-//intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
intent.setData(Uri.parse(file:///assets/license.txt));
startActivity(intent);
}
@@ -187,7 +187,7 @@ public class LibreOfficeMainActivity extends Activity {
@Override
public void onClick(View view) {
Intent intent = new Intent(view.getContext(),
LibreOfficeMainActivity.class);
-//intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
intent.setData(Uri.parse(file:///assets/notice.txt));
startActivity(intent);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: examples to manage docs using LibreOffice as a major component
On 30/09/14 19:57, nicholas ferguson wrote: I didn't understand your answer. I think you said you would not give me the samples of turning a cppunit test into a standalone executable ..because you find me unskilled and I would then ask too many questions Is it your english? No. It's the way we do it in the Open Source world. You are expected to scratch your own itches, not expect someone else to do it for you. You haven't made a very good impression here. Okay, so you don't understand the culture, as you point out there may be some language issues with people (though not Michael, he speaks English - that is, REAL English :-) And that first you want to see some contributions from me, to the LibreOffice code base patches... Which is what is expected of EVERYONE - you're no different. Or some other contribution. You're coming over as very demanding, wondering why nobody else has tried to do the same as you, and expecting them to drop what they're doing and help you. Except they're not doing it, because they see no value in doing it! And why should they waste their valuable time helping someone else, unless they get a kick out of the sheer act of helping? (Most of us, we're NOT paid ...) If I missunderstood your things... can you then tar up an example and send it to me. git pull is your friend. :-) You're coming over as a typical American - barging into someone else's community, expecting them to change everything (that works fine for them) just to suit you, and then wondering why nobody likes you. I notice Michael is pretty much the only person in your email threads now (and I strongly suspect he is PAID to be nice to everyone). The problem is, as has been pointed out, you are working on a very thorny issue - build systems. On a system that very few developers use (Windows). And one that a lot of developers despise and don't want to touch! A lot of your emails have been right over my head, for one. If anyone is going to help you, it will take a lot of effort for them to get up to speed on what you're trying to do. And those people (like Michael) who are being paid to work on LibreOffice are few in number, and have a lot of more serious priorities. I don't want to say you're on your own, but the reality is that most people here don't see what you're doing as either important, or of interest to them. Which means you aren't going to get much help (not because people don't want to, but because they don't understand what - or why - you are trying to achieve). And by coming over as demanding, you just guarantee that the people who *could* help, will likely tune you out. Sorry, it's just the way things work :-( Cheers, Wol nick -Original Message- From: LibreOffice [mailto:libreoffice-boun...@lists.freedesktop.org] On Behalf Of Michael Meeks Sent: Tuesday, September 30, 2014 2:54 PM To: nicholas ferguson Cc: 'libreoffice-dev'; 'Tor Lillqvist' Subject: Re: examples to manage docs using LibreOffice as a major component Hi Nicholas, On Tue, 2014-09-30 at 13:43 -0400, nicholas ferguson wrote: you will need to solve a truck-load of bootstrapping issues Wow. So in the past seven years, not a single successful attempt There are several successful attempts. It is certainly not impossible to do this. Those attempts have however been done by people skilled and experienced in the art of wrestling the LibreOffice octopus - I've personally broken the back of a couple of them. My concern here is not feasibility in the abstract, only the danger of yet more noisy and time-consuming remote debugging by mailing-list to no useful purpose - ie. ending up with something that is not contributed back. at transforming a unit test.. and spinning it off into a separate executable...a unit test like filters_test.cxx Sure - those unit tests run under cppunittester - a separate executable; as you can see if you read the make output and/or read the Makefiles ;-) Separately, if you use LibreOfficeKit (under Linux) you can write your own separate executable (eg. gtktiledviewer) really extremely easily - though you are limited by the currently exposed API there; failing that you can link the code into an Android or iOS binary for yet another incarnation. All of it is do-able (with some hard work). Hard to believe These unit tests have so much functionality exposed... some hacker would seem to be naturally attracted to transform them into an independent executable. They are already executed as shared libraries loaded into a separate executable post compilation. That however happens inside the warm, nurturing, and rather painfully constructed context of a live LibreOffice build tree. But of course - as with -any- community / code problem - you are by far more than welcome to contribute to fixing the situation and meeting your own need. Indeed, I encourage you to get stuck into fixing whatever perceived gaps there
[Libreoffice-commits] core.git: oox/source sw/qa
oox/source/drawingml/diagram/diagramlayoutatoms.cxx | 10 +-
sw/qa/core/data/ooxml/pass/fdo79129.docx|binary
2 files changed, 9 insertions(+), 1 deletion(-)
New commits:
commit c84ce79132c674b4c2d31da8997ed77671323dfe
Author: Caolán McNamara caol...@redhat.com
Date: Tue Sep 30 10:43:37 2014 +0100
Resolves: fdo#79129 Crash in oox::drawingml::LayoutNode::setupShape
Change-Id: I0bafd2c43d29806eea0ff0cb165e67aece53488f
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index 049f409..dc5f2db 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -394,7 +394,15 @@ bool LayoutNode::setupShape( const ShapePtr rShape, const
Diagram rDgm, sal_uI
const
DiagramData::StringMap::value_type::second_type::const_iterator
aVecEnd=aNodeName-second.end();
while( aVecIter != aVecEnd )
{
-DiagramData::PointNameMap::const_iterator
aDataNode2=rDgm.getData()-getPointNameMap().find(aVecIter-first);
+DiagramData::PointNameMap rMap =
rDgm.getData()-getPointNameMap();
+DiagramData::PointNameMap::const_iterator aDataNode2 =
rMap.find(aVecIter-first);
+if (aDataNode2 == rMap.end())
+{
+//busted, skip it
+++aVecIter;
+continue;
+}
+
if( aVecIter-second == 0 )
{
// grab shape attr from topmost element(s)
diff --git a/sw/qa/core/data/ooxml/pass/fdo79129.docx
b/sw/qa/core/data/ooxml/pass/fdo79129.docx
new file mode 100644
index 000..46ff0f5
Binary files /dev/null and b/sw/qa/core/data/ooxml/pass/fdo79129.docx differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/droid_calcimpress2' - android/Bootstrap
android/Bootstrap/Makefile.shared |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) New commits: commit cca9d7490de115dee13f5616411b7dcee21cbc39 Author: Michael Meeks michael.me...@collabora.com Date: Tue Sep 30 20:38:55 2014 +0100 android: package C* fonts as well for interop. Change-Id: I49c6c4bf0b2ddfb403612ccad90a41e8ae525427 diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared index 7bc9615..5dd9f4a 100644 --- a/android/Bootstrap/Makefile.shared +++ b/android/Bootstrap/Makefile.shared @@ -196,7 +196,11 @@ copy-stuff: # vcl/generic/fontmanager/helper.cxx: psp::getFontPath(). UserInstallation is # set to the app's data dir above. mkdir -p assets/gz.unpack/user/fonts - for F in $(INSTDIR)/share/fonts/truetype/Liberation*.ttf $(INSTDIR)/share/fonts/truetype/Gen*.ttf $(INSTDIR)/share/fonts/truetype/opens___.ttf; do \ + for F in $(INSTDIR)/share/fonts/truetype/Liberation*.ttf \ +$(INSTDIR)/share/fonts/truetype/Caladea-*.ttf \ +$(INSTDIR)/share/fonts/truetype/Carlito-*.ttf \ +$(INSTDIR)/share/fonts/truetype/Gen*.ttf \ +$(INSTDIR)/share/fonts/truetype/opens___.ttf; do \ gzip -9 $$F assets/gz.unpack/user/fonts/`basename $$F`; \ done # ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/ajrhunt/c4' - sc/source
sc/source/ui/view/viewdata.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 5ba5ff4aff2dd04be970a603c1503b566fd6eed1
Author: Andrzej Hunt andrzej.h...@collabora.com
Date: Tue Sep 30 20:43:43 2014 +0100
Fix wrong conditional for zoom-saneness-check.
Change-Id: I54cb8ffc71c162e75675d306b903ef40ad05092f
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 683bb6c..d46c7f4 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -629,7 +629,7 @@ void ScViewData::SetZoom( const Fraction rNewX, const
Fraction rNewY,
// We probably don't want these limits for tiled rendering, hence
// we make them optional.
-if ( !bIgnoreLimits )
+if ( bIgnoreLimits )
{
const Fraction aFrac20( 1, 5 );
const Fraction aFrac400( 4, 1 );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/droid_calcimpress3' - 11 commits - android/Bootstrap android/experimental sc/source
android/Bootstrap/Makefile.shared
|6
android/experimental/LOAndroid3/res/layout/activity_main.xml
| 12 +
android/experimental/LOAndroid3/src/java/org/libreoffice/LOEvent.java
| 30
android/experimental/LOAndroid3/src/java/org/libreoffice/LOEventFactory.java
| 37 ++
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitShell.java
|3
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
|9 -
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitTileProvider.java
| 61 +-
android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
|8 -
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/GeckoLayerClient.java
|5
android/experimental/LOAndroid3/src/java/org/mozilla/gecko/gfx/ViewTransform.java
| 19 ---
sc/source/ui/view/gridwin3.cxx
| 10 -
sc/source/ui/view/viewdata.cxx
|2
12 files changed, 114 insertions(+), 88 deletions(-)
New commits:
commit cf38e0daf4a21305e970fb07b6bbe12f0d198fe4
Author: Michael Meeks michael.me...@collabora.com
Date: Tue Sep 30 20:38:55 2014 +0100
android: package C* fonts as well for interop.
Change-Id: I49c6c4bf0b2ddfb403612ccad90a41e8ae525427
diff --git a/android/Bootstrap/Makefile.shared
b/android/Bootstrap/Makefile.shared
index 7bc9615..5dd9f4a 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -196,7 +196,11 @@ copy-stuff:
# vcl/generic/fontmanager/helper.cxx: psp::getFontPath(). UserInstallation is
# set to the app's data dir above.
mkdir -p assets/gz.unpack/user/fonts
- for F in $(INSTDIR)/share/fonts/truetype/Liberation*.ttf
$(INSTDIR)/share/fonts/truetype/Gen*.ttf
$(INSTDIR)/share/fonts/truetype/opens___.ttf; do \
+ for F in $(INSTDIR)/share/fonts/truetype/Liberation*.ttf \
+$(INSTDIR)/share/fonts/truetype/Caladea-*.ttf \
+$(INSTDIR)/share/fonts/truetype/Carlito-*.ttf \
+$(INSTDIR)/share/fonts/truetype/Gen*.ttf \
+$(INSTDIR)/share/fonts/truetype/opens___.ttf; do \
gzip -9 $$F assets/gz.unpack/user/fonts/`basename $$F`; \
done
#
commit 1b70f8fbcc835f5cb7c57d991fc22797ece78f98
Author: Tomaž Vajngerl tomaz.vajng...@collabora.com
Date: Tue Sep 30 21:16:29 2014 +0200
android: don't return to open document if viewing license / notice
Change-Id: I12994aa60fa2476ef94153b5ba13000ece71d28b
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
index 2f69cf3..64d70d0 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
@@ -176,7 +176,7 @@ public class LibreOfficeMainActivity extends Activity {
@Override
public void onClick(View view) {
Intent intent = new Intent(view.getContext(),
LibreOfficeMainActivity.class);
-//intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
intent.setData(Uri.parse(file:///assets/license.txt));
startActivity(intent);
}
@@ -187,7 +187,7 @@ public class LibreOfficeMainActivity extends Activity {
@Override
public void onClick(View view) {
Intent intent = new Intent(view.getContext(),
LibreOfficeMainActivity.class);
-//intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
intent.setData(Uri.parse(file:///assets/notice.txt));
startActivity(intent);
}
commit 20bd21718039e29e4acd4dac1b4a36a01cc5c651
Author: Tomaž Vajngerl tomaz.vajng...@collabora.com
Date: Tue Sep 30 21:09:40 2014 +0200
android: clear all tiles in refresh
Change-Id: I6a7e9070160e8d4bbd6ad5cd1bfa2dc18e66a45d
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
index 3bfa03a..ef75ae5 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
@@ -46,6 +46,8 @@ public class LOKitThread extends Thread {
mApplication.getLayerController().getView().changeCheckerboardBitmap(bitmap,
mTileProvider.getPageWidth(), mTileProvider.getPageHeight());
}
+
RE: examples to manage docs using LibreOffice as a major component
You missunderstand the english of a question. If in english someone says, I am having problems transforming a cppunit test into a standalone console application. Has anyone done that? And if they have, can they send me a sample or instructions. Some of you are reading this...as oh...someone does not know how to transform a cppunit test into a standalone console application. Gosh...do I have the time to do this work, on their behalf, and send that person my results...Let me check my schedule. Gosh, no..I don't have the time...so I will have to tell that person..that really...you have to do this on your own...I cannot help you. But the question is not asking you to do any work.. The question is asking something like... have you downloaded libreoffice source files..? Where do I go to download? if you have the time and inclination you send a url. That's it. That's the result of the question. You are not being asked to download the files for me..and then email it to me. Then Michael writes...Of course I have some...but I don't send them to you, because you will then ask me too many questions... So only a few members of your community have difficulties with english. -Original Message- From: LibreOffice [mailto:libreoffice-boun...@lists.freedesktop.org] On Behalf Of Wols Lists Sent: Tuesday, September 30, 2014 3:38 PM To: libreoffice@lists.freedesktop.org Subject: Re: examples to manage docs using LibreOffice as a major component On 30/09/14 19:57, nicholas ferguson wrote: I didn't understand your answer. I think you said you would not give me the samples of turning a cppunit test into a standalone executable ..because you find me unskilled and I would then ask too many questions Is it your english? No. It's the way we do it in the Open Source world. You are expected to scratch your own itches, not expect someone else to do it for you. You haven't made a very good impression here. Okay, so you don't understand the culture, as you point out there may be some language issues with people (though not Michael, he speaks English - that is, REAL English :-) And that first you want to see some contributions from me, to the LibreOffice code base patches... Which is what is expected of EVERYONE - you're no different. Or some other contribution. You're coming over as very demanding, wondering why nobody else has tried to do the same as you, and expecting them to drop what they're doing and help you. Except they're not doing it, because they see no value in doing it! And why should they waste their valuable time helping someone else, unless they get a kick out of the sheer act of helping? (Most of us, we're NOT paid ...) If I missunderstood your things... can you then tar up an example and send it to me. git pull is your friend. :-) You're coming over as a typical American - barging into someone else's community, expecting them to change everything (that works fine for them) just to suit you, and then wondering why nobody likes you. I notice Michael is pretty much the only person in your email threads now (and I strongly suspect he is PAID to be nice to everyone). The problem is, as has been pointed out, you are working on a very thorny issue - build systems. On a system that very few developers use (Windows). And one that a lot of developers despise and don't want to touch! A lot of your emails have been right over my head, for one. If anyone is going to help you, it will take a lot of effort for them to get up to speed on what you're trying to do. And those people (like Michael) who are being paid to work on LibreOffice are few in number, and have a lot of more serious priorities. I don't want to say you're on your own, but the reality is that most people here don't see what you're doing as either important, or of interest to them. Which means you aren't going to get much help (not because people don't want to, but because they don't understand what - or why - you are trying to achieve). And by coming over as demanding, you just guarantee that the people who *could* help, will likely tune you out. Sorry, it's just the way things work :-( Cheers, Wol nick -Original Message- From: LibreOffice [mailto:libreoffice-boun...@lists.freedesktop.org] On Behalf Of Michael Meeks Sent: Tuesday, September 30, 2014 2:54 PM To: nicholas ferguson Cc: 'libreoffice-dev'; 'Tor Lillqvist' Subject: Re: examples to manage docs using LibreOffice as a major component Hi Nicholas, On Tue, 2014-09-30 at 13:43 -0400, nicholas ferguson wrote: you will need to solve a truck-load of bootstrapping issues Wow. So in the past seven years, not a single successful attempt There are several successful attempts. It is certainly not impossible to do this. Those attempts have however been done by people skilled and experienced in the art of wrestling the LibreOffice octopus - I've personally broken the back of a couple of them. My concern here is not
[Libreoffice-commits] core.git: Branch 'feature/droid_calcimpress3' - android/experimental
android/experimental/LOAndroid3/res/layout/activity_main.xml
| 12 ++
android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
|7 +
android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
|8 ++
3 files changed, 27 insertions(+)
New commits:
commit 3d86ed49d5278568eef6441c71fcd4001edae392
Author: Tomaž Vajngerl tomaz.vajng...@collabora.com
Date: Tue Sep 30 18:00:54 2014 +0200
android: show loading animation until the document is loaded
Change-Id: I98eeafe30e90d039175daea65428526a95c9ff1e
diff --git a/android/experimental/LOAndroid3/res/layout/activity_main.xml
b/android/experimental/LOAndroid3/res/layout/activity_main.xml
index 9ada4d3..799f591 100644
--- a/android/experimental/LOAndroid3/res/layout/activity_main.xml
+++ b/android/experimental/LOAndroid3/res/layout/activity_main.xml
@@ -44,4 +44,16 @@
android:background=#9FFF
android:choiceMode=singleChoice/
+RelativeLayout
+android:id=@+id/loadingPanel
+android:layout_width=match_parent
+android:layout_height=match_parent
+android:gravity=center
+
+ProgressBar
+android:layout_width=wrap_content
+android:layout_height=wrap_content
+android:indeterminate=true /
+/RelativeLayout
+
/android.support.v4.widget.DrawerLayout
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
index ef75ae5..54478bf 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOKitThread.java
@@ -76,6 +76,13 @@ public class LOKitThread extends Thread {
boolean isReady = mTileProvider.isReady();
if (isReady) {
refresh();
+LOKitShell.getMainHandler().post(new Runnable() {
+@Override
+public void run() {
+LibreOfficeMainActivity.mAppContext.hideProgressBar();
+}
+});
+
}
return isReady;
}
diff --git
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
index 64d70d0..a37438e 100644
---
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
+++
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
@@ -195,6 +195,14 @@ public class LibreOfficeMainActivity extends Activity {
}
+public void showProgressBar() {
+findViewById(R.id.loadingPanel).setVisibility(View.VISIBLE);
+}
+
+public void hideProgressBar() {
+findViewById(R.id.loadingPanel).setVisibility(View.GONE);
+}
+
private class DocumentPartClickListener implements
android.widget.AdapterView.OnItemClickListener {
@Override
public void onItemClick(AdapterView? parent, View view, int
position, long id) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - editeng/source sw/qa
editeng/source/items/frmitems.cxx|6 ++
sw/qa/extras/inc/swmodeltestbase.hxx | 10 --
sw/qa/extras/ooxmlimport/ooxmlimport.cxx |8 +---
sw/qa/extras/rtfimport/rtfimport.cxx | 13 +++--
4 files changed, 26 insertions(+), 11 deletions(-)
New commits:
commit 9bb04da4bb18342a107bb843d8054e178d97ae28
Author: Michael Stahl mst...@redhat.com
Date: Mon Sep 29 23:44:08 2014 +0200
sw: when getting a property value in a unit test, a void result is a bug
Change-Id: Iba0e43c198c3380426d0572427c591f4d77ba09b
diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx
b/sw/qa/extras/inc/swmodeltestbase.hxx
index fdce9f1..154d18c 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -403,7 +403,10 @@ protected:
{
uno::Reference beans::XPropertySet properties( obj,
uno::UNO_QUERY_THROW );
T data = T();
-properties-getPropertyValue( name ) = data;
+if (!(properties-getPropertyValue(name) = data))
+{
+CPPUNIT_FAIL(the property is of unexpected type or void);
+}
return data;
}
@@ -412,7 +415,10 @@ protected:
{
uno::Reference beans::XPropertySet properties( obj,
uno::UNO_QUERY_THROW );
T data = T();
-properties-getPropertyValue( name ) = data;
+if (!(properties-getPropertyValue(name) = data))
+{
+CPPUNIT_FAIL(the property is of unexpected type or void);
+}
return data;
}
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index eca11e6..fe0241e 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -2349,9 +2349,11 @@ DECLARE_OOXMLIMPORT_TEST(testBnc519228OddBreaks,
bnc519228_odd-breaks.docx)
// Page2 comes from follow of style for page 1 and should be a normal
page. Also check the two page style have the same properties,
// since page style for page1 was created from page style for page 2.
-OUString page2StyleName = getPropertyOUString( getParagraph( 3, This is
page 2, which is obviously an even page. ), PageDescName);
-CPPUNIT_ASSERT_EQUAL(OUString(), page2StyleName);
-page2StyleName = getPropertyOUString( page1Style, FollowStyle );
+uno::Any page2StyleAny = uno::Referencebeans::XPropertySet(
+getParagraph(3, This is page 2, which is obviously an even page.),
+uno::UNO_QUERY_THROW)-getPropertyValue(PageDescName);
+CPPUNIT_ASSERT_EQUAL(uno::Any(), page2StyleAny);
+OUString page2StyleName = getPropertyOUString( page1Style, FollowStyle
);
uno::Referencebeans::XPropertySet
page2Style(getStyles(PageStyles)-getByName(page2StyleName), uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(uno::makeAny(style::PageStyleLayout_ALL),
page2Style-getPropertyValue(PageStyleLayout));
getParagraphOfText( 1, getProperty uno::Referencetext::XText
(page2Style, HeaderTextLeft), This is the even header);
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 2b2764e..a61d62f 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -1536,7 +1536,7 @@ DECLARE_RTFIMPORT_TEST(testFdo68291, fdo68291.odt)
paste(fdo68291-paste.rtf, xEnd);
// This was Standard, causing an unwanted page break on next paste.
-CPPUNIT_ASSERT_EQUAL(OUString(), getPropertyOUString(getParagraph(1),
PageDescName));
+CPPUNIT_ASSERT_EQUAL(uno::Any(),
uno::Referencebeans::XPropertySet(getParagraph(1),
uno::UNO_QUERY)-getPropertyValue(PageDescName));
}
DECLARE_RTFIMPORT_TEST(testFdo69384, hello.rtf)
@@ -1630,8 +1630,8 @@ DECLARE_RTFIMPORT_TEST(testContSectionPageBreak,
cont-section-pagebreak.rtf)
CPPUNIT_ASSERT_EQUAL(OUString(SECOND), xParaSecond-getString());
CPPUNIT_ASSERT_EQUAL(style::BreakType_NONE,
getPropertystyle::BreakType(xParaSecond,
BreakType));
-CPPUNIT_ASSERT_EQUAL(OUString(),
- getPropertyOUString(xParaSecond, PageDescName));
+CPPUNIT_ASSERT_EQUAL(uno::Any(),
+ uno::Referencebeans::XPropertySet(xParaSecond,
uno::UNO_QUERY)-getPropertyValue(PageDescName));
// actually not sure how many paragraph there should be between
// SECOND and THIRD - important is that the page break is on there
uno::Referencetext::XTextRange xParaNext = getParagraph(3);
@@ -1642,8 +1642,8 @@ DECLARE_RTFIMPORT_TEST(testContSectionPageBreak,
cont-section-pagebreak.rtf)
CPPUNIT_ASSERT_EQUAL(OUString(THIRD), xParaThird-getString());
CPPUNIT_ASSERT_EQUAL(style::BreakType_NONE,
getPropertystyle::BreakType(xParaThird,
BreakType));
-CPPUNIT_ASSERT_EQUAL(OUString(),
- getPropertyOUString(xParaThird, PageDescName));
+CPPUNIT_ASSERT_EQUAL(uno::Any(),
+
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Joel Madero jmadero@gmail.com changed: What|Removed |Added Depends on||68604 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 --- Comment #218 from Joel Madero jmadero@gmail.com --- Added bug 68604 - data loss for comments with .docx -- 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: examples to manage docs using LibreOffice as a major component
On Tue, 2014-09-30 at 14:57 -0400, nicholas ferguson wrote: I didn't understand your answer. I think you said you would not give me the samples of turning a cppunit test into a standalone executable All the code is there in public, in front of you; I've given you pointers into it too for the bits you want. And that first you want to see some contributions from me, to the LibreOffice code base patches... My concern is investing a ton of time doing work for you on a corner case that will not result in any improvement for the project =) Phrase that as you like. If I missunderstood your things... can you then tar up an example and send it to me. If you look at the several code pointers in my previous mails, and compare those paths with the files in the master source code tree, you'll have the best I have. There is no magic repository of closed code anywhere here; no-one (that I know of) has done this before - apart from the several examples that live in-build-tree or in-install, as explained. All the best, 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: Branch 'libreoffice-4-2' - oox/source sw/qa
oox/source/drawingml/diagram/diagramlayoutatoms.cxx | 10 +-
sw/qa/core/data/ooxml/pass/fdo79129.docx|binary
2 files changed, 9 insertions(+), 1 deletion(-)
New commits:
commit f5c7ce25cec1a01a1f154c180d46fc97b32a2105
Author: Caolán McNamara caol...@redhat.com
Date: Tue Sep 30 10:43:37 2014 +0100
Resolves: fdo#79129 Crash in oox::drawingml::LayoutNode::setupShape
Change-Id: I0bafd2c43d29806eea0ff0cb165e67aece53488f
(cherry picked from commit c84ce79132c674b4c2d31da8997ed77671323dfe)
Reviewed-on: https://gerrit.libreoffice.org/11727
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index 2953660..2a196d5 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -400,7 +400,15 @@ bool LayoutNode::setupShape( const ShapePtr rShape, const
Diagram rDgm, sal_uI
const
DiagramData::StringMap::value_type::second_type::const_iterator
aVecEnd=aNodeName-second.end();
while( aVecIter != aVecEnd )
{
-DiagramData::PointNameMap::const_iterator
aDataNode2=rDgm.getData()-getPointNameMap().find(aVecIter-first);
+DiagramData::PointNameMap rMap =
rDgm.getData()-getPointNameMap();
+DiagramData::PointNameMap::const_iterator aDataNode2 =
rMap.find(aVecIter-first);
+if (aDataNode2 == rMap.end())
+{
+//busted, skip it
+++aVecIter;
+continue;
+}
+
if( aVecIter-second == 0 )
{
// grab shape attr from topmost element(s)
diff --git a/sw/qa/core/data/ooxml/pass/fdo79129.docx
b/sw/qa/core/data/ooxml/pass/fdo79129.docx
new file mode 100644
index 000..46ff0f5
Binary files /dev/null and b/sw/qa/core/data/ooxml/pass/fdo79129.docx differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sw/qa writerfilter/source
sw/qa/core/data/ooxml/pass/fdo73608-1.docx |binary
sw/qa/core/data/ooxml/pass/fdo73608-2.docx |binary
writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 16 ++-
3 files changed, 15 insertions(+), 1 deletion(-)
New commits:
commit efd7c456fffc77a6bb2e85d3d89f98ccd4a0faba
Author: Caolán McNamara caol...@redhat.com
Date: Sun Sep 28 16:47:13 2014 +0100
Related: fdo#73608 don't crash on missing table styles
(cherry picked from commit 5fd7382651d64f77e8ad1d9a5c053f52f3641f9f)
Conflicts:
writerfilter/source/dmapper/DomainMapperTableHandler.cxx
Change-Id: I340b43b7afc4c5c4d6dc8e4ed182279240306540
Resolves: fdo#73608 bail out on loop in style sheet hierarchy
Change-Id: I03975d1ce8eaceceb4d5c263eb11c1521bcd57eb
(cherry picked from commit be18133e84120625734a09380594ee89b23c4322)
Reviewed-on: https://gerrit.libreoffice.org/11680
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com
diff --git a/sw/qa/core/data/ooxml/pass/fdo73608-1.docx
b/sw/qa/core/data/ooxml/pass/fdo73608-1.docx
new file mode 100644
index 000..d3cc84a
Binary files /dev/null and b/sw/qa/core/data/ooxml/pass/fdo73608-1.docx differ
diff --git a/sw/qa/core/data/ooxml/pass/fdo73608-2.docx
b/sw/qa/core/data/ooxml/pass/fdo73608-2.docx
new file mode 100644
index 000..f558878
Binary files /dev/null and b/sw/qa/core/data/ooxml/pass/fdo73608-2.docx differ
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 7b8d9cd..b4002d7 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -116,9 +116,17 @@ void DomainMapperTableHandler::startTable(unsigned int
nRows,
PropertyMapPtr lcl_SearchParentStyleSheetAndMergeProperties(const
StyleSheetEntryPtr pStyleSheet, StyleSheetTablePtr pStyleSheetTable)
{
PropertyMapPtr pRet;
+
+if (!pStyleSheet)
+return pRet;
+
if(!pStyleSheet-sBaseStyleIdentifier.isEmpty())
{
const StyleSheetEntryPtr pParentStyleSheet =
pStyleSheetTable-FindStyleSheetByISTD( pStyleSheet-sBaseStyleIdentifier );
+//a loop in the style hierarchy, bail out
+if (pParentStyleSheet == pStyleSheet)
+return pRet;
+
pRet = lcl_SearchParentStyleSheetAndMergeProperties(
pParentStyleSheet, pStyleSheetTable );
}
else
@@ -126,7 +134,10 @@ PropertyMapPtr
lcl_SearchParentStyleSheetAndMergeProperties(const StyleSheetEntr
pRet.reset( new PropertyMap );
}
-pRet-InsertProps(pStyleSheet-pProperties);
+if (pRet)
+{
+pRet-InsertProps(pStyleSheet-pProperties);
+}
return pRet;
}
@@ -291,6 +302,9 @@ namespace
bool lcl_extractTableBorderProperty(PropertyMapPtr pTableProperties, const
PropertyIds nId, TableInfo rInfo, table::BorderLine2 rLine)
{
+if (!pTableProperties)
+return false;
+
PropertyMap::iterator aTblBorderIter = pTableProperties-find(nId);
if( aTblBorderIter != pTableProperties-end() )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - svx/source sw/qa
svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx |2 +-
sw/qa/core/data/ooxml/pass/fdo79131.docx |binary
2 files changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a2dda857b3d163a42c243566eaef9bc97e933779
Author: Caolán McNamara caol...@redhat.com
Date: Mon Sep 29 20:38:18 2014 +0100
Resolves: fdo#79131 crash in EnhancedCustomShapeTypeNames::Get
Change-Id: Ib21a4a1574119120f09d4ecac73b93a0f2f6739f
(cherry picked from commit 65277f994ae25d930c15aebba0ed19f8de0abba1)
Reviewed-on: https://gerrit.libreoffice.org/11704
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com
diff --git a/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
b/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
index 88115ee..de2db7f 100644
--- a/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
@@ -300,7 +300,7 @@ MSO_SPT EnhancedCustomShapeTypeNames::Get( const OUString
rShapeType )
OUString EnhancedCustomShapeTypeNames::Get( const MSO_SPT eShapeType )
{
-return eShapeType = mso_sptTextBox
+return (eShapeType = mso_sptTextBox eShapeType = mso_sptMin)
? OUString::createFromAscii( pNameTypeTableArray[ eShapeType ].pS )
: OUString();
}
diff --git a/sw/qa/core/data/ooxml/pass/fdo79131.docx
b/sw/qa/core/data/ooxml/pass/fdo79131.docx
new file mode 100644
index 000..5f10d9c
Binary files /dev/null and b/sw/qa/core/data/ooxml/pass/fdo79131.docx differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - oox/source sd/qa
oox/source/drawingml/color.cxx| 30
sd/qa/unit/data/pptx/bnc584721_4.pptx |binary
sd/qa/unit/import-tests.cxx | 41 ++
3 files changed, 61 insertions(+), 10 deletions(-)
New commits:
commit 4fca0fcd7801091d0469525821231dc319a23811
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Tue Sep 30 19:55:50 2014 +0200
bnc#584721: invisible text because of wrong color (white)
Color::getColor() method uses some caching mechanism which
works wrong when the result depend on one of the input parameters.
So avoid caching in these cases.
(cherry picked from commit cfe658c289de030dc3a8fecd3bac0a0004a18061)
Conflicts:
sd/qa/unit/import-tests.cxx
Change-Id: Ifa9221e21e685715454de86d5cec09ff6c266307
Reviewed-on: https://gerrit.libreoffice.org/11723
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com
diff --git a/oox/source/drawingml/color.cxx b/oox/source/drawingml/color.cxx
index 52d5465..ec084cc 100644
--- a/oox/source/drawingml/color.cxx
+++ b/oox/source/drawingml/color.cxx
@@ -342,13 +342,10 @@ void Color::clearTransparence()
sal_Int32 Color::getColor( const GraphicHelper rGraphicHelper, sal_Int32
nPhClr ) const
{
-/* Special handling for theme style list placeholder colors (state
-COLOR_PH), Color::getColor() may be called with different placeholder
-colors in the nPhClr parameter. Therefore, the resolved color will not
-be stored in this object, thus the state COLOR_FINAL will not be
-reached and the transformation container will not be cleared, but the
-original COLOR_PH state will be restored instead. */
-bool bIsPh = false;
+const sal_Int32 nTempC1 = mnC1;
+const sal_Int32 nTempC2 = mnC2;
+const sal_Int32 nTempC3 = mnC3;
+const ColorMode eTempMode = meMode;
switch( meMode )
{
@@ -361,7 +358,7 @@ sal_Int32 Color::getColor( const GraphicHelper
rGraphicHelper, sal_Int32 nPhClr
case COLOR_SCHEME: setResolvedRgb( rGraphicHelper.getSchemeColor(
mnC1 ) );break;
case COLOR_PALETTE: setResolvedRgb( rGraphicHelper.getPaletteColor(
mnC1 ) ); break;
case COLOR_SYSTEM: setResolvedRgb( rGraphicHelper.getSystemColor(
mnC1, mnC2 ) ); break;
-case COLOR_PH: setResolvedRgb( nPhClr ); bIsPh = true;
break;
+case COLOR_PH: setResolvedRgb( nPhClr );
break;
case COLOR_FINAL: return mnC1;
}
@@ -497,10 +494,23 @@ sal_Int32 Color::getColor( const GraphicHelper
rGraphicHelper, sal_Int32 nPhClr
mnC1 = API_RGB_TRANSPARENT;
}
-meMode = bIsPh ? COLOR_PH : COLOR_FINAL;
+sal_Int32 nRet = mnC1;
+// Restore the original values when the color depends on one of the input
+// parameters (rGraphicHelper or nPhClr)
+if( eTempMode = COLOR_SCHEME eTempMode = COLOR_PH )
+{
+mnC1 = nTempC1;
+mnC2 = nTempC2;
+mnC3 = nTempC3;
+meMode = eTempMode;
+}
+else
+{
+meMode = COLOR_FINAL;
+}
if( meMode == COLOR_FINAL )
maTransforms.clear();
-return mnC1;
+return nRet;
}
bool Color::hasTransparency() const
diff --git a/sd/qa/unit/data/pptx/bnc584721_4.pptx
b/sd/qa/unit/data/pptx/bnc584721_4.pptx
new file mode 100644
index 000..102ee0b
Binary files /dev/null and b/sd/qa/unit/data/pptx/bnc584721_4.pptx differ
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index d931c10..df848de 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -69,6 +69,7 @@ public:
void testBnc862510_5();
void testBnc480256();
void testCreationDate();
+void testBnc584721_4();
CPPUNIT_TEST_SUITE(SdFiltersTest);
CPPUNIT_TEST(testDocumentLayout);
@@ -87,6 +88,7 @@ public:
CPPUNIT_TEST(testBnc862510_5);
CPPUNIT_TEST(testBnc480256);
CPPUNIT_TEST(testCreationDate);
+CPPUNIT_TEST(testBnc584721_4);
CPPUNIT_TEST_SUITE_END();
};
@@ -692,6 +694,45 @@ void SdFiltersTest::testBnc480256()
xDocShRef-DoClose();
}
+void SdFiltersTest::testBnc584721_4()
+{
+// Black text was imported as white because of wrong caching mechanism
+
+::sd::DrawDocShellRef xDocShRef =
loadURL(getURLFromSrc(/sd/qa/unit/data/pptx/bnc584721_4.pptx));
+
+uno::Reference drawing::XDrawPagesSupplier xDoc(
+xDocShRef-GetDoc()-getUnoModel(), uno::UNO_QUERY_THROW );
+
+uno::Reference drawing::XDrawPage xPage(
+xDoc-getDrawPages()-getByIndex(1), uno::UNO_QUERY_THROW );
+
+uno::Reference beans::XPropertySet xShape(
+xPage-getByIndex(1), uno::UNO_QUERY );
+CPPUNIT_ASSERT_MESSAGE( no text shape, xShape.is() );
+
+// Get first paragraph of the text
+uno::Referencetext::XText xText =
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - writerfilter/source
writerfilter/source/dmapper/DomainMapper_Impl.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6286b0dd97a330624d63d7be2b3efa43711984d0
Author: Caolán McNamara caol...@redhat.com
Date: Sat Sep 27 20:38:24 2014 +0100
Resolves: fdo#79130 Crash in DomainMapper_Impl::CloseFieldCommand
Change-Id: Ia59e0c79ec7f2066891b78657559f41eaeb80a09
(cherry picked from commit a392a1deb0bb55f39f0232f9b3df8ad9ac9062af)
Reviewed-on: https://gerrit.libreoffice.org/11666
Reviewed-by: Andras Timar andras.ti...@collabora.com
Tested-by: Andras Timar andras.ti...@collabora.com
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 3b55e86..87b0241 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -3062,7 +3062,7 @@ void DomainMapper_Impl::CloseFieldCommand()
dmapper_logger-element(closeFieldCommand);
#endif
-FieldContextPtr pContext = m_aFieldStack.top();
+FieldContextPtr pContext = m_aFieldStack.empty() ? NULL :
m_aFieldStack.top();
OSL_ENSURE( pContext.get(), no field context available);
if( pContext.get() )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
RE: examples to manage docs using LibreOffice as a major component
Most open source code repositories, would upload to a github, samples. Here with you...you tell me well this is how lots of folks went about before you, Nicholas, to discover how to do this...good luck...and have a good time. They were skilled programmers and understood how to tackle the ocotpus of LibreOffice. And by the way, I can tell you that I also did. So it can be done, and I won't send you samples, because you would ask me questions, and what the heck, I have to make monies. And oh. I feel your pain. -Original Message- From: Michael Meeks [mailto:michael.me...@collabora.com] Sent: Tuesday, September 30, 2014 4:24 PM To: nicholas ferguson Cc: 'libreoffice-dev'; 'Tor Lillqvist' Subject: Re: examples to manage docs using LibreOffice as a major component On Tue, 2014-09-30 at 14:57 -0400, nicholas ferguson wrote: I didn't understand your answer. I think you said you would not give me the samples of turning a cppunit test into a standalone executable All the code is there in public, in front of you; I've given you pointers into it too for the bits you want. And that first you want to see some contributions from me, to the LibreOffice code base patches... My concern is investing a ton of time doing work for you on a corner case that will not result in any improvement for the project =) Phrase that as you like. If I missunderstood your things... can you then tar up an example and send it to me. If you look at the several code pointers in my previous mails, and compare those paths with the files in the master source code tree, you'll have the best I have. There is no magic repository of closed code anywhere here; no-one (that I know of) has done this before - apart from the several examples that live in-build-tree or in-install, as explained. All the best, Michael. -- michael.me...@collabora.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
