LibreOffice Gerrit News for submodules on 2014-08-05
Moin! ~~ Project dictionaries ~~ Nothing moved in the project for the last 25 hours ~~ Project translations ~~ Nothing moved in the project for the last 25 hours ~~ Project help ~~ * Open changes on master for project help changed in the last 25 hours: None * Merged changes on master for project help changed in the last 25 hours: + Partial fix for fdo#80338: help for calc statistics in https://gerrit.libreoffice.org/10703 from Olivier Hallot * Abandoned changes on master for project help 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-08-05
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + fdo#70625 Add --cat parameter to make git diffs pretty in https://gerrit.libreoffice.org/10623 from Deena P. F. about module desktop End of freshness + Fix java check on 64 bit kernel / 32 bit user in https://gerrit.libreoffice.org/10743 from Riccardo Magliocchetti about module build + fdo#81552 Fail nicely if avahi doesn't let libreoffice publish items in https://gerrit.libreoffice.org/10735 from Bryan Quigley about module sd + fdo#75757: remove inheritance to std::vector in https://gerrit.libreoffice.org/10729 from Takeshi Abe about module include, xmloff * Merged changes on master for project core changed in the last 25 hours: + Convert RID_SCDLG_DPSHOWDETAIL to .ui in https://gerrit.libreoffice.org/10739 from Mihály Palenik + prevent memory leak in https://gerrit.libreoffice.org/10716 from Markus Mohrhard + Delete RID_XMLSECTP_MACROWARN dialog in https://gerrit.libreoffice.org/10718 from Mihály Palenik + avoid buffer overflow by using wrong buffer in https://gerrit.libreoffice.org/10717 from Markus Mohrhard + Convert DLG_PARAMETERS to .ui in https://gerrit.libreoffice.org/10725 from Mihály Palenik + fdo#75757: remove inheritance to std::vector in https://gerrit.libreoffice.org/10719 from Takeshi Abe + Convert RID_DLG_DEPENDENCIES to .ui in https://gerrit.libreoffice.org/10712 from Mihály Palenik + Convert RID_SVXDLG_ASSIGNCOMPONENT to .ui in https://gerrit.libreoffice.org/10710 from Mihály Palenik + PAGE_MYSQL_NATIVE and PAGE_DBWIZARD_MYSQL_NATIVE conversion to .ui in https://gerrit.libreoffice.org/10706 from Szymon Kłos + fdo#78301 : Size of word-arts change during import. in https://gerrit.libreoffice.org/10486 from Umesh Kadam * Abandoned changes on master for project core changed in the last 25 hours: + Remove Mozilla browser plugin option in https://gerrit.libreoffice.org/10678 from Bryan Quigley + Remove the ability to Insert Plugins from the UI in https://gerrit.libreoffice.org/10680 from Bryan Quigley + Some missed makefiles in https://gerrit.libreoffice.org/10679 from Bryan Quigley + fdo#45071 - Remove NPAPI support in https://gerrit.libreoffice.org/9644 from Bryan Quigley * Open changes needing tweaks, but being untouched for more than a week: + Rel fdo#48068: fix errors when 2 decimals in svg path position in https://gerrit.libreoffice.org/10544 from Joren De Cuyper + fdo#80996:Fix for DataLabel not preserved for ColumnChart after RT in https://gerrit.libreoffice.org/10169 from Dushyant Bhalgami + VS2013: Make 64 bit shell extensions optional in https://gerrit.libreoffice.org/10163 from David Ostrovsky + fdo#57950 Replace chained append( with operator+) in https://gerrit.libreoffice.org/10149 from Petr Vorel + fdo#79018: LO hangs while opening file. in https://gerrit.libreoffice.org/9564 from Yogesh Bharate + Use assert instead of OSL_ASSERT in sal/ in https://gerrit.libreoffice.org/10113 from Arnaud Versini + move OpenGLContext to SAL in https://gerrit.libreoffice.org/9429 from David Tardon + Changes for Wordml in https://gerrit.libreoffice.org/9013 from Michel Messak + fdo#64945 Remove inconvenient localized symbol code. in https://gerrit.libreoffice.org/8696 from Darshana Padmadas + fdo#77716 : Paragraph spacing is not preserved after RT. in https://gerrit.libreoffice.org/9197 from Tushar Bende + fdo#77121 Header / Footer positions not preserved after RT in https://gerrit.libreoffice.org/9235 from Priyanka Gaikwad 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
Re: LO 4.3 Base - problems with sub forms
After I wrote the note I too realised that my application had a form that had a sub form with a sub form. I raised Bug 82151 for this and attached a very cut down version of my application that should demonstrate the problem. Alex On Monday 04 Aug 2014 14:41:26 elderdanlewis wrote: The problem is Base in 4.3.0.4. I have a form that has a subfom with a subfom. As you notice, 4.2.6.2 does not have this problem. I will be filing bug reports later late today. Dan Original message From: Alex McMurchy mcmurchy1917-libreoff...@yahoo.co.uk Date:08/04/2014 4:12 AM (GMT-05:00) To: libreoffice@lists.freedesktop.org Subject: LO 4.3 Base - problems with sub forms Since and including LO 4.3 I've started having problems with sub forms I have two tables Subscribers and Payments which are linked on Subscriber_ID. I have a form Data_Entry the main details of the form contains the data for one particular Subscriber from the Subscribers table. The form also has a sub form that contains the payment details for that subscriber linked on Subscriber_Id. Upto and including LO 4.2.4 this has worked flawlessly for the past 15 months. Load the form and see the last viewed subscriber details with matching payment details - Correct. Select a different subscriber from a drop down box, the contents of main form changes to reflect the new subscriber and the contents of the sub form changes to the new subscribers payment details - Correct. Since 4.3 what I get is this - Load the form and see the last viewed subscriber details with matching payment details - Correct. Select a different subscriber from a drop down box, the contents of main form changes to reflect the new subscriber. The contents of the sub form doesn't change it still reflects the payments from the previous subscriber - Wrong. Restart LO. Load the form and see the last viewed subscriber details with matching payment details - Correct. Select a different subscriber from a drop down box, the contents of main form changes to reflect the new subscriber. The contents of the sub form doesn't change it still reflects the payments from the previous subscriber - Wrong. So the work around is to select a new subscriber, see the wrong payment details. Close LO. Start LO and load the form and see the correct payment details - bizarre. I've had a quick search in bugzilla but found nothing. Will have another search later today and if I don't find anything will raise a bug report with the above detail. Then flesh it out with the steps to take to replicate the bug. In the meantime has anyone seen this or any thoughts on the matter. Alex ___ 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: cui/source filter/source include/svx sc/source sd/source svx/sdi svx/source sw/source
cui/source/tabpages/tpshadow.cxx|6 +++---
filter/source/msfilter/msdffimp.cxx |2 +-
include/svx/sdshitm.hxx | 11 +++
sc/source/core/data/postit.cxx |4 ++--
sc/source/core/tool/detfunc.cxx |2 +-
sc/source/filter/excel/xiescher.cxx |2 +-
sd/source/core/drawdoc4.cxx |8
sd/source/core/stlpool.cxx |2 +-
svx/sdi/svx.sdi |2 +-
svx/sdi/svxitems.sdi|2 +-
svx/source/customshapes/EnhancedCustomShape2d.cxx |6 +++---
svx/source/customshapes/EnhancedCustomShapeFontWork.cxx |2 +-
svx/source/engine3d/float3d.cxx |2 +-
svx/source/sdr/primitive2d/sdrattributecreator.cxx |2 +-
svx/source/svdraw/svdattr.cxx |2 +-
svx/source/svdraw/svdedtv2.cxx |4 ++--
svx/source/svdraw/svdibrow.cxx |2 +-
svx/source/svdraw/svdoashp.cxx | 10 +-
svx/source/svdraw/svdotext.cxx |4 ++--
svx/source/svdraw/svdotxtr.cxx |2 +-
sw/source/filter/ww8/ww8graf.cxx|4 ++--
21 files changed, 38 insertions(+), 43 deletions(-)
New commits:
commit 8d023edc181e040e290c0e42aa71191f567de8fe
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Aug 5 08:59:37 2014 +0200
Consistency around SdrOnOffItem in svx/sdshitm.hxx
...similar to what has been done for svx/sdtmfitm.hxx in
6a2ea81ca1622d2c2ad55bea8ddc28167fcc2794 Remove unused ctors and
68969cc61adecac481ae9656978ef952f435b310 Consistency around SdrMetricItem.
Change-Id: Id712c222034ef807ea2d7bc459e78882e948aca6
diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx
index d1dfe22..13dc142 100644
--- a/cui/source/tabpages/tpshadow.cxx
+++ b/cui/source/tabpages/tpshadow.cxx
@@ -255,9 +255,9 @@ bool SvxShadowTabPage::FillItemSet( SfxItemSet* rAttrs )
TriState eState = m_pTsbShowShadow-GetState();
if( m_pTsbShowShadow-IsValueChangedFromSaved() )
{
-SdrShadowItem aItem( sal::static_int_cast sal_Bool ( eState ) );
+SdrOnOffItem aItem( makeSdrShadowItem(sal::static_int_cast
sal_Bool ( eState )) );
pOld = GetOldItem( *rAttrs, SDRATTR_SHADOW );
-if ( !pOld || !( *(const SdrShadowItem*)pOld == aItem ) )
+if ( !pOld || !( *(const SdrOnOffItem*)pOld == aItem ) )
{
rAttrs-Put( aItem );
bModified = true;
@@ -366,7 +366,7 @@ void SvxShadowTabPage::Reset( const SfxItemSet* rAttrs )
{
m_pTsbShowShadow-EnableTriState( false );
-if( ( ( const SdrShadowItem ) rAttrs-Get( SDRATTR_SHADOW )
).GetValue() )
+if( ( ( const SdrOnOffItem ) rAttrs-Get( SDRATTR_SHADOW )
).GetValue() )
m_pTsbShowShadow-SetState( TRISTATE_TRUE );
else
{
diff --git a/filter/source/msfilter/msdffimp.cxx
b/filter/source/msfilter/msdffimp.cxx
index 73a73d7..f3105e7 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -2628,7 +2628,7 @@ void DffPropertyReader::ApplyAttributes( SvStream rIn,
SfxItemSet rSet, DffObj
}
if ( bHasShadow )
-rSet.Put( SdrShadowItem( bHasShadow ) );
+rSet.Put( makeSdrShadowItem( bHasShadow ) );
}
ApplyLineAttributes( rSet, rObjData.eShapeType ); // #i28269#
ApplyFillAttributes( rIn, rSet, rObjData );
diff --git a/include/svx/sdshitm.hxx b/include/svx/sdshitm.hxx
index 7613870..ab8a2b8 100644
--- a/include/svx/sdshitm.hxx
+++ b/include/svx/sdshitm.hxx
@@ -22,14 +22,9 @@
#include svx/sdooitm.hxx
#include svx/svddef.hxx
-/*
- * class SdrShadowItem
- */
-class SdrShadowItem: public SdrOnOffItem {
-public:
-SdrShadowItem(bool bShadow=false): SdrOnOffItem(SDRATTR_SHADOW, bShadow) {}
-SdrShadowItem(SvStream rIn): SdrOnOffItem(SDRATTR_SHADOW, rIn) {}
-};
+inline SdrOnOffItem makeSdrShadowItem(bool bShadow) {
+return SdrOnOffItem(SDRATTR_SHADOW, bShadow);
+}
#endif
diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx
index 673640f..433138d 100644
--- a/sc/source/core/data/postit.cxx
+++ b/sc/source/core/data/postit.cxx
@@ -123,7 +123,7 @@ void ScCaptionUtil::SetDefaultItems( SdrCaptionObj
rCaption, ScDocument rDoc )
/* SdrShadowItem has sal_False, instead the shadow is set for the
rectangle only with SetSpecialTextBoxShadow() when the object is
created (item must be set to adjust objects from older files). */
-aItemSet.Put( SdrShadowItem( false ) );
+aItemSet.Put(
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 Adolfo Jayme f...@libreoffice.org changed: What|Removed |Added Depends on||80755 --- Comment #54 from Adolfo Jayme f...@libreoffice.org --- Nominating bug 80755: “StartCenter displays thumbnails of password-protected files”. Duplicates of it just keep popping up. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - writerfilter/source
writerfilter/source/dmapper/StyleSheetTable.cxx | 18 +-
1 file changed, 1 insertion(+), 17 deletions(-)
New commits:
commit b3b4f0da07710ecfef6ee06345280fb6b77dc781
Author: Michael Stahl mst...@redhat.com
Date: Mon Aug 4 17:00:50 2014 +0200
fdo#81993: Revert Resolves: #i119464# Update default alignment ...
... value for docx [Sub]Title
This reverts commit acc671ec74c874ffd22803bb2ee54a1f2c027155.
The commit is clearly unnecessary:
1) commit 3f9e7e72c53ecbe8ee1ab060f811cb41eadfc7e1
appears to be a better fix for alignment
2) commit b95d203bc17c83ec0fe5139f519d53ed1d842d3a
should have disabled the Center default in Writer already
Change-Id: Ib0cc60af037f12be0a1ab94ab32c743f7fca2b1d
(cherry picked from commit d4b96b45727314585d02394bb5a084393b647729)
Reviewed-on: https://gerrit.libreoffice.org/10733
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx
b/writerfilter/source/dmapper/StyleSheetTable.cxx
index ed5ecbe..9e76b14 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -1085,23 +1085,7 @@ void StyleSheetTable::ApplyStyleSheets( FontTablePtr
rFontTable )
xState-setPropertyToDefault(rPropNameSupplier.GetName( PROP_CHAR_PROP_HEIGHT
));
xState-setPropertyToDefault(rPropNameSupplier.GetName(
PROP_CHAR_PROP_HEIGHT_ASIAN ));
xState-setPropertyToDefault(rPropNameSupplier.GetName(
PROP_CHAR_PROP_HEIGHT_COMPLEX));
-}
-else if (sConvertedStyleName == Title ||
sConvertedStyleName == Subtitle)
-{
-//set the default adjust for ParaStyle Title and
Subtitle to left
-try
-{
-uno::Reference beans::XPropertySet xProp(
xStyle, uno::UNO_QUERY );
-if( xProp.is() )
-{
-uno::Any aMSDefaultVal = uno::makeAny(
(sal_Int16)style::ParagraphAdjust_LEFT );
-xProp-setPropertyValue(
rPropNameSupplier.GetName( PROP_PARA_ADJUST), aMSDefaultVal );
-}
-}
-catch(...)
-{
-OSL_ENSURE( false, Default ParaAdjust style
property could not be set);
-}
+
}
}
___
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' - writerfilter/source
writerfilter/source/dmapper/StyleSheetTable.cxx | 18 +-
1 file changed, 1 insertion(+), 17 deletions(-)
New commits:
commit 11ad475ec81353ddf87834e22e2db02c23d172d7
Author: Michael Stahl mst...@redhat.com
Date: Mon Aug 4 17:00:50 2014 +0200
fdo#81993: Revert Resolves: #i119464# Update default alignment ...
... value for docx [Sub]Title
This reverts commit acc671ec74c874ffd22803bb2ee54a1f2c027155.
The commit is clearly unnecessary:
1) commit 3f9e7e72c53ecbe8ee1ab060f811cb41eadfc7e1
appears to be a better fix for alignment
2) commit b95d203bc17c83ec0fe5139f519d53ed1d842d3a
should have disabled the Center default in Writer already
Change-Id: Ib0cc60af037f12be0a1ab94ab32c743f7fca2b1d
(cherry picked from commit d4b96b45727314585d02394bb5a084393b647729)
Reviewed-on: https://gerrit.libreoffice.org/10734
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx
b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 329cc63..2f48513 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -1118,23 +1118,7 @@ void StyleSheetTable::ApplyStyleSheets( FontTablePtr
rFontTable )
xState-setPropertyToDefault(rPropNameSupplier.GetName( PROP_CHAR_PROP_HEIGHT
));
xState-setPropertyToDefault(rPropNameSupplier.GetName(
PROP_CHAR_PROP_HEIGHT_ASIAN ));
xState-setPropertyToDefault(rPropNameSupplier.GetName(
PROP_CHAR_PROP_HEIGHT_COMPLEX));
-}
-else if (sConvertedStyleName == Title ||
sConvertedStyleName == Subtitle)
-{
-//set the default adjust for ParaStyle Title and
Subtitle to left
-try
-{
-uno::Reference beans::XPropertySet xProp(
xStyle, uno::UNO_QUERY );
-if( xProp.is() )
-{
-uno::Any aMSDefaultVal = uno::makeAny(
(sal_Int16)style::ParagraphAdjust_LEFT );
-xProp-setPropertyValue(
rPropNameSupplier.GetName( PROP_PARA_ADJUST), aMSDefaultVal );
-}
-}
-catch(...)
-{
-OSL_ENSURE( false, Default ParaAdjust style
property could not be set);
-}
+
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-commits] core.git: 7 commits - chart2/source extensions/source hwpfilter/source l10ntools/source sal/osl unoidl/source
On 08/04/2014 11:47 PM, Norbert Thiebaud wrote:
On Mon, Aug 4, 2014 at 8:38 PM, Michael Stahl mst...@redhat.com wrote:
a rule such as if the condition is a single line, put the brace on the
same line, if it is multiple lines, put the brace on a separate line
can still be called consistent :)
I guess.. but the point of a formatting rule is easy to read and above
all _visually consistent_.
There is apparently debate about the readability of the different
braces scheme.. but surely there can't be any argument that a mix of
both is the worse of both world.
I must confess that I happily live by that rule, as it IMO separates the
individual parts without introducing too much visual clutter,
if (cc) {
b
bbb
}
if (cc
ccc
c)
{
b
bbb
}
I agree that this involves a certain degree of subtlety, but that is IMO
not much different from how much subtlety needs to go into traditional
typography, for the benefit of the reader.
Anyway, somehow any discussion about formatting quickly diverts into
bikeshedding (this is /so/ lucid! no it isn't! yes it is!). So
all I would like to repeat is my humble plea to refrain from
reformatting commits, for the sake of a less cluttered git history.
Stephan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/source
vcl/source/fontsubset/cff.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3b38a2342e48a2aec3c2e4f5aebf883db4b84101 Author: Audrey Tang audr...@audreyt.org Date: Tue Aug 5 09:56:53 2014 +0200 fdo#81516 Support fonts like Source Han Sans with 16 FDArray elements Change-Id: I3f82574f434060d62dc3faeb730341c5b169ce9f diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx index 5730fcc..2ce3286 100644 --- a/vcl/source/fontsubset/cff.cxx +++ b/vcl/source/fontsubset/cff.cxx @@ -360,7 +360,7 @@ private: const char**mpCharStringOps; const char**mpCharStringEscs; -CffLocalmaCffLocal[16]; +CffLocalmaCffLocal[256]; CffLocal* mpCffLocal; voidreadDictOp( void); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: avmedia/source download.lst
avmedia/source/opengl/oglframegrabber.cxx |1
avmedia/source/opengl/oglframegrabber.hxx |4 -
avmedia/source/opengl/oglplayer.cxx | 75 +-
avmedia/source/opengl/oglplayer.hxx |8 ++-
avmedia/source/opengl/oglwindow.cxx |4 -
avmedia/source/opengl/oglwindow.hxx |4 -
download.lst |3 -
7 files changed, 49 insertions(+), 50 deletions(-)
New commits:
commit 48d1f860716720abdd7febdad4b57b9f31a6a1dc
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Tue Aug 5 09:54:05 2014 +0200
Upload first official libgltf release: libgltf-0.0.0
News relative to previous draft version:
- Memory management improvements (fdo#81180)
- Reduced OpenGL requirements (version 3.3 - version 3.0)
- Cleaned up API
Change-Id: Ie3caf8684a9f5e6a872a1ac35beafb94df03bcf5
Reviewed-on: https://gerrit.libreoffice.org/10744
Reviewed-by: Zolnai Tamás zolnaitamas2...@gmail.com
Tested-by: Zolnai Tamás zolnaitamas2...@gmail.com
diff --git a/avmedia/source/opengl/oglframegrabber.cxx
b/avmedia/source/opengl/oglframegrabber.cxx
index 2f76436..23e97f1 100644
--- a/avmedia/source/opengl/oglframegrabber.cxx
+++ b/avmedia/source/opengl/oglframegrabber.cxx
@@ -20,6 +20,7 @@
#include boost/scoped_array.hpp
using namespace com::sun::star;
+using namespace libgltf;
namespace avmedia { namespace ogl {
diff --git a/avmedia/source/opengl/oglframegrabber.hxx
b/avmedia/source/opengl/oglframegrabber.hxx
index b6cc0e8..5beb15b 100644
--- a/avmedia/source/opengl/oglframegrabber.hxx
+++ b/avmedia/source/opengl/oglframegrabber.hxx
@@ -25,7 +25,7 @@ class OGLFrameGrabber : public FrameGrabber_BASE
{
public:
-OGLFrameGrabber( glTFHandle rHandle );
+OGLFrameGrabber( libgltf::glTFHandle rHandle );
virtual ~OGLFrameGrabber();
// XFrameGrabber
@@ -37,7 +37,7 @@ public:
virtual com::sun::star::uno::Sequence OUString SAL_CALL
getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException,
std::exception) SAL_OVERRIDE;
private:
-glTFHandle m_rHandle;
+libgltf::glTFHandle m_rHandle;
};
} // namespace ogl
diff --git a/avmedia/source/opengl/oglplayer.cxx
b/avmedia/source/opengl/oglplayer.cxx
index 89ac3b1..431bdb8 100644
--- a/avmedia/source/opengl/oglplayer.cxx
+++ b/avmedia/source/opengl/oglplayer.cxx
@@ -21,6 +21,7 @@
#include cassert
using namespace com::sun::star;
+using namespace libgltf;
namespace avmedia { namespace ogl {
@@ -37,16 +38,10 @@ OGLPlayer::~OGLPlayer()
osl::MutexGuard aGuard(m_aMutex);
if( m_pHandle )
{
-for (size_t i = 0; i m_pHandle-size m_pHandle-files[i].buffer;
++i)
-{
-if (m_pHandle-files[i].type != GLTF_JSON)
-{
-delete [] m_pHandle-files[i].buffer;
-}
-}
m_aContext.makeCurrent();
gltf_renderer_release(m_pHandle);
}
+releaseInputFiles();
}
static bool lcl_LoadFile( glTFFile* io_pFile, const OUString rURL)
@@ -72,35 +67,27 @@ bool OGLPlayer::create( const OUString rURL )
m_sURL = rURL;
-// Load *.json file and init renderer
-glTFFile aJsonFile;
-aJsonFile.type = GLTF_JSON;
-OString sFileName =
OUStringToOString(INetURLObject(m_sURL).GetLastName(),RTL_TEXTENCODING_UTF8);
-aJsonFile.filename = (char*)sFileName.getStr();
-if( !lcl_LoadFile(aJsonFile, m_sURL) )
-{
-SAL_WARN(avmedia.opengl, Can't load *.json file: + sFileName);
-return false;
-}
-
-m_pHandle = gltf_renderer_init(aJsonFile);
+// Convert URL to a system path
+const INetURLObject aURLObj(m_sURL);
+const std::string sFilePath = OUStringToOString(
aURLObj.getFSysPath(INetURLObject::FSYS_DETECT), RTL_TEXTENCODING_UTF8
).getStr();
-delete [] aJsonFile.buffer;
+// Load *.json file and init renderer
+m_pHandle = gltf_renderer_init(sFilePath, m_vInputFiles);
-if( !m_pHandle || !m_pHandle-files )
+if( !m_pHandle )
{
SAL_WARN(avmedia.opengl, gltf_renderer_init returned an invalid
glTFHandle);
return false;
}
// Load external resources
-for( size_t i = 0; i m_pHandle-size; ++i )
+for( size_t i = 0; i m_vInputFiles.size(); ++i )
{
-glTFFile rFile = m_pHandle-files[i];
-if( rFile.filename )
+glTFFile rFile = m_vInputFiles[i];
+if( !rFile.filename.empty() )
{
const OUString sFilesURL =
-
INetURLObject::GetAbsURL(m_sURL,OStringToOUString(OString(rFile.filename),RTL_TEXTENCODING_UTF8));
+
INetURLObject::GetAbsURL(m_sURL,OStringToOUString(OString(rFile.filename.c_str()),RTL_TEXTENCODING_UTF8));
if( rFile.type == GLTF_IMAGE )
{
// Load images as bitmaps
@@ -139,6 +126,16 @@ bool OGLPlayer::create( const OUString rURL )
return true;
}
+void
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - vcl/source
vcl/source/fontsubset/cff.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit bff075cbe1b969361a891d43ae24a648aa429373 Author: Audrey Tang audr...@audreyt.org Date: Tue Aug 5 09:56:53 2014 +0200 fdo#81516 Support fonts like Source Han Sans with 16 FDArray elements Change-Id: I3f82574f434060d62dc3faeb730341c5b169ce9f (cherry picked from commit 3b38a2342e48a2aec3c2e4f5aebf883db4b84101) Reviewed-on: https://gerrit.libreoffice.org/10745 Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx index 2d3ce61..0b40ff5 100644 --- a/vcl/source/fontsubset/cff.cxx +++ b/vcl/source/fontsubset/cff.cxx @@ -360,7 +360,7 @@ private: const char**mpCharStringOps; const char**mpCharStringEscs; -CffLocalmaCffLocal[16]; +CffLocalmaCffLocal[256]; CffLocal* mpCffLocal; voidreadDictOp( void); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - vcl/source
vcl/source/fontsubset/cff.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c1a53308423ebf45c7209ca1359b205b6f0ac236 Author: Audrey Tang audr...@audreyt.org Date: Tue Aug 5 09:56:53 2014 +0200 fdo#81516 Support fonts like Source Han Sans with 16 FDArray elements Change-Id: I3f82574f434060d62dc3faeb730341c5b169ce9f (cherry picked from commit 3b38a2342e48a2aec3c2e4f5aebf883db4b84101) Reviewed-on: https://gerrit.libreoffice.org/10746 Reviewed-by: David Tardon dtar...@redhat.com Tested-by: David Tardon dtar...@redhat.com diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx index e2241a1..35b6679 100644 --- a/vcl/source/fontsubset/cff.cxx +++ b/vcl/source/fontsubset/cff.cxx @@ -405,7 +405,7 @@ private: const char**mpCharStringOps; const char**mpCharStringEscs; -CffLocalmaCffLocal[16]; +CffLocalmaCffLocal[256]; CffLocal* mpCffLocal; voidreadDictOp( void); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/xmloff xmloff/source
include/xmloff/xmlnumi.hxx |3 ++-
xmloff/source/style/xmlnumi.cxx |2 --
2 files changed, 2 insertions(+), 3 deletions(-)
New commits:
commit a9bae49661f817236f0aa168dd2f054b6bca0b2b
Author: Takeshi Abe t...@fixedpoint.jp
Date: Mon Aug 4 23:00:17 2014 +0900
fdo#75757: remove inheritance to std::vector
Typedef'ing SvxXMLListStyle_Impl is enough.
Change-Id: I281766822aea60794510c959581f0b821aea6642
Reviewed-on: https://gerrit.libreoffice.org/10729
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/include/xmloff/xmlnumi.hxx b/include/xmloff/xmlnumi.hxx
index 86b9726..304fadd 100644
--- a/include/xmloff/xmlnumi.hxx
+++ b/include/xmloff/xmlnumi.hxx
@@ -27,7 +27,8 @@
namespace com { namespace sun { namespace star { namespace frame { class
XModel; } } } }
class SvI18NMap;
-class SvxXMLListStyle_Impl;
+class SvxXMLListLevelStyleContext_Impl;
+typedef std::vectorSvxXMLListLevelStyleContext_Impl * SvxXMLListStyle_Impl;
class SvxXMLListStyleContext : public SvXMLStyleContext
{
diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx
index 917b6f4..41e51d8 100644
--- a/xmloff/source/style/xmlnumi.cxx
+++ b/xmloff/source/style/xmlnumi.cxx
@@ -1006,8 +1006,6 @@
SvxXMLListLevelStyleLabelAlignmentAttrContext_Impl::~SvxXMLListLevelStyleLabelAl
{
}
-class SvxXMLListStyle_Impl : public
std::vectorSvxXMLListLevelStyleContext_Impl * {};
-
void SvxXMLListStyleContext::SetAttribute( sal_uInt16 nPrefixKey,
const OUString rLocalName,
const OUString rValue )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 75757] remove inheritance to std::map and std::vector
https://bugs.freedesktop.org/show_bug.cgi?id=75757 --- Comment #15 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Takeshi Abe committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=a9bae49661f817236f0aa168dd2f054b6bca0b2b fdo#75757: remove inheritance to std::vector 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-3' - sd/source
sd/source/ui/slidesorter/view/SlsLayouter.cxx | 12 ++--
1 file changed, 10 insertions(+), 2 deletions(-)
New commits:
commit 48272a9a720039e79c6a684f1f037811ea42ed0c
Author: Jan Holesovsky ke...@collabora.com
Date: Fri Aug 1 21:10:22 2014 +0200
bnc#862514: Handle corner case in slide sorter correctly.
We should never return -1 when bIncludeBordersAndGaps is true; but that
could
have happened in a corner case:
* export SAL_USE_VCLPLUGIN=gen
* start LibreOffice
* open a presentation with many slides
* resize the window so that it shows the slides _exactly_, no slide is cut
off in the slide sorter
* point the mouse pointer into the left Slides sidebar (slide sorter) so
that it does not cause any mouse-over effect (somehow between the left
border, and the slides - there is space that can do this)
* turn the mouse wheel all the way down so that the last slide is at the
bottom
* turn the mouse wheel up _once_
* turn the mouse wheel down _once_ - it will look like the view does not
change (the last but one is still at the bottom), but you can see the
scrollbar jump to the top
* and now you can again start turning the wheel all the way down to repeat
the procedure :-)
Change-Id: I0253c89513222a1f2eb3263068997d10eea0f130
Reviewed-on: https://gerrit.libreoffice.org/10683
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/sd/source/ui/slidesorter/view/SlsLayouter.cxx
b/sd/source/ui/slidesorter/view/SlsLayouter.cxx
index 48b94ee..2c1f2ab 100644
--- a/sd/source/ui/slidesorter/view/SlsLayouter.cxx
+++ b/sd/source/ui/slidesorter/view/SlsLayouter.cxx
@@ -624,11 +624,15 @@ sal_Int32 Layouter::Implementation::GetRowAtPosition (
// When inside the gap below then nYPosition is not over a page
// object.
if (nDistanceIntoGap 0)
-nRow = ResolvePositionInGap (
+{
+sal_Int32 nResolvedRow = ResolvePositionInGap(
nDistanceIntoGap,
eGapMembership,
nRow,
mnVerticalGap);
+if (!bIncludeBordersAndGaps || nResolvedRow != -1)
+nRow = nResolvedRow;
+}
}
else if (bIncludeBordersAndGaps)
{
@@ -667,11 +671,15 @@ sal_Int32 Layouter::Implementation::GetColumnAtPosition (
// When inside the gap at the right then nXPosition is not over a
// page object.
if (nDistanceIntoGap 0)
-nColumn = ResolvePositionInGap (
+{
+sal_Int32 nResolvedColumn = ResolvePositionInGap(
nDistanceIntoGap,
eGapMembership,
nColumn,
mnHorizontalGap);
+if (!bIncludeBordersAndGaps || nResolvedColumn != -1)
+nColumn = nResolvedColumn;
+}
}
else if (bIncludeBordersAndGaps)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
GSoC Refactor god objects weekly report
This week I refactored IDocumentState and IDocumentStatistics. Another thing to write about: During this GSoC I learned vim. At the start I knew what vim was and had used it minimally before but I mostly chose nano or edited with graphical programs. So I learned about keyboard shortcuts, copy and pasting, registers, selecting text, syntax highlighting, using vim in tabbed mode, ... and I havent stopped learning yet. Valentin ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 10 +
sw/source/filter/ww8/docxattributeoutput.cxx | 47 +++
2 files changed, 57 insertions(+)
New commits:
commit 1b9353bae0e25d460555828ab33c8afe45b75a6d
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Aug 5 10:21:23 2014 +0200
DOCX export: handle all attributes of CT_TblLook
Change-Id: Ibe72d60be302158001fbf6e197f30945fe8fbed9
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 62195cc..d595af3 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -1309,6 +1309,16 @@ DECLARE_OOXMLEXPORT_TEST(testCalendar1, calendar1.docx)
assertXPath(pXmlStyles,
/w:styles/w:style[@w:styleId='Calendar1']/w:tblStylePr[@w:type='firstRow']/w:tcPr/w:vAlign,
val, bottom);
assertXPath(pXmlStyles,
/w:styles/w:style[@w:styleId='Calendar1']/w:tblStylePr[@w:type='lastRow']/w:tcPr/w:tcBorders/w:tr2bl,
val, nil);
assertXPath(pXmlStyles,
/w:styles/w:style[@w:styleId='Calendar1']/w:tblStylePr[@w:type='band2Horz']/w:tcPr/w:tcBorders/w:top,
themeColor, text1);
+
+// w:tblLook element and its attributes were missing.
+xmlDocPtr pXmlDoc = parseExport(word/document.xml);
+assertXPath(pXmlDoc, /w:document/w:body/w:tbl/w:tblPr/w:tblLook,
firstRow, 1);
+assertXPath(pXmlDoc, /w:document/w:body/w:tbl/w:tblPr/w:tblLook,
lastRow, 0);
+assertXPath(pXmlDoc, /w:document/w:body/w:tbl/w:tblPr/w:tblLook,
lastColumn, 0);
+assertXPath(pXmlDoc, /w:document/w:body/w:tbl/w:tblPr/w:tblLook,
firstColumn, 1);
+assertXPath(pXmlDoc, /w:document/w:body/w:tbl/w:tblPr/w:tblLook,
noHBand, 0);
+assertXPath(pXmlDoc, /w:document/w:body/w:tbl/w:tblPr/w:tblLook,
noVBand, 1);
+assertXPath(pXmlDoc, /w:document/w:body/w:tbl/w:tblPr/w:tblLook, val,
04a0);
}
DECLARE_OOXMLEXPORT_TEST(testCalendar2, calendar2.docx)
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index c66a6ea..bf00588 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -2950,6 +2950,21 @@ void DocxAttributeOutput::TableInfoRow(
ww8::WW8TableNodeInfoInner::Pointer_t /*
{
}
+/// Does the same as comphelper::string::padToLength(), but extends the start,
not the end.
+OString lcl_padStartToLength(OString aString, sal_Int32 nLen, sal_Char cFill)
+{
+if (nLen aString.getLength())
+{
+sal_Int32 nDiff = nLen - aString.getLength();
+OStringBuffer aBuffer;
+comphelper::string::padToLength(aBuffer, nDiff, cFill);
+aBuffer.append(aString);
+return aBuffer.makeStringAndClear();
+}
+else
+return aString;
+}
+
void DocxAttributeOutput::TableDefinition(
ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner )
{
bool bEcma = GetExport().GetFilter().getVersion( ) ==
oox::core::ECMA_DIALECT;
@@ -3057,6 +3072,36 @@ void DocxAttributeOutput::TableDefinition(
ww8::WW8TableNodeInfoInner::Pointer_t
m_aTableStyleConf[ BOX_LINE_LEFT ] =
aGrabBagElement-second.gettable::BorderLine2();
else if( aGrabBagElement-first == TableStyleRightBorder )
m_aTableStyleConf[ BOX_LINE_RIGHT ] =
aGrabBagElement-second.gettable::BorderLine2();
+else if (aGrabBagElement-first == TableStyleLook)
+{
+FastAttributeList* pAttributeList =
m_pSerializer-createAttrList();
+uno::Sequencebeans::PropertyValue aAttributeList =
aGrabBagElement-second.get uno::Sequencebeans::PropertyValue ();
+
+for (sal_Int32 i = 0; i aAttributeList.getLength(); ++i)
+{
+if (aAttributeList[i].Name == val)
+pAttributeList-add(FSNS(XML_w, XML_val),
lcl_padStartToLength(OString::number(aAttributeList[i].Value.getsal_Int32(),
16), 4, '0'));
+else
+{
+static DocxStringTokenMap const aTokens[] =
+{
+{firstRow, XML_firstRow},
+{lastRow, XML_lastRow},
+{firstColumn, XML_firstColumn},
+{lastColumn, XML_lastColumn},
+{noHBand, XML_noHBand},
+{noVBand, XML_noVBand},
+{0, 0}
+};
+
+if (sal_Int32 nToken = DocxStringGetToken(aTokens,
aAttributeList[i].Name))
+pAttributeList-add(FSNS(XML_w, nToken),
(aAttributeList[i].Value.getsal_Int32() ? 1 : 0));
+}
+}
+
+XFastAttributeListRef xAttributeList(pAttributeList);
+m_pSerializer-singleElementNS(XML_w, XML_tblLook, xAttributeList);
+}
else if (aGrabBagElement-first == TablePosition )
{
FastAttributeList *attrListTablePos =
[Libreoffice-commits] core.git: desktop/source
desktop/source/deployment/dp_services.cxx |8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
New commits:
commit c55d5ef51a84716c9be69c13349439e552a3ed39
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Aug 5 11:05:34 2014 +0200
Fix *_component_getFactory function type
Change-Id: I354cf9cfa5f1a749b01d16c93dbe7b86784a7d34
diff --git a/desktop/source/deployment/dp_services.cxx
b/desktop/source/deployment/dp_services.cxx
index 9850e41..c38c0a4 100644
--- a/desktop/source/deployment/dp_services.cxx
+++ b/desktop/source/deployment/dp_services.cxx
@@ -73,11 +73,13 @@ extern C {
SAL_DLLPUBLIC_EXPORT void * SAL_CALL deployment_component_getFactory(
sal_Char const * pImplName,
-lang::XMultiServiceFactory * pServiceManager,
-registry::XRegistryKey * pRegistryKey )
+void * pServiceManager,
+void * pRegistryKey )
{
return component_getFactoryHelper(
-pImplName, pServiceManager, pRegistryKey,
+pImplName,
+static_castcss::lang::XMultiServiceFactory *(pServiceManager),
+static_castcss::registry::XRegistryKey *(pRegistryKey),
dp_registry::backend::configuration::serviceDecl,
dp_registry::backend::component::serviceDecl,
dp_registry::backend::help::serviceDecl,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/libgltf
external/libgltf/ExternalProject_libgltf.mk |6 ++ 1 file changed, 6 insertions(+) New commits: commit dabfe7dd025f95862e302b3c4526d382eeba19ea Author: Zolnai Tamás tamas.zol...@collabora.com Date: Tue Aug 5 11:16:58 2014 +0200 libgltf: fix dbgutil build Change-Id: Icc5105d0668d5e4e3eb58bbaed6b2f059c30be99 diff --git a/external/libgltf/ExternalProject_libgltf.mk b/external/libgltf/ExternalProject_libgltf.mk index d68582f..d880c99 100644 --- a/external/libgltf/ExternalProject_libgltf.mk +++ b/external/libgltf/ExternalProject_libgltf.mk @@ -54,8 +54,14 @@ $(call gb_ExternalProject_get_state_target,libgltf,build) : else +libgltf_CPPFLAGS := +ifneq (,$(gb_ENABLE_DBGUTIL)) + libgltf_CPPFLAGS += -D_GLIBCXX_DEBUG +endif + $(call gb_ExternalProject_get_state_target,libgltf,build) : $(call gb_ExternalProject_run,build,\ + CPPFLAGS='$(libgltf_CPPFLAGS)' \ export PKG_CONFIG= \ ./configure \ --disable-shared \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 5 commits - bean/com bean/qa bean/test bridges/source bridges/test chart2/qa comphelper/qa connectivity/qa dbaccess/qa embeddedobj/test extensions/qa extensions/test fi
bean/com/sun/star/beans/LocalOfficeWindow.java |1 bean/com/sun/star/comp/beans/OOoBean.java |4 bean/qa/complex/bean/OOoBeanTest.java | 20 bean/qa/complex/bean/ScreenComparer.java |5 bean/qa/complex/bean/WriterFrame.java |1 bean/test/applet/oooapplet/OOoViewer.java |5 bridges/source/jni_uno/java/com/sun/star/bridges/jni_uno/JNI_proxy.java |2 bridges/test/lib/TestBed.java |4 bridges/test/testclient.java |1 chart2/qa/TestCaseOldAPI.java | 32 comphelper/qa/complex/comphelper/Map.java | 21 comphelper/qa/complex/comphelper/SequenceOutputStreamUnitTest.java | 20 connectivity/qa/complex/connectivity/JdbcLongVarCharTest.java |3 connectivity/qa/connectivity/tools/HsqlDatabase.java |1 dbaccess/qa/complex/dbaccess/Beamer.java |3 dbaccess/qa/complex/dbaccess/PropertyBag.java |2 dbaccess/qa/complex/dbaccess/Query.java |5 dbaccess/qa/complex/dbaccess/TestCase.java |1 embeddedobj/test/Container1/BitmapPainter.java | 22 embeddedobj/test/Container1/PaintThread.java | 30 extensions/qa/complex/extensions/OfficeResourceLoader.java | 15 extensions/qa/integration/extensions/MethodHandler.java |1 extensions/test/pgp/TestPGP.java | 12 filter/qa/complex/filter/detection/typeDetection/TypeDetection.java |1 filter/qa/complex/filter/misc/FinalizedMandatoryTest.java | 14 filter/qa/complex/filter/misc/TypeDetection6FileFormat.java |8 forms/qa/complex/forms/CheckOGroupBoxModel.java |5 forms/qa/integration/forms/ImageComparison.java |1 forms/qa/integration/forms/SingleControlValidation.java |2 framework/qa/complex/ModuleManager/CheckXModuleManager.java | 18 framework/qa/complex/XUserInputInterception/EventTest.java | 31 framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java | 17 framework/qa/complex/api_internal/CheckAPI.java |9 framework/qa/complex/broken_document/LoadDocument.java | 13 framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java | 14 framework/qa/complex/desktop/DesktopTerminate.java | 21 framework/qa/complex/dispatches/checkdispatchapi.java | 30 framework/qa/complex/disposing/GetServiceWhileDisposingOffice.java |8 framework/qa/complex/framework/autosave/AutoSave.java | 15 framework/qa/complex/imageManager/CheckImageManager.java |1 framework/qa/complex/imageManager/_XUIConfiguration.java |1 framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java | 148 framework/qa/complex/loadAllDocuments/InteractionHandler.java |4 framework/qa/complex/loadAllDocuments/StatusIndicator.java | 11 framework/qa/complex/path_settings/PathSettingsTest.java | 236
[Libreoffice-commits] core.git: 2 commits - external/libgltf
external/libgltf/UnpackedTarball_libgltf.mk |1
external/libgltf/pathces/fix_rendering_of_resized_model.patch | 71 --
external/libgltf/pathces/missing_include.patch| 11 +
3 files changed, 12 insertions(+), 71 deletions(-)
New commits:
commit 841d50ec234e71e8e89d0e9135e2002f35fc42fa
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Tue Aug 5 11:47:15 2014 +0200
libgltf: remove obsolete patch
Change-Id: Iec8a026f43cdcf1801f530e6303a9557374c92c7
diff --git a/external/libgltf/pathces/fix_rendering_of_resized_model.patch
b/external/libgltf/pathces/fix_rendering_of_resized_model.patch
deleted file mode 100644
index 57af9f9..000
--- a/external/libgltf/pathces/fix_rendering_of_resized_model.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -ur libgltf.org/src/RenderScene.cpp libgltf/src/RenderScene.cpp
libgltf.org/src/RenderScene.cpp2014-07-15 17:33:12.615059856 +0200
-+++ libgltf/src/RenderScene.cpp2014-07-15 22:24:20.862307666 +0200
-@@ -639,7 +639,7 @@
- , pScene(0)
- , mLoadJson()
- , mBindBufferMap()
--, viewport()
-+, mCurrentViewport()
- , fbo()
- , mEnableTransparency(false)
- , mEnableRotation(false)
-@@ -1555,10 +1555,9 @@
- pFPSCounter-timeStamp();
- }
- #endif
--viewport = *((glTFViewport*)lpParam);
- {
- TRACE_TIME;
--status = initSSAAFrameBuf(viewport);
-+status = initSSAAFrameBuf(((glTFViewport*)lpParam));
- if (LIBGLTF_SUCCESS != status)
- return status;
- }
-@@ -1569,6 +1568,15 @@
- {
- if (0 == pViewport-width)
- return LIBGLTF_INVALID_SIZE;
-+
-+// When viewport changes we need to release fbo and create a new one
-+if( mCurrentViewport.x != pViewport-x || mCurrentViewport.y !=
pViewport-y ||
-+mCurrentViewport.width != pViewport-width || mCurrentViewport.height
!= pViewport-height )
-+{
-+fbo.releaseFbo();
-+mCurrentViewport = *pViewport;
-+}
-+
- #if DEFAULT_VIEW
- unsigned int width = SSAA * DEFAULT_VIEW;
- unsigned int height = (SSAA * DEFAULT_VIEW *
-@@ -1730,14 +1738,14 @@
- #if ENABLE_FPS
- if (0 != pFPSCounter)
- {
--pFPSCounter-printFPS(viewport);
-+pFPSCounter-printFPS(mCurrentViewport);
- }
- #endif
-
- {
- TRACE_TIME;
--glViewport(viewport.x, viewport.y,
-- viewport.width, viewport.height);
-+glViewport(mCurrentViewport.x, mCurrentViewport.y,
-+ mCurrentViewport.width, mCurrentViewport.height);
- glBindFramebuffer(GL_FRAMEBUFFER, 0);
- fbo.renderFboTexture();
- }
-Only in libgltf/src: RenderScene.cpp~
-diff -ur libgltf.org/src/RenderScene.h libgltf/src/RenderScene.h
libgltf.org/src/RenderScene.h 2014-07-15 17:33:12.615059856 +0200
-+++ libgltf/src/RenderScene.h 2014-07-15 22:18:01.306324010 +0200
-@@ -349,7 +349,7 @@
- std::mapstd::string, BindBufferInfo mBindBufferMap;
-
- static ShaderProgram mShaderProgram;
--glTFViewport viewport;
-+glTFViewport mCurrentViewport;
- RenderWithFBO fbo;
-
- bool mEnableTransparency;
commit d085bba9139d882e191b46ee8056d364e7526f88
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Tue Aug 5 11:45:35 2014 +0200
libgltf: missing cstdio include
Change-Id: I69ac77f954434c080a70ae9833ee60a99d7f9eef
diff --git a/external/libgltf/UnpackedTarball_libgltf.mk
b/external/libgltf/UnpackedTarball_libgltf.mk
index 176c1d1..3b27c2a 100644
--- a/external/libgltf/UnpackedTarball_libgltf.mk
+++ b/external/libgltf/UnpackedTarball_libgltf.mk
@@ -16,6 +16,7 @@ $(eval $(call
gb_UnpackedTarball_set_patchflags,libgltf,--binary))
$(eval $(call gb_UnpackedTarball_set_patchlevel,libgltf,1))
$(eval $(call gb_UnpackedTarball_add_patches,libgltf,\
+ external/libgltf/pathces/missing_include.patch \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/libgltf/pathces/missing_include.patch
b/external/libgltf/pathces/missing_include.patch
new file mode 100644
index 000..8b05224
--- /dev/null
+++ b/external/libgltf/pathces/missing_include.patch
@@ -0,0 +1,11 @@
+diff -ur libgltf.org/src/Shaders.cpp libgltf/src/Shaders.cpp
+--- libgltf.org/src/Shaders.cpp2014-08-05 11:40:30.387537876 +0200
libgltf/src/Shaders.cpp2014-08-05 11:41:13.887536123 +0200
+@@ -10,6 +10,7 @@
+ #include Shaders.h
+
+ #include GL/glew.h
++#include cstdio
+
+ namespace libgltf
+ {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/docxattributeoutput.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 8dbe1223156ca184da70318b07c0247a2946f270
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Aug 5 11:52:00 2014 +0200
loplugin:passstuffbyref
Change-Id: I092b557ed06ec04e51aff0fafb03e2ad2a862c7d
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index bf00588..051b6c1 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -2951,7 +2951,7 @@ void DocxAttributeOutput::TableInfoRow(
ww8::WW8TableNodeInfoInner::Pointer_t /*
}
/// Does the same as comphelper::string::padToLength(), but extends the start,
not the end.
-OString lcl_padStartToLength(OString aString, sal_Int32 nLen, sal_Char cFill)
+OString lcl_padStartToLength(OString const aString, sal_Int32 nLen, sal_Char
cFill)
{
if (nLen aString.getLength())
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - extensions.lst
extensions.lst |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 6b426a17dbbefac6ed88b5d3c15f53054e4c2dda Author: Jürgen Schmidt j...@apache.org Date: Tue Aug 5 08:41:07 2014 + #125262# update dictionary for sl, ru, fr, pt and change name for simple future usage diff --git a/extensions.lst b/extensions.lst index dbbbad2..28c616c 100644 --- a/extensions.lst +++ b/extensions.lst @@ -55,7 +55,7 @@ # French dictionary. [ language=fr || language=nl || language=de || language=de_DE || language=ca || language=ca_XV ] -8f7ca241048c70bd7893995ac4bcca3b http://sourceforge.net/projects/aoo-extensions/files/17340/1/dict411.oxt/download dict411.oxt +48343ddb4f020f1c335189ba56f8f50c http://sourceforge.net/projects/aoo-extensions/files/17340/3/lo-oo-ressources-linguistiques-fr-v5.1.oxt/download dict-fr.oxt # Italian dictionary. [ language=it || language=de || language=de_DE ] @@ -80,7 +80,7 @@ # Russian dictionary. [ language=ru ] -a63512bc487d7378bbe2e44f59d5ef45 http://sourceforge.net/projects/aoo-extensions/files/3233/2/dict_ru_RU-0.3.6.oxt/download dict_ru_RU-0.3.6.oxt +93921f14809a22770f1bd89af65015bc http://sourceforge.net/projects/aoo-extensions/files/3233/3/dict_ru_ru-0.3.7.oxt/download dict-ru.oxt # Slovak dictionary. [ language=sk ] @@ -88,7 +88,7 @@ # Slovenian dictionary. [ language=sl ] -cfc3e4da22a3bb9f3f5fa7ae443f6407 http://sourceforge.net/projects/aoo-extensions/files/3280/5/pack-sl.oxt pack-sl.oxt +26b6cebb0534dfd8dc47ea2b746202ce http://sourceforge.net/projects/aoo-extensions/files/3280/7/pack-sl.oxt/download dict-sl.oxt # German (Austria) dictionary. [ language=de || language=de_AT || language=de_DE ] @@ -137,7 +137,7 @@ # Portuguese (European). [ language=pt || language=pt_PT ] -ad882aa5fcd1b48ebc2421b0d25ee178 http://sourceforge.net/projects/aoo-extensions/files/1196/27/oo3x-pt-pt-14.1.1.1.oxt/download dict-pt.oxt +196c27dd8da422006b64129665abd08f http://sourceforge.net/projects/aoo-extensions/files/1196/29/oo3x-pt-pt-14.7.4.1.oxt/download dict-pt.oxt # Catalan. [ language=ca ] ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx sd/source
include/svx/xtable.hxx |1 +
sd/source/ui/unoidl/UnoDocumentSettings.cxx |4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit c05105151b730b5d1014475b7b89857bc486629f
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Aug 5 12:10:11 2014 +0200
Avoid undef out-of-range value -1 for XPropertyListType enum
Change-Id: If2dedafe6d8517eba4dd4921d15dd2d969d181dd
diff --git a/include/svx/xtable.hxx b/include/svx/xtable.hxx
index a658596..3b8b368 100644
--- a/include/svx/xtable.hxx
+++ b/include/svx/xtable.hxx
@@ -172,6 +172,7 @@ public:
enum XPropertyListType {
+UNKNOWN_XPROPERTYLISTTYPE = -1,
XCOLOR_LIST,
XLINE_END_LIST,
XDASH_LIST,
diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx
b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
index e792db8..094c08d 100644
--- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx
+++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
@@ -281,7 +281,7 @@ static XPropertyListType getTypeOfName( const OUString
aName )
if( aName.equalsAscii( aURLPropertyNames[i].pName ) )
return aURLPropertyNames[i].t;
}
-return (XPropertyListType) -1;
+return UNKNOWN_XPROPERTYLISTTYPE;
}
static OUString getNameOfType( XPropertyListType t )
@@ -306,7 +306,7 @@ uno::Sequencebeans::PropertyValue
for( sal_Int32 i = 0; i aConfigProps.getLength(); i++ )
{
XPropertyListType t = getTypeOfName( aConfigProps[i].Name );
-if (t 0)
+if (t == UNKNOWN_XPROPERTYLISTTYPE)
aRet[nRet++] = aConfigProps[i];
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - avmedia/source download.lst external/libgltf
avmedia/source/opengl/oglframegrabber.cxx |1
avmedia/source/opengl/oglframegrabber.hxx |4
avmedia/source/opengl/oglplayer.cxx | 75 --
avmedia/source/opengl/oglplayer.hxx |8 -
avmedia/source/opengl/oglwindow.cxx |4
avmedia/source/opengl/oglwindow.hxx |4
download.lst |3
external/libgltf/ExternalProject_libgltf.mk |6
external/libgltf/UnpackedTarball_libgltf.mk |2
external/libgltf/pathces/fix_rendering_of_resized_model.patch | 71 -
external/libgltf/pathces/missing_include.patch| 11 +
11 files changed, 67 insertions(+), 122 deletions(-)
New commits:
commit ea596d69054bca96ac15fa46631c42422e859b19
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Tue Aug 5 10:27:09 2014 +0200
Upload first official libgltf release: libgltf-0.0.0
News relative to previous draft version:
- Memory management improvements (fdo#81180)
- Reduced OpenGL requirements (version 3.3 - version 3.0)
- Cleaned up API
Reviewed-on: https://gerrit.libreoffice.org/10744
Reviewed-by: Zolnai Tamás zolnaitamas2...@gmail.com
Tested-by: Zolnai Tamás zolnaitamas2...@gmail.com
(cherry picked from commit 48d1f860716720abdd7febdad4b57b9f31a6a1dc)
Conflicts:
avmedia/source/opengl/oglplayer.cxx
download.lst
libgltf: fix dbgutil build
(cherry picked from commit dabfe7dd025f95862e302b3c4526d382eeba19ea)
libgltf: missing cstdio include
(cherry picked from commit d085bba9139d882e191b46ee8056d364e7526f88)
libgltf: remove obsolete patch
(cherry picked from commit 841d50ec234e71e8e89d0e9135e2002f35fc42fa)
Change-Id: Icc5105d0668d5e4e3eb58bbaed6b2f059c30be99
Reviewed-on: https://gerrit.libreoffice.org/10747
Reviewed-by: Jan Holesovsky ke...@collabora.com
Tested-by: Jan Holesovsky ke...@collabora.com
diff --git a/avmedia/source/opengl/oglframegrabber.cxx
b/avmedia/source/opengl/oglframegrabber.cxx
index 2f76436..23e97f1 100644
--- a/avmedia/source/opengl/oglframegrabber.cxx
+++ b/avmedia/source/opengl/oglframegrabber.cxx
@@ -20,6 +20,7 @@
#include boost/scoped_array.hpp
using namespace com::sun::star;
+using namespace libgltf;
namespace avmedia { namespace ogl {
diff --git a/avmedia/source/opengl/oglframegrabber.hxx
b/avmedia/source/opengl/oglframegrabber.hxx
index b6cc0e8..5beb15b 100644
--- a/avmedia/source/opengl/oglframegrabber.hxx
+++ b/avmedia/source/opengl/oglframegrabber.hxx
@@ -25,7 +25,7 @@ class OGLFrameGrabber : public FrameGrabber_BASE
{
public:
-OGLFrameGrabber( glTFHandle rHandle );
+OGLFrameGrabber( libgltf::glTFHandle rHandle );
virtual ~OGLFrameGrabber();
// XFrameGrabber
@@ -37,7 +37,7 @@ public:
virtual com::sun::star::uno::Sequence OUString SAL_CALL
getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException,
std::exception) SAL_OVERRIDE;
private:
-glTFHandle m_rHandle;
+libgltf::glTFHandle m_rHandle;
};
} // namespace ogl
diff --git a/avmedia/source/opengl/oglplayer.cxx
b/avmedia/source/opengl/oglplayer.cxx
index b827d2f..ba7e9f2 100644
--- a/avmedia/source/opengl/oglplayer.cxx
+++ b/avmedia/source/opengl/oglplayer.cxx
@@ -21,6 +21,7 @@
#include cassert
using namespace com::sun::star;
+using namespace libgltf;
namespace avmedia { namespace ogl {
@@ -37,16 +38,10 @@ OGLPlayer::~OGLPlayer()
osl::MutexGuard aGuard(m_aMutex);
if( m_pHandle )
{
-for (size_t i = 0; i m_pHandle-size m_pHandle-files[i].buffer;
++i)
-{
-if (m_pHandle-files[i].type != GLTF_JSON)
-{
-delete [] m_pHandle-files[i].buffer;
-}
-}
m_aContext.makeCurrent();
gltf_renderer_release(m_pHandle);
}
+releaseInputFiles();
}
static bool lcl_LoadFile( glTFFile* io_pFile, const OUString rURL)
@@ -72,35 +67,27 @@ bool OGLPlayer::create( const OUString rURL )
m_sURL = rURL;
-// Load *.json file and init renderer
-glTFFile aJsonFile;
-aJsonFile.type = GLTF_JSON;
-OString sFileName =
OUStringToOString(INetURLObject(m_sURL).GetLastName(),RTL_TEXTENCODING_UTF8);
-aJsonFile.filename = (char*)sFileName.getStr();
-if( !lcl_LoadFile(aJsonFile, m_sURL) )
-{
-SAL_WARN(avmedia.opengl, Can't load *.json file: + sFileName);
-return false;
-}
-
-m_pHandle = gltf_renderer_init(aJsonFile);
+// Convert URL to a system path
+const INetURLObject aURLObj(m_sURL);
+const std::string sFilePath = OUStringToOString(
aURLObj.getFSysPath(INetURLObject::FSYS_DETECT), RTL_TEXTENCODING_UTF8
).getStr();
-delete [] aJsonFile.buffer;
+// Load *.json file and init
Awesome Push To Your Success!
Today's your lucky day, because [the system that I've found works](http://mishosavy.org/2416/2014/2778/05/?info=eyJhIjogMSwgInUiOiAiU29sby5BZHMuQWNhZGVteSIsICJlIjogImxpYnJlb2ZmaWNlQGxpc3RzLmZyZWVkZXNrdG9wLm9yZyIsICJ0IjogIlNvbG8uQWRzXzcuQWNhZGVteV9fMjAxNDA4MDQyMjI4MzYiLCAidiI6ICJtaXNob3Nhdnkub3JnIn0=url=http://income-cash.com/qcc/TrafficIN/?id=91) This system will give an awesome push to your success (and your bank acct.) warp speed. All you need to do is just to [click here](http://mishosavy.org/6188/2014/1309/05/?info=eyJhIjogMSwgInUiOiAiU29sby5BZHMuQWNhZGVteSIsICJlIjogImxpYnJlb2ZmaWNlQGxpc3RzLmZyZWVkZXNrdG9wLm9yZyIsICJ0IjogIlNvbG8uQWRzXzcuQWNhZGVteV9fMjAxNDA4MDQyMjI4MzYiLCAidiI6ICJtaXNob3Nhdnkub3JnIn0=url=http://income-cash.com/qcc/TrafficIN/?id=91) and WA-LLA! Talk soon, Andreea PS -- [Here's the link again ;)](http://mishosavy.org/4088/2014/7783/05/?info=eyJhIjogMSwgInUiOiAiU29sby5BZHMuQWNhZGVteSIsICJlIjogImxpYnJlb2ZmaWNlQGxpc3RzLmZyZWVkZXNrdG9wLm9yZyIsICJ0IjogIlNvbG8uQWRzXzcuQWNhZGVteV9fMjAxNDA4MDQyMjI4MzYiLCAidiI6ICJtaXNob3Nhdnkub3JnIn0=url=http://income-cash.com/qcc/TrafficIN/?id=91) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: dbaccess/source dbaccess/uiconfig dbaccess/UIConfig_dbaccess.mk extensions/source
dbaccess/UIConfig_dbaccess.mk |1
dbaccess/source/ui/dlg/ConnectionPage.cxx | 119 +++--
dbaccess/source/ui/dlg/ConnectionPage.hrc | 45 ---
dbaccess/source/ui/dlg/ConnectionPage.hxx | 25 -
dbaccess/source/ui/dlg/ConnectionPage.src | 110
dbaccess/source/ui/dlg/ConnectionPageSetup.cxx | 10
dbaccess/source/ui/inc/dbu_resource.hrc|1
dbaccess/uiconfig/ui/connectionpage.ui | 330 +++--
dbaccess/uiconfig/ui/dbwizconnectionpage.ui| 122 +
extensions/source/abpilot/abspilot.cxx |2
10 files changed, 445 insertions(+), 320 deletions(-)
New commits:
commit 020e283970783d53f0c8a4b88ff7ae79f6f81618
Author: Palenik Mihály palenik.mih...@gmail.com
Date: Tue Aug 5 11:39:31 2014 +0200
Convert PAGE_CONNECTION to .ui
Change-Id: Id65d57b848280fee12384b4f470782a28233acd8
Reviewed-on: https://gerrit.libreoffice.org/10748
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
diff --git a/dbaccess/UIConfig_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk
index 52d2bf4..0ac73bf 100644
--- a/dbaccess/UIConfig_dbaccess.mk
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
dbaccess/uiconfig/ui/connectionpage \
dbaccess/uiconfig/ui/copytablepage \
dbaccess/uiconfig/ui/dbaseindexdialog \
+dbaccess/uiconfig/ui/dbwizconnectionpage \
dbaccess/uiconfig/ui/dbwizmysqlintropage \
dbaccess/uiconfig/ui/dbwizmysqlnativepage \
dbaccess/uiconfig/ui/dbwizspreadsheetpage \
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx
b/dbaccess/source/ui/dlg/ConnectionPage.cxx
index b3c05d6..1f925b7 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx
@@ -19,7 +19,6 @@
#include config_features.h
#include ConnectionPage.hxx
-#include ConnectionPage.hrc
#include dbu_dlg.hrc
#include dsmeta.hxx
#if HAVE_FEATURE_JAVA
@@ -89,30 +88,26 @@ namespace dbaui
}
// OConnectionTabPage
OConnectionTabPage::OConnectionTabPage(Window* pParent, const SfxItemSet
_rCoreAttrs)
-:OConnectionHelper(pParent, ModuleRes(PAGE_CONNECTION), _rCoreAttrs)
-,m_aFL1(this, ModuleRes(FL_SEPARATOR1))
-,m_aFL2(this, ModuleRes(FL_SEPARATOR2))
-,m_aUserNameLabel(this, ModuleRes(FT_USERNAME))
-,m_aUserName(this, ModuleRes(ET_USERNAME))
-,m_aPasswordRequired(this, ModuleRes(CB_PASSWORD_REQUIRED))
-,m_aFL3(this, ModuleRes(FL_SEPARATOR3))
-,m_aJavaDriverLabel(this, ModuleRes(FT_JDBCDRIVERCLASS))
-,m_aJavaDriver(this, ModuleRes(ET_JDBCDRIVERCLASS))
-,m_aTestJavaDriver(this, ModuleRes(PB_TESTDRIVERCLASS))
-,m_aTestConnection(this, ModuleRes(PB_TESTCONNECTION))
+:OConnectionHelper(pParent, ConnectionPage,
dbaccess/ui/connectionpage.ui, _rCoreAttrs)
{
-m_pConnectionURL-SetModifyHdl(LINK(this, OConnectionTabPage,
OnEditModified));
-m_aJavaDriver.SetModifyHdl(getControlModifiedLink());
-m_aJavaDriver.SetModifyHdl(LINK(this, OConnectionTabPage,
OnEditModified));
-m_aUserName.SetModifyHdl(getControlModifiedLink());
-m_aPasswordRequired.SetClickHdl(getControlModifiedLink());
-
-
m_aTestConnection.SetClickHdl(LINK(this,OGenericAdministrationPage,OnTestConnectionClickHdl));
-
m_aTestJavaDriver.SetClickHdl(LINK(this,OConnectionTabPage,OnTestJavaClickHdl));
+get(m_pFL2, userlabel);
+get(m_pUserNameLabel, userNameLabel);
+get(m_pUserName, userNameEntry);
+get(m_pPasswordRequired, passCheckbutton);
+get(m_pFL3, JDBCLabel);
+get(m_pJavaDriverLabel, javaDriverLabel);
+get(m_pJavaDriver, driverEntry);
+get(m_pTestJavaDriver, driverButton);
+get(m_pTestConnection, connectionButton);
-FreeResource();
+m_pConnectionURL-SetModifyHdl(LINK(this, OConnectionTabPage,
OnEditModified));
+m_pJavaDriver-SetModifyHdl(getControlModifiedLink());
+m_pJavaDriver-SetModifyHdl(LINK(this, OConnectionTabPage,
OnEditModified));
+m_pUserName-SetModifyHdl(getControlModifiedLink());
+m_pPasswordRequired-SetClickHdl(getControlModifiedLink());
-LayoutHelper::fitSizeRightAligned( m_aTestConnection );
+
m_pTestConnection-SetClickHdl(LINK(this,OGenericAdministrationPage,OnTestConnectionClickHdl));
+
m_pTestJavaDriver-SetClickHdl(LINK(this,OConnectionTabPage,OnTestJavaClickHdl));
}
OConnectionTabPage::~OConnectionTabPage()
@@ -128,7 +123,6 @@ namespace dbaui
m_eType = m_pAdminDialog-getDatasourceType(_rSet);
OConnectionHelper::implInitControls( _rSet, _bSaveValue);
-LocalResourceAccess aLocRes( PAGE_CONNECTION, RSC_TABPAGE );
::dbaccess::DATASOURCE_TYPE eType =
m_pCollection-determineType(m_eType);
switch( eType )
{
@@
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |6 -- source/text/shared/explorer/database/dabapropgen.xhp |4 ++-- source/text/shared/explorer/database/dabawiz02jdbc.xhp |4 ++-- source/text/shared/explorer/database/dabawiz02oracle.xhp |2 +- 4 files changed, 5 insertions(+), 11 deletions(-) New commits: commit 400d593bd7f28ed51f0f3e0d0c9a381436e1ca27 Author: David Tardon dtar...@redhat.com Date: Tue Aug 5 13:15:17 2014 +0200 update help ids for ConnectionPage Change-Id: I41f485e025de7254c46010024a48b720df124fe6 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index e7da7b9..2fb7be5 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -1294,7 +1294,6 @@ HID_DSADMIN_CHARSET,38777, HID_DSADMIN_DBASE_INDICIES,38814, HID_DSADMIN_DBASE_PATH,39007, HID_DSADMIN_DECIMAL_SEPARATOR,38820, -HID_DSADMIN_DRIVERCLASS,38815, HID_DSADMIN_FIELD_SEPARATOR,38818, HID_DSADMIN_FLAT_PATH,39014, HID_DSADMIN_HOSTNAME,39034, @@ -4967,7 +4966,6 @@ chart2_TabPage_TP_LOCATION,551829504, chart2_TabPage_TP_WIZARD_TITLEANDOBJECTS,551813120, chart2_TabPage_TP_YERRORBAR,551927808, dbaccess_CheckBox_PAGE_ADABAS_CB_SHUTDB,851526657, -dbaccess_CheckBox_PAGE_CONNECTION_CB_PASSWORD_REQUIRED,851543041, dbaccess_CheckBox_PAGE_MYSQL_NATIVE_CB_PASSWORD_REQUIRED,851837953, dbaccess_Edit_DLG_ADABASSTAT_ET_FREESIZE,1388611589, dbaccess_Edit_DLG_ADABASSTAT_ET_SIZE,1388611588, @@ -4978,7 +4976,6 @@ dbaccess_Edit_DLG_PARAMETERS_ET_PARAM,1388398596, dbaccess_Edit_PAGE_ADABAS_ET_CTRLPASSWORD,851527681, dbaccess_Edit_PAGE_ADABAS_ET_CTRLUSERNAME,851527682, dbaccess_Edit_PAGE_ADABAS_ET_HOSTNAME,851527685, -dbaccess_Edit_PAGE_CONNECTION_ET_USERNAME,851544065, dbaccess_Edit_PAGE_MYSQL_JDBC_ET_JDBCDRIVERCLASS,851773444, dbaccess_Edit_PAGE_MYSQL_NATIVE_ET_USERNAME,851838977, dbaccess_Edit_PAGE_ORACLE_JDBC_ET_JDBCDRIVERCLASS,851888132, @@ -5007,8 +5004,6 @@ dbaccess_NumericField_PAGE_USERDRIVER_NF_PORTNUMBER,851761153, dbaccess_NumericField_TAB_WIZ_TYPE_SELECT_ET_AUTO,851613697, dbaccess_PushButton_DLG_PARAMETERS_BT_TRAVELNEXT,1388401158, dbaccess_PushButton_PAGE_ADABAS_PB_STAT,851530241, -dbaccess_PushButton_PAGE_CONNECTION_PB_TESTCONNECTION,851546626, -dbaccess_PushButton_PAGE_CONNECTION_PB_TESTDRIVERCLASS,851546625, dbaccess_PushButton_PAGE_GENERAL_PB_OPENDOCUMENT,851448326, dbaccess_PushButton_PAGE_MYSQL_JDBC_PB_TESTDRIVERCLASS,851776005, dbaccess_PushButton_PAGE_ORACLE_JDBC_PB_TESTDRIVERCLASS,851890693, @@ -5019,7 +5014,6 @@ dbaccess_PushButton_WIZ_RTFCOPYTABLE_PB_NEXT,1388581385, dbaccess_PushButton_WIZ_RTFCOPYTABLE_PB_PREV,1388581386, dbaccess_RadioButton_PAGE_GENERAL_RB_OPENEXISTINGDOC,851444227, dbaccess_TabPage_PAGE_ADVANCED_SETTINGS_SPECIAL,851820544, -dbaccess_TabPage_PAGE_CONNECTION,851542016, dbaccess_TabPage_PAGE_MYSQL_JDBC,851771392, dbaccess_TabPage_PAGE_MYSQL_NATIVE,851836928, dbaccess_TabPage_PAGE_MYSQL_ODBC,851722240, diff --git a/source/text/shared/explorer/database/dabapropgen.xhp b/source/text/shared/explorer/database/dabapropgen.xhp index 5267576..e5959d5 100644 --- a/source/text/shared/explorer/database/dabapropgen.xhp +++ b/source/text/shared/explorer/database/dabapropgen.xhp @@ -42,7 +42,7 @@ paragraph role=warning id=par_idN1057C xml-lang=en-US l10n=NEWEnsure that the *.dbf file name extension of the dBASE files is lowercase.commentmoved from shared\explorer\database\1103.xhp/comment/paragraph paragraph role=heading id=par_idN10591 xml-lang=en-US level=2 l10n=NEWBrowsecommentUFI: found for dBase/comment/paragraph paragraph role=paragraph id=par_idN10595 xml-lang=en-US l10n=NEWahelp hid=.Opens a dialog where you can select a file or a directory./ahelpcommentwhich one? or depends?/comment/paragraph -bookmark xml-lang=en-US branch=hid/dbaccess:PushButton:PAGE_CONNECTION:PB_TESTCONNECTION id=bm_id7854243 localize=false/paragraph role=heading id=par_idN105AA xml-lang=en-US level=2 l10n=NEWTest ConnectioncommentUFI: found for dBase/commentcommentand for Calc doc/comment/paragraph +bookmark xml-lang=en-US branch=hid/dbaccess/ui/connectionpage/connectionButton id=bm_id7854243 localize=false/paragraph role=heading id=par_idN105AA xml-lang=en-US level=2 l10n=NEWTest ConnectioncommentUFI: found for dBase/commentcommentand for Calc doc/comment/paragraph paragraph role=paragraph id=par_idN105AE xml-lang=en-US l10n=NEWahelp hid=.Tests the database connection with the current settings./ahelp/paragraph bookmark xml-lang=en-US branch=hid/DBACCESS_HID_DSADMIN_FLAT_PATH id=bm_id4529251 localize=false/paragraph role=heading id=par_idN105B1 xml-lang=en-US level=2 l10n=NEWPath to the text filescommentUFI: found for text file folder/comment/paragraph paragraph role=paragraph id=par_idN105B5 xml-lang=en-US l10n=CHGahelp hid=.Enter the path to the folder of the text files./ahelp/paragraph @@ -52,7 +52,7 @@ paragraph role=paragraph id=par_idN105C3 xml-lang=en-US l10n=NEWahelp hid=.Enter the name of the ODBC data
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4bae095f8387a87acf79d88b55fcfc51ae217bfc Author: David Tardon dtar...@redhat.com Date: Tue Aug 5 13:15:17 2014 +0200 Updated core Project: help 400d593bd7f28ed51f0f3e0d0c9a381436e1ca27 diff --git a/helpcontent2 b/helpcontent2 index 3d472f7..400d593 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 3d472f792cc7d9e213e5fdce5b1a3ee95714c1f0 +Subproject commit 400d593bd7f28ed51f0f3e0d0c9a381436e1ca27 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/libgltf
external/libgltf/UnpackedTarball_libgltf.mk|2 +- external/libgltf/patches/missing_include.patch | 11 +++ external/libgltf/pathces/missing_include.patch | 11 --- 3 files changed, 12 insertions(+), 12 deletions(-) New commits: commit 4d5ec5a0c3c5a179ef7982c8725c7ceb0732a836 Author: Simon Danner danner.si...@gmail.com Date: Tue Aug 5 12:40:15 2014 +0200 libgltf: rename pathces dir to patches Change-Id: Ibd28dcdab17b1248d62205e5bf94d0c92c3f8841 Reviewed-on: https://gerrit.libreoffice.org/10750 Reviewed-by: Zolnai Tamás tamas.zol...@collabora.com Tested-by: Zolnai Tamás tamas.zol...@collabora.com diff --git a/external/libgltf/UnpackedTarball_libgltf.mk b/external/libgltf/UnpackedTarball_libgltf.mk index 3b27c2a..861eb2e 100644 --- a/external/libgltf/UnpackedTarball_libgltf.mk +++ b/external/libgltf/UnpackedTarball_libgltf.mk @@ -16,7 +16,7 @@ $(eval $(call gb_UnpackedTarball_set_patchflags,libgltf,--binary)) $(eval $(call gb_UnpackedTarball_set_patchlevel,libgltf,1)) $(eval $(call gb_UnpackedTarball_add_patches,libgltf,\ - external/libgltf/pathces/missing_include.patch \ + external/libgltf/patches/missing_include.patch \ )) # vim: set noet sw=4 ts=4: diff --git a/external/libgltf/pathces/missing_include.patch b/external/libgltf/patches/missing_include.patch similarity index 100% rename from external/libgltf/pathces/missing_include.patch rename to external/libgltf/patches/missing_include.patch ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/fontsubset/cff.cxx | 18 +-
1 file changed, 13 insertions(+), 5 deletions(-)
New commits:
commit 45b0b47d114437198c9e0872d427576e6e7e6cc6
Author: Michael Stahl mst...@redhat.com
Date: Tue Aug 5 12:50:05 2014 +0200
fdo#81516: vcl: limit number of CFFs read from font
Change-Id: I9928b9805169a2dbb41be669dc37617b30bc672b
diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx
index 2ce3286..8293279 100644
--- a/vcl/source/fontsubset/cff.cxx
+++ b/vcl/source/fontsubset/cff.cxx
@@ -325,7 +325,7 @@ public:
explicit CffSubsetterContext( const U8* pBasePtr, int nBaseLen);
~CffSubsetterContext( void);
-voidinitialCffRead( void);
+boolinitialCffRead();
boolemitAsType1( class Type1Emitter,
const sal_GlyphId* pGlyphIds, const U8* pEncoding,
GlyphWidth* pGlyphWidths, int nGlyphCount, FontSubsetInfo );
@@ -1443,7 +1443,7 @@ CffGlobal::CffGlobal( void)
// TODO; maFontMatrix.clear();
}
-void CffSubsetterContext::initialCffRead( void)
+bool CffSubsetterContext::initialCffRead()
{
// get the CFFHeader
mpReadPtr = mpBasePtr;
@@ -1501,7 +1501,11 @@ void CffSubsetterContext::initialCffRead( void)
// assert( mnFontDictBase == tellRel());
mpReadPtr = mpBasePtr + mnFontDictBase;
mnFDAryCount = (mpReadPtr[0]8) + mpReadPtr[1];
-assert( mnFDAryCount (int)(sizeof(maCffLocal)/sizeof(*maCffLocal)));
+if (static_castsize_t(mnFDAryCount) = SAL_N_ELEMENTS(maCffLocal))
+{
+SAL_INFO(vcl.fonts, CffSubsetterContext: too many CFF in font);
+return false;
+}
// read FDArray details to get access to the PRIVDICTs
for( int i = 0; i mnFDAryCount; ++i) {
@@ -1542,6 +1546,8 @@ void CffSubsetterContext::initialCffRead( void)
}
// ignore the Notices info
+
+return true;
}
// get a cstring from a StringID
@@ -2176,14 +2182,16 @@ bool CffSubsetterContext::emitAsType1( Type1Emitter
rEmitter,
bool FontSubsetInfo::CreateFontSubsetFromCff( GlyphWidth* pOutGlyphWidths )
{
CffSubsetterContext aCff( mpInFontBytes, mnInByteLength);
-aCff.initialCffRead();
+bool bRC = aCff.initialCffRead();
+if (!bRC)
+return bRC;
// emit Type1 subset from the CFF input
// TODO: also support CFF-CFF subsetting (when PDF-export and PS-printing
need it)
const bool bPfbSubset = (0 != (mnReqFontTypeMask
FontSubsetInfo::TYPE1_PFB));
Type1Emitter aType1Emitter( mpOutFile, bPfbSubset);
aType1Emitter.setSubsetName( mpReqFontName);
-bool bRC = aCff.emitAsType1( aType1Emitter,
+bRC = aCff.emitAsType1( aType1Emitter,
mpReqGlyphIds, mpReqEncodedIds,
pOutGlyphWidths, mnReqGlyphCount, *this);
return bRC;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/unoidl/unopage.cxx | 13 +
1 file changed, 5 insertions(+), 8 deletions(-)
New commits:
commit 927da5e017c713fa1961863ffd11cb798f9ff48d
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Aug 5 13:33:20 2014 +0200
GetPage requires mpPage to be an SdPage
...which is apparently not always the case; at least observed that during
CppunitTest_sd_html_export_tests.
Change-Id: If3d73249845adfa6b489e783693768e755033f4a
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 0744855..821d049 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -2038,16 +2038,13 @@ Any SAL_CALL SdDrawPage::queryInterface( const
uno::Type rType )
{
return makeAny( Reference drawing::XMasterPageTarget ( this ) );
}
-else
+else if( mbIsImpressDocument
+ rType == cppu::UnoTypepresentation::XPresentationPage::get()
)
{
-if( mbIsImpressDocument )
+SdPage * p = dynamic_castSdPage *(SvxDrawPage::mpPage);
+if( p == 0 || p-GetPageKind() != PK_HANDOUT )
{
-const PageKind ePageKind = GetPage() ? GetPage()-GetPageKind() :
PK_STANDARD;
-
-if( ePageKind != PK_HANDOUT rType ==
cppu::UnoTypepresentation::XPresentationPage::get() )
-{
-return makeAny( Reference presentation::XPresentationPage (
this ) );
-}
+return makeAny( Reference presentation::XPresentationPage ( this
) );
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-commits] core.git: 7 commits - chart2/source extensions/source hwpfilter/source l10ntools/source sal/osl unoidl/source
On 05/08/14 08:33, Stephan Bergmann wrote: Anyway, somehow any discussion about formatting quickly diverts into bikeshedding (this is /so/ lucid! no it isn't! yes it is!). So all I would like to repeat is my humble plea to refrain from reformatting commits, for the sake of a less cluttered git history. At the risk of sparking off that bikeshedding war, is there an option in git that allows us to format everything according to a standard rule as it is committed? And then if individuals don't like that style, to reformat it to the individual's style on checkout? I seem to remember at least one git based project (possibly git itself, or lilypond) that does exactly that. I know - layout can be a very personal thing ... :-) Cheers, Wol ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/uiconfig
sc/uiconfig/scalc/ui/analysisofvariancedialog.ui| 16 +++- sc/uiconfig/scalc/ui/correlationdialog.ui | 16 +++- sc/uiconfig/scalc/ui/covariancedialog.ui| 19 +-- sc/uiconfig/scalc/ui/descriptivestatisticsdialog.ui | 16 +++- sc/uiconfig/scalc/ui/exponentialsmoothingdialog.ui | 16 +++- sc/uiconfig/scalc/ui/movingaveragedialog.ui | 16 +++- sc/uiconfig/scalc/ui/samplingdialog.ui | 18 -- sc/uiconfig/scalc/ui/ttestdialog.ui | 16 +++- 8 files changed, 123 insertions(+), 10 deletions(-) New commits: commit df2f99019413e109d86ec7b082142b8fec731095 Author: Olivier Hallot olivier.hal...@edx.srv.br Date: Sat Aug 2 21:42:18 2014 -0300 Fix fdo#80338: Help pages for Calc Data Stats This patch adds the help button on all dialogs of Calc Data Statistics. Change-Id: Ic74493a4df1341ca08b50c03290a386232c977e9 Reviewed-on: https://gerrit.libreoffice.org/10704 Reviewed-by: Olivier Hallot olivier.hal...@edx.srv.br Tested-by: Olivier Hallot olivier.hal...@edx.srv.br diff --git a/sc/uiconfig/scalc/ui/analysisofvariancedialog.ui b/sc/uiconfig/scalc/ui/analysisofvariancedialog.ui index f1ccb61..a913a2f 100644 --- a/sc/uiconfig/scalc/ui/analysisofvariancedialog.ui +++ b/sc/uiconfig/scalc/ui/analysisofvariancedialog.ui @@ -37,7 +37,7 @@ packing property name=expandFalse/property property name=fillTrue/property -property name=position1/property +property name=position0/property /packing /child child @@ -53,6 +53,20 @@ packing property name=expandFalse/property property name=fillTrue/property +property name=position1/property + /packing +/child +child + object class=GtkButton id=help +property name=labelgtk-help/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_stockTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property property name=position2/property /packing /child diff --git a/sc/uiconfig/scalc/ui/correlationdialog.ui b/sc/uiconfig/scalc/ui/correlationdialog.ui index 3d4d99e..35474b5 100644 --- a/sc/uiconfig/scalc/ui/correlationdialog.ui +++ b/sc/uiconfig/scalc/ui/correlationdialog.ui @@ -30,7 +30,7 @@ packing property name=expandFalse/property property name=fillTrue/property -property name=position1/property +property name=position0/property /packing /child child @@ -46,6 +46,20 @@ packing property name=expandFalse/property property name=fillTrue/property +property name=position1/property + /packing +/child +child + object class=GtkButton id=help +property name=labelgtk-help/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_stockTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property property name=position2/property /packing /child diff --git a/sc/uiconfig/scalc/ui/covariancedialog.ui b/sc/uiconfig/scalc/ui/covariancedialog.ui index 83b639b..c474705 100644 --- a/sc/uiconfig/scalc/ui/covariancedialog.ui +++ b/sc/uiconfig/scalc/ui/covariancedialog.ui @@ -1,8 +1,9 @@ ?xml version=1.0 encoding=UTF-8? !-- Generated with glade 3.16.1 -- interface - !-- interface-requires LibreOffice 1.0 -- requires lib=gtk+ version=3.0/ + requires lib= version=3.0/ + !-- interface-requires LibreOffice 1.0 -- object class=GtkDialog id=CovarianceDialog property name=can_focusFalse/property property name=border_width6/property @@ -160,7 +161,7 @@ packing property name=expandFalse/property property name=fillTrue/property -property name=position1/property +property name=position0/property /packing /child child @@ -176,6 +177,20 @@ packing property name=expandFalse/property property name=fillTrue/property +property
[Libreoffice-commits] core.git: 2 commits - writerfilter/source
writerfilter/source/ooxml/factoryimpl_ns.py | 19 +++
1 file changed, 7 insertions(+), 12 deletions(-)
New commits:
commit 9b64eed1e58e57d08b5f02fdbd2a69b55a8132af
Author: Jan Holesovsky ke...@collabora.com
Date: Tue Aug 5 12:51:18 2014 +0200
writerfilter: Use if's in ::attributeAction's instead of switches.
This only improves readability, otherwise the code size is exactly the same.
[And there is only one place where we are checking for 2 values - case
NN_wml|DEFINE_CT_FtnEdn: in OOXMLFactory_wml.cxx.]
Change-Id: Id6dc6b0cdd0e42f2215e978e1d4d91472969bbb8
diff --git a/writerfilter/source/ooxml/factoryimpl_ns.py
b/writerfilter/source/ooxml/factoryimpl_ns.py
index 467bbfc..cfcd30f 100644
--- a/writerfilter/source/ooxml/factoryimpl_ns.py
+++ b/writerfilter/source/ooxml/factoryimpl_ns.py
@@ -602,12 +602,13 @@ def factoryAttributeActionDefineInner(nsNode, defineNode):
defineName = defineNode.getAttribute(name)
block = []
+output_else =
for resourceNode in [i for i in getChildrenByName(nsNode, resource) if
i.getAttribute(name) == defineName]:
for attributeNode in getChildrenByName(resourceNode, attribute):
if attributeNode.hasAttribute(action):
-block.append(case %s: % fastToken(attributeNode))
+block.append(%sif (nToken ==
static_castToken_t(%s)) % (output_else, fastToken(attributeNode)))
block.append(pHandler-%s(pValue); %
attributeNode.getAttribute(action))
-block.append(break;)
+output_else = else
if len(block):
resource =
for resourceNode in [i for i in getChildrenByName(nsNode, resource)
if i.getAttribute(name) == defineName]:
@@ -615,13 +616,7 @@ def factoryAttributeActionDefineInner(nsNode, defineNode):
break
ret.append({)
ret.append(OOXMLFastContextHandler%s* pHandler =
dynamic_castOOXMLFastContextHandler%s*(_pHandler); % (resource, resource))
-ret.append()
-ret.append(switch (nToken))
-ret.append({)
ret.extend(block)
-ret.append(default:)
-ret.append(break;)
-ret.append(})
ret.append(})
return ret
commit d9ce700a817c7b7c7d5515b34dadf0d0bcd61bd2
Author: Jan Holesovsky ke...@collabora.com
Date: Tue Aug 5 12:29:00 2014 +0200
writerfilter: Make the generated ::attributeAction's readable.
Change-Id: I8461c374841ebd98d5767469ab2d931a2854921e
diff --git a/writerfilter/source/ooxml/factoryimpl_ns.py
b/writerfilter/source/ooxml/factoryimpl_ns.py
index bf3a8d9..467bbfc 100644
--- a/writerfilter/source/ooxml/factoryimpl_ns.py
+++ b/writerfilter/source/ooxml/factoryimpl_ns.py
@@ -605,24 +605,24 @@ def factoryAttributeActionDefineInner(nsNode, defineNode):
for resourceNode in [i for i in getChildrenByName(nsNode, resource) if
i.getAttribute(name) == defineName]:
for attributeNode in getChildrenByName(resourceNode, attribute):
if attributeNode.hasAttribute(action):
-block.append(case %s: % fastToken(attributeNode))
-block.append(pHandler-%s(pValue); %
attributeNode.getAttribute(action))
-block.append(break;)
+block.append(case %s: % fastToken(attributeNode))
+block.append(pHandler-%s(pValue); %
attributeNode.getAttribute(action))
+block.append(break;)
if len(block):
resource =
for resourceNode in [i for i in getChildrenByName(nsNode, resource)
if i.getAttribute(name) == defineName]:
resource = resourceNode.getAttribute(resource)
break
-ret.append({)
-ret.append(OOXMLFastContextHandler%s* pHandler =
dynamic_castOOXMLFastContextHandler%s*(_pHandler); % (resource, resource))
+ret.append({)
+ret.append(OOXMLFastContextHandler%s* pHandler =
dynamic_castOOXMLFastContextHandler%s*(_pHandler); % (resource, resource))
ret.append()
-ret.append(switch (nToken))
-ret.append({)
+ret.append(switch (nToken))
+ret.append({)
ret.extend(block)
-ret.append(default:)
-ret.append(break;)
-ret.append(})
-ret.append(})
+ret.append(default:)
+ret.append(break;)
+ret.append(})
+ret.append(})
return ret
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/core/sdpage.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 7627008b0671f16cf84a3f552e3316ab8d803ebb Author: Stephan Bergmann sberg...@redhat.com Date: Tue Aug 5 14:14:16 2014 +0200 Clear() an SdPage while it is still an SdPage ... because when Clear() is later called in the SdrObjList sub-object dtor, freed SdrObject dtors may call back via SdrObject::SendUserCall into this virtual SdPage::Changed, but then this is only an SdrObjList, causing undef behavior. Change-Id: I09a2d1445a51a70e8f795ff869027899ad0f528b diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 8f8f6e6..9e368eb 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -147,6 +147,8 @@ SdPage::~SdPage() if( mpItems ) delete mpItems; + +Clear(); } struct OrdNumSorter ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
MAC OS: 4.3.0.4 Info.plist version confusion
Hi there, hope writing to the right mailing list; I wrote to the users list, where I was told to ask my question here before filling out a bug report: I just wanted to check out the new libreOffice with a Mac and found out that in the Info.plist - file the key CFBundleShortVersionString is 4.3.4 in contrast to the CFBundleGetInfoString which is 4.3.0.4 (see the third digit: zero). Why is this? Just to shorten the version string to 3 digits? And if a future long version will be 4.3.1.3, will the short one be 4.3.1, which is smaller than the older one (4.3.4)? Such things makes automatic software deployment under Mac OS even harder. But first of all, thanks so much for your great work on libreOffice, i use it excessively and i love it. Markus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[RFC} running a formatter over the Java code
Hi Dons flame-proof suit Would there be any objections to my running a formatter over the existing Java LO code (with the exception of the newer Android stuff) ? Because at the moment - it has very little consistency - and it appears that at some point in time a tabs-to-spaces conversion was done, but not all the files followed the same tab-size convention, so some of the formatting is now REALLY out. I am suggesting using the standard Oracle Java code formatting conventions http://www.oracle.com/technetwork/java/codeconventions-150003.pdf which largely match the bulk of the existing style. Regards, Noel Grandin Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: odk/CustomTarget_allheaders.mk
odk/CustomTarget_allheaders.mk | 21 + 1 file changed, 21 insertions(+) New commits: commit e16cc171f161178e7cad55565bdbb6eab238176b Author: Michael Stahl mst...@redhat.com Date: Tue Aug 5 14:51:36 2014 +0200 odk: fix CustomTarget_allheaders for Win32 make This one also has an overly long command line that is cut off. Change-Id: I2d49e39b5dca6e1d84fffcb3212042b6d82c13f3 diff --git a/odk/CustomTarget_allheaders.mk b/odk/CustomTarget_allheaders.mk index 050648c..5f22d85 100644 --- a/odk/CustomTarget_allheaders.mk +++ b/odk/CustomTarget_allheaders.mk @@ -14,10 +14,26 @@ odk_allheaders_DIR := $(call gb_CustomTarget_get_workdir,odk/allheaders) $(call gb_CustomTarget_get_target,odk/allheaders) : \ $(odk_allheaders_DIR)/allheaders.hxx +define odk_genincludesheader +// Generated list of sal includes +#ifdef WNT +#include windows.h +#endif + +endef + +define odk_geninclude +$(if $(2),#ifdef WNT) +#include $(subst $(INSTDIR)/$(SDKDIRNAME)/include/,,$(1)) +$(if $(2),#endif) + +endef + $(odk_allheaders_DIR)/allheaders.hxx : \ $(call gb_PackageSet_get_target,odk_headers) \ | $(odk_allheaders_DIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) +ifeq ($(HAVE_GNUMAKE_FILE_FUNC),) printf '// Generated list of sal includes\n' $@ \ printf '#ifdef WNT\n' $@ \ printf '#include windows.h\n' $@ \ @@ -27,5 +43,10 @@ $(odk_allheaders_DIR)/allheaders.hxx : \ printf '#include %s\n' $(subst $(INSTDIR)/$(SDKDIRNAME)/include/,,$(file)) $@ \ $(if $(findstring /win32/,$(file)), printf '#endif // WNT\n' $@) \ ) +else + $(file $@,\ + $(call odk_genincludesheader) \ + $(foreach file,$(shell cat $^),$(call odk_geninclude,$(file),$(findstring /win32/,$(file) +endif # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: MAC OS: 4.3.0.4 Info.plist version confusion
Hi Markus, *, On Tue, Aug 5, 2014 at 12:19 PM, Markus Jansen markus.jan...@plainpicture.de wrote: Hi there, hope writing to the right mailing list; I wrote to the users list, where I was told to ask my question here before filling out a bug report: I just wanted to check out the new libreOffice with a Mac and found out that in the Info.plist - file the key CFBundleShortVersionString is 4.3.4 in contrast to the CFBundleGetInfoString which is 4.3.0.4 (see the third digit: zero). https://bugs.freedesktop.org/show_bug.cgi?id=74244 Why is this? Just to shorten the version string to 3 digits? Yes - Apple's doc say it is a three element string, and so far nobody has provided pointers to app-store listed applications that don't follow that word-by-word (although many programs in the wild use longer version strings and seem to work fine). So if you have a software from Appstore that has longer version number, then the limit can be dropped... And if a future long version will be 4.3.1.3, will the short one be 4.3.1, which is smaller than the older one (4.3.4)? Such things makes automatic software deployment under Mac OS even harder. Yeah, that was a specific bug with the code - I unfortunately forgot about that one, despite predicting this mismatch ciao Christian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: MAC OS: 4.3.0.4 Info.plist version confusion
Why is this? Just to shorten the version string to 3 digits? You mean integers, not digits. And yes, because that is what it is documented that it should be: CFBundleShortVersionString (String - iOS, OS X) specifies the release version number of the bundle, which identifies a released iteration of the app. The release version number is a string comprised of three period-separated integers And if a future long version will be 4.3.1.3, will the short one be 4.3.1, No it won't. It will be 4.3.1003. See configure.ac, look for MACOSX_BUNDLE_SHORTVERSION. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [RFC} running a formatter over the Java code
On 05/08/14 09:26, Noel Grandin wrote: Hi Dons flame-proof suit Would there be any objections to my running a formatter over the existing Java LO code (with the exception of the newer Android stuff) ? Because at the moment - it has very little consistency - and it appears that at some point in time a tabs-to-spaces conversion was done, but not all the files followed the same tab-size convention, so some of the formatting is now REALLY out. If you're going to do that, can you investigate a git hook or whatever it is that will enforce that convention on commit? That would then be a good prototype for the rest of the code base :-) I am suggesting using the standard Oracle Java code formatting conventions http://www.oracle.com/technetwork/java/codeconventions-150003.pdf which largely match the bulk of the existing style. Sounds sensible to me ... especially if you also investigate formatting hooks on checkout :-) Cheers, Wol ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - offapi/com sw/inc sw/source writerfilter/source
offapi/com/sun/star/text/TextTableRow.idl| 10 ++
sw/inc/unoprnms.hxx |1 +
sw/source/core/bastyp/init.cxx |1 +
sw/source/core/unocore/unomap.cxx|1 +
writerfilter/source/ooxml/modelpreprocess.py |8
5 files changed, 21 insertions(+)
New commits:
commit e0a2be865f31457b154acf2e0dd1baeae65f7f93
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Aug 5 14:37:47 2014 +0200
sw: add RowInteropGrabBag UNO property for table rows
Change-Id: I59e0d24e04ebabdaa2fdb23fbc47c649d4872853
diff --git a/offapi/com/sun/star/text/TextTableRow.idl
b/offapi/com/sun/star/text/TextTableRow.idl
index 8bd2f97..1755068 100644
--- a/offapi/com/sun/star/text/TextTableRow.idl
+++ b/offapi/com/sun/star/text/TextTableRow.idl
@@ -85,6 +85,16 @@ published service TextTableRow
*/
[optional, property, maybevoid] boolean IsSplitAllowed;
+/** Grab bag of row properties, used as a string-any map for interop
purposes.
+
+@since LibreOffice 4.4
+
+pThis property is intentionally not handled by the ODF filter. Any
+member that should be handled there should be first moved out from
this grab
+bag to a separate property./p
+*/
+[optional, property] sequencecom::sun::star::beans::PropertyValue
RowInteropGrabBag;
+
};
diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx
index 863b5ce..1a89a01 100644
--- a/sw/inc/unoprnms.hxx
+++ b/sw/inc/unoprnms.hxx
@@ -897,6 +897,7 @@
#define UNO_NAME_CHAR_INTEROP_GRAB_BAG CharInteropGrabBag
#define UNO_NAME_TEXT_VERT_ADJUST TextVerticalAdjust
#define UNO_NAME_CELL_INTEROP_GRAB_BAG CellInteropGrabBag
+#define UNO_NAME_ROW_INTEROP_GRAB_BAG RowInteropGrabBag
#define UNO_NAME_TABLE_INTEROP_GRAB_BAG TableInteropGrabBag
#endif
diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx
index b2fb605..8e716bf 100644
--- a/sw/source/core/bastyp/init.cxx
+++ b/sw/source/core/bastyp/init.cxx
@@ -209,6 +209,7 @@ sal_uInt16 aTableLineSetRange[] = {
RES_PROTECT,RES_PROTECT,
RES_VERT_ORIENT,RES_VERT_ORIENT,
RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1,
+RES_FRMATR_GRABBAG, RES_FRMATR_GRABBAG,
0
};
diff --git a/sw/source/core/unocore/unomap.cxx
b/sw/source/core/unocore/unomap.cxx
index 2a3ad60..c70c075 100644
--- a/sw/source/core/unocore/unomap.cxx
+++ b/sw/source/core/unocore/unomap.cxx
@@ -1697,6 +1697,7 @@ const SfxItemPropertyMapEntry*
SwUnoPropertyMapProvider::GetPropertyMapEntries(s
{ OUString(UNO_NAME_SIZE_TYPE), RES_FRM_SIZE,
cppu::UnoTypesal_Int16::get() , PROPERTY_NONE,
MID_FRMSIZE_SIZE_TYPE },
{ OUString(UNO_NAME_WIDTH_TYPE), RES_FRM_SIZE,
cppu::UnoTypesal_Int16::get() , PROPERTY_NONE,
MID_FRMSIZE_WIDTH_TYPE },
{ OUString(UNO_NAME_IS_SPLIT_ALLOWED), RES_ROW_SPLIT,
cppu::UnoTypebool::get() , PropertyAttribute::MAYBEVOID, 0},
+{ OUString(UNO_NAME_ROW_INTEROP_GRAB_BAG),
RES_FRMATR_GRABBAG, cppu::UnoType
cppu::UnoSequenceTypecss::beans::PropertyValue ::get(), PROPERTY_NONE, 0 },
{ OUString(), 0, css::uno::Type(), 0, 0 }
};
commit a37c6614acea66b20502998edc88eb3c61267106
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Aug 5 13:52:42 2014 +0200
writerfilter: prevent introducing new references to non-existing defines
f77981e3c89f428c648da1a550f8d36344e1a927 fixed the last such problem,
let's not introduce those again.
Change-Id: I8f193b7e234242b5c283d04ca20f83ee901dfbed
diff --git a/writerfilter/source/ooxml/modelpreprocess.py
b/writerfilter/source/ooxml/modelpreprocess.py
index cdb1382..100056d 100644
--- a/writerfilter/source/ooxml/modelpreprocess.py
+++ b/writerfilter/source/ooxml/modelpreprocess.py
@@ -57,6 +57,13 @@ def defaultNamespaceAliases():
}
+def check(model):
+defines = [i.getAttribute(name) for i in
model.getElementsByTagName(define)]
+for reference in [i.getAttribute(name) for i in
model.getElementsByTagName(ref)]:
+if not reference in defines:
+raise Exception(Unknown define with name '%s' % reference)
+
+
def preprocess(model):
for i in model.getElementsByTagName(namespace-alias):
name = i.getAttribute(name)
@@ -163,6 +170,7 @@ parseNamespaces(namespacesPath)
# URL - alias
namespaceAliases = {}
model = minidom.parse(modelPath)
+check(model)
preprocess(model)
model.writexml(sys.stdout)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/uiconfig
sfx2/uiconfig/ui/querysavedialog.ui |7 --- 1 file changed, 4 insertions(+), 3 deletions(-) New commits: commit 10abd657aacea884f520c97054625a94184c4aca Author: Adolfo Jayme Barrientos fit...@ubuntu.com Date: Fri Aug 1 21:11:10 2014 -0500 fdo#82017: Rename 'Close without saving' button to 'Don't Save'. It matches other applications both in Windows and OS X. Users expect to press the 'D' key to activate this button. Also, it's shorter. Change-Id: I08f80fd9dbfbc5e2a5dc69ff2f72d55b80ccda5a Reviewed-on: https://gerrit.libreoffice.org/10685 Reviewed-by: Olivier Hallot olivier.hal...@edx.srv.br Tested-by: Olivier Hallot olivier.hal...@edx.srv.br diff --git a/sfx2/uiconfig/ui/querysavedialog.ui b/sfx2/uiconfig/ui/querysavedialog.ui index 64ca5f3..93a67c3 100644 --- a/sfx2/uiconfig/ui/querysavedialog.ui +++ b/sfx2/uiconfig/ui/querysavedialog.ui @@ -1,6 +1,7 @@ ?xml version=1.0 encoding=UTF-8? +!-- Generated with glade 3.16.1 -- interface - !-- interface-requires gtk+ 3.0 -- + requires lib=gtk+ version=3.0/ object class=GtkMessageDialog id=QuerySaveDialog property name=can_focusFalse/property property name=border_width12/property @@ -15,14 +16,14 @@ object class=GtkBox id=messagedialog-vbox property name=can_focusFalse/property property name=orientationvertical/property -property name=spacing24/property +property name=spacing12/property child internal-child=action_area object class=GtkButtonBox id=messagedialog-action_area property name=can_focusFalse/property property name=layout_styleend/property child object class=GtkButton id=discard -property name=label translatable=yesClose _without saving/property +property name=label translatable=yes_Donât Save/property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultTrue/property ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/uiconfig sd/uiconfig
sc/uiconfig/scalc/menubar/menubar.xml|1 + sd/uiconfig/sdraw/menubar/menubar.xml|1 + sd/uiconfig/simpress/menubar/menubar.xml |1 + 3 files changed, 3 insertions(+) New commits: commit b34ddf0700a0d3ea51e7aca5e1b28851150f6f8c Author: Heiko Scheidt loh...@versanet.de Date: Sun Aug 3 13:58:04 2014 +0200 fdo#79917: Add 'Save a Copy' to Calc/Impress/Draw. Was added to writer in LO 4.1 but menu entries for other modules were overlooked. Change-Id: I90bcaa727eaa8fd8b35218f73c101f25c7a71d7b Reviewed-on: https://gerrit.libreoffice.org/10707 Reviewed-by: Andrzej Hunt andrzej.h...@collabora.com Tested-by: Andrzej Hunt andrzej.h...@collabora.com diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml index efbd03c..2cac34a 100644 --- a/sc/uiconfig/scalc/menubar/menubar.xml +++ b/sc/uiconfig/scalc/menubar/menubar.xml @@ -35,6 +35,7 @@ menu:menuitem menu:id=.uno:CloseDoc/ menu:menuitem menu:id=.uno:Save/ menu:menuitem menu:id=.uno:SaveAs/ +menu:menuitem menu:id=.uno:SaveACopy/ menu:menuitem menu:id=.uno:SaveAll/ menu:menuitem menu:id=.uno:CheckOut/ menu:menuitem menu:id=.uno:CancelCheckOut/ diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml index 2d6948f..d0c088a 100644 --- a/sd/uiconfig/sdraw/menubar/menubar.xml +++ b/sd/uiconfig/sdraw/menubar/menubar.xml @@ -35,6 +35,7 @@ menu:menuitem menu:id=.uno:CloseDoc/ menu:menuitem menu:id=.uno:Save/ menu:menuitem menu:id=.uno:SaveAs/ + menu:menuitem menu:id=.uno:SaveACopy/ menu:menuitem menu:id=.uno:SaveAll/ menu:menuitem menu:id=.uno:CheckOut/ menu:menuitem menu:id=.uno:CancelCheckOut/ diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml index 5fc1caa..e2e9d38 100644 --- a/sd/uiconfig/simpress/menubar/menubar.xml +++ b/sd/uiconfig/simpress/menubar/menubar.xml @@ -35,6 +35,7 @@ menu:menuitem menu:id=.uno:CloseDoc/ menu:menuitem menu:id=.uno:Save/ menu:menuitem menu:id=.uno:SaveAs/ +menu:menuitem menu:id=.uno:SaveACopy/ menu:menuitem menu:id=.uno:SaveAll/ menu:menuitem menu:id=.uno:CheckOut/ menu:menuitem menu:id=.uno:CancelCheckOut/ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-colors' - include/svx sc/source sd/source svx/source sw/source
include/svx/tbcontrl.hxx | 27 +-
sc/source/ui/app/scdll.cxx|2 -
sd/source/ui/app/sddll.cxx|2 -
svx/source/tbxctrls/tbcontrl.cxx | 69 +++---
sw/source/uibase/app/swmodule.cxx |2 -
5 files changed, 12 insertions(+), 90 deletions(-)
New commits:
commit c7705d871e76040fc2106a7ef8d519f79b6881bd
Author: Krisztian Pinter pin.termina...@gmail.com
Date: Tue Aug 5 15:39:20 2014 +0200
Remove redundant class SvxLineColorToolBoxControl
Change-Id: I882ee959baae429307218d3076a2a198ff960ddd
diff --git a/include/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx
index 762f33d..3d2fa35 100644
--- a/include/svx/tbcontrl.hxx
+++ b/include/svx/tbcontrl.hxx
@@ -42,7 +42,8 @@
SvxColorToolBoxControl
--
Item type: SvxColorItem
-and SfxBoolItem
+SfxBoolItem
+and XLineColorItem
for font color (writer, ...)
Execute-Id SID_ATTR_CHAR_COLOR2
@@ -66,9 +67,7 @@
for 3D extrusion
Execute-Id SID_EXTRUSION_3D_COLOR
-SvxLineColorToolBoxControl
---
-Item type: XLineColorItem
+for line color
Execute-Id SID_ATTR_LINE_COLOR
SvxPatternToolBoxControl
@@ -236,26 +235,6 @@ public:
};
-// class SvxLineColorToolBoxControl --
-
-class SVX_DLLPUBLIC SvxLineColorToolBoxControl : public SfxToolBoxControl
-{
-::boost::scoped_ptr ::svx::ToolboxButtonColorUpdater pBtnUpdater;
-PaletteManager mPaletteManager;
-DECL_LINK( SelectedHdl, Color* );
-public:
-SFX_DECL_TOOLBOX_CONTROL();
-SvxLineColorToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox
rTbx );
-virtual ~SvxLineColorToolBoxControl();
-
-virtual voidStateChanged( sal_uInt16 nSID, SfxItemState
eState,
- const SfxPoolItem* pState )
SAL_OVERRIDE;
-virtual SfxPopupWindowType GetPopupWindowType() const SAL_OVERRIDE;
-virtual SfxPopupWindow* CreatePopupWindow() SAL_OVERRIDE;
-virtual voidSelect(sal_uInt16 nSelectModifier)
SAL_OVERRIDE;
-};
-
-
// class SvxFrameToolBoxControl --
class SVX_DLLPUBLIC SvxFrameToolBoxControl : public SfxToolBoxControl
diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx
index 58da249..d3244a2 100644
--- a/sc/source/ui/app/scdll.cxx
+++ b/sc/source/ui/app/scdll.cxx
@@ -172,7 +172,7 @@ void ScDLL::Init()
SvxFillToolBoxControl ::RegisterControl(0, pMod);
SvxLineStyleToolBoxControl ::RegisterControl(0, pMod);
SvxLineWidthToolBoxControl ::RegisterControl(0, pMod);
-SvxLineColorToolBoxControl ::RegisterControl(0, pMod);
+SvxColorToolBoxControl ::RegisterControl(0, pMod);
SvxLineEndToolBoxControl::RegisterControl(SID_ATTR_LINEEND_STYLE,
pMod);
SvxStyleToolBoxControl ::RegisterControl(SID_STYLE_APPLY,
pMod);
SvxFontNameToolBoxControl ::RegisterControl(SID_ATTR_CHAR_FONT,
pMod);
diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx
index 69ec0aa..1d54c57 100644
--- a/sd/source/ui/app/sddll.cxx
+++ b/sd/source/ui/app/sddll.cxx
@@ -211,7 +211,7 @@ void SdDLL::RegisterControllers()
SvxFillToolBoxControl::RegisterControl(0, pMod);
SvxLineStyleToolBoxControl::RegisterControl(0, pMod);
SvxLineWidthToolBoxControl::RegisterControl(0, pMod);
-SvxLineColorToolBoxControl::RegisterControl(0, pMod);
+SvxColorToolBoxControl::RegisterControl(0, pMod);
SvxLineEndToolBoxControl::RegisterControl( SID_ATTR_LINEEND_STYLE, pMod );
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 4274ad1..7fc11de 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -110,8 +110,6 @@ using namespace ::com::sun::star::lang;
SFX_IMPL_TOOLBOX_CONTROL( SvxStyleToolBoxControl, SfxTemplateItem );
SFX_IMPL_TOOLBOX_CONTROL( SvxFontNameToolBoxControl, SvxFontItem );
-SFX_IMPL_TOOLBOX_CONTROL( SvxColorToolBoxControl, SvxColorItem );
-SFX_IMPL_TOOLBOX_CONTROL( SvxLineColorToolBoxControl, XLineColorItem );
SFX_IMPL_TOOLBOX_CONTROL( SvxFrameToolBoxControl, SvxBoxItem );
SFX_IMPL_TOOLBOX_CONTROL( SvxFrameLineStyleToolBoxControl, SvxLineItem );
SFX_IMPL_TOOLBOX_CONTROL( SvxSimpleUndoRedoController, SfxStringItem );
@@ -2345,73 +2343,18 @@ void SvxColorToolBoxControl::Select(sal_uInt16
/*nSelectModifier*/)
Dispatch( aCommand, aArgs );
}
-// class SvxLineColorToolBoxControl
-
-SvxLineColorToolBoxControl::SvxLineColorToolBoxControl(
-sal_uInt16 nSlotId,
-sal_uInt16 nId,
-ToolBox rTbx ) :
-
-SfxToolBoxControl( nSlotId, nId, rTbx )
-{
-
License for Xamarin's changes
Hello Libre Office team, In line with our general corporate policy, code contributed to open source projects is made available under the terms of that project's license. All past and present contributions to LibreOffice from Xamarin are available under LGPLv3+/MPL. Until further notice, all future contributions to LibreOffice from Xamarin are available under LGPLv3+/MPL. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/inc sw/qa sw/source
sw/inc/bparr.hxx |9 --
sw/inc/ndarr.hxx |8 --
sw/qa/core/Test-BigPtrArray.cxx | 135 ---
sw/source/core/bastyp/bparr.cxx | 38 --
sw/source/core/docnode/nodes.cxx | 34 +
5 files changed, 36 insertions(+), 188 deletions(-)
New commits:
commit a47b51b4159729472b8ef55d1fa3e1103947fad1
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Aug 5 16:30:14 2014 +0200
Avoid fn ptr casts in SwNodes::ForEeach
...by moving ForEach from BigPtrArray down to its sole user SwNodes.
Change-Id: I6d326d3e1ac9dc6ac820e600973af420785d5a50
diff --git a/sw/inc/bparr.hxx b/sw/inc/bparr.hxx
index 541be14..3c5ea87 100644
--- a/sw/inc/bparr.hxx
+++ b/sw/inc/bparr.hxx
@@ -43,8 +43,6 @@ protected:
};
typedef BigPtrEntry* ElementPtr;
-typedef bool (*FnForEach)( const ElementPtr, void* pArgs );
-
// 1000 entries per Block = a bit less then 4K
#define MAXENTRY 1000
@@ -63,6 +61,7 @@ struct BlockInfo { // block info:
class SW_DLLPUBLIC BigPtrArray
{
+protected:
BlockInfo** ppInf; // block info
sal_uLong nSize; /// number of elements
sal_uInt16 nMaxBlock; /// current max. number of blocks
@@ -75,7 +74,6 @@ class SW_DLLPUBLIC BigPtrArray
voidBlockDel( sal_uInt16 ); /// some blocks were deleted
voidUpdIndex( sal_uInt16 ); /// recalculate indices
-protected:
// fill all blocks
// the short parameter specifies in percent, how full the blocks should be
// made
@@ -93,11 +91,6 @@ public:
void Replace( sal_uLong pos, const ElementPtr r);
ElementPtr operator[]( sal_uLong ) const;
-void ForEach( FnForEach fn, void* pArgs = NULL )
-{
-ForEach( 0, nSize, fn, pArgs );
-}
-void ForEach( sal_uLong nStart, sal_uLong nEnd, FnForEach fn, void* pArgs
= NULL );
};
inline sal_uLong BigPtrEntry::GetPos() const
diff --git a/sw/inc/ndarr.hxx b/sw/inc/ndarr.hxx
index 26fee7e..02292de 100644
--- a/sw/inc/ndarr.hxx
+++ b/sw/inc/ndarr.hxx
@@ -146,13 +146,9 @@ public:
sal_uLong Count() const { return BigPtrArray::Count(); }
void ForEach( FnForEach_SwNodes fnForEach, void* pArgs = 0 )
{
-BigPtrArray::ForEach( 0, BigPtrArray::Count(),
-(FnForEach) fnForEach, pArgs );
-}
-void ForEach( sal_uLong nStt, sal_uLong nEnd, FnForEach_SwNodes fnForEach,
void* pArgs = 0 )
-{
-BigPtrArray::ForEach( nStt, nEnd, (FnForEach) fnForEach, pArgs );
+ForEach( 0, BigPtrArray::Count(), fnForEach, pArgs );
}
+void ForEach( sal_uLong nStt, sal_uLong nEnd, FnForEach_SwNodes fnForEach,
void* pArgs = 0 );
void ForEach( const SwNodeIndex rStart, const SwNodeIndex rEnd,
FnForEach_SwNodes fnForEach, void* pArgs = 0 );
diff --git a/sw/qa/core/Test-BigPtrArray.cxx b/sw/qa/core/Test-BigPtrArray.cxx
index 18749d81..bc1d824 100644
--- a/sw/qa/core/Test-BigPtrArray.cxx
+++ b/sw/qa/core/Test-BigPtrArray.cxx
@@ -30,6 +30,7 @@
#include stdlib.h
#include bparr.hxx
+#include ndarr.hxx
using namespace std;
@@ -53,11 +54,6 @@ namespace /* private */
return count_;
}
-void setCount(sal_uLong newCount)
-{
-count_ = newCount;
-}
-
sal_uLong Position() const
{
return GetPos();
@@ -67,13 +63,6 @@ namespace /* private */
sal_uLong count_;
};
-bool AddToCount(const ElementPtr rElem, void* pArgs)
-{
-BigPtrEntryMock* const pbem = static_castBigPtrEntryMock*
const(rElem);
-pbem-setCount(pbem-getCount() + *((sal_uLong*)pArgs));
-return true;
-}
-
void dumpBigPtrArray(const BigPtrArray bparr)
{
(void)bparr;
@@ -591,124 +580,6 @@ public:
releaseBigPtrArrayContent(bparr);
}
-void test_for_each()
-{
-printMethodName(test_for_each\n);
-
-BigPtrArray bparr;
-
-fillBigPtrArray(bparr, NUM_ENTRIES);
-dumpBigPtrArray(bparr);
-
-sal_uLong addCount = 1;
-bparr.ForEach(AddToCount, addCount);
-
-for (sal_uLong i = 0; i NUM_ENTRIES; i++)
-{
-CPPUNIT_ASSERT_MESSAGE
-(
-test_for_each failed,
-static_castBigPtrEntryMock*(bparr[i])-getCount() == (i+1)
-);
-}
-
-releaseBigPtrArrayContent(bparr);
-dumpBigPtrArray(bparr);
-}
-
-void test_for_some1()
-{
-printMethodName(test_for_some1\n);
-
-BigPtrArray bparr;
-
-fillBigPtrArray(bparr, NUM_ENTRIES);
-dumpBigPtrArray(bparr);
-
-sal_uLong addCount = 1;
-bparr.ForEach(0, NUM_ENTRIES / 2, AddToCount, addCount);
-
-sal_uLong i = 0;
-for (/* */; i NUM_ENTRIES / 2; i++)
-{
-CPPUNIT_ASSERT_MESSAGE
-(
-
[Libreoffice-commits] core.git: bridges/source
bridges/source/cpp_uno/gcc3_linux_intel/call.hxx| 31 bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx |1 2 files changed, 32 insertions(+) New commits: commit 6526881a0ce4b086a3e5ef23190ae77f7441da0b Author: Stephan Bergmann sberg...@redhat.com Date: Tue Aug 5 17:01:36 2014 +0200 loplugin:unreffun Change-Id: Ie5608777b0bee002437117709d2c96062a39ff55 diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/call.hxx b/bridges/source/cpp_uno/gcc3_linux_intel/call.hxx new file mode 100644 index 000..986d210 --- /dev/null +++ b/bridges/source/cpp_uno/gcc3_linux_intel/call.hxx @@ -0,0 +1,31 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the License); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#ifndef INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_INTEL_CALL_HXX +#define INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_LINUX_INTEL_CALL_HXX + +#include sal/config.h + +extern C void cpp_vtable_call( +int nFunctionIndex, int nVtableOffset, void ** pCallStack, +void * pRegisterReturn); + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx index 7bfa312..defe5aa 100644 --- a/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx @@ -28,6 +28,7 @@ #include bridges/cpp_uno/shared/types.hxx #include bridges/cpp_uno/shared/vtablefactory.hxx +#include call.hxx #include share.hxx using namespace ::com::sun::star::uno; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc14-colors' - svx/source
svx/source/tbxctrls/tbcontrl.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit d1f87b779d5962455cac81622113a6480e4ef752
Author: Krisztian Pinter pin.termina...@gmail.com
Date: Tue Aug 5 17:21:08 2014 +0200
Make small UI tweaks to SvxColorWindow_Impl
Change-Id: I604cbf8ca6f7ebb14c1c95e62f997c3150370119
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 7fc11de..446fb1e 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -1035,6 +1035,7 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString
rCommand,
get(mpColorSet, colorset);
mpColorSet-SetStyle( WinBits(WB_ITEMBORDER | WB_NAMEFIELD | WB_3DLOOK |
WB_NO_DIRECTSELECT) );
+mpColorSet-SetEdgeBlending( false );
if ( SID_ATTR_CHAR_COLOR_BACKGROUND == theSlotId || SID_BACKGROUND_COLOR
== theSlotId )
{
mpColorSet-SetStyle( mpColorSet-GetStyle() | WB_NONEFIELD );
@@ -1149,6 +1150,7 @@ IMPL_LINK_NOARG(SvxColorWindow_Impl, OpenPickerClickHdl)
void SvxColorWindow_Impl::Resize()
{
+mpColorSet-SetSizePixel( this-GetOutputSizePixel() );
SetOutputSizePixel(maWindowSize);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 4 commits - oox/source writerfilter/source
oox/source/token/tokens.txt | 58 ---
writerfilter/source/dmapper/DomainMapperTableManager.cxx |7 -
writerfilter/source/ooxml/fasttokens.py |8 +-
writerfilter/source/ooxml/model.xml | 53 -
4 files changed, 88 insertions(+), 38 deletions(-)
New commits:
commit 4140b9b2a35ef08183b8d2fe4657bdc46fcf7237
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Aug 5 17:24:36 2014 +0200
writerfilter: tokenize all attributes of CT_Cnf
Change-Id: I745dd2aa257899e398f1ae3a79e321156cba7505
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 4cecd37..904128b 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -435,13 +435,6 @@ bool DomainMapperTableManager::sprm(Sprm rSprm)
}
}
break;
-case NS_ooxml::LN_CT_TrPrBase_cnfStyle:
-break; // the cnfStyle doesn't matter, instead the tblLook
property is used to specify conditional styles that are to be used
-case NS_ooxml::LN_CT_PPrBase_cnfStyle:
-// TODO cnfStyle on a paragraph
-break;
-case NS_ooxml::LN_CT_TcPrBase_cnfStyle:
-break; // the cnfStyle doesn't matter, instead the tblLook
property is used to specify conditional styles that are to be used
case NS_ooxml::LN_CT_TblPrBase_tblpPr:
{
writerfilter::ReferenceProperties::Pointer_t pProperties
= rSprm.getProps();
diff --git a/writerfilter/source/ooxml/model.xml
b/writerfilter/source/ooxml/model.xml
index 0a574d3..0a1c9b3 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -18035,6 +18035,42 @@
attribute name=val
ref name=ST_Cnf/
/attribute
+attribute name=firstRow
+ ref name=ST_OnOff/
+/attribute
+attribute name=lastRow
+ ref name=ST_OnOff/
+/attribute
+attribute name=firstColumn
+ ref name=ST_OnOff/
+/attribute
+attribute name=lastColumn
+ ref name=ST_OnOff/
+/attribute
+attribute name=oddVBand
+ ref name=ST_OnOff/
+/attribute
+attribute name=evenVBand
+ ref name=ST_OnOff/
+/attribute
+attribute name=oddHBand
+ ref name=ST_OnOff/
+/attribute
+attribute name=evenHBand
+ ref name=ST_OnOff/
+/attribute
+attribute name=firstRowFirstColumn
+ ref name=ST_OnOff/
+/attribute
+attribute name=firstRowLastColumn
+ ref name=ST_OnOff/
+/attribute
+attribute name=lastRowFirstColumn
+ ref name=ST_OnOff/
+/attribute
+attribute name=lastRowLastColumn
+ ref name=ST_OnOff/
+/attribute
/define
define name=CT_TrPrBase
oneOrMore
@@ -23089,9 +23125,20 @@
action name=end action=endParagraphGroup/
/resource
resource name=ST_Cnf resource=String generated=yes/
-resource name=CT_Cnf resource=Value generated=yes
- attribute name=val tokenid=ooxml:CT_Cnf_val action=setValue/
- action name=start action=setDefaultStringValue/
+resource name=CT_Cnf resource=Properties
+ attribute name=val tokenid=ooxml:CT_Cnf_val/
+ attribute name=firstRow tokenid=ooxml:CT_Cnf_firstRow/
+ attribute name=lastRow tokenid=ooxml:CT_Cnf_lastRow/
+ attribute name=firstColumn tokenid=ooxml:CT_Cnf_firstColumn/
+ attribute name=lastColumn tokenid=ooxml:CT_Cnf_lastColumn/
+ attribute name=oddVBand tokenid=ooxml:CT_Cnf_oddVBand/
+ attribute name=evenVBand tokenid=ooxml:CT_Cnf_evenVBand/
+ attribute name=oddHBand tokenid=ooxml:CT_Cnf_oddHBand/
+ attribute name=evenHBand tokenid=ooxml:CT_Cnf_evenHBand/
+ attribute name=firstRowFirstColumn
tokenid=ooxml:CT_Cnf_firstRowFirstColumn/
+ attribute name=firstRowLastColumn
tokenid=ooxml:CT_Cnf_firstRowLastColumn/
+ attribute name=lastRowFirstColumn
tokenid=ooxml:CT_Cnf_lastRowFirstColumn/
+ attribute name=lastRowLastColumn
tokenid=ooxml:CT_Cnf_lastRowLastColumn/
/resource
resource name=CT_TrPrBase resource=Properties
element name=cnfStyle tokenid=ooxml:CT_TrPrBase_cnfStyle/
commit d1c1248bee686aebff12b0afd7c4d578607f3b3c
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Aug 5 17:09:59 2014 +0200
oox: tokenize all attributes from CT_Cnf
Change-Id: Ifceb9c1319208c897a6f018fa0b5f8863b58c3e1
diff --git a/oox/source/token/tokens.txt b/oox/source/token/tokens.txt
index 59ed938..ae7d2de 100644
--- a/oox/source/token/tokens.txt
+++ b/oox/source/token/tokens.txt
@@ -2120,8 +2120,10 @@ evalOrder
even
evenAndOddHeaders
Re: [RFC} running a formatter over the Java code
On Tue, Aug 5, 2014 at 3:05 PM, Wols Lists antli...@youngman.org.uk wrote: On 05/08/14 09:26, Noel Grandin wrote: Hi Dons flame-proof suit Would there be any objections to my running a formatter over the existing Java LO code (with the exception of the newer Android stuff) ? Because at the moment - it has very little consistency - and it appears that at some point in time a tabs-to-spaces conversion was done, but not all the files followed the same tab-size convention, so some of the formatting is now REALLY out. If you're going to do that, can you investigate a git hook or whatever it is that will enforce that convention on commit? No. Commit hooks should not _modify_ the content, ever! you can have check, but no automagic rewriting. Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/core/layout/ssfrm.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 58069f3676ab98b7383c11ff2fd1f17fa4522d77
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Aug 5 18:01:23 2014 +0200
typos
Change-Id: Iae1589b544a3d52e2cedc906fd0ca3cdc8596034
diff --git a/sw/source/core/layout/ssfrm.cxx b/sw/source/core/layout/ssfrm.cxx
index 73fe603..23dcc2b 100644
--- a/sw/source/core/layout/ssfrm.cxx
+++ b/sw/source/core/layout/ssfrm.cxx
@@ -394,12 +394,12 @@ SwFrm::~SwFrm()
const SwFrmFmt * SwLayoutFrm::GetFmt() const
{
-return static_cast const SwFlyFrmFmt * ( GetDep() );
+return static_cast const SwFrmFmt * ( GetDep() );
}
SwFrmFmt * SwLayoutFrm::GetFmt()
{
-return static_cast SwFlyFrmFmt * ( GetDep() );
+return static_cast SwFrmFmt * ( GetDep() );
}
void SwLayoutFrm::SetFrmFmt( SwFrmFmt *pNew )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/layout/ssfrm.cxx | 24
sw/source/core/text/txtfrm.cxx | 28
2 files changed, 28 insertions(+), 24 deletions(-)
New commits:
commit 32de046e05a5907a85d85cee0b293cab858a0400
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Aug 5 18:33:56 2014 +0200
Move SwTxtFrm specific code from ~SwCntntFrm down to ~SwTxtFrm
...to be executed while this is still a SwTxtFrm, not merely a SwCntntFrm.
Change-Id: Ia2ce9fff7d7e2562deb4bd099975976312cad6c4
diff --git a/sw/source/core/layout/ssfrm.cxx b/sw/source/core/layout/ssfrm.cxx
index 23dcc2b..e1cb418 100644
--- a/sw/source/core/layout/ssfrm.cxx
+++ b/sw/source/core/layout/ssfrm.cxx
@@ -432,30 +432,6 @@ SwCntntFrm::~SwCntntFrm()
pRoot-DisallowTurbo();
pRoot-ResetTurbo();
}
-if( IsTxtFrm() ((SwTxtFrm*)this)-HasFtn() )
-{
-SwTxtNode *pTxtNd = ((SwTxtFrm*)this)-GetTxtNode();
-const SwFtnIdxs rFtnIdxs = pCNd-GetDoc()-GetFtnIdxs();
-sal_uInt16 nPos;
-sal_uLong nIndex = pCNd-GetIndex();
-rFtnIdxs.SeekEntry( *pTxtNd, nPos );
-SwTxtFtn* pTxtFtn;
-if( nPos rFtnIdxs.size() )
-{
-while( nPos pTxtNd == (rFtnIdxs[ nPos ]-GetTxtNode()) )
---nPos;
-if( nPos || pTxtNd != (rFtnIdxs[ nPos ]-GetTxtNode()) )
-++nPos;
-}
-while( nPos rFtnIdxs.size() )
-{
-pTxtFtn = rFtnIdxs[ nPos ];
-if( pTxtFtn-GetTxtNode().GetIndex() nIndex )
-break;
-pTxtFtn-DelFrms( this );
-++nPos;
-}
-}
}
}
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index 42c27be..9da1256 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -74,6 +74,7 @@
#include fldupde.hxx
#include IGrammarContact.hxx
#include switerator.hxx
+#include ftnidx.hxx
TYPEINIT1( SwTxtFrm, SwCntntFrm );
@@ -368,6 +369,33 @@ SwTxtFrm::~SwTxtFrm()
{
// Remove associated SwParaPortion from pTxtCache
ClearPara();
+
+SwCntntNode* pCNd;
+if( 0 != ( pCNd = PTR_CAST( SwCntntNode, GetRegisteredIn() ))
+!pCNd-GetDoc()-IsInDtor() HasFtn() )
+{
+SwTxtNode *pTxtNd = ((SwTxtFrm*)this)-GetTxtNode();
+const SwFtnIdxs rFtnIdxs = pCNd-GetDoc()-GetFtnIdxs();
+sal_uInt16 nPos;
+sal_uLong nIndex = pCNd-GetIndex();
+rFtnIdxs.SeekEntry( *pTxtNd, nPos );
+SwTxtFtn* pTxtFtn;
+if( nPos rFtnIdxs.size() )
+{
+while( nPos pTxtNd == (rFtnIdxs[ nPos ]-GetTxtNode()) )
+--nPos;
+if( nPos || pTxtNd != (rFtnIdxs[ nPos ]-GetTxtNode()) )
+++nPos;
+}
+while( nPos rFtnIdxs.size() )
+{
+pTxtFtn = rFtnIdxs[ nPos ];
+if( pTxtFtn-GetTxtNode().GetIndex() nIndex )
+break;
+pTxtFtn-DelFrms( this );
+++nPos;
+}
+}
}
const OUString SwTxtFrm::GetTxt() const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/DomainMapper.cxx |4
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 12
writerfilter/source/dmapper/TablePropertiesHandler.cxx |1
writerfilter/source/ooxml/OOXMLFactory.cxx |2
writerfilter/source/ooxml/OOXMLFactory.hxx | 19 -
writerfilter/source/ooxml/OOXMLFastContextHandler.hxx | 249 ++---
writerfilter/source/ooxml/OOXMLFastHelper.hxx |4
writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx |1
writerfilter/source/ooxml/fasttokens.py|3
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 16 -
writerfilter/source/rtftok/rtffly.hxx | 28 -
11 files changed, 137 insertions(+), 202 deletions(-)
New commits:
commit eec640d9a0ab8aa52406b711d66f36c3b8d8d83f
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Aug 5 18:33:57 2014 +0200
writerfilter: avoid 'using' in generated header
Change-Id: Ib9510aed34e451c529133c9c114b770c374fe403
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index f80d6c0..3f6c798 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -2980,7 +2980,7 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_,
size_t len)
void DomainMapper::lcl_props(writerfilter::ReferenceProperties::Pointer_t
ref)
{
-string sType = ref-getType();
+std::string sType = ref-getType();
if( sType == PICF )
{
m_pImpl-ImportGraphic(ref, IMPORT_AS_GRAPHIC);
@@ -3122,7 +3122,7 @@ void DomainMapper_Impl::substream(Id rName,
}
}
-void DomainMapper::lcl_info(const string /*info_*/)
+void DomainMapper::lcl_info(const std::string /*info_*/)
{
}
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 1c736f0..1cb3354 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1636,8 +1636,8 @@ void DomainMapper_Impl::CheckParaMarkerRedline(
uno::Reference text::XTextRange
void DomainMapper_Impl::CheckRedline( uno::Reference text::XTextRange
const xRange )
{
-vectorRedlineParamsPtr::iterator pIt = m_aRedlines.top().begin( );
-vector RedlineParamsPtr aCleaned;
+std::vectorRedlineParamsPtr::iterator pIt = m_aRedlines.top().begin( );
+std::vector RedlineParamsPtr aCleaned;
for (; pIt != m_aRedlines.top().end( ); ++pIt )
{
CreateRedline( xRange, *pIt );
@@ -2175,12 +2175,12 @@ static OUString lcl_ExtractToken(OUString const
rCommand,
}
SAL_DLLPUBLIC_EXPORT // export just for test
-boost::tupleOUString, vectorOUString, vectorOUString
+boost::tupleOUString, std::vectorOUString, std::vectorOUString
lcl_SplitFieldCommand(const OUString rCommand)
{
OUString sType;
-vectorOUString arguments;
-vectorOUString switches;
+std::vectorOUString arguments;
+std::vectorOUString switches;
sal_Int32 nStartIndex(0);
do
@@ -3306,7 +3306,7 @@ void DomainMapper_Impl::CloseFieldCommand()
{
uno::Reference uno::XInterface xFieldInterface;
-boost::tupleOUString, vectorOUString, vectorOUString const
+boost::tupleOUString, std::vectorOUString,
std::vectorOUString const
field(lcl_SplitFieldCommand(pContext-GetCommand()));
OUString const sFirstParam(boost::get1(field).empty()
? OUString() : boost::get1(field).front());
diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.cxx
b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
index 64172a0..0832ec2 100644
--- a/writerfilter/source/dmapper/TablePropertiesHandler.cxx
+++ b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
@@ -34,6 +34,7 @@
#include dmapperLoggers.hxx
#include ooxml/OOXMLFastTokens.hxx
+using namespace com::sun::star;
namespace writerfilter {
namespace dmapper {
diff --git a/writerfilter/source/ooxml/OOXMLFactory.cxx
b/writerfilter/source/ooxml/OOXMLFactory.cxx
index 5f8512f..e40096a 100644
--- a/writerfilter/source/ooxml/OOXMLFactory.cxx
+++ b/writerfilter/source/ooxml/OOXMLFactory.cxx
@@ -28,6 +28,8 @@
namespace writerfilter {
namespace ooxml {
+using namespace com::sun::star;
+
AttributeInfo::AttributeInfo()
:m_nResource(RT_NoResource), m_nRef(0)
{
diff --git a/writerfilter/source/ooxml/OOXMLFactory.hxx
b/writerfilter/source/ooxml/OOXMLFactory.hxx
index 6167290..6b7eb30 100644
--- a/writerfilter/source/ooxml/OOXMLFactory.hxx
+++ b/writerfilter/source/ooxml/OOXMLFactory.hxx
@@ -82,7 +82,7 @@ struct CreateElement
typedef boost::unordered_mapToken_t, CreateElement CreateElementMap;
typedef boost::shared_ptrCreateElementMap CreateElementMapPointer;
typedef boost::unordered_mapId, CreateElementMapPointer CreateElementsMap;
-typedef boost::unordered_mapId, string IdToStringMap;
+typedef
[Libreoffice-commits] core.git: 2 commits - include/svx svx/source writerfilter/CustomTarget_source.mk writerfilter/inc writerfilter/source
include/svx/svdobj.hxx |2 svx/source/svdraw/svdobj.cxx |6 - writerfilter/CustomTarget_source.mk|7 - writerfilter/inc/resourcemodel/WW8ResourceModel.hxx|2 writerfilter/source/dmapper/DomainMapper.cxx | 29 +++--- writerfilter/source/dmapper/DomainMapper_Impl.cxx | 15 +-- writerfilter/source/dmapper/TablePropertiesHandler.cxx | 11 +- writerfilter/source/dmapper/TrackChangesHandler.cxx| 11 +- writerfilter/source/ooxml/OOXMLFactory.cxx |2 writerfilter/source/ooxml/OOXMLFactory.hxx |2 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 45 - writerfilter/source/ooxml/OOXMLFastContextHandler.hxx |2 writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx |2 writerfilter/source/ooxml/OOXMLFastTokenHandler.cxx|4 writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx |2 writerfilter/source/ooxml/factoryimpl.py |2 writerfilter/source/ooxml/factoryimpl_ns.py|3 writerfilter/source/ooxml/fasttokens.py| 79 - writerfilter/source/ooxml/gperffasttokenhandler.py |6 - writerfilter/source/ooxml/modelpreprocess.py |2 writerfilter/source/rtftok/rtfdocumentimpl.cxx |4 21 files changed, 80 insertions(+), 158 deletions(-) New commits: commit 459603e36a03e91310c236555f80ae612f02d6b2 Author: Miklos Vajna vmik...@collabora.co.uk Date: Tue Aug 5 19:09:03 2014 +0200 writerfilter: bin OOXML_something duplication of oox::XML_something constants workdir/CustomTarget/writerfilter/source/ooxml/OOXMLFastTokens.hxx was a duplication of workdir/CustomTarget/oox/generated/oox/token/tokens.hxx, except when the oox generator changed, the writerfilter copy was not adjusted and Bad Things happened. We don't need this. Change-Id: Id92481f110b04ec24cb424421aa0ec029b7896f3 diff --git a/writerfilter/CustomTarget_source.mk b/writerfilter/CustomTarget_source.mk index 10d74a7..922e5a1 100644 --- a/writerfilter/CustomTarget_source.mk +++ b/writerfilter/CustomTarget_source.mk @@ -48,7 +48,6 @@ writerfilter_ALL = \ $(writerfilter_GEN_ooxml_Factory_cxx) \ $(writerfilter_GEN_ooxml_Factory_hxx) \ $(writerfilter_GEN_ooxml_FactoryValues_hxx) \ - $(writerfilter_GEN_ooxml_FastTokens_hxx) \ $(writerfilter_GEN_ooxml_GperfFastToken_hxx) \ $(writerfilter_GEN_ooxml_NamespaceIds_hxx) \ $(writerfilter_GEN_ooxml_QNameToStr_cxx) \ @@ -61,14 +60,12 @@ writerfilter_DEP_ooxml_Namespaces_txt=$(call gb_CustomTarget_get_workdir,oox/gen writerfilter_GEN_ooxml_FactoryValues_hxx=$(writerfilter_WORK)/ooxml/OOXMLFactory_values.hxx writerfilter_GEN_ooxml_Factory_cxx=$(writerfilter_WORK)/ooxml/OOXMLFactory_generated.cxx writerfilter_GEN_ooxml_Factory_hxx=$(writerfilter_WORK)/ooxml/OOXMLFactory_generated.hxx -writerfilter_GEN_ooxml_FastTokens_hxx=$(writerfilter_WORK)/ooxml/OOXMLFastTokens.hxx writerfilter_GEN_ooxml_GperfFastToken_hxx=$(writerfilter_WORK)/ooxml/gperffasttoken.hxx writerfilter_GEN_ooxml_Model_processed=$(writerfilter_WORK)/ooxml/model_preprocessed.xml writerfilter_GEN_ooxml_NamespaceIds_hxx=$(writerfilter_WORK)/ooxml/OOXMLnamespaceids.hxx writerfilter_GEN_ooxml_QNameToStr_cxx=$(writerfilter_WORK)/ooxml/qnametostr.cxx writerfilter_GEN_ooxml_ResourceIds_hxx=$(writerfilter_WORK)/ooxml/resourceids.hxx writerfilter_GEN_ooxml_Token_xml=$(writerfilter_WORK)/ooxml/token.xml -writerfilter_SRC_ooxml_FastTokens_py=$(writerfilter_SRC)/ooxml/fasttokens.py writerfilter_SRC_ooxml_GperfFastTokenHandler_py=$(writerfilter_SRC)/ooxml/gperffasttokenhandler.py writerfilter_SRC_ooxml_Model=$(writerfilter_SRC)/ooxml/model.xml writerfilter_SRC_ooxml_Preprocess_py=$(writerfilter_SRC)/ooxml/modelpreprocess.py @@ -83,10 +80,6 @@ $(writerfilter_GEN_ooxml_Factory_hxx) : $(writerfilter_SRC)/ooxml/factoryinc.py $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,PY ,1) $(call gb_Helper_abbreviate_dirs, $(writerfilter_PYTHONCOMMAND) $ $(writerfilter_GEN_ooxml_Model_processed)) $@ -$(writerfilter_GEN_ooxml_FastTokens_hxx) : $(writerfilter_SRC_ooxml_FastTokens_py) $(writerfilter_GEN_ooxml_Token_xml) | $(writerfilter_WORK)/ooxml/.dir - $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,PY ,1) - $(call gb_Helper_abbreviate_dirs, $(writerfilter_PYTHONCOMMAND) $(writerfilter_SRC_ooxml_FastTokens_py) $(writerfilter_GEN_ooxml_Token_xml)) $@ - $(writerfilter_GEN_ooxml_GperfFastToken_hxx) : $(writerfilter_SRC_ooxml_GperfFastTokenHandler_py) $(writerfilter_GEN_ooxml_Token_xml) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,GPF,1) $(call gb_Helper_abbreviate_dirs, $(writerfilter_PYTHONCOMMAND) $(writerfilter_SRC_ooxml_GperfFastTokenHandler_py) $(writerfilter_GEN_ooxml_Token_xml)) \ diff --git
[Libreoffice-commits] core.git: Branch 'feature/lok_sofficemain' - 9 commits - desktop/source libreofficekit/qa
desktop/source/lib/init.cxx | 101 +---
libreofficekit/qa/data/blank_presentation.odp |binary
libreofficekit/qa/data/blank_text.odt |binary
libreofficekit/qa/data/impress_slidenames.odp |binary
libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx | 29 -
libreofficekit/qa/unit/tiledrendering.cxx | 100 +--
6 files changed, 160 insertions(+), 70 deletions(-)
New commits:
commit 8fd04dd87339c86636ca2285e5aac2b643276115
Author: Andrzej Hunt andrzej.h...@collabora.com
Date: Thu Jul 31 11:57:09 2014 +0200
LOK: add document loading failure test.
We don't really have any way of telling the client that the file didn't
exist yet though, so not very useful so far.
Change-Id: I1db386781b88b345f3e9cb4f37838ca1d95f92f9
diff --git a/libreofficekit/qa/unit/tiledrendering.cxx
b/libreofficekit/qa/unit/tiledrendering.cxx
index 043ffaf..5d61000 100644
--- a/libreofficekit/qa/unit/tiledrendering.cxx
+++ b/libreofficekit/qa/unit/tiledrendering.cxx
@@ -48,6 +48,7 @@ public:
// components on the one Office instance that we retrieve.
void runAllTests();
+void testDocumentLoadFail( Office* pOffice );
void testDocumentTypes( Office* pOffice );
void testImpressSlideNames( Office* pOffice );
void testOverlay( Office* pOffice );
@@ -63,11 +64,23 @@ void TiledRenderingTest::runAllTests()
m_sLOPath.c_str() ) );
CPPUNIT_ASSERT( pOffice.get() );
+testDocumentLoadFail( pOffice.get() );
testDocumentTypes( pOffice.get() );
testImpressSlideNames( pOffice.get() );
testOverlay( pOffice.get() );
}
+void TiledRenderingTest::testDocumentLoadFail( Office* pOffice )
+{
+const string sDocPath = m_sSrcRoot +
/libreofficekit/qa/data/IDONOTEXIST.odt;
+scoped_ptr Document pDocument( pOffice-documentLoad( sDocPath.c_str() )
);
+CPPUNIT_ASSERT( !pDocument.get() );
+// TODO: we probably want to have some way of returning what
+// the cause of failure was. getError() will return
+// something along the lines of:
+// Unsupported URL
file:///SRC_ROOT/libreofficekit/qa/data/IDONOTEXIST.odt: type detection
failed
+}
+
// Our dumped .png files end up in
// workdir/CppunitTest/libreofficekit_tiledrendering.test.core
commit 8c1bb1cd0e6e08b5aedb67c1279dcd5f57050238
Author: Andrzej Hunt andrzej.h...@collabora.com
Date: Thu Jul 31 11:20:00 2014 +0200
LOK documentLoad needs SolarMutex protection too.
We probably need to do this for most of LOK now that
we use soffice_main.
Change-Id: I77be7865511c083679cf2f68b0e5df106506fd70
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index a521d06..a08ab93 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -282,6 +282,8 @@ static LibreOfficeKitDocument*
lo_documentLoad(LibreOfficeKit* pThis, const char
OUString aURL = getAbsoluteURL(pURL);
+SolarMutexGuard aGuard;
+
uno::Referenceframe::XDesktop2 xComponentLoader =
frame::Desktop::create(xContext);
pLib-maLastExceptionMsg = ;
commit 9be8958a9470be52221906999f28bf8541733341
Author: Andrzej Hunt andrzej.h...@collabora.com
Date: Thu Jul 31 10:22:55 2014 +0200
LOK: add test for getDocumentType.
Change-Id: I264567f73dae9ecd061e09c4413857f793fcac48
diff --git a/libreofficekit/qa/data/blank_presentation.odp
b/libreofficekit/qa/data/blank_presentation.odp
new file mode 100644
index 000..fd68d9a
Binary files /dev/null and b/libreofficekit/qa/data/blank_presentation.odp
differ
diff --git a/libreofficekit/qa/data/blank_text.odt
b/libreofficekit/qa/data/blank_text.odt
new file mode 100644
index 000..00b92d7
Binary files /dev/null and b/libreofficekit/qa/data/blank_text.odt differ
diff --git a/libreofficekit/qa/unit/tiledrendering.cxx
b/libreofficekit/qa/unit/tiledrendering.cxx
index c544615..043ffaf 100644
--- a/libreofficekit/qa/unit/tiledrendering.cxx
+++ b/libreofficekit/qa/unit/tiledrendering.cxx
@@ -48,6 +48,7 @@ public:
// components on the one Office instance that we retrieve.
void runAllTests();
+void testDocumentTypes( Office* pOffice );
void testImpressSlideNames( Office* pOffice );
void testOverlay( Office* pOffice );
@@ -62,6 +63,7 @@ void TiledRenderingTest::runAllTests()
m_sLOPath.c_str() ) );
CPPUNIT_ASSERT( pOffice.get() );
+testDocumentTypes( pOffice.get() );
testImpressSlideNames( pOffice.get() );
testOverlay( pOffice.get() );
}
@@ -83,6 +85,34 @@ static void dumpRGBABitmap( const OUString rPath, const
unsigned char* pBuffer,
sOutput.Close();
}
+LibreOfficeKitDocumentType getDocumentType( Office* pOffice, const string
rPath )
+{
+scoped_ptr Document pDocument( pOffice-documentLoad( rPath.c_str() ) );
+CPPUNIT_ASSERT( pDocument.get() );
+return
[Libreoffice-commits] core.git: sot/source
sot/source/base/formats.cxx |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit a96a7ce51aa98fb9ee97ea3803e2b7e648611008
Author: Andrzej Hunt andrzej.h...@collabora.com
Date: Tue Aug 5 19:15:14 2014 +0200
fdo#81835 Don't prefer GDI Metafiles to RTF/HTML
Was first introduced by 538c13f3d1756f2d105115f64ab1bc0b7426eebc
We should process clipboard formats in order of descriptive-/
usefulness -- however png/bmp are special cases (as browsers
will add an html equivalent to their clipboard when copying raw
images, with the raw image being the preferred target format)
and were therefore moved up in the paste-preference list,
mistakenly it was assumed that GDI Metafiles should be subject
to the same treatment, but it appears that Word (and Wordpad?)
will provide both RTF (preferred) and GDI for formatted text.
Change-Id: I731986fc9d70e7aeb64e53764e32cfec3e27eca1
diff --git a/sot/source/base/formats.cxx b/sot/source/base/formats.cxx
index 753e738..c61508e 100644
--- a/sot/source/base/formats.cxx
+++ b/sot/source/base/formats.cxx
@@ -857,7 +857,6 @@ static SotAction_Impl const
aEXCHG_DEST_SWDOC_FREE_AREA_Copy[] = \
{ SOT_FORMATSTR_ID_SD_OLE, EXCHG_OUT_ACTION_INSERT_OLE |
EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL,
0 },\
{ SOT_FORMATSTR_ID_EMBED_SOURCE, EXCHG_OUT_ACTION_INSERT_OLE |
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
{ SOT_FORMATSTR_ID_EMBEDDED_OBJ, EXCHG_OUT_ACTION_INSERT_OLE |
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
-{ SOT_FORMAT_GDIMETAFILE, EXCHG_OUT_ACTION_INSERT_GDIMETAFILE |
EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL,
0 },\
{ SOT_FORMATSTR_ID_PNG, EXCHG_OUT_ACTION_INSERT_BITMAP |
EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL,
0 },\
{ SOT_FORMAT_BITMAP, EXCHG_OUT_ACTION_INSERT_BITMAP |
EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL,
0 },\
{ SOT_FORMATSTR_ID_HTML, EXCHG_OUT_ACTION_INSERT_HTML |
EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL,
0 },\
@@ -869,6 +868,7 @@ static SotAction_Impl const
aEXCHG_DEST_SWDOC_FREE_AREA_Copy[] = \
{ SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK,
EXCHG_OUT_ACTION_INSERT_HYPERLINK | EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP |
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
{ SOT_FORMATSTR_ID_FILEGRPDESCRIPTOR,
EXCHG_OUT_ACTION_INSERT_HYPERLINK | EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP |
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, FILEGRPDSC_ONLY_URL },\
{ SOT_FORMATSTR_ID_UNIFORMRESOURCELOCATOR,
EXCHG_OUT_ACTION_INSERT_HYPERLINK | EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP |
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
+{ SOT_FORMAT_GDIMETAFILE, EXCHG_OUT_ACTION_INSERT_GDIMETAFILE |
EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL,
0 },\
{ SOT_FORMATSTR_ID_EMBED_SOURCE_OLE, EXCHG_OUT_ACTION_INSERT_OLE |
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
{ SOT_FORMATSTR_ID_EMBEDDED_OBJ_OLE, EXCHG_OUT_ACTION_INSERT_OLE |
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
{ SOT_FORMATSTR_ID_LINK, EXCHG_OUT_ACTION_INSERT_DDE |
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
@@ -1036,7 +1036,6 @@ static SotAction_Impl const
aEXCHG_DEST_SCDOC_FREE_AREA_Copy[] = \
{ SOT_FORMATSTR_ID_EMBEDDED_OBJ, EXCHG_OUT_ACTION_INSERT_OLE |
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
{ SOT_FORMATSTR_ID_BIFF_5, EXCHG_IN_ACTION_COPY |
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
{ SOT_FORMATSTR_ID_BIFF__5,EXCHG_IN_ACTION_COPY |
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
-{ SOT_FORMAT_GDIMETAFILE, EXCHG_OUT_ACTION_INSERT_GDIMETAFILE |
EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL,
0 },\
{ SOT_FORMATSTR_ID_PNG, EXCHG_OUT_ACTION_INSERT_BITMAP |
EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL,
0 },\
{ SOT_FORMAT_BITMAP, EXCHG_OUT_ACTION_INSERT_BITMAP |
EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL,
0 },\
{ SOT_FORMATSTR_ID_HTML, EXCHG_OUT_ACTION_INSERT_HTML |
EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL,
0 },\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - chart2/qa include/oox oox/source
chart2/qa/extras/chart2export.cxx| 18
chart2/qa/extras/data/docx/3d-bar-label.docx |binary
include/oox/export/chartexport.hxx |2 -
oox/source/export/chartexport.cxx| 29 +--
4 files changed, 38 insertions(+), 11 deletions(-)
New commits:
commit 2f247407662922fe84bcc0e2aac3372d9ca1cb7b
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Aug 5 11:44:21 2014 -0400
Add test to ensure that we don't export label position attributes.
At least for 3D bar chart, exporting this would choke MS Office.
Change-Id: Ic6747f3c5502495d8cae734290183ff89b14fc70
diff --git a/chart2/qa/extras/chart2export.cxx
b/chart2/qa/extras/chart2export.cxx
index 1beb411..67d25f9 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -70,6 +70,7 @@ public:
void testFdo78290CombinationChartMarkerX();
void testAxisNumberFormatODS();
void testDataLabelBordersDOCX();
+void testDataLabel3DChartDOCX();
CPPUNIT_TEST_SUITE(Chart2ExportTest);
CPPUNIT_TEST(test);
@@ -105,6 +106,7 @@ public:
CPPUNIT_TEST(testFdo78290CombinationChartMarkerX);
CPPUNIT_TEST(testAxisNumberFormatODS);
CPPUNIT_TEST(testDataLabelBordersDOCX);
+CPPUNIT_TEST(testDataLabel3DChartDOCX);
CPPUNIT_TEST_SUITE_END();
protected:
@@ -802,6 +804,22 @@ void Chart2ExportTest::testDataLabelBordersDOCX()
aTest.checkObject2(xChartDoc);
}
+void Chart2ExportTest::testDataLabel3DChartDOCX()
+{
+load(/chart2/qa/extras/data/docx/, 3d-bar-label.docx);
+
+Referencechart2::XChartDocument xChartDoc(getChartDocFromWriter(0),
uno::UNO_QUERY);
+CPPUNIT_ASSERT(xChartDoc.is());
+
+xmlDocPtr pXmlDoc = parseExport(word/charts/chart,Office Open XML
Text);
+CPPUNIT_ASSERT(pXmlDoc);
+
+// We must not export label position attributes for 3D bar charts. The
+// same rule also applies to several other 3D charts, apparently.
+assertXPath(pXmlDoc,
/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:dLblPos, 0);
+assertXPath(pXmlDoc,
/c:chartSpace/c:chart/c:plotArea/c:barChart/c:ser/c:dLbls/c:dLbl/c:dLblPos,
0);
+}
+
void Chart2ExportTest::testBarChartRotation()
{
load (/chart2/qa/extras/data/docx/, barChartRotation.docx);
diff --git a/chart2/qa/extras/data/docx/3d-bar-label.docx
b/chart2/qa/extras/data/docx/3d-bar-label.docx
new file mode 100755
index 000..69cab8e
Binary files /dev/null and b/chart2/qa/extras/data/docx/3d-bar-label.docx differ
commit bb13f1a063c8934325929ff5b1944814bc2cb023
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Aug 5 10:15:28 2014 -0400
Avoid exporting label placement property when the chart is 3D.
MS Office has trouble loading the file if you do. There is an exception,
however. A pie chart allows label placement option even when 3D. There
may be other chart types that allow variable label placement when 3D.
Change-Id: I6a9247041ca6ee3ae1b9c245f5919fcb35951f24
diff --git a/include/oox/export/chartexport.hxx
b/include/oox/export/chartexport.hxx
index 8d570ec..7eb7e81 100644
--- a/include/oox/export/chartexport.hxx
+++ b/include/oox/export/chartexport.hxx
@@ -157,7 +157,7 @@ private:
void exportDataPoints(
const ::com::sun::star::uno::Reference
::com::sun::star::beans::XPropertySet xSeriesProperties,
sal_Int32 nSeriesLength );
-void exportDataLabels( const
css::uno::Referencecss::chart2::XDataSeries xSeries, sal_Int32 nSeriesLength
);
+void exportDataLabels( const
css::uno::Referencecss::chart2::XDataSeries xSeries, sal_Int32
nSeriesLength, sal_Int32 eChartType );
void exportGrouping( bool isBar = false );
void exportTrendlines( ::com::sun::star::uno::Reference
::com::sun::star::chart2::XDataSeries xSeries );
void exportMarker( ::com::sun::star::uno::Reference
::com::sun::star::chart2::XDataSeries xSeries );
diff --git a/oox/source/export/chartexport.cxx
b/oox/source/export/chartexport.cxx
index 2d4555f..66df939 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -1761,7 +1761,7 @@ void ChartExport::exportSeries( Reference
chart2::XChartType xChartType, sal_
// Excel does not like our current data label export
// for scatter charts
if( eChartType != chart::TYPEID_SCATTER )
-exportDataLabels(aSeriesSeq[nSeriesIdx],
nSeriesLength);
+exportDataLabels(aSeriesSeq[nSeriesIdx],
nSeriesLength, eChartType);
exportTrendlines( aSeriesSeq[nSeriesIdx] );
@@ -2555,18 +2555,17 @@ const char* toOOXMLPlacement( sal_Int32 nPlacement )
return outEnd;
}
-void writeLabelProperties( FSHelperPtr pFS, const
uno::Referencebeans::XPropertySet xPropSet )
+void writeLabelProperties(
+FSHelperPtr pFS, const uno::Referencebeans::XPropertySet
[Libreoffice-commits] core.git: Changes to 'feature/gsoc14-personas2'
New branch 'feature/gsoc14-personas2' available with the following commits: commit be5b98f43526c9ab8bd0436a5fbd568b252cb8e4 Author: Rachit Gupta rachitgupta1...@gmail.com Date: Tue Aug 5 22:49:22 2014 +0530 Removed hardcoded strings. Replaced the hardcoded strings with their CUI_RES equivalents. Change-Id: I1f4e0451839cd9fe10aa9d1c5ae82af9fa13dc4e commit add94e482716809ca667b494eba15d145e7abdc6 Author: Rachit Gupta rachitgupta1...@gmail.com Date: Tue Aug 5 21:27:20 2014 +0530 Changed Select Persona Dialog. The result buttons are visible initially but are disabled. These get enabled when the results are available. A little code clean up. Change-Id: I6217d59220d871909bd001a6c7f3636b05cdf911 commit 7809ac111d78c64a46d87266a40acdde677c2609 Author: Rachit Gupta rachitgupta1...@gmail.com Date: Tue Jul 29 19:39:57 2014 +0530 Added title to the Select Persona Dialog. Change-Id: Ia54e94c84e71fb794e7dec67f89306a5dd465f68 commit d0f95525cbc7000669a18541f478d6e9c5d2be30 Author: Rachit Gupta rachitgupta1...@gmail.com Date: Fri Jul 11 21:50:54 2014 +0530 Fixed crash when cancel is clicked without searching. Change-Id: I67ca901270874794ec55d5b7db2cd18e6d3a997d commit ff1e7a1df34e26b0e6b4a0d7694e1efa4d4bf1f0 Author: Rachit Gupta rachitgupta1...@gmail.com Date: Thu Jul 10 23:23:12 2014 +0530 Fixed thread related issues. Added a data member m_bExecute which defaults to true but is set to false when StopExecution is called. During execution, the member's value is checked at various positions, if it is false, the execution is stopped by returning from the execute method. Following issues have been resolved: * Multiple searches can be performed. The previous search is halted. * Cancel button can be pressed in between any search or application of the persona. * A theme can be selected and applied by clicking on OK while the search is being done. Change-Id: Ic76c224ca0d317a6e1a44b3e8933a3ba50b371cb commit 7c41f8cbc8396b755eb3280d6c22f6c9420f49ae Author: Rachit Gupta rachitgupta1...@gmail.com Date: Tue Jul 8 22:09:30 2014 +0530 The Select personas installed via extensions label is invisible by default. The label is not shown if there are no persona extensions installed. Change-Id: I758bb7ff7f22d56bfb7fe212908f9f5f1f3e7979 commit c7aeada5f674618c0a5e9e8d9bc01bcf1f159b83 Author: Rachit Gupta rachitgupta1...@gmail.com Date: Tue Jul 8 21:53:28 2014 +0530 Improved UI: Large buttons are not shown. * In the Personalization Tab Page, the button sizes are not affected by the presence of the preview buttons. THey remain their original size. * Added some padding and spacing to avoid cluttering of the widgets. Change-Id: Iea919b9fbfce4a7bfc82f73ccb49f94aa10ec804 commit defdb9e435643b597b5af02e3dbe51b45f9a5ac9 Author: Rachit Gupta rachitgupta1...@gmail.com Date: Wed Jul 2 14:01:59 2014 +0530 Added feature of clearing the registry in case something goes wrong. If the installed extension is removed, then the persona settings in the registry are cleared to avoid odd look in the UI. Change-Id: Iaa99f4c87ec6ce4a663e1a3cebb3f8ff45e02079 commit 8f066be6fab69721c872e442c794c97942837b4c Author: Rachit Gupta rachitgupta1...@gmail.com Date: Wed Jul 2 10:11:04 2014 +0530 Minor fix: Own persona selected when user selects installed persona. Change-Id: I5ecd9e3b4a9b878cf5aeb2ccce2e51b45ce9a70a commit 6cd70e51ef0cf4520a1068e35349df2ec8d722f8 Author: Rachit Gupta rachitgupta1...@gmail.com Date: Tue Jul 1 18:27:42 2014 +0530 Changed Personas installed through extensions procedure. The UI now consists of a TreeView that lists all the personas that were installed through extensions. When the user selects any name from the list, the preview is shown in a button besides the list. If there are no extensions installed, the list stays hidden. Change-Id: I030d99549fd5b15d1104224116257ad62cdd1891 commit a774e913dc698048c13e7d6b7dc0f2fee359467f Author: Rachit Gupta rachitgupta1...@gmail.com Date: Tue Jul 1 15:30:44 2014 +0530 Moved the personas installed through extensions handling to 'own'. Change-Id: I12baaf22bfad73e228d3ed55dcf365f8eba9cf0a commit de1422dd9fabf04d9edf5bcc28aa8a58ddee56c8 Author: Rachit Gupta rachitgupta1...@gmail.com Date: Tue Jul 1 13:34:39 2014 +0530 Fixed Bug: Persona info is deleted if No Persona is selected. If the user selects 'Plain look..' and clicks OK, the previous persona information is removed from the registry so that if the user selects either of the other option and clicks OK, the previous theme is not applied. Change-Id: I5f6a707e5f2724d2a3c39965d155cf47c898d392 commit 43d91a59e9be02a02a13600fb0084e8938988edb Author: Rachit Gupta rachitgupta1...@gmail.com
[Libreoffice-commits] core.git: avmedia/source config_host.mk.in configure.ac RepositoryExternal.mk
RepositoryExternal.mk | 18 ++
avmedia/source/opengl/oglframegrabber.hxx |4
avmedia/source/opengl/oglplayer.hxx |4
avmedia/source/opengl/oglwindow.hxx |4
config_host.mk.in |3 +++
configure.ac | 15 ++-
6 files changed, 47 insertions(+), 1 deletion(-)
New commits:
commit 97bda8e081fd746e9ef743b165b5bf621fc21fbb
Author: Rene Engelhard r...@debian.org
Date: Tue Aug 5 20:05:35 2014 +0200
implement --with-system-gltf
Change-Id: Ic842006b28f8043bcbbaa81ab5a20e15aa52ac82
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 4026bd7..a9c9e53 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3315,6 +3315,8 @@ endif # DESKTOP
ifeq ($(ENABLE_GLTF),TRUE)
+ifneq ($(SYSTEM_LIBGLTF),TRUE)
+
define gb_LinkTarget__use_libgltf
$(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,libgltf)/inc \
@@ -3340,6 +3342,22 @@ $(call
gb_ExternalProject_use_external_project,$(1),libgltf)
endef
+else # SYSTEM_LIBGLTF
+
+define gb_LinkTarget__use_libgltf
+$(call gb_LinkTarget_set_include,$(1),\
+ $$(INCLUDE) \
+ $(LIBGLTF_CFLAGS) \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(LIBGLTF_LIBS))
+$(call gb_LinkTarget_add_defs,$(1),\
+ -DSYSTEM_LIBGLTF \
+)
+
+endef
+
+endif # SYSTEN_LIBGLTF
+
define gb_LinkTarget__use_opencollada_parser
$(call gb_LinkTarget_set_include,$(1),\
-I$(call
gb_UnpackedTarball_get_dir,opencollada)/COLLADABaseUtils/include \
diff --git a/avmedia/source/opengl/oglframegrabber.hxx
b/avmedia/source/opengl/oglframegrabber.hxx
index 5beb15b..0d38224 100644
--- a/avmedia/source/opengl/oglframegrabber.hxx
+++ b/avmedia/source/opengl/oglframegrabber.hxx
@@ -14,7 +14,11 @@
#include com/sun/star/lang/XServiceInfo.hpp
#include com/sun/star/media/XFrameGrabber.hpp
+#ifdef SYSTEM_LIBGLTF
+#include libgltf/libgltf.h
+#else
#include libgltf.h
+#endif
namespace avmedia { namespace ogl {
diff --git a/avmedia/source/opengl/oglplayer.hxx
b/avmedia/source/opengl/oglplayer.hxx
index bb11578..75e2964 100644
--- a/avmedia/source/opengl/oglplayer.hxx
+++ b/avmedia/source/opengl/oglplayer.hxx
@@ -14,7 +14,11 @@
#include cppuhelper/basemutex.hxx
#include com/sun/star/lang/XServiceInfo.hpp
#include com/sun/star/media/XPlayer.hpp
+#ifdef SYSTEM_LIBGLTF
+#include libgltf/libgltf.h
+#else
#include libgltf.h
+#endif
#include vcl/opengl/OpenGLContext.hxx
#include vcl/timer.hxx
diff --git a/avmedia/source/opengl/oglwindow.hxx
b/avmedia/source/opengl/oglwindow.hxx
index 5697e47..0802bb3 100644
--- a/avmedia/source/opengl/oglwindow.hxx
+++ b/avmedia/source/opengl/oglwindow.hxx
@@ -17,7 +17,11 @@
#include com/sun/star/media/XPlayerWindow.hpp
#include com/sun/star/media/ZoomLevel.hpp
+#ifdef SYSTEM_LIBGLTF
+#include libgltf/libgltf.h
+#else
#include libgltf.h
+#endif
#include vcl/opengl/OpenGLContext.hxx
#include vcl/syschild.hxx
diff --git a/config_host.mk.in b/config_host.mk.in
index 8c38df6..4f88983 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -127,6 +127,9 @@ export ENABLE_GRAPHITE=@ENABLE_GRAPHITE@
export ENABLE_ORCUS=@ENABLE_ORCUS@
export ENABLE_HARFBUZZ=@ENABLE_HARFBUZZ@
export ENABLE_GLTF=@ENABLE_GLTF@
+export SYSTEM_LIBGLTF=@SYSTEM_LIBGLTF@
+export LIBGLTF_CFLAGS=@LIBGLTF_CFLAGS@
+export LIBGLTF_LIBS=@LIBGLTF_LIBS@
export ENABLE_GSTREAMER=@ENABLE_GSTREAMER@
export ENABLE_GSTREAMER_0_10=@ENABLE_GSTREAMER_0_10@
export ENABLE_GTK3=@ENABLE_GTK3@
diff --git a/configure.ac b/configure.ac
index 73705b3..e91773f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1595,6 +1595,11 @@ AC_ARG_WITH(system-jpeg,
[Use jpeg already on system.]),,
[with_system_jpeg=auto])
+AC_ARG_WITH(system-libgltf,
+AS_HELP_STRING([--with-system-libgltf],
+[Use libgltf already on system.]),,
+[with_system_libgltf=auto])
+
AC_ARG_WITH(system-clucene,
AS_HELP_STRING([--with-system-clucene],
[Use clucene already on system.]),,
@@ -10617,7 +10622,12 @@ if test x$enable_gltf != xno -a $_os != iOS -a
$_os != Android; then
ENABLE_GLTF=TRUE
AC_MSG_RESULT([yes])
AC_DEFINE(HAVE_FEATURE_GLTF,1)
-BUILD_TYPE=$BUILD_TYPE LIBGLTF
+if test $with_system_libgltf = yes; then
+ SYSTEM_LIBGLTF=TRUE
+ PKG_CHECK_MODULES( LIBGLTF, libgltf-0.0 )
+else
+ BUILD_TYPE=$BUILD_TYPE LIBGLTF
+fi
# otherwise build fails in collada2gltf external because of std::shared_ptr
if test $have_std_shared_ptr = yes; then
BUILD_TYPE=$BUILD_TYPE COLLADA2GLTF
@@ -10626,6 +10636,9 @@ else
AC_MSG_RESULT([no])
fi
AC_SUBST(ENABLE_GLTF)
+AC_SUBST(SYSTEM_LIBGLTF)
+AC_SUBST(LIBGLTF_CFLAGS)
+AC_SUBST(LIBGLTF_LIBS)
# pdf import?
AC_MSG_CHECKING([whether to build the PDF import feature])
___
Libreoffice-commits mailing list
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - basegfx/source drawinglayer/source
basegfx/source/polygon/b2dpolygonclipper.cxx | 67 +
drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx | 65 ++--
2 files changed, 78 insertions(+), 54 deletions(-)
New commits:
commit 7c5e9b9b3c5c899d63bf171ee1c9050db860337e
Author: Armin Le Grand a...@apache.org
Date: Tue Aug 5 16:11:21 2014 +
i125349 moved clip enhancements to base clipping functionality
diff --git a/basegfx/source/polygon/b2dpolygonclipper.cxx
b/basegfx/source/polygon/b2dpolygonclipper.cxx
index 39d7e8c..b8e9fdb 100644
--- a/basegfx/source/polygon/b2dpolygonclipper.cxx
+++ b/basegfx/source/polygon/b2dpolygonclipper.cxx
@@ -417,6 +417,73 @@ namespace basegfx
if(rCandidate.count() rClip.count())
{
+// #125349# detect if both given PolyPolygons are indeed ranges
+bool bBothRectangle(false);
+
+if(basegfx::tools::isRectangle(rCandidate))
+{
+if(basegfx::tools::isRectangle(rClip))
+{
+// both are ranges
+bBothRectangle = true;
+}
+else
+{
+// rCandidate is rectangle - clip rClip on
rRectangle, use the much
+// cheaper and numerically more stable clipping
against a range
+// This simplification (exchanging content and clip)
is valid
+// since we do a logical AND operation
+return clipPolyPolygonOnRange(rClip,
rCandidate.getB2DRange(), bInside, bStroke);
+}
+}
+else if(basegfx::tools::isRectangle(rClip))
+{
+if(basegfx::tools::isRectangle(rCandidate))
+{
+// both are ranges
+bBothRectangle = true;
+}
+else
+{
+// rClip is rectangle - clip rCandidate on
rRectangle, use the much
+// cheaper and numerically more stable clipping
against a range
+return clipPolyPolygonOnRange(rCandidate,
rClip.getB2DRange(), bInside, bStroke);
+}
+}
+
+if(bBothRectangle)
+{
+// both are rectangle
+if(rCandidate.getB2DRange().equal(rClip.getB2DRange()))
+{
+// if both are equal - no change
+return rCandidate;
+}
+else
+{
+// not equal - create new intersection from both
ranges,
+// but much cheaper based on the ranges
+basegfx::B2DRange
aIntersectionRange(rCandidate.getB2DRange());
+
+aIntersectionRange.intersect(rClip.getB2DRange());
+
+if(aIntersectionRange.isEmpty())
+{
+// no common IntersectionRange - the clip will be
empty
+return B2DPolyPolygon();
+}
+else
+{
+// use common aIntersectionRange as result, convert
+// to expected PolyPolygon form
+return basegfx::B2DPolyPolygon(
+
basegfx::tools::createPolygonFromRect(aIntersectionRange));
+}
+}
+}
+
+// one or both are no rectangle - go the hard way and clip
PolyPolygon
+// against PolyPolygon...
if(bStroke)
{
// line clipping, create line snippets by first adding all
cut points and
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index 5186719..d53f7a3 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -1744,52 +1744,17 @@ namespace drawinglayer
if(maClipPolyPolygon.count())
{
-// due to the cost of PolyPolygon clipping and
numerical reasons try first if the current
-// and the new ClipRegion are ranges. If yes,
processing can be simplified
-if(basegfx::tools::isRectangle(aMask)
-
basegfx::tools::isRectangle(maClipPolyPolygon))
-{
-// both ClipPolygons are rectangles
-
Re: [RFC} running a formatter over the Java code
Hi Noel, On Tuesday, 2014-08-05 10:26:23 +0200, Noel Grandin wrote: Would there be any objections to my running a formatter over the existing Java LO code (with the exception of the newer Android stuff) ? No objections from me if the reformatting is restricted to the Java sources. I am suggesting using the standard Oracle Java code formatting conventions For the mental health of a few members here please name it Sun Java Code Conventions should you mention it anywhere ;-) Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgpXcnCbsHXiW.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: chart2/source
chart2/source/view/main/ChartView.cxx | 29 -
1 file changed, 29 deletions(-)
New commits:
commit ec66929352294861c28fd160912166acab89be66
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Aug 5 14:28:40 2014 -0400
This was my debug code and is no longer relevant. Let's remove this.
Change-Id: Idcf8890af737adf302866c78101dd00398397a3c
diff --git a/chart2/source/view/main/ChartView.cxx
b/chart2/source/view/main/ChartView.cxx
index f904639..9086abc 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -127,31 +127,6 @@ namespace {
class theExplicitValueProviderUnoTunnelId : public
rtl::StaticUnoTunnelIdInit, theExplicitValueProviderUnoTunnelId {};
-#if ENABLE_GL3D_BARCHART
-
-/**
- * Only used for initial debugging of the new GL chart (until we can
- * visualize it).
- */
-void debugGL3DOutput( ChartModel rModel )
-{
-uno::ReferenceXDiagram xDiagram = rModel.getFirstDiagram();
-if (!xDiagram.is())
-return;
-
-try
-{
-uno::Referencebeans::XPropertySet xPropSet(xDiagram,
uno::UNO_QUERY_THROW);
-bool bRoundedEdge = false;
-xPropSet-getPropertyValue(CHART_UNONAME_ROUNDED_EDGE) =
bRoundedEdge;
-
-SAL_INFO(chart2.barchart3D, GL3D: rounded edge = bRoundedEdge);
-}
-catch (...) {}
-}
-
-#endif
-
}
class GL2DRenderer : public IRenderer
@@ -2502,10 +2477,6 @@ void ChartView::createShapes()
maTimeBased.bTimeBased = true;
}
-#if ENABLE_GL3D_BARCHART
-debugGL3DOutput(mrChartModel);
-#endif
-
//make sure add-in is refreshed after creating the shapes
const ::comphelper::ScopeGuard aGuard( boost::bind(
ChartView::impl_refreshAddIn, this ) );
if( impl_AddInDrawsAllByItself() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
modifying commit hooks (was: [Libreoffice-commits] core.git: 7 commits - chart2/source extensions/source hwpfilter/source l10ntools/source sal/osl unoidl/source)
Hi Wols, On Tuesday, 2014-08-05 12:44:11 +0100, Wols Lists wrote: At the risk of sparking off that bikeshedding war, is there an option in git that allows us to format everything according to a standard rule as it is committed? As also Norbert pointed out in the Java reformatting thread, commit hooks should not modify the material that is to be committed. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgp1Xa5mmQvoC.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sd/source
sd/source/ui/remotecontrol/AvahiNetworkService.cxx | 26 +
1 file changed, 17 insertions(+), 9 deletions(-)
New commits:
commit 3c57701cf0a169bd8d1893d1b2271d48b8072147
Author: Bryan Quigley gqu...@gmail.com
Date: Mon Aug 4 12:26:00 2014 -0400
fdo#81552 Fail nicely if avahi doesn't let libreoffice publish items
Change-Id: Ie264a032a71bda336158e18bd2b14c569f23f42d
Reviewed-on: https://gerrit.libreoffice.org/10735
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
diff --git a/sd/source/ui/remotecontrol/AvahiNetworkService.cxx
b/sd/source/ui/remotecontrol/AvahiNetworkService.cxx
index d4d92cd..ad2bfef 100644
--- a/sd/source/ui/remotecontrol/AvahiNetworkService.cxx
+++ b/sd/source/ui/remotecontrol/AvahiNetworkService.cxx
@@ -35,7 +35,7 @@ static AvahiThreadedPoll *threaded_poll = NULL;
static AvahiEntryGroup *group = NULL;
static AvahiNetworkService *avahiService = NULL;
-static void create_services(AvahiClient *c);
+static bool create_services(AvahiClient *c);
static void entry_group_callback(AvahiEntryGroup *g, AvahiEntryGroupState
state, AVAHI_GCC_UNUSED void *userdata) {
assert(g == group || group == NULL);
@@ -78,16 +78,19 @@ static void entry_group_callback(AvahiEntryGroup *g,
AvahiEntryGroupState state,
}
}
-static void create_services(AvahiClient *c) {
+static bool create_services(AvahiClient *c) {
assert(c);
/* If this is the first time we're called, let's create a new
* entry group if necessary */
+if(!client)
+return false;
if (!group)
if (!(group = avahi_entry_group_new(c, entry_group_callback, NULL))) {
SAL_WARN(sdremote.wifi, avahi_entry_group_new() failed:
avahi_strerror(avahi_client_errno(c)));
avahiService-clear();
+return false;
}
/* If the group is empty (either because it was just created, or
@@ -113,22 +116,23 @@ static void create_services(AvahiClient *c) {
avahi_entry_group_reset(group);
-create_services(c);
-return;
+return create_services(c);
}
SAL_WARN(sdremote.wifi, Failed to add _impressremote._tcp
service: avahi_strerror(ret));
avahiService-clear();
+return false;
}
/* Tell the server to register the service */
if ((ret = avahi_entry_group_commit(group)) 0) {
SAL_WARN(sdremote.wifi, Failed to commit entry group:
avahi_strerror(ret));
avahiService-clear();
+return false;
}
}
-return;
+return true; //Services we're already created
}
static void client_callback(AvahiClient *c, AvahiClientState state,
AVAHI_GCC_UNUSED void * userdata) {
@@ -174,7 +178,8 @@ void AvahiNetworkService::setup() {
return;
}
- create_services(client);
+ if(!create_services(client))
+return;
/* Finally, start the event loop thread */
if (avahi_threaded_poll_start(threaded_poll) 0) {
@@ -185,7 +190,10 @@ void AvahiNetworkService::setup() {
void AvahiNetworkService::clear() {
/* Call this when the app shuts down */
-avahi_threaded_poll_stop(threaded_poll);
-avahi_client_free(client);
-avahi_threaded_poll_free(threaded_poll);
+if(threaded_poll)
+avahi_threaded_poll_stop(threaded_poll);
+if(client)
+avahi_client_free(client);
+if(threaded_poll)
+avahi_threaded_poll_free(threaded_poll);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/source
chart2/source/view/main/ChartView.cxx | 32 +---
1 file changed, 1 insertion(+), 31 deletions(-)
New commits:
commit b398ed8e3f95b75705bb2e53d49589ef7fdbb1c7
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Aug 5 14:57:18 2014 -0400
bnc#886540: Let's not push the available area down when no titles are there.
This improves visual layout compability with MS Office chart looks better.
Change-Id: I348ea81152eca4e3bba9e0d9460448d9314738ad
diff --git a/chart2/source/view/main/ChartView.cxx
b/chart2/source/view/main/ChartView.cxx
index 9086abc..902705b 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -2301,37 +2301,7 @@ boost::shared_ptrVTitle lcl_createTitle(
TitleHelper::eTitleType eType
break;
}
}
-else
-{
-// #i109336# Improve auto positioning in chart
-switch ( eAlignment )
-{
-case ALIGN_TOP:
-{
-rRemainingSpace.Y += nYDistance;
-rRemainingSpace.Height -= nYDistance;
-}
-break;
-case ALIGN_BOTTOM:
-{
-rRemainingSpace.Height -= nYDistance;
-}
-break;
-case ALIGN_LEFT:
-{
-rRemainingSpace.X += nXDistance;
-rRemainingSpace.Width -= nXDistance;
-}
-break;
-case ALIGN_RIGHT:
-{
-rRemainingSpace.Width -= nXDistance;
-}
-break;
-default:
-break;
-}
-}
+
return apVTitle;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - filter/source svx/uiconfig
filter/source/config/fragments/filters/Beagle_Works.xcu |2 +- filter/source/config/fragments/filters/Beagle_Works_Calc.xcu |2 +- filter/source/config/fragments/filters/Beagle_Works_Draw.xcu |2 +- filter/source/config/fragments/filters/ClarisWorks.xcu |2 +- filter/source/config/fragments/filters/ClarisWorks_Calc.xcu |2 +- filter/source/config/fragments/filters/ClarisWorks_Draw.xcu |2 +- filter/source/config/fragments/filters/Great_Works.xcu |2 +- filter/source/config/fragments/filters/Great_Works_Calc.xcu |2 +- filter/source/config/fragments/filters/Great_Works_Draw.xcu |2 +- filter/source/config/fragments/filters/Mac_Works.xcu |2 +- filter/source/config/fragments/filters/Mac_Works_Calc.xcu|2 +- filter/source/config/fragments/filters/Mac_Works_Draw.xcu|2 +- svx/uiconfig/ui/sidebarparagraph.ui | 11 ++- 13 files changed, 22 insertions(+), 13 deletions(-) New commits: commit af28a77724cb552c18df9ca5ca76e4d1da10694b Author: Maxim Monastirsky momonas...@gmail.com Date: Tue Aug 5 22:29:11 2014 +0300 Better names for several filters Thanks to David Tardon Change-Id: I646f43fde5b7481ba77a2b12b7111b2093476f78 diff --git a/filter/source/config/fragments/filters/Beagle_Works.xcu b/filter/source/config/fragments/filters/Beagle_Works.xcu index 8b26456..a0cd6bc 100644 --- a/filter/source/config/fragments/filters/Beagle_Works.xcu +++ b/filter/source/config/fragments/filters/Beagle_Works.xcu @@ -15,7 +15,7 @@ valuecom.sun.star.comp.Writer.MWAWImportFilter/value /prop prop oor:name=UIName -value xml:lang=en-USBeagleWorks/WordPerfect Works v1 Document (Writer)/value +value xml:lang=en-USBeagleWorks/WordPerfect Works v1 Text Document/value /prop prop oor:name=FileFormatVersion value0/value diff --git a/filter/source/config/fragments/filters/Beagle_Works_Calc.xcu b/filter/source/config/fragments/filters/Beagle_Works_Calc.xcu index 6ae87c1..4471531 100644 --- a/filter/source/config/fragments/filters/Beagle_Works_Calc.xcu +++ b/filter/source/config/fragments/filters/Beagle_Works_Calc.xcu @@ -15,7 +15,7 @@ valuecom.sun.star.comp.Calc.MWAWCalcImportFilter/value /prop prop oor:name=UIName -value xml:lang=en-USBeagleWorks/WordPerfect Works v1 Document (Calc)/value +value xml:lang=en-USBeagleWorks/WordPerfect Works v1 Spreadsheet/value /prop prop oor:name=FileFormatVersion value0/value diff --git a/filter/source/config/fragments/filters/Beagle_Works_Draw.xcu b/filter/source/config/fragments/filters/Beagle_Works_Draw.xcu index 09520b3..0dad311 100644 --- a/filter/source/config/fragments/filters/Beagle_Works_Draw.xcu +++ b/filter/source/config/fragments/filters/Beagle_Works_Draw.xcu @@ -15,7 +15,7 @@ valuecom.sun.star.comp.Draw.MWAWDrawImportFilter/value /prop prop oor:name=UIName -value xml:lang=en-USBeagleWorks/WordPerfect Works v1 Document (Draw)/value +value xml:lang=en-USBeagleWorks/WordPerfect Works v1 Drawing/value /prop prop oor:name=FileFormatVersion value0/value diff --git a/filter/source/config/fragments/filters/ClarisWorks.xcu b/filter/source/config/fragments/filters/ClarisWorks.xcu index c2ad8a4..f429d00 100644 --- a/filter/source/config/fragments/filters/ClarisWorks.xcu +++ b/filter/source/config/fragments/filters/ClarisWorks.xcu @@ -21,7 +21,7 @@ prop oor:name=FilterServicevaluecom.sun.star.comp.Writer.MWAWImportFilter/value/prop prop oor:name=UserDatavalue/value/prop prop oor:name=UIName -value xml:lang=en-USClarisWorks/AppleWorks Document (Writer)/value +value xml:lang=en-USClarisWorks/AppleWorks Text Document/value /prop prop oor:name=FileFormatVersionvalue0/value/prop prop oor:name=Typevaluewriter_ClarisWorks/value/prop diff --git a/filter/source/config/fragments/filters/ClarisWorks_Calc.xcu b/filter/source/config/fragments/filters/ClarisWorks_Calc.xcu index 8f689e0..aa6edbb 100644 --- a/filter/source/config/fragments/filters/ClarisWorks_Calc.xcu +++ b/filter/source/config/fragments/filters/ClarisWorks_Calc.xcu @@ -21,7 +21,7 @@ prop oor:name=FilterServicevaluecom.sun.star.comp.Calc.MWAWCalcImportFilter/value/prop prop oor:name=UserDatavalue/value/prop prop oor:name=UIName -value xml:lang=en-USClarisWorks/AppleWorks Document (Calc)/value +value xml:lang=en-USClarisWorks/AppleWorks Spreadsheet/value /prop prop oor:name=FileFormatVersionvalue0/value/prop prop oor:name=Typevaluecalc_ClarisWorks/value/prop diff --git a/filter/source/config/fragments/filters/ClarisWorks_Draw.xcu b/filter/source/config/fragments/filters/ClarisWorks_Draw.xcu index baeaf9f..d97162b 100644 --- a/filter/source/config/fragments/filters/ClarisWorks_Draw.xcu
[Libreoffice-commits] core.git: include/svx sd/source svx/source
include/svx/svdobj.hxx |2 -
sd/source/ui/dlg/morphdlg.cxx |6 ++---
sd/source/ui/func/fumorph.cxx |4 +--
svx/source/sdr/properties/customshapeproperties.cxx |2 -
svx/source/sdr/properties/defaultproperties.cxx |8 +++
svx/source/sdr/properties/emptyproperties.cxx |2 -
svx/source/sdr/properties/pageproperties.cxx|2 -
svx/source/svdraw/svdoattr.cxx |4 +--
svx/source/svdraw/svdobj.cxx| 22
svx/source/svdraw/svdogrp.cxx |4 +--
10 files changed, 22 insertions(+), 34 deletions(-)
New commits:
commit 42172ea6478023d94d4f76f3b525180d2ff25695
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Aug 5 23:04:07 2014 +0200
Let GetObjectItemPool return a reference
Change-Id: Ibbcfa3452afcf88dbb6050765e081a1be2381334
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index 6dfc816..3eac84f 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -467,7 +467,7 @@ public:
virtual void SetModel(SdrModel* pNewModel);
SdrModel* GetModel() const { return pModel;}
-SfxItemPool* GetObjectItemPool() const;
+SfxItemPool GetObjectItemPool() const;
void AddListener(SfxListener rListener);
void RemoveListener(SfxListener rListener);
diff --git a/sd/source/ui/dlg/morphdlg.cxx b/sd/source/ui/dlg/morphdlg.cxx
index f8895e2..301ef79 100644
--- a/sd/source/ui/dlg/morphdlg.cxx
+++ b/sd/source/ui/dlg/morphdlg.cxx
@@ -44,9 +44,9 @@ MorphDlg::MorphDlg( ::Window* pParent, const SdrObject*
pObj1, const SdrObject*
LoadSettings();
-SfxItemPool*pPool = (SfxItemPool*) pObj1-GetObjectItemPool();
-SfxItemSet aSet1( *pPool );
-SfxItemSet aSet2( *pPool );
+SfxItemPool pPool = pObj1-GetObjectItemPool();
+SfxItemSet aSet1( pPool );
+SfxItemSet aSet2( pPool );
aSet1.Put(pObj1-GetMergedItemSet());
aSet2.Put(pObj2-GetMergedItemSet());
diff --git a/sd/source/ui/func/fumorph.cxx b/sd/source/ui/func/fumorph.cxx
index 5aa763a..272a95d 100644
--- a/sd/source/ui/func/fumorph.cxx
+++ b/sd/source/ui/func/fumorph.cxx
@@ -342,8 +342,8 @@ void FuMorph::ImpInsertPolygons(
longnStartLineWidth = 0;
longnEndLineWidth = 0;
SdrPageView*pPageView = mpView-GetSdrPageView();
-SfxItemPool*pPool = pObj1-GetObjectItemPool();
-SfxItemSet aSet1(
*pPool,SDRATTR_START,SDRATTR_NOTPERSIST_FIRST-1,EE_ITEMS_START,EE_ITEMS_END,0 );
+SfxItemPoolpPool = pObj1-GetObjectItemPool();
+SfxItemSet aSet1(
pPool,SDRATTR_START,SDRATTR_NOTPERSIST_FIRST-1,EE_ITEMS_START,EE_ITEMS_END,0 );
SfxItemSet aSet2( aSet1 );
boolbLineColor = false;
boolbFillColor = false;
diff --git a/svx/source/sdr/properties/customshapeproperties.cxx
b/svx/source/sdr/properties/customshapeproperties.cxx
index 97d4921..716dfb5 100644
--- a/svx/source/sdr/properties/customshapeproperties.cxx
+++ b/svx/source/sdr/properties/customshapeproperties.cxx
@@ -109,7 +109,7 @@ namespace sdr
TextProperties::ClearObjectItemDirect( nWhich2 );
nWhich2 = aIter.NextWhich();
}
-SfxItemSet
aSet((SfxItemPool)(*GetSdrObject().GetObjectItemPool()));
+SfxItemSet aSet(GetSdrObject().GetObjectItemPool());
ItemSetChanged(aSet);
}
else
diff --git a/svx/source/sdr/properties/defaultproperties.cxx
b/svx/source/sdr/properties/defaultproperties.cxx
index 47b32c6..a7d60a4 100644
--- a/svx/source/sdr/properties/defaultproperties.cxx
+++ b/svx/source/sdr/properties/defaultproperties.cxx
@@ -81,7 +81,7 @@ namespace sdr
{
if(!mpItemSet)
{
-((DefaultProperties*)this)-mpItemSet =
(((DefaultProperties*)this)-CreateObjectSpecificItemSet(*GetSdrObject().GetObjectItemPool()));
+((DefaultProperties*)this)-mpItemSet =
(((DefaultProperties*)this)-CreateObjectSpecificItemSet(GetSdrObject().GetObjectItemPool()));
((DefaultProperties*)this)-ForceDefaultAttributes();
}
@@ -99,7 +99,7 @@ namespace sdr
ItemChange(nWhichID, rItem);
PostItemChange(nWhichID);
-SfxItemSet aSet(*GetSdrObject().GetObjectItemPool(), nWhichID,
nWhichID);
+SfxItemSet aSet(GetSdrObject().GetObjectItemPool(), nWhichID,
nWhichID);
aSet.Put(rItem);
ItemSetChanged(aSet);
}
@@ -124,7 +124,7 @@ namespace sdr
if(nWhich)
{
-SfxItemSet aSet(*GetSdrObject().GetObjectItemPool(),
nWhich, nWhich, 0, 0);
+SfxItemSet aSet(GetSdrObject().GetObjectItemPool(),
nWhich, nWhich,
[Libreoffice-commits] core.git: include/xmloff xmloff/inc xmloff/source
include/xmloff/xmlimp.hxx|3 ++-
xmloff/inc/XMLTextColumnsContext.hxx |5 +++--
xmloff/inc/xmltabi.hxx |3 ++-
xmloff/source/core/xmlimp.cxx|2 --
xmloff/source/style/xmltabi.cxx |8
xmloff/source/text/XMLTextColumnsContext.cxx |2 --
6 files changed, 7 insertions(+), 16 deletions(-)
New commits:
commit 223f761330486ef4c4c47f3b92cfa6dd0ed9d56a
Author: Takeshi Abe t...@fixedpoint.jp
Date: Tue Aug 5 09:11:25 2014 +0900
fdo#75757: remove inheritance to std::vector
typedefs just work.
Change-Id: Ib91c0d4c383b5efac1ad9b93e574dec62e8234a4
Reviewed-on: https://gerrit.libreoffice.org/10754
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx
index 24414ff..4e801f9 100644
--- a/include/xmloff/xmlimp.hxx
+++ b/include/xmloff/xmlimp.hxx
@@ -62,7 +62,6 @@ namespace comphelper { class
UnoInterfaceToUniqueIdentifierMapper; }
class SvXMLNamespaceMap;
class SvXMLImportContext;
-class SvXMLImportContexts_Impl;
class SvXMLImport_Impl;
class SvXMLUnitConverter;
class SvXMLNumFmtHelper;
@@ -71,6 +70,8 @@ class XMLEventImportHelper;
class XMLErrors;
class StyleMap;
+typedef std::vectorSvXMLImportContext * SvXMLImportContexts_Impl;
+
namespace xmloff {
class RDFaImportHelper;
}
diff --git a/xmloff/inc/XMLTextColumnsContext.hxx
b/xmloff/inc/XMLTextColumnsContext.hxx
index a1fe4e0..1677eea 100644
--- a/xmloff/inc/XMLTextColumnsContext.hxx
+++ b/xmloff/inc/XMLTextColumnsContext.hxx
@@ -22,11 +22,12 @@
#include XMLElementPropertyContext.hxx
-
-class XMLTextColumnsArray_Impl;
+class XMLTextColumnContext_Impl;
class XMLTextColumnSepContext_Impl;
class SvXMLTokenMap;
+typedef std::vectorXMLTextColumnContext_Impl * XMLTextColumnsArray_Impl;
+
class XMLTextColumnsContext :public XMLElementPropertyContext
{
const OUString sSeparatorLineIsOn;
diff --git a/xmloff/inc/xmltabi.hxx b/xmloff/inc/xmltabi.hxx
index d7e7752..e8e1e27 100644
--- a/xmloff/inc/xmltabi.hxx
+++ b/xmloff/inc/xmltabi.hxx
@@ -22,9 +22,10 @@
#include XMLElementPropertyContext.hxx
-class SvxXMLTabStopArray_Impl;
class SvXMLImport;
+class SvxXMLTabStopContext_Impl;
+typedef std::vectorSvxXMLTabStopContext_Impl * SvxXMLTabStopArray_Impl;
class SvxXMLTabStopImportContext : public XMLElementPropertyContext
{
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 32e23db..5d15bea 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -340,8 +340,6 @@ public:
::comphelper::UnoInterfaceToUniqueIdentifierMapper
maInterfaceToIdentifierMapper;
};
-class SvXMLImportContexts_Impl : public std::vectorSvXMLImportContext * {};
-
SvXMLImportContext *SvXMLImport::CreateContext( sal_uInt16 nPrefix,
const OUString rLocalName,
const uno::Reference
xml::sax::XAttributeList )
diff --git a/xmloff/source/style/xmltabi.cxx b/xmloff/source/style/xmltabi.cxx
index 289f3fc..ab9a9af 100644
--- a/xmloff/source/style/xmltabi.cxx
+++ b/xmloff/source/style/xmltabi.cxx
@@ -169,14 +169,6 @@ SvXMLImportContext
*SvxXMLTabStopContext_Impl::CreateChildContext(
return new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
}
-
-
-
-class SvxXMLTabStopArray_Impl : public std::vectorSvxXMLTabStopContext_Impl
* {};
-
-
-
-
TYPEINIT1( SvxXMLTabStopImportContext, XMLElementPropertyContext );
SvxXMLTabStopImportContext::SvxXMLTabStopImportContext(
diff --git a/xmloff/source/text/XMLTextColumnsContext.cxx
b/xmloff/source/text/XMLTextColumnsContext.cxx
index 348471c..badf922 100644
--- a/xmloff/source/text/XMLTextColumnsContext.cxx
+++ b/xmloff/source/text/XMLTextColumnsContext.cxx
@@ -263,8 +263,6 @@
XMLTextColumnSepContext_Impl::~XMLTextColumnSepContext_Impl()
{
}
-class XMLTextColumnsArray_Impl : public std::vectorXMLTextColumnContext_Impl
* {};
-
TYPEINIT1( XMLTextColumnsContext, XMLElementPropertyContext );
XMLTextColumnsContext::XMLTextColumnsContext(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 75757] remove inheritance to std::map and std::vector
https://bugs.freedesktop.org/show_bug.cgi?id=75757 --- Comment #16 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Takeshi Abe committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=223f761330486ef4c4c47f3b92cfa6dd0ed9d56a fdo#75757: remove inheritance to std::vector 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: 2 commits - sw/source
sw/source/core/doc/docfmt.cxx | 22 ++
1 file changed, 22 insertions(+)
New commits:
commit 2e9840d18c09ce5552eec2f9d489d952da1034ae
Author: Michael Stahl mst...@redhat.com
Date: Tue Aug 5 22:56:17 2014 +0200
SwDoc::CopyPageDesc(): probably sending Modify for first too cannot hurt
Change-Id: I2056bee7555d3f6723ac374863187d82e4ad9edd
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index d650a02..faf1214 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -1510,6 +1510,12 @@ void SwDoc::CopyPageDesc( const SwPageDesc rSrcDesc,
SwPageDesc rDstDesc,
{
rDstDesc.GetLeft().ModifyBroadcast( aInfo, 0, TYPE(SwFrm) );
}
+{
+rDstDesc.GetFirstMaster().ModifyBroadcast( aInfo, 0, TYPE(SwFrm)
);
+}
+{
+rDstDesc.GetFirstLeft().ModifyBroadcast( aInfo, 0, TYPE(SwFrm) );
+}
}
}
commit 5c1cc92ee09f9fcc99077cacd3fc55640f03b7b2
Author: Michael Stahl mst...@redhat.com
Date: Tue Aug 5 22:50:23 2014 +0200
fdo#69282: sw: fix updating of page styles via SwDocShell::_LoadStyles()
SwDoc::CopyPageDesc() only copies master and left SwFrmFmt attributes,
but not first-master and first-left. They will contain exactly the same
attributes as master and left but they still need to be copied...
(see also: that FIXME in pagedesc.hxx)
(regression from 75084f6c42c27dc95418df9cefed2fddfb26000e)
Change-Id: I3dcc3627708b5d6a477eb7fef76cf6c42c95c004
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index 055bc46..d650a02 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -1443,6 +1443,22 @@ void SwDoc::CopyPageDesc( const SwPageDesc rSrcDesc,
SwPageDesc rDstDesc,
rDstDesc.GetLeft().DelDiffs( aAttrSet );
rDstDesc.GetLeft().SetFmtAttr( aAttrSet );
+
+aAttrSet.ClearItem();
+aAttrSet.Put( rSrcDesc.GetFirstMaster().GetAttrSet() );
+aAttrSet.ClearItem( RES_HEADER );
+aAttrSet.ClearItem( RES_FOOTER );
+
+rDstDesc.GetFirstMaster().DelDiffs( aAttrSet );
+rDstDesc.GetFirstMaster().SetFmtAttr( aAttrSet );
+
+aAttrSet.ClearItem();
+aAttrSet.Put( rSrcDesc.GetFirstLeft().GetAttrSet() );
+aAttrSet.ClearItem( RES_HEADER );
+aAttrSet.ClearItem( RES_FOOTER );
+
+rDstDesc.GetFirstLeft().DelDiffs( aAttrSet );
+rDstDesc.GetFirstLeft().SetFmtAttr( aAttrSet );
}
CopyHeader( rSrcDesc.GetMaster(), rDstDesc.GetMaster() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/inc
writerfilter/inc/pch/precompiled_writerfilter.hxx |2 -- 1 file changed, 2 deletions(-) New commits: commit 6e93ea106e7444980532b090deacdf6eb7397aed Author: Michael Stahl mst...@redhat.com Date: Tue Aug 5 23:47:37 2014 +0200 writerfilter: remove deleted header from PCH Change-Id: I3be867391f42b6c7e2ce7fb1f1f553f5a5558699 diff --git a/writerfilter/inc/pch/precompiled_writerfilter.hxx b/writerfilter/inc/pch/precompiled_writerfilter.hxx index 2fdd3f9..894a15a 100644 --- a/writerfilter/inc/pch/precompiled_writerfilter.hxx +++ b/writerfilter/inc/pch/precompiled_writerfilter.hxx @@ -14,7 +14,6 @@ also fixes all possible problems, so it's usually better to use it). */ -#include ooxml/OOXMLFastTokens.hxx #include algorithm #include boost/optional.hpp #include boost/shared_ptr.hpp @@ -190,7 +189,6 @@ #include oox/token/namespaces.hxx #include oox/token/tokens.hxx #include oox/vml/vmlformatting.hxx -#include ooxml/OOXMLFastTokens.hxx #include ooxml/OOXMLnamespaceids.hxx #include ooxml/resourceids.hxx #include osl/diagnose.h ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: config_host.mk.in configure.ac RepositoryExternal.mk
RepositoryExternal.mk | 15 +++ config_host.mk.in |3 +++ configure.ac | 16 ++-- 3 files changed, 32 insertions(+), 2 deletions(-) New commits: commit d85f513934bb5735a2c0c343fbe7dc2b9c11af3e Author: Rene Engelhard r...@debian.org Date: Wed Aug 6 00:03:21 2014 +0200 implement --with-system-coinmp Change-Id: I02928097f049e8f3cbefbc872b570b2d2b072658 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index a9c9e53..1961829 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2250,6 +2250,8 @@ endif # ENABLE_LPSOLVE ifneq ($(ENABLE_COINMP),) +ifneq ($(SYSTEM_COINMP),TRUE) + define gb_LinkTarget__use_coinmp $(call gb_LinkTarget_use_package,$(1),coinmp) ifeq ($(COM),MSC) @@ -2279,6 +2281,19 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\ coinmp \ )) +else # SYSTEM_COINMP + +define gb_LinkTarget__use_coinmp +$(call gb_LinkTarget_set_include,$(1),\ + $$(INCLUDE) \ + $(COINMP_CFLAGS) \ +) +$(call gb_LinkTarget_add_libs,$(1),$(COINMP_LIBS)) + +endef + +endif + else gb_LinkTarget__use_coinmp := diff --git a/config_host.mk.in b/config_host.mk.in index 4f88983..31dea01 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -109,6 +109,9 @@ export ENABLE_CAIRO_CANVAS=@ENABLE_CAIRO_CANVAS@ export ENABLE_CHART_TESTS=@ENABLE_CHART_TESTS@ export ENABLE_CMIS=@ENABLE_CMIS@ export ENABLE_COINMP=@ENABLE_COINMP@ +export SYSTEM_COINMP=@SYSTEM_COINMP@ +export COINMP_CFLAGS=@COINMP_CFLAGS@ +export COINMP_LIBS=@COINMP_LIBS@ export ENABLE_CRASHDUMP=@ENABLE_CRASHDUMP@ export ENABLE_CUPS=@ENABLE_CUPS@ export ENABLE_CURL=@ENABLE_CURL@ diff --git a/configure.ac b/configure.ac index e91773f..3aadd12 100644 --- a/configure.ac +++ b/configure.ac @@ -1867,6 +1867,11 @@ AC_ARG_WITH(system-lpsolve, [Use lpsolve already on system.]),, [with_system_lpsolve=$with_system_libs]) +AC_ARG_WITH(system-coinmp, +AS_HELP_STRING([--with-system-coinmp], +[Use CoinMP already on system.]),, +[with_system_coinmp=$with_system_libs]) + AC_ARG_WITH(system-liblangtag, AS_HELP_STRING([--with-system-liblangtag], [Use liblangtag library already on system.]),, @@ -9661,12 +9666,19 @@ AC_MSG_CHECKING([whether to build with CoinMP]) if test $enable_coinmp != no; then ENABLE_COINMP=TRUE AC_MSG_RESULT([yes]) -# Should we check for system CoinMP ? How to do that ? -BUILD_TYPE=$BUILD_TYPE COINMP +if test $with_system_coinmp = yes; then + SYSTEM_COINMP=TRUE + PKG_CHECK_MODULES( COINMP, coinmp ) +else + BUILD_TYPE=$BUILD_TYPE COINMP +fi else AC_MSG_RESULT([no]) fi AC_SUBST(ENABLE_COINMP) +AC_SUBST(SYSTEM_COINMP) +AC_SUBST(COINMP_CFLAGS) +AC_SUBST(COINMP_LIBS) ENABLE_LPSOLVE= AC_MSG_CHECKING([whether to build with lpsolve]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-qa] Another Round of Interoperability
- Messaggio originale - Da: Jay Philips philip...@hotmail.com A: libreoffice-qa@lists.freedesktop.org Inviato: Lunedì, 4 agosto 2014 22:05:07 Oggetto: Re: [Libreoffice-qa] Another Round of Interoperability Hi Marina, Hi Jay, All I have added all my recent non-fixed RTF bugs to the meta bug and will add my older list as well shortly. Thanks for confirming the bugs. :) Thank you :) Well done! Referring to fdo#82067 (https://bugs.freedesktop.org/show_bug.cgi?id=82067) I can confirm the problem but, according to http://opengrok.libreoffice.org/xref/core/sw/source/filter/ww8/writerhelper.hxx#75 this is a feature not our bug. We are anchoring all the images as character for compatibility reason because the anchor as character is the only one present in all MS rtf versions. I think this isn't the right behaviour but I'm not a dev and these are only my 2 cents. We could try to import the selected type of anchor specified in the document and use the as character one as a legacy mode. While creating a new rtf file we could try to use only the anchor as character, after informing the user of this kind of choice. Best, Marina -- Marina Latini mar...@studiostorti.com Studio Storti Srl Viale Leonardo da Vinci, 18 36100 - Vicenza (VI) http://www.studiostorti.com ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-qa] Someone with Kubuntu / KDE
Hi All, Stumbled on this Kubuntu UI bug in calc and wondered if someone can have a look at it. It may also effect other KDE desktops. https://www.libreoffice.org/bugzilla/show_bug.cgi?id=82036 -- Regards, Jay Philips ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Someone with Kubuntu / KDE
I am running Debian/KDE I can check later today. OK? 2014-08-05 10:17 GMT+02:00 Jay Philips philip...@hotmail.com: Hi All, Stumbled on this Kubuntu UI bug in calc and wondered if someone can have a look at it. It may also effect other KDE desktops. https://www.libreoffice.org/bugzilla/show_bug.cgi?id=82036 -- Regards, Jay Philips ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/ -- Luc Castermans mailto:luc.casterm...@gmail.com ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Update whiteboard wiki page
Hello. Some weeks ago there was a discussion about whiteboard, but information in wiki is incomplete. For example, I can not find information about such statuses as filter:doc or filter:rtf. Indeed I see them missing ;) Good thing about wiki is that anyone can update it :-D The filter:xxx decision was made not too long ago - feel free to add it. Well, I have added information about filter:xxx and changed examples in BugTriage to use tags from the current list. Best regards, Alexandr ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Another Round of Interoperability
Thanks for the workflow info. Regarding the second case, are there more problems opening or saving the RTF documents. Can you send me some sample second and third case files for me to do some testing on? Regards, Jay Philips On 08/05/2014 02:41 PM, Marina Latini wrote: - Messaggio originale - Da: Jay Philips philip...@hotmail.com A: libreoffice-qa@lists.freedesktop.org Inviato: Martedì, 5 agosto 2014 10:56:42 Oggetto: Re: [Libreoffice-qa] Another Round of Interoperability Hi Marina, About fdo#82067, i'm not a dev as well, but i think if the RTF opens in Word, Kingsoft Writer, and in the old RTF importer that libreoffice had in 3.3, then it should work now. Lets see what the devs think of it. :) ok :) You mentioned previously that Italy's Public Adminstrations uses rtf files for their workflow, is it just opening rtfs to convert them to odf or saving them also in rtf? the workflow is a little bit complicated. :( They use some third party softwares to generate the documents. These various softwares use rtf format as a template and through a mail merge produce the final rtf document with all the required fields. * First case: the software produces a doc file for editing and a pdf for storage. the users can edit the doc, send and store it. our doc filter works fine :) * Second case: the software produces a rtf file for editing and a pdf for storage. The user can edit the rtf and here we have a huge of interoperability problems. The versions of MS Office are heterogeneous and the final rtf files can be different. :( * Third case: the software uses a set of templates generated with MS Office. We have a lot of interoperability problems again :( * Fourth case: the software uses a set of handmade templates. We have interoperability problems but we can try to solve them ;) The biggest problems are related to the anchoring of the images and to tables or nested tables. In my speech in Bern I'll describe the Italian state of art. Best, Marina ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Another Round of Interoperability
Hello. Is useful expecially in Italy. Our Public Administrations use a lot of rtf files for their workflow and we have a lot of problem with this orrible file format. :( Often the bug report doesn't contain the whiteboard tag or the description is not so clear. so, a meta is useful for quickly identify and verify a new interoperability problem. Yes, I am meeting this problem too. Working with rtf in LibreOffice is painfull. If you believe that metabug helps developers - let it be. I add some old bugs. We should not foget about them. Best regards, Alexandr ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Another Round of Interoperability
Hello. Is useful expecially in Italy. Our Public Administrations use a lot of rtf files for their workflow and we have a lot of problem with this orrible file format. :( Often the bug report doesn't contain the whiteboard tag or the description is not so clear. so, a meta is useful for quickly identify and verify a new interoperability problem. Yes, I am meeting this problem too. Working with rtf in LibreOffice is painfull. If you believe that metabug helps developers - let it be. I add some old bugs. We should not foget about them. Before opening a meta bug I suggest pinging the dev list (and particularly the rtf expert(s) and ask them if it will help at all. We have quite a few meta bugs that are literally never looked at. How would this be better than just putting filter:rtf on all of them? Would it do something extra? Best, Joel -- *Joel Madero* LibreOffice QA Volunteer jmadero@gmail.com ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-bugs] [Bug 81419] NOT ABLE to paste the chart in thunderbird mail
https://bugs.freedesktop.org/show_bug.cgi?id=81419 Muthu muthu.subramanian.karunani...@ericsson.com changed: What|Removed |Added Assignee|libreoffice-b...@lists.free |muthu.subramanian.karunanid |desktop.org |h...@ericsson.com -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 82176] New: Cursor position, text selection and nonprinting characters do not take account of hanging punctuation
https://bugs.freedesktop.org/show_bug.cgi?id=82176 Priority: medium Bug ID: 82176 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Cursor position, text selection and nonprinting characters do not take account of hanging punctuation Severity: normal Classification: Unclassified OS: All Reporter: fdb...@neosheffield.co.uk Hardware: Other Status: UNCONFIRMED Version: 4.3.0.4 release Component: Writer Product: LibreOffice Observed on OSX 10.9.4 / LO 4.3.0.4 Hanging punctuation is used in CJK languages to ensure that, for instance, a full stop is not shifted by itself onto a following line, but instead extends into the page margin However, while the visual display of text is correct (with the exception of bug 58604), the current implementation in LO has the following usability issues: 1. When moving the cursor position using the keyboard, the visible cursor does not move when advancing over hanging punctuation. It is therefore impossible to visibly determine whether the cursor is before or after the hanging punctuation 2. Similarly, when expanding a text selection using the keyboard (Shift-Right), the visible selection does not change when advancing over hanging punctuation. (When a whole paragraph is selected, the margin of the selection is correctly shifted right to cover hanging punctuation within the paragraph. However, for text selected within a paragraph, this does not occur) 3. When View - Nonprinting Characters is selected, a paragraph mark is overlaid on hanging punctuation at the end of a paragraph -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 82176] Cursor position, text selection and nonprinting characters do not take account of hanging punctuation
https://bugs.freedesktop.org/show_bug.cgi?id=82176 --- Comment #1 from Matthew Francis fdb...@neosheffield.co.uk --- Created attachment 104050 -- https://bugs.freedesktop.org/attachment.cgi?id=104050action=edit Screenshot for (2) This shows the selection failing to cover hanging punctuation (the 。). Note that all the text within this sample paragraph is selected, but not the whole paragraph itself -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 82177] New: FILESAVE: DOCX cell top border gets added
https://bugs.freedesktop.org/show_bug.cgi?id=82177 Priority: medium Bug ID: 82177 Keywords: regression Assignee: libreoffice-bugs@lists.freedesktop.org Summary: FILESAVE: DOCX cell top border gets added Severity: normal Classification: Unclassified OS: All Reporter: philip...@hotmail.com Hardware: Other Status: UNCONFIRMED Version: 4.3.0.4 release Component: Writer Product: LibreOffice Steps: 1) Open attachment 103982 2) Notice the header has a table in it with a right cell with a border at the bottom 3) Save it as a docx 4) Open the saved docx 5) Notice that the cell now also has a border at the top This effects 4.3.1 and master, but not 4.2.5. Tested on Linux Mint. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 82176] Cursor position, text selection and nonprinting characters do not take account of hanging punctuation
https://bugs.freedesktop.org/show_bug.cgi?id=82176 --- Comment #2 from Matthew Francis fdb...@neosheffield.co.uk --- Created attachment 104051 -- https://bugs.freedesktop.org/attachment.cgi?id=104051action=edit Screenshot for (3) This shows non-printing characters and hanging punctuation overlaid on one another Note the ¶ and 。 jumbled together at the end of the second line -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 82177] FILESAVE: DOCX cell top border gets added
https://bugs.freedesktop.org/show_bug.cgi?id=82177 Jay Philips philip...@hotmail.com changed: What|Removed |Added Whiteboard||filter:docx -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 82176] Cursor position, text selection and nonprinting characters do not take account of hanging punctuation
https://bugs.freedesktop.org/show_bug.cgi?id=82176 --- Comment #3 from Matthew Francis fdb...@neosheffield.co.uk --- Created attachment 104053 -- https://bugs.freedesktop.org/attachment.cgi?id=104053action=edit Test Japanese file with hanging punctuation Not sure how reproducible the font layout will be across platforms. If necessary, add/remove characters and/or adjust the font size until the 。 hangs in the margin -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 82142] EDITING: Writer crashed
https://bugs.freedesktop.org/show_bug.cgi?id=82142 Jay Philips philip...@hotmail.com changed: What|Removed |Added Status|UNCONFIRMED |NEEDINFO CC||philip...@hotmail.com Ever confirmed|0 |1 --- Comment #1 from Jay Philips philip...@hotmail.com --- Hi Aosuper, Thank you for reporting the bug. Can you clarify what you mean by 'Change language corrector to Spanish.'. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 73386] EDITING: There is no warning/information when one accidentaly deletes non-visible (zero width) fields (e.g. mail merge next record !)
https://bugs.freedesktop.org/show_bug.cgi?id=73386 Bengt Giger lo_bugs.5.bigi_g...@spamgourmet.com changed: What|Removed |Added Status|NEEDINFO|UNCONFIRMED Ever confirmed|1 |0 --- Comment #10 from Bengt Giger lo_bugs.5.bigi_g...@spamgourmet.com --- Enhancement request set back to UNCONFIRMED to prevent invalidation. Same behaviour in 4.2.5.2. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 82178] New: Other: Welcome-/Startpage shows in thumbnails content of password protected documents
https://bugs.freedesktop.org/show_bug.cgi?id=82178 Priority: medium Bug ID: 82178 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Other: Welcome-/Startpage shows in thumbnails content of password protected documents Severity: normal Classification: Unclassified OS: All Reporter: rudolf.koll...@medas.de Hardware: Other Whiteboard: BSA PossibleRegression Status: UNCONFIRMED Version: 4.3.0.4 release Component: UI Product: LibreOffice When openening LO without choosing an component (writer/calc/etc), the start page displayes the last opened documents for fast access. Unfortunately the thumbnails show partially the content(!) of password/access protected documents. This is only a small view of the document, but in our case it was a big, big fail. Such documents should, or better must, be displayed with anonymized content or with a placeholder image like OSX does, when it cannot open files in icon mode preview. Showing parts of the content of confidental files are a big security problem. Operating System: All Version: 4.3.0.4 release Last worked in: 4.1.6.2 release -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 82138] some missing decimal mark by opening csv-file
https://bugs.freedesktop.org/show_bug.cgi?id=82138 --- Comment #2 from Stefan bugrep...@lohrer.com --- Created attachment 104054 -- https://bugs.freedesktop.org/attachment.cgi?id=104054action=edit csv-file converted in a calc-document The file is only seperated with semicolons. The decimal marks are only in the third and fourth column. I add this file as a calc-spreadsheet with the fields, they lost the dots, marked in red. All other fields in this rows have a decimal mark. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 82143] VIEWING: 100% CPU while Scrolling a specific document
https://bugs.freedesktop.org/show_bug.cgi?id=82143 Jay Philips philip...@hotmail.com changed: What|Removed |Added Status|UNCONFIRMED |NEEDINFO CC||philip...@hotmail.com Ever confirmed|0 |1 --- Comment #1 from Jay Philips philip...@hotmail.com --- Hi Johannes, Thank you for reporting this bug. You can directly send it to me as a separate email so that its not placed in the public. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 81378] Permanent Crashes and Content Loss in Presentations
https://bugs.freedesktop.org/show_bug.cgi?id=81378 --- Comment #5 from superu...@gmail.com --- Created attachment 104055 -- https://bugs.freedesktop.org/attachment.cgi?id=104055action=edit backtrace info when exporting an impress odt to PDF -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 81378] Permanent Crashes and Content Loss in Presentations
https://bugs.freedesktop.org/show_bug.cgi?id=81378 superu...@gmail.com changed: What|Removed |Added Attachment #104055|backtrace info when |backtrace info when description|exporting an impress odt to |exporting an impress odp to |PDF |PDF -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 70102] Flipped icons in RTL look out of place
https://bugs.freedesktop.org/show_bug.cgi?id=70102 Jay Philips philip...@hotmail.com changed: What|Removed |Added CC||libreoffice-ux-advise@lists ||.freedesktop.org Component|UI |ux-advise --- Comment #6 from Jay Philips philip...@hotmail.com --- Adding the ux-team for their input. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 82157] Calc not reading .csv files
https://bugs.freedesktop.org/show_bug.cgi?id=82157 David Tardon dtar...@redhat.com changed: What|Removed |Added Attachment #104030|text/plain |image/png mime type|| -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 82179] New: CONFIGURATION: Add option to disable thumbnail view of welcome screen
https://bugs.freedesktop.org/show_bug.cgi?id=82179 Priority: medium Bug ID: 82179 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: CONFIGURATION: Add option to disable thumbnail view of welcome screen Severity: normal Classification: Unclassified OS: All Reporter: rudolf.koll...@medas.de Hardware: Other Whiteboard: BSA PossibleRegression Status: UNCONFIRMED Version: 4.3.0.4 release Component: UI Product: LibreOffice It would be very nice to configure the layout of the welcome screen. Showing the thumbnails may be nice for some but not all users are pleased by this. Disabling the listing completly or changing to list view (maybe with details about last date/time opened, author etc) would be a great feature. Showing the content of password protected documents in the thumbnails is a big security issue! Operating System: All Version: 4.3.0.4 release Last worked in: 4.1.6.2 release -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 81378] Permanent Crashes and Content Loss in Presentations
https://bugs.freedesktop.org/show_bug.cgi?id=81378 --- Comment #6 from superu...@gmail.com --- Created attachment 104056 -- https://bugs.freedesktop.org/attachment.cgi?id=104056action=edit odp test file -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 81378] Permanent Crashes and Content Loss in Presentations
https://bugs.freedesktop.org/show_bug.cgi?id=81378 --- Comment #7 from superu...@gmail.com --- Created attachment 104057 -- https://bugs.freedesktop.org/attachment.cgi?id=104057action=edit Computer details used -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
