[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - include/svx reportdesign/source sc/source sd/source svx/source
include/svx/svdundo.hxx| 14 ---
reportdesign/source/core/inc/ReportUndoFactory.hxx |2
reportdesign/source/core/sdr/ReportUndoFactory.cxx |4 -
sc/source/core/data/drwlayer.cxx |2
sd/source/core/drawdoc3.cxx| 20 -
sd/source/ui/func/undoback.cxx | 56 ++
sd/source/ui/inc/undoback.hxx | 12 ---
svx/source/svdraw/svdundo.cxx | 83 -
8 files changed, 26 insertions(+), 167 deletions(-)
New commits:
commit 0402ba63551b614c9742b198e48232ac87a2b32b
Author: Caolán McNamara
Date: Fri Sep 30 12:45:03 2016 +0100
Resolves: tdf#101711 revert attempt to drop unused bg images
for 5-2/5-1 simply revert the effort
Revert "Related: rhbz#1353069 don't clear XATTR_FILL* from stylesheet if..."
This reverts commit 914d72ee1edb351e4975a516240a38696f619217.
Revert "Resolves: rhbz#1353069 don't clear XATTR_FILL* from stylesheet
if..."
This reverts commit de4908eb4d2f1f2ce38a37eea18a9efc4a0073b1.
Revert "use unique_ptr"
This reverts commit ee4f35090657fdce572c5bc6238aceb4098a6e4e.
Revert "fix typo"
This reverts commit a084962e8c3deaeb3c1b6b9119215b48cf27e76e.
Revert "rbhz#1326602 avoid exp. bg bitmaps from deleted slides"
This reverts commit b876bbe2cacce8af379b10d82da6c7e7d229b361.
Change-Id: I65a2f50d1087d6f8bb94d8bb73d54d3f378c6800
Reviewed-on: https://gerrit.libreoffice.org/29490
Tested-by: Jenkins
Reviewed-by: David Tardon
diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx
index 9d63557..8a9bb8a 100644
--- a/include/svx/svdundo.hxx
+++ b/include/svx/svdundo.hxx
@@ -22,7 +22,6 @@
#include
-#include
#include
#include
@@ -34,7 +33,6 @@
#include
class SfxItemSet;
-class SfxPoolItem;
class SfxStyleSheet;
class SdrView;
class SdrPageView;
@@ -586,12 +584,9 @@ class SVX_DLLPUBLIC SdrUndoDelPage : public SdrUndoPageList
// When deleting a MasterPage, we remember all relations of the
// Character Page with the MasterPage in this UndoGroup.
SdrUndoGroup* pUndoGroup;
-std::unique_ptr mpFillBitmapItem;
-bool mbHasFillBitmap;
-bool mbSoleOwnerOfFillBitmapProps;
public:
-SdrUndoDelPage(SdrPage& rNewPg, bool bSoleOwnerOfFillBitmapProps);
+SdrUndoDelPage(SdrPage& rNewPg);
virtual ~SdrUndoDelPage();
virtual void Undo() override;
@@ -602,11 +597,6 @@ public:
virtual void SdrRepeat(SdrView& rView) override;
virtual bool CanSdrRepeat(SdrView& rView) const override;
-
-private:
-void queryFillBitmap(const SfxItemSet &rItemSet);
-void clearFillBitmap();
-void restoreFillBitmap();
};
/**
@@ -763,7 +753,7 @@ public:
virtual SdrUndoAction* CreateUndoMoveLayer(sal_uInt16 nLayerNum,
SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel, sal_uInt16 nNeuPos1);
// Page
-virtual SdrUndoAction* CreateUndoDeletePage(SdrPage& rPage, bool
bSoleOwnerOfFillBitmapProps = true);
+virtual SdrUndoAction* CreateUndoDeletePage(SdrPage& rPage);
virtual SdrUndoAction* CreateUndoNewPage(SdrPage& rPage);
virtual SdrUndoAction* CreateUndoCopyPage(SdrPage& rPage);
virtual SdrUndoAction* CreateUndoSetPageNum(SdrPage& rNewPg, sal_uInt16
nOldPageNum1, sal_uInt16 nNewPageNum1);
diff --git a/reportdesign/source/core/inc/ReportUndoFactory.hxx
b/reportdesign/source/core/inc/ReportUndoFactory.hxx
index 1839f1f..88d0024 100644
--- a/reportdesign/source/core/inc/ReportUndoFactory.hxx
+++ b/reportdesign/source/core/inc/ReportUndoFactory.hxx
@@ -59,7 +59,7 @@ namespace rptui
virtual SdrUndoAction* CreateUndoMoveLayer(sal_uInt16 nLayerNum,
SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel, sal_uInt16 nNeuPos1)
override;
// page
-virtual SdrUndoAction* CreateUndoDeletePage(SdrPage& rPage, bool
bSoleOwnerOfFillBitmapProps = true) override;
+virtual SdrUndoAction* CreateUndoDeletePage(SdrPage& rPage) override;
virtual SdrUndoAction* CreateUndoNewPage(SdrPage& rPage) override;
virtual SdrUndoAction* CreateUndoCopyPage(SdrPage& rPage) override;
virtual SdrUndoAction* CreateUndoSetPageNum(SdrPage& rNewPg,
sal_uInt16 nOldPageNum1, sal_uInt16 nNewPageNum1) override;
diff --git a/reportdesign/source/core/sdr/ReportUndoFactory.cxx
b/reportdesign/source/core/sdr/ReportUndoFactory.cxx
index 566400c..cbb5a8a 100644
--- a/reportdesign/source/core/sdr/ReportUndoFactory.cxx
+++ b/reportdesign/source/core/sdr/ReportUndoFactory.cxx
@@ -133,9 +133,9 @@ SdrUndoAction*
OReportUndoFactory::CreateUndoMoveLayer(sal_uInt16 nLayerNum, Sdr
}
// page
-SdrUndoAction* OReportUndoFactory::CreateUndoDeletePage(SdrPage& rPage, bool
bSoleOwnerOfFillBitmapProps)
+SdrUndoAction* OReportUndoFactory::CreateUndoDeletePage(SdrPage& rPage)
{
-return m_pUndoFactory->
[Libreoffice-commits] core.git: compilerplugins/clang dbaccess/source
compilerplugins/clang/mergeclasses.results |1 -
dbaccess/source/core/recovery/storagestream.cxx| 15 ---
dbaccess/source/core/recovery/storagestream.hxx| 20
dbaccess/source/core/recovery/storagexmlstream.cxx | 17 +++--
dbaccess/source/core/recovery/storagexmlstream.hxx | 11 +--
5 files changed, 16 insertions(+), 48 deletions(-)
New commits:
commit c1e18e05a53c1d55afe36a887ca25f74f3f1d32d
Author: Noel Grandin
Date: Tue Oct 4 09:57:11 2016 +0200
merge dbaccess::StorageInputStream with dbaccess::StorageXMLInputStream
Change-Id: I05b54b8a2fe4ff0c8b9f89e3d29e864e8665b7b8
Reviewed-on: https://gerrit.libreoffice.org/29519
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/compilerplugins/clang/mergeclasses.results
b/compilerplugins/clang/mergeclasses.results
index 29b47df..d0c51a5 100644
--- a/compilerplugins/clang/mergeclasses.results
+++ b/compilerplugins/clang/mergeclasses.results
@@ -227,7 +227,6 @@ merge cppu::PropertySetMixinImpl with cppu::PropertySetMixin
merge dbaccess::IPropertyContainer with dbaccess::OColumn
merge dbaccess::IRefreshListener with dbaccess::OConnection
merge dbaccess::OColumnWrapper with dbaccess::OTableColumnDescriptorWrapper
-merge dbaccess::StorageInputStream with dbaccess::StorageXMLInputStream
merge dbaui::IEntryFilter with dbaui::(anonymous
namespace)::FilterByEntryDataId
merge dbaui::IUpdateHelper with dbaui::OParameterUpdateHelper
merge dbaui::OSplitterView with dbaui::OApplicationDetailView
diff --git a/dbaccess/source/core/recovery/storagestream.cxx
b/dbaccess/source/core/recovery/storagestream.cxx
index cba882c..6f23cba 100644
--- a/dbaccess/source/core/recovery/storagestream.cxx
+++ b/dbaccess/source/core/recovery/storagestream.cxx
@@ -60,21 +60,6 @@ namespace dbaccess
// (legitimately) do not call this method here.
}
-// StorageInputStream
-StorageInputStream::StorageInputStream( const Reference< XStorage >&
i_rParentStorage,
-const OUString& i_rStreamName
- )
-{
-ENSURE_OR_THROW( i_rParentStorage.is(), "illegal stream" );
-
-const Reference< XStream > xStream(
-i_rParentStorage->openStreamElement( i_rStreamName,
ElementModes::READ ), UNO_QUERY_THROW );
-m_xInputStream.set( xStream->getInputStream(), UNO_SET_THROW );
-}
-
-StorageInputStream::~StorageInputStream()
-{
-}
} // namespace dbaccess
diff --git a/dbaccess/source/core/recovery/storagestream.hxx
b/dbaccess/source/core/recovery/storagestream.hxx
index 3fe4e28..6ed2b93 100644
--- a/dbaccess/source/core/recovery/storagestream.hxx
+++ b/dbaccess/source/core/recovery/storagestream.hxx
@@ -53,26 +53,6 @@ namespace dbaccess
m_xOutputStream;
};
-// StorageInputStream
-/** convenience wrapper around a stream living in a storage
-*/
-class StorageInputStream
-{
-public:
-StorageInputStream(
-const css::uno::Reference< css::embed::XStorage >&
i_rParentStorage,
-const OUString& i_rStreamName
-);
-virtual ~StorageInputStream();
-
-protected:
-const css::uno::Reference< css::io::XInputStream >&
-getInputStream() const {
return m_xInputStream; }
-
-private:
- css::uno::Reference< css::io::XInputStream >
-m_xInputStream;
-};
} // namespace dbaccess
diff --git a/dbaccess/source/core/recovery/storagexmlstream.cxx
b/dbaccess/source/core/recovery/storagexmlstream.cxx
index 3919598..e47db02 100644
--- a/dbaccess/source/core/recovery/storagexmlstream.cxx
+++ b/dbaccess/source/core/recovery/storagexmlstream.cxx
@@ -19,6 +19,7 @@
#include "storagexmlstream.hxx"
+#include
#include
#include
#include
@@ -128,10 +129,14 @@ namespace dbaccess
StorageXMLInputStream::StorageXMLInputStream( const
Reference& i_rContext,
const Reference< XStorage >&
i_rParentStorage,
const OUString&
i_rStreamName )
-:StorageInputStream( i_rParentStorage, i_rStreamName )
-,m_pData( new StorageXMLInputStream_Data )
{
-m_pData->xParser.set( Parser::create(i_rContext) );
+ENSURE_OR_THROW( i_rParentStorage.is(), "illegal stream" );
+
+const Reference< css::io::XStream > xStream(
+i_rParentStorage->openStreamElement( i_rStreamName,
css::embed::ElementModes::READ ), UNO_QUERY_THROW );
+m_xInputStream.set( xStream->getInputStream(), css::uno::UNO_SET_THROW
);
+
+m_xParser.set( Parser::create(i_rContext) );
}
void StorageXMLInputStream::import( const Reference< XDocumentHandler >&
i_rHandler )
@@ -139,10 +1
[Libreoffice-commits] core.git: starmath/source
starmath/source/parse.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 36efdec23b86fe28c79fe672bb6862fb57b6e09a
Author: Takeshi Abe
Date: Mon Oct 3 09:03:30 2016 +0900
starmath: Assert the precondition for OUString#replaceAt()
Change-Id: I56ee95f9196eb2b2b3cc71203251b98ff1dba951
Reviewed-on: https://gerrit.libreoffice.org/29464
Reviewed-by: Takeshi Abe
Tested-by: Takeshi Abe
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 63886e5..4977a82 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -339,7 +339,7 @@ bool IsDelimiter( const OUString &rTxt, sal_Int32 nPos )
void SmParser::Replace( sal_Int32 nPos, sal_Int32 nLen, const OUString &rText )
{
-OSL_ENSURE( nPos + nLen <= m_aBufferString.getLength(), "argument
mismatch" );
+assert( nPos + nLen <= m_aBufferString.getLength() );
m_aBufferString = m_aBufferString.replaceAt( nPos, nLen, rText );
sal_Int32 nChg = rText.getLength() - nLen;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/subsequent_filters-test.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 1d37ad2575870a4cc3f4b73a55cae4f7147f0d12
Author: Kohei Yoshida
Date: Tue Oct 4 20:32:36 2016 -0400
Actually this should check for the top shared cell.
To be extra cautious.
Change-Id: I667d01dd82d957a0203a15602d9a2dacf7dc7e83
diff --git a/sc/qa/unit/subsequent_filters-test.cxx
b/sc/qa/unit/subsequent_filters-test.cxx
index 0b17d4c..4d4136c 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -3409,7 +3409,7 @@ void ScFiltersTest::testSharedFormulaColumnLabelsODS()
{
const ScFormulaCell* pCell = rDoc.GetFormulaCell(ScAddress(i,1,0));
CPPUNIT_ASSERT(pCell);
-CPPUNIT_ASSERT(pCell->IsShared());
+CPPUNIT_ASSERT(pCell->IsSharedTop());
CPPUNIT_ASSERT_EQUAL(static_cast(5), pCell->GetSharedLength());
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loolwsd/LOOLStress.cpp
loolwsd/LOOLStress.cpp |5 - 1 file changed, 4 insertions(+), 1 deletion(-) New commits: commit a0f6f4e41cebdc6617ef839c19d274e7ec7012d4 Author: Ashod Nakashian Date: Mon Oct 3 23:43:44 2016 -0400 loolstress: use new URI for loading documents Change-Id: If811deffc4b7a9b2cf290b93d9f87a840e64dc4e Reviewed-on: https://gerrit.libreoffice.org/29531 Reviewed-by: Ashod Nakashian Tested-by: Ashod Nakashian diff --git a/loolwsd/LOOLStress.cpp b/loolwsd/LOOLStress.cpp index c43cfbc..484d3fb 100644 --- a/loolwsd/LOOLStress.cpp +++ b/loolwsd/LOOLStress.cpp @@ -110,7 +110,10 @@ public: // Load a document and get its status. std::cout << "NewSession [" << sessionId << "]: " << uri.toString() << "... "; -Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_GET, "/lool/ws/" + documentURL); + +std::string encodedUri; +Poco::URI::encode(documentURL, ":/?", encodedUri); +Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_GET, "/lool/" + encodedUri + "/ws"); Poco::Net::HTTPResponse response; auto ws = helpers::connectLOKit(uri, request, response, sessionId + ' '); std::cout << "Connected.\n"; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Problem while building dependencies
Hi Hizaifa, Huzaifa Iftikhar wrote on 04-10-16 21:22: > I am new to this community and I would like to contribute to libre. Welcome :) > ... > "E: Unable to fetch some archives, maybe run apt-get update or try with > --fix-missing? > I stumbled the same problem not so long ago. And added an extra note on this page: https://wiki.documentfoundation.org/Development/Linux_Build_Dependencies : "! Mind, when the source URI points to a 'local' server, e.g. http://nl.archive.ubuntu.com/ubuntu/, that may give problems too. In the example removing 'nl' solves it." Does that help? Ciao - Cor -- Cor Nouws GPD key ID: 0xB13480A6 - 591A 30A7 36A0 CE3C 3D28 A038 E49D 7365 B134 80A6 - vrijwilliger http://nl.libreoffice.org - volunteer http://www.libreoffice.org - The Document Foundation Membership Committee Member ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Need help compiling using the --enable-vlc option.
Hi there, Kirk Puppy and Rene, I'm planning to work on improving the video playback in LO, and I am interested in your experiences with the vlc option. Can this be made to work at the same quality level as i.e. the gstreamer plugin? Are you yourself planning to make code contributions in this area? Greetings, Stephan van den Akker Peutz bv the Netherlands 2016-09-30 20:03 GMT+02:00 Kirk Puppy : > Wow, that was easy. Thanks for your help Rene! > > On Fri, Sep 30, 2016 at 9:11 AM, Rene Engelhard wrote: >> >> Hi, >> >> On Wed, Sep 28, 2016 at 10:35:39AM -0400, Kirk Puppy wrote: >> > So I built with --enable-vlc, but libreoffice still seemed to >> > try and >> >use gstreamer. When I would try and insert video into Impress I would >> > get >> >a gstreamer missing pluggins error on the terminal. >> > So then I tried compiling with --enable-vlc, >> > --disable-gstreamer-1-0, >> >and --disable-gstreamer-0-10. Now when I try to insert video into >> > impress, >> >I don't see any errors about gstreamer. But Impress pops up an error >> >message "The format of the selected file is not supported". I tried >> > mp4, >> >avi, and mkv. All have the same error message. Is there something >> > else I >> >need for using VLC? Is Gstreamer required? >> >> % grep -ri experimental * >> source/vlc/vlcuno.cxx:// Experimental for now - code is neither >> elegant nor well tested. >> source/vlc/vlcuno.cxx:if (!xContext.is() || >> !officecfg::Office::Common::Misc::ExperimentalMode::get(xContext)) >> source/vlc/vlcuno.cxx:// Experimental for now - code is neither >> elegant nor well tested. >> source/vlc/vlcuno.cxx:if (!xContext.is() || >> !officecfg::Office::Common::Misc::ExperimentalMode::get(xContext)) >> >> So I guess you want to enable experimental features? >> (in Tools -> Options -> Advanced) >> >> Regards, >> >> Rene > > > > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/libreoffice > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[ANNOUNCE] Branch libreoffice-5-1-6 and Tag libreoffice-5.1.6.1 created
Hi all, The tag libreoffice-5.1.6.1 (AKA 5.1.6 RC1) and the corresponding branch libreoffice-5-1-6 have been created. The branch will be used for fine tuning of the 5.1.6 release. (there is one additional RC planned) The following rules apply: + preferably just translation or blocker fixes + only cherry-picking from libreoffice-4-3 branch + 2 additional reviews needed; 2nd reviewer pushes + no regular merges back to anything The ‘libreoffice-5-1' branch is still active and will be used for the 5.1.6 bugfix release. Please read more at http://wiki.documentfoundation.org/ReleasePlan/5.1#5.1.6_release http://wiki.documentfoundation.org/Development/Branches http://wiki.documentfoundation.org/Release_Criteria Now, if you want to switch your clone to the branch, please do: ./g pull -r ./g checkout -b libreoffice-5-1-6 origin/libreoffice-5-1-6 To checkout the tag, use ./g fetch --tags ./g checkout -b tag-libreoffice-5.1.6.1 libreoffice-5.1.6.1 Hopefully it will work for you :-) Most probably, you will also want to do (if you haven't done it yet): git config --global push.default tracking When you do git push with this, git will push only the branch you are on; e.g. libreoffice-5-1-6 when you have switched to it. This will save you some git shouting at you. Linux distro packages might find source tarballs at http://dev-builds.libreoffice.org/pre-releases/src/ They will soon be available from the official page together with the builds. Attached is the list of changes against 5.1.5 (final) Happy hacking, Jan I commits-libreoffice-5-1-6-release-libreoffice-5.1.6.1.log Description: application/applefile bugs-changelog-libreoffice-5-1-6-release-libreoffice-5.1.6.1.log Description: application/applefile bugs-libreoffice-5-1-6-release-libreoffice-5.1.6.1.log Description: application/applefile ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 3 commits - sc/qa sc/source
sc/qa/unit/data/xlsx/pivot-table/shared-dategroup.xlsx |binary
sc/qa/unit/data/xlsx/pivot-table/shared-numgroup.xlsx |binary
sc/qa/unit/subsequent_filters-test.cxx | 78 -
sc/source/core/data/dpobject.cxx |3
4 files changed, 79 insertions(+), 2 deletions(-)
New commits:
commit 7e1fd9aa86ab8d5e86f35df8615f438a3383af98
Author: Tamás Zolnai
Date: Thu Sep 29 05:24:22 2016 +0200
Pivot tables: Fix wrong group field number in cache
getCache should not append new group fields to the cache,
but use those which are stored in the dimension data.
Change-Id: I2011b0d3a22644a86c31500d74469b9c4c641649
diff --git a/sc/qa/unit/subsequent_filters-test.cxx
b/sc/qa/unit/subsequent_filters-test.cxx
index 63bafd2..0b17d4c 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -2104,9 +2104,7 @@ void ScFiltersTest::testPivotTableSharedGroupXLSX()
const ScDPCache* pCache =
rSheetCaches.getExistingCache(ScRange(0,0,1,13,18,1));
CPPUNIT_ASSERT_MESSAGE("Pivot cache is expected for A1:N19 on the second
sheet.", pCache);
CPPUNIT_ASSERT_EQUAL(static_cast(14), pCache->GetFieldCount());
-
-// TODO : Look into this and find out why it fails.
-// CPPUNIT_ASSERT_EQUAL(static_cast(1),
pCache->GetGroupFieldCount());
+CPPUNIT_ASSERT_EQUAL(static_cast(1), pCache->GetGroupFieldCount());
xDocSh->DoClose();
}
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index 8e6411b..d9b07a4 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -2952,7 +2952,10 @@ const ScDPCache*
ScDPCollection::SheetCaches::getCache(const ScRange& rRange, co
}
if (pDimData)
+{
+(itCache->second)->ClearGroupFields();
pDimData->WriteToCache(*itCache->second);
+}
return itCache->second.get();
}
commit 93098854c2d2b814a21161bd88071918cb382e87
Author: Tamás Zolnai
Date: Wed Oct 5 05:14:42 2016 +0200
Test XLSX import of number groups
Change-Id: I12a8f301607240684676c5b50bdad0eea0923f97
diff --git a/sc/qa/unit/data/xlsx/pivot-table/shared-numgroup.xlsx
b/sc/qa/unit/data/xlsx/pivot-table/shared-numgroup.xlsx
new file mode 100644
index 000..36f36ef
Binary files /dev/null and
b/sc/qa/unit/data/xlsx/pivot-table/shared-numgroup.xlsx differ
diff --git a/sc/qa/unit/subsequent_filters-test.cxx
b/sc/qa/unit/subsequent_filters-test.cxx
index 8c90ce2..63bafd2 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -202,6 +202,7 @@ public:
void testGetPivotDataXLS();
void testPivotTableSharedGroupXLSX();
void testPivotTableSharedDateGroupXLSX();
+void testPivotTableSharedNumGroupXLSX();
void testFormulaDependency();
@@ -310,6 +311,7 @@ public:
CPPUNIT_TEST(testGetPivotDataXLS);
CPPUNIT_TEST(testPivotTableSharedGroupXLSX);
CPPUNIT_TEST(testPivotTableSharedDateGroupXLSX);
+CPPUNIT_TEST(testPivotTableSharedNumGroupXLSX);
CPPUNIT_TEST(testRowHeightODS);
CPPUNIT_TEST(testFormulaDependency);
CPPUNIT_TEST(testRichTextContentODS);
@@ -2146,6 +2148,41 @@ void ScFiltersTest::testPivotTableSharedDateGroupXLSX()
xDocSh->DoClose();
}
+void ScFiltersTest::testPivotTableSharedNumGroupXLSX()
+{
+ScDocShellRef xDocSh = loadDoc("pivot-table/shared-numgroup.",
FORMAT_XLSX);
+CPPUNIT_ASSERT_MESSAGE("Failed to load file", xDocSh.Is());
+ScDocument& rDoc = xDocSh->GetDocument();
+
+// Check whether right number groups are imported for both tables
+// First table
+CPPUNIT_ASSERT_EQUAL(OUString("32674-47673"),
rDoc.GetString(ScAddress(0,4,1)));
+CPPUNIT_ASSERT_EQUAL(OUString("47674-62673"),
rDoc.GetString(ScAddress(0,5,1)));
+CPPUNIT_ASSERT_EQUAL(OUString("62674-77673"),
rDoc.GetString(ScAddress(0,6,1)));
+CPPUNIT_ASSERT_EQUAL(OUString("77674-92673"),
rDoc.GetString(ScAddress(0,7,1)));
+CPPUNIT_ASSERT_EQUAL(OUString("92674-107673"),
rDoc.GetString(ScAddress(0,8,1)));
+
+// Second table
+CPPUNIT_ASSERT_EQUAL(OUString("32674-47673"),
rDoc.GetString(ScAddress(5,4,1)));
+CPPUNIT_ASSERT_EQUAL(OUString("47674-62673"),
rDoc.GetString(ScAddress(5,5,1)));
+CPPUNIT_ASSERT_EQUAL(OUString("62674-77673"),
rDoc.GetString(ScAddress(5,6,1)));
+CPPUNIT_ASSERT_EQUAL(OUString("77674-92673"),
rDoc.GetString(ScAddress(5,7,1)));
+CPPUNIT_ASSERT_EQUAL(OUString("92674-107673"),
rDoc.GetString(ScAddress(5,8,1)));
+
+// There should be exactly 2 pivot tables and 1 cache.
+ScDPCollection* pDPs = rDoc.GetDPCollection();
+CPPUNIT_ASSERT_EQUAL(static_cast(2), pDPs->GetCount());
+
+ScDPCollection::SheetCaches& rSheetCaches = pDPs->GetSheetCaches();
+CPPUNIT_ASSERT_EQUAL(static_cast(1), rSheetCaches.size());
+
+const ScDPCache* pCache =
rSheetCaches.getExistingCache(ScRange(0,0,0,9,24,0));
+
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/helpids.h |2 --
sc/source/ui/sidebar/CellAppearancePropertyPanel.src |2 --
2 files changed, 4 deletions(-)
New commits:
commit 47258c2c3d095ff1b9314d7a817baa567cf4907e
Author: Caolán McNamara
Date: Tue Oct 4 20:40:05 2016 +0100
these helpids go nowhere
Change-Id: Ib8938ac69227b99434fa4ab05c460cc44a96e4fd
diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index 9c15904..1641616 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -223,8 +223,6 @@
// sidebar -
// CellAppearancePropertyPanel -
-#define HID_PROPERTYPANEL_SC_STYLE_VS
"SC_HID_PROPERTYPANEL_SC_STYLE_VS"
-#define HID_PROPERTYPANEL_SC_STYLE_PB
"SC_HID_PROPERTYPANEL_SC_STYLE_PB"
#define HID_PROPERTYPANEL_SC_BORDER1_TBX
"SC_HID_PROPERTYPANEL_SC_BORDER1_TBX"
#define HID_PROPERTYPANEL_SC_BORDER_TBI_NONE
"SC_HID_PROPERTYPANEL_SC_BORDER_TBI_NONE"
#define HID_PROPERTYPANEL_SC_BORDER_TBI_ALL
"SC_HID_PROPERTYPANEL_SC_BORDER_TBI_ALL"
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.src
b/sc/source/ui/sidebar/CellAppearancePropertyPanel.src
index 56e0559..6361999 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.src
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.src
@@ -79,7 +79,6 @@ Control RID_POPUPPANEL_APPEARANCE_CELL_LINESTYLE
Control VS_STYLE
{
-HelpID = HID_PROPERTYPANEL_SC_STYLE_VS ;
Hide = TRUE ;
Pos = MAP_APPFONT( POPUPPANEL_MARGIN_SMALL + OFFSET_X ,
POPUPPANEL_MARGIN_SMALL + OFFSET_Y );
Size = MAP_APPFONT ( 80 , 12 * 9);
@@ -88,7 +87,6 @@ Control RID_POPUPPANEL_APPEARANCE_CELL_LINESTYLE
};
PushButton PB_OPTIONS
{
-HelpID = HID_PROPERTYPANEL_SC_STYLE_PB;
Pos = MAP_APPFONT ( POPUPPANEL_MARGIN_LARGE + OFFSET_X ,
POPUPPANEL_MARGIN_SMALL * 2 + OFFSET_Y + 12 * 9);
Size = MAP_APPFONT ( 75 , 12 );
TabStop = TRUE;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/sidebar/CellAppearancePropertyPanel.hrc |1 -
sc/source/ui/sidebar/CellAppearancePropertyPanel.src |4
2 files changed, 5 deletions(-)
New commits:
commit f81916ad6974f9ff97717b4babe4bdfad88e9c8a
Author: Caolán McNamara
Date: Tue Oct 4 20:36:55 2016 +0100
unused bitmap resource
Change-Id: If7ca172846ee958e51c8648a425cf646e03f8826
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hrc
b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hrc
index e9adcd6..439bb58 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hrc
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hrc
@@ -20,7 +20,6 @@
//line style page
#define VS_STYLE1
#define PB_OPTIONS 2
-#define BMP_UNDERLINE_MORE 3
//line border page
#define TB_BORDER1 1
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.src
b/sc/source/ui/sidebar/CellAppearancePropertyPanel.src
index 4049151..56e0559 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.src
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.src
@@ -94,10 +94,6 @@ Control RID_POPUPPANEL_APPEARANCE_CELL_LINESTYLE
TabStop = TRUE;
Text [ en-US ] = "~More Options...";
};
-Bitmap BMP_UNDERLINE_MORE
-{
-File = "sidebar/morebutton.png";
-};
};
// cell border style popup
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-5.1.6.1'
Tag 'libreoffice-5.1.6.1' created by Jan Iversen at 2016-10-04 19:32 + Tag libreoffice-5.1.6.1 -BEGIN PGP SIGNATURE- Comment: GPGTools - https://gpgtools.org iQIcBAABCgAGBQJX9AOwAAoJEPQ0oe+v7q6jdlAP/jcuGQDP+z9aJ0aWg9Knvwws nq1PegOBDdX6VTc1Dx8PeHFaSJZGmn3JLKmPNyazAlpvuQAHfkwOedCHW9e0xCxV NWBY/sxn7zmeeR+8Wiq+Q7gsCsVXBVOuDGqem9w0cIPQ/hskbckdvTiluzhDlO/q bLSrIgtHeIMzyV79U8hlCUlqc7S7/7xyrkSs0GOBTzlqJ9gEElB39frA8Y6o2hWO m1bIU6diXt7IIIBVwAH2iF5P2Q5fJODA/A1Quei1p7K1Qzr6dH/HOU8su6pBvOCD kECcWt0AxsNg5JiwP83S0lN+WVFS8Td7CdakJIDzMGVDl6W9h/YLQyfiHHkOlUOR A0gN7A6q3riH6O/zUlPNOxZVURSybTJWNvDxJct7fhSMMLuhtGxnSiLb3hg8VZ0r 2Dbw0hgqxcWNyzHrI91Jcg/3Yz/3U6PnKY5ZP010S/pkSYhmLNdz8PReL+2L/mVm pUsn3OzqoWikSFwhnRk91CHXK0G1+0ySuDDUfHQHRDnVg5p0xSnkD+KW9ekxeUDx azb2/yLdasT/4dxCfHwa7c/yAHXo9JJn/gaYZUemqukGTXkNiMuHqk4EOIrJtu0I Spea3FR0gypeVya3gOaN3AFDR0tKSU92Z7PRB2jzD/LJBfLTIkBMHq+BUOY9Hisq yl/ZQQzNhnLYJXzHHk1Z =sp01 -END PGP SIGNATURE- Changes since cp-5.1-branch-point-209: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1-6' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit eda4bb6c6b8cea62e0dfc37593d4b1ac95db237a Author: Jan Iversen Date: Tue Oct 4 21:34:14 2016 +0200 bump product version to 5.1.6.1 Change-Id: I1c7886bcca831d432f782ee8fe591b32638c5199 diff --git a/configure.ac b/configure.ac index 10dbb12..94f7540 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],[5.1.6.0.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[5.1.6.1.0+],[],[],[http://documentfoundation.org/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-5.1.6.1'
Tag 'libreoffice-5.1.6.1' created by Jan Iversen at 2016-10-04 19:30 + Tag libreoffice-5.1.6.1 -BEGIN PGP SIGNATURE- Comment: GPGTools - https://gpgtools.org iQIcBAABCgAGBQJX9AOIAAoJEPQ0oe+v7q6jG/gP/14T8bf6ITPLt1avZOWIEycr +woWI/cdo9vk5iADl2DtFNJ95zNkAHtFqQiXQn83W9nHZS3BzDM9Rpo9QeAHJSZC dWK8NzqLq6XlHeZCwGsFB8v1wanNgPAh1dpvCN1NW2KvkJN9vxaIpKTlxsJTdKiM MMr5J5xwUyBJtu2rFWoftea3skvAs6xyu6fGOH/sU6lzSrdCCX4CjMlzVS/xJ0ru 3goVWrERsDBaF43KheqaOeWJdCrOqtS+11URTDTpWeaaWY11a0kQxJv+PD3jEgBh +JycELkRt8dvNn9okO8HjLi9uClpwNGdTNBvctu8HqeUvHT6fs3lRSDbAauZkqzK ZJzP4U5JRI/ZLAG+Hcu7hvLS3LIZUIvoNUW+lIfRWUCUVfQXMrGd2WREDBqaBTpe bag6wRoR4oi/OmJvcQPNGyfLllrJrfoL1hHvkaK2lAJPB1HJEQLE6r1AIO+E4fFX BtBfoJrO5lBn2Pos2wyu7rszP8IcrAFcOCEYVjQNxgfeHhh0AwPmV8Jzcpg0BmMV z8WQh+8cMpGc1iLjJUCNBbjlgOT6Il21RLgVJj3VP7GLssHe6R6nUnIHSfFzBSf6 DhQLtyqY+SGKtNkJSkwU1GcqtHGzM9gjO/vD4du5/7iiLMHdw5FWs4PAtPkxSfCq q1rskxGW/hL36/hjFdvW =uDOB -END PGP SIGNATURE- Changes since cp-5.1-8-2: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-5.1.6.1'
Tag 'libreoffice-5.1.6.1' created by Jan Iversen at 2016-10-04 19:31 + Tag libreoffice-5.1.6.1 -BEGIN PGP SIGNATURE- Comment: GPGTools - https://gpgtools.org iQIcBAABCgAGBQJX9AOTAAoJEPQ0oe+v7q6jswcP/39GB3HjcBZWS+i5znoOJMJd YoxPeNoDsdzoI6eR/fUYgxgTHJoXEcrf4TJbVPws8jj++updGTVFs+TadaNC/hID eS/j1nU6kBK8pBPe6nxxMRI/Ewp9hh/j0BWUoeA0Jlu6qIDDo3Z2dXLh9/jn/Zdf adFFW5GIzGt5CfQ92fjcxuMiJICTH2//XA6MfTSrtuocgVNvMmpABe5+3dJM9yw0 96MKgbfRJGKJb+PTFJK5MnsOzpDaOT5Y9MZxk6XtjVHWZ53lBMlWVxpNhDUI5ihj 3ZXpIk7lxTmU05JifcLrUSz/KYlUIMgdrw/mdXA4wd/U5IWfQFhNhXO5sF/AhcMu 8S/eIIwVNWy1ygZgALStZAmiFmIjqhxwwl6fMljKDrVLk1hScToG3Ymzh84qJZ/Z gzffDv992eC8UYW/uyPi8b7UfZ/G8Pmg6npmxUA7jyAtAnS+JtfSNxD4ruIjzCMw dQ0DfCzgQj8VptlkAbEtw8NUvgM+SRzaVyzcWY9PBYnrqHMNI6/r0pyzoqDLFLHu ztxElGGsM64iH7x9tZg64zzDP+66/LS5WH/iHoXnqA7iI6zCJssXvM7OjA1bjw+e u8+yMmG6UZN0FcaXI4pQSu8cJz67u3Yyp0W5avZJZ4NOdyrYWsCaYtEWQSWXO0o7 YHMgIWc9vRYmjJC86aRc =CDjv -END PGP SIGNATURE- Changes since libreoffice-5-1-branch-point-11: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-5.1.6.1'
Tag 'libreoffice-5.1.6.1' created by Jan Iversen at 2016-10-04 19:31 + Tag libreoffice-5.1.6.1 -BEGIN PGP SIGNATURE- Comment: GPGTools - https://gpgtools.org iQIcBAABCgAGBQJX9AOpAAoJEPQ0oe+v7q6jU/MP/jNhukSemjRbnz4P7qkjx7rc 8+Dk+gCcWyCir28ZKDXnifRUf880zzUAyGdNrWpLKKCkZnfXatZc8APbQSGcnpEd yoGUzECsHehUv28JxI1OSQmimT+P3dVbveKvIOdxrENeiXX0Cn1WTgXGOZdeoJ9V fv8oot3R0ZJCZx3uAeyzSyksSXXxPoyJYq06ZpJWDcuy0otqPZg9AXBKKBe1zVbg 43RYx55v+mzWXADC1Rwm6nR683zo0TUMIujDTfvVHX1q1eA9wUpmC+aEoG/vOY5N mdAhNkbicns8mus1sRJ3JXaTiT+D4MwNATNFdCkZ2prY7QmTvMhMFmJicrT9470c f1dKIOIF1RaMIsCMqTxfLl33bSmz356nbhtv8Etd4wIv1oLMdKc/WisXlVYZqKmm UL8XI0YfrxDxmdU9WY+pM1VHj3iNyDM8IkbLFROoEXwQBCqzTB0zE+99+ICA7AP9 xnqITQxZwrbXRwwaWHJZeyXCVtO46crm2vTZDja6+J72NUygfXCZXkktO6ghLRvz q2SnRLLsL0DaHKdX8YeOwdisKABJ/ARLQl13fZBBFtO7X985frcGz8a7mr4pZtCV Jiw7VOsWozKZA+HtIFClq5qedo5WmPTt26MNonnnbgxZaWwMDRRasw5mKg3N+y+0 YPkdMsbR6VZ1NDywOueB =r0G+ -END PGP SIGNATURE- Changes since cp-5.1-8-3: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ecf2fcc7f9bd442a424200da3043d9a2385b387d Author: Jan Iversen Date: Tue Oct 4 20:52:44 2016 +0200 bump product version to 5.1.7 Change-Id: Ie0fa402ae3e0e11e8adc7d79e6496db7ba135c12 diff --git a/configure.ac b/configure.ac index 10dbb12..602bd93 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],[5.1.6.0.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[5.1.7.0.0+],[],[],[http://documentfoundation.org/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'libreoffice-5-1-6'
New branch 'libreoffice-5-1-6' available with the following commits: commit 0fd43ec64f5c6a9f95c9172ba22788aad4a6f99d Author: Jan Iversen Date: Tue Oct 4 20:33:30 2016 +0200 Branch libreoffice-5-1-6 This is 'libreoffice-5-1-6' - the stable branch for the 5.1.6 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 5.1.x release, please use the 'libreoffice-5-1' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I6be11c76a9b38d60ac02d1b8b2b54eb01a3228f5 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'libreoffice-5-1-6'
New branch 'libreoffice-5-1-6' available with the following commits: commit a2449287afb9c505575c4a1c2552f7bac061b58a Author: Jan Iversen Date: Tue Oct 4 20:27:33 2016 +0200 Branch libreoffice-5-1-6 This is 'libreoffice-5-1-6' - the stable branch for the 5.1.6 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 5.1.x release, please use the 'libreoffice-5-1' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: Id3cc0c92a0d0f160bc357e3a925e49b62602ba16 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'libreoffice-5-1-6'
New branch 'libreoffice-5-1-6' available with the following commits: commit 1a529d95a29ec2f5b741b4e941a179886e7430a4 Author: Jan Iversen Date: Tue Oct 4 20:27:32 2016 +0200 Branch libreoffice-5-1-6 This is 'libreoffice-5-1-6' - the stable branch for the 5.1.6 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 5.1.x release, please use the 'libreoffice-5-1' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I88e72af3350f7b54461b28b5f65cca57c853c33d ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'libreoffice-5-1-6'
New branch 'libreoffice-5-1-6' available with the following commits: commit 188bf1d5a0a7c5cc0a51c0b9a51af7925ac8c29b Author: Jan Iversen Date: Tue Oct 4 20:27:32 2016 +0200 Branch libreoffice-5-1-6 This is 'libreoffice-5-1-6' - the stable branch for the 5.1.6 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 5.1.x release, please use the 'libreoffice-5-1' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: Ic5d397aca7237ff7a792b45afebf7fc3ec6c8412 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/rtl
sal/rtl/math.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 9db395d02a87605834c4c74f163861c5cbd14548
Author: Eike Rathke
Date: Tue Oct 4 19:48:40 2016 +0200
isRepresentableInteger: assert(fAbsValue >= 0.0)
Change-Id: Idf140b312617e2a3a739cb5571d1b29ef700315c
diff --git a/sal/rtl/math.cxx b/sal/rtl/math.cxx
index 1df123bb..789c135 100644
--- a/sal/rtl/math.cxx
+++ b/sal/rtl/math.cxx
@@ -154,6 +154,7 @@ struct UStringTraits
*/
bool isRepresentableInteger(double fAbsValue)
{
+assert(fAbsValue >= 0.0);
const sal_Int64 kMaxInt = (static_cast(1) << 53) - 1;
if (fAbsValue <= static_cast(kMaxInt))
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit fa95140c1233e568038111dae2ea34ea8ac573c0 Author: Jan Iversen Date: Tue Oct 4 19:50:37 2016 +0200 Updated core Project: translations 12a624510400c53459ead83703767212673be6ea update helpcontent from pootle 5.1 Change-Id: Ic8670f7b6aea3f124b6832c823dd9aafa490b9aa diff --git a/translations b/translations index 5646c9a..12a6245 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 5646c9aa1b687715f7a0126101663f1b1db03e43 +Subproject commit 12a624510400c53459ead83703767212673be6ea ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Branch 'libreoffice-5-1' - 2 commits - source/am source/as source/bg source/bn-IN source/bo source/br source/brx source/bs source/ca source/ca-valencia source/c
source/am/cui/uiconfig/ui.po | 8 source/am/formula/source/core/resource.po| 56 source/am/sw/source/ui/utlui.po | 19 source/am/wizards/source/formwizard.po | 8 source/as/starmath/source.po | 42 source/bg/cui/source/dialogs.po | 12 source/bg/cui/uiconfig/ui.po | 8 source/bg/helpcontent2/source/text/sbasic/shared.po | 10 source/bg/helpcontent2/source/text/shared/guide.po | 8 source/bg/helpcontent2/source/text/swriter/01.po | 6 source/bg/helpcontent2/source/text/swriter/guide.po | 8 source/bg/sfx2/source/doc.po | 8 source/bg/sw/source/ui/utlui.po | 19 source/bg/sw/uiconfig/swriter/ui.po | 5 source/bn-IN/formula/source/core/resource.po | 65 source/bn-IN/scaddins/source/analysis.po | 20 source/bo/formula/source/core/resource.po| 47 source/bo/sw/source/ui/utlui.po | 107 source/br/formula/source/core/resource.po| 47 source/brx/formula/source/core/resource.po | 46 source/brx/starmath/source.po| 82 source/brx/sw/source/ui/utlui.po | 34 source/bs/sw/source/ui/utlui.po | 20 source/ca-valencia/formula/source/core/resource.po | 29 source/ca/formula/source/core/resource.po| 29 source/ca/helpcontent2/source/text/sbasic/shared.po | 8 source/cs/sw/source/ui/utlui.po | 19 source/da/formula/source/core/resource.po| 29 source/da/helpcontent2/source/text/scalc/01.po | 14 source/de/extensions/source/propctrlr.po | 10 source/de/officecfg/registry/data/org/openoffice/Office/UI.po| 20 source/de/svx/source/form.po | 10 source/de/sw/source/ui/utlui.po | 19 source/dgo/formula/source/core/resource.po | 73 source/dgo/instsetoo_native/inc_openoffice/windows/msi_languages.po | 26 source/dgo/starmath/source.po| 244 source/dgo/sw/source/ui/utlui.po | 18 source/dz/formula/source/core/resource.po| 47 source/dz/instsetoo_native/inc_openoffice/windows/msi_languages.po | 27 source/eo/formula/source/core/resource.po| 38 source/eo/helpcontent2/source/text/shared/guide.po | 20 source/eo/helpcontent2/source/text/swriter/01.po | 11 source/es/basctl/source/basicide.po | 8 source/es/basctl/uiconfig/basicide/ui.po | 12 source/es/basic/source/classes.po| 8 source/es/cui/source/customize.po| 12 source/es/cui/uiconfig/ui.po | 16 source/es/dbaccess/source/ui/app.po | 8 source/es/dbaccess/uiconfig/ui.po| 6 source/es/formula/source/core/resource.po| 53 source/es/helpcontent2/source/text/sbasic/guide.po | 16 source/es/helpcontent2/source/text/sbasic/shared.po | 14 source/es/helpcontent2/source/text/scalc/01.po | 100 source/es/helpcontent2/source/text/scalc/guide.po| 24 source/es/helpcontent2/source/text/schart/01.po | 10 source/es/helpcontent2/source/text/shared/00.po | 8 source/es/helpcontent2/source/text/shared/01.po | 34 source/es/helpcontent2/source/text/shared/02.po | 6 source/es/helpcontent2/source/text/shared/explorer/database.po | 16 source/es/helpcontent2/source/text/shared/guide.po | 18 source/es/helpcont
[Libreoffice-commits] online.git: loolwsd/discovery.xml loolwsd/lint-discovery.py
loolwsd/discovery.xml | 64 ++--- loolwsd/lint-discovery.py | 213 ++ 2 files changed, 245 insertions(+), 32 deletions(-) New commits: commit d8daaff1e91ac926a3f51473a7b5d4656e0802cb Author: Miklos Vajna Date: Tue Oct 4 18:42:40 2016 +0200 WOPI discovery: change action name to 'view' when we can import the format Also add a script that can detect if discovery.xml is no longer in sync with the core.git filter configuration. richdocuments.git d6b65b79835bc499f720d15bb6c00441079b2fd6 (Respect WOPI action names, 2016-10-04) can launch a read-only loleaflet based on this info. Change-Id: I09232bb53844d0737dfdc66cd0e87342b9dd0fb6 diff --git a/loolwsd/discovery.xml b/loolwsd/discovery.xml index 59cd769..759f0ab 100644 --- a/loolwsd/discovery.xml +++ b/loolwsd/discovery.xml @@ -2,10 +2,10 @@ - + - + @@ -16,7 +16,7 @@ - + @@ -27,7 +27,7 @@ - + @@ -38,7 +38,7 @@ - + @@ -49,9 +49,9 @@ - + - + @@ -65,7 +65,7 @@ - + @@ -73,7 +73,7 @@ - + @@ -81,7 +81,7 @@ - + @@ -94,7 +94,7 @@ - + @@ -102,7 +102,7 @@ - + @@ -110,7 +110,7 @@ - + @@ -123,7 +123,7 @@ - + @@ -139,18 +139,18 @@ - + - + - + - + @@ -178,19 +178,19 @@ - + - + - + - + - + @@ -205,31 +205,31 @@ - + - + - + - + - + - + - + - + - + diff --git a/loolwsd/lint-discovery.py b/loolwsd/lint-discovery.py new file mode 100755 index 000..d2c21e2 --- /dev/null +++ b/loolwsd/lint-discovery.py @@ -0,0 +1,213 @@ +#!/usr/bin/env python +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, you can obtain one at http://mozilla.org/MPL/2.0/. +# +# Makes sure that discovery.xml in online.git is in sync with +# filter/source/config/fragments/ in core.git. + +from __future__ import print_function +import os +import sys +import xml.sax + + +# Parses an online.git discovery.xml. +class DiscoveryHandler(xml.sax.handler.ContentHandler): +def __init__(self): +# List of app <-> action types. +self.appActions = [] +self.inApp = False +self.app = None +self.inAction = False +self.action = None + +def startElement(self, name, attrs): +if name == "app": +self.inApp = True +for k, v in list(attrs.items()): +if k == "name": +self.app = v +elif name == "action": +self.inAction = True +for k, v in list(attrs.items()): +if k == "name": +self.action = v + +def endElement(self, name): +if name == "app": +self.inApp = False +if self.app and self.action: +self.appActions.append([self.app, self.action]) +self.app = None +self.action = None +elif name == "action": +self.inAction = False + + +# Parses core.git filter/source/config/fragments/types/*.xcu. +class FilterTypeHandler(xml.sax.handler.ContentHand
[Libreoffice-commits] core.git: 3 commits - include/svx sc/Library_sc.mk sc/source sfx2/inc sfx2/source svx/inc svx/Library_svx.mk svx/source sw/source
include/svx/sidebar/AreaPropertyPanelBase.hxx |4
include/svx/sidebar/AreaTransparencyGradientPopup.hxx | 20 -
include/svx/sidebar/Popup.hxx | 102 -
include/svx/sidebar/PopupContainer.hxx | 47
include/svx/sidebar/PopupControl.hxx| 49
sc/Library_sc.mk|2
sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx| 75 +-
sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx| 67 --
sc/source/ui/sidebar/CellBorderStyleControl.cxx | 30 +-
sc/source/ui/sidebar/CellBorderStyleControl.hxx | 15 -
sc/source/ui/sidebar/CellBorderStylePopup.cxx | 38 ---
sc/source/ui/sidebar/CellBorderStylePopup.hxx | 41 ---
sc/source/ui/sidebar/CellLineStyleControl.cxx | 24 +-
sc/source/ui/sidebar/CellLineStyleControl.hxx | 11 -
sc/source/ui/sidebar/CellLineStylePopup.cxx | 50
sc/source/ui/sidebar/CellLineStylePopup.hxx | 43 ---
sfx2/inc/sidebar/PopupContainer.hxx | 40 ---
sfx2/source/sidebar/PopupContainer.cxx | 46
svx/Library_svx.mk |3
svx/inc/pch/precompiled_svx.hxx |3
svx/source/sidebar/area/AreaPropertyPanel.cxx |1
svx/source/sidebar/area/AreaPropertyPanel.hxx |1
svx/source/sidebar/area/AreaPropertyPanelBase.cxx | 19 -
svx/source/sidebar/area/AreaTransparencyGradientControl.cxx |4
svx/source/sidebar/area/AreaTransparencyGradientControl.hxx |3
svx/source/sidebar/area/AreaTransparencyGradientPopup.cxx | 25 +-
svx/source/sidebar/line/LinePropertyPanel.cxx |2
svx/source/sidebar/line/LinePropertyPanel.hxx |2
svx/source/sidebar/line/LinePropertyPanelBase.cxx |2
svx/source/sidebar/text/TextCharacterSpacingControl.hxx |1
svx/source/sidebar/text/TextPropertyPanel.cxx |2
svx/source/sidebar/text/TextPropertyPanel.hxx |3
svx/source/sidebar/text/TextUnderlineControl.hxx|1
svx/source/sidebar/tools/Popup.cxx | 130
svx/source/sidebar/tools/PopupContainer.cxx | 51
svx/source/sidebar/tools/PopupControl.cxx | 51
sw/source/uibase/sidebar/PageFooterPanel.hxx|1
sw/source/uibase/sidebar/PageFormatPanel.hxx|1
sw/source/uibase/sidebar/PageHeaderPanel.hxx|1
sw/source/uibase/sidebar/PageMarginControl.hxx |2
sw/source/uibase/sidebar/PagePropertyPanel.cxx |2
sw/source/uibase/sidebar/PagePropertyPanel.hxx |5
sw/source/uibase/sidebar/PageSizeControl.hxx|2
sw/source/uibase/sidebar/PageStylesPanel.hxx|1
sw/source/uibase/sidebar/StylePresetsPanel.hxx |1
sw/source/uibase/sidebar/ThemePanel.hxx |1
46 files changed, 140 insertions(+), 885 deletions(-)
New commits:
commit 349f4923e265d76cfd76627796dc93e99e0b5d02
Author: Caolán McNamara
Date: Tue Oct 4 17:14:33 2016 +0100
can now remove both PopupContainer copies
the recently unused svx one, and the forgotten not-built sfx2 one
Change-Id: I1a4ede49dc74bb71f250ee3eee999d1a3dfbee57
diff --git a/include/svx/sidebar/AreaPropertyPanelBase.hxx
b/include/svx/sidebar/AreaPropertyPanelBase.hxx
index 2454084..b3a37c0 100644
--- a/include/svx/sidebar/AreaPropertyPanelBase.hxx
+++ b/include/svx/sidebar/AreaPropertyPanelBase.hxx
@@ -53,7 +53,6 @@ class XFillBitmapItem;
namespace svx { namespace sidebar {
-class PopupContainer;
class AreaTransparencyGradientControl;
class SVX_DLLPUBLIC AreaPropertyPanelBase
diff --git a/include/svx/sidebar/PopupContainer.hxx
b/include/svx/sidebar/PopupContainer.hxx
deleted file mode 100644
index f46e77e..000
--- a/include/svx/sidebar/PopupContainer.hxx
+++ /dev/null
@@ -1,47 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/cellvalue.hxx |5 -
sc/source/core/data/cellvalue.cxx | 20
2 files changed, 25 deletions(-)
New commits:
commit 33e8582c0f34ce30e4a29228548438dc53aa8711
Author: Caolán McNamara
Date: Tue Oct 4 13:11:13 2016 +0100
coverity#1371197 the compiler defaults should be sufficient here
Change-Id: I4230d03dc58027f958d8943c0ff90f00508f7386
Reviewed-on: https://gerrit.libreoffice.org/29523
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sc/inc/cellvalue.hxx b/sc/inc/cellvalue.hxx
index ca7dc2e..4ebd298 100644
--- a/sc/inc/cellvalue.hxx
+++ b/sc/inc/cellvalue.hxx
@@ -110,15 +110,12 @@ struct SC_DLLPUBLIC ScRefCellValue
ScRefCellValue( const svl::SharedString* pString );
ScRefCellValue( const EditTextObject* pEditText );
ScRefCellValue( ScFormulaCell* pFormula );
-ScRefCellValue( const ScRefCellValue& r );
/**
* Take cell value from specified position in specified document.
*/
ScRefCellValue( ScDocument& rDoc, const ScAddress& rPos );
-~ScRefCellValue();
-
void clear();
/**
@@ -153,8 +150,6 @@ struct SC_DLLPUBLIC ScRefCellValue
bool hasEmptyValue();
bool equalsWithoutFormat( const ScRefCellValue& r ) const;
-
-ScRefCellValue& operator= ( const ScRefCellValue& r );
};
#endif
diff --git a/sc/source/core/data/cellvalue.cxx
b/sc/source/core/data/cellvalue.cxx
index 25ed7d70..147ad51 100644
--- a/sc/source/core/data/cellvalue.cxx
+++ b/sc/source/core/data/cellvalue.cxx
@@ -489,19 +489,11 @@ ScRefCellValue::ScRefCellValue( const svl::SharedString*
pString ) : meType(CELL
ScRefCellValue::ScRefCellValue( const EditTextObject* pEditText ) :
meType(CELLTYPE_EDIT), mpEditText(pEditText) {}
ScRefCellValue::ScRefCellValue( ScFormulaCell* pFormula ) :
meType(CELLTYPE_FORMULA), mpFormula(pFormula) {}
-// It should be enough to copy the double value, which is at least as large
-// as the pointer values.
-ScRefCellValue::ScRefCellValue( const ScRefCellValue& r ) : meType(r.meType),
mfValue(r.mfValue) {}
-
ScRefCellValue::ScRefCellValue( ScDocument& rDoc, const ScAddress& rPos )
{
assign( rDoc, rPos);
}
-ScRefCellValue::~ScRefCellValue()
-{
-}
-
void ScRefCellValue::clear()
{
// Reset to empty value.
@@ -589,16 +581,4 @@ bool ScRefCellValue::equalsWithoutFormat( const
ScRefCellValue& r ) const
return equalsWithoutFormatImpl(*this, r);
}
-ScRefCellValue& ScRefCellValue::operator= ( const ScRefCellValue& r )
-{
-// So we *could* have a copy-swap-idiom here for exception-safety if we had
-// to slow down things.. but then implement an explicit move-ctor and pass
-// r by-value instead of manually creating a temporary so the compiler can
-// take advantage. And initialize
-// ScRefCellValue(ScDocument&,const ScAddress&) with default ctor.
-meType = r.meType;
-mfValue = r.mfValue;// largest member of union
-return *this;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Calc HYPGEOMDIST: conditionally changing function opcode when saving to Excel format
Hi Winfried, On Tuesday, 2016-10-04 12:50:43 +0200, Winfried Donkers wrote: > -save in ODF as HYPGEOMDIST; > -save in Excel as HYPGEOMDIST in case of 4 arguments and HYPGEOM.DIST in case > of 5 arguments. > That means I have to change the opcode ocHypGeomDist to ocHypGeomDist_MS when > saving to Excel format. > > I remember that this can be done somewhere, but I forgot in which source > file/function that is to take place. > Do you know or have a hint? I think you have this in mind: formula/source/core/api/token.cxx MissingConventionOOXML::isRewriteNeeded() FormulaTokenArray::RewriteMissing() as is done for ocCeil and ocFloor. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key "ID" 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Better use 64-bit 0x6A6CD5B765632D3A here is why: https://evil32.com/ Care about Free Software, support the FSFE https://fsfe.org/support/?erack signature.asc Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/core/doc/docbm.cxx | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
New commits:
commit 76a5c7138361d8fc6493638d6c5a882e0a891bb0
Author: Michael Stahl
Date: Tue Oct 4 17:21:33 2016 +0200
sw: fix assert in MarkManager::deleteMarks()
On loading tdf89405-1.odt there is a "DdeLink" bookmark and a range
annotation at the same position:
info:sw.core:17729:1:sw/source/core/doc/docbm.cxx:290: N2sw4mark8BookmarkE
__DdeLink__30_388680695 11,11 11,52
info:sw.core:17729:1:sw/source/core/doc/docbm.cxx:290: N2sw4mark7UnoMarkE
__UnoMark__16_673019520 11,11 11,11
info:sw.core:17729:1:sw/source/core/doc/docbm.cxx:290: N2sw4mark7UnoMarkE
__UnoMark__19_673019520 11,12 11,12
While deleting the annotation's field character at 11,11-11,12 the
DdeLink one is moved but the UnoMarks are special-cased and remain where
they are, so just do some more sorting in this case.
Change-Id: If077329bf675cdf8dd788cc145252a078aba3750
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index 5d75496..25f6b80 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -674,6 +674,8 @@ namespace sw { namespace mark
// boolean indicating, if at least one mark has been moved while
collecting marks for deletion
bool bMarksMoved = false;
+// have marks in the range been skipped instead of deleted
+bool bMarksSkipDeletion = false;
// copy all bookmarks in the move area to a vector storing all
position data as offset
// reassignment is performed after the move
@@ -748,6 +750,10 @@ namespace sw { namespace mark
}
vMarksToDelete.push_back(ppMark);
}
+else
+{
+bMarksSkipDeletion = true;
+}
}
else if ( bIsPosInRange != bIsOtherPosInRange )
{
@@ -826,7 +832,9 @@ namespace sw { namespace mark
}
} // scope to kill vDelay
-if ( bIsSortingNeeded )
+// also need to sort if both marks were moved and not-deleted because
+// the not-deleted marks could be in wrong order vs. the moved ones
+if (bIsSortingNeeded || (bMarksMoved && bMarksSkipDeletion))
{
sortMarks();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - oox/source
oox/source/export/chartexport.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit f102e2391a913acef117aed6106e635b7ab1853d Author: Markus Mohrhard Date: Sat Oct 1 00:32:28 2016 +0200 tdf#96161, always write the varyColors element The default value changed between MSO 2007 and 2010 so we need to always write the value. Change-Id: I563eafa84baa3df656c83d657ebbb4c381c09957 Reviewed-on: https://gerrit.libreoffice.org/29420 Reviewed-by: Markus Mohrhard Tested-by: Jenkins (cherry picked from commit 74b2cc607448d24146bd3508abb832d6ab42cb56) Reviewed-on: https://gerrit.libreoffice.org/29426 Reviewed-by: Eike Rathke diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx index 5d37352..b8172f9 100644 --- a/oox/source/export/chartexport.cxx +++ b/oox/source/export/chartexport.cxx @@ -1713,6 +1713,8 @@ void ChartExport::exportLineChart( const Reference< chart2::XChartType >& xChart FSEND ); exportGrouping( ); +pFS->singleElement(FSNS(XML_c, XML_varyColors), +XML_val, "0", FSEND); // TODO: show marker symbol in series? bool bPrimaryAxes = true; exportSeries(xChartType, *itr, bPrimaryAxes); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - sc/source
sc/source/ui/undo/undoblk3.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 36b17b095850e73b3a5f044ac69661a813fbf3b8 Author: Markus Mohrhard Date: Wed Sep 28 03:55:01 2016 +0200 tdf#99386, broadcast that cell content changed after merge cells undo/redo Change-Id: Idf41d1b07e26af66d9eefd18e5d5b582edc205e9 Reviewed-on: https://gerrit.libreoffice.org/29370 Tested-by: Jenkins Reviewed-by: Markus Mohrhard (cherry picked from commit f6f213bed507d1d7547f6098a67b6e460d46bce6) Reviewed-on: https://gerrit.libreoffice.org/29376 Reviewed-by: Eike Rathke Tested-by: Eike Rathke diff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxx index dfec1d1..3072d0c 100644 --- a/sc/source/ui/undo/undoblk3.cxx +++ b/sc/source/ui/undo/undoblk3.cxx @@ -727,6 +727,8 @@ void ScUndoMerge::DoChange( bool bUndo ) const if (!bDidPaint) ScUndoUtil::PaintMore(pDocShell, aRange); + +rDoc.BroadcastCells(aRange, SC_HINT_DATACHANGED); } ShowTable(aCurRange); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - sd/source
sd/source/ui/annotations/annotationwindow.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit 0570ddd7377c825e6cff7e71d07452223d230b6b
Author: Caolán McNamara
Date: Sat Oct 1 21:09:48 2016 +0100
Engine() return mpOutliner, so can crash if Engine() used post delete
if Deactivate called during ::dispose
(cherry picked from commit 86617760eb8bc6c0b2713b9496ade9203d1077a5)
Change-Id: I066dcc52278f12442de0281c8d783353aed5a186
Reviewed-on: https://gerrit.libreoffice.org/29444
Reviewed-by: Michael Stahl
Tested-by: jan iversen
Tested-by: Jenkins
diff --git a/sd/source/ui/annotations/annotationwindow.cxx
b/sd/source/ui/annotations/annotationwindow.cxx
index dcbeb22..1b2fd38 100644
--- a/sd/source/ui/annotations/annotationwindow.cxx
+++ b/sd/source/ui/annotations/annotationwindow.cxx
@@ -298,6 +298,7 @@ void AnnotationWindow::dispose()
mpMeta.disposeAndClear();
delete mpOutlinerView;
delete mpOutliner;
+mpOutliner = nullptr;
mpVScrollbar.disposeAndClear();
mpTextWindow.disposeAndClear();
FloatingWindow::dispose();
@@ -613,6 +614,9 @@ void AnnotationWindow::SetColor()
void AnnotationWindow::Deactivate()
{
+if (!mpOutliner) //in dispose
+return;
+
Reference< XAnnotation > xAnnotation( mxAnnotation );
// write changed text back to annotation
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/filter/jpeg/JpegReader.cxx | 15 ---
1 file changed, 15 deletions(-)
New commits:
commit 92664a81aea6c150e219a1cf4b9a98d27cdd547b
Author: Tomaž Vajngerl
Date: Tue Oct 4 09:53:59 2016 +0200
vcl: remove artificial image byte size limit in JPEG filter
When reading a JPEG image we limit the image raw byte size to a
certain arbitrary value. This is not necessary and does not need
to be enforced.
Change-Id: Ia86ac2423f51a79eecf39d6afc0c81bb9b6ad1f1
Reviewed-on: https://gerrit.libreoffice.org/29521
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/vcl/source/filter/jpeg/JpegReader.cxx
b/vcl/source/filter/jpeg/JpegReader.cxx
index cd00518..b1582d8 100644
--- a/vcl/source/filter/jpeg/JpegReader.cxx
+++ b/vcl/source/filter/jpeg/JpegReader.cxx
@@ -32,13 +32,6 @@
#define JPEG_MIN_READ 512
#define BUFFER_SIZE 4096
-namespace {
-// Arbitrary maximal size (512M) of a bitmap after it has been decoded.
-// It is used to prevent excessive swapping due to large buffers in
-// virtual memory.
-// May have to be tuned if it turns out to be too large or too small.
-static const sal_uInt64 MAX_BITMAP_BYTE_SIZE = sal_uInt64(512 * 1024 *
1024);
-}
/* Expanded data source object for stdio input */
@@ -208,14 +201,6 @@ bool JPEGReader::CreateBitmap(JPEGCreateBitmapParam&
rParam)
if (nSize > SAL_MAX_INT32 / (bGray?1:3))
return false;
-// Check if the bitmap is atypically large.
-if (nSize*(bGray?1:3) > MAX_BITMAP_BYTE_SIZE)
-{
-// Do not try to acquire resources for the large bitmap or to
-// read the bitmap into memory.
-return false;
-}
-
if( bGray )
{
BitmapPalette aGrayPal( 256 );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - sc/inc sc/source
sc/inc/rangelst.hxx |2 +-
sc/source/core/tool/rangelst.cxx | 22 +++---
2 files changed, 20 insertions(+), 4 deletions(-)
New commits:
commit 685071d10a4cbe556b0c83342b18aeb97dc878fd
Author: Markus Mohrhard
Date: Sat Oct 1 01:31:09 2016 +0200
tdf#101910, mark ScRangeList updated when DeleteArea was used
Change-Id: I98390b28c5a1bbbd391ff054b2f574951c7c00c4
Reviewed-on: https://gerrit.libreoffice.org/29422
Reviewed-by: Markus Mohrhard
Tested-by: Jenkins
(cherry picked from commit 5f658dc87794036182aa1f8586d82c5ee997cd8b)
Reviewed-on: https://gerrit.libreoffice.org/29424
Reviewed-by: Eike Rathke
diff --git a/sc/inc/rangelst.hxx b/sc/inc/rangelst.hxx
index 2641483..996124f 100644
--- a/sc/inc/rangelst.hxx
+++ b/sc/inc/rangelst.hxx
@@ -62,7 +62,7 @@ public:
/** For now this method assumes that nTab1 == nTab2
* The algorithm will be much more complicated if nTab1 != nTab2
*/
-voidDeleteArea( SCCOL nCol1, SCROW nRow1, SCTAB nTab1, SCCOL
nCol2,
+boolDeleteArea( SCCOL nCol1, SCROW nRow1, SCTAB nTab1, SCCOL
nCol2,
SCROW nRow2, SCTAB nTab2 );
const ScRange* Find( const ScAddress& ) const;
diff --git a/sc/source/core/tool/rangelst.cxx b/sc/source/core/tool/rangelst.cxx
index daa2ffe..a59c483 100644
--- a/sc/source/core/tool/rangelst.cxx
+++ b/sc/source/core/tool/rangelst.cxx
@@ -398,11 +398,11 @@ bool ScRangeList::UpdateReference(
{
if(nDx < 0)
{
-DeleteArea(nCol1+nDx, nRow1, nTab1, nCol1-1, nRow2, nTab2);
+bChanged = DeleteArea(nCol1+nDx, nRow1, nTab1, nCol1-1, nRow2,
nTab2);
}
if(nDy < 0)
{
-DeleteArea(nCol1, nRow1+nDy, nTab1, nCol2, nRow1-1, nTab2);
+bChanged = DeleteArea(nCol1, nRow1+nDy, nTab1, nCol2, nRow1-1,
nTab2);
}
SAL_WARN_IF(nDx < 0 && nDy < 0, "sc", "nDx and nDy are negative,
check why");
}
@@ -940,9 +940,10 @@ bool handleFourRanges( const ScRange& rDelRange, ScRange*
p, std::vector= p.aEnd.X()
// && ( r.aStart.Y() <= p.aStart.Y() || r.aEnd.Y() >= r.aEnd.Y() )
if(handleOneRange( aRange, *itr ))
+{
+bChanged = true;
continue;
+}
// getting two ranges
// r.aStart.X()
else if(handleTwoRanges( aRange, *itr, aNewRanges ))
+{
+bChanged = true;
continue;
+}
// getting 3 ranges
// r.aStart.X() > p.aStart.X() && r.aEnd.X() >= p.aEnd.X()
@@ -989,16 +997,24 @@ void ScRangeList::DeleteArea( SCCOL nCol1, SCROW nRow1,
SCTAB nTab1,
// r.aStart.X() <= p.aStart.X() && r.aEnd.X() < p.aEnd.X()
// && r.aStart.Y() > p.aStart.Y() && r.aEnd.Y() < p.aEnd.Y()
else if(handleThreeRanges( aRange, *itr, aNewRanges ))
+{
+bChanged = true;
continue;
+}
// getting 4 ranges
// r.aStart.X() > p.aStart.X() && r.aEnd().X() < p.aEnd.X()
// && r.aStart.Y() > p.aStart.Y() && r.aEnd().Y() < p.aEnd.Y()
else if(handleFourRanges( aRange, *itr, aNewRanges ))
+{
+bChanged = true;
continue;
+}
}
for(vector::iterator itr = aNewRanges.begin(); itr !=
aNewRanges.end(); ++itr)
Join( *itr);
+
+return bChanged;
}
const ScRange* ScRangeList::Find( const ScAddress& rAdr ) const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - sc/source
sc/source/filter/xml/celltextparacontext.cxx |9 ++---
sc/source/filter/xml/celltextparacontext.hxx |3 ++-
sc/source/filter/xml/xmlcelli.cxx|6 --
sc/source/filter/xml/xmlcelli.hxx|2 +-
sc/source/filter/xml/xmlexprt.cxx|6 +-
sc/source/filter/xml/xmlimprt.cxx|1 +
sc/source/filter/xml/xmlimprt.hxx|1 +
7 files changed, 20 insertions(+), 8 deletions(-)
New commits:
commit 7f3fac39496db4fefc088a8c57781baae92da388
Author: Markus Mohrhard
Date: Sun Oct 2 18:27:32 2016 +0200
support TargetFrame in url field import/export code, tdf#77873
Change-Id: Id09ecbd10b8ee60371f223d62f2dd6fe1c2296ca
Reviewed-on: https://gerrit.libreoffice.org/29459
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard
(cherry picked from commit b11ad787372c4b833cc58a3738e375af26309b8d)
Reviewed-on: https://gerrit.libreoffice.org/29463
Reviewed-by: Eike Rathke
diff --git a/sc/source/filter/xml/celltextparacontext.cxx
b/sc/source/filter/xml/celltextparacontext.cxx
index 3f6c64b..dc89e14 100644
--- a/sc/source/filter/xml/celltextparacontext.cxx
+++ b/sc/source/filter/xml/celltextparacontext.cxx
@@ -94,9 +94,9 @@ void ScXMLCellTextParaContext::PushFieldTitle(const OUString&
rStyleName)
}
void ScXMLCellTextParaContext::PushFieldURL(
-const OUString& rURL, const OUString& rRep, const OUString& rStyleName)
+const OUString& rURL, const OUString& rRep, const OUString& rStyleName,
const OUString& rTargetFrame)
{
-mrParentCxt.PushParagraphFieldURL(rURL, rRep, rStyleName);
+mrParentCxt.PushParagraphFieldURL(rURL, rRep, rStyleName, rTargetFrame);
}
ScXMLCellTextSpanContext::ScXMLCellTextSpanContext(
@@ -325,6 +325,9 @@ void ScXMLCellFieldURLContext::StartElement(const
uno::ReferenceSetTargetFrame(rTargetFrame);
+PushParagraphField(pURLField, rStyleName);
}
void ScXMLTableRowCellContext::PushParagraphEnd()
diff --git a/sc/source/filter/xml/xmlcelli.hxx
b/sc/source/filter/xml/xmlcelli.hxx
index 883b3c7..42d2562 100644
--- a/sc/source/filter/xml/xmlcelli.hxx
+++ b/sc/source/filter/xml/xmlcelli.hxx
@@ -145,7 +145,7 @@ public:
void PushParagraphFieldDate(const OUString& rStyleName);
void PushParagraphFieldSheetName(const OUString& rStyleName);
void PushParagraphFieldDocTitle(const OUString& rStyleName);
-void PushParagraphFieldURL(const OUString& rURL, const OUString& rRep,
const OUString& rStyleName);
+void PushParagraphFieldURL(const OUString& rURL, const OUString& rRep,
const OUString& rStyleName, const OUString& rTargetFrame);
void PushParagraphEnd();
void SetAnnotation( const ScAddress& rPosition );
diff --git a/sc/source/filter/xml/xmlexprt.cxx
b/sc/source/filter/xml/xmlexprt.cxx
index fbcddd5..9d8a265 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -2981,9 +2981,13 @@ void writeContent(
{
// value
-OUString aURL = static_cast(pField)->GetURL();
+const SvxURLField* pURLField = static_cast(pField);
+OUString aURL = pURLField->GetURL();
rExport.AddAttribute(XML_NAMESPACE_XLINK, XML_HREF,
rExport.GetRelativeReference(aURL));
rExport.AddAttribute(XML_NAMESPACE_XLINK, XML_TYPE, "simple");
+OUString aTargetFrame = pURLField->GetTargetFrame();
+if (!aTargetFrame.isEmpty())
+rExport.AddAttribute(XML_NAMESPACE_OFFICE,
XML_TARGET_FRAME_NAME, aTargetFrame);
OUString aElemName = rExport.GetNamespaceMap().GetQNameByKey(
XML_NAMESPACE_TEXT, GetXMLToken(XML_A));
diff --git a/sc/source/filter/xml/xmlimprt.cxx
b/sc/source/filter/xml/xmlimprt.cxx
index 524892f..a82de48 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -1891,6 +1891,7 @@ const SvXMLTokenMap&
ScXMLImport::GetCellTextURLAttrTokenMap()
{
{ XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_CELL_TEXT_URL_ATTR_UREF },
{ XML_NAMESPACE_XLINK, XML_TYPE, XML_TOK_CELL_TEXT_URL_ATTR_TYPE },
+{ XML_NAMESPACE_OFFICE, XML_TARGET_FRAME_NAME,
XML_TOK_CELL_TEXT_URL_TARGET_FRAME },
XML_TOKEN_MAP_END
};
diff --git a/sc/source/filter/xml/xmlimprt.hxx
b/sc/source/filter/xml/xmlimprt.hxx
index 518a33d..570d2f2 100644
--- a/sc/source/filter/xml/xmlimprt.hxx
+++ b/sc/source/filter/xml/xmlimprt.hxx
@@ -737,6 +737,7 @@ enum ScXMLCellTextURLAttrTokens
{
XML_TOK_CELL_TEXT_URL_ATTR_UREF,
XML_TOK_CELL_TEXT_URL_ATTR_TYPE,
+XML_TOK_CELL_TEXT_URL_TARGET_FRAME
};
/**
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - sc/source
sc/source/filter/xml/celltextparacontext.cxx |9 ++---
sc/source/filter/xml/celltextparacontext.hxx |3 ++-
sc/source/filter/xml/xmlcelli.cxx|6 --
sc/source/filter/xml/xmlcelli.hxx|2 +-
sc/source/filter/xml/xmlexprt.cxx|6 +-
sc/source/filter/xml/xmlimprt.cxx|1 +
sc/source/filter/xml/xmlimprt.hxx|1 +
7 files changed, 20 insertions(+), 8 deletions(-)
New commits:
commit 0d60b0dc1208b01b659fd1af4b33d1a7f6ee737d
Author: Markus Mohrhard
Date: Sun Oct 2 18:27:32 2016 +0200
support TargetFrame in url field import/export code, tdf#77873
Change-Id: Id09ecbd10b8ee60371f223d62f2dd6fe1c2296ca
Reviewed-on: https://gerrit.libreoffice.org/29459
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard
(cherry picked from commit b11ad787372c4b833cc58a3738e375af26309b8d)
Reviewed-on: https://gerrit.libreoffice.org/29482
Reviewed-by: Eike Rathke
Tested-by: Eike Rathke
diff --git a/sc/source/filter/xml/celltextparacontext.cxx
b/sc/source/filter/xml/celltextparacontext.cxx
index 3f6c64b..dc89e14 100644
--- a/sc/source/filter/xml/celltextparacontext.cxx
+++ b/sc/source/filter/xml/celltextparacontext.cxx
@@ -94,9 +94,9 @@ void ScXMLCellTextParaContext::PushFieldTitle(const OUString&
rStyleName)
}
void ScXMLCellTextParaContext::PushFieldURL(
-const OUString& rURL, const OUString& rRep, const OUString& rStyleName)
+const OUString& rURL, const OUString& rRep, const OUString& rStyleName,
const OUString& rTargetFrame)
{
-mrParentCxt.PushParagraphFieldURL(rURL, rRep, rStyleName);
+mrParentCxt.PushParagraphFieldURL(rURL, rRep, rStyleName, rTargetFrame);
}
ScXMLCellTextSpanContext::ScXMLCellTextSpanContext(
@@ -325,6 +325,9 @@ void ScXMLCellFieldURLContext::StartElement(const
uno::ReferenceSetTargetFrame(rTargetFrame);
+PushParagraphField(pURLField, rStyleName);
}
void ScXMLTableRowCellContext::PushParagraphEnd()
diff --git a/sc/source/filter/xml/xmlcelli.hxx
b/sc/source/filter/xml/xmlcelli.hxx
index 56090ca..d72bc20 100644
--- a/sc/source/filter/xml/xmlcelli.hxx
+++ b/sc/source/filter/xml/xmlcelli.hxx
@@ -143,7 +143,7 @@ public:
void PushParagraphFieldDate(const OUString& rStyleName);
void PushParagraphFieldSheetName(const OUString& rStyleName);
void PushParagraphFieldDocTitle(const OUString& rStyleName);
-void PushParagraphFieldURL(const OUString& rURL, const OUString& rRep,
const OUString& rStyleName);
+void PushParagraphFieldURL(const OUString& rURL, const OUString& rRep,
const OUString& rStyleName, const OUString& rTargetFrame);
void PushParagraphEnd();
void SetAnnotation( const ScAddress& rPosition );
diff --git a/sc/source/filter/xml/xmlexprt.cxx
b/sc/source/filter/xml/xmlexprt.cxx
index 25eb603..aa8ec4a 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -2951,9 +2951,13 @@ void writeContent(
{
// value
-OUString aURL = static_cast(pField)->GetURL();
+const SvxURLField* pURLField = static_cast(pField);
+OUString aURL = pURLField->GetURL();
rExport.AddAttribute(XML_NAMESPACE_XLINK, XML_HREF,
rExport.GetRelativeReference(aURL));
rExport.AddAttribute(XML_NAMESPACE_XLINK, XML_TYPE, "simple");
+OUString aTargetFrame = pURLField->GetTargetFrame();
+if (!aTargetFrame.isEmpty())
+rExport.AddAttribute(XML_NAMESPACE_OFFICE,
XML_TARGET_FRAME_NAME, aTargetFrame);
OUString aElemName = rExport.GetNamespaceMap().GetQNameByKey(
XML_NAMESPACE_TEXT, GetXMLToken(XML_A));
diff --git a/sc/source/filter/xml/xmlimprt.cxx
b/sc/source/filter/xml/xmlimprt.cxx
index f62f350..3b0a675 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -1893,6 +1893,7 @@ const SvXMLTokenMap&
ScXMLImport::GetCellTextURLAttrTokenMap()
{
{ XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_CELL_TEXT_URL_ATTR_UREF },
{ XML_NAMESPACE_XLINK, XML_TYPE, XML_TOK_CELL_TEXT_URL_ATTR_TYPE },
+{ XML_NAMESPACE_OFFICE, XML_TARGET_FRAME_NAME,
XML_TOK_CELL_TEXT_URL_TARGET_FRAME },
XML_TOKEN_MAP_END
};
diff --git a/sc/source/filter/xml/xmlimprt.hxx
b/sc/source/filter/xml/xmlimprt.hxx
index 882f1f0..6fc09d1 100644
--- a/sc/source/filter/xml/xmlimprt.hxx
+++ b/sc/source/filter/xml/xmlimprt.hxx
@@ -739,6 +739,7 @@ enum ScXMLCellTextURLAttrTokens
{
XML_TOK_CELL_TEXT_URL_ATTR_UREF,
XML_TOK_CELL_TEXT_URL_ATTR_TYPE,
+XML_TOK_CELL_TEXT_URL_TARGET_FRAME
};
/**
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - sc/inc sc/source
sc/inc/rangelst.hxx |2 +-
sc/source/core/tool/rangelst.cxx | 22 +++---
2 files changed, 20 insertions(+), 4 deletions(-)
New commits:
commit ab80caf6359ac1bcf95b113b6c3b543dee0ed105
Author: Markus Mohrhard
Date: Sat Oct 1 01:31:09 2016 +0200
tdf#101910, mark ScRangeList updated when DeleteArea was used
Change-Id: I98390b28c5a1bbbd391ff054b2f574951c7c00c4
Reviewed-on: https://gerrit.libreoffice.org/29422
Reviewed-by: Markus Mohrhard
Tested-by: Jenkins
(cherry picked from commit 5f658dc87794036182aa1f8586d82c5ee997cd8b)
Reviewed-on: https://gerrit.libreoffice.org/29425
Reviewed-by: Eike Rathke
Tested-by: Eike Rathke
diff --git a/sc/inc/rangelst.hxx b/sc/inc/rangelst.hxx
index 9eae5b9..9d72596 100644
--- a/sc/inc/rangelst.hxx
+++ b/sc/inc/rangelst.hxx
@@ -62,7 +62,7 @@ public:
/** For now this method assumes that nTab1 == nTab2
* The algorithm will be much more complicated if nTab1 != nTab2
*/
-voidDeleteArea( SCCOL nCol1, SCROW nRow1, SCTAB nTab1, SCCOL
nCol2,
+boolDeleteArea( SCCOL nCol1, SCROW nRow1, SCTAB nTab1, SCCOL
nCol2,
SCROW nRow2, SCTAB nTab2 );
const ScRange* Find( const ScAddress& ) const;
diff --git a/sc/source/core/tool/rangelst.cxx b/sc/source/core/tool/rangelst.cxx
index 10e7952..e26f18a 100644
--- a/sc/source/core/tool/rangelst.cxx
+++ b/sc/source/core/tool/rangelst.cxx
@@ -398,11 +398,11 @@ bool ScRangeList::UpdateReference(
{
if(nDx < 0)
{
-DeleteArea(nCol1+nDx, nRow1, nTab1, nCol1-1, nRow2, nTab2);
+bChanged = DeleteArea(nCol1+nDx, nRow1, nTab1, nCol1-1, nRow2,
nTab2);
}
if(nDy < 0)
{
-DeleteArea(nCol1, nRow1+nDy, nTab1, nCol2, nRow1-1, nTab2);
+bChanged = DeleteArea(nCol1, nRow1+nDy, nTab1, nCol2, nRow1-1,
nTab2);
}
SAL_WARN_IF(nDx < 0 && nDy < 0, "sc", "nDx and nDy are negative,
check why");
}
@@ -940,9 +940,10 @@ bool handleFourRanges( const ScRange& rDelRange, ScRange*
p, std::vector= p.aEnd.X()
// && ( r.aStart.Y() <= p.aStart.Y() || r.aEnd.Y() >= r.aEnd.Y() )
if(handleOneRange( aRange, *itr ))
+{
+bChanged = true;
continue;
+}
// getting two ranges
// r.aStart.X()
else if(handleTwoRanges( aRange, *itr, aNewRanges ))
+{
+bChanged = true;
continue;
+}
// getting 3 ranges
// r.aStart.X() > p.aStart.X() && r.aEnd.X() >= p.aEnd.X()
@@ -989,16 +997,24 @@ void ScRangeList::DeleteArea( SCCOL nCol1, SCROW nRow1,
SCTAB nTab1,
// r.aStart.X() <= p.aStart.X() && r.aEnd.X() < p.aEnd.X()
// && r.aStart.Y() > p.aStart.Y() && r.aEnd.Y() < p.aEnd.Y()
else if(handleThreeRanges( aRange, *itr, aNewRanges ))
+{
+bChanged = true;
continue;
+}
// getting 4 ranges
// r.aStart.X() > p.aStart.X() && r.aEnd().X() < p.aEnd.X()
// && r.aStart.Y() > p.aStart.Y() && r.aEnd().Y() < p.aEnd.Y()
else if(handleFourRanges( aRange, *itr, aNewRanges ))
+{
+bChanged = true;
continue;
+}
}
for(vector::iterator itr = aNewRanges.begin(); itr !=
aNewRanges.end(); ++itr)
Join( *itr);
+
+return bChanged;
}
const ScRange* ScRangeList::Find( const ScAddress& rAdr ) const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: IEE754 and maximum correct integer value
Hi Winfried, On Wednesday, 2016-09-28 16:54:17 +0200, Winfried Donkers wrote: > > > But when I try 3^31 (which is less than 2^52) and subtract 3^31-1, > > > 3^31-2, 3^31-3 (resp. 1, 2 and 3 less than 3^31) I don't get 1, 2 and 3 > > > as result, but 0, 0 and 3. > > > This test is simply in Calc with e.g. =(3^31)-((3^31)-1). > > That's due to approxSub() being used for operator '-', which lessens the > > available precision. approxEqual() needs to be reworked to not scale in > > such cases. > > > > I'll investigate. > > > OK, that explains the remaining problem with my MOD() fix > (https://gerrit.libreoffice.org/29365) too. Should be cured with https://cgit.freedesktop.org/libreoffice/core/commit/?id=2135eae2a97c17d89cb47a2074830fd2d7b2226f Please check with a cherry-pick. Eike signature.asc Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sal/osl
sal/osl/w32/salinit.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit bef47d3da6f44b725519f7bf3e2400a3148bac67 Author: Stephan Bergmann Date: Tue Oct 4 16:58:55 2016 +0200 At least MSVC 2015 doesn't find sal/osl/w32/time.h ...when included as (our rather sick convention, for include files other than standard headers) rather than "time.h" Change-Id: I5aacfb81de95ae4254e39badffc9c83c7ac0f58f diff --git a/sal/osl/w32/salinit.cxx b/sal/osl/w32/salinit.cxx index 8122fbb..dd94af1 100644 --- a/sal/osl/w32/salinit.cxx +++ b/sal/osl/w32/salinit.cxx @@ -20,7 +20,7 @@ #include "sal/config.h" #include "system.h" -#include +#include "time.h" #include #include ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/column.cxx |7 ++-
1 file changed, 2 insertions(+), 5 deletions(-)
New commits:
commit d5c763f7b114aeebcb08254f26be718cd738d6b0
Author: Stephan Bergmann
Date: Tue Oct 4 16:58:15 2016 +0200
pNewPattern can never be null here
Change-Id: I87d66bca7b9399e0268eb2fb4c1dfa51d4461fa2
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 5abcb6e..6dfce01 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -552,11 +552,8 @@ void ScColumn::ApplyStyle( SCROW nRow, const ScStyleSheet*
rStyle )
{
const ScPatternAttr* pPattern = pAttrArray->GetPattern(nRow);
std::unique_ptr pNewPattern(new ScPatternAttr(*pPattern));
-if (pNewPattern)
-{
-pNewPattern->SetStyleSheet(const_cast(rStyle));
-pAttrArray->SetPattern(nRow, pNewPattern.get(), true);
-}
+pNewPattern->SetStyleSheet(const_cast(rStyle));
+pAttrArray->SetPattern(nRow, pNewPattern.get(), true);
}
void ScColumn::ApplyStyleArea( SCROW nStartRow, SCROW nEndRow, const
ScStyleSheet& rStyle )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl
include/vcl/alpha.hxx |6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit d010fbf353ab6f73741e4d1d9ea4bd3ba5301d90
Author: Stephan Bergmann
Date: Tue Oct 4 16:57:24 2016 +0200
Actually delegate to Bitmap's move assign op
Change-Id: Ib57906ead469d64d324f3820c6f5d3c49ab4cd0a
diff --git a/include/vcl/alpha.hxx b/include/vcl/alpha.hxx
index 738bd5a..9e3f497 100644
--- a/include/vcl/alpha.hxx
+++ b/include/vcl/alpha.hxx
@@ -20,6 +20,10 @@
#ifndef INCLUDED_VCL_ALPHA_HXX
#define INCLUDED_VCL_ALPHA_HXX
+#include
+
+#include
+
#include
#include
@@ -40,7 +44,7 @@ public:
AlphaMask& operator=( const Bitmap& rBitmap );
AlphaMask& operator=( const AlphaMask& rAlphaMask ) { return
static_cast( Bitmap::operator=( rAlphaMask ) ); }
-AlphaMask& operator=( AlphaMask&& rAlphaMask ) { return
static_cast( Bitmap::operator=( rAlphaMask ) ); }
+AlphaMask& operator=( AlphaMask&& rAlphaMask ) { return
static_cast( Bitmap::operator=( std::move(rAlphaMask) ) ); }
booloperator!() const { return Bitmap::operator!(); }
booloperator==( const AlphaMask& rAlphaMask ) const { return
Bitmap::operator==( rAlphaMask ); }
booloperator!=( const AlphaMask& rAlphaMask ) const { return
Bitmap::operator!=( rAlphaMask ); }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-0' - loleaflet/dist loleaflet/src loolwsd/ChildProcessSession.cpp loolwsd/ChildProcessSession.hpp loolwsd/DocumentBroker.c
loleaflet/dist/toolbar.css |9 +
loleaflet/dist/toolbar/toolbar.js| 80 +++
loleaflet/src/control/Toolbar.js |8 +
loleaflet/src/core/Socket.js |3
loleaflet/src/layer/tile/CalcTileLayer.js|1
loleaflet/src/layer/tile/ImpressTileLayer.js |1
loleaflet/src/layer/tile/TileLayer.js| 32 ++
loleaflet/src/layer/tile/WriterTileLayer.js |1
loleaflet/src/map/Map.js | 18 +++
loleaflet/src/map/handler/Map.Keyboard.js|4
loolwsd/ChildProcessSession.cpp | 33 --
loolwsd/ChildProcessSession.hpp | 33 +-
loolwsd/DocumentBroker.cpp |8 +
loolwsd/DocumentBroker.hpp |4
loolwsd/LOKitClient.cpp |2
loolwsd/LOKitHelper.hpp |6 -
loolwsd/LOOLKit.cpp | 138 +--
loolwsd/LOOLSession.cpp |7 +
loolwsd/LOOLSession.hpp |3
loolwsd/LOOLWSD.cpp |9 +
loolwsd/MasterProcessSession.cpp |7 +
loolwsd/MasterProcessSession.hpp |2
loolwsd/Storage.cpp | 14 +-
loolwsd/Storage.hpp |2
loolwsd/protocol.txt |6 +
loolwsd/test/httpwstest.cpp |1
26 files changed, 370 insertions(+), 62 deletions(-)
New commits:
commit 63d1d67ff129cafd41a406e9da05694e47f087c5
Author: Ashod Nakashian
Date: Sun Aug 14 18:02:51 2016 -0400
Correct comment authorship; and bring userlist in UI
This includes cherry-picking many commits as listed
below plus some hackery left and right to make it work with our
old code here.
To bring userlists here, we treat sessionIds like viewIds and
provide it to the UI. This helped in easy integration and less
hackery.
For comments, we pass the name of the author in the uno command
everytime, otherwise in this non-multiview case, there is no way
for core to know who issued the command.
List of cherry-picked commits:
loolwsd: convert function-object callbacks to abstract interface
(cherry picked from commit 5af1f18e364068e4b0dc1cac5a71b6dc5afd3bb4)
loolwsd: Receive WOPI userid, username
(cherry picked from commit f8ebb54af0948dbd4b9cb7bdceb44d90b190f4f9)
Don't check for nullptr after dereferencing.
(cherry picked from commit 2090f121b61c34a2285430f495aee88c24ebc2e4)
loolwsd: correct multiview creation
(cherry picked from commit 6536ba2fe218d26940af12baff2f61b41ccc7300)
loolwsd: Pass sessions' usernames to core
(cherry picked from commit 67444eeb80ad521edcab905217c4777cdeacb8c2)
loolwsd: Handle user names with spaces; encode/decode properly
(cherry picked from commit db5efae2b81449186552ae6838806304e1d61a48)
loolwsd: Echo back view information to clients
(cherry picked from commit 7d48cd6f175e57ce701be307bfbf782b308ddee9)
loolwsd: Always send the updated view info to clients
(cherry picked from commit 46107dd0c8973f48117d50111fe7a397320412c8)
loleaflet: Infrastructure for user list
(cherry picked from commit 3d8b73da8be0e5727c0613db131e06509ea1a051)
loleaflet: Show a user list in bottom toolbar
(cherry picked from commit 3d29df6f998df339896b1355b6fa9186dcc60892)
loleaflet: Don't use input for userlist; use menu list
(cherry picked from commit aca73d2ac52e0ab4c7b64f7575447cb2b65a21c8)
loleaflet: Include username in removeview signal
(cherry picked from commit 394054ecbf5a89a1a69a00344f1bb63c22a4b2cc)
loleaflet: Notifications when new user joins, leaves
(cherry picked from commit d223f2a0e41d8166321044d151de452870f09f3c)
loleaflet: Better algorithm for adding/removing users from list
(cherry picked from commit 958c0e35341c73f6636ba141f8fe82ea1c21)
loleaflet: User count in user list
(cherry picked from commit 04064b2e23c00af284fd671a73af980bda4236cc)
loleaflet: userlist l10n fix
(cherry picked from commit d3eda7d19857c17d98e4000f712cde61066684fe)
loleaflet: Handle new message, 'viewinfo:'
(cherry picked from commit 626eab255a23b985507c08c74558de7a67ce40c8)
loleaflet: Show usercolor in userlist
(cherry picked from commit 5891371dcacf04182827317482df6b92700aabbd)
Change-Id: I88c6ae53e280c054729c84497b6a0e416c0c13cc
diff --git a/loleaflet/dist/toolbar.css b/loleaflet/dist/toolbar.css
index 7fc6660..35badbb 100644
--- a/loleaflet/dist/toolbar.css
+++ b/loleaflet/dist/toolbar.css
@@ -304,3 +304,12 @@ button.leaflet-control-search-next
border: 0px;
background: rgba(66, 151, 215, 1);
}
+
+tr.useritem:hover {
+cursor: default;
+background-color: rgba(67, 172, 232, 0.25);
+}
+
+tr.useritem > td {
+padding: 7px;
+}
diff --git a/loleaflet/dist/toolbar/to
[Libreoffice-commits] online.git: Changes to 'private/pranavk/userlist_backport'
New branch 'private/pranavk/userlist_backport' available with the following commits: commit 7d456c7ac4453f041f9d8821b36097db90e5ca48 Author: Pranav Kant Date: Tue Oct 4 19:43:57 2016 +0530 loleaflet: Correct comment authorship in non-multiview case Change-Id: Ieb4958cf42576c71e0d1e744d46bb5bd19111081 commit 973bbc32d491ec4f3b850116f6f160b90cee2a6c Author: Pranav Kant Date: Tue Oct 4 19:25:16 2016 +0530 loleaflet: Remove colors from userlist We don't need them in this branch. Change-Id: I95cc13783b0406e8b276567e122ce7337f13a692 commit e74bc4cce58b4f72990bafe5acb91c7f567fcc19 Author: Pranav Kant Date: Sun Sep 25 22:47:59 2016 +0530 loleaflet: Show usercolor in userlist Change-Id: I6be05f36ffc4c00aa986b3873fce1bc5acc6fbf0 (cherry picked from commit 5891371dcacf04182827317482df6b92700aabbd) commit a6ddcad425511dac50a1506495a316f7bf69a24a Author: Pranav Kant Date: Tue Oct 4 19:03:26 2016 +0530 loolwsd: Add customized notifyViewInfo() for non-multiview case For easy integration of userlist feature with this branch, lets treat sessionId like viewId in multiview case. Change-Id: Idb38604cf52ce6800dd868e5849161c5277c6be9 commit b2d81db5a820da9d0a6c3f768c946dc83a440364 Author: Pranav Kant Date: Tue Oct 4 18:58:11 2016 +0530 loleaflet: Infrastructure for userlist Change-Id: Ic86c8f332e005ba009c634e51651ed51c457166d commit 09a1284d7744c14f886c6251bfaf5cc477f3e153 Author: Pranav Kant Date: Tue Sep 20 22:08:14 2016 +0530 loleaflet: Handle new message, 'viewinfo:' Change-Id: I82d886e3450439bbfd2e4b381cc8f9336bcdd57e (cherry picked from commit 626eab255a23b985507c08c74558de7a67ce40c8) commit 379bd0b9b5d34d9611bc7fc1e5e41522a6e2d437 Author: Pranav Kant Date: Thu Sep 1 12:40:58 2016 +0530 loleaflet: userlist l10n fix Change-Id: Id2be29e018f1c23a8d5b61ad3fbaebc36f1222ec (cherry picked from commit d3eda7d19857c17d98e4000f712cde61066684fe) commit ca0b0c59935534cd316474507776e885cc3f5a30 Author: Pranav Kant Date: Thu Sep 1 11:25:08 2016 +0530 loleaflet: User count in user list Change-Id: Idde4e1bdf1b33590c3b9a8265e059c01943f4777 (cherry picked from commit 04064b2e23c00af284fd671a73af980bda4236cc) commit 0d77cfbc60d4997a4d77b819e07b4dc8527f733e Author: Pranav Kant Date: Thu Sep 1 11:08:38 2016 +0530 loleaflet: Better algorithm for adding/removing users from list Remove them dynamically, rather than creating a new list everytime. Change-Id: I3e1a8c603e092fdd727806154a3715139e4f5b2c (cherry picked from commit 958c0e35341c73f6636ba141f8fe82ea1c21) commit c1d80d29bdc7cdfea5461152b71d4b9ea23c4c18 Author: Pranav Kant Date: Tue Aug 30 20:23:11 2016 +0530 loleaflet: Notifications when new user joins, leaves Change-Id: I71b9ffb82fa2a0104df6f2600558b1b094f1195f (cherry picked from commit d223f2a0e41d8166321044d151de452870f09f3c) commit 3000917e0dea3afa58e2f8b5aef4f0f46c375dcd Author: Pranav Kant Date: Tue Aug 30 20:33:28 2016 +0530 loleaflet: Include username in removeview signal Change-Id: I6b9cdf2712d130d09c7bddcbe68042eacfacb8bb (cherry picked from commit 394054ecbf5a89a1a69a00344f1bb63c22a4b2cc) commit 89b3aaa2b8bcc23d5fdd0d62b4c8acf7f5b5a4bf Author: Pranav Kant Date: Tue Aug 30 20:22:12 2016 +0530 loleaflet: Don't use input for userlist; use menu list Change-Id: I29244e3989fa5ca52c701c05996669cd548a0109 (cherry picked from commit aca73d2ac52e0ab4c7b64f7575447cb2b65a21c8) commit 065e7cb6304f19a51ed58164e628799dbe87ca37 Author: Pranav Kant Date: Mon Aug 29 16:58:38 2016 +0530 loleaflet: Show a user list in bottom toolbar Change-Id: I5aa87a6da3c6af9da0138bdfe51fbb707a47ba3e Reviewed-on: https://gerrit.libreoffice.org/28480 Reviewed-by: pranavk Tested-by: pranavk (cherry picked from commit 3d29df6f998df339896b1355b6fa9186dcc60892) commit d33529185407843707a37cf8d9019d3625b75b30 Author: Pranav Kant Date: Mon Aug 29 16:34:42 2016 +0530 loleaflet: Infrastructure for user list Change-Id: If06d014174479d3d05397422c000ca47c51c819e Reviewed-on: https://gerrit.libreoffice.org/28477 Reviewed-by: pranavk Tested-by: pranavk (cherry picked from commit 3d8b73da8be0e5727c0613db131e06509ea1a051) commit 4b26a368668e69ea0e917419ae195ad8c6d27bf8 Author: Pranav Kant Date: Tue Sep 20 15:59:53 2016 +0530 loolwsd: Always send the updated view info to clients This replaces addview/remview/remallview messages in the protocol with 'viewinfo' message which is sent whenever there is any change in the view information. Let the client deal with what information is redundant to it. Change-Id: Ic470ea88a94ff281a0ae021014a9fba1b876f648 (cherry picked from commit 46107dd0c8973f48117d50111fe7a397320412c8) commit a806bdf4d891443694227c57a17cf0d65a4b2bec Author: Pranav Kan
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - sc/source
sc/source/ui/undo/undoblk3.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 47d1aa87cbe8390f9c6190b13733f8c1fd240e30 Author: Markus Mohrhard Date: Wed Sep 28 03:55:01 2016 +0200 tdf#99386, broadcast that cell content changed after merge cells undo/redo Change-Id: Idf41d1b07e26af66d9eefd18e5d5b582edc205e9 Reviewed-on: https://gerrit.libreoffice.org/29370 Tested-by: Jenkins Reviewed-by: Markus Mohrhard (cherry picked from commit f6f213bed507d1d7547f6098a67b6e460d46bce6) Reviewed-on: https://gerrit.libreoffice.org/29377 Reviewed-by: jan iversen diff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxx index bb90e11..791c5b7 100644 --- a/sc/source/ui/undo/undoblk3.cxx +++ b/sc/source/ui/undo/undoblk3.cxx @@ -728,6 +728,8 @@ void ScUndoMerge::DoChange( bool bUndo ) const if (!bDidPaint) ScUndoUtil::PaintMore(pDocShell, aRange); + +rDoc.BroadcastCells(aRange, SC_HINT_DATACHANGED); } ShowTable(aCurRange); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - sd/source
sd/source/ui/annotations/annotationwindow.cxx |4 1 file changed, 4 insertions(+) New commits: commit 59a4486bb8519fbd54da0a924b7a5f9b712b3bf2 Author: Caolán McNamara Date: Sat Oct 1 21:09:48 2016 +0100 Engine() return mpOutliner, so can crash if Engine() used post delete if Deactivate called during ::dispose Change-Id: I066dcc52278f12442de0281c8d783353aed5a186 (cherry picked from commit 86617760eb8bc6c0b2713b9496ade9203d1077a5) Reviewed-on: https://gerrit.libreoffice.org/29443 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index 0e59a38..7cddb80 100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -297,6 +297,7 @@ void AnnotationWindow::dispose() mpMeta.disposeAndClear(); delete mpOutlinerView; delete mpOutliner; +mpOutliner = nullptr; mpVScrollbar.disposeAndClear(); mpTextWindow.disposeAndClear(); FloatingWindow::dispose(); @@ -614,6 +615,9 @@ void AnnotationWindow::Deactivate() if (mrManager.getPopupMenuActive()) return; +if (!mpOutliner) //in dispose +return; + Reference< XAnnotation > xAnnotation( mxAnnotation ); // write changed text back to annotation ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/column.hxx|2 +-
sc/inc/table.hxx |2 +-
sc/source/core/data/column.cxx |4 ++--
sc/source/core/data/document.cxx |2 +-
sc/source/core/data/table2.cxx |2 +-
sc/source/core/data/table3.cxx |4 ++--
sc/source/core/data/table4.cxx |2 +-
sc/source/core/data/table6.cxx |2 +-
8 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit bc1096fed97baae496d2b16868a9d7e36017bc59
Author: Stephan Bergmann
Date: Tue Oct 4 15:48:29 2016 +0200
Avoid UBSan "reference binding to null pointer"
...at least during JunitTest_sc_unoapi_2 at
> ScTable::DoSubTotals(ScSubTotalParam&)
sc/source/core/data/table3.cxx:2097:25
> ScDocument::DoSubTotals(short, ScSubTotalParam&)
sc/source/core/data/documen3.cxx:761:104
> ScDBDocFunc::DoSubTotals(short, ScSubTotalParam const&, bool, bool)
sc/source/ui/docshell/dbdocfun.cxx:1076:29
>
ScCellRangeObj::applySubTotals(com::sun::star::uno::Reference
const&, unsigned char) sc/source/ui/unoobj/cellsuno.cxx:5868:15
> gcc3::callVirtualMethod(void*, unsigned int, void*,
_typelib_TypeDescriptionReference*, bool, unsigned long*, unsigned int,
unsigned long*, double*)
bridges/source/cpp_uno/gcc3_linux_x86-64/callvirtualmethod.cxx:77:5
> cpp_call(bridges::cpp_uno::shared::UnoInterfaceProxy*,
bridges::cpp_uno::shared::VtableSlot, _typelib_TypeDescriptionReference*, int,
_typelib_MethodParameter*, void*, void**, _uno_Any**)
bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx:241:13
> bridges::cpp_uno::shared::unoInterfaceProxyDispatch(_uno_Interface*,
_typelib_TypeDescription const*, void*, void**, _uno_Any**)
bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx:431:13
> binaryurp::IncomingRequest::execute_throw(binaryurp::BinaryAny*,
std::__debug::vector
>*) const binaryurp/source/incomingrequest.cxx:240:13
> binaryurp::IncomingRequest::execute() const
binaryurp/source/incomingrequest.cxx:77:26
> request binaryurp/source/reader.cxx:85:9
> cppu_threadpool::JobQueue::enter(long, bool)
cppu/source/threadpool/jobqueue.cxx:107:17
> cppu_threadpool::ORequestThread::run()
cppu/source/threadpool/thread.cxx:165:31
> threadFunc include/osl/thread.hxx:185:15
> osl_thread_start_Impl(void*) sal/osl/unx/thread.cxx:240:9
> start_thread (/lib64/libpthread.so.0+0x75c9)
> __clone (/lib64/libc.so.6+0x102f6c)
pStyle can apparently be null, will get passed through to
ScColumn::ApplyStyle
(sc/source/core/data/column.cxx), where it is only used in
pNewPattern->SetStyleSheet(const_cast(&rStyle));
and which is apparently fine with a null argument.
Change-Id: I13fbb092aab06960d820c605476b2cee58889be4
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 621a65b..5ae6bb4 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -464,7 +464,7 @@ public:
voidApplyPatternIfNumberformatIncompatible( const ScRange& rRange,
const ScPatternAttr& rPattern, short nNewType );
-voidApplyStyle( SCROW nRow, const ScStyleSheet& rStyle );
+voidApplyStyle( SCROW nRow, const ScStyleSheet* rStyle );
voidApplyStyleArea( SCROW nStartRow, SCROW nEndRow, const
ScStyleSheet& rStyle );
voidApplySelectionStyle(const ScStyleSheet& rStyle, const
ScMarkData& rMark);
voidApplySelectionLineStyle( const ScMarkData& rMark,
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index e4e1432..e163233 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -633,7 +633,7 @@ public:
voidAddCondFormatData( const ScRangeList& rRange, sal_uInt32
nIndex );
voidRemoveCondFormatData( const ScRangeList& rRange, sal_uInt32
nIndex );
-voidApplyStyle( SCCOL nCol, SCROW nRow, const ScStyleSheet& rStyle
);
+voidApplyStyle( SCCOL nCol, SCROW nRow, const ScStyleSheet* rStyle
);
voidApplyStyleArea( SCCOL nStartCol, SCROW nStartRow, SCCOL
nEndCol, SCROW nEndRow, const ScStyleSheet& rStyle );
voidApplySelectionStyle(const ScStyleSheet& rStyle, const
ScMarkData& rMark);
voidApplySelectionLineStyle( const ScMarkData& rMark,
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index ea92124..5abcb6e 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -548,13 +548,13 @@ void ScColumn::RemoveCondFormat( SCROW nStartRow, SCROW
nEndRow, sal_uInt32 nInd
pAttrArray->RemoveCondFormat( nStartRow, nEndRow, nIndex );
}
-void ScColumn::ApplyStyle( SCROW nRow, const ScStyleSheet& rStyle )
+void ScColumn::ApplyStyle( SCROW nRow, const ScStyleSheet* rStyle )
{
const ScPatternAttr* pPattern = pAttrArray->GetPattern(nRow);
std::unique_ptr pNewPattern(new ScPatternAttr(*pPattern));
if (pNewPattern)
{
-pNewPattern->SetStyleSheet(const_cast(&rStyle));
+pNewPatter
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - drawinglayer/source
drawinglayer/source/processor2d/vclhelperbufferdevice.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 0537b554fd4ac56c1ac1c81e268ef1713c992cbd
Author: Caolán McNamara
Date: Thu Sep 29 14:16:20 2016 +0100
Resolves: tdf#101433 reset RasterOpMode on cached virtual device before
reuse
(cherry picked from commit 17f912c5bb63426f0758dccbc3357a73f56f3137)
Change-Id: I178aa499b080b0b684d41fdd4115a6398f944c43
Reviewed-on: https://gerrit.libreoffice.org/29390
Tested-by: Jenkins
Reviewed-by: jan iversen
diff --git a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
index 62d11c4..39cff2d 100644
--- a/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
+++ b/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx
@@ -196,6 +196,7 @@ namespace
{
// reused, reset some values
pRetval->SetMapMode();
+pRetval->SetRasterOp(ROP_OVERPAINT);
}
// remember allocated buffer
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - vcl/inc vcl/unx
vcl/inc/unx/gtk/gtkframe.hxx |6 +-
vcl/inc/unx/gtk/gtkinst.hxx |3 +++
vcl/unx/gtk/gtkinst.cxx | 21 -
vcl/unx/gtk/gtksalframe.cxx | 16 +++-
vcl/unx/gtk3/gtk3gtkframe.cxx | 27 ---
5 files changed, 59 insertions(+), 14 deletions(-)
New commits:
commit 243698b5520e70b54f28eed8e29bdbd551bba793
Author: Caolán McNamara
Date: Fri Sep 16 11:19:52 2016 +0100
Resolves: rhbz#1373933 gtk 3.21 emits a lot more "style-set" signals
also deb#837356
since gtk3 commit of...
commit 0f116135f4a5033ce4e9dfa19f10624701fa615c
Author: Matthias Clasen
Date: Fri May 6 10:12:14 2016 -0400
Avoid emitting ::style-set by name
GtkStyle is deprecated, but we still emit ::style-set quite
a bit, so lets at least not be slow while doing it.
docs say...
'GtkWidget::style-set has been deprecated since version 3.0 and should not
be
used in newly-written code.
Use the âstyle-updatedâ signal'
and this code just came over from gtk2 without any thought about it at the
time, so change it over to the "style-updated" which makes everything happy
again
gtk3 still emits a lot of style-updateds signals
so don't throw away font settings every time, check if the font settings
changed and only emit FontChanged if they differ from the last seen
settings.
(cherry picked from commit ef7abe81df10cb8a8c04afbb1fbe700f94e73f04)
Change-Id: I9e920d2fb2d820ff1b1b5a9ecb228484df3d6146
Reviewed-on: https://gerrit.libreoffice.org/28946
Tested-by: Jenkins
Reviewed-by: jan iversen
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index 3b81c54..0793b52 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -241,7 +241,11 @@ class GtkSalFrame : public SalFrame
// signals
static gboolean signalButton( GtkWidget*, GdkEventButton*, gpointer );
-static void signalStyleSet( GtkWidget*, GtkStyle* pPrevious,
gpointer );
+#if GTK_CHECK_VERSION(3,0,0)
+static void signalStyleUpdated(GtkWidget*, gpointer);
+#else
+static void signalStyleSet(GtkWidget*, GtkStyle* pPrevious,
gpointer);
+#endif
#if GTK_CHECK_VERSION(3,0,0)
static gboolean signalDraw( GtkWidget*, cairo_t *cr, gpointer );
static void sizeAllocated(GtkWidget*, GdkRectangle *pAllocation,
gpointer frame);
diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx
index 099fa11..1e2ddba 100644
--- a/vcl/inc/unx/gtk/gtkinst.hxx
+++ b/vcl/inc/unx/gtk/gtkinst.hxx
@@ -230,6 +230,8 @@ public:
#endif
virtual const cairo_font_options_t* GetCairoFontOptions() override;
+const cairo_font_options_t* GetLastSeenCairoFontOptions();
+ void ResetLastSeenCairoFontOptions();
voidRemoveTimer (SalTimer *pTimer);
@@ -239,6 +241,7 @@ private:
std::vector m_aTimers;
boolIsTimerExpired();
boolbNeedsInit;
+cairo_font_options_t* m_pLastCairoFontOptions;
mutable std::shared_ptr m_xPrintWrapper;
};
diff --git a/vcl/unx/gtk/gtkinst.cxx b/vcl/unx/gtk/gtkinst.cxx
index f073635..01abb67 100644
--- a/vcl/unx/gtk/gtkinst.cxx
+++ b/vcl/unx/gtk/gtkinst.cxx
@@ -157,6 +157,7 @@ GtkInstance::GtkInstance( SalYieldMutex* pMutex )
: X11SalInstance( pMutex )
#endif
, bNeedsInit(true)
+, m_pLastCairoFontOptions(nullptr)
{
}
@@ -202,6 +203,7 @@ GtkInstance::~GtkInstance()
while( !m_aTimers.empty() )
delete *m_aTimers.begin();
DeInitAtkBridge();
+ResetLastSeenCairoFontOptions();
}
SalFrame* GtkInstance::CreateFrame( SalFrame* pParent, SalFrameStyleFlags
nStyle )
@@ -478,7 +480,24 @@ GtkInstance::getPrintWrapper() const
const cairo_font_options_t* GtkInstance::GetCairoFontOptions()
{
-return gdk_screen_get_font_options(gdk_screen_get_default());
+const cairo_font_options_t* pCairoFontOptions =
gdk_screen_get_font_options(gdk_screen_get_default());
+if (!m_pLastCairoFontOptions && pCairoFontOptions)
+m_pLastCairoFontOptions = cairo_font_options_copy(pCairoFontOptions);
+return pCairoFontOptions;
+}
+
+const cairo_font_options_t* GtkInstance::GetLastSeenCairoFontOptions()
+{
+return m_pLastCairoFontOptions;
+}
+
+void GtkInstance::ResetLastSeenCairoFontOptions()
+{
+if (m_pLastCairoFontOptions)
+{
+cairo_font_options_destroy(m_pLastCairoFontOptions);
+m_pLastCairoFontOptions = nullptr;
+}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx
index 9e14746..29f7eb9 100644
--- a/vcl/unx/gtk/gtksalframe.cxx
+++ b/vcl/unx/gtk/gtksalframe.cxx
@@ -3289,7 +3289,21 @@ void GtkSalFrame::signalStyleSet( GtkWidget*, GtkStyle*
pPr
Re: minimal dialog width/size ?
Cor Nouws wrote on 02-10-16 21:12: > I notice that an extension, that shows dialogs of which the width/size > is set according to som variables, now produces dialogs with a minimal > height/width.. created bug: https://bugs.documentfoundation.org/show_bug.cgi?id=102957 -- Cor Nouws GPD key ID: 0xB13480A6 - 591A 30A7 36A0 CE3C 3D28 A038 E49D 7365 B134 80A6 - vrijwilliger http://nl.libreoffice.org - volunteer http://www.libreoffice.org - The Document Foundation Membership Committee Member ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - comphelper/source include/comphelper include/sfx2 sfx2/source sw/qa sw/source
comphelper/source/misc/lok.cxx | 12 ++
include/comphelper/lok.hxx |5 ++
include/sfx2/viewsh.hxx|6 ---
sfx2/source/view/viewsh.cxx| 18 --
sw/qa/extras/tiledrendering/tiledrendering.cxx | 44 -
sw/source/core/view/viewsh.cxx |4 +-
sw/source/uibase/docvw/PostItMgr.cxx |6 +--
sw/source/uibase/docvw/SidebarWin.cxx |6 +--
8 files changed, 69 insertions(+), 32 deletions(-)
New commits:
commit dfc9a744a536fb822ad067683c957143bc81c5b4
Author: Miklos Vajna
Date: Tue Oct 4 10:56:55 2016 +0200
comphelper: move setTiledPainting() from SfxViewShell
And make it a static one. The primary point of that member function is
to prevent invalidations during paint, and since multiple views are
allowed, it wasn't extended to filter out invalidations from all views,
not just from the current one. (Same goes for other callback types.)
(cherry picked from commit 59e38e946f19ab59370f8e52370b7a7b861cc558)
Conflicts:
include/sfx2/viewsh.hxx
sfx2/source/view/viewsh.cxx
Change-Id: I23e6b2c2ff94227f2b72c481148b2d8279ae2905
diff --git a/comphelper/source/misc/lok.cxx b/comphelper/source/misc/lok.cxx
index e1a099d..cf776f0 100644
--- a/comphelper/source/misc/lok.cxx
+++ b/comphelper/source/misc/lok.cxx
@@ -19,6 +19,8 @@ static bool g_bActive(false);
static bool g_bPartInInvalidation(false);
+static bool g_bTiledPainting(false);
+
void setActive(bool bActive)
{
g_bActive = bActive;
@@ -39,6 +41,16 @@ bool isPartInInvalidation()
return g_bPartInInvalidation;
}
+void setTiledPainting(bool bTiledPainting)
+{
+g_bTiledPainting = bTiledPainting;
+}
+
+bool isTiledPainting()
+{
+return g_bTiledPainting;
+}
+
static bool g_bLocalRendering(false);
void setLocalRendering(bool bLocalRendering)
diff --git a/include/comphelper/lok.hxx b/include/comphelper/lok.hxx
index 529694c..ca9f87f 100644
--- a/include/comphelper/lok.hxx
+++ b/include/comphelper/lok.hxx
@@ -48,6 +48,11 @@ COMPHELPER_DLLPUBLIC bool isPartInInvalidation();
/// Set whether clients want a part number in an invalidation payload.
COMPHELPER_DLLPUBLIC void setPartInInvalidation(bool bPartInInvalidation);
+/// Check if we are doing tiled painting.
+COMPHELPER_DLLPUBLIC bool isTiledPainting();
+/// Set if we are doing tiled painting.
+COMPHELPER_DLLPUBLIC void setTiledPainting(bool bTiledPainting);
+
// Status indicator handling. Even if in theory there could be several status
indicators active at
// the same time, in practice there is only one at a time, so we don't handle
any identification of
// status indicator in this API.
diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx
index fb93674..e2c0b75 100644
--- a/include/sfx2/viewsh.hxx
+++ b/include/sfx2/viewsh.hxx
@@ -331,12 +331,6 @@ public:
void setTiledSearching(bool bTiledSearching);
/// Are we doing tiled searching?
bool isTiledSearching() const;
-/// Set if we are doing tiled painting.
-void setTiledPainting(bool bTiledPainting);
-/// Are we doing tiled painting?
-bool isTiledPainting() const;
-/// Get if we are doing tiled painting.
-bool getTiledPainting() const;
/// See lok::Document::getPart().
virtual int getPart() const;
virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const;
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index ad04649..e308a1b 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -316,7 +316,6 @@ SfxViewShell_Impl::SfxViewShell_Impl(SfxViewShellFlags
const nFlags)
, m_pLibreOfficeKitViewCallback(nullptr)
, m_pLibreOfficeKitViewData(nullptr)
, m_bTiledSearching(false)
-, m_bTiledPainting(false)
, m_nViewShellId(SfxViewShell_Impl::m_nLastViewShellId++)
{}
@@ -1620,7 +1619,7 @@ void
SfxViewShell::registerLibreOfficeKitViewCallback(LibreOfficeKitCallback pCa
void SfxViewShell::libreOfficeKitViewCallback(int nType, const char* pPayload)
const
{
-if (pImp->m_bTiledPainting)
+if (comphelper::LibreOfficeKit::isTiledPainting())
return;
if (pImp->m_bTiledSearching)
@@ -1655,21 +1654,6 @@ bool SfxViewShell::isTiledSearching() const
return pImp->m_bTiledSearching;
}
-void SfxViewShell::setTiledPainting(bool bTiledPainting)
-{
-pImp->m_bTiledPainting = bTiledPainting;
-}
-
-bool SfxViewShell::isTiledPainting() const
-{
-return pImp->m_bTiledPainting;
-}
-
-bool SfxViewShell::getTiledPainting() const
-{
-return pImp->m_bTiledPainting;
-}
-
int SfxViewShell::getPart() const
{
return 0;
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx
b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index e7b78b7..eb64e9f 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -78,6 +78
[Libreoffice-commits] online.git: loolwsd/LOOLWSD.cpp loolwsd/Storage.cpp
loolwsd/LOOLWSD.cpp | 14 +++---
loolwsd/Storage.cpp |8
2 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit c453f2626a60a02c9a20baaa3fff4846fee06253
Author: Tor Lillqvist
Date: Tue Oct 4 15:10:45 2016 +0300
Let's not use lcl_ prefixes here
diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 95ce1fc..23d73e6 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -177,7 +177,7 @@ static int careerSpanSeconds = 0;
namespace {
static inline
-void lcl_shutdownLimitReached(WebSocket& ws)
+void shutdownLimitReached(WebSocket& ws)
{
const std::string error = Poco::format(PAYLOAD_UNAVALABLE_LIMIT_REACHED,
MAX_DOCUMENTS, MAX_CONNECTIONS);
const std::string close = Poco::format(SERVICE_UNAVALABLE_LIMIT_REACHED,
static_cast(WebSocket::WS_POLICY_VIOLATION));
@@ -717,7 +717,7 @@ private:
{
--LOOLWSD::NumDocBrokers;
Log::error("Maximum number of open documents reached.");
-lcl_shutdownLimitReached(*ws);
+shutdownLimitReached(*ws);
return;
}
#endif
@@ -945,7 +945,7 @@ public:
Log::error("Maximum number of connections reached.");
// accept hand shake
WebSocket ws(request, response);
-lcl_shutdownLimitReached(ws);
+shutdownLimitReached(ws);
return;
}
#endif
@@ -1362,14 +1362,14 @@ public:
namespace {
static inline
-ServerSocket* lcl_getServerSocket(int nClientPortNumber)
+ServerSocket* getServerSocket(int nClientPortNumber)
{
return (LOOLWSD::isSSLEnabled()) ? new
SecureServerSocket(nClientPortNumber)
: new ServerSocket(nClientPortNumber);
}
static inline
-std::string lcl_getLaunchURI()
+std::string getLaunchURI()
{
std::string aAbsTopSrcDir =
Poco::Path(Application::instance().commandPath()).parent().toString();
aAbsTopSrcDir = Poco::Path(aAbsTopSrcDir).absolute().toString();
@@ -1618,7 +1618,7 @@ void LOOLWSD::initialize(Application& self)
#if ENABLE_DEBUG
std::cerr << "\nLaunch this in your browser:\n\n" <<
-lcl_getLaunchURI() <<
+getLaunchURI() <<
"\n\nFull log is available in: " << LOOLWSD_LOGFILE << std::endl;
#endif
}
@@ -1901,7 +1901,7 @@ int LOOLWSD::main(const std::vector&
/*args*/)
// Start a server listening on the port for clients
-std::unique_ptr psvs(lcl_getServerSocket(ClientPortNumber));
+std::unique_ptr psvs(getServerSocket(ClientPortNumber));
ThreadPool threadPool(NumPreSpawnedChildren*6, MAX_SESSIONS * 2);
HTTPServer srv(new ClientRequestHandlerFactory(), threadPool, *psvs,
params1);
diff --git a/loolwsd/Storage.cpp b/loolwsd/Storage.cpp
index f320e2e..631b300 100644
--- a/loolwsd/Storage.cpp
+++ b/loolwsd/Storage.cpp
@@ -244,7 +244,7 @@ bool LocalStorage::saveLocalFileToStorage()
namespace {
static inline
-Poco::Net::HTTPClientSession* lcl_getHTTPClientSession(const Poco::URI& uri)
+Poco::Net::HTTPClientSession* getHTTPClientSession(const Poco::URI& uri)
{
return (LOOLWSD::isSSLEnabled() || LOOLWSD::isSSLTermination()) ? new
Poco::Net::HTTPSClientSession(uri.getHost(), uri.getPort(),
Poco::Net::SSLManager::instance().defaultClientContext())
: new Poco::Net::HTTPClientSession(uri.getHost(),
uri.getPort());
@@ -256,7 +256,7 @@ StorageBase::FileInfo WopiStorage::getFileInfo(const
Poco::URI& uri)
{
Log::debug("Getting info for wopi uri [" + uri.toString() + "].");
-std::unique_ptr
psession(lcl_getHTTPClientSession(uri));
+std::unique_ptr
psession(getHTTPClientSession(uri));
Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_GET,
uri.getPathAndQuery(), Poco::Net::HTTPMessage::HTTP_1_1);
request.set("User-Agent", "LOOLWSD WOPI Agent");
@@ -319,7 +319,7 @@ std::string WopiStorage::loadStorageFileToLocal()
const auto url = uriObject.getPath() + "/contents?" + uriObject.getQuery();
Log::debug("Wopi requesting: " + url);
-std::unique_ptr
psession(lcl_getHTTPClientSession(uriObject));
+std::unique_ptr
psession(getHTTPClientSession(uriObject));
Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_GET, url,
Poco::Net::HTTPMessage::HTTP_1_1);
request.set("User-Agent", "LOOLWSD WOPI Agent");
@@ -361,7 +361,7 @@ bool WopiStorage::saveLocalFileToStorage()
const auto url = uriObject.getPath() + "/contents?" + uriObject.getQuery();
Log::debug("Wopi posting: " + url);
-std::unique_ptr
psession(lcl_getHTTPClientSession(uriObject));
+std::unique_ptr
psession(getHTTPClientSession(uriObject));
Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_POST, url,
Poco::Net::HTTPMessage::HTTP_1_1);
request.set("X-WOPIOverride", "PUT");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.o
[Libreoffice-commits] core.git: comphelper/source include/comphelper include/sfx2 sfx2/source sw/qa sw/source
comphelper/source/misc/lok.cxx | 12
include/comphelper/lok.hxx |5 +++
include/sfx2/viewsh.hxx|4 --
sfx2/source/view/viewsh.cxx| 13
sw/qa/extras/tiledrendering/tiledrendering.cxx | 37 -
sw/source/core/view/viewsh.cxx |4 +-
sw/source/uibase/docvw/PostItMgr.cxx |6 ++--
sw/source/uibase/docvw/SidebarWin.cxx |6 ++--
8 files changed, 62 insertions(+), 25 deletions(-)
New commits:
commit 59e38e946f19ab59370f8e52370b7a7b861cc558
Author: Miklos Vajna
Date: Tue Oct 4 10:56:55 2016 +0200
comphelper: move setTiledPainting() from SfxViewShell
And make it a static one. The primary point of that member function is
to prevent invalidations during paint, and since multiple views are
allowed, it wasn't extended to filter out invalidations from all views,
not just from the current one. (Same goes for other callback types.)
Change-Id: I23e6b2c2ff94227f2b72c481148b2d8279ae2905
diff --git a/comphelper/source/misc/lok.cxx b/comphelper/source/misc/lok.cxx
index e1a099d..cf776f0 100644
--- a/comphelper/source/misc/lok.cxx
+++ b/comphelper/source/misc/lok.cxx
@@ -19,6 +19,8 @@ static bool g_bActive(false);
static bool g_bPartInInvalidation(false);
+static bool g_bTiledPainting(false);
+
void setActive(bool bActive)
{
g_bActive = bActive;
@@ -39,6 +41,16 @@ bool isPartInInvalidation()
return g_bPartInInvalidation;
}
+void setTiledPainting(bool bTiledPainting)
+{
+g_bTiledPainting = bTiledPainting;
+}
+
+bool isTiledPainting()
+{
+return g_bTiledPainting;
+}
+
static bool g_bLocalRendering(false);
void setLocalRendering(bool bLocalRendering)
diff --git a/include/comphelper/lok.hxx b/include/comphelper/lok.hxx
index 529694c..ca9f87f 100644
--- a/include/comphelper/lok.hxx
+++ b/include/comphelper/lok.hxx
@@ -48,6 +48,11 @@ COMPHELPER_DLLPUBLIC bool isPartInInvalidation();
/// Set whether clients want a part number in an invalidation payload.
COMPHELPER_DLLPUBLIC void setPartInInvalidation(bool bPartInInvalidation);
+/// Check if we are doing tiled painting.
+COMPHELPER_DLLPUBLIC bool isTiledPainting();
+/// Set if we are doing tiled painting.
+COMPHELPER_DLLPUBLIC void setTiledPainting(bool bTiledPainting);
+
// Status indicator handling. Even if in theory there could be several status
indicators active at
// the same time, in practice there is only one at a time, so we don't handle
any identification of
// status indicator in this API.
diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx
index 6583801..253c77c 100644
--- a/include/sfx2/viewsh.hxx
+++ b/include/sfx2/viewsh.hxx
@@ -329,10 +329,6 @@ public:
void libreOfficeKitViewCallback(int nType, const char* pPayload) const
override;
/// Set if we are doing tiled searching.
void setTiledSearching(bool bTiledSearching);
-/// Set if we are doing tiled painting.
-void setTiledPainting(bool bTiledPainting);
-/// Get if we are doing tiled painting.
-bool getTiledPainting() const;
/// See lok::Document::getPart().
virtual int getPart() const;
virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const;
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index dacd236..d03878c 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -255,7 +255,6 @@ SfxViewShell_Impl::SfxViewShell_Impl(SfxViewShellFlags
const nFlags)
, m_pLibreOfficeKitViewCallback(nullptr)
, m_pLibreOfficeKitViewData(nullptr)
, m_bTiledSearching(false)
-, m_bTiledPainting(false)
, m_nViewShellId(SfxViewShell_Impl::m_nLastViewShellId++)
{}
@@ -1473,7 +1472,7 @@ void
SfxViewShell::registerLibreOfficeKitViewCallback(LibreOfficeKitCallback pCa
void SfxViewShell::libreOfficeKitViewCallback(int nType, const char* pPayload)
const
{
-if (pImpl->m_bTiledPainting)
+if (comphelper::LibreOfficeKit::isTiledPainting())
return;
if (pImpl->m_bTiledSearching)
@@ -1503,16 +1502,6 @@ void SfxViewShell::setTiledSearching(bool
bTiledSearching)
pImpl->m_bTiledSearching = bTiledSearching;
}
-void SfxViewShell::setTiledPainting(bool bTiledPainting)
-{
-pImpl->m_bTiledPainting = bTiledPainting;
-}
-
-bool SfxViewShell::getTiledPainting() const
-{
-return pImpl->m_bTiledPainting;
-}
-
int SfxViewShell::getPart() const
{
return 0;
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx
b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index 82f5b11..7b441d6 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -77,6 +77,7 @@ public:
void testRedlineColors();
void testCommentEndTextEdit();
void testCursorPosition();
+void testPaintCallbacks();
CPPUNIT_TEST_SUITE(SwTiledRenderingTest);
CPPUNIT_TEST(testRegisterCallback);
[Libreoffice-commits] online.git: loolwsd/MessageQueue.cpp loolwsd/MessageQueue.hpp loolwsd/test
loolwsd/MessageQueue.cpp| 35 +++-
loolwsd/MessageQueue.hpp|4 +
loolwsd/test/TileQueueTests.cpp | 83 +---
3 files changed, 113 insertions(+), 9 deletions(-)
New commits:
commit a1e9c1eb42c711bbb2ab8293979daeb18c1b6094
Author: Jan Holesovsky
Date: Tue Oct 4 14:23:42 2016 +0200
Handle the Impress slide previews with low priority + unit test.
After processing a tile request for a slide preview, move the rest of them
to
the end of the queue, so that other events are processed before we render
the
next preview.
Change-Id: I82aa411406d6731b1c0bf3b849780220b5e68110
diff --git a/loolwsd/MessageQueue.cpp b/loolwsd/MessageQueue.cpp
index f06f670..ffa5f79 100644
--- a/loolwsd/MessageQueue.cpp
+++ b/loolwsd/MessageQueue.cpp
@@ -143,6 +143,9 @@ void TileQueue::removeDuplicate(const std::string& tileMsg)
// input from clients, but strings we have created ourselves here in C++
code, so probably we
// can be sure that the "ver" parameter is always in such a location that
this does what we
// mean.
+// FIXME: also the ver=... is only for debugging from what I can see, so
+// double-check if we can actually avoid the 'ver' everywhere in the
non-debug
+// builds
const std::string newMsg = tileMsg.substr(0, tileMsg.find(" ver"));
for (size_t i = 0; i < _queue.size(); ++i)
@@ -173,19 +176,43 @@ int TileQueue::priority(const std::string& tileMsg)
return -1;
}
+void TileQueue::deprioritizePreviews()
+{
+for (size_t i = 0; i < _queue.size(); ++i)
+{
+const auto front = _queue.front();
+const std::string message(front.data(), front.size());
+
+// stop at the first non-tile or non-'id' (preview) message
+std::string id;
+if (LOOLProtocol::getFirstToken(message) != "tile" ||
!LOOLProtocol::getTokenStringFromMessage(message, "id", id))
+break;
+
+_queue.pop_front();
+_queue.push_back(front);
+}
+}
+
MessageQueue::Payload TileQueue::get_impl()
{
-std::vector tiles;
const auto front = _queue.front();
auto msg = std::string(front.data(), front.size());
std::string id;
-if (LOOLProtocol::getFirstToken(msg) != "tile" ||
LOOLProtocol::getTokenStringFromMessage(msg, "id", id))
+bool isTile = (LOOLProtocol::getFirstToken(msg) == "tile");
+bool isPreview = isTile && LOOLProtocol::getTokenStringFromMessage(msg,
"id", id);
+if (!isTile || isPreview)
{
// Don't combine non-tiles or tiles with id.
Log::trace() << "MessageQueue res: " << msg << Log::end;
_queue.pop_front();
+
+// de-prioritize the other tiles with id - usually the previews in
+// Impress
+if (isPreview)
+deprioritizePreviews();
+
return front;
}
@@ -201,7 +228,7 @@ MessageQueue::Payload TileQueue::get_impl()
// avoid starving - stop the search when we reach a non-tile,
// otherwise we may keep growing the queue of unhandled stuff (both
// tiles and non-tiles)
-if (LOOLProtocol::getFirstToken(prio) != "tile")
+if (LOOLProtocol::getFirstToken(prio) != "tile" ||
LOOLProtocol::getTokenStringFromMessage(prio, "id", id))
break;
int p = priority(prio);
@@ -220,6 +247,7 @@ MessageQueue::Payload TileQueue::get_impl()
_queue.erase(_queue.begin() + prioritized);
+std::vector tiles;
tiles.emplace_back(TileDesc::parse(msg));
// Combine as many tiles as possible with the top one.
@@ -254,6 +282,7 @@ MessageQueue::Payload TileQueue::get_impl()
if (tiles.size() == 1)
{
msg = tiles[0].serialize("tile");
+Log::trace() << "MessageQueue res: " << msg << Log::end;
return Payload(msg.data(), msg.data() + msg.size());
}
diff --git a/loolwsd/MessageQueue.hpp b/loolwsd/MessageQueue.hpp
index 2a13484..8ce2287 100644
--- a/loolwsd/MessageQueue.hpp
+++ b/loolwsd/MessageQueue.hpp
@@ -131,6 +131,10 @@ private:
/// Search the queue for a duplicate tile and remove it (if present).
void removeDuplicate(const std::string& tileMsg);
+/// De-prioritize the previews (tiles with 'id') - move them to the end of
+/// the queue.
+void deprioritizePreviews();
+
/// Priority of the given tile message.
/// -1 means the lowest prio (the tile does not intersect any of the
cursors),
/// the higher the number, the bigger is priority [up to
_viewOrder.size()-1].
diff --git a/loolwsd/test/TileQueueTests.cpp b/loolwsd/test/TileQueueTests.cpp
index efe13cf..964df48 100644
--- a/loolwsd/test/TileQueueTests.cpp
+++ b/loolwsd/test/TileQueueTests.cpp
@@ -43,6 +43,7 @@ class TileQueueTests : public CPPUNIT_NS::TestFixture
CPPUNIT_TEST(testTileCombinedRendering);
CPPUNIT_TEST(testTileRecombining);
CPPUNIT_TEST(testViewOrder);
+CPPUNIT_TEST(testPreviewsDeprioritization);
CPPU
[Libreoffice-commits] core.git: compilerplugins/clang sd/Library_sd.mk sd/source
compilerplugins/clang/mergeclasses.results |1
sd/Library_sd.mk |1
sd/source/ui/func/fuoltext.cxx | 42 ---
sd/source/ui/func/fuoutl.cxx | 63 -
sd/source/ui/inc/fuoltext.hxx | 13 +++--
sd/source/ui/inc/fuoutl.hxx| 61
6 files changed, 35 insertions(+), 146 deletions(-)
New commits:
commit ac9373e65ed7908a19edc6f5c758af9b8232820b
Author: Noel Grandin
Date: Tue Oct 4 10:36:23 2016 +0200
merge sd::FuOutline with sd::FuOutlineText
Change-Id: Ie8191ac91175ba51f89809aaa53bc1ffacf42df0
Reviewed-on: https://gerrit.libreoffice.org/29520
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/compilerplugins/clang/mergeclasses.results
b/compilerplugins/clang/mergeclasses.results
index 254d14e..29b47df 100644
--- a/compilerplugins/clang/mergeclasses.results
+++ b/compilerplugins/clang/mergeclasses.results
@@ -290,7 +290,6 @@ merge sc::opencl::SumOfProduct with sc::opencl::OpSumProduct
merge sc::opencl::XNPV with sc::opencl::OpXNPV
merge sd::BroadcastHelperOwner with sd::DrawController
merge sd::ClientInfo with sd::ClientInfoInternal
-merge sd::FuOutline with sd::FuOutlineText
merge sd::IBluetoothSocket with sd::BufferedStreamSocket
merge sd::ICustomAnimationListController with sd::CustomAnimationPane
merge sd::sidebar::IDisposable with sd::sidebar::PanelBase
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 8bed9f6..22c94b8 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -289,7 +289,6 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
sd/source/ui/func/fuoaprms \
sd/source/ui/func/fuolbull \
sd/source/ui/func/fuoltext \
- sd/source/ui/func/fuoutl \
sd/source/ui/func/fupage \
sd/source/ui/func/fuparagr \
sd/source/ui/func/fupoor \
diff --git a/sd/source/ui/func/fuoltext.cxx b/sd/source/ui/func/fuoltext.cxx
index 9ae6b61..88507be 100644
--- a/sd/source/ui/func/fuoltext.cxx
+++ b/sd/source/ui/func/fuoltext.cxx
@@ -84,10 +84,32 @@ static sal_uInt16 SidArray[] = {
FuOutlineText::FuOutlineText(ViewShell* pViewShell, ::sd::Window* pWindow,
::sd::View* pView, SdDrawDocument* pDoc,
SfxRequest& rReq)
- : FuOutline(pViewShell, pWindow, pView, pDoc, rReq)
+ : FuPoor(pViewShell, pWindow, pView, pDoc, rReq),
+ pOutlineViewShell (static_cast(pViewShell)),
+ pOutlineView (static_cast(pView))
{
}
+/**
+ * forward to OutlinerView
+ */
+bool FuOutlineText::Command(const CommandEvent& rCEvt)
+{
+bool bResult = false;
+
+OutlinerView* pOlView =
+static_cast(mpView)->GetViewByWindow(mpWindow);
+DBG_ASSERT (pOlView, "no OutlineView found");
+
+if (pOlView)
+{
+pOlView->Command(rCEvt);// unfortunately, we do not get a
return value
+bResult = true;
+}
+return bResult;
+}
+
+
rtl::Reference FuOutlineText::Create( ViewShell* pViewSh,
::sd::Window* pWin, ::sd::View* pView, SdDrawDocument* pDoc, SfxRequest& rReq )
{
rtl::Reference xFunc( new FuOutlineText( pViewSh, pWin, pView,
pDoc, rReq ) );
@@ -108,7 +130,7 @@ bool FuOutlineText::MouseButtonDown(const MouseEvent& rMEvt)
}
else
{
-bReturn = FuOutline::MouseButtonDown(rMEvt);
+bReturn = FuPoor::MouseButtonDown(rMEvt);
}
return bReturn;
@@ -120,7 +142,7 @@ bool FuOutlineText::MouseMove(const MouseEvent& rMEvt)
if (!bReturn)
{
-bReturn = FuOutline::MouseMove(rMEvt);
+bReturn = FuPoor::MouseMove(rMEvt);
}
return bReturn;
@@ -171,7 +193,7 @@ bool FuOutlineText::MouseButtonUp(const MouseEvent& rMEvt)
}
if( !bReturn )
-bReturn = FuOutline::MouseButtonUp(rMEvt);
+bReturn = FuPoor::MouseButtonUp(rMEvt);
return bReturn;
}
@@ -201,7 +223,7 @@ bool FuOutlineText::KeyInput(const KeyEvent& rKEvt)
}
else
{
-bReturn = FuOutline::KeyInput(rKEvt);
+bReturn = FuPoor::KeyInput(rKEvt);
}
}
@@ -238,16 +260,6 @@ void FuOutlineText::UpdateForKeyPress (const KeyEvent&
rEvent)
pOutlineViewShell->UpdatePreview (pOutlineViewShell->GetActualPage());
}
-void FuOutlineText::Activate()
-{
-FuOutline::Activate();
-}
-
-void FuOutlineText::Deactivate()
-{
-FuOutline::Deactivate();
-}
-
/**
* Cut object to clipboard
*/
diff --git a/sd/source/ui/func/fuoutl.cxx b/sd/source/ui/func/fuoutl.cxx
deleted file mode 100644
index 61b3b3d..000
--- a/sd/source/ui/func/fuoutl.cxx
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with t
[Libreoffice-commits] core.git: vcl/source
vcl/source/filter/jpeg/JpegReader.cxx | 214 +-
vcl/source/filter/jpeg/JpegReader.hxx | 23 +--
vcl/source/filter/jpeg/jpegc.cxx | 149 ++-
3 files changed, 139 insertions(+), 247 deletions(-)
New commits:
commit 8a04fac29da8ae902bd5f0aac559129013274304
Author: Tomaž Vajngerl
Date: Mon Oct 3 18:39:04 2016 +0200
vcl: read image from JPEG one scanline at a time
When reading an image from JPEG file we allocate a large buffer
to hold the whole raw image before we read it into SalBitmap.
If the image is large this step will spike the memory usage.
This changes reading so that we allocate only the buffer for
a scanline and read one scanline at a time.
Change-Id: I405f4a14601e271c0293a2b75b4c9ec6c458d8a9
Reviewed-on: https://gerrit.libreoffice.org/29504
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/vcl/source/filter/jpeg/JpegReader.cxx
b/vcl/source/filter/jpeg/JpegReader.cxx
index 8959e4e..cd00518 100644
--- a/vcl/source/filter/jpeg/JpegReader.cxx
+++ b/vcl/source/filter/jpeg/JpegReader.cxx
@@ -178,9 +178,6 @@ void jpeg_svstream_src (j_decompress_ptr cinfo, void* input)
JPEGReader::JPEGReader( SvStream& rStream, void* /*pCallData*/, bool
bSetLogSize ) :
mrStream ( rStream ),
-mpAcc( nullptr ),
-mpAcc1 ( nullptr ),
-mpBuffer ( nullptr ),
mnLastPos( rStream.Tell() ),
mnLastLines ( 0 ),
mbSetLogSize ( bSetLogSize )
@@ -191,46 +188,32 @@ JPEGReader::JPEGReader( SvStream& rStream, void*
/*pCallData*/, bool bSetLogSize
JPEGReader::~JPEGReader()
{
-delete[] mpBuffer;
-
-if( mpAcc )
-Bitmap::ReleaseAccess( mpAcc );
-
-if( mpAcc1 )
-Bitmap::ReleaseAccess( mpAcc1 );
}
-unsigned char * JPEGReader::CreateBitmap(JPEGCreateBitmapParam& rParam)
+bool JPEGReader::CreateBitmap(JPEGCreateBitmapParam& rParam)
{
if (rParam.nWidth > SAL_MAX_INT32 / 8 || rParam.nHeight > SAL_MAX_INT32 /
8)
-return nullptr; // avoid overflows later
+return false; // avoid overflows later
if (rParam.nWidth == 0 || rParam.nHeight == 0)
-return nullptr;
+return false;
-SizeaSize(rParam.nWidth, rParam.nHeight );
-boolbGray = rParam.bGray != 0;
+Size aSize(rParam.nWidth, rParam.nHeight);
+bool bGray = rParam.bGray;
-unsigned char * pBmpBuf = nullptr;
+maBitmap = Bitmap();
-if( mpAcc )
-{
-Bitmap::ReleaseAccess( mpAcc );
-maBmp = Bitmap();
-mpAcc = nullptr;
-}
+sal_uInt64 nSize = aSize.Width() * aSize.Height();
-sal_uInt64 nSize = aSize.Width();
-nSize *= aSize.Height();
if (nSize > SAL_MAX_INT32 / (bGray?1:3))
-return nullptr;
+return false;
// Check if the bitmap is atypically large.
if (nSize*(bGray?1:3) > MAX_BITMAP_BYTE_SIZE)
{
// Do not try to acquire resources for the large bitmap or to
// read the bitmap into memory.
-return nullptr;
+return false;
}
if( bGray )
@@ -243,18 +226,18 @@ unsigned char *
JPEGReader::CreateBitmap(JPEGCreateBitmapParam& rParam)
aGrayPal[ n ] = BitmapColor( cGray, cGray, cGray );
}
-maBmp = Bitmap( aSize, 8, &aGrayPal );
+maBitmap = Bitmap(aSize, 8, &aGrayPal);
}
else
{
-maBmp = Bitmap( aSize, 24 );
+maBitmap = Bitmap(aSize, 24);
}
-if ( mbSetLogSize )
+if (mbSetLogSize)
{
unsigned long nUnit = rParam.density_unit;
-if( ( ( 1 == nUnit ) || ( 2 == nUnit ) ) && rParam.X_density &&
rParam.Y_density )
+if (((1 == nUnit) || (2 == nUnit)) && rParam.X_density &&
rParam.Y_density )
{
Point aEmptyPoint;
FractionaFractX( 1, rParam.X_density );
@@ -262,161 +245,48 @@ unsigned char *
JPEGReader::CreateBitmap(JPEGCreateBitmapParam& rParam)
MapMode aMapMode( nUnit == 1 ? MAP_INCH : MAP_CM, aEmptyPoint,
aFractX, aFractY );
SizeaPrefSize = OutputDevice::LogicToLogic( aSize,
aMapMode, MAP_100TH_MM );
-maBmp.SetPrefSize( aPrefSize );
-maBmp.SetPrefMapMode( MapMode( MAP_100TH_MM ) );
+maBitmap.SetPrefSize(aPrefSize);
+maBitmap.SetPrefMapMode(MapMode(MAP_100TH_MM));
}
}
-mpAcc = maBmp.AcquireWriteAccess();
-
-if( mpAcc )
-{
-const ScanlineFormat nFormat = mpAcc->GetScanlineFormat();
-
-if(
-( bGray && ( ScanlineFormat::N8BitPal == nFormat ) ) ||
-( !bGray && ( ScanlineFormat::N24BitTcRgb == nFormat ) )
- )
-{
-pBmpBuf = mpAcc->GetBuffer();
-rParam.nAlignedWidth = mpAcc->GetScanlineSize();
-rParam.bTopDown = mpAcc->IsTopDown();
-}
-else
-{
-rParam.nAlign
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/ww8par6.cxx |6 +-
1 file changed, 1 insertion(+), 5 deletions(-)
New commits:
commit d954f856a9909a582b089fd9339b0930d57914d7
Author: Jochen Nitschke
Date: Mon Oct 3 14:28:36 2016 +0200
simplify loop
Change-Id: I7c6041239fcd5f0fa29fffcb34f06085306a1682
Reviewed-on: https://gerrit.libreoffice.org/29487
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index b09fc68..5f3afa8 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -2148,12 +2148,8 @@ WW8DupProperties::WW8DupProperties(SwDoc &rDoc,
SwWW8FltControlStack *pStack)
void WW8DupProperties::Insert(const SwPosition &rPos)
{
-const SfxItemSet *pSet=&aChrSet;
-for(int i=0;i<2;i++)
+for (const SfxItemSet* pSet : {&aChrSet, &aParSet})
{
-if (i==1)
-pSet = &aParSet;
-
if( pSet->Count() )
{
SfxItemIter aIter( *pSet );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/rtl sal/util
include/rtl/math.h |2 ++
sal/util/sal.map |2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 2c3ebb202f6c83706c07efe39cd6d9ab48b4f4c4
Author: Stephan Bergmann
Date: Tue Oct 4 14:08:24 2016 +0200
@since tag; sorting
follow-up to 2135eae2a97c17d89cb47a2074830fd2d7b2226f "let approxEqual() not
scale too early for large representable integer values"
Change-Id: I628e01297fea08915d0ca1c95f3ba13f7ce15db8
diff --git a/include/rtl/math.h b/include/rtl/math.h
index 1217e65..7c3f09a 100644
--- a/include/rtl/math.h
+++ b/include/rtl/math.h
@@ -427,6 +427,8 @@ SAL_DLLPUBLIC double SAL_CALL rtl_math_approxValue(double
fValue) SAL_THROW_EXTE
@attention
approxEqual( value!=0.0, 0.0 ) _never_ yields true.
+
+@since LibreOffice 5.3
*/
SAL_DLLPUBLIC bool SAL_CALL rtl_math_approxEqual(double a, double b)
SAL_THROW_EXTERN_C();
diff --git a/sal/util/sal.map b/sal/util/sal.map
index d50752c..c8f3a74 100644
--- a/sal/util/sal.map
+++ b/sal/util/sal.map
@@ -697,6 +697,7 @@ LIBO_UDK_5.2 { # symbols available in >= LibO 5.2
LIBO_UDK_5.3 { # symbols available in >= LibO 5.3
global:
+rtl_math_approxEqual;
rtl_uString_newConcatUtf16L;
rtl_uString_newReplaceAllAsciiLUtf16L;
rtl_uString_newReplaceAllUtf16LAsciiL;
@@ -704,7 +705,6 @@ LIBO_UDK_5.3 { # symbols available in >= LibO 5.3
rtl_uString_newReplaceFirstAsciiLUtf16L;
rtl_uString_newReplaceFirstUtf16LAsciiL;
rtl_uString_newReplaceFirstUtf16LUtf16L;
-rtl_math_approxEqual;
} LIBO_UDK_5.2;
PRIVATE_1.0 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d66b12b5be0bb5fc6903772e89a48d8ad61f723c Author: Andrea Mussap Date: Sun Oct 2 18:25:05 2016 -0300 Updated core Project: help 66d3a06fa03301bbce6a17dc427f04a3527e0d7a tdf#80590 Help page for title pages Change-Id: I9daca6c8e3f453e276b14ec5780714c2abf3398b Reviewed-on: https://gerrit.libreoffice.org/29462 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/helpcontent2 b/helpcontent2 index 359a2f1..66d3a06 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 359a2f1fadaa69574238147a9c954b8a42999019 +Subproject commit 66d3a06fa03301bbce6a17dc427f04a3527e0d7a ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: AllLangHelp_swriter.mk source/text
AllLangHelp_swriter.mk|1 source/text/swriter/01/title_page.xhp | 143 ++ 2 files changed, 144 insertions(+) New commits: commit 66d3a06fa03301bbce6a17dc427f04a3527e0d7a Author: Andrea Mussap Date: Sun Oct 2 18:25:05 2016 -0300 tdf#80590 Help page for title pages Change-Id: I9daca6c8e3f453e276b14ec5780714c2abf3398b Reviewed-on: https://gerrit.libreoffice.org/29462 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/AllLangHelp_swriter.mk b/AllLangHelp_swriter.mk index 4ffebd4..c961c73 100644 --- a/AllLangHelp_swriter.mk +++ b/AllLangHelp_swriter.mk @@ -197,6 +197,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,swriter,\ helpcontent2/source/text/swriter/01/mm_seladdlis \ helpcontent2/source/text/swriter/01/mm_seltab \ helpcontent2/source/text/swriter/01/selection_mode \ +helpcontent2/source/text/swriter/01/title_page \ helpcontent2/source/text/swriter/02/0211 \ helpcontent2/source/text/swriter/02/0321 \ helpcontent2/source/text/swriter/02/0322 \ diff --git a/source/text/swriter/01/title_page.xhp b/source/text/swriter/01/title_page.xhp new file mode 100644 index 000..83657c3 --- /dev/null +++ b/source/text/swriter/01/title_page.xhp @@ -0,0 +1,143 @@ + + + + + + +Using title pages in your document +/text/swriter/01/title_page.xhp + + + + + + + + + + + page;title page + title pages;first page style + title pages;modifying + title pages;inserting + + + +Inserting title pages in the document +Insert title pages in your document. + +Title pages are pages at the beginning of the document that lists the publication information, such as the title of the publication, the name of the author etc. These pages have a different layout than the pages of the document body, because they may not have page numbering, sometimes a different heading and footer and even different margins settings or background. + + +Choose menu Format - Title Page + +Many documents, such as letters and reports, have a first page that is different from the other pages in the document. For example, the first page of a letterhead typically has a different header or the first page of a report might have no header or footer, while the other pages do. This is simple to achieve with %PRODUCTNAME Writer. +Page header and footer, numbering, margins and orientation are some of the properties that belongs to page styles. %PRODUCTNAME Writer let your to insert a blank title page at any point of your document, or format an existing page like a title page, by inserting a page break followed by a page style of your choice or by changing the page style at cursor position. +Note: Using the Default (or any other) page style for your document, you can add a header/footer as you wish to the first page by deselecting the Same content on first page option on the header/footer pages in the Page Style dialog, and then adding the header/footer. You can then add a different header/footer to the other pages of the document. + +To convert the first page of the document into a title page + + + +Place the cursor on the first page, + + +From the Menu Bar, choose Format > Title Page⦠+ + +Select Converting existing pages to title pages + + +Select the style of the title page in the Edit page property area + + +Note: By default, %PRODUCTNAME select the First page page style. + + + +Set the page numbering reset options. + + +Click OK. + + +This will change the current page style to First page and the following pages will have the Default page style + +To insert a title page anywhere in the document +Place the cursor where you want to insert a new title page. + + + +From the menu bar select Format -> Title page. + + +Select Insert new title pages + + +Set number of title pages to add and + + +Set the title page location by setting its page number in the spin box. + + +Set the page numbering reset options. + + +Click OK + + +This will insert a page break and change the current page style to First page. The following pages will have the default page style. + +To delete a title page: +You cannot delete a title page. You must change its page style format from First page to whatever other page style you wish. + + + +Place the cursor in the page you want to change the style + + +From the Sidebar Deck, select Sidebar Settings > Styles and Formatting. + + +From the Styles and Formatting, select button Page Styles. + + +From the Style list, select the page style you want to apply. + + +Double click on the page style to apply. + + + + + + + +Format page, + + +Page break, + + +Creating a Page Style Based on the Current Page. + + + + + ___ Libreoffice-commits mailing list l
[Libreoffice-commits] core.git: 2 commits - include/o3tl include/xmloff sw/qa xmloff/source
include/o3tl/stack.hxx | 78
include/xmloff/xmlimp.hxx |5 +-
sw/qa/core/data/xml/fail/ooo71273-1.sxw |binary
xmloff/source/core/xmlimp.cxx | 36 +++---
4 files changed, 99 insertions(+), 20 deletions(-)
New commits:
commit fd79f88272d13c36e88199d276fea94f6b567a13
Author: Caolán McNamara
Date: Tue Oct 4 12:08:11 2016 +0100
crashtesting: use a stack with the expected dtor order for its elements
contains test document which crashes if it doesn't
Change-Id: I6cc7007a90d37225fffd636c9648289f04d7
diff --git a/include/o3tl/stack.hxx b/include/o3tl/stack.hxx
new file mode 100644
index 000..1fa7934
--- /dev/null
+++ b/include/o3tl/stack.hxx
@@ -0,0 +1,78 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ */
+
+#ifndef INCLUDED_O3TL_STACK_HXX
+#define INCLUDED_O3TL_STACK_HXX
+
+#include
+
+namespace o3tl
+{
+
+/**
+ *
+ * Same as std::stack (it just wraps it) except at destruction time the
+ * container elements are destroyed in order starting from the top of the stack
+ * which is the order one would rather assume a stack uses, but doesn't have to
+ *
+ *
https://connect.microsoft.com/VisualStudio/feedback/details/765649/std-vector-does-not-destruct-in-reverse-order-of-construction
+ *
+ **/
+
+template class stack final
+{
+private:
+typedef std::stack stack_t;
+
+stack_t mStack;
+public:
+
+T& top()
+{
+return mStack.top();
+}
+
+const T& top() const
+{
+return mStack.top();
+}
+
+void push(const T& val)
+{
+mStack.push(val);
+}
+
+void push(T&& val)
+{
+mStack.push(val);
+}
+
+void pop()
+{
+mStack.pop();
+}
+
+bool empty() const
+{
+return mStack.empty();
+}
+
+~stack()
+{
+while (!mStack.empty())
+mStack.pop();
+}
+};
+
+}
+
+#endif /* INCLUDED_O3TL_STACK_HXX */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx
index 07168bc..0aedd5b 100644
--- a/include/xmloff/xmlimp.hxx
+++ b/include/xmloff/xmlimp.hxx
@@ -23,7 +23,7 @@
#include
#include
-#include
+#include
#include
#include
@@ -86,8 +86,8 @@ class XMLErrors;
class StyleMap;
enum class SvXMLErrorFlags;
-typedef std::stack SvXMLImportContexts_Impl;
-typedef std::stack>
+typedef o3tl::stack SvXMLImportContexts_Impl;
+typedef o3tl::stack>
FastSvXMLImportContexts_Impl;
namespace xmloff {
diff --git a/sw/qa/core/data/xml/fail/ooo71273-1.sxw
b/sw/qa/core/data/xml/fail/ooo71273-1.sxw
new file mode 100644
index 000..5208512
Binary files /dev/null and b/sw/qa/core/data/xml/fail/ooo71273-1.sxw differ
commit 22cea99518af0358ddabab95f68fedcb94a7d923
Author: Caolán McNamara
Date: Tue Oct 4 11:28:21 2016 +0100
this is used as a stack, so convert to std::stack
Change-Id: I248617ccbb985615f936ecd607ab7c8246ff8e71
diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx
index 93c5f25..07168bc 100644
--- a/include/xmloff/xmlimp.hxx
+++ b/include/xmloff/xmlimp.hxx
@@ -23,6 +23,7 @@
#include
#include
+#include
#include
#include
@@ -85,8 +86,8 @@ class XMLErrors;
class StyleMap;
enum class SvXMLErrorFlags;
-typedef std::vector SvXMLImportContexts_Impl;
-typedef std::vector< ::css::uno::Reference<
::css::xml::sax::XFastContextHandler>>
+typedef std::stack SvXMLImportContexts_Impl;
+typedef std::stack>
FastSvXMLImportContexts_Impl;
namespace xmloff {
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index d528a17..c061d8e 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -736,7 +736,7 @@ void SAL_CALL SvXMLImport::startElement( const OUString&
rName,
SvXMLImportContextRef xContext;
if(!maContexts.empty())
{
-xContext.set(maContexts.back()->CreateChildContext(nPrefix,
aLocalName, xAttrList));
+xContext.set(maContexts.top()->CreateChildContext(nPrefix, aLocalName,
xAttrList));
SAL_WARN_IF( !xContext.is() || (xContext->GetPrefix() != nPrefix),
"xmloff.core",
"SvXMLImport::startElement: created context has wrong prefix"
);
}
@@ -767,7 +767,7 @@ void SAL_CALL SvXMLImport::startElement( const OUString&
rName,
xContext->StartElement( xAttrList );
// Push context on stack.
-maContexts.push_back( xContext );
+maContexts.push(xContext);
}
void SAL_CALL SvXMLImport::endElement( const OUString&
@@ -787,8 +787,8 @@ rName
{
// Get topmost context and remove it from the stack.
-
[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4968d55270f2eaf100cfe8cc071fa302e21203d3 Author: Andras Timar Date: Mon Oct 3 19:54:26 2016 +0200 Updated core Project: dictionaries a5ac3e1d730e3fb84b2cc9c4108effeee613c6d2 Update pt_PT dictionary to version 16.10.1.2 Change-Id: I0f66f15b594bebaefc2b8ffbc26bff5450ebf292 Reviewed-on: https://gerrit.libreoffice.org/29510 Reviewed-by: Tiago Santos Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/dictionaries b/dictionaries index 6417dbd..a5ac3e1 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit 6417dbd05e13c2e1165751feb2bc7866328dec2d +Subproject commit a5ac3e1d730e3fb84b2cc9c4108effeee613c6d2 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Branch 'libreoffice-5-2' - pt_PT/description.xml pt_PT/pt_PT.dic pt_PT/README_th_pt_PT_v2.txt pt_PT/th_pt_PT_v2.dat
pt_PT/README_th_pt_PT_v2.txt | 123 pt_PT/description.xml|2 pt_PT/pt_PT.dic | 19 pt_PT/th_pt_PT_v2.dat|107769 --- 4 files changed, 91971 insertions(+), 15942 deletions(-) New commits: commit a5ac3e1d730e3fb84b2cc9c4108effeee613c6d2 Author: Andras Timar Date: Mon Oct 3 19:54:26 2016 +0200 Update pt_PT dictionary to version 16.10.1.2 Change-Id: I0f66f15b594bebaefc2b8ffbc26bff5450ebf292 Reviewed-on: https://gerrit.libreoffice.org/29510 Reviewed-by: Tiago Santos Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/pt_PT/README_th_pt_PT_v2.txt b/pt_PT/README_th_pt_PT_v2.txt index 50028d4..e3ca8bc 100644 --- a/pt_PT/README_th_pt_PT_v2.txt +++ b/pt_PT/README_th_pt_PT_v2.txt @@ -1,3 +1,120 @@ +Thesaurus / Dicionário de sinónimos +--- + +Thesaurus adicionado em Agosto de 2016 +-- + O presente dicionário de sinónimos foi compilado por Tiago F. Santos +acrescentando ao thesaurus anterior as relações de sinonÃmia fornecidas +pelo projecto PAPEL e Onto.PT, utilizando manipulações de texto e +tabelas para a fusão dos thesaurus e criação de Ãndices válidos. Também +foi utilizado o programa ProofingTools de Marco A.G. Pinto, para +'desduplicação' de relações entre palavras. + O presente trabalho pode ser redistribuÃdo respeitando os termos das +licenças base. + + +Projecto Onto.pt + +http://ontopt.dei.uc.pt/ + + Foi convertido e acrescentado ao dicionário de sinónimos existente um +thesaururs personalizado, criado com base numa versão do projecto CLIP +2.1, disponibilizada pelo responsável pelo projecto Onto.pt, Doutor Hugo +Gonçalves Oliveira. +Onto.PT rege-se pela licença Creative Commons Attribution 3.0 Unported que +está disponÃvel em: + +http://creativecommons.org/licenses/by/3.0/ + +Como citar Onto.pt +-- + + +Visão global do Onto.PT e sua construção: +Hugo Gonçalo Oliveira and Paulo Gomes. ECO and Onto.PT: A flexible approach for creating a Portuguese wordnet automatically. In Language Resources and Evaluation 48(2):373-393. Springer, 2014. [ bib | http ] + +CONTO.PT -- uma wordnet com medidas de confiança: +Hugo Gonçalo Oliveira. CONTO.PT: Groundwork for the Automatic Creation of a Fuzzy Portuguese Wordnet. In Proceedings of 12th International Conference on Computational Processing of the Portuguese Language (PROPOR 2016), volume 9727 of LNAI, pages 283-295, Tomar, Portugal, July 2016. Springer. [ bib ] + +Extracção de relações a partir de dicionários (CARTÃO): +Hugo Gonçalo Oliveira, Leticia Antón Pérez, Hernani Costa, and Paulo Gomes. Uma rede léxico-semântica de grandes dimensões para o português, extraÃda a partir de dicionários electrónicos. Linguamática 3(2):23-38, December 2011. [ bib | http ] + +Construção de thesaurus a partir de dicionários: +Hugo Gonçalo Oliveira and Paulo Gomes. Automatic discovery of fuzzy synsets from dictionary definitions. In Proceedings of 22nd International Joint Conference on Artificial Intelligence, IJCAI 2011, pages 1801-1806, Barcelona, Spain, July 2011. AAAI Press. [ bib | .pdf ] + +Aumento de thesaurus utilizando dicionários: +Hugo Gonçalo Oliveira and Paulo Gomes. Towards the automatic enrichment of a thesaurus with information in dictionaries. Expert Systems: The Journal of Knowledge Engineering (KDBI special issue), 30(4), pp. 320â332. 2013. Extended and updated version of Gonçalo Oliveira & Gomes (2011) in EPIA 2011. [ bib | http ] + +Integração de relações em thesaurus: +Hugo Gonçalo Oliveira and Paulo Gomes. Ontologising semantic relations into a relationless thesaurus. In Proceedings of 20th European Conference on Artificial Intelligence (ECAI 2012), pages 915-916, Montpellier, France, August 2012. IOS Press. [ bib | http ] + +Associação de polaridades aos synsets: +Hugo Gonçalo Oliveira, António Paulo-Santos, and Paulo Gomes. Assigning polarity automatically to the synsets of a wordnet-like resource. In 3rd Symposium on Languages, Applications and Technologies (SLATE 2014) - Bragança, Portugal, OASICS, pages 169-184. Schloss Dagstuhl - Leibniz-Zentrum fuer Informatik, June 19-20 2014. [ bib | http ] + + +--- +Creative Commons Attribution 3.0 Unported +- +You are free to: + +Share â copy and redistribute the material in any medium or format +Adapt â remix, transform, and build upon the material +for any purpose, even commercially. +The licensor cannot revoke these freedoms as long as you follow the +license terms. +Under the following terms: + +Attribution â You must give appropriate credit, provide a link to the +license, and indicate if changes were made. You may do so in any reasonable +manner, but not in any way that
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - include/svx reportdesign/source sc/source sd/source svx/source
include/svx/svdundo.hxx| 14 ---
reportdesign/source/core/inc/ReportUndoFactory.hxx |2
reportdesign/source/core/sdr/ReportUndoFactory.cxx |4 -
sc/source/core/data/drwlayer.cxx |2
sd/source/core/drawdoc3.cxx| 20 -
sd/source/ui/func/undoback.cxx | 43 --
sd/source/ui/inc/undoback.hxx |6 -
svx/source/svdraw/svdundo.cxx | 84 +
8 files changed, 15 insertions(+), 160 deletions(-)
New commits:
commit 8127ac5412b0af8ed7985e07ab11b3241a4e659e
Author: Caolán McNamara
Date: Mon Oct 3 15:22:50 2016 +0100
Resolves: tdf#101711 revert attempt to drop unused bg images
for 5-2/5-1 simply revert the effort
Revert "Related: rhbz#1353069 don't clear XATTR_FILL* from stylesheet if..."
This reverts commit 19c191a0a92b6ae9ca86aa4ee7afb887fd42a209.
Revert "Resolves: rhbz#1353069 don't clear XATTR_FILL* from stylesheet
if..."
This reverts commit fad4d7877ac8d04ab82e8acd21205f315d6eab1f.
Revert "rhbz#1326602 avoid exp. bg bitmaps from deleted slides"
This reverts commit fd45334b49c09538598f82f5ffa2f61f6bdd9d24.
Change-Id: I591083b6b1d7b08316ee24c0788386799d01724b
Reviewed-on: https://gerrit.libreoffice.org/29491
Tested-by: Jenkins
Reviewed-by: jan iversen
diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx
index b1be6dd..7d4973f 100644
--- a/include/svx/svdundo.hxx
+++ b/include/svx/svdundo.hxx
@@ -22,7 +22,6 @@
#include
-#include
#include
#include
@@ -34,7 +33,6 @@
#include
class SfxItemSet;
-class SfxPoolItem;
class SfxStyleSheet;
class SdrView;
class SdrPageView;
@@ -586,12 +584,9 @@ class SVX_DLLPUBLIC SdrUndoDelPage : public SdrUndoPageList
// When deleting a MasterPage, we remember all relations of the
// Character Page with the MasterPage in this UndoGroup.
SdrUndoGroup* pUndoGroup;
-std::unique_ptr mpFillBitmapItem;
-bool mbHasFillBitmap;
-bool mbSoleOwnerOfFillBitmapProps;
public:
-SdrUndoDelPage(SdrPage& rNewPg, bool bSoleOwnerOfFillBitmapProps);
+SdrUndoDelPage(SdrPage& rNewPg);
virtual ~SdrUndoDelPage();
virtual void Undo() override;
@@ -602,11 +597,6 @@ public:
virtual void SdrRepeat(SdrView& rView) override;
virtual bool CanSdrRepeat(SdrView& rView) const override;
-
-private:
-void queryFillBitmap(const SfxItemSet &rItemSet);
-void clearFillBitmap();
-void restoreFillBitmap();
};
/**
@@ -764,7 +754,7 @@ public:
virtual SdrUndoAction* CreateUndoMoveLayer(sal_uInt16 nLayerNum,
SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel, sal_uInt16 nNeuPos1);
// Page
-virtual SdrUndoAction* CreateUndoDeletePage(SdrPage& rPage, bool
bSoleOwnerOfFillBitmapProps = true);
+virtual SdrUndoAction* CreateUndoDeletePage(SdrPage& rPage);
virtual SdrUndoAction* CreateUndoNewPage(SdrPage& rPage);
virtual SdrUndoAction* CreateUndoCopyPage(SdrPage& rPage);
virtual SdrUndoAction* CreateUndoSetPageNum(SdrPage& rNewPg, sal_uInt16
nOldPageNum1, sal_uInt16 nNewPageNum1);
diff --git a/reportdesign/source/core/inc/ReportUndoFactory.hxx
b/reportdesign/source/core/inc/ReportUndoFactory.hxx
index 1839f1f..88d0024 100644
--- a/reportdesign/source/core/inc/ReportUndoFactory.hxx
+++ b/reportdesign/source/core/inc/ReportUndoFactory.hxx
@@ -59,7 +59,7 @@ namespace rptui
virtual SdrUndoAction* CreateUndoMoveLayer(sal_uInt16 nLayerNum,
SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel, sal_uInt16 nNeuPos1)
override;
// page
-virtual SdrUndoAction* CreateUndoDeletePage(SdrPage& rPage, bool
bSoleOwnerOfFillBitmapProps = true) override;
+virtual SdrUndoAction* CreateUndoDeletePage(SdrPage& rPage) override;
virtual SdrUndoAction* CreateUndoNewPage(SdrPage& rPage) override;
virtual SdrUndoAction* CreateUndoCopyPage(SdrPage& rPage) override;
virtual SdrUndoAction* CreateUndoSetPageNum(SdrPage& rNewPg,
sal_uInt16 nOldPageNum1, sal_uInt16 nNewPageNum1) override;
diff --git a/reportdesign/source/core/sdr/ReportUndoFactory.cxx
b/reportdesign/source/core/sdr/ReportUndoFactory.cxx
index 566400c..cbb5a8a 100644
--- a/reportdesign/source/core/sdr/ReportUndoFactory.cxx
+++ b/reportdesign/source/core/sdr/ReportUndoFactory.cxx
@@ -133,9 +133,9 @@ SdrUndoAction*
OReportUndoFactory::CreateUndoMoveLayer(sal_uInt16 nLayerNum, Sdr
}
// page
-SdrUndoAction* OReportUndoFactory::CreateUndoDeletePage(SdrPage& rPage, bool
bSoleOwnerOfFillBitmapProps)
+SdrUndoAction* OReportUndoFactory::CreateUndoDeletePage(SdrPage& rPage)
{
-return m_pUndoFactory->CreateUndoDeletePage(rPage,
bSoleOwnerOfFillBitmapProps);
+return m_pUndoFactory->CreateUndoDeletePage( rPage );
}
SdrUndoAction* OReportUndoFactory::CreateUndoNewPage(SdrPage& rPage)
diff --git a/sc/
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - sd/source
sd/source/ui/unoidl/UnoDocumentSettings.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b41b72139ee5a92260b5d8732a437106d31b1688
Author: Noel Grandin
Date: Mon Oct 3 10:07:41 2016 +0200
fix bug in DocumentSettings::LoadList when testing result of lastIndexOf
managed to trigger it in a flat ODF test document of mine.
I suspect that this might have something to do with one of the various
conversions to OUString, the old String APIs might have returned
-LARGE_INTEGER
instead of -1.
code was introduced in commit
cbcfda9b2079ea4ef83b2a42828408b5f70f7692
Author: Michael Meeks
Date: Mon Sep 5 17:22:24 2011 +0100
add XPropertyList enum, factory, and associated cleanup
Change-Id: I39b4715cc12ef6366fe0466786589ef198602a98
Reviewed-on: https://gerrit.libreoffice.org/29473
Tested-by: Jenkins
Reviewed-by: Michael Meeks
(cherry picked from commit 9f0096d934fcdec6cd55e32a15fd438f628f894b)
Reviewed-on: https://gerrit.libreoffice.org/29480
Reviewed-by: Noel Grandin
(cherry picked from commit 85bd2c1145e23b67aafdfcc9c2ca8d720194fe97)
Reviewed-on: https://gerrit.libreoffice.org/29508
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx
b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
index d3b506b..c2166f6 100644
--- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx
+++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
@@ -233,7 +233,7 @@ bool DocumentSettings::LoadList( XPropertyListType t, const
OUString &rInPath,
sal_Int32 nSlash = rInPath.lastIndexOf('/');
OUString aPath, aName;
-if (nSlash < -1)
+if (nSlash < 0)
aName = rInPath;
else {
aName = rInPath.copy( nSlash + 1 );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - svx/source
svx/source/dialog/frmsel.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 0620f7ca99eca6c8fe00a99b999ad74b8847ffe4 Author: Caolán McNamara Date: Tue Sep 27 20:47:16 2016 +0100 Resolves: tdf#101884 keyboard navigation in User defined border control Change-Id: I92ea37754f057c560d19b41f814a1d649ea74876 (cherry picked from commit f20996450e409406f4f55f9eb7ca9bfe1e455c35) Reviewed-on: https://gerrit.libreoffice.org/29345 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx index 0c7583f..5e12d3b 100644 --- a/svx/source/dialog/frmsel.cxx +++ b/svx/source/dialog/frmsel.cxx @@ -1176,6 +1176,7 @@ void FrameSelector::KeyInput( const KeyEvent& rKEvt ) DeselectAllBorders(); SelectBorder( eBorder ); } +bHandled = true; } } break; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d171bc3398a7521a45a423d24d2ecc923ac9b2cf Author: Andras Timar Date: Mon Oct 3 19:54:26 2016 +0200 Updated core Project: dictionaries 2080473f3c049986c98e41715eeffe5ef3a9aaa0 Update pt_PT dictionary to version 16.10.1.2 Change-Id: I0f66f15b594bebaefc2b8ffbc26bff5450ebf292 Reviewed-on: https://gerrit.libreoffice.org/29511 Reviewed-by: Tiago Santos Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/dictionaries b/dictionaries index 0f1ab1f..2080473 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit 0f1ab1fdfce99714b9af6090a0191facb21735b7 +Subproject commit 2080473f3c049986c98e41715eeffe5ef3a9aaa0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Branch 'libreoffice-5-1' - pt_PT/description.xml pt_PT/pt_PT.dic pt_PT/README_th_pt_PT_v2.txt pt_PT/th_pt_PT_v2.dat
pt_PT/README_th_pt_PT_v2.txt | 123 pt_PT/description.xml|2 pt_PT/pt_PT.dic | 19 pt_PT/th_pt_PT_v2.dat|107769 --- 4 files changed, 91971 insertions(+), 15942 deletions(-) New commits: commit 2080473f3c049986c98e41715eeffe5ef3a9aaa0 Author: Andras Timar Date: Mon Oct 3 19:54:26 2016 +0200 Update pt_PT dictionary to version 16.10.1.2 Change-Id: I0f66f15b594bebaefc2b8ffbc26bff5450ebf292 Reviewed-on: https://gerrit.libreoffice.org/29511 Reviewed-by: Tiago Santos Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/pt_PT/README_th_pt_PT_v2.txt b/pt_PT/README_th_pt_PT_v2.txt index 50028d4..e3ca8bc 100644 --- a/pt_PT/README_th_pt_PT_v2.txt +++ b/pt_PT/README_th_pt_PT_v2.txt @@ -1,3 +1,120 @@ +Thesaurus / Dicionário de sinónimos +--- + +Thesaurus adicionado em Agosto de 2016 +-- + O presente dicionário de sinónimos foi compilado por Tiago F. Santos +acrescentando ao thesaurus anterior as relações de sinonÃmia fornecidas +pelo projecto PAPEL e Onto.PT, utilizando manipulações de texto e +tabelas para a fusão dos thesaurus e criação de Ãndices válidos. Também +foi utilizado o programa ProofingTools de Marco A.G. Pinto, para +'desduplicação' de relações entre palavras. + O presente trabalho pode ser redistribuÃdo respeitando os termos das +licenças base. + + +Projecto Onto.pt + +http://ontopt.dei.uc.pt/ + + Foi convertido e acrescentado ao dicionário de sinónimos existente um +thesaururs personalizado, criado com base numa versão do projecto CLIP +2.1, disponibilizada pelo responsável pelo projecto Onto.pt, Doutor Hugo +Gonçalves Oliveira. +Onto.PT rege-se pela licença Creative Commons Attribution 3.0 Unported que +está disponÃvel em: + +http://creativecommons.org/licenses/by/3.0/ + +Como citar Onto.pt +-- + + +Visão global do Onto.PT e sua construção: +Hugo Gonçalo Oliveira and Paulo Gomes. ECO and Onto.PT: A flexible approach for creating a Portuguese wordnet automatically. In Language Resources and Evaluation 48(2):373-393. Springer, 2014. [ bib | http ] + +CONTO.PT -- uma wordnet com medidas de confiança: +Hugo Gonçalo Oliveira. CONTO.PT: Groundwork for the Automatic Creation of a Fuzzy Portuguese Wordnet. In Proceedings of 12th International Conference on Computational Processing of the Portuguese Language (PROPOR 2016), volume 9727 of LNAI, pages 283-295, Tomar, Portugal, July 2016. Springer. [ bib ] + +Extracção de relações a partir de dicionários (CARTÃO): +Hugo Gonçalo Oliveira, Leticia Antón Pérez, Hernani Costa, and Paulo Gomes. Uma rede léxico-semântica de grandes dimensões para o português, extraÃda a partir de dicionários electrónicos. Linguamática 3(2):23-38, December 2011. [ bib | http ] + +Construção de thesaurus a partir de dicionários: +Hugo Gonçalo Oliveira and Paulo Gomes. Automatic discovery of fuzzy synsets from dictionary definitions. In Proceedings of 22nd International Joint Conference on Artificial Intelligence, IJCAI 2011, pages 1801-1806, Barcelona, Spain, July 2011. AAAI Press. [ bib | .pdf ] + +Aumento de thesaurus utilizando dicionários: +Hugo Gonçalo Oliveira and Paulo Gomes. Towards the automatic enrichment of a thesaurus with information in dictionaries. Expert Systems: The Journal of Knowledge Engineering (KDBI special issue), 30(4), pp. 320â332. 2013. Extended and updated version of Gonçalo Oliveira & Gomes (2011) in EPIA 2011. [ bib | http ] + +Integração de relações em thesaurus: +Hugo Gonçalo Oliveira and Paulo Gomes. Ontologising semantic relations into a relationless thesaurus. In Proceedings of 20th European Conference on Artificial Intelligence (ECAI 2012), pages 915-916, Montpellier, France, August 2012. IOS Press. [ bib | http ] + +Associação de polaridades aos synsets: +Hugo Gonçalo Oliveira, António Paulo-Santos, and Paulo Gomes. Assigning polarity automatically to the synsets of a wordnet-like resource. In 3rd Symposium on Languages, Applications and Technologies (SLATE 2014) - Bragança, Portugal, OASICS, pages 169-184. Schloss Dagstuhl - Leibniz-Zentrum fuer Informatik, June 19-20 2014. [ bib | http ] + + +--- +Creative Commons Attribution 3.0 Unported +- +You are free to: + +Share â copy and redistribute the material in any medium or format +Adapt â remix, transform, and build upon the material +for any purpose, even commercially. +The licensor cannot revoke these freedoms as long as you follow the +license terms. +Under the following terms: + +Attribution â You must give appropriate credit, provide a link to the +license, and indicate if changes were made. You may do so in any reasonable +manner, but not in any way that
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - sd/source
sd/source/ui/unoidl/UnoDocumentSettings.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 46d989cf31ce361515f6267adcc59455d094ad13
Author: Noel Grandin
Date: Mon Oct 3 10:07:41 2016 +0200
fix bug in DocumentSettings::LoadList when testing result of lastIndexOf
managed to trigger it in a flat ODF test document of mine.
I suspect that this might have something to do with one of the various
conversions to OUString, the old String APIs might have returned
-LARGE_INTEGER
instead of -1.
code was introduced in commit
cbcfda9b2079ea4ef83b2a42828408b5f70f7692
Author: Michael Meeks
Date: Mon Sep 5 17:22:24 2011 +0100
add XPropertyList enum, factory, and associated cleanup
Change-Id: I39b4715cc12ef6366fe0466786589ef198602a98
Reviewed-on: https://gerrit.libreoffice.org/29473
Tested-by: Jenkins
Reviewed-by: Michael Meeks
(cherry picked from commit 9f0096d934fcdec6cd55e32a15fd438f628f894b)
Reviewed-on: https://gerrit.libreoffice.org/29480
Reviewed-by: Noel Grandin
(cherry picked from commit 85bd2c1145e23b67aafdfcc9c2ca8d720194fe97)
Reviewed-on: https://gerrit.libreoffice.org/29512
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx
b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
index d3b506b..c2166f6 100644
--- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx
+++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
@@ -233,7 +233,7 @@ bool DocumentSettings::LoadList( XPropertyListType t, const
OUString &rInPath,
sal_Int32 nSlash = rInPath.lastIndexOf('/');
OUString aPath, aName;
-if (nSlash < -1)
+if (nSlash < 0)
aName = rInPath;
else {
aName = rInPath.copy( nSlash + 1 );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
RE: Calc HYPGEOMDIST: conditionally changing function opcode when saving to Excel format
For tdf102498 read tdf102948... Winfried Van: LibreOffice [mailto:libreoffice-boun...@lists.freedesktop.org] Namens Winfried Donkers Verzonden: dinsdag 4 oktober 2016 12:51 Aan: libreoffice@lists.freedesktop.org; Eike Rathke (er...@redhat.com) Onderwerp: Calc HYPGEOMDIST: conditionally changing function opcode when saving to Excel format Hi Eike, ODFF1.2 has a HYPGEOMDIST function with 4 mandatory and an optional 5th argument (cumulative), Excel has a HYPGEOMDIST with 4 mandatory arguments and a HYPGEOM.DIST with 5 mandatory arguments. All 3 are the same (apart from (non)cumulative calculation). To fix tdf102498, and to simplify the current code, I want to use one ScInterpreter::ScHypGeomDist() function for all, and -save in ODF as HYPGEOMDIST; -save in Excel as HYPGEOMDIST in case of 4 arguments and HYPGEOM.DIST in case of 5 arguments. That means I have to change the opcode ocHypGeomDist to ocHypGeomDist_MS when saving to Excel format. I remember that this can be done somewhere, but I forgot in which source file/function that is to take place. Do you know or have a hint? Winfried ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Calc HYPGEOMDIST: conditionally changing function opcode when saving to Excel format
Hi Eike, ODFF1.2 has a HYPGEOMDIST function with 4 mandatory and an optional 5th argument (cumulative), Excel has a HYPGEOMDIST with 4 mandatory arguments and a HYPGEOM.DIST with 5 mandatory arguments. All 3 are the same (apart from (non)cumulative calculation). To fix tdf102498, and to simplify the current code, I want to use one ScInterpreter::ScHypGeomDist() function for all, and -save in ODF as HYPGEOMDIST; -save in Excel as HYPGEOMDIST in case of 4 arguments and HYPGEOM.DIST in case of 5 arguments. That means I have to change the opcode ocHypGeomDist to ocHypGeomDist_MS when saving to Excel format. I remember that this can be done somewhere, but I forgot in which source file/function that is to take place. Do you know or have a hint? Winfried ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: cui/source
cui/source/inc/dbregister.hxx |3 --- 1 file changed, 3 deletions(-) New commits: commit f6a258948ae03311746699d23b03a1d7e2d235eb Author: Noel Grandin Date: Tue Oct 4 09:43:54 2016 +0200 remove bogus include checks Change-Id: Ia76f000ed10852dadc4ca0270b925efd6d8cd0b7 Reviewed-on: https://gerrit.libreoffice.org/29518 Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx index 0ea1e54..3a12061 100644 --- a/cui/source/inc/dbregister.hxx +++ b/cui/source/inc/dbregister.hxx @@ -51,7 +51,6 @@ namespace svx sal_uLong m_nOldCount; boolm_bModified; -#ifdef INCLUDED_CUI_SOURCE_INC_DBREGISTER_HXX DECL_LINK_TYPED( NewHdl, Button*, void ); DECL_LINK_TYPED( EditHdl, Button*, void ); DECL_LINK_TYPED( DeleteHdl, Button*, void ); @@ -82,8 +81,6 @@ namespace svx */ void openLinkDialog(const OUString& _sOldName,const OUString& _sOldLocation,SvTreeListEntry* _pEntry = nullptr); -#endif - public: DbRegistrationOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~DbRegistrationOptionsPage() override; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loolwsd/protocol.txt loolwsd/TileCache.cpp loolwsd/TileDesc.hpp
loolwsd/TileCache.cpp |7 +++
loolwsd/TileDesc.hpp |1 +
loolwsd/protocol.txt | 10 ++
3 files changed, 14 insertions(+), 4 deletions(-)
New commits:
commit 97adaf935b319cca6f1b5139fef281dc5245e0f9
Author: Tor Lillqvist
Date: Tue Oct 4 13:20:41 2016 +0300
Don't let 'canceltiles' messages affect slide thumbnails being rendered
Document that the 'id' parameter of a 'tile' message is not (should
not be) used for anything except slide thumbnails.
If we later need some more generic way to distinguish the purpose of
tile requests, need to come up with something else, like a 'purpose'
parameter.
diff --git a/loolwsd/TileCache.cpp b/loolwsd/TileCache.cpp
index ddceca8..9b7293f 100644
--- a/loolwsd/TileCache.cpp
+++ b/loolwsd/TileCache.cpp
@@ -478,6 +478,13 @@ std::string TileCache::cancelTiles(const
std::shared_ptr &subscri
for (auto it = _tilesBeingRendered.begin(); it !=
_tilesBeingRendered.end(); )
{
+if (it->second->getTile().getId() >= 0)
+{
+// Tile is for a thumbnail, don't cancel it
+++it;
+continue;
+}
+
auto& subscribers = it->second->_subscribers;
Log::trace("Tile " + it->first + " has " +
std::to_string(subscribers.size()) + " subscribers.");
diff --git a/loolwsd/TileDesc.hpp b/loolwsd/TileDesc.hpp
index 7a42135..9356c2d 100644
--- a/loolwsd/TileDesc.hpp
+++ b/loolwsd/TileDesc.hpp
@@ -61,6 +61,7 @@ public:
void setVersion(const int ver) { _ver = ver; }
int getImgSize() const { return _imgSize; }
void setImgSize(const int imgSize) { _imgSize = imgSize; }
+int getId() const { return _id; }
bool intersectsWithRect(int x, int y, int w, int h) const
{
diff --git a/loolwsd/protocol.txt b/loolwsd/protocol.txt
index 65ad0a0..418986d 100644
--- a/loolwsd/protocol.txt
+++ b/loolwsd/protocol.txt
@@ -27,8 +27,9 @@ client -> server
canceltiles
All outstanding tile messages from the client to the server are
-dropped and will not be handled. There is no guarantee of exactly
-which tile: messages might still be sent back to the client.
+dropped and will not be handled, except tile messages with an id
+parameter. There is no guarantee of exactly which tile: messages
+might still be sent back to the client.
downloadas name= id= format=
options=
@@ -127,8 +128,9 @@ tileheight= [timestamp=] [id=]
All parameters are numbers.
Note: id must be echoed back in the response verbatim. It is used
-by Impress to render the slide thumbnails. It is only useful to
-loleaflet and will break it if not returned in the response.
+when rendering slide thumbnails of presentation documents, and not
+for anything else. It is only useful to loleaflet and will break
+it if not returned in the response.
tilecombine
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/oox oox/source sw/qa
include/oox/drawingml/fillproperties.hxx|1 +
oox/source/drawingml/fillproperties.cxx |4
oox/source/drawingml/fillpropertiesgroupcontext.cxx |3 +++
sw/qa/extras/ooxmlimport/data/tdf100830.docx|binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx|6 ++
5 files changed, 14 insertions(+)
New commits:
commit ecfcee8b05e45ec82dec6ed417e9ac53d4d7b4ff
Author: Miklos Vajna
Date: Tue Oct 4 09:24:42 2016 +0200
tdf#100830 drawingML import: handle
Fill transparency on the UI. Regression from commit
57450afb768c085df0ba2344aa94b5f843060178 (DOCX import: declare wps as a
supported feature, 2013-12-03), as the VML import handled this.
Change-Id: I654b51d51448d25d400979a4a62189b86126ac01
Reviewed-on: https://gerrit.libreoffice.org/29517
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/include/oox/drawingml/fillproperties.hxx
b/include/oox/drawingml/fillproperties.hxx
index 3015424..bed67d6 100644
--- a/include/oox/drawingml/fillproperties.hxx
+++ b/include/oox/drawingml/fillproperties.hxx
@@ -121,6 +121,7 @@ struct BlipFillProperties
Color maDuotoneColors[2]; /// Duotone Colors
ArtisticEffectProperties maEffect; /// Artistic effect, not
supported by core.
+OptValue moAlphaModFix; ///< Alpha Modulate Fixed Effect.
/** Overwrites all members that are explicitly set in rSourceProps. */
voidassignUsed( const BlipFillProperties& rSourceProps );
diff --git a/oox/source/drawingml/fillproperties.cxx
b/oox/source/drawingml/fillproperties.cxx
index 370be68..2acf94f 100644
--- a/oox/source/drawingml/fillproperties.cxx
+++ b/oox/source/drawingml/fillproperties.cxx
@@ -205,6 +205,7 @@ void BlipFillProperties::assignUsed( const
BlipFillProperties& rSourceProps )
maDuotoneColors[0].assignIfUsed( rSourceProps.maDuotoneColors[0] );
maDuotoneColors[1].assignIfUsed( rSourceProps.maDuotoneColors[1] );
maEffect.assignUsed( rSourceProps.maEffect );
+moAlphaModFix.assignIfUsed(rSourceProps.moAlphaModFix);
}
void FillProperties::assignUsed( const FillProperties& rSourceProps )
@@ -652,6 +653,9 @@ void FillProperties::pushToPropMap( ShapePropertyMap&
rPropMap,
}
}
}
+
+if (maBlipProps.moAlphaModFix.has())
+rPropMap.setProperty(ShapeProperty::FillTransparency,
static_cast(maBlipProps.moAlphaModFix.get() / PER_PERCENT));
}
break;
diff --git a/oox/source/drawingml/fillpropertiesgroupcontext.cxx
b/oox/source/drawingml/fillpropertiesgroupcontext.cxx
index c8009f8..22d68fa 100644
--- a/oox/source/drawingml/fillpropertiesgroupcontext.cxx
+++ b/oox/source/drawingml/fillpropertiesgroupcontext.cxx
@@ -190,6 +190,9 @@ ContextHandlerRef BlipContext::onCreateContext(
mrBlipProps.moBrightness = rAttribs.getInteger( XML_bright );
mrBlipProps.moContrast = rAttribs.getInteger( XML_contrast );
break;
+case A_TOKEN( alphaModFix ):
+mrBlipProps.moAlphaModFix = rAttribs.getInteger(XML_amt);
+break;
}
return nullptr;
}
diff --git a/sw/qa/extras/ooxmlimport/data/tdf100830.docx
b/sw/qa/extras/ooxmlimport/data/tdf100830.docx
new file mode 100644
index 000..a51b890
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/tdf100830.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 4c099e1..8752ee0 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -3294,6 +3294,12 @@ DECLARE_OOXMLIMPORT_TEST(testTdf99140, "tdf99140.docx")
CPPUNIT_ASSERT_EQUAL(text::HoriOrientation::LEFT_AND_WIDTH,
getProperty(xTableProperties, "HoriOrient"));
}
+DECLARE_OOXMLIMPORT_TEST(testTdf100830, "tdf100830.docx")
+{
+// FillTransparence wasn't imported, this was 0.
+CPPUNIT_ASSERT_EQUAL(static_cast(50),
getProperty(getShape(1), "FillTransparence"));
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/core/xmlimp.cxx | 26 +-
1 file changed, 9 insertions(+), 17 deletions(-)
New commits:
commit be014c218d81b228784764e280baa25750e7adb7
Author: Caolán McNamara
Date: Tue Oct 4 10:29:54 2016 +0100
we just care about empty vs nonempty here
Change-Id: Ie7888f611f804ed1bd235e32e21560981f116c9a
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 66e6075..d528a17 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -734,12 +734,9 @@ void SAL_CALL SvXMLImport::startElement( const OUString&
rName,
// If there are contexts already, call a CreateChildContext at the topmost
// context. Otherwise, create a default context.
SvXMLImportContextRef xContext;
-sal_uInt16 nCount = maContexts.size();
-if( nCount > 0 )
+if(!maContexts.empty())
{
-xContext.set(maContexts[nCount - 1]->CreateChildContext( nPrefix,
- aLocalName,
- xAttrList ));
+xContext.set(maContexts.back()->CreateChildContext(nPrefix,
aLocalName, xAttrList));
SAL_WARN_IF( !xContext.is() || (xContext->GetPrefix() != nPrefix),
"xmloff.core",
"SvXMLImport::startElement: created context has wrong prefix"
);
}
@@ -780,8 +777,7 @@ rName
)
throw(xml::sax::SAXException, uno::RuntimeException, std::exception)
{
-auto const nCount = maContexts.size();
-if (nCount == 0)
+if (maContexts.empty())
{
SAL_WARN("xmloff.core", "SvXMLImport::endElement: no context left");
return;
@@ -863,10 +859,9 @@ void SAL_CALL SvXMLImport::startFastElement (sal_Int32
Element,
{
//Namespace handling is unnecessary. It is done by the fastparser itself.
uno::Reference xContext;
-sal_uInt16 nCount = maFastContexts.size();
-if( nCount > 0 )
+if (!maFastContexts.empty())
{
-uno::Reference< XFastContextHandler > pHandler = maFastContexts[nCount
- 1];
+uno::Reference< XFastContextHandler > pHandler = maFastContexts.back();
xContext = pHandler->createFastChildContext( Element, Attribs );
}
else
@@ -901,10 +896,9 @@ void SAL_CALL SvXMLImport::startUnknownElement (const
OUString & rPrefix, const
throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
uno::Reference xContext;
-sal_uInt16 nCount = maFastContexts.size();
-if( nCount > 0 )
+if (!maFastContexts.empty())
{
-uno::Reference< XFastContextHandler > pHandler = maFastContexts[nCount
- 1];
+uno::Reference< XFastContextHandler > pHandler = maFastContexts.back();
xContext = pHandler->createUnknownChildContext( rPrefix, rLocalName,
Attribs );
}
else
@@ -920,8 +914,7 @@ void SAL_CALL SvXMLImport::startUnknownElement (const
OUString & rPrefix, const
void SAL_CALL SvXMLImport::endFastElement (sal_Int32 Element)
throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
-sal_uInt16 nCount = maFastContexts.size();
-if( nCount > 0 )
+if (!maFastContexts.empty())
{
uno::Reference< XFastContextHandler > xContext = maFastContexts.back();
maFastContexts.pop_back();
@@ -937,8 +930,7 @@ void SAL_CALL SvXMLImport::endFastElement (sal_Int32
Element)
void SAL_CALL SvXMLImport::endUnknownElement (const OUString & rPrefix, const
OUString & rLocalName)
throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
{
-sal_uInt16 nCount = maFastContexts.size();
-if( nCount > 0 )
+if (!maFastContexts.empty())
{
uno::Reference< XFastContextHandler > xContext = maFastContexts.back();
maFastContexts.pop_back();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Fresh install of Win 10 + LODE + vs2013-ide-integration = Error 127
Hi, On Tue, Oct 04, 2016 at 07:46:05AM +0200, Jan Iversen wrote: > I use the gbuild-to-ide script regular, without problems. BUT it has severe > limitations, it will not (and has never) made a visual studio project that > you can actually build. > [...] > There is a ongoing project to enhance the script, and patches are welcome The main trouble with all these IDE integrations seems that the output of "make -np" on which it depends is not as stable between versions of make as originally expected by that naive guy who did the initial implementation. Thus the parser of that is both more fragile and more complex as it should be by now. I have a half-finished patch that will make make write out how it intends to build stuff in small (json) text files. Parsing _that_ should be really trivial and not fragile. Also it might make possible creating: 1/ the possiblity of creating a IDE integration without a full build 2/ the possiblity to create MS Build solutions for some (non-special) targets, thus building like MSVS would. However, for the most part, I dont think 2/ is a good idea anyway as: a/ It would be an addition scenario to support, which is a pain b/ we arent getting rid of needing cygwin with this anyway, so why bother? c/ the hard part is in all the special casing and nasty custom logic, which is e.g. in scp2/ still -- not building a general C++ library. So as long as scp2/ is still around, we shouldnt venture into 2/: As usual with gbuild, the hard part is not building the new stuff, but cleaning up the old. Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.Menubar.js |8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
New commits:
commit b5f95c2aed1c8af9577ac90e0a8a89de049f6852
Author: Andras Timar
Date: Tue Oct 4 11:21:10 2016 +0200
loleaflet: add Insert Footnote, Endnote, Page and Column break to Writer
menu
diff --git a/loleaflet/src/control/Control.Menubar.js
b/loleaflet/src/control/Control.Menubar.js
index 88aef52..7fee304 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -26,7 +26,13 @@ L.Control.Menubar = L.Control.extend({
{name: _('Select all'), type: 'unocommand', uno:
'.uno:SelectAll'}]
},
{name: _('Insert'), type: 'menu', menu: [{name:
_('Image'), id: 'insertgraphic', type: 'action'},
-
{name: _('Comment'), type: 'unocommand', uno:
'.uno:InsertAnnotation'}]
+
{name: _('Comment'), type: 'unocommand', uno:
'.uno:InsertAnnotation'},
+
{type: 'separator'},
+
{name: _('Footnote'), type: 'unocommand', uno:
'.uno:InsertFootnote'},
+
{name: _('Endnote'), type: 'unocommand', uno:
'.uno:InsertEndnote'},
+
{type: 'separator'},
+
{name: _('Page break'), type: 'unocommand', uno:
'.uno:InsertPageBreak'},
+
{name: _('Column break'), type: 'unocommand', uno:
'.uno:InsertColumnBreak'}]
},
{name: _('View'), type: 'menu', menu: [{name: _('Full
screen'), id: 'fullscreen', type: 'action'},
{type: 'separator'},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: 2 commits - loolwsd/test
loolwsd/test/TileCacheTests.cpp |6 ++ loolwsd/test/test.cpp |1 + 2 files changed, 7 insertions(+) New commits: commit 7a2a1b1b9917d4b8ccf8871c6024921d97c4dd06 Author: Tor Lillqvist Date: Tue Oct 4 11:04:36 2016 +0300 Add another FIXME rant diff --git a/loolwsd/test/TileCacheTests.cpp b/loolwsd/test/TileCacheTests.cpp index d5e18c9..3590a06 100644 --- a/loolwsd/test/TileCacheTests.cpp +++ b/loolwsd/test/TileCacheTests.cpp @@ -271,6 +271,12 @@ void TileCacheTests::testCancelTilesMultiView() getTileMessage(*socket2, "cancelTilesMultiView-2 "); } +// FIXME: Note that especially when this is run on a loaded machine, the server might not honor +// the 'canceltiles' but still send out a tile, or it has already sent the tile before it even +// gets the 'canceltiles'. That is not an error. It is a bit silly to have it cause an assertion +// failure here. Transient failures make a unit test worse than no unit test. Should we remove +// this testCancelTilesMultiView altogether? + assertNotInResponse(socket1, "tile:", "cancelTilesMultiView-1 "); assertNotInResponse(socket2, "tile:", "cancelTilesMultiView-2 "); } commit dba94a9c0371cee7a242611583307772ef10969d Author: Tor Lillqvist Date: Tue Oct 4 11:04:22 2016 +0300 Avoid annoying line wrapping of cppunit output diff --git a/loolwsd/test/test.cpp b/loolwsd/test/test.cpp index d0404dd..d93ccf9 100644 --- a/loolwsd/test/test.cpp +++ b/loolwsd/test/test.cpp @@ -94,6 +94,7 @@ int main(int /*argc*/, char** /*argv*/) runner.run(controller); CPPUNIT_NS::CompilerOutputter outputter(&result, std::cerr); +outputter.setNoWrap(); outputter.write(); return result.wasSuccessful() ? 0 : 1; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/osx
vcl/osx/salmenu.cxx |7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
New commits:
commit ae3ec79354f7b4967e736c6a4cd7c08fc52e2b7d
Author: Douglas Mencken
Date: Mon Oct 3 11:03:06 2016 -0400
thereâs no need to peel tildæ for separator
Change-Id: Id53e5c704759d831bedd42ca9a8cd9f393ecdd0c
Reviewed-on: https://gerrit.libreoffice.org/29492
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/vcl/osx/salmenu.cxx b/vcl/osx/salmenu.cxx
index 70a438a..7c9b7db 100644
--- a/vcl/osx/salmenu.cxx
+++ b/vcl/osx/salmenu.cxx
@@ -866,9 +866,6 @@ AquaSalMenuItem::AquaSalMenuItem( const SalItemParams*
pItemData ) :
mpSubMenu( nullptr ),
mpMenuItem( nil )
{
-// Delete mnemonics
-OUString aText = pItemData->aText.replaceAll("~", "");
-
if (pItemData->eType == MenuItemType::SEPARATOR)
{
mpMenuItem = [NSMenuItem separatorItem];
@@ -880,7 +877,9 @@ AquaSalMenuItem::AquaSalMenuItem( const SalItemParams*
pItemData ) :
{
mpMenuItem = [[SalNSMenuItem alloc] initWithMenuItem: this];
[mpMenuItem setEnabled: YES];
-NSString* pString = CreateNSString( aText );
+
+// peel mnemonics because on mac there are no such things for menu
items
+NSString* pString = CreateNSString( pItemData->aText.replaceAll( "~",
"" ) );
if (pString)
{
[mpMenuItem setTitle: pString];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - compilerplugins/clang include/editeng
compilerplugins/clang/mergeclasses.cxx | 74 +
compilerplugins/clang/mergeclasses.py | 48 ++
compilerplugins/clang/mergeclasses.results | 32 +++-
include/editeng/outliner.hxx |6 --
4 files changed, 60 insertions(+), 100 deletions(-)
New commits:
commit bd89dff26155800be457735a0252476b670ddbd2
Author: Noel Grandin
Date: Tue Oct 4 09:29:36 2016 +0200
loplugin:mergeclasses various fixes
better tracking of templates, ignore more noise in the plugin so the
python has less log to process
Change-Id: I62874236d362529bd566140ac3fcc65e734fd62c
diff --git a/compilerplugins/clang/mergeclasses.cxx
b/compilerplugins/clang/mergeclasses.cxx
index 20f3dc2..fa4eb3c 100644
--- a/compilerplugins/clang/mergeclasses.cxx
+++ b/compilerplugins/clang/mergeclasses.cxx
@@ -70,28 +70,32 @@ public:
myfile.close();
}
+bool shouldVisitTemplateInstantiations () const { return true; }
+
bool VisitVarDecl(const VarDecl *);
bool VisitFieldDecl(const FieldDecl *);
bool VisitCXXConstructExpr( const CXXConstructExpr* var );
bool VisitCXXRecordDecl( const CXXRecordDecl* decl);
-bool VisitFunctionDecl( const FunctionDecl* decl);
-bool VisitCallExpr(const CallExpr* decl);
};
bool startsWith(const std::string& rStr, const char* pSubStr) {
return rStr.compare(0, strlen(pSubStr), pSubStr) == 0;
}
-void addToInstantiatedSet(const std::string& s)
+bool ignoreClass(StringRef s)
{
// ignore stuff in the standard library, and UNO stuff we can't touch.
if (startsWith(s, "rtl::") || startsWith(s, "sal::") || startsWith(s,
"com::sun::")
|| startsWith(s, "std::") || startsWith(s, "boost::")
|| s == "OString" || s == "OUString" || s == "bad_alloc")
{
-return;
+return true;
+}
+// ignore instantiations of pointers and arrays
+if (s.endswith("*") || s.endswith("]")) {
+return true;
}
-instantiatedSet.insert(s);
+return false;
}
// check for implicit construction
@@ -100,7 +104,9 @@ bool MergeClasses::VisitVarDecl( const VarDecl* pVarDecl )
if (ignoreLocation(pVarDecl)) {
return true;
}
-addToInstantiatedSet(pVarDecl->getType().getAsString());
+std::string s = pVarDecl->getType().getAsString();
+if (!ignoreClass(s))
+instantiatedSet.insert(s);
return true;
}
@@ -110,7 +116,9 @@ bool MergeClasses::VisitFieldDecl( const FieldDecl*
pFieldDecl )
if (ignoreLocation(pFieldDecl)) {
return true;
}
-addToInstantiatedSet(pFieldDecl->getType().getAsString());
+std::string s = pFieldDecl->getType().getAsString();
+if (!ignoreClass(s))
+instantiatedSet.insert(s);
return true;
}
@@ -126,7 +134,8 @@ bool MergeClasses::VisitCXXConstructExpr( const
CXXConstructExpr* pCXXConstructE
const CXXConstructorDecl* pCXXConstructorDecl =
pCXXConstructExpr->getConstructor();
const CXXRecordDecl* pParentCXXRecordDecl =
pCXXConstructorDecl->getParent();
std::string s = pParentCXXRecordDecl->getQualifiedNameAsString();
-addToInstantiatedSet(s);
+if (!ignoreClass(s))
+instantiatedSet.insert(s);
return true;
}
@@ -135,63 +144,26 @@ bool MergeClasses::VisitCXXRecordDecl(const
CXXRecordDecl* decl)
if (ignoreLocation(decl)) {
return true;
}
-if (decl->hasDefinition())
+if (decl->isThisDeclarationADefinition())
{
SourceLocation spellingLocation =
compiler.getSourceManager().getSpellingLoc(decl->getCanonicalDecl()->getLocStart());
std::string filename =
compiler.getSourceManager().getFilename(spellingLocation);
filename = filename.substr(strlen(SRCDIR));
-definitionMap.insert(
std::pair(decl->getQualifiedNameAsString(), filename)
);
+std::string s = decl->getQualifiedNameAsString();
+if (ignoreClass(s))
+return true;
+definitionMap.insert( std::pair(s, filename)
);
for (auto it = decl->bases_begin(); it != decl->bases_end(); ++it)
{
const CXXBaseSpecifier spec = *it;
// need to look through typedefs, hence the
getUnqualifiedDesugaredType
QualType baseType =
spec.getType().getDesugaredType(compiler.getASTContext());
-childToParentClassSet.insert(
std::pair(decl->getQualifiedNameAsString(),
baseType.getAsString()) );
+childToParentClassSet.insert(
std::pair(s, baseType.getAsString()) );
}
}
return true;
}
-bool MergeClasses::VisitFunctionDecl(const FunctionDecl* decl)
-{
-if (ignoreLocation(decl)) {
-return true;
-}
-return true;
-}
-
-bool startswith(const std::string& s, const std::string& prefix)
-{
-return s.rfind(prefix,0) == 0;
-}
-
-bool endswith(const std::string& s, const std::string& suffix)
-{
-return s.rfind(suffix) == (s.size()-suffix.size());
-}
-
