[Bug 45904] move java based api tests to c++
https://bugs.documentfoundation.org/show_bug.cgi?id=45904 --- Comment #24 from jan iversen --- (In reply to jeremy.carpentier.sio from comment #22) > Hi, is it still something we need to work on ? > > I'm a student and I would like to try working on it. If you have any advice, > i'll happily take them. Yes we are still working on this, if you need help feel free to mail me. have a nice day jan iversen -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: license statement
Thanks for your license statement. I have added you to our wiki: https://wiki.documentfoundation.org/Development/Developers I you want help to get started or have any questions, then please contact me. I am here to help you (and others) getting their first patch submitted. LibreOffice is a very big program and getting it build, setting up gerrit, and getting the first patch right, can be a bit challenging, therefore do not hesitate to email me if you want help. rgds Jan Iversen. Sent from my iPad, please excuse any misspellings > On 17 Dec 2015, at 11:11, Burçin Akalın wrote: > > All of my past & future contributions to LibreOffice may be licensed under > the MPLv2/LGPLv3+ dual license. > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sw/qa sw/source
sw/qa/extras/odfimport/data/tdf96113.odt |binary
sw/qa/extras/odfimport/odfimport.cxx |6 ++
sw/source/core/unocore/unoframe.cxx |2 +-
3 files changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 09ea045d373bc00de4238363c6551fdffa7f3548
Author: Miklos Vajna
Date: Tue Dec 15 09:08:50 2015 +0100
tdf#96113 sw: don't overwrite fo:background-color on ODT frame import
The situation is similar to commit
79fb61efb847405fa47235002b52ee8efad5e339 (tdf#92379: svx: don't
overwrite fo:background-color on ODF import, 2015-08-21), except that
here text frames had the problem of loosing colors when transparency is
set.
Fix the problem by informing getSvxBrushItemFromSourceSet() about if
we're in XML import or not.
(cherry picked from commit 3a0c0af7309e1f5ba3811bbe8a73e506cf5cd069)
Conflicts:
sw/qa/extras/odfimport/odfimport.cxx
Change-Id: Id1adf60b14a3762f0a2a43c49caeed9f6ea039be
Reviewed-on: https://gerrit.libreoffice.org/20744
Tested-by: Jenkins
Reviewed-by: Andras Timar
diff --git a/sw/qa/extras/odfimport/data/tdf96113.odt
b/sw/qa/extras/odfimport/data/tdf96113.odt
new file mode 100644
index 000..ede7b07
Binary files /dev/null and b/sw/qa/extras/odfimport/data/tdf96113.odt differ
diff --git a/sw/qa/extras/odfimport/odfimport.cxx
b/sw/qa/extras/odfimport/odfimport.cxx
index 105e046..5c60935 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -613,6 +613,12 @@ DECLARE_ODFIMPORT_TEST(testTdf92586, "tdf92586.odt")
CPPUNIT_ASSERT_EQUAL(drawing::BitmapMode_STRETCH,
getProperty(xPageStyle, "FillBitmapMode"));
}
+DECLARE_ODFIMPORT_TEST(testTdf96113, "tdf96113.odt")
+{
+// Background of the formula frame was white (0xff), not green.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0x00ff00),
getProperty(getShape(1), "BackColor"));
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/core/unocore/unoframe.cxx
b/sw/source/core/unocore/unoframe.cxx
index dd9f789..ab14e38 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -1803,7 +1803,7 @@ void SwXFrame::setPropertyValue(const :: OUString&
rPropertyName, const :: uno::
if(RES_BACKGROUND == pEntry->nWID)
{
const SwAttrSet& rSet = pFormat->GetAttrSet();
-const SvxBrushItem
aOriginalBrushItem(getSvxBrushItemFromSourceSet(rSet, RES_BACKGROUND));
+const SvxBrushItem
aOriginalBrushItem(getSvxBrushItemFromSourceSet(rSet, RES_BACKGROUND, true,
pDoc->IsInXMLImport()));
SvxBrushItem aChangedBrushItem(aOriginalBrushItem);
aChangedBrushItem.PutValue(aValue, nMemberId);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/inc vcl/source
vcl/inc/window.h|3 +++
vcl/source/window/event.cxx | 22 +-
2 files changed, 20 insertions(+), 5 deletions(-)
New commits:
commit 60e67b387e79185a33eb07bc03b01cd6d0d0a56b
Author: Noel Grandin
Date: Fri Dec 18 10:08:35 2015 +0200
fix O(n^2) in vcl event broadcasting tdf#90199
Change-Id: If3d7514364589058334369432cdcf4f7586c239d
diff --git a/vcl/inc/window.h b/vcl/inc/window.h
index 5d792de..e950369 100644
--- a/vcl/inc/window.h
+++ b/vcl/inc/window.h
@@ -39,6 +39,7 @@
#include
#include "vcleventlisteners.hxx"
#include
+#include
struct SalPaintEvent;
struct ImplDelData;
@@ -231,6 +232,8 @@ public:
VclPtr mpDlgCtrlDownWindow;
std::vector> maEventListeners;
std::vector> maChildEventListeners;
+int maChildEventListenersIteratingCount;
+std::set> maChildEventListenersDeleted;
// The canvas interface for this VCL window. Is persistent after the first
GetCanvas() call
css::uno::WeakReference< css::rendering::XCanvas >mxCanvas;
diff --git a/vcl/source/window/event.cxx b/vcl/source/window/event.cxx
index f90ac28..c001c7e 100644
--- a/vcl/source/window/event.cxx
+++ b/vcl/source/window/event.cxx
@@ -30,6 +30,7 @@
#include
#include
#include
+#include
namespace vcl {
@@ -238,17 +239,26 @@ void Window::CallEventListeners( sal_uLong nEvent, void*
pData )
if ( aDelData.IsDead() )
return;
-auto& rChildListeners = pWindow->mpWindowImpl->maChildEventListeners;
-if (!rChildListeners.empty())
+auto& rWindowImpl = *pWindow->mpWindowImpl;
+if (!rWindowImpl.maChildEventListeners.empty())
{
// Copy the list, because this can be destroyed when calling a
Link...
-std::vector> aCopy( rChildListeners );
+std::vector> aCopy(
rWindowImpl.maChildEventListeners );
+// we use an iterating counter/flag and a set of deleted Link's to
avoid O(n^2) behaviour
+rWindowImpl.maChildEventListenersIteratingCount++;
+comphelper::ScopeGuard aGuard(
+[&rWindowImpl]()
+{
+if (--rWindowImpl.maChildEventListenersIteratingCount == 0)
+rWindowImpl.maChildEventListenersDeleted.clear();
+}
+);
for ( Link& rLink : aCopy )
{
if (aDelData.IsDead())
return;
-// check this hasn't been removed in some re-enterancy
scenario fdo#47368
-if( std::find(rChildListeners.begin(), rChildListeners.end(),
rLink) != rChildListeners.end() )
+// Check this hasn't been removed in some re-enterancy
scenario fdo#47368.
+if( rWindowImpl.maChildEventListenersDeleted.find(rLink) !=
rWindowImpl.maChildEventListenersDeleted.end() )
rLink.Call( aEvent );
}
}
@@ -292,6 +302,8 @@ void Window::RemoveChildEventListener( const
Link& rEventL
{
auto& rListeners = mpWindowImpl->maChildEventListeners;
rListeners.erase( std::remove(rListeners.begin(), rListeners.end(),
rEventListener ), rListeners.end() );
+if (mpWindowImpl->maChildEventListenersIteratingCount)
+mpWindowImpl->maChildEventListenersDeleted.insert(rEventListener);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/milestone-7' - 2 commits - loolwsd/configure.ac
loolwsd/configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 62c95dfab4666c0f1dda17ba1332b213f0b7e178 Author: Mihai Varga Date: Fri Dec 18 11:01:27 2015 +0200 loolwsd: bump version after tarball diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac index f96617e..aefc7f9 100644 --- a/loolwsd/configure.ac +++ b/loolwsd/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.69]) -AC_INIT([loolwsd], [1.4.24], [libreoff...@collabora.com]) +AC_INIT([loolwsd], [1.4.25], [libreoff...@collabora.com]) AM_INIT_AUTOMAKE([1.11 silent-rules subdir-objects]) commit 19cefe0a3664dfd6084212cfd8ce0c546679b3e9 Author: Mihai Varga Date: Fri Dec 18 11:01:11 2015 +0200 loolwsd: bump version before tarball diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac index e34236e..f96617e 100644 --- a/loolwsd/configure.ac +++ b/loolwsd/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.69]) -AC_INIT([loolwsd], [1.4.23], [libreoff...@collabora.com]) +AC_INIT([loolwsd], [1.4.24], [libreoff...@collabora.com]) AM_INIT_AUTOMAKE([1.11 silent-rules subdir-objects]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Two svg import filters
Hi, Am 16.12.2015 um 09:49 schrieb Jan Holesovsky: Hi Thorsten, Thorsten Behrens píše v Út 15. 12. 2015 v 23:46 +0100: Other than that, the two filters serve two very different purposes - the document filter actually tries to map svg as well as possible to ODF (it would work even better if LibreOffice's ODF filter would support more of the syntax and semantics of SVG), to get *editable* graphics. As such, replacing the document importer with something that sticks the image into a graphic object is missing the point IMO. Armin wrote that svgio can "'break' to process/use the contained geometries" - so my understanding was that it can be further editable; is it not the case? If not - how hard would it be to extend drawinglayer to be able to "make something editable out of the contained svg"? It is the case. Compare the following: (a) Start LO, file/open, choose any SVG you want -> Draw opens, the SVG gets represented as draw objects (b) Start LO, open Draw, insert same SVG as graphic (D&D or insert/graphic) -> SVG gets a single GraphicObject With (b) you may now select, and choose 'break' in the context menu -> SVG gets decomposed to draw objects. Compare the two results with your SVG. Despite the quality being quite different, even when this would be fixed, there will alwyas be slight differences. How do you explain a user that the quality of the SVG he wants to use depends on the way he uses it? Does anyone expect users to know the difference between opening and inserting an SVG? How much do users like answers as 'yes, but you added it in the 'wrong' way...'? There should be no wrong way. You should not need expertise know-how to be able to use SVG in the best possible quality. Both do not allow round-trip, good-quality SVG editing, that is not the role of LO. At least, (b) keeps the orig SVG as reusable data (context menu, save graphic saves the *original* svg). Thus, you can edit it in an external editor and re-add (or is there nowadays even a 'edit in external editor', have seen that somewhere..?). Even if someone wants to have the filter to 'edit' SVG the better solution would be to automate (b) what means add the last step of breaking up the object after load. I would not do that - let the user choose if he wants to 'edit' the SVG. As long as we have no dedicated SVG editing options, I doubbt many will use LO for that. What is indeed useful is to re-use graphic data from SVGs for draw objects, that is what 'break' offers. Maybe the problem is more that only view people seem to know about 'break' - what about adding that more prominent/additionally under 'ungroup'...? Still, I would opt for using one SVG filter/importer only. All the best, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice -- -- ALG (PGP Key: EE1C 4B3F E751 D8BC C485 DEC1 3C59 F953 D81C F4A2) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Crash test update
New crashtest update available at http://dev-builds.libreoffice.org/crashtest/fd94964ad6611d7f20523272fe6752d38e3aec88/ exportCrashes.csv Description: Binary data importCrash.csv Description: Binary data validationErrors.csv Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f6d8dd5d68a3da70e6f7d0ff1a0dad74db5d0fb8 Author: Stanislav Horacek Date: Wed Dec 9 18:34:46 2015 +0100 Updated core Project: help 1b436f3010b7d9ce4d9b2a0eb526b06196b632d7 add missing pluses in keyboard shortcuts Change-Id: I02e52789dc66116f5c0ac8623f6e312a2b996d46 Reviewed-on: https://gerrit.libreoffice.org/20550 Reviewed-by: Andras Timar Tested-by: Andras Timar diff --git a/helpcontent2 b/helpcontent2 index 581ae2d..1b436f3 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 581ae2d39799c48ee338b27e9b64d547ab62b70c +Subproject commit 1b436f3010b7d9ce4d9b2a0eb526b06196b632d7 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/simpress/04/0102.xhp |2 +- source/text/swriter/04/0102.xhp |4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 1b436f3010b7d9ce4d9b2a0eb526b06196b632d7 Author: Stanislav Horacek Date: Wed Dec 9 18:34:46 2015 +0100 add missing pluses in keyboard shortcuts Change-Id: I02e52789dc66116f5c0ac8623f6e312a2b996d46 Reviewed-on: https://gerrit.libreoffice.org/20550 Reviewed-by: Andras Timar Tested-by: Andras Timar diff --git a/source/text/simpress/04/0102.xhp b/source/text/simpress/04/0102.xhp index 18bc6a5..6b25de4 100644 --- a/source/text/simpress/04/0102.xhp +++ b/source/text/simpress/04/0102.xhp @@ -565,7 +565,7 @@ Option -CtrlShift+Arrow Down +Ctrl+Shift+Arrow Down Select to end of paragraph. Next keystroke extends selection to end of next paragraph diff --git a/source/text/swriter/04/0102.xhp b/source/text/swriter/04/0102.xhp index 1d4bd75..7f9387f 100644 --- a/source/text/swriter/04/0102.xhp +++ b/source/text/swriter/04/0102.xhp @@ -618,7 +618,7 @@ Option -CtrlShift+Arrow Up +Ctrl+Shift+Arrow Up Select to beginning of paragraph. Next keystroke extends selection to beginning of previous paragraph @@ -652,7 +652,7 @@ Option -CtrlShift+Arrow Down +Ctrl+Shift+Arrow Down Select to end of paragraph. Next keystroke extends selection to end of next paragraph ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] voting.git: vote/2015-board
vote/2015-board/candidates.wml |4 ++--
vote/2015-board/shuffle.js |8
2 files changed, 10 insertions(+), 2 deletions(-)
New commits:
commit a4acc2c9a4be44f2ff00e18c4c2146bd0323120c
Author: Andras Timar
Date: Fri Dec 4 16:36:39 2015 +0100
shuffle list of candidates
Change-Id: If30bf0c6f11702189468e7c70afa66aa01aae2ef
Reviewed-on: https://gerrit.libreoffice.org/20402
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/vote/2015-board/candidates.wml b/vote/2015-board/candidates.wml
index b950f04..1992019 100644
--- a/vote/2015-board/candidates.wml
+++ b/vote/2015-board/candidates.wml
@@ -45,7 +45,7 @@
Candidates for The Document Foundation Board of Directors
-In alphabetical order by surname:
+In random order:
Thorsten Behrens
@@ -146,6 +146,6 @@ I've been a volunteer in the project since its creation
five years ago. These da
Rules for this election or write to
mailto:electi...@documentfoundation.org";>electi...@documentfoundation.org.
-
+
diff --git a/vote/2015-board/shuffle.js b/vote/2015-board/shuffle.js
new file mode 100644
index 000..49a939a
--- /dev/null
+++ b/vote/2015-board/shuffle.js
@@ -0,0 +1,8 @@
+window.onload = shuffle;
+
+function shuffle() {
+var ol = document.querySelector('ol');
+for (var i = ol.children.length; i >= 0; i--) {
+ol.appendChild(ol.children[Math.random() * i | 0]);
+}
+}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmlscript/source
xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx |2 ++ xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx |2 ++ 2 files changed, 4 insertions(+) New commits: commit ffdd3c68205ddaa2d7fd895234461c02f1560e7c Author: Oliver Specht Date: Fri Dec 18 10:32:51 2015 +0100 tdf#80047: load&save align and valign attributes of NumericField Change-Id: Iff92f050210c112f355803d4d4bcec6b9d289a84 Reviewed-on: https://gerrit.libreoffice.org/20788 Reviewed-by: Oliver Specht Tested-by: Oliver Specht diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx index cfa7509..9bc4adf 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx @@ -751,6 +751,8 @@ void ElementDescriptor::readNumericFieldModel( StyleBag * all_styles ) // collect elements readDefaults(); +readAlignAttr( "Align", XMLNS_DIALOGS_PREFIX ":align" ); +readVerticalAlignAttr( "VerticalAlign", XMLNS_DIALOGS_PREFIX ":valign" ); readBoolAttr( "Tabstop", XMLNS_DIALOGS_PREFIX ":tabstop" ); readBoolAttr( "ReadOnly", XMLNS_DIALOGS_PREFIX ":readonly" ); readBoolAttr( "HideInactiveSelection", XMLNS_DIALOGS_PREFIX ":hide-inactive-selection" ); diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx index 7ca5ed4..af17a17 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx @@ -677,6 +677,8 @@ void NumericFieldElement::endElement() } ctx.importDefaults( _nBasePosX, _nBasePosY, _xAttributes ); +ctx.importAlignProperty( "Align", "align", _xAttributes ); +ctx.importVerticalAlignProperty( "VerticalAlign", "valign", _xAttributes ); ctx.importBooleanProperty( "Tabstop","tabstop",_xAttributes ); ctx.importBooleanProperty( "ReadOnly", "readonly",_xAttributes ); ctx.importBooleanProperty( "StrictFormat", "strict-format", _xAttributes ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Two svg import filters
Hi all, Thorsten Behrens schrieb: Michael Stahl wrote: i don't claim to know anything about SVG, but i just noticed that filter/source/svg uses boost::spirit, and therefore i am +1 for removing it. That's so far the strongest case for removal here. ;) Other than that, the two filters serve two very different purposes - the document filter actually tries to map svg as well as possible to ODF (it would work even better if LibreOffice's ODF filter would support more of the syntax and semantics of SVG), to get *editable* graphics. As such, replacing the document importer with something that sticks the image into a graphic object is missing the point IMO. I think, that one filter is enough and that LO should use svgio. In case of File>Open and if you really want to make the graphic immediately editable, then LO should insert the SVG in a new document as done by Insert>Image and then break it automatically. All effort and free time should be used to improve svgio and to implement the missing ODF parts. For example the lack of the ODF elements and is really bad. It does not only effect SVG import but the OOXML filter too. Kind regards Regina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Two svg import filters
Hi Armin, Armin Le Grand schrieb: [..] Both do not allow round-trip, good-quality SVG editing, that is not the role of LO. Why not? At least, (b) keeps the orig SVG as reusable data (context menu, save graphic saves the *original* svg). Thus, you can edit it in an external editor and re-add (or is there nowadays even a 'edit in external editor', have seen that somewhere..?). The item "Edit with External Tool..." is in the context menu of the image. In my case the browser is started to open the svg image. But LO adds garbage in front of the svg source, so my browser shows an XML error. Despite of the ... in the item label, no dialog opens to choose the External Tool. Kind regards Regina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Two svg import filters
> Why not? > Because there are better alternatives? Because we want to avoid feature creep; especially features that nobody seems to be ready to spend resources on? (My *private* opinions only.) --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 3 commits - include/sfx2 officecfg/registry sc/AllLangResTarget_sc.mk sc/inc sc/source sc/uiconfig sc/UIConfig_scalc.mk sfx2/source
include/sfx2/dispatch.hxx|4 officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu|8 officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu |9 sc/AllLangResTarget_sc.mk|1 sc/UIConfig_scalc.mk |1 sc/inc/sc.hrc| 23 - sc/inc/sccommands.h | 12 sc/source/ui/src/popup.src | 123 -- sc/source/ui/view/tabcont.cxx|2 sc/uiconfig/scalc/popupmenu/audit.xml|4 sc/uiconfig/scalc/popupmenu/pivot.xml|4 sc/uiconfig/scalc/popupmenu/sheettab.xml | 31 ++ sfx2/source/control/dispatch.cxx | 64 ++--- 13 files changed, 103 insertions(+), 183 deletions(-) New commits: commit 8a664fd83f70282d000aaedc626f1fa09a99161e Author: Maxim Monastirsky Date: Fri Dec 18 13:19:28 2015 +0200 tdf#93837 Convert RID_POPUP_TAB to xml Change-Id: Ia05fb0a568c29d7990a8a837e1df953358acfa1f diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu index 4da1213..ff1091f 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu @@ -1602,6 +1602,9 @@ Sheet ~Tab Color... + + ~Tab Color... + @@ -1826,6 +1829,9 @@ R~ight-To-Left + + Sheet R~ight-To-Left + diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu index 64caade..9adc27e 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu @@ -85,6 +85,11 @@ Print Preview + + + Sheet Tabs Bar + + false diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk index 11dffec..57035f0 100644 --- a/sc/AllLangResTarget_sc.mk +++ b/sc/AllLangResTarget_sc.mk @@ -33,7 +33,6 @@ $(eval $(call gb_SrsTarget_set_include,sc/res,\ )) $(eval $(call gb_SrsTarget_add_files,sc/res,\ -sc/source/ui/src/popup.src \ sc/source/ui/src/globstr.src \ sc/source/ui/src/toolbox.src \ sc/source/ui/src/scfuncs.src \ diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk index c124665..f5ec631 100644 --- a/sc/UIConfig_scalc.mk +++ b/sc/UIConfig_scalc.mk @@ -33,6 +33,7 @@ $(eval $(call gb_UIConfig_add_popupmenufiles,modules/scalc,\ sc/uiconfig/scalc/popupmenu/pagebreak \ sc/uiconfig/scalc/popupmenu/pivot \ sc/uiconfig/scalc/popupmenu/preview \ + sc/uiconfig/scalc/popupmenu/sheettab \ )) $(eval $(call gb_UIConfig_add_statusbarfiles,modules/scalc,\ diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc index 4241157..e9a5f61 100644 --- a/sc/inc/sc.hrc +++ b/sc/inc/sc.hrc @@ -411,18 +411,17 @@ #define DATA_MENU_END (DATA_MENU_START + 29) #define TAB_POPUP_START (DATA_MENU_END) -#define RID_POPUP_TAB (TAB_POPUP_START) -#define FID_TAB_MENU_RENAME (TAB_POPUP_START+1) -#define FID_TAB_RENAME (TAB_POPUP_START+2) -#define FID_TAB_MOVE(TAB_POPUP_START+3) -#define FID_TAB_SELECTALL (TAB_POPUP_START+4) -#define FID_TAB_APPEND (TAB_POPUP_START+5) -#define FID_TAB_INDEX (TAB_POPUP_START+6) -#define FID_TAB_RTL (TAB_POPUP_START+7) -#define FID_TAB_DESELECTALL (TAB_POPUP_START+8) -#define FID_TAB_MENU_SET_TAB_BG_COLOR (TAB_POPUP_START + 9) -#define FID_TAB_SET_TAB_BG_COLOR (TAB_POPUP_START + 10) -#define FID_TAB_EVENTS (TAB_POPUP_START+11) +#define FID_TAB_MENU_RENAME (TAB_POPUP_START) +#define FID_TAB_RENAME (TAB_POPUP_START+1) +#define FID_TAB_MOVE(TAB_POPUP_START+2) +#define FID_TAB_SELECTALL (TAB_POPUP_START+3) +#define FID_TAB_APPEND (TAB_POPUP_START+4) +#define FID_TAB_INDEX (TAB_POPUP_START+5) +#define FID_TAB_RTL (TAB_POPUP_START+6) +#define FID_TAB_DESELECTALL (TAB_POPUP_START+7) +#define FID_TAB_MENU_SET_TAB_BG_COLOR (TAB_POPUP_START + 8) +#define FID_TAB_SET_TAB_BG_COLOR (TAB_POPUP_START + 9) +#define FID_TAB_EVENTS (TAB_POPUP_START+10) #define TAB_POPUP_END (TAB_POPUP_START + 20) diff --git a/sc/inc/sccommands.h b/sc/inc/sccommands.h index 009621f..706555d 100644 --- a/sc/inc/sccommands.h +++ b/sc/in
[Libreoffice-commits] core.git: lotuswordpro/source
lotuswordpro/source/filter/lwptablelayout.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit dfa979ffe51b32297f45faa037584074173682e5
Author: Caolán McNamara
Date: Fri Dec 18 11:38:56 2015 +
crashtesting: this can happen with a broken document
Change-Id: I001f68a2033c7c4f631b17cda6653d845c8d1e40
diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx
b/lotuswordpro/source/filter/lwptablelayout.cxx
index 4efa6a8..385baa6 100644
--- a/lotuswordpro/source/filter/lwptablelayout.cxx
+++ b/lotuswordpro/source/filter/lwptablelayout.cxx
@@ -698,7 +698,7 @@ void LwpTableLayout::RegisterStyle()
LwpTable * pTable = GetTable();
if (pTable == nullptr)
{
-assert(false);
+SAL_WARN("lwp", "missing table, early return");
return;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: formula/source
formula/source/ui/dlg/formula.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit 8217ddbfc863dd9b313d6b5eaecb1877e42b2d02
Author: Eike Rathke
Date: Fri Dec 18 12:25:54 2015 +0100
tdf#96366 disable treeview results until fix available
Since f82d89f35207fc1cfc00ad5cd914b74c55c3e3d2 EditThisFunc() and
EditNextFunc() are used to iterate through the formula to obtain
expression results to display in the treeview. Calling the Edit...()
functions spoils about everything as it messes around with the edit
state. As the name suggests..
Change-Id: I8b35d85b7bbf8821b5a995e84f9dd88a0f6f00b9
diff --git a/formula/source/ui/dlg/formula.cxx
b/formula/source/ui/dlg/formula.cxx
index 0448045..3c1523c 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -695,6 +695,8 @@ void FormulaDlg_Impl::MakeTree(StructPage*
_pTree,SvTreeListEntry* pParent,Formu
if (bCalcSubformula)
{
+/* FIXME: tdf#96366 this simply does not work, disable until solved. */
+#if 0
OUString aStr;
OUString aEquals(" = ");
@@ -717,6 +719,7 @@ void FormulaDlg_Impl::MakeTree(StructPage*
_pTree,SvTreeListEntry* pParent,Formu
m_pWndResult->SetText( aStr );
aStr = m_pWndResult->GetText();
pStructPage->GetTlbStruct()->SetEntryText(pEntry,aResult +
aEquals + aStr);
+#endif
}
--Count;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/fixes13' -
0 files changed New commits: commit 55ab05a50fdef1b774438ca9c4e5de3654db222a Author: László Németh Date: Fri Dec 18 12:43:28 2015 +0100 fix GDI ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - formula/source
formula/source/ui/dlg/formula.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit 6e80c6b9d40408a745ab0ced5d217118985e4079
Author: Eike Rathke
Date: Fri Dec 18 12:25:54 2015 +0100
tdf#96366 disable treeview results until fix available
Since f82d89f35207fc1cfc00ad5cd914b74c55c3e3d2 EditThisFunc() and
EditNextFunc() are used to iterate through the formula to obtain
expression results to display in the treeview. Calling the Edit...()
functions spoils about everything as it messes around with the edit
state. As the name suggests..
Change-Id: I8b35d85b7bbf8821b5a995e84f9dd88a0f6f00b9
(cherry picked from commit 8217ddbfc863dd9b313d6b5eaecb1877e42b2d02)
diff --git a/formula/source/ui/dlg/formula.cxx
b/formula/source/ui/dlg/formula.cxx
index 0448045..3c1523c 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -695,6 +695,8 @@ void FormulaDlg_Impl::MakeTree(StructPage*
_pTree,SvTreeListEntry* pParent,Formu
if (bCalcSubformula)
{
+/* FIXME: tdf#96366 this simply does not work, disable until solved. */
+#if 0
OUString aStr;
OUString aEquals(" = ");
@@ -717,6 +719,7 @@ void FormulaDlg_Impl::MakeTree(StructPage*
_pTree,SvTreeListEntry* pParent,Formu
m_pWndResult->SetText( aStr );
aStr = m_pWndResult->GetText();
pStructPage->GetTlbStruct()->SetEntryText(pEntry,aResult +
aEquals + aStr);
+#endif
}
--Count;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: lotuswordpro/source
lotuswordpro/source/filter/lwpdivinfo.cxx |8 ++--
lotuswordpro/source/filter/lwpfont.cxx|2 +-
lotuswordpro/source/filter/lwptablelayout.cxx |4 ++--
lotuswordpro/source/filter/lwptblformula.cxx |2 +-
4 files changed, 6 insertions(+), 10 deletions(-)
New commits:
commit 742bcd2b2d23ae05bfcf356db69f79f33d20f53f
Author: Caolán McNamara
Date: Fri Dec 18 11:48:02 2015 +
crashtesting: these can happen with broken documents
Change-Id: I35f77345804b3ebfda9d427de79968b193d1419a
diff --git a/lotuswordpro/source/filter/lwpdivinfo.cxx
b/lotuswordpro/source/filter/lwpdivinfo.cxx
index 2f9a6cf..efa32f6 100644
--- a/lotuswordpro/source/filter/lwpdivinfo.cxx
+++ b/lotuswordpro/source/filter/lwpdivinfo.cxx
@@ -108,15 +108,11 @@ void LwpDivInfo::Read()
m_FillerPageTextID.ReadIndexed(m_pObjStrm);
// read external file object stuff
-#if !defined(NDEBUG)
-sal_uInt16 type =
-#endif
-m_pObjStrm->QuickReaduInt16();
+sal_uInt16 type = m_pObjStrm->QuickReaduInt16();
//cpExternalFile = LNULL;
-assert(type==0);
+SAL_WARN_IF(type != 0, "lwp", "should be 0");
m_pObjStrm->SkipExtra();
-
}
void LwpDivInfo::SkipFront()
diff --git a/lotuswordpro/source/filter/lwpfont.cxx
b/lotuswordpro/source/filter/lwpfont.cxx
index 5e0d274..8805533 100644
--- a/lotuswordpro/source/filter/lwpfont.cxx
+++ b/lotuswordpro/source/filter/lwpfont.cxx
@@ -262,7 +262,7 @@ void LwpFontTable::Read(LwpObjectStream *pStrm)
OUString LwpFontTable::GetFaceName(sal_uInt16 index) //index: start from 1
{
-assert(index <= m_nCount && index > 0);
+SAL_WARN_IF(index > m_nCount || index <= 0, "lwp", "bad font index");
return (index <= m_nCount && index > 0) ?
m_pFontEntries[index-1].GetFaceName() : OUString();
}
diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx
b/lotuswordpro/source/filter/lwptablelayout.cxx
index 385baa6..0faf772 100644
--- a/lotuswordpro/source/filter/lwptablelayout.cxx
+++ b/lotuswordpro/source/filter/lwptablelayout.cxx
@@ -215,13 +215,13 @@ double LwpSuperTableLayout::GetTableWidth()
LwpTableLayout* pTableLayout = GetTableLayout();
if(!pTableLayout)
{
-assert(false);
+SAL_WARN("lwp", "missing table layout, early return");
return 0;
}
LwpTable *pTable = pTableLayout->GetTable();
if(!pTable)
{
-assert(false);
+SAL_WARN("lwp", "missing table, early return");
return 0;
}
double dDefaultWidth = pTable->GetWidth();
diff --git a/lotuswordpro/source/filter/lwptblformula.cxx
b/lotuswordpro/source/filter/lwptblformula.cxx
index 6f699c5..7a28a6e 100644
--- a/lotuswordpro/source/filter/lwptblformula.cxx
+++ b/lotuswordpro/source/filter/lwptblformula.cxx
@@ -342,7 +342,7 @@ void LwpFormulaInfo::Read()
}
else
{
-assert(false);
+SAL_WARN("lwp", "missing row list");
}
}
m_pObjStrm->SeekRel(2);//flags, size in file: sal_uInt16
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sc/source
sc/source/filter/html/htmlpars.cxx | 39 ++---
sc/source/filter/inc/htmlpars.hxx | 11 --
2 files changed, 25 insertions(+), 25 deletions(-)
New commits:
commit 6f1e25133e31dbd8942e669bd658b43869f6dddc
Author: Michael Stahl
Date: Thu Dec 17 23:15:56 2015 +0100
sc: replace boost::ptr_map with std::map
Change-Id: Id56046d135e7d1acdd7e705b5f0c40f71427c121
diff --git a/sc/source/filter/html/htmlpars.cxx
b/sc/source/filter/html/htmlpars.cxx
index 36911c3..35a6072 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -20,7 +20,6 @@
#include
#include
-#include
#include "scitems.hxx"
#include
@@ -83,19 +82,20 @@ void ScHTMLStyles::add(const char* pElemName, size_t
nElemName, const char* pCla
if (pClassName)
{
// Both element and class names given.
-ElemsType::iterator itrElem = maElemProps.find(aElem);
-if (itrElem == maElemProps.end())
+ElemsType::iterator itrElem = m_ElemProps.find(aElem);
+if (itrElem == m_ElemProps.end())
{
// new element
std::unique_ptr p(new NamePropsType);
-std::pair r =
o3tl::ptr_container::insert(maElemProps, aElem, std::move(p));
+std::pair r =
+m_ElemProps.insert(std::make_pair(aElem, std::move(p)));
if (!r.second)
// insertion failed.
return;
itrElem = r.first;
}
-NamePropsType* pClsProps = itrElem->second;
+NamePropsType *const pClsProps = itrElem->second.get();
OUString aClass(pClassName, nClassName, RTL_TEXTENCODING_UTF8);
aClass = aClass.toAsciiLowerCase();
insertProp(*pClsProps, aClass, aProp, aValue);
@@ -123,10 +123,10 @@ const OUString& ScHTMLStyles::getPropertyValue(
{
// First, look into the element-class storage.
{
-ElemsType::const_iterator itr = maElemProps.find(rElem);
-if (itr != maElemProps.end())
+auto const itr = m_ElemProps.find(rElem);
+if (itr != m_ElemProps.end())
{
-const NamePropsType* pClasses = itr->second;
+const NamePropsType *const pClasses = itr->second.get();
NamePropsType::const_iterator itr2 = pClasses->find(rClass);
if (itr2 != pClasses->end())
{
diff --git a/sc/source/filter/inc/htmlpars.hxx
b/sc/source/filter/inc/htmlpars.hxx
index 305afda..a22be4e 100644
--- a/sc/source/filter/inc/htmlpars.hxx
+++ b/sc/source/filter/inc/htmlpars.hxx
@@ -27,7 +27,6 @@
#include
#include
#include
-#include
#include "rangelst.hxx"
#include "eeparser.hxx"
@@ -50,11 +49,11 @@ class ScHTMLStyles
{
typedef std::unordered_map PropsType;
typedef ::std::map> NamePropsType;
-typedef ::boost::ptr_map ElemsType;
+typedef ::std::map> ElemsType;
NamePropsType m_GlobalProps; /// global properties (for a given class
for all elements)
NamePropsType m_ElemGlobalProps; /// element global properties (no class
specified)
-ElemsType maElemProps; /// element to class to properties (both
element and class are given)
+ElemsType m_ElemProps; /// element to class to properties (both
element and class are given)
const OUString maEmpty; /// just a persistent empty string.
public:
ScHTMLStyles();
commit fa90bbb79027c89a6178c21569157ca796b8fff4
Author: Michael Stahl
Date: Thu Dec 17 23:12:55 2015 +0100
sc: replace boost::ptr_map with std::map
Change-Id: I32ab5eb985bd55d9194f3bff4739614cb6e93516
diff --git a/sc/source/filter/html/htmlpars.cxx
b/sc/source/filter/html/htmlpars.cxx
index 5ecfeaa..36911c3 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -103,7 +103,7 @@ void ScHTMLStyles::add(const char* pElemName, size_t
nElemName, const char* pCla
else
{
// Element name only. Add it to the element global.
-insertProp(maElemGlobalProps, aElem, aProp, aValue);
+insertProp(m_ElemGlobalProps, aElem, aProp, aValue);
}
}
else
@@ -113,7 +113,7 @@ void ScHTMLStyles::add(const char* pElemName, size_t
nElemName, const char* pCla
// Class name only. Add it to the global.
OUString aClass(pClassName, nClassName, RTL_TEXTENCODING_UTF8);
aClass = aClass.toAsciiLowerCase();
-insertProp(maGlobalProps, aClass, aProp, aValue);
+insertProp(m_GlobalProps, aClass, aProp, aValue);
}
}
}
@@ -130,7 +130,7 @@ const OUString& ScHTMLStyles::getPropertyValue(
NamePropsType::const_iterator itr2 = pClasses->find(rClass);
if (itr2 != pClasses->end())
{
-const PropsType* pProps = itr2->second;
+const Props
[Libreoffice-commits] core.git: sw/JunitTest_sw_complex.mk sw/PythonTest_sw_python.mk sw/qa
sw/JunitTest_sw_complex.mk |1
sw/PythonTest_sw_python.mk |1
sw/qa/complex/writer/CheckCrossReferences.java | 312 -
sw/qa/python/check_cross_references.py | 234 ++
4 files changed, 235 insertions(+), 313 deletions(-)
New commits:
commit 214b0c8356ab88e75cb4bbc2ad3109ee536dcd70
Author: kadertarlan
Date: Fri Dec 18 05:51:32 2015 +0200
Java unittest(CheckCrossReferences.java) converted to Python unittest
Change-Id: I9b856c9ffd7b3b380b2c1ba37c7c07355423c1f5
Reviewed-on: https://gerrit.libreoffice.org/20786
Reviewed-by: jan iversen
Tested-by: jan iversen
diff --git a/sw/JunitTest_sw_complex.mk b/sw/JunitTest_sw_complex.mk
index cdf9a94..ae96c28 100644
--- a/sw/JunitTest_sw_complex.mk
+++ b/sw/JunitTest_sw_complex.mk
@@ -29,7 +29,6 @@ $(eval $(call gb_JunitTest_add_sourcefiles,sw_complex,\
sw/qa/complex/checkColor/CheckChangeColor \
sw/qa/complex/indeterminateState/CheckIndeterminateState \
sw/qa/complex/writer/CheckBookmarks \
-sw/qa/complex/writer/CheckCrossReferences \
sw/qa/complex/writer/CheckIndexedPropertyValues \
sw/qa/complex/writer/CheckNamedPropertyValues \
sw/qa/complex/writer/CheckTable \
diff --git a/sw/PythonTest_sw_python.mk b/sw/PythonTest_sw_python.mk
index c24d418..44d7ff4 100644
--- a/sw/PythonTest_sw_python.mk
+++ b/sw/PythonTest_sw_python.mk
@@ -17,6 +17,7 @@ $(eval $(call
gb_PythonTest_add_modules,sw_python,$(SRCDIR)/sw/qa/python,\
check_index \
check_flies \
check_fields \
+check_cross_references \
check_styles \
check_table \
get_expression \
diff --git a/sw/qa/complex/writer/CheckCrossReferences.java
b/sw/qa/complex/writer/CheckCrossReferences.java
deleted file mode 100644
index 651604b..000
--- a/sw/qa/complex/writer/CheckCrossReferences.java
+++ /dev/null
@@ -1,312 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-package complex.writer;
-
-import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.text.XTextDocument;
-import com.sun.star.uno.UnoRuntime;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.openoffice.test.OfficeConnection;
-import static org.junit.Assert.*;
-
-public class CheckCrossReferences {
-
-private com.sun.star.container.XEnumeration xParaEnum;
-private com.sun.star.container.XEnumeration xPortionEnum;
-private com.sun.star.util.XRefreshable xFieldsRefresh;
-
-public com.sun.star.text.XTextField getNextField()
-throws com.sun.star.uno.Exception
-{
-while (true) {
-while (xPortionEnum == null) {
-if (!xParaEnum.hasMoreElements())
-fail("Cannot retrieve next field.");
-
-com.sun.star.container.XEnumerationAccess aPara =
-UnoRuntime.queryInterface(
-com.sun.star.container.XEnumerationAccess.class,
xParaEnum.nextElement());
-xPortionEnum = aPara.createEnumeration();
-}
-
-if ( xPortionEnum == null )
-break;
-
-while ( xPortionEnum.hasMoreElements() ) {
-com.sun.star.beans.XPropertySet xPortionProps =
-UnoRuntime.queryInterface(
-com.sun.star.beans.XPropertySet.class ,
xPortionEnum.nextElement());
-final String sPortionType =
-xPortionProps.getPropertyValue( "TextPortionType"
).toString();
-if ( sPortionType.equals( "TextField") ) {
-com.sun.star.text.XTextField xField =
UnoRuntime.queryInterface(
-com.sun.star.text.XTextField.class,
-xPortionProps.getPropertyValue( "TextField" ) );
-assertNotNull("Cannot retrieve next field.", xField);
-return xField;
-}
-}
-xPortionEnum = null;
-}
-
-return null; // unreachable
-}
-
-public com.sun.star.beans.XPropertySet getFieldProps(
[Libreoffice-commits] core.git: vcl/inc vcl/opengl
vcl/inc/openglgdiimpl.hxx |2 +-
vcl/opengl/gdiimpl.cxx| 36 +++-
2 files changed, 20 insertions(+), 18 deletions(-)
New commits:
commit ce326521f315893dedaffb3a851a1ed0fc6eb1b6
Author: Michael Meeks
Date: Thu Dec 10 18:31:04 2015 +
vcl: opengl - lean on the default window's context much more.
Avoid creating our own OpenGLContext to render until we need to
refresh the screen.
Change-Id: I29d4a1cb6193c92ed77ae98566f8b897a6bc67b5
Reviewed-on: https://gerrit.libreoffice.org/20709
Tested-by: Jenkins
Reviewed-by: Michael Meeks
diff --git a/vcl/inc/openglgdiimpl.hxx b/vcl/inc/openglgdiimpl.hxx
index 813a7be..a81b1e8 100644
--- a/vcl/inc/openglgdiimpl.hxx
+++ b/vcl/inc/openglgdiimpl.hxx
@@ -158,7 +158,7 @@ public:
void PostDraw();
protected:
-bool AcquireContext();
+bool AcquireContext(bool bForceCreate = false);
bool ReleaseContext();
/// retrieve the default context for offscreen rendering
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index 860cdbc..41f8e93 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -92,7 +92,7 @@ OpenGLSalGraphicsImpl::~OpenGLSalGraphicsImpl()
rtl::Reference OpenGLSalGraphicsImpl::GetOpenGLContext()
{
-if( !AcquireContext() )
+if( !AcquireContext(true) )
return nullptr;
return mpContext;
}
@@ -102,7 +102,7 @@ rtl::Reference
OpenGLSalGraphicsImpl::GetDefaultContext()
return ImplGetDefaultWindow()->GetGraphics()->GetOpenGLContext();
}
-bool OpenGLSalGraphicsImpl::AcquireContext( )
+bool OpenGLSalGraphicsImpl::AcquireContext( bool bForceCreate )
{
ImplSVData* pSVData = ImplGetSVData();
@@ -134,7 +134,12 @@ bool OpenGLSalGraphicsImpl::AcquireContext( )
mpContext = pContext;
else if( mpWindowContext.is() )
mpContext = mpWindowContext;
-else
+else if( bForceCreate && !IsOffscreen() )
+{
+mpWindowContext = CreateWinContext();
+mpContext = mpWindowContext;
+}
+if( !mpContext.is() )
mpContext = GetDefaultContext();
return mpContext.is();
@@ -175,12 +180,8 @@ void OpenGLSalGraphicsImpl::Init()
VCL_GL_INFO("::Init - re-size offscreen texture");
}
-if( !IsOffscreen() )
-{
-if( mpWindowContext.is() )
-mpWindowContext->reset();
-mpWindowContext = CreateWinContext();
-}
+if( mpWindowContext.is() )
+mpWindowContext->reset();
}
// Currently only used to get windows ordering right.
@@ -245,11 +246,6 @@ void OpenGLSalGraphicsImpl::PostDraw()
assert (maOffscreenTex);
-if( IsOffscreen() )
-assert( !mpWindowContext.is() );
-else
-assert( mpWindowContext.is() );
-
// Always queue the flush.
if( !IsOffscreen() )
flush();
@@ -2022,15 +2018,13 @@ void OpenGLSalGraphicsImpl::doFlush()
if( IsOffscreen() )
return;
-assert( mpWindowContext.is() );
-
if( !maOffscreenTex )
{
VCL_GL_INFO( "flushAndSwap - odd no texture !" );
return;
}
-if (mnDrawCountAtFlush == mnDrawCount)
+if( mnDrawCountAtFlush == mnDrawCount )
{
VCL_GL_INFO( "eliding redundant flushAndSwap, no drawing since last!"
);
return;
@@ -2042,6 +2036,14 @@ void OpenGLSalGraphicsImpl::doFlush()
VCL_GL_INFO( "flushAndSwap" );
+if( !mpWindowContext.is() )
+{
+VCL_GL_INFO( "late creation of window context" );
+mpWindowContext = CreateWinContext();
+}
+
+assert( mpWindowContext.is() );
+
// Interesting ! -> this destroys a context [ somehow ] ...
mpWindowContext->makeCurrent();
CHECK_GL_ERROR();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Minutes of the Design Hangout: 2015-12-04
* Present: Heiko, Kendy, Michel, Samuel, Stuart, Tomaž * UI changes integrated the last week: + Controller to show toolbar content as menu (Maxim) + Edit points toolbar (Jay) + Save Remote only when available (Maxim) + Transition icons for Impress (Andreas) * Suggestions from Roland (Samuel) + http://nabble.documentfoundation.org/libre-office-vs-numbers-td4167428.html + mostly general ideas (Samuel) + might be good to point Roland to the .ui files, so that he can do improvements etc. (Kendy) + will mail him & point to the calc sidebar .ui files, so that he can play with that (Samuel) * Area Tab design session (Heiko/Jay) + Area Tab - https://bugs.documentfoundation.org/show_bug.cgi?id=94551 https://docs.google.com/document/d/1gf7wqYszXnbrbzbyNlLKbJelMb20ssuimxfszcHP_wM/edit?usp=sharing + not published yet + draft finished, but Jay not that happy with the content (Heiko) + what to do to unblock? :-) + we should share it at least in the current state, to get feedback, and be able to iterate (Heiko) + unfortunately cannot see Jay recently (Kendy) + let's wait with the Area Tab blog post for now, Jay had some concerns (Kendy) + let's publish the Table Style blog post now instead (Kendy) * Evaluation of what the users need (Michel) + what use cases are we targeting (Michel) + we have personas in the HIG (Kendy) + would be good to prototype + test (Michel) + prefer doing the LibreOffice code directly - so that it is exactly what can be done (Kendy) + but if you know of a tool that can do it more easily, please do tell us (Kendy) + in the case of the Area Tab, it is only about re-arranging the existing dialog (Heiko) + not necessary to have user stories there, but useful for new designs (Heiko) + interesting to have user stories even when re-designing (Michel) * Bug discussions + https://bugs.documentfoundation.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=NEEDINFO&component=ux-advise&list_id=527515&query_format=advanced&resolution=--- + discussed, and acted on: + https://bugs.documentfoundation.org/show_bug.cgi?id=84953 + https://bugs.documentfoundation.org/show_bug.cgi?id=85383 + https://bugs.documentfoundation.org/show_bug.cgi?id=81519 * NotebookBar (ToolSpace?) (Samuel) + https://docs.google.com/document/d/1Pt1Psa4YDVwFOdYlLl6TXaK5LIK2uf1RKJk1UOTLsWg + current focus: loading the toolbars from glade (.ui) instead of .xcu files + keep in mind the HIG (Heiko) + https://wiki.documentfoundation.org/Design/ToolBar + mentions some future enhancements of toolbars that might be helpful here (Heiko) + eg. grouping + possible with Notebookbar + eg. http://docs.sencha.com/extjs/4.0.7/#!/example/toolbar/toolbars.html ? + Will have a friday session on NotebookBar topic on Fr 04th of Dec + Please have a look at the following links until then: https://wiki.documentfoundation.org/Development/NotebookBar#Resources + the patch was reverted in master, will re-introduce that (Kendy) + considering a rename to 'ToolSpace' when at that; let's see (Kendy) + current plan: do more technical ground work there, so that the rest is up to concrete design of .ui files via glade (Kendy) + then many paths are possible, eg: + https://smehrbrodt.wordpress.com/2015/11/24/improving-the-toolbars-in-libreoffice/ + https://wiki.documentfoundation.org/Development/NotebookBar + but we want this to be an "implementation detail" - whatever is in .ui files (Kendy) * Icon Updates / Issues (Jay) + Andreas provided the icons for transitions + many thanks! :-) (Kendy) + Paulo proposed new mimetype icons (Heiko) + nice stuff (Stuart) + https://wiki.documentfoundation.org/images/7/7d/Pj-icons-2015-11-6-v2-default-dark.png https://wiki.documentfoundation.org/images/e/eb/Pj-icons-2015-11-6-v2-high-contrast-dark.png + looks good, positive feedback on the ML (Kendy) + could have a better contrast for the Draw icon (Heiko) + up to Andreas + Jay to merge if it fits their plan (Kendy) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: RepositoryExternal.mk
RepositoryExternal.mk | 26 -- 1 file changed, 26 deletions(-) New commits: commit 4336db6d89a8531673fdbac790692a89f3c1fe79 Author: Michael Stahl Date: Fri Dec 18 13:17:29 2015 +0100 remove unused gb_LinkTarget__use_npapi_headers Change-Id: I527eeb82202de0d7b3545c545c492eda89c78e47 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 356da54..fe614db3 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -37,32 +37,6 @@ endif # External headers -ifneq ($(SYSTEM_NPAPI_HEADERS),) - -# yes this uses internal headers too... -# they are split across 2 dirs for this reason -define gb_LinkTarget__use_npapi_headers -$(call gb_LinkTarget_set_include,$(1),\ - $(NPAPI_HEADERS_CFLAGS) \ - -I$(SRCDIR)/external/np_sdk \ - $$(INCLUDE) \ -) - -endef - -else #!SYSTEM_NPAPI_HEADERS - -define gb_LinkTarget__use_npapi_headers -$(call gb_LinkTarget_set_include,$(1),\ - -I$(SRCDIR)/external/np_sdk/inc \ - -I$(SRCDIR)/external/np_sdk \ - $$(INCLUDE) \ -) - -endef - -endif #SYSTEM_NPAPI_HEADERS - ifneq ($(SYSTEM_ODBC_HEADERS),) define gb_LinkTarget__use_odbc_headers ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: 2 commits - loleaflet/reference.html loleaflet/src
loleaflet/reference.html | 43 +-
loleaflet/src/control/Scroll.js |6
loleaflet/src/core/Socket.js | 34 ++
loleaflet/src/layer/tile/GridLayer.js |6 +---
loleaflet/src/layer/tile/TileLayer.js | 21 ++--
loleaflet/src/map/Map.js |5 ++-
6 files changed, 90 insertions(+), 25 deletions(-)
New commits:
commit 6ae4bdf2a14998a3e9e6bdd116bea23a46d07373
Author: Mihai Varga
Date: Fri Dec 18 14:40:46 2015 +0200
loleaflet: allow specifying the starting zoom level
diff --git a/loleaflet/reference.html b/loleaflet/reference.html
index b15b7dd..3e28ec0 100644
--- a/loleaflet/reference.html
+++ b/loleaflet/reference.html
@@ -1491,6 +1491,33 @@ unexpected behaviour.
Whether the document is automatically zoomed so that the
width fits the viewing area when
the window is resized. The document will not be zoomed in more
than map.options.zoom.
+
+ zoom
+ Number
+ 10
+ Default zoom level in which the document will be
loaded.
+
+
+ tileWidthTwips
+ Number
+ 3000
+ Default tile width in twips (how much of the document is
covered horizontally in a 256x256 pixels tile).
+Unless you know what you are doing, this should not be
modified.
+
+
+ tileHeightTwips
+ Number
+ 3000
+ Default tile height in twips (how much of the document is
covered vertically in a 256x256 pixels tile).
+Unless you know what you are doing, this should not be
modified.
+
+
+ defaultZoom
+ Number
+ 10
+ The zoom level at which the tile size in twips equals the
default size (3000 x 3000).
+Unless you know what you are doing, this should not be
modified.
+
General
diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index 1c7397f2..e8d34ef 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -107,32 +107,45 @@ L.Socket = {
if (textMsg.startsWith('status:') && !this._map._docLayer) {
// first status message, we need to create the document
layer
+ var tileWidthTwips = this._map.options.tileWidthTwips;
+ var tileHeightTwips = this._map.options.tileHeightTwips;
+ if (this._map.options.zoom !==
this._map.options.defaultZoom) {
+ var scale =
this._map.options.crs.scale(this._map.options.defaultZoom -
this._map.options.zoom);
+ tileWidthTwips = Math.round(tileWidthTwips *
scale);
+ tileHeightTwips = Math.round(tileHeightTwips *
scale);
+ }
+
var command = this.parseServerCmd(textMsg);
var docLayer = null;
if (command.type === 'text') {
docLayer = new L.WriterTileLayer('', {
permission:
this._map.options.permission,
+ tileWidthTwips: tileWidthTwips,
+ tileHeightTwips: tileHeightTwips,
docType: command.type
});
}
else if (command.type === 'spreadsheet') {
docLayer = new L.CalcTileLayer('', {
permission:
this._map.options.permission,
+ tileWidthTwips: tileWidthTwips,
+ tileHeightTwips: tileHeightTwips,
docType: command.type
});
}
else {
- if (command.type === 'presentation') {
+ if (command.type === 'presentation' &&
+ this._map.options.defaultZoom
=== this._map.options.zoom) {
+ // If we have a presentation document
and the zoom level has not been set
+ // in the options, resize the document
so that it fits the viewing area
var verticalTiles =
this._map.getSize().y / 256;
- var tileTwipsSize =
Math.round(command.height / verticalTiles);
- }
- else {
- tileTwipsSize = 3000;
+ tileWidthTwips =
Math.round(command
[Libreoffice-commits] core.git: vcl/win
vcl/win/gdi/winlayout.cxx | 79 --
vcl/win/gdi/winlayout.hxx |6 +--
2 files changed, 52 insertions(+), 33 deletions(-)
New commits:
commit 61085083e4a5060ba7e2135818264d63c6da13c2
Author: Tor Lillqvist
Date: Fri Dec 18 14:38:27 2015 +0200
tdf#95054: Make sure glyphs alpha blend properly in the Graphite+OpenGL case
The problem apparently was that the GraphiteWinLayout::DrawTextImpl()
function drew each glyph using a separate call to ExtTextOutW(). That
mishandled anti-aliased glyphs (alpha), somewhat in the way as
described in the nice long comment (thanks kendy!) in
WinLayout::DrawText().
The irony here is that in the case of Graphite fonts and OpenGL, it is
exactly from that code block in WinLayout::DrawText() that
GraphiteWinLayout::DrawTextImpl() gets called, and in that situation
it itself runs into the same or similar problem as the calling code
wants to avoid for the run as a whole. It draws each glyph separately,
and subsequent glyphs will overwrite the rightmost pixels of the
earlier one instead of blend properly. Or something like that.
As a solution, change the interface of DrawTextImpl() so that instead
of being called once to draw a run of text, it might draw just a part
of the run, and in that case expects to be called repeatedly to draw
the whole text.
The GraphiteWinLayout::DrawTextImpl() implementation does it like this
in the case of using OpenGL (as indicated by the presence of a
non-null pRectToErase, as added in
b7842c93dc06b831d3fa649410ed847358ce9d17 for tdf#95648). The end
result is that it draws one glyph at a time into the DC for the bitmap
allocated in the caller, WinLayout::DrawText(). The caller uses that
bitmap as a texture and blends it into the actual destination,
separately for each glyph.
For non-Graphite fonts, or when not using OpenGL, nothing should
change. No repeated DrawTextImpl calls are done to iterate over a run.
Change-Id: Ib7adc30665fc7804913fd2f8886c5b29d9ca42c4
diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx
index a1cdf14..f46ae47 100644
--- a/vcl/win/gdi/winlayout.cxx
+++ b/vcl/win/gdi/winlayout.cxx
@@ -566,7 +566,10 @@ void WinLayout::DrawText(SalGraphics& rGraphics) const
if (!mbUseOpenGL)
{
// no OpenGL, just classic rendering
-DrawTextImpl(hDC, NULL);
+Point aPos(0, 0);
+int nGetNextGlypInfo(0);
+bool bContinue = DrawTextImpl(hDC, NULL, &aPos, &nGetNextGlypInfo);
+assert(!bContinue);
}
else if (CacheGlyphs(rGraphics) &&
DrawCachedGlyphs(rGraphics))
@@ -607,40 +610,49 @@ void WinLayout::DrawText(SalGraphics& rGraphics) const
Rectangle aRect;
GetBoundRect(rGraphics, aRect);
-OpenGLCompatibleDC aDC(rGraphics, aRect.Left(), aRect.Top(),
aRect.GetWidth(), aRect.GetHeight());
+WinOpenGLSalGraphicsImpl *pImpl =
dynamic_cast(rWinGraphics.mpImpl.get());
-// we are making changes to the DC, make sure we got a new one
-assert(aDC.getCompatibleHDC() != hDC);
+if (pImpl)
+{
+pImpl->PreDraw();
-// setup the hidden DC with black color and white background, we will
-// use the result of the text drawing later as a mask only
-HFONT hOrigFont = SelectFont(aDC.getCompatibleHDC(), mhFont);
+Point aPos(0, 0);
+int nGetNextGlypInfo(0);
+while (true)
+{
+OpenGLCompatibleDC aDC(rGraphics, aRect.Left(), aRect.Top(),
aRect.GetWidth(), aRect.GetHeight());
-SetTextColor(aDC.getCompatibleHDC(), RGB(0, 0, 0));
-SetBkColor(aDC.getCompatibleHDC(), RGB(255, 255, 255));
+// we are making changes to the DC, make sure we got a new one
+assert(aDC.getCompatibleHDC() != hDC);
-UINT nTextAlign = GetTextAlign(hDC);
-SetTextAlign(aDC.getCompatibleHDC(), nTextAlign);
+// setup the hidden DC with black color and white background,
we will
+// use the result of the text drawing later as a mask only
+HFONT hOrigFont = SelectFont(aDC.getCompatibleHDC(), mhFont);
-// the actual drawing
-DrawTextImpl(aDC.getCompatibleHDC(), &aRect);
+SetTextColor(aDC.getCompatibleHDC(), RGB(0, 0, 0));
+SetBkColor(aDC.getCompatibleHDC(), RGB(255, 255, 255));
-COLORREF color = GetTextColor(hDC);
-SalColor salColor = MAKE_SALCOLOR(GetRValue(color), GetGValue(color),
GetBValue(color));
+UINT nTextAlign = GetTextAlign(hDC);
+SetTextAlign(aDC.getCompatibleHDC(), nTextAlign);
-WinOpenGLSalGraphicsImpl *pImpl =
dynamic_cast(rWinGraphics.mpImpl.get());
-if (pImpl)
-{
-pImpl->PreDraw();
+COLORR
[Libreoffice-commits] core.git: sw/JunitTest_sw_complex.mk sw/qa
sw/JunitTest_sw_complex.mk |1 -
sw/qa/python/check_cross_references.py |4 ++--
2 files changed, 2 insertions(+), 3 deletions(-)
New commits:
commit bcf7ab3e13ac276ef42fa96af0755795c5f88c4a
Author: Michael Stahl
Date: Fri Dec 18 13:51:44 2015 +0100
fix some issues with 214b0c8356ab88e75cb4bbc2ad3109ee536dcd70
Change-Id: Icd3cf90bf617c9c77dcf9cbda705bf348f980fb3
diff --git a/sw/JunitTest_sw_complex.mk b/sw/JunitTest_sw_complex.mk
index ae96c28..688ef19 100644
--- a/sw/JunitTest_sw_complex.mk
+++ b/sw/JunitTest_sw_complex.mk
@@ -49,7 +49,6 @@ $(eval $(call gb_JunitTest_add_classes,sw_complex,\
complex.accessibility.AccessibleRelationSet \
complex.checkColor.CheckChangeColor \
complex.writer.CheckBookmarks \
-complex.writer.CheckCrossReferences \
complex.writer.CheckTable \
complex.writer.CheckIndexedPropertyValues \
complex.writer.CheckNamedPropertyValues \
diff --git a/sw/qa/python/check_cross_references.py
b/sw/qa/python/check_cross_references.py
index da6006e..5ec1bc8 100644
--- a/sw/qa/python/check_cross_references.py
+++ b/sw/qa/python/check_cross_references.py
@@ -75,7 +75,7 @@ class CheckCrossReferences(unittest.TestCase):
def getFieldProps(self,xField):
xProps = xField
-self.assertTrue("Cannot retrieve field properties.", xProps)
+self.assertTrue(xProps, "Cannot retrieve field properties.")
return xProps
def checkField(self, xField , xProps, nFormat, aExpectedFieldResult ):
@@ -222,7 +222,7 @@ class CheckCrossReferences(unittest.TestCase):
#check inserted reference field
xField = xNewField
-self.assertTrue("J", xField.getPresentation(False)) #inserted
reference field doesn't has correct field result
+self.assertEqual("J", xField.getPresentation(False)) #inserted
reference field doesn't has correct field result
xParaTextRange.getStart().setString( "Hallo new bookmark: ")
self.xFieldsRefresh.refresh()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - writerperfect/qa
dev/null |binary 1 file changed New commits: commit c28aad62c7295b23d45a9e2fa579068922de8144 Author: David Tardon Date: Fri Dec 18 13:22:41 2015 +0100 drop test file for unsupported Keynote version I don't remember why I added it anyway. And it will break build with (system) libetonyek >= 0.1.4, as the format is supported by that version. Change-Id: I4b69af8ae637eae2ff1f7342eaa6a7e8580c3af4 Reviewed-on: https://gerrit.libreoffice.org/20790 Reviewed-by: Michael Stahl Tested-by: Michael Stahl diff --git a/writerperfect/qa/unit/data/impress/libetonyek/fail/.gitignore b/writerperfect/qa/unit/data/impress/libetonyek/fail/.gitignore new file mode 100644 index 000..e69de29 diff --git a/writerperfect/qa/unit/data/impress/libetonyek/fail/v6.zip b/writerperfect/qa/unit/data/impress/libetonyek/fail/v6.zip deleted file mode 100644 index b0401b3..000 Binary files a/writerperfect/qa/unit/data/impress/libetonyek/fail/v6.zip and /dev/null differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - vcl/win
vcl/win/source/gdi/winlayout.cxx | 79 ---
vcl/win/source/gdi/winlayout.hxx |6 +-
2 files changed, 52 insertions(+), 33 deletions(-)
New commits:
commit ac04051a3565bb5cde904da9a84b6e22443cf8b5
Author: Tor Lillqvist
Date: Fri Dec 18 14:38:27 2015 +0200
tdf#95054: Make sure glyphs alpha blend properly in the Graphite+OpenGL case
The problem apparently was that the GraphiteWinLayout::DrawTextImpl()
function drew each glyph using a separate call to ExtTextOutW(). That
mishandled anti-aliased glyphs (alpha), somewhat in the way as
described in the nice long comment (thanks kendy!) in
WinLayout::DrawText().
The irony here is that in the case of Graphite fonts and OpenGL, it is
exactly from that code block in WinLayout::DrawText() that
GraphiteWinLayout::DrawTextImpl() gets called, and in that situation
it itself runs into the same or similar problem as the calling code
wants to avoid for the run as a whole. It draws each glyph separately,
and subsequent glyphs will overwrite the rightmost pixels of the
earlier one instead of blend properly. Or something like that.
As a solution, change the interface of DrawTextImpl() so that instead
of being called once to draw a run of text, it might draw just a part
of the run, and in that case expects to be called repeatedly to draw
the whole text.
The GraphiteWinLayout::DrawTextImpl() implementation does it like this
in the case of using OpenGL (as indicated by the presence of a
non-null pRectToErase, as added in
b7842c93dc06b831d3fa649410ed847358ce9d17 for tdf#95648). The end
result is that it draws one glyph at a time into the DC for the bitmap
allocated in the caller, WinLayout::DrawText(). The caller uses that
bitmap as a texture and blends it into the actual destination,
separately for each glyph.
For non-Graphite fonts, or when not using OpenGL, nothing should
change. No repeated DrawTextImpl calls are done to iterate over a run.
Change-Id: Ib7adc30665fc7804913fd2f8886c5b29d9ca42c4
(cherry picked from commit 61085083e4a5060ba7e2135818264d63c6da13c2)
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index 7c57366..cef4f8a 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -566,7 +566,10 @@ void WinLayout::DrawText(SalGraphics& rGraphics) const
if (!mbUseOpenGL)
{
// no OpenGL, just classic rendering
-DrawTextImpl(hDC, NULL);
+Point aPos(0, 0);
+int nGetNextGlypInfo(0);
+bool bContinue = DrawTextImpl(hDC, NULL, &aPos, &nGetNextGlypInfo);
+assert(!bContinue);
}
else if (CacheGlyphs(rGraphics) &&
DrawCachedGlyphs(rGraphics))
@@ -607,40 +610,49 @@ void WinLayout::DrawText(SalGraphics& rGraphics) const
Rectangle aRect;
GetBoundRect(rGraphics, aRect);
-OpenGLCompatibleDC aDC(rGraphics, aRect.Left(), aRect.Top(),
aRect.GetWidth(), aRect.GetHeight());
+WinOpenGLSalGraphicsImpl *pImpl =
dynamic_cast(rWinGraphics.mpImpl.get());
-// we are making changes to the DC, make sure we got a new one
-assert(aDC.getCompatibleHDC() != hDC);
+if (pImpl)
+{
+pImpl->PreDraw();
-// setup the hidden DC with black color and white background, we will
-// use the result of the text drawing later as a mask only
-HFONT hOrigFont = SelectFont(aDC.getCompatibleHDC(), mhFont);
+Point aPos(0, 0);
+int nGetNextGlypInfo(0);
+while (true)
+{
+OpenGLCompatibleDC aDC(rGraphics, aRect.Left(), aRect.Top(),
aRect.GetWidth(), aRect.GetHeight());
-SetTextColor(aDC.getCompatibleHDC(), RGB(0, 0, 0));
-SetBkColor(aDC.getCompatibleHDC(), RGB(255, 255, 255));
+// we are making changes to the DC, make sure we got a new one
+assert(aDC.getCompatibleHDC() != hDC);
-UINT nTextAlign = GetTextAlign(hDC);
-SetTextAlign(aDC.getCompatibleHDC(), nTextAlign);
+// setup the hidden DC with black color and white background,
we will
+// use the result of the text drawing later as a mask only
+HFONT hOrigFont = SelectFont(aDC.getCompatibleHDC(), mhFont);
-// the actual drawing
-DrawTextImpl(aDC.getCompatibleHDC(), &aRect);
+SetTextColor(aDC.getCompatibleHDC(), RGB(0, 0, 0));
+SetBkColor(aDC.getCompatibleHDC(), RGB(255, 255, 255));
-COLORREF color = GetTextColor(hDC);
-SalColor salColor = MAKE_SALCOLOR(GetRValue(color), GetGValue(color),
GetBValue(color));
+UINT nTextAlign = GetTextAlign(hDC);
+SetTextAlign(aDC.getCompatibleHDC(), nTextAlign);
-WinOpenGLSalGraphicsImpl *pImpl =
dynamic_cast(rWinGr
[Libreoffice-commits] core.git: javaunohelper/com
javaunohelper/com/sun/star/comp/helper/Bootstrap.java | 58 +++---
1 file changed, 51 insertions(+), 7 deletions(-)
New commits:
commit 02002f83f156117cf178532d48abaa9319ee8cb4
Author: Katarina Behrens
Date: Tue Dec 15 14:44:44 2015 +0100
tdf#86784: Pass custom options to Java bootstrap
Change-Id: I9e9c78387627e173dea8062e4a3f16bc396e8115
Reviewed-on: https://gerrit.libreoffice.org/20720
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
diff --git a/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
b/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
index a36f16c..0b99cce 100644
--- a/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
+++ b/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
@@ -92,6 +92,34 @@ public class Bootstrap {
}
/**
+ * Returns an array of default commandline options to start bootstrapped
+ * instance of soffice with. You may use it in connection with bootstrap
+ * method for example like this:
+ *
+ * List list = Arrays.asList( Bootstrap.getDefaultOptions() );
+ * list.remove("--nologo");
+ * list.remove("--nodefault");
+ * list.add("--invisible");
+ *
+ * Bootstrap.bootstrap( list.toArray( new String[list.size()] );
+ *
+ *
+ * @return an array of default commandline options
+ * @see #bootstrap( String[] )
+ * @since UDK 5.2.0
+ */
+public static final String[] getDefaultOptions()
+{
+return new String[]
+{
+"--nologo",
+"--nodefault",
+"--norestore",
+"--nolockcheck"
+};
+}
+
+/**
* backwards compatibility stub.
*/
public static XComponentContext createInitialComponentContext(
Hashtable context_entries )
@@ -248,6 +276,24 @@ public class Bootstrap {
public static final XComponentContext bootstrap()
throws BootstrapException {
+String[] defaultArgArray = getDefaultOptions();
+return bootstrap( defaultArgArray );
+}
+
+/**
+ * Bootstraps the component context from a UNO installation.
+ *
+ * @param argArray
+ *an array of strings - commandline options to start instance of
+ *soffice with
+ * @see #getDefaultOptions()
+ * @return a bootstrapped component context.
+ *
+ * @since UDK 5.2.0
+ */
+public static final XComponentContext bootstrap( String[] argArray )
+throws BootstrapException {
+
XComponentContext xContext = null;
try {
@@ -271,13 +317,11 @@ public class Bootstrap {
Long.toString( (new Random()).nextLong() & 0x7fffL
);
// create call with arguments
-String[] cmdArray = new String[] {
-fOffice.getPath(),
-"--nologo",
-"--nodefault",
-"--norestore",
-"--nolockcheck",
-"--accept=pipe,name=" + sPipeName + ";urp;" };
+String[] cmdArray = new String[ argArray.length + 2 ];
+cmdArray[0] = fOffice.getPath();
+cmdArray[1] = ( "--accept=pipe,name=" + sPipeName + ";urp;" );
+
+System.arraycopy( argArray, 0, cmdArray, 2, argArray.length );
// start office process
Process p = Runtime.getRuntime().exec( cmdArray );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/reference.html loolwsd/LOOLSession.cpp
loleaflet/reference.html |4 ++--
loolwsd/LOOLSession.cpp |6 +-
2 files changed, 7 insertions(+), 3 deletions(-)
New commits:
commit fe7ae3cc2a5173ac5b5dde72f30560d60f4f386e
Author: Mihai Varga
Date: Fri Dec 18 15:40:03 2015 +0200
fire the `commandresult` when the saveAs command has finished
diff --git a/loleaflet/reference.html b/loleaflet/reference.html
index 3e28ec0..730fe05 100644
--- a/loleaflet/reference.html
+++ b/loleaflet/reference.html
@@ -1862,7 +1862,7 @@ unexpected behaviour.
commandresult
CommandResultEvent
- Fired when the a dispatched uno command has finished.
+ Fired when a dispatched uno command or the 'saveas' command
has finished.
commandstatechanged
@@ -1977,7 +1977,7 @@ unexpected behaviour.
commandName
CommandStateChangedValues
- UNO command.
+ UNO command or 'saveas'.
success
diff --git a/loolwsd/LOOLSession.cpp b/loolwsd/LOOLSession.cpp
index fbfea8b..513cd5c 100644
--- a/loolwsd/LOOLSession.cpp
+++ b/loolwsd/LOOLSession.cpp
@@ -1505,11 +1505,15 @@ bool ChildProcessSession::saveAs(const char*
/*buffer*/, int /*length*/, StringT
}
}
-_loKitDocument->pClass->saveAs(_loKitDocument, url.c_str(),
+bool success = _loKitDocument->pClass->saveAs(_loKitDocument, url.c_str(),
format.size() == 0 ? NULL :format.c_str(),
filterOptions.size() == 0 ? NULL : filterOptions.c_str());
sendTextFrame("saveas: url=" + url);
+std::string successStr = success ? "true" : "false";
+sendTextFrame("unocommandresult: {"
+"\"commandName\":\"saveas\","
+"\"success\":\"" + successStr + "\"}");
return true;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source
cui/source/customize/cfg.cxx |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit b2e78fc73363d3ee43e3ee7bc90237d6d048aef7
Author: Rishabh Kumar
Date: Tue Aug 18 03:11:53 2015 +0530
tdf#80758:empty values in button name not respected
In case of empty values , the accelerator character is passed as the button
name which avoids extra spacing.
Change-Id: I8a82f5226e17bf8977fb6a8fd59c99a244e59309
Reviewed-on: https://gerrit.libreoffice.org/14498
Tested-by: Jenkins
Reviewed-by: Norbert Thiebaud
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 2b1cd622..b1defa9 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -3396,9 +3396,12 @@ IMPL_LINK_TYPED( SvxToolbarConfigPage, EntrySelectHdl,
MenuButton *, pButton, vo
if ( pNameDialog->Execute() == RET_OK ) {
pNameDialog->GetName(aNewName);
-pEntry->SetName( aNewName );
-m_pContentsListBox->SetEntryText( pActEntry, aNewName );
+if( aNewName == "" ) //tdf#80758 - Accelerator character ("~")
is passed as
+pEntry->SetName( "~" ); // the button name in case of
empty values.
+else
+pEntry->SetName( aNewName );
+m_pContentsListBox->SetEntryText( pActEntry, aNewName );
bNeedsApply = true;
}
break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Two svg import filters
Hi, Am 18.12.2015 um 12:12 schrieb Regina Henschel: Hi Armin, Armin Le Grand schrieb: [..] Both do not allow round-trip, good-quality SVG editing, that is not the role of LO. Why not? Don't get me wrong - I would love LO to be a SVG editor, in the same sense that I would love it to be a pixel editor when a pixel graphic is selected. Both would require much work to make it happen. In the case of the pixel editor the pragmatic answer is to use an external tool, evtl. triggered from the office. As long as we do not extensively add work to get a good SVG edit roundtrip, the answer for now is the same for SVG. At least, (b) keeps the orig SVG as reusable data (context menu, save graphic saves the *original* svg). Thus, you can edit it in an external editor and re-add (or is there nowadays even a 'edit in external editor', have seen that somewhere..?). The item "Edit with External Tool..." is in the context menu of the image. In my case the browser is started to open the svg image. But LO adds garbage in front of the svg source, so my browser shows an XML error. Despite of the ... in the item label, no dialog opens to choose the External Tool. The idea is good and this should be added to bugzilla as an error. This should be possible for SVG and pixel graphics. If this runs well (and opens the user's choosen default editor for the wnated purpose) we have a good solution. Kind regards Regina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice -- -- ALG (PGP Key: EE1C 4B3F E751 D8BC C485 DEC1 3C59 F953 D81C F4A2) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Two svg import filters
Hi, Am 18.12.2015 um 11:56 schrieb Regina Henschel: Hi all, Thorsten Behrens schrieb: Michael Stahl wrote: i don't claim to know anything about SVG, but i just noticed that filter/source/svg uses boost::spirit, and therefore i am +1 for removing it. That's so far the strongest case for removal here. ;) Other than that, the two filters serve two very different purposes - the document filter actually tries to map svg as well as possible to ODF (it would work even better if LibreOffice's ODF filter would support more of the syntax and semantics of SVG), to get *editable* graphics. As such, replacing the document importer with something that sticks the image into a graphic object is missing the point IMO. I think, that one filter is enough and that LO should use svgio. In case of File>Open and if you really want to make the graphic immediately editable, then LO should insert the SVG in a new document as done by Insert>Image and then break it automatically. All effort and free time should be used to improve svgio and to implement the missing ODF parts. For example the lack of the ODF elements and is really bad. It does not only effect SVG import but the OOXML filter too. +1! Kind regards Regina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice -- -- ALG (PGP Key: EE1C 4B3F E751 D8BC C485 DEC1 3C59 F953 D81C F4A2) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: formula/source
formula/source/ui/dlg/formula.cxx | 55 ++
1 file changed, 38 insertions(+), 17 deletions(-)
New commits:
commit 9d1ee5a5b4730a6d3da4e8a02a08d1d27e9d27e4
Author: Eike Rathke
Date: Fri Dec 18 15:40:31 2015 +0100
Resolves: tdf#96366 replace Edit...() calls with actually working code
... and way less overhead, geez..
Change-Id: Id9277301fbe69bc9a83ca39a907032b0b86b1c81
diff --git a/formula/source/ui/dlg/formula.cxx
b/formula/source/ui/dlg/formula.cxx
index 3c1523c..bb4f46d 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -92,6 +92,8 @@ public:
boolEditNextFunc( bool bForward, sal_Int32 nFStart=NOT_FOUND );
voidEditThisFunc(sal_Int32 nFStart);
+OUStringGetPrevFuncExpression( bool bStartFromEnd );
+
voidStoreFormEditData(FormEditData* pEditData);
voidUpdate();
@@ -206,6 +208,8 @@ public:
::std::vector< OUString > m_aArguments;
Selection aFuncSel;
+sal_Int32 mnFuncExpStart; ///< current formula position for
treeview results
+
FormulaDlg_Impl(Dialog* pParent
, bool _bSupportFunctionResult
, bool _bSupportResult
@@ -242,7 +246,8 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog* pParent
bMakingTree (false),
nEdFocus(0),
pFuncDesc (nullptr),
-nArgs (0)
+nArgs (0),
+mnFuncExpStart (0)
{
pParent->get(m_pParaWinBox, "BOX");
pParent->get(m_pTabCtrl, "tabs");
@@ -695,31 +700,25 @@ void FormulaDlg_Impl::MakeTree(StructPage*
_pTree,SvTreeListEntry* pParent,Formu
if (bCalcSubformula)
{
-/* FIXME: tdf#96366 this simply does not work, disable until solved. */
-#if 0
-OUString aStr;
-OUString aEquals(" = ");
+OUString aFormula;
if (!bMakingTree)
-{ // gets the last subformula result
+{
+// gets the last subformula result
bMakingTree = true;
-EditThisFunc(0);
-while ( EditNextFunc(true) ) {}
+aFormula = GetPrevFuncExpression( true);
}
else
-{ // gets subsequent subformula results (from the back)
-const IFunctionDescription* pDesc
=pFuncPage->GetFuncDesc( pFuncPage->GetFunction() );
-if(pDesc==pFuncDesc || !pFuncPage->IsVisible())
-{
-EditNextFunc(false);
-}
+{
+// gets subsequent subformula results (from the back)
+aFormula = GetPrevFuncExpression( false);
}
-if ( CalcValue( pFuncDesc->getFormula( m_aArguments ),
aStr ) )
+OUString aStr;
+if (CalcValue( aFormula, aStr))
m_pWndResult->SetText( aStr );
aStr = m_pWndResult->GetText();
-pStructPage->GetTlbStruct()->SetEntryText(pEntry,aResult +
aEquals + aStr);
-#endif
+pStructPage->GetTlbStruct()->SetEntryText( pEntry, aResult
+ " = " + aStr);
}
--Count;
@@ -1200,6 +1199,28 @@ bool FormulaDlg_Impl::EditNextFunc( bool bForward,
sal_Int32 nFStart )
return bFound;
}
+OUString FormulaDlg_Impl::GetPrevFuncExpression( bool bStartFromEnd )
+{
+OUString aExpression;
+
+OUString aFormula( m_pHelper->getCurrentFormula());
+if (aFormula.isEmpty())
+return aExpression;
+
+if (bStartFromEnd || mnFuncExpStart >= aFormula.getLength())
+mnFuncExpStart = aFormula.getLength() - 1;
+
+sal_Int32 nFStart = mnFuncExpStart;
+sal_Int32 nFEnd = 0;
+if (m_aFormulaHelper.GetNextFunc( aFormula, true, nFStart, &nFEnd))
+{
+aExpression = aFormula.copy( nFStart, nFEnd - nFStart); // nFEnd is
exclusive
+mnFuncExpStart = nFStart;
+}
+
+return aExpression;
+}
+
void FormulaDlg_Impl::SaveArg( sal_uInt16 nEd )
{
if (nEdhttp://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/docnode/ndtbl1.cxx | 14 ++
sw/source/core/unocore/unotbl.cxx | 18 ++
2 files changed, 32 insertions(+)
New commits:
commit d95428278d54697064973a70c68fd2c40d174d8a
Author: Oliver Specht
Date: Fri Dec 18 12:55:55 2015 +0100
tdf#33477: added support of property VertOrient to cell range
Change-Id: Id8f0c138fb665a19b92f2779aa59ae1778efddc5
Reviewed-on: https://gerrit.libreoffice.org/20789
Tested-by: Jenkins
Reviewed-by: Oliver Specht
diff --git a/sw/source/core/docnode/ndtbl1.cxx
b/sw/source/core/docnode/ndtbl1.cxx
index 99be14a..a95cec8 100644
--- a/sw/source/core/docnode/ndtbl1.cxx
+++ b/sw/source/core/docnode/ndtbl1.cxx
@@ -1213,6 +1213,20 @@ bool SwDoc::GetBoxAttr( const SwCursor& rCursor,
SfxPoolItem& rToFill )
else if( rToFill != rDir )
bRet = false;
}
+break;
+case RES_VERT_ORIENT:
+{
+const SwFormatVertOrient& rOrient =
+
aBoxes[i]->GetFrameFormat()->GetVertOrient();
+if( !bOneFound )
+{
+(SwFormatVertOrient&)rToFill = rOrient;
+bOneFound = true;
+}
+else if( rToFill != rOrient )
+bRet = false;
+}
+break;
}
if ( !bRet )
diff --git a/sw/source/core/unocore/unotbl.cxx
b/sw/source/core/unocore/unotbl.cxx
index d8cf5c6..4e6c1c7 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -61,6 +61,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -3384,6 +3385,14 @@ void SwXCellRange::setPropertyValue(const OUString&
rPropertyName, const uno::An
}
}
break;
+case RES_VERT_ORIENT:
+{
+sal_Int16 nAlign = -1;
+aValue >>= nAlign;
+if( nAlign >= text::VertOrientation::NONE && nAlign <=
text::VertOrientation::BOTTOM)
+pDoc->SetBoxAlign( rCursor, nAlign );
+}
+break;
default:
{
SfxItemSet aItemSet( pDoc->GetAttrPool(), pEntry->nWID,
pEntry->nWID );
@@ -3462,6 +3471,15 @@ uno::Any SwXCellRange::getPropertyValue(const OUString&
rPropertyName)
case FN_UNO_RANGE_COL_LABEL:
aRet <<= m_bFirstColumnAsLabel;
break;
+case RES_VERT_ORIENT:
+{
+SwFormatVertOrient aVertOrient;
+if( m_pTableCursor->GetDoc()->GetBoxAttr( *m_pTableCursor,
aVertOrient ) )
+{
+aVertOrient.QueryValue( aRet, pEntry->nMemberId );
+}
+}
+break;
default:
{
SfxItemSet aSet(m_pTableCursor->GetDoc()->GetAttrPool(),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - formula/source
formula/source/ui/dlg/formula.cxx | 55 ++
1 file changed, 38 insertions(+), 17 deletions(-)
New commits:
commit 0996f40fbc8cb2456ed042d7a93d9fb538e0b7d0
Author: Eike Rathke
Date: Fri Dec 18 15:40:31 2015 +0100
Resolves: tdf#96366 replace Edit...() calls with actually working code
... and way less overhead, geez..
Change-Id: Id9277301fbe69bc9a83ca39a907032b0b86b1c81
(cherry picked from commit 9d1ee5a5b4730a6d3da4e8a02a08d1d27e9d27e4)
diff --git a/formula/source/ui/dlg/formula.cxx
b/formula/source/ui/dlg/formula.cxx
index 3c1523c..bb4f46d 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -92,6 +92,8 @@ public:
boolEditNextFunc( bool bForward, sal_Int32 nFStart=NOT_FOUND );
voidEditThisFunc(sal_Int32 nFStart);
+OUStringGetPrevFuncExpression( bool bStartFromEnd );
+
voidStoreFormEditData(FormEditData* pEditData);
voidUpdate();
@@ -206,6 +208,8 @@ public:
::std::vector< OUString > m_aArguments;
Selection aFuncSel;
+sal_Int32 mnFuncExpStart; ///< current formula position for
treeview results
+
FormulaDlg_Impl(Dialog* pParent
, bool _bSupportFunctionResult
, bool _bSupportResult
@@ -242,7 +246,8 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog* pParent
bMakingTree (false),
nEdFocus(0),
pFuncDesc (nullptr),
-nArgs (0)
+nArgs (0),
+mnFuncExpStart (0)
{
pParent->get(m_pParaWinBox, "BOX");
pParent->get(m_pTabCtrl, "tabs");
@@ -695,31 +700,25 @@ void FormulaDlg_Impl::MakeTree(StructPage*
_pTree,SvTreeListEntry* pParent,Formu
if (bCalcSubformula)
{
-/* FIXME: tdf#96366 this simply does not work, disable until solved. */
-#if 0
-OUString aStr;
-OUString aEquals(" = ");
+OUString aFormula;
if (!bMakingTree)
-{ // gets the last subformula result
+{
+// gets the last subformula result
bMakingTree = true;
-EditThisFunc(0);
-while ( EditNextFunc(true) ) {}
+aFormula = GetPrevFuncExpression( true);
}
else
-{ // gets subsequent subformula results (from the back)
-const IFunctionDescription* pDesc
=pFuncPage->GetFuncDesc( pFuncPage->GetFunction() );
-if(pDesc==pFuncDesc || !pFuncPage->IsVisible())
-{
-EditNextFunc(false);
-}
+{
+// gets subsequent subformula results (from the back)
+aFormula = GetPrevFuncExpression( false);
}
-if ( CalcValue( pFuncDesc->getFormula( m_aArguments ),
aStr ) )
+OUString aStr;
+if (CalcValue( aFormula, aStr))
m_pWndResult->SetText( aStr );
aStr = m_pWndResult->GetText();
-pStructPage->GetTlbStruct()->SetEntryText(pEntry,aResult +
aEquals + aStr);
-#endif
+pStructPage->GetTlbStruct()->SetEntryText( pEntry, aResult
+ " = " + aStr);
}
--Count;
@@ -1200,6 +1199,28 @@ bool FormulaDlg_Impl::EditNextFunc( bool bForward,
sal_Int32 nFStart )
return bFound;
}
+OUString FormulaDlg_Impl::GetPrevFuncExpression( bool bStartFromEnd )
+{
+OUString aExpression;
+
+OUString aFormula( m_pHelper->getCurrentFormula());
+if (aFormula.isEmpty())
+return aExpression;
+
+if (bStartFromEnd || mnFuncExpStart >= aFormula.getLength())
+mnFuncExpStart = aFormula.getLength() - 1;
+
+sal_Int32 nFStart = mnFuncExpStart;
+sal_Int32 nFEnd = 0;
+if (m_aFormulaHelper.GetNextFunc( aFormula, true, nFStart, &nFEnd))
+{
+aExpression = aFormula.copy( nFStart, nFEnd - nFStart); // nFEnd is
exclusive
+mnFuncExpStart = nFStart;
+}
+
+return aExpression;
+}
+
void FormulaDlg_Impl::SaveArg( sal_uInt16 nEd )
{
if (nEdhttp://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/source sfx2/source
desktop/source/lib/init.cxx |3 +++
sfx2/source/control/unoctitm.cxx |7 +--
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 8a7a20f67567ee94a5d3a77230c8e260f0142c1c
Author: Mihai Varga
Date: Fri Dec 18 16:55:25 2015 +0200
LOK: get feedback for all of the font/back color commands
Change-Id: Id4aac707666420752b985bcfd03b5b9bb99f79f1
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 8fa8e0e..3b0c7d7 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -661,9 +661,12 @@ static void doc_iniUnoCommands ()
OUString sUnoCommands[] =
{
OUString(".uno:BackColor"),
+OUString(".uno:BackgroundColor"),
OUString(".uno:Bold"),
OUString(".uno:CenterPara"),
+OUString(".uno:CharBackColor"),
OUString(".uno:CharFontName"),
+OUString(".uno:Color"),
OUString(".uno:DecrementIndent"),
OUString(".uno:DefaultBullet"),
OUString(".uno:DefaultNumbering"),
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 00c76e2..8645826 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1102,8 +1102,11 @@ void
SfxDispatchController_Impl::InterceptLOKStateChangeEvent(const SfxObjectShe
aEvent.State >>= aTemplate;
aBuffer.append(aTemplate.StyleName);
}
-else if (aEvent.FeatureURL.Path == "FontColor" ||
- aEvent.FeatureURL.Path == "BackColor")
+else if (aEvent.FeatureURL.Path == "BackColor" ||
+ aEvent.FeatureURL.Path == "BackgroundColor" ||
+ aEvent.FeatureURL.Path == "CharBackColor" ||
+ aEvent.FeatureURL.Path == "Color" ||
+ aEvent.FeatureURL.Path == "FontColor")
{
sal_Int32 nColor = -1;
aEvent.State >>= nColor;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - desktop/source sfx2/source
desktop/source/lib/init.cxx |3 +++
sfx2/source/control/unoctitm.cxx |7 +--
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 3efce450f669417f14cee5610f1e9614f1315d0f
Author: Mihai Varga
Date: Fri Dec 18 16:55:25 2015 +0200
LOK: get feedback for all of the font/back color commands
Change-Id: Id4aac707666420752b985bcfd03b5b9bb99f79f1
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index efd5d10..f8d37ef 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -670,9 +670,12 @@ static void doc_iniUnoCommands ()
OUString sUnoCommands[] =
{
OUString(".uno:BackColor"),
+OUString(".uno:BackgroundColor"),
OUString(".uno:Bold"),
OUString(".uno:CenterPara"),
+OUString(".uno:CharBackColor"),
OUString(".uno:CharFontName"),
+OUString(".uno:Color"),
OUString(".uno:DecrementIndent"),
OUString(".uno:DefaultBullet"),
OUString(".uno:DefaultNumbering"),
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index f0e9bc1..ddc1596 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1104,8 +1104,11 @@ void
SfxDispatchController_Impl::InterceptLOKStateChangeEvent(const SfxObjectShe
aEvent.State >>= aTemplate;
aBuffer.append(aTemplate.StyleName);
}
-else if (aEvent.FeatureURL.Path == "FontColor" ||
- aEvent.FeatureURL.Path == "BackColor")
+else if (aEvent.FeatureURL.Path == "BackColor" ||
+ aEvent.FeatureURL.Path == "BackgroundColor" ||
+ aEvent.FeatureURL.Path == "CharBackColor" ||
+ aEvent.FeatureURL.Path == "Color" ||
+ aEvent.FeatureURL.Path == "FontColor")
{
sal_Int32 nColor = -1;
aEvent.State >>= nColor;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Minutes of the Design Hangout: 2015-12-11
* Present: Heiko, Kendy, Samuel, Stuart, Tomaž * UI changes integrated the last week: + Kill destructive color conversion menu in Impress (Tomaž) + ToolbarAsMenu controller in reportdesign (Maxim) + Displaymode icons (Andreas) + Improved toolbars (Jay) + Breeze icons improvements (Andreas) + Fix tooltips for frame alignment buttons (Samuel) + Save button behavior (Samuel) + Save contains "Save as" and "Save remote" in a dropdown + Dropdown was disabled when "Save" was disabled -> Made the button dropdown only when save disabled https://gerrit.libreoffice.org/#/c/20079/ + However, this is quite irritating (button has two different modes, user doesn't know why he can't click save and later he can) + Also users missing indication whether document is saved + possible solutions: + make only the dropdown active + move the functionality to Save As + what do you want from that button? (Heiko) + is there a good reason to disable Save in the first place? (Heiko) + we already have a user setting to enable Save all the time (Kendy) + moving to Save As is a problem: wanted to hide it in the default toolbar + Save status is in the status bar too (Kendy) + not many people know about that though (Heiko) + the information could be in the tooltip; even with additional info (Document is saved / Document is modified / ...) (Kendy) +1 (Stuart) + eg. MSO has that enabled all the time (Samuel) + additional / new icon indicator in the toolbar for that - disabled by default (Heiko) + icon that looks disabled, but still clickable (Samuel) + that would be confusing (Heiko) + possiblity to switch the icon to one with a star when unsaved changes? (Kendy) + decoration / small star + like it (Heiko) + any technical limitations when allowing saving all the time? (Heiko) + not that I am aware of (Kendy) + conclusion: + implement switching of the Save icon to a "Document has changes" state + decorator, like an added star (Andreas promised to take a look, at least for Breeze) + enable Save always + remove the configuration setting to disable the Save button (because it would be confusing when the user switches to "disabling") + hide the Save As from the toolbar + Samuel will talk to Maxim, let's still try to get this in as a late feature + Navigator in Impress & Draw (Samuel) + What to do with "Show Navigator when Slideshow running"? + there is a possibility to have the navigator visible during presenting (Samuel) + but that's the point of the presenter console (Samuel) + would like to remove this feature (Samuel) + does not even work in my 5.0 :-) (Kendy) + looks unused / nobody misses this feature apparently (Samuel / all) + keep in mind that people wanted the use case the separate window for navigator in Writer (Stuart) + conclusion: + let's remove the "Navigator visible" from Slide Show -> Slide Show Settings... + if there is a missing functionality, let's find out the exact use case, and add to the presenter console + EasyHack created for this: https://bugs.documentfoundation.org/show_bug.cgi?id=96414 + Mail merge toolbar (Kendy) + current problem: in the Mail Merge Wizard, the document state switches between the "Source" and "Target" view + confuses users a lot + proposed to drop the last 3 screens from the mail merge wizard + instead put this functionality to a toolbar, that has + Mail Merge Wizard (for changes in the address settings etc) + back and forth for navigation + skip recipient + Edit Individual Documents... + Print (range) + e-mail (range) + conclusion: sounds good + will share the prototype when I get there (Kendy) * Suggestions from Roland (Samuel) + http://nabble.documentfoundation.org/libre-office-vs-numbers-td4167428.html + Roland now bootstrapped, let's see (Samuel) + we can close this topic for now * Table styles blog post (Heiko) + shared a draft + needs a bit of discussion too unfortunately (Heiko) + discussed it in the call (Kendy/Heiko) + Heiko will finish the draft & publish * Start Center GUI suggestions for change (Stuart) + there were some new proposals about the start center (Stuart) + thanks so much for thinking in the new ways + sharing only a screenshot is not enough though + when considering a big change, more communication is needed - encourage to join the #libreoffice-design, and discuss there + https://bugs.documentfoundation.org/show_bug.cgi?id=96383 + Change Start Screen - kompilainenn's + very concise, tabbed GUI -- maybe an alternate to current thumbnail based (Stuart) + would f
[Libreoffice-commits] core.git: 2 commits - dbaccess/Library_dba.mk dbaccess/source
dbaccess/Library_dba.mk |1
dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx | 30 -
dbaccess/source/core/dataaccess/databasecontext.cxx |1
dbaccess/source/core/inc/module_dba.hxx | 34 ---
dbaccess/source/core/misc/module_dba.cxx | 29
5 files changed, 10 insertions(+), 85 deletions(-)
New commits:
commit e0075eb0c0b87f52ed74e19133d26cbd8138bb39
Author: Matúš Kukan
Date: Sat Nov 21 01:46:57 2015 +0100
dbaccess: module_dba not used anymore
Change-Id: I6f9222dd40c553e1d0ad63e00e5874be939a97c1
diff --git a/dbaccess/Library_dba.mk b/dbaccess/Library_dba.mk
index 6ed0a2b..beeddad 100644
--- a/dbaccess/Library_dba.mk
+++ b/dbaccess/Library_dba.mk
@@ -114,7 +114,6 @@ $(eval $(call gb_Library_add_exception_objects,dba,\
dbaccess/source/core/misc/ContainerMediator \
dbaccess/source/core/misc/DatabaseDataProvider \
dbaccess/source/core/misc/dsntypes \
-dbaccess/source/core/misc/module_dba \
dbaccess/source/core/misc/objectnameapproval \
dbaccess/source/core/misc/PropertyForward \
dbaccess/source/core/misc/sdbcoretools \
diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx
b/dbaccess/source/core/dataaccess/databasecontext.cxx
index 8ff8df3..b12ace6 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.cxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.cxx
@@ -27,7 +27,6 @@
#include "databaseregistrations.hxx"
#include "datasource.hxx"
#include "dbastrings.hrc"
-#include "module_dba.hxx"
#include
#include
diff --git a/dbaccess/source/core/inc/module_dba.hxx
b/dbaccess/source/core/inc/module_dba.hxx
deleted file mode 100644
index c79b53c..000
--- a/dbaccess/source/core/inc/module_dba.hxx
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_DBACCESS_SOURCE_CORE_INC_MODULE_DBA_HXX
-#define INCLUDED_DBACCESS_SOURCE_CORE_INC_MODULE_DBA_HXX
-
-#include
-
-namespace dba
-{
-
-DEFINE_MODULE( DbaModule, DbaClient, DbaRes )
-
-} // namespace sdbtools
-
-#endif // INCLUDED_DBACCESS_SOURCE_CORE_INC_MODULE_DBA_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/misc/module_dba.cxx
b/dbaccess/source/core/misc/module_dba.cxx
deleted file mode 100644
index 7b554e7..000
--- a/dbaccess/source/core/misc/module_dba.cxx
+++ /dev/null
@@ -1,29 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "module_dba.hxx"
-
-namespace dba
-{
-
-IMPLEMENT_MODULE( DbaModule, "dba" )
-
-} // namespace sdbtools
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 30289fcab7fdeb21e8380d55d2ae550fc888e6f5
Author: Matúš Kukan
Date: Sun Dec 13 12:51:52 2015 +0100
XComponentContext not needed for DataAccessDescriptor
Change-Id: If5ede0c308930d37bff9e97afc8a76cc5b709034
diff --git a/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx
b/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx
index e351d29..13df4cf 100644
--- a/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx
+++ b/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx
@@ -42,7 +42,6 @@ namespace
using :
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - connectivity/source
connectivity/source/drivers/firebird/PreparedStatement.cxx | 10
connectivity/source/drivers/firebird/Util.cxx | 16 -
2 files changed, 10 insertions(+), 16 deletions(-)
New commits:
commit 3ac3aff895ceb466934a2e22641f5340ea6d23f7
Author: Lionel Elie Mamane
Date: Fri Dec 18 16:54:00 2015 +0100
tdf#96572 firebird correctly transmit request for NULL
even if column is not nullable
Change-Id: I72ceda68e983125aef26c8f0aacc06320bd16b77
diff --git a/connectivity/source/drivers/firebird/PreparedStatement.cxx
b/connectivity/source/drivers/firebird/PreparedStatement.cxx
index fbc2fae..5e3758a 100644
--- a/connectivity/source/drivers/firebird/PreparedStatement.cxx
+++ b/connectivity/source/drivers/firebird/PreparedStatement.cxx
@@ -706,13 +706,13 @@ void OPreparedStatement::setParameterNull(sal_Int32
nParameterIndex,
bool bSetNull)
{
XSQLVAR* pVar = m_pInSqlda->sqlvar + (nParameterIndex - 1);
-if (pVar->sqltype & 1)
+if (bSetNull)
{
-if (bSetNull)
-*pVar->sqlind = -1;
-else
-*pVar->sqlind = 0;
+pVar->sqltype |= 1;
+*pVar->sqlind = -1;
}
+else
+*pVar->sqlind = 0;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/firebird/Util.cxx
b/connectivity/source/drivers/firebird/Util.cxx
index ddb9d02..00eb4aa 100644
--- a/connectivity/source/drivers/firebird/Util.cxx
+++ b/connectivity/source/drivers/firebird/Util.cxx
@@ -254,11 +254,8 @@ void firebird::mallocSQLVAR(XSQLDA* pSqlda)
assert(false);
break;
}
-if (pVar->sqltype & 1)
-{
-/* allocate variable to hold NULL status */
-pVar->sqlind = static_cast(malloc(sizeof(short)));
-}
+/* allocate variable to hold NULL status */
+pVar->sqlind = static_cast(malloc(sizeof(short)));
}
}
@@ -302,13 +299,10 @@ void firebird::freeSQLVAR(XSQLDA* pSqlda)
break;
}
-if (pVar->sqltype & 1)
+if(pVar->sqlind)
{
-if(pVar->sqlind)
-{
-free(pVar->sqlind);
-pVar->sqlind = nullptr;
-}
+free(pVar->sqlind);
+pVar->sqlind = nullptr;
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/firebird/PreparedStatement.cxx | 10
connectivity/source/drivers/firebird/Util.cxx | 16 -
2 files changed, 10 insertions(+), 16 deletions(-)
New commits:
commit 85f17f9ea822421c6d31da90d7be83089f58cec2
Author: Lionel Elie Mamane
Date: Fri Dec 18 16:54:00 2015 +0100
tdf#96572 firebird correctly transmit request for NULL
even if column is not nullable
Change-Id: I72ceda68e983125aef26c8f0aacc06320bd16b77
diff --git a/connectivity/source/drivers/firebird/PreparedStatement.cxx
b/connectivity/source/drivers/firebird/PreparedStatement.cxx
index a29c822..be8d8eb 100644
--- a/connectivity/source/drivers/firebird/PreparedStatement.cxx
+++ b/connectivity/source/drivers/firebird/PreparedStatement.cxx
@@ -704,13 +704,13 @@ void OPreparedStatement::setParameterNull(sal_Int32
nParameterIndex,
bool bSetNull)
{
XSQLVAR* pVar = m_pInSqlda->sqlvar + (nParameterIndex - 1);
-if (pVar->sqltype & 1)
+if (bSetNull)
{
-if (bSetNull)
-*pVar->sqlind = -1;
-else
-*pVar->sqlind = 0;
+pVar->sqltype |= 1;
+*pVar->sqlind = -1;
}
+else
+*pVar->sqlind = 0;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/firebird/Util.cxx
b/connectivity/source/drivers/firebird/Util.cxx
index ddb9d02..00eb4aa 100644
--- a/connectivity/source/drivers/firebird/Util.cxx
+++ b/connectivity/source/drivers/firebird/Util.cxx
@@ -254,11 +254,8 @@ void firebird::mallocSQLVAR(XSQLDA* pSqlda)
assert(false);
break;
}
-if (pVar->sqltype & 1)
-{
-/* allocate variable to hold NULL status */
-pVar->sqlind = static_cast(malloc(sizeof(short)));
-}
+/* allocate variable to hold NULL status */
+pVar->sqlind = static_cast(malloc(sizeof(short)));
}
}
@@ -302,13 +299,10 @@ void firebird::freeSQLVAR(XSQLDA* pSqlda)
break;
}
-if (pVar->sqltype & 1)
+if(pVar->sqlind)
{
-if(pVar->sqlind)
-{
-free(pVar->sqlind);
-pVar->sqlind = nullptr;
-}
+free(pVar->sqlind);
+pVar->sqlind = nullptr;
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Minutes of the Design Hangout: 2015-12-18
* Present: Cor, Heiko, Jay, Kendy, Michel, Samuel, Stuart, Tomaž * UI changes integrated the last week: + Enabled double click in input list field dialog (Oliver) + Converted MN_TAB_POPUPMENU to xml (Maxim) + Table context menu improvements (Maxim) + Clarified advanced options (unstable vs. limited) (Joel) + Convert some Calc context menus to xml (Maxim) + Filter options dialog controls expandable (Oliver) + Convert RID_POPUP_TAB to xml (Maxim) + Incremental UI changes only? + Joel suggest to not change the whole UI but have small steps + https://bugs.documentfoundation.org/show_bug.cgi?id=91820#c25 + mostly about the menu and toolbar reorg (Kendy) + Makes not much sense in this case since there is no half-conceptual menu organization (Heiko) + the hope is that the largest changes are now done (Kendy) + and we are back to incremental changes (Kendy) + should there be more changes, they'll be incremental again (Kendy) + pretty large change overall (Stuart) + there was support from the Design team (Stuart) + the change was needed, and long overdue (Stuart) + yes (Kendy) + now back to more easily manageable (Stuart) + there was a concept behind the changes (Heiko) + we are affecting people's workflows... (Heiko) + would be good to have 'something' that introduces the new features (Heiko) + when doing changes, we should prefer larger (but complete) change (Tomaž) + so that people don't have to re-learn all the time (Kendy) + agree (Cor) + better bundle the changes (per module) as much as reasonable doable + for NotebookBar, we'll need a switch between the old and new (Heiko) + that's easy - different concept, so a simple switch is possible (Kendy) + Save button behavior (Samuel) + Samuel talked to Maxim, Maxim agreed (Samuel) + only needs the new icon (Samuel) + what to do in 5.1 - revert? (Samuel) + let's wait a bit if Maxim can provide the proposed solution ~soon (Kendy) + and cherry-pick (Kendy) + late feature - will need 3 cross-company approvals (Kendy) + if not in time for RC2 (January 11), let's revert in 5.1 (Kendy) + Mail merge toolbar (Kendy) + implementation ongoing (Kendy) + have the basic toolbar now, working on moving the functionality to there from the wizard (Kendy) * Area Tab design session (Heiko/Jay) + Area Tab - https://bugs.documentfoundation.org/show_bug.cgi?id=94551 https://docs.google.com/document/d/1gf7wqYszXnbrbzbyNlLKbJelMb20ssuimxfszcHP_wM/edit?usp=sharing + not published yet * Table styles blog post (Heiko) + published, some comments came in (Heiko) + nothing controversial, good (Heiko) + missing use case for the table style (Michel) + scenario / use case - for the persona (Heiko) + it is there, but not in a structured / strict way (Heiko) + scrum way: have there 'who' and 'why', in one sentence (Heiko) + so one can imagine that better + fine with that, if it is short (Kendy) + want to focus on the resulting work, not paperwork around :-) (Kendy) * Mockups with Draw? (Michel/Heiko) + drafted a blog-post how it could work (Heiko) + https://docs.google.com/document/d/1MrSd7nwm3PJfKg_DQ79Sbc4jlqWeX280U_yF81pvQiQ/edit?ts=5672a18b + and what's missing in Draw (Heiko) + should we blog it, or keep internal only so far? (Heiko) + reinventing existing stuff a bit (Stuart) + if somebody wants to do the work, go for that of course (Stuart) + but people are happy with the tools + agree with Stuart (Cor) + blog post focusing on strengths of Draw would be good (Cor) + but not as a tool to create workflows (Cor) + some features are missing, some need adjustments (Heiko) + and could be useful in Draw (Heiko) + but should not be a replacement for people's tools (Heiko) + wanted to propose only a small step (Michel) + people should be using tools that fit them, no forcing of this or that (Kendy) + we can do recommendations, but that's only it :-) (Kendy) + important to manage expectations (Cor) + shapes tab in the sidebar - that could get us closer (Jay) + down to stencils / objects + https://docs.google.com/document/d/1Sv3Q-XdnHElYGXX2m8OLbRAy1zyodcU231Gn2SkVRV0/edit?usp=sharing + have a feeling of feature creep (Kendy) + let's stay what we are - a general purpose drawing program, not specialized on UI design (Kendy) * Draw problems (Stuart) + not that good in vector drawing - freehand/Illustrator/Krita (Stuart) + problem with beziers (as in hand lettering/cursive lettering) + svg's should be handled correctly + please file bugs :-) (Kendy) + Draw does not have too exactl
[Libreoffice-commits] core.git: 3 commits - sc/inc sc/source
sc/inc/dpobject.hxx | 15 ++---
sc/source/core/data/dpobject.cxx | 93 +--
sc/source/filter/xml/pivotsource.cxx |2
3 files changed, 55 insertions(+), 55 deletions(-)
New commits:
commit def6b1dd14b7d7dbf776e3de9e2f2d5a0cd1fc2c
Author: Michael Stahl
Date: Fri Dec 18 17:20:56 2015 +0100
sc: replace boost::ptr_map with std::map
Change-Id: Ia9d061d9f5fb07e07fd6253a6493a4e9b1f9c975
diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx
index 0af7348..610cf8e 100644
--- a/sc/inc/dpobject.hxx
+++ b/sc/inc/dpobject.hxx
@@ -35,8 +35,6 @@
#include
#include
-#include
-
namespace com { namespace sun { namespace star {
namespace container {
@@ -337,8 +335,8 @@ public:
class DBCaches
{
friend class ScDPCollection;
-typedef ::boost::ptr_map CachesType;
-CachesType maCaches;
+typedef ::std::map, DBType::less>
CachesType;
+CachesType m_Caches;
ScDocument* mpDoc;
public:
DBCaches(ScDocument* pDoc);
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index f6fee9f..59dcd61 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -68,7 +68,6 @@
#include
#include
#include
-#include
#include
#include
#include
@@ -3104,8 +3103,8 @@ ScDPCollection::DBCaches::DBCaches(ScDocument* pDoc) :
mpDoc(pDoc) {}
bool ScDPCollection::DBCaches::hasCache(sal_Int32 nSdbType, const OUString&
rDBName, const OUString& rCommand) const
{
DBType aType(nSdbType, rDBName, rCommand);
-CachesType::const_iterator itr = maCaches.find(aType);
-return itr != maCaches.end();
+CachesType::const_iterator const itr = m_Caches.find(aType);
+return itr != m_Caches.end();
}
const ScDPCache* ScDPCollection::DBCaches::getCache(
@@ -3113,10 +3112,10 @@ const ScDPCache* ScDPCollection::DBCaches::getCache(
const ScDPDimensionSaveData* pDimData)
{
DBType aType(nSdbType, rDBName, rCommand);
-CachesType::const_iterator itr = maCaches.find(aType);
-if (itr != maCaches.end())
+CachesType::const_iterator const itr = m_Caches.find(aType);
+if (itr != m_Caches.end())
// already cached.
-return itr->second;
+return itr->second.get();
uno::Reference xRowSet = createRowSet(nSdbType, rDBName,
rCommand);
if (!xRowSet.is())
@@ -3140,7 +3139,7 @@ const ScDPCache* ScDPCollection::DBCaches::getCache(
::comphelper::disposeComponent(xRowSet);
const ScDPCache* p = pCache.get();
-o3tl::ptr_container::insert(maCaches, aType, std::move(pCache));
+m_Caches.insert(std::make_pair(aType, std::move(pCache)));
return p;
}
@@ -3148,8 +3147,8 @@ ScDPCache* ScDPCollection::DBCaches::getExistingCache(
sal_Int32 nSdbType, const OUString& rDBName, const OUString& rCommand)
{
DBType aType(nSdbType, rDBName, rCommand);
-CachesType::iterator itr = maCaches.find(aType);
-return itr != maCaches.end() ? itr->second : nullptr;
+CachesType::iterator const itr = m_Caches.find(aType);
+return itr != m_Caches.end() ? itr->second.get() : nullptr;
}
uno::Reference ScDPCollection::DBCaches::createRowSet(
@@ -3215,8 +3214,8 @@ void ScDPCollection::DBCaches::updateCache(
std::set& rRefs)
{
DBType aType(nSdbType, rDBName, rCommand);
-CachesType::iterator it = maCaches.find(aType);
-if (it == maCaches.end())
+CachesType::iterator const it = m_Caches.find(aType);
+if (it == m_Caches.end())
{
// not cached.
rRefs.clear();
@@ -3255,12 +3254,12 @@ void ScDPCollection::DBCaches::updateCache(
bool ScDPCollection::DBCaches::remove(const ScDPCache* p)
{
-CachesType::iterator it = maCaches.begin(), itEnd = maCaches.end();
+CachesType::iterator it = m_Caches.begin(), itEnd = m_Caches.end();
for (; it != itEnd; ++it)
{
-if (it->second == p)
+if (it->second.get() == p)
{
-maCaches.erase(it);
+m_Caches.erase(it);
return true;
}
}
diff --git a/sc/source/filter/xml/pivotsource.cxx
b/sc/source/filter/xml/pivotsource.cxx
index 43b5a4d..633b8c5 100644
--- a/sc/source/filter/xml/pivotsource.cxx
+++ b/sc/source/filter/xml/pivotsource.cxx
@@ -11,6 +11,8 @@
#include
+#include
+
namespace sc {
PivotTableSources::SelectedPages::SelectedPages( ScDPObject* pObj, const
SelectedPagesType& rSelected ) :
commit 91f571a2d6b0db016342fa2f2e5b7b83a23ae873
Author: Michael Stahl
Date: Fri Dec 18 14:45:37 2015 +0100
sc: replace boost::ptr_map with std::map
Change-Id: I5abc1d6fae7186342e45a83253d56c2311ec5139
diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx
index 646817e..0af7348 100644
--- a/sc/inc/dpobject.hxx
+++ b/sc/inc/dpobject.hxx
@@ -297,8 +297,8 @@ public:
class NameCaches
{
friend class ScDPCollection;
-typedef ::boost::ptr_map CachesType;
-C
[Libreoffice-commits] libvisio.git: src/lib
src/lib/VSD5Parser.cpp | 66
src/lib/VSD5Parser.h |1
src/lib/VSD6Parser.cpp | 43 +++--
src/lib/VSDCollector.h | 10 ++-
src/lib/VSDContentCollector.cpp | 126 ++-
src/lib/VSDContentCollector.h| 10 ++-
src/lib/VSDOutputElementList.cpp | 114 +++
src/lib/VSDOutputElementList.h | 10 ++-
src/lib/VSDParagraphList.cpp | 37 +++
src/lib/VSDParagraphList.h |3
src/lib/VSDParser.cpp| 47 --
src/lib/VSDStyles.h | 37 ---
src/lib/VSDStylesCollector.cpp | 20 --
src/lib/VSDStylesCollector.h |8 +-
src/lib/VSDTypes.h | 23 +++
src/lib/VSDXMLParserBase.cpp | 33 --
src/lib/tokens.txt |3
17 files changed, 523 insertions(+), 68 deletions(-)
New commits:
commit 0766a97602f3dd8e68b47fd838d3897f20dc58da
Author: Fridrich Å trba
Date: Fri Dec 18 17:26:42 2015 +0100
BIPU support of bullets
Change-Id: If859332ac564522fdad06c081b644fba0759880b
diff --git a/src/lib/VSD5Parser.cpp b/src/lib/VSD5Parser.cpp
index be47174..1c116f6 100644
--- a/src/lib/VSD5Parser.cpp
+++ b/src/lib/VSD5Parser.cpp
@@ -218,6 +218,72 @@ void
libvisio::VSD5Parser::readLine(librevenge::RVNGInputStream *input)
m_shape.m_lineStyle.override(VSDOptionalLineStyle(strokeWidth, c,
linePattern, startMarker, endMarker, lineCap, rounding));
}
+void libvisio::VSD5Parser::readParaIX(librevenge::RVNGInputStream *input)
+{
+ long startPosition = input->tell();
+ unsigned charCount = readU16(input);
+ input->seek(1, librevenge::RVNG_SEEK_CUR);
+ double indFirst = readDouble(input);
+ input->seek(1, librevenge::RVNG_SEEK_CUR);
+ double indLeft = readDouble(input);
+ input->seek(1, librevenge::RVNG_SEEK_CUR);
+ double indRight = readDouble(input);
+ input->seek(1, librevenge::RVNG_SEEK_CUR);
+ double spLine = readDouble(input);
+ input->seek(1, librevenge::RVNG_SEEK_CUR);
+ double spBefore = readDouble(input);
+ input->seek(1, librevenge::RVNG_SEEK_CUR);
+ double spAfter = readDouble(input);
+ unsigned char align = readU8(input);
+ unsigned char bullet = readU8(input);
+ input->seek(1, librevenge::RVNG_SEEK_CUR);
+
+ long remainingData = m_header.dataLength - input->tell() + startPosition;
+ unsigned blockLength = 0;
+ VSDName bulletStr;
+
+ while (remainingData >= 2 && (blockLength = readU16(input)))
+ {
+long blockEnd = blockLength-2 + input->tell();
+unsigned char blockType = readU8(input);
+unsigned char blockIdx = readU8(input);
+if (blockType == 2 && blockIdx == 8)
+{
+ input->seek(1, librevenge::RVNG_SEEK_CUR);
+ unsigned long numBytes = readU8(input);
+ unsigned long numBytesRead = 0;
+ const unsigned char *tmpBuffer = input->read(numBytes, numBytesRead);
+ if (tmpBuffer && numBytesRead)
+ {
+librevenge::RVNGBinaryData tmpBulletString(tmpBuffer, numBytesRead);
+bulletStr = VSDName(tmpBulletString, libvisio::VSD_TEXT_ANSI);
+ }
+}
+else if (blockType == 2 && blockIdx == 3)
+{
+};
+input->seek(blockEnd, librevenge::RVNG_SEEK_SET);
+remainingData -= blockLength;
+ }
+
+ if (m_isInStyles)
+m_collector->collectParaIXStyle(m_header.id, m_header.level, charCount,
indFirst, indLeft, indRight,
+spLine, spBefore, spAfter, align, bullet,
bulletStr, 0.0, 0);
+ else
+ {
+if (m_isStencilStarted)
+{
+ VSD_DEBUG_MSG(("Found stencil paragraph style\n"));
+}
+
+m_shape.m_paraStyle.override(VSDOptionalParaStyle(charCount, indFirst,
indLeft, indRight,
+ spLine, spBefore,
spAfter, align, bullet,
+ bulletStr, 0.0, 0));
+m_shape.m_paraList.addParaIX(m_header.id, m_header.level, charCount,
indFirst, indLeft, indRight,
+ spLine, spBefore, spAfter, align, bullet,
bulletStr, 0.0, 0);
+ }
+}
+
void libvisio::VSD5Parser::readCharIX(librevenge::RVNGInputStream *input)
{
unsigned charCount = readU16(input);
diff --git a/src/lib/VSD5Parser.h b/src/lib/VSD5Parser.h
index 08e8497..914f93d 100644
--- a/src/lib/VSD5Parser.h
+++ b/src/lib/VSD5Parser.h
@@ -43,6 +43,7 @@ protected:
virtual void readFillAndShadow(librevenge::RVNGInputStream *input);
virtual void readTextBlock(librevenge::RVNGInputStream *input);
virtual void readCharIX(librevenge::RVNGInputStream *input);
+ virtual void readParaIX(librevenge::RVNGInputStream *input);
virtual void readTextField(librevenge::RVNGInputStream *input);
virtual void readShape(librevenge::RVNGInputStream *input);
diff --git a/src/lib/VSD6Parser.cpp b/src/lib/VSD6Parser.cpp
index d38454e..e8707c6 100644
--- a/src/lib/VSD6Parser.cpp
+++ b/src/lib/VSD6Parser.cpp
@@ -169,7 +169,8 @@ voi
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.ColumnHeader.js |7 +++
loleaflet/src/control/Control.RowHeader.js|7 +++
2 files changed, 14 insertions(+)
New commits:
commit 896b12d253fbca8f1fc60eb16fc40e458fa8faec
Author: Mihai Varga
Date: Fri Dec 18 18:52:23 2015 +0200
loleaflet: ccu#1347 - row/column headers can be < than the map
diff --git a/loleaflet/src/control/Control.ColumnHeader.js
b/loleaflet/src/control/Control.ColumnHeader.js
index fcd8064..6cd846f 100644
--- a/loleaflet/src/control/Control.ColumnHeader.js
+++ b/loleaflet/src/control/Control.ColumnHeader.js
@@ -76,6 +76,13 @@ L.Control.ColumnHeader = L.Control.extend({
text.innerHTML = columns[iterator].text;
column.width = Math.round(converter.call(context,
twip).x) - 1 + 'px';
}
+ if (this._map.getDocSize().x < this._map.getSize().x) {
+ // the column headers no longer need to strecth to the
whole screen
+ L.DomUtil.setStyle(this._table, 'width', 0);
+ }
+ else {
+ L.DomUtil.setStyle(this._table, 'width', '100%');
+ }
},
_onUpdatePermission: function () {
diff --git a/loleaflet/src/control/Control.RowHeader.js
b/loleaflet/src/control/Control.RowHeader.js
index 42f45fd..2aef1da 100644
--- a/loleaflet/src/control/Control.RowHeader.js
+++ b/loleaflet/src/control/Control.RowHeader.js
@@ -72,6 +72,13 @@ L.Control.RowHeader = L.Control.extend({
L.DomUtil.setStyle(text, 'line-height', height);
L.DomUtil.setStyle(text, 'height', height);
}
+ if (this._map.getDocSize().y < this._map.getSize().y) {
+ // the row headers no longer need to strecth to the
whole screen
+ L.DomUtil.setStyle(this._table, 'height', 0);
+ }
+ else {
+ L.DomUtil.setStyle(this._table, 'height', '100%');
+ }
},
_onUpdatePermission: function () {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/font/PhysicalFontCollection.cxx | 21 -
1 file changed, 21 deletions(-)
New commits:
commit 0ebbdd66b6bfc761c2bfd610149c01706e68f9da
Author: Tor Lillqvist
Date: Fri Dec 18 18:52:11 2015 +0200
SAL_FONTENUM_STABLE_ON_PLATFORM is not defined anywhere
Change-Id: Id4e9fefc3529a8e1b0079b47ff182ef54e19a0e8
diff --git a/vcl/source/font/PhysicalFontCollection.cxx
b/vcl/source/font/PhysicalFontCollection.cxx
index c339242..0098b3a 100644
--- a/vcl/source/font/PhysicalFontCollection.cxx
+++ b/vcl/source/font/PhysicalFontCollection.cxx
@@ -189,27 +189,6 @@ void PhysicalFontCollection::InitGenericGlyphFallback()
const
}
}
-#ifdef SAL_FONTENUM_STABLE_ON_PLATFORM // #i113472#
-// sort the list of fonts for glyph fallback by quality (highest first)
-// #i33947# keep the EUDC font at the front of the list
-// an insertion sort is good enough for this short list
-const int nSortStart = bHasEudc ? 1 : 0;
-for( int i = nSortStart+1, j; i < nMaxLevel; ++i )
-{
-PhysicalFontFamily* pTestFont = pFallbackList[ i ];
-int nTestQuality = pTestFont->GetMinQuality();
-
-for( j = i; --j >= nSortStart; )
-{
-if( nTestQuality > pFallbackList[j]->GetMinQuality() )
-pFallbackList[ j+1 ] = pFallbackList[ j ];
-else
-break;
-}
-pFallbackList[ j+1 ] = pTestFont;
-}
-#endif
-
mnFallbackCount = nMaxLevel;
mpFallbackList = pFallbackList;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: lotuswordpro/source
lotuswordpro/source/filter/lwppara.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0063b891424ba7023d376d12a7c54522bca087c6
Author: Caolán McNamara
Date: Fri Dec 18 17:06:17 2015 +
guard against missing XFContentContainer
Change-Id: Ic974159f816bae465339e1b9abd2e247bbc2f206
diff --git a/lotuswordpro/source/filter/lwppara.cxx
b/lotuswordpro/source/filter/lwppara.cxx
index 99a2132..725b914 100644
--- a/lotuswordpro/source/filter/lwppara.cxx
+++ b/lotuswordpro/source/filter/lwppara.cxx
@@ -845,7 +845,7 @@ void LwpPara::ParseDropcapContent()
*/
void LwpPara::AddBreakBefore(XFContentContainer* pCont)
{
-if (!m_pBreaks)
+if (!m_pBreaks || !pCont)
return;
if (m_pBreaks->IsPageBreakBefore())
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - lotuswordpro/source
lotuswordpro/source/filter/lwppara.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b2cc385892c24dba6481bff396d4125f58c92f65
Author: Caolán McNamara
Date: Fri Dec 18 17:06:17 2015 +
guard against missing XFContentContainer
Change-Id: Ic974159f816bae465339e1b9abd2e247bbc2f206
(cherry picked from commit 0063b891424ba7023d376d12a7c54522bca087c6)
diff --git a/lotuswordpro/source/filter/lwppara.cxx
b/lotuswordpro/source/filter/lwppara.cxx
index 99a2132..725b914 100644
--- a/lotuswordpro/source/filter/lwppara.cxx
+++ b/lotuswordpro/source/filter/lwppara.cxx
@@ -845,7 +845,7 @@ void LwpPara::ParseDropcapContent()
*/
void LwpPara::AddBreakBefore(XFContentContainer* pCont)
{
-if (!m_pBreaks)
+if (!m_pBreaks || !pCont)
return;
if (m_pBreaks->IsPageBreakBefore())
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libvisio.git: src/lib
src/lib/VSD5Parser.cpp | 50 +
1 file changed, 26 insertions(+), 24 deletions(-)
New commits:
commit 3c23f01aa8947f7fc43db98f8b2987b1e1b87637
Author: Fridrich Å trba
Date: Fri Dec 18 18:10:44 2015 +0100
Disable bullets for vsd5 for the while
Change-Id: Iac61f5d477b2d732785b6bfbb4b8a9a152f7b281
diff --git a/src/lib/VSD5Parser.cpp b/src/lib/VSD5Parser.cpp
index 1c116f6..58d62b3 100644
--- a/src/lib/VSD5Parser.cpp
+++ b/src/lib/VSD5Parser.cpp
@@ -220,7 +220,7 @@ void
libvisio::VSD5Parser::readLine(librevenge::RVNGInputStream *input)
void libvisio::VSD5Parser::readParaIX(librevenge::RVNGInputStream *input)
{
- long startPosition = input->tell();
+ // long startPosition = input->tell();
unsigned charCount = readU16(input);
input->seek(1, librevenge::RVNG_SEEK_CUR);
double indFirst = readDouble(input);
@@ -235,37 +235,39 @@ void
libvisio::VSD5Parser::readParaIX(librevenge::RVNGInputStream *input)
input->seek(1, librevenge::RVNG_SEEK_CUR);
double spAfter = readDouble(input);
unsigned char align = readU8(input);
- unsigned char bullet = readU8(input);
+ unsigned char bullet = 0;
+ readU8(input);
input->seek(1, librevenge::RVNG_SEEK_CUR);
- long remainingData = m_header.dataLength - input->tell() + startPosition;
- unsigned blockLength = 0;
VSDName bulletStr;
+ /*
+long remainingData = m_header.dataLength - input->tell() + startPosition;
+unsigned blockLength = 0;
- while (remainingData >= 2 && (blockLength = readU16(input)))
- {
-long blockEnd = blockLength-2 + input->tell();
-unsigned char blockType = readU8(input);
-unsigned char blockIdx = readU8(input);
-if (blockType == 2 && blockIdx == 8)
+while (remainingData >= 2 && (blockLength = readU16(input)))
{
- input->seek(1, librevenge::RVNG_SEEK_CUR);
- unsigned long numBytes = readU8(input);
- unsigned long numBytesRead = 0;
- const unsigned char *tmpBuffer = input->read(numBytes, numBytesRead);
- if (tmpBuffer && numBytesRead)
+ long blockEnd = blockLength-2 + input->tell();
+ unsigned char blockType = readU8(input);
+ unsigned char blockIdx = readU8(input);
+ if (blockType == 2 && blockIdx == 8)
{
-librevenge::RVNGBinaryData tmpBulletString(tmpBuffer, numBytesRead);
-bulletStr = VSDName(tmpBulletString, libvisio::VSD_TEXT_ANSI);
+input->seek(1, librevenge::RVNG_SEEK_CUR);
+unsigned long numBytes = readU8(input);
+unsigned long numBytesRead = 0;
+const unsigned char *tmpBuffer = input->read(numBytes, numBytesRead);
+if (tmpBuffer && numBytesRead)
+{
+ librevenge::RVNGBinaryData tmpBulletString(tmpBuffer, numBytesRead);
+ bulletStr = VSDName(tmpBulletString, libvisio::VSD_TEXT_ANSI);
+}
}
+ else if (blockType == 2 && blockIdx == 3)
+ {
+ };
+ input->seek(blockEnd, librevenge::RVNG_SEEK_SET);
+ remainingData -= blockLength;
}
-else if (blockType == 2 && blockIdx == 3)
-{
-};
-input->seek(blockEnd, librevenge::RVNG_SEEK_SET);
-remainingData -= blockLength;
- }
-
+ */
if (m_isInStyles)
m_collector->collectParaIXStyle(m_header.id, m_header.level, charCount,
indFirst, indLeft, indRight,
spLine, spBefore, spAfter, align, bullet,
bulletStr, 0.0, 0);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ba580e07fe06d9e2740c44d669313b37bf69c6ad Author: Adolfo Jayme Barrientos Date: Fri Dec 18 11:32:02 2015 -0600 Updated core Project: help 78c7e1c24aacacfa69c8de3644b154e98d858f7e Typo: doubled period Change-Id: Ic41033ee91fa10ba5b9d4ec84f7a7a006b944095 diff --git a/helpcontent2 b/helpcontent2 index 1b436f3..78c7e1c 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 1b436f3010b7d9ce4d9b2a0eb526b06196b632d7 +Subproject commit 78c7e1c24aacacfa69c8de3644b154e98d858f7e ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/optionen/expertconfig.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 78c7e1c24aacacfa69c8de3644b154e98d858f7e Author: Adolfo Jayme Barrientos Date: Fri Dec 18 11:32:02 2015 -0600 Typo: doubled period Change-Id: Ic41033ee91fa10ba5b9d4ec84f7a7a006b944095 diff --git a/source/text/shared/optionen/expertconfig.xhp b/source/text/shared/optionen/expertconfig.xhp index 54c8003..1dc321b 100644 --- a/source/text/shared/optionen/expertconfig.xhp +++ b/source/text/shared/optionen/expertconfig.xhp @@ -74,7 +74,7 @@ Value -Current value of the property.. +Current value of the property. Edit Opens a dialog to edit the preference. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Branch 'libreoffice-5-1' - source/text
source/text/simpress/04/0102.xhp |2 +- source/text/swriter/04/0102.xhp |4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 0cf317ca3a91d1cc87b8079f10a05db1a01d3548 Author: Stanislav Horacek Date: Wed Dec 9 18:34:46 2015 +0100 add missing pluses in keyboard shortcuts Change-Id: I02e52789dc66116f5c0ac8623f6e312a2b996d46 Reviewed-on: https://gerrit.libreoffice.org/20550 Reviewed-by: Andras Timar Tested-by: Andras Timar (cherry picked from commit 1b436f3010b7d9ce4d9b2a0eb526b06196b632d7) Signed-off-by: Adolfo Jayme Barrientos diff --git a/source/text/simpress/04/0102.xhp b/source/text/simpress/04/0102.xhp index 18bc6a5..6b25de4 100644 --- a/source/text/simpress/04/0102.xhp +++ b/source/text/simpress/04/0102.xhp @@ -565,7 +565,7 @@ Option -CtrlShift+Arrow Down +Ctrl+Shift+Arrow Down Select to end of paragraph. Next keystroke extends selection to end of next paragraph diff --git a/source/text/swriter/04/0102.xhp b/source/text/swriter/04/0102.xhp index 1d4bd75..7f9387f 100644 --- a/source/text/swriter/04/0102.xhp +++ b/source/text/swriter/04/0102.xhp @@ -618,7 +618,7 @@ Option -CtrlShift+Arrow Up +Ctrl+Shift+Arrow Up Select to beginning of paragraph. Next keystroke extends selection to beginning of previous paragraph @@ -652,7 +652,7 @@ Option -CtrlShift+Arrow Down +Ctrl+Shift+Arrow Down Select to end of paragraph. Next keystroke extends selection to end of next paragraph ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/scmatrix.cxx | 16 +---
1 file changed, 13 insertions(+), 3 deletions(-)
New commits:
commit ddeca090ba612cdd5a2d55785fb1c4b66b6bc0a5
Author: Caolán McNamara
Date: Fri Dec 18 16:29:21 2015 +
crashtesting: crash on converting ooo93489-1.ods to pdf
with --headless --convert-to pdf ooo93489-1.ods
probable regression from...
commit d4daad185e9583bedbb5a4eef1fd53e1f22e219b
Author: Jan Holesovsky
Date: Mon Nov 30 10:28:43 2015 +0100
sc interpreter: Move the code that can create a ScFullMatrix.
In that original code I see there was a check for "Data array is shorter
than
the row size of the reference. Truncate it to the data" which doesn't exist
anymore. If I reintroduce that check here the crash is avoided.
Change-Id: I7c7a5979d9c14c133b05e89ce3794e6b739ca61c
Reviewed-on: https://gerrit.libreoffice.org/20794
Reviewed-by: Eike Rathke
Tested-by: Eike Rathke
diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index 881cb81..ec87836 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -2994,6 +2994,16 @@ void ScVectorRefMatrix::ensureFullMatrix()
size_t nColSize = rArrays.size();
mpFullMatrix.reset(new ScFullMatrix(nColSize, mnRowSize));
+size_t nRowSize = mnRowSize;
+size_t nRowEnd = mnRowStart + mnRowSize;
+size_t nDataRowEnd = mpToken->GetArrayLength();
+if (nRowEnd > nDataRowEnd)
+{
+// Data array is shorter than the row size of the reference. Truncate
+// it to the data.
+nRowSize -= nRowEnd - nDataRowEnd;
+}
+
for (size_t nCol = 0; nCol < nColSize; ++nCol)
{
const formula::VectorRefArray& rArray = rArrays[nCol];
@@ -3006,14 +3016,14 @@ void ScVectorRefMatrix::ensureFullMatrix()
pNums += mnRowStart;
rtl_uString** pStrs = rArray.mpStringArray;
pStrs += mnRowStart;
-fillMatrix(*mpFullMatrix, nCol, pNums, pStrs, mnRowSize);
+fillMatrix(*mpFullMatrix, nCol, pNums, pStrs, nRowSize);
}
else
{
// String cells only.
rtl_uString** pStrs = rArray.mpStringArray;
pStrs += mnRowStart;
-fillMatrix(*mpFullMatrix, nCol, pStrs, mnRowSize);
+fillMatrix(*mpFullMatrix, nCol, pStrs, nRowSize);
}
}
else if (rArray.mpNumericArray)
@@ -3021,7 +3031,7 @@ void ScVectorRefMatrix::ensureFullMatrix()
// Numeric cells only.
const double* pNums = rArray.mpNumericArray;
pNums += mnRowStart;
-fillMatrix(*mpFullMatrix, nCol, pNums, mnRowSize);
+fillMatrix(*mpFullMatrix, nCol, pNums, nRowSize);
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1e1cb9800587c1656ed1d10ad21460cc610c53f3 Author: Stanislav Horacek Date: Wed Dec 9 18:34:46 2015 +0100 Updated core Project: help 0cf317ca3a91d1cc87b8079f10a05db1a01d3548 add missing pluses in keyboard shortcuts Change-Id: I02e52789dc66116f5c0ac8623f6e312a2b996d46 Reviewed-on: https://gerrit.libreoffice.org/20550 Reviewed-by: Andras Timar Tested-by: Andras Timar (cherry picked from commit 1b436f3010b7d9ce4d9b2a0eb526b06196b632d7) Signed-off-by: Adolfo Jayme Barrientos diff --git a/helpcontent2 b/helpcontent2 index 892e559..0cf317c 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 892e5592e152d3f4de91102d1683dfd05cea6d83 +Subproject commit 0cf317ca3a91d1cc87b8079f10a05db1a01d3548 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - sc/source
sc/source/core/tool/scmatrix.cxx | 16 +---
1 file changed, 13 insertions(+), 3 deletions(-)
New commits:
commit d86e429f339131e05081132a6ef6aae41e5f6811
Author: Caolán McNamara
Date: Fri Dec 18 16:29:21 2015 +
crashtesting: crash on converting ooo93489-1.ods to pdf
with --headless --convert-to pdf ooo93489-1.ods
probable regression from...
commit d4daad185e9583bedbb5a4eef1fd53e1f22e219b
Author: Jan Holesovsky
Date: Mon Nov 30 10:28:43 2015 +0100
sc interpreter: Move the code that can create a ScFullMatrix.
In that original code I see there was a check for "Data array is shorter
than
the row size of the reference. Truncate it to the data" which doesn't exist
anymore. If I reintroduce that check here the crash is avoided.
Change-Id: I7c7a5979d9c14c133b05e89ce3794e6b739ca61c
Reviewed-on: https://gerrit.libreoffice.org/20794
Reviewed-by: Eike Rathke
Tested-by: Eike Rathke
(cherry picked from commit ddeca090ba612cdd5a2d55785fb1c4b66b6bc0a5)
Reviewed-on: https://gerrit.libreoffice.org/20800
diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index 42d25ba..d3816b5 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -2994,6 +2994,16 @@ void ScVectorRefMatrix::ensureFullMatrix()
size_t nColSize = rArrays.size();
mpFullMatrix.reset(new ScFullMatrix(nColSize, mnRowSize));
+size_t nRowSize = mnRowSize;
+size_t nRowEnd = mnRowStart + mnRowSize;
+size_t nDataRowEnd = mpToken->GetArrayLength();
+if (nRowEnd > nDataRowEnd)
+{
+// Data array is shorter than the row size of the reference. Truncate
+// it to the data.
+nRowSize -= nRowEnd - nDataRowEnd;
+}
+
for (size_t nCol = 0; nCol < nColSize; ++nCol)
{
const formula::VectorRefArray& rArray = rArrays[nCol];
@@ -3006,14 +3016,14 @@ void ScVectorRefMatrix::ensureFullMatrix()
pNums += mnRowStart;
rtl_uString** pStrs = rArray.mpStringArray;
pStrs += mnRowStart;
-fillMatrix(*mpFullMatrix, nCol, pNums, pStrs, mnRowSize);
+fillMatrix(*mpFullMatrix, nCol, pNums, pStrs, nRowSize);
}
else
{
// String cells only.
rtl_uString** pStrs = rArray.mpStringArray;
pStrs += mnRowStart;
-fillMatrix(*mpFullMatrix, nCol, pStrs, mnRowSize);
+fillMatrix(*mpFullMatrix, nCol, pStrs, nRowSize);
}
}
else if (rArray.mpNumericArray)
@@ -3021,7 +3031,7 @@ void ScVectorRefMatrix::ensureFullMatrix()
// Numeric cells only.
const double* pNums = rArray.mpNumericArray;
pNums += mnRowStart;
-fillMatrix(*mpFullMatrix, nCol, pNums, mnRowSize);
+fillMatrix(*mpFullMatrix, nCol, pNums, nRowSize);
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/outdev/bitmap.cxx | 47 ---
1 file changed, 40 insertions(+), 7 deletions(-)
New commits:
commit 3119440a80282692640378fde5e37974ab63f096
Author: pasqualm
Date: Fri Dec 18 01:03:05 2015 +0100
tdf#90319: make image flipping work in writer for png
Flipping of images was not working if it was only horizontal or vertical,
if both options were selected flipping was treated as a 180º rotation
and that make it work. Problem only affected png files because this
kind of files are treated different from jpg's.
Change-Id: Ia0e4a2b16a714cce0b7fb00d6f0a25fb3552d3b8
Reviewed-on: https://gerrit.libreoffice.org/20782
Reviewed-by: Jacobo Aragunde Pérez
Tested-by: Jacobo Aragunde Pérez
diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx
index 6225e79..4c125c3 100644
--- a/vcl/source/outdev/bitmap.cxx
+++ b/vcl/source/outdev/bitmap.cxx
@@ -693,7 +693,10 @@ void OutputDevice::DrawDeviceAlphaBitmap( const Bitmap&
rBmp, const AlphaMask& r
Rectangle aBmpRect(Point(), rBmp.GetSizePixel());
if (!aBmpRect.Intersection(Rectangle(rSrcPtPixel,
rSrcSizePixel)).IsEmpty())
{
-DrawDeviceAlphaBitmapSlowPath(rBmp, rAlpha, aDstRect, aBmpRect,
aOutSz, aOutPt);
+Point auxOutPt(LogicToPixel(rDestPt));
+Size auxOutSz(LogicToPixel(rDestSize));
+
+DrawDeviceAlphaBitmapSlowPath(rBmp, rAlpha, aDstRect, aBmpRect,
auxOutSz, auxOutPt);
}
}
}
@@ -993,6 +996,7 @@ void OutputDevice::DrawDeviceAlphaBitmapSlowPath(const
Bitmap& rBitmap, const Al
else
{
LinearScaleContext aLinearContext(aDstRect, aBmpRect, aOutSize,
nOffX, nOffY);
+
if (aLinearContext.blendBitmap(
Bitmap::ScopedWriteAccess(aBmp).get(), pBitmapReadAccess.get(),
pAlphaReadAccess.get(),
nDstWidth, nDstHeight))
{
@@ -1175,6 +1179,7 @@ void OutputDevice::DrawTransformedBitmapEx(
if ( mnDrawMode & DrawModeFlags::NoBitmap )
return;
+
// decompose matrix to check rotation and shear
basegfx::B2DVector aScale, aTranslate;
double fRotate, fShearX;
@@ -1501,13 +1506,21 @@ Bitmap OutputDevice::BlendBitmap(
for( nY = 0, nOutY = nOffY; nY < nDstHeight; nY++, nOutY++ )
{
-const long nMapY = pMapY[ nY ];
+long nMapY = pMapY[ nY ];
+if (bVMirr)
+{
+nMapY = aBmpRect.Bottom() - nMapY;
+}
const long nModY = ( nOutY & 0x0FL ) << 4L;
int nOutX;
for( nX = 0, nOutX = nOffX; nX < nDstWidth; nX++, nOutX++ )
{
-const long nMapX = pMapX[ nX ];
+long nMapX = pMapX[ nX ];
+if (bHMirr)
+{
+nMapX = aBmpRect.Right() - nMapX;
+}
const sal_uLong nD = nVCLDitherLut[ nModY | ( nOutX &
0x0FL ) ];
aDstCol = pB->GetColor( nY, nX );
@@ -1548,13 +1561,22 @@ Bitmap OutputDevice::BlendBitmap(
{
for( nY = 0; nY < nDstHeight; nY++ )
{
-const long nMapY = pMapY[ nY ];
+long nMapY = pMapY[ nY ];
+if ( bVMirr )
+{
+nMapY = aBmpRect.Bottom() - nMapY;
+}
ScanlinepPScan = pP->GetScanline( nMapY );
ScanlinepAScan = pA->GetScanline( nMapY );
for( nX = 0; nX < nDstWidth; nX++ )
{
-const long nMapX = pMapX[ nX ];
+long nMapX = pMapX[ nX ];
+
+if ( bHMirr )
+{
+nMapX = aBmpRect.Right() - nMapX;
+}
aDstCol = pB->GetPixel( nY, nX );
pB->SetPixel( nY, nX, aDstCol.Merge(
pP->GetPaletteColor( pPScan[ nMapX ] ),
pAScan[
nMapX ] ) );
@@ -1565,14 +1587,25 @@ Bitmap OutputDevice::BlendBitmap(
default:
{
+
for( nY = 0; nY < nDstHeight; nY++ )
{
-const long nMapY = pMapY[ nY ];
+long nMapY = pMapY[ nY ];
+
+if ( bVMirr )
+{
+nMapY = aBmpRect.Bottom() - nMapY;
+}
ScanlinepAScan = pA->GetScanline( nMapY );
[Libreoffice-commits] core.git: Changes to 'feature/mailmerge-toolbar'
New branch 'feature/mailmerge-toolbar' available with the following commits: commit 19a3ab43d5abf0e3cb307eac4f03525ba56d038a Author: Jan Holesovsky Date: Fri Dec 18 21:19:10 2015 +0100 mailmerge: Introduce buttons for first/prev/next/last mailmerge entry. Change-Id: I3dc63d568dc4cd6f7e06b057ca4a387e4ad0677e commit bc2110c65543b57edbdf1e4b896ef007443954a7 Author: Jan Holesovsky Date: Fri Dec 18 12:40:05 2015 +0100 mailmerge: Don't hide the source document. Change-Id: Ie920ae1ea05ba81fb2da1198d9d79ba028e1e95a commit 84558579414143ad8656a10f40bb84509b8bbf38 Author: Jan Holesovsky Date: Fri Dec 18 12:21:40 2015 +0100 mailmerge: Introduce a mailmerge toolbar. So far contains just a button to start the mailmerge wizard, and it is shown when the mailmerge wizard starts. The plan is that the last 3 steps (Edit document; Personalize document; Save, print or send) will be removed from the wizard, and instead introduced in the mailmerge toolbar. Change-Id: I3a55a5b3b8a73bc6775579ac42c4ae30c6c9bac6 commit 1eebf378996cbfc60bfbd268271349d30e66f839 Author: Jan Holesovsky Date: Fri Dec 18 11:39:23 2015 +0100 mailmerge: Minor refactor. Change-Id: Ia92b624ee32349ab936ad1a6fc62b4489fd5cde7 commit 31d85c3ee5dee95ea97e973a7759e7b7409e6739 Author: Jan Holesovsky Date: Thu Dec 17 10:54:45 2015 +0100 sfx2: Improve git-grep-ability for at least few toolbars. Change-Id: Id5a2b98f7ce892fdf9969c676d987ee041913468 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/inc vcl/opengl vcl/source
vcl/inc/svdata.hxx|1 +
vcl/opengl/gdiimpl.cxx| 12 ++--
vcl/source/app/svdata.cxx | 19 ++-
3 files changed, 21 insertions(+), 11 deletions(-)
New commits:
commit 3538e039ea82076202ac4b341fc81ffe0d916f21
Author: Michael Meeks
Date: Fri Dec 18 17:25:17 2015 +
vcl: always re-use context from default window.
This avoids problems with the initial default context getting destroyed.
Change-Id: If465dfcd185a3336036b98cb2a205e0502d3f80b
Reviewed-on: https://gerrit.libreoffice.org/20796
Reviewed-by: Michael Meeks
Tested-by: Michael Meeks
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index 46527f0..b559cf3 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -357,6 +357,7 @@ struct ImplSVData
voidImplDeInitSVData();
VCL_PLUGIN_PUBLIC vcl::Window* ImplGetDefaultWindow();
+VCL_PLUGIN_PUBLIC vcl::Window* ImplGetDefaultContextWindow();
VCL_PLUGIN_PUBLIC ResMgr* ImplGetResMgr();
VCL_PLUGIN_PUBLIC ResId VclResId( sal_Int32 nId ); // throws std::bad_alloc if
no res mgr
DockingManager* ImplGetDockingManager();
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index 41f8e93..1c6be71 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -121,6 +121,8 @@ bool OpenGLSalGraphicsImpl::AcquireContext( bool
bForceCreate )
mpContext.clear();
}
+// We don't care what context we have - but not switching context
+// is rather useful from a performance perspective.
OpenGLContext *pContext = pSVData->maGDIData.mpLastContext;
while( pContext )
{
@@ -181,7 +183,10 @@ void OpenGLSalGraphicsImpl::Init()
}
if( mpWindowContext.is() )
+{
mpWindowContext->reset();
+mpWindowContext.clear();
+}
}
// Currently only used to get windows ordering right.
@@ -193,8 +198,11 @@ void OpenGLSalGraphicsImpl::DeInit()
// let it know. Other eg. VirtualDevice contexts which have
// references on and rely on this context continuing to work will
// get a shiny new context in AcquireContext:: next PreDraw.
-if( mpContext.is() && !IsOffscreen() )
-mpContext->reset();
+if( mpWindowContext.is() )
+{
+mpWindowContext->reset();
+mpWindowContext.clear();
+}
mpContext.clear();
}
diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index edfdbc9..fbde610 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.cxx
@@ -113,23 +113,25 @@ void ImplDeInitSVData()
delete pSVData->mpPaperNames, pSVData->mpPaperNames = nullptr;
}
+/// Returns either the application window, or the default GL context window
vcl::Window* ImplGetDefaultWindow()
{
ImplSVData* pSVData = ImplGetSVData();
if ( pSVData->maWinData.mpAppWin )
return pSVData->maWinData.mpAppWin;
+else
+return ImplGetDefaultContextWindow();
+}
-// First test if we already have a default window.
-// Don't only place a single if..else inside solar mutex lockframe
-// because then we might have to wait for the solar mutex what is not
necessary
-// if we already have a default window.
+/// returns the default window created to hold the persistent VCL GL context.
+vcl::Window *ImplGetDefaultContextWindow()
+{
+ImplSVData* pSVData = ImplGetSVData();
+// Double check locking on mpDefaultWin.
if ( !pSVData->mpDefaultWin )
{
-Application::GetSolarMutex().acquire();
-
-// Test again because the thread who released the solar mutex could
have called
-// the same method
+SolarMutexGuard aGuard;
if ( !pSVData->mpDefaultWin && !pSVData->mbDeInit )
{
@@ -142,7 +144,6 @@ vcl::Window* ImplGetDefaultWindow()
if( pContext.is() )
pContext->acquire();
}
-Application::GetSolarMutex().release();
}
return pSVData->mpDefaultWin;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loolwsd/LOOLWSD.cpp
loolwsd/LOOLWSD.cpp |4 1 file changed, 4 deletions(-) New commits: commit 8c4421d681c9fca56faabb1a010c4394cef7fb26 Author: Henry Castro Date: Fri Dec 18 16:45:30 2015 -0400 loolwsd: clean up unnecessary code diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp index 184ddfd..a74d867 100644 --- a/loolwsd/LOOLWSD.cpp +++ b/loolwsd/LOOLWSD.cpp @@ -1360,10 +1360,6 @@ int LOOLWSD::main(const std::vector& /*args*/) // wait broker process finish waitpid(-1, &status, WUNTRACED); -// remove child root -if (LOOLWSD::_childId > 0) -File(LOOLWSD::childRoot + Path::separator() + std::to_string(LOOLWSD::_childId)).remove(true); - return Application::EXIT_OK; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loolwsd/LOOLSession.cpp loolwsd/LOOLWSD.hpp
loolwsd/LOOLSession.cpp |2 +-
loolwsd/LOOLWSD.hpp |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit d70280fff8932153677f2caf231f36048ff6071a
Author: Henry Castro
Date: Fri Dec 18 16:51:08 2015 -0400
loolwsd: when no available child sessions, pre spawns more children
diff --git a/loolwsd/LOOLSession.cpp b/loolwsd/LOOLSession.cpp
index 513cd5c..f5299aa 100644
--- a/loolwsd/LOOLSession.cpp
+++ b/loolwsd/LOOLSession.cpp
@@ -688,7 +688,7 @@ void MasterProcessSession::dispatchChild()
{
LOOLWSD::_namedMutexLOOL.lock();
std::cout << Util::logPrefix() << "No available child sessions, queue
new child session" << std::endl;
-LOOLWSD::_sharedForkChild.begin()[0] =
(LOOLWSD::_sharedForkChild.begin()[0] > 0 ?
LOOLWSD::_sharedForkChild.begin()[0] + 1 : 1);
+LOOLWSD::_sharedForkChild.begin()[0] = LOOLWSD::_numPreSpawnedChildren;
LOOLWSD::_namedMutexLOOL.unlock();
}
diff --git a/loolwsd/LOOLWSD.hpp b/loolwsd/LOOLWSD.hpp
index 0970fc5..62e4c32 100644
--- a/loolwsd/LOOLWSD.hpp
+++ b/loolwsd/LOOLWSD.hpp
@@ -32,6 +32,7 @@ public:
// statics
static int portNumber;
static int timeoutCounter;
+static int _numPreSpawnedChildren;
static bool doTest;
static bool volatile isShutDown;
static std::string cache;
@@ -73,7 +74,6 @@ private:
int createComponent();
int createDesktop();
-static int _numPreSpawnedChildren;
static std::mutex _rngMutex;
#if ENABLE_DEBUG
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/unoobj/chart2uno.cxx | 73 ++
1 file changed, 35 insertions(+), 38 deletions(-)
New commits:
commit fe88326d35579f2c88efe96a45911affa9c9f174
Author: Noel Grandin
Date: Thu Dec 17 12:07:54 2015 +0200
sc: convert SequenceMapping O(n^2) algorithm to O(n log(n)) tdf#85548
Change-Id: Ie0c819ac3f8b0c0b165e95ae5e58405a12c38472
Reviewed-on: https://gerrit.libreoffice.org/20753
Reviewed-by: Markus Mohrhard
Tested-by: Markus Mohrhard
diff --git a/sc/source/ui/unoobj/chart2uno.cxx
b/sc/source/ui/unoobj/chart2uno.cxx
index deb144f..51a159e 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -1762,6 +1762,18 @@ bool RangeAnalyzer::inSameSingleColumn( RangeAnalyzer&
rOther )
return false;
}
+OUString constructKey(const uno::Reference<
chart2::data::XLabeledDataSequence>& xNew)
+{
+OUString key;
+if( xNew->getLabel().is() )
+key += xNew->getLabel()->getSourceRangeRepresentation();
+key += "";
+if( xNew->getValues().is() )
+key += xNew->getValues()->getSourceRangeRepresentation();
+return key;
+}
+
+
} //end anonymous namespace
uno::Sequence< beans::PropertyValue > SAL_CALL
ScChart2DataProvider::detectArguments(
@@ -1983,49 +1995,34 @@ uno::Sequence< beans::PropertyValue > SAL_CALL
ScChart2DataProvider::detectArgum
if( xDataSource.is() && xCompareDataSource.is() )
{
-uno::Sequence< uno::Reference< chart2::data::XLabeledDataSequence>
> aOldSequences(
-xCompareDataSource->getDataSequences() );
-uno::Sequence< uno::Reference< chart2::data::XLabeledDataSequence
> > aNewSequences(
-xDataSource->getDataSequences());
-
-OUString aOldLabel;
-OUString aNewLabel;
-OUString aOldValues;
-OUString aNewValues;
+const uno::Sequence< uno::Reference<
chart2::data::XLabeledDataSequence> >& aOldSequences =
+xCompareDataSource->getDataSequences();
+const uno::Sequence< uno::Reference<
chart2::data::XLabeledDataSequence> >& aNewSequences =
+xDataSource->getDataSequences();
-for( sal_Int32 nNewIndex = 0; nNewIndex <
aNewSequences.getLength(); nNewIndex++ )
+std::map aOldEntryToIndex;
+for( sal_Int32 nIndex = 0; nIndex < aOldSequences.getLength();
nIndex++ )
{
-uno::Reference< chart2::data::XLabeledDataSequence> xNew(
aNewSequences[nNewIndex] );
-for( sal_Int32 nOldIndex = 0; nOldIndex <
aOldSequences.getLength(); nOldIndex++ )
+const uno::Reference< chart2::data::XLabeledDataSequence>&
xOld( aOldSequences[nIndex] );
+if( xOld.is() )
{
-uno::Reference< chart2::data::XLabeledDataSequence> xOld(
aOldSequences[nOldIndex] );
-
-if( xOld.is() && xNew.is() )
-{
-aOldLabel.clear();
-aNewLabel.clear();
-aOldValues.clear();
-aNewValues.clear();
-if( xOld.is() && xOld->getLabel().is() )
-aOldLabel =
xOld->getLabel()->getSourceRangeRepresentation();
-if( xNew.is() && xNew->getLabel().is() )
-aNewLabel =
xNew->getLabel()->getSourceRangeRepresentation();
-if( xOld.is() && xOld->getValues().is() )
-aOldValues =
xOld->getValues()->getSourceRangeRepresentation();
-if( xNew.is() && xNew->getValues().is() )
-aNewValues =
xNew->getValues()->getSourceRangeRepresentation();
-
-if( aOldLabel.equals(aNewLabel)
-&& ( aOldValues.equals(aNewValues) ) )
-{
-if( nOldIndex!=nNewIndex )
-bDifferentIndexes = true;
-aSequenceMappingVector.push_back(nOldIndex);
-break;
-}
-}
+OUString key = constructKey(xOld);
+aOldEntryToIndex[key] = nIndex;
}
}
+for( sal_Int32 nNewIndex = 0; nNewIndex <
aNewSequences.getLength(); nNewIndex++ )
+{
+const uno::Reference< chart2::data::XLabeledDataSequence>&
xNew( aNewSequences[nNewIndex] );
+if( !xNew.is() )
+continue;
+OUString key = constructKey(xNew);
+if (aOldEntryToIndex.find(key) == aOldEntryToIndex.end())
+continue;
+sal_Int32 nOldIndex = aOldEntryToIndex[key];
+if( nOldIndex != nNewIndex )
+bDifferentInd
[Libreoffice-commits] core.git: formula/source include/formula reportdesign/source sc/inc sc/qa sc/source
formula/source/ui/dlg/formula.cxx | 32 ++
include/formula/IFunctionDescription.hxx |2 -
reportdesign/source/ui/dlg/Formula.cxx|2 -
reportdesign/source/ui/inc/Formula.hxx|2 -
sc/inc/simpleformulacalc.hxx |6 +++--
sc/qa/unit/ucalc.cxx |4 +--
sc/source/core/data/simpleformulacalc.cxx | 16 ---
sc/source/ui/app/inputhdl.cxx |4 +--
sc/source/ui/formdlg/formula.cxx |8 ---
sc/source/ui/inc/formula.hxx |2 -
10 files changed, 46 insertions(+), 32 deletions(-)
New commits:
commit dc89367a5622748dd7c37b89ac300a663b8b98e9
Author: Eike Rathke
Date: Fri Dec 18 23:22:24 2015 +0100
Formula Wizard: evaluating expressions always in matrix context is wrong
Change-Id: I276f7bbf2bd6fa7c67d8691634ad9d79e4a08b1c
diff --git a/formula/source/ui/dlg/formula.cxx
b/formula/source/ui/dlg/formula.cxx
index bb4f46d..0d0a646 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -77,9 +77,9 @@ public:
RefInputStartBefore( RefEdit* pEdit, RefButton* pButton );
voidRefInputStartAfter( RefEdit* pEdit, RefButton* pButton );
voidRefInputDoneAfter( bool bForced );
-boolCalcValue( const OUString& rStrExp, OUString& rStrResult );
-boolCalcStruct( const OUString& rStrExp);
-voidUpdateValues();
+boolCalcValue( const OUString& rStrExp, OUString& rStrResult,
bool bForceMatrixFormula = false );
+boolCalcStruct( const OUString& rStrExp, bool
bForceRecalcStruct = false );
+voidUpdateValues( bool bForceRecalcStruct = false );
voidDeleteArgs();
sal_Int32 GetFunctionPos(sal_Int32 nPos);
voidClearAllParas();
@@ -568,7 +568,7 @@ sal_Int32 FormulaDlg_Impl::GetFunctionPos(sal_Int32 nPos)
return nFuncPos;
}
-bool FormulaDlg_Impl::CalcValue( const OUString& rStrExp, OUString& rStrResult
)
+bool FormulaDlg_Impl::CalcValue( const OUString& rStrExp, OUString&
rStrResult, bool bForceMatrixFormula )
{
bool bResult = true;
@@ -578,7 +578,7 @@ bool FormulaDlg_Impl::CalcValue( const OUString& rStrExp,
OUString& rStrResult )
if ( !Application::AnyInput( VclInputFlags::KEYBOARD ) )
{
-bResult = m_pHelper->calculateValue(rStrExp,rStrResult);
+bResult = m_pHelper->calculateValue( rStrExp, rStrResult,
bForceMatrixFormula || m_pBtnMatrix->IsChecked());
}
else
bResult = false;
@@ -587,7 +587,7 @@ bool FormulaDlg_Impl::CalcValue( const OUString& rStrExp,
OUString& rStrResult )
return bResult;
}
-void FormulaDlg_Impl::UpdateValues()
+void FormulaDlg_Impl::UpdateValues( bool bForceRecalcStruct )
{
OUString aStrResult;
if ( CalcValue( pFuncDesc->getFormula( m_aArguments ), aStrResult ) )
@@ -603,15 +603,15 @@ void FormulaDlg_Impl::UpdateValues()
aStrResult.clear();
m_pWndFormResult->SetText( aStrResult );
}
-CalcStruct(pMEdit->GetText());
+CalcStruct( pMEdit->GetText(), bForceRecalcStruct);
}
-bool FormulaDlg_Impl::CalcStruct( const OUString& rStrExp)
+bool FormulaDlg_Impl::CalcStruct( const OUString& rStrExp, bool
bForceRecalcStruct )
{
bool bResult = true;
sal_Int32 nLength = rStrExp.getLength();
-if ( !rStrExp.isEmpty() && aOldFormula!=rStrExp && bStructUpdate)
+if ( !rStrExp.isEmpty() && (bForceRecalcStruct || aOldFormula != rStrExp)
&& bStructUpdate)
{
// Only calculate the value when there isn't any more keyboard input:
@@ -733,10 +733,17 @@ void FormulaDlg_Impl::MakeTree(StructPage*
_pTree,SvTreeListEntry* pParent,Formu
}
else if (eOp==ocPush)
{
+// Interpret range reference in matrix context to resolve
+// as array elements.
+/* TODO: this should depend on parameter classification, if
+ * a scalar value is expected matrix should not be forced.
+ * */
+bool bForceMatrix = (!m_pBtnMatrix->IsChecked() &&
+(_pToken->GetType() == svDoubleRef ||
_pToken->GetType() == svExternalDoubleRef));
OUString aCellResult;
-OUString aEquals(" = ");
-if (CalcValue( "=" + aResult, aCellResult) && aCellResult
!= aResult) // cell is a formula, print subformula
-_pTree->InsertEntry(aResult + aEquals +
aCellResult,pParent,STRUCT_END,0,_pToken);
+if (CalcValue( "=" + aResult, aCellResult, bForceMatrix)
&& aCellResult != aResult)
+// Cell is a formula, print subformula.
+_pTree->InsertEntry(aResult + " = " + aCellResult,
pParent,STRUCT_END,0,_pToken);
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - formula/source include/formula reportdesign/source sc/inc sc/qa sc/source
formula/source/ui/dlg/formula.cxx | 32 ++
include/formula/IFunctionDescription.hxx |2 -
reportdesign/source/ui/dlg/Formula.cxx|2 -
reportdesign/source/ui/inc/Formula.hxx|2 -
sc/inc/simpleformulacalc.hxx |6 +++--
sc/qa/unit/ucalc.cxx |4 +--
sc/source/core/data/simpleformulacalc.cxx | 16 ---
sc/source/ui/app/inputhdl.cxx |4 +--
sc/source/ui/formdlg/formula.cxx |8 ---
sc/source/ui/inc/formula.hxx |2 -
10 files changed, 46 insertions(+), 32 deletions(-)
New commits:
commit 9a9bf646cfc388324df017fb0b9e0f6ad71acabd
Author: Eike Rathke
Date: Fri Dec 18 23:22:24 2015 +0100
Formula Wizard: evaluating expressions always in matrix context is wrong
Change-Id: I276f7bbf2bd6fa7c67d8691634ad9d79e4a08b1c
(cherry picked from commit dc89367a5622748dd7c37b89ac300a663b8b98e9)
diff --git a/formula/source/ui/dlg/formula.cxx
b/formula/source/ui/dlg/formula.cxx
index bb4f46d..0d0a646 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -77,9 +77,9 @@ public:
RefInputStartBefore( RefEdit* pEdit, RefButton* pButton );
voidRefInputStartAfter( RefEdit* pEdit, RefButton* pButton );
voidRefInputDoneAfter( bool bForced );
-boolCalcValue( const OUString& rStrExp, OUString& rStrResult );
-boolCalcStruct( const OUString& rStrExp);
-voidUpdateValues();
+boolCalcValue( const OUString& rStrExp, OUString& rStrResult,
bool bForceMatrixFormula = false );
+boolCalcStruct( const OUString& rStrExp, bool
bForceRecalcStruct = false );
+voidUpdateValues( bool bForceRecalcStruct = false );
voidDeleteArgs();
sal_Int32 GetFunctionPos(sal_Int32 nPos);
voidClearAllParas();
@@ -568,7 +568,7 @@ sal_Int32 FormulaDlg_Impl::GetFunctionPos(sal_Int32 nPos)
return nFuncPos;
}
-bool FormulaDlg_Impl::CalcValue( const OUString& rStrExp, OUString& rStrResult
)
+bool FormulaDlg_Impl::CalcValue( const OUString& rStrExp, OUString&
rStrResult, bool bForceMatrixFormula )
{
bool bResult = true;
@@ -578,7 +578,7 @@ bool FormulaDlg_Impl::CalcValue( const OUString& rStrExp,
OUString& rStrResult )
if ( !Application::AnyInput( VclInputFlags::KEYBOARD ) )
{
-bResult = m_pHelper->calculateValue(rStrExp,rStrResult);
+bResult = m_pHelper->calculateValue( rStrExp, rStrResult,
bForceMatrixFormula || m_pBtnMatrix->IsChecked());
}
else
bResult = false;
@@ -587,7 +587,7 @@ bool FormulaDlg_Impl::CalcValue( const OUString& rStrExp,
OUString& rStrResult )
return bResult;
}
-void FormulaDlg_Impl::UpdateValues()
+void FormulaDlg_Impl::UpdateValues( bool bForceRecalcStruct )
{
OUString aStrResult;
if ( CalcValue( pFuncDesc->getFormula( m_aArguments ), aStrResult ) )
@@ -603,15 +603,15 @@ void FormulaDlg_Impl::UpdateValues()
aStrResult.clear();
m_pWndFormResult->SetText( aStrResult );
}
-CalcStruct(pMEdit->GetText());
+CalcStruct( pMEdit->GetText(), bForceRecalcStruct);
}
-bool FormulaDlg_Impl::CalcStruct( const OUString& rStrExp)
+bool FormulaDlg_Impl::CalcStruct( const OUString& rStrExp, bool
bForceRecalcStruct )
{
bool bResult = true;
sal_Int32 nLength = rStrExp.getLength();
-if ( !rStrExp.isEmpty() && aOldFormula!=rStrExp && bStructUpdate)
+if ( !rStrExp.isEmpty() && (bForceRecalcStruct || aOldFormula != rStrExp)
&& bStructUpdate)
{
// Only calculate the value when there isn't any more keyboard input:
@@ -733,10 +733,17 @@ void FormulaDlg_Impl::MakeTree(StructPage*
_pTree,SvTreeListEntry* pParent,Formu
}
else if (eOp==ocPush)
{
+// Interpret range reference in matrix context to resolve
+// as array elements.
+/* TODO: this should depend on parameter classification, if
+ * a scalar value is expected matrix should not be forced.
+ * */
+bool bForceMatrix = (!m_pBtnMatrix->IsChecked() &&
+(_pToken->GetType() == svDoubleRef ||
_pToken->GetType() == svExternalDoubleRef));
OUString aCellResult;
-OUString aEquals(" = ");
-if (CalcValue( "=" + aResult, aCellResult) && aCellResult
!= aResult) // cell is a formula, print subformula
-_pTree->InsertEntry(aResult + aEquals +
aCellResult,pParent,STRUCT_END,0,_pToken);
+if (CalcValue( "=" + aResult, aCellResult, bForceMatrix)
&& aCellResult != aResult)
+// Cell is a formula, print subformula.
+_pTree->InsertEntry(
[Libreoffice-commits] core.git: include/svx sc/source sd/source svx/source
include/svx/svdpage.hxx |8 +++-
sc/source/core/data/drwlayer.cxx |1 +
sd/source/core/drawdoc4.cxx |1 +
sd/source/core/sdpage.cxx|1 +
svx/source/svdraw/svdpage.cxx| 22 --
5 files changed, 22 insertions(+), 11 deletions(-)
New commits:
commit a103c3456a2bd12c5c94124abeda06978caea609
Author: Kohei Yoshida
Date: Thu Dec 17 23:08:08 2015 -0500
Use std::unique_ptr for SdrLayerAdmin data member.
Change-Id: Ib49f52c94ae96b8bddec6718585d5d7d6e3d148d
Reviewed-on: https://gerrit.libreoffice.org/20806
Reviewed-by: Kohei Yoshida
Tested-by: Kohei Yoshida
diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx
index c8d5370..347beb3 100644
--- a/include/svx/svdpage.hxx
+++ b/include/svx/svdpage.hxx
@@ -28,7 +28,6 @@
#include
#include
#include
-#include
#include
#include
#include
@@ -417,9 +416,8 @@ friend class reportdesign::OSection;
sal_Int32 nBordRgt; // Seitenrand rechts
sal_Int32 nBordLwr; // Seitenrand unten
-protected:
-SdrLayerAdmin* pLayerAdmin;
private:
+std::unique_ptr mpLayerAdmin;
SdrPageProperties* mpSdrPageProperties;
css::uno::Reference< css::uno::XInterface > mxUnoPage;
@@ -506,8 +504,8 @@ protected:
public:
/// changing the layers does not set the modified-flag!
-const SdrLayerAdmin& GetLayerAdmin() const {
return *pLayerAdmin; }
- SdrLayerAdmin& GetLayerAdmin(){
return *pLayerAdmin; }
+const SdrLayerAdmin& GetLayerAdmin() const;
+SdrLayerAdmin& GetLayerAdmin();
virtual OUString GetLayoutName() const;
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index 1fa2e6c..d6b26b8 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -37,6 +37,7 @@
#include
#include
#include
+#include
#include
#include
#include
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index 56ca923..fc50caf 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -84,6 +84,7 @@
#include
#include
#include
+#include
#include
#include
#include
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index f140cca..a4a6c65 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -47,6 +47,7 @@
#include
#include
#include
+#include
#include
#include
#include
diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index a5828e2..583c489 100644
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -1203,7 +1203,7 @@ SdrPage::SdrPage(SdrModel& rNewModel, bool bMasterPage)
nBordUpp(0L),
nBordRgt(0L),
nBordLwr(0L),
-pLayerAdmin(new SdrLayerAdmin(&rNewModel.GetLayerAdmin())),
+mpLayerAdmin(new SdrLayerAdmin(&rNewModel.GetLayerAdmin())),
mpSdrPageProperties(nullptr),
mpMasterPageDescriptor(nullptr),
nPageNum(0L),
@@ -1228,7 +1228,7 @@ SdrPage::SdrPage(const SdrPage& rSrcPage)
nBordUpp(rSrcPage.nBordUpp),
nBordRgt(rSrcPage.nBordRgt),
nBordLwr(rSrcPage.nBordLwr),
-pLayerAdmin(new SdrLayerAdmin(rSrcPage.pModel->GetLayerAdmin())),
+mpLayerAdmin(new SdrLayerAdmin(rSrcPage.pModel->GetLayerAdmin())),
mpSdrPageProperties(nullptr),
mpMasterPageDescriptor(nullptr),
nPageNum(rSrcPage.nPageNum),
@@ -1269,7 +1269,7 @@ SdrPage::~SdrPage()
// when they get called from PageInDestruction().
maPageUsers.clear();
-delete pLayerAdmin;
+mpLayerAdmin.reset();
TRG_ClearMasterPage();
@@ -1506,11 +1506,11 @@ sal_Int32 SdrPage::GetLwrBorder() const
void SdrPage::impl_setModelForLayerAdmin(SdrModel* const pNewModel)
{
if (pNewModel!=nullptr) {
-pLayerAdmin->SetParent(&pNewModel->GetLayerAdmin());
+mpLayerAdmin->SetParent(&pNewModel->GetLayerAdmin());
} else {
-pLayerAdmin->SetParent(nullptr);
+mpLayerAdmin->SetParent(nullptr);
}
-pLayerAdmin->SetModel(pNewModel);
+mpLayerAdmin->SetModel(pNewModel);
}
void SdrPage::SetModel(SdrModel* pNewModel)
@@ -1661,6 +1661,16 @@ const SdrPageGridFrameList*
SdrPage::GetGridFrameList(const SdrPageView* /*pPV*/
return nullptr;
}
+const SdrLayerAdmin& SdrPage::GetLayerAdmin() const
+{
+return *mpLayerAdmin;
+}
+
+SdrLayerAdmin& SdrPage::GetLayerAdmin()
+{
+return *mpLayerAdmin;
+}
+
OUString SdrPage::GetLayoutName() const
{
return OUString();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/dpobject.cxx |6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) New commits: commit c1aca008603d18dcd84a751df70fb8eefd9f0111 Author: Michael Meeks Date: Fri Dec 18 22:28:06 2015 + Fix pivot cache debugging. Change-Id: I79facae1159f878092a47560bb1c4488842fcc0a Reviewed-on: https://gerrit.libreoffice.org/20811 Reviewed-by: Kohei Yoshida Tested-by: Kohei Yoshida diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index 59dcd61..e14f368 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -2791,11 +2791,9 @@ void ScDPObject::DumpCache() const if (!mpTableData) return; -const ScDPCache* pCache = mpTableData->GetCacheTable().getCache(); -if (!pCache) -return; +const ScDPCache &rCache = mpTableData->GetCacheTable().getCache(); -pCache->Dump(); +rCache.Dump(); } #endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - rsc/source sal/osl
rsc/source/rscpp/cpp1.c |3 ++-
sal/osl/unx/profile.c |1 +
2 files changed, 3 insertions(+), 1 deletion(-)
New commits:
commit dcfb7880a25c4d0f9630046d332ff8340ed83aed
Author: Pedro Giffuni
Date: Sat Dec 19 00:00:28 2015 +
Remember to NULL terminate when using strncpy.
All systems should have strlcpy.
diff --git a/rsc/source/rscpp/cpp1.c b/rsc/source/rscpp/cpp1.c
index b1aff3f..de33f0b 100644
--- a/rsc/source/rscpp/cpp1.c
+++ b/rsc/source/rscpp/cpp1.c
@@ -329,7 +329,8 @@ nRunde++;
cerror("Can't open input file \"%s\"", useargv[1]);
exit(IO_ERROR);
}
-strncpy(work, useargv[1], sizeof(work)); /* Remember input
filename */
+strncpy(work, useargv[1], NWORK+1); /* Remember input
filename */
+work[NWORK] = '\0';
break;
} /* Else, just get stdin */
case 0: /* No args? */
diff --git a/sal/osl/unx/profile.c b/sal/osl/unx/profile.c
index 0379070..d453266 100644
--- a/sal/osl/unx/profile.c
+++ b/sal/osl/unx/profile.c
@@ -2065,6 +2065,7 @@ static sal_Bool
osl_ProfileSwapProfileNames(osl_TProfileImpl* pProfile)
osl_ProfileGenerateExtension(pProfile->m_FileName,"bak",pszBakFile);
strncpy(pszIniFile,pProfile->m_FileName,PATH_MAX);
+pszIniFile[PATH_MAX-1] = '\0';
osl_ProfileGenerateExtension(pProfile->m_FileName,"tmp",pszTmpFile);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - 2 commits - bean/BUCK bean/com bean/pom.officebean.xml bin/mvn.py BUCK .buckconfig .buckversion .gitignore javaunohelper/BUCK javaunohelper/p
.buckconfig | 13 .buckversion|1 .gitignore |2 BUCK| 59 +++ bean/BUCK | 23 + bean/com/sun/star/comp/beans/LocalOfficeWindow.java |2 bean/com/sun/star/comp/beans/OOoBean.java | 24 - bean/pom.officebean.xml | 44 ++ bin/mvn.py | 60 --- javaunohelper/BUCK | 20 + javaunohelper/pom.juh.xml | 44 ++ jurt/BUCK | 21 + jurt/pom.jurt.xml | 44 ++ ridljar/BUCK| 20 + ridljar/pom.ridl.xml| 44 ++ ridljar/pom.unoloader.xml | 44 ++ ridljar/source/unoloader/BUCK | 20 + solenv/bin/version.py | 49 ++ solenv/buck/build.defs | 49 ++ solenv/maven/BUCK | 41 ++ solenv/maven/README.md | 373 solenv/maven/VERSION|7 solenv/maven/mvn.py | 77 solenv/maven/package.defs | 28 + unoil/BUCK | 21 + unoil/pom.unoil.xml | 44 ++ 26 files changed, 1100 insertions(+), 74 deletions(-) New commits: commit 756e103214c3c74c2af7e0da836b568259f81226 Author: David Ostrovsky Date: Tue Dec 1 23:59:11 2015 +0100 Add build toolchain to upload LibreOffice API to Maven Central Set up the toolchain to create sources and javadocs artifacts in addition to JARs created during the build. Use Buck build tool for that: [1]. This is a fork of Google's build tool Blaze, created by Xooglers at Facebook. This build tool (like Blaze itself) uses Python to write build files. Add needed tools and build files to install LibreOffice API artifacts to local Maven repository or deploy them to Maven Central. To build all needed artifacts LibreOffice must be built regularly with GNU make first. To build the rest of the API (sources and javadocs): $> buck build api To replace version number with upcoming release version: $> solenv/bin/version.py 5.1.0 To install the API to local Maven repository: $> buck build api_install To deploy the API to Maven Central: $> buck build api_deploy Detailed documentation is added to document the prerequisites and the workflow to upload LibreOffice API to Maven Central. * [1] https://buckbuild.com Change-Id: Ibdd552a01110836703bc069abe829b9921491cac Reviewed-on: https://gerrit.libreoffice.org/20343 Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens (cherry picked from commit 1fd41f43eb73c373cb94d32d82c5fb7a7e243367) diff --git a/.buckconfig b/.buckconfig new file mode 100644 index 000..5fa3abc --- /dev/null +++ b/.buckconfig @@ -0,0 +1,13 @@ +[alias] + api = //:api + api_install = //solenv/maven:api_install + api_deploy = //solenv/maven:api_deploy + +[buildfile] + includes = //solenv/buck/build.defs + +[project] + ignore = .git,workdir,instdir + +[cache] + mode = dir diff --git a/.buckversion b/.buckversion new file mode 100644 index 000..3c60745 --- /dev/null +++ b/.buckversion @@ -0,0 +1 @@ +6659a474fb2ba6e921bb38c1b55d4c9ba6073cfa diff --git a/.gitignore b/.gitignore index 7999ec4..f9b6e90 100644 --- a/.gitignore +++ b/.gitignore @@ -20,6 +20,7 @@ # # where stuff is built +/buck-out /instdir /instdir_for_build /workdir @@ -75,6 +76,7 @@ \#* *.kdev4 .kdev_include_paths +.buckd .directory # things below this point are targeted for elimination diff --git a/BUCK b/BUCK new file mode 100644 index 000..66b0dbd --- /dev/null +++ b/BUCK @@ -0,0 +1,59 @@ +prebuilt_jar( + name = 'juh', + binary_jar = 'instdir/program/classes/juh.jar', + visibility = ['PUBLIC'], +) + +prebuilt_jar( + name = 'jurt', + binary_jar = 'instdir/program/classes/jurt.jar', + visibility = ['PUBLIC'], +) + +prebuilt_jar( + name = 'officebean', + binary_jar = 'instdir/program/classes/officebean.jar', + visibility = ['PUBLIC'], +) + +prebuilt_jar( + name = 'ridl', + binary_jar = 'instdir/program/classes/ridl.jar', + visibility = ['PUBLIC'], +) + +prebuilt_jar( + name = 'unoil', + binary_jar = 'instdir/program/classes/unoil.jar', + visibility = ['PUBLIC'], +) + +prebuilt_jar( + name = 'unoloader', + binary_jar = 'instdir/program/classes/unoloader.jar', + visibility = ['PUBLIC'], +) + +zip_file( + name = 'api', + srcs = [
[Libreoffice-commits] core.git: include/svx svx/source
include/svx/sdr/contact/objectcontactofobjlistpainter.hxx |7 +--
include/svx/svdpage.hxx | 30 ++
svx/source/sdr/contact/objectcontactofobjlistpainter.cxx |4 -
svx/source/sdr/contact/viewobjectcontactofpageobj.cxx |2
svx/source/svdraw/svdpage.cxx | 24 +--
5 files changed, 32 insertions(+), 35 deletions(-)
New commits:
commit 6b57529888f384307b88cf5ead5e3e477c6c03b1
Author: Kohei Yoshida
Date: Fri Dec 18 19:42:09 2015 -0500
Use std::unique_ptr for mpViewContact member instance of SdrPage.
And fix some const-incorrect-ness while at it.
Change-Id: I0314c8e5b73f1a7edce040b2a57fbc5d1081d70c
Reviewed-on: https://gerrit.libreoffice.org/20815
Tested-by: Jenkins
Reviewed-by: Kohei Yoshida
Tested-by: Kohei Yoshida
diff --git a/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx
b/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx
index d9ee440..8a2d4da 100644
--- a/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx
+++ b/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx
@@ -34,7 +34,7 @@ class SVX_DLLPUBLIC ObjectContactPainter : public
ObjectContact
protected:
// Hierarchy access methods
virtual sal_uInt32 GetPaintObjectCount() const = 0;
-virtual ViewContact& GetPaintObjectViewContact(sal_uInt32 nIndex) const =
0;
+virtual ViewContact& GetPaintObjectViewContact(sal_uInt32 nIndex) = 0;
public:
// basic constructor/destructor
@@ -59,7 +59,7 @@ protected:
// Hierarchy access methods
virtual sal_uInt32 GetPaintObjectCount() const override;
-virtual ViewContact& GetPaintObjectViewContact(sal_uInt32 nIndex) const
override;
+virtual ViewContact& GetPaintObjectViewContact(sal_uInt32 nIndex) override;
public:
// basic constructor/destructor
@@ -95,7 +95,7 @@ protected:
// Hierarchy access methods
virtual sal_uInt32 GetPaintObjectCount() const override;
-virtual ViewContact& GetPaintObjectViewContact(sal_uInt32 nIndex) const
override;
+virtual ViewContact& GetPaintObjectViewContact(sal_uInt32 nIndex) override;
public:
// basic constructor
@@ -107,6 +107,7 @@ public:
// set another page
void SetStartPage(const SdrPage* pPage);
const SdrPage* GetStartPage() const { return mxStartPage.get(); }
+SdrPage* GetStartPage() { return mxStartPage.get(); }
virtual OutputDevice* TryToGetOutputDevice() const override;
};
diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx
index 347beb3..7e1d15f 100644
--- a/include/svx/svdpage.hxx
+++ b/include/svx/svdpage.hxx
@@ -375,6 +375,14 @@ public:
*/
class SVX_DLLPUBLIC SdrPage : public SdrObjList, public tools::WeakBase<
SdrPage >
{
+// #i9076#
+friend class SdrModel;
+friend class SvxUnoDrawPagesAccess;
+
+// this class uses its own UNO wrapper
+// and thus has to set mxUnoPage (it also relies on mxUnoPage not being
WeakRef)
+friend class reportdesign::OSection;
+
SdrPage& operator=(const SdrPage& rSrcPage) = delete;
// start PageUser section
@@ -382,32 +390,20 @@ private:
// #11# PageUser section
sdr::PageUserVector
maPageUsers;
+std::unique_ptr mpViewContact;
+
public:
void AddPageUser(sdr::PageUser& rNewUser);
void RemovePageUser(sdr::PageUser& rOldUser);
-
-// end PageUser section
-
-
-// #110094# DrawContact section
-private:
-sdr::contact::ViewContact*
mpViewContact;
protected:
sdr::contact::ViewContact* CreateObjectSpecificViewContact();
public:
-sdr::contact::ViewContact& GetViewContact() const;
+const sdr::contact::ViewContact& GetViewContact() const;
+sdr::contact::ViewContact& GetViewContact();
// #110094# DrawContact support: Methods for handling Page changes
-void ActionChanged() const;
-
-// #i9076#
-friend class SdrModel;
-friend class SvxUnoDrawPagesAccess;
-
-// this class uses its own UNO wrapper
-// and thus has to set mxUnoPage (it also relies on mxUnoPage not being
WeakRef)
-friend class reportdesign::OSection;
+void ActionChanged();
sal_Int32 nWdt; // Seitengroesse
sal_Int32 nHgt; // Seitengroesse
diff --git a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx
b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx
index 5c9fb17..a55607e 100644
--- a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx
+++ b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx
@@ -45,7 +45,7 @@ sal_uInt32
ObjectContactOfObjListPainter::GetPaintObjectCount() const
return maStartObjects.size();
}
-ViewContact&
ObjectContactOfObjListPainter::GetPaintObjectViewContact(sal_uInt32 nIndex)
const
+ViewContact&
ObjectContactOfObjListPainter::GetPaintObjectViewContact(sal_uInt32 nIndex)
{
const SdrObject* pObj = maStartObjects[n
[Libreoffice-commits] core.git: cui/source
cui/source/customize/cfg.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 58f6e2ec8c546e7f927dfc333c8ae401f98e3dcf
Author: Matúš Kukan
Date: Sat Dec 19 07:20:51 2015 +0100
loplugin:stringconstant
Change-Id: Iafe0c422f8681bd2ed5b825af180facb59aaf531
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index b1defa9..9f6c8fd 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -3396,7 +3396,7 @@ IMPL_LINK_TYPED( SvxToolbarConfigPage, EntrySelectHdl,
MenuButton *, pButton, vo
if ( pNameDialog->Execute() == RET_OK ) {
pNameDialog->GetName(aNewName);
-if( aNewName == "" ) //tdf#80758 - Accelerator character ("~")
is passed as
+if( aNewName.isEmpty() ) //tdf#80758 - Accelerator character
("~") is passed as
pEntry->SetName( "~" ); // the button name in case of
empty values.
else
pEntry->SetName( aNewName );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
