[PUSHED libreoffice-4-1] remove inherited number formats, fdo#60215
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4147 Approvals: Kohei Yoshida: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/4147 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia8199bdc63ee732bada51687df195c9ab9cae9aa Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: libreoffice-4-1 Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@suse.de ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] gbuild: Replace SHOWINCLUDES_PREFIX without regexp.
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3579 Approvals: Kohei Yoshida: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3579 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic7d85fc3a93807de11155488e9d0368427375c78 Gerrit-PatchSet: 7 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Isamu Mogi saturda...@gmail.com Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@suse.de ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] coverity#1000855 Unitialized scalar variable
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3896 Approvals: Kohei Yoshida: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3896 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2bece68ed33f3aa193a30d9686ba81d21c7ec55e Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Norbert Thiebaud nthieb...@gmail.com Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@suse.de ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] change order to allow validation of chart part
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3657 Approvals: Kohei Yoshida: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3657 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib55e5b32edc3a556e9081b3008df539275dc289b Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@suse.de ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] c:delete is true by default in Excel
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3685 Approvals: Kohei Yoshida: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3685 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1bfa76a46081ba478e44d8d90d8a91790a9a9ff3 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@suse.de ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] c:varyColor is true by default in Excel
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3686 Approvals: Kohei Yoshida: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3686 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib6aa8ddb2f2792513c7263d86865e08fe5f1483d Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@suse.de ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] fdo#61820: Avoid crasher when file URL contains unicode byte...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3581
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/81/3581/1
fdo#61820: Avoid crasher when file URL contains unicode bytes.
This is a cherry-pick of 6374df20c2a8378209cce21c0e9689e65b8bd9a2.
Credit goes to Isamu Mogi for pin-pointing exactly what caused the crash
and which commit fixed it on master.
Change-Id: Ic5653c76c8c7d8eb8798a9c4ae0cbc43f0e946e4
---
M sc/Library_scfilt.mk
M sc/source/filter/orcus/xmlcontext.cxx
2 files changed, 30 insertions(+), 5 deletions(-)
diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk
index bdb99ca..0a849da 100644
--- a/sc/Library_scfilt.mk
+++ b/sc/Library_scfilt.mk
@@ -58,6 +58,7 @@
svxcore \
tk \
tl \
+ ucbhelper \
utl \
vcl \
i18nisolang1 \
diff --git a/sc/source/filter/orcus/xmlcontext.cxx
b/sc/source/filter/orcus/xmlcontext.cxx
index ecbf35b..001c8f9 100644
--- a/sc/source/filter/orcus/xmlcontext.cxx
+++ b/sc/source/filter/orcus/xmlcontext.cxx
@@ -14,6 +14,7 @@
#include svtools/treelistbox.hxx
#include svtools/treelistentry.hxx
+#include ucbhelper/content.hxx
#include orcus/spreadsheet/import_interface.hpp
#include orcus/xml_structure_tree.hpp
@@ -21,7 +22,14 @@
#include orcus/orcus_xml.hpp
#include orcus/global.hpp
+#include com/sun/star/ucb/XCommandEnvironment.hpp
+
#include string
+#include sstream
+
+#define BUFFER_SIZE 4096
+
+using namespace com::sun::star;
namespace {
@@ -143,6 +151,26 @@
}
};
+void loadContentFromURL(const OUString rURL, std::string rStrm)
+{
+ucbhelper::Content aContent(
+rURL, uno::Referenceucb::XCommandEnvironment(),
comphelper::getProcessComponentContext());
+uno::Referenceio::XInputStream xStrm = aContent.openStream();
+
+std::ostringstream aStrmBuf;
+uno::Sequencesal_Int8 aBytes;
+size_t nBytesRead = 0;
+do
+{
+nBytesRead = xStrm-readBytes(aBytes, BUFFER_SIZE);
+const sal_Int8* p = aBytes.getConstArray();
+aStrmBuf std::string(p, p + nBytesRead);
+}
+while (nBytesRead == BUFFER_SIZE);
+
+rStrm = aStrmBuf.str();
+}
+
}
ScOrcusXMLContextImpl::ScOrcusXMLContextImpl(ScDocument rDoc, const OUString
rPath) :
@@ -154,12 +182,8 @@
{
rParam.maUserDataStore.clear();
-OString aSysPath = ScOrcusFiltersImpl::toSystemPath(maPath);
-const char* path = aSysPath.getStr();
-
-// TODO: Use our own stream loading call instead of one from orcus.
std::string aStrm;
-orcus::load_file_content(path, aStrm);
+loadContentFromURL(maPath, aStrm);
if (aStrm.empty())
return false;
--
To view, visit https://gerrit.libreoffice.org/3581
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic5653c76c8c7d8eb8798a9c4ae0cbc43f0e946e4
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Kohei Yoshida kohei.yosh...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] Remove the 4th option from the pivot table source selection ...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3402 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/02/3402/1 Remove the 4th option from the pivot table source selection dialog. Change-Id: I39ed1a9fd0476506cac0852af63182075f433ffd --- M sc/source/ui/dbgui/dapitype.cxx M sc/source/ui/dbgui/dapitype.src 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/sc/source/ui/dbgui/dapitype.cxx b/sc/source/ui/dbgui/dapitype.cxx index cad3532..e17d1e0 100644 --- a/sc/source/ui/dbgui/dapitype.cxx +++ b/sc/source/ui/dbgui/dapitype.cxx @@ -62,6 +62,10 @@ aBtnNamedRange.Disable(); FreeResource(); + + // Intentionally hide this to see if someone complains. Eventually we'll + // remove this option. +aBtnExternal.Show(false); } ScDataPilotSourceTypeDlg::~ScDataPilotSourceTypeDlg() diff --git a/sc/source/ui/dbgui/dapitype.src b/sc/source/ui/dbgui/dapitype.src index 569023d..4a388d6 100644 --- a/sc/source/ui/dbgui/dapitype.src +++ b/sc/source/ui/dbgui/dapitype.src @@ -26,7 +26,7 @@ OutputSize = TRUE ; HelpId = HID_DATAPILOT_TYPE ; SVLook = TRUE ; -Size = MAP_APPFONT ( 241 , 76 ) ; +Size = MAP_APPFONT ( 241 , 63 ) ; Moveable = TRUE ; Closeable = FALSE ; -- To view, visit https://gerrit.libreoffice.org/3402 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I39ed1a9fd0476506cac0852af63182075f433ffd Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Kohei Yoshida kohei.yosh...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] prevent out of bounds vector access in ooo62493-1.xls recalc...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3336 Approvals: Kohei Yoshida: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3336 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: If96c2eadba8753ea3e3166db0a81441818c89b2d Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Eike Rathke er...@redhat.com Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-3-6] prevent out of bounds vector access in ooo62493-1.xls recalc...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3339 Approvals: Kohei Yoshida: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3339 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: If96c2eadba8753ea3e3166db0a81441818c89b2d Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Eike Rathke er...@redhat.com Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] prevent vector and sequence out of bounds access, fdo#60300
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3340 Approvals: Kohei Yoshida: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3340 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3782b5e39f18bc65ffe510b847ffa7969a26cd37 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Eike Rathke er...@redhat.com Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-3-6] prevent vector and sequence out of bounds access, fdo#60300
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3344 Approvals: Kohei Yoshida: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3344 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3782b5e39f18bc65ffe510b847ffa7969a26cd37 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Eike Rathke er...@redhat.com Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] disable cached value import for ODS for now, fdo#60215
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3290 Approvals: Kohei Yoshida: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3290 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I714e75112727f5ebcd8cc55cf4f70dd15eb9b810 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] fdo#51296 Patch accounts security setting requiring ctrl+cli...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3032 Approvals: Kohei Yoshida: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3032 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1280e7cf7e8923282fda17088fd7c61fbf503b9d Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Akash Shetye shetyeak...@gmail.com Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Remove commented code in VCL demo app - should make the exam...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2920 Approvals: Kohei Yoshida: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2920 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2e56c580b30435731b3b8dc716abae19c8673acf Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Chris Sherlock chris.sherloc...@gmail.com Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] fdo#54651: Only pick non-default number format for pivot fie...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2585
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/85/2585/1
fdo#54651: Only pick non-default number format for pivot field.
Change-Id: Ia88282803c8df8389ed24efd8b1ca7600a39bf23
(cherry picked from commit dd1b3ca024a85597b46778a62007bb966174368d)
---
M sc/source/core/data/dpcache.cxx
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx
index 5f075a3..018d1a2 100644
--- a/sc/source/core/data/dpcache.cxx
+++ b/sc/source/core/data/dpcache.cxx
@@ -357,7 +357,9 @@
if (!aData.IsEmpty())
{
maEmptyRows.insert_back(i, i+1, false);
-rField.mnNumFormat = nNumFormat;
+if (nNumFormat)
+// Only take non-default number format.
+rField.mnNumFormat = nNumFormat;
}
}
--
To view, visit https://gerrit.libreoffice.org/2585
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia88282803c8df8389ed24efd8b1ca7600a39bf23
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Kohei Yoshida kohei.yosh...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] calc : multiple tabs can be hidden at once
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2053 Approvals: Kohei Yoshida: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2053 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I445eccc188f1817006cb425dc9a0e92a25350ec8 Gerrit-PatchSet: 5 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Laurent Godard lgodard.li...@laposte.net Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@gmail.com Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com Gerrit-Reviewer: Tor Lillqvist t...@iki.fi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] bnc#802350: Cell validation is not a special (cell) content.
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2128
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/28/2128/1
bnc#802350: Cell validation is not a special (cell) content.
Cell validation is stored as cell attributes which are stored with
columns not with cells. When HasSpecialContent() is true, it flags
the *cell* not empty, which in turns causes AddTextAndValueCell to
iterate over every single cell position for all repeated columns
and rows. That can very very slow when the number of repeated rows
is very high.
Since cell validation is stored with columns, skipping empty cells
even when they have cell validation settings set won't cause any
issues, and all cell validation settings are imported correctly even
after this change.
With the test document I have (confidential), this change alone reduces
the load time from 30 seconds to 0.3 seconds.
(cherry picked from commit f6acfb5fe41fb166b5b588ec73e2e9331489c632)
Conflicts:
sc/source/filter/xml/xmlcelli.cxx
Change-Id: I84fa4cec50172ccd02eca1042c8fafb93d1cfc73
---
M sc/source/filter/xml/xmlcelli.cxx
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/sc/source/filter/xml/xmlcelli.cxx
b/sc/source/filter/xml/xmlcelli.cxx
index 42714a1..e9776ec 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -956,8 +956,7 @@
bool ScXMLTableRowCellContext::HasSpecialContent() const
{
-return ( (pContentValidationName !pContentValidationName-isEmpty()) ||
- mxAnnotationData.get() || pDetectiveObjVec || pCellRangeSource );
+return (mxAnnotationData.get() || pDetectiveObjVec || pCellRangeSource);
}
bool ScXMLTableRowCellContext::CellsAreRepeated() const
--
To view, visit https://gerrit.libreoffice.org/2128
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I84fa4cec50172ccd02eca1042c8fafb93d1cfc73
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Kohei Yoshida kohei.yosh...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] API CHANGE: unpublish com.sun.star.document.MediaDescriptor.
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2016
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/16/2016/1
API CHANGE: unpublish com.sun.star.document.MediaDescriptor.
This is a service that basically describes the properties passed to
loadComponentFromURL and possibly other load/save related APIs. As
some properties get deprecated (some already have), new ones added as
the loading processs gets re-worked (including the type detection
process), we need the flexibility to change its property set.
Since all properties described here are optional, leaving it published
would make little sense.
Conflicts:
offapi/type_reference/types.rdb
Change-Id: I59384e62c7b6ab5c599141c8fc73a37c8bfe56e7
---
M offapi/com/sun/star/document/MediaDescriptor.idl
M offapi/type_reference/types.rdb
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/offapi/com/sun/star/document/MediaDescriptor.idl
b/offapi/com/sun/star/document/MediaDescriptor.idl
index b99a3d4..417f6f1 100644
--- a/offapi/com/sun/star/document/MediaDescriptor.idl
+++ b/offapi/com/sun/star/document/MediaDescriptor.idl
@@ -53,7 +53,7 @@
@see com::sun::star::beans::PropertyValue
*/
-published service MediaDescriptor
+service MediaDescriptor
{
/** May be set by filters or detection services if user has chosen to
abort loading/saving, e.g. while entering a password.
diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb
index b9e6624..fbc116b 100644
--- a/offapi/type_reference/types.rdb
+++ b/offapi/type_reference/types.rdb
Binary files differ
--
To view, visit https://gerrit.libreoffice.org/2016
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I59384e62c7b6ab5c599141c8fc73a37c8bfe56e7
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Kohei Yoshida kohei.yosh...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] resolved fdo#60366 make MATCH() accept a single cell referen...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2018 Approvals: Kohei Yoshida: Verified; Looks good to me, approved Norbert Thiebaud: Looks good to me, but someone else must approve -- To view, visit https://gerrit.libreoffice.org/2018 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7059abdb6232b95e0b940b34f74bf87182510146 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Eike Rathke er...@redhat.com Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@gmail.com Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-3-6] resolved fdo#60366 make MATCH() accept a single cell referen...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2019 Approvals: Kohei Yoshida: Verified; Looks good to me, approved Norbert Thiebaud: Looks good to me, but someone else must approve -- To view, visit https://gerrit.libreoffice.org/2019 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7059abdb6232b95e0b940b34f74bf87182510146 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Eike Rathke er...@redhat.com Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@gmail.com Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] fdo#39135: Prevent integer overflow update the character d...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2007
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/07/2007/1
fdo#39135: Prevent integer overflow update the character during loop.
These two errors in the code contributed to the reported bug. Let's
fix them.
Change-Id: If82a1bd4d1e27145b48e722b30388cc9dc4a8a6e
---
M sc/source/core/tool/reffind.cxx
1 file changed, 5 insertions(+), 0 deletions(-)
diff --git a/sc/source/core/tool/reffind.cxx b/sc/source/core/tool/reffind.cxx
index 2fe76fc..c4621f0 100644
--- a/sc/source/core/tool/reffind.cxx
+++ b/sc/source/core/tool/reffind.cxx
@@ -155,15 +155,20 @@
if (c == '\'')
break;
}
+if (rStartPos == 0)
+break;
}
else if (c == ']')
{
// Skip until the opening braket.
for (--rStartPos; rStartPos 0; --rStartPos)
{
+c = p[rStartPos];
if (c == '[')
break;
}
+if (rStartPos == 0)
+break;
}
else if (!IsText(c))
{
--
To view, visit https://gerrit.libreoffice.org/2007
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If82a1bd4d1e27145b48e722b30388cc9dc4a8a6e
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Kohei Yoshida kohei.yosh...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-3-6] fdo#39135: Prevent integer overflow update the character d...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2008
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/08/2008/1
fdo#39135: Prevent integer overflow update the character during loop.
These two errors in the code contributed to the reported bug. Let's
fix them.
Change-Id: If82a1bd4d1e27145b48e722b30388cc9dc4a8a6e
---
M sc/source/core/tool/reffind.cxx
1 file changed, 5 insertions(+), 0 deletions(-)
diff --git a/sc/source/core/tool/reffind.cxx b/sc/source/core/tool/reffind.cxx
index 660bab0..c8e1722 100644
--- a/sc/source/core/tool/reffind.cxx
+++ b/sc/source/core/tool/reffind.cxx
@@ -169,15 +169,20 @@
if (c == '\'')
break;
}
+if (rStartPos == 0)
+break;
}
else if (c == ']')
{
// Skip until the opening braket.
for (--rStartPos; rStartPos 0; --rStartPos)
{
+c = p[rStartPos];
if (c == '[')
break;
}
+if (rStartPos == 0)
+break;
}
else if (!IsText(c))
{
--
To view, visit https://gerrit.libreoffice.org/2008
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If82a1bd4d1e27145b48e722b30388cc9dc4a8a6e
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Kohei Yoshida kohei.yosh...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] fdo#59426: Don't try to repair package during flat detection...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1984
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/84/1984/1
fdo#59426: Don't try to repair package during flat detection phase.
Change-Id: I35968241a79db0aabe06e25c0efac2aa3d1c5b84
---
M comphelper/inc/comphelper/mediadescriptor.hxx
M comphelper/source/misc/mediadescriptor.cxx
M filter/source/config/cache/typedetection.cxx
M sc/source/ui/unoobj/scdetect.cxx
M sd/source/ui/unoidl/sddetect.cxx
M sw/source/ui/uno/swdetect.cxx
6 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/comphelper/inc/comphelper/mediadescriptor.hxx
b/comphelper/inc/comphelper/mediadescriptor.hxx
index 53dcffc..8c55f85 100644
--- a/comphelper/inc/comphelper/mediadescriptor.hxx
+++ b/comphelper/inc/comphelper/mediadescriptor.hxx
@@ -94,6 +94,8 @@
static const ::rtl::OUString PROP_VIEWONLY();
static const ::rtl::OUString PROP_DOCUMENTBASEURL();
+static const OUString PROP_DEEPDETECTION();
+
//---
// interface
public:
diff --git a/comphelper/source/misc/mediadescriptor.cxx
b/comphelper/source/misc/mediadescriptor.cxx
index 1957ab6..ce1f3e9 100644
--- a/comphelper/source/misc/mediadescriptor.cxx
+++ b/comphelper/source/misc/mediadescriptor.cxx
@@ -296,6 +296,12 @@
return sProp;
}
+const OUString MediaDescriptor::PROP_DEEPDETECTION()
+{
+static const OUString aProp(DeepDetection);
+return aProp;
+}
+
MediaDescriptor::MediaDescriptor()
: SequenceAsHashMap()
{
diff --git a/filter/source/config/cache/typedetection.cxx
b/filter/source/config/cache/typedetection.cxx
index 0732f06..9eae711 100644
--- a/filter/source/config/cache/typedetection.cxx
+++ b/filter/source/config/cache/typedetection.cxx
@@ -305,6 +305,8 @@
(bAllowDeep)
)
{
+// Let's the detection service know we are in a deep detection
phase.
+stlDescriptor[comphelper::MediaDescriptor::PROP_DEEPDETECTION()]
= sal_True;
sType = impl_detectTypeDeepOnly(stlDescriptor, lUsedDetectors);
}
diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx
index c9d892f..44163a3 100644
--- a/sc/source/ui/unoobj/scdetect.cxx
+++ b/sc/source/ui/unoobj/scdetect.cxx
@@ -244,6 +244,7 @@
sal_Bool bRepairPackage = false;
sal_Bool bRepairAllowed = false;
+bool bDeepDetection = false;
// now some parameters that can already be in the array, but may be
overwritten or new inserted here
// remember their indices in the case new values must be added to the array
@@ -300,6 +301,8 @@
lDescriptor[nProperty].Value = bRepairPackage;
else if ( lDescriptor[nProperty].Name == DocumentTitle )
nIndexOfDocumentTitle = nProperty;
+else if (lDescriptor[nProperty].Name == DeepDetection)
+bDeepDetection = lDescriptor[nProperty].Value.getsal_Bool();
}
// can't check the type for external filters, so set the dont flag
accordingly
@@ -382,6 +385,10 @@
}
catch( const lang::WrappedTargetException aWrap )
{
+if (!bDeepDetection)
+// Bail out early unless it's a deep detection.
+return OUString();
+
packages::zip::ZipIOException aZipException;
// repairing is done only if this type is requested
from outside
@@ -424,9 +431,8 @@
aTypeName.Erase();
}
- if ( aTypeName.Len() )
- pFilter = SfxFilterMatcher( rtl::OUString(scalc)
).GetFilter4EA( aTypeName );
-
+if ( aTypeName.Len() )
+pFilter = SfxFilterMatcher( rtl::OUString(scalc)
).GetFilter4EA( aTypeName );
}
}
else
diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx
index 0431e6e..4ff9a46 100644
--- a/sd/source/ui/unoidl/sddetect.cxx
+++ b/sd/source/ui/unoidl/sddetect.cxx
@@ -102,6 +102,7 @@
sal_Bool bRepairPackage = sal_False;
sal_Bool bRepairAllowed = sal_False;
+bool bDeepDetection = false;
// now some parameters that can already be in the array, but may be
overwritten or new inserted here
// remember their indices in the case new values must be added to the array
@@ -152,6 +153,8 @@
lDescriptor[nProperty].Value = bRepairPackage;
else if ( lDescriptor[nProperty].Name == DocumentTitle )
nIndexOfDocumentTitle = nProperty;
+else if (lDescriptor[nProperty].Name == DeepDetection)
+bDeepDetection = lDescriptor[nProperty].Value.getsal_Bool();
}
// can't check the type for external filters, so set the dont flag
accordingly
@@ -258,6 +261,10 @@
[PATCH libreoffice-4-0] bnc#801152: Scan all columns to determine the first data row...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1959
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/59/1959/1
bnc#801152: Scan all columns to determine the first data row.
When scanning the entire data range in an attempt to determine where
the first data row is, we shouldn't stop at the first column. We should
scan all data columns to make sure we pick the lowest value row
position among all columns.
Change-Id: I693ec169857b181c6b4237efcba3fa6a46eaa531
---
M sc/source/ui/unoobj/chart2uno.cxx
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/sc/source/ui/unoobj/chart2uno.cxx
b/sc/source/ui/unoobj/chart2uno.cxx
index 5ea6f54..e877469 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -294,13 +294,14 @@
bool bFoundValues = false;
bool bFoundAnything = false;
FormulaTokenMapMap::const_iterator it1 = rCols.begin();
-for (SCCOL nCol = 0; !bFoundValues nCol nAllColCount; ++nCol)
+for (SCCOL nCol = 0; nCol nAllColCount; ++nCol)
{
if (it1 != rCols.end() nCol=nHeaderColCount)
{
+bool bFoundValuesInRow = false;
FormulaTokenMap* pCol = it1-second;
FormulaTokenMap::const_iterator it2 = pCol-begin();
-for (SCROW nRow = 0; !bFoundValues nRow
nSmallestValueRowIndex it2 != pCol-end(); ++nRow)
+for (SCROW nRow = 0; !bFoundValuesInRow nRow
nSmallestValueRowIndex it2 != pCol-end(); ++nRow)
{
FormulaToken* pToken = it2-second;
if (pToken nRow=nHeaderRowCount)
@@ -318,7 +319,7 @@
aRange.GetVars( nCol1, nRow1, nTab1, nCol2, nRow2,
nTab2 );
if (pDoc pDoc-HasValueData( nCol1, nRow1, nTab1 ))
{
-bFoundValues = bFoundAnything = true;
+bFoundValuesInRow = bFoundValues = bFoundAnything
= true;
nSmallestValueRowIndex = std::min(
nSmallestValueRowIndex, nRow );
}
if( !bFoundAnything )
--
To view, visit https://gerrit.libreoffice.org/1959
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I693ec169857b181c6b4237efcba3fa6a46eaa531
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Kohei Yoshida kohei.yosh...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-4-0]: resolved fdo#60087 corrected .xlsx export of functions
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1929 Approvals: Kohei Yoshida: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1929 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6c7ba47dde88a73d035b1db5f7f4cede78b262db Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Eike Rathke er...@redhat.com Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-4-0]: make it possible to update DDE links after loading, fdo#5903...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1940 Approvals: Kohei Yoshida: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1940 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iba49bec62cb9081cdcd9410215f269b59c1be304 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-4-0]: if no cond format is valid use the existing protection, fdo#...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1942 Approvals: Kohei Yoshida: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1942 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib52a546a98f681b918de5e3bd285c36407fa8254 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-4-0]: show style when dialog is created with existing cond format, ...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1943 Approvals: Kohei Yoshida: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1943 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic1218179cd9c87ec15826adc861d505339a05f2d Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-4-0]: we need to parse the cell address after import, fdo#59843
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1944 Approvals: Kohei Yoshida: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1944 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I99a6507567b7d1018b790a90019cd563fa7323a0 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-4-0]: we need to use SCROW for row numbers, fdo#59894
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1945 Approvals: Kohei Yoshida: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1945 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I954acd801eb18e2c2fe6a449048856cb95d0d8b0 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-4-0-0]: fdo#51232: i#119987# fix Impress crash when pasting text und...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1933 Approvals: Kohei Yoshida: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1933 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I340de4f1b626defa52ecc48938c63ec4d1ce5c1d Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0-0 Gerrit-Owner: Caolán McNamara caol...@redhat.com Gerrit-Reviewer: Joren De Cuyper joren.libreoff...@telenet.be Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@gmail.com Gerrit-Reviewer: Petr Mladek pmla...@suse.cz Gerrit-Reviewer: Tor Lillqvist t...@iki.fi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-4-0]: bnc#437516: Hide minimum password info in the password dialo...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1946
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/46/1946/1
bnc#437516: Hide minimum password info in the password dialog.
When launching it from the Security tab of the PDF Options dialog
during PDF export.
Change-Id: Ife2d3a7b508ba2e077018d11478ad680d18d3f0d
---
M filter/source/pdf/impdialog.cxx
M sfx2/inc/sfx2/passwd.hxx
M sfx2/source/dialog/passwd.cxx
3 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index 870209f..1304c5e 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -1288,6 +1288,7 @@
{
SfxPasswordDialog aPwdDialog( this, msUserPwdTitle );
aPwdDialog.SetMinLen( 0 );
+aPwdDialog.ShowMinLengthText(false);
aPwdDialog.ShowExtras( SHOWEXTRAS_CONFIRM | SHOWEXTRAS_PASSWORD2 |
SHOWEXTRAS_CONFIRM2 );
aPwdDialog.SetText( maStrSetPwd );
aPwdDialog.SetGroup2Text( msOwnerPwdTitle );
diff --git a/sfx2/inc/sfx2/passwd.hxx b/sfx2/inc/sfx2/passwd.hxx
index 856916a..1f10c74 100644
--- a/sfx2/inc/sfx2/passwd.hxx
+++ b/sfx2/inc/sfx2/passwd.hxx
@@ -112,6 +112,9 @@
{
mbAsciiOnly = i_bAsciiOnly;
}
+
+void ShowMinLengthText(bool bShow);
+
virtual short Execute();
};
diff --git a/sfx2/source/dialog/passwd.cxx b/sfx2/source/dialog/passwd.cxx
index 39b4096..40d6d08 100644
--- a/sfx2/source/dialog/passwd.cxx
+++ b/sfx2/source/dialog/passwd.cxx
@@ -148,6 +148,11 @@
EditModifyHdl( NULL );
}
+void SfxPasswordDialog::ShowMinLengthText(bool bShow)
+{
+mpMinLengthFT-Show(bShow);
+}
+
// ---
short SfxPasswordDialog::Execute()
--
To view, visit https://gerrit.libreoffice.org/1946
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ife2d3a7b508ba2e077018d11478ad680d18d3f0d
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Kohei Yoshida kohei.yosh...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-4-0]: resolved fdo#60078 correctly calculate IMCSCH and IMSECH
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1926 Approvals: Kohei Yoshida: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1926 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: If502b708069d7fcbe09e954b26ce8b7268b6 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Eike Rathke er...@redhat.com Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-4-0]: resolved fdo#60043 write correct IM* function names
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1920 Approvals: Kohei Yoshida: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1920 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4f119f92096329432488503f36df670a4ce19b42 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Eike Rathke er...@redhat.com Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-4-0]: bnc#615317: Recompile cells with #NAME! for English function...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1931
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/31/1931/1
bnc#615317: Recompile cells with #NAME! for English function name option.
When the option for using English function name changes, we should re-compile
all cells with #NAME! as the error may have been caused by unresolved function
name which may be fixed after the option change.
Change-Id: Id340ce9b5db3ed368b98e814861be5c3f96df071
---
M sc/inc/column.hxx
M sc/inc/document.hxx
M sc/inc/table.hxx
M sc/source/core/data/column.cxx
M sc/source/core/data/document.cxx
M sc/source/core/data/table2.cxx
M sc/source/ui/app/scmod.cxx
7 files changed, 102 insertions(+), 6 deletions(-)
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 3e927c8..930caba 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -250,6 +250,8 @@
voidCompileAll();
voidCompileXML( ScProgress rProgress );
+bool CompileErrorCells(sal_uInt16 nErrCode);
+
voidResetChanged( SCROW nStartRow, SCROW nEndRow );
boolUpdateReference( UpdateRefMode eUpdateRefMode, SCCOL nCol1,
SCROW nRow1, SCTAB nTab1,
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index c7c09d8..31c5ac2 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -863,6 +863,18 @@
voidCompileAll();
voidCompileXML();
+/**
+ * Re-compile formula cells with error.
+ *
+ * @param nErrCode specified error code to match. Only those cells with
+ * this error code will be re-compiled. If this value is
+ * 0, cells with any error values will be re-compiled.
+ *
+ * @return true if at least one cell is re-compiled, false if no cells are
+ * re-compiled.
+ */
+bool CompileErrorCells(sal_uInt16 nErrCode);
+
ScAutoNameCache* GetAutoNameCache() { return pAutoNameCache; }
SC_DLLPUBLIC void SetAutoNameCache( ScAutoNameCache* pCache
);
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 26d5a69..061c830 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -446,6 +446,8 @@
voidCompileAll();
voidCompileXML( ScProgress rProgress );
+bool CompileErrorCells(sal_uInt16 nErrCode);
+
voidUpdateReference( UpdateRefMode eUpdateRefMode, SCCOL nCol1,
SCROW nRow1, SCTAB nTab1,
SCCOL nCol2, SCROW nRow2, SCTAB nTab2,
SCsCOL nDx, SCsROW nDy, SCsTAB nDz,
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 462abe7..7bdb927 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -2149,6 +2149,41 @@
}
}
+bool ScColumn::CompileErrorCells(sal_uInt16 nErrCode)
+{
+if (maItems.empty())
+return false;
+
+bool bCompiled = false;
+std::vectorColEntry::iterator it = maItems.begin(), itEnd =
maItems.end();
+for (; it != itEnd; ++it)
+{
+ScBaseCell* pCell = it-pCell;
+if (pCell-GetCellType() != CELLTYPE_FORMULA)
+// Not a formula cell. Skip it.
+continue;
+
+ScFormulaCell* pFCell = static_castScFormulaCell*(pCell);
+sal_uInt16 nCurError = pFCell-GetRawError();
+if (!nCurError)
+// It's not an error cell. Skip it.
+continue;
+
+if (nErrCode nCurError != nErrCode)
+// Error code is specified, and it doesn't match. Skip it.
+continue;
+
+pFCell-GetCode()-SetCodeError(0);
+pFCell-SetCompile(true);
+OUStringBuffer aBuf;
+pFCell-GetFormula(aBuf, pDocument-GetGrammar());
+pFCell-Compile(aBuf.makeStringAndClear(), false,
pDocument-GetGrammar());
+
+bCompiled = true;
+}
+
+return bCompiled;
+}
void ScColumn::CalcAfterLoad()
{
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 95018d7..8cc1713 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -3377,6 +3377,22 @@
SetAutoCalc( bOldAutoCalc );
}
+bool ScDocument::CompileErrorCells(sal_uInt16 nErrCode)
+{
+bool bCompiled = false;
+TableContainer::iterator it = maTabs.begin(), itEnd = maTabs.end();
+for (; it != itEnd; ++it)
+{
+ScTable* pTab = *it;
+if (!pTab)
+continue;
+
+if (pTab-CompileErrorCells(nErrCode))
+bCompiled = true;
+}
+
+return bCompiled;
+}
void ScDocument::CalcAfterLoad()
{
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index f0bd119..918a602 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -1539,6 +1539,18 @@
mpCondFormatList-CompileXML();
}
+bool ScTable::CompileErrorCells(sal_uInt16 nErrCode)
+{
+bool bCompiled = false;
+for
Change in core[libreoffice-4-0]: bnc#492440: Sort autofilter popup items correctly.
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1932
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/32/1932/1
bnc#492440: Sort autofilter popup items correctly.
Use locale-aware collator to sort strings, instead of using the
transliterator. The actual sorting algorithm for cell sort uses
collator. Let's be consistent with it.
Change-Id: I6729553ce92d50e45fa1ea6e1c35581fd791807d
---
M sc/source/core/tool/typedstrdata.cxx
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/sc/source/core/tool/typedstrdata.cxx
b/sc/source/core/tool/typedstrdata.cxx
index 811c5d8..71cf0fa 100644
--- a/sc/source/core/tool/typedstrdata.cxx
+++ b/sc/source/core/tool/typedstrdata.cxx
@@ -29,7 +29,7 @@
#include typedstrdata.hxx
#include global.hxx
-#include unotools/transliterationwrapper.hxx
+#include unotools/collatorwrapper.hxx
bool ScTypedStrData::LessCaseSensitive::operator() (const ScTypedStrData
left, const ScTypedStrData right) const
{
@@ -39,7 +39,7 @@
if (left.meStrType == Value)
return left.mfValue right.mfValue;
-return ScGlobal::GetCaseTransliteration()-compareString(
+return ScGlobal::GetCaseCollator()-compareString(
left.maStrValue, right.maStrValue) 0;
}
@@ -51,7 +51,7 @@
if (left.meStrType == Value)
return left.mfValue right.mfValue;
-return ScGlobal::GetpTransliteration()-compareString(
+return ScGlobal::GetCollator()-compareString(
left.maStrValue, right.maStrValue) 0;
}
@@ -63,7 +63,7 @@
if (left.meStrType == Value left.mfValue != right.mfValue)
return false;
-return ScGlobal::GetCaseTransliteration()-compareString(
+return ScGlobal::GetCaseCollator()-compareString(
left.maStrValue, right.maStrValue) == 0;
}
@@ -75,7 +75,7 @@
if (left.meStrType == Value left.mfValue != right.mfValue)
return false;
-return ScGlobal::GetpTransliteration()-compareString(
+return ScGlobal::GetCollator()-compareString(
left.maStrValue, right.maStrValue) == 0;
}
--
To view, visit https://gerrit.libreoffice.org/1932
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6729553ce92d50e45fa1ea6e1c35581fd791807d
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Kohei Yoshida kohei.yosh...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-4-0-0]: fdo#59056: Re-calculate cell anchor position of a pasted dra...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1899
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/99/1899/1
fdo#59056: Re-calculate cell anchor position of a pasted drawing object.
Else it would re-use the anchor position of the original one (minus the
sheet index which is correctly adjusted).
Change-Id: I52d11eb9953ee7539c9d5da41edd7dd28604587c
Reviewed-on: https://gerrit.libreoffice.org/1869
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
---
M sc/inc/drwlayer.hxx
M sc/source/core/data/drwlayer.cxx
M sc/source/ui/view/viewfun7.cxx
3 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/sc/inc/drwlayer.hxx b/sc/inc/drwlayer.hxx
index 298d619..72b980d 100644
--- a/sc/inc/drwlayer.hxx
+++ b/sc/inc/drwlayer.hxx
@@ -166,6 +166,7 @@
String GetNewGraphicName( long* pnCounter = NULL ) const;
voidEnsureGraphicNames();
+static bool IsCellAnchored( const SdrObject rObj );
static void SetPageAnchored( SdrObject );
static void SetCellAnchored( SdrObject, const ScDrawObjData
rAnchor );
// Updates rAnchor based on position of rObj
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index 76d6794..8ea4fca 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -1787,6 +1787,13 @@
pAnchor-maEndOffset.X() = aCellRect.Right()-aObjRect.Left();
}
+bool ScDrawLayer::IsCellAnchored( const SdrObject rObj )
+{
+// Cell anchored object always has a user data, to store the anchor cell
+// info. If it doesn't then it's page-anchored.
+return GetFirstUserDataOfType(rObj, SC_UD_OBJDATA) != NULL;
+}
+
void ScDrawLayer::SetPageAnchored( SdrObject rObj )
{
DeleteFirstUserDataOfType(rObj, SC_UD_OBJDATA);
diff --git a/sc/source/ui/view/viewfun7.cxx b/sc/source/ui/view/viewfun7.cxx
index c69dc65..63e2f1a 100644
--- a/sc/source/ui/view/viewfun7.cxx
+++ b/sc/source/ui/view/viewfun7.cxx
@@ -172,8 +172,8 @@
pDestPage-InsertObject( pNeuObj );
pScDrawView-AddUndo(new SdrUndoInsertObj( *pNeuObj ));
-// Chart braucht nicht mehr getrennt behandelt zu werden,
-// weil es seine Daten jetzt selber hat
+if (ScDrawLayer::IsCellAnchored(*pNeuObj))
+ScDrawLayer::SetCellAnchoredFromPosition(*pNeuObj,
*GetViewData()-GetDocument(), nTab);
}
}
@@ -238,6 +238,10 @@
{
if ( pObject-ISA(SdrUnoObj) pObject-GetLayer() !=
SC_LAYER_CONTROLS )
pObject-NbcSetLayer(SC_LAYER_CONTROLS);
+
+if (ScDrawLayer::IsCellAnchored(*pObject))
+ScDrawLayer::SetCellAnchoredFromPosition(*pObject,
*GetViewData()-GetDocument(), nTab);
+
pObject = aIter.Next();
}
}
--
To view, visit https://gerrit.libreoffice.org/1899
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I52d11eb9953ee7539c9d5da41edd7dd28604587c
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0-0
Gerrit-Owner: Kohei Yoshida kohei.yosh...@gmail.com
Gerrit-Reviewer: Eike Rathke er...@redhat.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0]: fdo#58562: Ensure internal data is always used when pasting ...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1835
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/35/1835/1
fdo#58562: Ensure internal data is always used when pasting to another doc.
Without this, pasting a chart object from one Calc doc to another may
occasionally incorrectly switch to range references *if* the destination
document contains the right set of sheet names. With this fix, pasted
chart objects always switch to internal cached data source when pasting
to another document, while retaining range references when pasting within
the same document.
Change-Id: If1dbc854c5faae62f06ece155fad470b229ca0c7
---
M sc/inc/unonames.hxx
M sc/source/ui/unoobj/chart2uno.cxx
M xmloff/source/chart/SchXMLTools.cxx
3 files changed, 33 insertions(+), 6 deletions(-)
diff --git a/sc/inc/unonames.hxx b/sc/inc/unonames.hxx
index ca89837..9ab1856 100644
--- a/sc/inc/unonames.hxx
+++ b/sc/inc/unonames.hxx
@@ -652,6 +652,7 @@
#define SC_UNONAME_HIDDENVALUES HiddenValues
#define SC_UNONAME_INCLUDEHIDDENCELLS IncludeHiddenCells
#define SC_UNONAME_HIDDENVALUES HiddenValues
+#define SC_UNONAME_USE_INTERNAL_DATA_PROVIDER UseInternalDataProvider
// Solver
#define SC_UNONAME_TIMEOUT Timeout
diff --git a/sc/source/ui/unoobj/chart2uno.cxx
b/sc/source/ui/unoobj/chart2uno.cxx
index 53656cb..5ea6f54 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -76,7 +76,8 @@
{
static SfxItemPropertyMapEntry aDataProviderPropertyMap_Impl[] =
{
-{MAP_CHAR_LEN(SC_UNONAME_INCLUDEHIDDENCELLS), 0,
getBooleanCppuType(), 0, 0 },
+{ MAP_CHAR_LEN(SC_UNONAME_INCLUDEHIDDENCELLS), 0,
getBooleanCppuType(), 0, 0 },
+{ MAP_CHAR_LEN(SC_UNONAME_USE_INTERNAL_DATA_PROVIDER), 0,
getBooleanCppuType(), 0, 0 },
{0,0,0,0,0,0}
};
return aDataProviderPropertyMap_Impl;
@@ -2327,6 +2328,11 @@
uno::Any aRet;
if ( rPropertyName == SC_UNONAME_INCLUDEHIDDENCELLS )
aRet = m_bIncludeHiddenCells;
+else if (rPropertyName == SC_UNONAME_USE_INTERNAL_DATA_PROVIDER)
+{
+// This is a read-only property.
+aRet = static_castsal_Bool(m_pDocument-PastingDrawFromOtherDoc());
+}
else
throw beans::UnknownPropertyException();
return aRet;
diff --git a/xmloff/source/chart/SchXMLTools.cxx
b/xmloff/source/chart/SchXMLTools.cxx
index 2c83c3e..e12de82 100644
--- a/xmloff/source/chart/SchXMLTools.cxx
+++ b/xmloff/source/chart/SchXMLTools.cxx
@@ -380,14 +380,34 @@
return xRet;
}
-try
+bool bUseInternal = false;
+uno::Referencebeans::XPropertySet xPropSet(xDataProvider,
uno::UNO_QUERY);
+if (xPropSet.is())
{
-xRet.set( xDataProvider-createDataSequenceByRangeRepresentation(
lcl_ConvertRange( rRange, xDataProvider )));
-SchXMLTools::setXMLRangePropertyAtDataSequence( xRet, rRange );
+try
+{
+sal_Bool bVal;
+uno::Any any =
xPropSet-getPropertyValue(UseInternalDataProvider);
+if (any = bVal)
+bUseInternal = static_castbool(bVal);
+}
+catch (const beans::UnknownPropertyException)
+{
+// Do nothing
+}
}
-catch( const lang::IllegalArgumentException )
+
+if (!bUseInternal)
{
-OSL_FAIL( could not create data sequence );
+try
+{
+xRet.set( xDataProvider-createDataSequenceByRangeRepresentation(
lcl_ConvertRange( rRange, xDataProvider )));
+SchXMLTools::setXMLRangePropertyAtDataSequence( xRet, rRange );
+}
+catch( const lang::IllegalArgumentException )
+{
+OSL_FAIL( could not create data sequence );
+}
}
if( !xRet.is() !xChartDoc-hasInternalDataProvider()
!rRange.isEmpty() )
--
To view, visit https://gerrit.libreoffice.org/1835
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If1dbc854c5faae62f06ece155fad470b229ca0c7
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Kohei Yoshida kohei.yosh...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Change in core[libreoffice-4-0-0]: reset automatic row height flag after import, fdo#59193
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1832 Approvals: Kohei Yoshida: Verified; Looks good to me, approved Noel Power: Verified; Looks good to me, but someone else must approve Joren De Cuyper: Looks good to me, but someone else must approve -- To view, visit https://gerrit.libreoffice.org/1832 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ied9cb4a2b6a17d8c7b65f4fec3cb17219a5afa5b Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0-0 Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com Gerrit-Reviewer: Joren De Cuyper joren.libreoff...@telenet.be Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@gmail.com Gerrit-Reviewer: Noel Power noel.po...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0-0]: fdo#58562: Ensure internal data is always used when pasting ...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1846
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/46/1846/1
fdo#58562: Ensure internal data is always used when pasting to another doc.
Without this, pasting a chart object from one Calc doc to another may
occasionally incorrectly switch to range references *if* the destination
document contains the right set of sheet names. With this fix, pasted
chart objects always switch to internal cached data source when pasting
to another document, while retaining range references when pasting within
the same document.
Change-Id: If1dbc854c5faae62f06ece155fad470b229ca0c7
Reviewed-on: https://gerrit.libreoffice.org/1835
Tested-by: Noel Power noel.po...@suse.com
Reviewed-by: Noel Power noel.po...@suse.com
---
M sc/inc/unonames.hxx
M sc/source/ui/unoobj/chart2uno.cxx
M xmloff/source/chart/SchXMLTools.cxx
3 files changed, 33 insertions(+), 6 deletions(-)
diff --git a/sc/inc/unonames.hxx b/sc/inc/unonames.hxx
index ca89837..9ab1856 100644
--- a/sc/inc/unonames.hxx
+++ b/sc/inc/unonames.hxx
@@ -652,6 +652,7 @@
#define SC_UNONAME_HIDDENVALUES HiddenValues
#define SC_UNONAME_INCLUDEHIDDENCELLS IncludeHiddenCells
#define SC_UNONAME_HIDDENVALUES HiddenValues
+#define SC_UNONAME_USE_INTERNAL_DATA_PROVIDER UseInternalDataProvider
// Solver
#define SC_UNONAME_TIMEOUT Timeout
diff --git a/sc/source/ui/unoobj/chart2uno.cxx
b/sc/source/ui/unoobj/chart2uno.cxx
index 53656cb..5ea6f54 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -76,7 +76,8 @@
{
static SfxItemPropertyMapEntry aDataProviderPropertyMap_Impl[] =
{
-{MAP_CHAR_LEN(SC_UNONAME_INCLUDEHIDDENCELLS), 0,
getBooleanCppuType(), 0, 0 },
+{ MAP_CHAR_LEN(SC_UNONAME_INCLUDEHIDDENCELLS), 0,
getBooleanCppuType(), 0, 0 },
+{ MAP_CHAR_LEN(SC_UNONAME_USE_INTERNAL_DATA_PROVIDER), 0,
getBooleanCppuType(), 0, 0 },
{0,0,0,0,0,0}
};
return aDataProviderPropertyMap_Impl;
@@ -2327,6 +2328,11 @@
uno::Any aRet;
if ( rPropertyName == SC_UNONAME_INCLUDEHIDDENCELLS )
aRet = m_bIncludeHiddenCells;
+else if (rPropertyName == SC_UNONAME_USE_INTERNAL_DATA_PROVIDER)
+{
+// This is a read-only property.
+aRet = static_castsal_Bool(m_pDocument-PastingDrawFromOtherDoc());
+}
else
throw beans::UnknownPropertyException();
return aRet;
diff --git a/xmloff/source/chart/SchXMLTools.cxx
b/xmloff/source/chart/SchXMLTools.cxx
index 2c83c3e..e12de82 100644
--- a/xmloff/source/chart/SchXMLTools.cxx
+++ b/xmloff/source/chart/SchXMLTools.cxx
@@ -380,14 +380,34 @@
return xRet;
}
-try
+bool bUseInternal = false;
+uno::Referencebeans::XPropertySet xPropSet(xDataProvider,
uno::UNO_QUERY);
+if (xPropSet.is())
{
-xRet.set( xDataProvider-createDataSequenceByRangeRepresentation(
lcl_ConvertRange( rRange, xDataProvider )));
-SchXMLTools::setXMLRangePropertyAtDataSequence( xRet, rRange );
+try
+{
+sal_Bool bVal;
+uno::Any any =
xPropSet-getPropertyValue(UseInternalDataProvider);
+if (any = bVal)
+bUseInternal = static_castbool(bVal);
+}
+catch (const beans::UnknownPropertyException)
+{
+// Do nothing
+}
}
-catch( const lang::IllegalArgumentException )
+
+if (!bUseInternal)
{
-OSL_FAIL( could not create data sequence );
+try
+{
+xRet.set( xDataProvider-createDataSequenceByRangeRepresentation(
lcl_ConvertRange( rRange, xDataProvider )));
+SchXMLTools::setXMLRangePropertyAtDataSequence( xRet, rRange );
+}
+catch( const lang::IllegalArgumentException )
+{
+OSL_FAIL( could not create data sequence );
+}
}
if( !xRet.is() !xChartDoc-hasInternalDataProvider()
!rRange.isEmpty() )
--
To view, visit https://gerrit.libreoffice.org/1846
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If1dbc854c5faae62f06ece155fad470b229ca0c7
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0-0
Gerrit-Owner: Kohei Yoshida kohei.yosh...@gmail.com
Gerrit-Reviewer: Noel Power noel.po...@suse.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0]: bnc#798271: Don't delete the PropertyMapEntry instance prema...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1858
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/58/1858/1
bnc#798271: Don't delete the PropertyMapEntry instance prematurely.
When using comphelper::PropertyMapEntry array to create a UNO property
set, we need to make sure we keep this instance while the property set
object is alive, else it would cause a very hard-to-debug problem down
the road...
In this particular case, the aExportInfoMap array instance was destroyed
when it went out of scope, but the xInfoSet which references it was used
afterward.
Change-Id: I02132b6b2e6bef7b461f0f77c2c4a3e911e42014
---
M chart2/source/model/filter/XMLFilter.cxx
1 file changed, 17 insertions(+), 19 deletions(-)
diff --git a/chart2/source/model/filter/XMLFilter.cxx
b/chart2/source/model/filter/XMLFilter.cxx
index 10a565a..75692c4 100644
--- a/chart2/source/model/filter/XMLFilter.cxx
+++ b/chart2/source/model/filter/XMLFilter.cxx
@@ -631,28 +631,26 @@
xServiceFactory-createInstanceWithArguments(
C2U(com.sun.star.comp.Svx.GraphicExportHelper),
aGraphicResolverArgs ), uno::UNO_QUERY );
-uno::Reference beans::XPropertySet xInfoSet;
+// property map for export info set
+comphelper::PropertyMapEntry aExportInfoMap[] =
{
-// property map for export info set
-comphelper::PropertyMapEntry aExportInfoMap[] =
-{
-{ MAP_LEN(UsePrettyPrinting), 0, ::getBooleanCppuType(),
beans::PropertyAttribute::MAYBEVOID, 0},
-{ MAP_LEN(BaseURI), 0, ::getCppuType( (OUString *)0 ),
beans::PropertyAttribute::MAYBEVOID, 0 },
-{ MAP_LEN(StreamRelPath), 0, ::getCppuType( (OUString *)0
), beans::PropertyAttribute::MAYBEVOID, 0 },
-{ MAP_LEN(StreamName), 0, ::getCppuType( (OUString *)0 ),
beans::PropertyAttribute::MAYBEVOID, 0 },
-{ MAP_LEN(ExportTableNumberList), 0,
::getBooleanCppuType(), beans::PropertyAttribute::MAYBEVOID, 0 },
-{ NULL, 0, 0, NULL, 0, 0 }
-};
+{ MAP_LEN(UsePrettyPrinting), 0, ::getBooleanCppuType(),
beans::PropertyAttribute::MAYBEVOID, 0},
+{ MAP_LEN(BaseURI), 0, ::getCppuType( (OUString *)0 ),
beans::PropertyAttribute::MAYBEVOID, 0 },
+{ MAP_LEN(StreamRelPath), 0, ::getCppuType( (OUString *)0 ),
beans::PropertyAttribute::MAYBEVOID, 0 },
+{ MAP_LEN(StreamName), 0, ::getCppuType( (OUString *)0 ),
beans::PropertyAttribute::MAYBEVOID, 0 },
+{ MAP_LEN(ExportTableNumberList), 0, ::getBooleanCppuType(),
beans::PropertyAttribute::MAYBEVOID, 0 },
+{ NULL, 0, 0, NULL, 0, 0 }
+};
-xInfoSet = comphelper::GenericPropertySet_CreateInstance( new
comphelper::PropertySetInfo( aExportInfoMap ) );
+uno::Reference beans::XPropertySet xInfoSet =
+comphelper::GenericPropertySet_CreateInstance( new
comphelper::PropertySetInfo( aExportInfoMap ) );
-SvtSaveOptions aSaveOpt;
-OUString
sUsePrettyPrinting(RTL_CONSTASCII_USTRINGPARAM(UsePrettyPrinting));
-sal_Bool bUsePrettyPrinting( aSaveOpt.IsPrettyPrinting() );
-xInfoSet-setPropertyValue( sUsePrettyPrinting, uno::makeAny(
bUsePrettyPrinting ) );
-if( ! bOasis )
-xInfoSet-setPropertyValue( C2U(ExportTableNumberList),
uno::makeAny( true ));
-}
+SvtSaveOptions aSaveOpt;
+OUString
sUsePrettyPrinting(RTL_CONSTASCII_USTRINGPARAM(UsePrettyPrinting));
+sal_Bool bUsePrettyPrinting( aSaveOpt.IsPrettyPrinting() );
+xInfoSet-setPropertyValue( sUsePrettyPrinting, uno::makeAny(
bUsePrettyPrinting ) );
+if( ! bOasis )
+xInfoSet-setPropertyValue( C2U(ExportTableNumberList),
uno::makeAny( true ));
sal_Int32 nArgs = 2;
if( xGraphicObjectResolver.is())
--
To view, visit https://gerrit.libreoffice.org/1858
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I02132b6b2e6bef7b461f0f77c2c4a3e911e42014
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Kohei Yoshida kohei.yosh...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-3-6]: bnc#798271: Don't delete the PropertyMapEntry instance prema...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1859
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/59/1859/1
bnc#798271: Don't delete the PropertyMapEntry instance prematurely.
When using comphelper::PropertyMapEntry array to create a UNO property
set, we need to make sure we keep this instance while the property set
object is alive, else it would cause a very hard-to-debug problem down
the road...
In this particular case, the aExportInfoMap array instance was destroyed
when it went out of scope, but the xInfoSet which references it was used
afterward.
Change-Id: I02132b6b2e6bef7b461f0f77c2c4a3e911e42014
---
M chart2/source/model/filter/XMLFilter.cxx
1 file changed, 17 insertions(+), 19 deletions(-)
diff --git a/chart2/source/model/filter/XMLFilter.cxx
b/chart2/source/model/filter/XMLFilter.cxx
index 2a6e35b..551e9b2 100644
--- a/chart2/source/model/filter/XMLFilter.cxx
+++ b/chart2/source/model/filter/XMLFilter.cxx
@@ -644,28 +644,26 @@
xServiceFactory-createInstanceWithArguments(
C2U(com.sun.star.comp.Svx.GraphicExportHelper),
aGraphicResolverArgs ), uno::UNO_QUERY );
-uno::Reference beans::XPropertySet xInfoSet;
+// property map for export info set
+comphelper::PropertyMapEntry aExportInfoMap[] =
{
-// property map for export info set
-comphelper::PropertyMapEntry aExportInfoMap[] =
-{
-{ MAP_LEN(UsePrettyPrinting), 0, ::getBooleanCppuType(),
beans::PropertyAttribute::MAYBEVOID, 0},
-{ MAP_LEN(BaseURI), 0, ::getCppuType( (OUString *)0 ),
beans::PropertyAttribute::MAYBEVOID, 0 },
-{ MAP_LEN(StreamRelPath), 0, ::getCppuType( (OUString *)0
), beans::PropertyAttribute::MAYBEVOID, 0 },
-{ MAP_LEN(StreamName), 0, ::getCppuType( (OUString *)0 ),
beans::PropertyAttribute::MAYBEVOID, 0 },
-{ MAP_LEN(ExportTableNumberList), 0,
::getBooleanCppuType(), beans::PropertyAttribute::MAYBEVOID, 0 },
-{ NULL, 0, 0, NULL, 0, 0 }
-};
+{ MAP_LEN(UsePrettyPrinting), 0, ::getBooleanCppuType(),
beans::PropertyAttribute::MAYBEVOID, 0},
+{ MAP_LEN(BaseURI), 0, ::getCppuType( (OUString *)0 ),
beans::PropertyAttribute::MAYBEVOID, 0 },
+{ MAP_LEN(StreamRelPath), 0, ::getCppuType( (OUString *)0 ),
beans::PropertyAttribute::MAYBEVOID, 0 },
+{ MAP_LEN(StreamName), 0, ::getCppuType( (OUString *)0 ),
beans::PropertyAttribute::MAYBEVOID, 0 },
+{ MAP_LEN(ExportTableNumberList), 0, ::getBooleanCppuType(),
beans::PropertyAttribute::MAYBEVOID, 0 },
+{ NULL, 0, 0, NULL, 0, 0 }
+};
-xInfoSet = comphelper::GenericPropertySet_CreateInstance( new
comphelper::PropertySetInfo( aExportInfoMap ) );
+uno::Reference beans::XPropertySet xInfoSet =
+comphelper::GenericPropertySet_CreateInstance( new
comphelper::PropertySetInfo( aExportInfoMap ) );
-SvtSaveOptions aSaveOpt;
-OUString
sUsePrettyPrinting(RTL_CONSTASCII_USTRINGPARAM(UsePrettyPrinting));
-sal_Bool bUsePrettyPrinting( aSaveOpt.IsPrettyPrinting() );
-xInfoSet-setPropertyValue( sUsePrettyPrinting, uno::makeAny(
bUsePrettyPrinting ) );
-if( ! bOasis )
-xInfoSet-setPropertyValue( C2U(ExportTableNumberList),
uno::makeAny( true ));
-}
+SvtSaveOptions aSaveOpt;
+OUString
sUsePrettyPrinting(RTL_CONSTASCII_USTRINGPARAM(UsePrettyPrinting));
+sal_Bool bUsePrettyPrinting( aSaveOpt.IsPrettyPrinting() );
+xInfoSet-setPropertyValue( sUsePrettyPrinting, uno::makeAny(
bUsePrettyPrinting ) );
+if( ! bOasis )
+xInfoSet-setPropertyValue( C2U(ExportTableNumberList),
uno::makeAny( true ));
sal_Int32 nArgs = 2;
if( xGraphicObjectResolver.is())
--
To view, visit https://gerrit.libreoffice.org/1859
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I02132b6b2e6bef7b461f0f77c2c4a3e911e42014
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Kohei Yoshida kohei.yosh...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0-0]: bnc#798271: Don't delete the PropertyMapEntry instance prema...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1860
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/60/1860/1
bnc#798271: Don't delete the PropertyMapEntry instance prematurely.
When using comphelper::PropertyMapEntry array to create a UNO property
set, we need to make sure we keep this instance while the property set
object is alive, else it would cause a very hard-to-debug problem down
the road...
In this particular case, the aExportInfoMap array instance was destroyed
when it went out of scope, but the xInfoSet which references it was used
afterward.
Change-Id: I02132b6b2e6bef7b461f0f77c2c4a3e911e42014
---
M chart2/source/model/filter/XMLFilter.cxx
1 file changed, 17 insertions(+), 19 deletions(-)
diff --git a/chart2/source/model/filter/XMLFilter.cxx
b/chart2/source/model/filter/XMLFilter.cxx
index 10a565a..75692c4 100644
--- a/chart2/source/model/filter/XMLFilter.cxx
+++ b/chart2/source/model/filter/XMLFilter.cxx
@@ -631,28 +631,26 @@
xServiceFactory-createInstanceWithArguments(
C2U(com.sun.star.comp.Svx.GraphicExportHelper),
aGraphicResolverArgs ), uno::UNO_QUERY );
-uno::Reference beans::XPropertySet xInfoSet;
+// property map for export info set
+comphelper::PropertyMapEntry aExportInfoMap[] =
{
-// property map for export info set
-comphelper::PropertyMapEntry aExportInfoMap[] =
-{
-{ MAP_LEN(UsePrettyPrinting), 0, ::getBooleanCppuType(),
beans::PropertyAttribute::MAYBEVOID, 0},
-{ MAP_LEN(BaseURI), 0, ::getCppuType( (OUString *)0 ),
beans::PropertyAttribute::MAYBEVOID, 0 },
-{ MAP_LEN(StreamRelPath), 0, ::getCppuType( (OUString *)0
), beans::PropertyAttribute::MAYBEVOID, 0 },
-{ MAP_LEN(StreamName), 0, ::getCppuType( (OUString *)0 ),
beans::PropertyAttribute::MAYBEVOID, 0 },
-{ MAP_LEN(ExportTableNumberList), 0,
::getBooleanCppuType(), beans::PropertyAttribute::MAYBEVOID, 0 },
-{ NULL, 0, 0, NULL, 0, 0 }
-};
+{ MAP_LEN(UsePrettyPrinting), 0, ::getBooleanCppuType(),
beans::PropertyAttribute::MAYBEVOID, 0},
+{ MAP_LEN(BaseURI), 0, ::getCppuType( (OUString *)0 ),
beans::PropertyAttribute::MAYBEVOID, 0 },
+{ MAP_LEN(StreamRelPath), 0, ::getCppuType( (OUString *)0 ),
beans::PropertyAttribute::MAYBEVOID, 0 },
+{ MAP_LEN(StreamName), 0, ::getCppuType( (OUString *)0 ),
beans::PropertyAttribute::MAYBEVOID, 0 },
+{ MAP_LEN(ExportTableNumberList), 0, ::getBooleanCppuType(),
beans::PropertyAttribute::MAYBEVOID, 0 },
+{ NULL, 0, 0, NULL, 0, 0 }
+};
-xInfoSet = comphelper::GenericPropertySet_CreateInstance( new
comphelper::PropertySetInfo( aExportInfoMap ) );
+uno::Reference beans::XPropertySet xInfoSet =
+comphelper::GenericPropertySet_CreateInstance( new
comphelper::PropertySetInfo( aExportInfoMap ) );
-SvtSaveOptions aSaveOpt;
-OUString
sUsePrettyPrinting(RTL_CONSTASCII_USTRINGPARAM(UsePrettyPrinting));
-sal_Bool bUsePrettyPrinting( aSaveOpt.IsPrettyPrinting() );
-xInfoSet-setPropertyValue( sUsePrettyPrinting, uno::makeAny(
bUsePrettyPrinting ) );
-if( ! bOasis )
-xInfoSet-setPropertyValue( C2U(ExportTableNumberList),
uno::makeAny( true ));
-}
+SvtSaveOptions aSaveOpt;
+OUString
sUsePrettyPrinting(RTL_CONSTASCII_USTRINGPARAM(UsePrettyPrinting));
+sal_Bool bUsePrettyPrinting( aSaveOpt.IsPrettyPrinting() );
+xInfoSet-setPropertyValue( sUsePrettyPrinting, uno::makeAny(
bUsePrettyPrinting ) );
+if( ! bOasis )
+xInfoSet-setPropertyValue( C2U(ExportTableNumberList),
uno::makeAny( true ));
sal_Int32 nArgs = 2;
if( xGraphicObjectResolver.is())
--
To view, visit https://gerrit.libreoffice.org/1860
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I02132b6b2e6bef7b461f0f77c2c4a3e911e42014
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0-0
Gerrit-Owner: Kohei Yoshida kohei.yosh...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Change in core[libreoffice-4-0]: import inherited number formats with cached values, fdo#5972...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1866 Approvals: Kohei Yoshida: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1866 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I698f60daf4e591b57d8d99c130d2e524dc10c306 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@gmail.com Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0]: bnc#590020: Sort data points stably.
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1871 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/71/1871/1 bnc#590020: Sort data points stably. std::sort is unstable sort, which is not what we want. Use std::stable_sort to sort data points by X values. If we use unstable sort, it may mess up the order of the sequence when two data points contain identical X values. Change-Id: I6453a986185b326dc680fbcec6227ea332235b22 --- M chart2/source/view/main/VDataSeries.cxx 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chart2/source/view/main/VDataSeries.cxx b/chart2/source/view/main/VDataSeries.cxx index f0e267c..fcd69ff 100644 --- a/chart2/source/view/main/VDataSeries.cxx +++ b/chart2/source/view/main/VDataSeries.cxx @@ -304,7 +304,7 @@ } //do sort -std::sort( aTmp.begin(), aTmp.end(), lcl_LessXOfPoint() ); +std::stable_sort( aTmp.begin(), aTmp.end(), lcl_LessXOfPoint() ); //fill the sorted points back to the members m_aValues_X.Doubles.realloc( m_nPointCount ); -- To view, visit https://gerrit.libreoffice.org/1871 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6453a986185b326dc680fbcec6227ea332235b22 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Kohei Yoshida kohei.yosh...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-3-6]: bnc#590020: Sort data points stably.
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1872 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/72/1872/1 bnc#590020: Sort data points stably. std::sort is unstable sort, which is not what we want. Use std::stable_sort to sort data points by X values. If we use unstable sort, it may mess up the order of the sequence when two data points contain identical X values. Change-Id: I6453a986185b326dc680fbcec6227ea332235b22 --- M chart2/source/view/main/VDataSeries.cxx 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chart2/source/view/main/VDataSeries.cxx b/chart2/source/view/main/VDataSeries.cxx index 9fc7695..811422b 100644 --- a/chart2/source/view/main/VDataSeries.cxx +++ b/chart2/source/view/main/VDataSeries.cxx @@ -313,7 +313,7 @@ } //do sort -std::sort( aTmp.begin(), aTmp.end(), lcl_LessXOfPoint() ); +std::stable_sort( aTmp.begin(), aTmp.end(), lcl_LessXOfPoint() ); //fill the sorted points back to the members m_aValues_X.Doubles.realloc( m_nPointCount ); -- To view, visit https://gerrit.libreoffice.org/1872 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6453a986185b326dc680fbcec6227ea332235b22 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Kohei Yoshida kohei.yosh...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0]: fdo#59056: Re-calculate cell anchor position of a pasted dra...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1869
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/69/1869/1
fdo#59056: Re-calculate cell anchor position of a pasted drawing object.
Else it would re-use the anchor position of the original one (minus the
sheet index which is correctly adjusted).
Change-Id: I52d11eb9953ee7539c9d5da41edd7dd28604587c
---
M sc/inc/drwlayer.hxx
M sc/source/core/data/drwlayer.cxx
M sc/source/ui/view/viewfun7.cxx
3 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/sc/inc/drwlayer.hxx b/sc/inc/drwlayer.hxx
index 298d619..72b980d 100644
--- a/sc/inc/drwlayer.hxx
+++ b/sc/inc/drwlayer.hxx
@@ -166,6 +166,7 @@
String GetNewGraphicName( long* pnCounter = NULL ) const;
voidEnsureGraphicNames();
+static bool IsCellAnchored( const SdrObject rObj );
static void SetPageAnchored( SdrObject );
static void SetCellAnchored( SdrObject, const ScDrawObjData
rAnchor );
// Updates rAnchor based on position of rObj
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index 76d6794..8ea4fca 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -1787,6 +1787,13 @@
pAnchor-maEndOffset.X() = aCellRect.Right()-aObjRect.Left();
}
+bool ScDrawLayer::IsCellAnchored( const SdrObject rObj )
+{
+// Cell anchored object always has a user data, to store the anchor cell
+// info. If it doesn't then it's page-anchored.
+return GetFirstUserDataOfType(rObj, SC_UD_OBJDATA) != NULL;
+}
+
void ScDrawLayer::SetPageAnchored( SdrObject rObj )
{
DeleteFirstUserDataOfType(rObj, SC_UD_OBJDATA);
diff --git a/sc/source/ui/view/viewfun7.cxx b/sc/source/ui/view/viewfun7.cxx
index c69dc65..63e2f1a 100644
--- a/sc/source/ui/view/viewfun7.cxx
+++ b/sc/source/ui/view/viewfun7.cxx
@@ -172,8 +172,8 @@
pDestPage-InsertObject( pNeuObj );
pScDrawView-AddUndo(new SdrUndoInsertObj( *pNeuObj ));
-// Chart braucht nicht mehr getrennt behandelt zu werden,
-// weil es seine Daten jetzt selber hat
+if (ScDrawLayer::IsCellAnchored(*pNeuObj))
+ScDrawLayer::SetCellAnchoredFromPosition(*pNeuObj,
*GetViewData()-GetDocument(), nTab);
}
}
@@ -238,6 +238,10 @@
{
if ( pObject-ISA(SdrUnoObj) pObject-GetLayer() !=
SC_LAYER_CONTROLS )
pObject-NbcSetLayer(SC_LAYER_CONTROLS);
+
+if (ScDrawLayer::IsCellAnchored(*pObject))
+ScDrawLayer::SetCellAnchoredFromPosition(*pObject,
*GetViewData()-GetDocument(), nTab);
+
pObject = aIter.Next();
}
}
--
To view, visit https://gerrit.libreoffice.org/1869
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I52d11eb9953ee7539c9d5da41edd7dd28604587c
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Kohei Yoshida kohei.yosh...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0]: fdo#58988, fdo#58562: Populate draw clip document with data ...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1757
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/57/1757/1
fdo#58988, fdo#58562: Populate draw clip document with data for charts.
Without populating the clip document, copying a chart (or charts) into
clipboard makes the charts lose all their referenced data, which causes
the pasted chart to appear empty.
Conflicts:
sc/source/ui/view/drawvie4.cxx
Change-Id: I0e7ce7cfbcdb3c9f120c6f0c72c58ab320901e6b
---
M sc/inc/column.hxx
M sc/inc/document.hxx
M sc/inc/table.hxx
M sc/qa/unit/ucalc.cxx
M sc/source/core/data/column.cxx
M sc/source/core/data/document.cxx
M sc/source/core/data/table2.cxx
M sc/source/ui/view/drawvie4.cxx
8 files changed, 362 insertions(+), 6 deletions(-)
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 7abce09..3e927c8 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -168,6 +168,7 @@
voidDeleteRange( SCSIZE nStartIndex, SCSIZE nEndIndex, sal_uInt16
nDelFlag );
voidDeleteArea(SCROW nStartRow, SCROW nEndRow, sal_uInt16 nDelFlag
);
void CopyToClip(SCROW nRow1, SCROW nRow2, ScColumn rColumn, bool
bKeepScenarioFlags) const;
+void CopyStaticToDocument(SCROW nRow1, SCROW nRow2, ScColumn rDestCol);
voidCopyFromClip(SCROW nRow1, SCROW nRow2, long nDy,
sal_uInt16 nInsFlag, bool bAsLink, bool
bSkipAttrForEmpty, ScColumn rColumn);
voidStartListeningInArea( SCROW nRow1, SCROW nRow2 );
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 76df284..c7c09d8 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1027,6 +1027,16 @@
const ScMarkData* pMarks = NULL, bool bAllTabs
= false, bool bKeepScenarioFlags = false,
bool bIncludeObjects = false, bool
bCloneNoteCaptions = true, bool bUseRangeForVBA = false );
+/**
+ * Copy only raw cell values to another document. Formula cells are
+ * converted to raw cells. No formatting info are copied.
+ *
+ * @param rSrcRange source range in the source document
+ * @param nDestTab table in the clip document to copy to.
+ * @param pDestDoc document to copy to
+ */
+void CopyStaticToDocument(const ScRange rSrcRange, SCTAB nDestTab,
ScDocument* pDestDoc);
+
voidCopyTabToClip(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW
nRow2,
SCTAB nTab, ScDocument* pClipDoc = NULL);
voidCopyBlockFromClip( SCCOL nCol1, SCROW nRow1, SCCOL nCol2,
SCROW nRow2,
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 512dee2..26d5a69 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -350,6 +350,7 @@
bool bKeepScenarioFlags, bool bCloneNoteCaptions);
voidCopyToClip(const ScRangeList rRanges, ScTable* pTable,
bool bKeepScenarioFlags, bool bCloneNoteCaptions);
+void CopyStaticToDocument(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW
nRow2, ScTable* pDestTab);
voidCopyFromClip(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW
nRow2, SCsCOL nDx, SCsROW nDy,
sal_uInt16 nInsFlag, bool bAsLink, bool
bSkipAttrForEmpty, ScTable* pTable);
voidStartListeningInArea( SCCOL nCol1, SCROW nRow1,
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 14d0da1..11ca7fe 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -117,7 +117,7 @@
void testRangeList();
void testInput();
void testCellFunctions();
-
+void testCopyToDocument();
/**
* Make sure the SHEETS function gets properly updated during sheet
* insertion and removal.
@@ -263,6 +263,7 @@
CPPUNIT_TEST(testRangeList);
CPPUNIT_TEST(testInput);
CPPUNIT_TEST(testCellFunctions);
+CPPUNIT_TEST(testCopyToDocument);
CPPUNIT_TEST(testSheetsFunc);
CPPUNIT_TEST(testVolatileFunc);
CPPUNIT_TEST(testFormulaDepTracking);
@@ -1146,6 +1147,34 @@
m_pDoc-DeleteTab(0);
}
+void Test::testCopyToDocument()
+{
+CPPUNIT_ASSERT_MESSAGE (failed to insert sheet, m_pDoc-InsertTab (0,
src));
+
+m_pDoc-SetString(0, 0, 0, Header);
+m_pDoc-SetString(0, 1, 0, 1);
+m_pDoc-SetString(0, 2, 0, 2);
+m_pDoc-SetString(0, 3, 0, 3);
+m_pDoc-SetString(0, 4, 0, =4/2);
+m_pDoc-CalcAll();
+
+// Copy statically to another document.
+
+ScDocument aDestDoc(SCDOCMODE_DOCUMENT);
+aDestDoc.InsertTab(0, src);
+m_pDoc-CopyStaticToDocument(ScRange(0,1,0,0,3,0), 0, aDestDoc); // Copy
A2:A4
+m_pDoc-CopyStaticToDocument(ScAddress(0,0,0), 0, aDestDoc); // Copy A1
+m_pDoc-CopyStaticToDocument(ScRange(0,4,0,0,7,0), 0, aDestDoc); // Copy
A5:A8
+
+CPPUNIT_ASSERT_EQUAL(m_pDoc-GetString(0,0,0), aDestDoc.GetString(0,0,0));
+CPPUNIT_ASSERT_EQUAL(m_pDoc-GetString(0,1,0), aDestDoc.GetString(0,1,0));
[PUSHED] Change in core[libreoffice-4-0]: reset one of the sort containers before refilling, fdo#57465
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1752 Approvals: Kohei Yoshida: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1752 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I758af67efec980a56ec83d8e5e6f5f60a0523ac5 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Change in core[libreoffice-3-6]: reset one of the sort containers before refilling, fdo#57465
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1753 Approvals: Kohei Yoshida: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1753 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I758af67efec980a56ec83d8e5e6f5f60a0523ac5 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Markus Mohrhard markus.mohrh...@googlemail.com Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-3-6]: fdo#59084: Sync dimension members after reloading the group ...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1651
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/51/1651/1
fdo#59084: Sync dimension members after reloading the group data.
Else the syncing would end up syncing to the older version of the
group data before the reload, which (as you can see in the bug report)
may lead to a crash.
Change-Id: Ibd674a97a59205e5e28efd007f8857731e8df4d3
Reviewed-on: https://gerrit.libreoffice.org/1635
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
---
M sc/source/ui/docshell/dbdocfun.cxx
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sc/source/ui/docshell/dbdocfun.cxx
b/sc/source/ui/docshell/dbdocfun.cxx
index e424763..5216c68 100644
--- a/sc/source/ui/docshell/dbdocfun.cxx
+++ b/sc/source/ui/docshell/dbdocfun.cxx
@@ -1330,6 +1330,8 @@
if ( pDestObj )
{
pDestObj-ReloadGroupTableData();
+if (!pDestObj-SyncAllDimensionMembers())
+return false;
pDestObj-InvalidateData(); // before getting the
new output area
// make sure the table has a name (not set by dialog)
@@ -1472,8 +1474,6 @@
for (; it != itEnd; ++it)
{
ScDPObject* pObj = *it;
-if (!pObj-SyncAllDimensionMembers())
-continue;
// This action is intentionally not undoable since it modifies cache.
DataPilotUpdate(pObj, pObj, false, bApi);
--
To view, visit https://gerrit.libreoffice.org/1651
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibd674a97a59205e5e28efd007f8857731e8df4d3
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Kohei Yoshida kohei.yosh...@gmail.com
Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0]: Let's not return here to prevent memory leak.
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1653
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/53/1653/1
Let's not return here to prevent memory leak.
There are several heap objects that are deleted at the end of the
method. Returning prematurely would leak those objects.
Change-Id: If70cb3c9c02e47229d10b30f1542f7b25534d593
---
M sc/source/ui/docshell/dbdocfun.cxx
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/sc/source/ui/docshell/dbdocfun.cxx
b/sc/source/ui/docshell/dbdocfun.cxx
index 3b1db2f..9f4d58d 100644
--- a/sc/source/ui/docshell/dbdocfun.cxx
+++ b/sc/source/ui/docshell/dbdocfun.cxx
@@ -1319,8 +1319,7 @@
if ( pDestObj )
{
pDestObj-ReloadGroupTableData();
-if (!pDestObj-SyncAllDimensionMembers())
-return false;
+pDestObj-SyncAllDimensionMembers();
pDestObj-InvalidateData(); // before getting the
new output area
// make sure the table has a name (not set by dialog)
--
To view, visit https://gerrit.libreoffice.org/1653
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If70cb3c9c02e47229d10b30f1542f7b25534d593
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Kohei Yoshida kohei.yosh...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-3-6]: Let's not return here to prevent memory leak.
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1654
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/54/1654/1
Let's not return here to prevent memory leak.
There are several heap objects that are deleted at the end of the
method. Returning prematurely would leak those objects.
Change-Id: If70cb3c9c02e47229d10b30f1542f7b25534d593
---
M sc/source/ui/docshell/dbdocfun.cxx
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/sc/source/ui/docshell/dbdocfun.cxx
b/sc/source/ui/docshell/dbdocfun.cxx
index 5216c68..9fea320 100644
--- a/sc/source/ui/docshell/dbdocfun.cxx
+++ b/sc/source/ui/docshell/dbdocfun.cxx
@@ -1330,8 +1330,7 @@
if ( pDestObj )
{
pDestObj-ReloadGroupTableData();
-if (!pDestObj-SyncAllDimensionMembers())
-return false;
+pDestObj-SyncAllDimensionMembers();
pDestObj-InvalidateData(); // before getting the
new output area
// make sure the table has a name (not set by dialog)
--
To view, visit https://gerrit.libreoffice.org/1654
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If70cb3c9c02e47229d10b30f1542f7b25534d593
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Kohei Yoshida kohei.yosh...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Resolves: fdo#58865 hard-coded LibreOffice strings
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1656 Approvals: Kohei Yoshida: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1656 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie03106c3089f6d1bc0172a2e2c702b5725e55acf Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Caolán McNamara caol...@redhat.com Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0]: fdo#58531: Register cells with external references at compil...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1631
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/31/1631/1
fdo#58531: Register cells with external references at compile time.
In the old code, we would do this during interpretation. But we need
to move that to the compilation to make this work properly without
full recalculation during ods import.
For 4.0, we'll just add calls to insertRefCells in ScCompiler. On
master we should remove these calls from the old places to avoid
duplicate calls. Duplicate calls for the same external file ID - cell
address pair will not hurt; it just adds more overhead.
Change-Id: I25cf2e08195da17c6c8f7d19c74d744df6e1638e
---
M sc/inc/compiler.hxx
M sc/inc/externalrefmgr.hxx
M sc/source/core/tool/compiler.cxx
3 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index d40d261..10af901 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -331,6 +331,7 @@
ExtendedErrorDetection meExtendedErrorDetection;
boolmbCloseBrackets;// whether to close open brackets
automatically, default TRUE
boolmbRewind; // whether symbol is to be rewound
to some step during lexical analysis
+std::vectorsal_uInt16 maExternalFiles;
bool NextNewToken(bool bInArray = false);
diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx
index 3fd3ab5..87693a3 100644
--- a/sc/inc/externalrefmgr.hxx
+++ b/sc/inc/externalrefmgr.hxx
@@ -679,13 +679,13 @@
*/
bool containsUnsavedReferences() { return !maUnsavedDocShells.empty(); }
+void insertRefCell(sal_uInt16 nFileId, const ScAddress rCell);
+
private:
ScExternalRefManager();
ScExternalRefManager(const ScExternalRefManager);
void refreshAllRefCells(sal_uInt16 nFileId);
-
-void insertRefCell(sal_uInt16 nFileId, const ScAddress rCell);
void fillCellFormat(sal_uLong nFmtIndex, ScExternalRefCache::CellFormat*
pFmt) const;
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index b827019..b6183ba 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -2717,6 +2717,7 @@
const OUString* pRealTab =
pRefMgr-getRealTableName(aExtInfo.mnFileId, aExtInfo.maTabName);
aToken.SetExternalDoubleRef(
aExtInfo.mnFileId, pRealTab ? *pRealTab : aExtInfo.maTabName,
aRef);
+maExternalFiles.push_back(aExtInfo.mnFileId);
}
else
{
@@ -2765,6 +2766,7 @@
const OUString* pRealTab =
pRefMgr-getRealTableName(aExtInfo.mnFileId, aExtInfo.maTabName);
aToken.SetExternalSingleRef(
aExtInfo.mnFileId, pRealTab ? *pRealTab : aExtInfo.maTabName,
aRef);
+maExternalFiles.push_back(aExtInfo.mnFileId);
}
else
aToken.SetSingleReference(aRef);
@@ -2973,6 +2975,7 @@
const OUString* pRealName = pRefMgr-getRealRangeName(nFileId, aName);
aToken.SetExternalName(nFileId, pRealName ? *pRealName : OUString(aTmp));
pRawToken = aToken.Clone();
+maExternalFiles.push_back(nFileId);
return true;
}
@@ -3737,6 +3740,24 @@
rFormulaNmsp = aFormulaNmsp;
}
+namespace {
+
+class ExternalFileInserter : std::unary_functionsal_uInt16, void
+{
+ScAddress maPos;
+ScExternalRefManager mrRefMgr;
+public:
+ExternalFileInserter(const ScAddress rPos, ScExternalRefManager rRefMgr)
:
+maPos(rPos), mrRefMgr(rRefMgr) {}
+
+void operator() (sal_uInt16 nFileId) const
+{
+mrRefMgr.insertRefCell(nFileId, maPos);
+}
+};
+
+}
+
ScTokenArray* ScCompiler::CompileString( const String rFormula )
{
OSL_ENSURE( meGrammar != FormulaGrammar::GRAM_EXTERNAL,
ScCompiler::CompileString - unexpected grammar GRAM_EXTERNAL );
@@ -3943,6 +3964,16 @@
// remember pArr, in case a subsequent CompileTokenArray() is executed.
ScTokenArray* pNew = new ScTokenArray( aArr );
pArr = pNew;
+
+if (!maExternalFiles.empty())
+{
+// Remove duplicates, and register all external files found in this
cell.
+std::sort(maExternalFiles.begin(), maExternalFiles.end());
+std::vectorsal_uInt16::iterator itEnd =
std::unique(maExternalFiles.begin(), maExternalFiles.end());
+std::for_each(maExternalFiles.begin(), itEnd,
ExternalFileInserter(aPos, *pDoc-GetExternalRefManager()));
+maExternalFiles.erase(itEnd, maExternalFiles.end());
+}
+
return pNew;
}
--
To view, visit https://gerrit.libreoffice.org/1631
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I25cf2e08195da17c6c8f7d19c74d744df6e1638e
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Kohei Yoshida kohei.yosh...@gmail.com
[PATCH] Change in core[libreoffice-4-0]: fdo#58069: Invalidate sheet stream cache when directory path...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1634
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/34/1634/1
fdo#58069: Invalidate sheet stream cache when directory path changes.
To properly regenerate hyperlinks (among other things) which depend on
the full path of the host document.
Change-Id: I44fdd5b0ef0a57bf4fae13f29f1ebacfe1ab19a8
---
M sc/inc/document.hxx
M sc/source/core/data/document.cxx
M sc/source/ui/docshell/docsh.cxx
3 files changed, 49 insertions(+), 1 deletion(-)
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 5b5a472..76df284 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -571,6 +571,7 @@
void AppendTabOnLoad(const rtl::OUString rName);
void SetTabNameOnLoad(SCTAB nTab, const rtl::OUString rName);
+void InvalidateStreamOnSave();
SC_DLLPUBLIC bool InsertTab( SCTAB nPos, const rtl::OUString
rName,
bool bExternalDocument = false );
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 9d8a8c3..65e904f 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -402,6 +402,17 @@
maTabs[nTab]-SetName(rName);
}
+void ScDocument::InvalidateStreamOnSave()
+{
+TableContainer::iterator it = maTabs.begin(), itEnd = maTabs.end();
+for (; it != itEnd; ++it)
+{
+ScTable* pTab = *it;
+if (pTab)
+pTab-SetStreamValid(false);
+}
+}
+
bool ScDocument::InsertTab( SCTAB nPos, const rtl::OUString rName,
bool bExternalDocument )
{
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 291f5e0..948f622 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -34,6 +34,7 @@
#include sfx2/objface.hxx
#include svl/documentlockfile.hxx
#include svl/sharecontrolfile.hxx
+#include svl/urihelper.hxx
#include chgtrack.hxx
#include chgviset.hxx
#include com/sun/star/awt/Key.hpp
@@ -1526,10 +1527,45 @@
return bRet;
}
+namespace {
+
+/**
+ * Remove the file name from the full path, to keep only the directory path.
+ */
+void popFileName(OUString rPath)
+{
+if (!rPath.isEmpty())
+{
+INetURLObject aURLObj(rPath);
+aURLObj.removeSegment();
+rPath = aURLObj.GetMainURL(INetURLObject::NO_DECODE);
+}
+}
+
+}
sal_Bool ScDocShell::SaveAs( SfxMedium rMedium )
{
-RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, sc, nn93723, ScDocShell::SaveAs );
+OUString aCurPath; // empty for new document that hasn't been saved.
+const SfxMedium* pCurMedium = GetMedium();
+if (pCurMedium)
+{
+aCurPath = pCurMedium-GetName();
+popFileName(aCurPath);
+}
+
+if (!aCurPath.isEmpty())
+{
+// current document has a path - not a brand-new document.
+OUString aNewPath = rMedium.GetName();
+popFileName(aNewPath);
+OUString aRel = URIHelper::simpleNormalizedMakeRelative(aCurPath,
aNewPath);
+if (!aRel.isEmpty())
+{
+// Directory path will change before and after the save.
+aDocument.InvalidateStreamOnSave();
+}
+}
ScTabViewShell* pViewShell = GetBestViewShell();
bool bNeedsRehash = ScPassHashHelper::needsPassHashRegen(aDocument,
PASSHASH_SHA1);
--
To view, visit https://gerrit.libreoffice.org/1634
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I44fdd5b0ef0a57bf4fae13f29f1ebacfe1ab19a8
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Kohei Yoshida kohei.yosh...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Change in core[libreoffice-4-0]: - fdo#46460 - Missing Circles and Ovals toolbar
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1627 Approvals: Kohei Yoshida: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1627 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I08f2cef9c16ac998663f634653dad37a201f50c5 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Caolán McNamara caol...@redhat.com Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@gmail.com Gerrit-Reviewer: Rob Snelders libreoff...@ertai.nl ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Change in core[libreoffice-4-0]: Resolves: fdo#59112 re-scroll to current entry when dialog r...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1628 Approvals: Kohei Yoshida: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1628 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I96486f6edad11520bf9bb43b700b1716d9b2f170 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Caolán McNamara caol...@redhat.com Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Change in core[libreoffice-4-0]: Resolves: fdo#58301 make sure ScrollBar OptimalSize is up to...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1630 Approvals: Kohei Yoshida: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1630 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I12e95c3594ffbb508c7f79bd512e07aaf44a6eab Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Caolán McNamara caol...@redhat.com Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0]: fdo#59084: Sync dimension members after reloading the group ...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1635
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/35/1635/1
fdo#59084: Sync dimension members after reloading the group data.
Else the syncing would end up syncing to the older version of the
group data before the reload, which (as you can see in the bug report)
may lead to a crash.
Change-Id: Ibd674a97a59205e5e28efd007f8857731e8df4d3
---
M sc/source/ui/docshell/dbdocfun.cxx
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/sc/source/ui/docshell/dbdocfun.cxx
b/sc/source/ui/docshell/dbdocfun.cxx
index 4d0d2ec..94d4f1f 100644
--- a/sc/source/ui/docshell/dbdocfun.cxx
+++ b/sc/source/ui/docshell/dbdocfun.cxx
@@ -1319,6 +1319,8 @@
if ( pDestObj )
{
pDestObj-ReloadGroupTableData();
+if (!pDestObj-SyncAllDimensionMembers())
+return false;
pDestObj-InvalidateData(); // before getting the
new output area
// make sure the table has a name (not set by dialog)
@@ -1461,11 +1463,10 @@
for (; it != itEnd; ++it)
{
ScDPObject* pObj = *it;
-if (!pObj-SyncAllDimensionMembers())
-continue;
// This action is intentionally not undoable since it modifies cache.
-DataPilotUpdate(pObj, pObj, false, bApi);
+if (!DataPilotUpdate(pObj, pObj, false, bApi))
+continue;
}
return 0;
--
To view, visit https://gerrit.libreoffice.org/1635
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibd674a97a59205e5e28efd007f8857731e8df4d3
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Kohei Yoshida kohei.yosh...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0]: fdo#58539: Correctly set cached matrix formula result.
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1623
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/23/1623/1
fdo#58539: Correctly set cached matrix formula result.
During the import, a cached matrix value only has an empty matrix
of correct geometry, plus the token type of the top-left cell. The
rest of the elements are imported as hybrid values. For now, this
seems to do the trick.
In the future we may want to change it to fully populate the matrix
cache value during the import, and skip setting the hybrid values for
the non-top-left elements.
This commit also make several other trivial changes:
* Mark pRawToken mutable so that we can mark those IsFoo() methods
const.
* Move the ScCompiler instance from static instance to member of
ScXMLImport. Since we don't need the instance to persist once the
import is over, this is more appropriate.
Change-Id: I1abde03c0fcd91b02ef4dbf8b5526f7965eaf19c
---
M formula/inc/formula/FormulaCompiler.hxx
M formula/source/core/api/FormulaCompiler.cxx
M sc/inc/cell.hxx
M sc/inc/compiler.hxx
M sc/inc/formularesult.hxx
M sc/inc/token.hxx
M sc/source/core/tool/compiler.cxx
M sc/source/core/tool/formularesult.cxx
M sc/source/core/tool/interpr1.cxx
M sc/source/filter/xml/xmlcelli.cxx
M sc/source/filter/xml/xmlimprt.cxx
M sc/source/filter/xml/xmlimprt.hxx
12 files changed, 70 insertions(+), 14 deletions(-)
diff --git a/formula/inc/formula/FormulaCompiler.hxx
b/formula/inc/formula/FormulaCompiler.hxx
index ce4157d..85295b2 100644
--- a/formula/inc/formula/FormulaCompiler.hxx
+++ b/formula/inc/formula/FormulaCompiler.hxx
@@ -212,6 +212,8 @@
*/
OpCode GetEnglishOpCode( const String rName ) const;
+sal_uInt16 GetErrorConstant( const String rName ) const;
+
voidSetCompileForFAP( bool bVal )
{ bCompileForFAP = bVal; bIgnoreErrors = bVal; }
@@ -265,7 +267,6 @@
virtual void CreateStringFromIndex(rtl::OUStringBuffer
rBuffer,FormulaToken* pTokenP);
virtual void LocalizeString( String rName ); // modify rName - input:
exact name
-sal_uInt16 GetErrorConstant( const String rName );
void AppendErrorConstant( rtl::OUStringBuffer rBuffer, sal_uInt16 nError
);
bool GetToken();
diff --git a/formula/source/core/api/FormulaCompiler.cxx
b/formula/source/core/api/FormulaCompiler.cxx
index 29b6694..f79201b 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -816,7 +816,7 @@
}
//
-
-sal_uInt16 FormulaCompiler::GetErrorConstant( const String rName )
+sal_uInt16 FormulaCompiler::GetErrorConstant( const String rName ) const
{
sal_uInt16 nError = 0;
OpCodeHashMap::const_iterator iLook( mxSymbols-getHashMap()-find(
rName));
diff --git a/sc/inc/cell.hxx b/sc/inc/cell.hxx
index 521a28f..008b510 100644
--- a/sc/inc/cell.hxx
+++ b/sc/inc/cell.hxx
@@ -492,6 +492,11 @@
const formula::FormulaGrammar::Grammar
eGrammar )
{ aResult.SetHybridFormula( r); eTempGrammar =
eGrammar; }
+void SetResultMatrix( SCCOL nCols, SCROW nRows, const ScConstMatrixRef
pMat, formula::FormulaToken* pUL )
+{
+aResult.SetMatrix(nCols, nRows, pMat, pUL);
+}
+
/** For import only: set a double result.
Use this instead of SetHybridDouble() if there is no (temporary)
formula string because the formula is present as a token array, as it
diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index 4aa393d..d40d261 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -320,7 +320,7 @@
sal_Unicode cSymbol[MAXSTRLEN]; // current Symbol
String aFormula; // formula source code
xub_StrLen nSrcPos;// tokenizer position
(source code)
-ScRawTokenRef pRawToken;
+mutable ScRawTokenRef pRawToken;
const CharClass*pCharClass; // which character classification
is used for parseAnyToken
sal_uInt16 mnPredetectedReference; // reference when reading ODF,
0 (none), 1 (single) or 2 (double)
@@ -386,7 +386,7 @@
// Check if it is a valid english function name
bool IsEnglishSymbol( const String rName );
-bool IsErrorConstant( const String );
+bool IsErrorConstant( const String ) const;
//! _either_ CompileForFAP _or_ AutoCorrection, _not_ both
// #i101512# SetCompileForFAP is in formula::FormulaCompiler
diff --git a/sc/inc/formularesult.hxx b/sc/inc/formularesult.hxx
index c4f281f..2128636 100644
--- a/sc/inc/formularesult.hxx
+++ b/sc/inc/formularesult.hxx
@@ -179,6 +179,8 @@
SetHybridFormula() for formula string to be compiled later. */
SC_DLLPUBLIC void SetHybridFormula( const String rFormula );
+SC_DLLPUBLIC void SetMatrix(
[PUSHED] tabs to spaces
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1458 Approvals: Kohei Yoshida: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1458 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4f1c834f28cb49ec0dcb824280d348226ad7e514 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Jack Leigh leigh...@gmx.se Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#58370 - 'Send Feedback...' URL invalid in other language...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1408 Approvals: Kohei Yoshida: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1408 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idfd689c86700fe3b6ec2af477973a2cb484fc29d Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Rob Snelders libreoff...@ertai.nl Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Remove unused method from sc: importBiffRecord
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1410 Approvals: Kohei Yoshida: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1410 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3e3eb7ba3e2e71bb615f64d5f63ca7f8cac00e9c Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@gmail.com Gerrit-Reviewer: Marcos Souza marcos.souza@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Change in core[libreoffice-3-6]: fix fdo#58237 import hyperlinks for shapes in xlsx documents
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1337 Approvals: Kohei Yoshida: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1337 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib0c661dbb3ce9a2f8c8d29707a1cf0c65aadc81f Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Noel Power noel.po...@suse.com Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Change in core[libreoffice-3-6]: fix sometimes data corruption with xlsx import ( with scenar...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1338 Approvals: Kohei Yoshida: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1338 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9357f028f31bec1b1504ca991f5534f80d79c9bc Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Noel Power noel.po...@suse.com Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-3-6]: Do extra check on source range to make sure no funny things ...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1345 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/45/1345/1 Do extra check on source range to make sure no funny things happen. Like a crash in the pivot layout dialog... :-/ Change-Id: I9a330ee3f39ebacb7299d24868bb13ee2a9c3ec5 --- M sc/source/core/data/dpcache.cxx M sc/source/core/data/dpshttab.cxx 2 files changed, 13 insertions(+), 0 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1345 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9a330ee3f39ebacb7299d24868bb13ee2a9c3ec5 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Kohei Yoshida kohei.yosh...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Change in core[libreoffice-3-6]: fdo#52240 added [no-NO] date acceptance patterns D.M; D/M/Y; D...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1287 Approvals: Kohei Yoshida: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1287 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9e07f4307800e99fdff21bccde91af4178b244f3 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Eike Rathke er...@redhat.com Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Change in core[libreoffice-3-6]: fdo#52240 added [hr-HR] date acceptance patterns D/M/Y; D/M
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1288 Approvals: Kohei Yoshida: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1288 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I83afc59e4ac71b18219ace60dcbcabafebd5b525 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Eike Rathke er...@redhat.com Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-3-6]: fdo#57497: Remove group table data when all group dimensions...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1247 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/47/1247/1 fdo#57497: Remove group table data when all group dimensions are gone. Otherwise ungrouping date grouped dimension may crash, or produce incorrect results. Change-Id: I3634e3c0bf8336fc1221f5d234cb7e01eb1f07c6 --- M sc/inc/dpsave.hxx M sc/qa/unit/ucalc.cxx M sc/source/core/data/dpobject.cxx M sc/source/core/data/dpsave.cxx M sc/source/ui/view/dbfunc3.cxx 5 files changed, 86 insertions(+), 37 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1247 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3634e3c0bf8336fc1221f5d234cb7e01eb1f07c6 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Kohei Yoshida kohei.yosh...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Change in core[libreoffice-3-6-4]: resolved fdo#56278 broadcast deletion to dependent formula c...
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1081 Approvals: Markus Mohrhard: Looks good to me, but someone else must approve Kohei Yoshida: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1081 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I63351bfcd9d25cdb2c8618b2dbf45a9430e97daf Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6-4 Gerrit-Owner: Eike Rathke er...@redhat.com Gerrit-Reviewer: Eike Rathke er...@redhat.com Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@gmail.com Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-3-6-4]: fdo#56776: Change in formula options should cause repaint.
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1050 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/50/1050/1 fdo#56776: Change in formula options should cause repaint. Else Calc would fail to update the column headers due to A1 to R1C1 change (and vise versa). Change-Id: I2c403212f5bc539aea92370e60da96f480549d6d --- M sc/source/ui/app/scmod.cxx 1 file changed, 5 insertions(+), 0 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1050 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2c403212f5bc539aea92370e60da96f480549d6d Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6-4 Gerrit-Owner: Kohei Yoshida kohei.yosh...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-3-6]: fdo#56776: Change in formula options should cause repaint.
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1049 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/49/1049/1 fdo#56776: Change in formula options should cause repaint. Else Calc would fail to update the column headers due to A1 to R1C1 change (and vise versa). Change-Id: I2c403212f5bc539aea92370e60da96f480549d6d --- M sc/source/ui/app/scmod.cxx 1 file changed, 5 insertions(+), 0 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1049 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2c403212f5bc539aea92370e60da96f480549d6d Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Kohei Yoshida kohei.yosh...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-3-6]: fdo#54898: Test equality by order index (integer) which is m...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1013 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/13/1013/1 fdo#54898: Test equality by order index (integer) which is more stable. At the point where std::unique is called, we can use order indices to determine whether the two items are equal. This should be more stable than using CaseInsEqual() to assess equality. Change-Id: I88310fc7beede19fb1c629b9b7e3cb9a069b2b23 --- M sc/source/core/data/dpcache.cxx 1 file changed, 3 insertions(+), 3 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1013 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I88310fc7beede19fb1c629b9b7e3cb9a069b2b23 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Kohei Yoshida kohei.yosh...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-3-6]: Minor enhancements on the autofilter popup window.
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/997 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/97/997/1 Minor enhancements on the autofilter popup window. 1) Launch pop-up right-aligned in case the cell is wider than the popup. Launching it always left-aligned will look weird especially when the column is very wide. 2) Allow type-ahead search when launching the autofilter via keyboard. This is achieved by making two small changes to the popup; first, the focus is set on the check list box upon launching, and second, the type-ahead search is enabled on the check list box control. Change-Id: I8a33a52afc6005b4a7428d5f7046eff986da80d2 --- M sc/source/ui/cctrl/checklistmenu.cxx 1 file changed, 15 insertions(+), 1 deletion(-) -- To view, visit https://gerrit.libreoffice.org/997 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8a33a52afc6005b4a7428d5f7046eff986da80d2 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Kohei Yoshida kohei.yosh...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Change in core[libreoffice-3-6]: halt corrupted styles with multi-saved xlsx document fdo#554...
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/958 Approvals: Kohei Yoshida: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/958 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2d53c88ab121edeec2bf53f7fd177a0edcc05a25 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@gmail.com Gerrit-Reviewer: Noel Power noel.po...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Change in core[libreoffice-3-6]: fix xlsx export missing alignment attributes with cellstyle ...
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/959 Approvals: Kohei Yoshida: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/959 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I510d0f399c58b5a9b192f3566e093c636cae2c0a Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@gmail.com Gerrit-Reviewer: Noel Power noel.po...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-3-6]: fdo#53531: Time field can be represented with an extended ti...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/992 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/92/992/1 fdo#53531: Time field can be represented with an extended time field type. And Calc's header footer currently don't distinguish between time and extended time. Time fields in the header / footer are always dynamic and never static. Change-Id: If628d179968c270a63d38cdc3bf6018c01241ac1 --- M sc/source/core/tool/editutil.cxx 1 file changed, 2 insertions(+), 0 deletions(-) -- To view, visit https://gerrit.libreoffice.org/992 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If628d179968c270a63d38cdc3bf6018c01241ac1 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Kohei Yoshida kohei.yosh...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Change in core[libreoffice-3-6-3]: kill this hard coded sheet limit for xlsx import, rhbz#86485...
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/857 Approvals: Kohei Yoshida: Verified; Looks good to me, approved Eike Rathke: Looks good to me, but someone else must approve -- To view, visit https://gerrit.libreoffice.org/857 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I49e12d97d1e17b0a63daf374e7ff4b4720129553 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6-3 Gerrit-Owner: Eike Rathke er...@redhat.com Gerrit-Reviewer: Eike Rathke er...@redhat.com Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@gmail.com Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-3-6]: Fix crash on Mac when a11y in use, and avoid infinite loop, ...
Hello Norbert Thiebaud, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/708 to look at the new patch set (#2). Change subject: Fix crash on Mac when a11y in use, and avoid infinite loop, fdo#47275 .. Fix crash on Mac when a11y in use, and avoid infinite loop, fdo#47275 The code used static_cast blindly even if the object not necessarily was of the assumed subclass. Crash followed. Use dynamic_cast instead to be able to check, like the corresponding code for GTK a11y. After that fix we then got a nice infinite loop whn an object apparently is its own parent. Detect that and break out. Whether accessibility for the affected parts of the GUI actually works now for its real use cases, no idea. But anything is better than a crash... Change-Id: I862234e168db0bd19d185b0f1f73b733b570cac4 Signed-off-by: Norbert Thiebaud nthieb...@gmail.com --- M vcl/aqua/source/a11y/aqua11yfocustracker.cxx M vcl/aqua/source/a11y/aqua11ywrapper.mm 2 files changed, 20 insertions(+), 2 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/08/708/2 -- To view, visit https://gerrit.libreoffice.org/708 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I862234e168db0bd19d185b0f1f73b733b570cac4 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@gmail.com Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com Gerrit-Reviewer: Tor Lillqvist t...@iki.fi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Change in core[libreoffice-3-6]: Fix crash on Mac when a11y in use, and avoid infinite loop, ...
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/708 -- To view, visit https://gerrit.libreoffice.org/708 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I862234e168db0bd19d185b0f1f73b733b570cac4 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@gmail.com Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com Gerrit-Reviewer: Tor Lillqvist t...@iki.fi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Better center status bar items between separators
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/298 Approvals: Kohei Yoshida: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/298 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I24553dda11b13c323b1a14813530175cdc563f8b Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Björn Michaelsen bjoern.michael...@canonical.com Gerrit-Reviewer: Jan Holesovsky ke...@suse.cz Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] sax: com.sun.star.xml.sax.FastSerializer seems to be unused
Hi, Thank you for your patch! :-) It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/480 Approvals: Kohei Yoshida: Verified Michael Meeks: Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/480 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I826da00c83589f468c499879d86546d60b2aa515 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matúš Kukan matus.ku...@gmail.com Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@gmail.com Gerrit-Reviewer: Matúš Kukan matus.ku...@gmail.com Gerrit-Reviewer: Michael Meeks michael.me...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
