[Libreoffice-commits] core.git: Branch 'distro/collabora/lof-4.3' - 5 commits - configure.ac Makefile.in sc/source sw/qa writerfilter/source
Tor Lillqvist
tml at collabora.com
Wed Sep 24 00:15:07 PDT 2014
Makefile.in | 1 +
configure.ac | 2 +-
dev/null |binary
sc/source/ui/dbgui/filtdlg.cxx | 5 ++++-
sc/source/ui/dbgui/validate.cxx | 3 ++-
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 9 ---------
writerfilter/source/dmapper/GraphicImport.cxx | 7 -------
writerfilter/source/dmapper/PropertyIds.cxx | 1 -
writerfilter/source/dmapper/PropertyIds.hxx | 1 -
9 files changed, 8 insertions(+), 21 deletions(-)
New commits:
commit 71fc278fd98b4439fc1119b591107f0608ebe3af
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed Sep 24 10:10:51 2014 +0300
Bump patch (build) number
Change-Id: I075150f72ffc5d95eb73da048808ba14b02bcccd
diff --git a/configure.ac b/configure.ac
index 3452a1f..a297829 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
# several non-alphanumeric characters, those are split off and used only for the
# ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea.
-AC_INIT([LibreOffice],[4.3.3.0],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[4.3.3.1],[],[],[http://documentfoundation.org/])
AC_PREREQ([2.59])
commit 51b96c1d8c406f4544ab299d93b311a4451af5cd
Author: Laurent Balland-Poirier <laurent.balland-poirier at laposte.net>
Date: Mon Sep 22 08:07:01 2014 +0200
fdo#83848 Add GetAddressConvention to RefButton
Reviewed-on: https://gerrit.libreoffice.org/11578
Reviewed-by: Kohei Yoshida <libreoffice at kohei.us>
Tested-by: Kohei Yoshida <libreoffice at kohei.us>
(cherry picked from commit 2c7595a911c3b0102162c2ad9cef4a84538b66f8)
Change-Id: I20d633909d3c13bf49998a6cca054ab125b6c991
diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
index df23c4b..e858bdf 100644
--- a/sc/source/ui/dbgui/validate.cxx
+++ b/sc/source/ui/dbgui/validate.cxx
@@ -47,6 +47,7 @@
#include <sfx2/viewfrm.hxx>
#include <sfx2/childwin.hxx>
#include "reffact.hxx"
+#include <document.hxx>
/* Position indexes for "Allow" list box.
They do not map directly to ScValidationMode and can safely be modified to
@@ -105,7 +106,7 @@ void ScTPValidationValue::SetReferenceHdl( const ScRange&rRange , ScDocument* pD
if ( m_pRefEdit )
{
- OUString aStr(rRange.Format(SCR_ABS_3D, pDoc));
+ OUString aStr(rRange.Format(SCR_ABS_3D, pDoc, pDoc->GetAddressConvention()));
m_pRefEdit->SetRefString( aStr );
}
}
commit 39e3dc4efe321fcff28862141c4d410f8a4b81d2
Author: David Ostrovsky <david at ostrovsky.org>
Date: Wed Sep 24 02:11:28 2014 +0200
fdo#65281 Empty/Not empty doesn't work in columns with date format
"Empty" and "Not empty" predicates were unconditionally overriden
in filter dialog for date format columns. Rectify it by preventing
the overriding for these functions.
Test Plan:
* open calc document
* define column with date format
* put some data and let some columns empty
* apply standard filter on date column with "Not empty" function
* verify that rows with non empty columns still visible
Change-Id: I2111c5a6b6350cab63173d42419069813d1137b6
Reviewed-on: https://gerrit.libreoffice.org/11613
Reviewed-by: Kohei Yoshida <libreoffice at kohei.us>
Tested-by: Kohei Yoshida <libreoffice at kohei.us>
(cherry picked from commit 551ee32dfaaddd2aa48efebaefab0730474b656d)
diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx
index b6ff4e1..a19b958 100644
--- a/sc/source/ui/dbgui/filtdlg.cxx
+++ b/sc/source/ui/dbgui/filtdlg.cxx
@@ -1078,15 +1078,18 @@ IMPL_LINK( ScFilterDlg, ValModifyHdl, ComboBox*, pEd )
ScQueryEntry::Item& rItem = rEntry.GetQueryItem();
bool bDoThis = (pLbField->GetSelectEntryPos() != 0);
rEntry.bDoQuery = bDoThis;
+ bool bByEmptyOrNotByEmpty = false;
if ( rEntry.bDoQuery || maRefreshExceptQuery[nQE] )
{
if ( aStrEmpty.equals(aStrVal) )
{
+ bByEmptyOrNotByEmpty = true;
rEntry.SetQueryByEmpty();
}
else if ( aStrNotEmpty.equals(aStrVal) )
{
+ bByEmptyOrNotByEmpty = true;
rEntry.SetQueryByNonEmpty();
}
else
@@ -1106,7 +1109,7 @@ IMPL_LINK( ScFilterDlg, ValModifyHdl, ComboBox*, pEd )
ScQueryOp eOp = (ScQueryOp)pLbCond->GetSelectEntryPos();
rEntry.eOp = eOp;
- if (maHasDates[nQE])
+ if (maHasDates[nQE] && !bByEmptyOrNotByEmpty)
rItem.meType = ScQueryEntry::ByDate;
}
}
commit c892ec1bc259ee3587a2471f58df35b2f231a6f8
Author: Andras Timar <andras.timar at collabora.com>
Date: Tue Sep 23 23:40:56 2014 +0200
Revert "handle docx's w:anchor layoutInCell attribute (bnc#891663)"
This reverts commit 2a632bb30f78f02042ce333d426468087639305b.
diff --git a/sw/qa/extras/ooxmlimport/data/bnc891663.docx b/sw/qa/extras/ooxmlimport/data/bnc891663.docx
deleted file mode 100644
index d5f057e..0000000
Binary files a/sw/qa/extras/ooxmlimport/data/bnc891663.docx and /dev/null differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 07761dd..305b6ed 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -2275,15 +2275,6 @@ DECLARE_OOXMLIMPORT_TEST(testBnc519228OddBreaks, "bnc519228_odd-breaks.docx")
getParagraphOfText( 1, getProperty< uno::Reference<text::XText> >(page5Style, "HeaderText"), "This is the header for odd pages");
}
-DECLARE_OOXMLIMPORT_TEST(testBnc891663, "bnc891663.docx")
-{
- // The image should be inside a cell, so the text in the following cell should be below it.
- int imageTop = parseDump("/root/page/body/tab/row[1]/cell[2]/txt[1]/anchored/fly/infos/bounds", "top").toInt32();
- int imageHeight = parseDump("/root/page/body/tab/row[1]/cell[2]/txt[1]/anchored/fly/infos/bounds", "height").toInt32();
- int textNextRowTop = parseDump("/root/page/body/tab/row[2]/cell[1]/txt[1]/infos/bounds", "top").toInt32();
- CPPUNIT_ASSERT( textNextRowTop >= imageTop + imageHeight );
-}
-
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx
index e2d3fa3..6cd88a5 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -210,7 +210,6 @@ public:
sal_Int16 nVertOrient;
sal_Int16 nVertRelation;
sal_Int32 nWrap;
- bool bLayoutInCell;
bool bOpaque;
bool bContour;
bool bContourOutside;
@@ -284,7 +283,6 @@ public:
,nVertOrient( text::VertOrientation::NONE )
,nVertRelation( text::RelOrientation::FRAME )
,nWrap(0)
- ,bLayoutInCell(false)
,bOpaque( true )
,bContour(false)
,bContourOutside(true)
@@ -583,8 +581,6 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue)
break;
case NS_ooxml::LN_CT_Anchor_locked: // 90990; - ignored
case NS_ooxml::LN_CT_Anchor_layoutInCell: // 90991; - ignored
- m_pImpl->bLayoutInCell = nIntValue != 0;
- break;
case NS_ooxml::LN_CT_Anchor_hidden: // 90992; - ignored
break;
case NS_ooxml::LN_CT_Anchor_allowOverlap: // 90993;
@@ -1234,9 +1230,6 @@ uno::Reference< text::XTextContent > GraphicImport::createGraphicObject( const b
}
xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName( PROP_SURROUND ),
uno::makeAny(m_pImpl->nWrap));
- if( m_pImpl->bLayoutInCell && m_pImpl->nWrap != text::WrapTextMode_THROUGHT )
- xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName( PROP_FOLLOW_TEXT_FLOW ),
- uno::makeAny(true));
xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName( PROP_SURROUND_CONTOUR ),
uno::makeAny(m_pImpl->bContour));
diff --git a/writerfilter/source/dmapper/PropertyIds.cxx b/writerfilter/source/dmapper/PropertyIds.cxx
index fc81dae..3f5fa05 100644
--- a/writerfilter/source/dmapper/PropertyIds.cxx
+++ b/writerfilter/source/dmapper/PropertyIds.cxx
@@ -394,7 +394,6 @@ OUString PropertyNameSupplier::GetName( PropertyIds eId ) const
case PROP_APPLY_PARAGRAPH_MARK_FORMAT_TO_NUMBERING : sName = "ApplyParagraphMarkFormatToNumbering"; break;
case PROP_CELL_DIRECTION: sName = "CellDirection"; break;
case PROP_CELL_HIDE_MARK: sName = "CellHideMark"; break;
- case PROP_FOLLOW_TEXT_FLOW: sName = "IsFollowingTextFlow"; break;
}
::std::pair<PropertyNameMap_t::iterator,bool> aInsertIt =
m_pImpl->aNameMap.insert( PropertyNameMap_t::value_type( eId, sName ));
diff --git a/writerfilter/source/dmapper/PropertyIds.hxx b/writerfilter/source/dmapper/PropertyIds.hxx
index 7394a50..3510e62 100644
--- a/writerfilter/source/dmapper/PropertyIds.hxx
+++ b/writerfilter/source/dmapper/PropertyIds.hxx
@@ -366,7 +366,6 @@ enum PropertyIds
,PROP_APPLY_PARAGRAPH_MARK_FORMAT_TO_NUMBERING
,PROP_CELL_DIRECTION
,PROP_CELL_HIDE_MARK
- ,PROP_FOLLOW_TEXT_FLOW
};
struct PropertyNameSupplier_Impl;
class PropertyNameSupplier
commit cecc73ffca034b4d65d0f8abc674ea89d7a9d179
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Sep 9 10:35:51 2014 +0300
Remove potential old leftover before moving the app bundle
Change-Id: I7f0a8ae184a2f3d8a4476415b56df4ad8e4e342f
diff --git a/Makefile.in b/Makefile.in
index b458400..de86fea 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -327,6 +327,7 @@ endif
mac-app-store-package: test-install
ifneq ($(MACOSX_PACKAGE_SIGNING_IDENTITY),)
+ rm -rf "$(MACOSX_APP_NAME).app"
mv "$(TESTINSTALLDIR)/$(PRODUCTNAME).app" "$(MACOSX_APP_NAME).app"
productbuild --component "$(MACOSX_APP_NAME).app" /Applications --sign $(MACOSX_PACKAGE_SIGNING_IDENTITY) $(shell echo "$(MACOSX_APP_NAME)" | tr ' ' '-').pkg
else
More information about the Libreoffice-commits
mailing list