[Libreoffice-commits] core.git: sc/qa sc/source sc/uiconfig
sc/qa/uitest/autofilter/autofilter.py | 45 +
sc/qa/uitest/autofilter/data/tdf133160.ods |binary
sc/source/ui/cctrl/checklistmenu.cxx | 25 ++--
sc/source/ui/inc/checklistmenu.hxx |4 +-
sc/source/ui/view/gridwin.cxx | 40 +++--
sc/uiconfig/scalc/ui/filterdropdown.ui |3 +
6 files changed, 110 insertions(+), 7 deletions(-)
New commits:
commit 2d43c425a0de003a37bc278c3786d89165ecaf76
Author: Attila Szűcs
AuthorDate: Wed Aug 19 10:50:22 2020 +0200
Commit: László Németh
CommitDate: Fri Aug 28 08:56:31 2020 +0200
tdf#133160 sc: fix width of Autofilter popup window
Autofilter popup window will be automatically resized horizontally
to make sure its list items are fit into the window, if possible.
The window width is capped at 1024 pixel. If it is not enough,
horizontal scrollbar will appear for the TreeList.
Co-authored-by: Tibor Nagy (NISZ)
Change-Id: I49ce9ec2c715010d604357e4955eee86d276d713
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100978
Tested-by: László Németh
Reviewed-by: László Németh
diff --git a/sc/qa/uitest/autofilter/autofilter.py
b/sc/qa/uitest/autofilter/autofilter.py
index 57504e66e8e9..a0264f07878c 100644
--- a/sc/qa/uitest/autofilter/autofilter.py
+++ b/sc/qa/uitest/autofilter/autofilter.py
@@ -6,6 +6,7 @@
#
from uitest.framework import UITestCase
+from uitest.uihelper.common import get_state_as_dict
from uitest.path import get_srcdir_url
from libreoffice.uno.propertyvalue import mkPropertyValues
@@ -70,4 +71,48 @@ class AutofilterTest(UITestCase):
self.assertTrue(is_row_hidden(doc, 3))
self.assertFalse(is_row_hidden(doc, 4))
+def test_tdf133160(self):
+doc = self.ui_test.load_file(get_url_for_data_file("tdf133160.ods"))
+
+xGridWin = self.xUITest.getTopFocusWindow().getChild("grid_window")
+xGridWin.executeAction("LAUNCH", mkPropertyValues({"AUTOFILTER": "",
"COL": "1", "ROW": "3"}))
+xFloatWindow = self.xUITest.getFloatWindow()
+xCheckListMenu = xFloatWindow.getChild("check_list_menu")
+xTreeList = xCheckListMenu.getChild("check_list_box")
+size1 = int(get_state_as_dict(xTreeList)["Size"].split('x')[0])
+xOkBtn = xFloatWindow.getChild("cancel")
+xOkBtn.executeAction("CLICK", tuple())
+
+xGridWin.executeAction("LAUNCH", mkPropertyValues({"AUTOFILTER": "",
"COL": "2", "ROW": "3"}))
+xFloatWindow = self.xUITest.getFloatWindow()
+xCheckListMenu = xFloatWindow.getChild("check_list_menu")
+xTreeList = xCheckListMenu.getChild("check_list_box")
+size2 = int(get_state_as_dict(xTreeList)["Size"].split('x')[0])
+xOkBtn = xFloatWindow.getChild("cancel")
+xOkBtn.executeAction("CLICK", tuple())
+
+xGridWin.executeAction("LAUNCH", mkPropertyValues({"AUTOFILTER": "",
"COL": "3", "ROW": "3"}))
+xFloatWindow = self.xUITest.getFloatWindow()
+xCheckListMenu = xFloatWindow.getChild("check_list_menu")
+xTreeList = xCheckListMenu.getChild("check_list_box")
+size3 = int(get_state_as_dict(xTreeList)["Size"].split('x')[0])
+xOkBtn = xFloatWindow.getChild("cancel")
+xOkBtn.executeAction("CLICK", tuple())
+
+xGridWin.executeAction("LAUNCH", mkPropertyValues({"AUTOFILTER": "",
"COL": "4", "ROW": "3"}))
+xFloatWindow = self.xUITest.getFloatWindow()
+xCheckListMenu = xFloatWindow.getChild("check_list_menu")
+xTreeList = xCheckListMenu.getChild("check_list_box")
+size4 = int(get_state_as_dict(xTreeList)["Size"].split('x')[0])
+
+xOkBtn = xFloatWindow.getChild("cancel")
+xOkBtn.executeAction("CLICK", tuple())
+
+self.assertTrue(size1 < size2) # for me they were size1=176 size2=212
size3=459 size4=1012
+self.assertTrue(size2 < size3) # size1 is the minimum window width,
size2 based on its column width
+self.assertTrue(size3 < size4) # size3 is a long text width
+self.assertTrue(size4 < 1500) # size4 is the maximum window width
with a really long text
+
+self.ui_test.close_doc()
+
# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sc/qa/uitest/autofilter/data/tdf133160.ods
b/sc/qa/uitest/autofilter/data/tdf133160.ods
new file mode 100644
index ..40f83e60af97
Binary files /dev/null and b/sc/qa/uitest/autofilter/data/tdf133160.ods differ
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx
b/sc/source/ui/cctrl/checklistmenu.cxx
index 7422a1a93b52..9a9259f9f796 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -1159,14 +1159,17 @@ namespace
}
}
-size_t ScCheckListMenuControl::initMembers()
+size_t ScCheckListMenuControl::initMembers(int nMaxMemberWidth)
{
size_t n = maMembers.size();
size_t nVisMemCount = 0;
+if (nMaxMemberWidth
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/src
loleaflet/src/core/Socket.js |9 +
1 file changed, 5 insertions(+), 4 deletions(-)
New commits:
commit 39c778e0cf4e37b5621a06798cd5147604505bc5
Author: Henry Castro
AuthorDate: Thu Jul 23 19:33:02 2020 -0400
Commit: Andras Timar
CommitDate: Fri Aug 28 08:37:14 2020 +0200
loleaflet: fix the "vex" dialog that throw an uncaught type error
This happens when a dialog related to saving a document conflict
Change-Id: I37c4840ef09f421a16c0313891b75a61be9c881d
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99342
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Henry Castro
(cherry picked from commit e98459439e405896bc7f36178bbaf07c40033bbc)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101461
Reviewed-by: Andras Timar
diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index a5f8ee5ed..95588578e 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -550,6 +550,7 @@ L.Socket = L.Class.extend({
}
else if (command.errorKind === 'documentconflict')
{
+ var that = this;
storageError =
errorMessages.storage.documentconflict;
vex.closeAll();
@@ -578,15 +579,15 @@ L.Socket = L.Class.extend({
callback: function(value) {
if (value === 'discard') {
// They want to refresh
the page and load document again for all
-
this.sendMessage('closedocument');
+
that.sendMessage('closedocument');
} else if (value ===
'overwrite') {
// They want to
overwrite
-
this.sendMessage('savetostorage force=1');
+
that.sendMessage('savetostorage force=1');
} else if (value === 'saveas') {
- var filename =
this._map['wopi'].BaseFileName;
+ var filename =
that._map['wopi'].BaseFileName;
if (filename) {
filename =
L.LOUtil.generateNewFileName(filename, '_new');
-
this._map.saveAs(filename);
+
that._map.saveAs(filename);
}
}
},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: avmedia/source basctl/source basic/source chart2/source comphelper/source compilerplugins/clang connectivity/source cppuhelper/source cui/source dbaccess/source desktop
avmedia/source/viewer/mediawindow_impl.cxx |4 avmedia/source/vlc/vlcframegrabber.cxx |4 avmedia/source/vlc/vlcplayer.cxx |4 avmedia/source/vlc/vlcwindow.cxx |4 avmedia/source/vlc/wrapper/SymbolLoader.hxx |2 basctl/source/basicide/baside2b.cxx |2 basctl/source/basicide/basidectrlr.cxx |2 basctl/source/basicide/bastype2.cxx |4 basctl/source/basicide/bastype3.cxx |2 basctl/source/basicide/localizationmgr.cxx |6 basctl/source/basicide/moduldl2.cxx |2 basic/source/classes/sbunoobj.cxx |2 basic/source/sbx/sbxscan.cxx | 22 chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx |4 chart2/source/controller/dialogs/ChartTypeDialogController.cxx | 20 chart2/source/controller/dialogs/DialogModel.cxx |2 chart2/source/controller/dialogs/res_DataLabel.cxx |2 chart2/source/controller/dialogs/tp_DataSource.cxx |2 chart2/source/controller/main/ChartController_Window.cxx |2 chart2/source/controller/sidebar/ChartColorWrapper.cxx |4 chart2/source/model/main/ChartModel.cxx |4 chart2/source/tools/ErrorBar.cxx | 32 chart2/source/tools/ExponentialRegressionCurveCalculator.cxx |2 chart2/source/view/main/ChartView.cxx |4 comphelper/source/container/embeddedobjectcontainer.cxx |2 comphelper/source/misc/backupfilehelper.cxx |2 comphelper/source/misc/profilezone.cxx |2 comphelper/source/misc/storagehelper.cxx |4 comphelper/source/officeinstdir/officeinstallationdirectories.cxx |4 comphelper/source/xml/ofopxmlhelper.cxx | 36 compilerplugins/clang/stringstatic.cxx |4 compilerplugins/clang/test/conditionalstring.cxx |2 compilerplugins/clang/test/elidestringvar.cxx |2 compilerplugins/clang/test/staticvar.cxx |2 compilerplugins/clang/test/stringadd.cxx |3 compilerplugins/clang/test/stringconcatliterals.cxx | 14 connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx |2 connectivity/source/drivers/firebird/Connection.cxx |4 connectivity/source/drivers/hsqldb/HDriver.cxx |2 connectivity/source/drivers/jdbc/DatabaseMetaData.cxx | 14 connectivity/source/drivers/mork/MDatabaseMetaData.cxx |4 connectivity/source/drivers/mysql_jdbc/YTable.cxx |2 cppuhelper/source/typemanager.cxx | 30 cui/source/dialogs/colorpicker.cxx |4 cui/source/dialogs/scriptdlg.cxx |2 cui/source/inc/cfg.hxx |2 cui/source/options/dbregister.cxx |2 cui/source/options/treeopt.cxx | 26 cui/source/tabpages/border.cxx | 74 dbaccess/source/core/api/SingleSelectQueryComposer.cxx |2 dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx |6 desktop/qa/desktop_lib/test_desktop_lib.cxx |2 desktop/source/deployment/registry/component/dp_component.cxx |2 desktop/source/lib/init.cxx
[Libreoffice-commits] core.git: filter/source
filter/source/svg/presentation_engine.js |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 554834484a3323f73b5aeace246bcd9635368967
Author: Marco Cecchetti
AuthorDate: Wed Aug 26 09:06:59 2020 +0200
Commit: Andras Timar
CommitDate: Fri Aug 28 07:03:59 2020 +0200
filter: svg export: error when playing an animated empty text field
Change-Id: I4af15c4503dbd8953c1caf2a51a09f41b94ca6f0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101359
Tested-by: Jenkins
Reviewed-by: Andras Timar
diff --git a/filter/source/svg/presentation_engine.js
b/filter/source/svg/presentation_engine.js
index 5e67ecd2ea7e..cc67d3252a96 100644
--- a/filter/source/svg/presentation_engine.js
+++ b/filter/source/svg/presentation_engine.js
@@ -9647,6 +9647,7 @@ function NodeContext( aSlideShowContext )
this.aSourceEventElementMap = null;
this.nStartDelay = 0.0;
this.bFirstRun = undefined;
+this.bIsInvalid = false;
this.aSlideHeight = HEIGHT;
this.aSlideWidth = WIDTH;
}
@@ -9919,7 +9920,7 @@ BaseNode.prototype.init = function()
BaseNode.prototype.resolve = function()
{
-if( ! this.checkValidNode() )
+if( this.aNodeContext.bIsInvalid || ! this.checkValidNode() )
return false;
this.DBG( this.callInfo( 'resolve' ) );
@@ -15212,7 +15213,8 @@ SlideAnimations.prototype.start = function()
this.aContext.bFirstRun = false;
// init all nodes
-if( !this.aRootNode.init() )
+this.aContext.bIsInvalid = !this.aRootNode.init();
+if( this.aContext.bIsInvalid )
return false;
// resolve root node
@@ -15240,6 +15242,7 @@ SlideAnimations.prototype.end = function(
bLeftEffectsSkipped )
this.aContext.bFirstRun = false;
}
+this.aContext.bIsInvalid = false;
};
SlideAnimations.prototype.dispose = function()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
XML-Questions
Hello,
I wrote a tool in C++ to work on content.xml directly to replace some
placeholders without using the libreoffice libraries.
I wonder about some XML constructions.
In a Writer document I write:
Manfred Rebentisch{{today}}
The XML:
Manfred Rebentisch{{today}}
Why is the "h" separated? T6 is:
But why?
In another line I write in bold and centered:
Rechnung Nr. {{orderid}}
The XML is:
Rechnung Nr.
{
{
orderid}
}
But why this crazy construction?
In another line I write only
{{name}}
The XML:
{{name}}
Is it possible to store the document in a cleaner way?
Thank you for answers,
Manfred
--
COMPARAT Software-Entwicklungs-GmbH
Willy-Brandt-Allee 31a
23554 Lübeck
Web: https://comparat.de
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Crash test update
On Wed, 2020-08-26 at 05:57 +, crashtest wrote: > New crashtest update available at > https://dev-builds.libreoffice.org/crashtest/03e28651142af2ffa7a3749b879f31bde98a2173/ commit c123bfff501229f398a1b679fc7434b82d53685c (HEAD, refs/bisect/bad) Date: Thu Aug 20 22:58:24 2020 +0300 Bin overly eager early return that stops replacement image creation one of these crashes, ooo38104-1.sxw on export to docx began with the above commit. To reproduce: wget -O ooo38104-1.sxw https://bz.apache.org/ooo/attachment.cgi?id=19889 ./instdir/program/soffice.bin --headless --convert-to docx ./ooo38104- 1.sxw ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: framework/source
framework/source/uielement/toolbarmanager.cxx | 16 +---
1 file changed, 1 insertion(+), 15 deletions(-)
New commits:
commit a486fd929d4b3e915f928ef495b6cb2b96d74a3a
Author: Maxim Monastirsky
AuthorDate: Fri Aug 28 00:52:43 2020 +0300
Commit: Maxim Monastirsky
CommitDate: Fri Aug 28 01:19:49 2020 +0200
Use ToolBarMerger::IsCorrectContext
Change-Id: I1256dcacd364b332232872f48a4eb3ec979fb0a0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101512
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky
diff --git a/framework/source/uielement/toolbarmanager.cxx
b/framework/source/uielement/toolbarmanager.cxx
index 738792c6e653..5dc5c17dca48 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -131,20 +131,6 @@ sal_Int16 getCurrentImageType()
return nImageType;
}
-bool IsCorrectContext( const OUString& rModuleIdentifier, const OUString&
aContextList )
-{
-if ( aContextList.isEmpty() )
-return true;
-
-if ( !rModuleIdentifier.isEmpty() )
-{
-sal_Int32 nIndex = aContextList.indexOf( rModuleIdentifier );
-return ( nIndex >= 0 );
-}
-
-return false;
-}
-
} // end anonymous namespace
// XInterface, XTypeProvider, XServiceInfo
@@ -1207,7 +1193,7 @@ void ToolBarManager::FillAddonToolbar( const Sequence<
Sequence< PropertyValue >
ToolBarMerger::ConvertSequenceToValues( rSeq, aURL, aTitle, aImageId,
aTarget, aContext, aControlType, nWidth );
-if ( IsCorrectContext( m_aModuleIdentifier, aContext ) )
+if ( ToolBarMerger::IsCorrectContext( aContext, m_aModuleIdentifier ) )
{
if ( aURL == "private:separator" )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/uiconfig
svx/uiconfig/ui/sidebargraphic.ui | 101 -- 1 file changed, 64 insertions(+), 37 deletions(-) New commits: commit 751a79444184a1aed1c39062f0a4ab043736c5f6 Author: andreas kainz AuthorDate: Thu Aug 27 17:33:55 2020 +0200 Commit: Andreas Kainz CommitDate: Fri Aug 28 00:48:09 2020 +0200 tdf#136101 Sidebar update image align section Change-Id: I413a9bae5bfece174b1a37d166c8aa1dacb20dd3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101487 Tested-by: Jenkins Reviewed-by: Andreas Kainz diff --git a/svx/uiconfig/ui/sidebargraphic.ui b/svx/uiconfig/ui/sidebargraphic.ui index 26c48bbf5363..3a90c21ba34c 100644 --- a/svx/uiconfig/ui/sidebargraphic.ui +++ b/svx/uiconfig/ui/sidebargraphic.ui @@ -11,7 +11,7 @@ 0.01 10 1 -0.10001 +0.1 1 @@ -54,16 +54,16 @@ True False True +True 6 vertical -12 +3 True False -6 +3 6 -True True @@ -75,7 +75,7 @@ 0 -0 +1 @@ -83,6 +83,7 @@ True True Specify the luminance of the graphic. +True plusminus100adjustment @@ -91,7 +92,7 @@ -0 +1 1 @@ -105,8 +106,8 @@ 0 -1 -0 +0 +2 @@ -114,6 +115,7 @@ True True Specify the degree of difference between the lightest and darkest parts of the graphic. +True plusminus100adjustment1 @@ -123,7 +125,7 @@ 1 -1 +2 @@ -137,13 +139,14 @@ 0 -2 +0 True False +True Color mode @@ -151,8 +154,8 @@ -0 -3 +1 +0 @@ -165,8 +168,8 @@ 0 -1 -2 +0 +3 @@ -174,6 +177,7 @@ True True Specify the percentage of transparency; 0% is fully opaque and 100% is fully transparent. +True 0to100adjustment @@ -186,6 +190,21 @@ 3 + + +False +True +0 + + + + +True +False +True +3 +6 +True True @@ -226,21 +245,21 @@ 0 -4 +0 - + True False 6 - + True False center center -svx/res/symphony/AdjustColorGreen_16x16.png +svx/res/symphony/AdjustColorBlue_16x16.png False @@ -249,42 +268,41 @@ - + True True -Green -plusminus100adjustment3 +Blue +plusminus100adjustment4 - -Green + +Blue True True -end 1 -1 -4 +0 +1
[Libreoffice-commits] core.git: desktop/source sfx2/source
desktop/source/lib/init.cxx |3 ++-
sfx2/source/control/unoctitm.cxx |3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit fb763b5236c6859290902e69dc31a4793e63146c
Author: Pranam Lashkari
AuthorDate: Sat Aug 22 18:48:34 2020 +0530
Commit: Pranam Lashkari
CommitDate: Fri Aug 28 00:18:11 2020 +0200
LOK: send status of the sidebar
sidebar button did not show status initially
similarly view->sidebar did not show checked/unchecked initially
and same problem can be seen in notebookbar
Change-Id: Ie5fdf298d343435514954efaaebfdc628d4a90fe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101182
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101509
Tested-by: Jenkins
Reviewed-by: Pranam Lashkari
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 9c8c51c3672b..d7ac2603fab8 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2825,7 +2825,8 @@ static void doc_iniUnoCommands ()
OUString(".uno:BorderOuter"),
OUString(".uno:FreezePanes"),
OUString(".uno:FreezePanesColumn"),
-OUString(".uno:FreezePanesRow")
+OUString(".uno:FreezePanesRow"),
+OUString(".uno:Sidebar")
};
util::URL aCommandURL;
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index c9cb75dacbf9..c3c48b5305c4 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1017,7 +1017,8 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID,
SfxViewFrame* pViewFra
aEvent.FeatureURL.Path == "AlignDown" ||
aEvent.FeatureURL.Path == "TraceChangeMode" ||
aEvent.FeatureURL.Path == "FormatPaintbrush" ||
-aEvent.FeatureURL.Path == "FreezePanes")
+aEvent.FeatureURL.Path == "FreezePanes" ||
+aEvent.FeatureURL.Path == "Sidebar")
{
bool bTemp = false;
aEvent.State >>= bTemp;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/inc framework/source framework/util officecfg/registry
framework/inc/menuconfiguration.hxx |2
framework/inc/uielement/menubarmanager.hxx |1
framework/source/uielement/menubarmanager.cxx | 227
++
framework/source/uielement/resourcemenucontroller.cxx | 161 +++
framework/util/fwk.component|4
officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu | 11
6 files changed, 230 insertions(+), 176 deletions(-)
New commits:
commit 3a46e402adfd8e0ac1f162de382e03ba92842bcb
Author: Maxim Monastirsky
AuthorDate: Wed Aug 26 14:00:50 2020 +0300
Commit: Maxim Monastirsky
CommitDate: Fri Aug 28 00:17:07 2020 +0200
MenuBarManager: Extract the window list to own controller
Change-Id: Iad3df8cfe0814f510effaac2b7ba6dd926baab7d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101476
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky
diff --git a/framework/inc/menuconfiguration.hxx
b/framework/inc/menuconfiguration.hxx
index 0c8ae43545bd..84943f5326a6 100644
--- a/framework/inc/menuconfiguration.hxx
+++ b/framework/inc/menuconfiguration.hxx
@@ -29,8 +29,6 @@ namespace com::sun::star::io { class XInputStream; }
namespace com::sun::star::io { class XOutputStream; }
namespace com::sun::star::uno { class XComponentContext; }
-const sal_uInt16 START_ITEMID_WINDOWLIST= 4600;
-const sal_uInt16 END_ITEMID_WINDOWLIST = 4699;
const sal_uInt16 ITEMID_ADDONLIST = 6678; // used to be a SID in
sfx2, now just a unique id...
namespace framework
diff --git a/framework/inc/uielement/menubarmanager.hxx
b/framework/inc/uielement/menubarmanager.hxx
index 4fa42c8e8fd1..698b46341579 100644
--- a/framework/inc/uielement/menubarmanager.hxx
+++ b/framework/inc/uielement/menubarmanager.hxx
@@ -162,7 +162,6 @@ class MenuBarManager final :
};
void RetrieveShortcuts( std::vector<
std::unique_ptr >& aMenuShortCuts );
-static void UpdateSpecialWindowMenu( Menu* pMenu, const
css::uno::Reference< css::uno::XComponentContext >& xContext );
static void FillMenuImages( css::uno::Reference<
css::frame::XFrame > const & xFrame, Menu* _pMenu, bool bShowMenuImages );
static void impl_RetrieveShortcutsFromConfiguration( const
css::uno::Reference< css::ui::XAcceleratorConfiguration >& rAccelCfg,
const
css::uno::Sequence< OUString >& rCommands,
diff --git a/framework/source/uielement/menubarmanager.cxx
b/framework/source/uielement/menubarmanager.cxx
index 5359bc712f53..eb3fe530acce 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -28,7 +28,6 @@
#include
#include
#include
-#include
#include
#include
#include
@@ -51,10 +50,8 @@
#include
#include
#include
-#include
#include
#include
-#include
#include
#include
#include
@@ -615,9 +612,6 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu, bool )
m_bActive = true;
-if ( m_aMenuItemCommand == aSpecialWindowCommand )
-UpdateSpecialWindowMenu( pMenu, m_xContext );
-
// Check if some modes have changed so we have to update our menu
images
OUString sIconTheme = SvtMiscOptions().GetIconTheme();
@@ -687,64 +681,57 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu, bool )
if ( !menuItemHandler->xMenuItemDispatch.is() &&
!menuItemHandler->xSubMenuManager.is() )
{
-// There is no dispatch mechanism for the special
window list menu items,
-// because they are handled directly through
XFrame->activate!!!
-// Don't update dispatches for special file menu items.
-if ( menuItemHandler->nItemId <
START_ITEMID_WINDOWLIST ||
- menuItemHandler->nItemId >= END_ITEMID_WINDOWLIST
)
-{
-Reference< XDispatch > xMenuItemDispatch;
+Reference< XDispatch > xMenuItemDispatch;
-aTargetURL.Complete =
menuItemHandler->aMenuItemURL;
+aTargetURL.Complete = menuItemHandler->aMenuItemURL;
-m_xURLTransformer->parseStrict( aTargetURL );
+m_xURLTransformer->parseStrict( aTargetURL );
-if ( bHasDisabledEntries )
-{
-if ( aCmdOptions.Lookup(
SvtCommandOptions::CMDOPTION_DISABLED, aTargetURL.Path ))
-pMenu->HideItem( menuItemHandler->nItemId
);
-}
+if ( bHasDisabledEntries )
+{
+if ( aCmdOptio
[Libreoffice-commits] core.git: sc/source
sc/source/ui/inc/viewdata.hxx |1
sc/source/ui/view/tabvwsh3.cxx | 53 +++--
sc/source/ui/view/tabvwsha.cxx | 15 +--
sc/source/ui/view/viewdata.cxx |7 +
4 files changed, 66 insertions(+), 10 deletions(-)
New commits:
commit 82e620ab36b23b58a1be3f56f694c438395103ee
Author: Pranam Lashkari
AuthorDate: Fri Aug 21 07:41:37 2020 +0530
Commit: Pranam Lashkari
CommitDate: Fri Aug 28 00:16:46 2020 +0200
lok-freezepanes: fixed freeze row and column handling
Added freeze row and column buttons in online UI did not work
because the case for LOK was not handled
Change-Id: I44315c6bc89ae02b7a8ac4c7c493ad7e8eda439e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101127
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Dennis Francis
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101432
Tested-by: Jenkins
Reviewed-by: Pranam Lashkari
diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx
index 3c5c55036f42..2c362b58c4ec 100644
--- a/sc/source/ui/inc/viewdata.hxx
+++ b/sc/source/ui/inc/viewdata.hxx
@@ -656,6 +656,7 @@ public:
SCCOLROWGetLOKSheetFreezeIndex(bool bIsCol) const;
boolSetLOKSheetFreezeIndex(const SCCOLROW nFreezeIndex, bool
bIsCol, SCTAB nForTab = -1);
+boolRemoveLOKFreeze();
voidDeriveLOKFreezeAllSheets();
voidDeriveLOKFreezeIfNeeded(SCTAB nForTab);
voidOverrideWithLOKFreeze(ScSplitMode& eExHSplitMode,
ScSplitMode& eExVSplitMode,
diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx
index 80748d849c3d..f12692547c6a 100644
--- a/sc/source/ui/view/tabvwsh3.cxx
+++ b/sc/source/ui/view/tabvwsh3.cxx
@@ -943,15 +943,52 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
case SID_WINDOW_FIX:
{
-ScSplitMode eHSplit = GetViewData().GetHSplitMode();
-ScSplitMode eVSplit = GetViewData().GetVSplitMode();
-if ( eHSplit == SC_SPLIT_FIX || eVSplit == SC_SPLIT_FIX )
// remove
-RemoveSplit();
+if (!comphelper::LibreOfficeKit::isActive())
+{
+ScSplitMode eHSplit = GetViewData().GetHSplitMode();
+ScSplitMode eVSplit = GetViewData().GetVSplitMode();
+if ( eHSplit == SC_SPLIT_FIX || eVSplit == SC_SPLIT_FIX )
// remove
+RemoveSplit();
+else
+FreezeSplitters( true, SC_SPLIT_METHOD_CURSOR);
// create or fixate
+rReq.Done();
+InvalidateSplit();
+}
else
-FreezeSplitters( true, SC_SPLIT_METHOD_CURSOR);//
create or fixate
+{
+ScViewData& rViewData = GetViewData();
+SCTAB nThisTab = rViewData.GetTabNo();
+bool bChangedX = false, bChangedY = false;
+if (rViewData.GetLOKSheetFreezeIndex(true) > 0 ||
+rViewData.GetLOKSheetFreezeIndex(false) > 0 )
// remove freeze
+{
+bChangedX = rViewData.RemoveLOKFreeze();
+}
// create or fixate
+else
+{
+bChangedX =
rViewData.SetLOKSheetFreezeIndex(rViewData.GetCurX(), true);// Freeze column
+bChangedY =
rViewData.SetLOKSheetFreezeIndex(rViewData.GetCurY(), false); // Freeze row
+}
-rReq.Done();
-InvalidateSplit();
+rReq.Done();
+if (bChangedX || bChangedY)
+{
+rBindings.Invalidate( SID_WINDOW_FIX );
+rBindings.Invalidate( SID_WINDOW_FIX_COL );
+rBindings.Invalidate( SID_WINDOW_FIX_ROW );
+// Invalidate the slot for all views on the same tab
of the document.
+SfxLokHelper::forEachOtherView(this,
[nThisTab](ScTabViewShell* pOther) {
+ScViewData& rOtherViewData = pOther->GetViewData();
+if (rOtherViewData.GetTabNo() != nThisTab)
+return;
+
+SfxBindings& rOtherBind =
rOtherViewData.GetBindings();
+rOtherBind.Invalidate( SID_WINDOW_FIX );
+rOtherBind.Invalidate( SID_WINDOW_FIX_COL );
+rOtherBind.Invalidate( SID_WINDOW_FIX_ROW );
+});
+}
+}
}
break;
@@ -
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/chart/SchXMLAxisContext.cxx |6 +++---
xmloff/source/text/txtfldi.cxx|4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 89c2cd2fad6447b2d5b248147b2388db1cc9392e
Author: Andrea Gelmini
AuthorDate: Thu Aug 27 13:17:10 2020 +0200
Commit: Julien Nabet
CommitDate: Thu Aug 27 22:00:41 2020 +0200
Fix typos in code
It passe "make check" on Linux
Change-Id: I9e663ac6fc4818d74cb4b239387ba8b1d7db0ee4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101470
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/xmloff/source/chart/SchXMLAxisContext.cxx
b/xmloff/source/chart/SchXMLAxisContext.cxx
index 1599550d3a50..ebd512a6bca7 100644
--- a/xmloff/source/chart/SchXMLAxisContext.cxx
+++ b/xmloff/source/chart/SchXMLAxisContext.cxx
@@ -414,16 +414,16 @@ void SchXMLAxisContext::CreateAxis()
}
if( m_aCurrentAxis.eDimension==SCH_XML_AXIS_Z )
{
-bool bSettingZAxisSuccedded = false;
+bool bSettingZAxisSucceeded = false;
try
{
-xDiaProp->getPropertyValue( aPropName ) >>= bSettingZAxisSuccedded;
+xDiaProp->getPropertyValue( aPropName ) >>= bSettingZAxisSucceeded;
}
catch( beans::UnknownPropertyException & )
{
SAL_INFO("xmloff.chart", "Couldn't turn on z axis" );
}
-if( !bSettingZAxisSuccedded )
+if( !bSettingZAxisSucceeded )
return;
}
diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx
index 917c061eb626..d975ef082632 100644
--- a/xmloff/source/text/txtfldi.cxx
+++ b/xmloff/source/text/txtfldi.cxx
@@ -1145,13 +1145,13 @@ const OUStringLiteral gsPropertyIsVisible("IsVisible");
XMLDatabaseFieldImportContext::XMLDatabaseFieldImportContext(
SvXMLImport& rImport, XMLTextImportHelper& rHlp,
const char* pServiceName, sal_uInt16 nPrfx,
-const OUString& sLocalName, bool bUseDisply)
+const OUString& sLocalName, bool bUseDisplay)
: XMLTextFieldImportContext(rImport, rHlp, pServiceName, nPrfx, sLocalName)
, m_nCommandType( sdb::CommandType::TABLE )
, m_bCommandTypeOK(false)
, m_bDisplay( true )
, m_bDisplayOK( false )
-, m_bUseDisplay( bUseDisply )
+, m_bUseDisplay( bUseDisplay )
, m_bDatabaseOK(false)
, m_bDatabaseNameOK(false)
, m_bDatabaseURLOK(false)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/JavaClassSet.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8fd8f2ec973b9bdf4ab12056cd37bb817a53edad Author: Stephan Bergmann AuthorDate: Thu Aug 27 18:35:18 2020 +0200 Commit: Stephan Bergmann CommitDate: Thu Aug 27 21:36:50 2020 +0200 Remove tempfile again Apparently missing from 941b567a41569260fef14a7337511e8f42337323 "tdf#131572 Add java 9 module info for libreoffice.jar". Change-Id: I6c87c79846a1711f78716410a5939e4b88a4f298 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101490 Reviewed-by: Michael Stahl Tested-by: Jenkins diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk index cff4299bf06e..2c3f2dc31c94 100644 --- a/solenv/gbuild/JavaClassSet.mk +++ b/solenv/gbuild/JavaClassSet.mk @@ -60,7 +60,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(if $(T_MODULENAME),--patch-module $(T_MODULENAME)="$(subst $(WHITESPACE),$(gb_CLASSPATHSEP),$(strip $(dir $(PACKAGEDIRS") \ -d $(call gb_JavaClassSet_get_classdir,$(2)) \ @$$RESPONSEFILE &&) \ - ) \ + rm -f $$RESPONSEFILE &&) \ touch $(1)) endef ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/source
framework/source/uielement/menubarmanager.cxx |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 03fe80f43c8210c81a41b84bbf5dc7ad17b2a6b2
Author: Maxim Monastirsky
AuthorDate: Wed Aug 26 17:14:48 2020 +0300
Commit: Maxim Monastirsky
CommitDate: Thu Aug 27 21:28:16 2020 +0200
Command icon changes not reflected in menus
Regression of commit 7383ab517030db0c2d7bf4f393f38743fbcaba04
("loplugin:constantparam in f*").
To reproduce from UI:
1. Start Writer with gen.
2. Open the File menu at least once (so m_bRetrieveImages set to false).
3. Right click on the Standard toolbar > Customize Toolbar...
4. Right click the Open toolbar button > Change Icon..., pick some new
icon, and confirm the changes.
5. Open the File menu and notice that the Open... item there still has
the old icon.
Change-Id: I89ba87aafc56192dc150741244d5cd7c6f7923e2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101443
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky
diff --git a/framework/source/uielement/menubarmanager.cxx
b/framework/source/uielement/menubarmanager.cxx
index 21a4c82b731b..5359bc712f53 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -232,8 +232,7 @@ void SAL_CALL MenuBarManager::elementInserted( const
css::ui::ConfigurationEvent
return;
sal_Int16 nImageType = sal_Int16();
-if (( Event.aInfo >>= nImageType ) &&
-( nImageType == css::ui::ImageType::SIZE_LARGE ))
+if (( Event.aInfo >>= nImageType ) && nImageType == 0 )
RequestImages();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/source
framework/source/uielement/popuptoolbarcontroller.cxx |7 +--
framework/source/uielement/resourcemenucontroller.cxx |5 +
2 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit e9fc3f69cf3c677db5fc5203e95e9d21528dc888
Author: Maxim Monastirsky
AuthorDate: Wed Aug 26 14:26:56 2020 +0300
Commit: Maxim Monastirsky
CommitDate: Thu Aug 27 21:27:34 2020 +0200
Don't pass ResourceURL unconditionally
In case !m_bResourceURL, this is not only unnecessary but
likely incorrect, as it's a dispatch command name, not a
UI resource URL. This helps avoid "The given URL is not
valid: .uno:SaveAsMenu" warning when clicking the toolbar
save button dropdown.
This also reverts 1cbbf63b7670a3d85a5a29df6124467e954cc7e9
("Always prefer Value over ResourceURL"), which no longer
needed.
Change-Id: Ic09c5893988c75c9f5dabb9eb5e2d557fc7fcbcf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101475
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky
diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx
b/framework/source/uielement/popuptoolbarcontroller.cxx
index 8c91779a8518..fe0ed307e76d 100644
--- a/framework/source/uielement/popuptoolbarcontroller.cxx
+++ b/framework/source/uielement/popuptoolbarcontroller.cxx
@@ -242,8 +242,7 @@ void PopupMenuToolbarController::createPopupMenuController()
css::uno::Sequence aArgs {
css::uno::makeAny(comphelper::makePropertyValue("Frame",
m_xFrame)),
css::uno::makeAny(comphelper::makePropertyValue("ModuleIdentifier",
m_sModuleName)),
-css::uno::makeAny(comphelper::makePropertyValue("InToolbar",
true)),
-css::uno::makeAny(comphelper::makePropertyValue("ResourceURL",
m_aPopupCommand))
+css::uno::makeAny(comphelper::makePropertyValue("InToolbar", true))
};
try
@@ -255,6 +254,10 @@ void
PopupMenuToolbarController::createPopupMenuController()
if (m_bResourceURL)
{
+sal_Int32 nAppendIndex = aArgs.getLength();
+aArgs.realloc(nAppendIndex + 1);
+aArgs[nAppendIndex] <<=
comphelper::makePropertyValue("ResourceURL", m_aPopupCommand);
+
m_xPopupMenuController.set(
m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext(
"com.sun.star.comp.framework.ResourceMenuController",
aArgs, m_xContext), css::uno::UNO_QUERY_THROW );
}
diff --git a/framework/source/uielement/resourcemenucontroller.cxx
b/framework/source/uielement/resourcemenucontroller.cxx
index 60a7af1aefba..ea2ff5b6dbf0 100644
--- a/framework/source/uielement/resourcemenucontroller.cxx
+++ b/framework/source/uielement/resourcemenucontroller.cxx
@@ -94,10 +94,7 @@ ResourceMenuController::ResourceMenuController( const
css::uno::Reference< css::
m_aMenuURL = "private:resource/popupmenu/" + aMenuName;
}
else if ( aPropValue.Name == "ResourceURL" )
-{
-if ( m_aMenuURL.isEmpty() )
-aPropValue.Value >>= m_aMenuURL;
-}
+aPropValue.Value >>= m_aMenuURL;
else if ( aPropValue.Name == "Frame" )
aPropValue.Value >>= m_xFrame;
else if ( aPropValue.Name == "ModuleIdentifier" )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-7.0.1.2'
Tag 'libreoffice-7.0.1.2' created by Christian Lohmaier at 2020-08-27 19:21 + Tag libreoffice-7.0.1.2 -BEGIN PGP SIGNATURE- iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl9IB7kACgkQ9DSh76/u rqMfUhAAp5POo4I7zP35sw1fD8sNLN0m5p22nkKTwxFlvesxRnTofi9mHcguu+HG GcNUCp7gQRh3qZ95fE1iwMg4tyYeJYOIe2N7ngeK1u5GZ2RAf9fZFemWo/d9kjGe QTvE2IHeDyfo0FePaO+a7InRJVdTIrmz18BF6Sra4i06q9FqzKaLPxP7Y92Si6Ck Zi0gufNS4+A4plKFoz+2pxMIeiO3v9YT4fvRYGnlupTvQI2nP0EvrSGdB8FhT7I0 XRkaAVsTZbYAGRz0XXCM/QOQs+6ipPW1wvCh/iQ1u9naZjGvri4HguM6JIZubcdf 7QjBLCxfRSTIvJOntj+xfWsWNlvhag7eGw3GpZeokS0wH/iqKpDyjz2kHtJT4+sH qGMswNBF18XFe4Qul4VTkkEr7Xp6oEXv0E82X8i6lvCnCVWY1QF1db0bDJwKECI/ zu+bHkYLY5kRc55BH2MIJbvvPT3K6fM+LPCkXOzxIqqqtTIHcPUnPEDdDrKT1OYc XWB12kE89frQJPS3NjIALR3Yuk0Znuqia3w6DsweH7uAznthRAsW+oybAhUeyu2H 2fadrodt/J+ztUCiy+QoqipJsJw7vP/kVHXDXbVlvJSZ4cyeBwAtTPlJriaa59RQ zH1a27++GrIKIDReE0CkJW2USytNQfnFWgAZ1eM8MeF1Jt7I2lo= =VvrZ -END PGP SIGNATURE- Changes since libreoffice-7-0-branch-point-16: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-7.0.1.2'
Tag 'libreoffice-7.0.1.2' created by Christian Lohmaier at 2020-08-27 19:21 + Tag libreoffice-7.0.1.2 -BEGIN PGP SIGNATURE- iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl9IB7kACgkQ9DSh76/u rqNikhAAq5ng7IYw1YBFwWLNwul2Txd8TH5OcAm+4GJ/c8t2LiggL8kp74rmX9Ru YK8Wh9yZ6KpU2azlyZbxTWeeECF1urMCtmF37KBRl3yP8DxUtkhyuTOxjYhJY1rm RxcmSpQwo3sEUQgsgd399pYMSGvo8Pa1y6K5hworSRG6Sjhri+AQxN050CuWb6eM 2aVk5nZnKiei0bldh6X0YHq2WFxnrkwwaHrHHx9XnqaHzU/CTsDBk3neOlq8qmDC VQGISWwRNOrfIB4Zc9fZ5offeTDXPVgqJRVzxoHJj3QBF4CmKKaPknP30hW5wV9q 01ds5+aLJ2GOSSoSaOYj6m+0MPu12EblNuC1A4LXU8nuPKVow1pV56AJprpdFWrB cuX5ORK58Bjt8b+muhg6VBGhqVIYeJLFSi6xF2IoG/ZIi0pwttVl0Ug+lGW6PVAz gV43bTAFoSgW3rjxQJuvCj93HDu/JsdAqRbej9bdCJWgOiXlZamYW2zkDGt03CIL v/96TT/rZOghT04LKX8aoBv+xd9TVtcx81sLxsT/Ko9EWtlfSQwzpsMa7F0OLRww Ka+O3QY5Ue44linVBS8CNbYNXYI1Zf/nGepVKKajx2W2sfcUHrPJlVzX5QOULYJ+ cqIUsAdC3SlyQQqPIhQd1i8OyUJuV8+MJTkPK+bfyPdgz/M30Aw= =/Ux/ -END PGP SIGNATURE- Changes since libreoffice-7-0-branch-point-658: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-7.0.1.2'
Tag 'libreoffice-7.0.1.2' created by Christian Lohmaier at 2020-08-27 19:21 + Tag libreoffice-7.0.1.2 -BEGIN PGP SIGNATURE- iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl9IB7IACgkQ9DSh76/u rqNwLw/9FdTi7EVshXc1LG/fOJ1xeBMXYTy7EnC8EaetUwjn44qSDkE0htPkkWBC q4SFlyc/V31TVNZqVykz88Z+vEGhdnBngJiAfwsANCkD8hmKvXcn1w8G6aIamNY6 TbFbEmdQXUegJ+fNEFuYUIVVCtJ77lvaOd7QvEmPxWiAXMFyyz32Qn5Wia0Sv3ss 2YWulPMwfB2vfBuResVbmya1/fXECZB4bl3xVxnCWddnHUjjJyyL8NyqBgZ3pcGO qW3SMIH8FZofKdRxfANHMXQSymAxfMC1yjfvLVuU9sU8ZEZHDiLEalAj5YCr56an 2egaC/JXgqqP7O6WOlaUdVASYNeRqdLWtyIVtD3z0cnXF7KJzFNL9mv8Bona3a0L Ni8ddkM2rVH2NcnFq+WfxZoJvLUCqfY0f0Rv6pX0htZMpZcK06rDcTuxvIBUrSjB WBW2PSka7xqDrP8Vn3yPO4YkJgW+afYkVV9bxXe/iw8YOOcGr4oQtVNsK3eqBNP2 UtV+MKA3k7zGerm7zYH5FS+9WAKDteA+utRBCsQBWiHMWYruBq/xBdsXphu1aih0 NGl7AfzT20b0Z/gP3KnB1UbznMxVWtzp7VKFTFx1UEpKqvTR+bRKGkL9+IGoORvl r+yGudjnv3ixllJwfoJpkBsQ/83O3VDj/0O+EmWQkE0HxTtXAGo= =o0yu -END PGP SIGNATURE- Changes since libreoffice-7-0-branch-point-7: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-7.0.1.2'
Tag 'libreoffice-7.0.1.2' created by Christian Lohmaier at 2020-08-27 19:21 + Tag libreoffice-7.0.1.2 -BEGIN PGP SIGNATURE- iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl9IB7kACgkQ9DSh76/u rqMk3BAAigtBzVQO0bcqRwYxMzvEqAXd3b12qsvbBQ2B3sakLcP/GUdzP6p88DYz 82Ko8cayRHezcXR4/xpjQNZMMwm4MdYXvzvkngDUJJxEETDROrKFTs72pz42Z08S io9oEY4vq7k7aNQuTeYnGu6YdV9hzb8MTCIl1cRFu/OCs3xm1C3dvhaiB2TL81pk ojGMaFatFxiVqujVbTU8EnTREE3ISDDBCiqnxgckL1HDXO/l78eAEQsruJE/MU2C Spd7ulDNJfyB8JQe3P11lKi7OcDC1ynrNXuTu42lENUhx5oHBbKq4jyWJJwAYNJ8 Dw4Ok+OA+63JlxGTllsNbOA+V1Ve9uST3eLHAl8svy2qV/CrzISabf7gIokKfFfK 9G0CvuZJ4G5vJYmhH2xhClnONvx8jPFGBUCPu3dZ4+zpJg0yNb/nGSmwiXImTYuW 5L52ky2ShSpBYmAdcVhPFEnqWdz7JOR6NT8ERssQJGCuLXYeDDeAv1RI/63st/Mh DdXmU54b8PgvLoxiZSYSnqk4UQQO9B7PDV5AzF31Pw+iUc8oVpGU47/INu5Z4f26 3UGITATZjvxJROFU/2e1FE3sdIhmtXjidE7I1swnBrJnSHihPJpLtp+nut3xmpHQ mmG88CuwwxMva0kmDiFh6D9hpaPaxyCXzV03G2x6V7akaC1XSvw= =k5Gh -END PGP SIGNATURE- Changes since libreoffice-7-0-branch-point-72: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0-1' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 13c436bd23bdf1ea96676197bb23afca0324e875 Author: Christian Lohmaier AuthorDate: Thu Aug 27 21:21:50 2020 +0200 Commit: Christian Lohmaier CommitDate: Thu Aug 27 21:21:50 2020 +0200 bump product version to 7.0.1.2.0+ Change-Id: I66fefce5a2c8683ed372cb200ddc51254f8db225 diff --git a/configure.ac b/configure.ac index ce524142a1a6..3a1cea340c4a 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[7.0.1.1.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[7.0.1.2.0+],[],[],[http://documentfoundation.org/]) dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard ___ 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-1' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ecf509837292c8d774e6d46bb6cbb50ab6fa5424 Author: Christian Lohmaier AuthorDate: Thu Aug 27 21:22:56 2020 +0200 Commit: Gerrit Code Review CommitDate: Thu Aug 27 21:22:56 2020 +0200 Update git submodules * Update translations from branch 'libreoffice-7-0-1' to 8786a7cc6bdc89e0f4e951849fdada4b7ae7e3d0 - update translations for 7.0.1 rc2 and force-fix errors using pocheck Change-Id: I9e227a0844ed7ece4966a4d3839b93db4c0f6d77 (cherry picked from commit b68c6e941c1a9dadab2c8425ecc67b033aeeec83) diff --git a/translations b/translations index e49449c1728b..8786a7cc6bdc 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit e49449c1728bee75e7c01ef50a60fd8f2088fc1b +Subproject commit 8786a7cc6bdc89e0f4e951849fdada4b7ae7e3d0 ___ 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' - filter/source
filter/source/svg/presentation_engine.js |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 51772544c03bc749c8b191e7134d738dd099dbaa
Author: Marco Cecchetti
AuthorDate: Wed Aug 26 09:06:59 2020 +0200
Commit: Andras Timar
CommitDate: Thu Aug 27 21:14:58 2020 +0200
filter: svg export: error when playing an animated empty text field
Change-Id: I4af15c4503dbd8953c1caf2a51a09f41b94ca6f0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101379
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/filter/source/svg/presentation_engine.js
b/filter/source/svg/presentation_engine.js
index 3484fc296c7a..b4c8d3a63078 100644
--- a/filter/source/svg/presentation_engine.js
+++ b/filter/source/svg/presentation_engine.js
@@ -9661,6 +9661,7 @@ function NodeContext( aSlideShowContext )
this.aSourceEventElementMap = null;
this.nStartDelay = 0.0;
this.bFirstRun = undefined;
+this.bIsInvalid = false;
this.aSlideHeight = HEIGHT;
this.aSlideWidth = WIDTH;
}
@@ -9933,7 +9934,7 @@ BaseNode.prototype.init = function()
BaseNode.prototype.resolve = function()
{
-if( ! this.checkValidNode() )
+if( this.aNodeContext.bIsInvalid || ! this.checkValidNode() )
return false;
this.DBG( this.callInfo( 'resolve' ) );
@@ -15226,7 +15227,8 @@ SlideAnimations.prototype.start = function()
this.aContext.bFirstRun = false;
// init all nodes
-if( !this.aRootNode.init() )
+this.aContext.bIsInvalid = !this.aRootNode.init();
+if( this.aContext.bIsInvalid )
return false;
// resolve root node
@@ -15254,6 +15256,7 @@ SlideAnimations.prototype.end = function(
bLeftEffectsSkipped )
this.aContext.bFirstRun = false;
}
+this.aContext.bIsInvalid = false;
};
SlideAnimations.prototype.dispose = function()
___
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' - loleaflet/src
loleaflet/src/layer/marker/TextInput.js | 87 +++-
1 file changed, 86 insertions(+), 1 deletion(-)
New commits:
commit e2e0727be7b546d81f2f12bd84de06f72bad6cca
Author: Tor Lillqvist
AuthorDate: Wed Aug 19 11:19:35 2020 +0300
Commit: Andras Timar
CommitDate: Thu Aug 27 21:13:32 2020 +0200
Use CollaboraOnlineWebViewKeyboardManager if available
If loleaflet is embedded in an iOS app that uses
CollaboraOnlineWebViewKeyboardManager, then we can use that to
reliably display and hide the on-screen keyboard. (Such iOS apps are
Collabora Office or Nextcloud.)
This is optional as we can't be sure whether the version of the iOS
app we are embedded in uses CollaboraOnlineWebViewKeyboardManager or
not. If not, work as before. I.e. hope that calling the focus()/blur()
methods of a textarea object will show/hide the on-screen keyboard.
Change-Id: Idddedcb4a83588c622067cdbeadb02ecdbd4fc72
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100980
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tor Lillqvist
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/101441
Reviewed-by: Andras Timar
diff --git a/loleaflet/src/layer/marker/TextInput.js
b/loleaflet/src/layer/marker/TextInput.js
index 9fe093ce7..418ffd7d1 100644
--- a/loleaflet/src/layer/marker/TextInput.js
+++ b/loleaflet/src/layer/marker/TextInput.js
@@ -1,4 +1,4 @@
-/* -*- js-indent-level: 8 -*- */
+/* -*- js-indent-level: 8; fill-column: 100 -*- */
/*
* L.TextInput is the hidden textarea, which handles text input events
*
@@ -171,6 +171,81 @@ L.TextInput = L.Layer.extend({
return;
}
+ // Are we running in a WebView under an iOS app that uses
+ // CollaboraOnlineWebViewKeyboardManager?
+ if (window.webkit &&
+ window.webkit.messageHandlers &&
+
window.webkit.messageHandlers.CollaboraOnlineWebViewKeyboardManager) {
+
+ if (!acceptInput) {
+
window.webkit.messageHandlers.CollaboraOnlineWebViewKeyboardManager.postMessage({command:
'hide'});
+ return;
+ }
+
+ // Define the function that
CollaboraOnlineWebViewKeyboardManager will call.
+ // This is a hardcoded name that
CollaboraOnlineWebViewKeyboardManager
+ // knows. This is not a problem as we can keep both
codebases in sync.
+
+ var that = this;
+ window.COKbdMgrCallback = function(message) {
+ var errorMessage;
+ if (typeof message !== 'object') {
+ errorMessage = 'COKbdMgrCallback called
with non-object of type ' + typeof message;
+ console.log(errorMessage);
+ throw errorMessage;
+ }
+
+ if (message.id !== 'COKbdMgr') {
+ errorMessage = 'COKbdMgrCallback called
with object with unknown id: ' + message.id;
+ console.log(errorMessage);
+ throw errorMessage;
+ }
+
+ if (message.command === undefined || typeof
message.command !== 'string') {
+ errorMessage = 'COKbdMgrCallback called
without command';
+ console.log(errorMessage);
+ throw errorMessage;
+ }
+
+ if (message.command === 'replaceText') {
+ if (message.text === undefined ||
typeof message.text !== 'string') {
+ errorMessage =
'COKbdMgrCallback called for replaceText without text';
+ console.log(errorMessage);
+ throw errorMessage;
+ }
+
+ if (message.location === undefined ||
typeof message.location !== 'number') {
+ errorMessage =
'COKbdMgrCallback called for replaceText without location';
+ console.log(errorMessage);
+ throw errorMessage;
+ }
+
+ if (message.length === undefined ||
typeof message.length !== 'number') {
+ errorMessage =
'COKbdMgrCallback called for replaceText without
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/ooxmlexport/ooxmlexport3.cxx |6 ++
1 file changed, 6 insertions(+)
New commits:
commit e538c63c0d55b581332f4146dab26e26eb611dce
Author: Justin Luth
AuthorDate: Thu Aug 27 16:36:19 2020 +0300
Commit: Justin Luth
CommitDate: Thu Aug 27 20:54:39 2020 +0200
related tdf#132149 ww8 export: unit test to prevent bad fix
The unit test I am using for this patch writes out landscape
attribute, but provides portrait width/height values.
I was tempted to just "fix" the values on export, but this
existing document shows that w/h trump p/l in LO
(and Word does the same). So that should also round-trip,
and this test will ensure that keeps happening.
Change-Id: Ib55cb799462abd1039ce7c1c935b3f66761a5dc2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101479
Tested-by: Jenkins
Reviewed-by: Justin Luth
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
index 504be6950cd0..2596c8d5d5e4 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
@@ -322,6 +322,12 @@ DECLARE_OOXMLEXPORT_TEST(testCalendar3, "calendar3.docx")
uno::Reference xCell2(xTable->getCellByName("A1"),
uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(sal_Int32(0x2E74B5),
getProperty(getRun(getParagraphOfText(1, xCell2->getText()), 1),
"CharColor"));
CPPUNIT_ASSERT_EQUAL(20.f, getProperty(getRun(getParagraphOfText(1,
xCell2->getText()),1), "CharHeight"));
+
+// tdf#132149 Despite specifying portrait, the page size's specified width
is greater than its height.
+// Both Word and LO display it as landscape, so ensure that it round-trips
with landscape dimentions.
+uno::Reference
xPageStyle(getStyles("PageStyles")->getByName("Standard"), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Page Width (mm) ", sal_Int32(148),
getProperty(xPageStyle, "Width") / 100);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Page Height (mm)", sal_Int32(105),
getProperty(xPageStyle, "Height") / 100);
}
DECLARE_OOXMLEXPORT_TEST(testCalendar4, "calendar4.docx")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css
loleaflet/css/device-mobile.css |2 +-
loleaflet/css/mobilewizard.css |5 +++--
loleaflet/css/toolbar.css |8
3 files changed, 8 insertions(+), 7 deletions(-)
New commits:
commit 8895a48d1f430260bc79ae1c65b447c7f70b1894
Author: gokaysatir
AuthorDate: Wed Aug 19 13:16:52 2020 +0300
Commit: Andras Timar
CommitDate: Thu Aug 27 20:48:21 2020 +0200
loleaflet: Insert shape window last row visibility.
Last row wasn't fully visible on Calculator mobile view.
Change-Id: Ia326fddc3510eabbca9b3d9b4bd90bf30f95f785
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100982
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/loleaflet/css/device-mobile.css b/loleaflet/css/device-mobile.css
index f78dd8fb8..38a7658f4 100644
--- a/loleaflet/css/device-mobile.css
+++ b/loleaflet/css/device-mobile.css
@@ -411,7 +411,7 @@
button.vex-dialog-button-secondary.vex-dialog-button.vex-last {
/* Related to toolbar.css */
.insertshape-grid {
box-sizing: content-box;
- position: absolute;
+ position: static;
padding: 2px 0px 2px 0px;
display: inline-block;
width: 100%;
diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css
index ae530a7f3..efb84291e 100644
--- a/loleaflet/css/mobilewizard.css
+++ b/loleaflet/css/mobilewizard.css
@@ -194,7 +194,6 @@ p.mobile-wizard.ui-combobox-text.selected {
top: 111px;
bottom: 0px;
width: 100%;
- padding-bottom: 50px;
}
#mobile-wizard.funcwizard div#mobile-wizard-content.hideHelpBG {
background: none !important;
@@ -265,7 +264,8 @@ p.mobile-wizard.ui-combobox-text.selected {
bottom: 0px;
z-index: 1000;
background-color: white;
- box-shadow: 0px -2px 4px 1px #0030
+ box-shadow: 0px -2px 4px 1px #0030;
+ overflow-y: scroll;
}
#mobile-wizard-content *{
@@ -279,6 +279,7 @@ p.mobile-wizard.ui-combobox-text.selected {
height: 48px;
color: #636363;
border-bottom: 1px solid #dd !important;
+ position: sticky;
}
.ui-content.mobile-wizard {
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 3be4c97e6..986290d35 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -852,8 +852,7 @@ button.leaflet-control-search-next
}
.insertshape-grid .row:last-child {
- box-sizing: content-box;
- margin-bottom: 43px;
+ margin-bottom: 70px;
}
.insertshape-grid .col {
@@ -866,10 +865,11 @@ button.leaflet-control-search-next
.insertshape-grid .row-header {
height: 30px;
text-align: center;
- padding: 5px;
- padding-top: 10px;
+ padding: 7px;
clear: both;
background-color: rgba(128, 128, 128, 0.1);
+ position: static;
+ line-height: 30px;
}
.insertshape-grid .col:hover {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/xmloff sc/source xmloff/inc xmloff/source
include/xmloff/XMLTextMasterPageContext.hxx | 12 --
sc/source/filter/xml/XMLTableHeaderFooterContext.cxx | 100 ---
sc/source/filter/xml/XMLTableHeaderFooterContext.hxx | 20 ++-
sc/source/filter/xml/xmlstyli.cxx|7 -
sc/source/filter/xml/xmlstyli.hxx|5
xmloff/inc/XMLTextHeaderFooterContext.hxx|8 -
xmloff/source/text/XMLTextHeaderFooterContext.cxx|9 -
xmloff/source/text/XMLTextMasterPageContext.cxx | 44 +++-
8 files changed, 94 insertions(+), 111 deletions(-)
New commits:
commit c995359be1b768d9848ebbeac57765e217f5acff
Author: Noel Grandin
AuthorDate: Thu Aug 27 13:05:14 2020 +0200
Commit: Noel Grandin
CommitDate: Thu Aug 27 20:48:36 2020 +0200
use fastparser in CreateHeaderFooterContext
Change-Id: Ic0a4e4911bb56fd9731e0e9d3850387b1f26b1d5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101474
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/xmloff/XMLTextMasterPageContext.hxx
b/include/xmloff/XMLTextMasterPageContext.hxx
index ad58d69eb269..3d2bd7302f68 100644
--- a/include/xmloff/XMLTextMasterPageContext.hxx
+++ b/include/xmloff/XMLTextMasterPageContext.hxx
@@ -60,15 +60,13 @@ public:
virtual void SAL_CALL startFastElement( sal_Int32 /*nElement*/,
const css::uno::Reference< css::xml::sax::XFastAttributeList >& )
override {}
-virtual SvXMLImportContextRef CreateChildContext(
-sal_uInt16 nPrefix,
-const OUString& rLocalName,
-const css::uno::Reference< css::xml::sax::XAttributeList > &
xAttrList ) override;
+virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL
createFastChildContext(
+sal_Int32 nElement,
+const css::uno::Reference< css::xml::sax::XFastAttributeList >&
AttrList ) override;
virtual SvXMLImportContext *CreateHeaderFooterContext(
-sal_uInt16 nPrefix,
-const OUString& rLocalName,
-const css::uno::Reference< css::xml::sax::XAttributeList > &
xAttrList,
+sal_Int32 nElement,
+const css::uno::Reference< css::xml::sax::XFastAttributeList > &
xAttrList,
const bool bFooter,
const bool bLeft,
const bool bFirst );
diff --git a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx
b/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx
index e62dec99205c..1e04f85cbf53 100644
--- a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx
+++ b/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx
@@ -26,6 +26,7 @@
#include "XMLTableHeaderFooterContext.hxx"
#include
#include
+#include
#include
@@ -37,13 +38,12 @@ using namespace ::com::sun::star::beans;
using namespace xmloff::token;
-XMLTableHeaderFooterContext::XMLTableHeaderFooterContext( SvXMLImport&
rImport, sal_uInt16 nPrfx,
- const OUString& rLName,
+XMLTableHeaderFooterContext::XMLTableHeaderFooterContext( SvXMLImport&
rImport, sal_Int32 /*nElement*/,
const uno::Reference<
-xml::sax::XAttributeList > & xAttrList,
+xml::sax::XFastAttributeList > & xAttrList,
const Reference < XPropertySet > & rPageStylePropSet,
bool bFooter, bool bLeft ) :
-SvXMLImportContext( rImport, nPrfx, rLName ),
+SvXMLImportContext( rImport ),
xPropSet( rPageStylePropSet ),
bContainsLeft(false),
bContainsRight(false),
@@ -54,20 +54,12 @@ XMLTableHeaderFooterContext::XMLTableHeaderFooterContext(
SvXMLImport& rImport,
OUString sContentLeft( bFooter ? OUString(SC_UNO_PAGE_LEFTFTRCONT) :
OUString(SC_UNO_PAGE_LEFTHDRCONT) );
OUString sShareContent( bFooter ? OUString(SC_UNO_PAGE_FTRSHARED) :
OUString(SC_UNO_PAGE_HDRSHARED) );
bool bDisplay( true );
-sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0);
-for( sal_Int16 i=0; i < nAttrCount; ++i )
+for( auto &aIter : sax_fastparser::castToFastAttributeList( xAttrList ) )
{
-const OUString& rAttrName(xAttrList->getNameByIndex( i ));
-OUString aLName;
-sal_uInt16 nPrefix(GetImport().GetNamespaceMap().GetKeyByAttrName(
rAttrName, &aLName ));
-const OUString& rValue(xAttrList->getValueByIndex( i ));
-
-// TODO: use a map here
-if( XML_NAMESPACE_STYLE == nPrefix )
-{
-if( IsXMLToken(aLName, XML_DISPLAY ) )
-bDisplay = IsXMLToken(rValue, XML_TRUE);
-}
+if( aIter.getToken() == XML_ELEMENT(STYLE, XML_DISPLAY) )
+bDisplay = IsXMLToken(aIter.toString(), XML_TRUE);
+else
+SAL_WARN("sc", "unknown attribute " <<
SvXMLImport::getPrefixAndNameFromToken(aIter.getToken()) << "=" <<
aIter.toString());
}
if( bLeft )
{
@@ -103,6 +95,39 @@ XMLTableHeaderFooterContext::~XMLTableHeaderFooterCont
[Libreoffice-commits] core.git: oox/source
oox/source/crypto/DocumentDecryption.cxx | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 2730ae520da2c47ac1cabaa3ddcc43359aae5875
Author: Caolán McNamara
AuthorDate: Thu Aug 27 17:16:54 2020 +0100
Commit: Caolán McNamara
CommitDate: Thu Aug 27 20:33:50 2020 +0200
ofz#24934 practically infinite loop on eof
Change-Id: Iaa6121f3a0088978c57718610bc9baf9bcfe6fee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101489
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/oox/source/crypto/DocumentDecryption.cxx
b/oox/source/crypto/DocumentDecryption.cxx
index 45b820a89302..c566426267ff 100644
--- a/oox/source/crypto/DocumentDecryption.cxx
+++ b/oox/source/crypto/DocumentDecryption.cxx
@@ -117,14 +117,14 @@ bool DocumentDecryption::readEncryptionInfo()
SAL_WARN_IF(aEntryCount != 1, "oox", "DataSpaceMap contains more than
one entry. Some content may be skipped");
// Read each DataSpaceMapEntry (MS-OFFCRYPTO 2.1.6.1)
-for (sal_uInt32 i = 0; i < aEntryCount; i++)
+for (sal_uInt32 i = 0; i < aEntryCount && !aDataSpaceStream.isEof();
i++)
{
// entryLen unused for the moment
aDataSpaceStream.skip(sizeof(sal_uInt32));
// Read each DataSpaceReferenceComponent (MS-OFFCRYPTO 2.1.6.2)
sal_uInt32 aReferenceComponentCount =
aDataSpaceStream.readuInt32();
-for (sal_uInt32 j = 0; j < aReferenceComponentCount; j++)
+for (sal_uInt32 j = 0; j < aReferenceComponentCount &&
!aDataSpaceStream.isEof(); j++)
{
// Read next reference component
// refComponentType unused for the moment
@@ -139,6 +139,12 @@ bool DocumentDecryption::readEncryptionInfo()
sDataSpaceName =
aDataSpaceStream.readUnicodeArray(aDataSpaceNameLength / 2);
aDataSpaceStream.skip((4 - (aDataSpaceNameLength & 3)) & 3); //
Skip padding
}
+
+if (aDataSpaceStream.isEof())
+{
+SAL_WARN("oox", "EOF on parsing DataSpaceMapEntry table");
+return false;
+}
}
else
{
___
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-1' - sc/source
sc/source/core/tool/interpr8.cxx | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit cd7243cd2a1d7790832fbd7cfd43d1870b6c544a
Author: Eike Rathke
AuthorDate: Thu Aug 20 01:12:05 2020 +0200
Commit: Caolán McNamara
CommitDate: Thu Aug 27 20:33:15 2020 +0200
Resolves: tdf#109409 TEXTJOIN() CONCAT() handle array/matrix row-wise
... like references, instead of column-wise.
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101034
Reviewed-by: Eike Rathke
Tested-by: Jenkins
(cherry picked from commit ff3955db7161b8644699d7a0128ec4a6e7e525ec)
merge conflicts: sc/source/core/tool/interpr8.cxx
Change-Id: If3ada9b197dd15c95b0da50464c70844fb7685ee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101058
Reviewed-by: Christian Lohmaier
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sc/source/core/tool/interpr8.cxx b/sc/source/core/tool/interpr8.cxx
index 9fc1e799884a..92ea9ab1ac11 100644
--- a/sc/source/core/tool/interpr8.cxx
+++ b/sc/source/core/tool/interpr8.cxx
@@ -1474,9 +1474,9 @@ void ScInterpreter::ScConcat_MS()
SetError(FormulaError::IllegalArgument);
else
{
-for ( SCSIZE j = 0; j < nC; j++ )
+for (SCSIZE k = 0; k < nR; ++k)
{
-for (SCSIZE k = 0; k < nR; k++ )
+for (SCSIZE j = 0; j < nC; ++j)
{
if ( pMat->IsStringOrEmpty( j, k ) )
{
@@ -1602,9 +1602,9 @@ void ScInterpreter::ScTextJoin_MS()
SetError(FormulaError::IllegalArgument);
else
{
-for ( SCSIZE j = 0; j < nC; j++ )
+for (SCSIZE k = 0; k < nR; ++k)
{
-for (SCSIZE k = 0; k < nR; k++ )
+for (SCSIZE j = 0; j < nC; ++j)
{
if ( !pMat->IsEmpty( j, k ) )
{
@@ -1782,9 +1782,9 @@ void ScInterpreter::ScTextJoin_MS()
else
{
OUString aStr;
-for ( SCSIZE j = 0; j < nC; j++ )
+for (SCSIZE k = 0; k < nR; ++k)
{
-for (SCSIZE k = 0; k < nR; k++ )
+for (SCSIZE j = 0; j < nC; ++j)
{
if ( !pMat->IsEmpty( j, k ) )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svtools/source sw/qa
svtools/source/uitest/uiobject.cxx |2 +-
sw/qa/uitest/writer_tests2/fontworks.py |4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 5be3b44a87fafebe56840eadd983020f57e566c4
Author: Ahmed ElShreif
AuthorDate: Mon Aug 24 11:00:09 2020 +0200
Commit: Ahmed ElShreif
CommitDate: Thu Aug 27 20:32:35 2020 +0200
uitest : Change all the ValueSet uitest statments to CHOOSE
instead of using "SELECT" which similar to other UIObjects we will write
"CHOOSE"
Change-Id: I32c1ab5f8a5dd21df87d90923d5821f8f0b16e76
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101265
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard
diff --git a/svtools/source/uitest/uiobject.cxx
b/svtools/source/uitest/uiobject.cxx
index 904a81be1bb6..db593581d6c2 100644
--- a/svtools/source/uitest/uiobject.cxx
+++ b/svtools/source/uitest/uiobject.cxx
@@ -20,7 +20,7 @@ ValueSetUIObject::ValueSetUIObject(const VclPtr&
xSetWin, ValueSet*
void ValueSetUIObject::execute(const OUString& rAction, const StringMap&
rParameters)
{
-if (rAction == "SELECT")
+if (rAction == "CHOOSE")
{
if (rParameters.find("POS") != rParameters.end())
{
diff --git a/sw/qa/uitest/writer_tests2/fontworks.py
b/sw/qa/uitest/writer_tests2/fontworks.py
index df72f5ed67a4..d3034dc8134b 100644
--- a/sw/qa/uitest/writer_tests2/fontworks.py
+++ b/sw/qa/uitest/writer_tests2/fontworks.py
@@ -24,13 +24,13 @@ class fontWorksDialog(UITestCase):
FontWorkSelector = xDialog.getChild("ctlFavorites")
# Select element with id (3)
-FontWorkSelector.executeAction("SELECT", mkPropertyValues({"POS":
"3"}))
+FontWorkSelector.executeAction("CHOOSE", mkPropertyValues({"POS":
"3"}))
self.assertEqual(get_state_as_dict(FontWorkSelector)["SelectedItemPos"], "2")
self.assertEqual(get_state_as_dict(FontWorkSelector)["SelectedItemId"], "3")
self.assertEqual(get_state_as_dict(FontWorkSelector)["ItemsCount"],
"36")
# Select element with id (7)
-FontWorkSelector.executeAction("SELECT", mkPropertyValues({"POS":
"7"}))
+FontWorkSelector.executeAction("CHOOSE", mkPropertyValues({"POS":
"7"}))
self.assertEqual(get_state_as_dict(FontWorkSelector)["SelectedItemPos"], "6")
self.assertEqual(get_state_as_dict(FontWorkSelector)["SelectedItemId"], "7")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svtools/source uitest/ui_logger_dsl vcl/source
svtools/source/control/valueset.cxx| 13 +++
uitest/ui_logger_dsl/UI_Object_commands.tx |7 +-
uitest/ui_logger_dsl/dsl_core.py | 33 +
vcl/source/uitest/logger.cxx |5
4 files changed, 57 insertions(+), 1 deletion(-)
New commits:
commit 707903aa8c74047c4fe6364b114b0736f61a4b4d
Author: Ahmed ElShreif
AuthorDate: Mon Aug 24 11:39:37 2020 +0200
Commit: Ahmed ElShreif
CommitDate: Thu Aug 27 20:29:22 2020 +0200
uilogger : Add support in the Logger and DSL for ValueSet
For example the DSL syntax will be:
>>Choose element with position 18 in 'colorset' from
'cui/ui/colorpage/colorset'
Change-Id: I9186b870da096719873c8709dedbc4bb4d315e2c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101267
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard
diff --git a/svtools/source/control/valueset.cxx
b/svtools/source/control/valueset.cxx
index e56f3e7e2d43..96216831e4d7 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -44,6 +44,8 @@
#include
#include
+#include
+#include
using namespace css::uno;
using namespace css::lang;
@@ -51,6 +53,16 @@ using namespace css::accessibility;
namespace
{
+void collectUIInformation( const OUString& aID , const OUString& aParentID ,
const OUString& aPos )
+{
+EventDescription aDescription;
+aDescription.aID = aID ;
+aDescription.aParameters = {{"POS", aPos }};
+aDescription.aAction = "SELECT";
+aDescription.aKeyWord = "ValueSet";
+aDescription.aParent = aParentID;
+UITestLogger::getInstance().logEvent(aDescription);
+}
enum
{
@@ -155,6 +167,7 @@ void ValueSet::ImplDeleteItems()
void ValueSet::Select()
{
maSelectHdl.Call( this );
+
collectUIInformation(OStringToOUString(GetDrawingArea()->get_buildable_name(),RTL_TEXTENCODING_UTF8)
, OStringToOUString(GetDrawingArea()->get_help_id(),RTL_TEXTENCODING_UTF8) ,
OUString::number(GetSelectedItemId()));
}
void ValueSet::UserDraw( const UserDrawEvent& )
diff --git a/uitest/ui_logger_dsl/UI_Object_commands.tx
b/uitest/ui_logger_dsl/UI_Object_commands.tx
index a3fe81b72b2b..7770bc1ee581 100644
--- a/uitest/ui_logger_dsl/UI_Object_commands.tx
+++ b/uitest/ui_logger_dsl/UI_Object_commands.tx
@@ -11,12 +11,14 @@ import type_options
7) SpinUIObject ( Increase event - Decrease event )
8) TabControlUIObject ( Change tab event )
9) ToolBoxUIObject ( Click on item event )
+10) ValueSetUIObject (Choose item)
*/
UIObjectCommand:
ButtonUIObject | CheckBoxUIObject | EditUIObject |
RadioButtonUIObject | ListBoxUIObject | ComboBoxUIObject |
- SpinFieldUIObject | TabControlUIObject | ToolBoxUIObject
+ SpinFieldUIObject | TabControlUIObject | ToolBoxUIObject |
+ ValueSetUIObject
;
ButtonUIObject:
@@ -46,6 +48,9 @@ ListBoxUIObject:
ToolBoxUIObject:
'Click on item number' POS=INT 'in' toolbox_id=ID
;
+ValueSetUIObject:
+ 'Choose element with position ' POS=INT 'in' value_set_id=STRING 'from'
parent_id=STRING
+;
//=
//helper grammar for EditUIObject
action_on_UIObject:
diff --git a/uitest/ui_logger_dsl/dsl_core.py b/uitest/ui_logger_dsl/dsl_core.py
index feb69b76a320..b9941c81c746 100644
--- a/uitest/ui_logger_dsl/dsl_core.py
+++ b/uitest/ui_logger_dsl/dsl_core.py
@@ -104,6 +104,7 @@ class ul_Compiler:
"SpinFieldUIObject": self.handle_spin_field,
"EditUIObject": self.handle_Edit_uiObject,
"ToolBoxUIObject": self.handle_ToolBox_uiObject,
+"ValueSetUIObject": self.handle_ValueSet_uiObject,
"writer_Type_command": self.handle_writer_type,
"writer_Select_command": self.handle_writer_select,
"writer_GOTO_command": self.handle_writer_goto,
@@ -627,6 +628,38 @@ class ul_Compiler:
self.prev_command = ToolBoxUIObject
+def handle_ValueSet_uiObject(self, ValueSetUIObject):
+
+name_of_obj = ""
+if keyword.iskeyword(ValueSetUIObject.value_set_id):
+name_of_obj = "x" + ValueSetUIObject.value_set_id
+else:
+name_of_obj = ValueSetUIObject.value_set_id
+
+parent_txt = ValueSetUIObject.parent_id.split("/")
+parent = parent_txt[len(parent_txt)-2]
+if( parent.upper() !=
self.last_parent[self.parent_hierarchy_count].upper()):
+self.init_Object(
+parent,
+parent,
+self.last_parent[self.parent_hierarchy_count],
+)
+
+self.init_Object(
+name_of_obj, ValueSetUIObject.value_set_id, parent
+)
+
+else:
+self.init_Object(
+name_of_obj, ValueSetUIObject.value_set_id,
self.last_parent[self.parent_hierarchy_count]
+)
+
+self.write_lin
[Libreoffice-commits] core.git: dbaccess/Library_dbu.mk dbaccess/source dbaccess/uiconfig dbaccess/UIConfig_dbaccess.mk
dbaccess/Library_dbu.mk|1
dbaccess/UIConfig_dbaccess.mk |2
dbaccess/source/ui/app/AppController.cxx |9
dbaccess/source/ui/app/AppController.hxx |3
dbaccess/source/ui/app/AppDetailPageHelper.cxx | 61 +++---
dbaccess/source/ui/app/AppDetailPageHelper.hxx | 18 -
dbaccess/source/ui/app/AppDetailView.cxx | 230 +
dbaccess/source/ui/app/AppDetailView.hxx | 55 ++---
dbaccess/source/ui/app/AppSwapWindow.cxx | 54 +
dbaccess/source/ui/app/AppSwapWindow.hxx | 19 --
dbaccess/source/ui/app/AppTitleWindow.cxx | 96 +-
dbaccess/source/ui/app/AppTitleWindow.hxx | 34 +--
dbaccess/source/ui/app/AppView.cxx | 135 --
dbaccess/source/ui/app/AppView.hxx | 36 +--
dbaccess/source/ui/app/ChildWindow.cxx | 25 ++
dbaccess/source/ui/app/ChildWindow.hxx | 34 +++
dbaccess/source/ui/browser/unodatbr.cxx| 11 -
dbaccess/source/ui/control/dbtreelistbox.cxx | 11 -
dbaccess/source/ui/inc/callbacks.hxx |7
dbaccess/source/ui/inc/unodatbr.hxx|3
dbaccess/uiconfig/ui/appborderwindow.ui| 45
dbaccess/uiconfig/ui/appdetailwindow.ui| 56 ++
dbaccess/uiconfig/ui/appswapwindow.ui |3
dbaccess/uiconfig/ui/taskwindow.ui | 25 +-
dbaccess/uiconfig/ui/titlewindow.ui|7
25 files changed, 465 insertions(+), 515 deletions(-)
New commits:
commit 0319ebeca61a8eb73c6bdacc25639658fe3b9fba
Author: Caolán McNamara
AuthorDate: Tue Aug 25 16:51:16 2020 +0100
Commit: Caolán McNamara
CommitDate: Thu Aug 27 20:14:00 2020 +0200
weld dbu ui cluster
making the dbaccess a wholely welded hierarchy
Change-Id: I87ea94d7775e38c8eb3342d91a730457481407f2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101340
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk
index 1fd2f3c078e1..460ff181db5b 100644
--- a/dbaccess/Library_dbu.mk
+++ b/dbaccess/Library_dbu.mk
@@ -78,6 +78,7 @@ $(eval $(call gb_Library_add_exception_objects,dbu,\
dbaccess/source/ui/app/AppSwapWindow \
dbaccess/source/ui/app/AppTitleWindow \
dbaccess/source/ui/app/AppView \
+dbaccess/source/ui/app/ChildWindow \
dbaccess/source/ui/app/DocumentInfoPreview \
dbaccess/source/ui/app/subcomponentmanager \
dbaccess/source/ui/app/templwin \
diff --git a/dbaccess/UIConfig_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk
index 91dc44de9606..3dc9eeb90e08 100644
--- a/dbaccess/UIConfig_dbaccess.mk
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -12,6 +12,8 @@ $(eval $(call gb_UIConfig_UIConfig,dbaccess))
$(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
dbaccess/uiconfig/ui/admindialog \
dbaccess/uiconfig/ui/advancedsettingsdialog \
+dbaccess/uiconfig/ui/appborderwindow \
+dbaccess/uiconfig/ui/appdetailwindow \
dbaccess/uiconfig/ui/applycolpage \
dbaccess/uiconfig/ui/appswapwindow \
dbaccess/uiconfig/ui/authentificationpage \
diff --git a/dbaccess/source/ui/app/AppController.cxx
b/dbaccess/source/ui/app/AppController.cxx
index 937778bb3302..f8818f11d7ed 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -2268,9 +2268,14 @@ Any
OApplicationController::getCurrentSelection(weld::TreeView& rControl) const
return makeAny( aSelection );
}
-vcl::Window* OApplicationController::getMenuParent(weld::TreeView& rControl)
const
+vcl::Window* OApplicationController::getMenuParent() const
{
-return getContainer()->getMenuParent(rControl);
+return getContainer()->getMenuParent();
+}
+
+void OApplicationController::adjustMenuPosition(const weld::TreeView&
rControl, ::Point& rPos) const
+{
+getContainer()->adjustMenuPosition(rControl, rPos);
}
bool OApplicationController::requestQuickHelp(const void* /*pUserData*/,
OUString& /*rText*/) const
diff --git a/dbaccess/source/ui/app/AppController.hxx
b/dbaccess/source/ui/app/AppController.hxx
index 490b4232a7ea..0fe4dcbca527 100644
--- a/dbaccess/source/ui/app/AppController.hxx
+++ b/dbaccess/source/ui/app/AppController.hxx
@@ -507,7 +507,8 @@ namespace dbaui
virtual ::comphelper::OInterfaceContainerHelper2*
getContextMenuInterceptors() override;
virtual css::uno::Any getCurrentSelection(weld::TreeView& rControl)
const override;
-virtual vcl::Window* getMenuParent(weld::TreeView& rControl) const
override;
+virtual vcl::Window* getMenuParent() const override;
+virtual void adjustMenuPosition(const weld::TreeView& rControl,
::Point& rPos) const override;
void OnInvalidateClipboard();
DECL_LINK( OnClipboardChanged, TransferableDataHelper*, void );
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
b/dbac
[Libreoffice-commits] core.git: 2 commits - accessibility/source chart2/inc compilerplugins/clang connectivity/inc cppcanvas/inc cppuhelper/inc dbaccess/inc dbaccess/source desktop/inc drawinglayer/in
accessibility/source/extended/accessibleiconchoicectrl.cxx |2 accessibility/source/extended/accessibleiconchoicectrlentry.cxx |2 chart2/inc/pch/precompiled_chartcore.hxx|4 compilerplugins/clang/unusedenumconstants.writeonly.results |4 connectivity/inc/pch/precompiled_ado.hxx|2 connectivity/inc/pch/precompiled_dbtools.hxx|3 cppcanvas/inc/pch/precompiled_cppcanvas.hxx |2 cppuhelper/inc/pch/precompiled_cppuhelper.hxx |3 dbaccess/inc/pch/precompiled_dba.hxx|2 dbaccess/inc/pch/precompiled_dbu.hxx|5 - dbaccess/source/ui/control/sqledit.cxx |3 dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx|1 desktop/inc/pch/precompiled_deploymentmisc.hxx |2 desktop/inc/pch/precompiled_sofficeapp.hxx |4 drawinglayer/inc/pch/precompiled_drawinglayer.hxx |3 external/skia/inc/pch/precompiled_skia.hxx |9 +- forms/source/solar/control/navtoolbar.cxx |1 include/vcl/toolkit/ivctrl.hxx |9 +- sd/source/filter/html/htmlattr.cxx |2 sfx2/inc/pch/precompiled_sfx.hxx|6 + slideshow/inc/pch/precompiled_slideshow.hxx | 45 +- solenv/clang-format/excludelist |2 sot/inc/pch/precompiled_sot.hxx |2 svl/inc/pch/precompiled_svl.hxx |2 svx/inc/pch/precompiled_svxcore.hxx |3 sw/inc/pch/precompiled_vbaswobj.hxx |3 uui/inc/pch/precompiled_uui.hxx |3 vcl/inc/verticaltabctrl.hxx |2 vcl/source/app/salvtables.cxx |2 vcl/source/control/imivctl.hxx |2 vcl/source/control/imivctl1.cxx |2 vcl/source/control/ivctrl.cxx |2 vcl/source/uitest/uiobject.cxx |2 vcl/source/window/builder.cxx |2 writerfilter/inc/pch/precompiled_writerfilter.hxx |5 - xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx |2 36 files changed, 100 insertions(+), 50 deletions(-) New commits: commit 98b47440d2f95504f6bca82d2081343bdc183cde Author: Caolán McNamara AuthorDate: Thu Aug 27 16:27:32 2020 +0100 Commit: Caolán McNamara CommitDate: Thu Aug 27 20:14:43 2020 +0200 remove some unused includes and update pches Change-Id: I786548bef39fa711aabcff32b592b3fdc4a6f9fc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101486 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/chart2/inc/pch/precompiled_chartcore.hxx b/chart2/inc/pch/precompiled_chartcore.hxx index 194a3678e2e7..b66d37067306 100644 --- a/chart2/inc/pch/precompiled_chartcore.hxx +++ b/chart2/inc/pch/precompiled_chartcore.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2020-08-12 11:04:23 using: + Generated on 2020-08-27 16:25:53 using: ./bin/update_pch chart2 chartcore --cutoff=3 --exclude:system --exclude:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -74,6 +74,7 @@ #include #include #include +#include #include #include #include @@ -188,6 +189,7 @@ #include #include #include +#include #include #include #include diff --git a/connectivity/inc/pch/precompiled_ado.hxx b/connectivity/inc/pch/precompiled_ado.hxx index 06f10addb04f..821b53a60b24 100644 --- a/connectivity/inc/pch/precompiled_ado.hxx +++ b/connectivity/inc/pch/precompiled_ado.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2020-08-18 21:25:46 using: + Generated on 2020-08-27 17:03:22 using: ./bin/update_pch connectivity ado --cutoff=2 --exclude:system --exclude:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: diff --git a/connectivity/inc/pch/precompiled_dbtools.hxx b/connectivity/inc/pch/precompiled_dbtools.hxx index 8eddcad7e521..dcb2db38efbd 100644 --- a/connectivity/inc/pch/precompiled_dbtools.hxx +++ b/connectivity/inc/pch/precompiled_dbtools.hxx @@ -13,7 +13,7 @@ manual changes will be rewrit
[Libreoffice-commits] core.git: basctl/source extensions/source include/vcl sc/source sfx2/source svtools/source vcl/inc vcl/source vcl/unx
basctl/source/basicide/bastypes.cxx|2 +-
extensions/source/propctrlr/propcontroller.cxx |2 +-
include/vcl/InterimItemWindow.hxx |7 ++-
include/vcl/svapp.hxx |3 ++-
sc/source/ui/cctrl/checklistmenu.cxx |2 +-
sfx2/source/appl/newhelp.cxx |2 +-
sfx2/source/dialog/dockwin.cxx |2 +-
sfx2/source/sidebar/PanelLayout.cxx|2 +-
svtools/source/control/toolbarmenu.cxx |2 +-
vcl/inc/salinst.hxx|3 ++-
vcl/inc/unx/gtk/gtkframe.hxx |3 +++
vcl/inc/unx/gtk/gtkinst.hxx|3 ++-
vcl/source/app/salvtables.cxx |2 +-
vcl/source/control/InterimItemWindow.cxx |7 ---
vcl/source/control/calendar.cxx|2 +-
vcl/source/window/builder.cxx |4 ++--
vcl/unx/gtk3/gtk3gtkframe.cxx | 24 ++--
vcl/unx/gtk3/gtk3gtkinst.cxx | 14 +-
18 files changed, 65 insertions(+), 21 deletions(-)
New commits:
commit fce9d818e7ddeeb309e56069f67b7fb702ea31a6
Author: Caolán McNamara
AuthorDate: Thu Aug 27 16:16:03 2020 +0100
Commit: Caolán McNamara
CommitDate: Thu Aug 27 20:13:42 2020 +0200
add a DisableCycleFocusOut flag for an all-welded hierarchy
so we can differentiate the case of embedded welded widgets co-sharing the
tab-cycle sequence with vcl widgets vs the case its all welded widgets
Change-Id: I5c57b4e98d2f5c543522a72e31d554a67c259307
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101485
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/basctl/source/basicide/bastypes.cxx
b/basctl/source/basicide/bastypes.cxx
index 8430c9444dbf..5a4012b6cebb 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -263,7 +263,7 @@ DockingWindow::DockingWindow(vcl::Window* pParent, const
OUString& rUIXMLDescrip
{
m_xVclContentArea = VclPtr::Create(this);
m_xVclContentArea->Show();
-m_xBuilder.reset(Application::CreateInterimBuilder(m_xVclContentArea,
rUIXMLDescription));
+m_xBuilder.reset(Application::CreateInterimBuilder(m_xVclContentArea,
rUIXMLDescription, true));
m_xContainer = m_xBuilder->weld_container(rID);
}
diff --git a/extensions/source/propctrlr/propcontroller.cxx
b/extensions/source/propctrlr/propcontroller.cxx
index 7233d2df6446..9a421dd4432e 100644
--- a/extensions/source/propctrlr/propcontroller.cxx
+++ b/extensions/source/propctrlr/propcontroller.cxx
@@ -348,7 +348,7 @@ namespace pcr
VclPtr pParentWin = pContainerWindow ?
pContainerWindow->GetWindow() : VclPtr();
if (!pParentWin)
throw RuntimeException("The frame is invalid. Unable to
extract the container window.",*this);
-xBuilder.reset(Application::CreateInterimBuilder(pParentWin,
sUIFile));
+xBuilder.reset(Application::CreateInterimBuilder(pParentWin,
sUIFile, true));
}
Construct(xContainerWindow, std::move(xBuilder));
diff --git a/include/vcl/InterimItemWindow.hxx
b/include/vcl/InterimItemWindow.hxx
index 4f8f9ece2848..3716c1e2053a 100644
--- a/include/vcl/InterimItemWindow.hxx
+++ b/include/vcl/InterimItemWindow.hxx
@@ -31,8 +31,13 @@ public:
virtual void Draw(OutputDevice* pDevice, const Point& rPos, DrawFlags
nFlags) override;
protected:
+// bAllowCycleFocusOut of true allows focus to be moved out of the Control
+// via tab key into a parent window or sibling window, false means focus
+// remains inside the InterimItemWindow and cycles back to the first child
+// of this control on reaching pass the last child. This is suitable when
+// the Control is the toplevel control and has no siblings or parent
InterimItemWindow(vcl::Window* pParent, const OUString& rUIXMLDescription,
const OString& rID,
- sal_uInt64 nLOKWindowId = 0);
+ bool bAllowCycleFocusOut = true, sal_uInt64 nLOKWindowId
= 0);
void InitControlBase(weld::Widget* pWidget);
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index 7102633f7a96..16356c8b93e7 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -1322,7 +1322,8 @@ public:
static void setDeInitHook(Link const & hook);
static weld::Builder* CreateBuilder(weld::Widget* pParent, const OUString
&rUIFile, bool bMobile = false);
-static weld::Builder* CreateInterimBuilder(vcl::Window* pParent, const
OUString &rUIFile, sal_uInt64 nLOKWindowId = 0); //for the duration of vcl
parent windows
+// For the duration of vcl parent windows
+static weld::Builder* CreateInterimBuilder(vcl::Window* pParent, const
OUString &rUIFile, bool bAllowCycleFocusOut, sal_uInt64 nLOKWindowId = 0);
static weld::MessageDialog* CreateMessageDialog
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/DomainMapper_Impl.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit c9c5fd9dce780aa15ad67ae0539e804c6f05dc29
Author: Andrea Gelmini
AuthorDate: Thu Aug 27 14:55:32 2020 +0200
Commit: Julien Nabet
CommitDate: Thu Aug 27 19:02:02 2020 +0200
Fix typo in code
It passed "make check" on Linux
Change-Id: I0fd9d72214c2826b8240ce7629d6e6ca72fb2fad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101477
Reviewed-by: Julien Nabet
Tested-by: Jenkins
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 1ddf7f941956..453e73dc8d94 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -3480,7 +3480,7 @@ std::tuple,
std::vector > splitFieldCo
return std::make_tuple(sType, arguments, switches);
}
-static OUString lcl_ExctractVariableAndHint( const OUString& rCommand,
OUString& rHint )
+static OUString lcl_ExtractVariableAndHint( const OUString& rCommand,
OUString& rHint )
{
// the first word after "ASK " is the variable
// the text after the variable and before a '\' is the hint
@@ -4145,7 +4145,7 @@ void DomainMapper_Impl::handleFieldSet
{
OUString sVariable, sHint;
-sVariable = lcl_ExctractVariableAndHint(pContext->GetCommand(), sHint);
+sVariable = lcl_ExtractVariableAndHint(pContext->GetCommand(), sHint);
// remove surrounding "" if exists
if(sHint.getLength() >= 2)
@@ -4186,7 +4186,7 @@ void DomainMapper_Impl::handleFieldAsk
//doesn the command contain a variable name?
OUString sVariable, sHint;
-sVariable = lcl_ExctractVariableAndHint( pContext->GetCommand(),
+sVariable = lcl_ExtractVariableAndHint( pContext->GetCommand(),
sHint );
if(!sVariable.isEmpty())
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmloff/inc xmloff/source
xmloff/inc/txtfldi.hxx | 24 ++--
xmloff/source/text/txtfldi.cxx | 80
xmloff/source/text/txtvfldi.cxx |2 -
3 files changed, 53 insertions(+), 53 deletions(-)
New commits:
commit f1e789442d59330349067a4c59aee75cb267a86f
Author: Julien Nabet
AuthorDate: Thu Aug 27 17:01:30 2020 +0200
Commit: Julien Nabet
CommitDate: Thu Aug 27 19:00:32 2020 +0200
xmloff: prefix members of XMLTextFieldImportContext
Change-Id: I8a67d0c1c24e6c82803198fe343d4ee1c095b9b6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101484
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx
index bea6df8bb853..2e8f9562c40a 100644
--- a/xmloff/inc/txtfldi.hxx
+++ b/xmloff/inc/txtfldi.hxx
@@ -385,22 +385,22 @@ public:
/** superclass for database fields: handle database and table names */
class XMLDatabaseFieldImportContext : public XMLTextFieldImportContext
{
-OUString sDatabaseName;
-OUString sDatabaseURL;
-OUString sTableName;
+OUString m_sDatabaseName;
+OUString m_sDatabaseURL;
+OUString m_sTableName;
-sal_Int32 nCommandType;
-bool bCommandTypeOK;
+sal_Int32 m_nCommandType;
+bool m_bCommandTypeOK;
-bool bDisplay;
-bool bDisplayOK;
-bool bUseDisplay;
+bool m_bDisplay;
+bool m_bDisplayOK;
+bool m_bUseDisplay;
protected:
-bool bDatabaseOK;
-bool bDatabaseNameOK;
-bool bDatabaseURLOK;
-bool bTableOK;
+bool m_bDatabaseOK;
+bool m_bDatabaseNameOK;
+bool m_bDatabaseURLOK;
+bool m_bTableOK;
/// protected constructor: only for subclasses
XMLDatabaseFieldImportContext(SvXMLImport& rImport,
diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx
index 6133045d909e..917c061eb626 100644
--- a/xmloff/source/text/txtfldi.cxx
+++ b/xmloff/source/text/txtfldi.cxx
@@ -1147,15 +1147,15 @@
XMLDatabaseFieldImportContext::XMLDatabaseFieldImportContext(
const char* pServiceName, sal_uInt16 nPrfx,
const OUString& sLocalName, bool bUseDisply)
: XMLTextFieldImportContext(rImport, rHlp, pServiceName, nPrfx, sLocalName)
-, nCommandType( sdb::CommandType::TABLE )
-, bCommandTypeOK(false)
-, bDisplay( true )
-, bDisplayOK( false )
-, bUseDisplay( bUseDisply )
-, bDatabaseOK(false)
-, bDatabaseNameOK(false)
-, bDatabaseURLOK(false)
-, bTableOK(false)
+, m_nCommandType( sdb::CommandType::TABLE )
+, m_bCommandTypeOK(false)
+, m_bDisplay( true )
+, m_bDisplayOK( false )
+, m_bUseDisplay( bUseDisply )
+, m_bDatabaseOK(false)
+, m_bDatabaseNameOK(false)
+, m_bDatabaseURLOK(false)
+, m_bTableOK(false)
{
}
@@ -1165,41 +1165,41 @@ void XMLDatabaseFieldImportContext::ProcessAttribute(
switch (nAttrToken)
{
case XML_TOK_TEXTFIELD_DATABASE_NAME:
-sDatabaseName = sAttrValue;
-bDatabaseOK = true;
-bDatabaseNameOK = true;
+m_sDatabaseName = sAttrValue;
+m_bDatabaseOK = true;
+m_bDatabaseNameOK = true;
break;
case XML_TOK_TEXTFIELD_TABLE_NAME:
-sTableName = sAttrValue;
-bTableOK = true;
+m_sTableName = sAttrValue;
+m_bTableOK = true;
break;
case XML_TOK_TEXTFIELD_TABLE_TYPE:
if( IsXMLToken( sAttrValue, XML_TABLE ) )
{
-nCommandType = sdb::CommandType::TABLE;
-bCommandTypeOK = true;
+m_nCommandType = sdb::CommandType::TABLE;
+m_bCommandTypeOK = true;
}
else if( IsXMLToken( sAttrValue, XML_QUERY ) )
{
-nCommandType = sdb::CommandType::QUERY;
-bCommandTypeOK = true;
+m_nCommandType = sdb::CommandType::QUERY;
+m_bCommandTypeOK = true;
}
else if( IsXMLToken( sAttrValue, XML_COMMAND ) )
{
-nCommandType = sdb::CommandType::COMMAND;
-bCommandTypeOK = true;
+m_nCommandType = sdb::CommandType::COMMAND;
+m_bCommandTypeOK = true;
}
break;
case XML_TOK_TEXTFIELD_DISPLAY:
if( IsXMLToken( sAttrValue, XML_NONE ) )
{
-bDisplay = false;
-bDisplayOK = true;
+m_bDisplay = false;
+m_bDisplayOK = true;
}
else if( IsXMLToken( sAttrValue, XML_VALUE ) )
{
-bDisplay = true;
-bDisplayOK = true;
+m_bDisplay = true;
+m_bDisplayOK = true;
}
break;
}
@@ -1224,9 +1224,9 @@ SvXMLImportContextRef
XMLDatabaseFieldImportContext::CreateChildContext(
if( ( nPrefix == XML_NAMESPACE_XLINK ) &&
IsXMLToken( sLocalName, XM
[Libreoffice-commits] core.git: desktop/source sfx2/source
desktop/source/lib/init.cxx |9 -
sfx2/source/control/unoctitm.cxx |3 ++-
2 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit e7f81a8bcb481df4daa17ae9ef7210c68af5f337
Author: Pranam Lashkari
AuthorDate: Thu Aug 20 03:57:17 2020 +0530
Commit: Pranam Lashkari
CommitDate: Thu Aug 27 18:56:11 2020 +0200
LOK: send state of FreezePanes
Change-Id: I817117d05f7f0f75f65c8e6dbf6105d120ab275d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101031
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101372
Tested-by: Jenkins
Reviewed-by: Pranam Lashkari
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index b61767ff4a88..9c8c51c3672b 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2800,10 +2800,7 @@ static void doc_iniUnoCommands ()
OUString(".uno:ParaspaceDecrease"),
OUString(".uno:AcceptTrackedChange"),
OUString(".uno:RejectTrackedChange"),
-OUString(".uno:FreezePanesColumn"),
-OUString(".uno:FreezePanesRow"),
OUString(".uno:ShowResolvedAnnotations"),
-OUString(".uno:FreezePanesColumn"),
OUString(".uno:InsertBreak"),
OUString(".uno:InsertEndnote"),
OUString(".uno:InsertFootnote"),
@@ -2824,9 +2821,11 @@ static void doc_iniUnoCommands ()
OUString(".uno:AlignMiddle"),
OUString(".uno:AlignDown"),
OUString(".uno:TraceChangeMode"),
-OUString(".uno:FreezePanesRow"),
OUString(".uno:BorderInner"),
-OUString(".uno:BorderOuter")
+OUString(".uno:BorderOuter"),
+OUString(".uno:FreezePanes"),
+OUString(".uno:FreezePanesColumn"),
+OUString(".uno:FreezePanesRow")
};
util::URL aCommandURL;
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index d0f935f248bd..c9cb75dacbf9 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -1016,7 +1016,8 @@ static void InterceptLOKStateChangeEvent(sal_uInt16 nSID,
SfxViewFrame* pViewFra
aEvent.FeatureURL.Path == "AlignMiddle" ||
aEvent.FeatureURL.Path == "AlignDown" ||
aEvent.FeatureURL.Path == "TraceChangeMode" ||
-aEvent.FeatureURL.Path == "FormatPaintbrush")
+aEvent.FeatureURL.Path == "FormatPaintbrush" ||
+aEvent.FeatureURL.Path == "FreezePanes")
{
bool bTemp = false;
aEvent.State >>= bTemp;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/uiconfig
sc/uiconfig/scalc/ui/scgeneralpage.ui |7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) New commits: commit bac424a99d12fd2eece57cdf70ec5725398e80ac Author: Olivier Hallot AuthorDate: Thu Aug 27 16:29:04 2020 +0200 Commit: Olivier Hallot CommitDate: Thu Aug 27 18:32:07 2020 +0200 Fix extended tip after import Change-Id: Icf067aad55f43137b3126b5aede40982845001a9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101455 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/sc/uiconfig/scalc/ui/scgeneralpage.ui b/sc/uiconfig/scalc/ui/scgeneralpage.ui index 2d74dbce358d..2808e080880f 100644 --- a/sc/uiconfig/scalc/ui/scgeneralpage.ui +++ b/sc/uiconfig/scalc/ui/scgeneralpage.ui @@ -337,12 +337,7 @@ True -With the option set, expanding a selection (with Command - Ctrl +Shift+Down/Up) jumps to the end of the range in the column that was added as last to the initial selection. - When the option is not set, expanding a selection (with CommandCtrl+Shift - +Down/Up) jumps to the end of the range in the column where selecting the cell range was started. - The same of course applies when extending a selection on rows, with CommandCtrl+ - Shift+Left/Right. +With the option set, expanding a selection (with Ctrl + Shift + Down/Up) jumps to the end of the range in the column that was added as last to the initial selection. When the option is not set, expanding a selection (with Ctrl + Shift + Down/Up) jumps to the end of the range in the column where selecting the cell range was started. The same of course applies when extending a selection on rows, with Ctrl + Shift + Left/Right. ___ 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' - xmloff/source
xmloff/source/script/XMLEventsImportContext.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b0eec225c61eb5e72e61da2edd7ee26305a11cab
Author: Noel Grandin
AuthorDate: Thu Aug 27 11:57:28 2020 +0200
Commit: Noel Grandin
CommitDate: Thu Aug 27 18:31:07 2020 +0200
fix bug in XMLEventsImportContext
ever since
commit 10e08b1d398e6aa91aa4ced0ca6c966349be8b5d
Date: Fri Feb 14 13:27:23 2020 +0200
convert XMLEventsImportContext to fastparser
Change-Id: I3bdc514f25a38f598d2a764c536b46f6ded9d14c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101473
Tested-by: Jenkins
Reviewed-by: Noel Grandin
(cherry picked from commit bd2d082a0c681ec7340ed01a27b7d2c7ab14549c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101454
diff --git a/xmloff/source/script/XMLEventsImportContext.cxx
b/xmloff/source/script/XMLEventsImportContext.cxx
index 5960b5215e91..a5a8837ec423 100644
--- a/xmloff/source/script/XMLEventsImportContext.cxx
+++ b/xmloff/source/script/XMLEventsImportContext.cxx
@@ -173,7 +173,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler >
XMLEventsImportContext
{
sEventName = sValue;
}
-else if (aIter.getToken() == XML_ELEMENT(SCRIPT, XML_EVENT_NAME))
+else if (aIter.getToken() == XML_ELEMENT(SCRIPT, XML_LANGUAGE))
{
sLanguage = sValue;
// else: ignore -> let child context handle this
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source
filter/source/xslt/export/spreadsheetml/table.xsl |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8b2845295c722f3713cf7cc699b6068e30008a5f Author: Julien Nabet AuthorDate: Tue Aug 25 16:42:15 2020 +0200 Commit: Julien Nabet CommitDate: Thu Aug 27 17:56:26 2020 +0200 tdf#136107: crash on export of selection typo in xslt about comparison operator Change-Id: I0ccf0babbf10b77b99c727afccc8c4ddcedb1acc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101335 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/filter/source/xslt/export/spreadsheetml/table.xsl b/filter/source/xslt/export/spreadsheetml/table.xsl index f1a563596b37..73d16b3ebc0e 100644 --- a/filter/source/xslt/export/spreadsheetml/table.xsl +++ b/filter/source/xslt/export/spreadsheetml/table.xsl @@ -430,7 +430,7 @@ - + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/view/viewfrm.cxx | 27 ---
1 file changed, 16 insertions(+), 11 deletions(-)
New commits:
commit be4fcac736fccce8ee7d4550a860b0127e7601bb
Author: Julien Nabet
AuthorDate: Wed Aug 26 11:00:16 2020 +0200
Commit: Julien Nabet
CommitDate: Thu Aug 27 17:54:39 2020 +0200
tdf#136133: AppendInfoBar can return null
2 cases:
1) When set Donate property to false value in
/org.openoffice.Office.UI.Infobar/Enabled
and LastTimeDonateShow with 1 in /org.openoffice.Setup/Product (Expert
Configuration)
See https://bugs.documentfoundation.org/attachment.cgi?id=164702
2) GetInvolved = false and LastTimeGetInvolved = 1
See https://bugs.documentfoundation.org/attachment.cgi?id=164703
Change-Id: I2da22616fb6f3fb4e42bf6b5e5c29cc094dc2fd6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101391
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index b0f1e40fbb82..9e4b4b280c59 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -1382,11 +1382,14 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/,
const SfxHint& rHint )
VclPtr pInfoBar =
AppendInfoBar("getinvolved", "", SfxResId(STR_GET_INVOLVED_TEXT),
InfobarType::INFO);
-VclPtrInstance
xGetInvolvedButton(&GetWindow());
-
xGetInvolvedButton->SetText(SfxResId(STR_GET_INVOLVED_BUTTON));
-
xGetInvolvedButton->SetSizePixel(xGetInvolvedButton->GetOptimalSize());
-xGetInvolvedButton->SetClickHdl(LINK(this, SfxViewFrame,
GetInvolvedHandler));
-pInfoBar->addButton(xGetInvolvedButton);
+if (pInfoBar)
+{
+VclPtrInstance
xGetInvolvedButton(&GetWindow());
+
xGetInvolvedButton->SetText(SfxResId(STR_GET_INVOLVED_BUTTON));
+
xGetInvolvedButton->SetSizePixel(xGetInvolvedButton->GetOptimalSize());
+xGetInvolvedButton->SetClickHdl(LINK(this,
SfxViewFrame, GetInvolvedHandler));
+pInfoBar->addButton(xGetInvolvedButton);
+}
}
if (bUpdateLastTimeGetInvolvedShown
@@ -1408,12 +1411,14 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/,
const SfxHint& rHint )
bUpdateLastTimeDonateShown = true;
VclPtr pInfoBar =
AppendInfoBar("donate", "", SfxResId(STR_DONATE_TEXT), InfobarType::INFO);
-
-VclPtrInstance xDonateButton(&GetWindow());
-xDonateButton->SetText(SfxResId(STR_DONATE_BUTTON));
-
xDonateButton->SetSizePixel(xDonateButton->GetOptimalSize());
-xDonateButton->SetClickHdl(LINK(this, SfxViewFrame,
DonationHandler));
-pInfoBar->addButton(xDonateButton);
+if (pInfoBar)
+{
+VclPtrInstance xDonateButton(&GetWindow());
+xDonateButton->SetText(SfxResId(STR_DONATE_BUTTON));
+
xDonateButton->SetSizePixel(xDonateButton->GetOptimalSize());
+xDonateButton->SetClickHdl(LINK(this, SfxViewFrame,
DonationHandler));
+pInfoBar->addButton(xDonateButton);
+}
}
if (bUpdateLastTimeDonateShown
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'private/tvajngerl/staging'
New branch 'private/tvajngerl/staging' available with the following commits: commit 9fd24baa4d66b374db013f8ef9b52e87464efcc8 Author: Tomaž Vajngerl Date: Thu Nov 7 17:29:43 2019 +0100 vcl: add Bitmap 24+8 to 32 bit conversion tool Change-Id: I0f622624bf53f4a7128964abf226bf82178566e1 commit ca1d75e5395bd8ef693b61d35d37f2baedd6304c Author: Tomaž Vajngerl Date: Thu Aug 27 17:30:47 2020 +0200 add ScopedNanoTimer for benchmark timing Change-Id: Ia64927722446629a468b8714414704404f33480e ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/drawinglayercore' - include/svx svx/source
include/svx/svdcrtv.hxx |3 -
include/svx/svddrgv.hxx |3 -
include/svx/svdedtv.hxx |1
include/svx/svdedxv.hxx |2
include/svx/svdmrkv.hxx |1
include/svx/svdpntv.hxx |1
svx/source/svdraw/svdcrtv.cxx | 34 +--
svx/source/svdraw/svddrgv.cxx | 53 +---
svx/source/svdraw/svdedtv.cxx | 48 +-
svx/source/svdraw/svdedxv.cxx | 32 ++
svx/source/svdraw/svdmrkv.cxx | 43 +++
svx/source/svdraw/svdpntv.cxx | 91 ++
12 files changed, 137 insertions(+), 175 deletions(-)
New commits:
commit 082ea320d54f6e5d1108f3b16bce56cfb16469f4
Author: Tomaž Vajngerl
AuthorDate: Thu Aug 27 14:43:56 2020 +0200
Commit: Tomaž Vajngerl
CommitDate: Thu Aug 27 16:16:43 2020 +0200
remove ImpClearVars, set values in the constructor
Change-Id: I8ff465d5755dae7098293702115ab08055814754
diff --git a/include/svx/svdcrtv.hxx b/include/svx/svdcrtv.hxx
index 1bf7276a02cc..6868e7ba1cb2 100644
--- a/include/svx/svdcrtv.hxx
+++ b/include/svx/svdcrtv.hxx
@@ -57,9 +57,6 @@ protected:
void ImpClearConnectMarker();
-private:
-SVX_DLLPRIVATE void ImpClearVars();
-
protected:
bool ImpBegCreateObj(SdrInventor nInvent, sal_uInt16 nIdent, const Point&
rPnt, OutputDevice* pOut,
sal_Int16 nMinMov, const tools::Rectangle& rLogRect, SdrObject*
pPreparedFactoryObject);
diff --git a/include/svx/svddrgv.hxx b/include/svx/svddrgv.hxx
index 654f010c7b3f..c88cf0b30192 100644
--- a/include/svx/svddrgv.hxx
+++ b/include/svx/svddrgv.hxx
@@ -59,9 +59,6 @@ protected:
boolmbInsGluePointMode : 1;
boolmbNoDragXorPolys : 1;
-private:
-SVX_DLLPRIVATE void ImpClearVars();
-
protected:
virtual void SetMarkHandles(SfxViewShell* pOtherShell) override;
void ShowDragObj();
diff --git a/include/svx/svdedtv.hxx b/include/svx/svdedtv.hxx
index 35236d6e2570..91fa245cf74f 100644
--- a/include/svx/svdedtv.hxx
+++ b/include/svx/svdedtv.hxx
@@ -114,7 +114,6 @@ protected:
boolm_bResizeProtect : 1;
private:
-SVX_DLLPRIVATE void ImpClearVars();
SVX_DLLPRIVATE void ImpResetPossibilityFlags();
protected:
diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx
index a78dd5cdc637..192c61e3c07c 100644
--- a/include/svx/svdedxv.hxx
+++ b/include/svx/svdedxv.hxx
@@ -105,8 +105,6 @@ protected:
private:
SfxUndoManager* mpOldTextEditUndoManager;
-SVX_DLLPRIVATE void ImpClearVars();
-
protected:
// central method to get an SdrUndoManager for enhanced TextEdit. Default
will
// try to return a dynamic_casted GetModel()->GetSdrUndoManager().
Applications
diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx
index bc4016d69801..f94033e8a047 100644
--- a/include/svx/svdmrkv.hxx
+++ b/include/svx/svdmrkv.hxx
@@ -144,7 +144,6 @@ protected:
const SdrPageView* pPV) const;
private:
-SVX_DLLPRIVATE void ImpClearVars();
SVX_DLLPRIVATE void ImpSetPointsRects() const;
void UndirtyMrkPnt() const;
diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx
index 829e6241780b..ad68da20dec2 100644
--- a/include/svx/svdpntv.hxx
+++ b/include/svx/svdpntv.hxx
@@ -226,7 +226,6 @@ public:
OutputDevice* GetFirstOutputDevice() const;
private:
-SVX_DLLPRIVATE void ImpClearVars();
DECL_LINK(ImpComeBackHdl, Timer*, void);
protected:
diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx
index 061bc034d92e..d5e9f8d08473 100644
--- a/svx/source/svdraw/svdcrtv.cxx
+++ b/svx/source/svdraw/svdcrtv.cxx
@@ -177,29 +177,19 @@ void SdrCreateView::ImpClearConnectMarker()
mpCoMaOverlay.reset();
}
-void SdrCreateView::ImpClearVars()
-{
-nCurrentInvent=SdrInventor::Default;
-nCurrentIdent=OBJ_NONE;
-pCurrentCreate=nullptr;
-pCreatePV=nullptr;
-b1stPointAsCenter=false;
-aCurrentCreatePointer=PointerStyle::Cross;
-bUseIncompatiblePathCreateInterface=false;
-nAutoCloseDistPix=5;
-nFreeHandMinDistPix=10;
-
-ImpClearConnectMarker();
-}
-
-SdrCreateView::SdrCreateView(
-SdrModel& rSdrModel,
-OutputDevice* pOut)
-: SdrDragView(rSdrModel, pOut),
-mpCreateViewExtraData(new ImpSdrCreateViewExtraData()),
-aCurrentCreatePointer(PointerStyle::Arrow)
+SdrCreateView::SdrCreateView(SdrModel& rSdrModel, OutputDevice* pOut)
+: SdrDragView(rSdrModel, pOut)
+, pCurrentCreate(nullptr)
+, pCreatePV(nullptr)
+, mpCreateViewExtraData(new ImpSdrCreateViewExtraData())
+, aCurrentCreatePointer(PointerStyle::Cross)
+, nAutoCloseDistPix(5)
+, nFreeHandMinDistPix(10)
+, nCurrentInvent(SdrInventor::Default)
+, nCurrentIdent(OBJ_NONE)
+, b1stPointAsCenter(false)
+, bUseIncompatiblePathCreateInterface(false)
{
-ImpClearVars();
}
SdrCreateView::~SdrCreateView()
diff --git a/svx/source/sv
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0-1' - sw/source
sw/source/core/txtnode/ndtxt.cxx |9 -
1 file changed, 4 insertions(+), 5 deletions(-)
New commits:
commit 04d2a330f7b9db6a8e2a340b119f474946b84d44
Author: Caolán McNamara
AuthorDate: Fri Aug 14 16:52:23 2020 +0100
Commit: Christian Lohmaier
CommitDate: Thu Aug 27 16:44:08 2020 +0200
tdf#132892 Revert "sw: paragraph-sign: erase metafields ... correctly"
This reverts commit b402d0112a0bb53221b847fa372bfa3f6390a0e2.
Change-Id: I210d2fded01fb952d7384b78240e32d868b08575
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100795
Reviewed-by: Michael Stahl
Tested-by: Jenkins
(cherry picked from commit 13c3e22bcea72aa1b41e5891ff65647f7eeb02d9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101152
Reviewed-by: Thorsten Behrens
Reviewed-by: Christian Lohmaier
Tested-by: Christian Lohmaier
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 6200eb040abd..37400645b2fc 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -2002,7 +2002,7 @@ void SwTextNode::CopyText( SwTextNode *const pDest,
{
CHECK_SWPHINTS_IF_FRM(this);
CHECK_SWPHINTS(pDest);
-const sal_Int32 nTextStartIdx = rStart.GetIndex();
+sal_Int32 nTextStartIdx = rStart.GetIndex();
sal_Int32 nDestStart = rDestStart.GetIndex(); // remember old Pos
if (pDest->GetDoc()->IsClipBoard() && GetNum())
@@ -2093,6 +2093,7 @@ void SwTextNode::CopyText( SwTextNode *const pDest,
// Fetch end only now, because copying into self updates the start index
// and all attributes
+nTextStartIdx = rStart.GetIndex();
const sal_Int32 nEnd = nTextStartIdx + nLen;
// 2. copy attributes
@@ -2240,10 +2241,8 @@ void SwTextNode::CopyText( SwTextNode *const pDest,
std::reverse(metaFieldRanges.begin(), metaFieldRanges.end());
for (const auto& pair : metaFieldRanges)
{
-const SwIndex aIdx(pDest, std::max(pair.first -
nTextStartIdx, 0));
-const sal_Int32 nCount = pair.second - pair.first;
-if (nCount > 0)
-pDest->EraseText(aIdx, nCount);
+const SwIndex aIdx(pDest, pair.first);
+pDest->EraseText(aIdx, pair.second - pair.first);
}
}
___
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-1' - vcl/unx
vcl/unx/gtk3/gtk3gtkframe.cxx | 13 +++--
1 file changed, 11 insertions(+), 2 deletions(-)
New commits:
commit dbbce6bf7f21fd8d72fa9b01a28a4ea0d7e2ccdc
Author: Caolán McNamara
AuthorDate: Sun Aug 23 20:12:28 2020 +0100
Commit: Christian Lohmaier
CommitDate: Thu Aug 27 16:38:39 2020 +0200
tdf#135779 move focus back to usual parent before grabbing pointer
Change-Id: Ia4f1f2f1672a76515ab586d679a05467515868d6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101157
Reviewed-by: Michael Stahl
Reviewed-by: Adolfo Jayme Barrientos
Reviewed-by: Christian Lohmaier
Tested-by: Christian Lohmaier
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index b4757b39023c..28a19033ea0d 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -1988,6 +1988,13 @@ void GtkSalFrame::SetPointer( PointerStyle ePointerStyle
)
void GtkSalFrame::grabPointer( bool bGrab, bool bKeyboardAlso, bool
bOwnerEvents )
{
+if (bGrab)
+{
+// tdf#135779 move focus back inside usual input window out of any
+// other gtk widgets before grabbing the pointer
+GrabFocus();
+}
+
static const char* pEnv = getenv( "SAL_NO_MOUSEGRABS" );
if (pEnv && *pEnv)
return;
@@ -2524,8 +2531,10 @@ void GtkSalFrame::GrabFocus()
pGrabWidget = GTK_WIDGET(m_pWindow);
else
pGrabWidget = GTK_WIDGET(m_pFixedContainer);
-gtk_widget_set_can_focus(pGrabWidget, true);
-gtk_widget_grab_focus(pGrabWidget);
+if (!gtk_widget_get_can_focus(pGrabWidget))
+gtk_widget_set_can_focus(pGrabWidget, true);
+if (!gtk_widget_has_focus(pGrabWidget))
+gtk_widget_grab_focus(pGrabWidget);
}
gboolean GtkSalFrame::signalButton(GtkWidget*, GdkEventButton* pEvent,
gpointer frame)
___
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-1' - sw/source
sw/source/filter/ww8/ww8par.cxx | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
New commits:
commit 804187175a0fafb9f763c09786ab4db857614049
Author: Caolán McNamara
AuthorDate: Sun Aug 23 20:47:00 2020 +0100
Commit: Christian Lohmaier
CommitDate: Thu Aug 27 16:36:56 2020 +0200
ofz#25169 insertion into set might find a duplicate
in which case pImpRec is deleted and pImpRecTmp is invalid
Change-Id: I2a273a436ebd88cb53e329bbcb4f171dda6ed840
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101156
Reviewed-by: Michael Stahl
Reviewed-by: Adolfo Jayme Barrientos
Reviewed-by: Christian Lohmaier
Tested-by: Christian Lohmaier
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 054b0a98e9ee..b733cad8ce83 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -1082,7 +1082,9 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt,
if( pImpRec->nShapeId )
{
-auto pImpRecTmp = pImpRec.get();
+auto nShapeId = pImpRec->nShapeId;
+auto nShapeOrder =
(static_cast(pImpRec->aTextId.nTxBxS) << 16)
++ pImpRec->aTextId.nSequence;
// Complement Import Record List
pImpRec->pObj = pObj;
rImportData.insert(std::move(pImpRec));
@@ -1094,9 +1096,9 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream& rSt,
( (rObjData.nSpFlags & ShapeFlag::Group)
&& (rObjData.nCalledByGroup < 2) )
)
-StoreShapeOrder( pImpRecTmp->nShapeId,
-(
static_cast(pImpRecTmp->aTextId.nTxBxS) << 16 )
-+ pImpRecTmp->aTextId.nSequence, pObj );
+{
+StoreShapeOrder(nShapeId, nShapeOrder, pObj);
+}
}
else
pImpRec.reset();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
ESC meeting minutes: 2020-08-27
* Present: + Caolan, Sberg, Gabriel, Eike, Olivier, Kendy, Cloph, Mst * Completed Action Items: + give commit access to Gokay Satir (Cloph) * Pending Action Items: + make a decision on what notebookbar variant to promote (Heiko) + see tdf#135501 for details + no decision yet * Release Engineering update (Cloph) + 7.0 status + This week - RC2 for 7.0.1, planning to tag this evening + 6.4 status + 6.4.7 - end of September (week 39) + Remotes + Android viewer + Online * Documentation (Olivier) * New Help + More extended tips to the UI and to weblate (ohallot + cloph) + Reusing the translations thanks to Cloph! + More to come... * Helpcpontent2 + housekeeping, fixes and refactors (ohallot) * Google seasons of Doc 2020 + Community bonding phase + 2 projects - for 3 months + running well, no problems so far * Any information anyone wrt. the document comparison feature done as GSoC 2009? + Kendy may remember still some details :-) * Guides + Work in progress + updating for 7.0; Calc the most active * UX Update (Heiko) + Heiko not present * Crash testing (Caolan) + 4 import failure, 7 export failures + two known regressions reported to list + threaded calc ? https://dev-builds.libreoffice.org/crashtest/03e28651142af2ffa7a3749b879f31bde98a2173/backtraces/task588-core.backtrace.txt https://dev-builds.libreoffice.org/crashtest/03e28651142af2ffa7a3749b879f31bde98a2173/backtraces/task565-core.backtrace.txt - these do not have to be new, just hard to repro + 0 coverity issues + builds good now + 16 ossfuzz issues, 14 timeouts, 2 oom * Crash Reporting (Xisco) + Xisco on vacation * GSoC 2020 (Thorsten/Ilmari) + Projects announced: https://blog.documentfoundation.org/blog/2020/05/05/9769/ + June 1, 2020 - August 24, 2020: Students work on their projects + 6 projects accepted + the game is on, students are reporting more or less regularly + remind your students if it's not happening + August 31, 2020 - September 7, 2020: Mentors Submit Final Evaluations + the next week!!! + Students will have a panel: (Thorsten) + mentors: please poke your students to have a 10-15 mins presentation of their work * Mentoring/easyhack update * Commit Access + None * Developer Certification (Stephan/Kendy/Thorsten) + sleep 6 weeks + seeking for a new person as a replacement for Bjoern, who is currently inactive * Jenkins / CI update (Christian) from:Thu Aug 20 14:03:53 2020 master linux rel jobs: 67 ok: 67 ko: 0 fail ratio: 0.00 % break: 0 broken duration: 0.00% master linux dbg jobs: 61 ok: 58 ko: 3 fail ratio: 4.92 % break: 3 broken duration: 1.49% master mac reljobs: 119 ok: 118 ko: 0 fail ratio: 0.00 % break: 0 broken duration: 0.00% master mac dbgjobs: 117 ok: 116 ko: 0 fail ratio: 0.00 % break: 0 broken duration: 0.00% master win reljobs: 82 ok: 82 ko: 0 fail ratio: 0.00 % break: 0 broken duration: 0.00% master win dbgjobs: 88 ok: 88 ko: 0 fail ratio: 0.00 % break: 0 broken duration: 0.00% master win64 dbg jobs: 85 ok: 84 ko: 0 fail ratio: 0.00 % break: 0 broken duration: 0.00% master gerrit lin jobs: 554 ok: 470 ko: 61 fail ratio: 11.01% time for ok: mean: 23 median: 23 master gerrit plg jobs: 510 ok: 383 ko: 96 fail ratio: 18.82% time for ok: mean: 32 median: 30 master gerrit win jobs: 603 ok: 380 ko: 178 fail ratio: 29.52% time for ok: mean: 57 median: 56 master gerrit mac jobs: 555 ok: 475 ko: 53 fail ratio: 9.55% time for ok: mean: 27 median: 22 master gerrit all jobs: 554 ok: 294 ko: 208 fail ratio: 37.55% time for ok: mean: 90 median: 75 + https://dev-www.libreoffice.org/tmp/gerrit_200827.html + tests that failed more than twice in last seven days: 3 Killed by the kill-wrapper gerrit_linux_clang_dbgutil 3 CppunitTest_sc_statistical_functions_test gerrit_linux_clang_dbgutil 3 CppunitTest_sc_subsequent_export_test gerrit_windows 3 CppunitTest_sw_ooxmlexport8 gerrit_windows 3 CppunitTest_sw_ww8export3 gerrit_windows 3 UITest_writer_demo1 gerrit_linux_clang_dbgutil 3 UITest_writer_dialogs gerrit_linux_clang_dbgutil 4 CppunitTest_chart2_xshape gerrit_windows 4 CppunitTest_sc_statistical_functions_test gerrit_windows 6 CppunitTest_xmlsecurity_signing gerrit_windows 7 UITest_impress_demo gerrit_linux_clang_dbgutil 12 CppunitTest_sw_odfexportgerrit_windows 26 CppunitTest_sw_uiwriter gerrit_windows 28 CppunitTest_vcl_complextext gerrit_windows + TDF’s online gerrit builder not run
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/script/XMLEventsImportContext.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit bd2d082a0c681ec7340ed01a27b7d2c7ab14549c
Author: Noel Grandin
AuthorDate: Thu Aug 27 11:57:28 2020 +0200
Commit: Noel Grandin
CommitDate: Thu Aug 27 15:59:55 2020 +0200
fix bug in XMLEventsImportContext
ever since
commit 10e08b1d398e6aa91aa4ced0ca6c966349be8b5d
Date: Fri Feb 14 13:27:23 2020 +0200
convert XMLEventsImportContext to fastparser
Change-Id: I3bdc514f25a38f598d2a764c536b46f6ded9d14c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101473
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/xmloff/source/script/XMLEventsImportContext.cxx
b/xmloff/source/script/XMLEventsImportContext.cxx
index b37ec6d65570..7694bc482d94 100644
--- a/xmloff/source/script/XMLEventsImportContext.cxx
+++ b/xmloff/source/script/XMLEventsImportContext.cxx
@@ -173,7 +173,7 @@ css::uno::Reference< css::xml::sax::XFastContextHandler >
XMLEventsImportContext
{
sEventName = sValue;
}
-else if (aIter.getToken() == XML_ELEMENT(SCRIPT, XML_EVENT_NAME))
+else if (aIter.getToken() == XML_ELEMENT(SCRIPT, XML_LANGUAGE))
{
sLanguage = sValue;
// else: ignore -> let child context handle this
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basic/qa basic/source
basic/qa/basic_coverage/test_ismissing_cascade.vb | 51 ++
basic/source/runtime/runtime.cxx |2
2 files changed, 53 insertions(+)
New commits:
commit 781b6ac998370f2923c0783100da7086bfad622d
Author: Andreas Heinisch
AuthorDate: Wed Aug 26 18:56:28 2020 +0200
Commit: Mike Kaganski
CommitDate: Thu Aug 27 15:49:16 2020 +0200
tdf#136143 - reset SbxFlagBits::Fixed SbiRuntime::StepPARAM
In order to prevent type conversion errors, reset a variable of type
SbxERROR to not fixed. Variable will be of type SbxERROR, but can be
converted to any requested type.
Change-Id: Ic856376e3f8232577a5e894a2adb2545c8723033
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101419
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/basic/qa/basic_coverage/test_ismissing_cascade.vb
b/basic/qa/basic_coverage/test_ismissing_cascade.vb
new file mode 100644
index ..ad967c7bbd81
--- /dev/null
+++ b/basic/qa/basic_coverage/test_ismissing_cascade.vb
@@ -0,0 +1,51 @@
+Dim passCount As Integer
+Dim failCount As Integer
+Dim result As String
+
+Function doUnitTest() As String
+result = verify_testIsMissingCascade()
+If failCount <> 0 Or passCount = 0 Then
+doUnitTest = 0
+Else
+doUnitTest = 1
+End If
+End Function
+
+Function verify_testIsMissingCascade() As String
+
+passCount = 0
+failCount = 0
+
+result = "Test Results" & Chr$(10) & "" & Chr$(10)
+testName = "Test missing (IsMissing with cascading optionals)"
+On Error GoTo errorHandler
+
+' tdf#136143 - test cascading optionals in order to prevent type
conversion errors, because
+' optional arguments are of type SbxERROR and set to not fixed.
+TestLog_ASSERT TestOpt(), 2, "Cascading optionals"
+
+result = result & Chr$(10) & "Tests passed: " & passCount & Chr$(10) &
"Tests failed: " & failCount & Chr$(10)
+verify_testIsMissingCascade = result
+
+Exit Function
+errorHandler:
+TestLog_ASSERT False, True, Err.Description
+End Function
+
+Function TestOpt(Optional A)
+TestOpt = TestOptCascade(A)
+End Function
+
+Function TestOptCascade(Optional A)
+If IsMissing(A) Then A = 2
+TestOptCascade = A
+End Function
+
+Sub TestLog_ASSERT(actual As Variant, expected As Integer, testName As String)
+If expected = actual Then
+passCount = passCount + 1
+Else
+result = result & Chr$(10) & " Failed: " & testName & " returned " &
actual & ", expected " & expected
+failCount = failCount + 1
+End If
+End Sub
\ No newline at end of file
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index f55d5ad86bd8..abd65aa685a8 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -4110,6 +4110,8 @@ void SbiRuntime::StepPARAM( sal_uInt32 nOp1, sal_uInt32
nOp2 )
const SbxParamInfo* pParam = pInfo->GetParam( nIdx );
if( pParam && ( pParam->nFlags & SbxFlagBits::Optional ) )
{
+// tdf#136143 - reset SbxFlagBits::Fixed in order to
prevent type conversion errors
+pVar->ResetFlag( SbxFlagBits::Fixed );
// Default value?
sal_uInt16 nDefaultId =
static_cast(pParam->nUserData & 0x0);
if( nDefaultId > 0 )
___
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/ooxmlexport/data/frame.fodt | 75 +++
sw/qa/extras/ooxmlexport/ooxmlexport6.cxx| 23
sw/source/filter/ww8/attributeoutputbase.hxx |2
sw/source/filter/ww8/docxattributeoutput.cxx | 24
sw/source/filter/ww8/docxattributeoutput.hxx |1
sw/source/filter/ww8/ww8atr.cxx |9 +++
6 files changed, 134 insertions(+)
New commits:
commit 990245577df21b5ffd6fbaa548500731f31b1d36
Author: Michael Stahl
AuthorDate: Wed Aug 26 17:08:00 2020 +0200
Commit: Caolán McNamara
CommitDate: Thu Aug 27 15:41:16 2020 +0200
sw: DOCX export: don't export text frames as transparent
Writer paints text frames without fill still as opaque but nothing is
written in the DOCX file and Word by default treats DrawingML text frame
as transparent (the VML fallback is opaque though).
Change-Id: I0ce539ac8084c5047b4732abc5c199589ee369ee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101411
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit d84e590486e2c26212931de80a84181d7aca7bbe)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101426
Reviewed-by: Caolán McNamara
diff --git a/sw/qa/extras/ooxmlexport/data/frame.fodt
b/sw/qa/extras/ooxmlexport/data/frame.fodt
new file mode 100644
index ..c474b8de5e9e
--- /dev/null
+++ b/sw/qa/extras/ooxmlexport/data/frame.fodt
@@ -0,0 +1,75 @@
+
+
+http://www.w3.org/TR/css3-text/";
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
xmlns:oooc="http://openoffice.org/2004/calc";
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
xmlns:ooow="http://openoffice.org/2004/writer";
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
xmlns:dc="http://purl.org/dc/elements/1.1/";
xmlns:rpt="http://openoffice.org/2005/report";
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0"
xmlns:xlink="http://www.w3.org/1999/xlink";
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"
xmlns:ooo="http://openoffice.org/2004/office";
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
xmlns:d
r3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2"
xmlns:math="http://www.w3.org/1998/Math/MathML";
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
xmlns:dom="http://www.w3.org/2001/xml-events";
xmlns:xforms="http://www.w3.org/2002/xforms";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:xhtml="http://www.w3.org/1999/xhtml";
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; office:version="1.3"
office:mimetype="application/vnd.oasis.opendocument.text">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ opaque
+
+
+
+ solid
+
+
+
+ transparent
+
+
+
+
+
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
index 123a339c6232..7702b935f3fe 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
@@ -149,6 +149,29 @@ DECLARE_OOXMLEXPORT_TEST(testDMLSolidfillAlpha,
"dml-solidfill-alpha.docx")
CPPUNIT_ASSERT_EQUAL(sal_Int16(20), getProperty(xShape,
"FillTransparence"));
}
+DECLARE_OOXMLEXPORT_TEST(testDMLTextFrameNoFill, "frame.fodt")
+{
+// Problem is that default text frame background is white in Writer and
transparent in Word
+uno::Reference xShape1(getShape(1), uno::UNO_QUERY);
+// it is re-imported as solid
+//CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_NONE,
getProperty(xShape1, "FillStyle"));
+CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_SOLID,
getProperty(xShape1, "FillStyle"));
+CPPUNIT_ASSERT_EQUAL(sal_Int16(0), getProperty(xShape1,
"FillTransparence"));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0xff), getProperty(xShape1,
"FillColor"));
+
+uno::Reference xShape2(getShape(2), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_SOLID,
getProperty(xShape2, "FillStyle"));
+CPPUNIT_ASSERT_EQUAL(sal_Int16(0), getProperty(xShape2,
"FillTransparence"));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0xE8F2A1), getProperty(xShape2,
"FillColor"));
+
+uno::Reference xShape3(getShape(3), uno:
[Libreoffice-commits] core.git: sfx2/source xmloff/source
sfx2/source/control/dispatch.cxx |2 +-
xmloff/source/text/txtimp.cxx|4 ++--
xmloff/source/text/txtstyli.cxx |2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 0c28fc7d89e833860216bb02d787d004c32595c7
Author: Andrea Gelmini
AuthorDate: Thu Aug 27 13:16:51 2020 +0200
Commit: Julien Nabet
CommitDate: Thu Aug 27 15:36:17 2020 +0200
Fix typos
It passed "make check" on Linux
Change-Id: I5f39984f1c30fcde46ed411faac3f8d637d10d6f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101449
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 739336a8859c..9c6f3c5200c2 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -465,7 +465,7 @@ IMPL_LINK_NOARG( SfxDispatcher, EventHdl_Impl, Timer *,
void )
flushed.
This method is intended among other things to make assertions possible
-without the side effect of having to flush the SfxDispathcer.
+without the side effect of having to flush the SfxDispatcher.
*/
bool SfxDispatcher::CheckVirtualStack(const SfxShell& rShell)
{
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index 367741953b49..a1380ac7f57b 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -65,7 +65,7 @@
#include
#include
#include
-// XML import: reconstrution of assignment of paragraph style to outline
levels (#i69629#)
+// XML import: reconstruction of assignment of paragraph style to outline
levels (#i69629#)
#include
#include
#include
@@ -605,7 +605,7 @@ struct XMLTextImportHelper::Impl
bool const bProgress, bool const bBlockMode,
bool const bOrganizerMode)
: m_xTextListsHelper( new XMLTextListsHelper() )
-// XML import: reconstrution of assignment of paragraph style to
outline levels (#i69629#)
+// XML import: reconstruction of assignment of paragraph style to
outline levels (#i69629#)
, m_xServiceFactory( rModel, UNO_QUERY )
, m_rSvXMLImport( rImport )
, m_bInsertMode( bInsertMode )
diff --git a/xmloff/source/text/txtstyli.cxx b/xmloff/source/text/txtstyli.cxx
index b475423f4509..7d15c874eeea 100644
--- a/xmloff/source/text/txtstyli.cxx
+++ b/xmloff/source/text/txtstyli.cxx
@@ -219,7 +219,7 @@ void XMLTextStyleContext::CreateAndInsert( bool bOverwrite )
m_xEventContext.clear();
}
-// XML import: reconstrution of assignment of paragraph style to outline
levels (#i69629#)
+// XML import: reconstruction of assignment of paragraph style to outline
levels (#i69629#)
if (m_nOutlineLevel > 0)
{
GetImport().GetTextImport()->AddOutlineStyleCandidate(m_nOutlineLevel,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Crash test update
> On 2020-08-27, at 15.03, Caolán McNamara wrote: > > On Wed, 2020-08-26 at 05:57 +, crashtest wrote: >> New crashtest update available at >> https://dev-builds.libreoffice.org/crashtest/03e28651142af2ffa7a3749b879f31bde98a2173/ > > commit c123bfff501229f398a1b679fc7434b82d53685c (HEAD, refs/bisect/bad) > Date: Thu Aug 20 22:58:24 2020 +0300 > >Bin overly eager early return that stops replacement image creation > > one of these crashes, ooo38104-1.sxw on export to docx began with the > above commit. OK, investigating. —tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - sc/source svx/sdi svx/source
sc/source/ui/drawfunc/drawsh.cxx |8
svx/sdi/svx.sdi |2 +-
svx/source/sidebar/shadow/ShadowPropertyPanel.cxx | 16
3 files changed, 25 insertions(+), 1 deletion(-)
New commits:
commit e99e7499a8e738251ecf42f29d5f2e898b08ef4f
Author: Szymon Kłos
AuthorDate: Tue Aug 11 15:14:23 2020 +0200
Commit: Szymon Kłos
CommitDate: Thu Aug 27 14:42:07 2020 +0200
Shadow color setter for online
Change-Id: Id79d879a6017beb39e95a8d923e8368178901c74
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100502
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Jan Holesovsky
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101388
Tested-by: Jenkins
Reviewed-by: Szymon Kłos
diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx
index 2302367e9aa1..ab0baaf89402 100644
--- a/sc/source/ui/drawfunc/drawsh.cxx
+++ b/sc/source/ui/drawfunc/drawsh.cxx
@@ -58,6 +58,7 @@
#include
#include
#include
+#include
SFX_IMPL_INTERFACE(ScDrawShell, SfxShell)
@@ -103,6 +104,13 @@ namespace
pArgs->Put(aFillColorItem);
break;
}
+
+case SID_ATTR_SHADOW_COLOR:
+{
+XColorItem aItem(SDRATTR_SHADOWCOLOR, aColor);
+pArgs->Put(aItem);
+break;
+}
}
}
if (SfxItemState::SET == pArgs->GetItemState(SID_FILL_GRADIENT_JSON,
false, &pItem))
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index d2ba31f57608..d382a1814121 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -7671,7 +7671,7 @@ SdrOnOffItem FillShadow SID_ATTR_FILL_SHADOW
]
XColorItem FillShadowColor SID_ATTR_SHADOW_COLOR
-
+(SfxStringItem Color SID_ATTR_COLOR_STR)
[
AutoUpdate = TRUE,
commit 09111f124be4f3c34b4d7cebcc238dcd29ceaede
Author: Szymon Kłos
AuthorDate: Tue Aug 11 10:28:52 2020 +0200
Commit: Szymon Kłos
CommitDate: Thu Aug 27 14:41:53 2020 +0200
Instant update shadow fields in sidebar
This allows mobile LOK client to receive updated
state.
Change-Id: I07fb397c1566546e6e2eb8071eaf6d848f6effc0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100466
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Jan Holesovsky
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101387
Tested-by: Jenkins
Reviewed-by: Szymon Kłos
diff --git a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
index 0d69afa1520e..43bdec9b61f2 100644
--- a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
+++ b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
@@ -21,6 +21,7 @@
#include
#include
#include
+#include
using namespace css;
using namespace css::uno;
@@ -109,12 +110,27 @@ IMPL_LINK_NOARG(ShadowPropertyPanel, ClickShadowHdl,
weld::ToggleButton&, void)
SdrOnOffItem aItem(makeSdrShadowItem(false));
GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_FILL_SHADOW,
SfxCallMode::RECORD, { &aItem });
+
+if (comphelper::LibreOfficeKit::isActive())
+{
+mxShowShadow->set_state( TRISTATE_FALSE );
+UpdateControls();
+}
}
else
{
SdrOnOffItem aItem(makeSdrShadowItem(true));
GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_FILL_SHADOW,
SfxCallMode::RECORD, { &aItem });
+
+if (mxShadowDistance->get_value(FieldUnit::POINT) == 0)
+mxShadowDistance->set_value( 8, FieldUnit::POINT );
+
+if (comphelper::LibreOfficeKit::isActive())
+{
+mxShowShadow->set_state( TRISTATE_TRUE );
+UpdateControls();
+}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 48 +-- sw/qa/extras/ooxmlexport/ooxmlexport15.cxx |4 +- sw/source/filter/ww8/docxattributeoutput.cxx |2 - sw/source/filter/ww8/wrtw8nds.cxx|2 - sw/source/filter/ww8/ww8atr.cxx |2 - 5 files changed, 29 insertions(+), 29 deletions(-) New commits: commit 632b6ce6f9f829b35957279f030f9aba8dca8e9f Author: László Németh AuthorDate: Wed Aug 26 14:46:30 2020 +0200 Commit: László Németh CommitDate: Thu Aug 27 14:37:49 2020 +0200 tdf#136132 DOCX export: fix space in table formula Don't add extra space after the equal sign again and again. See commit 82189fdc93ac337e1de3379d678eca6b7654e6fc (tdf133647 tdf123386 tdf123389 fix DOCX table formula export) and commit cf596c43315bb96b5e7256a82256f1ccb8c9c4d0 (tdf#133163 DOCX: export formula cells). Change-Id: I45b49ce572c8e668571ed0550be13beff91634d6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101405 Tested-by: Jenkins Reviewed-by: László Németh diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index e0ce31a44d1b..9260cc8f4f7f 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -992,8 +992,8 @@ DECLARE_OOXMLEXPORT_TEST(testTdf118682, "tdf118682.fodt") assertXPath(pXmlDoc, "/w:document/w:body/w:tbl/w:tr[4]/w:tc/w:p/w:r/w:fldChar", 3); // Cell references were parenthesized: + and SUM() -assertXPathContent(pXmlDoc, "/w:document/w:body/w:tbl/w:tr[3]/w:tc/w:p/w:r[2]/w:instrText", " = A1+A2"); -assertXPathContent(pXmlDoc, "/w:document/w:body/w:tbl/w:tr[4]/w:tc/w:p/w:r[2]/w:instrText", " = SUM(A1:A3)"); +assertXPathContent(pXmlDoc, "/w:document/w:body/w:tbl/w:tr[3]/w:tc/w:p/w:r[2]/w:instrText", " =A1+A2"); +assertXPathContent(pXmlDoc, "/w:document/w:body/w:tbl/w:tr[4]/w:tc/w:p/w:r[2]/w:instrText", " =SUM(A1:A3)"); } DECLARE_OOXMLEXPORT_TEST(testTdf133163, "tdf133163.fodt") @@ -1005,8 +1005,8 @@ DECLARE_OOXMLEXPORT_TEST(testTdf133163, "tdf133163.fodt") assertXPath(pXmlDoc, "/w:document/w:body/w:tbl/w:tr[4]/w:tc/w:p/w:r/w:fldChar", 3); // Cell references were parenthesized: + and SUM() -assertXPathContent(pXmlDoc, "/w:document/w:body/w:tbl/w:tr[3]/w:tc/w:p/w:r[2]/w:instrText", " = A1+A2"); -assertXPathContent(pXmlDoc, "/w:document/w:body/w:tbl/w:tr[4]/w:tc/w:p/w:r[2]/w:instrText", " = SUM(A1:A3)"); +assertXPathContent(pXmlDoc, "/w:document/w:body/w:tbl/w:tr[3]/w:tc/w:p/w:r[2]/w:instrText", " =A1+A2"); +assertXPathContent(pXmlDoc, "/w:document/w:body/w:tbl/w:tr[4]/w:tc/w:p/w:r[2]/w:instrText", " =SUM(A1:A3)"); } DECLARE_OOXMLEXPORT_TEST(testTdf133647, "tdf133647.docx") @@ -1016,14 +1016,14 @@ DECLARE_OOXMLEXPORT_TEST(testTdf133647, "tdf133647.docx") return; // Keep original formula during round-trip -assertXPathContent(pXmlDoc, "/w:document/w:body/w:tbl/w:tr[4]/w:tc[4]/w:p/w:r[2]/w:instrText", " = SUM(A1,B1)"); -assertXPathContent(pXmlDoc, "/w:document/w:body/w:tbl/w:tr[5]/w:tc[4]/w:p/w:r[2]/w:instrText", " = SUM(C1:D1)"); -assertXPathContent(pXmlDoc, "/w:document/w:body/w:tbl/w:tr[6]/w:tc[4]/w:p/w:r[2]/w:instrText", " = SUM(A1,5,B1:C1,6)"); -assertXPathContent(pXmlDoc, "/w:document/w:body/w:tbl/w:tr[7]/w:tc[4]/w:p/w:r[2]/w:instrText", " = (1+2)*SUM(C1,D1)"); -assertXPathContent(pXmlDoc, "/w:document/w:body/w:tbl/w:tr[8]/w:tc[4]/w:p/w:r[2]/w:instrText", " = 3*(2+SUM(A1:C1)+7)"); -assertXPathContent(pXmlDoc, "/w:document/w:body/w:tbl/w:tr[9]/w:tc[4]/w:p/w:r[2]/w:instrText", " = 1+(SUM(1,2))"); -assertXPathContent(pXmlDoc, "/w:document/w:body/w:tbl/w:tr[10]/w:tc[4]/w:p/w:r[2]/w:instrText", " = (SUM(C1,5)*(2+7))*(3+SUM(1,B1))"); -assertXPathContent(pXmlDoc, "/w:document/w:body/w:tbl/w:tr[11]/w:tc[4]/w:p/w:r[2]/w:instrText", " = sum(a1,b1)"); +assertXPathContent(pXmlDoc, "/w:document/w:body/w:tbl/w:tr[4]/w:tc[4]/w:p/w:r[2]/w:instrText", " =SUM(A1,B1)"); +assertXPathContent(pXmlDoc, "/w:document/w:body/w:tbl/w:tr[5]/w:tc[4]/w:p/w:r[2]/w:instrText", " =SUM(C1:D1)"); +assertXPathContent(pXmlDoc, "/w:document/w:body/w:tbl/w:tr[6]/w:tc[4]/w:p/w:r[2]/w:instrText", " =SUM(A1,5,B1:C1,6)"); +assertXPathContent(pXmlDoc, "/w:document/w:body/w:tbl/w:tr[7]/w:tc[4]/w:p/w:r[2]/w:instrText", " =(1+2)*SUM(C1,D1)"); +assertXPathContent(pXmlDoc, "/w:document/w:body/w:tbl/w:tr[8]/w:tc[4]/w:p/w:r[2]/w:instrText", " =3*(2+SUM(A1:C1)+7)"); +assertXPathContent(pXmlDoc, "/w:document/w:body/w:tbl/w:tr[9]/w:tc[4]/w:p/w:r[2]/w:instrText", " =1+(SUM(1,2))"); +assertXPathContent(pXmlDoc, "/w:document/w:body/w:tbl/w:tr[10]/w:tc[4]/w:p/w:r[2]/w:instrText", " =(SUM(C1,5)*(2+7))*(3+SUM(1,B1))"); +assertXPathContent(pXmlDoc, "/w:document/w:body/w:tbl/w:tr[11]/w:tc[4]/w:p/w:r[2]/w:instrText", " =sum(a1,b1)"); } DECLARE_OOXMLEXPORT_TEST(
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0-1' - readlicense_oo/license
readlicense_oo/license/CREDITS.fodt | 3284 ++-- 1 file changed, 1663 insertions(+), 1621 deletions(-) New commits: commit b622cf8907788ec1a0dd343b167b6188b1073cde Author: Christian Lohmaier AuthorDate: Thu Aug 27 14:26:16 2020 +0200 Commit: Christian Lohmaier CommitDate: Thu Aug 27 14:31:34 2020 +0200 update credits Change-Id: I09404b311a121d0316f30991f82fc21e596f080a (cherry picked from commit 9f77b5b694ec3708c8ae5feb01dc7d34f1c29d82) (cherry picked from commit a1c384e4b89690050b18e9afbe34b6dd3a852ce0) diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt index 0380df94d669..e950ad90bac7 100644 --- a/readlicense_oo/license/CREDITS.fodt +++ b/readlicense_oo/license/CREDITS.fodt @@ -1,12 +1,12 @@ http://www.w3.org/TR/css3-text/"; xmlns:grddl="http://www.w3.org/2003/g/data-view#"; xmlns:xhtml="http://www.w3.org/1999/xhtml"; xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:dom="http://www.w3.org/2001/xml-events"; xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:xforms="http://www.w3.org/2002/xforms"; xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:drawooo="http://openoffice.org/2010/draw"; xmlns:math="http://www.w3.org/1998/Math/MathML"; xmlns:tableooo="http://openoffice.org/2009/table"; xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:oooc="http://openoffice.org/2004/calc"; xmlns:ooow="http://openoffice.org/200 4/writer" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:xlink="http://www.w3.org/1999/xlink"; xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:ooo="http://openoffice.org/2004/office"; xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:rpt="http://openoffice.org/2005/report"; xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:officeooo="http://openoffice.org/2009/office"; xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:open document:xmlns:table:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text"> - Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/7.0.0.3$Linux_X86_64 LibreOffice_project/8061b3e9204bef6b321a21033174034a5e2ea88e2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA + Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/7.0.0.3$Linux_X86_64 LibreOffice_project/8061b3e9204bef6b321a21033174034a5e2ea88e2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA - 517 + 649 501 - 20765 + 50592 27360 true true @@ -16,9 +16,9 @@ 3577 3434 501 - 517 - 21264 - 27875 + 649 + 51091 + 28007 0 0 false @@ -119,7 +119,7 @@ true false true - 9519943 + 9536229 false false false @@ -160,7 +160,7 @@ - + @@ -338,24 +338,24 @@ - + - + - + - + - + - + @@ -419,24 +419,24 @@ - + - + - + - + - + - + @@ -1075,7 +1075,7 @@ Credits -1560 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2020-08-06 14:11:38. +1567 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2020-08-27 13:59:14. * marks developers whose first contributions happened after 2010-09-28. Developers committing code since 2010-09-28 @@ -1094,21 +1094,21 @@ Oliver BolteCommits: 31008Joined: 2000-09-19 - Jens-Heiner Rechtien [hr]Commits: 28805Joined: 2000-09-18 + Caolán McNamaraCommits: 28851Joined: 2000-10-10
[Libreoffice-commits] core.git: accessibility/source include/vcl vcl/source
accessibility/source/standard/accessiblemenubasecomponent.cxx |5 +
accessibility/source/standard/accessiblemenuitemcomponent.cxx |2
include/vcl/builder.hxx |7 +
include/vcl/menu.hxx |4
include/vcl/vclevent.hxx |1
vcl/source/window/builder.cxx | 42 +++---
vcl/source/window/menu.cxx| 30 +++
vcl/source/window/menuitemlist.hxx|1
8 files changed, 78 insertions(+), 14 deletions(-)
New commits:
commit 7d0279121f099aa36fcee3f0df207bdbcee75ad4
Author: Caolán McNamara
AuthorDate: Thu Aug 27 10:34:36 2020 +0100
Commit: Caolán McNamara
CommitDate: Thu Aug 27 14:33:23 2020 +0200
tdf#136162 implement applying atk properties to gen menus
Change-Id: I77dbc21910b01524d281869a83d9d12efd419bf6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101446
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/accessibility/source/standard/accessiblemenubasecomponent.cxx
b/accessibility/source/standard/accessiblemenubasecomponent.cxx
index 3c5cdd53c71f..4dbb71c554cf 100644
--- a/accessibility/source/standard/accessiblemenubasecomponent.cxx
+++ b/accessibility/source/standard/accessiblemenubasecomponent.cxx
@@ -579,6 +579,11 @@ void OAccessibleMenuBaseComponent::ProcessMenuEvent( const
VclMenuEvent& rVclMen
RemoveChild( nItemPos );
}
break;
+case VclEventId::MenuAccessibleNameChanged:
+{
+UpdateAccessibleName( nItemPos );
+}
+break;
case VclEventId::MenuItemTextChanged:
{
UpdateAccessibleName( nItemPos );
diff --git a/accessibility/source/standard/accessiblemenuitemcomponent.cxx
b/accessibility/source/standard/accessiblemenuitemcomponent.cxx
index c4e08609fe04..951d913e20c3 100644
--- a/accessibility/source/standard/accessiblemenuitemcomponent.cxx
+++ b/accessibility/source/standard/accessiblemenuitemcomponent.cxx
@@ -336,7 +336,7 @@ OUString
OAccessibleMenuItemComponent::getAccessibleDescription( )
OUString sDescription;
if ( m_pParent )
-sDescription = m_pParent->GetHelpText( m_pParent->GetItemId(
m_nItemPos ) );
+sDescription = m_pParent->GetAccessibleDescription(
m_pParent->GetItemId( m_nItemPos ) );
return sDescription;
}
diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index c15b671cd8b2..6a642a1c7149 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -345,8 +345,10 @@ private:
voidextractStock(const OString &id, stringmap &rMap);
voidextractMnemonicWidget(const OString &id, stringmap &rMap);
-voidhandleChild(vcl::Window *pParent, xmlreader::XmlReader
&reader);
-VclPtr handleObject(vcl::Window *pParent,
xmlreader::XmlReader &reader);
+// either pParent or pAtkProps must be set, pParent for a child of a
widget, pAtkProps for
+// collecting the atk info for a GtkMenuItem
+voidhandleChild(vcl::Window *pParent, stringmap *pAtkProps,
xmlreader::XmlReader &reader);
+VclPtr handleObject(vcl::Window *pParent, stringmap
*pAtkProps, xmlreader::XmlReader &reader);
voidhandlePacking(vcl::Window *pCurrent, vcl::Window *pParent,
xmlreader::XmlReader &reader);
static std::vector
handleStyle(xmlreader::XmlReader &reader, int &nPriority);
static OString getStyleClass(xmlreader::XmlReader &reader);
@@ -363,6 +365,7 @@ private:
const OString &rClass,
const OString &rID,
stringmap &rProps,
+ stringmap &rAtkProps,
accelmap &rAccels);
voidhandleMenuChild(Menu *pParent, xmlreader::XmlReader &reader);
diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index bea9e2a39268..9522204de0b6 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -372,8 +372,12 @@ public:
vcl::Window* GetWindow() const { return pWindow; }
+void SetAccessibleName( sal_uInt16 nItemId, const OUString& rStr );
OUString GetAccessibleName( sal_uInt16 nItemId ) const;
+void SetAccessibleDescription( sal_uInt16 nItemId, const OUString& rStr );
+OUString GetAccessibleDescription( sal_uInt16 nItemId ) const;
+
// returns whether the item a position nItemPos is highlighted or not.
bool IsHighlighted( sal_uInt16 nItemPos ) const;
diff --git a/include/vcl/vclevent.hxx b/include/vcl/vclevent.hxx
index ad24a61740a2..a0a11c6a0870 100644
--- a/include/vcl/vclevent.hxx
+++ b/include/vcl/vclevent.hxx
@@ -67,6 +67,7 @@ enum class VclEventId
ListboxSelect,
ListboxTreeFocus,
ListboxTreeSelect,
+MenuAccessibleNameChanged,
MenuActivate,
MenuDeactivate,
MenuDehighlight,
diff --git a/vcl/source/window/builder.cxx b/vcl/source/
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - readlicense_oo/license
readlicense_oo/license/CREDITS.fodt | 3284 ++-- 1 file changed, 1663 insertions(+), 1621 deletions(-) New commits: commit a1c384e4b89690050b18e9afbe34b6dd3a852ce0 Author: Christian Lohmaier AuthorDate: Thu Aug 27 14:26:16 2020 +0200 Commit: Christian Lohmaier CommitDate: Thu Aug 27 14:30:20 2020 +0200 update credits Change-Id: I09404b311a121d0316f30991f82fc21e596f080a (cherry picked from commit 9f77b5b694ec3708c8ae5feb01dc7d34f1c29d82) diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt index 0380df94d669..e950ad90bac7 100644 --- a/readlicense_oo/license/CREDITS.fodt +++ b/readlicense_oo/license/CREDITS.fodt @@ -1,12 +1,12 @@ http://www.w3.org/TR/css3-text/"; xmlns:grddl="http://www.w3.org/2003/g/data-view#"; xmlns:xhtml="http://www.w3.org/1999/xhtml"; xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:dom="http://www.w3.org/2001/xml-events"; xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:xforms="http://www.w3.org/2002/xforms"; xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:drawooo="http://openoffice.org/2010/draw"; xmlns:math="http://www.w3.org/1998/Math/MathML"; xmlns:tableooo="http://openoffice.org/2009/table"; xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:oooc="http://openoffice.org/2004/calc"; xmlns:ooow="http://openoffice.org/200 4/writer" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:xlink="http://www.w3.org/1999/xlink"; xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:ooo="http://openoffice.org/2004/office"; xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:rpt="http://openoffice.org/2005/report"; xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:officeooo="http://openoffice.org/2009/office"; xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:open document:xmlns:table:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text"> - Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/7.0.0.3$Linux_X86_64 LibreOffice_project/8061b3e9204bef6b321a21033174034a5e2ea88e2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA + Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/7.0.0.3$Linux_X86_64 LibreOffice_project/8061b3e9204bef6b321a21033174034a5e2ea88e2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA - 517 + 649 501 - 20765 + 50592 27360 true true @@ -16,9 +16,9 @@ 3577 3434 501 - 517 - 21264 - 27875 + 649 + 51091 + 28007 0 0 false @@ -119,7 +119,7 @@ true false true - 9519943 + 9536229 false false false @@ -160,7 +160,7 @@ - + @@ -338,24 +338,24 @@ - + - + - + - + - + - + @@ -419,24 +419,24 @@ - + - + - + - + - + - + @@ -1075,7 +1075,7 @@ Credits -1560 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2020-08-06 14:11:38. +1567 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2020-08-27 13:59:14. * marks developers whose first contributions happened after 2010-09-28. Developers committing code since 2010-09-28 @@ -1094,21 +1094,21 @@ Oliver BolteCommits: 31008Joined: 2000-09-19 - Jens-Heiner Rechtien [hr]Commits: 28805Joined: 2000-09-18 + Caolán McNamaraCommits: 28851Joined: 2000-10-10 - Caolán McNamaraCommits: 28714Joined: 2000-10-10 + Jen
[Libreoffice-commits] core.git: include/vcl vcl/source
include/vcl/builder.hxx |4 +++-
vcl/source/window/builder.cxx | 17 +++--
2 files changed, 14 insertions(+), 7 deletions(-)
New commits:
commit 5f2c138bf67b19ba5cfa696afda7087d6879f074
Author: Caolán McNamara
AuthorDate: Thu Aug 27 09:50:00 2020 +0100
Commit: Caolán McNamara
CommitDate: Thu Aug 27 14:32:50 2020 +0200
factor out an applyAtkProperties
Change-Id: Ib7fda3bbf25046f307dcd080e918d159358b4c90
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101445
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index 9ceca5cb53dd..c15b671cd8b2 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -376,7 +376,9 @@ private:
voidhandleSizeGroup(xmlreader::XmlReader &reader);
-voidhandleAtkObject(xmlreader::XmlReader &reader, vcl::Window
*pWindow);
+stringmap handleAtkObject(xmlreader::XmlReader &reader);
+
+static void applyAtkProperties(vcl::Window *pWindow, const stringmap&
rProperties);
voidhandleActionWidget(xmlreader::XmlReader &reader);
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 020ea6c5f74c..1b2f0aef2263 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -3087,15 +3087,13 @@ void VclBuilder::handleListStore(xmlreader::XmlReader
&reader, const OString &rI
}
}
-void VclBuilder::handleAtkObject(xmlreader::XmlReader &reader, vcl::Window
*pWindow)
+VclBuilder::stringmap VclBuilder::handleAtkObject(xmlreader::XmlReader &reader)
{
-assert(pWindow);
-
int nLevel = 1;
stringmap aProperties;
-while(true)
+while (true)
{
xmlreader::Span name;
int nsId;
@@ -3122,7 +3120,13 @@ void VclBuilder::handleAtkObject(xmlreader::XmlReader
&reader, vcl::Window *pWin
break;
}
-for (auto const& prop : aProperties)
+return aProperties;
+}
+
+void VclBuilder::applyAtkProperties(vcl::Window *pWindow, const stringmap&
rProperties)
+{
+assert(pWindow);
+for (auto const& prop : rProperties)
{
const OString &rKey = prop.first;
const OUString &rValue = prop.second;
@@ -3620,7 +3624,8 @@ VclPtr VclBuilder::handleObject(vcl::Window
*pParent, xmlreader::Xm
}
else if (sClass == "AtkObject")
{
-handleAtkObject(reader, pParent);
+auto aAtkProperties = handleAtkObject(reader);
+applyAtkProperties(pParent, aAtkProperties);
return nullptr;
}
___
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' - 2 commits - readlicense_oo/license
readlicense_oo/license/CREDITS.fodt | 4269 ++-- 1 file changed, 2181 insertions(+), 2088 deletions(-) New commits: commit f48c917f59ec2ba1a91536bda52043da4058c163 Author: Christian Lohmaier AuthorDate: Thu Aug 27 14:26:16 2020 +0200 Commit: Christian Lohmaier CommitDate: Thu Aug 27 14:29:44 2020 +0200 update credits Change-Id: I09404b311a121d0316f30991f82fc21e596f080a (cherry picked from commit 9f77b5b694ec3708c8ae5feb01dc7d34f1c29d82) diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt index 0380df94d669..e950ad90bac7 100644 --- a/readlicense_oo/license/CREDITS.fodt +++ b/readlicense_oo/license/CREDITS.fodt @@ -1,12 +1,12 @@ http://www.w3.org/TR/css3-text/"; xmlns:grddl="http://www.w3.org/2003/g/data-view#"; xmlns:xhtml="http://www.w3.org/1999/xhtml"; xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:dom="http://www.w3.org/2001/xml-events"; xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:xforms="http://www.w3.org/2002/xforms"; xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:drawooo="http://openoffice.org/2010/draw"; xmlns:math="http://www.w3.org/1998/Math/MathML"; xmlns:tableooo="http://openoffice.org/2009/table"; xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:oooc="http://openoffice.org/2004/calc"; xmlns:ooow="http://openoffice.org/200 4/writer" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:xlink="http://www.w3.org/1999/xlink"; xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:ooo="http://openoffice.org/2004/office"; xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:rpt="http://openoffice.org/2005/report"; xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:officeooo="http://openoffice.org/2009/office"; xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:open document:xmlns:table:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text"> - Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/7.0.0.3$Linux_X86_64 LibreOffice_project/8061b3e9204bef6b321a21033174034a5e2ea88e2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA + Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/7.0.0.3$Linux_X86_64 LibreOffice_project/8061b3e9204bef6b321a21033174034a5e2ea88e2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA - 517 + 649 501 - 20765 + 50592 27360 true true @@ -16,9 +16,9 @@ 3577 3434 501 - 517 - 21264 - 27875 + 649 + 51091 + 28007 0 0 false @@ -119,7 +119,7 @@ true false true - 9519943 + 9536229 false false false @@ -160,7 +160,7 @@ - + @@ -338,24 +338,24 @@ - + - + - + - + - + - + @@ -419,24 +419,24 @@ - + - + - + - + - + - + @@ -1075,7 +1075,7 @@ Credits -1560 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2020-08-06 14:11:38. +1567 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2020-08-27 13:59:14. * marks developers whose first contributions happened after 2010-09-28. Developers committing code since 2010-09-28 @@ -1094,21 +1094,21 @@ Oliver BolteCommits: 31008Joined: 2000-09-19 - Jens-Heiner Rechtien [hr]Commits: 28805Joined: 2000-09-18 + Caolán McNamaraCommits: 28851Joined: 2000-10-10 - Caolán McNamaraCommits: 28714Joined: 2000-10-10 + Jen
[Libreoffice-commits] core.git: readlicense_oo/license
readlicense_oo/license/CREDITS.fodt | 3284 ++-- 1 file changed, 1663 insertions(+), 1621 deletions(-) New commits: commit 9f77b5b694ec3708c8ae5feb01dc7d34f1c29d82 Author: Christian Lohmaier AuthorDate: Thu Aug 27 14:26:16 2020 +0200 Commit: Christian Lohmaier CommitDate: Thu Aug 27 14:26:32 2020 +0200 update credits Change-Id: I09404b311a121d0316f30991f82fc21e596f080a diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt index 0380df94d669..e950ad90bac7 100644 --- a/readlicense_oo/license/CREDITS.fodt +++ b/readlicense_oo/license/CREDITS.fodt @@ -1,12 +1,12 @@ http://www.w3.org/TR/css3-text/"; xmlns:grddl="http://www.w3.org/2003/g/data-view#"; xmlns:xhtml="http://www.w3.org/1999/xhtml"; xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:dom="http://www.w3.org/2001/xml-events"; xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:xforms="http://www.w3.org/2002/xforms"; xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:drawooo="http://openoffice.org/2010/draw"; xmlns:math="http://www.w3.org/1998/Math/MathML"; xmlns:tableooo="http://openoffice.org/2009/table"; xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:oooc="http://openoffice.org/2004/calc"; xmlns:ooow="http://openoffice.org/200 4/writer" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:xlink="http://www.w3.org/1999/xlink"; xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:ooo="http://openoffice.org/2004/office"; xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:rpt="http://openoffice.org/2005/report"; xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:officeooo="http://openoffice.org/2009/office"; xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:open document:xmlns:table:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text"> - Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/7.0.0.3$Linux_X86_64 LibreOffice_project/8061b3e9204bef6b321a21033174034a5e2ea88e2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA + Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/7.0.0.3$Linux_X86_64 LibreOffice_project/8061b3e9204bef6b321a21033174034a5e2ea88e2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA - 517 + 649 501 - 20765 + 50592 27360 true true @@ -16,9 +16,9 @@ 3577 3434 501 - 517 - 21264 - 27875 + 649 + 51091 + 28007 0 0 false @@ -119,7 +119,7 @@ true false true - 9519943 + 9536229 false false false @@ -160,7 +160,7 @@ - + @@ -338,24 +338,24 @@ - + - + - + - + - + - + @@ -419,24 +419,24 @@ - + - + - + - + - + - + @@ -1075,7 +1075,7 @@ Credits -1560 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2020-08-06 14:11:38. +1567 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2020-08-27 13:59:14. * marks developers whose first contributions happened after 2010-09-28. Developers committing code since 2010-09-28 @@ -1094,21 +1094,21 @@ Oliver BolteCommits: 31008Joined: 2000-09-19 - Jens-Heiner Rechtien [hr]Commits: 28805Joined: 2000-09-18 + Caolán McNamaraCommits: 28851Joined: 2000-10-10 - Caolán McNamaraCommits: 28714Joined: 2000-10-10 + Jens-Heiner Rechtien [hr]Commits: 28805Joined: 2000-09-18
[Libreoffice-commits] core.git: basctl/source
basctl/source/basicide/basidesh.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit d762aa98046eb2294fc24c3955190a4e2e367868
Author: Mike Kaganski
AuthorDate: Thu Aug 27 12:40:13 2020 +0200
Commit: Mike Kaganski
CommitDate: Thu Aug 27 14:24:32 2020 +0200
Fix a nonsense change
... from commit 9ad4eeb4fa413b1a3e084d141c6eb01795f95b7f.
Change-Id: Ib8ed2fd638b393180860c549f432651f34878f5c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101452
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/basctl/source/basicide/basidesh.cxx
b/basctl/source/basicide/basidesh.cxx
index a2f9023e8147..3cf2ed621457 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -905,14 +905,14 @@ void Shell::SetCurLib( const ScriptDocument& rDocument,
const OUString& aLibName
ContainerListenerImpl* pListener = static_cast< ContainerListenerImpl* >(
m_xLibListener.get() );
+if (pListener)
+pListener->removeContainerListener(m_aCurDocument, m_aCurLibName);
+
m_aCurDocument = rDocument;
m_aCurLibName = aLibName;
if ( pListener )
-{
-pListener->removeContainerListener( m_aCurDocument, m_aCurLibName );
pListener->addContainerListener( m_aCurDocument, aLibName );
-}
if ( bUpdateWindows )
UpdateWindows();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/xmloff sw/source xmloff/inc xmloff/source
include/xmloff/XMLDrawingPageStyleContext.hxx |5
include/xmloff/XMLGraphicsDefaultStyle.hxx| 11
include/xmloff/XMLShapeStyleContext.hxx |6
include/xmloff/XMLTextShapeStyleContext.hxx |6
include/xmloff/prstylei.hxx | 10
include/xmloff/txtstyli.hxx | 12
include/xmloff/xmlimppr.hxx | 15
sw/source/filter/xml/xmlfmt.cxx | 132 ++--
xmloff/inc/XMLChartStyleContext.hxx |6
xmloff/inc/XMLShapePropertySetContext.hxx |5
xmloff/source/chart/XMLChartPropertyContext.cxx |8
xmloff/source/chart/XMLChartPropertyContext.hxx |5
xmloff/source/chart/XMLChartStyleContext.cxx | 30 -
xmloff/source/draw/XMLGraphicsDefaultStyle.cxx| 26 -
xmloff/source/draw/XMLShapePropertySetContext.cxx | 12
xmloff/source/draw/XMLShapeStyleContext.cxx | 26 -
xmloff/source/draw/ximpstyl.cxx | 58 ---
xmloff/source/style/prstylei.cxx | 58 +--
xmloff/source/style/xmlimppr.cxx | 334 +++---
xmloff/source/text/XMLTextPropertySetContext.cxx | 13
xmloff/source/text/XMLTextPropertySetContext.hxx |7
xmloff/source/text/XMLTextShapeStyleContext.cxx | 51 +--
xmloff/source/text/txtstyli.cxx | 55 ---
23 files changed, 391 insertions(+), 500 deletions(-)
New commits:
commit 6a33cdd0c440bdf3a563d514da3fdaef841c1588
Author: Noel Grandin
AuthorDate: Wed Aug 26 13:12:36 2020 +0200
Commit: Noel Grandin
CommitDate: Thu Aug 27 14:17:47 2020 +0200
convert remaining XMLPropStyleContext subclasses to fastparser
Change-Id: If78be8caf1b1a87ef16abf04a29bc30762ddb90b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101440
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/xmloff/XMLDrawingPageStyleContext.hxx
b/include/xmloff/XMLDrawingPageStyleContext.hxx
index 22fa6f88f041..5587e5ddde07 100644
--- a/include/xmloff/XMLDrawingPageStyleContext.hxx
+++ b/include/xmloff/XMLDrawingPageStyleContext.hxx
@@ -27,11 +27,6 @@
class XMLOFF_DLLPUBLIC XMLDrawingPageStyleContext : public XMLPropStyleContext
{
public:
-XMLDrawingPageStyleContext(SvXMLImport& rImport, sal_uInt16 nPrefix,
OUString const& rLocalName,
-
css::uno::Reference const& xAttrList,
- SvXMLStylesContext& rStyles,
- ContextID_Index_Pair const pContextIDs[],
- XmlStyleFamily const pFamilies[]);
XMLDrawingPageStyleContext(
SvXMLImport& rImport, sal_Int32 nElement,
css::uno::Reference const&
xAttrList,
diff --git a/include/xmloff/XMLGraphicsDefaultStyle.hxx
b/include/xmloff/XMLGraphicsDefaultStyle.hxx
index 0d3c088c76f0..20c6c1dbfe7e 100644
--- a/include/xmloff/XMLGraphicsDefaultStyle.hxx
+++ b/include/xmloff/XMLGraphicsDefaultStyle.hxx
@@ -28,21 +28,14 @@ class XMLOFF_DLLPUBLIC XMLGraphicsDefaultStyle final :
public XMLPropStyleContex
{
public:
-XMLGraphicsDefaultStyle( SvXMLImport& rImport, sal_uInt16 nPrfx,
-const OUString& rLName,
-const css::uno::Reference< css::xml::sax::XAttributeList >& xAttrList,
-SvXMLStylesContext& rStyles);
-
XMLGraphicsDefaultStyle( SvXMLImport& rImport, sal_Int32 nElement,
const css::uno::Reference< css::xml::sax::XFastAttributeList >&
xAttrList,
SvXMLStylesContext& rStyles);
virtual ~XMLGraphicsDefaultStyle() override;
-virtual SvXMLImportContextRef CreateChildContext(
-sal_uInt16 nPrefix,
-const OUString& rLocalName,
-const css::uno::Reference< css::xml::sax::XAttributeList > &
xAttrList ) override;
+virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL
createFastChildContext(
+sal_Int32 nElement, const css::uno::Reference<
css::xml::sax::XFastAttributeList >& AttrList ) override;
// This method is called for every default style
virtual void SetDefaults() override;
diff --git a/include/xmloff/XMLShapeStyleContext.hxx
b/include/xmloff/XMLShapeStyleContext.hxx
index 93e0ffa72031..86f18a8340c3 100644
--- a/include/xmloff/XMLShapeStyleContext.hxx
+++ b/include/xmloff/XMLShapeStyleContext.hxx
@@ -50,10 +50,8 @@ public:
XmlStyleFamily nFamily);
virtual ~XMLShapeStyleContext() override;
-SvXMLImportContextRef CreateChildContext(
-sal_uInt16 nPrefix,
-const OUString& rLocalName,
-const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList
) override;
+virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL
createFastChildContext(
+sal_Int32 nElement, const css::uno::Reference<
css::xml::sax::XFastAttributeList >& AttrList ) override;
virtual void Finish( bool bOverwrite ) override;
diff --git a/include/xmlof
[Libreoffice-commits] core.git: translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 00791931967170aecc4260e568efa11724386692 Author: Christian Lohmaier AuthorDate: Thu Aug 27 13:59:14 2020 +0200 Commit: Gerrit Code Review CommitDate: Thu Aug 27 13:59:14 2020 +0200 Update git submodules * Update translations from branch 'master' to 6990b2c53807ca4ce972b4c894a5eecc683d67a7 - update translations for master and force-fix errors using pocheck Change-Id: Ifb22d7a6dc32d3f017fcd35f4fc1877aea3b4d38 diff --git a/translations b/translations index 5632692504d4..6990b2c53807 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 5632692504d455d87c83b863fffcf7baf2820c49 +Subproject commit 6990b2c53807ca4ce972b4c894a5eecc683d67a7 ___ 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' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit eb7c0eadc848d0ca9d109ed1c7e227e38d6b11d3 Author: Christian Lohmaier AuthorDate: Thu Aug 27 13:10:38 2020 +0200 Commit: Gerrit Code Review CommitDate: Thu Aug 27 13:10:38 2020 +0200 Update git submodules * Update translations from branch 'libreoffice-7-0' to b68c6e941c1a9dadab2c8425ecc67b033aeeec83 - update translations for 7.0.1 rc2 and force-fix errors using pocheck Change-Id: I9e227a0844ed7ece4966a4d3839b93db4c0f6d77 diff --git a/translations b/translations index 308f24bebb06..b68c6e941c1a 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 308f24bebb06e30657b965538393203c2afc8889 +Subproject commit b68c6e941c1a9dadab2c8425ecc67b033aeeec83 ___ 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/source
sw/source/core/doc/DocumentLayoutManager.cxx |9 +
1 file changed, 9 insertions(+)
New commits:
commit 42770e9c231bec7cec383b4c0d6979b0d7a329ee
Author: Vasily Melenchuk
AuthorDate: Thu Aug 20 12:06:03 2020 +0300
Commit: Michael Stahl
CommitDate: Thu Aug 27 13:01:02 2020 +0200
tdf#133490: set name for pasted frame format
In some copy/paste operations resulting frame format name can
be empty. This can lead to problems with udo/redo which relies
on format names.
Change-Id: I3cb542321d37cc00e2dee83d0f667164d83ead78
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101042
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
(cherry picked from commit a6c2a87612a10d55fc59fa01e44d67d95505834f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101366
Reviewed-by: Michael Stahl
diff --git a/sw/source/core/doc/DocumentLayoutManager.cxx
b/sw/source/core/doc/DocumentLayoutManager.cxx
index 57f8af08920b..8d5cc79dc648 100644
--- a/sw/source/core/doc/DocumentLayoutManager.cxx
+++ b/sw/source/core/doc/DocumentLayoutManager.cxx
@@ -41,6 +41,7 @@
#include
#include
#include
+#include
using namespace ::com::sun::star;
@@ -484,6 +485,14 @@ SwFrameFormat *DocumentLayoutManager::CopyLayoutFormat(
pDestTextBox->SetOtherTextBoxFormat(pDest);
}
+if (pDest->GetName().isEmpty())
+{
+// Format name should have unique name. Let's use object name as a
fallback
+SdrObject *pObj = pDest->FindSdrObject();
+if (pObj)
+pDest->SetName(pObj->GetName());
+}
+
return pDest;
}
___
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/source
sw/source/core/docnode/ndsect.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit cc1d627b647ac842d6bdbceb309bc67f2227f68e
Author: Vasily Melenchuk
AuthorDate: Thu Aug 20 12:09:49 2020 +0300
Commit: Michael Stahl
CommitDate: Thu Aug 27 12:59:30 2020 +0200
sw: set name for section format on creation
Section format is derived from frame format and better to
have own unique name for undo/redo work.
Change-Id: If41890443c2d71886164e0b94721b92bc2e9573a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101043
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
(cherry picked from commit 5f23f241704f798164df498e24dbf6b0daf27c44)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101368
Reviewed-by: Michael Stahl
diff --git a/sw/source/core/docnode/ndsect.cxx
b/sw/source/core/docnode/ndsect.cxx
index 86207616fce5..67dea3850311 100644
--- a/sw/source/core/docnode/ndsect.cxx
+++ b/sw/source/core/docnode/ndsect.cxx
@@ -191,6 +191,7 @@ SwDoc::InsertSwSection(SwPaM const& rRange, SwSectionData &
rNewData,
}
SwSectionFormat* const pFormat = MakeSectionFormat();
+pFormat->SetName(rNewData.GetSectionName());
if ( pAttr )
{
pFormat->SetFormatAttr( *pAttr );
___
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/source
sw/source/core/docnode/ndsect.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 031fb8b0cf1d0fa0e5290afb32ea8d603c6b2550
Author: Vasily Melenchuk
AuthorDate: Thu Aug 20 12:09:49 2020 +0300
Commit: Michael Stahl
CommitDate: Thu Aug 27 12:59:17 2020 +0200
sw: set name for section format on creation
Section format is derived from frame format and better to
have own unique name for undo/redo work.
Change-Id: If41890443c2d71886164e0b94721b92bc2e9573a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101043
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
(cherry picked from commit 5f23f241704f798164df498e24dbf6b0daf27c44)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101369
Reviewed-by: Michael Stahl
diff --git a/sw/source/core/docnode/ndsect.cxx
b/sw/source/core/docnode/ndsect.cxx
index ef388242fa67..11c6237f5f15 100644
--- a/sw/source/core/docnode/ndsect.cxx
+++ b/sw/source/core/docnode/ndsect.cxx
@@ -188,6 +188,7 @@ SwDoc::InsertSwSection(SwPaM const& rRange, SwSectionData &
rNewData,
}
SwSectionFormat* const pFormat = MakeSectionFormat();
+pFormat->SetName(rNewData.GetSectionName());
if ( pAttr )
{
pFormat->SetFormatAttr( *pAttr );
___
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/qa sw/source
sw/qa/extras/ooxmlexport/data/tdf135973.odt |binary
sw/qa/extras/ooxmlexport/ooxmlexport15.cxx | 21 +++
sw/source/filter/ww8/wrtw8num.cxx | 30 +
sw/source/filter/ww8/wrtww8.hxx |3
sw/source/filter/ww8/ww8atr.cxx | 158 +---
5 files changed, 107 insertions(+), 105 deletions(-)
New commits:
commit 2bc32e96df52e7f49b51881aa8f0dc97961c4f60
Author: Vasily Melenchuk
AuthorDate: Sun Aug 23 14:02:40 2020 +0300
Commit: Michael Stahl
CommitDate: Thu Aug 27 12:58:53 2020 +0200
tdf#135973: DOCX export: improved list override support
Removed remains of old override support which are not working now.
Partial refactoring and fixing for listid and overrides detection.
Change-Id: I1f94a09b7d51fcc3300b056d6d9e8ea6367a4446
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101238
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101438
Reviewed-by: Michael Stahl
diff --git a/sw/qa/extras/ooxmlexport/data/tdf135973.odt
b/sw/qa/extras/ooxmlexport/data/tdf135973.odt
new file mode 100644
index ..0eb42080f9d6
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf135973.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
index dedad4d00eab..2942b74dd194 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
@@ -33,6 +33,27 @@ DECLARE_OOXMLEXPORT_TEST(testTdf14_followPgStyle,
"tdf14_followPgStyle.o
CPPUNIT_ASSERT_EQUAL(2, getPages());
}
+DECLARE_OOXMLEXPORT_TEST(testTdf135973, "tdf135973.odt")
+{
+CPPUNIT_ASSERT_EQUAL(1, getPages());
+{
+uno::Reference xPara(getParagraph(2),
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("1."), getProperty(xPara,
"ListLabelString"));
+}
+{
+uno::Reference xPara(getParagraph(3),
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("2."), getProperty(xPara,
"ListLabelString"));
+}
+{
+uno::Reference xPara(getParagraph(5),
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("1."), getProperty(xPara,
"ListLabelString"));
+}
+{
+uno::Reference xPara(getParagraph(6),
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("2."), getProperty(xPara,
"ListLabelString"));
+}
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/wrtw8num.cxx
b/sw/source/filter/ww8/wrtw8num.cxx
index aef96bcd23cb..088f5d445996 100644
--- a/sw/source/filter/ww8/wrtw8num.cxx
+++ b/sw/source/filter/ww8/wrtw8num.cxx
@@ -91,22 +91,19 @@ sal_uInt16 MSWordExportBase::OverrideNumRule(
OUString const& rListId,
SwNumRule const& rAbstractRule)
{
-auto const numdef = GetNumberingId(rExistingRule);
-auto const absnumdef = rListId == rAbstractRule.GetDefaultListId()
+const sal_uInt16 numdef = GetNumberingId(rExistingRule);
+
+const sal_uInt16 absnumdef = rListId == rAbstractRule.GetDefaultListId()
? GetNumberingId(rAbstractRule)
: DuplicateAbsNum(rListId, rAbstractRule);
auto const mapping = std::make_pair(numdef, absnumdef);
-auto it = m_OverridingNumsR.find(mapping);
-if (it == m_OverridingNumsR.end())
-{
-it = m_OverridingNumsR.insert(std::make_pair(mapping,
m_pUsedNumTable->size())).first;
-m_OverridingNums.insert(std::make_pair(m_pUsedNumTable->size(),
mapping));
+auto it = m_OverridingNums.insert(std::make_pair(m_pUsedNumTable->size(),
mapping));
-m_pUsedNumTable->push_back(nullptr); // dummy, it's unique_ptr...
-++m_nUniqueList; // counter for DuplicateNumRule...
-}
-return it->second;
+m_pUsedNumTable->push_back(nullptr); // dummy, it's unique_ptr...
+++m_nUniqueList; // counter for DuplicateNumRule...
+
+return it.first->first;
}
void MSWordExportBase::AddListLevelOverride(sal_uInt16 nListId,
@@ -148,17 +145,6 @@ sal_uInt16 MSWordExportBase::GetNumberingId( const
SwNumRule& rNumRule )
SwNumRule* p = const_cast(&rNumRule);
sal_uInt16 nRet = static_cast(m_pUsedNumTable->GetPos(p));
-// Is this list now duplicated into a new list which we should use
-// #i77812# - perform 'deep' search in duplication map
-std::map::const_iterator aResult =
m_aRuleDuplicates.end();
-do {
-aResult = m_aRuleDuplicates.find(nRet);
-if ( aResult != m_aRuleDuplicates.end() )
-{
-nRet = (*aResult).second;
-}
-} while ( aResult != m_aRuleDuplicates.end() );
-
return nRet;
}
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 3f64071e2120..9356b87bd86f 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -463,8 +463,6 @@ public:
std::unique_ptr m_pUsedNumTable; // all use
[Libreoffice-commits] core.git: vcl/source
vcl/source/control/button.cxx |7 +++ 1 file changed, 7 insertions(+) New commits: commit 84b2849512bdb19597739d9515dd55e2d3ba9504 Author: Thorsten Wagner AuthorDate: Tue Jul 28 00:36:07 2020 +0200 Commit: Tomaž Vajngerl CommitDate: Thu Aug 27 12:55:40 2020 +0200 tdf#134708 Text coloring of buttons within forms amended Change-Id: I55f91ff626a55ab588ac49a085070c0d9f919e68 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99564 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index 49dd0c204dbb..531315a09233 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -752,6 +752,13 @@ void PushButton::ImplDrawPushButtonContent(OutputDevice *pDev, DrawFlags nDrawFl if (nDrawFlags & DrawFlags::Mono) aColor = COL_BLACK; +// Custom foreground color is reasonable on stock controls only. Stock controls are used if a custom background has been set +// (and thus no native controls are able to be used) or no native controls are available. + +else if (IsControlForeground() + && (IsControlBackground() || !IsNativeControlSupported(ControlType::Pushbutton, ControlPart::Entire))) +aColor = GetControlForeground(); + // Button types with possibly different text coloring are flat buttons and regular buttons. Regular buttons may be action // buttons and may have an additional default status. Moreover all buttons may have an additional pressed and rollover // (highlight) status. Pressed buttons are always in rollover status. ___ 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/svx svx/source sw/source
include/svx/sdrpagewindow.hxx |4 ++--
svx/source/svdraw/sdrpagewindow.cxx | 33 ++---
svx/source/svdraw/svdpagv.cxx | 11 ++-
sw/source/core/view/viewsh.cxx |5 +++--
4 files changed, 37 insertions(+), 16 deletions(-)
New commits:
commit 39f42fbd3f91afad60dad2937d2dfed79b956485
Author: Noel Grandin
AuthorDate: Thu Aug 20 11:27:29 2020 +0200
Commit: Noel Grandin
CommitDate: Thu Aug 27 12:50:25 2020 +0200
tdf#132940 Crash in mergedlo!vcl::Region::operator=
We had a SdrPageWindow accessing a SdPaintWindow that had already been
freed.
Turns that SdrPageWindow can be "patched" more than once given enough
stuff going on in writer, so make the call sites restore the previous
state as the stack unwinds.
Change-Id: Ia1ef5c9b2f818b7873e8e739c9cdf257554e403a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101044
Tested-by: Jenkins
Reviewed-by: Noel Grandin
(cherry picked from commit 445cf499666f21c2d480ce1df9ce6004b9450b64)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101450
diff --git a/include/svx/sdrpagewindow.hxx b/include/svx/sdrpagewindow.hxx
index 80417a6729a0..f5cb98c297da 100644
--- a/include/svx/sdrpagewindow.hxx
+++ b/include/svx/sdrpagewindow.hxx
@@ -68,8 +68,8 @@ public:
rtl::Reference< sdr::overlay::OverlayManager > const & GetOverlayManager()
const;
// #i72752# allow patcing SdrPaintWindow from SdrPageView::DrawLayer if
needed
-void patchPaintWindow(SdrPaintWindow& rPaintWindow);
-void unpatchPaintWindow();
+[[nodiscard]] SdrPaintWindow* patchPaintWindow(SdrPaintWindow&
rPaintWindow);
+void unpatchPaintWindow(SdrPaintWindow* pPreviousPaintWindow);
// the repaint method. For migration from pPaintProc, use one more
parameter
void PrePaint();
diff --git a/svx/source/svdraw/sdrpagewindow.cxx
b/svx/source/svdraw/sdrpagewindow.cxx
index fb3155c0eb14..6d197dab5282 100644
--- a/svx/source/svdraw/sdrpagewindow.cxx
+++ b/svx/source/svdraw/sdrpagewindow.cxx
@@ -163,22 +163,41 @@ rtl::Reference< sdr::overlay::OverlayManager > const &
SdrPageWindow::GetOverlay
return GetPaintWindow().GetOverlayManager();
}
-void SdrPageWindow::patchPaintWindow(SdrPaintWindow& rPaintWindow)
+SdrPaintWindow* SdrPageWindow::patchPaintWindow(SdrPaintWindow& rPaintWindow)
{
-mpImpl->mpOriginalPaintWindow = mpImpl->mpPaintWindow;
-mpImpl->mpPaintWindow = &rPaintWindow;
-mpImpl->mpOriginalPaintWindow->setPatched(&rPaintWindow);
+if (!mpImpl->mpOriginalPaintWindow)
+{
+// first patch
+mpImpl->mpOriginalPaintWindow = mpImpl->mpPaintWindow;
+mpImpl->mpPaintWindow = &rPaintWindow;
+mpImpl->mpOriginalPaintWindow->setPatched(&rPaintWindow);
+return mpImpl->mpOriginalPaintWindow;
+}
+else
+{
+// second or more patch
+auto pPreviousPaintWindow = mpImpl->mpPaintWindow;
+mpImpl->mpPaintWindow = &rPaintWindow;
+mpImpl->mpOriginalPaintWindow->setPatched(&rPaintWindow);
+return pPreviousPaintWindow;
+}
}
-void SdrPageWindow::unpatchPaintWindow()
+void SdrPageWindow::unpatchPaintWindow(SdrPaintWindow* pPreviousPaintWindow)
{
-DBG_ASSERT(mpImpl->mpOriginalPaintWindow,
"SdrPageWindow::unpatchPaintWindow: paint window not patched!" );
-if (mpImpl->mpOriginalPaintWindow)
+if (pPreviousPaintWindow == mpImpl->mpOriginalPaintWindow)
{
+// first patch
mpImpl->mpPaintWindow = mpImpl->mpOriginalPaintWindow;
mpImpl->mpOriginalPaintWindow->setPatched(nullptr);
mpImpl->mpOriginalPaintWindow = nullptr;
}
+else
+{
+// second or more patch
+mpImpl->mpPaintWindow = pPreviousPaintWindow;
+mpImpl->mpOriginalPaintWindow->setPatched(pPreviousPaintWindow);
+}
}
void SdrPageWindow::PrePaint()
diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx
index 215e37bc7c94..480182782984 100644
--- a/svx/source/svdraw/svdpagv.cxx
+++ b/svx/source/svdraw/svdpagv.cxx
@@ -32,6 +32,7 @@
#include
#include
#include
+#include
#include
using namespace ::com::sun::star;
@@ -290,13 +291,13 @@ void SdrPageView::DrawLayer(SdrLayerID nID, OutputDevice*
pGivenTarget,
else
aTemporaryPaintWindow.SetRedrawRegion(vcl::Region(rRect));
// patch the ExistingPageWindow
-pPreparedTarget->patchPaintWindow(aTemporaryPaintWindow);
-
+auto pPreviousWindow =
pPreparedTarget->patchPaintWindow(aTemporaryPaintWindow);
+// unpatch window when leaving the scope
+const ::comphelper::ScopeGuard aGuard(
+[&pPreviousWindow, &pPreparedTarget]() {
pPreparedTarget->unpatchPaintWindow(pPreviousWindow); } );
+
// redraw the layer
pPreparedTarge
[Libreoffice-commits] core.git: external/skia
external/skia/share-grcontext.patch.1 | 14 ++
1 file changed, 14 insertions(+)
New commits:
commit fb3d929466e4e54b29d2558b403991c9c2cf4d3f
Author: Mike Kaganski
AuthorDate: Thu Aug 27 10:35:53 2020 +0300
Commit: Luboš Luňák
CommitDate: Thu Aug 27 12:49:28 2020 +0200
Fix `--disable-pch` build
... breaking after commit eaf4f6d3b1e64bc7b057e70cffe0bda0ed42c49f with
this:
In file included from
C:/lo/src/build/workdir/UnpackedTarball/skia/tools/sk_app/win/VulkanWindowContext_win.cpp:13:
In file included from
C:/lo/src/build/workdir/UnpackedTarball/skia\tools/sk_app/VulkanWindowContext.h:17:
In file included from
C:/lo/src/build/workdir/UnpackedTarball/skia\include/gpu/vk/GrVkBackendContext.h:11:
C:/lo/src/build/workdir/UnpackedTarball/skia\include/core/SkRefCnt.h(141,12):
error: member access into incomplete type 'GrDirectContext'
obj->ref();
^
C:/lo/src/build/workdir/UnpackedTarball/skia\include/core/SkRefCnt.h(226,40):
note: in instantiation of function template specialization
'SkSafeRef' requested here
sk_sp(const sk_sp& that) : fPtr(SkSafeRef(that.get())) {}
^
C:/lo/src/build/workdir/UnpackedTarball/skia\tools/sk_app/WindowContext.h(24,1):
note: in instantiation of member function 'sk_sp::sk_sp'
requested here
WindowContext {
^
C:/lo/src/build/workdir/UnpackedTarball/skia\include/core/SkImage.h(36,7):
note: forward declaration of 'GrDirectContext'
class GrDirectContext;
^
In file included from
C:/lo/src/build/workdir/UnpackedTarball/skia/tools/sk_app/win/VulkanWindowContext_win.cpp:13:
In file included from
C:/lo/src/build/workdir/UnpackedTarball/skia\tools/sk_app/VulkanWindowContext.h:17:
In file included from
C:/lo/src/build/workdir/UnpackedTarball/skia\include/gpu/vk/GrVkBackendContext.h:11:
C:/lo/src/build/workdir/UnpackedTarball/skia\include/core/SkRefCnt.h(150,12):
error: member access into incomplete type 'GrDirectContext'
obj->unref();
^
C:/lo/src/build/workdir/UnpackedTarball/skia\include/core/SkRefCnt.h(251,9):
note: in instantiation of function template specialization
'SkSafeUnref' requested here
SkSafeUnref(fPtr);
^
C:/lo/src/build/workdir/UnpackedTarball/skia\tools/sk_app/WindowContext.h(24,1):
note: in instantiation of member function 'sk_sp::~sk_sp'
requested here
WindowContext {
^
C:/lo/src/build/workdir/UnpackedTarball/skia\include/core/SkImage.h(36,7):
note: forward declaration of 'GrDirectContext'
class GrDirectContext;
^
In file included from
C:/lo/src/build/workdir/UnpackedTarball/skia/tools/sk_app/win/VulkanWindowContext_win.cpp:13:
In file included from
C:/lo/src/build/workdir/UnpackedTarball/skia\tools/sk_app/VulkanWindowContext.h:17:
In file included from
C:/lo/src/build/workdir/UnpackedTarball/skia\include/gpu/vk/GrVkBackendContext.h:11:
C:/lo/src/build/workdir/UnpackedTarball/skia\include/core/SkRefCnt.h(264,25):
error: no matching function for call to 'SkSafeRef'
this->reset(SkSafeRef(that.get()));
^
C:/lo/src/build/workdir/UnpackedTarball/skia\tools/sk_app/WindowContext.h(24,1):
note: in instantiation of member function 'sk_sp::operator='
requested here
WindowContext {
^
C:/lo/src/build/workdir/UnpackedTarball/skia\include/core/SkRefCnt.h(139,40):
note: candidate template ignored: substitution failure [with T =
GrDirectContext]
template static inline T* SkSafeRef(T* obj) {
^
C:/lo/src/build/workdir/UnpackedTarball/skia\include/core/SkRefCnt.h(311,9):
error: no matching function for call to 'SkSafeUnref'
SkSafeUnref(oldPtr);
^~~
C:/lo/src/build/workdir/UnpackedTarball/skia\include/core/SkRefCnt.h(264,19):
note: in instantiation of member function 'sk_sp::reset'
requested here
this->reset(SkSafeRef(that.get()));
^
C:/lo/src/build/workdir/UnpackedTarball/skia\tools/sk_app/WindowContext.h(24,1):
note: in instantiation of member function 'sk_sp::operator='
requested here
WindowContext {
^
C:/lo/src/build/workdir/UnpackedTarball/skia\include/core/SkRefCnt.h(148,42):
note: candidate template ignored: substitution failure [with T =
GrDirectContext]
template static inline void SkSafeUnref(T* obj) {
^
4 errors generated.
Change-Id: I159b9ef388834a454eff58c6c2eda2e13dddb67a
Revi
Re: Glade installation
Hi, Could you please help me with the installation of glade in Cygwin on windows?? On Wed, 26 Aug, 2020, 5:32 AM anshu khare, wrote: > Exception thrown is : > > Exception: STATUS_ACCESS_VIOLATION at rip=003F6C560C6 > > On Wed, Aug 26, 2020 at 2:06 AM anshu khare > wrote: > >> Hi >> >> I am trying to install glade on cygwin in Windows 10. >> >> I have installed all the required packages i.e. X11, Gtk3, Glade and >> OpenGL. >> >> I have added >> export GLADE_CATALOG_SEARCH_PATH=C:/Sources/libo-core/instdir/share/glade >> in .bashrc as given in the doc. >> >> I opened Cygwin shell and ran X-multiwindow >> >> It was running fine till this point. >> >> Then I opened another Cygwin shell and ran DISPLAY=:0.0 glade.exe as >> given in the doc. >> >> It is giving me Segmentation fault(Core dumped) error. >> >> I have also rebased Cygwin and still it is giving me error. >> >> Could you please tell me how to solve this? >> >> Regards >> Anshu >> > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: chart2/qa chart2/source
chart2/qa/extras/chart2import.cxx | 45
chart2/qa/extras/data/xlsx/tdf136105.xlsx |binary
chart2/qa/extras/xshape/data/reference/tdf90839-2.xml | 84 +++
chart2/qa/extras/xshape/data/reference/tdf90839-3.xml | 36 +++---
chart2/qa/extras/xshape/data/reference/tdf90839-4.xml | 96 +-
chart2/source/view/charttypes/PieChart.cxx| 15 ++
chart2/source/view/charttypes/VSeriesPlotter.cxx |1
chart2/source/view/diagram/VDiagram.cxx |4
chart2/source/view/inc/VSeriesPlotter.hxx |3
chart2/source/view/main/ChartView.cxx |5
10 files changed, 177 insertions(+), 112 deletions(-)
New commits:
commit 75a8b367f2a06e0d485fc2b9f4472e8bb29d71e3
Author: Balazs Varga
AuthorDate: Tue Aug 25 12:32:02 2020 +0200
Commit: László Németh
CommitDate: Thu Aug 27 12:10:03 2020 +0200
tdf#136105 tdf#134883 pie chart: improve data label position
Set the maximum text width of data point label shape based
on the remaining space, when text wrapping is enabled and
the label placement is OUTSIDE.
Change-Id: I9132658e44886000c692efadaee4841c4d3ffc7b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101317
Tested-by: László Németh
Reviewed-by: László Németh
diff --git a/chart2/qa/extras/chart2import.cxx
b/chart2/qa/extras/chart2import.cxx
index d502d163fc64..651d2b829e06 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -162,6 +162,7 @@ public:
void testStockChartShiftedCategoryPosition();
void testTdf133376();
void testTdf134225();
+void testTdf136105();
void testTdf91250();
void testTdf134111();
@@ -274,6 +275,7 @@ public:
CPPUNIT_TEST(testStockChartShiftedCategoryPosition);
CPPUNIT_TEST(testTdf133376);
CPPUNIT_TEST(testTdf134225);
+CPPUNIT_TEST(testTdf136105);
CPPUNIT_TEST(testTdf91250);
CPPUNIT_TEST(testTdf134111);
@@ -2525,8 +2527,8 @@ void Chart2ImportTest::testTdf133376()
CPPUNIT_ASSERT(xDataPointLabel.is());
// Check the position of the 3rd data point label, which is out from the
pie slice
awt::Point aLabelPosition = xDataPointLabel->getPosition();
-CPPUNIT_ASSERT_DOUBLES_EQUAL(1071, aLabelPosition.X, 30);
-CPPUNIT_ASSERT_DOUBLES_EQUAL(5269, aLabelPosition.Y, 30);
+CPPUNIT_ASSERT_DOUBLES_EQUAL(482, aLabelPosition.X, 30);
+CPPUNIT_ASSERT_DOUBLES_EQUAL(5427, aLabelPosition.Y, 30);
}
void Chart2ImportTest::testTdf134225()
@@ -2557,6 +2559,45 @@ void Chart2ImportTest::testTdf134225()
#endif
}
+void Chart2ImportTest::testTdf136105()
+{
+load("/chart2/qa/extras/data/xlsx/", "tdf136105.xlsx");
+// 1st chart with fix inner position and size
+{
+Reference xChartDoc(getChartDocFromSheet(0,
mxComponent),
+UNO_QUERY_THROW);
+
+Reference xDrawPageSupplier(xChartDoc,
UNO_QUERY_THROW);
+Reference
xDrawPage(xDrawPageSupplier->getDrawPage(), UNO_SET_THROW);
+Reference xShapes(xDrawPage->getByIndex(0),
UNO_QUERY_THROW);
+Reference xDataPointLabel(getShapeByName(xShapes,
+
"CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=0"),
UNO_SET_THROW);
+
+CPPUNIT_ASSERT(xDataPointLabel.is());
+// Check the position of the 1st data point label, which is out from
the pie slice
+awt::Point aLabelPosition = xDataPointLabel->getPosition();
+CPPUNIT_ASSERT_DOUBLES_EQUAL(8797, aLabelPosition.X, 500);
+CPPUNIT_ASSERT_DOUBLES_EQUAL(1374, aLabelPosition.Y, 500);
+}
+// 2nd chart with auto inner position and size
+{
+Reference xChartDoc(getChartDocFromSheet(1,
mxComponent),
+UNO_QUERY_THROW);
+
+Reference xDrawPageSupplier(xChartDoc,
UNO_QUERY_THROW);
+Reference
xDrawPage(xDrawPageSupplier->getDrawPage(), UNO_SET_THROW);
+Reference xShapes(xDrawPage->getByIndex(0),
UNO_QUERY_THROW);
+Reference xDataPointLabel(getShapeByName(xShapes,
+
"CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=0"),
UNO_SET_THROW);
+
+CPPUNIT_ASSERT(xDataPointLabel.is());
+// Check the position of the 1st data point label, which is out from
the pie slice
+awt::Point aLabelPosition = xDataPointLabel->getPosition();
+CPPUNIT_ASSERT_DOUBLES_EQUAL(8610, aLabelPosition.X, 500);
+CPPUNIT_ASSERT_DOUBLES_EQUAL(1684, aLabelPosition.Y, 500);
+}
+}
+
void Chart2ImportTest::testTdf91250()
{
load("/chart2/qa/extras/data/docx/", "tdf91250.docx");
diff --git a/chart2/qa/extras/data/xlsx/tdf136105.xlsx
b/chart2/qa/extras/data/xlsx/tdf136105.xlsx
new file mode 100644
index ..bc3a9092244f
Binary files /dev/null and b/chart2/qa/extras/data/xlsx/tdf136105.xlsx differ
diff --git a/chart2/qa/extras/xshape/data/reference/tdf90839-2.xml
b/chart2/qa/extras/xshape/data/reference/t
[Libreoffice-commits] core.git: oox/source sw/qa writerfilter/source
oox/source/vml/vmlshape.cxx |9 -
sw/qa/extras/ooxmlexport/data/tdf135653.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport15.cxx| 19 +++
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 38 --
4 files changed, 55 insertions(+), 11 deletions(-)
New commits:
commit 636d16efe45a55c1a5a7a451c46fbb8618bf0393
Author: Attila Bakos
AuthorDate: Thu Aug 13 16:37:58 2020 +0200
Commit: László Németh
CommitDate: Thu Aug 27 11:29:51 2020 +0200
tdf#135653 OOXML import: fix OLE background color
When importing a .docx file Writer used to ignore the 'filled' and
'fillcolor' attributes in the 'shape' tag belonging to an OLE object.
Now both these are imported and displayed correctly.
Co-authored-by: Daniel Arato (NISZ)
Change-Id: I2e6b880d88e4c46af6f3f2316ee966bac1a1f2e0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100922
Tested-by: László Németh
Reviewed-by: László Németh
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index f22a98576a16..362f02c7cabf 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -293,13 +293,18 @@ void ShapeBase::finalizeFragmentImport()
aType = aType.copy(1);
if( const ShapeType* pShapeType = mrDrawing.getShapes().getShapeTypeById(
aType ) )
{
-// Make sure that the stroke props from maTypeModel have priority over
the stroke props from
+// Make sure that the props from maTypeModel have priority over the
props from
// the shape type.
StrokeModel aMergedStrokeModel;
aMergedStrokeModel.assignUsed(pShapeType->getTypeModel().maStrokeModel);
aMergedStrokeModel.assignUsed(maTypeModel.maStrokeModel);
+FillModel aMergedFillModel;
+aMergedFillModel.assignUsed(pShapeType->getTypeModel().maFillModel);
+aMergedFillModel.assignUsed(maTypeModel.maFillModel);
+
maTypeModel.assignUsed( pShapeType->getTypeModel() );
maTypeModel.maStrokeModel = aMergedStrokeModel;
+maTypeModel.maFillModel = aMergedFillModel;
}
else {
// Temporary fix, shapetype not found if referenced from different
substream
@@ -1359,6 +1364,8 @@ Reference< XShape > ComplexShape::implConvertAndInsert(
const Reference< XShapes
oox::drawingml::ShapePropertyMap
aPropMap(mrDrawing.getFilter().getModelObjectHelper());
const GraphicHelper& rGraphicHelper =
mrDrawing.getFilter().getGraphicHelper();
maTypeModel.maStrokeModel.pushToPropMap(aPropMap, rGraphicHelper);
+//And, fill-color properties as well...
+maTypeModel.maFillModel.pushToPropMap(aPropMap, rGraphicHelper);
PropertySet(xShape).setProperties(aPropMap);
return xShape;
diff --git a/sw/qa/extras/ooxmlexport/data/tdf135653.docx
b/sw/qa/extras/ooxmlexport/data/tdf135653.docx
new file mode 100644
index ..b53777f81952
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf135653.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
index e78e7fba8179..818664f384f1 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
@@ -9,6 +9,8 @@
#include
+#include
+#include
#include
#include
#include
@@ -369,6 +371,23 @@ DECLARE_OOXMLEXPORT_TEST(testTdf134063, "tdf134063.docx")
CPPUNIT_ASSERT_EQUAL(sal_Int32(720), getXPath(pDump,
"//page[1]/body/txt[1]/Text[3]", "nWidth").toInt32());
}
+DECLARE_OOXMLIMPORT_TEST(TestTdf135653, "tdf135653.docx")
+{
+uno::Reference xOLEProps(getShape(1),
uno::UNO_QUERY_THROW);
+drawing::FillStyle nFillStyle = static_cast(-1);
+xOLEProps->getPropertyValue("FillStyle") >>= nFillStyle;
+Color aFillColor(COL_AUTO);
+xOLEProps->getPropertyValue("FillColor") >>= aFillColor;
+
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Fill style setting does not match!",
+ drawing::FillStyle::FillStyle_SOLID,
nFillStyle);
+Color aExpectedColor;
+aExpectedColor.SetRed(255);
+aExpectedColor.SetGreen(0);
+aExpectedColor.SetBlue(0);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("OLE bg color does not match!",
aExpectedColor, aFillColor);
+}
+
DECLARE_OOXMLEXPORT_TEST(testAtPageShapeRelOrientation, "rotated_shape.fodt")
{
// invalid combination of at-page anchor and horizontal-rel="paragraph"
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index ce3fd3fbe3a8..1ddf7f941956 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -101,6 +101,7 @@
#include
#include
#include
+#include
#include
#include
@@ -2246,18 +2247,35 @@ void DomainMapper_Impl::appendOLE( const OUString&
rStreamName, const std::share
uno::Reference
xReplacementProperties(pOLE
[Libreoffice-commits] online.git: discovery.xml wsd/lint-discovery.py wsd/LOOLWSD.cpp
discovery.xml | 315 +++--- wsd/LOOLWSD.cpp | 158 + wsd/lint-discovery.py | 277 ++- 3 files changed, 528 insertions(+), 222 deletions(-) New commits: commit 05dba7ad86e4bc5ddde3fcfb3faca2c4458c676b Author: Mike Kaganski AuthorDate: Tue Jul 28 17:52:14 2020 +0300 Commit: Mike Kaganski CommitDate: Thu Aug 27 11:29:12 2020 +0200 Restructure discovery to have less apps The apps are not meant to represent MIME types of respective single file extensions; rather, they represent application/module that handles several extensions. So this groups extensions under modules (writer/calc/...). This is required for some WOPI hosts that whitelist discovery data on per-app base. The old list of MIME-type-based apps is kept for compatibility with existing integrations, until they are fixed to use new-style discovery. Extensions are removed from legacy part, to avoid duplicating actions. This also hardcodes content types, to avoid repeated parsing of discovery.xml. lint-discovery.py is updated to process new-style information (ignores legacy part). Change-Id: Ib8d3518f00510cd0788314d8a9da9a286a52e0ba Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99637 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice Reviewed-by: Mike Kaganski diff --git a/discovery.xml b/discovery.xml index b0ea602d4..22b284621 100644 --- a/discovery.xml +++ b/discovery.xml @@ -1,314 +1,451 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + -
[Libreoffice-commits] core.git: sc/source
sc/source/ui/miscdlgs/acredlin.cxx |7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) New commits: commit 894fddc5edf5aad6fc6d0e18a6c934bfa7f001e4 Author: Gabor Kelemen AuthorDate: Mon Aug 24 22:18:55 2020 +0200 Commit: László Németh CommitDate: Thu Aug 27 11:12:25 2020 +0200 tdf#136062 Don't use 'Reject (All)/Clear formatting' buttons in Calc Since formatting changes are not tracked in Calc Change-Id: Ib1b50d248f1ba75aad22cd04af86d15cc2813e36 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101293 Tested-by: Jenkins Reviewed-by: László Németh diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx index 70821153bf73..8837fc5510e5 100644 --- a/sc/source/ui/miscdlgs/acredlin.cxx +++ b/sc/source/ui/miscdlgs/acredlin.cxx @@ -108,10 +108,9 @@ ScAcceptChgDlg::ScAcceptChgDlg(SfxBindings* pB, SfxChildWindow* pCW, weld::Windo pTPFilter = m_xAcceptChgCtr->GetFilterPage(); pTPView = m_xAcceptChgCtr->GetViewPage(); -// set wider window for the optional extending button labels -// eg. "Reject/Clear formatting" instead of "Reject" -pTPView->EnableClearFormat(true); -pTPView->EnableClearFormatAll(true); +// tdf#136062 Don't use "Reject/Clear formatting" instead of "Reject" buttons in Calc +pTPView->EnableClearFormat(false); +pTPView->EnableClearFormatAll(false); pTheView = pTPView->GetTableControl(); pTheView->SetCalcView(); ___ 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/ooxmlexport/data/tdf135973.odt |binary
sw/qa/extras/ooxmlexport/ooxmlexport15.cxx | 20 +++
sw/source/filter/ww8/wrtw8num.cxx | 30 +
sw/source/filter/ww8/wrtww8.hxx |3
sw/source/filter/ww8/ww8atr.cxx | 158 +---
5 files changed, 106 insertions(+), 105 deletions(-)
New commits:
commit 892329fc88116cbe70f0d92f8d307775840595b4
Author: Vasily Melenchuk
AuthorDate: Sun Aug 23 14:02:40 2020 +0300
Commit: Michael Stahl
CommitDate: Thu Aug 27 10:39:56 2020 +0200
tdf#135973: DOCX export: improved list override support
Removed remains of old override support which are not working now.
Partial refactoring and fixing for listid and overrides detection.
Change-Id: I1f94a09b7d51fcc3300b056d6d9e8ea6367a4446
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101238
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101437
Reviewed-by: Michael Stahl
diff --git a/sw/qa/extras/ooxmlexport/data/tdf135973.odt
b/sw/qa/extras/ooxmlexport/data/tdf135973.odt
new file mode 100644
index ..0eb42080f9d6
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf135973.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
index 8dd905a6405b..f585934c896f 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
@@ -39,6 +39,26 @@ DECLARE_OOXMLEXPORT_TEST(testTdf133370_columnBreak,
"tdf133370_columnBreak.odt")
CPPUNIT_ASSERT_EQUAL(1, getPages());
}
+DECLARE_OOXMLEXPORT_TEST(testTdf135973, "tdf135973.odt")
+{
+CPPUNIT_ASSERT_EQUAL(1, getPages());
+{
+uno::Reference xPara(getParagraph(2),
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("1."), getProperty(xPara,
"ListLabelString"));
+}
+{
+uno::Reference xPara(getParagraph(3),
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("2."), getProperty(xPara,
"ListLabelString"));
+}
+{
+uno::Reference xPara(getParagraph(5),
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("1."), getProperty(xPara,
"ListLabelString"));
+}
+{
+uno::Reference xPara(getParagraph(6),
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("2."), getProperty(xPara,
"ListLabelString"));
+}
+}
DECLARE_OOXMLEXPORT_TEST(testTdf134063, "tdf134063.docx")
{
diff --git a/sw/source/filter/ww8/wrtw8num.cxx
b/sw/source/filter/ww8/wrtw8num.cxx
index df51bb99be36..87a6cb68f111 100644
--- a/sw/source/filter/ww8/wrtw8num.cxx
+++ b/sw/source/filter/ww8/wrtw8num.cxx
@@ -86,22 +86,19 @@ sal_uInt16 MSWordExportBase::OverrideNumRule(
OUString const& rListId,
SwNumRule const& rAbstractRule)
{
-auto const numdef = GetNumberingId(rExistingRule);
-auto const absnumdef = rListId == rAbstractRule.GetDefaultListId()
+const sal_uInt16 numdef = GetNumberingId(rExistingRule);
+
+const sal_uInt16 absnumdef = rListId == rAbstractRule.GetDefaultListId()
? GetNumberingId(rAbstractRule)
: DuplicateAbsNum(rListId, rAbstractRule);
auto const mapping = std::make_pair(numdef, absnumdef);
-auto it = m_OverridingNumsR.find(mapping);
-if (it == m_OverridingNumsR.end())
-{
-it = m_OverridingNumsR.insert(std::make_pair(mapping,
m_pUsedNumTable->size())).first;
-m_OverridingNums.insert(std::make_pair(m_pUsedNumTable->size(),
mapping));
+auto it = m_OverridingNums.insert(std::make_pair(m_pUsedNumTable->size(),
mapping));
-m_pUsedNumTable->push_back(nullptr); // dummy, it's unique_ptr...
-++m_nUniqueList; // counter for DuplicateNumRule...
-}
-return it->second;
+m_pUsedNumTable->push_back(nullptr); // dummy, it's unique_ptr...
+++m_nUniqueList; // counter for DuplicateNumRule...
+
+return it.first->first;
}
void MSWordExportBase::AddListLevelOverride(sal_uInt16 nListId,
@@ -143,17 +140,6 @@ sal_uInt16 MSWordExportBase::GetNumberingId( const
SwNumRule& rNumRule )
SwNumRule* p = const_cast(&rNumRule);
sal_uInt16 nRet = static_cast(m_pUsedNumTable->GetPos(p));
-// Is this list now duplicated into a new list which we should use
-// #i77812# - perform 'deep' search in duplication map
-std::map::const_iterator aResult =
m_aRuleDuplicates.end();
-do {
-aResult = m_aRuleDuplicates.find(nRet);
-if ( aResult != m_aRuleDuplicates.end() )
-{
-nRet = (*aResult).second;
-}
-} while ( aResult != m_aRuleDuplicates.end() );
-
return nRet;
}
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 8753314664ca..50d762f6e358 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -455,8 +455,6 @@ public:
std::unique_ptr m_pUsedNumTable; // all used NumRules
/// ov
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sw/source
sw/source/core/doc/DocumentLayoutManager.cxx |9 +
1 file changed, 9 insertions(+)
New commits:
commit 8c0cf4e63c1522a58584f93f38cda71b87c9bb3a
Author: Vasily Melenchuk
AuthorDate: Thu Aug 20 12:06:03 2020 +0300
Commit: Michael Stahl
CommitDate: Thu Aug 27 10:21:35 2020 +0200
tdf#133490: set name for pasted frame format
In some copy/paste operations resulting frame format name can
be empty. This can lead to problems with udo/redo which relies
on format names.
Change-Id: I3cb542321d37cc00e2dee83d0f667164d83ead78
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101042
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
(cherry picked from commit a6c2a87612a10d55fc59fa01e44d67d95505834f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101367
Reviewed-by: Michael Stahl
diff --git a/sw/source/core/doc/DocumentLayoutManager.cxx
b/sw/source/core/doc/DocumentLayoutManager.cxx
index 67875e86efbb..57e436a8bac6 100644
--- a/sw/source/core/doc/DocumentLayoutManager.cxx
+++ b/sw/source/core/doc/DocumentLayoutManager.cxx
@@ -40,6 +40,7 @@
#include
#include
#include
+#include
using namespace ::com::sun::star;
@@ -483,6 +484,14 @@ SwFrameFormat *DocumentLayoutManager::CopyLayoutFormat(
pDestTextBox->SetOtherTextBoxFormat(pDest);
}
+if (pDest->GetName().isEmpty())
+{
+// Format name should have unique name. Let's use object name as a
fallback
+SdrObject *pObj = pDest->FindSdrObject();
+if (pObj)
+pDest->SetName(pObj->GetName());
+}
+
return pDest;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/uiconfig include/vcl vcl/source
dbaccess/uiconfig/ui/detailwindow.ui |1 +
include/vcl/layout.hxx |1 +
vcl/source/window/layout.cxx | 13 -
3 files changed, 14 insertions(+), 1 deletion(-)
New commits:
commit 4895f9de44713fdc574342e5b2993b9829cddb41
Author: Caolán McNamara
AuthorDate: Wed Aug 26 17:37:35 2020 +0100
Commit: Caolán McNamara
CommitDate: Thu Aug 27 10:16:19 2020 +0200
use monoborder widget css name as a WindowBorderStyle::MONO replacement
Change-Id: I563f917c741130909a9d726754cd3eb23a651a11
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101429
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/dbaccess/uiconfig/ui/detailwindow.ui
b/dbaccess/uiconfig/ui/detailwindow.ui
index 36955532cf0c..19bf1e23361b 100644
--- a/dbaccess/uiconfig/ui/detailwindow.ui
+++ b/dbaccess/uiconfig/ui/detailwindow.ui
@@ -63,6 +63,7 @@
6
+monoborder
True
False
True
diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index 3fcfd58c3f43..3a5adbcf0aeb 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -522,6 +522,7 @@ private:
virtual bool EventNotify(NotifyEvent& rNEvt) override;
bool m_bUserManagedScrolling;
DrawFrameStyle m_eDrawFrameStyle;
+DrawFrameFlags m_eDrawFrameFlags;
VclPtr m_pVScroll;
VclPtr m_pHScroll;
VclPtr m_aScrollBarBox;
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index a4a008df7448..d6b9247b73ed 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -1791,12 +1791,19 @@ VclScrolledWindow::VclScrolledWindow(vcl::Window
*pParent)
: VclBin(pParent, WB_HIDE | WB_CLIPCHILDREN | WB_AUTOHSCROLL |
WB_AUTOVSCROLL | WB_TABSTOP)
, m_bUserManagedScrolling(false)
, m_eDrawFrameStyle(DrawFrameStyle::NONE)
+, m_eDrawFrameFlags(DrawFrameFlags::NONE)
, m_pVScroll(VclPtr::Create(this, WB_HIDE | WB_VERT))
, m_pHScroll(VclPtr::Create(this, WB_HIDE | WB_HORZ))
, m_aScrollBarBox(VclPtr::Create(this, WB_HIDE))
{
SetType(WindowType::SCROLLWINDOW);
+AllSettings aAllSettings = GetSettings();
+StyleSettings aStyle = aAllSettings.GetStyleSettings();
+aStyle.SetMonoColor(aStyle.GetActiveBorderColor());
+aAllSettings.SetStyleSettings(aStyle);
+SetSettings(aAllSettings);
+
Link aLink( LINK( this, VclScrolledWindow, ScrollBarHdl )
);
m_pVScroll->SetScrollHdl(aLink);
m_pHScroll->SetScrollHdl(aLink);
@@ -2013,6 +2020,10 @@ bool VclScrolledWindow::set_property(const OString
&rKey, const OUString &rValue
m_eDrawFrameStyle = DrawFrameStyle::NONE;
return true;
}
+else if (rKey == "name")
+{
+m_eDrawFrameFlags = rValue == "monoborder" ? DrawFrameFlags::Mono :
DrawFrameFlags::NONE;
+}
bool bRet = VclBin::set_property(rKey, rValue);
m_pVScroll->Show((GetStyle() & WB_VSCROLL) != 0);
@@ -2043,7 +2054,7 @@ void VclScrolledWindow::Paint(vcl::RenderContext&
rRenderContext, const tools::R
{
VclBin::Paint(rRenderContext, rRect);
DecorationView aDecoView(&rRenderContext);
-aDecoView.DrawFrame(tools::Rectangle(Point(0,0), GetSizePixel()),
m_eDrawFrameStyle);
+aDecoView.DrawFrame(tools::Rectangle(Point(0,0), GetSizePixel()),
m_eDrawFrameStyle, m_eDrawFrameFlags);
}
void VclViewport::setAllocation(const Size &rAllocation)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl
include/vcl/decoview.hxx | 15 ---
include/vcl/vclenum.hxx | 15 +++
2 files changed, 15 insertions(+), 15 deletions(-)
New commits:
commit 3636972c4ef6135ffa8de7c94412b9cdcbaaf169
Author: Caolán McNamara
AuthorDate: Wed Aug 26 17:36:38 2020 +0100
Commit: Caolán McNamara
CommitDate: Thu Aug 27 10:16:00 2020 +0200
move DrawFrameFlags to vclenum.hxx
Change-Id: I49c4a95dc30584753724c1f824f12ce33317312d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101428
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/include/vcl/decoview.hxx b/include/vcl/decoview.hxx
index 40dc600b87d2..4ab2fe70d314 100644
--- a/include/vcl/decoview.hxx
+++ b/include/vcl/decoview.hxx
@@ -42,21 +42,6 @@ namespace o3tl
template<> struct typed_flags :
is_typed_flags {};
}
-// Flags for DrawFrame()
-enum class DrawFrameFlags
-{
-NONE = 0x,
-Menu = 0x0010,
-WindowBorder = 0x0020,
-BorderWindowBorder = 0x0040,
-Mono = 0x1000,
-NoDraw = 0x8000,
-};
-namespace o3tl
-{
-template<> struct typed_flags :
is_typed_flags {};
-}
-
// Flags for DrawHighlightFrame()
enum class DrawHighlightFrameStyle
{
diff --git a/include/vcl/vclenum.hxx b/include/vcl/vclenum.hxx
index 9ac6e79b7737..59f0cb3c9f39 100644
--- a/include/vcl/vclenum.hxx
+++ b/include/vcl/vclenum.hxx
@@ -343,6 +343,21 @@ enum class DrawFrameStyle
NWF = 0x0006,
};
+// Flags for DrawFrame()
+enum class DrawFrameFlags
+{
+NONE = 0x,
+Menu = 0x0010,
+WindowBorder = 0x0020,
+BorderWindowBorder = 0x0040,
+Mono = 0x1000,
+NoDraw = 0x8000,
+};
+namespace o3tl
+{
+template<> struct typed_flags :
is_typed_flags {};
+}
+
enum class TxtAlign
{
Left,
___
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' - framework/source vcl/inc vcl/unx
framework/source/uielement/edittoolbarcontroller.cxx |4 +
vcl/inc/unx/gtk/gtkframe.hxx |2
vcl/unx/gtk3/gtk3gtkframe.cxx| 10 ++
vcl/unx/gtk3/gtk3gtkinst.cxx | 76 +--
4 files changed, 85 insertions(+), 7 deletions(-)
New commits:
commit c4ad7eae4800fe7aa2d8f362d4effa160d5c476f
Author: Caolán McNamara
AuthorDate: Fri Aug 21 14:25:03 2020 +0100
Commit: Michael Stahl
CommitDate: Thu Aug 27 10:09:32 2020 +0200
tdf#135965 let F1 in gtk widgets embedded in a GtkSalFrame call help
and...
Resolves: tdf#135965 blank helpids for EditControl children
so the helpid of the EditControl itself is chosen and LibreLogo's
help can be shown with F1
and...
Resolves: tdf#135965 distinguish between press and release
and...
Related: tdf#135965 return true to show event was handled
and ...
Related: tdf#135965 don't install accel group on adapter
it already has a suitable one in this case
Change-Id: I6eed15a54769a1a1dcc0a8a6ddb226bd9d7a4fcd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101315
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/framework/source/uielement/edittoolbarcontroller.cxx
b/framework/source/uielement/edittoolbarcontroller.cxx
index 76988f88f7a9..392943bdd8e0 100644
--- a/framework/source/uielement/edittoolbarcontroller.cxx
+++ b/framework/source/uielement/edittoolbarcontroller.cxx
@@ -65,6 +65,10 @@ EditControl::EditControl(vcl::Window* pParent,
EditToolbarController* pEditToolb
, m_xWidget(m_xBuilder->weld_entry("entry"))
, m_pEditToolbarController(pEditToolbarController)
{
+OString sEmpty;
+m_xWidget->set_help_id(sEmpty);
+m_xContainer->set_help_id(sEmpty);
+
m_xWidget->connect_focus_in(LINK(this, EditControl, FocusInHdl));
m_xWidget->connect_focus_out(LINK(this, EditControl, FocusOutHdl));
m_xWidget->connect_changed(LINK(this, EditControl, ModifyHdl));
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index 3d4c803ff5be..fa08c1e64617 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -521,6 +521,8 @@ public:
static sal_uInt16 GetKeyModCode(guint nState);
static GdkEvent*makeFakeKeyPress(GtkWidget* pWidget);
static SalWheelMouseEvent GetWheelEvent(GdkEventScroll& rEvent);
+static gboolean NativeWidgetHelpPressed(GtkAccelGroup*,
GObject*, guint,
+GdkModifierType, gpointer pFrame);
};
#define OOO_TYPE_FIXED ooo_fixed_get_type()
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 5d773bbeeb8a..8ca684ca53b7 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -1040,6 +1040,12 @@ void GtkSalFrame::Init( SalFrame* pParent,
SalFrameStyleFlags nStyle )
else
{
m_pWindow = gtk_window_new(eWinType);
+
+// hook up F1 to show help for embedded native gtk widgets
+GtkAccelGroup *pGroup = gtk_accel_group_new();
+GClosure* closure =
g_cclosure_new(G_CALLBACK(GtkSalFrame::NativeWidgetHelpPressed),
GTK_WINDOW(m_pWindow), nullptr);
+gtk_accel_group_connect(pGroup, GDK_KEY_F1,
static_cast(0), GTK_ACCEL_LOCKED, closure);
+gtk_window_add_accel_group(GTK_WINDOW(m_pWindow), pGroup);
}
g_object_set_data( G_OBJECT( m_pWindow ), "SalFrame", this );
@@ -3179,7 +3185,9 @@ gboolean GtkSalFrame::signalKey(GtkWidget* pWidget,
GdkEventKey* pEvent, gpointe
GtkWidgetClass* pWindowClass = GTK_WIDGET_CLASS(pClass);
// if the focus is not in our main widget, see if there is a
handler
// for this key stroke in GtkWindow first
-bool bHandled = pWindowClass->key_press_event(pThis->m_pWindow,
pEvent);
+bool bHandled = pEvent->type == GDK_KEY_PRESS
+? pWindowClass->key_press_event(pThis->m_pWindow, pEvent)
+: pWindowClass->key_release_event(pThis->m_pWindow, pEvent);
g_type_class_unref(pClass);
if (bHandled)
return true;
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 986cf4d23bc1..a6a1481c1620 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -3865,10 +3865,11 @@ private:
rtl::Reference m_xWindow; //uno api
gulong m_nToplevelFocusChangedSignalId;
-static void help_pressed(GtkAccelGroup*, GObject*, guint, GdkModifierType,
gpointer widget)
+static gboolean help_pressed(GtkAccelGroup*, GObject*, guint,
GdkModifierType, gpointer widget)
{
GtkInstanceWindow* pThis = static_cast(widget);
pThis->help();
+return true;
}
static void signalToplevelFocusChanged(GtkWindow*, GParamSpec*, gpointer
widget)
@@ -3885,11 +3886,15 @@ public:
, m_pWindow(pWindo
[Libreoffice-commits] core.git: include/codemaker svl/source xmloff/source
include/codemaker/global.hxx |1 -
svl/source/passwordcontainer/syscreds.cxx |4 ++--
svl/source/passwordcontainer/syscreds.hxx |6 ++
xmloff/source/forms/propertyexport.hxx|3 +--
xmloff/source/forms/propertyimport.hxx|3 +--
5 files changed, 6 insertions(+), 11 deletions(-)
New commits:
commit f9f52b918a3255521bd74cd88939c45381297e19
Author: Noel Grandin
AuthorDate: Wed Aug 26 19:29:14 2020 +0200
Commit: Noel Grandin
CommitDate: Thu Aug 27 09:56:16 2020 +0200
expand out StringSet typedef
Change-Id: If7791d51d055ad918b54a52bee3f13a79c5468f6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101435
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/codemaker/global.hxx b/include/codemaker/global.hxx
index 358db5da7eda..d865e5270aa4 100644
--- a/include/codemaker/global.hxx
+++ b/include/codemaker/global.hxx
@@ -29,7 +29,6 @@
#include
typedef ::std::vector< ::rtl::OString > StringVector;
-typedef ::std::set< ::rtl::OString >StringSet;
// FileStream
diff --git a/svl/source/passwordcontainer/syscreds.cxx
b/svl/source/passwordcontainer/syscreds.cxx
index 73020ef60f2a..3db663d844b8 100644
--- a/svl/source/passwordcontainer/syscreds.cxx
+++ b/svl/source/passwordcontainer/syscreds.cxx
@@ -119,7 +119,7 @@ namespace
return false;
}
-bool findURL( StringSet const & rContainer, OUString const & aURL,
OUString & aResult )
+bool findURL( std::set const & rContainer, OUString const &
aURL, OUString & aResult )
{
// TODO: This code is actually copied from
svl/source/passwordcontainer.cxx
if( !rContainer.empty() && !aURL.isEmpty() )
@@ -131,7 +131,7 @@ namespace
do
{
// first look for /somename and then look for
/somename/...
-StringSet::const_iterator aIter = rContainer.find( aUrl );
+auto aIter = rContainer.find( aUrl );
if( aIter != rContainer.end() )
{
aResult = *aIter;
diff --git a/svl/source/passwordcontainer/syscreds.hxx
b/svl/source/passwordcontainer/syscreds.hxx
index d3605c262506..4f2d6734788e 100644
--- a/svl/source/passwordcontainer/syscreds.hxx
+++ b/svl/source/passwordcontainer/syscreds.hxx
@@ -52,8 +52,6 @@ class SysCredentialsConfigItem : public utl::ConfigItem
SysCredentialsConfig * m_pOwner;
};
-typedef std::set< OUString > StringSet;
-
class SysCredentialsConfig
{
public:
@@ -71,8 +69,8 @@ class SysCredentialsConfig
void writeCfg();
::osl::Mutex m_aMutex;
-StringSetm_aMemContainer;
-StringSetm_aCfgContainer;
+std::set< OUString > m_aMemContainer;
+std::set< OUString > m_aCfgContainer;
SysCredentialsConfigItem m_aConfigItem;
bool m_bCfgInited;
};
diff --git a/xmloff/source/forms/propertyexport.hxx
b/xmloff/source/forms/propertyexport.hxx
index fbf568880307..2a9a6d7e08d8 100644
--- a/xmloff/source/forms/propertyexport.hxx
+++ b/xmloff/source/forms/propertyexport.hxx
@@ -61,8 +61,7 @@ namespace xmloff
class OPropertyExport
{
private:
-typedef std::set StringSet;
-StringSet m_aRemainingProps;
+std::set m_aRemainingProps;
// see examinePersistence
void exportRelativeTargetLocation(const OUString& _sPropertyName,
CCAFlags _nProperty,bool _bAddType);
diff --git a/xmloff/source/forms/propertyimport.hxx
b/xmloff/source/forms/propertyimport.hxx
index f17501fc9f63..9ea8c1dd797a 100644
--- a/xmloff/source/forms/propertyimport.hxx
+++ b/xmloff/source/forms/propertyimport.hxx
@@ -80,8 +80,7 @@ namespace xmloff
PropertyValueArray m_aGenericValues;
// the values which the instance collects between StartElement and
EndElement
-typedef std::set StringSet;
-StringSet m_aEncounteredAttributes;
+std::set m_aEncounteredAttributes;
OFormLayerXMLImport_Impl& m_rContext;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/codemaker
include/codemaker/global.hxx |1 - 1 file changed, 1 deletion(-) New commits: commit 142a5ed429d3b159a3538c372ec51af3605db942 Author: Noel Grandin AuthorDate: Wed Aug 26 19:31:00 2020 +0200 Commit: Noel Grandin CommitDate: Thu Aug 27 09:42:14 2020 +0200 remove unused StringList typedef Change-Id: I432a6d35c204eedc040d38dbdd49b837ba61416e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101436 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/include/codemaker/global.hxx b/include/codemaker/global.hxx index 256b3786ce90..358db5da7eda 100644 --- a/include/codemaker/global.hxx +++ b/include/codemaker/global.hxx @@ -28,7 +28,6 @@ #include #include -typedef ::std::list< ::rtl::OString > StringList; typedef ::std::vector< ::rtl::OString > StringVector; typedef ::std::set< ::rtl::OString >StringSet; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/cib_contract3753' - sw/qa sw/source
Rebased ref, commits from common ancestor:
commit d7896b0af6715e576d5ac2bea7c461c31c3a1836
Author: Michael Stahl
AuthorDate: Wed Aug 26 17:08:00 2020 +0200
Commit: Michael Stahl
CommitDate: Thu Aug 27 09:33:22 2020 +0200
sw: DOCX export: don't export text frames as transparent
Writer paints text frames without fill still as opaque but nothing is
written in the DOCX file and Word by default treats DrawingML text frame
as transparent (the VML fallback is opaque though).
Change-Id: I0ce539ac8084c5047b4732abc5c199589ee369ee
diff --git a/sw/qa/extras/ooxmlexport/data/frame.fodt
b/sw/qa/extras/ooxmlexport/data/frame.fodt
new file mode 100644
index ..c474b8de5e9e
--- /dev/null
+++ b/sw/qa/extras/ooxmlexport/data/frame.fodt
@@ -0,0 +1,75 @@
+
+
+http://www.w3.org/TR/css3-text/";
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
xmlns:oooc="http://openoffice.org/2004/calc";
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
xmlns:ooow="http://openoffice.org/2004/writer";
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
xmlns:dc="http://purl.org/dc/elements/1.1/";
xmlns:rpt="http://openoffice.org/2005/report";
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0"
xmlns:xlink="http://www.w3.org/1999/xlink";
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"
xmlns:ooo="http://openoffice.org/2004/office";
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
xmlns:d
r3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2"
xmlns:math="http://www.w3.org/1998/Math/MathML";
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
xmlns:dom="http://www.w3.org/2001/xml-events";
xmlns:xforms="http://www.w3.org/2002/xforms";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:xhtml="http://www.w3.org/1999/xhtml";
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; office:version="1.3"
office:mimetype="application/vnd.oasis.opendocument.text">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ opaque
+
+
+
+ solid
+
+
+
+ transparent
+
+
+
+
+
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
index a8fe7ac73ea0..4318856bdae2 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx
@@ -142,6 +142,29 @@ DECLARE_OOXMLEXPORT_TEST(testDMLSolidfillAlpha,
"dml-solidfill-alpha.docx")
CPPUNIT_ASSERT_EQUAL(sal_Int16(20), getProperty(xShape,
"FillTransparence"));
}
+DECLARE_OOXMLEXPORT_TEST(testDMLTextFrameNoFill, "frame.fodt")
+{
+// Problem is that default text frame background is white in Writer and
transparent in Word
+uno::Reference xShape1(getShape(1), uno::UNO_QUERY);
+// it is re-imported as solid
+//CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_NONE,
getProperty(xShape1, "FillStyle"));
+CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_SOLID,
getProperty(xShape1, "FillStyle"));
+CPPUNIT_ASSERT_EQUAL(sal_Int16(0), getProperty(xShape1,
"FillTransparence"));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0xff), getProperty(xShape1,
"FillColor"));
+
+uno::Reference xShape2(getShape(2), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_SOLID,
getProperty(xShape2, "FillStyle"));
+CPPUNIT_ASSERT_EQUAL(sal_Int16(0), getProperty(xShape2,
"FillTransparence"));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0xE8F2A1), getProperty(xShape2,
"FillColor"));
+
+uno::Reference xShape3(getShape(3), uno::UNO_QUERY);
+// it is re-imported as solid
+//CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_NONE,
getProperty(xShape3, "FillStyle"));
+CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_SOLID,
getProperty(xShape3, "FillStyle"));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0xff), getProperty(xShape3,
"FillColor"));
+CPPUNIT_ASSERT_EQUAL(sal_Int16(100), getProperty(xShape3,
"FillTransparence"));
+}
+
DECLARE_OOXMLEXPORT_TEST(testDMLCustomGeometry,
"dml-customgeometry-cubicbezier.docx")
{
diff --git a/sw/source/filter/ww8/attributeoutputbase.hxx
b/sw/source/filter/ww8/attributeoutputbase.hxx
index 3d8daa633daa..38cd3f8893b3 100644
--- a/sw/source/filter/ww8/attr
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sw/qa
sw/qa/extras/htmlexport/htmlexport.cxx | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
New commits:
commit eee1cf0720e080703da2df0acbe8a87ac3b105cb
Author: Jan Holesovsky
AuthorDate: Tue Aug 25 15:16:21 2020 +0200
Commit: Stephan Bergmann
CommitDate: Thu Aug 27 09:26:56 2020 +0200
CppunitTest_sw_htmlexport: The actual PNG data does not matter.
The test was supposed to test whether the PNG data is embedded (or not),
not the actual content of the data. Turns out that a different zlib
affects the PNG content, so let's ignore that part, and only check that
the data is actually embedded.
Change-Id: I603bd546d97abda7c47248db0a95349f4a48b4aa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101329
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
(cherry picked from commit 824e092dbfefe2366f39e55a3efcc3d99dc1cbf7)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101365
diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx
b/sw/qa/extras/htmlexport/htmlexport.cxx
index aa92fd90ddd6..3d29bc1ddce1 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -346,6 +346,8 @@ DECLARE_HTMLEXPORT_TEST(testNormalImageExport,
"textAndImage.docx")
CPPUNIT_ASSERT(pDoc);
assertXPath(pDoc, "/html/body", 1);
+
+// the HTML export normally does not embed the images
OUString imgSrc = getXPath(pDoc, "/html/body/p/img", "src");
CPPUNIT_ASSERT(imgSrc.endsWith(".png"));
}
@@ -356,7 +358,13 @@ DECLARE_HTMLEXPORT_TEST(testEmbedImagesEnabled,
"textAndImage.docx")
CPPUNIT_ASSERT(pDoc);
assertXPath(pDoc, "/html/body", 1);
-assertXPath(pDoc, "/html/body/p/img", "src",
"data:image/png;base64,iVBORw0KGgoNSUhEUgAAADAwCAYAAABXAvmHCXBIWXMAAA3ZAAAN2QHmodeGAAAFyUlEQVR4nO1Za2gcVRQ+szuzO9ndZtfEktY2tVorVdNKxRpQweqPmh/B1w8JhCL4R4RYiPhCfKFEfwX/2VYULJIqJFDqg4KC1EaoEoyGhFJClBgbN+a9z9ndeXnOzJ3szCbbQuY2i5ADh5udmXvP953z3cdMRNM04f9sYq0B+LVNArW2TQJXM0EQdmKTQL+Mi4V2PWJwJ4CgBUkKdImi9F48HpGikTptfj4l19fLX2cyxeeQyALPeNwJxOOx/r17djz6+afdsX233QBg5CCXWYS3es62n/js4mXkdyeSmOMVjysBURQ7djVvbRv87p2oLJUAtHmLQDSUg963W8MhMSscPzXWh48e4RaT10BkKJkXens6orKYRvBZC7zlut2+231r6MOTI4exCgmswjKPmFwJFIvFu+5pqbczr7vB22QkMwd7d8vK2Hj+AD5+gUdMrgRCUnD+yt9T8ZubGsrAHSKMTHK2SDGTvGJyJaBp2g/9Z4abH7j7YMjJupvA0Mgi5BVDxUcneMXkSiCTVV/75ItLTx1qCTR2PpbwEJiYTMHjXamcUjSfMTmeIH0TwAm5H5s96JPou3N57f3n3xh99URfuL79IVmOR1UYGlXUL89phqrCabuLcAjbRvQCcjlfMwII5PCWaPib1ntv0S4O/Skn4jHhjn27FMPQ4d/ZJePjgWzJNExBDCW0gwciWp0ceLpQLHaMjM3UNTeZhcU0CLGI8FE2b75SEwJhSWx/ueuR6JvdD8Kx18+Yl/4oCN8PHEP9KyibAoC50krO76Hf/4EjnUkYHYDY+F8A93XCszhUbQiQSUHcsPQFJINz00TX5hhodCJS2WpLIAbBD
ARAkMN+o/OYxEYeQS0y0Gz3rQTtJmQs+0ftMp8EDFsm+qLdmvhbn7cBr8o+k5Se5oOcGZ8K6E4FBHb+8ejfS0jLcYBdNn4SInBm0CuhSiIkMc7fEPxLiIDqKgMZYgQqdA86F7Brmf8KmCQhzV6BKLvWHGBy2QDzEKAtEpsgu04eoMvsNqVRY62OO6hhXbXAsieIhL60AbDLZhFA3AQa6w8xsN9hybegy+wZAkspzaAvk2OfTFhaIcds4z+SiQiEABLwrejb0ZvQ8VBvESJiDkgigbPQIjGLfoU9U1NzZCKBnW0iEkEPu+6RUWqJCAGuQ4+CXaXIxsJdbQSSdE27iyMTEjG+jVsSIrBEziFCz1IViOBOzYD6C8OgPvEwSIPDYDYkvJJK4nx+qReMvg9W+oOEo2UVEEbGAcYmrMwovgjQZEQZlRgJhwBVIs6c5EQZp2yHGDHygK7Dzz/9Bvtbj8I2/Ft5EVv34HO4PZw97w24rdFqCvcfhZIQgEJOgSd9EUDwjoQINA1/I5QrILN7QZc7RtnWMjk4zn634QGtzT04ZhoQYEDH2gYD5esBAUo5xYz7Ab5CAGx9Oxp3iDQwAtJV+jp9qlo2b7cpnPYNXri0Ygex+r53OJKQiYPReypJiDROmqQDC8khAXYVnNXIWSeFa4F3E1hKewmwQUIYt+D39dLaB9ggJRyQCBQYGZoLtKzS8uosq4Eq46wJwiGwnFmzj8rj3dizE7MJXQS7EhQ+BTaRm8CeHzSZSVZO9t0VWWVZtr5UIUDzz1jZ0XkQsBDZWdFwcOfokAV79yVJUTVirn4kLQnKc8lLoHoFqJI70BcwDj2lrZdI1cPcGrKir8oRKFeAwEcZKfJVExJXKGuiVyFwO/o0+gx6ipby9UjqmqdRlhmSVRGDpKEsF2dnpi/NdPxIVfZdTlukiECw4hYBpaQYbBzn0MifgCeqnSF3EIVViGQwfbIfSl/9CCoDA5PT1vjJ3lOw/fQ5Kw
mmqtESav39K7rKXF/vhPb9PoBxVUaiZ2YBBtGdsxQZZfmX5AK0oFtAwc76FPbj8nLM5dMiy14aiXwLthyc5dZgm9UUjzhrGddvo4yIDtfzHbLCNv9LWWvbJFBr2yRQa/sP25LGjrtpN08ASUVORK5CYII=");
+
+// the HTML export normally does not embed the images, but here the test
+// name triggers setting of the "EmbedImages" filter option, meaning the
+// image will not be a separate PNG, but an embedded base64 encoded
+// version of that
+OUString imgSrc = getXPath(pDoc, "/html/body/p/img", "src");
+CPPUNIT_ASSERT(imgSrc.startsWith("data:image/png;base64,"));
}
DECLARE_HTMLEXPORT_TEST(testXHTML, "hello.html")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/inc sw/qa sw/source sw/uiconfig
sw/inc/calc.hxx |3 +-
sw/qa/extras/ooxmlexport/data/tdf123354.fodt | 40 +++
sw/qa/extras/ooxmlexport/ooxmlexport15.cxx | 20 +
sw/source/core/bastyp/calc.cxx |8 -
sw/uiconfig/swriter/ui/inputwinmenu.ui | 14 +
5 files changed, 83 insertions(+), 2 deletions(-)
New commits:
commit 947b7357cc2bb0bd591e4519fa43c4b4bc3cbf2a
Author: László Németh
AuthorDate: Wed Aug 26 13:12:21 2020 +0200
Commit: László Németh
CommitDate: Thu Aug 27 09:19:19 2020 +0200
tdf#123354 sw: add table formula ABS
for DOCX interoperability.
See also commit e1aea22f3f4fbf0cc412a8867165a85a3c55f49c
(tdf#123354 DOCX import: fix ABS formula).
Change-Id: I8633ff4d4727a1e7a596312cdd62e87c07cbe730
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101402
Tested-by: Jenkins
Reviewed-by: László Németh
diff --git a/sw/inc/calc.hxx b/sw/inc/calc.hxx
index 41b3cd0a8cec..99c024bcac35 100644
--- a/sw/inc/calc.hxx
+++ b/sw/inc/calc.hxx
@@ -55,7 +55,7 @@ enum SwCalcOper
CALC_ACOS=278, CALC_ATAN=279, CALC_TDIF=280,
CALC_ROUND=281, CALC_DATE=282, CALC_MONTH=283,
CALC_DAY=284, CALC_PRODUCT=285, CALC_AVERAGE=286,
-CALC_COUNT=287, CALC_SIGN=288
+CALC_COUNT=287, CALC_SIGN=288, CALC_ABS=289
};
// Calculate Operations Strings
@@ -92,6 +92,7 @@ extern const char sCalc_Atan[];
extern const char sCalc_Round[];
extern const char sCalc_Date[];
extern const char sCalc_Sign[];
+extern const char sCalc_Abs[];
// Calculate ErrorCodes
enum class SwCalcError
diff --git a/sw/qa/extras/ooxmlexport/data/tdf123354.fodt
b/sw/qa/extras/ooxmlexport/data/tdf123354.fodt
new file mode 100644
index ..5e75b212957e
--- /dev/null
+++ b/sw/qa/extras/ooxmlexport/data/tdf123354.fodt
@@ -0,0 +1,40 @@
+
+http://openoffice.org/2009/office";
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
xmlns:ooow="http://openoffice.org/2004/writer"; office:version="1.2"
office:mimetype="application/vnd.oasis.opendocument.text">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -10
+
+
+ 0
+
+
+ 10
+
+
+
+
+ 10
+
+
+ 0
+
+
+ 10
+
+
+
+
+
+
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
index e46f99e0c3e9..e78e7fba8179 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
@@ -139,6 +139,26 @@ DECLARE_OOXMLEXPORT_TEST(testTdf123390, "tdf123390.fodt")
CPPUNIT_ASSERT_EQUAL(OUString("0"),
xEnumerationAccess3->getPresentation(false).trim());
}
+DECLARE_OOXMLEXPORT_TEST(testTdf123354, "tdf123354.fodt")
+{
+uno::Reference xTextFieldsSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Reference
xFieldsAccess(xTextFieldsSupplier->getTextFields());
+uno::Reference
xFields(xFieldsAccess->createEnumeration());
+
+// Tests new cell formula SIGN
+uno::Reference
xEnumerationAccess1(xFields->nextElement(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("ABS()"),
xEnumerationAccess1->getPresentation(true).trim());
+CPPUNIT_ASSERT_EQUAL(OUString("10"),
xEnumerationAccess1->getPresentation(false).trim());
+
+uno::Reference
xEnumerationAccess2(xFields->nextElement(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("ABS()"),
xEnumerationAccess2->getPresentation(true).trim());
+CPPUNIT_ASSERT_EQUAL(OUString("10"),
xEnumerationAccess2->getPresentation(false).trim());
+
+uno::Reference
xEnumerationAccess3(xFields->nextElement(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("ABS()"),
xEnumerationAccess3->getPresentation(true).trim());
+CPPUNIT_ASSERT_EQUAL(OUString("0"),
xEnumerationAccess3->getPresentation(false).trim());
+}
+
DECLARE_OOXMLEXPORT_TEST(testTdf98000_changePageStyle,
"tdf98000_changePageStyle.odt")
{
uno::Reference xModel(mxComponent, uno::UNO_QUERY);
diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index 3750aead867c..17179f472352 100644
--- a/sw/source/core/bastyp/calc.cxx
+++ b/sw/source/core/bastyp/calc.cxx
@@ -86,7 +86,8 @@ const char sCalc_Date[] = "date";
const char sCalc_Product[] = "product";
const char sCalc_Average[] = "average";
const char sCalc_Count[]= "count";
-const char sCalc_Sign[]= "sign";
+const char sCalc_Sign[] = "sign";
+const char sCalc_Abs[] = "abs";
// ATTENTION: sorted list of all operators
struct CalcOp
@@ -99,6 +100,7 @@ struct CalcOp
};
CalcOp const aOpTable[] = {
+/* ABS */ {{sCalc_Abs},CALC_ABS}, // Abs (since LibreOffice 7.1)
/* ACOS */{{sCalc_Acos}, CALC_ACOS}, // Arc cosine
/* ADD */ {{sCalc_Add},CALC_PLUS}, // Addition
/* AND */ {{sCalc_And},CALC_
[Libreoffice-commits] core.git: sw/qa writerfilter/source
dev/null |binary
sw/qa/extras/ooxmlexport/ooxmlexport15.cxx| 20
writerfilter/source/dmapper/DomainMapper_Impl.cxx |4
3 files changed, 24 deletions(-)
New commits:
commit 3e6f5176bf433a3f1b543b3bb9fc10d6ad72545f
Author: László Németh
AuthorDate: Wed Aug 26 12:49:12 2020 +0200
Commit: László Németh
CommitDate: Thu Aug 27 09:18:53 2020 +0200
Revert "tdf#123354 DOCX import: fix ABS formula"
This reverts commit e1aea22f3f4fbf0cc412a8867165a85a3c55f49c,
except some clean-up associated to the patch.
Change-Id: Id9f87b5a02a14ad304c755b10ab157ff0577e249
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101401
Tested-by: Jenkins
Reviewed-by: László Németh
diff --git a/sw/qa/extras/ooxmlexport/data/tdf123354.docx
b/sw/qa/extras/ooxmlexport/data/tdf123354.docx
deleted file mode 100644
index 15c7663c645c..
Binary files a/sw/qa/extras/ooxmlexport/data/tdf123354.docx and /dev/null differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
index 6df8475aaa26..e46f99e0c3e9 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
@@ -69,26 +69,6 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf118701,
"tdf118701.docx")
assertXPath(pXmlDoc, "/w:document/w:body/w:p[10]/w:pPr[1]/w:numPr", 1);
}
-DECLARE_OOXMLEXPORT_TEST(testTdf123354, "tdf123354.docx")
-{
-// Tests cell formula ABS(x) to SQRT(x POW 2) conversion
-uno::Reference xTextFieldsSupplier(mxComponent,
uno::UNO_QUERY);
-uno::Reference
xFieldsAccess(xTextFieldsSupplier->getTextFields());
-uno::Reference
xFields(xFieldsAccess->createEnumeration());
-
-uno::Reference
xEnumerationAccess1(xFields->nextElement(), uno::UNO_QUERY);
-CPPUNIT_ASSERT_EQUAL(OUString("SQRT((-234) POW 2)"),
xEnumerationAccess1->getPresentation(true).trim());
-CPPUNIT_ASSERT_EQUAL(OUString("234"),
xEnumerationAccess1->getPresentation(false).trim());
-
-uno::Reference
xEnumerationAccess2(xFields->nextElement(), uno::UNO_QUERY);
-CPPUNIT_ASSERT_EQUAL(OUString("SQRT((SUM()-SUM()*2) POW 2)"),
xEnumerationAccess2->getPresentation(true).trim());
-CPPUNIT_ASSERT_EQUAL(OUString("700035"),
xEnumerationAccess2->getPresentation(false).trim());
-
-uno::Reference
xEnumerationAccess3(xFields->nextElement(), uno::UNO_QUERY);
-CPPUNIT_ASSERT_EQUAL(OUString("SQRT(() POW 2)"),
xEnumerationAccess3->getPresentation(true).trim());
-CPPUNIT_ASSERT_EQUAL(OUString("233423"),
xEnumerationAccess3->getPresentation(false).trim());
-}
-
DECLARE_OOXMLEXPORT_TEST(testTdf123388, "tdf123388.docx")
{
uno::Reference xTextFieldsSupplier(mxComponent,
uno::UNO_QUERY);
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index d720e53a2a53..ce3fd3fbe3a8 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -4264,10 +4264,6 @@ OUString DomainMapper_Impl::convertFieldFormula(const
OUString& input) {
icu::RegexMatcher rmatch5("\\bDEFINED\\s*\\(<([A-Z]+[0-9]+)>\\)", usInput,
rMatcherFlags, status);
usInput = rmatch5.replaceAll(icu::UnicodeString("DEFINED($1)"), status);
-/* Fix up ABS(x) using SQRT(x POW 2) - it supports only 1-level nesting */
-icu::RegexMatcher
rmatch6("\\bABS\\s*(\\(([^()]*|([^()])*\\([^()]*\\)[^()]*)*\\))", usInput,
rMatcherFlags, status);
-usInput = rmatch6.replaceAll(icu::UnicodeString("SQRT($1 POW 2)"), status);
-
return OUString(usInput.getTerminatedBuffer());
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/inc sw/qa sw/source sw/uiconfig
sw/inc/calc.hxx |3 +-
sw/qa/extras/ooxmlexport/data/tdf123390.fodt | 40 +++
sw/qa/extras/ooxmlexport/ooxmlexport15.cxx | 20 +
sw/source/core/bastyp/calc.cxx | 12
sw/uiconfig/swriter/ui/inputwinmenu.ui |8 +
5 files changed, 82 insertions(+), 1 deletion(-)
New commits:
commit 305c8993788b32685a1e6bfc8999fd8a43fcfdaf
Author: László Németh
AuthorDate: Wed Aug 26 12:41:02 2020 +0200
Commit: László Németh
CommitDate: Thu Aug 27 09:18:30 2020 +0200
tdf#123390 sw: add table formula SIGN
for DOCX interoperability.
See also commit 4d9b72d1c3929eca04c7a2e363ab6214676b0f64
(tdf#123390 DOCX import: fix SIGN formula).
Change-Id: I60896e2bf8fb96b8a71d426d50fdea3d212854b8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101398
Tested-by: Jenkins
Reviewed-by: László Németh
diff --git a/sw/inc/calc.hxx b/sw/inc/calc.hxx
index e2b2677a1503..41b3cd0a8cec 100644
--- a/sw/inc/calc.hxx
+++ b/sw/inc/calc.hxx
@@ -55,7 +55,7 @@ enum SwCalcOper
CALC_ACOS=278, CALC_ATAN=279, CALC_TDIF=280,
CALC_ROUND=281, CALC_DATE=282, CALC_MONTH=283,
CALC_DAY=284, CALC_PRODUCT=285, CALC_AVERAGE=286,
-CALC_COUNT=287
+CALC_COUNT=287, CALC_SIGN=288
};
// Calculate Operations Strings
@@ -91,6 +91,7 @@ extern const char sCalc_Acos[];
extern const char sCalc_Atan[];
extern const char sCalc_Round[];
extern const char sCalc_Date[];
+extern const char sCalc_Sign[];
// Calculate ErrorCodes
enum class SwCalcError
diff --git a/sw/qa/extras/ooxmlexport/data/tdf123390.fodt
b/sw/qa/extras/ooxmlexport/data/tdf123390.fodt
new file mode 100644
index ..6512425bda2c
--- /dev/null
+++ b/sw/qa/extras/ooxmlexport/data/tdf123390.fodt
@@ -0,0 +1,40 @@
+
+http://openoffice.org/2009/office";
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
xmlns:ooow="http://openoffice.org/2004/writer"; office:version="1.2"
office:mimetype="application/vnd.oasis.opendocument.text">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -10
+
+
+ 0
+
+
+ 10
+
+
+
+
+ -1
+
+
+ 0
+
+
+ 1
+
+
+
+
+
+
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
index ae3e174ca911..6df8475aaa26 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
@@ -139,6 +139,26 @@ DECLARE_OOXMLEXPORT_TEST(testTdf123356, "tdf123356.fodt")
CPPUNIT_ASSERT_EQUAL(OUString("4"),
xEnumerationAccess2->getPresentation(false).trim());
}
+DECLARE_OOXMLEXPORT_TEST(testTdf123390, "tdf123390.fodt")
+{
+uno::Reference xTextFieldsSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Reference
xFieldsAccess(xTextFieldsSupplier->getTextFields());
+uno::Reference
xFields(xFieldsAccess->createEnumeration());
+
+// Tests new cell formula SIGN
+uno::Reference
xEnumerationAccess1(xFields->nextElement(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("SIGN()"),
xEnumerationAccess1->getPresentation(true).trim());
+CPPUNIT_ASSERT_EQUAL(OUString("-1"),
xEnumerationAccess1->getPresentation(false).trim());
+
+uno::Reference
xEnumerationAccess2(xFields->nextElement(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("SIGN()"),
xEnumerationAccess2->getPresentation(true).trim());
+CPPUNIT_ASSERT_EQUAL(OUString("1"),
xEnumerationAccess2->getPresentation(false).trim());
+
+uno::Reference
xEnumerationAccess3(xFields->nextElement(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("SIGN()"),
xEnumerationAccess3->getPresentation(true).trim());
+CPPUNIT_ASSERT_EQUAL(OUString("0"),
xEnumerationAccess3->getPresentation(false).trim());
+}
+
DECLARE_OOXMLEXPORT_TEST(testTdf98000_changePageStyle,
"tdf98000_changePageStyle.odt")
{
uno::Reference xModel(mxComponent, uno::UNO_QUERY);
diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index 9e206144e13e..3750aead867c 100644
--- a/sw/source/core/bastyp/calc.cxx
+++ b/sw/source/core/bastyp/calc.cxx
@@ -86,6 +86,7 @@ const char sCalc_Date[] = "date";
const char sCalc_Product[] = "product";
const char sCalc_Average[] = "average";
const char sCalc_Count[]= "count";
+const char sCalc_Sign[]= "sign";
// ATTENTION: sorted list of all operators
struct CalcOp
@@ -124,6 +125,7 @@ CalcOp const aOpTable[] = {
/* POW */ {{sCalc_Pow},CALC_POW}, // Exponentiation
/* PRODUCT */ {{sCalc_Product},CALC_PRODUCT}, // Product (since
LibreOffice 7.1)
/* ROUND */ {{sCalc_Round}, CALC_ROUND}, // Rounding
+/* SIGN */{{sCalc_Sign}, CALC_SIGN}, // Sign (since LibreOffice 7.1)
/* SIN */ {{sCalc_Sin},CALC_SIN}, // Sine
/* SQRT */{{sCalc_Sqrt},
[Libreoffice-commits] core.git: sw/qa writerfilter/source
dev/null |binary
sw/qa/extras/ooxmlexport/ooxmlexport15.cxx| 24 --
writerfilter/source/dmapper/DomainMapper_Impl.cxx |6 -
3 files changed, 1 insertion(+), 29 deletions(-)
New commits:
commit a2b48254e4ce731edcdbd2f3fa9f6720ae676ae8
Author: László Németh
AuthorDate: Wed Aug 26 11:51:41 2020 +0200
Commit: László Németh
CommitDate: Thu Aug 27 09:17:45 2020 +0200
Revert "tdf#123390 DOCX import: fix SIGN formula"
This reverts commit 4d9b72d1c3929eca04c7a2e363ab6214676b0f64.
Change-Id: Icd342121c375b26ad9c95631ee118de5e0a5f585
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101397
Tested-by: Jenkins
Reviewed-by: László Németh
diff --git a/sw/qa/extras/ooxmlexport/data/tdf123390.docx
b/sw/qa/extras/ooxmlexport/data/tdf123390.docx
deleted file mode 100644
index c3591dbfd2e6..
Binary files a/sw/qa/extras/ooxmlexport/data/tdf123390.docx and /dev/null differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
index 8436eed13a04..ae3e174ca911 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
@@ -89,30 +89,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf123354, "tdf123354.docx")
CPPUNIT_ASSERT_EQUAL(OUString("233423"),
xEnumerationAccess3->getPresentation(false).trim());
}
-DECLARE_OOXMLEXPORT_TEST(testTdf123390, "tdf123390.docx")
-{
-// Tests cell formula SIGN(x) to (0 < x) - (x < 0) conversion
-uno::Reference xTextFieldsSupplier(mxComponent,
uno::UNO_QUERY);
-uno::Reference
xFieldsAccess(xTextFieldsSupplier->getTextFields());
-uno::Reference
xFields(xFieldsAccess->createEnumeration());
-
-uno::Reference
xEnumerationAccess1(xFields->nextElement(), uno::UNO_QUERY);
-CPPUNIT_ASSERT_EQUAL(OUString("((0 L (-11)) - ((-11) L 0))"),
xEnumerationAccess1->getPresentation(true).trim());
-CPPUNIT_ASSERT_EQUAL(OUString("-1"),
xEnumerationAccess1->getPresentation(false).trim());
-
-uno::Reference
xEnumerationAccess4(xFields->nextElement(), uno::UNO_QUERY);
-CPPUNIT_ASSERT_EQUAL(OUString("((0 L ()) - (() L 0))"),
xEnumerationAccess4->getPresentation(true).trim());
-CPPUNIT_ASSERT_EQUAL(OUString("0"),
xEnumerationAccess4->getPresentation(false).trim());
-
-uno::Reference
xEnumerationAccess3(xFields->nextElement(), uno::UNO_QUERY);
-CPPUNIT_ASSERT_EQUAL(OUString("((0 L (0)) - ((0) L 0))"),
xEnumerationAccess3->getPresentation(true).trim());
-CPPUNIT_ASSERT_EQUAL(OUString("0"),
xEnumerationAccess3->getPresentation(false).trim());
-
-uno::Reference
xEnumerationAccess2(xFields->nextElement(), uno::UNO_QUERY);
-CPPUNIT_ASSERT_EQUAL(OUString("((0 L ()) - (() L 0))"),
xEnumerationAccess2->getPresentation(true).trim());
-CPPUNIT_ASSERT_EQUAL(OUString("1"),
xEnumerationAccess2->getPresentation(false).trim());
-}
-
DECLARE_OOXMLEXPORT_TEST(testTdf123388, "tdf123388.docx")
{
uno::Reference xTextFieldsSupplier(mxComponent,
uno::UNO_QUERY);
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index b5a8f124c142..d720e53a2a53 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -4264,14 +4264,10 @@ OUString DomainMapper_Impl::convertFieldFormula(const
OUString& input) {
icu::RegexMatcher rmatch5("\\bDEFINED\\s*\\(<([A-Z]+[0-9]+)>\\)", usInput,
rMatcherFlags, status);
usInput = rmatch5.replaceAll(icu::UnicodeString("DEFINED($1)"), status);
-/* Fix up ABS(x) using SQRT(x POW 2) (it supports only 1-level nesting) */
+/* Fix up ABS(x) using SQRT(x POW 2) - it supports only 1-level nesting */
icu::RegexMatcher
rmatch6("\\bABS\\s*(\\(([^()]*|([^()])*\\([^()]*\\)[^()]*)*\\))", usInput,
rMatcherFlags, status);
usInput = rmatch6.replaceAll(icu::UnicodeString("SQRT($1 POW 2)"), status);
-/* Fix up SIGN(x) using (0 < x) - (x < 0) (it supports only 1-level
nesting) */
-icu::RegexMatcher
rmatch7("\\bSIGN\\s*(\\(([^()]*|([^()])*\\([^()]*\\)[^()]*)*\\))", usInput,
rMatcherFlags, status);
-usInput = rmatch7.replaceAll(icu::UnicodeString("((0 L $1) - ($1 L 0))"),
status);
-
return OUString(usInput.getTerminatedBuffer());
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/inc sw/qa sw/source sw/uiconfig
sw/inc/calc.hxx |4 ++
sw/qa/extras/ooxmlexport/data/tdf123356.fodt | 40 +++
sw/qa/extras/ooxmlexport/ooxmlexport15.cxx | 16 ++
sw/source/core/bastyp/calc.cxx | 13
sw/uiconfig/swriter/ui/inputwinmenu.ui |8 +
5 files changed, 80 insertions(+), 1 deletion(-)
New commits:
commit 79681f6a35ebf70293136034d675d312c5b6cdee
Author: László Németh
AuthorDate: Wed Aug 26 10:59:10 2020 +0200
Commit: László Németh
CommitDate: Thu Aug 27 09:17:17 2020 +0200
tdf#123356 sw: add table formula COUNT
for DOCX interoperability.
See also commit f1f27b2487ccfb7a03190ff68eadbfb611dd9749
(tdf#123356 DOCX import: fix COUNT formula).
Change-Id: I951944ed92bcbed3388f5d7e364e7ff104f37d1d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101395
Tested-by: Jenkins
Reviewed-by: László Németh
diff --git a/sw/inc/calc.hxx b/sw/inc/calc.hxx
index a8eb9c18933a..e2b2677a1503 100644
--- a/sw/inc/calc.hxx
+++ b/sw/inc/calc.hxx
@@ -54,7 +54,8 @@ enum SwCalcOper
CALC_COS=274, CALC_TAN=275, CALC_ASIN=276,
CALC_ACOS=278, CALC_ATAN=279, CALC_TDIF=280,
CALC_ROUND=281, CALC_DATE=282, CALC_MONTH=283,
-CALC_DAY=284, CALC_PRODUCT=285, CALC_AVERAGE=286
+CALC_DAY=284, CALC_PRODUCT=285, CALC_AVERAGE=286,
+CALC_COUNT=287
};
// Calculate Operations Strings
@@ -79,6 +80,7 @@ extern const char sCalc_Sum[];
extern const char sCalc_Mean[];
extern const char sCalc_Average[];
extern const char sCalc_Product[];
+extern const char sCalc_Count[];
extern const char sCalc_Min[];
extern const char sCalc_Max[];
extern const char sCalc_Sin[];
diff --git a/sw/qa/extras/ooxmlexport/data/tdf123356.fodt
b/sw/qa/extras/ooxmlexport/data/tdf123356.fodt
new file mode 100644
index ..c7dc5d1e61ff
--- /dev/null
+++ b/sw/qa/extras/ooxmlexport/data/tdf123356.fodt
@@ -0,0 +1,40 @@
+
+http://openoffice.org/2009/office";
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
xmlns:ooow="http://openoffice.org/2004/writer"; office:version="1.2"
office:mimetype="application/vnd.oasis.opendocument.text">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -10
+
+
+ 0
+
+
+ 10
+
+
+
+
+ 3
+
+
+ 1
+
+
+ 4
+
+
+
+
+
+
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
index 3661c3f0b973..8436eed13a04 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
@@ -147,6 +147,22 @@ DECLARE_OOXMLEXPORT_TEST(testTdf123401, "tdf123401.fodt")
assertXPathContent(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr[4]/w:tc/w:p/w:r[2]/w:instrText", " =
AVERAGE(A1:A3)");
}
+DECLARE_OOXMLEXPORT_TEST(testTdf123356, "tdf123356.fodt")
+{
+uno::Reference xTextFieldsSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Reference
xFieldsAccess(xTextFieldsSupplier->getTextFields());
+uno::Reference
xFields(xFieldsAccess->createEnumeration());
+
+// Tests new cell formula COUNT
+uno::Reference
xEnumerationAccess1(xFields->nextElement(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("COUNT()"),
xEnumerationAccess1->getPresentation(true).trim());
+CPPUNIT_ASSERT_EQUAL(OUString("1"),
xEnumerationAccess1->getPresentation(false).trim());
+
+uno::Reference
xEnumerationAccess2(xFields->nextElement(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("COUNT()"),
xEnumerationAccess2->getPresentation(true).trim());
+CPPUNIT_ASSERT_EQUAL(OUString("4"),
xEnumerationAccess2->getPresentation(false).trim());
+}
+
DECLARE_OOXMLEXPORT_TEST(testTdf98000_changePageStyle,
"tdf98000_changePageStyle.odt")
{
uno::Reference xModel(mxComponent, uno::UNO_QUERY);
diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index 6e06fbd52e53..9e206144e13e 100644
--- a/sw/source/core/bastyp/calc.cxx
+++ b/sw/source/core/bastyp/calc.cxx
@@ -85,6 +85,7 @@ const char sCalc_Round[]= "round";
const char sCalc_Date[] = "date";
const char sCalc_Product[] = "product";
const char sCalc_Average[] = "average";
+const char sCalc_Count[]= "count";
// ATTENTION: sorted list of all operators
struct CalcOp
@@ -104,6 +105,7 @@ CalcOp const aOpTable[] = {
/* ATAN */{{sCalc_Atan}, CALC_ATAN}, // Arc tangent
/* AVERAGE */ {{sCalc_Average},CALC_MEAN}, // Mean (since LibreOffice 7.1)
/* COS */ {{sCalc_Cos},CALC_COS}, // Cosine
+/* COUNT */ {{sCalc_Count}, CALC_COUNT}, // Count (since LibreOffice
7.1)
/* DATE */{{sCalc_Date}, CALC_DATE}, // Date
/* DIV */ {{sCalc_Div},CALC_DIV}, // Division
/* EQ */ {{sCalc_Eq}, CALC_EQ},// Equality
@@ -668,6 +670,7 @@ Sw
[Libreoffice-commits] core.git: sw/qa writerfilter/source
dev/null |binary
sw/qa/extras/ooxmlexport/ooxmlexport15.cxx| 20
writerfilter/source/dmapper/DomainMapper_Impl.cxx |4
3 files changed, 24 deletions(-)
New commits:
commit 894a0f77c12f3ac4029bdeb671943f32bcad875c
Author: László Németh
AuthorDate: Wed Aug 26 11:13:48 2020 +0200
Commit: László Németh
CommitDate: Thu Aug 27 09:16:52 2020 +0200
Revert "tdf#123356 DOCX import: fix COUNT formula"
This reverts commit f1f27b2487ccfb7a03190ff68eadbfb611dd9749.
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
Change-Id: Ic5c920fd70f350890c4b696797152be9307b4eee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101394
Tested-by: László Németh
Reviewed-by: László Németh
diff --git a/sw/qa/extras/ooxmlexport/data/tdf123356.docx
b/sw/qa/extras/ooxmlexport/data/tdf123356.docx
deleted file mode 100644
index 9432ca2dbb06..
Binary files a/sw/qa/extras/ooxmlexport/data/tdf123356.docx and /dev/null differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
index 62d1339b3127..3661c3f0b973 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx
@@ -113,26 +113,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf123390, "tdf123390.docx")
CPPUNIT_ASSERT_EQUAL(OUString("1"),
xEnumerationAccess2->getPresentation(false).trim());
}
-DECLARE_OOXMLEXPORT_TEST(testTdf123356, "tdf123356.docx")
-{
-uno::Reference xTextFieldsSupplier(mxComponent,
uno::UNO_QUERY);
-uno::Reference
xFieldsAccess(xTextFieldsSupplier->getTextFields());
-uno::Reference
xFields(xFieldsAccess->createEnumeration());
-
-uno::Reference
xEnumerationAccess1(xFields->nextElement(), uno::UNO_QUERY);
-CPPUNIT_ASSERT_EQUAL(OUString("-11"),
xEnumerationAccess1->getPresentation(true).trim());
-CPPUNIT_ASSERT_EQUAL(OUString("-11"),
xEnumerationAccess1->getPresentation(false).trim());
-
-// Tests cell formula COUNT(x) to SUM(x)/MEAN(x) conversion
-uno::Reference
xEnumerationAccess4(xFields->nextElement(), uno::UNO_QUERY);
-
CPPUNIT_ASSERT_EQUAL(OUString("(SUM(|)/MEAN(|))"),
xEnumerationAccess4->getPresentation(true).trim());
-CPPUNIT_ASSERT_EQUAL(OUString("5"),
xEnumerationAccess4->getPresentation(false).trim());
-
-uno::Reference
xEnumerationAccess3(xFields->nextElement(), uno::UNO_QUERY);
-CPPUNIT_ASSERT_EQUAL(OUString("(SUM()/MEAN())"),
xEnumerationAccess3->getPresentation(true).trim());
-CPPUNIT_ASSERT_EQUAL(OUString("3"),
xEnumerationAccess3->getPresentation(false).trim());
-}
-
DECLARE_OOXMLEXPORT_TEST(testTdf123388, "tdf123388.docx")
{
uno::Reference xTextFieldsSupplier(mxComponent,
uno::UNO_QUERY);
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index a482a3231551..b5a8f124c142 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -4272,10 +4272,6 @@ OUString DomainMapper_Impl::convertFieldFormula(const
OUString& input) {
icu::RegexMatcher
rmatch7("\\bSIGN\\s*(\\(([^()]*|([^()])*\\([^()]*\\)[^()]*)*\\))", usInput,
rMatcherFlags, status);
usInput = rmatch7.replaceAll(icu::UnicodeString("((0 L $1) - ($1 L 0))"),
status);
-/* Fix up COUNT(x) using SUM(x)/MEAN(x) (it supports only 1-level nesting)
*/
-icu::RegexMatcher
rmatch8("\\bCOUNT\\s*(\\(([^()]*|([^()])*\\([^()]*\\)[^()]*)*\\))", usInput,
rMatcherFlags, status);
-usInput = rmatch8.replaceAll(icu::UnicodeString("(SUM$1/MEAN$1)"), status);
-
return OUString(usInput.getTerminatedBuffer());
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/qa filter/source slideshow/source svgio/source sw/inc sw/source vcl/source xmloff/source
filter/qa/complex/filter/detection/typeDetection/Helper.java |2 +-
filter/source/xslt/export/spreadsheetml/table.xsl|4 ++--
filter/source/xslt/odf2xhtml/export/common/table/table_cells.xsl |2 +-
slideshow/source/engine/slideview.cxx|2 +-
slideshow/source/engine/tools.cxx|2 +-
slideshow/source/engine/transitions/slidechangebase.cxx |2 +-
svgio/source/svgreader/svgsvgnode.cxx|4 ++--
sw/inc/IDocumentSettingAccess.hxx|8
sw/source/core/layout/dbg_lay.cxx|2 +-
vcl/source/filter/jpeg/transupp.c|2 +-
xmloff/source/draw/animationexport.cxx |2 +-
xmloff/source/transform/PropertyActionsOASIS.cxx |2 +-
12 files changed, 17 insertions(+), 17 deletions(-)
New commits:
commit 8a2136443929ac0215b3aa4008de272b6d576050
Author: Andrea Gelmini
AuthorDate: Wed Aug 26 22:49:55 2020 +0200
Commit: Julien Nabet
CommitDate: Thu Aug 27 09:15:00 2020 +0200
Fix typos
Change-Id: Ieebf8bc3051d1f6b99cf72629aa411e27de21640
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101403
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/filter/qa/complex/filter/detection/typeDetection/Helper.java
b/filter/qa/complex/filter/detection/typeDetection/Helper.java
index d74105590144..23eb07fc48bf 100644
--- a/filter/qa/complex/filter/detection/typeDetection/Helper.java
+++ b/filter/qa/complex/filter/detection/typeDetection/Helper.java
@@ -365,7 +365,7 @@ public class Helper {
/**
* Fills the Hashtable m_hFileURLs with all file names and their URL
- * and the Hashtable m_hFilesTypes with all file names and their file
+ * and the Hashtable m_hFileTypes with all file names and their file
* type name. This information is extracted from "files.csv"
* This is for faster access to get fileURL and fileType of fileAlias
*/
diff --git a/filter/source/xslt/export/spreadsheetml/table.xsl
b/filter/source/xslt/export/spreadsheetml/table.xsl
index 1c2c13809554..f1a563596b37 100644
--- a/filter/source/xslt/export/spreadsheetml/table.xsl
+++ b/filter/source/xslt/export/spreadsheetml/table.xsl
@@ -269,7 +269,7 @@
-
+
@@ -465,7 +465,7 @@
-
+
diff --git a/filter/source/xslt/odf2xhtml/export/common/table/table_cells.xsl
b/filter/source/xslt/odf2xhtml/export/common/table/table_cells.xsl
index 53a649f357e9..3c884138b74d 100644
--- a/filter/source/xslt/odf2xhtml/export/common/table/table_cells.xsl
+++ b/filter/source/xslt/odf2xhtml/export/common/table/table_cells.xsl
@@ -69,7 +69,7 @@
to get the adequate column styles during later cell creation,
or hiding the cell when @table:visibility is not set to 'visible'.
-The position is archieved by adding up all
table:number-columns-repeated of the preceding cells.
+The position is archived by adding up all
table:number-columns-repeated of the preceding cells.
Step1: creating
'$precedingCells/quantity/@table:number-columns-repeated').
Step2: sum(xxx:nodeset($precedingCells)/quantity) + 1-->
diff --git a/slideshow/source/engine/slideview.cxx
b/slideshow/source/engine/slideview.cxx
index 979ab06424fa..013e089a065c 100644
--- a/slideshow/source/engine/slideview.cxx
+++ b/slideshow/source/engine/slideview.cxx
@@ -157,7 +157,7 @@ void clearRect( ::cppcanvas::CanvasSharedPtr const& pCanvas,
pCanvas->setClip( aClipPoly );
}
-// set transformation to identitiy (->device pixel)
+// set transformation to identity (->device pixel)
pCanvas->setTransformation( ::basegfx::B2DHomMatrix() );
// #i42440# Fill the _full_ background in
diff --git a/slideshow/source/engine/tools.cxx
b/slideshow/source/engine/tools.cxx
index 1fbb673ff61e..3de893ae9ee0 100644
--- a/slideshow/source/engine/tools.cxx
+++ b/slideshow/source/engine/tools.cxx
@@ -674,7 +674,7 @@ namespace slideshow::internal
{
::cppcanvas::CanvasSharedPtr pCanvas( rCanvas->clone() );
-// set transformation to identitiy (->device pixel)
+// set transformation to identity (->device pixel)
pCanvas->setTransformation( ::basegfx::B2DHomMatrix() );
// #i42440# Fill the _full_ background in
diff --git a/slideshow/source/engine/transitions/slidechangebase.cxx
b/slideshow/source/engine/transitions/slidechangebase.cxx
index bee40c9480aa..460f53cf4090 100644
--- a/slideshow/source/engine/transitions/slidechangebase.cxx
+++ b/slideshow/source/engine/transitions/slidechangebase.cxx
