[Libreoffice-commits] core.git: uui/Library_uui.mk uui/source uui/util
uui/Library_uui.mk |1
uui/source/passwordcontainer.cxx | 49 --
uui/source/passwordcontainer.hxx | 10 --
uui/source/services.cxx | 63 ---
uui/util/uui.component |5 +--
5 files changed, 10 insertions(+), 118 deletions(-)
New commits:
commit 2da149ff33b6ef345aef8619e06654e343c4e960
Author: Noel Grandin
AuthorDate: Mon Jul 6 16:31:00 2020 +0200
Commit: Noel Grandin
CommitDate: Wed Jul 8 08:36:23 2020 +0200
uui: create instances with uno constructors
See tdf#74608 for motivation
Change-Id: I8b7eec5e2cbe61a8dc3bb65f391245c1825fedc2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98235
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/uui/Library_uui.mk b/uui/Library_uui.mk
index f1dc84a4761c..4daad8403dcb 100644
--- a/uui/Library_uui.mk
+++ b/uui/Library_uui.mk
@@ -64,7 +64,6 @@ $(eval $(call gb_Library_add_exception_objects,uui,\
uui/source/passworddlg \
uui/source/requeststringresolver \
uui/source/secmacrowarnings \
- uui/source/services \
uui/source/sslwarndlg \
uui/source/trylater \
uui/source/unknownauthdlg \
diff --git a/uui/source/passwordcontainer.cxx b/uui/source/passwordcontainer.cxx
index a97725ef1ca3..2e2d0b0ac3cb 100644
--- a/uui/source/passwordcontainer.cxx
+++ b/uui/source/passwordcontainer.cxx
@@ -292,7 +292,7 @@
PasswordContainerInteractionHandler::~PasswordContainerInteractionHandler()
OUString SAL_CALL
PasswordContainerInteractionHandler::getImplementationName()
{
-return getImplementationName_Static();
+return "com.sun.star.comp.uui.PasswordContainerInteractionHandler";
}
@@ -309,24 +309,7 @@ PasswordContainerInteractionHandler::supportsService(
uno::Sequence< OUString > SAL_CALL
PasswordContainerInteractionHandler::getSupportedServiceNames()
{
-return getSupportedServiceNames_Static();
-}
-
-
-// static
-OUString
-PasswordContainerInteractionHandler::getImplementationName_Static()
-{
-return "com.sun.star.comp.uui.PasswordContainerInteractionHandler";
-}
-
-
-// static
-uno::Sequence< OUString >
-PasswordContainerInteractionHandler::getSupportedServiceNames_Static()
-{
-uno::Sequence< OUString > aSNS {
"com.sun.star.task.PasswordContainerInteractionHandler" };
-return aSNS;
+return { "com.sun.star.task.PasswordContainerInteractionHandler" };
}
@@ -395,31 +378,13 @@
PasswordContainerInteractionHandler::handleInteractionRequest(
}
-// Service factory implementation.
-
-/// @throws uno::Exception
-static uno::Reference< uno::XInterface >
-PasswordContainerInteractionHandler_CreateInstance(
-const uno::Reference< lang::XMultiServiceFactory> & rSMgr )
-{
-lang::XServiceInfo* pX
-= new
PasswordContainerInteractionHandler(comphelper::getComponentContext(rSMgr));
-return uno::Reference< uno::XInterface >::query( pX );
-}
-
+} // namespace uui
-// static
-uno::Reference< lang::XSingleServiceFactory >
-PasswordContainerInteractionHandler::createServiceFactory(
-const uno::Reference< lang::XMultiServiceFactory >& rxServiceMgr )
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
+com_sun_star_comp_uui_PasswordContainerInteractionHandler_get_implementation(
+css::uno::XComponentContext* context, css::uno::Sequence
const&)
{
-return cppu::createOneInstanceFactory(
-rxServiceMgr,
-
PasswordContainerInteractionHandler::getImplementationName_Static(),
-PasswordContainerInteractionHandler_CreateInstance,
-
PasswordContainerInteractionHandler::getSupportedServiceNames_Static() );
+return cppu::acquire(new
uui::PasswordContainerInteractionHandler(context));
}
-} // namespace uui
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/passwordcontainer.hxx b/uui/source/passwordcontainer.hxx
index 2e2545fa6098..cb4d5a533507 100644
--- a/uui/source/passwordcontainer.hxx
+++ b/uui/source/passwordcontainer.hxx
@@ -150,16 +150,6 @@ public:
virtual sal_Bool SAL_CALL
handleInteractionRequest( const css::uno::Reference<
css::task::XInteractionRequest >& Request ) override;
-// Non-UNO interfaces
-static OUString
-getImplementationName_Static();
-
-static css::uno::Sequence< OUString >
-getSupportedServiceNames_Static();
-
-static css::uno::Reference< css::lang::XSingleServiceFactory >
-createServiceFactory( const css::uno::Reference<
css::lang::XMultiServiceFactory > & rxServiceMgr );
-
private:
PasswordContainerHelper m_aPwContainerHelper;
};
diff --git a/uui/source/services.cxx b/uui/source/services.cxx
deleted file mode 100644
index 7709e41760a7..
--- a/uui/source/services.cxx
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * Thi
[Libreoffice-commits] dev-tools.git: ciabot/config-example.cfg ciabot/config.pl.sample ciabot/.gitignore ciabot/INSTALL ciabot/irker-cia-proxy.py ciabot/libreoffice-bugzilla2.py ciabot/libreoffice-cia
ciabot/.gitignore|1 ciabot/INSTALL | 19 -- ciabot/README| 109 -- ciabot/config-example.cfg| 16 -- ciabot/config.pl.sample | 11 - ciabot/irker-cia-proxy.py| 152 ciabot/libreoffice-bugzilla2.py | 231 --- ciabot/libreoffice-ciabot.pl | 290 --- ciabot/projmap.json |7 ciabot/run-libreoffice-ciabot.pl | 229 -- ciabot/setup/install | 34 ciabot/setup/irkerd.conf | 18 -- ciabot/setup/loircbot.conf | 19 -- ciabot/sigui-bugzilla.pl | 129 - ciabot/start-ciabot.sh |5 ciabot/start-irker.sh|7 16 files changed, 1277 deletions(-) New commits: commit aed5bd02b50032e9152f2f91c5632f6b44987c35 Author: Guilhem Moulin AuthorDate: Mon Jul 6 00:17:51 2020 +0200 Commit: Guilhem Moulin CommitDate: Mon Jul 6 00:17:51 2020 +0200 ciabot: Move subtree to infra/salt The repository now lives at https://git.libreoffice.org/infra/salt/+/master/ciabot/ . This makes it easier for the infra team to deploy changes to production. Subtree history was preserved during the operation: https://git.libreoffice.org/infra/salt/history/7162daff402d4ad235ed48e3872bc0b50faa2275 diff --git a/ciabot/.gitignore b/ciabot/.gitignore deleted file mode 100644 index 3e9cb72..000 --- a/ciabot/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/repositories diff --git a/ciabot/INSTALL b/ciabot/INSTALL deleted file mode 100644 index 3f36105..000 --- a/ciabot/INSTALL +++ /dev/null @@ -1,19 +0,0 @@ -The following steps are needed to use this code: - -Install some packages: -- Python - * git module (Debian: python-git) - * bugzilla module (Debian: python-bugzilla) - -Configure the software: -- Copy config-example.cfg -> config.cfg and change the defaults - - -- Have this directory as e.g. ~/prod - -Clone-out extra repositories -- git clone https://gitlab.com/esr/irker ~/git/irker -- git clone https://github.com/vmiklos/irker-cia-proxy ~/git/irker-cia-proxy - -Run the install script -- ~/git/dev-tools/ciabot/setup/install diff --git a/ciabot/README b/ciabot/README deleted file mode 100644 index 4ea4e1b..000 --- a/ciabot/README +++ /dev/null @@ -1,109 +0,0 @@ -How the IRC nofication part works: - -1) After a reboot, start-irker.sh and start-ciabot.sh has to be started -manually. The first starts irkerd, which -- in case of no errors -- has no -output. The second starts run-libreoffice-ciabot.pl in screen. - -2) run-libreoffice-ciabot.pl invokes libreoffice-ciabot.pl for each commit, which -has an XML output, piped into irker-cia-proxy.py, which sends the info to -irkerd. - - -TESTING - -How to test the IRC notification part: --- - -1) Take the IRC bot "offline", by editing ~/bin/irker-cia-proxy/projmap.json, -e.g. redirect the channel from #libreoffice-dev to some test channel. - -2) Run: - -cd ~/libreoffice/core -perl ~/bin/libreoffice-ciabot.pl core f9453275d2710f9d3e9a4cc1285a57db334a5e2e | (cd ~/bin/irker-cia-proxy; python irker-cia-proxy.py -s) - -3) Once you're happy with the result, change projmap.json back. - - -How to test the Bugzilla integration: -- - -- Follow the instructions in INSTALL to install packages and configure - the software. - - (NOTE: It's possible that for simple testing you won't have to - install repos besides dev-tools and LibreOffice core. More details - in the future :-) - -- Edit file projmap.json to change the IRC channel - -e.g. "to": "ircs://irc.freenode.net/libreoffice-dev" -> - "to": "ircs://irc.freenode.net/libreoffice-dev-test" - -- Edit config.cfg to change the url for the Bugzilla install - -e.g. url = bugs.libreoffice.org/xmlrpc.cgi -> - url = bugzilla-test.documentfoundation.org/xmlrpc.cgi - -Don't forget to also update the user/password for connecting. - -- If you don't have a LibreOffice core repo handy, clone one out - -https://wiki.documentfoundation.org/Development/BuildingOnLinux#Cloning_and_building - -- cd to the LibreOffice core repo - - cd ~/libreoffice/core - -- Run the script: - -That should give you text that looks like this (abbreviated for space): - - - -CIA Perl client for Git -1.0 - - ... - - -If that doesn't crash, let's go further. - -- Make a commit in the core repo (but do NOT push it!). - -Reference a test bug so you don't email anyone else. Example: - -commit 3da8ea79e9616332fdd13a78409e963a96318428 -Author: Robinson Tryon -Date: Sun Dec 7 19:49:36 2014 -0500 - -fdo#76789 - Test Git-Bugzilla integration scripts - -Testing the integration scripts in ciabot/ to make sure that they run -as expected against a new server setup. - -If the run is successful, you shouldn't see
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - vcl/source
vcl/source/window/toolbox.cxx |6 --
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 9921be1f47943781c443927f7c7d94a460f2780b
Author: Jan-Marek Glogowski
AuthorDate: Tue Jun 30 16:42:35 2020 +0200
Commit: Thorsten Behrens
CommitDate: Wed Jul 8 02:31:11 2020 +0200
tdf#130991 Scale the drop-down arrow size-request
When requesting the size of the drop-down arrow button, the arrow
rect must be scaled, like all other native size requests.
Change-Id: Ic0ccd96e812527c880868d385484655526ebb09b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97536
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist
(cherry picked from commit ba956e60a868e98d22bc95efd041f423987e7f76)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97576
Reviewed-by: Adolfo Jayme Barrientos
(cherry picked from commit f0daeb39aa61cc3435630cf0b9727f6da818de1a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97679
Reviewed-by: Thorsten Behrens
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index df5aadf89243..187ea2512f98 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -1352,20 +1352,22 @@ static void ImplAddButtonBorder( long &rWidth, long&
rHeight, bool bNativeButton
bool ToolBox::ImplCalcItem()
{
-
// recalc required ?
if ( !mbCalc )
return false;
ImplDisableFlatButtons();
+OutputDevice *pDefault = Application::GetDefaultDevice();
+float fScaleFactor = pDefault ? pDefault->GetDPIScaleFactor() : 1.0;
+
longnDefWidth;
longnDefHeight;
longnMaxWidth = 0;
longnMaxHeight = 0;
longnMinWidth = 6;
longnMinHeight = 6;
-longnDropDownArrowWidth = TB_DROPDOWNARROWWIDTH;
+longnDropDownArrowWidth = TB_DROPDOWNARROWWIDTH * fScaleFactor;
#ifdef IOS
nDropDownArrowWidth *= 3;
#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
qtconfig.h header not found
Hello Michael, Following d68fc8d10da9047534f0e7a2d5ebc59f13745442 (configure: try to fail early if qt5 header QtCore/qconfig-32.h missing), I get this: configure: error: qconfig.h header not found. Error running configure at ./autogen.sh line 299 Here's my autogen.input: CC=clang CXX=clang++ --enable-compiler-plugins --with-system-odbc --enable-gtk3-kde5 --enable-kf5 --enable-split-debug --enable-gdb-index --enable-ld=gold --enable-ext-nlpsolver --enable-ext-ct2n --enable-ext-numbertext --enable-postgresql-sdbc --enable-ext-wiki-publisher --enable-dbus --enable-werror --enable-debug --enable-dbgutil --enable-dependency-tracking --enable-online-update --enable-python=fully-internal --without-system-mariadb --enable-bundle-mariadb --enable-avahi --enable-eot --enable-odk --with-lang=en-US it fr fi de es br pt pt-BR ru cs hu pl nl el ko ja sl #--with-lang=ALL --with-myspell-dicts --enable-evolution2 #--with-help apt-file search qconfig.h -> libsquirrel-dev: /usr/include/squirrel3/sqconfig.h qtbase5-dev: /usr/include/x86_64-linux-gnu/qt5/QtCore/qconfig.h qtbase5-gles-dev: /usr/include/x86_64-linux-gnu/qt5/QtCore/qconfig.h "qtbase5-dev" is installed julien@debianamd:~/lo/libreoffice$ ls -l /usr/include/x86_64-linux-gnu/qt5/QtCore/qconfig.h -rw-r--r-- 1 root root 1724 juin 26 18:47 /usr/include/x86_64-linux-gnu/qt5/QtCore/qconfig.h uname -a -> Linux debianamd 5.7.0-1-amd64 #1 SMP Debian 5.7.6-1 (2020-06-24) x86_64 GNU/Linux I must recognize I don't understand why QtCore/qconfig.h isn't found. What can I check? Regards, Julien ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Simulated Animation Effects - Week 5 Report
Hello everyone, Just published my blog post about the current progress of my GSoC project Simulated Animation Effects. You can check it out at the link below: https://quwex.com/gsoc20-week5/ Since my finals started last week, I was able to commit less time than before, they will be over at the end of the next week, hopefully will get back to speed after that. Looking forward for your feedback Best regards, Sarper Akdemir ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - chart2/source
chart2/source/controller/dialogs/tp_TitleRotation.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit f1b1be9e3707b2e25557f4f781e3321051018683
Author: Caolán McNamara
AuthorDate: Tue Jul 7 15:03:35 2020 +0100
Commit: Adolfo Jayme Barrientos
CommitDate: Wed Jul 8 00:13:59 2020 +0200
tdf#134603 [en|dis]able logic reversed
Change-Id: I192b7a6da4bcd311e64a31d9dc2b4c2b422194cb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98267
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.cxx
b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
index 1cd5ecdf6558..022489881359 100644
--- a/chart2/source/controller/dialogs/tp_TitleRotation.cxx
+++ b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
@@ -61,10 +61,10 @@ SchAlignmentTabPage::SchAlignmentTabPage(weld::Container*
pPage, weld::DialogCon
IMPL_LINK_NOARG(SchAlignmentTabPage, StackedToggleHdl, weld::ToggleButton&,
void)
{
bool bActive = m_xCbStacked->get_active();
-m_xNfRotate->set_sensitive(bActive);
-m_xCtrlDial->set_sensitive(bActive);
+m_xNfRotate->set_sensitive(!bActive);
+m_xCtrlDial->set_sensitive(!bActive);
m_aCtrlDial.StyleUpdated();
-m_xFtRotate->set_sensitive(bActive);
+m_xFtRotate->set_sensitive(!bActive);
}
SchAlignmentTabPage::~SchAlignmentTabPage()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - chart2/source
chart2/source/controller/dialogs/tp_TitleRotation.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit faa9ed4c2bc043cb2c483db799c2a696b66a5435
Author: Caolán McNamara
AuthorDate: Tue Jul 7 15:03:35 2020 +0100
Commit: Adolfo Jayme Barrientos
CommitDate: Wed Jul 8 00:12:26 2020 +0200
tdf#134603 [en|dis]able logic reversed
Change-Id: I192b7a6da4bcd311e64a31d9dc2b4c2b422194cb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98271
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.cxx
b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
index 32510374aa33..d23e393d5f13 100644
--- a/chart2/source/controller/dialogs/tp_TitleRotation.cxx
+++ b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
@@ -62,10 +62,10 @@ SchAlignmentTabPage::SchAlignmentTabPage(weld::Container*
pPage, weld::DialogCon
IMPL_LINK_NOARG(SchAlignmentTabPage, StackedToggleHdl, weld::ToggleButton&,
void)
{
bool bActive = m_xCbStacked->get_active();
-m_xNfRotate->set_sensitive(bActive);
-m_xCtrlDialWin->set_sensitive(bActive);
+m_xNfRotate->set_sensitive(!bActive);
+m_xCtrlDialWin->set_sensitive(!bActive);
m_xCtrlDial->StyleUpdated();
-m_xFtRotate->set_sensitive(bActive);
+m_xFtRotate->set_sensitive(!bActive);
}
SchAlignmentTabPage::~SchAlignmentTabPage()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/drawinglayercore' - 2 commits - drawinglayer/source emfio/qa include/drawinglayer svgio/qa svx/qa vcl/source
drawinglayer/source/tools/primitive2dxmldump.cxx |4 -
emfio/qa/cppunit/emf/EmfImportTest.cxx| 10 +--
include/drawinglayer/tools/primitive2dxmldump.hxx |4 -
svgio/qa/cppunit/SvgImportTest.cxx| 58 +++---
svx/qa/unit/sdr.cxx |2
svx/qa/unit/svdraw.cxx|2
vcl/source/gdi/mtfxmldump.cxx | 46 +++--
7 files changed, 81 insertions(+), 45 deletions(-)
New commits:
commit 7d1c55b837754455a3ae1aff66059b3b1fedadff
Author: Tomaž Vajngerl
AuthorDate: Tue Jul 7 23:09:57 2020 +0200
Commit: Tomaž Vajngerl
CommitDate: Tue Jul 7 23:19:11 2020 +0200
move Primitive2dXmlDump from drawinglayer::tools to drawinglayer NS
drawinglayer::tools causes conflicts with ::tools namespace, so
better to move Primitive2dXmlDump out from this namespace as for
inspecting purposes it ccan be injected into existing code which
could break make it conflict and break compilation.
Change-Id: I5f9e594b2b8b1dd24067fa5f5ca3cfc4eefb85cd
diff --git a/drawinglayer/source/tools/primitive2dxmldump.cxx
b/drawinglayer/source/tools/primitive2dxmldump.cxx
index 7fd249697ac2..7e68a780a84c 100644
--- a/drawinglayer/source/tools/primitive2dxmldump.cxx
+++ b/drawinglayer/source/tools/primitive2dxmldump.cxx
@@ -44,7 +44,7 @@
using namespace drawinglayer::primitive2d;
-namespace drawinglayer::tools
+namespace drawinglayer
{
namespace
@@ -451,6 +451,6 @@ void Primitive2dXmlDump::decomposeAndWrite(
}
}
-} // end namespace drawinglayer::tools
+} // end namespace drawinglayer
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/emfio/qa/cppunit/emf/EmfImportTest.cxx
b/emfio/qa/cppunit/emf/EmfImportTest.cxx
index ac435905d570..ca42b307211b 100644
--- a/emfio/qa/cppunit/emf/EmfImportTest.cxx
+++ b/emfio/qa/cppunit/emf/EmfImportTest.cxx
@@ -76,7 +76,7 @@ Primitive2DSequence Test::parseEmf(const OUString& aSource)
void Test::checkRectPrimitive(Primitive2DSequence const & rPrimitive)
{
-drawinglayer::tools::Primitive2dXmlDump dumper;
+drawinglayer::Primitive2dXmlDump dumper;
xmlDocUniquePtr pDocument =
dumper.dumpAndParse(comphelper::sequenceToContainer(rPrimitive));
CPPUNIT_ASSERT (pDocument);
@@ -103,7 +103,7 @@ void Test::TestDrawString()
// first, get the sequence of primitives and dump it
Primitive2DSequence aSequence =
parseEmf("/emfio/qa/cppunit/emf/data/TestDrawString.emf");
CPPUNIT_ASSERT_EQUAL(1, static_cast(aSequence.getLength()));
-drawinglayer::tools::Primitive2dXmlDump dumper;
+drawinglayer::Primitive2dXmlDump dumper;
xmlDocUniquePtr pDocument =
dumper.dumpAndParse(comphelper::sequenceToContainer(aSequence));
CPPUNIT_ASSERT (pDocument);
@@ -125,7 +125,7 @@ void Test::TestDrawStringTransparent()
// first, get the sequence of primitives and dump it
Primitive2DSequence aSequence =
parseEmf("/emfio/qa/cppunit/emf/data/TestDrawStringTransparent.emf");
CPPUNIT_ASSERT_EQUAL(1, static_cast(aSequence.getLength()));
-drawinglayer::tools::Primitive2dXmlDump dumper;
+drawinglayer::Primitive2dXmlDump dumper;
xmlDocUniquePtr pDocument =
dumper.dumpAndParse(comphelper::sequenceToContainer(aSequence));
CPPUNIT_ASSERT (pDocument);
@@ -148,7 +148,7 @@ void Test::TestDrawLine()
// first, get the sequence of primitives and dump it
Primitive2DSequence aSequence =
parseEmf("/emfio/qa/cppunit/emf/data/TestDrawLine.emf");
CPPUNIT_ASSERT_EQUAL(1, static_cast(aSequence.getLength()));
-drawinglayer::tools::Primitive2dXmlDump dumper;
+drawinglayer::Primitive2dXmlDump dumper;
xmlDocUniquePtr pDocument =
dumper.dumpAndParse(comphelper::sequenceToContainer(aSequence));
CPPUNIT_ASSERT (pDocument);
@@ -162,7 +162,7 @@ void Test::TestLinearGradient()
// This unit checks for a correct import of an EMF+ file with
LinearGradient brush
Primitive2DSequence aSequence =
parseEmf("/emfio/qa/cppunit/emf/data/TestLinearGradient.emf");
CPPUNIT_ASSERT_EQUAL(1, static_cast(aSequence.getLength()));
-drawinglayer::tools::Primitive2dXmlDump dumper;
+drawinglayer::Primitive2dXmlDump dumper;
xmlDocUniquePtr pDocument =
dumper.dumpAndParse(comphelper::sequenceToContainer(aSequence));
CPPUNIT_ASSERT (pDocument);
diff --git a/include/drawinglayer/tools/primitive2dxmldump.hxx
b/include/drawinglayer/tools/primitive2dxmldump.hxx
index f8712db35fb2..9dc06e7b674d 100644
--- a/include/drawinglayer/tools/primitive2dxmldump.hxx
+++ b/include/drawinglayer/tools/primitive2dxmldump.hxx
@@ -19,14 +19,14 @@
namespace tools { class XmlWriter; }
-namespace drawinglayer::tools
+namespace drawinglayer
{
class DRAWINGLAYER_DLLPUBLIC Primitive2dXmlDump final
{
private:
std::vector maFilter;
-void decomposeAndWrite(const
drawinglayer::primitive2d::Primitive2DContainer& rPrimitive2DSequence,
::tools::Xm
[Libreoffice-commits] core.git: configure.ac
configure.ac |2 ++ 1 file changed, 2 insertions(+) New commits: commit f1e2e69b9b31b42ed9b8a46778c05dc36ff8edcf Author: Henry Castro AuthorDate: Wed Jun 3 20:18:58 2020 -0400 Commit: Henry Castro CommitDate: Tue Jul 7 22:42:20 2020 +0200 lok: symbolic link to the "include" directory when builddir != srcdir When compiling the android variant build in a different build output directory of the "online" project, it fails due to the missing "include" files. Change-Id: If9056788b3d043e4ae8ad3f799885995c0ab0cf0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95603 Tested-by: Jenkins CollaboraOffice Reviewed-by: Henry Castro Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98269 Tested-by: Jenkins diff --git a/configure.ac b/configure.ac index f0492335a9d6..0be03f347d2a 100644 --- a/configure.ac +++ b/configure.ac @@ -13518,6 +13518,8 @@ CFLAGS=$my_original_CFLAGS CXXFLAGS=$my_original_CXXFLAGS CPPFLAGS=$my_original_CPPFLAGS +AC_LINK_FILES([include], [include]) + # Keep in sync with list of files far up, at AC_MSG_CHECKING([for # BUILD platform configuration] - otherwise breaks cross building AC_CONFIG_FILES([config_host.mk ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx officecfg/registry sd/sdi sd/source sd/uiconfig svx/sdi svx/source
include/svx/svxids.hrc | 6 ++- officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu | 8 sd/sdi/tables.sdi| 5 ++ sd/source/ui/table/tableobjectbar.cxx| 2 + sd/uiconfig/sdraw/menubar/menubar.xml| 1 sd/uiconfig/sdraw/toolbar/tableobjectbar.xml | 1 sd/uiconfig/simpress/menubar/menubar.xml | 1 sd/uiconfig/simpress/toolbar/tableobjectbar.xml | 1 svx/sdi/svx.sdi | 17 ++ svx/source/table/tablecontroller.cxx | 16 - 10 files changed, 54 insertions(+), 4 deletions(-) New commits: commit 1e602c9c3f8dafd1e47d50c9670846fc1172700d Author: Justin Luth AuthorDate: Fri Jul 3 11:45:24 2020 +0300 Commit: Maxim Monastirsky CommitDate: Tue Jul 7 22:21:26 2020 +0200 tdf#100772 sd: add uno:DeleteTable to non-NB menus Delete Row and Delete Column were there, but no option to delete table, so that major omission was fixed for Draw and Impress. The notebookbar looks very incomplete. Also, I didn't really understand the pop-out menu configuration, and at least in the one case there didn't seem to be a good space to add delete table. So I left the notebookbar completely alone. Change-Id: I5d6c98e3238bc545a02325edfd62f5d937ac6371 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97821 Tested-by: Jenkins Tested-by: Maxim Monastirsky Reviewed-by: Justin Luth Reviewed-by: Maxim Monastirsky diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc index 9081fe0f36f6..ead0bd87d48c 100644 --- a/include/svx/svxids.hrc +++ b/include/svx/svxids.hrc @@ -852,6 +852,7 @@ class SvxSetItem; #define SID_SHRINK_FONT_SIZE( SID_SVX_START + 1043 ) // color subtoolbar on graphictoolbar #define SID_COLOR_SETTINGS ( SID_SVX_START + 1044 ) + #define SID_FM_FORM_DESIGN_TOOLS( SID_SVX_START + 1046 ) #define SID_DRAWTBX_CS_BASIC( SID_SVX_START + 1047 ) #define SID_DRAWTBX_CS_SYMBOL ( SID_SVX_START + 1048 ) @@ -898,7 +899,7 @@ class SvxSetItem; #define SID_TABLE_STYLE_SETTINGS( SID_SVX_START + 1089 ) #define SID_CHAR_DLG_PREVIEW_STRING ( SID_SVX_START + 1090 ) #define SID_RECHECK_DOCUMENT( SID_SVX_START + 1091 ) - +// 1092 is used out of order below #define SID_OBJECT_MIRROR ( SID_SVX_START + 1093 ) #define SID_DELETE_POSTIT ( SID_SVX_START + 1094 ) @@ -994,7 +995,8 @@ class SvxSetItem; #define SID_EDIT_SIGNATURELINE ( SID_SVX_START + 1174 ) #define SID_SIGN_SIGNATURELINE ( SID_SVX_START + 1175 ) #define SID_MEASURE_DLG ( SID_SVX_START + 1176 ) - +// free slots - available for use +#define SID_TABLE_DELETE_TABLE ( SID_SVX_START + 1184 ) #define SID_TABLE_MINIMAL_COLUMN_WIDTH ( SID_SVX_START + 1185 ) #define SID_TABLE_MINIMAL_ROW_HEIGHT( SID_SVX_START + 1186 ) #define SID_TABLE_OPTIMAL_COLUMN_WIDTH ( SID_SVX_START + 1187 ) diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu index 0a0803d950cb..542b1208f00e 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu @@ -2042,6 +2042,14 @@ 1 + + + Delete Table + + + 1 + + Select Table diff --git a/sd/sdi/tables.sdi b/sd/sdi/tables.sdi index a5918af490db..9943ce719e29 100644 --- a/sd/sdi/tables.sdi +++ b/sd/sdi/tables.sdi @@ -113,6 +113,11 @@ shell TableObjectBar ExecMethod = Execute; StateMethod = GetState; ] +SID_TABLE_DELETE_TABLE +[ +ExecMethod = Execute; +StateMethod = GetState; +] SID_TABLE_SELECT_ALL [ ExecMethod = Execute; diff --git a/sd/source/ui/table/tableobjectbar.cxx b/sd/source/ui/table/tableobjectbar.cxx index 3c4c59ce2b3d..846d5fb6bbfc 100644 --- a/sd/source/ui/table/tableobjectbar.cxx +++ b/sd/source/ui/table/tableobjectbar.cxx @@ -180,6 +180,7 @@ void TableObjectBar::Execute( SfxRequest& rReq ) case SID_OPTIMIZE_TABLE: case SID_TABLE_DELETE_ROW: case SID_TABLE_DELETE_COL: +case SID_TABLE_DELETE_T
[Libreoffice-commits] core.git: framework/inc framework/source framework/util include/framework
framework/inc/dispatch/oxt_handler.hxx | 15 +- framework/inc/dispatch/popupmenudispatcher.hxx | 10 - framework/inc/dispatch/servicehandler.hxx| 14 +- framework/inc/dispatch/systemexec.hxx| 10 - framework/inc/jobs/helponstartup.hxx | 10 - framework/inc/jobs/shelljob.hxx | 10 - framework/inc/services.h | 12 -- framework/inc/services/uriabbreviation.hxx |9 - framework/inc/uielement/newmenucontroller.hxx| 10 - framework/inc/uielement/toolbarmodemenucontroller.hxx| 10 - framework/inc/uielement/toolbarsmenucontroller.hxx | 10 - framework/source/dispatch/dispatchdisabler.cxx | 28 - framework/source/dispatch/oxt_handler.cxx| 39 --- framework/source/dispatch/popupmenudispatcher.cxx| 58 +- framework/source/dispatch/servicehandler.cxx | 46 framework/source/dispatch/systemexec.cxx | 35 +++--- framework/source/inc/dispatch/dispatchdisabler.hxx |9 - framework/source/jobs/helponstartup.cxx | 81 --- framework/source/jobs/shelljob.cxx | 38 --- framework/source/register/registertemp.cxx | 14 -- framework/source/services/dispatchhelper.cxx | 24 +++- framework/source/services/uriabbreviation.cxx| 31 +++-- framework/source/uielement/newmenucontroller.cxx | 27 +++-- framework/source/uielement/toolbarmodemenucontroller.cxx | 29 - framework/source/uielement/toolbarsmenucontroller.cxx| 28 - framework/util/fwk.component | 36 -- include/framework/dispatchhelper.hxx | 12 -- 27 files changed, 354 insertions(+), 301 deletions(-) New commits: commit 71227e2306987cb8aa5fbda2943e73237674e9ba Author: Noel Grandin AuthorDate: Tue Jul 7 20:02:18 2020 +0200 Commit: Noel Grandin CommitDate: Tue Jul 7 22:13:02 2020 +0200 framework: create instances with uno constructors See tdf#74608 for motivation Change-Id: I8679b50395d11cb2d807d52526d803df9b0606b2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98294 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/framework/inc/dispatch/oxt_handler.hxx b/framework/inc/dispatch/oxt_handler.hxx index 69bc07074c3e..bc9c24070cde 100644 --- a/framework/inc/dispatch/oxt_handler.hxx +++ b/framework/inc/dispatch/oxt_handler.hxx @@ -52,16 +52,13 @@ class Oxt_Handler final : public ::cppu::WeakImplHelper< public: - Oxt_Handler( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory ); + Oxt_Handler( const css::uno::Reference< css::uno::XComponentContext >& ); virtual ~Oxt_Handler( ) override; -// XInterface, XTypeProvider, XServiceInfo - -DECLARE_XSERVICEINFO_NOFACTORY -/* Helper for registry */ -/// @throws css::uno::Exception -static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ); -static css::uno::Reference< css::lang::XSingleServiceFactory > impl_createFactory ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ); +/* interface XServiceInfo */ +virtual OUString SAL_CALL getImplementationName() override; +virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) override; +virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XNotifyingDispatch @@ -85,7 +82,7 @@ class Oxt_Handler final : public ::cppu::WeakImplHelper< private: osl::Mutex m_mutex; -css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory; /// global uno service factory to create new services +css::uno::Reference< css::uno::XComponentContext > m_xContext; /// global uno service factory to create new services }; diff --git a/framework/inc/dispatch/popupmenudispatcher.hxx b/framework/inc/dispatch/popupmenudispatcher.hxx index 869ee956e4a4..845e5c92592d 100644 --- a/framework/inc/dispatch/popupmenudispatcher.hxx +++ b/framework/inc/dispatch/popupmenudispatcher.hxx @@ -68,12 +68,10 @@ class PopupMenuDispatcher final : public ::cppu::WeakImplHelper< // constructor / destructor PopupMenuDispatcher( const css::uno::Reference< css::uno::XComponentContext >& xContext ); -// XInterface, XTypeProvider, XServiceInfo -DECLARE_XSERVICEINFO_NOFACTORY -/* Helper for registry */ -/// @throws css::uno::Excepti
[Libreoffice-commits] core.git: formula/Library_for.mk formula/source formula/util include/formula
formula/Library_for.mk |1
formula/source/core/api/FormulaOpCodeMapperObj.cxx | 24 +++--
formula/source/core/api/services.cxx | 53 -
formula/util/for.component |5 +
include/formula/FormulaOpCodeMapperObj.hxx |6 --
5 files changed, 12 insertions(+), 77 deletions(-)
New commits:
commit 9ff8a1173a72b9ebea54ef3b00b1d632bf953e37
Author: Noel Grandin
AuthorDate: Tue Jul 7 17:57:41 2020 +0200
Commit: Noel Grandin
CommitDate: Tue Jul 7 22:01:33 2020 +0200
formula: create instances with uno constructors
See tdf#74608 for motivation
Change-Id: I5983c837977e40b91df02605c1012640ffd5c650
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98291
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/formula/Library_for.mk b/formula/Library_for.mk
index d3d86a4494b5..a646b4a9598a 100644
--- a/formula/Library_for.mk
+++ b/formula/Library_for.mk
@@ -41,7 +41,6 @@ $(eval $(call gb_Library_add_exception_objects,for,\
formula/source/core/api/FormulaCompiler \
formula/source/core/api/FormulaOpCodeMapperObj \
formula/source/core/api/grammar \
-formula/source/core/api/services \
formula/source/core/api/token \
formula/source/core/api/vectortoken \
formula/source/core/resource/core_resource \
diff --git a/formula/source/core/api/FormulaOpCodeMapperObj.cxx
b/formula/source/core/api/FormulaOpCodeMapperObj.cxx
index a22a1ff3d43d..a3ffe56cc8c9 100644
--- a/formula/source/core/api/FormulaOpCodeMapperObj.cxx
+++ b/formula/source/core/api/FormulaOpCodeMapperObj.cxx
@@ -81,32 +81,24 @@ SAL_CALL FormulaOpCodeMapperObj::getAvailableMappings(
}
OUString SAL_CALL FormulaOpCodeMapperObj::getImplementationName( )
-{
-return getImplementationName_Static();
-}
-
-OUString FormulaOpCodeMapperObj::getImplementationName_Static()
{
return "simple.formula.FormulaOpCodeMapperObj";
}
uno::Sequence< OUString > SAL_CALL
FormulaOpCodeMapperObj::getSupportedServiceNames( )
{
-return getSupportedServiceNames_Static();
-}
-uno::Sequence< OUString >
FormulaOpCodeMapperObj::getSupportedServiceNames_Static()
-{
-uno::Sequence aSeq { "com.sun.star.sheet.FormulaOpCodeMapper" };
-return aSeq;
+return { "com.sun.star.sheet.FormulaOpCodeMapper" };
}
-uno::Reference< uno::XInterface > FormulaOpCodeMapperObj::create(
-uno::Reference< uno::XComponentContext > const & /*_xContext*/)
+} // formula
+
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
+simple_formula_FormulaOpCodeMapperObj(
+css::uno::XComponentContext* , css::uno::Sequence const& )
{
-return static_cast(new
FormulaOpCodeMapperObj(std::make_unique()));
+return cppu::acquire(
+new
formula::FormulaOpCodeMapperObj(std::make_unique()));
}
-} // formula
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/formula/source/core/api/services.cxx
b/formula/source/core/api/services.cxx
deleted file mode 100644
index 2e885fea41cd..
--- a/formula/source/core/api/services.cxx
+++ /dev/null
@@ -1,53 +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
-#include
-#include
-#include
-
-//
-
-using namespace ::formula;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::registry;
-
-
-// registry functions
-namespace
-{
-
-cppu::ImplementationEntry const entries[] = {
-{ &FormulaOpCodeMapperObj::create,
&FormulaOpCodeMapperObj::getImplementationName_Static,
&FormulaOpCodeMapperObj::getSupportedServiceNames_Static,
-&cppu::createSingleComponentFactory, nullptr, 0 },
-{ nullptr, nullptr, nullptr, nullptr, nullptr, 0 }
-};
-}
-
-extern "C"
-{
-SAL_DLLPUBLIC_EXPORT void * for_component_getFactory(
-char const * implName, void * serviceManager, void * registryKey)
-{
-return cppu::component_getFactoryHelper(
-implName, serviceManager, registryKey, entri
[Libreoffice-commits] online.git: Changes to 'refs/tags/cp-4.2.4-8'
Tag 'cp-4.2.4-8' created by Andras Timar at 2020-07-07 19:30 + cp-4.2.4-8 Changes since cp-4.2.4-7-2: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/Bootstrap
android/Bootstrap/Makefile.shared |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 0dffc65236fbacf98047d6dbfc82b4efe7dd959b Author: Henry Castro AuthorDate: Fri Jun 5 08:59:26 2020 -0400 Commit: Henry Castro CommitDate: Tue Jul 7 21:21:09 2020 +0200 android: fix the build output directory When compiling in a different build output directory, the "liblo-native-code.so" file is created in the source directory and it fails compiling the "online" project Change-Id: I4782a69796fb298e9c1a6c4370720b18587735e9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95602 Tested-by: Jenkins CollaboraOffice Reviewed-by: Henry Castro Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98290 Tested-by: Jenkins diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared index 3e38e14617cc..eb3812f1b9fb 100644 --- a/android/Bootstrap/Makefile.shared +++ b/android/Bootstrap/Makefile.shared @@ -14,8 +14,8 @@ # configurability on platforms like Android and iOS where apps based on LO # code are very much self-contained pre-packaged thingies. -SODEST=jniLibs/$(ANDROID_APP_ABI) -OBJLOCAL=obj/local/$(ANDROID_APP_ABI) +SODEST=$(BUILDDIR)/android/jniLibs/$(ANDROID_APP_ABI) +OBJLOCAL=$(BUILDDIR)/android/obj/local/$(ANDROID_APP_ABI) # # Helpful rules ... ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: offapi/com
offapi/com/sun/star/xml/crypto/NSSProfile.idl |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e8ede68fbe35befdc8c30f28ac6bba0f86393daf
Author: Andrea Gelmini
AuthorDate: Fri Jul 3 18:58:32 2020 +0200
Commit: Jan-Marek Glogowski
CommitDate: Tue Jul 7 21:17:46 2020 +0200
Fix typo
Change-Id: I7c3e2c4c129c5ff7e3c8e5f3ac94e57508ce39ea
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97891
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski
diff --git a/offapi/com/sun/star/xml/crypto/NSSProfile.idl
b/offapi/com/sun/star/xml/crypto/NSSProfile.idl
index 4ac4a39c0b52..1ce68bfa82ce 100644
--- a/offapi/com/sun/star/xml/crypto/NSSProfile.idl
+++ b/offapi/com/sun/star/xml/crypto/NSSProfile.idl
@@ -31,7 +31,7 @@ struct NSSProfile {
/** the name of the NSS profile
Normally the name will reflect the name of the Mozilla profile. But the
-profile list also contains the following special enties: MANUAL and
+profile list also contains the following special entries: MANUAL and
MOZILLA_CERTIFICATE_FOLDER.
These will have a product type of MozillaProductType::Default and might
have an empty path, if that value is not available.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/ww8par2.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit ee009595f2ff4fe3c9b6fb7bc5720ae14bec460f
Author: Caolán McNamara
AuthorDate: Tue Jul 7 16:05:19 2020 +0100
Commit: Caolán McNamara
CommitDate: Tue Jul 7 20:54:44 2020 +0200
ofz#23961 pad back to original length
in case of multi-byte input encoding resulting in a shorter output string
than
input
Change-Id: Ieb4bb7b5f4551ca22e87c573233f083901f3d3c0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98268
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index db9f07ec5ce6..407b6e91aae6 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -609,6 +609,9 @@ void SwWW8ImplReader::SetAnlvStrings(SwNumFormat &rNum,
WW8_ANLV const &rAV,
return;
}
sText = OUString(reinterpret_cast(pText), nLen,
eCharSet);
+// ofz#23961 in case of multi-byte input encoding resulting in shorter
+// output pad to full length with something semi-arbitrary
+comphelper::string::padToLength(sText, nLen, cBulletChar);
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/source
chart2/source/controller/dialogs/tp_TitleRotation.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 0cde19038d7e264d7a184042f10a41574bda11f5
Author: Caolán McNamara
AuthorDate: Tue Jul 7 15:03:35 2020 +0100
Commit: Caolán McNamara
CommitDate: Tue Jul 7 20:55:02 2020 +0200
tdf#134603 [en|dis]able logic reversed
Change-Id: I192b7a6da4bcd311e64a31d9dc2b4c2b422194cb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98266
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.cxx
b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
index 32510374aa33..d23e393d5f13 100644
--- a/chart2/source/controller/dialogs/tp_TitleRotation.cxx
+++ b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
@@ -62,10 +62,10 @@ SchAlignmentTabPage::SchAlignmentTabPage(weld::Container*
pPage, weld::DialogCon
IMPL_LINK_NOARG(SchAlignmentTabPage, StackedToggleHdl, weld::ToggleButton&,
void)
{
bool bActive = m_xCbStacked->get_active();
-m_xNfRotate->set_sensitive(bActive);
-m_xCtrlDialWin->set_sensitive(bActive);
+m_xNfRotate->set_sensitive(!bActive);
+m_xCtrlDialWin->set_sensitive(!bActive);
m_xCtrlDial->StyleUpdated();
-m_xFtRotate->set_sensitive(bActive);
+m_xFtRotate->set_sensitive(!bActive);
}
SchAlignmentTabPage::~SchAlignmentTabPage()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-4' - debian/changelog loolwsd.spec.in
debian/changelog |6 ++
loolwsd.spec.in |2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
New commits:
commit c8794d1d5cd252378588b2f013939f5f41223a41
Author: Aron Budea
AuthorDate: Tue Jul 7 20:02:46 2020 +0200
Commit: Aron Budea
CommitDate: Tue Jul 7 20:02:46 2020 +0200
Bump package version to 4.2.4-8
Change-Id: I0e99305b12dab5c21815fd0405e030655202e10b
diff --git a/debian/changelog b/debian/changelog
index 6613b7811..6251c4f4d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+loolwsd (4.2.4-8) unstable; urgency=medium
+
+ * https://cgit.freedesktop.org/libreoffice/online/log/?h=cp-4.2.4-8
+
+ -- Aron Budea Tue, 07 Jul 2020 20:00:00 +0200
+
loolwsd (4.2.4-7) unstable; urgency=medium
* https://cgit.freedesktop.org/libreoffice/online/log/?h=cp-4.2.4-7
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index 7a1ff0dc8..217ca1cca 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -12,7 +12,7 @@ Name: loolwsd%{name_suffix}
Name: loolwsd
%endif
Version:@PACKAGE_VERSION@
-Release:7%{?dist}
+Release:8%{?dist}
Vendor: %{vendor}
Summary:LibreOffice Online WebSocket Daemon
License:EULA
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/bin vcl/inc vcl/source vcl/vcl.android.component vcl/vcl.ios.component vcl/vcl.macosx.component vcl/vcl.unx.component
solenv/bin/native-code.py|2 +
vcl/inc/factory.hxx |5 --
vcl/source/components/dtranscomp.cxx | 60 +++
vcl/source/components/factory.cxx|6 ---
vcl/vcl.android.component|5 +-
vcl/vcl.ios.component|5 +-
vcl/vcl.macosx.component |3 +
vcl/vcl.unx.component|3 +
8 files changed, 19 insertions(+), 70 deletions(-)
New commits:
commit 05d286e0065ff1c10e75827ac4726b5a74747128
Author: Noel Grandin
AuthorDate: Tue Jul 7 15:55:05 2020 +0200
Commit: Noel Grandin
CommitDate: Tue Jul 7 19:58:39 2020 +0200
vcl/clipboard: create instances with uno constructors
See tdf#74608 for motivation
Change-Id: I8b50ccb014adeba8fa5084bcb804dfa61fa61159
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98265
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index d9d50e81103d..4f387be3186a 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -304,6 +304,8 @@ core_constructor_list = [
# uui/util/uui.component
"com_sun_star_comp_uui_UUIInteractionHandler_get_implementation",
"com_sun_star_comp_uui_UUIInteractionRequestStringResolver_get_implementation",
+# vcl/*.component
+"vcl_SystemClipboard_get_implementation",
# xmloff/source/transform/xof.component
"xmloff_XMLCalcContentImportOOO_get_implementation",
"xmloff_XMLCalcImportOOO_get_implementation",
diff --git a/vcl/inc/factory.hxx b/vcl/inc/factory.hxx
index f32fdaee6012..4a808d29c70b 100644
--- a/vcl/inc/factory.hxx
+++ b/vcl/inc/factory.hxx
@@ -36,11 +36,6 @@ namespace com::sun::star {
namespace vcl {
-OUString Clipboard_getImplementationName();
-
-css::uno::Reference
-Clipboard_createFactory();
-
css::uno::Sequence DragSource_getSupportedServiceNames();
OUString DragSource_getImplementationName();
diff --git a/vcl/source/components/dtranscomp.cxx
b/vcl/source/components/dtranscomp.cxx
index c7bda5361fdb..7e5f36f67f7d 100644
--- a/vcl/source/components/dtranscomp.cxx
+++ b/vcl/source/components/dtranscomp.cxx
@@ -185,64 +185,16 @@ void GenericClipboard::removeClipboardListener( const
Reference< datatransfer::c
m_aListeners.erase(std::remove(m_aListeners.begin(), m_aListeners.end(),
listener), m_aListeners.end());
}
-namespace {
-
-class ClipboardFactory : public ::cppu::WeakComponentImplHelper<
-css::lang::XSingleServiceFactory
->
-{
-osl::Mutex m_aMutex;
-public:
-ClipboardFactory();
-
-/*
- * XSingleServiceFactory
- */
-virtual Reference< XInterface > SAL_CALL createInstance() override;
-virtual Reference< XInterface > SAL_CALL createInstanceWithArguments(
const Sequence< Any >& rArgs ) override;
-};
-
-}
-
-ClipboardFactory::ClipboardFactory() :
-cppu::WeakComponentImplHelper<
-css::lang::XSingleServiceFactory
->( m_aMutex )
-{
-}
-Reference< XInterface > ClipboardFactory::createInstance()
-{
-return createInstanceWithArguments( Sequence< Any >() );
-}
-Reference< XInterface > ClipboardFactory::createInstanceWithArguments( const
Sequence< Any >& arguments )
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
+vcl_SystemClipboard_get_implementation(
+css::uno::XComponentContext* , css::uno::Sequence const&
args)
{
SolarMutexGuard aGuard;
-Reference< XInterface > xResult =
ImplGetSVData()->mpDefInst->CreateClipboard( arguments );
-return xResult;
-}
-
-OUString Clipboard_getImplementationName()
-{
-return
-#if defined MACOSX
-"com.sun.star.datatransfer.clipboard.AquaClipboard"
-#elif defined IOS
-"com.sun.star.datatransfer.clipboard.iOSClipboard"
-#elif defined ANDROID
-"com.sun.star.datatransfer.VCLGenericClipboard"
-#elif defined UNX
-"com.sun.star.datatransfer.X11ClipboardSupport"
-#else
-"com.sun.star.datatransfer.VCLGenericClipboard"
-#endif
- ;
-}
-
-Reference< XSingleServiceFactory > Clipboard_createFactory()
-{
-return Reference< XSingleServiceFactory >( new ClipboardFactory() );
+auto xClipboard = ImplGetSVData()->mpDefInst->CreateClipboard( args );
+xClipboard->acquire();
+return xClipboard.get();
}
namespace {
diff --git a/vcl/source/components/factory.cxx
b/vcl/source/components/factory.cxx
index 6c1cfe2ec872..0a5b7e8f6f8c 100644
--- a/vcl/source/components/factory.cxx
+++ b/vcl/source/components/factory.cxx
@@ -43,11 +43,7 @@ extern "C" {
static_cast< css::lang::XMultiServiceFactory* >( pXUnoSMgr )
);
Reference< css::lang::XSingleServiceFactory > xFactory;
-if( vcl::Clipboard_getImplementationName().equalsAscii(
pImplementationName ) )
-{
-xFactory = vcl::Clipboard_createFactory();
-}
-else if( vcl::DragSource_getImplementationName().equalsAscii(
pImplementationName ) )
+
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-4' - loleaflet/src
loleaflet/src/map/Clipboard.js |9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 208d8a944906f35e7e1a0b3fdbaa077a8d44475d
Author: Szymon Kłos
AuthorDate: Tue Jul 7 09:52:04 2020 +0200
Commit: Aron Budea
CommitDate: Tue Jul 7 19:55:59 2020 +0200
clipboard: avoid error when localStorage is not available
In some browsers with strange settings localStorage is
not available.
Change-Id: If9e5ebeb9701cc0a2b19c5946bcbc23f76a8c577
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98238
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
(cherry picked from commit ac7125b1ea4f451a4dfef0a7eed999e18ff0f51b)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98087
Reviewed-by: Aron Budea
diff --git a/loleaflet/src/map/Clipboard.js b/loleaflet/src/map/Clipboard.js
index 29bb77e67..160b664f4 100644
--- a/loleaflet/src/map/Clipboard.js
+++ b/loleaflet/src/map/Clipboard.js
@@ -786,10 +786,13 @@ L.Clipboard = L.Class.extend({
_userAlreadyWarned: function (warning) {
var itemKey = warning;
- if (!localStorage.getItem(itemKey)) {
- localStorage.setItem(itemKey, '1');
+ var storage = localStorage;
+ if (storage && !storage.getItem(itemKey)) {
+ storage.setItem(itemKey, '1');
return false;
- }
+ } else if (!storage)
+ return false;
+
return true;
},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-4' - loleaflet/src
loleaflet/src/map/Clipboard.js | 16
1 file changed, 16 insertions(+)
New commits:
commit 76030544269d6b8d03919098cb4187baf383081e
Author: Szymon Kłos
AuthorDate: Tue Jul 7 09:31:36 2020 +0200
Commit: Aron Budea
CommitDate: Tue Jul 7 19:55:18 2020 +0200
clipboard: no stub message when copy is disabled
When copy is disabled don't put stub message about
download button in the clipboard.
Allow internal copy & paste when copy is disabled
- so disable only external interaction.
Change-Id: Ie7864abc8a239aa068880545cf09a48155ebbaea
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98237
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
(cherry picked from commit 39d5d55d719730f42073df86d1103888598a9042)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98088
Reviewed-by: Aron Budea
diff --git a/loleaflet/src/map/Clipboard.js b/loleaflet/src/map/Clipboard.js
index c7b604083..29bb77e67 100644
--- a/loleaflet/src/map/Clipboard.js
+++ b/loleaflet/src/map/Clipboard.js
@@ -139,6 +139,16 @@ L.Clipboard = L.Class.extend({
));
},
+ // put in the clipboard if copy is disabled
+ _getCopyDisabledHtml: function() {
+ var lang = 'en_US'; // FIXME: l10n
+ return this._substProductName(this._originWrapBody(
+ ' \n' +
+ '\n' +
+ ' \n', true
+ ));
+ },
+
_getMetaOrigin: function (html) {
var match = 'https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/vcl.headless.component vcl/vcl.windows.component
vcl/vcl.headless.component |2 +- vcl/vcl.windows.component |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 616dc30585943b2d9bdae0d2b9e95567f8c7641f Author: Noel Grandin AuthorDate: Tue Jul 7 15:39:09 2020 +0200 Commit: Noel Grandin CommitDate: Tue Jul 7 19:16:43 2020 +0200 no need to use prefix here all these services use a constructor Change-Id: I8e8e2df27a919e9042a041e1134add8492b3e72f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98264 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/vcl/vcl.headless.component b/vcl/vcl.headless.component index 6e8475f1969b..6cda44e416e2 100644 --- a/vcl/vcl.headless.component +++ b/vcl/vcl.headless.component @@ -18,7 +18,7 @@ --> http://openoffice.org/2010/uno-components";> +xmlns="http://openoffice.org/2010/uno-components";> diff --git a/vcl/vcl.windows.component b/vcl/vcl.windows.component index bc3bf755978c..a818ad075c9d 100644 --- a/vcl/vcl.windows.component +++ b/vcl/vcl.windows.component @@ -18,7 +18,7 @@ --> http://openoffice.org/2010/uno-components";> +xmlns="http://openoffice.org/2010/uno-components";> ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
GSoC Styles Inspector Week 5 Report
Hi, This was the first week for the Second month of GSoC. Work Done :- * The patch for adding Paragraph Styles and enabling dropdown menus is complete and merged now. * Cleanup patch for variable names and some other minor fixes. (Under Review) * LO would crash on clicking on any image, this bug was introduced because Inspector code would assume that there is text at the cursor and extract the property set of this text. But this is not always true. Added a check if there is text at the current cursor point. (Under Review) To do for this week :- * Add Direct Formatting panel and make it completely functional. (MAJOR) * When no Character Style is manually added do not show Default Character Style. * Show all the properties in Inspector, Previously Inspector would not show properties having their default values. Will have to change that * The current property for any colour is shown in the respective Hex value like 0x33fef. Replace this with a colour box. A list of Bugzilla Tickets have been filled [1] (thanks to Heiko ). It would be great if more people could test the features and help us improve it. sincerely, Shivam Kumar Singh [1] https://bugs.documentfoundation.org/show_bug.cgi?id=134554 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] online.git: common/FileUtil.cpp common/FileUtil.hpp common/JailUtil.cpp loolwsd-systemplate-setup
common/FileUtil.cpp | 119 ++
common/FileUtil.hpp | 47 +-
common/JailUtil.cpp | 88 +-
loolwsd-systemplate-setup | 12 +---
4 files changed, 195 insertions(+), 71 deletions(-)
New commits:
commit d6259d6a54e0e7873b2f4eb844c75bf0003245c6
Author: Ashod Nakashian
AuthorDate: Thu Jul 2 17:54:28 2020 -0400
Commit: Ashod Nakashian
CommitDate: Tue Jul 7 19:05:23 2020 +0200
wsd: support parallel systemplate setup
When tests are run in parallel, they will all
compete to update and set up the systemplate
directory, which has a handful of files that
need to be up-to-date. This is a source of errors.
Normally, these files are linked (hard- or soft-
link, whichever succeeds). With linking, we
only need to worry about the initial setup,
as the files will never be out-of-date from
then on. However, when linking fails, we need
to copy the files, and update them (by copying
over fresh versions of the files, if necessary)
every time a new kit is forked. Copying over
is tricky, as it's not atomic. To make it
atomic, we copy the files to the destination
directory under a temporary (random) name,
and then rename to the final name (which is
atomic, including replacing the target file,
if it exists).
No such race exists in production, where there
is (or should be) but one instance of loolwsd
(which does the initial setup) and forkit
(which updates systemplate before forking
new kit instances).
This is an issue with parallel tests only.
Change-Id: I6ba1514d00a84da7397d28efeb6378619711d52f
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97785
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Ashod Nakashian
diff --git a/common/FileUtil.cpp b/common/FileUtil.cpp
index 560a1b659..1f31e536d 100644
--- a/common/FileUtil.cpp
+++ b/common/FileUtil.cpp
@@ -13,6 +13,7 @@
#include
#include
+#include
#ifdef __linux
#include
#elif defined IOS
@@ -85,7 +86,7 @@ namespace FileUtil
return name;
}
-void copyFileTo(const std::string &fromPath, const std::string &toPath)
+bool copy(const std::string& fromPath, const std::string& toPath, bool
log, bool throw_on_error)
{
int from = -1, to = -1;
try {
@@ -110,7 +111,10 @@ namespace FileUtil
throw;
}
-LOG_INF("Copying " << st.st_size << " bytes from " <<
anonymizeUrl(fromPath) << " to " << anonymizeUrl(toPath));
+// Logging may be redundant and/or noisy.
+if (log)
+LOG_INF("Copying " << st.st_size << " bytes from " <<
anonymizeUrl(fromPath)
+ << " to " << anonymizeUrl(toPath));
char buffer[64 * 1024];
@@ -150,15 +154,24 @@ namespace FileUtil
}
close(from);
close(to);
+return true;
}
catch (...)
{
-LOG_SYS("Failed to copy from " << anonymizeUrl(fromPath) << " to "
<< anonymizeUrl(toPath));
+std::ostringstream oss;
+oss << "Failed to copy from " << anonymizeUrl(fromPath) << " to "
+<< anonymizeUrl(toPath);
+const std::string err = oss.str();
+
+LOG_SYS(err);
close(from);
close(to);
unlink(toPath.c_str());
-throw Poco::Exception("failed to copy");
+if (throw_on_error)
+throw Poco::Exception(err);
}
+
+return false;
}
std::string getTempFilePath(const std::string& srcDir, const std::string&
srcFilename, const std::string& dstFilenamePrefix)
@@ -252,6 +265,69 @@ namespace FileUtil
return path;
}
+bool isEmptyDirectory(const char* path)
+{
+DIR* dir = opendir(path);
+if (dir == nullptr)
+return errno != EACCES; // Assume it's not empty when EACCES.
+
+int count = 0;
+while (readdir(dir) && ++count < 3)
+;
+
+closedir(dir);
+return count <= 2; // Discounting . and ..
+}
+
+bool updateTimestamps(const std::string& filename, timespec tsAccess,
timespec tsModified)
+{
+// The timestamp is in seconds and microseconds.
+timeval timestamps[2]{ { tsAccess.tv_sec, tsAccess.tv_nsec / 1000 },
+ { tsModified.tv_sec, tsModified.tv_nsec / 1000
} };
+if (utimes(filename.c_str(), timestamps) != 0)
+{
+LOG_SYS("Failed to update the timestamp of [" << filename << "]");
+return false;
+}
+
+return true;
+}
+
+bool copyAtomic(const std::string& fromPath, const std::string& toPath,
bool preserveTimestamps)
+{
+const std::string randFilename = toPath + Util
[Libreoffice-commits] core.git: configure.ac
configure.ac |3 +++ 1 file changed, 3 insertions(+) New commits: commit d68fc8d10da9047534f0e7a2d5ebc59f13745442 Author: Michael Stahl AuthorDate: Tue Jul 7 10:36:13 2020 +0200 Commit: Michael Stahl CommitDate: Tue Jul 7 18:39:49 2020 +0200 configure: try to fail early if qt5 header QtCore/qconfig-32.h missing Unfortunately configure passes successfully if qt5-qtbase-devel-*.x86_64 is installed but the host cpu is i686. Change-Id: Ib155d6f91676c12a480eed2f0d4d38c05377e909 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98240 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/configure.ac b/configure.ac index cd1e6a52c615..f0492335a9d6 100644 --- a/configure.ac +++ b/configure.ac @@ -11929,6 +11929,9 @@ then if test "x$qt5_incdir" = "xno"; then AC_MSG_ERROR([Qt5 headers not found. Please specify the root of your Qt5 installation by exporting QT5DIR before running "configure".]) fi +# check for scenario: qt5-qtbase-devel-*.86_64 installed but host is i686 +AC_CHECK_HEADER(QtCore/qconfig.h, [], +[AC_MSG_ERROR(qconfig.h header not found.)], []) AC_MSG_CHECKING([for Qt5 libraries]) qt5_libdir="no" ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/DomainMapperTableManager.cxx | 26 ---
writerfilter/source/dmapper/DomainMapperTableManager.hxx |2 -
writerfilter/source/dmapper/TableData.hxx| 11 +-
writerfilter/source/dmapper/TableManager.cxx | 11 ++
writerfilter/source/dmapper/TableManager.hxx |2 +
5 files changed, 30 insertions(+), 22 deletions(-)
New commits:
commit 2ad32b39af2e00ef253a2ef99e033feef416808f
Author: Justin Luth
AuthorDate: Mon Jun 29 12:33:07 2020 +0300
Commit: Justin Luth
CommitDate: Tue Jul 7 18:32:16 2020 +0200
tdf#129452 writerfilter: preserve gridBefore longer than currentRow
It is a fairly common thing for table operations to need to
compare items in the same column (like merged cells for example).
In order to determine column information, each row's gridBefore
(and merged cells) need to be known.
So save that information in the row data - and don't just throw
it away after the current row has been analyzed. Good grief.
Change-Id: Ie305477f0e3468a4a923095d76f520d97fe99ffe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97432
Tested-by: Jenkins
Tested-by: László Németh
Reviewed-by: Justin Luth
Reviewed-by: László Németh
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 2d75c971b85a..c16ee820528f 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -40,7 +40,6 @@ DomainMapperTableManager::DomainMapperTableManager() :
m_nRow(0),
m_nCell(),
m_nGridSpan(1),
-m_aGridBefore(),
m_nGridAfter(0),
m_nHeaderRepeat(0),
m_nTableWidth(0),
@@ -354,7 +353,7 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm)
}
break;
case NS_ooxml::LN_CT_TrPrBase_gridBefore:
-m_aGridBefore.back( ) = nIntValue;
+setCurrentGridBefore( nIntValue );
break;
case NS_ooxml::LN_CT_TrPrBase_gridAfter:
m_nGridAfter = nIntValue;
@@ -394,11 +393,6 @@ DomainMapperTableManager::IntVectorPtr const &
DomainMapperTableManager::getCurr
return m_aTableGrid.back( );
}
-sal_uInt32 DomainMapperTableManager::getCurrentGridBefore( )
-{
-return m_aGridBefore.back( );
-}
-
DomainMapperTableManager::IntVectorPtr const &
DomainMapperTableManager::getCurrentSpans( )
{
return m_aGridSpans.back( );
@@ -469,7 +463,6 @@ void DomainMapperTableManager::startLevel( )
m_aTmpPosition.push_back( pTmpPosition );
m_aTmpTableProperties.push_back( pTmpProperties );
m_nCell.push_back( 0 );
-m_aGridBefore.push_back( 0 );
m_nTableWidth = 0;
m_nLayoutType = 0;
TableParagraphVectorPtr pNewParagraphs =
std::make_shared>();
@@ -503,7 +496,6 @@ void DomainMapperTableManager::endLevel( )
m_aCellWidths.back()->push_back(*oCurrentWidth);
m_nCell.pop_back( );
-m_aGridBefore.pop_back( );
m_nTableWidth = 0;
m_nLayoutType = 0;
@@ -579,7 +571,6 @@ void DomainMapperTableManager::endOfRowAction()
IntVectorPtr pTmpGridSpans = m_aGridSpans.back();
IntVectorPtr pTmpCellWidths = m_aCellWidths.back();
sal_uInt32 nTmpCell = m_nCell.back();
-sal_uInt32 nTmpGridBefore = m_aGridBefore.back();
TableParagraphVectorPtr pTableParagraphs = getCurrentParagraphs();
// endLevel and startLevel are taking care of the non finished row
@@ -593,12 +584,10 @@ void DomainMapperTableManager::endOfRowAction()
m_aGridSpans.pop_back();
m_aCellWidths.pop_back();
m_nCell.pop_back();
-m_aGridBefore.pop_back();
m_aTableGrid.push_back(pTmpTableGrid);
m_aGridSpans.push_back(pTmpGridSpans);
m_aCellWidths.push_back(pTmpCellWidths);
m_nCell.push_back(nTmpCell);
-m_aGridBefore.push_back(nTmpGridBefore);
m_aParagraphsToEndTable.pop( );
m_aParagraphsToEndTable.push( pTableParagraphs );
}
@@ -652,15 +641,15 @@ void DomainMapperTableManager::endOfRowAction()
IntVectorPtr pCurrentSpans = getCurrentSpans( );
-if( m_aGridBefore.back() > 0 )
+if ( getCurrentGridBefore() )
{
//fill missing gridBefore elements with '1'
-pCurrentSpans->insert( pCurrentSpans->begin( ), m_aGridBefore.back(),
1 );
+pCurrentSpans->insert( pCurrentSpans->begin(), getCurrentGridBefore(),
1 );
}
-if( pCurrentSpans->size() < m_aGridBefore.back() + m_nCell.back( ))
+if ( pCurrentSpans->size() < getCurrentGridBefore() + m_nCell.back() )
{
//fill missing elements with '1'
-pCurrentSpans->insert( pCurrentSpans->end( ), m_aGridBefore.back() +
m_nCell.back( ) - pCurrentSpans->size(), 1 );
+pCurrentSpans->insert( pCurrentSpans->end(), getCurrentGridBefore
[Libreoffice-commits] core.git: bin/find-can-be-private-symbols.classes.results bin/find-can-be-private-symbols.functions.results bin/find-can-be-private-symbols.py framework/inc include/drawinglayer
bin/find-can-be-private-symbols.classes.results | 25 +++- bin/find-can-be-private-symbols.functions.results |1 bin/find-can-be-private-symbols.py |7 ++-- framework/inc/addonmenu.hxx |2 - framework/inc/classes/converter.hxx |2 - framework/inc/classes/fwkresid.hxx |3 - framework/inc/classes/protocolhandlercache.hxx |5 +-- framework/inc/helper/mischelper.hxx |7 +--- framework/inc/jobs/configaccess.hxx |2 - framework/inc/jobs/jobconst.hxx |3 - framework/inc/menuconfiguration.hxx |5 +-- framework/inc/statusbarconfiguration.hxx|2 - framework/inc/toolboxconfiguration.hxx |2 - framework/inc/uielement/constitemcontainer.hxx |2 - framework/inc/uielement/rootitemcontainer.hxx |9 ++--- framework/inc/xml/menudocumenthandler.hxx |1 framework/inc/xml/saxnamespacefilter.hxx|2 - include/drawinglayer/primitive2d/polygonprimitive2d.hxx |2 - include/framework/transactionmanager.hxx|2 - include/oox/crypto/StrongEncryptionDataSpace.hxx|2 - include/sfx2/sidebar/TabBar.hxx |3 - include/svtools/editbrowsebox.hxx |2 - include/svx/tbcontrl.hxx| 12 +++ include/vcl/gdimetafiletools.hxx|4 +- include/vcl/uitest/formattedfielduiobject.hxx |2 - include/vcl/uitest/metricfielduiobject.hxx |2 - include/vcl/viewdataentry.hxx |2 - svx/source/inc/StylesPreviewToolBoxControl.hxx |4 +- svx/source/inc/svdpdf.hxx |2 - vcl/inc/jsdialog/jsdialogbuilder.hxx| 12 +++ vcl/inc/pdf/objectcopier.hxx|2 - 31 files changed, 55 insertions(+), 78 deletions(-) New commits: commit ca46feb2ff915c6842b87cd5799a83af8003f3cd Author: Noel Grandin AuthorDate: Tue Jul 7 09:28:32 2020 +0200 Commit: Noel Grandin CommitDate: Tue Jul 7 17:44:23 2020 +0200 make some symbols private Change-Id: I224831ad18e754fd67d9b16510cd286a5397f1f3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98236 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/bin/find-can-be-private-symbols.classes.results b/bin/find-can-be-private-symbols.classes.results index 05defda91c09..520f90bdb04b 100644 --- a/bin/find-can-be-private-symbols.classes.results +++ b/bin/find-can-be-private-symbols.classes.results @@ -4,7 +4,6 @@ BitmapConvolutionMatrixFilter BitmapEmbossGreyFilter BitmapMedianFilter BitmapMonochromeFilter -BitmapMonochromeMatrixFilter BitmapMosaicFilter BitmapPalette BitmapPopArtFilter @@ -25,17 +24,12 @@ FmDesignModeChangedHint FocusListenerMultiplexer FontSelectPattern FontSubsetInfo -FreetypeManager::IFSD_Equal GrBackendFormat GrBackendRenderTarget GrBackendTexture GrContext GrContextThreadSafeProxy GrContext_Base -GrGLExtensions -GrGLInterface -GrGpuResource -GrGpuResource::ProxyAccess GrImageContext GrVkExtensions GrVkSecondaryCBDrawContext @@ -51,6 +45,7 @@ MorkParser MouseListenerMultiplexer MouseMotionListenerMultiplexer MyThes +NotifyEvent OpenGLFramebuffer OpenGLZone PackedTextureAtlasManager @@ -64,7 +59,6 @@ SalInfoPrinter SalPrinter SalSystem SbClassModuleObject -ScChart2DataProvider ScFormatEntry ScPaintHint ScPreviewShell @@ -112,8 +106,6 @@ SfxStyleSheetModifiedHint SfxViewFrameItem SfxVisibilityItem SpinListenerMultiplexer -SvxGraphicObject -SvxMetricField SvxPrintItem SvxRsidItem SvxShowText @@ -157,9 +149,6 @@ SyntaxHighlighter::Tokenizer SystemWindow::ImplData TBCExtraInfo TBCGeneralInfo -TreeEditListenerMultiplexer -TreeExpansionListenerMultiplexer -TreeSelectionListenerMultiplexer VclAlignment VclBin VclBuilder::MenuAndId @@ -246,23 +235,19 @@ oox::ole::AxPageModel oox::ole::AxTabStripModel oox::ole::AxToggleButtonModel oox::ole::AxUserFormModel -psp::PrintFontManager::PrintFont salhelper::ORealDynamicLoader -sc::FormulaGroupInterpreter sd::DrawView sdr::SelectionController sdr::ViewSelection sdr::animation::primitiveAnimator sdr::contact::ObjectContactPainter -sdr::properties::BaseProperties sfx2::sidebar::Panel sfx2::sidebar::SidebarToolBox -sfx2::sidebar::TabBar::Item -skjpeg_destination_mgr -svt::MultiLineEditImplementation +svt::ControlBase +svt::EditControlBase svt::MultiLineTextCell +svtools::ToolbarPopup svx::CommonStyleManager -svx::DialControl::DialControl_Impl svx::PropertyValueProvider sw::BroadcastingModify sw::UnoCursorHint @@ -272,7 +257,6 @@ ucbhelper::InteractionApprove ucbhelper::InteractionDisapprove ucbhelper::InteractionRetry ucbhelper::Inter
[Libreoffice-commits] core.git: embedserv/Library_emser.mk embedserv/source embedserv/util
embedserv/Library_emser.mk |1
embedserv/source/embed/register.cxx | 79
embedserv/source/embed/servprov.cxx | 11 +
embedserv/util/emser.component |5 +-
4 files changed, 14 insertions(+), 82 deletions(-)
New commits:
commit c0929d4b558137a20eff1366a4b8202063306f13
Author: Noel Grandin
AuthorDate: Mon Jul 6 18:51:10 2020 +0200
Commit: Noel Grandin
CommitDate: Tue Jul 7 17:44:43 2020 +0200
embedserv: create instances with uno constructors
See tdf#74608 for motivation
Change-Id: I5f912ee625a37f64f9d9c35ccb13f995a56685c7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98220
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/embedserv/Library_emser.mk b/embedserv/Library_emser.mk
index 559f8d713450..07f433da0116 100644
--- a/embedserv/Library_emser.mk
+++ b/embedserv/Library_emser.mk
@@ -58,7 +58,6 @@ $(eval $(call gb_Library_add_exception_objects,emser,\
embedserv/source/embed/guid \
embedserv/source/embed/iipaobj \
embedserv/source/embed/intercept \
- embedserv/source/embed/register \
embedserv/source/embed/servprov \
embedserv/source/embed/syswinwrapper \
embedserv/source/embed/tracker \
diff --git a/embedserv/source/embed/register.cxx
b/embedserv/source/embed/register.cxx
deleted file mode 100644
index 46b18d5fd949..
--- a/embedserv/source/embed/register.cxx
+++ /dev/null
@@ -1,79 +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
-#include
-#include
-#include
-#include
-#include
-#include
-
-
-using namespace ::com::sun::star;
-
-/// @throws uno::Exception
-static uno::Reference EmbedServer_createInstance(
-const uno::Reference & xSMgr)
-{
-uno::Reference xService = *new EmbedServer_Impl( xSMgr );
-return xService;
-}
-
-static OUString EmbedServer_getImplementationName() throw()
-{
-return "com.sun.star.comp.ole.EmbedServer";
-
-}
-
-static uno::Sequence< OUString > EmbedServer_getSupportedServiceNames() throw()
-{
-uno::Sequence aServiceNames {
"com.sun.star.document.OleEmbeddedServerRegistration" };
-return aServiceNames;
-}
-
-extern "C" {
-
-SAL_DLLPUBLIC_EXPORT void * emser_component_getFactory( const char *
pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
-{
-void * pRet = nullptr;
-
-OUString aImplName( OUString::createFromAscii( pImplName ) );
-uno::Reference< lang::XSingleServiceFactory > xFactory;
-
-if(pServiceManager && aImplName.equals(
EmbedServer_getImplementationName() ) )
-{
-xFactory= ::cppu::createOneInstanceFactory( static_cast<
lang::XMultiServiceFactory*>(pServiceManager),
-
EmbedServer_getImplementationName(),
-EmbedServer_createInstance,
-
EmbedServer_getSupportedServiceNames() );
-}
-
-if (xFactory.is())
-{
-xFactory->acquire();
-pRet = xFactory.get();
-}
-
-return pRet;
-}
-
-} // extern "C"
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/embedserv/source/embed/servprov.cxx
b/embedserv/source/embed/servprov.cxx
index ec7628bd3453..46454667a42c 100644
--- a/embedserv/source/embed/servprov.cxx
+++ b/embedserv/source/embed/servprov.cxx
@@ -21,6 +21,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -224,4 +225,14 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP
EmbedProviderFactory_Impl::LockServer( int /*f
return NOERROR;
}
+
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
+embedserv_EmbedServer(
+css::uno::XComponentContext* context, css::uno::Sequence
const& )
+{
+auto msf =
uno::Reference(context->getServiceManager(),
css::uno::UNO_QUERY_THROW);
+return cppu::acquire(new EmbedServer_Impl(msf));
+}
+
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/embedserv/util/emser.component b/embedserv/util/emser.component
index 38f2a2eee4c0..29a28be56843 100644
--- a/embedserv/util/emser.component
++
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - cui/uiconfig
cui/uiconfig/ui/qrcodegen.ui |1 - 1 file changed, 1 deletion(-) New commits: commit 654f5316015a38b5c720a93305d21f63aa9697eb Author: Gabor Kelemen AuthorDate: Thu Jun 4 22:36:26 2020 +0200 Commit: Adolfo Jayme Barrientos CommitDate: Tue Jul 7 17:29:23 2020 +0200 tdf#133600 Only one button selected by default in QR code dialog Change-Id: I10a5f04492cf23caeb89cb119f91c578e5d57413 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95540 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos Signed-off-by: Xisco Fauli Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98245 diff --git a/cui/uiconfig/ui/qrcodegen.ui b/cui/uiconfig/ui/qrcodegen.ui index 2c01c16f1715..5fda7873c0f1 100644 --- a/cui/uiconfig/ui/qrcodegen.ui +++ b/cui/uiconfig/ui/qrcodegen.ui @@ -208,7 +208,6 @@ 0 True True -button_medium 0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css loleaflet/src
loleaflet/css/device-mobile.css |6 +++---
loleaflet/src/control/Control.PartsPreview.js | 15 ++-
2 files changed, 13 insertions(+), 8 deletions(-)
New commits:
commit e5188272c768e3cb4da8f87f93fd06a510d2f930
Author: Henry Castro
AuthorDate: Thu Jun 11 09:35:25 2020 -0400
Commit: Henry Castro
CommitDate: Tue Jul 7 17:29:32 2020 +0200
android: fix thumbnails images when portrait orientation is set
Change-Id: I70aee6b569f78795487cbff736130e0e7413e852
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/96123
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Henry Castro
diff --git a/loleaflet/css/device-mobile.css b/loleaflet/css/device-mobile.css
index 24f26678a..2207215ac 100644
--- a/loleaflet/css/device-mobile.css
+++ b/loleaflet/css/device-mobile.css
@@ -584,14 +584,14 @@ td[id^=tb_spreadsheet-toolbar_item]:focus
table.w2ui-button div.w2ui-icon, td[id
/* Related to slidesorter */
/* Show slidesorter beyond 768px only */
#presentation-controls-wrapper {
- top: initial;
+ top: 41px;
left: initial;
bottom: 33px;
max-width: initial;
}
#presentation-controls-wrapper.readonly {
- top: initial;
+ top: 41px;
bottom: 0px;
}
@@ -691,7 +691,6 @@ td[id^=tb_spreadsheet-toolbar_item]:focus table.w2ui-button
div.w2ui-icon, td[id
.preview-img-portrait {
min-width: 37px;
max-width: 60px;
- max-height: 45px;
margin: 0px;
}
@@ -715,6 +714,7 @@ td[id^=tb_spreadsheet-toolbar_item]:focus table.w2ui-button
div.w2ui-icon, td[id
}
#document-container.landscape.parts-preview-document {
+ top: 41px;
left: 66px !important;
bottom: 33px;
}
diff --git a/loleaflet/src/control/Control.PartsPreview.js
b/loleaflet/src/control/Control.PartsPreview.js
index e5f1676df..a922ada7a 100644
--- a/loleaflet/src/control/Control.PartsPreview.js
+++ b/loleaflet/src/control/Control.PartsPreview.js
@@ -12,8 +12,8 @@ L.Control.PartsPreview = L.Control.extend({
frameClass: '',
axis: '',
allowOrientation: true,
- maxWidth: (window.mode.isMobile() || window.mode.isTablet()) ?
60 : 180,
- maxHeight: (window.mode.isMobile() || window.mode.isTablet()) ?
60 : 180
+ maxWidth: !window.mode.isDesktop() ? 60 : 180,
+ maxHeight: !window.mode.isDesktop() ? 60 : 180
},
partsFocused: false,
@@ -118,7 +118,7 @@ L.Control.PartsPreview = L.Control.extend({
this._addDnDHandlers(frame);
frame.setAttribute('draggable', false);
- if (!window.mode.isMobile()) {
+ if (window.mode.isDesktop()) {
L.DomUtil.setStyle(frame, 'height',
'20px');
L.DomUtil.setStyle(frame, 'margin',
'0em');
}
@@ -204,7 +204,7 @@ L.Control.PartsPreview = L.Control.extend({
img.hash = hashCode;
img.src = L.Icon.Default.imagePath + '/preview_placeholder.png';
img.fetched = false;
- if (window.mode.isMobile() || window.mode.isTablet()) {
+ if (!window.mode.isDesktop()) {
(new Hammer(img, {recognizers: [[Hammer.Press]]}))
.on('press', L.bind(function () {
if (this._map._permission === 'edit') {
@@ -290,7 +290,7 @@ L.Control.PartsPreview = L.Control.extend({
var previewImgMinWidth =
Math.round(parseFloat(L.DomUtil.getStyle(img, 'min-width')));
var imgHeight = imgSize.height;
var imgWidth = imgSize.width;
- if (imgSize.width < previewImgMinWidth)
+ if (imgSize.width < previewImgMinWidth &&
window.mode.isDesktop())
imgHeight = Math.round(imgHeight *
previewImgMinWidth / imgSize.width);
var previewFrameBB =
img.parentElement.getBoundingClientRect();
if (this._direction === 'x') {
@@ -303,6 +303,11 @@ L.Control.PartsPreview = L.Control.extend({
this._previewFrameHeight = imgHeight + 2 *
previewImgBorder;
}
}
+
+ if (!window.mode.isDesktop() && imgSize) {
+ L.DomUtil.setStyle(img, 'width', imgSize.width + 'px');
+ L.DomUtil.setStyle(img, 'height', imgSize.height +
'px');
+ }
},
_setPart: function (e) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.PartsPreview.js | 20
loleaflet/src/layer/tile/ImpressTileLayer.js | 10 --
2 files changed, 24 insertions(+), 6 deletions(-)
New commits:
commit 982a56e54a9fab563a33b66c2e3d6d850f9f8101
Author: Henry Castro
AuthorDate: Fri Jul 3 16:10:18 2020 -0400
Commit: Henry Castro
CommitDate: Tue Jul 7 17:29:10 2020 +0200
loleaflet: fix the orientation only on main custom scroll
Since we are manually changing the CSS class names when
orientation changes, this is only valid for main custom scrollbar
because the mobile wizard scrollbar is always in portrait mode.
Change-Id: I0b9e7156dac0e33a6e793c7f6caae2021068f252
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97900
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Henry Castro
diff --git a/loleaflet/src/control/Control.PartsPreview.js
b/loleaflet/src/control/Control.PartsPreview.js
index 5e62fc832..e5f1676df 100644
--- a/loleaflet/src/control/Control.PartsPreview.js
+++ b/loleaflet/src/control/Control.PartsPreview.js
@@ -8,6 +8,10 @@ L.Control.PartsPreview = L.Control.extend({
options: {
fetchThumbnail: true,
autoUpdate: true,
+ imageClass: '',
+ frameClass: '',
+ axis: '',
+ allowOrientation: true,
maxWidth: (window.mode.isMobile() || window.mode.isTablet()) ?
60 : 180,
maxHeight: (window.mode.isMobile() || window.mode.isTablet()) ?
60 : 180
},
@@ -31,7 +35,9 @@ L.Control.PartsPreview = L.Control.extend({
onAdd: function (map) {
this._previewInitialized = false;
this._previewTiles = [];
- this._direction = window.mode.isMobile() &&
L.DomUtil.isPortrait() ? 'x' : 'y';
+ this._direction = this.options.allowOrientation ?
+ (!window.mode.isDesktop() && L.DomUtil.isPortrait() ?
'x' : 'y') :
+ this.options.axis;
this._scrollY = 0;
map.on('updateparts', this._updateDisabled, this);
@@ -107,7 +113,8 @@ L.Control.PartsPreview = L.Control.extend({
this._scrollContainer =
$(this._partsPreviewCont).find('.mCSB_container').get(0);
// Add a special frame just as a drop-site for
reordering.
- var frame = L.DomUtil.create('div',
'preview-frame', this._scrollContainer);
+ var frameClass = 'preview-frame ' +
this.options.frameClass;
+ var frame = L.DomUtil.create('div', frameClass,
this._scrollContainer);
this._addDnDHandlers(frame);
frame.setAttribute('draggable', false);
@@ -140,6 +147,10 @@ L.Control.PartsPreview = L.Control.extend({
}
}
+ if (!this.options.allowOrientation) {
+ return;
+ }
+
// update portrait / landscape
var removePreviewImg = 'preview-img-portrait';
var addPreviewImg = 'preview-img-landscape';
@@ -183,11 +194,12 @@ L.Control.PartsPreview = L.Control.extend({
},
_createPreview: function (i, hashCode, bottomBound) {
- var frame = L.DomUtil.create('div', 'preview-frame',
this._scrollContainer);
+ var frameClass = 'preview-frame ' + this.options.frameClass;
+ var frame = L.DomUtil.create('div', frameClass,
this._scrollContainer);
this._addDnDHandlers(frame);
L.DomUtil.create('span', 'preview-helper', frame);
- var imgClassName = 'preview-img';
+ var imgClassName = 'preview-img ' + this.options.imageClass;
var img = L.DomUtil.create('img', imgClassName, frame);
img.hash = hashCode;
img.src = L.Icon.Default.imagePath + '/preview_placeholder.png';
diff --git a/loleaflet/src/layer/tile/ImpressTileLayer.js
b/loleaflet/src/layer/tile/ImpressTileLayer.js
index 5063cc817..af7e3f34a 100644
--- a/loleaflet/src/layer/tile/ImpressTileLayer.js
+++ b/loleaflet/src/layer/tile/ImpressTileLayer.js
@@ -59,7 +59,13 @@ L.ImpressTileLayer = L.TileLayer.extend({
var container = L.DomUtil.createWithId('div',
'mobile-wizard-header', mobileWizard);
var preview = L.DomUtil.createWithId('div',
'mobile-slide-sorter', container);
L.DomUtil.toBack(container);
- map.addControl(L.control.partsPreview(container,
preview, {fetchThumbnail: false}));
+ map.addControl(L.control.partsPreview(container,
preview, {
+ fetchThumbnail: fa
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.PartsPreview.js | 13 +++
loleaflet/src/layer/tile/ImpressTileLayer.js | 30 --
loleaflet/src/map/Map.js |6 -
3 files changed, 9 insertions(+), 40 deletions(-)
New commits:
commit 937823cd4a5af7477818893ee6bb306cf4acd46e
Author: Henry Castro
AuthorDate: Fri Jul 3 15:42:09 2020 -0400
Commit: Henry Castro
CommitDate: Tue Jul 7 17:28:27 2020 +0200
loleaflet: re-creates the scrollbar when orientation changes
We are manually changing the orientation CSS class name for
preview thumbnails, so it requires to destroy and create again
the custom scroll with the new axis to show a vertical or
horizontal scroll bar
Change-Id: Ib341025da66db05f6feddbbb32a286da107cd8df
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97898
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Henry Castro
diff --git a/loleaflet/src/control/Control.PartsPreview.js
b/loleaflet/src/control/Control.PartsPreview.js
index cab7805d6..75004 100644
--- a/loleaflet/src/control/Control.PartsPreview.js
+++ b/loleaflet/src/control/Control.PartsPreview.js
@@ -42,11 +42,8 @@ L.Control.PartsPreview = L.Control.extend({
map.on('docsize', this._updateAllPreview, this);
},
- createScrollbar: function (axis) {
+ createScrollbar: function () {
var control = this;
- if (axis) {
- this._direction = axis;
- }
$(this._partsPreviewCont).mCustomScrollbar({
axis: this._direction,
@@ -163,6 +160,14 @@ L.Control.PartsPreview = L.Control.extend({
var previewFrame =
$(this._partsPreviewCont).find('.preview-frame');
previewFrame.removeClass(removePreviewFrame);
previewFrame.addClass(addPreviewFrame);
+
+ // re-create scrollbar with new direction
+ var direction = this._direction;
+ this._direction = !window.mode.isDesktop() &&
L.DomUtil.isPortrait() ? 'x' : 'y';
+ if (direction !== this._direction) {
+
$(this._partsPreviewCont).mCustomScrollbar('destroy');
+ this.createScrollbar();
+ }
}
},
diff --git a/loleaflet/src/layer/tile/ImpressTileLayer.js
b/loleaflet/src/layer/tile/ImpressTileLayer.js
index b24ee5ccf..5063cc817 100644
--- a/loleaflet/src/layer/tile/ImpressTileLayer.js
+++ b/loleaflet/src/layer/tile/ImpressTileLayer.js
@@ -48,7 +48,6 @@ L.ImpressTileLayer = L.TileLayer.extend({
map.on('AnnotationSave', this.onAnnotationSave, this);
map.on('AnnotationScrollUp', this.onAnnotationScrollUp, this);
map.on('AnnotationScrollDown', this.onAnnotationScrollDown,
this);
- map.on('orientationchange', this.onOrientationChange, this);
map.on('resize', this.onResize, this);
map.uiManager.initializeSpecializedUI('presentation');
@@ -255,35 +254,6 @@ L.ImpressTileLayer = L.TileLayer.extend({
}
},
- onOrientationChange: function () {
- var container = L.DomUtil.get('presentation-controls-wrapper');
- var preview = L.DomUtil.get('slide-sorter');
-
- if (!container || !preview) {
- return;
- }
-
- // Android change the orientation if the keyboard is visible
- if (L.Browser.android) {
- if (window.innerHeight < 2 * screen.height / 3) {
-
L.DomUtil.addClass(this._map.options.documentContainer, 'keyboard');
- $(preview).hide();
- } else {
-
L.DomUtil.removeClass(this._map.options.documentContainer, 'keyboard');
- $(preview).show();
- }
- }
-
- if (L.DomUtil.isPortrait() && $(preview).data('mCS').opt.axis
!== 'x') {
- $(preview).mCustomScrollbar('destroy');
- this._preview.createScrollbar('x');
- } else if (L.DomUtil.isLandscape() &&
$(preview).data('mCS').opt.axis !== 'y') {
- $(preview).mCustomScrollbar('destroy');
- this._preview.createScrollbar('y');
- }
-
- },
-
onUpdatePermission: function (e) {
if (window.mode.isMobile()) {
if (e.perm === 'edit') {
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 0cd8f9282..66103df1c 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -161,12 +161,6 @@ L.Map = L.Evented.extend({
this
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.PartsPreview.js |9 ++---
loleaflet/src/control/Parts.js|7 +--
2 files changed, 11 insertions(+), 5 deletions(-)
New commits:
commit f68d5346a9bc535d82c45b39876dc8f8b3824694
Author: Henry Castro
AuthorDate: Fri Jul 3 15:59:32 2020 -0400
Commit: Henry Castro
CommitDate: Tue Jul 7 17:28:47 2020 +0200
loleaflet: fix the bounding rectangle when not visible
The preview thumbnail in mobile wizard are not visible yet,
so assume the map container rectangle bounds to properly
calculate the aspect ratio of the image
Change-Id: Iacc387b92e326965c86fb60d1acfde5b49365ad3
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97899
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Henry Castro
diff --git a/loleaflet/src/control/Control.PartsPreview.js
b/loleaflet/src/control/Control.PartsPreview.js
index 75004..5e62fc832 100644
--- a/loleaflet/src/control/Control.PartsPreview.js
+++ b/loleaflet/src/control/Control.PartsPreview.js
@@ -220,6 +220,11 @@ L.Control.PartsPreview = L.Control.extend({
var previewContBB =
this._partsPreviewCont.getBoundingClientRect();
var bottomBound;
+ // is not visible yet, assume map bounds
+ if (previewContBB.right === 0 && previewContBB.bottom === 0) {
+ previewContBB =
this._map._container.getBoundingClientRect();
+ }
+
if (this._direction === 'x') {
this._previewContTop = previewContBB.left;
bottomBound = previewContBB.right + previewContBB.width
/ 2;
@@ -258,9 +263,7 @@ L.Control.PartsPreview = L.Control.extend({
var imgSize;
if (i === 0 || (previewFrameTop >= topBound && previewFrameTop
<= bottomBound)
|| (previewFrameBottom >= topBound &&
previewFrameBottom <= bottomBound)) {
- imgSize = this.options.fetchThumbnail ?
- this._map.getPreview(i, i,
this.options.maxWidth, this.options.maxHeight, {autoUpdate:
this.options.autoUpdate}) :
- { width: this.options.maxWidth, height:
this.options.maxHeight };
+ imgSize = this._map.getPreview(i, i,
this.options.maxWidth, this.options.maxHeight, {autoUpdate:
this.options.autoUpdate, fetchThumbnail: this.options.fetchThumbnail});
img.fetched = true;
if (this._direction === 'x') {
diff --git a/loleaflet/src/control/Parts.js b/loleaflet/src/control/Parts.js
index 72a213402..de3bcdd9f 100644
--- a/loleaflet/src/control/Parts.js
+++ b/loleaflet/src/control/Parts.js
@@ -103,6 +103,7 @@ L.Map.include({
}
var autoUpdate = options ? !!options.autoUpdate : false;
var forAllClients = options ? !!options.broadcast : false;
+ var fetchThumbnail = options && options.fetchThumbnail ?
options.fetchThumbnail : true;
this._docPreviews[id] = {id: id, index: index, maxWidth:
maxWidth, maxHeight: maxHeight, autoUpdate: autoUpdate, invalid: false};
var docLayer = this._docLayer;
@@ -131,7 +132,8 @@ L.Map.include({
dpiscale = 2; // some may be hidpi, and it is fine to
send the hi-dpi slide preview to non-hpi clients
}
- this._socket.sendMessage('tile ' +
+ if (fetchThumbnail) {
+ this._socket.sendMessage('tile ' +
'nviewid=0' + ' ' +
'part=' + part + ' ' +
'width=' + maxWidth *
dpiscale + ' ' +
@@ -141,7 +143,8 @@ L.Map.include({
'tilewidth=' +
tileWidth + ' ' +
'tileheight=' +
tileHeight + ' ' +
'id=' + id + ' ' +
- 'broadcast=' +
(forAllClients ? 'yes' : 'no'));
+'broadcast=' + (forAllClients
? 'yes' : 'no'));
+ }
return {width: maxWidth, height: maxHeight};
},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/uitest/uiobject.cxx |2 -- 1 file changed, 2 deletions(-) New commits: commit a041cb54351326cd8beb39abac23f07f35de5463 Author: Andrea Gelmini AuthorDate: Fri Jul 3 18:55:42 2020 +0200 Commit: Julien Nabet CommitDate: Tue Jul 7 17:10:29 2020 +0200 Removed duplicated includes Change-Id: I5c93b8ae1db219cfea3266a15d502747e8709fa5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97890 Reviewed-by: Julien Nabet Tested-by: Jenkins diff --git a/svx/source/uitest/uiobject.cxx b/svx/source/uitest/uiobject.cxx index 5204688c4975..046cece582ca 100644 --- a/svx/source/uitest/uiobject.cxx +++ b/svx/source/uitest/uiobject.cxx @@ -12,9 +12,7 @@ #include #include -#include #include -#include SvxShowCharSetUIObject::SvxShowCharSetUIObject(const VclPtr& xCharSetWin, SvxShowCharSet* pCharSet): WindowUIObject(xCharSetWin), ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: editeng/source odk/examples sw/inc sw/source
editeng/source/misc/svxacorr.cxx |2 +-
odk/examples/DevelopersGuide/Text/TextDocuments.java |2 +-
sw/inc/shellio.hxx |2 +-
sw/source/core/unocore/unoobj.cxx|2 +-
sw/source/filter/ascii/ascatr.cxx|2 +-
sw/source/filter/writer/writer.cxx |2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit e596785580cbc7e8f4055ae495de48e6ecd0c022
Author: Julien Nabet
AuthorDate: Tue Jul 7 13:01:40 2020 +0200
Commit: Julien Nabet
CommitDate: Tue Jul 7 17:10:03 2020 +0200
Typo: pargraph->paragraph
Change-Id: I7749951d829eb8aaeacdca0fd66d41cf9d6a1613
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98251
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 9fc509483fa0..b51d34e6173d 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -1722,7 +1722,7 @@ OUString
SvxAutoCorrect::GetPrevAutoCorrWord(SvxAutoCorrDoc const& rDoc, const O
// auto.
sal_Int32 nCapLttrPos = nPos+1;// on the 1st Character
if( !nPos && !IsWordDelim( rTxt[ 0 ]))
---nCapLttrPos; // Beginning of pargraph and no Blank!
+--nCapLttrPos; // Beginning of paragraph and no Blank!
while( lcl_IsInAsciiArr( sImplSttSkipChars, rTxt[ nCapLttrPos ]) )
if( ++nCapLttrPos >= nEnd )
diff --git a/odk/examples/DevelopersGuide/Text/TextDocuments.java
b/odk/examples/DevelopersGuide/Text/TextDocuments.java
index 20e9f7a58e72..1a1a82762612 100644
--- a/odk/examples/DevelopersGuide/Text/TextDocuments.java
+++ b/odk/examples/DevelopersGuide/Text/TextDocuments.java
@@ -1591,7 +1591,7 @@ public class TextDocuments {
// Insert a new paragraph
mxDocText.insertControlCharacter (
mxDocCursor, ControlCharacter.PARAGRAPH_BREAK, false );
-// And select the new pargraph
+// And select the new paragraph
xParaCursor.gotoPreviousParagraph ( true );
// Create a new Text Section and access its XNamed interface
diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx
index 8d1b4776c828..dd6183444fe8 100644
--- a/sw/inc/shellio.hxx
+++ b/sw/inc/shellio.hxx
@@ -417,7 +417,7 @@ public:
bool m_bASCII_ParaAsBlank : 1;
bool m_bASCII_NoLastLineEnd : 1;
bool m_bUCS2_WithStartChar : 1;
-bool m_bExportPargraphNumbering : 1;
+bool m_bExportParagraphNumbering : 1;
bool m_bBlock : 1;
bool m_bOrganizerMode : 1;
diff --git a/sw/source/core/unocore/unoobj.cxx
b/sw/source/core/unocore/unoobj.cxx
index 5b6a296c6065..236481cb03b2 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -144,7 +144,7 @@ void SwUnoCursorHelper::GetTextFromPam(SwPaM & rPam,
OUString & rBuffer,
SwWriter aWriter( aStream, rPam );
xWrt->m_bASCII_NoLastLineEnd = true;
-xWrt->m_bExportPargraphNumbering = false;
+xWrt->m_bExportParagraphNumbering = false;
SwAsciiOptions aOpt = xWrt->GetAsciiOptions();
aOpt.SetCharSet( RTL_TEXTENCODING_UNICODE );
xWrt->SetAsciiOptions( aOpt );
diff --git a/sw/source/filter/ascii/ascatr.cxx
b/sw/source/filter/ascii/ascatr.cxx
index 3445d7fcdff7..ec8129eab961 100644
--- a/sw/source/filter/ascii/ascatr.cxx
+++ b/sw/source/filter/ascii/ascatr.cxx
@@ -264,7 +264,7 @@ static Writer& OutASC_SwTextNode( Writer& rWrt,
SwContentNode& rNode )
}
const SwNumRule* pNumRule = rNd.GetNumRule();
-if (pNumRule && !nStrPos && rWrt.m_bExportPargraphNumbering &&
!bIsOneParagraph)
+if (pNumRule && !nStrPos && rWrt.m_bExportParagraphNumbering &&
!bIsOneParagraph)
{
bool bIsOutlineNumRule = pNumRule == rNd.GetDoc()->GetOutlineNumRule();
diff --git a/sw/source/filter/writer/writer.cxx
b/sw/source/filter/writer/writer.cxx
index 5be2118a284b..743ce8bd1ebb 100644
--- a/sw/source/filter/writer/writer.cxx
+++ b/sw/source/filter/writer/writer.cxx
@@ -123,7 +123,7 @@ Writer::Writer()
m_bASCII_NoLastLineEnd = m_bASCII_ParaAsBlank = m_bASCII_ParaAsCR =
m_bWriteClipboardDoc = m_bWriteOnlyFirstTable = m_bBlock =
m_bOrganizerMode = false;
-m_bExportPargraphNumbering = true;
+m_bExportParagraphNumbering = true;
}
Writer::~Writer()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: ios/Mobile
ios/Mobile/CODocument.mm | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
New commits:
commit ea4a6575731fb261d0557feba668fa087d5764b9
Author: Tor Lillqvist
AuthorDate: Tue Jul 7 16:13:25 2020 +0300
Commit: Tor Lillqvist
CommitDate: Tue Jul 7 16:01:19 2020 +0200
Use a separate temp directory for each document during the iOS app lifetime
This prevents an assertion failure when you quickly open the same
document again after closing it.
Change-Id: I26b8c53d57bd1d33f0473a3c5a332ec02c37455d
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98263
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tor Lillqvist
diff --git a/ios/Mobile/CODocument.mm b/ios/Mobile/CODocument.mm
index c12bd2e91..d25c7ded7 100644
--- a/ios/Mobile/CODocument.mm
+++ b/ios/Mobile/CODocument.mm
@@ -56,7 +56,14 @@ static std::atomic appDocIdCounter(1);
fakeClientFd = fakeSocketSocket();
-copyFileURL = [[[NSFileManager defaultManager] temporaryDirectory]
URLByAppendingPathComponent:[[[self fileURL] path] lastPathComponent]];
+appDocId = appDocIdCounter++;
+NSURL *copyFileDirectory = [[NSFileManager.defaultManager
temporaryDirectory] URLByAppendingPathComponent:[NSString
stringWithFormat:@"%d", appDocId]];
+if (![NSFileManager.defaultManager createDirectoryAtURL:copyFileDirectory
withIntermediateDirectories:YES attributes:nil error:nil]) {
+LOG_ERR("Could not create directory " << [[copyFileDirectory path]
UTF8String]);
+return NO;
+}
+
+copyFileURL = [copyFileDirectory URLByAppendingPathComponent:[[[self
fileURL] path] lastPathComponent]];
NSError *error;
[[NSFileManager defaultManager] removeItemAtURL:copyFileURL error:nil];
@@ -66,7 +73,6 @@ static std::atomic appDocIdCounter(1);
NSURL *url = [[NSBundle mainBundle] URLForResource:@"loleaflet"
withExtension:@"html"];
NSURLComponents *components = [NSURLComponents componentsWithURL:url
resolvingAgainstBaseURL:NO];
-appDocId = appDocIdCounter++;
allocateDocumentDataForMobileAppDocId(appDocId).coDocument = self;
components.queryItems = @[ [NSURLQueryItem queryItemWithName:@"file_path"
value:[copyFileURL absoluteString]],
[NSURLQueryItem
queryItemWithName:@"closebutton" value:@"1"],
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: net/FakeSocket.cpp
net/FakeSocket.cpp |2 -- 1 file changed, 2 deletions(-) New commits: commit a92e80a58ef4107763e6b5ba4bb95bb9b49c86e8 Author: Tor Lillqvist AuthorDate: Tue Jul 7 12:16:22 2020 +0300 Commit: Tor Lillqvist CommitDate: Tue Jul 7 15:57:24 2020 +0200 There should be no need to notify when fakeSocketRead() completes Change-Id: I95ba22b553c8e17167d90c1033246a85d8ccb6ef Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98261 Tested-by: Jenkins Reviewed-by: Tor Lillqvist diff --git a/net/FakeSocket.cpp b/net/FakeSocket.cpp index cb292a8fb..013a15ce9 100644 --- a/net/FakeSocket.cpp +++ b/net/FakeSocket.cpp @@ -571,8 +571,6 @@ ssize_t fakeSocketRead(int fd, void *buf, size_t nbytes) else if (pair.buffer[K].size() == 0) pair.readable[K] = false; -theCV.notify_all(); - FAKESOCKET_LOG(2, "FakeSocket Read from #" << fd << " got " << result << (result == 1 ? " byte" : " bytes") << flush()); return result; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: net/FakeSocket.cpp
net/FakeSocket.cpp |2 ++ 1 file changed, 2 insertions(+) New commits: commit e8595dc831df007a287d0d67f728bba1fb5c8dea Author: Tor Lillqvist AuthorDate: Tue Jul 7 12:41:13 2020 +0300 Commit: Tor Lillqvist CommitDate: Tue Jul 7 15:47:01 2020 +0200 Do notify waiting threads when fakeSocketShutdown() completes Change-Id: I3d30eb0dfd92f55b44eff3c48094e99d7106b93a Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98262 Tested-by: Jenkins CollaboraOffice Tested-by: Jenkins Reviewed-by: Tor Lillqvist diff --git a/net/FakeSocket.cpp b/net/FakeSocket.cpp index 51346eb7e..cb292a8fb 100644 --- a/net/FakeSocket.cpp +++ b/net/FakeSocket.cpp @@ -654,6 +654,8 @@ int fakeSocketShutdown(int fd) pair.shutdown[K] = true; pair.readable[K] = true; +theCV.notify_all(); + FAKESOCKET_LOG(1, "FakeSocket Shutdown #" << fd << flush()); return 0; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: net/FakeSocket.cpp
net/FakeSocket.cpp |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit ba14da5982f25c8a3a7cb651787c328ecd659d34 Author: Tor Lillqvist AuthorDate: Tue Jul 7 12:15:37 2020 +0300 Commit: Tor Lillqvist CommitDate: Tue Jul 7 15:38:40 2020 +0200 Expand on comment Change-Id: I4523e25ff91ff9a51bb13c585bec6ef0547b7e2f Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98260 Tested-by: Jenkins Reviewed-by: Tor Lillqvist diff --git a/net/FakeSocket.cpp b/net/FakeSocket.cpp index a4ef761e5..51346eb7e 100644 --- a/net/FakeSocket.cpp +++ b/net/FakeSocket.cpp @@ -125,7 +125,9 @@ static int fakeSocketAllocate() // We always allocate a new FakeSocketPair struct. Let's not bother with potential issues with // reusing them. It isn't like we would be allocating thousands anyway during the typical -// lifetime of an app. +// lifetime of an app. Also, not reusing FakeSocket fd numbers means that it is easier to set a +// conditional breakpoint on an operation on a specific fd when debugging some problematic +// scenario. const int i = fds.size(); fds.resize(i + 1); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css loleaflet/src
loleaflet/css/notebookbar.css | 10
loleaflet/src/control/Control.NotebookbarBuilder.js | 17
loleaflet/src/control/Control.NotebookbarCalc.js| 260 ++
loleaflet/src/control/Control.NotebookbarImpress.js | 313
loleaflet/src/control/Control.NotebookbarWriter.js | 490 +++-
5 files changed, 1086 insertions(+), 4 deletions(-)
New commits:
commit 7895ab9a293ad304017043fcd7597738441e18c1
Author: Szymon Kłos
AuthorDate: Mon Jul 6 09:42:30 2020 +0200
Commit: Szymon Kłos
CommitDate: Tue Jul 7 15:36:25 2020 +0200
notebookbar: add file & help tabs
Change-Id: Ie24b8ff6d541a95df61ff45a3a4ad1b26b08c596
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98254
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
diff --git a/loleaflet/css/notebookbar.css b/loleaflet/css/notebookbar.css
index dbadb..94cff1fee 100644
--- a/loleaflet/css/notebookbar.css
+++ b/loleaflet/css/notebookbar.css
@@ -358,6 +358,16 @@ div[id*='Row'].notebookbar, div[id*='Column'].notebookbar,
#SendToBack.notebookb
margin-top: 10px !important;
}
+/* Help tab */
+#table-Help-Section {
+ margin-top: 40px;
+}
+
+/* File tab */
+#table-File-Section {
+ margin-top: 20px;
+}
+
/* Calc */
/* Home tab */
diff --git a/loleaflet/src/control/Control.NotebookbarBuilder.js
b/loleaflet/src/control/Control.NotebookbarBuilder.js
index 27857a375..36265b450 100644
--- a/loleaflet/src/control/Control.NotebookbarBuilder.js
+++ b/loleaflet/src/control/Control.NotebookbarBuilder.js
@@ -16,6 +16,7 @@ L.Control.NotebookbarBuilder =
L.Control.JSDialogBuilder.extend({
this._controlHandlers['combobox'] =
this._comboboxControlHandler;
this._controlHandlers['listbox'] = this._comboboxControlHandler;
this._controlHandlers['tabcontrol'] =
this._overridenTabsControlHandler;
+ this._controlHandlers['menubartoolitem'] =
this._menubarToolItemHandler;
this._controlHandlers['pushbutton'] = function() { return
false; };
this._controlHandlers['spinfield'] = function() { return false;
};
@@ -240,6 +241,22 @@ L.Control.NotebookbarBuilder =
L.Control.JSDialogBuilder.extend({
return builder._tabsControlHandler(parentContainer, data,
builder);
},
+ _menubarToolItemHandler: function(parentContainer, data, builder) {
+ var originalInLineState =
builder.options.useInLineLabelsForUnoButtons;
+ builder.options.useInLineLabelsForUnoButtons = true;
+
+ data.command = data.id;
+ var control = builder._unoToolButton(parentContainer, data,
builder);
+
+ builder.options.useInLineLabelsForUnoButtons =
originalInLineState;
+
+ $(control.container).unbind('click');
+ $(control.container).click(function () {
+ console.log(builder.options.map);
+ L.control.menubar()._executeAction.bind({_map:
builder.options.map})(undefined, {id: data.id});
+ });
+ },
+
_colorControl: function(parentContainer, data, builder) {
var commandOverride = data.command === '.uno:Color' &&
builder.map.getDocType() === 'text';
if (commandOverride)
diff --git a/loleaflet/src/control/Control.NotebookbarCalc.js
b/loleaflet/src/control/Control.NotebookbarCalc.js
index b8709c2c2..b806bb4b8 100644
--- a/loleaflet/src/control/Control.NotebookbarCalc.js
+++ b/loleaflet/src/control/Control.NotebookbarCalc.js
@@ -3,11 +3,16 @@
* L.Control.NotebookbarCalc
*/
-/* global _ */
+/* global _ _UNO */
L.Control.NotebookbarCalc = L.Control.NotebookbarWriter.extend({
getTabs: function() {
return [
+ {
+ 'text': _('~File'),
+ 'id': '-1',
+ 'name': 'File',
+ },
{
'text': _('~Home'),
'id': '2',
@@ -23,10 +28,263 @@ L.Control.NotebookbarCalc =
L.Control.NotebookbarWriter.extend({
'text': _('~Review'),
'id': '6',
'name': 'ReviewLabel'
+ },
+ {
+ 'text': _('~Help'),
+ 'id': '-2',
+ 'name': 'Help',
}
];
},
+ getFileTab: function() {
+ var hasRevisionHistory = L.Params.revHistoryEnabled;
+ var hasPrint = !this._map['wopi'].HidePrintOption;
+ var hasSaveAs = !this._map['wopi'].UserCanNotWriteRelative;
+ var hasShare = this._map['wopi'].EnableShare;
+
+
+
[Libreoffice-commits] online.git: wsd/DocumentBroker.cpp
wsd/DocumentBroker.cpp |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit e71e37bcec84068e92434357df6172b9cf457e7e
Author: Samuel Mehrbrodt
AuthorDate: Thu Jul 2 08:16:00 2020 +0200
Commit: Samuel Mehrbrodt
CommitDate: Tue Jul 7 15:06:25 2020 +0200
Improve reporting save results
Change-Id: I3f2f96f4b8f196e6e9268bed24695f739f679124
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97699
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Samuel Mehrbrodt
diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index e64c0f8e1..a6b8c62e2 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -970,8 +970,8 @@ bool DocumentBroker::saveToStorageInternal(const
std::string& sessionId, bool su
{
LOG_DBG("Save skipped as document [" << _docKey << "] was not
modified.");
_lastSaveTime = std::chrono::steady_clock::now();
-_poll->wakeup();
broadcastSaveResult(true, "unmodified");
+_poll->wakeup();
return true;
}
@@ -1116,7 +1116,7 @@ bool DocumentBroker::saveToStorageInternal(const
std::string& sessionId, bool su
LOG_ERR("Cannot save docKey [" << _docKey << "] to storage URI [" <<
uriAnonym <<
"]. Invalid or expired access token. Notifying client.");
it->second->sendTextFrameAndLogError("error: cmd=storage
kind=saveunauthorized");
-broadcastSaveResult(false, "Invalid or expired access token",
storageSaveResult.getErrorMsg());
+broadcastSaveResult(false, "Invalid or expired access token");
}
else if (storageSaveResult.getResult() == StorageBase::SaveResult::FAILED)
{
@@ -1144,9 +1144,9 @@ bool DocumentBroker::saveToStorageInternal(const
std::string& sessionId, bool su
void DocumentBroker::broadcastSaveResult(bool success, const std::string&
result, const std::string& errorMsg)
{
-std::string resultstr = success ? "true" : "false";
+const std::string resultstr = success ? "true" : "false";
// Some sane limit, otherwise we get problems transfering this to the
client with large strings (can be a whole webpage)
-std::string errorMsgFormatted = errorMsg.substr(0, 1000);
+std::string errorMsgFormatted =
LOOLProtocol::getAbbreviatedMessage(errorMsg);
// Replace reserverd characters
errorMsgFormatted = Poco::translate(errorMsgFormatted, "\"", "'");
broadcastMessage("commandresult: { \"command\": \"save\", \"success\": " +
resultstr +
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.PartsPreview.js | 38 +++---
1 file changed, 17 insertions(+), 21 deletions(-)
New commits:
commit 0e3f2d7c9f571c23e53e173a073664ff37148676
Author: Henry Castro
AuthorDate: Thu Jul 2 15:13:12 2020 -0400
Commit: Henry Castro
CommitDate: Tue Jul 7 15:03:35 2020 +0200
loleafet: simplify to compute the bottom bound of the preview thumbnails
Change-Id: I5ee8c5b4182b2752821fcd3bba022bc4b3db42d1
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97778
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Henry Castro
diff --git a/loleaflet/src/control/Control.PartsPreview.js
b/loleaflet/src/control/Control.PartsPreview.js
index 3b0acb149..cab7805d6 100644
--- a/loleaflet/src/control/Control.PartsPreview.js
+++ b/loleaflet/src/control/Control.PartsPreview.js
@@ -86,18 +86,9 @@ L.Control.PartsPreview = L.Control.extend({
$('.scroll-container').mCustomScrollbar('update');
}, this), 500);
}
- var previewContBB =
this._partsPreviewCont.getBoundingClientRect();
- var bottomBound;
this.createScrollbar();
-
- if (this._direction === 'x') {
- this._previewContTop =
previewContBB.left;
- bottomBound = previewContBB.right +
previewContBB.width / 2;
- } else {
- this._previewContTop =
previewContBB.top;
- bottomBound = previewContBB.bottom +
previewContBB.height / 2;
- }
+ var bottomBound = this._getBottomBound();
this._map.on('click', function() {
this.partsFocused = false;
@@ -180,17 +171,7 @@ L.Control.PartsPreview = L.Control.extend({
return;
}
- var previewContBB =
this._partsPreviewCont.getBoundingClientRect();
- var bottomBound;
-
- if (this._direction === 'x') {
- this._previewContTop = previewContBB.left;
- bottomBound = previewContBB.right + previewContBB.width
/ 2;
- } else {
- this._previewContTop = previewContBB.top;
- bottomBound = previewContBB.bottom +
previewContBB.height / 2;
- }
-
+ var bottomBound = this._getBottomBound();
for (var prev = 0; prev < this._previewTiles.length; prev++) {
this._layoutPreview(prev, this._previewTiles[prev],
bottomBound);
}
@@ -230,6 +211,21 @@ L.Control.PartsPreview = L.Control.extend({
return img;
},
+ _getBottomBound: function () {
+ var previewContBB =
this._partsPreviewCont.getBoundingClientRect();
+ var bottomBound;
+
+ if (this._direction === 'x') {
+ this._previewContTop = previewContBB.left;
+ bottomBound = previewContBB.right + previewContBB.width
/ 2;
+ } else {
+ this._previewContTop = previewContBB.top;
+ bottomBound = previewContBB.bottom +
previewContBB.height / 2;
+ }
+
+ return bottomBound;
+ },
+
_layoutPreview: function (i, img, bottomBound) {
var topBound = this._previewContTop;
var previewFrameTop = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.PartsPreview.js | 32 +++---
1 file changed, 29 insertions(+), 3 deletions(-)
New commits:
commit 67bd6649015646fe505371bee9b0755ff75fb0c6
Author: Henry Castro
AuthorDate: Thu Jul 2 10:59:56 2020 -0400
Commit: Henry Castro
CommitDate: Tue Jul 7 15:03:10 2020 +0200
loleaflet: update preview images when the doc size changes
The unit test checks the aspect ratio of the preview thumbnails,
this happens when the document size changes (i.e changing paper format)
Change-Id: I0267e797327b73d714947258e004fe64cce9d1dd
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97775
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Henry Castro
diff --git a/loleaflet/src/control/Control.PartsPreview.js
b/loleaflet/src/control/Control.PartsPreview.js
index c7250de7f..3b0acb149 100644
--- a/loleaflet/src/control/Control.PartsPreview.js
+++ b/loleaflet/src/control/Control.PartsPreview.js
@@ -39,6 +39,7 @@ L.Control.PartsPreview = L.Control.extend({
map.on('tilepreview', this._updatePreview, this);
map.on('insertpage', this._insertPreview, this);
map.on('deletepage', this._deletePreview, this);
+ map.on('docsize', this._updateAllPreview, this);
},
createScrollbar: function (axis) {
@@ -174,6 +175,27 @@ L.Control.PartsPreview = L.Control.extend({
}
},
+ _updateAllPreview: function () {
+ if (this._previewTiles.length === 0) {
+ return;
+ }
+
+ var previewContBB =
this._partsPreviewCont.getBoundingClientRect();
+ var bottomBound;
+
+ if (this._direction === 'x') {
+ this._previewContTop = previewContBB.left;
+ bottomBound = previewContBB.right + previewContBB.width
/ 2;
+ } else {
+ this._previewContTop = previewContBB.top;
+ bottomBound = previewContBB.bottom +
previewContBB.height / 2;
+ }
+
+ for (var prev = 0; prev < this._previewTiles.length; prev++) {
+ this._layoutPreview(prev, this._previewTiles[prev],
bottomBound);
+ }
+ },
+
_createPreview: function (i, hashCode, bottomBound) {
var frame = L.DomUtil.create('div', 'preview-frame',
this._scrollContainer);
this._addDnDHandlers(frame);
@@ -203,6 +225,12 @@ L.Control.PartsPreview = L.Control.extend({
document.activeElement.blur();
}, this);
+ this._layoutPreview(i, img, bottomBound);
+
+ return img;
+ },
+
+ _layoutPreview: function (i, img, bottomBound) {
var topBound = this._previewContTop;
var previewFrameTop = 0;
var previewFrameBottom = 0;
@@ -248,7 +276,7 @@ L.Control.PartsPreview = L.Control.extend({
var imgWidth = imgSize.width;
if (imgSize.width < previewImgMinWidth)
imgHeight = Math.round(imgHeight *
previewImgMinWidth / imgSize.width);
- var previewFrameBB = frame.getBoundingClientRect();
+ var previewFrameBB =
img.parentElement.getBoundingClientRect();
if (this._direction === 'x') {
this._previewFrameMargin = previewFrameBB.left
- this._previewContTop;
this._previewImgHeight = imgWidth;
@@ -259,8 +287,6 @@ L.Control.PartsPreview = L.Control.extend({
this._previewFrameHeight = imgHeight + 2 *
previewImgBorder;
}
}
-
- return img;
},
_setPart: function (e) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - svx/source
svx/source/tbxctrls/StylesPreviewWindow.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit c9ceaeaee923a742d842fbc6174222eaf9667ca6
Author: Szymon Kłos
AuthorDate: Tue Jul 7 14:24:57 2020 +0200
Commit: Szymon Kłos
CommitDate: Tue Jul 7 14:57:39 2020 +0200
Avoid nullptr dereference
Change-Id: I5f2bd8206a1339e09f277cdc7f0c6a01a6d85df7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98259
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
diff --git a/svx/source/tbxctrls/StylesPreviewWindow.cxx
b/svx/source/tbxctrls/StylesPreviewWindow.cxx
index 01bd8037b0f7..4ff428a73e66 100644
--- a/svx/source/tbxctrls/StylesPreviewWindow.cxx
+++ b/svx/source/tbxctrls/StylesPreviewWindow.cxx
@@ -66,7 +66,8 @@ StyleStatusListener::StyleStatusListener(
void StyleStatusListener::StateChanged(SfxItemState /*eState*/, const
SfxPoolItem* pState)
{
const SfxTemplateItem* pStateItem = dynamic_cast(pState);
-m_pPreviewControl->Select(pStateItem->GetStyleName());
+if (pStateItem)
+m_pPreviewControl->Select(pStateItem->GetStyleName());
}
StyleItemController::StyleItemController(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Review for gerrit 98187 : tdf#100348 add fill to fontwork in export to pptx
Hi all, I have continued to work on Fontwork. It brings fill, outline and effects from LO to pptx. The patch is in https://gerrit.libreoffice.org/c/core/+/98187 It has the following limitations: Not for docx No import Has no solution for character properties like "bold", which are ignored in LibreOffice but evaluated in PowerPoint. I know, that unit tests are missing. Please have a look, whether you see any problems. Otherwise I would commit it to master. Kind regards Regina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.Notebookbar.js |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit eaa904478ecd0782a2bd5e4c16a79765206f8807
Author: Szymon Kłos
AuthorDate: Tue Jul 7 13:47:31 2020 +0200
Commit: Szymon Kłos
CommitDate: Tue Jul 7 14:34:35 2020 +0200
notebookbar: fix context switching
Change-Id: I292f013fea46ebe15370ac11cd13e316b4adbd63
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98256
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
diff --git a/loleaflet/src/control/Control.Notebookbar.js
b/loleaflet/src/control/Control.Notebookbar.js
index 765f6790d..a6c0821a8 100644
--- a/loleaflet/src/control/Control.Notebookbar.js
+++ b/loleaflet/src/control/Control.Notebookbar.js
@@ -189,7 +189,7 @@ L.Control.Notebookbar = L.Control.extend({
var contexts = tabs[tab].context.split('|');
for (var context in contexts) {
if (contexts[context] ===
event.context) {
-
this.selectedTab(tabs[tab].name);
+ $('#' + tabs[tab].name).click();
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
AW: [EXTERN]-Error in building LibreOffice
Hi. for me, granting the user read/write access to the MachineKeys Folder was exactly the right solution for this error. I’m building inside a VM, so I didn’t really care about windows warning messages. There is another solution involving registry entries floating around that didn’t work for me. Regards, Julian Von: LibreOffice [mailto:libreoffice-boun...@lists.freedesktop.org] Im Auftrag von anshu khare Gesendet: Sonntag, 5. Juli 2020 18:07 An: libreoffice Betreff: [EXTERN]-Error in building LibreOffice Hi When I run /opt/lo/bin/make gb_COLOR=1 it gives the following error ALINK: error AL1078: Error signing assembly -- Access is denied. make[1]: *** [C:/sources/libo-core/solenv/gbuild/CliAssembly.mk:82: C:/build/workdir/CliAssemblyTarget/cli_basetypes.done] Error 1 make[1]: *** Waiting for unfinished jobs make: *** [Makefile:282: build] Error 2 This link: https://github.com/dotnet/runtime/issues/15416 says that I have to add myself to the list of permissions of C:\ProgramData\Microsoft\Crypto\RSA\MachineKeys folder with Full Control. When I go this path I find that MachineKeys is a system file and editing it can cause harm to my pc. Is it the correct solution or there is something else that needs to be focussed on? If it is the correct solution, then which permissions do I have to edit the attached picture? Warm regards Anshu ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: compilerplugins/clang include/sal sal/osl
compilerplugins/clang/stringconcatliterals.cxx |3 -
include/sal/log.hxx| 61 ++---
sal/osl/all/log.cxx| 39 ---
3 files changed, 78 insertions(+), 25 deletions(-)
New commits:
commit b9d93fc47b2489764e251a11572fccef872df4e9
Author: Jan-Marek Glogowski
AuthorDate: Wed Jul 1 18:06:28 2020 +0200
Commit: Thorsten Behrens
CommitDate: Tue Jul 7 14:15:04 2020 +0200
Allow making SAL_LOG based output fatal
This introduces the [+-]FATAL marker for SAL_LOG. This way you can
set part of the matching SAL_LOG string to std::abort on match.
The example "SAL_LOG=+FATAL+WARN.vcl.scheduler-FATAL+INFO" will
abort for any "+WARN.vcl.scheduler" match, but will just print all
additional "+INFO" logs.
Change-Id: Ib77f194a78f5165e6c885c82374ae41293815ee9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97651
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/compilerplugins/clang/stringconcatliterals.cxx
b/compilerplugins/clang/stringconcatliterals.cxx
index 0f26f4f553bc..0b52bd0c9b4f 100644
--- a/compilerplugins/clang/stringconcatliterals.cxx
+++ b/compilerplugins/clang/stringconcatliterals.cxx
@@ -109,7 +109,8 @@ bool StringConcatLiterals::VisitCallExpr(CallExpr const *
expr) {
compiler.getSourceManager().getSpellingLoc(
compiler.getSourceManager().getImmediateMacroCallerLoc(
compiler.getSourceManager().getImmediateMacroCallerLoc(
-compat::getBeginLoc(expr),
+
compiler.getSourceManager().getImmediateMacroCallerLoc(
+compat::getBeginLoc(expr)),
SRCDIR "/include/tools/diagnose_ex.h"))
return true;
diff --git a/include/sal/log.hxx b/include/sal/log.hxx
index 00d533ab5495..6bb0d1b43d3d 100644
--- a/include/sal/log.hxx
+++ b/include/sal/log.hxx
@@ -26,11 +26,20 @@
/// @cond INTERNAL
+enum sal_detail_LogAction
+{
+SAL_DETAIL_LOG_ACTION_IGNORE,
+SAL_DETAIL_LOG_ACTION_LOG,
+SAL_DETAIL_LOG_ACTION_FATAL
+};
+
extern "C" SAL_DLLPUBLIC void SAL_CALL sal_detail_log(
sal_detail_LogLevel level, char const * area, char const * where,
char const * message, sal_uInt32 backtraceDepth);
-extern "C" SAL_DLLPUBLIC sal_Bool SAL_CALL sal_detail_log_report(
+// the return value is actually "enum sal_detail_LogAction", but due to ABI
+// compatibility, it's left as the original "sal_Bool" / "unsigned char".
+extern "C" SAL_DLLPUBLIC unsigned char SAL_CALL sal_detail_log_report(
sal_detail_LogLevel level, char const * area);
namespace sal { namespace detail {
@@ -113,22 +122,38 @@ inline char const * unwrapStream(SAL_UNUSED_PARAMETER
StreamIgnore const &) {
} }
+// to prevent using a local variable, which can eventually shadow,
+// resulting in compiler warnings (or even errors with -Werror)
+#define SAL_DETAIL_LOG_STREAM_PRIVATE_(level, area, where, stream) \
+if (sizeof ::sal::detail::getResult( \
+::sal::detail::StreamStart() << stream) == 1) \
+{ \
+::sal_detail_log( \
+(level), (area), (where), \
+::sal::detail::unwrapStream( \
+::sal::detail::StreamStart() << stream), \
+0); \
+} else { \
+::std::ostringstream sal_detail_stream; \
+sal_detail_stream << stream; \
+::sal::detail::log( \
+(level), (area), (where), sal_detail_stream, 0); \
+}
+
#define SAL_DETAIL_LOG_STREAM(condition, level, area, where, stream) \
do { \
-if ((condition) && sal_detail_log_report(level, area)) { \
-if (sizeof ::sal::detail::getResult( \
-::sal::detail::StreamStart() << stream) == 1) \
+if (condition) \
+{ \
+switch (sal_detail_log_report(level, area)) \
{ \
-::sal_detail_log( \
-(level), (area), (where), \
-::sal::detail::unwrapStream( \
-::sal::detail::StreamStart() << stream), \
-0); \
-} else { \
-::std::ostringstream sal_detail_stream; \
-sal_detail_stream << stream; \
-::sal::detail::log( \
-(level), (area), (where), sal_detail_stream, 0); \
+case SAL_DETAIL_LOG_ACTION_IGNORE: break; \
+case SAL_DETAIL_LOG_ACTION_LOG: \
+SAL_DETAIL_LOG_STREAM_PRIVATE_(level, area, where, stream); \
+break; \
+case SAL_DETAIL_LOG_ACTION_FATAL: \
+SAL_DETAIL_LOG_STREAM_PRIVATE_(level, area, where, stream); \
+std::abort(); \
+break; \
} \
} \
} while (false)
@@ -235,7 +260,7 @@ inline char const * unwrapStream(SAL_UNUSED_PARAMETER
StreamIgnore const &) {
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - vcl/source
vcl/source/window/toolbox.cxx | 18 --
1 file changed, 8 insertions(+), 10 deletions(-)
New commits:
commit eee6441bc9eea847ba4b338baf99ab47913fcd61
Author: Jan-Marek Glogowski
AuthorDate: Mon Jun 29 07:01:26 2020 +0200
Commit: Thorsten Behrens
CommitDate: Tue Jul 7 14:14:07 2020 +0200
tdf#134054 toolbox: respect drop-down arrow rect
When centering the text and icon on the button, the code didn't
take the drop-down arrow rect width into account, resulting in an
overlapped arrow. This is especially visible, if the drop-down
is shown and the button is wrongly highlighted.
There is supposed to be some vertical mode, which I couldn't find
in the GUI, so this just adapts the width in horizontal mode.
Change-Id: I194780dc32db610041ad0ee45a425e1026c7c4e3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97358
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski
(cherry picked from commit 8565546ce6a04f6f243f4f60d2693b148dca5a77)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97688
Reviewed-by: Thorsten Behrens
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 77df4fddcacb..df5aadf89243 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -2641,13 +2641,11 @@ void ToolBox::ImplDrawItem(vcl::RenderContext&
rRenderContext, ImplToolItems::si
longnBtnWidth = aBtnSize.Width()-SMALLBUTTON_HSIZE;
longnBtnHeight = aBtnSize.Height()-SMALLBUTTON_VSIZE;
SizeaImageSize;
-SizeaTxtSize;
-if ( bText )
-{
-aTxtSize.setWidth( GetCtrlTextWidth( pItem->maText ) );
-aTxtSize.setHeight( GetTextHeight() );
-}
+const bool bDropDown = (pItem->mnBits & ToolBoxItemBits::DROPDOWN) ==
ToolBoxItemBits::DROPDOWN;
+tools::Rectangle aDropDownRect;
+if (bDropDown)
+aDropDownRect = pItem->GetDropDownRect(mbHorz);
if ( bImage )
{
@@ -2678,7 +2676,7 @@ void ToolBox::ImplDrawItem(vcl::RenderContext&
rRenderContext, ImplToolItems::si
}
else
{
-nImageOffX += (nBtnWidth-aImageSize.Width())/2;
+nImageOffX += (nBtnWidth-(bDropDown ? aDropDownRect.getWidth() :
0)+SMALLBUTTON_OFF_NORMAL_X-aImageSize.Width())/2;
if ( meTextPosition == ToolBoxTextPosition::Right )
nImageOffY += (nBtnHeight-aImageSize.Height())/2;
}
@@ -2705,6 +2703,7 @@ void ToolBox::ImplDrawItem(vcl::RenderContext&
rRenderContext, ImplToolItems::si
bool bRotate = false;
if ( bText )
{
+const Size aTxtSize(GetCtrlTextWidth(pItem->maText), GetTextHeight());
long nTextOffX = nOffX;
long nTextOffY = nOffY;
@@ -2742,7 +2741,7 @@ void ToolBox::ImplDrawItem(vcl::RenderContext&
rRenderContext, ImplToolItems::si
else
{
// center horizontally
-nTextOffX += (nBtnWidth-aTxtSize.Width() -
TB_IMAGETEXTOFFSET)/2;
+nTextOffX += (nBtnWidth-(bDropDown ? aDropDownRect.getWidth()
: 0)+SMALLBUTTON_OFF_NORMAL_X-aTxtSize.Width() - TB_IMAGETEXTOFFSET)/2;
// set vertical position
nTextOffY += nBtnHeight - aTxtSize.Height();
}
@@ -2768,9 +2767,8 @@ void ToolBox::ImplDrawItem(vcl::RenderContext&
rRenderContext, ImplToolItems::si
}
// paint optional drop down arrow
-if ( pItem->mnBits & ToolBoxItemBits::DROPDOWN )
+if (bDropDown)
{
-tools::Rectangle aDropDownRect( pItem->GetDropDownRect( mbHorz ) );
bool bSetColor = true;
if ( !pItem->mbEnabled || !IsEnabled() )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - vcl/source
vcl/source/window/toolbox.cxx | 31 ---
1 file changed, 16 insertions(+), 15 deletions(-)
New commits:
commit c0971961cf11097c787c67b5892d6209f89662e7
Author: Jan-Marek Glogowski
AuthorDate: Tue Jun 30 16:49:52 2020 +0200
Commit: Thorsten Behrens
CommitDate: Tue Jul 7 14:13:41 2020 +0200
tdf#130991 Fit the drop-down arrow into its rect
Looking at the original fixed-size arrow painting code replaced
in commit b62c43d1200e524369d9c7c2bd1dad3044efd672 ("Anti-alias
toolbar button drop-downs."), it used some fixed values of 5
and 3 to match the arrow box width of 11.
The new code assumes the width is the expected arrow size, minus
a minimal margin to separate the arrow from the button border,
and there is enough height available. Based on these assumptions,
the code now scales, positions and paints the triangle to fill
the available space.
Change-Id: Ied721e494d105106086ef6252e72ae7395eafe08
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97537
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski
(cherry picked from commit 1cb897a0f65ba066d1e81b62c70c3e46bbdb7ba8)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97583
Reviewed-by: Adolfo Jayme Barrientos
(cherry picked from commit b0315eb69c62f2108983e6a4b2177cf28a2663bf)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97687
Reviewed-by: Thorsten Behrens
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 3b0d6b5a5f7e..77df4fddcacb 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -2387,27 +2387,28 @@ static void ImplDrawDropdownArrow(vcl::RenderContext&
rRenderContext, const tool
rRenderContext.SetFillColor(COL_BLACK);
}
-float fScaleFactor = rRenderContext.GetDPIScaleFactor();
-
tools::Polygon aPoly(4);
-long width = round(rDropDownRect.getHeight()/5.5) * fScaleFactor; // scale
triangle depending on theme/toolbar height with 7 for gtk, 5 for gen
-long height = round(rDropDownRect.getHeight()/9.5) * fScaleFactor; // 4
for gtk, 3 for gen
-if (width < 4) width = 4;
-if (height < 3) height = 3;
+// the assumption is, that the width always specifies the size of the
expected arrow.
+const long nMargin = round(2 * rRenderContext.GetDPIScaleFactor());
+const long nSize = rDropDownRect.getWidth() - 2 * nMargin;
+const long nHalfSize = (nSize + 1) / 2;
+const long x = rDropDownRect.Left() + nMargin + (bRotate ?
(rDropDownRect.getWidth() - nHalfSize) / 2 : 0);
+const long y = rDropDownRect.Top() + nMargin + (rDropDownRect.getHeight()
- (bRotate ? nSize : nHalfSize)) / 2;
-long x = rDropDownRect.Left() + (rDropDownRect.getWidth() - width)/2;
-long y = rDropDownRect.Top() + (rDropDownRect.getHeight() - height)/2;
-
-long halfwidth = (width+1)>>1;
aPoly.SetPoint(Point(x, y), 0);
-aPoly.SetPoint(Point(x + halfwidth, y + height), 1);
-aPoly.SetPoint(Point(x + halfwidth*2, y), 2);
+if (bRotate) // >
+{
+aPoly.SetPoint(Point(x, y + nSize), 1);
+aPoly.SetPoint(Point(x + nHalfSize, y + nHalfSize), 2);
+}
+else // v
+{
+aPoly.SetPoint(Point(x + nHalfSize, y + nHalfSize), 1);
+aPoly.SetPoint(Point(x + nSize, y), 2);
+}
aPoly.SetPoint(Point(x, y), 3);
-if (bRotate) // TESTME: harder ...
-aPoly.Rotate(Point(x,y+height/2),2700);
-
auto aaflags = rRenderContext.GetAntialiasing();
rRenderContext.SetAntialiasing(AntialiasingFlags::EnableB2dDraw);
rRenderContext.DrawPolygon( aPoly );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bin/gla11y
bin/gla11y | 51 ++-
1 file changed, 50 insertions(+), 1 deletion(-)
New commits:
commit 0a42d1e94ba9c35f2518f0fe08d3bf6eef8ff081
Author: Samuel Thibault
AuthorDate: Sun Jul 5 22:55:40 2020 +0200
Commit: Thorsten Behrens
CommitDate: Tue Jul 7 14:11:49 2020 +0200
gla11y: Document global variables
Change-Id: Ic8ed50bdff182bab1104b5a22e667aadfd25c684
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97982
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/bin/gla11y b/bin/gla11y
index d29ee4ac62cc..f2dfbbdf81b2 100755
--- a/bin/gla11y
+++ b/bin/gla11y
@@ -247,34 +247,83 @@ widgets_labels = [
progname = os.path.basename(sys.argv[0])
+# This dictionary contains the set of suppression lines as read from the
+# suppression file(s). It is merely indexed by the text of the suppresion line
+# and contains whether the suppressions was unused.
suppressions = {}
+
+# This dictionary is indexed like suppressions and returns a "file:line" string
+# to report where in the suppression file the suppression was read
suppressions_to_line = {}
+
+# This dictionary is similar to the suppressions dictionary, but for false
+# positives rather than suppressions
false_positives = {}
+
+# This dictionary is indexed by the xml id and returns the element object.
ids = {}
+# This dictionary is indexed by the xml id and returns whether several objects
+# have the same id.
ids_dup = {}
+
+# This dictionary is indexed by the xml id of an element A and returns the list
+# of objects which are labelled-by A.
labelled_by_elm = {}
+
+# This dictionary is indexed by the xml id of an element A and returns the list
+# of objects which are label-for A.
label_for_elm = {}
+
+# This dictionary is indexed by the xml id of an element A and returns the list
+# of objects which have a mnemonic-for A.
mnemonic_for_elm = {}
+# Possibly a file name to put generated suppression lines in
gen_suppr = None
+# The corresponding opened file
gen_supprfile = None
+# A prefix to remove from file names in the generated suppression lines
suppr_prefix = ""
+
+# Possibly an opened file in which our output should also be written to.
outfile = None
+# Whether -p option was set, i.e. print XML class path instead of line number
in
+# the output
pflag = False
+# Whether we should warn about labels which are orphan
warn_orphan_labels = True
+# Number of errors
errors = 0
+# Number of suppressed errors
errexists = 0
+# Number of warnings
warnings = 0
+# Number of suppressed warnings
warnexists = 0
+# Number of fatal errors
fatals = 0
+# Number of suppressed fatal errors
fatalexists = 0
-enables = [ ]
+# List of warnings and errors which are fatal
+#
+# Format of each element: (enabled, type, class)
+# See the is_enabled function: the list is traversed completely, each element
+# can specify whether it enables or disables the warning, possibly the type of
+# warning to be enabled/disabled, possibly the class of XML element for which
it
+# should be enabled.
+#
+# This mechanism matches the semantic of the parameters on the command line,
+# each of which refining the semantic set by the previous parameters
dofatals = [ ]
+# List of warnings and errors which are enabled
+# Same format as dofatals
+enables = [ ]
+
# buffers all printed output, so it isn't split in parallel builds
output_buffer = ""
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bin/gla11y
bin/gla11y | 22 ++ 1 file changed, 14 insertions(+), 8 deletions(-) New commits: commit 372b109f4d90dca7bb53f93bc597ce1dd8ba5898 Author: Samuel Thibault AuthorDate: Sat Jul 4 22:54:55 2020 +0200 Commit: Thorsten Behrens CommitDate: Tue Jul 7 14:12:26 2020 +0200 gla11y: improve warning printing Also print the howto URL in messages about suppressed warnings When showing suppression lines, also print the suppression file name. Change-Id: I72da4149c505cec04bf715791f45a2b809d3ce63 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97989 Tested-by: Jenkins Reviewed-by: Thorsten Behrens diff --git a/bin/gla11y b/bin/gla11y index f2dfbbdf81b2..80d3e54a371c 100755 --- a/bin/gla11y +++ b/bin/gla11y @@ -41,6 +41,8 @@ except ImportError: import xml.etree.ElementTree as ET lxml = False +howto_url = "https://wiki.documentfoundation.org/Development/Accessibility"; + # Toplevel widgets widgets_toplevel = [ 'GtkWindow', @@ -1376,7 +1378,7 @@ def main(): continue prefix = line.rstrip() suppressions[prefix] = True -suppressions_to_line[prefix] = line_no +suppressions_to_line[prefix] = "%s:%u" % (suppr, line_no) supprfile.close() except IOError: pass @@ -1429,19 +1431,19 @@ def main(): if errors > 0 or errexists > 0: output_buffer += "%s new error%s" % (errors, 's' if errors != 1 else '') if errexists > 0: -output_buffer += " (%s suppressed)" % (errexists) +output_buffer += " (%s suppressed by %s, please fix %s)" % (errexists, suppr, 'them' if errexists > 1 else 'it') output_buffer += "\n" if warnings > 0 or warnexists > 0: output_buffer += "%s new warning%s" % (warnings, 's' if warnings != 1 else '') if warnexists > 0: -output_buffer += " (%s suppressed)" % (warnexists) +output_buffer += " (%s suppressed by %s, please fix %s)" % (warnexists, suppr, 'them' if warnexists > 1 else 'it') output_buffer += "\n" if fatals > 0 or fatalexists > 0: output_buffer += "%s new fatal%s" % (fatals, 's' if fatals != 1 else '') if fatalexists > 0: -output_buffer += " (%s suppressed)" % (fatalexists) +output_buffer += " (%s suppressed by %s, please fix %s)" % (fatalexists, suppr, 'them' if fatalexists > 1 else 'it') output_buffer += "\n" n = 0 @@ -1459,10 +1461,14 @@ def main(): gen_supprfile.close() if outfile is not None: outfile.close() -if fatals > 0 and gen_suppr is None: -output_buffer += "Explanations are available on https://wiki.documentfoundation.org/Development/Accessibility"; -print(output_header.rstrip() + "\n" + output_buffer) -sys.exit(1) + +if gen_suppr is None: +if output_buffer != "": +output_buffer += "Explanations are available on " + howto_url + "\n" + +if fatals > 0: +print(output_header.rstrip() + "\n" + output_buffer) +sys.exit(1) if len(output_buffer) > 0: print(output_header.rstrip() + "\n" + output_buffer) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/tdf83309.docx |binary writerfilter/source/dmapper/NumberingManager.cxx |2 ++ 2 files changed, 2 insertions(+) New commits: commit 7221994b9b29659d3290e95eee92b1a3f80c2b7e Author: Vasily Melenchuk AuthorDate: Thu Jun 25 11:42:02 2020 +0300 Commit: Thorsten Behrens CommitDate: Tue Jul 7 14:11:16 2020 +0200 tdf#134260: docx import: allow default value for list tab position It looks like previously used as a testcase document is just a specific case with default values. All other readers (incl. Office 365) displaying that doc with default tab at zero position. Change-Id: I50fe00c7f87b6d790fbe6e2f32a306ac59060c72 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97089 Tested-by: Jenkins Reviewed-by: Thorsten Behrens diff --git a/sw/qa/extras/ooxmlexport/data/tdf83309.docx b/sw/qa/extras/ooxmlexport/data/tdf83309.docx index 8dfddb6ed201..e8f59bc81969 100644 Binary files a/sw/qa/extras/ooxmlexport/data/tdf83309.docx and b/sw/qa/extras/ooxmlexport/data/tdf83309.docx differ diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx index 2a51ca351135..e5c813d819a5 100644 --- a/writerfilter/source/dmapper/NumberingManager.cxx +++ b/writerfilter/source/dmapper/NumberingManager.cxx @@ -231,6 +231,8 @@ uno::Sequence ListLevel::GetLevelProperties(bool bDefaults if (m_nTabstop.has_value()) aNumberingProperties.push_back(lcl_makePropVal(PROP_LISTTAB_STOP_POSITION, *m_nTabstop)); +else if (bDefaults) + aNumberingProperties.push_back(lcl_makePropVal(PROP_LISTTAB_STOP_POSITION, 0)); //TODO: handling of nFLegal? //TODO: nFNoRestart lower levels do not restart when higher levels are incremented, like: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sw/qa sw/source
sw/qa/extras/layout/data/tdf134472.odt |binary
sw/qa/extras/layout/layout.cxx |9 +
sw/source/core/layout/flowfrm.cxx |5 -
3 files changed, 13 insertions(+), 1 deletion(-)
New commits:
commit 4d9f1afa79b1446a9cab805de42bd7a8851a006a
Author: Samuel Mehrbrodt
AuthorDate: Mon Jul 6 21:24:49 2020 +0200
Commit: Thorsten Behrens
CommitDate: Tue Jul 7 14:09:53 2020 +0200
tdf#134472 Only add spacing in header when flag is set
Flag was set, but not evaluated in 9b5805d1ef2b9e9c4e8f389c069807bf4489ea95
Change-Id: I46f19945be521e886baa0fc9a9a419d88c0915fe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98224
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
(cherry picked from commit 70f9c3b8f03fb28215985a5b899bd8fae9cb3ac3)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98084
Reviewed-by: Thorsten Behrens
diff --git a/sw/qa/extras/layout/data/tdf134472.odt
b/sw/qa/extras/layout/data/tdf134472.odt
new file mode 100644
index ..a50c99c87622
Binary files /dev/null and b/sw/qa/extras/layout/data/tdf134472.odt differ
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index f24a37ba3704..9e0ee4c66c66 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -453,6 +453,15 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testRedlineFlysInBody)
}
}
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, TestTdf134272)
+{
+SwDoc* pDoc = createDoc("tdf134472.odt");
+CPPUNIT_ASSERT(pDoc);
+xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+assertXPath(pXmlDoc, "/root/page[1]/header/txt[2]/infos/bounds", "height",
"843");
+assertXPath(pXmlDoc, "/root/page[1]/header/txt[2]/infos/bounds", "bottom",
"2819");
+}
+
CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testRedlineFlysInHeader)
{
loadURL("private:factory/swriter", nullptr);
diff --git a/sw/source/core/layout/flowfrm.cxx
b/sw/source/core/layout/flowfrm.cxx
index 06b9db38fefd..73c939ec1a40 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -1712,7 +1712,10 @@ SwTwips SwFlowFrame::CalcLowerSpace( const
SwBorderAttrs* _pAttrs ) const
}
// tdf#128195 Consider para spacing below last paragraph in header
-if (!m_rThis.IsInFly() && m_rThis.FindFooterOrHeader() && !GetFollow() &&
!m_rThis.GetIndNext())
+bool bHasSpacingBelowPara =
m_rThis.GetUpper()->GetFormat()->getIDocumentSettingAccess().get(
+DocumentSettingId::HEADER_SPACING_BELOW_LAST_PARA);
+if (bHasSpacingBelowPara && !m_rThis.IsInFly() &&
m_rThis.FindFooterOrHeader() && !GetFollow()
+&& !m_rThis.GetIndNext())
nLowerSpace += _pAttrs->GetULSpace().GetLower() +
_pAttrs->CalcLineSpacing();
return nLowerSpace;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - include/filter sw/source writerfilter/source
include/filter/msfilter/ww8fields.hxx | 130 ++
sw/source/filter/ww8/fields.hxx | 107 --
sw/source/filter/ww8/ww8atr.cxx |8 -
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 112 ++
4 files changed, 245 insertions(+), 112 deletions(-)
New commits:
commit bbdbaa07ed7e40e1172959fa5dedb8df79f19fc1
Author: Michael Stahl
AuthorDate: Mon Jul 6 19:14:08 2020 +0200
Commit: Thorsten Behrens
CommitDate: Tue Jul 7 14:09:35 2020 +0200
tdf#134264 writerfilter: fix DOCX->DOC of ADDRESSBLOCK field
... and other unsupported ones; the problem was that the field got
exported with ww::eUNKNOWN = 1, which can't be imported again.
Move the ww8 eField enum to include/ so it can be used from
writerfilter.
(regression from
e511a0ca5dde6d731bb126bbfe21768867890102..d9030ad6298e2f49ee63489d6158ea6ad23c0111)
Change-Id: I19193392d62fdf0bba01fac2516bafe9fdfa5a99
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98221
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit ae2e8202407e82c9b14f0cc307742561f8c6e530)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98244
Reviewed-by: Thorsten Behrens
diff --git a/include/filter/msfilter/ww8fields.hxx
b/include/filter/msfilter/ww8fields.hxx
new file mode 100644
index ..8399fe22edb0
--- /dev/null
+++ b/include/filter/msfilter/ww8fields.hxx
@@ -0,0 +1,130 @@
+/* -*- 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 .
+ */
+
+#pragma once
+
+namespace ww
+{
+enum eField
+{
+eNONE = 0,
+eUNKNOWN = 1,
+ePOSSIBLEBOOKMARK = 2,
+eREF = 3,
+eXE = 4,
+eFOOTREF = 5,
+eSET = 6,
+eIF = 7,
+eINDEX = 8,
+eTC = 9,
+eSTYLEREF = 10,
+eRD = 11,
+eSEQ = 12,
+eTOC = 13,
+eINFO = 14,
+eTITLE = 15,
+eSUBJECT = 16,
+eAUTHOR = 17,
+eKEYWORDS = 18,
+eCOMMENTS = 19,
+eLASTSAVEDBY = 20,
+eCREATEDATE = 21,
+eSAVEDATE = 22,
+ePRINTDATE = 23,
+eREVNUM = 24,
+eEDITTIME = 25,
+eNUMPAGES = 26,
+eNUMWORDS = 27,
+eNUMCHARS = 28,
+eFILENAME = 29,
+eTEMPLATE = 30,
+eDATE = 31,
+eTIME = 32,
+ePAGE = 33,
+eEquals = 34,
+eQUOTE = 35,
+eMERGEINC = 36,
+ePAGEREF = 37,
+eASK = 38,
+eFILLIN = 39,
+eMERGEDATA = 40,
+eNEXT = 41,
+eNEXTIF = 42,
+eSKIPIF = 43,
+eMERGEREC = 44,
+eDDEREF = 45,
+eDDEAUTOREF = 46,
+eGLOSSREF = 47,
+ePRINT = 48,
+eEQ = 49,
+eGOTOBUTTON = 50,
+eMACROBUTTON = 51,
+eAUTONUMOUT = 52,
+eAUTONUMLGL = 53,
+eAUTONUM = 54,
+eINCLUDETIFF = 55,
+eLINK = 56,
+eSYMBOL = 57,
+eEMBED = 58,
+eMERGEFIELD = 59,
+eUSERNAME = 60,
+eUSERINITIALS = 61,
+eUSERADDRESS = 62,
+eBARCODE = 63,
+eDOCVARIABLE = 64,
+eSECTION = 65,
+eSECTIONPAGES = 66,
+eINCLUDEPICTURE = 67,
+eINCLUDETEXT = 68,
+eFILESIZE = 69,
+eFORMTEXT = 70,
+eFORMCHECKBOX = 71,
+eNOTEREF = 72,
+eTOA = 73,
+eTA = 74,
+eMERGESEQ = 75,
+eMACRO = 76,
+ePRIVATE = 77,
+eDATABASE = 78,
+eAUTOTEXT = 79,
+eCOMPARE = 80,
+ePLUGIN = 81,
+eSUBSCRIBER = 82,
+eFORMDROPDOWN = 83,
+eADVANCE = 84,
+eDOCPROPERTY = 85,
+eUNKNOWN2 = 86,
+eCONTROL = 87,
+eHYPERLINK = 88,
+eAUTOTEXTLIST = 89,
+eLISTNUM = 90,
+eHTMLCONTROL = 91,
+eBIDIOUTLINE = 92,
+eADDRESSBLOCK = 93,
+eGREETINGLINE = 94,
+eSHAPE = 95,
+// NOTE: values > 95 / 0x5F do not correspond to documented WW8 fields
+// and thus need special handling in WW8Export::OutputField()!
+eBIBLIOGRAPHY = 96,
+eCITATION = 97,
+eFORMDATE = 98,
+};
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/fields.hxx b/sw/source/filter/ww8/fields.hxx
index 8e24ca11d37b..9f3b0aafa252 100644
--- a/sw/source/filter/ww8/fields.hxx
+++ b/sw/source/filter/ww8/fields.hxx
@@ -21,113 +21,10 @@
#ifndef INCLUDED_SW_SOURCE_FILTER_WW8_FIELDS_HXX
#define INCLUD
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sw/qa sw/source
sw/qa/extras/layout/data/tdf134472.odt |binary
sw/qa/extras/layout/layout.cxx |8
sw/source/core/layout/flowfrm.cxx |5 -
3 files changed, 12 insertions(+), 1 deletion(-)
New commits:
commit c68fc819f78312c17ef6c4aee20a3759a2b10280
Author: Samuel Mehrbrodt
AuthorDate: Mon Jul 6 21:24:49 2020 +0200
Commit: Thorsten Behrens
CommitDate: Tue Jul 7 14:09:58 2020 +0200
tdf#134472 Only add spacing in header when flag is set
Flag was set, but not evaluated in 9b5805d1ef2b9e9c4e8f389c069807bf4489ea95
Change-Id: I46f19945be521e886baa0fc9a9a419d88c0915fe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98224
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
(cherry picked from commit 70f9c3b8f03fb28215985a5b899bd8fae9cb3ac3)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98085
Reviewed-by: Thorsten Behrens
diff --git a/sw/qa/extras/layout/data/tdf134472.odt
b/sw/qa/extras/layout/data/tdf134472.odt
new file mode 100644
index ..a50c99c87622
Binary files /dev/null and b/sw/qa/extras/layout/data/tdf134472.odt differ
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index 774b495b31e8..62a94a242a37 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -470,6 +470,14 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testRedlineFlysInBody)
}
}
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, TestTdf134272)
+{
+SwDoc* pDoc = createDoc("tdf134472.odt");
+CPPUNIT_ASSERT(pDoc);
+xmlDocPtr pXmlDoc = parseLayoutDump();
+assertXPath(pXmlDoc, "/root/page[1]/header/txt[2]/infos/bounds", "height",
"843");
+}
+
CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testRedlineFlysInHeader)
{
loadURL("private:factory/swriter", nullptr);
diff --git a/sw/source/core/layout/flowfrm.cxx
b/sw/source/core/layout/flowfrm.cxx
index 466e0e1855bc..6d83406583a7 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -1697,7 +1697,10 @@ SwTwips SwFlowFrame::CalcLowerSpace( const
SwBorderAttrs* _pAttrs ) const
}
// tdf#128195 Consider para spacing below last paragraph in header
-if (!m_rThis.IsInFly() && m_rThis.FindFooterOrHeader() && !GetFollow() &&
!m_rThis.GetIndNext())
+bool bHasSpacingBelowPara =
m_rThis.GetUpper()->GetFormat()->getIDocumentSettingAccess().get(
+DocumentSettingId::HEADER_SPACING_BELOW_LAST_PARA);
+if (bHasSpacingBelowPara && !m_rThis.IsInFly() &&
m_rThis.FindFooterOrHeader() && !GetFollow()
+&& !m_rThis.GetIndNext())
nLowerSpace += _pAttrs->GetULSpace().GetLower() +
_pAttrs->CalcLineSpacing();
return nLowerSpace;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - include/filter sw/source writerfilter/source
include/filter/msfilter/ww8fields.hxx | 130 ++
sw/source/filter/ww8/fields.hxx | 107 --
sw/source/filter/ww8/ww8atr.cxx |8 -
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 112 ++
4 files changed, 245 insertions(+), 112 deletions(-)
New commits:
commit 997e7011877b6559fce7173972c73fe0917212cb
Author: Michael Stahl
AuthorDate: Mon Jul 6 19:14:08 2020 +0200
Commit: Thorsten Behrens
CommitDate: Tue Jul 7 14:09:19 2020 +0200
tdf#134264 writerfilter: fix DOCX->DOC of ADDRESSBLOCK field
... and other unsupported ones; the problem was that the field got
exported with ww::eUNKNOWN = 1, which can't be imported again.
Move the ww8 eField enum to include/ so it can be used from
writerfilter.
(regression from
e511a0ca5dde6d731bb126bbfe21768867890102..d9030ad6298e2f49ee63489d6158ea6ad23c0111)
Change-Id: I19193392d62fdf0bba01fac2516bafe9fdfa5a99
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98221
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit ae2e8202407e82c9b14f0cc307742561f8c6e530)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98086
Reviewed-by: Thorsten Behrens
diff --git a/include/filter/msfilter/ww8fields.hxx
b/include/filter/msfilter/ww8fields.hxx
new file mode 100644
index ..8399fe22edb0
--- /dev/null
+++ b/include/filter/msfilter/ww8fields.hxx
@@ -0,0 +1,130 @@
+/* -*- 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 .
+ */
+
+#pragma once
+
+namespace ww
+{
+enum eField
+{
+eNONE = 0,
+eUNKNOWN = 1,
+ePOSSIBLEBOOKMARK = 2,
+eREF = 3,
+eXE = 4,
+eFOOTREF = 5,
+eSET = 6,
+eIF = 7,
+eINDEX = 8,
+eTC = 9,
+eSTYLEREF = 10,
+eRD = 11,
+eSEQ = 12,
+eTOC = 13,
+eINFO = 14,
+eTITLE = 15,
+eSUBJECT = 16,
+eAUTHOR = 17,
+eKEYWORDS = 18,
+eCOMMENTS = 19,
+eLASTSAVEDBY = 20,
+eCREATEDATE = 21,
+eSAVEDATE = 22,
+ePRINTDATE = 23,
+eREVNUM = 24,
+eEDITTIME = 25,
+eNUMPAGES = 26,
+eNUMWORDS = 27,
+eNUMCHARS = 28,
+eFILENAME = 29,
+eTEMPLATE = 30,
+eDATE = 31,
+eTIME = 32,
+ePAGE = 33,
+eEquals = 34,
+eQUOTE = 35,
+eMERGEINC = 36,
+ePAGEREF = 37,
+eASK = 38,
+eFILLIN = 39,
+eMERGEDATA = 40,
+eNEXT = 41,
+eNEXTIF = 42,
+eSKIPIF = 43,
+eMERGEREC = 44,
+eDDEREF = 45,
+eDDEAUTOREF = 46,
+eGLOSSREF = 47,
+ePRINT = 48,
+eEQ = 49,
+eGOTOBUTTON = 50,
+eMACROBUTTON = 51,
+eAUTONUMOUT = 52,
+eAUTONUMLGL = 53,
+eAUTONUM = 54,
+eINCLUDETIFF = 55,
+eLINK = 56,
+eSYMBOL = 57,
+eEMBED = 58,
+eMERGEFIELD = 59,
+eUSERNAME = 60,
+eUSERINITIALS = 61,
+eUSERADDRESS = 62,
+eBARCODE = 63,
+eDOCVARIABLE = 64,
+eSECTION = 65,
+eSECTIONPAGES = 66,
+eINCLUDEPICTURE = 67,
+eINCLUDETEXT = 68,
+eFILESIZE = 69,
+eFORMTEXT = 70,
+eFORMCHECKBOX = 71,
+eNOTEREF = 72,
+eTOA = 73,
+eTA = 74,
+eMERGESEQ = 75,
+eMACRO = 76,
+ePRIVATE = 77,
+eDATABASE = 78,
+eAUTOTEXT = 79,
+eCOMPARE = 80,
+ePLUGIN = 81,
+eSUBSCRIBER = 82,
+eFORMDROPDOWN = 83,
+eADVANCE = 84,
+eDOCPROPERTY = 85,
+eUNKNOWN2 = 86,
+eCONTROL = 87,
+eHYPERLINK = 88,
+eAUTOTEXTLIST = 89,
+eLISTNUM = 90,
+eHTMLCONTROL = 91,
+eBIDIOUTLINE = 92,
+eADDRESSBLOCK = 93,
+eGREETINGLINE = 94,
+eSHAPE = 95,
+// NOTE: values > 95 / 0x5F do not correspond to documented WW8 fields
+// and thus need special handling in WW8Export::OutputField()!
+eBIBLIOGRAPHY = 96,
+eCITATION = 97,
+eFORMDATE = 98,
+};
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/fields.hxx b/sw/source/filter/ww8/fields.hxx
index 8e24ca11d37b..9f3b0aafa252 100644
--- a/sw/source/filter/ww8/fields.hxx
+++ b/sw/source/filter/ww8/fields.hxx
@@ -21,113 +21,10 @@
#ifndef INCLUDED_SW_SOURCE_FILTER_WW8_FIELDS_HXX
#define INCLUD
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - download.lst external/mdds
download.lst |4 -
external/mdds/UnpackedTarball_mdds.mk |5 +-
external/mdds/Wdeprecated-copy.patch | 11
external/mdds/delta-signed-int.diff | 44 +
external/mdds/remove-warnings.diff| 84 ++
5 files changed, 133 insertions(+), 15 deletions(-)
New commits:
commit 19c068f825ace98e67322c535fd318ab4a32ba2d
Author: Kohei Yoshida
AuthorDate: Thu Feb 6 21:38:19 2020 -0500
Commit: Michael Meeks
CommitDate: Tue Jul 7 14:06:23 2020 +0200
Update mdds to 1.6.0.
Change-Id: Iff350b47d5d237e0bb3ffcce0e80ce867c74191d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88191
Tested-by: Kohei Yoshida
Reviewed-by: Kohei Yoshida
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98243
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Michael Meeks
diff --git a/download.lst b/download.lst
index 97dcad75633f..fb9f0eef3c76 100644
--- a/download.lst
+++ b/download.lst
@@ -192,8 +192,8 @@ export LXML_SHA256SUM :=
940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a
export LXML_TARBALL := lxml-4.1.1.tgz
export MARIADB_CONNECTOR_C_SHA256SUM :=
431434d3926f4bcce2e5c97240609983f60d7ff50df5a72083934759bb863f7b
export MARIADB_CONNECTOR_C_TARBALL := mariadb-connector-c-3.1.8-src.tar.gz
-export MDDS_SHA256SUM :=
144d6debd7be32726f332eac14ef9f17e2d3cf89cb3250eb31a7127e0789680d
-export MDDS_TARBALL := mdds-1.5.0.tar.bz2
+export MDDS_SHA256SUM :=
f1585c9cbd12f83a6d43d395ac1ab6a9d9d5d77f062c7b5f704e24ed72dae07d
+export MDDS_TARBALL := mdds-1.6.0.tar.bz2
export MDNSRESPONDER_SHA256SUM :=
e777b4d7dbf5eb1552cb80090ad1ede319067ab6e45e3990d68aabf6e8b3f5a0
export MDNSRESPONDER_TARBALL := mDNSResponder-878.200.35.tar.gz
export MSPUB_SHA256SUM :=
ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba
diff --git a/external/mdds/UnpackedTarball_mdds.mk
b/external/mdds/UnpackedTarball_mdds.mk
index c5ca78bd368c..17834c6d100e 100644
--- a/external/mdds/UnpackedTarball_mdds.mk
+++ b/external/mdds/UnpackedTarball_mdds.mk
@@ -11,10 +11,11 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,mdds))
$(eval $(call gb_UnpackedTarball_set_tarball,mdds,$(MDDS_TARBALL)))
-$(eval $(call gb_UnpackedTarball_set_patchlevel,mdds,0))
+$(eval $(call gb_UnpackedTarball_set_patchlevel,mdds,1))
$(eval $(call gb_UnpackedTarball_add_patches,mdds,\
-external/mdds/Wdeprecated-copy.patch \
+external/mdds/remove-warnings.diff \
+external/mdds/delta-signed-int.diff \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/mdds/Wdeprecated-copy.patch
b/external/mdds/Wdeprecated-copy.patch
deleted file mode 100644
index edcb2ddaa9ec..
--- a/external/mdds/Wdeprecated-copy.patch
+++ /dev/null
@@ -1,11 +0,0 @@
include/mdds/multi_type_vector_itr.hpp
-+++ include/mdds/multi_type_vector_itr.hpp
-@@ -71,8 +71,6 @@
- private_data() : block_index(0) {}
- private_data(size_type _block_index) :
- block_index(_block_index) {}
--private_data(const private_data& other) :
--block_index(other.block_index) {}
-
- void swap(private_data& other)
- {
diff --git a/external/mdds/delta-signed-int.diff
b/external/mdds/delta-signed-int.diff
new file mode 100644
index ..8612b854378d
--- /dev/null
+++ b/external/mdds/delta-signed-int.diff
@@ -0,0 +1,44 @@
+diff --git a/include/mdds/multi_type_vector.hpp
b/include/mdds/multi_type_vector.hpp
+index d941ee2..71c34f3 100644
+--- a/include/mdds/multi_type_vector.hpp
b/include/mdds/multi_type_vector.hpp
+@@ -1071,7 +1071,7 @@ public:
+
+ private:
+
+-void adjust_block_positions(int64_t start_block_index, size_type delta);
++void adjust_block_positions(int64_t start_block_index, int64_t delta);
+
+ /**
+ * Delete only the element block owned by an outer block.
+diff --git a/include/mdds/multi_type_vector_def.inl
b/include/mdds/multi_type_vector_def.inl
+index d4fff49..7509e3e 100644
+--- a/include/mdds/multi_type_vector_def.inl
b/include/mdds/multi_type_vector_def.inl
+@@ -503,7 +503,7 @@ multi_type_vector<_CellBlockFunc, _EventFunc>::set(const
iterator& pos_hint, siz
+ }
+
+ template
+-void multi_type_vector<_CellBlockFunc,
_EventFunc>::adjust_block_positions(int64_t start_block_index, size_type delta)
++void multi_type_vector<_CellBlockFunc,
_EventFunc>::adjust_block_positions(int64_t start_block_index, int64_t delta)
+ {
+ int64_t n = m_blocks.size();
+
+@@ -2927,7 +2927,7 @@ void multi_type_vector<_CellBlockFunc,
_EventFunc>::erase_impl(size_type start_r
+ // Now, erase all blocks in between.
+ delete_element_blocks(it_erase_begin, it_erase_end);
+ auto it_adjust_block = m_blocks.erase(it_erase_begin, it_erase_end);
+-size_type delta = end_row - start_row + 1;
++int64_t delta = end_row - start_row + 1;
+ m_cur_size -= delta;
+
+ if (m_blocks.empty())
+@@ -2945,7 +2945,7 @@ void multi_type_vector<_Ce
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - vcl/inc vcl/jsdialog
vcl/inc/jsdialog/jsdialogbuilder.hxx |4 +++-
vcl/jsdialog/jsdialogbuilder.cxx | 27 +++
2 files changed, 26 insertions(+), 5 deletions(-)
New commits:
commit aff12153caab1abd5ab576cf5ff36b49c25310d4
Author: Szymon Kłos
AuthorDate: Tue Jul 7 13:15:31 2020 +0200
Commit: Szymon Kłos
CommitDate: Tue Jul 7 13:49:15 2020 +0200
jsdialog: force update if tab is selected again
This will allow to add additional tabs in the view
(not existing in the JSON) and switching tabs still
will work properly.
Change-Id: Ia6901da3157b391502d5170f599410bfd6ea2c61
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98253
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
diff --git a/vcl/inc/jsdialog/jsdialogbuilder.hxx
b/vcl/inc/jsdialog/jsdialogbuilder.hxx
index ffc67e98ac5e..3118d3b65894 100644
--- a/vcl/inc/jsdialog/jsdialogbuilder.hxx
+++ b/vcl/inc/jsdialog/jsdialogbuilder.hxx
@@ -30,11 +30,13 @@ class JSDialogNotifyIdle : public Idle
{
VclPtr m_aWindow;
std::string m_LastNotificationMessage;
+bool m_bForce;
public:
JSDialogNotifyIdle(VclPtr aWindow);
void Invoke() override;
+void ForceUpdate();
};
class VCL_DLLPUBLIC JSDialogSender
@@ -47,7 +49,7 @@ public:
{
}
-void notifyDialogState();
+void notifyDialogState(bool bForce = false);
};
class JSInstanceBuilder : public SalInstanceBuilder
diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index 4601a26d4cd1..d9fcf3032081 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -22,10 +22,13 @@ JSDialogNotifyIdle::JSDialogNotifyIdle(VclPtr
aWindow)
: Idle("JSDialog notify")
, m_aWindow(aWindow)
, m_LastNotificationMessage()
+, m_bForce(false)
{
SetPriority(TaskPriority::POST_PAINT);
}
+void JSDialogNotifyIdle::ForceUpdate() { m_bForce = true; }
+
void JSDialogNotifyIdle::Invoke()
{
try
@@ -41,8 +44,9 @@ void JSDialogNotifyIdle::Invoke()
aTree.put("id", m_aWindow->GetLOKWindowId());
boost::property_tree::write_json(aStream, aTree);
const std::string message = aStream.str();
-if (message != m_LastNotificationMessage)
+if (m_bForce || message != m_LastNotificationMessage)
{
+m_bForce = false;
m_LastNotificationMessage = message;
pNotifier->libreOfficeKitViewCallback(LOK_CALLBACK_JSDIALOG,
message.c_str());
}
@@ -54,7 +58,12 @@ void JSDialogNotifyIdle::Invoke()
}
}
-void JSDialogSender::notifyDialogState() { mpIdleNotify->Start(); }
+void JSDialogSender::notifyDialogState(bool bForce)
+{
+if (bForce)
+mpIdleNotify->ForceUpdate();
+mpIdleNotify->Start();
+}
JSInstanceBuilder::JSInstanceBuilder(weld::Widget* pParent, const OUString&
rUIRoot,
const OUString& rUIFile)
@@ -479,14 +488,24 @@ JSNotebook::JSNotebook(VclPtr
aOwnedToplevel, ::TabControl* pContro
void JSNotebook::set_current_page(int nPage)
{
+bool bForce = false;
+int nCurrent = get_current_page();
+if (nCurrent == nPage)
+bForce = true;
+
SalInstanceNotebook::set_current_page(nPage);
-notifyDialogState();
+notifyDialogState(bForce);
}
void JSNotebook::set_current_page(const OString& rIdent)
{
+bool bForce = false;
+OString sCurrent = get_current_page_ident();
+if (sCurrent == rIdent)
+bForce = true;
+
SalInstanceNotebook::set_current_page(rIdent);
-notifyDialogState();
+notifyDialogState(bForce);
}
void JSNotebook::remove_page(const OString& rIdent)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/inc
framework/inc/pch/precompiled_fwk.hxx |1 - 1 file changed, 1 deletion(-) New commits: commit eccb763146325bd44a84b6a1698109ebd1bcf35e Author: Andrea Gelmini AuthorDate: Sat Jul 4 21:02:22 2020 +0200 Commit: Julien Nabet CommitDate: Tue Jul 7 12:41:11 2020 +0200 Removed duplicated include Change-Id: I33b3a56d9727dea2cbafcfbf73f5d4c08069ba34 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98030 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/framework/inc/pch/precompiled_fwk.hxx b/framework/inc/pch/precompiled_fwk.hxx index 39c7a24e7361..b8109e1107e0 100644 --- a/framework/inc/pch/precompiled_fwk.hxx +++ b/framework/inc/pch/precompiled_fwk.hxx @@ -251,7 +251,6 @@ #if PCH_LEVEL >= 4 #include #include -#include #include #include #endif // PCH_LEVEL >= 4 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/layout/layout.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit cdb1671d05ffebf4ff1a02bc6383fec71e8f827c Author: Andrea Gelmini AuthorDate: Tue Jul 7 11:52:27 2020 +0200 Commit: Julien Nabet CommitDate: Tue Jul 7 12:39:31 2020 +0200 Fix typo Change-Id: Ib6aa24401db9cd39b314800f4fb5e4443aeec198 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98249 Tested-by: Julien Nabet Reviewed-by: Julien Nabet diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx index 94cd82d26782..8aee5a95a6fe 100644 --- a/sw/qa/extras/layout/layout.cxx +++ b/sw/qa/extras/layout/layout.cxx @@ -2853,7 +2853,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf134146) // Without the accompanying fix in place, this test would have failed with: // - Expected: 14 // - Actual : 13 -// i.e. the Y axis title didn't break to multilple lines. +// i.e. the Y axis title didn't break to multiple lines. assertXPath(pXmlDoc, "//textarray", 14); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sax oox/source sc/source sd/source
include/sax/fshelper.hxx | 41 -
oox/source/export/drawingml.cxx | 56 +++---
oox/source/export/shapes.cxx |8 ++--
sc/source/filter/excel/xecontent.cxx | 15 +++-
sc/source/filter/excel/xeescher.cxx |8 ++--
sc/source/filter/excel/xeextlst.cxx |4 +-
sc/source/filter/excel/xestyle.cxx|4 +-
sd/source/filter/eppt/pptx-animations.cxx | 38 ++--
sd/source/filter/eppt/pptx-epptooxml.cxx |8 ++--
9 files changed, 101 insertions(+), 81 deletions(-)
New commits:
commit b7ed6de51422ca7bc8333e80ae6e9a4d57e07239
Author: Mike Kaganski
AuthorDate: Mon Jul 6 02:08:33 2020 +0300
Commit: Mike Kaganski
CommitDate: Tue Jul 7 12:21:27 2020 +0200
Use std::optional to allow optional inclusion of attributes
... instead of converting the O(U)String objects to char*.
Eventually this could allow to drop variants of *Element that take
XFastAttributeListRef.
Change-Id: Ib2748fcd93e655c55a176c00410fdcc7f052930d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98179
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/include/sax/fshelper.hxx b/include/sax/fshelper.hxx
index 235181bf9846..e4b5072345e2 100644
--- a/include/sax/fshelper.hxx
+++ b/include/sax/fshelper.hxx
@@ -25,6 +25,7 @@
#include
#include
#include
+#include
#include
#include
@@ -58,16 +59,21 @@ public:
startElement(elementTokenId, std::forward(args)...);
}
template
-void startElement(sal_Int32 elementTokenId, sal_Int32 attribute, const
OString& value, Args &&... args)
+void startElement(sal_Int32 elementTokenId, sal_Int32 attribute,
+ const std::optional& value, Args&&... args)
{
-pushAttributeValue(attribute, value);
+if (value)
+pushAttributeValue(attribute, *value);
startElement(elementTokenId, std::forward(args)...);
}
template
-void startElement(sal_Int32 elementTokenId, sal_Int32 attribute, const
OUString& value, Args&&... args)
+void startElement(sal_Int32 elementTokenId, sal_Int32 attribute,
+ const std::optional& value, Args&&... args)
{
-// The temporary created by toUtf8() must stay alive until
startElement() ends using it
-startElement(elementTokenId, attribute, value.toUtf8(),
std::forward(args)...);
+std::optional opt;
+if (value)
+opt = value->toUtf8();
+startElement(elementTokenId, attribute, opt,
std::forward(args)...);
}
void startElement(sal_Int32 elementTokenId);
@@ -87,16 +93,21 @@ public:
singleElement(elementTokenId, std::forward(args)...);
}
template
-void singleElement(sal_Int32 elementTokenId, sal_Int32 attribute, const
OString& value, Args &&... args)
+void singleElement(sal_Int32 elementTokenId, sal_Int32 attribute,
+ const std::optional& value, Args&&... args)
{
-pushAttributeValue(attribute, value);
+if (value)
+pushAttributeValue(attribute, *value);
singleElement(elementTokenId, std::forward(args)...);
}
template
-void singleElement(sal_Int32 elementTokenId, sal_Int32 attribute, const
OUString& value, Args&&... args)
+void singleElement(sal_Int32 elementTokenId, sal_Int32 attribute,
+ const std::optional& value, Args&&... args)
{
-// The temporary created by toUtf8() must stay alive until
singleElement() ends using it
-singleElement(elementTokenId, attribute, value.toUtf8(),
std::forward(args)...);
+std::optional opt;
+if (value)
+opt = value->toUtf8();
+singleElement(elementTokenId, attribute, opt,
std::forward(args)...);
}
void singleElement(sal_Int32 elementTokenId);
@@ -150,6 +161,16 @@ private:
typedef std::shared_ptr< FastSerializerHelper > FSHelperPtr;
+// Helpers to make intention to pass optional attributes to *Element finctions
explicit, instead of
+// using `(condition) ? value.toUtf8().getStr() : nullptr` syntax.
+inline const char* UseIf(const char* s, bool bUse) { return bUse ? s :
nullptr; }
+// OString, OUString
+template
+std::optional UseIf(const TString& s, bool bUse)
+{
+return bUse ? std::optional(s) : std::optional();
+}
+
}
#endif // INCLUDED_SAX_FSHELPER_HXX
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 1d52bef4b25c..052ea8f93090 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -860,8 +860,8 @@ void DrawingML::WriteOutline( const
Reference& rXPropSet, Referenc
nEmuLineWidth = oox::drawingml::convertHmmToEmu(nLineWidth);
mpFS->startElementNS( XML_a, XML_ln,
XML_cap, cap,
- XML_w, nLineWidth == 0 || (nLineWidth > 1 &&
nStyleL
[Libreoffice-commits] core.git: drawinglayer/drawinglayer.component drawinglayer/Library_drawinglayer.mk drawinglayer/source solenv/bin
drawinglayer/Library_drawinglayer.mk |1
drawinglayer/drawinglayer.component |5 -
drawinglayer/source/drawinglayeruno/drawinglayeruno.cxx | 55 ---
drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx | 41 ++--
drawinglayer/source/drawinglayeruno/xprimitive2drenderer.hxx | 49 -
solenv/bin/native-code.py|3
6 files changed, 16 insertions(+), 138 deletions(-)
New commits:
commit 125f3c4c930bd28a42c6819417b11b885e4586fc
Author: Noel Grandin
AuthorDate: Mon Jul 6 18:46:12 2020 +0200
Commit: Noel Grandin
CommitDate: Tue Jul 7 11:56:41 2020 +0200
drawinglayer: create instances with uno constructors
See tdf#74608 for motivation
Change-Id: I38de5ec7b9e376ef8868bebbe7f30240de81c241
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98219
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/drawinglayer/Library_drawinglayer.mk
b/drawinglayer/Library_drawinglayer.mk
index 24b8055836d0..43a42b83b42c 100644
--- a/drawinglayer/Library_drawinglayer.mk
+++ b/drawinglayer/Library_drawinglayer.mk
@@ -187,7 +187,6 @@ $(eval $(call
gb_Library_add_exception_objects,drawinglayer,\
drawinglayer/source/tools/emfpcustomlinecap \
drawinglayer/source/tools/wmfemfhelper \
drawinglayer/source/tools/primitive2dxmldump \
-drawinglayer/source/drawinglayeruno/drawinglayeruno \
drawinglayer/source/drawinglayeruno/xprimitive2drenderer \
drawinglayer/source/texture/texture \
drawinglayer/source/dumper/XShapeDumper \
diff --git a/drawinglayer/drawinglayer.component
b/drawinglayer/drawinglayer.component
index 146df69790b5..0b35eab47b83 100644
--- a/drawinglayer/drawinglayer.component
+++ b/drawinglayer/drawinglayer.component
@@ -18,8 +18,9 @@
-->
http://openoffice.org/2010/uno-components";>
-
+xmlns="http://openoffice.org/2010/uno-components";>
+
diff --git a/drawinglayer/source/drawinglayeruno/drawinglayeruno.cxx
b/drawinglayer/source/drawinglayeruno/drawinglayeruno.cxx
deleted file mode 100644
index 52438318e77f..
--- a/drawinglayer/source/drawinglayeruno/drawinglayeruno.cxx
+++ /dev/null
@@ -1,55 +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
-#include
-#include
-#include
-
-#include "xprimitive2drenderer.hxx"
-
-using namespace ::com::sun::star;
-
-extern "C"
-{
-SAL_DLLPUBLIC_EXPORT void* drawinglayer_component_getFactory( const char*
pImplName, void* pServiceManager, void* /* pRegistryKey */ )
-{
-uno::Reference< lang::XSingleServiceFactory > xFactory;
-void* pRet = nullptr;
-
-
if(drawinglayer::unorenderer::XPrimitive2DRenderer_getImplementationName().equalsAscii(pImplName))
-{
-xFactory = ::cppu::createSingleFactory(
-static_cast< lang::XMultiServiceFactory * >(pServiceManager),
-
drawinglayer::unorenderer::XPrimitive2DRenderer_getImplementationName(),
-drawinglayer::unorenderer::XPrimitive2DRenderer_createInstance,
-
drawinglayer::unorenderer::XPrimitive2DRenderer_getSupportedServiceNames());
-}
-
-if(xFactory.is())
-{
-xFactory->acquire();
-pRet = xFactory.get();
-}
-
-return pRet;
-}
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
index e4708c4131b4..66b29591df7e 100644
--- a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
+++ b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
@@ -20,8 +20,8 @@
#include
#include
-#include
#include
+#include
#include
#include
#include
@@ -35,8 +35,6 @@
#include
-#include "xprimitive2drenderer.hxx"
-
using namespace ::com::sun::star;
@@ -70,32 +68,7 @@ namespace drawinglayer::unorenderer
};
}
-} // end of namespace drawinglayer::unorenderer
-
-
-// uno functions
-
Re: Error in building LibreOffice
On 07.07.2020 12:41, anshu khare wrote: > Someone please help me with this. > > On Sun, 5 Jul, 2020, 10:06 PM anshu khare, wrote: > >> The link says about solving the error >> >> >> ALINK: error AL1078: Error signing assembly -- Access is denied. Possibly no one who reads the list remembers anything similar. I don't know if that might help; you haven't indicated the arguments you used for autogen, and that could shed some light... (and then, you are likely to had followed the build directions in the wiki not carefully enough - because of your previous question, which indicated that you haven't followed the list of required components in VS; so the things might had went wrong in so many ways...). Please mention as much information as possible, and follow the guides as carefully as possible. Maybe using --disable-windows-build-signing in autogen.input could affect this - just guessing. -- Best regards, Mike Kaganski pEpkey.asc Description: application/pgp-keys ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/ui/view/gridwin.cxx | 12
1 file changed, 12 insertions(+)
New commits:
commit 33509fd9483099470160abb66074c5d052b31eda
Author: Dennis Francis
AuthorDate: Wed Jun 3 14:59:12 2020 +0530
Commit: Dennis Francis
CommitDate: Tue Jul 7 11:49:00 2020 +0200
ScGridWindow::UpdateEditViewPos: keep EditView's print-twips data updated
Change-Id: I2f6fab371a107a4f16704030e341198a541020f8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98127
Tested-by: Jenkins
Reviewed-by: Dennis Francis
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 1e747fa6fe46..6e173754b79a 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -4554,6 +4554,18 @@ void ScGridWindow::UpdateEditViewPos()
{
// bForceToTop = sal_True for editing
tools::Rectangle aPixRect = pViewData->GetEditArea( eWhich, nCol,
nRow, this, nullptr, true );
+
+if (comphelper::LibreOfficeKit::isActive() &&
+comphelper::LibreOfficeKit::isCompatFlagSet(
+comphelper::LibreOfficeKit::Compat::scPrintTwipsMsgs))
+{
+tools::Rectangle aPTwipsRect = pViewData->GetEditArea(eWhich,
nCol, nRow, this, nullptr,
+true, true /* bInPrintTwips */);
+tools::Rectangle aOutputAreaPTwips =
pView->GetLOKSpecialOutputArea();
+aOutputAreaPTwips.SetPos(aPTwipsRect.TopLeft());
+pView->SetLOKSpecialOutputArea(aOutputAreaPTwips);
+}
+
Point aScrPos = PixelToLogic( aPixRect.TopLeft(),
pViewData->GetLogicMode() );
tools::Rectangle aRect = pView->GetOutputArea();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/view/viewdata.cxx | 23 ++-
1 file changed, 22 insertions(+), 1 deletion(-)
New commits:
commit 5483183ab0389914830fa183af1242860f2ab0a6
Author: Dennis Francis
AuthorDate: Wed Jun 3 14:02:44 2020 +0530
Commit: Dennis Francis
CommitDate: Tue Jul 7 11:48:00 2020 +0200
ScViewData::EditGrowY: keep EditView's print-twips data updated
Change-Id: I0207e65fc0386eb9a86de6ab4472780553eadd4a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98126
Tested-by: Jenkins
Reviewed-by: Dennis Francis
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 11f24c453fa8..7a4d8224a06f 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -2050,6 +2050,10 @@ void ScViewData::EditGrowY( bool bInitial )
comphelper::FlagRestorationGuard aFlagGuard(bGrowing, true);
+bool bLOKActive = comphelper::LibreOfficeKit::isActive();
+bool bLOKPrintTwips = bLOKActive &&
comphelper::LibreOfficeKit::isCompatFlagSet(
+comphelper::LibreOfficeKit::Compat::scPrintTwipsMsgs);
+
ScSplitPos eWhich = GetActivePart();
ScVSplitPos eVWhich = WhichV(eWhich);
EditView* pCurView = pEditView[eWhich].get();
@@ -2069,11 +2073,21 @@ void ScViewData::EditGrowY( bool bInitial )
EditEngine* pEngine = pCurView->GetEditEngine();
vcl::Window* pWin = pCurView->GetWindow();
+MapUnit eWinUnit = GetLogicMode(eWhich).GetMapUnit();
SCROW nBottom = GetPosY(eVWhich) + VisibleCellsY(eVWhich);
SizeaSize = pEngine->GetPaperSize();
+Size aSizePTwips;
tools::Rectangle aArea = pCurView->GetOutputArea();
+tools::Rectangle aAreaPTwips;
+
+if (bLOKPrintTwips)
+{
+aSizePTwips = OutputDevice::LogicToLogic(aSize, MapMode(eWinUnit),
MapMode(MapUnit::MapTwip));
+aAreaPTwips = pCurView->GetLOKSpecialOutputArea();
+}
+
longnOldBottom = aArea.Bottom();
longnTextHeight = pEngine->GetTextHeight();
@@ -2100,12 +2114,17 @@ void ScViewData::EditGrowY( bool bInitial )
{
++nEditEndRow;
ScDocument* pLocalDoc = GetDocument();
-long nPix = ToPixel( pLocalDoc->GetRowHeight( nEditEndRow, nTabNo ),
nPPTY );
+long nRowHeight = pLocalDoc->GetRowHeight( nEditEndRow, nTabNo );
+long nPix = ToPixel( nRowHeight, nPPTY );
aArea.AdjustBottom(pWin->PixelToLogic(Size(0,nPix)).Height() );
+if (bLOKPrintTwips)
+aAreaPTwips.AdjustBottom(nRowHeight);
if ( aArea.Bottom() > aArea.Top() + aSize.Height() - 1 )
{
aArea.SetBottom( aArea.Top() + aSize.Height() - 1 );
+if (bLOKPrintTwips)
+aAreaPTwips.SetBottom( aAreaPTwips.Top() +
aSizePTwips.Height() - 1 );
bMaxReached = true; // don't occupy more cells beyond paper
size
}
@@ -2116,6 +2135,8 @@ void ScViewData::EditGrowY( bool bInitial )
if (bChanged)
{
pCurView->SetOutputArea(aArea);
+if (bLOKPrintTwips)
+pCurView->SetLOKSpecialOutputArea(aAreaPTwips);
if (nEditEndRow >= nBottom || bMaxReached)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/view/viewdata.cxx | 110 +++--
1 file changed, 106 insertions(+), 4 deletions(-)
New commits:
commit f9589bb011451dc27790281bb4727bc1ffa05412
Author: Dennis Francis
AuthorDate: Wed Jun 3 12:13:18 2020 +0530
Commit: Dennis Francis
CommitDate: Tue Jul 7 11:47:30 2020 +0200
ScViewData::EditGrowX: keep EditView's print-twips data updated
Change-Id: Ia2470f98954859b191432d68db5742d13a61c802
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98125
Tested-by: Jenkins
Reviewed-by: Dennis Francis
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 603dd682adeb..11f24c453fa8 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -1758,6 +1758,10 @@ void ScViewData::EditGrowX()
comphelper::FlagRestorationGuard aFlagGuard(bGrowing, true);
+bool bLOKActive = comphelper::LibreOfficeKit::isActive();
+bool bLOKPrintTwips = bLOKActive &&
comphelper::LibreOfficeKit::isCompatFlagSet(
+comphelper::LibreOfficeKit::Compat::scPrintTwipsMsgs);
+
ScDocument* pLocalDoc = GetDocument();
ScSplitPos eWhich = GetActivePart();
@@ -1777,8 +1781,18 @@ void ScViewData::EditGrowX()
SCCOL nLeft = GetPosX(eHWhich);
SCCOL nRight = nLeft + VisibleCellsX(eHWhich);
+MapUnit eWinUnit = GetLogicMode(eWhich).GetMapUnit();
SizeaSize = pEngine->GetPaperSize();
+Size aSizePTwips;
+
+if (bLOKPrintTwips)
+aSizePTwips = OutputDevice::LogicToLogic(aSize, MapMode(eWinUnit),
MapMode(MapUnit::MapTwip));
+
tools::Rectangle aArea = pCurView->GetOutputArea();
+tools::Rectangle aAreaPTwips;
+if (bLOKPrintTwips)
+aAreaPTwips = pCurView->GetLOKSpecialOutputArea();
+
longnOldRight = aArea.Right();
// Margin is already included in the original width.
@@ -1804,22 +1818,35 @@ void ScViewData::EditGrowX()
while (aArea.GetWidth() + 0 < nTextWidth && ( nEditStartCol > nLeft ||
nEditEndCol < nRight ) )
{
long nLogicLeft = 0;
+long nLogicLeftPTwips = 0;
if ( nEditStartCol > nLeft )
{
--nEditStartCol;
-long nLeftPix = ToPixel( pLocalDoc->GetColWidth(
nEditStartCol, nTabNo ), nPPTX );
+long nColWidth = pLocalDoc->GetColWidth( nEditStartCol, nTabNo
);
+long nLeftPix = ToPixel( nColWidth, nPPTX );
nLogicLeft = pWin->PixelToLogic(Size(nLeftPix,0)).Width();
+if (bLOKPrintTwips)
+nLogicLeftPTwips = nColWidth;
}
long nLogicRight = 0;
+long nLogicRightPTwips = 0;
if ( nEditEndCol < nRight )
{
++nEditEndCol;
-long nRightPix = ToPixel( pLocalDoc->GetColWidth( nEditEndCol,
nTabNo ), nPPTX );
+long nColWidth = pLocalDoc->GetColWidth( nEditEndCol, nTabNo );
+long nRightPix = ToPixel( nColWidth, nPPTX );
nLogicRight = pWin->PixelToLogic(Size(nRightPix,0)).Width();
+if (bLOKPrintTwips)
+nLogicRightPTwips = nColWidth;
}
aArea.AdjustLeft( -(bLayoutRTL ? nLogicRight : nLogicLeft) );
aArea.AdjustRight(bLayoutRTL ? nLogicLeft : nLogicRight );
+if (bLOKPrintTwips)
+{
+aAreaPTwips.AdjustLeft( -(bLayoutRTL ? nLogicRightPTwips :
nLogicLeftPTwips) );
+aAreaPTwips.AdjustRight(bLayoutRTL ? nLogicLeftPTwips :
nLogicRightPTwips );
+}
if ( aArea.Right() > aArea.Left() + aSize.Width() - 1 )
{
@@ -1827,6 +1854,14 @@ void ScViewData::EditGrowX()
long nHalf = aSize.Width() / 2;
aArea.SetLeft( nCenter - nHalf + 1 );
aArea.SetRight( nCenter + aSize.Width() - nHalf - 1 );
+
+if (bLOKPrintTwips)
+{
+long nCenterPTwips = ( aAreaPTwips.Left() +
aAreaPTwips.Right() ) / 2;
+long nHalfPTwips = aSizePTwips.Width() / 2;
+aAreaPTwips.SetLeft( nCenterPTwips - nHalfPTwips + 1 );
+aAreaPTwips.SetRight( nCenterPTwips + aSizePTwips.Width()
- nHalfPTwips - 1 );
+}
}
bChanged = true;
@@ -1839,19 +1874,38 @@ void ScViewData::EditGrowX()
while (aArea.GetWidth() + 0 < nTextWidth && nEditStartCol > nLeft)
{
--nEditStartCol;
-long nPix = ToPixel( pLocalDoc->GetColWidth( nEditStartCol, nTabNo
), nPPTX );
+long nColWidth = pLocalDoc->GetColWidth( nEditStartCol, nTabNo );
+long nPix = ToPixel( nColWidth, nPPTX );
long nLogicWidth = pWin->PixelToLogic(Size(nPix,0)).Width();
+long& nLogicWidthPTwips = nColWidth;
+
if ( !bLayoutRTL )
+{
[Libreoffice-commits] core.git: sc/source
sc/source/ui/view/viewdata.cxx | 101 ++---
1 file changed, 94 insertions(+), 7 deletions(-)
New commits:
commit e5150f14a20d8766910980d44fd1d3df2cd7212c
Author: Dennis Francis
AuthorDate: Tue Jun 2 21:44:11 2020 +0530
Commit: Dennis Francis
CommitDate: Tue Jul 7 11:46:32 2020 +0200
ScViewData::SetEditEngine: keep EditView's print-twips data updated
whenever EditView::SetOutputArea() and EditView::SetVisArea() are
called.
Change-Id: I90a840b85d01d27427fbaa1101148ce1efb55db5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98124
Tested-by: Jenkins
Reviewed-by: Dennis Francis
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index f7f8735da490..603dd682adeb 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -1436,6 +1436,10 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich,
{
bool bLayoutRTL = pDoc->IsLayoutRTL( nTabNo );
ScHSplitPos eHWhich = WhichH(eWhich);
+ScVSplitPos eVWhich = WhichV(eWhich);
+bool bLOKActive = comphelper::LibreOfficeKit::isActive();
+bool bLOKPrintTwips = bLOKActive &&
comphelper::LibreOfficeKit::isCompatFlagSet(
+comphelper::LibreOfficeKit::Compat::scPrintTwipsMsgs);
bool bWasThere = false;
if (pEditView[eWhich])
@@ -1462,15 +1466,16 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich,
{
pEditView[eWhich].reset(new EditView( pNewEngine, pWin ));
-if (comphelper::LibreOfficeKit::isActive())
+if (bLOKActive)
{
-pEditView[eWhich]->SetBroadcastLOKViewCursor(false);
+// We can broadcast the view-cursor message in print-twips for all
views.
+pEditView[eWhich]->SetBroadcastLOKViewCursor(bLOKPrintTwips);
pEditView[eWhich]->RegisterViewShell(pViewShell);
}
}
// add windows from other views
-if (!bWasThere && comphelper::LibreOfficeKit::isActive())
+if (!bWasThere && bLOKActive)
{
ScTabViewShell* pThisViewShell = GetViewShell();
SCTAB nThisTabNo = GetTabNo();
@@ -1508,14 +1513,34 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich,
pWin,
nPPTX,nPPTY,GetZoomX(),GetZoomY() ).
GetEditArea( pPattern, true );
+tools::Rectangle aPTwipsRect;
+if (bLOKPrintTwips)
+{
+aPTwipsRect = ScEditUtil(pDoc, nNewX, nNewY, nTabNo,
GetPrintTwipsPos(nNewX, nNewY),
+ pWin, nPPTX, nPPTY, GetZoomX(), GetZoomY(),
true /* bInPrintTwips */).
+GetEditArea(pPattern, true);
+}
+
// when right-aligned, leave space for the cursor
// in vertical mode, editing is always right-aligned
if ( GetEditAdjust() == SvxAdjust::Right || bAsianVertical )
+{
aPixRect.AdjustRight(1 );
+if (bLOKPrintTwips)
+aPTwipsRect.AdjustRight(TWIPS_PER_PIXEL);
+}
tools::Rectangle aOutputArea = pWin->PixelToLogic( aPixRect,
GetLogicMode() );
pEditView[eWhich]->SetOutputArea( aOutputArea );
+if (bLOKPrintTwips)
+{
+if (!pEditView[eWhich]->HasLOKSpecialPositioning())
+pEditView[eWhich]->InitLOKSpecialPositioning(MapUnit::MapTwip,
aPTwipsRect, Point());
+else
+pEditView[eWhich]->SetLOKSpecialOutputArea(aPTwipsRect);
+}
+
if ( bActive && eWhich == GetActivePart() )
{
// keep the part that has the active edit view available after
@@ -1541,9 +1566,28 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich,
if ( bAsianVertical )
bGrowCentered = bGrowToLeft = false; // keep old behavior for
asian mode
-long nSizeXPix;
+long nSizeXPix, nSizeXPTwips = 0;
+
+const long nGridWidthPx = pView->GetGridWidth(eHWhich);
+const long nGridHeightPx = pView->GetGridHeight(eVWhich);
+long nGridWidthTwips = 0, nGridHeightTwips = 0;
+if (bLOKPrintTwips)
+{
+Size aGridSize(nGridWidthPx, nGridHeightPx);
+const MapMode& rWinMapMode = GetLogicMode();
+aGridSize = OutputDevice::LogicToLogic(
+pWin->PixelToLogic(aGridSize, rWinMapMode),
+rWinMapMode, MapMode(MapUnit::MapTwip));
+nGridWidthTwips = aGridSize.Width();
+nGridHeightTwips = aGridSize.Height();
+}
+
if (bBreak && !bAsianVertical)
+{
nSizeXPix = aPixRect.GetWidth();// papersize -> no horizontal
scrolling
+if (bLOKPrintTwips)
+nSizeXPTwips = aPTwipsRect.GetWidth();
+}
else
{
OSL_ENSURE(pView,"no View for EditView");
@@ -1553,23 +1597,48 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich,
// growing into both directions until one edge is reached
//! s
[Libreoffice-commits] core.git: 2 commits - sc/source vcl/skia
sc/source/ui/view/gridwin4.cxx | 43 +++--
vcl/skia/win/gdiimpl.cxx | 10 +
2 files changed, 35 insertions(+), 18 deletions(-)
New commits:
commit 9aa33b25764cb199c916737ca334cd35c82350c2
Author: Dennis Francis
AuthorDate: Tue Jun 2 21:57:48 2020 +0530
Commit: Dennis Francis
CommitDate: Tue Jul 7 11:44:28 2020 +0200
scPrintTwipsMsgs: No more view specific edit-cursor messages
Change-Id: I2a07834568716ea1608a40613108d229699058b7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98123
Tested-by: Jenkins
Reviewed-by: Dennis Francis
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 4c42d86f2de4..17f9b16a8ec9 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -1120,28 +1120,35 @@ void ScGridWindow::DrawContent(OutputDevice &rDevice,
const ScTableInfo& rTableI
pEditView->SetOutputArea(rDevice.PixelToLogic(aEditRect));
pEditView->Paint(rDevice.PixelToLogic(aEditRect), &rDevice);
-// Now we need to get relative cursor position within the editview.
-// This is for sending the absolute twips position of the cursor
to the specific views with
-// the same given zoom level.
-tools::Rectangle aCursorRect = pEditView->GetEditCursor();
-Point aCursPos = OutputDevice::LogicToLogic(aCursorRect.TopLeft(),
MapMode(MapUnit::Map100thMM), MapMode(MapUnit::MapTwip));
+// EditView will do the cursor notifications correctly if we're in
+// print-twips messaging mode.
+if (!comphelper::LibreOfficeKit::isCompatFlagSet(
+comphelper::LibreOfficeKit::Compat::scPrintTwipsMsgs))
+{
+// Now we need to get relative cursor position within the
editview.
+// This is for sending the pixel-aligned twips position of the
cursor to the specific views with
+// the same given zoom level.
+tools::Rectangle aCursorRect = pEditView->GetEditCursor();
+Point aCursPos =
OutputDevice::LogicToLogic(aCursorRect.TopLeft(),
+MapMode(MapUnit::Map100thMM),
MapMode(MapUnit::MapTwip));
+
+const MapMode& rDevMM = rDevice.GetMapMode();
+MapMode aMM(MapUnit::MapTwip);
+aMM.SetScaleX(rDevMM.GetScaleX());
+aMM.SetScaleY(rDevMM.GetScaleY());
+
+aBGAbs.AdjustLeft(1);
+aBGAbs.AdjustTop(1);
+aCursorRect = OutputDevice::PixelToLogic(aBGAbs, aMM);
+aCursorRect.setWidth(0);
+aCursorRect.Move(aCursPos.getX(), 0);
+// Sends view cursor position to views of all matching zooms
if needed (avoids duplicates).
+InvalidateLOKViewCursor(aCursorRect, aMM.GetScaleX(),
aMM.GetScaleY());
+}
// Rollback the mapmode and 'output area'.
SetMapMode(aOrigMapMode);
pEditView->SetOutputArea(aOrigOutputArea);
-
-const MapMode& rDevMM = rDevice.GetMapMode();
-MapMode aMM(MapUnit::MapTwip);
-aMM.SetScaleX(rDevMM.GetScaleX());
-aMM.SetScaleY(rDevMM.GetScaleY());
-
-aBGAbs.AdjustLeft(1);
-aBGAbs.AdjustTop(1);
-aCursorRect = OutputDevice::PixelToLogic(aBGAbs, aMM);
-aCursorRect.setWidth(0);
-aCursorRect.Move(aCursPos.getX(), 0);
-// Sends view cursor position to views of all matching zooms if
needed (avoids duplicates).
-InvalidateLOKViewCursor(aCursorRect, aMM.GetScaleX(),
aMM.GetScaleY());
}
else
{
commit fada69d6ee05700fd57c8844591562608a900a9d
Author: Luboš Luňák
AuthorDate: Mon Jul 6 11:59:13 2020 +0200
Commit: Luboš Luňák
CommitDate: Tue Jul 7 11:44:13 2020 +0200
set also RGB/BGR LCD order for Skia text rendering (tdf#134275)
Change-Id: I797a851f52d9ba4c18127219b9042348225d14dd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98199
Tested-by: Jenkins
Reviewed-by: Luboš Luňák
diff --git a/vcl/skia/win/gdiimpl.cxx b/vcl/skia/win/gdiimpl.cxx
index b3170b27b8ca..0e883bc1960f 100644
--- a/vcl/skia/win/gdiimpl.cxx
+++ b/vcl/skia/win/gdiimpl.cxx
@@ -22,6 +22,7 @@
#include
#include
#include
+#include
#include
#include
@@ -213,16 +214,25 @@ SkFont::Edging WinSkiaSalGraphicsImpl::getFontEdging()
// the glyphs will be rendered based on this setting (subpixel AA requires
colors,
// others do not).
fontEdging = SkFont::Edging::kAlias;
+SkFontLCDConfig::LCDOrder lcdOrder = SkFontLCDConfig::kNONE_LCDOrder;
BOOL set;
if (SystemParametersInfo(SPI_GETFONTSMOOTHING, 0, &set, 0) && set)
{
UINT set2;
if (SystemParametersInfo(SPI_GETFONTSMOOTHINGTYPE, 0, &set2, 0)
&& set2 == FE_FONTSMOOTHINGCLE
[Libreoffice-commits] core.git: sc/source
sc/source/ui/inc/viewdata.hxx |2 +-
sc/source/ui/view/viewdata.cxx |8 +---
2 files changed, 6 insertions(+), 4 deletions(-)
New commits:
commit ecb2dc9705d2197833cfbfd2259d3ac289f3e82d
Author: Dennis Francis
AuthorDate: Tue Jun 2 15:32:29 2020 +0530
Commit: Dennis Francis
CommitDate: Tue Jul 7 11:43:34 2020 +0200
Allow edit-area computation in print-twips...
via a optional flag bInPrintTwips (false by default) in
ScViewData::GetEditArea()
Change-Id: I9bf7465b703a2df817fe438db3671261d0d907a8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98122
Tested-by: Jenkins
Reviewed-by: Dennis Francis
diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx
index b893eb63dab0..286330adeaee 100644
--- a/sc/source/ui/inc/viewdata.hxx
+++ b/sc/source/ui/inc/viewdata.hxx
@@ -595,7 +595,7 @@ public:
SCROW GetEditEndRow() const { return nEditEndRow; }
tools::Rectangle GetEditArea( ScSplitPos eWhich, SCCOL nPosX, SCROW
nPosY, vcl::Window* pWin,
-const ScPatternAttr* pPattern, bool
bForceToTop );
+const ScPatternAttr* pPattern, bool
bForceToTop, bool bInPrintTwips = false );
voidSetTabNo( SCTAB nNewTab );
voidSetActivePart( ScSplitPos eNewActive );
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 7a4a630d409c..f7f8735da490 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -1421,10 +1421,12 @@ void ScViewData::SetMaxTiledRow( SCROW nNewMaxRow )
tools::Rectangle ScViewData::GetEditArea( ScSplitPos eWhich, SCCOL nPosX,
SCROW nPosY,
vcl::Window* pWin, const
ScPatternAttr* pPattern,
- bool bForceToTop )
+ bool bForceToTop, bool bInPrintTwips
)
{
-return ScEditUtil( pDoc, nPosX, nPosY, nTabNo,
GetScrPos(nPosX,nPosY,eWhich,true),
-pWin, nPPTX, nPPTY, GetZoomX(), GetZoomY() ).
+Point aCellTopLeft = bInPrintTwips ?
+GetPrintTwipsPos(nPosX, nPosY) : GetScrPos(nPosX, nPosY, eWhich,
true);
+return ScEditUtil( pDoc, nPosX, nPosY, nTabNo, aCellTopLeft,
+pWin, nPPTX, nPPTY, GetZoomX(), GetZoomY(),
bInPrintTwips ).
GetEditArea( pPattern, bForceToTop );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Error in building LibreOffice
Someone please help me with this. On Sun, 5 Jul, 2020, 10:06 PM anshu khare, wrote: > The link says about solving the error > > > ALINK: error AL1078: Error signing assembly -- Access is denied. > > That's why I thought that it might be useful.. > > Please tell me how to solve this problem > > On Sun, 5 Jul, 2020, 10:02 PM Tor Lillqvist, wrote: > >> >>> >>> This link: https://github.com/dotnet/runtime/issues/15416 >>> >>> says that I have to add myself to the list of permissions of >>> C:\ProgramData\Microsoft\Crypto\RSA\MachineKeys folder with Full >>> Control. >>> >> >> Why do you think a five year old message about a problem when building >> the .NET runtime has anything to do with building LibreOffice in 2020? >> >> --tml >> > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - solenv/bin vcl/inc vcl/source vcl/vcl.android.component vcl/vcl.headless.component vcl/vcl.ios.component vcl/vcl.macosx.component vcl/vcl.unx.component vcl/
solenv/bin/native-code.py|2
vcl/inc/factory.hxx | 16 ---
vcl/source/app/session.cxx | 23 +-
vcl/source/components/factory.cxx| 14 --
vcl/source/components/fontident.cxx | 28 -
vcl/vcl.android.component|6 +-
vcl/vcl.headless.component |6 +-
vcl/vcl.ios.component|6 +-
vcl/vcl.macosx.component |6 +-
vcl/vcl.unx.component|6 +-
vcl/vcl.windows.component|6 +-
xmlhelp/Library_ucpchelp1.mk |1
xmlhelp/source/cxxhelp/inc/tvfactory.hxx | 15 --
xmlhelp/source/cxxhelp/provider/provider.cxx | 43
xmlhelp/source/cxxhelp/provider/provider.hxx | 14 --
xmlhelp/source/cxxhelp/provider/services.cxx | 58 ---
xmlhelp/source/treeview/tvfactory.cxx| 37 ++---
xmlhelp/util/ucpchelp1.component |8 ++-
18 files changed, 61 insertions(+), 234 deletions(-)
New commits:
commit b719e02868d364849b26080fa4182d4adfc68250
Author: Noel Grandin
AuthorDate: Mon Jul 6 13:54:34 2020 +0200
Commit: Noel Grandin
CommitDate: Tue Jul 7 11:34:36 2020 +0200
xmlhelp: create instances with uno constructors
See tdf#74608 for motivation
Change-Id: Id05885b9da95009609cf8875be489aa88fd5a3cb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98232
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/xmlhelp/Library_ucpchelp1.mk b/xmlhelp/Library_ucpchelp1.mk
index 506ddad704d5..ac4b5e0f7196 100644
--- a/xmlhelp/Library_ucpchelp1.mk
+++ b/xmlhelp/Library_ucpchelp1.mk
@@ -54,7 +54,6 @@ $(eval $(call gb_Library_add_exception_objects,ucpchelp1,\
xmlhelp/source/cxxhelp/provider/resultsetbase \
xmlhelp/source/cxxhelp/provider/resultsetforquery \
xmlhelp/source/cxxhelp/provider/resultsetforroot \
-xmlhelp/source/cxxhelp/provider/services \
xmlhelp/source/cxxhelp/provider/urlparameter \
xmlhelp/source/treeview/tvfactory \
xmlhelp/source/treeview/tvread \
diff --git a/xmlhelp/source/cxxhelp/inc/tvfactory.hxx
b/xmlhelp/source/cxxhelp/inc/tvfactory.hxx
index 992c9fc3747e..6ca53c7f52e4 100644
--- a/xmlhelp/source/cxxhelp/inc/tvfactory.hxx
+++ b/xmlhelp/source/cxxhelp/inc/tvfactory.hxx
@@ -65,21 +65,6 @@ class TVFactory final : public cppu::WeakImplHelper <
virtual css::uno::Sequence< OUString > SAL_CALL
getAvailableServiceNames( ) override;
-// Other
-
-static OUString getImplementationName_static();
-
-static css::uno::Sequence< OUString >
getSupportedServiceNames_static();
-
-static css::uno::Reference< css::lang::XSingleServiceFactory >
-createServiceFactory(
-const css::uno::Reference< css::lang::XMultiServiceFactory >&
rxServiceMgr );
-
-static css::uno::Reference< css::uno::XInterface > SAL_CALL
-CreateInstance(
-const css::uno::Reference< css::lang::XMultiServiceFactory >&
xMultiServiceFactory );
-
-
private:
// Members
diff --git a/xmlhelp/source/cxxhelp/provider/provider.cxx
b/xmlhelp/source/cxxhelp/provider/provider.cxx
index b82ba4917d24..6f690da96583 100644
--- a/xmlhelp/source/cxxhelp/provider/provider.cxx
+++ b/xmlhelp/source/cxxhelp/provider/provider.cxx
@@ -39,6 +39,7 @@
using namespace com::sun::star;
using namespace chelp;
+
// ContentProvider Implementation.
ContentProvider::ContentProvider( const uno::Reference< uno::XComponentContext
>& rxContext )
@@ -102,11 +103,6 @@ css::uno::Sequence< css::uno::Type > SAL_CALL
ContentProvider::getTypes()
// XServiceInfo methods.
OUString SAL_CALL ContentProvider::getImplementationName()
-{
-return getImplementationName_Static();
-}
-
-OUString ContentProvider::getImplementationName_Static()
{
return "CHelpContentProvider";
}
@@ -120,35 +116,7 @@ ContentProvider::supportsService(const OUString&
ServiceName )
uno::Sequence< OUString > SAL_CALL
ContentProvider::getSupportedServiceNames()
{
-return getSupportedServiceNames_Static();
-}
-
-/// @throws uno::Exception
-static uno::Reference< uno::XInterface >
-ContentProvider_CreateInstance(
- const uno::Reference< lang::XMultiServiceFactory> & rSMgr )
-{
-lang::XServiceInfo * pX = new ContentProvider(
comphelper::getComponentContext(rSMgr) );
-return uno::Reference< uno::XInterface >::query( pX );
-}
-
-uno::Sequence< OUString >
-ContentProvider::getSupportedServiceNames_Static()
-{
-return { MYUCP_CONTENT_PROVIDER_SERVICE_NAME1,
MYUCP_CONTENT_PROVIDER_SERVICE_NAME2 };
-}
-
-// Service factory implementation.
-
-css::uno::Reference< css::lang::XSingleServiceFactory >
-ContentProvider::createServiceFactory( const css::uno::Reference<
-css::lang::XMultiServiceFactory >& rxServiceMgr )
-{
-
[Libreoffice-commits] core.git: officecfg/registry sw/inc sw/uiconfig
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu | 12
+-
sw/inc/strings.hrc | 10
sw/uiconfig/swriter/ui/sidebarwrap.ui | 12
+-
sw/uiconfig/swriter/ui/wrappage.ui |6
++---
4 files changed, 20 insertions(+), 20 deletions(-)
New commits:
commit 859e4dd6b5680e15a454fd0f8c0eae67459fe177
Author: Gabor Kelemen
AuthorDate: Sun May 24 19:11:34 2020 +0200
Commit: Heiko Tietze
CommitDate: Tue Jul 7 11:23:05 2020 +0200
tdf#87783 Unify image wrap option labels wording
In Image properties dialog - Wrap tab, and UNO commands
Change-Id: I420884a5df3373e74e14bba48bff7ae7f5ad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94762
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index a15e89e8c705..5cf5ed8436b8 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -1301,7 +1301,7 @@
- Wrap Off
+ None
15
@@ -1309,7 +1309,7 @@
- ~Page Wrap
+ ~Parallel
7
@@ -1333,7 +1333,7 @@
- ~Wrap Through
+ ~Through
7
@@ -2281,7 +2281,7 @@
- ~Optimal Page Wrap
+ ~Optimal
1
@@ -2398,7 +2398,7 @@
- Wrap Left
+ Before
1
@@ -2411,7 +2411,7 @@
- Wrap Right
+ After
1
diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index e498db376a76..46a4ec21f64a 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -1073,12 +1073,12 @@
#define STR_NO_FOOTER NC_("STR_NO_FOOTER", "No
footer")
#define STR_HEADER NC_("STR_HEADER", "Header")
#define STR_NO_HEADER NC_("STR_NO_HEADER", "No
header")
-#define STR_SURROUND_IDEAL NC_("STR_SURROUND_IDEAL",
"Optimal wrap")
-#define STR_SURROUND_NONE NC_("STR_SURROUND_NONE", "No
wrap")
+#define STR_SURROUND_IDEAL NC_("STR_SURROUND_IDEAL",
"Optimal")
+#define STR_SURROUND_NONE NC_("STR_SURROUND_NONE",
"None")
#define STR_SURROUND_THROUGHNC_("STR_SURROUND_THROUGH",
"Through")
-#define STR_SURROUND_PARALLEL NC_("STR_SURROUND_PARALLEL",
"Parallel wrap")
-#define STR_SURROUND_LEFT NC_("STR_SURROUND_LEFT", "Left
wrap")
-#define STR_SURROUND_RIGHT NC_("STR_SURROUND_RIGHT",
"Right wrap")
+#define STR_SURROUND_PARALLEL NC_("STR_SURROUND_PARALLEL",
"Parallel")
+#define STR_SURROUND_LEFT NC_("STR_SURROUND_LEFT",
"Before")
+#define STR_SURROUND_RIGHT NC_("STR_SURROUND_RIGHT",
"After")
#define STR_SURROUND_ANCHORONLY NC_("STR_SURROUND_ANCHORONLY",
"(Anchor only)")
#define STR_FRM_WIDTH NC_("STR_FRM_WIDTH", "Width:")
#define STR_FRM_FIXEDHEIGHT NC_("STR_FRM_FIXEDHEIGHT",
"Fixed height:")
diff --git a/sw/uiconfig/swriter/ui/sidebarwrap.ui
b/sw/uiconfig/swriter/ui/sidebarwrap.ui
index b48338b6bb6b..4be72678aaa3 100644
--- a/sw/uiconfig/swriter/ui/sidebarwrap.ui
+++ b/sw/uiconfig/swriter/ui/sidebarwrap.ui
@@ -70,7 +70,7 @@
True
False
-Wrap Off
+None
True
True
@@ -83,7 +83,7 @@
True
False
-Wrap On
+Parallel
True
.uno:WrapOff
@@ -96,7 +96,7 @@
True
False
-Wrap Ideal
+Optimal
True
.uno:WrapOff
@@ -109,7 +109,7 @@
True
False
-Wrap Left
+Before
True
.uno:WrapOff
@@ -122,7 +122,7 @@
True
False
-Wrap Right
+After
True
.uno:WrapOff
@@
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sc/source
sc/source/core/tool/compiler.cxx | 12 +++-
1 file changed, 11 insertions(+), 1 deletion(-)
New commits:
commit 56641c9717f4fadcc81248c58c7762314270d721
Author: Eike Rathke
AuthorDate: Tue Jun 30 17:28:39 2020 +0200
Commit: Xisco Fauli
CommitDate: Tue Jul 7 11:15:48 2020 +0200
Resolves: tdf#131424 separator in TableRef column specifier is valid
Even only a separator or any operator single character.
Change-Id: I102dd7fd49c1a6a7f1d8c39f4a6139a51dbebe51
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97535
Reviewed-by: Eike Rathke
Tested-by: Jenkins
(cherry picked from commit 31951265f541c9f5acf424674e2d1d97c0f3b8c2)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97507
Reviewed-by: Xisco Fauli
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index f0c755fa1b8c..e31ab2731fa3 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -2080,6 +2080,8 @@ sal_Int32 ScCompiler::NextSymbol(bool bInArray)
case ssSkipString:
case ssGetReference:
case ssSkipReference:
+case ssGetTableRefItem:
+case ssGetTableRefColumn:
break;
default:
if (eState == ssGetChar)
@@ -4234,12 +4236,20 @@ bool ScCompiler::NextNewToken( bool bInArray )
bMayBeFuncName = ScGlobal::pCharClass->isLetter( aTmpStr, 0 );
bAsciiNonAlnum = false;
}
-if (bAsciiNonAlnum && cSymbol[1] == 0)
+
+// Within a TableRef anything except an unescaped '[' or ']' is an item
+// or a column specifier, do not attempt to recognize any other single
+// operator there so even [,] or [+] for a single character column
+// specifier works. Note that space between two ocTableRefOpen is not
+// supported (Table[ [ColumnSpec]]), not only here. Note also that Table[]
+// without any item or column specifier is valid.
+if (bAsciiNonAlnum && cSymbol[1] == 0 && (eLastOp != ocTableRefOpen ||
cSymbol[0] == '[' || cSymbol[0] == ']'))
{
// Shortcut for operators and separators that need no further checks
or upper.
if (IsOpCode( OUString( cSymbol), bInArray ))
return true;
}
+
if ( bMayBeFuncName )
{
// a function name must be followed by a parenthesis
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sw/inc sw/source
sw/inc/undobj.hxx |5 +
sw/source/core/doc/DocumentContentOperationsManager.cxx | 15 ++---
sw/source/core/undo/untblk.cxx | 41 ++--
3 files changed, 37 insertions(+), 24 deletions(-)
New commits:
commit d9a7fb29f1adedc155be236afebde58bb253bc18
Author: Michael Stahl
AuthorDate: Fri Jul 3 17:52:28 2020 +0200
Commit: Xisco Fauli
CommitDate: Tue Jul 7 11:14:18 2020 +0200
tdf#134253 sw: fix SwUndoInserts::UndoImpl() if inserting before section
Somehow the clipboard is pasted before the SwSectionNode, which is the
first node in the body text.
The OSL_ENSURE( !bStartIsTextNode, "Oops, undo may be instable now." )
is triggered; the Undo must remove 2 SwTextNode in this case.
Because of the extra SwTextNode the indexes are off by 1 and this starts
to assert since commit 24fd14b387dca458a1b6e9415e936d26562ddb1e when
setting a fieldmark on a non-text node.
Change-Id: Ic52b0f4c7665994cadfe8f074bc4607c55352aa1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97887
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit dc7e7b94a7211c576454267c09eb108e761e4487)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98078
Reviewed-by: Xisco Fauli
diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx
index c76a1dfbec0e..71d9c511591d 100644
--- a/sw/inc/undobj.hxx
+++ b/sw/inc/undobj.hxx
@@ -252,7 +252,8 @@ class SwUndoInserts : public SwUndo, public SwUndRng,
private SwUndoSaveContent
std::unique_ptr> m_pFrameFormats;
std::vector< std::shared_ptr > m_FlyUndos;
std::unique_ptr m_pRedlineData;
-bool m_bStartWasTextNode;
+int m_nDeleteTextNodes;
+
protected:
sal_uLong m_nNodeDiff;
/// start of Content in UndoNodes for Redo
@@ -269,7 +270,7 @@ public:
// Set destination range after reading.
void SetInsertRange( const SwPaM&, bool bScanFlys = true,
- bool bSttWasTextNd = true );
+ int nDeleteTextNodes = 1);
static bool IsCreateUndoForNewFly(SwFormatAnchor const& rAnchor,
sal_uLong const nStartNode, sal_uLong const nEndNode);
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx
b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index f62d77352cc9..33b7e5fe8f27 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -4732,7 +4732,7 @@ bool
DocumentContentOperationsManager::CopyImplImpl(SwPaM& rPam, SwPosition& rPo
( !bOneNode && !rPos.nContent.GetIndex() ) );
bool bCopyBookmarks = true;
bool bCopyPageSource = false;
-bool bStartIsTextNode = nullptr != pSttTextNd;
+int nDeleteTextNodes = 0;
// #i104585# copy outline num rule to clipboard (for ASCII filter)
if (pDoc->IsClipBoard() && m_rDoc.GetOutlineNumRule())
@@ -4769,6 +4769,7 @@ bool
DocumentContentOperationsManager::CopyImplImpl(SwPaM& rPam, SwPosition& rPo
do {
if( pSttTextNd )
{
+++nDeleteTextNodes; // must be joined in Undo
// Don't copy the beginning completely?
if( !bCopyCollFormat || bColumnSel || pStt->nContent.GetIndex() )
{
@@ -4878,7 +4879,7 @@ bool
DocumentContentOperationsManager::CopyImplImpl(SwPaM& rPam, SwPosition& rPo
else if( rPos.nContent.GetIndex() )
{ // Insertion in the middle of a text node, it has to be split
// (and joined from undo)
-bStartIsTextNode = true;
+++nDeleteTextNodes;
const sal_Int32 nContentEnd = pEnd->nContent.GetIndex();
{
@@ -4931,11 +4932,9 @@ bool
DocumentContentOperationsManager::CopyImplImpl(SwPaM& rPam, SwPosition& rPo
// if we have to insert an extra text node
// at the destination, this node will be our new destination
-// (text) node, and thus we set bStartisTextNode to true. This
-// will ensure that this node will be deleted during Undo
-// using JoinNext.
-OSL_ENSURE( !bStartIsTextNode, "Oops, undo may be instable
now." );
-bStartIsTextNode = true;
+// (text) node, and thus we increment nDeleteTextNodes. This
+// will ensure that this node will be deleted during Undo.
+++nDeleteTextNodes; // must be deleted
}
const bool bEmptyDestNd = pDestTextNd->GetText().isEmpty();
@@ -5109,7 +5108,7 @@ bool
DocumentContentOperationsManager::CopyImplImpl(SwPaM& rPam, SwPosition& rPo
// If Undo is enabled, store the inserted area
if (pDoc->GetIDocumentUndoRedo().DoesUndo())
{
-pUndo->SetInsertRange( *pCopyPam, true, bStartIsTextNode );
+pUndo->SetInsertRange(*pCopyPam, true
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - chart2/source sw/qa
chart2/source/view/main/ChartView.cxx |5 +++--
chart2/source/view/main/VLegend.cxx | 19 +--
chart2/source/view/main/VLegend.hxx |6 --
sw/qa/extras/layout/data/tdf132956.docx |binary
sw/qa/extras/layout/layout.cxx | 20 ++--
5 files changed, 38 insertions(+), 12 deletions(-)
New commits:
commit d1e570f2db9903cba2d8d91343922ef1393d4895
Author: Balazs Varga
AuthorDate: Tue May 12 15:36:06 2020 +0200
Commit: Xisco Fauli
CommitDate: Tue Jul 7 11:13:13 2020 +0200
tdf#132956 Chart view: fix missing plot area
Do not reduce the inside area of the chart depending
on the size of the legend. Use the default legend size.
Regression from commit: 739ed2c29f49ea5e83bcd1352b2644c2e2d09f7b
(tdf#115630 tdf#88922 Chart: fix custom legend position and size)
cherry picked from commit cf46500243c51071227e08c5067041e414180ebc
Change-Id: Ic191229d7ceab1f2689ab07424353108f8cb2b95
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94059
Tested-by: Jenkins
Tested-by: László Németh
Reviewed-by: Tünde Tóth
Reviewed-by: László Németh
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95583
Reviewed-by: Xisco Fauli
diff --git a/chart2/source/view/main/ChartView.cxx
b/chart2/source/view/main/ChartView.cxx
index 44ca2853f503..f0f84a9783f2 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -2252,12 +2252,13 @@ bool lcl_createLegend( const uno::Reference< XLegend >
& xLegend
if (!VLegend::isVisible(xLegend))
return false;
+awt::Size rDefaultLegendSize;
VLegend aVLegend( xLegend, xContext, rLegendEntryProviderList,
xPageShapes, xShapeFactory, rModel);
aVLegend.setDefaultWritingMode( nDefaultWritingMode );
aVLegend.createShapes( awt::Size( rRemainingSpace.Width,
rRemainingSpace.Height ),
- rPageSize );
-aVLegend.changePosition( rRemainingSpace, rPageSize );
+ rPageSize, rDefaultLegendSize );
+aVLegend.changePosition( rRemainingSpace, rPageSize, rDefaultLegendSize );
return true;
}
diff --git a/chart2/source/view/main/VLegend.cxx
b/chart2/source/view/main/VLegend.cxx
index 8272696ea102..f9d836921ebe 100644
--- a/chart2/source/view/main/VLegend.cxx
+++ b/chart2/source/view/main/VLegend.cxx
@@ -270,7 +270,8 @@ awt::Size lcl_placeLegendEntries(
const awt::Size& rRemainingSpace,
sal_Int32 nYStartPosition,
const awt::Size& rPageSize,
-bool bIsPivotChart)
+bool bIsPivotChart,
+awt::Size& rDefaultLegendSize)
{
bool bIsCustomSize = (eExpansion ==
css::chart::ChartLegendExpansion_CUSTOM);
awt::Size aResultingLegendSize(0,0);
@@ -309,6 +310,9 @@ awt::Size lcl_placeLegendEntries(
sal_Int32 nMaxEntryHeight = nYOffset + aMaxEntryExtent.Height;
sal_Int32 nNumberOfEntries = rEntries.size();
+rDefaultLegendSize.Width = nMaxEntryWidth;
+rDefaultLegendSize.Height = nMaxEntryHeight + nYPadding;
+
sal_Int32 nNumberOfColumns = 0, nNumberOfRows = 0;
std::vector< sal_Int32 > aColumnWidths;
std::vector< sal_Int32 > aRowHeights;
@@ -870,7 +874,8 @@ bool VLegend::isVisible( const Reference< XLegend > &
xLegend )
void VLegend::createShapes(
const awt::Size & rAvailableSpace,
-const awt::Size & rPageSize )
+const awt::Size & rPageSize,
+awt::Size & rDefaultLegendSize )
{
if(! (m_xLegend.is() &&
m_xShapeFactory.is() &&
@@ -980,7 +985,7 @@ void VLegend::createShapes(
// place the legend entries
aLegendSize = lcl_placeLegendEntries(aViewEntries, eExpansion,
bSymbolsLeftSide, fViewFontSize,
aMaxSymbolExtent,
aTextProperties, xLegendContainer,
- m_xShapeFactory,
aLegendSize, nUsedButtonHeight, rPageSize, bIsPivotChart);
+ m_xShapeFactory,
aLegendSize, nUsedButtonHeight, rPageSize, bIsPivotChart, rDefaultLegendSize);
uno::Reference
xModelPage(mrModel.getPageBackground());
@@ -1014,7 +1019,8 @@ void VLegend::createShapes(
void VLegend::changePosition(
awt::Rectangle & rOutAvailableSpace,
-const awt::Size & rPageSize )
+const awt::Size & rPageSize,
+const css::awt::Size & rDefaultLegendSize )
{
if(! m_xShape.is())
return;
@@ -1026,6 +1032,7 @@ void VLegend::changePosition(
Reference< beans::XPropertySet > xLegendProp( m_xLegend,
uno::UNO_QUERY_THROW );
chart2::RelativePosition aRelativePosition;
+bool bDefaultLegendSize = rDefaultLegendSize.Width != 0 ||
rDefaultLegendSize.Height != 0;
bool bAutoPosition =
! (xLegendProp->getPropertyValue( "RelativePosition") >>=
aRelativePosition);
@@ -1046,7 +1053,7 @@ void VLegend::changePosition(
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sc/inc sc/source
sc/inc/mtvelements.hxx |1 +
sc/source/core/data/mtvelements.cxx |5 +
sc/source/core/data/table2.cxx |2 +-
sc/source/core/data/table3.cxx |2 ++
4 files changed, 9 insertions(+), 1 deletion(-)
New commits:
commit 6c3a6b9685acad171fda7bc5d44b0dd53b9f7268
Author: Luboš Luňák
AuthorDate: Wed Jul 1 11:24:08 2020 +0200
Commit: Xisco Fauli
CommitDate: Tue Jul 7 11:11:32 2020 +0200
don't add a cell to a non-existent column (tdf#104865)
This change also needs invalidating column position hints if
the columns get changed by the copying of the cells.
Change-Id: I4793e25f253c0197d88b313bc9336435cef649f4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97603
Tested-by: Jenkins
Reviewed-by: Luboš Luňák
(cherry picked from commit ee2d2184133b3bf47d38a03b14abab2caa15dad1)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97673
Reviewed-by: Xisco Fauli
(cherry picked from commit 8765592db900fae22ff2a0440fe94842dcbd805f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97684
diff --git a/sc/inc/mtvelements.hxx b/sc/inc/mtvelements.hxx
index 0727bda0fa7f..7fa266ecf8f0 100644
--- a/sc/inc/mtvelements.hxx
+++ b/sc/inc/mtvelements.hxx
@@ -167,6 +167,7 @@ public:
~TableColumnBlockPositionSet();
ColumnBlockPosition* getBlockPosition( SCCOL nCol );
+void invalidate(); // discards cached positions
};
ScRefCellValue toRefCell( const sc::CellStoreType::const_iterator& itPos,
size_t nOffset );
diff --git a/sc/source/core/data/mtvelements.cxx
b/sc/source/core/data/mtvelements.cxx
index 21eef33cad45..56c0fbab0d9a 100644
--- a/sc/source/core/data/mtvelements.cxx
+++ b/sc/source/core/data/mtvelements.cxx
@@ -150,6 +150,11 @@ ColumnBlockPosition*
TableColumnBlockPositionSet::getBlockPosition( SCCOL nCol )
return &it->second;
}
+void TableColumnBlockPositionSet::invalidate()
+{
+mpImpl->maColumns.clear();
+}
+
ScRefCellValue toRefCell( const sc::CellStoreType::const_iterator& itPos,
size_t nOffset )
{
switch (itPos->type)
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 7597ebaddba5..638c02953219 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -3811,7 +3811,7 @@ void ScTable::CopyData( SCCOL nStartCol, SCROW nStartRow,
SCCOL nEndCol, SCROW n
if (bThisTab)
{
-aCell.release(aCol[nDestX], nDestY);
+aCell.release(CreateColumnIfNotExists(nDestX), nDestY);
SetPattern( nDestX, nDestY, *GetPattern( nCol, nRow ) );
}
else
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 41a130d65f6c..1ee6456d84a6 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -3131,6 +3131,8 @@ SCSIZE ScTable::Query(const ScQueryParam& rParamOrg, bool
bKeepSub)
if (bResult)
{
CopyData( aParam.nCol1,j, aParam.nCol2,j,
aParam.nDestCol,nOutRow,aParam.nDestTab );
+if( nTab == aParam.nDestTab ) // copy to self, changes may
invalidate caching position hints
+blockPos.invalidate();
++nOutRow;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sc/inc sc/qa sc/source
sc/inc/recursionhelper.hxx | 10 -
sc/qa/unit/parallelism.cxx | 54
sc/source/core/data/column4.cxx |2 -
sc/source/core/data/formulacell.cxx | 15
sc/source/core/tool/recursionhelper.cxx | 18 ++
5 files changed, 95 insertions(+), 4 deletions(-)
New commits:
commit 90e85e829cd2b934c750e005f43975e71ea21caa
Author: Luboš Luňák
AuthorDate: Mon Jun 22 11:42:22 2020 +0200
Commit: Xisco Fauli
CommitDate: Tue Jul 7 11:10:22 2020 +0200
failed cell dependency check should not set invalid values (tdf#132451)
Calc's dependency check done before parallel formula cell group
calculation tries to ensure valid cell values for all the dependencies
of the group's cell, and if it detects a problem such as a cycle
it bails out. But since ScFormulaCell::Interpret() simply bailed out
without doing anything, other cells could use that cell's possibly
incorrect value for their calculation and get their dirty flag reset.
This fix adds a flag to mark that bailing out is in progress, which
ensures the bail-out is short-circuited and no cell values are set.
Change-Id: Ia93c70d456682e19ce533abd2cf65ce35ffed9ca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96838
Reviewed-by: Dennis Francis
Tested-by: Jenkins
(cherry picked from commit 82803ef4736fbed89dd8ae0723f2c4f30e37ba8e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96801
(cherry picked from commit afb6dd43af5d1179c2e3cd8f00794cd4c3d75b2d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97493
Reviewed-by: Xisco Fauli
diff --git a/sc/inc/recursionhelper.hxx b/sc/inc/recursionhelper.hxx
index 9988a676203b..477eb2a4d00e 100644
--- a/sc/inc/recursionhelper.hxx
+++ b/sc/inc/recursionhelper.hxx
@@ -64,6 +64,7 @@ class ScRecursionHelper
boolbInIterationReturn;
boolbConverging;
boolbGroupsIndependent;
+boolbAbortingDependencyComputation;
std::vector< ScFormulaCell* > aTemporaryGroupCells;
std::unordered_set< ScFormulaCellGroup* >* pFGSet;
@@ -77,8 +78,8 @@ public:
voidIncRecursionCount() { ++nRecursionCount; }
voidDecRecursionCount() { --nRecursionCount; }
sal_uInt16 GetDepComputeLevel() const { return
nDependencyComputationLevel; }
-voidIncDepComputeLevel(){ ++nDependencyComputationLevel; }
-voidDecDepComputeLevel(){ --nDependencyComputationLevel; }
+voidIncDepComputeLevel();
+voidDecDepComputeLevel();
/// A pure recursion return, no iteration.
boolIsInRecursionReturn() const { return bInRecursionReturn &&
!bInIterationReturn; }
@@ -116,6 +117,11 @@ public:
bool AnyCycleMemberInDependencyEvalMode(ScFormulaCell* pCell);
bool AnyParentFGInCycle();
void SetFormulaGroupDepEvalMode(bool bSet);
+// When dependency computation detects a cycle, it may not compute proper
cell values.
+// This sets a flag that ScFormulaCell will use to avoid setting those new
values
+// and resetting the dirty flag, until the dependency computation bails
out.
+void AbortDependencyComputation();
+bool IsAbortingDependencyComputation() const { return
bAbortingDependencyComputation; }
void AddTemporaryGroupCell(ScFormulaCell* cell);
void CleanTemporaryGroupCells();
diff --git a/sc/qa/unit/parallelism.cxx b/sc/qa/unit/parallelism.cxx
index 9af1daaca9e0..7bd370db3a54 100644
--- a/sc/qa/unit/parallelism.cxx
+++ b/sc/qa/unit/parallelism.cxx
@@ -48,6 +48,7 @@ public:
void testFormulaGroupWithForwardSelfReference();
void testFormulaGroupsInCyclesAndWithSelfReference();
void testFormulaGroupsInCyclesAndWithSelfReference2();
+void testFormulaGroupsInCyclesAndWithSelfReference3();
CPPUNIT_TEST_SUITE(ScParallelismTest);
CPPUNIT_TEST(testSUMIFS);
@@ -66,6 +67,7 @@ public:
CPPUNIT_TEST(testFormulaGroupWithForwardSelfReference);
CPPUNIT_TEST(testFormulaGroupsInCyclesAndWithSelfReference);
CPPUNIT_TEST(testFormulaGroupsInCyclesAndWithSelfReference2);
+CPPUNIT_TEST(testFormulaGroupsInCyclesAndWithSelfReference3);
CPPUNIT_TEST_SUITE_END();
private:
@@ -979,6 +981,58 @@ void
ScParallelismTest::testFormulaGroupsInCyclesAndWithSelfReference2()
m_pDoc->DeleteTab(0);
}
+void ScParallelismTest::testFormulaGroupsInCyclesAndWithSelfReference3()
+{
+sc::AutoCalcSwitch aACSwitch(*m_pDoc, false);
+m_pDoc->InsertTab(0, "1");
+
+m_pDoc->SetValue(1, 1, 0, 2.0); // B2 <== 2
+for (size_t nRow = 1; nRow < 105; ++nRow)
+{
+// Formula-group in B3:B104 with first cell "=D2+0.001"
+if( nRow != 1 )
+m_pDoc->SetFormula(ScAddress(1, nRow, 0), "=D" +
OUString::number(nRow) + "+0
[Libreoffice-commits] core.git: svtools/uiconfig
svtools/uiconfig/ui/thineditcontrol.ui |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 3a52e3ba6795b967d6b147bf3d1babd9b1cdc7cd Author: Caolán McNamara AuthorDate: Mon Jul 6 17:14:38 2020 +0100 Commit: Caolán McNamara CommitDate: Tue Jul 7 10:54:55 2020 +0200 let browsebox entry stretch to fit allocated space Change-Id: I7b09fd8cebed503c86b3df131eb2d7b1a07ef21c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98222 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/svtools/uiconfig/ui/thineditcontrol.ui b/svtools/uiconfig/ui/thineditcontrol.ui index fd88ec456cd8..6e9911425b09 100644 --- a/svtools/uiconfig/ui/thineditcontrol.ui +++ b/svtools/uiconfig/ui/thineditcontrol.ui @@ -6,6 +6,7 @@ True False True +True vertical 6 @@ -19,7 +20,7 @@ 1 -False +True True 0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/filter sw/source writerfilter/source
include/filter/msfilter/ww8fields.hxx | 130 ++
sw/source/filter/ww8/fields.hxx | 107 --
sw/source/filter/ww8/ww8atr.cxx |8 -
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 112 ++
4 files changed, 245 insertions(+), 112 deletions(-)
New commits:
commit ae2e8202407e82c9b14f0cc307742561f8c6e530
Author: Michael Stahl
AuthorDate: Mon Jul 6 19:14:08 2020 +0200
Commit: Michael Stahl
CommitDate: Tue Jul 7 10:48:06 2020 +0200
tdf#134264 writerfilter: fix DOCX->DOC of ADDRESSBLOCK field
... and other unsupported ones; the problem was that the field got
exported with ww::eUNKNOWN = 1, which can't be imported again.
Move the ww8 eField enum to include/ so it can be used from
writerfilter.
(regression from
e511a0ca5dde6d731bb126bbfe21768867890102..d9030ad6298e2f49ee63489d6158ea6ad23c0111)
Change-Id: I19193392d62fdf0bba01fac2516bafe9fdfa5a99
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98221
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/include/filter/msfilter/ww8fields.hxx
b/include/filter/msfilter/ww8fields.hxx
new file mode 100644
index ..8399fe22edb0
--- /dev/null
+++ b/include/filter/msfilter/ww8fields.hxx
@@ -0,0 +1,130 @@
+/* -*- 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 .
+ */
+
+#pragma once
+
+namespace ww
+{
+enum eField
+{
+eNONE = 0,
+eUNKNOWN = 1,
+ePOSSIBLEBOOKMARK = 2,
+eREF = 3,
+eXE = 4,
+eFOOTREF = 5,
+eSET = 6,
+eIF = 7,
+eINDEX = 8,
+eTC = 9,
+eSTYLEREF = 10,
+eRD = 11,
+eSEQ = 12,
+eTOC = 13,
+eINFO = 14,
+eTITLE = 15,
+eSUBJECT = 16,
+eAUTHOR = 17,
+eKEYWORDS = 18,
+eCOMMENTS = 19,
+eLASTSAVEDBY = 20,
+eCREATEDATE = 21,
+eSAVEDATE = 22,
+ePRINTDATE = 23,
+eREVNUM = 24,
+eEDITTIME = 25,
+eNUMPAGES = 26,
+eNUMWORDS = 27,
+eNUMCHARS = 28,
+eFILENAME = 29,
+eTEMPLATE = 30,
+eDATE = 31,
+eTIME = 32,
+ePAGE = 33,
+eEquals = 34,
+eQUOTE = 35,
+eMERGEINC = 36,
+ePAGEREF = 37,
+eASK = 38,
+eFILLIN = 39,
+eMERGEDATA = 40,
+eNEXT = 41,
+eNEXTIF = 42,
+eSKIPIF = 43,
+eMERGEREC = 44,
+eDDEREF = 45,
+eDDEAUTOREF = 46,
+eGLOSSREF = 47,
+ePRINT = 48,
+eEQ = 49,
+eGOTOBUTTON = 50,
+eMACROBUTTON = 51,
+eAUTONUMOUT = 52,
+eAUTONUMLGL = 53,
+eAUTONUM = 54,
+eINCLUDETIFF = 55,
+eLINK = 56,
+eSYMBOL = 57,
+eEMBED = 58,
+eMERGEFIELD = 59,
+eUSERNAME = 60,
+eUSERINITIALS = 61,
+eUSERADDRESS = 62,
+eBARCODE = 63,
+eDOCVARIABLE = 64,
+eSECTION = 65,
+eSECTIONPAGES = 66,
+eINCLUDEPICTURE = 67,
+eINCLUDETEXT = 68,
+eFILESIZE = 69,
+eFORMTEXT = 70,
+eFORMCHECKBOX = 71,
+eNOTEREF = 72,
+eTOA = 73,
+eTA = 74,
+eMERGESEQ = 75,
+eMACRO = 76,
+ePRIVATE = 77,
+eDATABASE = 78,
+eAUTOTEXT = 79,
+eCOMPARE = 80,
+ePLUGIN = 81,
+eSUBSCRIBER = 82,
+eFORMDROPDOWN = 83,
+eADVANCE = 84,
+eDOCPROPERTY = 85,
+eUNKNOWN2 = 86,
+eCONTROL = 87,
+eHYPERLINK = 88,
+eAUTOTEXTLIST = 89,
+eLISTNUM = 90,
+eHTMLCONTROL = 91,
+eBIDIOUTLINE = 92,
+eADDRESSBLOCK = 93,
+eGREETINGLINE = 94,
+eSHAPE = 95,
+// NOTE: values > 95 / 0x5F do not correspond to documented WW8 fields
+// and thus need special handling in WW8Export::OutputField()!
+eBIBLIOGRAPHY = 96,
+eCITATION = 97,
+eFORMDATE = 98,
+};
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/fields.hxx b/sw/source/filter/ww8/fields.hxx
index 8e24ca11d37b..9f3b0aafa252 100644
--- a/sw/source/filter/ww8/fields.hxx
+++ b/sw/source/filter/ww8/fields.hxx
@@ -21,113 +21,10 @@
#ifndef INCLUDED_SW_SOURCE_FILTER_WW8_FIELDS_HXX
#define INCLUDED_SW_SOURCE_FILTER_WW8_FIELDS_HXX
+#include
+
namespace ww
{
-enum eField
-{
-eNONE = 0,
-eUNKNOWN = 1,
-ePOSSIBLEBOOKMARK = 2,
-
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/map/Clipboard.js | 16
1 file changed, 16 insertions(+)
New commits:
commit 39d5d55d719730f42073df86d1103888598a9042
Author: Szymon Kłos
AuthorDate: Tue Jul 7 09:31:36 2020 +0200
Commit: Szymon Kłos
CommitDate: Tue Jul 7 10:37:29 2020 +0200
clipboard: no stub message when copy is disabled
When copy is disabled don't put stub message about
download button in the clipboard.
Allow internal copy & paste when copy is disabled
- so disable only external interaction.
Change-Id: Ie7864abc8a239aa068880545cf09a48155ebbaea
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98237
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
diff --git a/loleaflet/src/map/Clipboard.js b/loleaflet/src/map/Clipboard.js
index 31a459aa2..694019246 100644
--- a/loleaflet/src/map/Clipboard.js
+++ b/loleaflet/src/map/Clipboard.js
@@ -139,6 +139,16 @@ L.Clipboard = L.Class.extend({
));
},
+ // put in the clipboard if copy is disabled
+ _getCopyDisabledHtml: function() {
+ var lang = 'en_US'; // FIXME: l10n
+ return this._substProductName(this._originWrapBody(
+ ' \n' +
+ '\n' +
+ ' \n', true
+ ));
+ },
+
_getMetaOrigin: function (html) {
var match = 'https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-3' - configure.ac
configure.ac |3 +++ 1 file changed, 3 insertions(+) New commits: commit 327b2da4fb1211fb5c46b5a52d679f3ddb0de618 Author: Michael Stahl AuthorDate: Tue Jul 7 10:12:39 2020 +0200 Commit: Michael Stahl CommitDate: Tue Jul 7 10:13:38 2020 +0200 configure: try to fail early if qt5 header QtCore/qconfig-32.h missing Unfortunately configure passes successfully if qt5-qtbase-devel-*.x86_64 is installed but the host cpu is i686. Change-Id: I6afcec6e18294daa48e92e4f3879d96365ce337f diff --git a/configure.ac b/configure.ac index df7094a8145c..2a32ba1cd42d 100644 --- a/configure.ac +++ b/configure.ac @@ -11348,6 +11348,9 @@ then if test "x$qt5_incdir" = "xno"; then AC_MSG_ERROR([Qt5 headers not found. Please specify the root of your Qt5 installation by exporting QT5DIR before running "configure".]) fi +# check for scenario: qt5-qtbase-devel-*.86_64 installed but host is i686 +AC_CHECK_HEADER(QtCore/qconfig.h, [], +[AC_MSG_ERROR(qconfig.h header not found.)], []) AC_MSG_CHECKING([for Qt5 libraries]) qt5_libdir="no" ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/map/Clipboard.js |9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
New commits:
commit ac7125b1ea4f451a4dfef0a7eed999e18ff0f51b
Author: Szymon Kłos
AuthorDate: Tue Jul 7 09:52:04 2020 +0200
Commit: Szymon Kłos
CommitDate: Tue Jul 7 10:16:59 2020 +0200
clipboard: avoid error when localStorage is not available
In some browsers with strange settings localStorage is
not available.
Change-Id: If9e5ebeb9701cc0a2b19c5946bcbc23f76a8c577
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98238
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
diff --git a/loleaflet/src/map/Clipboard.js b/loleaflet/src/map/Clipboard.js
index 39f5f6f10..31a459aa2 100644
--- a/loleaflet/src/map/Clipboard.js
+++ b/loleaflet/src/map/Clipboard.js
@@ -770,10 +770,13 @@ L.Clipboard = L.Class.extend({
_userAlreadyWarned: function (warning) {
var itemKey = warning;
- if (!localStorage.getItem(itemKey)) {
- localStorage.setItem(itemKey, '1');
+ var storage = localStorage;
+ if (storage && !storage.getItem(itemKey)) {
+ storage.setItem(itemKey, '1');
return false;
- }
+ } else if (!storage)
+ return false;
+
return true;
},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/source sw/qa
chart2/source/view/main/ChartView.cxx | 10 +-
chart2/source/view/main/VTitle.cxx | 15 ---
chart2/source/view/main/VTitle.hxx |3 ++-
sw/qa/extras/layout/data/tdf134146.docx |binary
sw/qa/extras/layout/layout.cxx | 17 +
5 files changed, 40 insertions(+), 5 deletions(-)
New commits:
commit 23b73bc02536455df75438e19b5c70bacc9aa700
Author: Tünde Tóth
AuthorDate: Wed Jul 1 15:48:19 2020 +0200
Commit: László Németh
CommitDate: Tue Jul 7 10:13:38 2020 +0200
tdf#134146 Chart OOXML import: break long horizontal Y axis title
Workaround to handle long (near) horizontal Y axis titles,
like MSO does.
See commit 17f131fcb3f534792a3b2ec6048d03fb54b55eb1
(tdf#134235 Chart OOXML import: fix long chart title).
Change-Id: I215aaa8e2ca18920e2b7ca5761c5bed7e8d19663
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97631
Tested-by: László Németh
Reviewed-by: László Németh
diff --git a/chart2/source/view/main/ChartView.cxx
b/chart2/source/view/main/ChartView.cxx
index faa7fbe3511a..a6c09be30b1d 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -2139,15 +2139,23 @@ std::shared_ptr lcl_createTitle(
TitleHelper::eTitleType eType
//create title
awt::Size aTextMaxWidth(rPageSize.Width, rPageSize.Height);
+bool bYAxisTitle = false;
if (eType == TitleHelper::MAIN_TITLE || eType == TitleHelper::SUB_TITLE)
{
aTextMaxWidth.Width = static_cast(rPageSize.Width * 0.8);
aTextMaxWidth.Height = static_cast(rPageSize.Height * 0.5);
}
+else if (eType == TitleHelper::Y_AXIS_TITLE || eType ==
TitleHelper::SECONDARY_Y_AXIS_TITLE
+ || eType == TitleHelper::TITLE_AT_STANDARD_Y_AXIS_POSITION)
+{
+aTextMaxWidth.Width = static_cast(rPageSize.Width * 0.2);
+aTextMaxWidth.Height = static_cast(rPageSize.Height * 0.8);
+bYAxisTitle = true;
+}
apVTitle = std::make_shared(xTitle);
OUString aCID =
ObjectIdentifier::createClassifiedIdentifierForObject(xTitle, rModel);
apVTitle->init(xPageShapes, xShapeFactory, aCID);
-apVTitle->createShapes(awt::Point(0, 0), rPageSize, aTextMaxWidth);
+apVTitle->createShapes(awt::Point(0, 0), rPageSize, aTextMaxWidth,
bYAxisTitle);
awt::Size aTitleUnrotatedSize = apVTitle->getUnrotatedSize();
awt::Size aTitleSize = apVTitle->getFinalSize();
diff --git a/chart2/source/view/main/VTitle.cxx
b/chart2/source/view/main/VTitle.cxx
index 53e214f76999..f0befe954659 100644
--- a/chart2/source/view/main/VTitle.cxx
+++ b/chart2/source/view/main/VTitle.cxx
@@ -100,7 +100,8 @@ void VTitle::changePosition( const awt::Point& rPos )
void VTitle::createShapes(
const awt::Point& rPos
, const awt::Size& rReferenceSize
-, const awt::Size& rTextMaxWidth )
+, const awt::Size& rTextMaxWidth
+, bool bYAxisTitle )
{
if(!m_xTitle.is())
return;
@@ -126,8 +127,16 @@ void VTitle::createShapes(
}
sal_Int32 nTextMaxWidth;
-if (m_fRotationAngleDegree <= 15.0 || m_fRotationAngleDegree >= 345.0
-|| (m_fRotationAngleDegree >= 165.0 && m_fRotationAngleDegree <=
195.0))
+if (bYAxisTitle)
+{
+if (m_fRotationAngleDegree < 75.0 || m_fRotationAngleDegree > 285.0
+|| (m_fRotationAngleDegree > 105.0 && m_fRotationAngleDegree <
255.0))
+nTextMaxWidth = rTextMaxWidth.Width;
+else
+nTextMaxWidth = rTextMaxWidth.Height;
+}
+else if (m_fRotationAngleDegree <= 15.0 || m_fRotationAngleDegree >= 345.0
+ || (m_fRotationAngleDegree >= 165.0 && m_fRotationAngleDegree <=
195.0))
nTextMaxWidth = rTextMaxWidth.Width;
else
nTextMaxWidth = rTextMaxWidth.Height;
diff --git a/chart2/source/view/main/VTitle.hxx
b/chart2/source/view/main/VTitle.hxx
index 261458025956..9fb0e905fa8a 100644
--- a/chart2/source/view/main/VTitle.hxx
+++ b/chart2/source/view/main/VTitle.hxx
@@ -45,7 +45,8 @@ public:
voidcreateShapes( const css::awt::Point& rPos
, const css::awt::Size& rReferenceSize
- , const css::awt::Size& nTextMaxWidth );
+ , const css::awt::Size& nTextMaxWidth
+ , bool bYAxisTitle );
double getRotationAnglePi() const;
css::awt::Size getUnrotatedSize() const;
diff --git a/sw/qa/extras/layout/data/tdf134146.docx
b/sw/qa/extras/layout/data/tdf134146.docx
new file mode 100644
index ..9fe1bc06196f
Binary files /dev/null and b/sw/qa/extras/layout/data/tdf134146.docx differ
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index a4c46a3d69de..94cd82d26782 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -2840,6 +2840,23 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf134235)
assertXPath(pXmlDoc, "//textarray", 1
[GSoC] Week 5 Report
Hi all, I am excited to announce that the first evaluation has been completed and I'm happy to have made it in the second phase of coding. Thanks to my mentor for his continuous support. Here's the week 5 report: * I was stuck with a problem and after not getting it myself, I discussed it with my mentor + Basically, it occurred during the refactoring of aSvDrawStorageRef to binary engine. + I did not give much time this week to work on this issue, that's why there is a bit of lag. + Yesterday, after communicating with my mentor, I applied his solution and now it seems to be working almost fine.. [1] + Will make further improvement to it today. Warm Regards, Aditya Sahu [1] https://gerrit.libreoffice.org/c/core/+/96764 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
