[Libreoffice-commits] online.git: Branch 'feature/jsdialogs' - 394 commits - android/app android/lib android/templates common/FileUtil.cpp common/Log.cpp common/Log.hpp common/LOOLWebSocket.hpp common
Rebased ref, commits from common ancestor:
commit c4590977dac80308a02067bb8089bbf4bedc0a2a
Author: Szymon Kłos
AuthorDate: Tue Mar 31 12:17:20 2020 +0200
Commit: Szymon Kłos
CommitDate: Fri Apr 3 08:18:17 2020 +0200
jsdialog: show ok button in message boxes
Change-Id: I4f57b6cc0275875150a6cd1c944e2d12394a59a4
diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js
b/loleaflet/src/control/Control.JSDialogBuilder.js
index f42b84064..1ea147613 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -35,6 +35,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
this._controlHandlers['edit'] = this._editControl;
this._controlHandlers['multilineedit'] =
this._multiLineEditControl;
this._controlHandlers['pushbutton'] = this._pushbuttonControl;
+ this._controlHandlers['okbutton'] = this._pushbuttonControl;
this._controlHandlers['combobox'] = this._comboboxControl;
this._controlHandlers['comboboxentry'] = this._comboboxEntry;
this._controlHandlers['listbox'] = this._listboxControl;
commit 8faff3302af9b3ec085b5613cf22db1ef484b65e
Author: Szymon Kłos
AuthorDate: Tue Mar 31 12:14:40 2020 +0200
Commit: Szymon Kłos
CommitDate: Fri Apr 3 08:18:17 2020 +0200
jsdialog: close mobilewizard before all dialogs
Mobilewizard has reference to the last window so in
case of message box it will be closed first.
This prevent us from closing parent window before child
as we close all windows in closePopups.
Change-Id: I9887b56374f2fc7e1cabb46d97e2c8ee03511596
diff --git a/loleaflet/src/map/handler/Map.TouchGesture.js
b/loleaflet/src/map/handler/Map.TouchGesture.js
index 95c2eb25e..ebc5d2ddd 100644
--- a/loleaflet/src/map/handler/Map.TouchGesture.js
+++ b/loleaflet/src/map/handler/Map.TouchGesture.js
@@ -309,8 +309,8 @@ L.Map.TouchGesture = L.Handler.extend({
return;
}
- this._map.fire('closepopups');
this._map.fire('closemobilewizard');
+ this._map.fire('closepopups');
this._map.fire('editorgotfocus');
var docLayer = this._map._docLayer;
commit d5e75c9a0bc635cc4930374061a6450745bea047
Author: Szymon Kłos
AuthorDate: Thu Mar 26 14:58:14 2020 +0100
Commit: Szymon Kłos
CommitDate: Fri Apr 3 08:18:17 2020 +0200
jsdialog: customize spell checking error label
Change-Id: Ieb977363bda76af51a4e5d41052fc378995e24ea
diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css
index f48f032b2..e82eec5a9 100644
--- a/loleaflet/css/mobilewizard.css
+++ b/loleaflet/css/mobilewizard.css
@@ -840,6 +840,12 @@ input[type=checkbox][disabled] {
font-size: 15pt;
}
+#mobile-spell-error {
+ border: none;
+ font-size: 15pt;
+ color: red !important;
+}
+
#searchlabel {
border: none;
font-size: 11pt;
commit 03abc977725737d14fcdf001071794537ef4aa14
Author: Szymon Kłos
AuthorDate: Wed Mar 25 12:17:06 2020 +0100
Commit: Szymon Kłos
CommitDate: Fri Apr 3 08:17:43 2020 +0200
jsdialog: handle drawingarea
Change-Id: Ia3bc01e76c71edc7ac59e3157e7de5700397c21d
diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css
index 60bdf2f98..f48f032b2 100644
--- a/loleaflet/css/mobilewizard.css
+++ b/loleaflet/css/mobilewizard.css
@@ -848,3 +848,8 @@ input[type=checkbox][disabled] {
#criteria.ui-tab, #inputhelp.ui-tab {
width: 30% !important;
}
+
+.mobile-wizard.ui-drawing-area {
+ margin: 10px 5% 10px 5% !important;
+ width: 90%;
+}
diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js
b/loleaflet/src/control/Control.JSDialogBuilder.js
index cd3ea3f85..f42b84064 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -59,6 +59,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
this._controlHandlers['colorlistbox'] = this._colorControl;
this._controlHandlers['borderstyle'] = this._borderControl;
this._controlHandlers['treelistbox'] = this._listboxControl;
+ this._controlHandlers['drawingarea'] = this._drawingAreaControl;
this._controlHandlers['mainmenu'] = this._containerHandler;
this._controlHandlers['submenu'] = this._subMenuHandler;
@@ -1365,6 +1366,15 @@ L.Control.JSDialogBuilder = L.Control.extend({
return false;
},
+ _drawingAreaControl: function(parentContainer, data) {
+ if (data.image) {
+ var image = L.DomUtil.create('img', 'mobile-wizard
ui-drawing-area', parentContainer);
+ image.src = data.image.replace('\\', '');
+ image.id = data.id;
+ }
+ ret
[Libreoffice-commits] core.git: compilerplugins/clang include/vcl
compilerplugins/clang/unnecessaryvirtual-dead.results |2 compilerplugins/clang/unnecessaryvirtual.results | 102 +- include/vcl/lstbox.hxx|2 include/vcl/treelistbox.hxx |4 4 files changed, 59 insertions(+), 51 deletions(-) New commits: commit 33852fc82b14e5a7a4295b43d2835aa620c1929a Author: Noel Grandin AuthorDate: Thu Apr 2 14:41:02 2020 +0200 Commit: Noel Grandin CommitDate: Fri Apr 3 08:04:22 2020 +0200 loplugin:unnecessaryvirtual Change-Id: If50fcacc6710f582281d8030c97c39a5d2201390 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91572 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/compilerplugins/clang/unnecessaryvirtual-dead.results b/compilerplugins/clang/unnecessaryvirtual-dead.results index 979b850593bd..edda0c78ce2c 100644 --- a/compilerplugins/clang/unnecessaryvirtual-dead.results +++ b/compilerplugins/clang/unnecessaryvirtual-dead.results @@ -14,6 +14,8 @@ slideshow/source/engine/animationfactory.cxx:437 void slideshow::internal::(anonymous namespace)::GenericAnimation::prefetch() vcl/inc/salframe.hxx:145 void SalFrame::SetRepresentedURL(const class rtl::OUString &,) +vcl/inc/salframe.hxx:264 +void SalFrame::BeginSheet(class SalFrame *,)const vcl/inc/salinst.hxx:202 void SalInstance::releaseMainThread() vcl/inc/salmenu.hxx:81 diff --git a/compilerplugins/clang/unnecessaryvirtual.results b/compilerplugins/clang/unnecessaryvirtual.results index c72b7718cdca..811776b8e263 100644 --- a/compilerplugins/clang/unnecessaryvirtual.results +++ b/compilerplugins/clang/unnecessaryvirtual.results @@ -90,39 +90,39 @@ canvas/inc/base/canvasbase.hxx:416 class com::sun::star::uno::Reference canvas::CanvasBase::drawBitmapModulated(const class com::sun::star::uno::Reference &,const struct com::sun::star::rendering::ViewState &,const struct com::sun::star::rendering::RenderState &,) canvas/inc/base/canvasbase.hxx:432 class com::sun::star::uno::Reference canvas::CanvasBase::getDevice() -canvas/inc/base/canvascustomspritebase.hxx:94 +canvas/inc/base/canvascustomspritebase.hxx:93 void canvas::CanvasCustomSpriteBase::disposeThis() -canvas/inc/base/canvascustomspritebase.hxx:105 +canvas/inc/base/canvascustomspritebase.hxx:104 void canvas::CanvasCustomSpriteBase::clear() -canvas/inc/base/canvascustomspritebase.hxx:116 +canvas/inc/base/canvascustomspritebase.hxx:115 class com::sun::star::uno::Reference canvas::CanvasCustomSpriteBase::drawBitmap(const class com::sun::star::uno::Reference &,const struct com::sun::star::rendering::ViewState &,const struct com::sun::star::rendering::RenderState &,) -canvas/inc/base/canvascustomspritebase.hxx:142 +canvas/inc/base/canvascustomspritebase.hxx:141 void canvas::CanvasCustomSpriteBase::setAlpha(double,) -canvas/inc/base/canvascustomspritebase.hxx:151 +canvas/inc/base/canvascustomspritebase.hxx:150 void canvas::CanvasCustomSpriteBase::move(const struct com::sun::star::geometry::RealPoint2D &,const struct com::sun::star::rendering::ViewState &,const struct com::sun::star::rendering::RenderState &,) -canvas/inc/base/canvascustomspritebase.hxx:164 +canvas/inc/base/canvascustomspritebase.hxx:163 void canvas::CanvasCustomSpriteBase::transform(const struct com::sun::star::geometry::AffineMatrix2D &,) -canvas/inc/base/canvascustomspritebase.hxx:175 +canvas/inc/base/canvascustomspritebase.hxx:174 void canvas::CanvasCustomSpriteBase::clip(const class com::sun::star::uno::Reference &,) -canvas/inc/base/canvascustomspritebase.hxx:184 +canvas/inc/base/canvascustomspritebase.hxx:183 void canvas::CanvasCustomSpriteBase::setPriority(double,) -canvas/inc/base/canvascustomspritebase.hxx:191 +canvas/inc/base/canvascustomspritebase.hxx:190 void canvas::CanvasCustomSpriteBase::show() -canvas/inc/base/canvascustomspritebase.hxx:198 +canvas/inc/base/canvascustomspritebase.hxx:197 void canvas::CanvasCustomSpriteBase::hide() -canvas/inc/base/canvascustomspritebase.hxx:207 +canvas/inc/base/canvascustomspritebase.hxx:206 class com::sun::star::uno::Reference canvas::CanvasCustomSpriteBase::getContentCanvas() -canvas/inc/base/canvascustomspritebase.hxx:215 +canvas/inc/base/canvascustomspritebase.hxx:214 _Bool canvas::CanvasCustomSpriteBase::isAreaUpdateOpaque(const class basegfx::B2DRange &,)const -canvas/inc/base/canvascustomspritebase.hxx:222 +canvas/inc/base/canvascustomspritebase.hxx:221 _Bool canvas::CanvasCustomSpriteBase::isContentChanged()const -canvas/inc/base/canvascustomspritebase.hxx:229 +canvas/inc/base/canvascustomspritebase.hxx:228 class basegfx::B2DPoint canvas::CanvasCustomSpriteBase::getPosPixel()const -canvas/inc/base/canvascustomspritebase.hxx:236 +canvas/inc/base/canvascustomspritebase.hxx:235 class basegfx::B2DVector canvas::CanvasCustomSpriteBase::getSizePixel()const -canvas/inc/base/canvascustomspritebase.hxx:2
Re: start calc if resolve fails
Ok thank you. Unfortunately my Ubuntu system has neither of these files. What part of libreoffice contains them? -- Sent from: http://document-foundation-mail-archive.969070.n3.nabble.com/Dev-f1639786.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Urgent - ideas for 2020 budget (was: Re: ESC meeting agenda: 2020-04-02 16:00 Berlin time)
Hi, It turns out that we don't have much time to discuss this, as the ESC decision is wanted on the budget topic already by April 20th. So if you have good ideas, please add them to the wiki now, and come to the call later today to discuss them: On Wed, Apr 01, 2020 at 04:50:24PM +0200, Miklos Vajna wrote: > + if you have good ideas, please add them to > https://wiki.documentfoundation.org/Development/Budget2020 Thanks and sorry for the rush, Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - jvmfwk/plugins
jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 12
1 file changed, 12 insertions(+)
New commits:
commit 44a40091ae960a10ef88f16f04138989366017fd
Author: ilhan
AuthorDate: Wed Mar 25 11:18:09 2020 +0100
Commit: Thorsten Behrens
CommitDate: Thu Apr 2 21:41:44 2020 +0200
tdf#131399 Update java settings after slight java version change
Under linux, the version is now also checked for changes at startup
of libreoffice.
Change-Id: I572f718cf5afc83a70d98a6897f1d3d6877644f7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91037
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit 6b6af620ff53209487a146aa3977db328c3a6300)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91405
Reviewed-by: Thorsten Behrens
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index 128de9b352b0..4760ab629313 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -867,6 +867,18 @@ javaPluginError jfw_plugin_existJRE(const JavaInfo *pInfo,
bool *exist)
*exist = true;
JFW_TRACE2("Java runtime library exist: " << sRuntimeLib);
+// Check version
+rtl::Reference aVendorInfo =
getJREInfoByPath(sLocation);
+if (!aVendorInfo.is())
+{
+*exist = false;
+JFW_TRACE2("JRE or supported vendor not accessible at
location: " << sLocation);
+}
+else if(pInfo->sVersion!=aVendorInfo->getVersion())
+{
+*exist = false;
+JFW_TRACE2("Mismatch between version number in libreoffice
settings and installed JRE: " << pInfo->sVersion <<" != " <<
aVendorInfo->getVersion());
+}
}
else if (::osl::File::E_NOENT == rc_itemRt)
{
___
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' - oox/source sd/qa
oox/source/ppt/pptshape.cxx |4 +++-
sd/qa/unit/data/pptx/tdf131554.pptx |binary
sd/qa/unit/export-tests-ooxml2.cxx | 11 +++
3 files changed, 14 insertions(+), 1 deletion(-)
New commits:
commit 55d423e8f371e914c51f9aa18aacede46355b133
Author: nd101
AuthorDate: Wed Mar 25 13:17:48 2020 +0800
Commit: Thorsten Behrens
CommitDate: Thu Apr 2 21:40:50 2020 +0200
tdf#131554 placeholder iteration fails to stop when a match is found
Wrong placeholder is returned due to iteration not stopping
when a match is found. It causes a text element position
to be incorrectly set.
Change-Id: I58be6825cec7a61f48b46418bdf28964c1afe4ce
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91023
Reviewed-by: Xisco Faulí
Reviewed-by: Michael Stahl
Tested-by: Jenkins
Signed-off-by: Xisco Fauli
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91472
Reviewed-by: Thorsten Behrens
diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx
index 0088c1e51673..39b0c2eb4abc 100644
--- a/oox/source/ppt/pptshape.cxx
+++ b/oox/source/ppt/pptshape.cxx
@@ -424,6 +424,8 @@ namespace
// 3. ph with nSecondSubType and the same oSubTypeIndex
// 4. ph with nSecondSubType
// 5. ph with the same oSubTypeIndex
+// It appears 3 and 1 has the same highest prority.
+
oox::drawingml::ShapePtr PPTShape::findPlaceholder( sal_Int32 nFirstSubType,
sal_Int32 nSecondSubType,
const OptValue< sal_Int32 >& oSubTypeIndex, std::vector<
oox::drawingml::ShapePtr >& rShapes, bool bMasterOnly )
{
@@ -473,7 +475,7 @@ oox::drawingml::ShapePtr PPTShape::findPlaceholder(
sal_Int32 nFirstSubType, sal
aChoiceShapePtr3 = aChoiceShapePtr4;
}
}
-if (aShapePtr.get())
+if (aShapePtr.get() || aChoiceShapePtr2.get())
break;
++aRevIter;
}
diff --git a/sd/qa/unit/data/pptx/tdf131554.pptx
b/sd/qa/unit/data/pptx/tdf131554.pptx
new file mode 100644
index ..a65f423add39
Binary files /dev/null and b/sd/qa/unit/data/pptx/tdf131554.pptx differ
diff --git a/sd/qa/unit/export-tests-ooxml2.cxx
b/sd/qa/unit/export-tests-ooxml2.cxx
index 78452a763f01..d0ef2dac0eb7 100644
--- a/sd/qa/unit/export-tests-ooxml2.cxx
+++ b/sd/qa/unit/export-tests-ooxml2.cxx
@@ -182,6 +182,7 @@ public:
void testTdf127372();
void testTdf127379();
void testTdf98603();
+void testTdf131554();
CPPUNIT_TEST_SUITE(SdOOXMLExportTest2);
@@ -282,6 +283,7 @@ public:
CPPUNIT_TEST(testTdf127372);
CPPUNIT_TEST(testTdf127379);
CPPUNIT_TEST(testTdf98603);
+CPPUNIT_TEST(testTdf131554);
CPPUNIT_TEST_SUITE_END();
@@ -2633,6 +2635,15 @@ void SdOOXMLExportTest2::testTdf98603()
CPPUNIT_ASSERT_EQUAL(OUString("IL"), aLocale.Country);
}
+void SdOOXMLExportTest2::testTdf131554()
+{
+::sd::DrawDocShellRef xDocShRef =
loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/tdf131554.pptx"),
PPTX);
+xDocShRef = saveAndReload( xDocShRef.get(), PPTX );
+uno::Reference xShape(getShapeFromPage(1, 0, xDocShRef),
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(static_cast(5622),
xShape->getPosition().X);
+CPPUNIT_ASSERT_EQUAL(static_cast(13251),
xShape->getPosition().Y);
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(SdOOXMLExportTest2);
CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa
sw/qa/uitest/writer_tests/wordCount.py |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit f0bf741e0cda449666a9648f5bd2cef7c4d919d0
Author: Stephan Bergmann
AuthorDate: Wed Apr 1 22:06:43 2020 +0200
Commit: Stephan Bergmann
CommitDate: Thu Apr 2 21:32:35 2020 +0200
Run both test functions named test_word_count_interpunction_counted_tdf56975
...by giving them different names. The first function had been hidden by
the
second ever since both were introduced in
5db29ca06b56bb235b0e8dfd0956715730f9cf0d "uitest-Word Count;tdf#68347
tdf#91100
tdf#58050 tdf#56975 tdf#56975"
Change-Id: I6ab927b0fe0374927dacbe30fd930763cba96d62
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91534
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/sw/qa/uitest/writer_tests/wordCount.py
b/sw/qa/uitest/writer_tests/wordCount.py
index 1b3d22616bb2..96ff3ea47349 100644
--- a/sw/qa/uitest/writer_tests/wordCount.py
+++ b/sw/qa/uitest/writer_tests/wordCount.py
@@ -125,7 +125,7 @@ class writerWordCount(UITestCase):
self.ui_test.close_doc()
-def test_word_count_interpunction_counted_tdf56975(self):
+def test_word_count_interpunction_counted_tdf56975_a(self):
self.ui_test.create_doc_in_start_center("writer")
xWriterDoc = self.xUITest.getTopFocusWindow()
@@ -159,7 +159,7 @@ class writerWordCount(UITestCase):
self.ui_test.close_doc()
-def test_word_count_interpunction_counted_tdf56975(self):
+def test_word_count_interpunction_counted_tdf56975_b(self):
self.ui_test.create_doc_in_start_center("writer")
xWriterDoc = self.xUITest.getTopFocusWindow()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: accessibility/source compilerplugins/clang include/vcl vcl/source
accessibility/source/extended/accessiblelistboxentry.cxx | 14 -
compilerplugins/clang/virtualdead.py |2
compilerplugins/clang/virtualdead.results| 93 ++--
compilerplugins/clang/virtualdead.unusedparams.results | 112 +++
include/vcl/treelistbox.hxx |3
vcl/source/treelist/treelistbox.cxx | 18 --
6 files changed, 114 insertions(+), 128 deletions(-)
New commits:
commit 6df92df74b68d5965ae3fbe9ce5cdc484f03ff20
Author: Noel Grandin
AuthorDate: Thu Apr 2 14:38:04 2020 +0200
Commit: Noel Grandin
CommitDate: Thu Apr 2 21:23:23 2020 +0200
loplugin:virtualdead
Change-Id: I5698862e5890d3208bc7012b0ce5b60520797c2d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91571
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx
b/accessibility/source/extended/accessiblelistboxentry.cxx
index c5e65ee5a1d4..7b5b055f4d95 100644
--- a/accessibility/source/extended/accessiblelistboxentry.cxx
+++ b/accessibility/source/extended/accessiblelistboxentry.cxx
@@ -444,7 +444,7 @@ namespace accessibility
SvTreeListEntry* pEntry = m_pTreeListBox->GetEntryFromPath(
m_aEntryPath );
if( getAccessibleRole() == AccessibleRole::TREE_ITEM )
{
-return m_pTreeListBox->GetEntryLongDescription( pEntry );
+return OUString();
}
//want to count the real column number in the list box.
sal_uInt16 iRealItemCount = 0;
@@ -476,17 +476,7 @@ namespace accessibility
EnsureIsAlive();
-OUString sRet(implGetText());
-
-SvTreeListEntry* pEntry = m_pTreeListBox->GetEntryFromPath(
m_aEntryPath );
-
-OUString altText = m_pTreeListBox->GetEntryAltText( pEntry );
-if (!altText.isEmpty())
-{
-sRet += " " + altText;
-}
-
-return sRet;
+return implGetText();
}
Reference< XAccessibleRelationSet > SAL_CALL
AccessibleListBoxEntry::getAccessibleRelationSet( )
diff --git a/compilerplugins/clang/virtualdead.py
b/compilerplugins/clang/virtualdead.py
index eccfbd4f76e3..142743685bf4 100755
--- a/compilerplugins/clang/virtualdead.py
+++ b/compilerplugins/clang/virtualdead.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
import sys
import re
diff --git a/compilerplugins/clang/virtualdead.results
b/compilerplugins/clang/virtualdead.results
index 87e6431675e0..9a39282eff04 100644
--- a/compilerplugins/clang/virtualdead.results
+++ b/compilerplugins/clang/virtualdead.results
@@ -1,40 +1,40 @@
-basic/source/comp/codegen.cxx:464
-void OffSetAccumulator::start(const unsigned char *,)
+basic/source/comp/codegen.cxx:478
+void (anonymous namespace)::OffSetAccumulator::start(const unsigned char
*,)
empty
-basic/source/comp/codegen.cxx:476
-_Bool OffSetAccumulator::processParams()
+basic/source/comp/codegen.cxx:490
+_Bool (anonymous namespace)::OffSetAccumulator::processParams()
0
-basic/source/comp/codegen.cxx:526
-_Bool BufferTransformer::processParams()
+basic/source/comp/codegen.cxx:540
+_Bool (anonymous namespace)::BufferTransformer::processParams()
1
-desktop/source/deployment/registry/inc/dp_backenddb.hxx:119
-class rtl::OUString dp_registry::backend::BackendDb::getDbNSName()
-"http://openoffi
-include/basegfx/utils/unopolypolygon.hxx:97
-void basegfx::unotools::UnoPolyPolygon::modifying()const
-empty
-include/canvas/base/bitmapcanvasbase.hxx:80
+canvas/inc/base/bitmapcanvasbase.hxx:79
unsigned char canvas::BitmapCanvasBase::hasAlpha()
1
-include/canvas/base/bufferedgraphicdevicebase.hxx:108
+canvas/inc/base/bufferedgraphicdevicebase.hxx:107
void canvas::BufferedGraphicDeviceBase::destroyBuffers()
empty
-include/canvas/base/graphicdevicebase.hxx:235
+canvas/inc/base/graphicdevicebase.hxx:234
unsigned char canvas::GraphicDeviceBase::hasFullScreenMode()
0
-include/canvas/base/graphicdevicebase.hxx:240
+canvas/inc/base/graphicdevicebase.hxx:239
unsigned char canvas::GraphicDeviceBase::enterFullScreenMode(unsigned
char,)
0
-include/canvas/base/graphicdevicebase.hxx:306
+canvas/inc/base/graphicdevicebase.hxx:305
void canvas::GraphicDeviceBase::removePropertyChangeListener(const class
rtl::OUString &,const class com::sun::star::uno::Reference &,)
empty
-include/canvas/base/graphicdevicebase.hxx:319
+canvas/inc/base/graphicdevicebase.hxx:318
void canvas::GraphicDeviceBase::removeVetoableChangeListener(const class
rtl::OUString &,const class com::sun::star::uno::Reference &,)
empty
+desktop/source/deployment/registry/inc/dp_backenddb.hxx:120
+class rtl::OUString dp_registry::backend::BackendDb::getDbNSName()
+"http://openoffi
+include/basegfx/utils/unopolypolygon.hxx:97
+void basegfx::unotools::UnoPolyPolygon::modifying()const
+empty
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - sw/qa sw/source writerfilter/source
sw/qa/extras/ooxmlexport/ooxmlexport10.cxx |7 +-
sw/qa/extras/ooxmlexport/ooxmlexport5.cxx|5 +
sw/source/filter/ww8/docxattributeoutput.cxx |7 +-
sw/source/filter/ww8/docxexport.cxx | 48 +++
writerfilter/source/dmapper/DomainMapperTableHandler.cxx |3
5 files changed, 65 insertions(+), 5 deletions(-)
New commits:
commit 0ee0ee3eb66dadf50b3d2c6a7af9c095b26afd88
Author: Justin Luth
AuthorDate: Fri Mar 13 07:14:29 2020 +0300
Commit: Thorsten Behrens
CommitDate: Thu Apr 2 21:22:43 2020 +0200
tdf#131304 .docx: flag new files as MS Word 2019 native mode
compatibilityMode = 15: [Word 2013/2016/2019]
Up till now, documents that were exported into the docx format
were treated by default as native Word 2007 format,
since no compatibilityMode setting was provided.
(Don't worry, we still round-trip existing older values.
This patch only affects non-docx >>= .docx export.)
Ultimately, this change is for the benefit of MS Word.
It has no practical effect for LO.
NOTE: This patch depends on previous
commit 53f099c842d39266a0b4786a1af3db5628746634
which sets an appropriate value for existing .docx files.
This scary change shouldn't actually be all that scary,
since we already round-trip native 2019 files,
without any complaint from Word or our users.
The biggest change is that Word 2010 users might not be able
to open NEW files perfectly. But Microsoft has already been doing
that to them since 2013. By the time LO 7.0 hits stable version,
it will have been months since 2010 has reached end-of-life.
The vast majority of documents will still open perfectly for them.
Plus, if a Word 2010 user does modify our new document,
we will drop back down to their level.
A nice, clear explanation of what compatibilityMode does is at
howtogeek.com/256269/what-is-compatibility-mode-in-microsoft-office/
The MAIN CHANGE is that MS WORD has been DE-ACTIVATING features
when it notices that it is SHARING the document with
OLD_VERSION users. So Word is limiting what it will do
for the BENEFIT OF THE OTHER USER while collaborating.
There are a few instances where layout is affected by
compatiblityMode. For example, tdf#123116 wants compat=15
so that Word will nicely layout an oversized table-row.
tdf#131121 wants it too.
By changing to compat=15, we can help Word take advantage
of some fixes since docx 1.0, and avoid having to write
new logic to export to old formats as well as new.
Unfortunately, documentation on what layout changes are expected
has not been identified yet. But in 7 years we should have
run into most of them already... well maybe no.
Change-Id: I1ce016618a680b9842fa6828c9e87cc6b677a557
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90455
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
(cherry picked from commit f25985c55541cbbc9a4fc79e660592d3d0485196)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90920
Tested-by: Thorsten Behrens
Reviewed-by: Thorsten Behrens
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
index 835947da9dfb..2e870f5d016f 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
@@ -1180,13 +1180,14 @@ DECLARE_OOXMLEXPORT_TEST(testTableMarginAdjustment,
"table.fodt")
auto const xTable(getParagraphOrTable(1));
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty(xTable,
"LeftMargin"));
-// currently no compatibilityMode is generated, it's only round-tripped if
-// it exists in the input; if it doesn't exist, the default is "12" (old)
+// Now that compatibilityMode is set to 2013's 15 (new), expect the new
values,
+// since LO is exporting in the NEW way now instead of the OLD way.
+// This was 55 when using 2007's compatibilityMode of 12 (old)
xmlDocPtr pXmlDoc = parseExport("word/document.xml");
assertXPath(pXmlDoc, "//w:tbl[1]/w:tblPr[1]/w:tblInd[1]", "type", "dxa");
-assertXPath(pXmlDoc, "//w:tbl[1]/w:tblPr[1]/w:tblInd[1]", "w", "55");
+assertXPath(pXmlDoc, "//w:tbl[1]/w:tblPr[1]/w:tblInd[1]", "w", "0");
}
DECLARE_OOXMLEXPORT_TEST( testTableCellMargin, "table-cell-margin.docx" )
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
index ee64589d0305..cc0295a36294 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
@@ -1112,6 +1112,11 @@ DECLARE_OOXMLEXPORT_TEST(tdf106843, "tdf106843.fodt")
{
assertXPath(pXmlSettings, "/w:settings/w:documentProtection", "edit",
"trackedChanges");
assertXPath(pXmlSettings, "/w:settings/w:documentProtection",
"enforcement",
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/ooxmlexport5.cxx |6 ++
writerfilter/source/dmapper/SettingsTable.cxx | 17 +
2 files changed, 23 insertions(+)
New commits:
commit 3c92bceceea49f4a4449395ef0cf1c7d27e13d50
Author: Justin Luth
AuthorDate: Thu Mar 12 21:44:57 2020 +0300
Commit: Thorsten Behrens
CommitDate: Thu Apr 2 21:22:21 2020 +0200
tdf#131304 .docx: provide default compatibilityMode value
When a docx is imported without specifying a compat mode,
populate the appropriate compatibilityMode setting,
which will be written out at save time.
"12: Use word processing features specified in ECMA-376.
This is the default."
The immediate benefit for LO is that this will provide a
cacheable result - instead of repeated lookup attempts
for something that doesn't exist.
Perhaps more importantly, it paves the way
for allowing LO to export new documents
as compatible with 2013, while leaving existing
documents at their current level.
Both Word and LO treat the missing compatSetting
correctly as mode 12, so this should not have any
affect on layout or any other compatibility aspect.
Therefore I can't see any reason why
it shouldn't be explicitly written.
MS Word also writes it out on a round-trip.
Writing it out doesn't limit us in any way either.
As soon as it is in docx format, it will be treated
as mode 12 anyway, so why not make it explicit?
Well, I guess that since MS Word has
been filling this in since 2010 at least, we
could "assume" that if it is missing and has been
modified in the past 5 years it was
created by LO and thus treat it differently,
contrary to standard. But that doesn't seem
like a very good idea at all.
Change-Id: If68cecc14bf4446c5ca25fd2dd6eebddf8d954a1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90439
Tested-by: Jenkins
Reviewed-by: Justin Luth
Reviewed-by: Mike Kaganski
Reviewed-by: Miklos Vajna
(cherry picked from commit 53f099c842d39266a0b4786a1af3db5628746634)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90919
Tested-by: Thorsten Behrens
Reviewed-by: Thorsten Behrens
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
index 87795d6ba6c6..ee64589d0305 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
@@ -1122,6 +1122,12 @@ DECLARE_OOXMLEXPORT_TEST(tdf89991_revisionView,
"tdf89991.docx")
{
assertXPath(pXmlSettings, "/w:settings/w:revisionView", "insDel",
"0");
assertXPath(pXmlSettings, "/w:settings/w:revisionView", "formatting",
"0");
+
+// There was no compatibilityMode defined.
+// 12: Use word processing features specified in ECMA-376. This is the
default.
+assertXPath(pXmlSettings, "/w:settings/w:compat/w:compatSetting[1]",
"name", "compatibilityMode");
+assertXPath(pXmlSettings, "/w:settings/w:compat/w:compatSetting[1]",
"uri", "http://schemas.microsoft.com/office/word";);
+assertXPath(pXmlSettings, "/w:settings/w:compat/w:compatSetting[1]",
"val", "12");
}
}
diff --git a/writerfilter/source/dmapper/SettingsTable.cxx
b/writerfilter/source/dmapper/SettingsTable.cxx
index 58399cf0a151..f875bdd70523 100644
--- a/writerfilter/source/dmapper/SettingsTable.cxx
+++ b/writerfilter/source/dmapper/SettingsTable.cxx
@@ -28,6 +28,7 @@
#include
#include
#include
+#include
#include
#include
#include "ConversionHelper.hxx"
@@ -679,6 +680,22 @@ uno::Sequence const &
SettingsTable::GetThemeFontLangPrope
uno::Sequence SettingsTable::GetCompatSettings() const
{
+if ( GetWordCompatibilityMode() == -1 )
+{
+// the default value for an undefined compatibilityMode is 12 (Word
2007)
+uno::Sequence aCompatSetting(
comphelper::InitPropertySequence({
+{ "name", uno::Any(OUString("compatibilityMode")) },
+{ "uri",
uno::Any(OUString("http://schemas.microsoft.com/office/word";)) },
+{ "val", uno::Any(OUString("12")) } //12: Use word processing
features specified in ECMA-376. This is the default.
+}));
+
+beans::PropertyValue aValue;
+aValue.Name = "compatSetting";
+aValue.Value <<= aCompatSetting;
+
+m_pImpl->m_aCompatSettings.push_back(aValue);
+}
+
return comphelper::containerToSequence(m_pImpl->m_aCompatSettings);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: ESC meeting minutes: 2020-04-02
Am 02.04.20 um 20:52 schrieb Ilmari Lauhakangas: > As you can see from this, interest in Jitsi has grown 100x during the > pandemic: https://trends.google.com/trends/explore?q=jitsi > > They are absolutely slammed with user support requests right now, so > let's give them peace to work on all these improvements. I guess the incentive to get video conferencing (VC) fixed on whatever side has now much increased, especially if you were following the Zoom debate and other VC related privacy problems and solutions; either if real or not. The old FF bug just (three days ago) got a priority boost to P1 and someone assigned. I don't think there is any need for us / me to get involved in it, except if someone wants to help fixing either FF or Jitsi stuff. Still I'll test, if chromium on Debian and Ubuntu is an alternative, if just for VC meetings. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/vcl vcl/source
include/vcl/treelist.hxx |2 +-
vcl/source/treelist/treelist.cxx |4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 344a87f0bc4027825480e1c44235bd6d8d8fc2aa
Author: Caolán McNamara
AuthorDate: Thu Apr 2 17:17:06 2020 +0100
Commit: Caolán McNamara
CommitDate: Thu Apr 2 20:57:19 2020 +0200
make SvListView::IsSelected take const arg
Change-Id: I1e6d2ed5b092741499505bdfd65c6a583495204c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91594
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/include/vcl/treelist.hxx b/include/vcl/treelist.hxx
index 433cd5db91f7..a6cdbe0aa60e 100644
--- a/include/vcl/treelist.hxx
+++ b/include/vcl/treelist.hxx
@@ -281,7 +281,7 @@ public:
boolIsExpanded( SvTreeListEntry* pEntry ) const;
boolIsAllExpanded( SvTreeListEntry* pEntry) const;
-boolIsSelected( SvTreeListEntry* pEntry ) const;
+boolIsSelected(const SvTreeListEntry* pEntry) const;
voidSetEntryFocus( SvTreeListEntry* pEntry, bool bFocus );
const SvViewDataEntry* GetViewData( const SvTreeListEntry* pEntry
) const;
SvViewDataEntry* GetViewData( SvTreeListEntry* pEntry );
diff --git a/vcl/source/treelist/treelist.cxx b/vcl/source/treelist/treelist.cxx
index 1f16f1d1a150..2f99060ac1ea 100644
--- a/vcl/source/treelist/treelist.cxx
+++ b/vcl/source/treelist/treelist.cxx
@@ -1355,10 +1355,10 @@ bool SvListView::IsAllExpanded( SvTreeListEntry* pEntry
) const
return true;
}
-bool SvListView::IsSelected( SvTreeListEntry* pEntry ) const
+bool SvListView::IsSelected(const SvTreeListEntry* pEntry) const
{
DBG_ASSERT(pEntry,"IsExpanded:No Entry");
-SvDataTable::const_iterator itr = m_pImpl->m_DataTable.find(pEntry);
+SvDataTable::const_iterator itr =
m_pImpl->m_DataTable.find(const_cast(pEntry));
if (itr == m_pImpl->m_DataTable.end())
return false;
return itr->second->IsSelected();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: ESC meeting minutes: 2020-04-02
Jan-Marek Glogowski kirjoitti 2.4.2020 klo 21.40: Am 02.04.20 um 17:05 schrieb Miklos Vajna: * Test BBB for ESC meetings (Xisco) - Jitsi always problematic. Even with new adjustments ( Android app & chromium ) - Specially when many people in the call, like today - Board tested BBB in one meeting and it seems it went well - Would like to suggest the same for ESC meeting - Opinions ? + several improvements being pushed upstream as we speak (Ilmari) + people were waiting for this for years + not a great moment to change + any other instance would need somebody to admin the room (Thorsten) + anyone else has issues? (Cloph) + it’s working (Ilmari, Miklos) + mobile was problematic (Kendy) + using desktop browser now instead + massive lag sometimes (Michael M) + problems with Firefox and mobile apps (Cloph) + perhaps fixed with better VM recently (Thorsten) + it’s improving, even from Firefox (Thorsten) I've looked into this a few days ago, due to the current pandemic situation to stay in touch with my family: - https://github.com/jitsi/jitsi-meet/issues/4758 - https://bugzilla.mozilla.org/buglist.cgi?status_whiteboard_type=substring&status_whiteboard=jitsi-meet Main FF "bug" seems to be 5y old: https://bugzilla.mozilla.org/show_bug.cgi?id=1164187 As I understand it, FF says the feature is not needed and Jitsi says it won't implement a special solution for FF. My guess is, FF might start moving now, as video conferencing just became more important... Note that all this Firefox stuff only applies when having video calls, possibly only with screen sharing. Separately from this, the Jitsi devs are working on optimising the web UI itself to reduce load on the client side. As you can see from this, interest in Jitsi has grown 100x during the pandemic: https://trends.google.com/trends/explore?q=jitsi They are absolutely slammed with user support requests right now, so let's give them peace to work on all these improvements. Ilmari ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: ESC meeting minutes: 2020-04-02
Am 02.04.20 um 17:05 schrieb Miklos Vajna: > * Test BBB for ESC meetings (Xisco) > - Jitsi always problematic. Even with new adjustments ( Android app & > chromium ) > - Specially when many people in the call, like today > - Board tested BBB in one meeting and it seems it went well > - Would like to suggest the same for ESC meeting > - Opinions ? > + several improvements being pushed upstream as we speak (Ilmari) > + people were waiting for this for years > + not a great moment to change > + any other instance would need somebody to admin the room (Thorsten) > + anyone else has issues? (Cloph) > + it’s working (Ilmari, Miklos) > + mobile was problematic (Kendy) > + using desktop browser now instead > + massive lag sometimes (Michael M) > + problems with Firefox and mobile apps (Cloph) > + perhaps fixed with better VM recently (Thorsten) > + it’s improving, even from Firefox (Thorsten) I've looked into this a few days ago, due to the current pandemic situation to stay in touch with my family: - https://github.com/jitsi/jitsi-meet/issues/4758 - https://bugzilla.mozilla.org/buglist.cgi?status_whiteboard_type=substring&status_whiteboard=jitsi-meet Main FF "bug" seems to be 5y old: https://bugzilla.mozilla.org/show_bug.cgi?id=1164187 As I understand it, FF says the feature is not needed and Jitsi says it won't implement a special solution for FF. My guess is, FF might start moving now, as video conferencing just became more important... Thanks for the BBB info. Had not seen this yet. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: reportdesign/source
reportdesign/source/core/api/Section.cxx| 32
reportdesign/source/core/sdr/PropertyForward.cxx| 92 +-
reportdesign/source/core/sdr/RptObject.cxx | 222 ++---
reportdesign/source/core/sdr/UndoActions.cxx| 122 +-
reportdesign/source/filter/xml/xmlAutoStyle.cxx | 36
reportdesign/source/filter/xml/xmlColumn.cxx| 76 -
reportdesign/source/filter/xml/xmlControlProperty.cxx | 22
reportdesign/source/filter/xml/xmlExport.cxx| 494 +--
reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx | 20
reportdesign/source/filter/xml/xmlFixedContent.cxx | 46 -
reportdesign/source/filter/xml/xmlHelper.cxx| 112 +-
reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx | 66 -
reportdesign/source/filter/xml/xmlSubDocument.cxx | 63 -
reportdesign/source/ui/dlg/AddField.cxx | 92 +-
reportdesign/source/ui/dlg/CondFormat.cxx | 22
reportdesign/source/ui/dlg/Condition.cxx| 44
reportdesign/source/ui/dlg/GroupsSorting.cxx| 238 ++---
reportdesign/source/ui/dlg/Navigator.cxx| 56 -
reportdesign/source/ui/inspection/DataProviderHandler.cxx | 34
reportdesign/source/ui/inspection/GeometryHandler.cxx | 146 +--
reportdesign/source/ui/misc/RptUndo.cxx | 86 -
reportdesign/source/ui/misc/statusbarcontroller.cxx | 94 +-
reportdesign/source/ui/report/DesignView.cxx| 30
reportdesign/source/ui/report/ReportController.cxx | 531 +---
reportdesign/source/ui/report/ReportControllerObserver.cxx | 48 -
reportdesign/source/ui/report/ReportSection.cxx | 316 +++
reportdesign/source/ui/report/ReportWindow.cxx | 50 -
reportdesign/source/ui/report/SectionView.cxx | 52 -
reportdesign/source/ui/report/StartMarker.cxx | 30
reportdesign/source/ui/report/ViewsWindow.cxx | 42
reportdesign/source/ui/report/dlgedfunc.cxx | 102 +-
reportdesign/source/ui/report/propbrw.cxx | 30
32 files changed, 1722 insertions(+), 1724 deletions(-)
New commits:
commit ff7e960701ccacbd62bd2251f26561eeba8ebe8a
Author: Noel Grandin
AuthorDate: Thu Apr 2 12:06:45 2020 +0200
Commit: Noel Grandin
CommitDate: Thu Apr 2 20:07:00 2020 +0200
loplugin:flatten in reportdesign
Change-Id: I6d8b2730cede4453e7afd581cc24ed101ca6c81b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91557
Tested-by: Noel Grandin
Reviewed-by: Noel Grandin
diff --git a/reportdesign/source/core/api/Section.cxx
b/reportdesign/source/core/api/Section.cxx
index 6aa10a6acaa2..761ed63e5c67 100644
--- a/reportdesign/source/core/api/Section.cxx
+++ b/reportdesign/source/core/api/Section.cxx
@@ -194,22 +194,22 @@ void OSection::init()
uno::Reference< report::XReportDefinition> xReport = getReportDefinition();
std::shared_ptr pModel =
OReportDefinition::getSdrModel(xReport);
assert(pModel && "No model set at the report definition!");
-if ( pModel )
-{
-uno::Reference const xSection(this);
-SdrPage & rSdrPage(*pModel->createNewPage(xSection));
-m_xDrawPage.set(rSdrPage.getUnoPage(), uno::UNO_QUERY_THROW);
-m_xDrawPage_ShapeGrouper.set(m_xDrawPage, uno::UNO_QUERY_THROW);
-// apparently we may also get OReportDrawPage which doesn't support
this
-m_xDrawPage_FormSupplier.set(m_xDrawPage, uno::UNO_QUERY);
-m_xDrawPage_Tunnel.set(m_xDrawPage, uno::UNO_QUERY_THROW);
-// fdo#53872: now also exchange the XDrawPage in the SdrPage so that
-// rSdrPage.getUnoPage returns this
-rSdrPage.SetUnoPage(this);
-// createNewPage _should_ have stored away 2 uno::References to this,
-// so our ref count cannot be 1 here, so this isn't destroyed here
-assert(m_refCount > 1);
-}
+if ( !pModel )
+return;
+
+uno::Reference const xSection(this);
+SdrPage & rSdrPage(*pModel->createNewPage(xSection));
+m_xDrawPage.set(rSdrPage.getUnoPage(), uno::UNO_QUERY_THROW);
+m_xDrawPage_ShapeGrouper.set(m_xDrawPage, uno::UNO_QUERY_THROW);
+// apparently we may also get OReportDrawPage which doesn't support this
+m_xDrawPage_FormSupplier.set(m_xDrawPage, uno::UNO_QUERY);
+m_xDrawPage_Tunnel.set(m_xDrawPage, uno::UNO_QUERY_THROW);
+// fdo#53872: now also exchange the XDrawPage in the SdrPage so that
+// rSdrPage.getUnoPage returns this
+rSdrPage.SetUnoPage(this);
+// createNewPage _should_ have stored away 2 uno::References to this,
+// so our ref count cannot be 1 here, so this isn't destroyed here
+assert(m_refCount > 1);
}
// XSection
diff --git a/reportdesign/source/core/sdr/PropertyForward.cxx
b/reportdesign
[Libreoffice-commits] core.git: sal/osl sal/rtl
sal/osl/all/log.cxx | 57
sal/osl/unx/file_path_helper.cxx | 26 +++
sal/osl/unx/process.cxx | 54 +++
sal/osl/unx/profile.cxx | 114
sal/osl/unx/signal.cxx | 66 +-
sal/rtl/bootstrap.cxx| 42 ++--
sal/rtl/cipher.cxx | 40 +--
sal/rtl/cmdargs.cxx | 46 ++---
sal/rtl/strbuf.cxx | 84
sal/rtl/ustrbuf.cxx | 136 +++
10 files changed, 333 insertions(+), 332 deletions(-)
New commits:
commit 4acb0e7f05fa7fe05f990786e0483e20962af1d9
Author: Noel Grandin
AuthorDate: Thu Apr 2 10:58:02 2020 +0200
Commit: Noel Grandin
CommitDate: Thu Apr 2 20:06:15 2020 +0200
loplugin:flatten in sal
Change-Id: Icc30c79d599486203c8f763cd5ff43059f0bb910
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91556
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sal/osl/all/log.cxx b/sal/osl/all/log.cxx
index 5a6ffdff9110..ed663076b8d2 100644
--- a/sal/osl/all/log.cxx
+++ b/sal/osl/all/log.cxx
@@ -228,23 +228,23 @@ void maybeOutputTimestamp(std::ostringstream &s) {
static_cast(dateTime.NanoSeconds / 100));
s << ts << '.' << milliSecs << ':';
}
-if (outputRelativeTimer)
+if (!outputRelativeTimer)
+return;
+
+TimeValue now;
+osl_getSystemTime(&now);
+int seconds = now.Seconds - aStartTime.aTime.Seconds;
+int milliSeconds;
+if (now.Nanosec < aStartTime.aTime.Nanosec)
{
-TimeValue now;
-osl_getSystemTime(&now);
-int seconds = now.Seconds - aStartTime.aTime.Seconds;
-int milliSeconds;
-if (now.Nanosec < aStartTime.aTime.Nanosec)
-{
-seconds--;
-milliSeconds = 1000 - (aStartTime.aTime.Nanosec - now.Nanosec) /
100;
-}
-else
-milliSeconds = (now.Nanosec - aStartTime.aTime.Nanosec) / 100;
-char relativeTimestamp[100];
-snprintf(relativeTimestamp, sizeof(relativeTimestamp), "%d.%03d",
seconds, milliSeconds);
-s << relativeTimestamp << ':';
+seconds--;
+milliSeconds = 1000 - (aStartTime.aTime.Nanosec - now.Nanosec) /
100;
}
+else
+milliSeconds = (now.Nanosec - aStartTime.aTime.Nanosec) / 100;
+char relativeTimestamp[100];
+snprintf(relativeTimestamp, sizeof(relativeTimestamp), "%d.%03d", seconds,
milliSeconds);
+s << relativeTimestamp << ':';
}
#endif
@@ -344,20 +344,21 @@ void sal_detail_logFormat(
sal_detail_LogLevel level, char const * area, char const * where,
char const * format, ...)
{
-if (sal_detail_log_report(level, area)) {
-std::va_list args;
-va_start(args, format);
-char buf[1024];
-int const len = sizeof buf - RTL_CONSTASCII_LENGTH("...");
-int n = vsnprintf(buf, len, format, args);
-if (n < 0) {
-std::strcpy(buf, "???");
-} else if (n >= len) {
-std::strcpy(buf + len - 1, "...");
-}
-sal_detail_log(level, area, where, buf, 0);
-va_end(args);
+if (!sal_detail_log_report(level, area))
+return;
+
+std::va_list args;
+va_start(args, format);
+char buf[1024];
+int const len = sizeof buf - RTL_CONSTASCII_LENGTH("...");
+int n = vsnprintf(buf, len, format, args);
+if (n < 0) {
+std::strcpy(buf, "???");
+} else if (n >= len) {
+std::strcpy(buf + len - 1, "...");
}
+sal_detail_log(level, area, where, buf, 0);
+va_end(args);
}
sal_Bool sal_detail_log_report(sal_detail_LogLevel level, char const * area) {
diff --git a/sal/osl/unx/file_path_helper.cxx b/sal/osl/unx/file_path_helper.cxx
index a0ef13f9503d..080a99c09928 100644
--- a/sal/osl/unx/file_path_helper.cxx
+++ b/sal/osl/unx/file_path_helper.cxx
@@ -35,21 +35,21 @@ const sal_Unicode FPH_CHAR_COLON = ':';
void osl_systemPathRemoveSeparator(rtl_String* pstrPath)
{
OSL_PRECOND(nullptr != pstrPath, "osl_systemPathRemoveSeparator: Invalid
parameter");
-if (pstrPath != nullptr)
-{
-// maybe there are more than one separator at end
-// so we run in a loop
-while ((pstrPath->length > 1) && (pstrPath->buffer[pstrPath->length -
1] == FPH_CHAR_PATH_SEPARATOR))
-{
-pstrPath->length--;
-pstrPath->buffer[pstrPath->length] = '\0';
-}
+if (pstrPath == nullptr)
+return;
-SAL_WARN_IF( !((0 == pstrPath->length) || (1 == pstrPath->length) ||
- (pstrPath->length > 1 &&
pstrPath->buffer[pstrPath->length - 1] != FPH_CHAR_PATH_SEPARATOR)),
- "sal.osl",
- "osl_systemPathRemoveSeparator: Post condition failed");
+// maybe there are more than one separato
[Libreoffice-commits] core.git: sax/source
sax/source/expatwrap/sax_expat.cxx | 32 +-
sax/source/expatwrap/xml2utf.cxx | 65 ++---
sax/source/fastparser/fastparser.cxx | 65 ++---
sax/source/fastparser/legacyfastparser.cxx | 88 ++---
sax/source/tools/fastserializer.cxx| 30 -
5 files changed, 139 insertions(+), 141 deletions(-)
New commits:
commit d8af42ec5004c8cdb57b6aa60a0f811cf61ad355
Author: Noel Grandin
AuthorDate: Thu Apr 2 10:52:17 2020 +0200
Commit: Noel Grandin
CommitDate: Thu Apr 2 20:05:51 2020 +0200
loplugin:flatten in sax
Change-Id: I01c1f3328d04cf6ea7c76fab9547970387b968e5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91551
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sax/source/expatwrap/sax_expat.cxx
b/sax/source/expatwrap/sax_expat.cxx
index 3172fbe89503..b80ebf033782 100644
--- a/sax/source/expatwrap/sax_expat.cxx
+++ b/sax/source/expatwrap/sax_expat.cxx
@@ -699,25 +699,25 @@ void SaxExpatParser_Impl::callbackStartElement( void
*pvThis ,
{
SaxExpatParser_Impl *pImpl = static_cast(pvThis);
-if( pImpl->rDocumentHandler.is() ) {
-
-int i = 0;
-pImpl->rAttrList->Clear();
+if( !pImpl->rDocumentHandler.is() )
+return;
-while( awAttributes[i] ) {
-assert(awAttributes[i+1]);
-pImpl->rAttrList->AddAttribute(
-XML_CHAR_TO_OUSTRING( awAttributes[i] ) ,
-gsCDATA, // expat doesn't know types
-XML_CHAR_TO_OUSTRING( awAttributes[i+1] ) );
-i +=2;
-}
+int i = 0;
+pImpl->rAttrList->Clear();
-CALL_ELEMENT_HANDLER_AND_CARE_FOR_EXCEPTIONS(
-pImpl ,
-rDocumentHandler->startElement( XML_CHAR_TO_OUSTRING( pwName ) ,
-pImpl->rAttrList.get() ) );
+while( awAttributes[i] ) {
+assert(awAttributes[i+1]);
+pImpl->rAttrList->AddAttribute(
+XML_CHAR_TO_OUSTRING( awAttributes[i] ) ,
+gsCDATA, // expat doesn't know types
+XML_CHAR_TO_OUSTRING( awAttributes[i+1] ) );
+i +=2;
}
+
+CALL_ELEMENT_HANDLER_AND_CARE_FOR_EXCEPTIONS(
+pImpl ,
+rDocumentHandler->startElement( XML_CHAR_TO_OUSTRING( pwName ) ,
+pImpl->rAttrList.get() ) );
}
void SaxExpatParser_Impl::callbackEndElement( void *pvThis , const XML_Char
*pwName )
diff --git a/sax/source/expatwrap/xml2utf.cxx b/sax/source/expatwrap/xml2utf.cxx
index 3e318d8827c3..420f90b6c3f0 100644
--- a/sax/source/expatwrap/xml2utf.cxx
+++ b/sax/source/expatwrap/xml2utf.cxx
@@ -117,43 +117,42 @@ sal_Int32 XMLFile2UTFConverter::readAndConvert(
Sequence &seq , sal_In
void XMLFile2UTFConverter::removeEncoding( Sequence &seq )
{
const sal_Int8 *pSource = seq.getArray();
-if (seq.getLength() >= 5 && !strncmp(reinterpret_cast(pSource), "= 5 && !strncmp(reinterpret_cast(pSource), "(pSource), seq.getLength()
);
+// scan for encoding
+OString str( reinterpret_cast(pSource), seq.getLength() );
-// cut sequence to first line break
-// find first line break;
-int nMax = str.indexOf( 10 );
-if( nMax >= 0 )
-{
-str = str.copy( 0 , nMax );
-}
+// cut sequence to first line break
+// find first line break;
+int nMax = str.indexOf( 10 );
+if( nMax >= 0 )
+{
+str = str.copy( 0 , nMax );
+}
-int nFound = str.indexOf( " encoding" );
-if( nFound >= 0 ) {
-int nStop;
-int nStart = str.indexOf( "\"" , nFound );
-if( nStart < 0 || str.indexOf( "'" , nFound ) < nStart )
-{
-nStart = str.indexOf( "'" , nFound );
-nStop = str.indexOf( "'" , nStart +1 );
-}
-else
-{
-nStop = str.indexOf( "\"" , nStart +1);
-}
+int nFound = str.indexOf( " encoding" );
+if( nFound < 0 )return;
-if( nStart >= 0 && nStop >= 0 && nStart+1 < nStop )
-{
-// remove encoding tag from file
-memmove(&( seq.getArray()[nFound] ) ,
-&( seq.getArray()[nStop+1]) ,
-seq.getLength() - nStop -1);
-seq.realloc( seq.getLength() - ( nStop+1 - nFound ) );
-}
-}
+int nStop;
+int nStart = str.indexOf( "\"" , nFound );
+if( nStart < 0 || str.indexOf( "'" , nFound ) < nStart )
+{
+nStart = str.indexOf( "'" , nFound );
+nStop = str.indexOf( "'" , nStart +1 );
+}
+else
+{
+nStop = str.indexOf( "\"" , nStart +1);
+}
+
+if( nStart >= 0 && nStop >= 0 && nStart+1 < nStop )
+{
+// remove encoding tag from file
+memmove(&( seq.getArray
[Libreoffice-commits] core.git: scripting/source
scripting/source/dlgprov/DialogModelProvider.cxx| 46 ++---
scripting/source/dlgprov/dlgevtatt.cxx | 168 +-
scripting/source/dlgprov/dlgprov.cxx| 50 ++---
scripting/source/protocolhandler/scripthandler.cxx | 50 ++---
scripting/source/provider/ActiveMSPList.cxx | 28 +--
scripting/source/provider/BrowseNodeFactoryImpl.cxx | 24 +-
scripting/source/stringresource/stringresource.cxx | 184 ++--
scripting/source/vbaevents/eventhelper.cxx | 130 +++---
8 files changed, 340 insertions(+), 340 deletions(-)
New commits:
commit d9946e6d0ba81071f3e50622e5cae9e2ffc9bfb0
Author: Noel Grandin
AuthorDate: Thu Apr 2 10:45:58 2020 +0200
Commit: Noel Grandin
CommitDate: Thu Apr 2 20:05:25 2020 +0200
loplugin:flatten in scripting
Change-Id: I8df38b4b581fb674a050ef32624b22498a8e340f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91549
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/scripting/source/dlgprov/DialogModelProvider.cxx
b/scripting/source/dlgprov/DialogModelProvider.cxx
index bd9525a5bc5b..5f9e4e15a032 100644
--- a/scripting/source/dlgprov/DialogModelProvider.cxx
+++ b/scripting/source/dlgprov/DialogModelProvider.cxx
@@ -42,33 +42,33 @@ DialogModelProvider::DialogModelProvider(Reference<
XComponentContext > const &
// lang::XInitialization:
void SAL_CALL DialogModelProvider::initialize(const css::uno::Sequence<
uno::Any > & aArguments)
{
-if ( aArguments.getLength() == 1 )
-{
-OUString sURL;
-if ( !( aArguments[ 0 ] >>= sURL ))
-throw css::lang::IllegalArgumentException();
- // Try any other URL with SimpleFileAccess
-Reference< ucb::XSimpleFileAccess3 > xSFI =
ucb::SimpleFileAccess::create(m_xContext);
+if ( aArguments.getLength() != 1 )
+return;
+
+OUString sURL;
+if ( !( aArguments[ 0 ] >>= sURL ))
+throw css::lang::IllegalArgumentException();
+ // Try any other URL with SimpleFileAccess
+Reference< ucb::XSimpleFileAccess3 > xSFI =
ucb::SimpleFileAccess::create(m_xContext);
-try
+try
+{
+Reference< io::XInputStream > xInput = xSFI->openFileRead( sURL );
+Reference< resource::XStringResourceManager > xStringResourceManager;
+if ( xInput.is() )
{
-Reference< io::XInputStream > xInput = xSFI->openFileRead( sURL );
-Reference< resource::XStringResourceManager >
xStringResourceManager;
-if ( xInput.is() )
-{
-xStringResourceManager =
dlgprov::lcl_getStringResourceManager(m_xContext,sURL);
-Any aDialogSourceURLAny;
-aDialogSourceURLAny <<= sURL;
-
-Reference< frame::XModel > xModel;
-m_xDialogModel.set( dlgprov::lcl_createDialogModel(
m_xContext, xInput , xModel, xStringResourceManager, aDialogSourceURLAny ),
UNO_SET_THROW);
-m_xDialogModelProp.set(m_xDialogModel, UNO_QUERY_THROW);
-}
+xStringResourceManager =
dlgprov::lcl_getStringResourceManager(m_xContext,sURL);
+Any aDialogSourceURLAny;
+aDialogSourceURLAny <<= sURL;
+
+Reference< frame::XModel > xModel;
+m_xDialogModel.set( dlgprov::lcl_createDialogModel( m_xContext,
xInput , xModel, xStringResourceManager, aDialogSourceURLAny ), UNO_SET_THROW);
+m_xDialogModelProp.set(m_xDialogModel, UNO_QUERY_THROW);
}
-catch( Exception& )
-{}
-//m_sURL = sURL;
}
+catch( Exception& )
+{}
+//m_sURL = sURL;
}
// container::XElementAccess:
diff --git a/scripting/source/dlgprov/dlgevtatt.cxx
b/scripting/source/dlgprov/dlgevtatt.cxx
index 1269395b01f5..b1a3fceee7ec 100644
--- a/scripting/source/dlgprov/dlgevtatt.cxx
+++ b/scripting/source/dlgprov/dlgevtatt.cxx
@@ -118,37 +118,37 @@ namespace dlgprov
args[0] <<= xModel;
mxListener.set( xSMgr->createInstanceWithArgumentsAndContext(
"ooo.vba.EventListener", args, m_xContext ), UNO_QUERY );
}
-if ( rxControl.is() )
+if ( !rxControl.is() )
+return;
+
+try
{
-try
-{
-Reference< XPropertySet > xProps( rxControl->getModel(),
UNO_QUERY_THROW );
-xProps->getPropertyValue("Name") >>= msDialogCodeName;
-xProps.set( mxListener, UNO_QUERY_THROW );
-xProps->setPropertyValue("Model", args[ 0 ] );
-}
-catch( const Exception& )
-{
-DBG_UNHANDLED_EXCEPTION("scripting");
-}
+Reference< XPropertySet > xProps( rxControl->getModel(),
UNO_QUERY_THROW );
+xProps->getPropertyValue("Name") >>= msDialogCodeName;
+xProps.set( mxListener, UNO_QUERY_THROW );
+xProps->setPropertyValue("Model", ar
[Libreoffice-commits] core.git: scaddins/source
scaddins/source/analysis/analysishelper.cxx | 32 ++--
1 file changed, 16 insertions(+), 16 deletions(-)
New commits:
commit a3695d24087b7958850d73eee7e665c1d78a041b
Author: Noel Grandin
AuthorDate: Thu Apr 2 10:48:50 2020 +0200
Commit: Noel Grandin
CommitDate: Thu Apr 2 20:04:45 2020 +0200
loplugin:flatten in scaddins
Change-Id: I7a973de06d36fb10e9dd7f6826991ff9d503076d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91550
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/scaddins/source/analysis/analysishelper.cxx
b/scaddins/source/analysis/analysishelper.cxx
index 3206b650b30b..2e799c9d1588 100644
--- a/scaddins/source/analysis/analysishelper.cxx
+++ b/scaddins/source/analysis/analysishelper.cxx
@@ -2689,23 +2689,23 @@ void ScaAnyConverter::init( const uno::Reference<
beans::XPropertySet >& xPropSe
{
// try to get default number format
bHasValidFormat = false;
-if( xFormatter.is() )
+if( !xFormatter.is() )
+return;
+
+// get XFormatsSupplier from outer XPropertySet
+uno::Reference< util::XNumberFormatsSupplier > xFormatsSupp( xPropSet,
uno::UNO_QUERY );
+if( !xFormatsSupp.is() )
+return;
+
+// get XNumberFormatTypes from XNumberFormatsSupplier to get standard index
+uno::Reference< util::XNumberFormats > xFormats(
xFormatsSupp->getNumberFormats() );
+uno::Reference< util::XNumberFormatTypes > xFormatTypes( xFormats,
uno::UNO_QUERY );
+if( xFormatTypes.is() )
{
-// get XFormatsSupplier from outer XPropertySet
-uno::Reference< util::XNumberFormatsSupplier > xFormatsSupp( xPropSet,
uno::UNO_QUERY );
-if( xFormatsSupp.is() )
-{
-// get XNumberFormatTypes from XNumberFormatsSupplier to get
standard index
-uno::Reference< util::XNumberFormats > xFormats(
xFormatsSupp->getNumberFormats() );
-uno::Reference< util::XNumberFormatTypes > xFormatTypes( xFormats,
uno::UNO_QUERY );
-if( xFormatTypes.is() )
-{
-lang::Locale eLocale;
-nDefaultFormat = xFormatTypes->getStandardIndex( eLocale );
-xFormatter->attachNumberFormatsSupplier( xFormatsSupp );
-bHasValidFormat = true;
-}
-}
+lang::Locale eLocale;
+nDefaultFormat = xFormatTypes->getStandardIndex( eLocale );
+xFormatter->attachNumberFormatsSupplier( xFormatsSupp );
+bHasValidFormat = true;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: compilerplugins/clang include/vcl sw/inc vcl/inc vcl/source xmloff/source
compilerplugins/clang/unusedmethods.results | 288 +--- include/vcl/treelist.hxx|7 include/vcl/treelistbox.hxx |4 sw/inc/calbck.hxx | 47 vcl/inc/svimpbox.hxx|7 vcl/source/treelist/svimpbox.cxx| 34 --- vcl/source/treelist/treelist.cxx| 10 vcl/source/treelist/treelistbox.cxx | 28 -- xmloff/source/draw/sdxmlimp.cxx | 23 -- xmloff/source/draw/sdxmlimp_impl.hxx|2 10 files changed, 142 insertions(+), 308 deletions(-) New commits: commit 51143bbb326a7a2e7df7ba987c0e50030c609841 Author: Noel Grandin AuthorDate: Thu Apr 2 09:05:06 2020 +0200 Commit: Noel Grandin CommitDate: Thu Apr 2 20:03:33 2020 +0200 loplugin:unusedmethods Change-Id: I906234a38b96c6ba6eaadf7693abd33e98debf50 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91567 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/compilerplugins/clang/unusedmethods.results b/compilerplugins/clang/unusedmethods.results index 4c05c1c08f25..b1318fc0f7ed 100644 --- a/compilerplugins/clang/unusedmethods.results +++ b/compilerplugins/clang/unusedmethods.results @@ -58,12 +58,6 @@ canvas/source/vcl/impltools.hxx:103 vclcanvas::tools::LocalGuard::LocalGuard() chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx:55 void chart::ThreeD_SceneIllumination_TabPage::LinkStubfillControlsFromModel(void *,void *) -chart2/source/controller/inc/ChartController.hxx:323 -_Bool chart::ChartController::isSelectedObjectDraggable() const -chart2/source/controller/inc/ChartController.hxx:324 -_Bool chart::ChartController::isSelectedObjectResizable() const -chart2/source/controller/inc/ChartController.hxx:325 -_Bool chart::ChartController::isSelectedObjectRotatable() const connectivity/inc/sdbcx/VGroup.hxx:63 connectivity::sdbcx::OGroup::OGroup(_Bool) connectivity/inc/sdbcx/VGroup.hxx:64 @@ -80,18 +74,10 @@ connectivity/source/drivers/firebird/Util.hxx:74 short connectivity::firebird::ColumnTypeInfo::getSubType() const connectivity/source/drivers/firebird/Util.hxx:76 const class rtl::OUString & connectivity::firebird::ColumnTypeInfo::getCharacterSet() const -connectivity/source/drivers/mork/mork_helper.cxx:37 -int main(int,char **) connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx:96 type-parameter-?-? connectivity::mysqlc::OPreparedResultSet::safelyRetrieveValue(const int) connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx:97 type-parameter-?-? connectivity::mysqlc::OPreparedResultSet::retrieveValue(const int) -connectivity/source/drivers/postgresql/pq_connection.hxx:79 -_Bool pq_sdbc_driver::isLog(const struct pq_sdbc_driver::ConnectionSettings *,enum pq_sdbc_driver::LogLevel) -connectivity/source/drivers/postgresql/pq_connection.hxx:80 -void pq_sdbc_driver::log(struct pq_sdbc_driver::ConnectionSettings *,enum pq_sdbc_driver::LogLevel,const class rtl::OUString &) -connectivity/source/drivers/postgresql/pq_connection.hxx:81 -void pq_sdbc_driver::log(struct pq_sdbc_driver::ConnectionSettings *,enum pq_sdbc_driver::LogLevel,const char *) connectivity/source/inc/dbase/dindexnode.hxx:67 _Bool connectivity::dbase::ONDXKey::operator<(const class connectivity::dbase::ONDXKey &) const connectivity/source/inc/java/sql/Connection.hxx:61 @@ -138,7 +124,7 @@ cui/source/inc/cfgutil.hxx:165 int CuiConfigFunctionListBox::get_selected_index() const cui/source/inc/cfgutil.hxx:166 void CuiConfigFunctionListBox::select(const class weld::TreeIter &) -cui/source/inc/CustomNotebookbarGenerator.hxx:31 +cui/source/inc/CustomNotebookbarGenerator.hxx:30 CustomNotebookbarGenerator::CustomNotebookbarGenerator() cui/source/inc/hangulhanjadlg.hxx:244 class rtl::OUString svx::SuggestionEdit::get_text() const @@ -178,6 +164,8 @@ dbaccess/source/ui/inc/WTypeSelect.hxx:76 void dbaui::OWizTypeSelectList::show() desktop/source/lib/lokclipboard.hxx:96 LOKClipboardFactory::LOKClipboardFactory() +drawinglayer/inc/texture/texture.hxx:43 +_Bool drawinglayer::texture::GeoTexSvx::operator!=(const class drawinglayer::texture::GeoTexSvx &) const drawinglayer/source/tools/emfpcustomlinecap.hxx:38 void emfplushelper::EMFPCustomLineCap::SetAttributes(struct com::sun::star::rendering::StrokeAttributes &) drawinglayer/source/tools/emfpstringformat.hxx:94 @@ -208,7 +196,7 @@ hwpfilter/source/mzstring.h:101 class MzString & MzString::operator<<(long) hwpfilter/source/mzstring.h:102 class MzString & MzString::operator<<(short) -include/basegfx/color/bcolormodifier.hxx:76 +include/basegfx/color/bcolormodifier.hxx:77 _Bool basegfx::BColorModifier::operator!=(const class basegfx::BColorModifier &) const include/basegfx/curve/b2dcubicbezier.hxx:52 _Bool basegfx::B2DCubicBezier::operator==(const clas
[Libreoffice-commits] core.git: i18npool/source
i18npool/source/localedata/data/vi_VN.xml | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) New commits: commit 28ccea8b7feed20d33e2ca7d6197d947dbbad848 Author: Eike Rathke AuthorDate: Thu Apr 2 18:14:14 2020 +0200 Commit: Eike Rathke CommitDate: Thu Apr 2 18:54:35 2020 +0200 Resolves: tdf#131829 [vi-VN] set currency VND decimals to 0 Change-Id: I865d6b3dcb7f3bff037a4015aa98db2fa2578672 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91593 Reviewed-by: Eike Rathke Tested-by: Jenkins diff --git a/i18npool/source/localedata/data/vi_VN.xml b/i18npool/source/localedata/data/vi_VN.xml index c2ee30b98bbc..2203461443b5 100644 --- a/i18npool/source/localedata/data/vi_VN.xml +++ b/i18npool/source/localedata/data/vi_VN.xml @@ -90,19 +90,19 @@ #.##0 [CURRENCY];-#.##0 [CURRENCY] - #.##0,00 [CURRENCY];-#.##0,00 [CURRENCY] + #.##0 [CURRENCY];-#.##0 [CURRENCY] #.##0 [CURRENCY];[RED]-#.##0 [CURRENCY] - #.##0,00 [CURRENCY];[RED]-#.##0,00 [CURRENCY] + #.##0 [CURRENCY];[RED]-#.##0 [CURRENCY] - #.##0,00 CCC + #.##0 CCC - #.##0,-- [CURRENCY];[RED]-#.##0,-- [CURRENCY] + #.##0 [CURRENCY];[RED]-#.##0 [CURRENCY] D/M/YY @@ -342,7 +342,7 @@ ₫ VND Việt Nam Đồng - 2 + 0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extensions/source
extensions/source/abpilot/abspilot.cxx |2 +-
extensions/source/abpilot/datasourcehandling.cxx |5 +++--
extensions/source/abpilot/datasourcehandling.hxx |4 ++--
3 files changed, 6 insertions(+), 5 deletions(-)
New commits:
commit f16214fc22aa6665bc9667033496f8e4bed80e05
Author: Gabor Kelemen
AuthorDate: Thu Apr 2 01:28:21 2020 +0200
Commit: László Németh
CommitDate: Thu Apr 2 18:53:52 2020 +0200
tdf#117101 Make Spreadsheet the default new data source type
instead of DBase. It's more likely that people are having those as
data source for Mail Merge
Also change method name to mirror the "Other" option that was selected
in the firs step of the wizard
Change-Id: I12b7fa98ada3af4fd39614a77b47cb587743b614
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91541
Tested-by: Jenkins
Tested-by: László Németh
Reviewed-by: László Németh
diff --git a/extensions/source/abpilot/abspilot.cxx
b/extensions/source/abpilot/abspilot.cxx
index be1f98daf0eb..11376effb3a9 100644
--- a/extensions/source/abpilot/abspilot.cxx
+++ b/extensions/source/abpilot/abspilot.cxx
@@ -343,7 +343,7 @@ namespace abp
break;
case AST_OTHER:
-m_aNewDataSource = aContext.createNewDBase(
m_aSettings.sDataSourceName );
+m_aNewDataSource = aContext.createNewOther(
m_aSettings.sDataSourceName );
break;
case AST_INVALID:
diff --git a/extensions/source/abpilot/datasourcehandling.cxx
b/extensions/source/abpilot/datasourcehandling.cxx
index 00ab85a2486a..46b71839d8e2 100644
--- a/extensions/source/abpilot/datasourcehandling.cxx
+++ b/extensions/source/abpilot/datasourcehandling.cxx
@@ -280,9 +280,10 @@ namespace abp
}
-ODataSource ODataSourceContext::createNewDBase( const OUString& _rName)
+// tdf117101: Spreadsheet by default
+ODataSource ODataSourceContext::createNewOther( const OUString& _rName)
{
-return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:dbase:" );
+return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:calc:" );
}
struct ODataSourceImpl
diff --git a/extensions/source/abpilot/datasourcehandling.hxx
b/extensions/source/abpilot/datasourcehandling.hxx
index 00da09f7941d..98e62e90ef3b 100644
--- a/extensions/source/abpilot/datasourcehandling.hxx
+++ b/extensions/source/abpilot/datasourcehandling.hxx
@@ -80,8 +80,8 @@ namespace abp
/// creates a new macOS address book data source
ODataSource createNewMacab( const OUString& _rName );
-/// creates a new dBase data source
-ODataSource createNewDBase( const OUString& _rName );
+/// creates a new Other data source; tdf117101: Spreadsheet by default
+ODataSource createNewOther( const OUString& _rName );
};
struct ODataSourceImpl;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source writerfilter/source
sw/source/filter/ww8/ww8par2.cxx| 10 --
writerfilter/source/dmapper/PropertyMap.cxx |2 +-
2 files changed, 5 insertions(+), 7 deletions(-)
New commits:
commit c93b2a24d42b31043e2456b222bcb433175d6ce9
Author: Justin Luth
AuthorDate: Thu Mar 26 09:45:56 2020 +0300
Commit: Justin Luth
CommitDate: Thu Apr 2 18:51:48 2020 +0200
NFC ww8/writerfilter: comment fixes and general code cleanup
1.) Confusing to set a default in the CTOR head, and then
change it in the body.
2.) fix spelling
3.) clarify somewhat misleading comments.
Change-Id: Icb19a8838f1f01310b2dacc8cef7d9f0c67f3e75
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91275
Tested-by: Jenkins
Reviewed-by: Justin Luth
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 3f3ff253a44e..a18dd5185ccc 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -1767,7 +1767,7 @@ WW8TabDesc::WW8TabDesc(SwWW8ImplReader* pIoClass, WW8_CP
nStartCp) :
m_nPercentWidth(0),
m_bOk(true),
m_bClaimLineFormat(false),
-m_eOri(text::HoriOrientation::NONE),
+m_eOri(text::HoriOrientation::LEFT),
m_bIsBiDi(false),
m_nCurrentRow(0),
m_nCurrentBandRow(0),
@@ -1793,8 +1793,6 @@ WW8TabDesc::WW8TabDesc(SwWW8ImplReader* pIoClass, WW8_CP
nStartCp) :
WW8PLCFx_Cp_FKP* pPap = m_pIo->m_xPlcxMan->GetPapPLCF();
-m_eOri = text::HoriOrientation::LEFT;
-
WW8TabBandDesc* pNewBand = new WW8TabBandDesc;
wwSprmParser aSprmParser(m_pIo->GetFib());
@@ -2499,7 +2497,7 @@ void WW8TabDesc::CreateSwTable()
if( m_nMaxRight - m_nMinLeft > MINLAY * m_nDefaultSwCols )
{
SwFormatFrameSize aFrameSize(SwFrameSize::Fixed, m_nSwWidth);
-// Don't set relative width if the table has been converted into a
floating frame
+// Don't set relative width if the table is in a floating frame
if ( m_nPercentWidth && (!m_pIo->m_xSFlyPara ||
!m_pIo->m_xSFlyPara->pFlyFormat) )
aFrameSize.SetWidthPercent(m_nPercentWidth);
m_pTable->GetFrameFormat()->SetFormatAttr(aFrameSize);
@@ -2530,9 +2528,9 @@ void WW8TabDesc::CreateSwTable()
m_pIo->m_xSFlyPara->pFlyFormat->SetFormatAttr(aHori);
}
}
-else
+else // Not directly in a floating frame.
{
-//If bApo is set, then this table is being placed in a floating
+//Historical note: If InLocalApo(), then this table is being
placed in a floating
//frame, and the frame matches the left and right *lines* of the
//table, so the space to the left of the table isn't to be used
//inside the frame, in word the dialog involved greys out the
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx
b/writerfilter/source/dmapper/PropertyMap.cxx
index 23c9aac40dc0..21fd70d662d4 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -1180,7 +1180,7 @@ bool SectionPropertyMap::FloatingTableConversion( const
DomainMapper_Impl& rDM_I
// here represents this limit.
const sal_Int32 nMagicNumber = 469;
-// If the table's with is smaller than the text area width, text might
+// If the table's width is smaller than the text area width, text might
// be next to the table and so it should behave as a floating table.
if ( (nTableWidth + nMagicNumber) < nTextAreaWidth )
return true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Changes to 'refs/tags/cp-4.2.1-3'
Tag 'cp-4.2.1-3' created by Andras Timar at 2020-04-02 16:19 + cp-4.2.1-3 Changes since CODE-4.2.1-2-4: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Changes to 'refs/tags/CODE-4.2.1-3'
Tag 'CODE-4.2.1-3' created by Andras Timar at 2020-04-02 16:19 + CODE-4.2.1-3 Changes since CODE-4.2.1-2-4: --- 0 files changed --- ___ 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-1' - debian/changelog loolwsd.spec.in
debian/changelog |6 ++
loolwsd.spec.in |2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
New commits:
commit be45e63bce249f3489d831377e2a96c5ace27e2b
Author: Andras Timar
AuthorDate: Thu Apr 2 18:18:42 2020 +0200
Commit: Andras Timar
CommitDate: Thu Apr 2 18:18:42 2020 +0200
Bump package version to 4.2.1-3
Change-Id: I81e2d889362012f0827951a589cbe185af1075e2
diff --git a/debian/changelog b/debian/changelog
index 514081f17..5b402eb27 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+loolwsd (4.2.1-3) unstable; urgency=medium
+
+ * https://cgit.freedesktop.org/libreoffice/online/log/?h=CODE-4.2.1-3
+
+ -- Andras Timar Thu, 02 Apr 2020 18:00:00 +0100
+
loolwsd (4.2.1-2) unstable; urgency=medium
* https://cgit.freedesktop.org/libreoffice/online/log/?h=CODE-4.2.1-2
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index de9893878..c31d09921 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -12,7 +12,7 @@ Name: loolwsd%{name_suffix}
Name: loolwsd
%endif
Version:@PACKAGE_VERSION@
-Release:2%{?dist}
+Release:3%{?dist}
Vendor: %{vendor}
Summary:LibreOffice Online WebSocket Daemon
License:MPL
___
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-1' - loleaflet/src
loleaflet/src/layer/tile/TileLayer.js |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 151a2ac08d2cc82020328b83e039cb8608222738
Author: Ashod Nakashian
AuthorDate: Thu Apr 2 08:09:28 2020 -0400
Commit: Andras Timar
CommitDate: Thu Apr 2 18:16:35 2020 +0200
leaflet: maintain focus when searching
When the focus is in the search box, we shouldn't
lose it, or hide the keyboard.
Change-Id: I05c4c3e384d840b2919106af1063978b6fe7fbfe
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91580
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Ashod Nakashian
(cherry picked from commit 04b0a7b651bc2d7f98b843b08c402411641513a3)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91515
Tested-by: Andras Timar
Reviewed-by: Andras Timar
diff --git a/loleaflet/src/layer/tile/TileLayer.js
b/loleaflet/src/layer/tile/TileLayer.js
index bfac945ab..f0b540de9 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -2207,7 +2207,8 @@ L.TileLayer = L.GridLayer.extend({
}
} else {
this._map._textInput.hideCursor();
- if (this._map.editorHasFocus()) // Allow input if a
dialog has the focus.
+ // Maintain input if a dialog or search-box has the
focus.
+ if (this._map.editorHasFocus() &&
!this._map.isSearching())
this._map.focus(false);
}
},
___
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-1' - loleaflet/src
loleaflet/src/map/Clipboard.js |4
1 file changed, 4 insertions(+)
New commits:
commit 69e8ff86bab99440fe43d957be41d168f5616072
Author: Ashod Nakashian
AuthorDate: Thu Apr 2 10:05:15 2020 -0400
Commit: Andras Timar
CommitDate: Thu Apr 2 18:15:59 2020 +0200
leaflet: support pasting in the search box
When pasting into the document a special handler
is used to manage the transfer of data. For the search
box we need to let the default handler do the right thing
and so we check that we aren't searching before we override
the paste handler logic, which explicitly pastes into the doc.
Change-Id: I570168d1aaf70c2a78403644e006ba9625ec68db
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91581
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Ashod Nakashian
(cherry picked from commit f96126fb69ff8feb3b5de6c55310f9926b89bf44)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91514
Tested-by: Andras Timar
Reviewed-by: Andras Timar
diff --git a/loleaflet/src/map/Clipboard.js b/loleaflet/src/map/Clipboard.js
index 68e5e4b1c..160a0273d 100644
--- a/loleaflet/src/map/Clipboard.js
+++ b/loleaflet/src/map/Clipboard.js
@@ -657,6 +657,10 @@ L.Clipboard = L.Class.extend({
if (isAnyVexDialogActive() && !this._map.hasFocus())
return;
+ // If the focus is in the search box, paste there.
+ if (this._map.isSearching())
+ return;
+
if (this._map._activeDialog)
ev.usePasteKeyEvent = true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: AllLangHelp_sbasic.mk source/auxiliary source/text
AllLangHelp_sbasic.mk |1 source/auxiliary/sbasic.tree |1 source/text/sbasic/shared/0003.xhp |2 source/text/sbasic/shared/ErrVBA.xhp | 127 + source/text/sbasic/shared/special_vba_func.xhp |5 5 files changed, 133 insertions(+), 3 deletions(-) New commits: commit b6a60949a44df45c1ea13dcd5c7330d327860233 Author: LibreOfficiant AuthorDate: Fri Mar 27 14:24:07 2020 +0100 Commit: Olivier Hallot CommitDate: Thu Apr 2 17:38:09 2020 +0200 VBA Err object - Handling exceptions or Throwing them w/ Basic A limited set of VBA ERR object properties & methods are exhibiting useful features. This page document that subset. Change-Id: I98726a6ffbce370b81f1a26daa35a8a1bf3dc57c Reviewed-on: https://gerrit.libreoffice.org/c/help/+/91177 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/AllLangHelp_sbasic.mk b/AllLangHelp_sbasic.mk index 714338107..4b5999ba1 100644 --- a/AllLangHelp_sbasic.mk +++ b/AllLangHelp_sbasic.mk @@ -362,6 +362,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sbasic,\ helpcontent2/source/text/sbasic/shared/compatible \ helpcontent2/source/text/sbasic/shared/compatibilitymode \ helpcontent2/source/text/sbasic/shared/enum \ +helpcontent2/source/text/sbasic/shared/ErrVBA \ helpcontent2/source/text/sbasic/shared/partition \ helpcontent2/source/text/sbasic/shared/property \ helpcontent2/source/text/sbasic/shared/replace \ diff --git a/source/auxiliary/sbasic.tree b/source/auxiliary/sbasic.tree index bbc37c493..74996c65a 100644 --- a/source/auxiliary/sbasic.tree +++ b/source/auxiliary/sbasic.tree @@ -133,6 +133,7 @@ Eqv Operator Erl Function Err Function +Err Object [VBA] Error Function Error-Handling Functions Exit Statement diff --git a/source/text/sbasic/shared/0003.xhp b/source/text/sbasic/shared/0003.xhp index b1eabffbc..848fb4cbd 100644 --- a/source/text/sbasic/shared/0003.xhp +++ b/source/text/sbasic/shared/0003.xhp @@ -187,7 +187,7 @@ -This function or constant is enabled with the statement Option VBASupport 1 placed before the executable program code in a module. +This constant, function or object is enabled with the statement Option VBASupport 1 placed before the executable program code in a module. This statement must be added before the executable program code in a module. diff --git a/source/text/sbasic/shared/ErrVBA.xhp b/source/text/sbasic/shared/ErrVBA.xhp new file mode 100644 index 0..0e28e5107 --- /dev/null +++ b/source/text/sbasic/shared/ErrVBA.xhp @@ -0,0 +1,127 @@ + + + + + + Err VBA Object + /text/sbasic/shared/ErrVBA.xhp + + + + + + Err object + Error;raising + Error;handling + + Err Object [VBA] + Use VBA Err object to raise or handle runtime errors. Err is a VBA built-in global object which permits: + + + to raise predefined Basic errors + to throw user-defined exceptions + to name the routine originating the error + to describe the error and possible solutions + + + VBA Err object has the following properties and methods: + Properties + + Err.Description As String + + Description property gives the nature of the error. It details the various reasons that may cause the error. Ideally it provides the multiple course of actions that help solve the issue and prevent its reoccurrence. Its alias is Basic Error function for %PRODUCTNAME predefined errors. + + Err.Number As Long + + This the error code associated with the error. Err object default property is Number. Its alias is %PRODUCTNAME Basic Err function. + + Err.Source As String + + Source indicates the name of the routine that produces the error. Source is an option for user-defined errors. + Methods + + Err.Clear() + + Resets description, Erl, number and source properties of current error. Its alias is %PRODUCTNAME Basic Resume statement. + + Err.Raise(Number As Long, Optional source As String, Optional description As String) + + Throws user-defined errors or predefined errors. Its alias is %PRODUCTNAME Basic Error statement. + Parameters + Number A user-defined or predefined error code to be raised. + Error code range 0-2000 is reserved for %PRODUCTNAME Basic. User-defined errors may start from higher values in order to prevent collision with %PRODUCTNAME Basic future developments. + Source The name of the routine raising the error. A name in the form of "myLibrary.myModule.myProc" is r
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0bff023e1069a11fba16d90b80c6c931b64ebc0a Author: LibreOfficiant AuthorDate: Thu Apr 2 16:38:09 2020 +0100 Commit: Gerrit Code Review CommitDate: Thu Apr 2 17:38:09 2020 +0200 Update git submodules * Update helpcontent2 from branch 'master' to b6a60949a44df45c1ea13dcd5c7330d327860233 - VBA Err object - Handling exceptions or Throwing them w/ Basic A limited set of VBA ERR object properties & methods are exhibiting useful features. This page document that subset. Change-Id: I98726a6ffbce370b81f1a26daa35a8a1bf3dc57c Reviewed-on: https://gerrit.libreoffice.org/c/help/+/91177 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index cb85f4bc7fb5..b6a60949a44d 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit cb85f4bc7fb510f55321857d26f895b81f4c5964 +Subproject commit b6a60949a44df45c1ea13dcd5c7330d327860233 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: cypress_test/integration_tests loleaflet/src
cypress_test/integration_tests/mobile/calc/apply_font_spec.js
|3 --
cypress_test/integration_tests/mobile/calc/number_format_spec.js
|6 +
cypress_test/integration_tests/mobile/writer/apply_font_spec.js
|8 ---
cypress_test/integration_tests/mobile/writer/apply_paragraph_properties_spec.js
|3 --
cypress_test/integration_tests/mobile/writer/insert_field_spec.js
|3 --
cypress_test/integration_tests/mobile/writer/insert_formatting_mark_spec.js
|3 --
cypress_test/integration_tests/mobile/writer/shape_properties_spec.js
| 11 +-
cypress_test/integration_tests/mobile/writer/table_properties_spec.js
|3 --
cypress_test/integration_tests/mobile/writer/writer_helper.js
|3 --
loleaflet/src/control/Control.MobileWizard.js
|3 ++
10 files changed, 13 insertions(+), 33 deletions(-)
New commits:
commit 4bdd0497ed8e082db577062a988be2807f00e25f
Author: Tamás Zolnai
AuthorDate: Thu Apr 2 12:11:19 2020 +0200
Commit: Tamás Zolnai
CommitDate: Thu Apr 2 17:13:25 2020 +0200
cypress: mobile: avoid animations in mobile wizard.
Cypress sometimes fails with 'DOM element is detached'
failure because of the animation in the mobile wizard.
Disable animation instead of waiting for 100 ms.
I tried to override $.fn.show() function, but it's
actually overriden by JQuery.ui code.
Change-Id: I0e8e937a501a99b1106d7a450088760f67102bc2
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91569
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tamás Zolnai
diff --git a/cypress_test/integration_tests/mobile/calc/apply_font_spec.js
b/cypress_test/integration_tests/mobile/calc/apply_font_spec.js
index c829890da..c54cbcfe3 100644
--- a/cypress_test/integration_tests/mobile/calc/apply_font_spec.js
+++ b/cypress_test/integration_tests/mobile/calc/apply_font_spec.js
@@ -26,8 +26,7 @@ describe('Apply font changes.', function() {
.click();
cy.get('#Bold')
- .should('be.visible')
- .wait(100);
+ .should('be.visible');
});
afterEach(function() {
diff --git a/cypress_test/integration_tests/mobile/calc/number_format_spec.js
b/cypress_test/integration_tests/mobile/calc/number_format_spec.js
index 942de9de0..03fef04bb 100644
--- a/cypress_test/integration_tests/mobile/calc/number_format_spec.js
+++ b/cypress_test/integration_tests/mobile/calc/number_format_spec.js
@@ -26,8 +26,7 @@ describe('Apply number formatting.', function() {
.click();
cy.get('#category')
- .should('be.visible')
- .wait(100);
+ .should('be.visible');
});
afterEach(function() {
@@ -225,8 +224,7 @@ describe('Apply number formatting.', function() {
.click();
cy.get('#NumberFormatDecimal')
- .should('be.visible')
- .wait(100);
+ .should('be.visible');
// Change to number formatting
cy.get('#NumberFormatDecimal')
diff --git a/cypress_test/integration_tests/mobile/writer/apply_font_spec.js
b/cypress_test/integration_tests/mobile/writer/apply_font_spec.js
index 08e51940c..1f0ba1d2a 100644
--- a/cypress_test/integration_tests/mobile/writer/apply_font_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/apply_font_spec.js
@@ -36,17 +36,9 @@ describe('Apply font changes.', function() {
cy.get('#applystyle')
.click();
- cy.wait(200);
-
cy.get('#mobile-wizard-back')
.should('be.visible');
- cy.get('.mobile-wizard.ui-combobox-text')
- .contains(styleName)
- .scrollIntoView();
-
- cy.wait(200);
-
cy.get('.mobile-wizard.ui-combobox-text')
.contains(styleName)
.click();
diff --git
a/cypress_test/integration_tests/mobile/writer/apply_paragraph_properties_spec.js
b/cypress_test/integration_tests/mobile/writer/apply_paragraph_properties_spec.js
index 7db827bbf..13da19d7a 100644
---
a/cypress_test/integration_tests/mobile/writer/apply_paragraph_properties_spec.js
+++
b/cypress_test/integration_tests/mobile/writer/apply_paragraph_properties_spec.js
@@ -23,8 +23,7 @@ describe('Apply paragraph properties.', function() {
.click();
cy.get('#Paragraph')
- .should('have.class', 'selected')
- .wait(100);
+ .should('have.class', 'selected');
});
afterEach(function() {
diff --git a/cypress_test
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - 2 commits - sw/qa sw/source
sw/qa/extras/rtfexport/data/arabic-zero-numbering.rtf | 14 ++
sw/qa/extras/rtfexport/rtfexport3.cxx | 13 +
sw/qa/extras/ww8export/data/arabic-zero-numbering.doc |binary
sw/qa/extras/ww8export/ww8export3.cxx | 13 +
sw/source/filter/ww8/rtfattributeoutput.cxx |3 +++
sw/source/filter/ww8/wrtw8num.cxx |4
sw/source/filter/ww8/ww8par3.cxx |4
7 files changed, 51 insertions(+)
New commits:
commit 64f00a277711aaa1e537dd7d717dd4c3910fbbe3
Author: Miklos Vajna
AuthorDate: Wed Mar 4 13:33:40 2020 +0100
Commit: Miklos Vajna
CommitDate: Thu Apr 2 17:11:24 2020 +0200
sw padded numbering: add RTF export
RTF import was working already.
(cherry picked from commit dc05428405fb96f28b2d7c7bcfa9033f3f5248a3)
Change-Id: Ifa71035645d4738138790e72c3f9dee640833d0c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91561
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Miklos Vajna
diff --git a/sw/qa/extras/rtfexport/data/arabic-zero-numbering.rtf
b/sw/qa/extras/rtfexport/data/arabic-zero-numbering.rtf
new file mode 100644
index ..0969ba9088ca
--- /dev/null
+++ b/sw/qa/extras/rtfexport/data/arabic-zero-numbering.rtf
@@ -0,0 +1,14 @@
+{\rtf1
+{\*\listtable
+{\list
+{\listlevel\levelnfc22\levelstartat1
+{\leveltext\'02\'00.;}
+{\levelnumbers\'01;}
+}
+\listid0}
+}
+{\*\listoverridetable
+{\listoverride\listid0\ls1}
+}
+\pard\plain\ls1 A\par
+}
diff --git a/sw/qa/extras/rtfexport/rtfexport3.cxx
b/sw/qa/extras/rtfexport/rtfexport3.cxx
index 1f282f79ac85..40f7c9e25c81 100644
--- a/sw/qa/extras/rtfexport/rtfexport3.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport3.cxx
@@ -130,6 +130,19 @@ DECLARE_RTFEXPORT_TEST(testTdf115180, "tdf115180.docx")
CPPUNIT_ASSERT_MESSAGE("Second cell width", cell2Width >= 218 &&
cell2Width <= 220);
}
+DECLARE_ODFEXPORT_TEST(testArabicZeroNumbering, "arabic-zero-numbering.rtf")
+{
+auto xNumberingRules
+=
getProperty>(getParagraph(1),
"NumberingRules");
+comphelper::SequenceAsHashMap aMap(xNumberingRules->getByIndex(0));
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected: 64
+// - Actual : 4
+// i.e. numbering type was ARABIC, not ARABIC_ZERO.
+
CPPUNIT_ASSERT_EQUAL(static_cast(style::NumberingType::ARABIC_ZERO),
+ aMap["NumberingType"].get());
+}
+
DECLARE_RTFEXPORT_TEST(testTdf116841, "tdf116841.rtf")
{
// This was 0, left margin was ignored as we assumed the default is already
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 266b63ad57d4..13c1a8c72478 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -1455,6 +1455,9 @@ void RtfAttributeOutput::NumberingLevel(sal_uInt8 nLevel,
sal_uInt16 nStart,
case SVX_NUM_NUMBER_NONE:
nVal = 255;
break;
+case SVX_NUM_ARABIC_ZERO:
+nVal = 22;
+break;
}
m_rExport.Strm().WriteCharPtr(OOO_STRING_SVTOOLS_RTF_LEVELNFC);
m_rExport.OutULong(nVal);
commit 481a5b23960a5858559f52164b7b4648af1a1e2f
Author: Miklos Vajna
AuthorDate: Wed Mar 4 11:22:09 2020 +0100
Commit: Miklos Vajna
CommitDate: Thu Apr 2 17:11:12 2020 +0200
sw padded numbering: add DOC filter
[MS-OSHARED] 2.2.1.3 MSONFC says msonfcArabicLZ / 0x16 should be used
for this.
(cherry picked from commit a8a5fc175a8af2bf3750497d7ebe2c8ea9176981)
Change-Id: I6bdf460d77acabf54cecc2ec2d2bca91bc814518
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91560
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Miklos Vajna
diff --git a/sw/qa/extras/ww8export/data/arabic-zero-numbering.doc
b/sw/qa/extras/ww8export/data/arabic-zero-numbering.doc
new file mode 100644
index ..c198c4aa44d0
Binary files /dev/null and
b/sw/qa/extras/ww8export/data/arabic-zero-numbering.doc differ
diff --git a/sw/qa/extras/ww8export/ww8export3.cxx
b/sw/qa/extras/ww8export/ww8export3.cxx
index 7d6f4b756a39..b9531e3159bc 100644
--- a/sw/qa/extras/ww8export/ww8export3.cxx
+++ b/sw/qa/extras/ww8export/ww8export3.cxx
@@ -48,6 +48,19 @@ DECLARE_WW8EXPORT_TEST(testTdf37778_readonlySection,
"tdf37778_readonlySection.d
CPPUNIT_ASSERT_EQUAL_MESSAGE("Number of Sections", sal_Int32(0),
xSections->getCount());
}
+DECLARE_ODFEXPORT_TEST(testArabicZeroNumbering, "arabic-zero-numbering.doc")
+{
+auto xNumberingRules
+=
getProperty>(getParagraph(1),
"NumberingRules");
+comphelper::SequenceAsHashMap aMap(xNumberingRules->getByIndex(0));
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected: 64
+// - Actual : 4
+// i.e. numbering type was ARABIC, not ARABIC_ZERO.
+
CPPUNIT_ASSER
Balázs Regényi license statement
All of my past & future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/layer/tile/TileLayer.js |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 04b0a7b651bc2d7f98b843b08c402411641513a3
Author: Ashod Nakashian
AuthorDate: Thu Apr 2 08:09:28 2020 -0400
Commit: Ashod Nakashian
CommitDate: Thu Apr 2 17:09:28 2020 +0200
leaflet: maintain focus when searching
When the focus is in the search box, we shouldn't
lose it, or hide the keyboard.
Change-Id: I05c4c3e384d840b2919106af1063978b6fe7fbfe
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91580
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Ashod Nakashian
diff --git a/loleaflet/src/layer/tile/TileLayer.js
b/loleaflet/src/layer/tile/TileLayer.js
index 225bceddb..d5aa0c18d 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -2184,7 +2184,8 @@ L.TileLayer = L.GridLayer.extend({
}
} else {
this._map._textInput.hideCursor();
- if (this._map.editorHasFocus()) // Allow input if a
dialog has the focus.
+ // Maintain input if a dialog or search-box has the
focus.
+ if (this._map.editorHasFocus() &&
!this._map.isSearching())
this._map.focus(false);
}
},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/map/Clipboard.js |4
1 file changed, 4 insertions(+)
New commits:
commit f96126fb69ff8feb3b5de6c55310f9926b89bf44
Author: Ashod Nakashian
AuthorDate: Thu Apr 2 10:05:15 2020 -0400
Commit: Ashod Nakashian
CommitDate: Thu Apr 2 17:08:22 2020 +0200
leaflet: support pasting in the search box
When pasting into the document a special handler
is used to manage the transfer of data. For the search
box we need to let the default handler do the right thing
and so we check that we aren't searching before we override
the paste handler logic, which explicitly pastes into the doc.
Change-Id: I570168d1aaf70c2a78403644e006ba9625ec68db
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91581
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Ashod Nakashian
diff --git a/loleaflet/src/map/Clipboard.js b/loleaflet/src/map/Clipboard.js
index 218c3dfd0..df07abf4d 100644
--- a/loleaflet/src/map/Clipboard.js
+++ b/loleaflet/src/map/Clipboard.js
@@ -657,6 +657,10 @@ L.Clipboard = L.Class.extend({
if (isAnyVexDialogActive() && !this._map.hasFocus())
return;
+ // If the focus is in the search box, paste there.
+ if (this._map.isSearching())
+ return;
+
if (this._map._activeDialog)
ev.usePasteKeyEvent = true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/layer/tile/TileLayer.js |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a0c1bc05ecefc3606d35244a3faa42348752a216
Author: Ashod Nakashian
AuthorDate: Thu Mar 26 07:32:39 2020 -0400
Commit: Ashod Nakashian
CommitDate: Thu Apr 2 17:06:39 2020 +0200
leaflet: limit special case to only the Formula-Bar
Change-Id: If9c5bbe7f985a7bdac2d12c5136e0e93a1d41354
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91536
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Ashod Nakashian
diff --git a/loleaflet/src/layer/tile/TileLayer.js
b/loleaflet/src/layer/tile/TileLayer.js
index add537854..225bceddb 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -2017,7 +2017,7 @@ L.TileLayer = L.GridLayer.extend({
_postMouseEvent: function(type, x, y, count, buttons, modifier) {
- if (this.isCalc() && !this._map.editorHasFocus()) {
+ if (this._map.calcInputBarHasFocus()) {
// When the Formula-bar has the focus, sending
// mouse move with the document coordinates
// hides the cursor (lost focus?). This is clearly
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
ESC meeting minutes: 2020-04-02
* Present: + Caolan, Heiko, Cloph, Ilmari, Miklos, Sophie, Stephan, Kendy, Thorsten, Eike, Olivier, Michael W, Michael S, Xisco, Michael M, Gabriel, Mike K, Xisco * Completed Action Items: + New committers, give them the actual permission (Cloph) + Balázs Varga and Tünde Tóth (Stephan) + only people with permission are able to do that these days, and the permission was restricted only to hostmasters (Heiko) [ Guilhem did it ] * Pending Action Items: * Tenders for budget 2020 (Miklos) + deadline is end of April + see ideas from 2018: https://wiki.documentfoundation.org/Development/Budget2018 + if you have good ideas, please add them to https://wiki.documentfoundation.org/Development/Budget2020 + proposal: deadline for adding ideas to that page is 1 week from now (9th) + then we can copy them to a sheet, vote on it and rank them based on votes + deadline to have an ESC decision is 16th April + provided we can get a vote done in a week may just work out (Thorsten) + repeat the ranking / spreadsheet process? (Miklos) + will dig that out for next week (Thorsten) + interested in a bundle of UX issues (Heiko) + need someone who can guestimate things (Miklos) + key-binding bits, SmartArt + binary format for table-styles + multi-color gradient from Armin + GSOC – perhaps we know by next week (Thorsten) + recommend a few of them get estimated (Thorsten) + Reviewers – needed ? (Michael M) + traditionally solves TDF problems signing off on contracts + community people who are willing to agree something is done. + or do we fix this as we fix tendering perhaps ? + should we require this burden at this point ? + prolly not at this stage (Thorsten) + seems like a barrier. + having two contacts might help increase chances. + Do we include all the non-completed 2018 tasks ? (Michael M) + if have an idea not tendered yet (Thorsten) + can copy/paste it over to the 2020 page + already done it for 3 proposals (Michael S) + can we assume things previously suggested & not done (Caolan) + will be re-suggested & included ? + two years ago – think welding is impossible eg. (Miklos) + things have moved on a lot in 2 years. + can we copy rankings from previous time ? (Michael M) + will build that into another tab for what was voted last time. + OOXML interop. Collecting ideas from ? (Michael M) + was there an outcome there ? (Thorsten) + larger pieces etc. + inconclusive + some larger bits there eg. theming (Michael M) + should include template pieces too (Michael M) + deadline – next ESC call? (Miklos) + or have a sheet prepared for next week ? + no strong opinion (Thorsten) + people add their ideas frantically in the call + by end of ESC call next week have them in. + will crunch by end of Thursday night. + worth highlighting: mail again with subject (Thorsten) + don’t add ‘Urgent’ to the subject – it goes to moderation (Miklos) + regrettable it’s so late – but lets try to make up for it (Michael) + why is the deadline so soon? (Caolan) + budgeting 2020 needs filing by end of April (Thorsten) + need to set aside / plan money for this name + sum + why not earlier → is unclear (Michael) + TDF team bounce around ideas (Ilmari) + all ideas are welcome (Michael) + we want them in the wiki ! + need someone to guesstimate person weeks (Miklos) + anything cool to help estimate ? (Michael) + items (Ilmari) + a11y improvements + been talking to hypra wrt. a proposal (Michael) + master document improvements + finished MAR auto-updater + Google Chrome 2 factor authentication fixing. + previously ranking open to ESC attendees + members (Michael) + if people read them all & understand can rank them too (Miklos) + added a couple of items to the wiki (Xisco) * Release Engineering update (Cloph) + 7.0 status: feature freeze is last week of May + 6.4 status: 6.4.3 rc2 next week + 6.3 status: 6.3.6 rc1 next week + Remotes + Android viewer + Online * Documentation (Olivier) + New Help : No news + Helpcontent2 + More updates on Calc Function (S. Fanning) + Additions for BASIC (LibreOfficiant) + Fixes (Caolán, ohallot) + Guides + team actively updating literature * UX Update (Heiko) + Bugzilla (topicUI) statistics 240(240) (topicUI) bugs open, 255(255) (needsUXEval) needs to be evaluated by the UXteam + Updates: BZ changes 1 week 1 month3 months 12 months added 5(1) 47(-1) 78(0) 152(0) commented 69(-3) 284(-57) 978(15)3013(3) removed 1(1) 32(1) 35(1)
[Libreoffice-commits] online.git: loleaflet/css
loleaflet/css/toolbar.css |7 +--
1 file changed, 1 insertion(+), 6 deletions(-)
New commits:
commit c46168bb779ac8fd043ff9b219c9fd1a17460967
Author: Jan Holesovsky
AuthorDate: Thu Apr 2 15:48:34 2020 +0200
Commit: Jan Holesovsky
CommitDate: Thu Apr 2 16:38:20 2020 +0200
mobile: Let's remove the smaller padding for really small phones.
Apparently there were more stuff added mobilewizard.css and nobody cared
to update these, so I suspect better not to have this, because nobody
will ever test it again anyway.
Change-Id: I591fe2b52621cde4f1d7d1f087555f98c49731f2
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91575
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Jan Holesovsky
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 408023067..c01e913f6 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -1,9 +1,4 @@
-@media (max-width: 407px), (max-device-height: 407px) {
- #buttonbefore, #buttonafter, #buttonoptimal, #buttonparallel,
#buttonnone, #buttonthrough{
- padding: 18px 28px 18px 28px !important;
- }
-}
- #toolbar-up.w2ui-toolbar {
+#toolbar-up.w2ui-toolbar {
left: 0;
right: 0;
padding-left: 9px;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css loleaflet/src
loleaflet/css/device-mobile.css | 34 +++
loleaflet/css/partsPreviewControl.css | 38 --
loleaflet/src/control/Control.PartsPreview.js | 21 ++
loleaflet/src/layer/tile/ImpressTileLayer.js |6 ++--
4 files changed, 59 insertions(+), 40 deletions(-)
New commits:
commit 7cd2beb8660498d1dedd37b23057c4e4b0bc55a4
Author: Jan Holesovsky
AuthorDate: Thu Apr 2 14:14:19 2020 +0200
Commit: Jan Holesovsky
CommitDate: Thu Apr 2 16:37:45 2020 +0200
mobile: Handle the portrait / landscape for slide sorter in JS too.
Change-Id: I214501fac516f4d581d3c1e8a95650a87db1a4aa
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91570
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Jan Holesovsky
diff --git a/loleaflet/css/device-mobile.css b/loleaflet/css/device-mobile.css
index 5a40ba1b2..685d16454 100644
--- a/loleaflet/css/device-mobile.css
+++ b/loleaflet/css/device-mobile.css
@@ -624,6 +624,24 @@ td[id^=tb_spreadsheet-toolbar_item]:focus
table.w2ui-button div.w2ui-icon, td[id
bottom: 33px;
}
+#slide-sorter.portrait {
+ max-height: 60px;
+}
+
+.preview-img-portrait {
+ min-width: 37px;
+ max-width: 60px;
+ max-height: 45px;
+ margin: 0px;
+}
+
+.preview-frame-portrait {
+ max-height: 60px;
+ max-width: initial;
+ display: table-cell;
+ padding-right: 1em;
+}
+
/* Slidesorter in landscape mode */
#presentation-controls-wrapper.landscape {
top: 41px;
@@ -650,3 +668,19 @@ td[id^=tb_spreadsheet-toolbar_item]:focus
table.w2ui-button div.w2ui-icon, td[id
#document-container.landscape.parts-preview-document.keyboard {
left: 0px !important;
}
+
+#slide-sorter.landscape {
+ max-width: 120px;
+}
+
+.preview-img-landscape {
+ min-width: 40px;
+ max-width: 40px;
+ margin-left: 8px;
+}
+
+.preview-frame-landscape {
+ max-height: initial;
+ max-width: 66px;
+ display: block;
+}
diff --git a/loleaflet/css/partsPreviewControl.css
b/loleaflet/css/partsPreviewControl.css
index 618d2e0a7..4ea0d3c7e 100644
--- a/loleaflet/css/partsPreviewControl.css
+++ b/loleaflet/css/partsPreviewControl.css
@@ -33,44 +33,6 @@
margin-left: 20px;
}
-@media (max-width: 767px) and (orientation: portrait), (max-device-width:
767px) and (orientation: portrait) {
- #slide-sorter {
- max-height: 60px;
- }
-
- .preview-img {
- min-width: 37px;
- max-width: 60px;
- max-height: 45px;
- margin: 0px;
- }
-
- .preview-frame {
- max-height: 60px;
- max-width: initial;
- display: table-cell;
- padding-right: 1em;
- }
-}
-
-@media (max-height: 767px) and (orientation: landscape), (max-device-height:
767px) and (orientation: landscape) {
- #slide-sorter {
- max-width: 120px;
- }
-
- .preview-img {
- min-width: 40px;
- max-width: 40px;
- margin-left: 8px;
- }
-
- .preview-frame {
- max-height: initial;
- max-width: 66px;
- display: block;
- }
-}
-
/* The current part the user is on. */
.preview-img-currentpart {
border-color: #00;
diff --git a/loleaflet/src/control/Control.PartsPreview.js
b/loleaflet/src/control/Control.PartsPreview.js
index 4d9776566..22c81be19 100644
--- a/loleaflet/src/control/Control.PartsPreview.js
+++ b/loleaflet/src/control/Control.PartsPreview.js
@@ -150,6 +150,27 @@ L.Control.PartsPreview = L.Control.extend({
L.DomUtil.addClass(this._previewTiles[j], 'preview-img-selectedpart');
}
}
+
+ // update portrait / landscape
+ var removePreviewImg = 'preview-img-portrait';
+ var addPreviewImg = 'preview-img-landscape';
+ var removePreviewFrame = 'preview-frame-portrait';
+ var addPreviewFrame = 'preview-frame-landscape';
+ if (L.DomUtil.isPortrait()) {
+ removePreviewImg = 'preview-img-landscape';
+ addPreviewImg = 'preview-img-portrait';
+ removePreviewFrame = 'preview-frame-landscape';
+ addPreviewFrame = 'preview-frame-portrait';
+ }
+
+ for (i = 0; i < parts; i++) {
+ L.DomUtil.removeClass(this._previewTiles[i],
removePreviewImg);
+ L.DomUtil.addClass(this._previewTiles[i],
addPreviewImg);
+ }
+
+ var previewFrame =
$(this._partsPreviewCont).find('.preview-frame');
+
[Libreoffice-commits] online.git: loleaflet/css
loleaflet/css/device-mobile.css |5 +
loleaflet/css/partsPreviewControl.css |9 +
2 files changed, 6 insertions(+), 8 deletions(-)
New commits:
commit 53a668b179f99482210015cc0228d2297a3be447
Author: Jan Holesovsky
AuthorDate: Thu Apr 2 15:39:40 2020 +0200
Commit: Jan Holesovsky
CommitDate: Thu Apr 2 16:37:59 2020 +0200
mobile: Drag and drop target is smaller on mobile.
Change-Id: Ic17eac122578bbefed75e1b8a9569d3ae622cbc4
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91574
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Jan Holesovsky
diff --git a/loleaflet/css/device-mobile.css b/loleaflet/css/device-mobile.css
index 685d16454..363818deb 100644
--- a/loleaflet/css/device-mobile.css
+++ b/loleaflet/css/device-mobile.css
@@ -684,3 +684,8 @@ td[id^=tb_spreadsheet-toolbar_item]:focus table.w2ui-button
div.w2ui-icon, td[id
max-width: 66px;
display: block;
}
+
+/* Highlight where a slide can be dropped when reordering by drag-and-drop. */
+.preview-img-dropsite {
+border-bottom: 3px solid #b6b6b6;
+}
diff --git a/loleaflet/css/partsPreviewControl.css
b/loleaflet/css/partsPreviewControl.css
index 4ea0d3c7e..0d07b3d0c 100644
--- a/loleaflet/css/partsPreviewControl.css
+++ b/loleaflet/css/partsPreviewControl.css
@@ -47,12 +47,5 @@
/* Highlight where a slide can be dropped when reordering by drag-and-drop. */
.preview-img-dropsite {
-border-bottom: 3px solid #b6b6b6;
-}
-
-/* Make it larger on larger displays */
-@media (min-width: 768px),(min-device-height: 768px) {
-.preview-img-dropsite {
- border-bottom: 20px solid #b6b6b6;
-}
+border-bottom: 20px solid #b6b6b6;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extras/Gallery_computers.mk extras/Module_extras.mk extras/source scp2/source
dev/null |binary extras/Gallery_computers.mk | 33 -- extras/Module_extras.mk |1 extras/source/gallery/computers/computers.str |2 - scp2/source/ooo/file_extra_ooo.scp|1 5 files changed, 37 deletions(-) New commits: commit 59a05bc2120750104cca0bc16cad8e0e831ca534 Author: andreas kainz AuthorDate: Wed Apr 1 15:54:14 2020 +0200 Commit: andreas_kainz CommitDate: Thu Apr 2 16:32:03 2020 +0200 tdf#131308 Gallery: Remove Computer Gallery Change-Id: I3205f630d61b86c71a8554432295a9e56c1623a4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91492 Tested-by: Jenkins Reviewed-by: andreas_kainz diff --git a/extras/Gallery_computers.mk b/extras/Gallery_computers.mk deleted file mode 100644 index eadbe8cfde4a.. --- a/extras/Gallery_computers.mk +++ /dev/null @@ -1,33 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_Gallery_Gallery,computers,extras/source/gallery/computers)) - -$(eval $(call gb_Gallery_add_files,computers,$(LIBO_SHARE_FOLDER)/gallery/computers,\ -extras/source/gallery/computers/Computer-Cloud.png \ -extras/source/gallery/computers/Computer-Desktop.png \ -extras/source/gallery/computers/Computer-Laptop-Black.png \ -extras/source/gallery/computers/Computer-Laptop-Silver.png \ -extras/source/gallery/computers/Database-Add.png \ -extras/source/gallery/computers/Database-Delete.png \ -extras/source/gallery/computers/Database-Download.png \ -extras/source/gallery/computers/Database.png \ -extras/source/gallery/computers/Folder01-Blue.png \ -extras/source/gallery/computers/Folder02-Green.png \ -extras/source/gallery/computers/Folder03-Manilla.png \ -extras/source/gallery/computers/Folder04-Yellow.png \ -extras/source/gallery/computers/Folder05-OpenBlue.png \ -extras/source/gallery/computers/Folder06-OpenGreen.png \ -extras/source/gallery/computers/Folder07-OpenManilla.png \ -extras/source/gallery/computers/Folder08-OpenYellow.png \ -extras/source/gallery/computers/Server.png \ -extras/source/gallery/computers/WirelessAccessPoint.png \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk index 927086ffedd1..1967ef24eda6 100644 --- a/extras/Module_extras.mk +++ b/extras/Module_extras.mk @@ -60,7 +60,6 @@ ifneq ($(WITH_GALLERY_BUILD),) $(eval $(call gb_Module_add_targets,extras,\ Gallery_arrows \ Gallery_backgrounds \ - Gallery_computers \ Gallery_diagrams \ Gallery_education \ Gallery_environment \ diff --git a/extras/source/gallery/computers/Computer-Cloud.png b/extras/source/gallery/computers/Computer-Cloud.png deleted file mode 100644 index c6c6d69dce94.. Binary files a/extras/source/gallery/computers/Computer-Cloud.png and /dev/null differ diff --git a/extras/source/gallery/computers/Computer-Desktop.png b/extras/source/gallery/computers/Computer-Desktop.png deleted file mode 100644 index 4609920223f4.. Binary files a/extras/source/gallery/computers/Computer-Desktop.png and /dev/null differ diff --git a/extras/source/gallery/computers/Computer-Laptop-Black.png b/extras/source/gallery/computers/Computer-Laptop-Black.png deleted file mode 100644 index 53decc7cf893.. Binary files a/extras/source/gallery/computers/Computer-Laptop-Black.png and /dev/null differ diff --git a/extras/source/gallery/computers/Computer-Laptop-Silver.png b/extras/source/gallery/computers/Computer-Laptop-Silver.png deleted file mode 100644 index dca425a88290.. Binary files a/extras/source/gallery/computers/Computer-Laptop-Silver.png and /dev/null differ diff --git a/extras/source/gallery/computers/Database-Add.png b/extras/source/gallery/computers/Database-Add.png deleted file mode 100644 index 5bce0deb0e35.. Binary files a/extras/source/gallery/computers/Database-Add.png and /dev/null differ diff --git a/extras/source/gallery/computers/Database-Delete.png b/extras/source/gallery/computers/Database-Delete.png deleted file mode 100644 index 8c1809cfd9bf.. Binary files a/extras/source/gallery/computers/Database-Delete.png and /dev/null differ diff --git a/extras/source/gallery/computers/Database-Download.png b/extras/source/gallery/computers/Database-Download.png deleted file mode 100644 index 621f6b4a24ff.. Binary files a/extras/source/gallery/computers/Database-Download.png and /dev/null differ diff --git a/extras/source/gallery/computers/Database.png b/extras/source/gallery/computers/Database.p
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.JSDialogBuilder.js | 39 ---
1 file changed, 8 insertions(+), 31 deletions(-)
New commits:
commit 91b2e52ce2d2f78802faec1025c13bd1e438fae7
Author: Henry Castro
AuthorDate: Fri Mar 27 20:02:16 2020 -0400
Commit: Henry Castro
CommitDate: Thu Apr 2 15:43:54 2020 +0200
loleaflet: update position and size transformation values
Now the LO Core server sends the converted units formatted
text to update in client side when mobile wizard is visible.
Change-Id: I82416bb4712aa20bcddb409c1129da1aff521a34
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91266
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Henry Castro
diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js
b/loleaflet/src/control/Control.JSDialogBuilder.js
index 862c218a4..27c8f35d7 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -904,34 +904,6 @@ L.Control.JSDialogBuilder = L.Control.extend({
}
break;
- case 'selectwidth':
- state = items.getItemValue('.uno:Size');
- if (state) {
- return
String(L.mm100thToInch(state.split('x')[0]).toFixed(2));
- }
- break;
-
- case 'selectheight':
- state = items.getItemValue('.uno:Size');
- if (state) {
- return
String(L.mm100thToInch(state.split('x')[1]).toFixed(2));
- }
- break;
-
- case 'horizontalpos':
- state = items.getItemValue('.uno:Position');
- if (state) {
- return
String(L.mm100thToInch(state.split('/')[0]).toFixed(2));
- }
- break;
-
- case 'verticalpos':
- state = items.getItemValue('.uno:Position');
- if (state) {
- return
String(L.mm100thToInch(state.split('/')[1]).toFixed(2));
- }
- break;
-
case 'transtype':
state =
items.getItemValue('.uno:FillFloatTransparence');
if (state) {
@@ -999,8 +971,11 @@ L.Control.JSDialogBuilder = L.Control.extend({
if (data.readOnly === true)
$(spinfield).attr('readOnly', 'true');
- var updateFunction = function() {
- var value = builder._getUnoStateForItemId(data.id,
builder);
+ var updateFunction = function(e) {
+ var value = e ? e[data.id] : undefined;
+ if (!value) {
+ value = builder._getUnoStateForItemId(data.id,
builder);
+ }
if (!value && data.text != undefined)
value = data.text;
@@ -1013,7 +988,9 @@ L.Control.JSDialogBuilder = L.Control.extend({
updateFunction();
builder.map.on('commandstatechanged', function(e) {
- if (e.commandName ===
builder._mapWindowIdToUnoCommand(data.id))
+ if (e.state[data.id]) {
+ updateFunction(e.state);
+ } else if (e.commandName ===
builder._mapWindowIdToUnoCommand(data.id))
updateFunction();
}, this);
___
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.2' - desktop/qa
desktop/qa/desktop_lib/test_desktop_lib.cxx | 16
1 file changed, 16 insertions(+)
New commits:
commit 4959e6a1054e8c1f08ef2068b522f06b432ceb45
Author: Henry Castro
AuthorDate: Mon Mar 30 19:38:31 2020 -0400
Commit: Henry Castro
CommitDate: Thu Apr 2 15:42:48 2020 +0200
lok: unit test GetControlState
Change-Id: I7187fe787aaed33d85ad76b612725741e9f586d9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91383
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Henry Castro
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index 101fdda65742..3ca8c44a 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -50,6 +50,7 @@
#include
#include
+#include
using namespace com::sun::star;
using namespace desktop;
@@ -171,6 +172,7 @@ public:
void testDialogPaste();
void testCalcSaveAs();
void testDialogInput();
+void testControlState();
void testABI();
CPPUNIT_TEST_SUITE(DesktopLOKTest);
@@ -227,6 +229,7 @@ public:
CPPUNIT_TEST(testDialogPaste);
CPPUNIT_TEST(testCalcSaveAs);
CPPUNIT_TEST(testDialogInput);
+CPPUNIT_TEST(testControlState);
CPPUNIT_TEST(testABI);
CPPUNIT_TEST_SUITE_END();
@@ -2772,6 +2775,19 @@ void DesktopLOKTest::testSpellcheckerMultiView()
CPPUNIT_ASSERT_EQUAL(1,
pDocument->m_pDocumentClass->getViewsCount(pDocument));
}
+void DesktopLOKTest::testControlState()
+{
+LibLODocument_Impl* pDocument = loadDoc("search.ods");
+pDocument->pClass->postUnoCommand(pDocument, ".uno:StarShapes", nullptr,
false);
+Scheduler::ProcessEventsToIdle();
+
+boost::property_tree::ptree aState;
+SfxViewShell* pViewShell = SfxViewShell::Current();
+pViewShell->GetViewFrame()->GetBindings().Update();
+
pViewShell->GetViewFrame()->GetBindings().QueryControlState(SID_ATTR_TRANSFORM_WIDTH,
aState);
+CPPUNIT_ASSERT(!aState.empty());
+}
+
namespace {
constexpr size_t classOffset(int i)
___
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 |1 +
1 file changed, 1 insertion(+)
New commits:
commit 6b096960fde3434996bff1eef1c61d410507bbcd
Author: Pedro Pinto Silva
AuthorDate: Thu Apr 2 14:07:01 2020 +0200
Commit: Pedro Pinto da Silva
CommitDate: Thu Apr 2 15:18:44 2020 +0200
Mobile: Tollbar-up: mkae sure the bezel under the toolbar-up is visisble
all the way
Change-Id: I20f6188eec56c1ef193a9f1efdfd8b7d7a60f169
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91568
Reviewed-by: Jan Holesovsky
Reviewed-by: Pedro Pinto da Silva
Tested-by: Jenkins CollaboraOffice
Tested-by: Pedro Pinto da Silva
diff --git a/loleaflet/css/device-mobile.css b/loleaflet/css/device-mobile.css
index e642080f1..5a40ba1b2 100644
--- a/loleaflet/css/device-mobile.css
+++ b/loleaflet/css/device-mobile.css
@@ -362,6 +362,7 @@
button.vex-dialog-button-secondary.vex-dialog-button.vex-last {
#toolbar-up.w2ui-toolbar{
padding-top: 0px;
padding-bottom: 0px;
+ background: transparent;
}
#formulabar {
padding: 0px !important;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/images
loleaflet/images/lc_selectionlanugagedefault.svg |3 +++ loleaflet/images/lc_selectionlanugagenone.svg|8 loleaflet/images/lc_setparagraphlanguagemenu.svg | 10 ++ loleaflet/images/lc_setselectionlanguagemenu.svg | 11 +++ loleaflet/images/lc_spellcheckignore.svg |9 + loleaflet/images/lc_spellcheckignoreall.svg |8 6 files changed, 49 insertions(+) New commits: commit 73ff494aaaf636ad9e1a0f88b2095db0a0dc5fdb Author: Pedro Pinto Silva AuthorDate: Thu Apr 2 15:12:38 2020 +0200 Commit: Pedro Pinto da Silva CommitDate: Thu Apr 2 15:17:33 2020 +0200 Mobile: spelling context menu: add icons Change-Id: Idc56a0534770a1895c5e6e7ea93fb46ccb44f3e9 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91573 Tested-by: Pedro Pinto da Silva Reviewed-by: Pedro Pinto da Silva diff --git a/loleaflet/images/lc_selectionlanugagedefault.svg b/loleaflet/images/lc_selectionlanugagedefault.svg new file mode 100644 index 0..b95226337 --- /dev/null +++ b/loleaflet/images/lc_selectionlanugagedefault.svg @@ -0,0 +1,3 @@ +http://www.w3.org/2000/svg";> + + diff --git a/loleaflet/images/lc_selectionlanugagenone.svg b/loleaflet/images/lc_selectionlanugagenone.svg new file mode 100644 index 0..ae9911814 --- /dev/null +++ b/loleaflet/images/lc_selectionlanugagenone.svg @@ -0,0 +1,8 @@ +http://www.w3.org/2000/svg";> + + + + + + + diff --git a/loleaflet/images/lc_setparagraphlanguagemenu.svg b/loleaflet/images/lc_setparagraphlanguagemenu.svg new file mode 100644 index 0..53ef0a279 --- /dev/null +++ b/loleaflet/images/lc_setparagraphlanguagemenu.svg @@ -0,0 +1,10 @@ +http://www.w3.org/2000/svg";> + + + + + + + + + diff --git a/loleaflet/images/lc_setselectionlanguagemenu.svg b/loleaflet/images/lc_setselectionlanguagemenu.svg new file mode 100644 index 0..6c9f7c7e8 --- /dev/null +++ b/loleaflet/images/lc_setselectionlanguagemenu.svg @@ -0,0 +1,11 @@ +http://www.w3.org/2000/svg";> + + + + + + + + + + diff --git a/loleaflet/images/lc_spellcheckignore.svg b/loleaflet/images/lc_spellcheckignore.svg new file mode 100644 index 0..ed7a91613 --- /dev/null +++ b/loleaflet/images/lc_spellcheckignore.svg @@ -0,0 +1,9 @@ +http://www.w3.org/2000/svg";> + + + + + + + + diff --git a/loleaflet/images/lc_spellcheckignoreall.svg b/loleaflet/images/lc_spellcheckignoreall.svg new file mode 100644 index 0..16dc38362 --- /dev/null +++ b/loleaflet/images/lc_spellcheckignoreall.svg @@ -0,0 +1,8 @@ +http://www.w3.org/2000/svg";> + + + + + + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/tdf131594.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport13.cxx |7 +++
writerfilter/source/dmapper/DomainMapper.cxx | 25 +++--
3 files changed, 22 insertions(+), 10 deletions(-)
New commits:
commit 910197b8cf9b653c1b39b35b73424a36b7c1d1ae
Author: Xisco Fauli
AuthorDate: Thu Mar 26 15:50:59 2020 +0100
Commit: Miklos Vajna
CommitDate: Thu Apr 2 14:49:02 2020 +0200
tdf#131594: switch line numbering off if w:countBy="0"
See https://bugs.documentfoundation.org/show_bug.cgi?id=131594#c0
for more info
Change-Id: Ic57826eb5a440e83cea1d9bde5e9144727e3b6df
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91141
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/sw/qa/extras/ooxmlexport/data/tdf131594.docx
b/sw/qa/extras/ooxmlexport/data/tdf131594.docx
new file mode 100644
index ..009c6d56bd85
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf131594.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
index 3f217e35d96c..81f286c6e3da 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
@@ -784,6 +784,13 @@ DECLARE_OOXMLEXPORT_TEST(testImageCommentAtChar,
"image-comment-at-char.docx")
getProperty(getRun(xPara, 5),
"TextPortionType"));
}
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf131594, "tdf131594.docx")
+{
+xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+// lnNumType should not be exported if w:countBy="0"
+assertXPath(pXmlDoc, "/w:document/w:body/w:sectPr/w:lnNumType", 0);
+}
+
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf121663, "tdf121663.docx")
{
xmlDocPtr pXmlDoc = parseExport("word/document.xml");
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index d84c94b2fbfe..e69e3796160b 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -2018,19 +2018,24 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const
PropertyMapPtr& rContext )
{
uno::Reference< text::XLineNumberingProperties >
xLineNumberingProperties( m_pImpl->GetTextDocument(), uno::UNO_QUERY_THROW );
uno::Reference< beans::XPropertySet > xLineNumberingPropSet =
xLineNumberingProperties->getLineNumberingProperties();
-xLineNumberingPropSet->setPropertyValue(getPropertyName(
PROP_IS_ON ), uno::makeAny(true) );
-if( aSettings.nInterval )
-xLineNumberingPropSet->setPropertyValue(getPropertyName(
PROP_INTERVAL ), uno::makeAny(static_cast(aSettings.nInterval)) );
-if( aSettings.nDistance != -1 )
-xLineNumberingPropSet->setPropertyValue(getPropertyName(
PROP_DISTANCE ), uno::makeAny(aSettings.nDistance) );
+if( aSettings.nInterval == 0 )
+xLineNumberingPropSet->setPropertyValue(getPropertyName(
PROP_IS_ON ), uno::makeAny(false) );
else
{
-// set Auto value (0.5 cm)
-xLineNumberingPropSet->setPropertyValue(getPropertyName(
PROP_DISTANCE ), uno::makeAny(static_cast(500)) );
-if( pSectionContext )
-pSectionContext->SetdxaLnn( static_cast(283) );
+xLineNumberingPropSet->setPropertyValue(getPropertyName(
PROP_IS_ON ), uno::makeAny(true) );
+if( aSettings.nInterval )
+xLineNumberingPropSet->setPropertyValue(getPropertyName(
PROP_INTERVAL ), uno::makeAny(static_cast(aSettings.nInterval)) );
+if( aSettings.nDistance != -1 )
+xLineNumberingPropSet->setPropertyValue(getPropertyName(
PROP_DISTANCE ), uno::makeAny(aSettings.nDistance) );
+else
+{
+// set Auto value (0.5 cm)
+xLineNumberingPropSet->setPropertyValue(getPropertyName(
PROP_DISTANCE ), uno::makeAny(static_cast(500)) );
+if( pSectionContext )
+pSectionContext->SetdxaLnn(
static_cast(283) );
+}
+xLineNumberingPropSet->setPropertyValue(getPropertyName(
PROP_RESTART_AT_EACH_PAGE ), uno::makeAny(aSettings.bRestartAtEachPage) );
}
-xLineNumberingPropSet->setPropertyValue(getPropertyName(
PROP_RESTART_AT_EACH_PAGE ), uno::makeAny(aSettings.bRestartAtEachPage) );
}
catch( const uno::Exception& )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: remove attribute table:cell-range-address at element in ODF 1.4
Hi Regina,
On Tuesday, 2020-03-31 16:56:59 +0200, Regina Henschel wrote:
> Does anyone know, whether there exists a scenario (besides sx* import
> filter) where it makes a difference for LibreOffice, whether the attribute
> exists or not?
Of the places that git grep -w XML_CELL_RANGE_ADDRESS lists there may
be one of interest
xmloff/source/chart/SchXMLImport.cxx
SchXMLImportHelper::GetPlotAreaAttrTokenMap() has
{ XML_NAMESPACE_TABLE, XML_CELL_RANGE_ADDRESS,
XML_TOK_PA_CHART_ADDRESS },
XML_TOK_PA_CHART_ADDRESS is used in
xmloff/source/chart/SchXMLPlotAreaContext.cxx
SchXMLPlotAreaContext::StartElement() to set mrChartAddress and
m_rbHasRangeAtPlotArea = true (that both are references, so wherever
used outside..) and m_rbHasRangeAtPlotArea being true _may_ lead to an
internal data provider not being created as a last fallback further
down.
I don't know of the consequences or how things are later used from there.
Eike
--
GPG key 0x6A6CD5B765632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A
signature.asc
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - oox/source sw/qa sysui/CustomTarget_share.mk
oox/source/drawingml/textcharacterpropertiescontext.cxx | 40
+++
sw/qa/extras/ooxmlexport/data/tdf123351_UnderlineGroupSapeText.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport4.cxx | 54
++
sysui/CustomTarget_share.mk |5
4 files changed, 96 insertions(+), 3 deletions(-)
New commits:
commit 63860b3652ade32bee1902b02f2da51a52e60bea
Author: Szabolcs
AuthorDate: Wed Apr 1 09:17:17 2020 +0200
Commit: László Németh
CommitDate: Thu Apr 2 14:47:28 2020 +0200
tdf#123351 DOCX DrawingML shape import: fix missing underline
in shape texts.
Handling of 18 underline types in DrawingML shape objects, i.e.
in grouped shapes did not exist.
Note: Underline type "words" imported as "single" temporarily.
Also testing of dashLong is missing, because it is exported as
dashLongHeavy in DOCX.
Co-Authors: Balázs Regényi, Tibor Nagy
Change-Id: I620d919da6b85eaed211e5cbdd5c1a55e60436d8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91461
Tested-by: László Németh
Reviewed-by: László Németh
diff --git a/oox/source/drawingml/textcharacterpropertiescontext.cxx
b/oox/source/drawingml/textcharacterpropertiescontext.cxx
index a126c258cd11..b7bb876044cf 100644
--- a/oox/source/drawingml/textcharacterpropertiescontext.cxx
+++ b/oox/source/drawingml/textcharacterpropertiescontext.cxx
@@ -162,6 +162,46 @@ ContextHandlerRef
TextCharacterPropertiesContext::onCreateContext( sal_Int32 aEl
mrTextCharacterProperties.maAsianThemeFont.setAttributes(rAttribs.getString(W_TOKEN(eastAsiaTheme),
OUString()));
}
break;
+case W_TOKEN( u ):
+{
+// If you add here, check if it is in drawingmltypes.cxx 113.
+auto attrib = rAttribs.getString(W_TOKEN( val ), OUString());
+if (attrib == "single" || attrib == "words") // TODO: implement
words properly. Now it is a single line.
+mrTextCharacterProperties.moUnderline = XML_sng;
+else if (attrib == "wavyHeavy")
+mrTextCharacterProperties.moUnderline = XML_wavyHeavy;
+else if (attrib == "wavyDouble")
+mrTextCharacterProperties.moUnderline = XML_wavyDbl;
+else if (attrib == "wave")
+mrTextCharacterProperties.moUnderline = XML_wavy;
+else if (attrib == "thick")
+mrTextCharacterProperties.moUnderline = XML_heavy;
+else if (attrib == "dottedHeavy")
+mrTextCharacterProperties.moUnderline = XML_dottedHeavy;
+else if (attrib == "dotted")
+mrTextCharacterProperties.moUnderline = XML_dotted;
+else if (attrib == "dashDotDotHeavy")
+mrTextCharacterProperties.moUnderline = XML_dotDotDashHeavy;
+else if (attrib == "dotDotDash")
+mrTextCharacterProperties.moUnderline = XML_dotDotDash;
+else if (attrib == "dashDotHeavy")
+mrTextCharacterProperties.moUnderline = XML_dotDashHeavy;
+else if (attrib == "dotDash")
+mrTextCharacterProperties.moUnderline = XML_dotDash;
+else if (attrib == "double")
+mrTextCharacterProperties.moUnderline = XML_dbl;
+else if (attrib == "dashLongHeavy")
+mrTextCharacterProperties.moUnderline = XML_dashLongHeavy;
+else if (attrib == "dashLong")
+mrTextCharacterProperties.moUnderline = XML_dashLong;
+else if (attrib == "dashedHeavy")
+mrTextCharacterProperties.moUnderline = XML_dashHeavy;
+else if (attrib == "dash")
+mrTextCharacterProperties.moUnderline = XML_dash;
+else if (attrib == "none")
+mrTextCharacterProperties.moUnderline = XML_none;
+break;
+}
case W_TOKEN( b ):
mrTextCharacterProperties.moBold = rAttribs.getBool(W_TOKEN( val
), true);
break;
diff --git
a/sw/qa/extras/ooxmlexport/data/tdf123351_UnderlineGroupSapeText.docx
b/sw/qa/extras/ooxmlexport/data/tdf123351_UnderlineGroupSapeText.docx
new file mode 100644
index ..8726f7ee6f72
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/tdf123351_UnderlineGroupSapeText.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
index aa4c902d6765..91acdfe299ec 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
@@ -1144,6 +1144,60 @@
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testDocxTablePosition, "floating-table-posit
assertXPath(pXmlDoc, "/w:document/w:body/w:tbl/w:tblPr/w:tblpPr", "tblpY",
"4611");
}
+DECLARE_OOXMLEXPORT_TEST(testUnderlineGroupShapeText,
"tdf123351_UnderlineGroupSapeText.docx")
+{
+// tdf#123351: Che
[Libreoffice-commits] core.git: chart2/source
chart2/source/controller/sidebar/ChartAreaPanel.cxx |6 ++ chart2/source/controller/sidebar/ChartAxisPanel.cxx |6 ++ chart2/source/controller/sidebar/ChartLinePanel.cxx |6 ++ chart2/source/controller/sidebar/ChartSeriesPanel.cxx |6 ++ 4 files changed, 24 insertions(+) New commits: commit aafea2f2a23203e44adc8c394021b87ac57b74c3 Author: Stephan Bergmann AuthorDate: Wed Apr 1 10:39:04 2020 +0200 Commit: Stephan Bergmann CommitDate: Thu Apr 2 14:07:49 2020 +0200 updateModel must remove the SelectionChangeListener from the old controller ...and not just add it to the new controller. It caused > $ SAL_USE_VCLPLUGIN=gen make UITest_chart UITEST_TEST_NAME=chartLegend.chartLegend.test_chart_display_legend_dialog to fail with > ==346284==ERROR: AddressSanitizer: heap-use-after-free on address 0x61a00049cca8 at pc 0x7f8496747751 bp 0x7fff7c483f10 sp 0x7fff7c483f08 > READ of size 8 at 0x61a00049cca8 thread T0 > #0 in chart::sidebar::ChartSidebarSelectionListener::selectionChanged(com::sun::star::lang::EventObject const&) at chart2/source/controller/sidebar/ChartSidebarSelectionListener.cxx:66:15 > #1 in chart::ChartController::impl_notifySelectionChangeListeners() at chart2/source/controller/main/ChartController_Window.cxx:1740:28 > #2 in chart::ChartController::impl_selectObjectAndNotiy() at chart2/source/controller/main/ChartController_Window.cxx:1756:5 > #3 in chart::ChartController::modeChanged(com::sun::star::util::ModeChangeEvent const&) at chart2/source/controller/main/ChartController.cxx:538:31 > #4 in chart::ChartView::impl_notifyModeChangeListener(rtl::OUString const&) at chart2/source/view/main/ChartView.cxx:2653:32 > #5 in chart::ChartView::impl_updateView(bool) at chart2/source/view/main/ChartView.cxx:2561:9 > #6 in chart::ChartView::update() at chart2/source/view/main/ChartView.cxx:2687:5 > #7 in chart::ChartController::execute_Paint(OutputDevice&, tools::Rectangle const&) at chart2/source/controller/main/ChartController_Window.cxx:485:25 > #8 in chart::ChartWindow::Paint(OutputDevice&, tools::Rectangle const&) at chart2/source/controller/main/ChartWindow.cxx:99:30 > #9 in PaintHelper::DoPaint(vcl::Region const*) at vcl/source/window/paint.cxx:309:24 > #10 in vcl::Window::ImplCallPaint(vcl::Region const*, ImplPaintFlags) at vcl/source/window/paint.cxx:613:17 > #11 in PaintHelper::~PaintHelper() at vcl/source/window/paint.cxx:549:30 > #12 in vcl::Window::ImplCallPaint(vcl::Region const*, ImplPaintFlags) at vcl/source/window/paint.cxx:619:1 > #13 in PaintHelper::~PaintHelper() at vcl/source/window/paint.cxx:549:30 > #14 in vcl::Window::ImplCallPaint(vcl::Region const*, ImplPaintFlags) at vcl/source/window/paint.cxx:619:1 > #15 in PaintHelper::~PaintHelper() at vcl/source/window/paint.cxx:549:30 > #16 in vcl::Window::ImplCallPaint(vcl::Region const*, ImplPaintFlags) at vcl/source/window/paint.cxx:619:1 > #17 in PaintHelper::~PaintHelper() at vcl/source/window/paint.cxx:549:30 > #18 in vcl::Window::ImplCallPaint(vcl::Region const*, ImplPaintFlags) at vcl/source/window/paint.cxx:619:1 > #19 in PaintHelper::~PaintHelper() at vcl/source/window/paint.cxx:549:30 > #20 in vcl::Window::ImplCallPaint(vcl::Region const*, ImplPaintFlags) at vcl/source/window/paint.cxx:619:1 > #21 in PaintHelper::~PaintHelper() at vcl/source/window/paint.cxx:549:30 > #22 in vcl::Window::ImplCallPaint(vcl::Region const*, ImplPaintFlags) at vcl/source/window/paint.cxx:619:1 > #23 in PaintHelper::~PaintHelper() at vcl/source/window/paint.cxx:549:30 > #24 in vcl::Window::ImplCallPaint(vcl::Region const*, ImplPaintFlags) at vcl/source/window/paint.cxx:619:1 > #25 in PaintHelper::~PaintHelper() at vcl/source/window/paint.cxx:549:30 > #26 in vcl::Window::ImplCallPaint(vcl::Region const*, ImplPaintFlags) at vcl/source/window/paint.cxx:619:1 > #27 in vcl::Window::ImplCallOverlapPaint() at vcl/source/window/paint.cxx:637:9 > #28 in vcl::Window::ImplHandlePaintHdl(Timer*) at vcl/source/window/paint.cxx:660:9 > #29 in vcl::Window::LinkStubImplHandlePaintHdl(void*, Timer*) at vcl/source/window/paint.cxx:641:1 > #30 in Link::Call(Timer*) const at include/tools/link.hxx:111:45 > #31 in Timer::Invoke() at vcl/source/app/timer.cxx:75:21 > #32 in Scheduler::ProcessTaskScheduling() at vcl/source/app/scheduler.cxx:478:20 > #33 in Scheduler::CallbackTaskScheduling() at vcl/source/app/scheduler.cxx:287:5 > #34 in SalTimer::CallCallback() at vcl/inc/saltimer.hxx:54:13 > #35 in X11SalData::Timeout() at vcl/unx/generic/app/saldata.cxx:551:41 > #36 in SalXLib::CheckTimeout(bool) at vcl/unx/generic/app/saldata.cxx:635:17 > #37 in SalXLib::Yield(bool, bool) at vcl/unx/generic/app/saldata.cxx:716:25 > #38 in X11SalInstance::DoYield(bool, bool
[Libreoffice-commits] online.git: cypress_test/.gitignore cypress_test/integration_tests cypress_test/package.json cypress_test/support
cypress_test/.gitignore|1
cypress_test/integration_tests/mobile/writer/insert_object_spec.js | 92
+-
cypress_test/package.json |1
cypress_test/support/commands.js |1
cypress_test/support/index.js |1
5 files changed, 49 insertions(+), 47 deletions(-)
New commits:
commit e814adfb2876748b06e3d21145aa4d18db52ed0d
Author: Tamás Zolnai
AuthorDate: Thu Apr 2 11:35:07 2020 +0200
Commit: Tamás Zolnai
CommitDate: Thu Apr 2 13:50:06 2020 +0200
cypress: integrate cypress-wait-until package.
There are cases sometimes, where we can't use cypress'
nice retry feature for waiting to an assumption to
be true. A workaround for this issue is the cypress-wait-until
package, which makes us able to use the retry feature for
any use case.
An example is the position of an element. I don't know
a way to wait on the position to get changed in the cypress
test framework. So we can use cy.waitUntil() here instead.
Please use this new package when it's really necessary,
do not replace the better cypress calls with it.
Change-Id: I8c553456e351664e30043b8ccd5ace51f1c0298d
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91554
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tamás Zolnai
diff --git a/cypress_test/.gitignore b/cypress_test/.gitignore
index 0b6b5b539..3e5e8dbd2 100644
--- a/cypress_test/.gitignore
+++ b/cypress_test/.gitignore
@@ -2,4 +2,3 @@ node_modules
cypress
package-lock.json
workdir
-support/commands.js
diff --git a/cypress_test/integration_tests/mobile/writer/insert_object_spec.js
b/cypress_test/integration_tests/mobile/writer/insert_object_spec.js
index 7a01c8824..64794d649 100644
--- a/cypress_test/integration_tests/mobile/writer/insert_object_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/insert_object_spec.js
@@ -171,14 +171,14 @@ describe('Insert objects via insertion wizard.',
function() {
.contains('All')
.click();
- cy.wait(100);
-
// Check that the cursor was moved
- cy.get('.blinking-cursor')
- .then(function(cursor) {
- expect(cursor).to.have.lengthOf(1);
-
expect(cursor[0].getBoundingClientRect().left).to.be.lessThan(cursorOrigLeft);
- });
+ cy.waitUntil(function() {
+ return cy.get('.blinking-cursor')
+ .then(function(cursor) {
+ expect(cursor).to.have.lengthOf(1);
+ return
cursor[0].getBoundingClientRect().left < cursorOrigLeft;
+ });
+ });
});
it('Insert footer.', function() {
@@ -214,14 +214,14 @@ describe('Insert objects via insertion wizard.',
function() {
.contains('All')
.click();
- cy.wait(100);
-
// Check that the cursor was moved
- cy.get('.blinking-cursor')
- .then(function(cursor) {
- expect(cursor).to.have.lengthOf(1);
-
expect(cursor[0].getBoundingClientRect().top).to.be.greaterThan(cursorOrigTop);
- });
+ cy.waitUntil(function() {
+ return cy.get('.blinking-cursor')
+ .then(function(cursor) {
+ expect(cursor).to.have.lengthOf(1);
+ return
cursor[0].getBoundingClientRect().top > cursorOrigTop;
+ });
+ });
});
it('Insert footnote.', function() {
@@ -245,14 +245,14 @@ describe('Insert objects via insertion wizard.',
function() {
.contains('Footnote')
.click();
- cy.wait(100);
-
- // Check that the cursor was moved down
- cy.get('.blinking-cursor')
- .then(function(cursor) {
- expect(cursor).to.have.lengthOf(1);
-
expect(cursor[0].getBoundingClientRect().top).to.be.greaterThan(cursorOrigTop);
- });
+ // Check that the cursor was moved
+ cy.waitUntil(function() {
+ return cy.get('.blinking-cursor')
+ .then(function(cursor) {
+ expect(cursor).to.have.lengthOf(1);
+ return
cursor[0].getBoundingClientRect().top > cursorOrigTop;
+
[Libreoffice-commits] core.git: sysui/desktop
sysui/desktop/share/brand.pl |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 54df1aa066d86d9bd04fc37c6e1fabc436ddcf2c
Author: Stephan Bergmann
AuthorDate: Thu Apr 2 12:04:56 2020 +0200
Commit: Stephan Bergmann
CommitDate: Thu Apr 2 13:13:39 2020 +0200
Fix Perl loop reading a list of file names from the command line
while (<>) { ... }
opens all the file names given on the command line in succession, and
executes
the loop body once for every line read from those files. So the existing
loop
processed each file over and over N times, where N is the number of lines in
that file. This appears to have been broken ever since the code's
introduction
in be63ae6cba16a0e31c1388cd5e0bc418cb41afd6 "INTEGRATION: CWS networker3
(1.1.2); FILE ADDED: 2004/05/20 11:38:58 obr 1.1.2.1: #i20355#,#i20356# new
directories for system wide desktop integration".
Change-Id: I8b4f0c6812bf3ba42da4b7c55c38e52c91dd4229
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91558
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/sysui/desktop/share/brand.pl b/sysui/desktop/share/brand.pl
index 2be723b30514..9d73e619c495 100644
--- a/sysui/desktop/share/brand.pl
+++ b/sysui/desktop/share/brand.pl
@@ -64,13 +64,13 @@ while ($_ = $ARGV[0], /^-/) {
}
-while (<>) {
-unless (open INFILE,$ARGV) {
-print STDOUT "Can't open input file $ARGV: $!\n";
+while ($arg = shift) {
+unless (open INFILE,$arg) {
+print STDOUT "Can't open input file $arg: $!\n";
exit 1;
}
-$srcfile = substr($ARGV, rindex($ARGV, "/") + 1);
+$srcfile = substr($arg, rindex($arg, "/") + 1);
unless (open OUTFILE,"> $destdir/$prefix$srcfile") {
print STDOUT "Can't open output file $destdir/$prefix$srcfile: $!\n";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Ideas for 2020 budget (was: Re: ESC meeting agenda: 2020-04-02 16:00 Berlin time)
Hi, It turns out that we don't have much time to discuss this, as the ESC decision is wanted on the budget topic already by April 20th. So if you have good ideas, please add them to the wiki now, and come to the call later today to discuss them: On Wed, Apr 01, 2020 at 04:50:24PM +0200, Miklos Vajna wrote: > + if you have good ideas, please add them to > https://wiki.documentfoundation.org/Development/Budget2020 Thanks and sorry for the rush, Miklos ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/UITest_writer_macro_tests.mk
sw/UITest_writer_macro_tests.mk |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 262fae7a478dba80caff4d35651965742cb166f9 Author: Stephan Bergmann AuthorDate: Thu Apr 2 11:10:11 2020 +0200 Commit: Stephan Bergmann CommitDate: Thu Apr 2 13:05:16 2020 +0200 Make UITest name match .mk file name Change-Id: I38f85fcedfed92a04c2a5538821e94e1c9866ebe Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91552 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/sw/UITest_writer_macro_tests.mk b/sw/UITest_writer_macro_tests.mk index 3aad09e8f04f..3318e1f5d5dc 100644 --- a/sw/UITest_writer_macro_tests.mk +++ b/sw/UITest_writer_macro_tests.mk @@ -5,12 +5,12 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_UITest_UITest,macro_tests)) +$(eval $(call gb_UITest_UITest,writer_macro_tests)) -$(eval $(call gb_UITest_add_modules,macro_tests,$(SRCDIR)/sw/qa/uitest,\ +$(eval $(call gb_UITest_add_modules,writer_macro_tests,$(SRCDIR)/sw/qa/uitest,\ macro_tests/ \ )) -$(eval $(call gb_UITest_set_defs,macro_tests, \ +$(eval $(call gb_UITest_set_defs,writer_macro_tests, \ TDOC="$(SRCDIR)/sw/qa/uitest/macro_tests/data" \ )) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css loleaflet/src
loleaflet/css/device-mobile.css | 130 ++
loleaflet/css/loleaflet.css | 132 ---
loleaflet/src/layer/tile/ImpressTileLayer.js | 17 +++
3 files changed, 146 insertions(+), 133 deletions(-)
New commits:
commit ef1a14e175c526865cc3b07fc82fdda5143c2b5d
Author: Jan Holesovsky
AuthorDate: Thu Apr 2 11:02:47 2020 +0200
Commit: Jan Holesovsky
CommitDate: Thu Apr 2 13:01:57 2020 +0200
mobile: Move the slidesorter handling to device-mobile.css.
Don't use @media for portrait / landscape handling either.
Change-Id: I5a67488e862b59878284bbc5d0ef067a1ff7f60a
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91559
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Jan Holesovsky
diff --git a/loleaflet/css/device-mobile.css b/loleaflet/css/device-mobile.css
index 5b1143739..e642080f1 100644
--- a/loleaflet/css/device-mobile.css
+++ b/loleaflet/css/device-mobile.css
@@ -519,3 +519,133 @@ td[id^=tb_spreadsheet-toolbar_item]:focus
table.w2ui-button div.w2ui-icon, td[id
flex-direction: row;
align-items: center;
}
+
+/* Related to slidesorter */
+/* Show slidesorter beyond 768px only */
+#presentation-controls-wrapper {
+ top: initial;
+ left: initial;
+ bottom: 33px;
+ max-width: initial;
+}
+
+#presentation-controls-wrapper.readonly {
+ top: initial;
+ bottom: 0px;
+}
+
+/* Show sidebar beyond 768px only */
+#sidebar-dock-wrapper {
+ display: none;
+ top: 41px;
+}
+
+#document-container.sidebar-document {
+ left: 0px !important;
+}
+
+#document-container.readonly {
+ top: 37px; /*set equal to toolbar up's height*/
+ bottom: 0px;
+}
+
+#document-container.readonly.parts-preview-document {
+ bottom: 65px;
+}
+
+#document-container.readonly.spreadsheet-document {
+ top: 61px !important;
+ bottom: 42px;
+}
+
+#document-container.parts-preview-document {
+ left: 0px !important;
+ bottom: 95px;
+}
+
+#document-container.spreadsheet-document {
+ top: 92px !important;
+ bottom: 68px;
+}
+
+#document-container {
+ top: 37px; /*set equal to toolbar up's height*/
+ right: 0px !important;
+ bottom: 35px;
+}
+
+#spreadsheet-row-column-frame {
+ top: 72px !important;
+ bottom: 68px;
+}
+
+#spreadsheet-row-column-frame.readonly {
+ top: 41px !important;
+ bottom: 35px !important;
+}
+
+#closebuttonwrapper {
+ display: none;
+}
+/* Show menubar even if folded */
+.main-nav {
+ display: block !important;
+}
+
+/* Slidesorter in portrait mode */
+#presentation-controls-wrapper.portrait {
+ top: initial;
+ left: initial;
+ bottom: 33px;
+ position: fixed;
+ width: 100%;
+ max-width: initial;
+}
+
+#presentation-controls-wrapper.portrait.readonly {
+ top: initial;
+ bottom: 0px;
+ width: 100%;
+ position: fixed;
+}
+
+#document-container.portrait.readonly.parts-preview-document {
+ bottom: 65px;
+}
+
+#document-container.portrait.parts-preview-document {
+ left: 0px !important;
+ bottom: 95px;
+ width: 100%;
+}
+
+#document-container.portrait.parts-preview-document.keyboard {
+ bottom: 33px;
+}
+
+/* Slidesorter in landscape mode */
+#presentation-controls-wrapper.landscape {
+ top: 41px;
+ bottom: 33px;
+}
+
+#presentation-controls-wrapper.landscape.readonly {
+ top: 41px;
+ bottom: 0px;
+ max-width: 120px;
+}
+
+#document-container.landscape.parts-preview-document {
+ left: 66px !important;
+ bottom: 33px;
+}
+
+#document-container.landscape.readonly.parts-preview-document {
+ top: 41px;
+ bottom: 0px;
+ width: initial;
+}
+
+#document-container.landscape.parts-preview-document.keyboard {
+ left: 0px !important;
+}
diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index d56a602c4..3b4d4f439 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -221,138 +221,6 @@ body {
.w2ui-tag .w2ui-tag-top{display:none !important;}
}
-@media (max-width: 767px), (max-device-height: 767px) {
- /* Show slidesorter beyond 768px only */
- #presentation-controls-wrapper {
- top: initial;
- left: initial;
- bottom: 33px;
- max-width: initial;
- }
-
- #presentation-controls-wrapper.readonly {
- top: initial;
- bottom: 0px;
- }
-
- /* Show sidebar beyond 768px only */
- #sidebar-dock-wrapper {
- display: none;
- top: 41px;
- }
-
- #document-container.sidebar-document {
- left: 0px !important;
- }
-
- #document-container.readonly {
- top: 37px; /*set equal to toolbar up's height*/
- bottom: 0px;
- }
-
- #document-containe
[Libreoffice-commits] core.git: 2 commits - basic/qa basic/source include/basic solenv/bin
basic/qa/basic_coverage/test_cverr_method.vb | 20 +
basic/qa/basic_coverage/test_ismissing_basic.vb | 38 +++---
basic/qa/basic_coverage/test_ismissing_compatible.vb | 38 +++---
basic/qa/basic_coverage/test_optional_paramters_basic.vb | 36 +++--
basic/qa/basic_coverage/test_optional_paramters_compatible.vb | 38 +++---
basic/qa/vba_tests/cverr.vb | 11 ++
basic/qa/vba_tests/ismissing.vb | 36 ++---
basic/qa/vba_tests/optional_paramters.vb | 36 ++---
basic/source/inc/runtime.hxx |5 +
basic/source/runtime/runtime.cxx | 38 --
include/basic/sbxdef.hxx |3
solenv/bin/desktop-translate.py | 12 +--
12 files changed, 152 insertions(+), 159 deletions(-)
New commits:
commit b9ba707ad95889db8e3dd04766aadc5d5c95cfaf
Author: Jussi Pakkanen
AuthorDate: Wed Apr 1 19:24:03 2020 +0300
Commit: Jan-Marek Glogowski
CommitDate: Thu Apr 2 12:58:03 2020 +0200
Always treat desktop-translate files as utf-8.
Fixes a regression from commit
d2c23609083d7b3e5267b1e4c923476cbc509d00 ("tdf#130911: convert
desktop-translate from Perl to Python."), which breaks gallery
generation on some Windows machines. Python tries to decode the
utf-8 files with cp1252 on some machines and that fails with a
UnicodeDecodeError exception.
Change-Id: Ic82e5e3b2c21fc4b4bc32944ae7112bff14ccba1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91505
Tested-by: Jan-Marek Glogowski
Reviewed-by: Jan-Marek Glogowski
diff --git a/solenv/bin/desktop-translate.py b/solenv/bin/desktop-translate.py
index e0dbc3078082..3ae49ae576ee 100644
--- a/solenv/bin/desktop-translate.py
+++ b/solenv/bin/desktop-translate.py
@@ -22,7 +22,7 @@
# l10ntools/source/localize.cxx
#
-import os, sys, argparse
+import os, sys, argparse, io
parser = argparse.ArgumentParser()
parser.add_argument('-p', dest='productname', default='LibreOffice')
@@ -50,7 +50,7 @@ else:
templates = {}
# open input file
-source = open(o.ifile)
+source = io.open(o.ifile, encoding='utf-8')
template = None
@@ -99,7 +99,7 @@ for template in templates:
# open the template file - ignore sections for which no
# templates exist
try:
-template_file = open(outfilename)
+template_file = io.open(outfilename, encoding='utf-8')
except Exception:
# string files processed one by one
if o.ext == 'str':
@@ -109,7 +109,7 @@ for template in templates:
# open output file
tmpfilename = '{}.tmp'.format(outfilename)
-outfile = open(tmpfilename, 'w')
+outfile = io.open(tmpfilename, 'w', encoding='utf-8')
# emit the template to the output file
for line in template_file:
@@ -125,9 +125,9 @@ for template in templates:
# print "value is $value\n";
if value:
if o.ext == "desktop" or o.ext == "str":
-outfile.write("""{}[{}]={}\n""".format(outkey, locale,
value))
+outfile.write(u"""{}[{}]={}\n""".format(outkey,
locale, value))
else:
-outfile.write("""\t[{}]{}={}\n""".format(locale,
outkey, value))
+outfile.write(u"""\t[{}]{}={}\n""".format(locale,
outkey, value))
template_file.close()
commit 84b884135ee419fe7abfefa7b4b651a649cf9ad9
Author: Andreas Heinisch
AuthorDate: Mon Mar 9 11:53:50 2020 +0100
Commit: Mike Kaganski
CommitDate: Thu Apr 2 12:57:57 2020 +0200
tdf#79426, tdf#125180 - Don't convert missing parameters to requested type
If a particular parameter type is requested during the
construction of a parameter list, don't convert missing
parameters to avoid implicit casting to the specified
data type and value of the method.
Missing parameters are handled in StepEMPTY, where
additional information about missing parameters is added.
Change-Id: Ia413b2996d7d1feecedc1dfefaf6baf0fd9d917e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90215
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/basic/qa/basic_coverage/test_cverr_method.vb
b/basic/qa/basic_coverage/test_cverr_method.vb
index b1c3f8bec51c..f74445c20c6a 100644
--- a/basic/qa/basic_coverage/test_cverr_method.vb
+++ b/basic/qa/basic_coverage/test_cverr_method.vb
@@ -13,4 +13,24 @@ Function doUnitTest as Integer
Else
doUnitTest = 1
End If
+
+' tdf#79426 - passing an error object to a function
+if ( TestCVErr( CVErr( 2 ) ) <> 2 ) Then
+doUnitTest = 0
+Else
+doUnitTest = 1
+End If
+
+' tdf#79426 - test with Error-Code 448 ( ERRCODE_BASIC_NAMED_NOT_FOUND )
+if ( Test
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4-3' - sw/source
sw/source/ui/dbui/mmlayoutpage.cxx |8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
New commits:
commit 708f8c4dfcf29550e5f69cb09add76403a4eefa8
Author: Caolán McNamara
AuthorDate: Wed Apr 1 14:48:36 2020 +0100
Commit: Michael Stahl
CommitDate: Thu Apr 2 12:57:27 2020 +0200
Resolves: tdf#131767 explicitly get the odt filter
instead of using CXML which might return either the desired writer8 odt
filter
or the StarOffice_XML__Writer filter which both have CXML set as userdata
Change-Id: I3da7e7ee9a0069642c09766e8778bcaf247a4575
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91509
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
(cherry picked from commit fdc768a10024998f6ed27991ea722645b3f5c246)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91511
Reviewed-by: Xisco Faulí
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx
b/sw/source/ui/dbui/mmlayoutpage.cxx
index 8a2dcf3f6766..d504212c77d9 100644
--- a/sw/source/ui/dbui/mmlayoutpage.cxx
+++ b/sw/source/ui/dbui/mmlayoutpage.cxx
@@ -33,6 +33,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -91,9 +92,10 @@
SwMailMergeLayoutPage::SwMailMergeLayoutPage(weld::Container* pPage, SwMailMerge
, m_xDownPB(m_xBuilder->weld_button("down"))
, m_xZoomLB(m_xBuilder->weld_combo_box("zoom"))
{
-std::shared_ptr pSfxFlt = SwIoSystem::GetFilterOfFormat(
-FILTER_XML,
-SwDocShell::Factory().GetFilterContainer() );
+std::shared_ptr pSfxFlt =
+SwDocShell::Factory().GetFilterContainer()->
+GetFilter4FilterName("writer8");
+
//save the current document into a temporary file
{
//temp file needs its own block
___
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.2' - sw/qa sw/source writerfilter/source
sw/qa/extras/ooxmlexport/data/arabic-zero-numbering.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport13.cxx | 13 +
sw/source/filter/ww8/docxattributeoutput.cxx |1 +
writerfilter/source/dmapper/ConversionHelper.cxx |4 +++-
4 files changed, 17 insertions(+), 1 deletion(-)
New commits:
commit 5c397440529bbfd997a3fd75f64c4e4e78fc80ac
Author: Miklos Vajna
AuthorDate: Wed Mar 4 09:13:11 2020 +0100
Commit: Miklos Vajna
CommitDate: Thu Apr 2 12:57:21 2020 +0200
sw padded numbering: add DOCX filter
DOCX uses for this.
(cherry picked from commit 5435ea2afc5da5633a440f2f06d79265bcbb040c)
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
writerfilter/source/dmapper/ConversionHelper.cxx
Change-Id: I12a4a88f472af42a04244d30f9e59fc0b8b4855c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91503
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Miklos Vajna
diff --git a/sw/qa/extras/ooxmlexport/data/arabic-zero-numbering.docx
b/sw/qa/extras/ooxmlexport/data/arabic-zero-numbering.docx
new file mode 100644
index ..f87dce364c9e
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/arabic-zero-numbering.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
index 9dcc609fcf6a..073844d6c75d 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
@@ -425,6 +425,19 @@ DECLARE_OOXMLEXPORT_TEST(testContSectBreakHeaderFooter,
"cont-sect-break-header-
}
}
+DECLARE_OOXMLEXPORT_TEST(testArabicZeroNumbering, "arabic-zero-numbering.docx")
+{
+auto xNumberingRules
+=
getProperty>(getParagraph(1),
"NumberingRules");
+comphelper::SequenceAsHashMap aMap(xNumberingRules->getByIndex(0));
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected: 64
+// - Actual : 4
+// i.e. numbering type was ARABIC, not ARABIC_ZERO.
+
CPPUNIT_ASSERT_EQUAL(static_cast(style::NumberingType::ARABIC_ZERO),
+ aMap["NumberingType"].get());
+}
+
CPPUNIT_TEST_FIXTURE(SwModelTestBase, testZeroLineSpacing)
{
// Create the doc model.
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index f75d4aa0d02d..02c6b8f370d0 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -6491,6 +6491,7 @@ static OString impl_LevelNFC( sal_uInt16 nNumberingType ,
const SfxItemSet *pOut
case style::NumberingType::TEXT_CARDINAL: aType="cardinalText"; break;
case style::NumberingType::TEXT_ORDINAL: aType="ordinalText"; break;
case style::NumberingType::SYMBOL_CHICAGO: aType="chicago"; break;
+case style::NumberingType::ARABIC_ZERO: aType = "decimalZero"; break;
/*
Fallback the rest to decimal.
case style::NumberingType::NATIVE_NUMBERING:
diff --git a/writerfilter/source/dmapper/ConversionHelper.cxx
b/writerfilter/source/dmapper/ConversionHelper.cxx
index 996c284f1779..c0eaf005d4dd 100644
--- a/writerfilter/source/dmapper/ConversionHelper.cxx
+++ b/writerfilter/source/dmapper/ConversionHelper.cxx
@@ -585,6 +585,9 @@ sal_Int16 ConvertNumberingType(sal_Int32 nFmt)
case NS_ooxml::LN_Value_ST_NumberFormat_chicago:
nRet = style::NumberingType::SYMBOL_CHICAGO;
break;
+case NS_ooxml::LN_Value_ST_NumberFormat_decimalZero:
+nRet = style::NumberingType::ARABIC_ZERO;
+break;
default: nRet = style::NumberingType::ARABIC;
}
/* TODO: Lots of additional values are available - some are supported in the
I18 framework
@@ -593,7 +596,6 @@ sal_Int16 ConvertNumberingType(sal_Int32 nFmt)
NS_ooxml::LN_Value_ST_NumberFormat_decimalHalfWidth = 91692;
NS_ooxml::LN_Value_ST_NumberFormat_japaneseDigitalTenThousand = 91694;
NS_ooxml::LN_Value_ST_NumberFormat_decimalEnclosedCircle = 91695;
-NS_ooxml::LN_Value_ST_NumberFormat_decimalZero = 91699;
NS_ooxml::LN_Value_ST_NumberFormat_decimalEnclosedFullstop = 91703;
NS_ooxml::LN_Value_ST_NumberFormat_decimalEnclosedParen = 91704;
NS_ooxml::LN_Value_ST_NumberFormat_ideographZodiacTraditional = 91709;
___
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.2' - i18npool/source sw/qa
i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx |1
sw/qa/extras/odfexport/data/arabic-zero-numbering.odt |binary
sw/qa/extras/odfexport/odfexport.cxx | 13
++
3 files changed, 14 insertions(+)
New commits:
commit aa258391ecc86dad47a52f51fdaf773dbe9ca6f5
Author: Miklos Vajna
AuthorDate: Tue Mar 3 15:54:19 2020 +0100
Commit: Miklos Vajna
CommitDate: Thu Apr 2 12:57:02 2020 +0200
sw padded numbering: add ODF filter
ODF allows any string as style:num-format="...", go with "01, 02, 03,
...", because that seems to be consistent with both
DefaultNumberingProvider::makeNumberingIdentifier()'s fallback mechanism
and with OOXML (which uses "001, 002, 003, ..." for the "pad to 3"
case).
(cherry picked from commit 7a8450c3ecf1a8000cb37981c981fdd55d196df4)
Change-Id: I5c5c7ee5bd61175afc3e682276e69344852106d5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91502
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Miklos Vajna
diff --git
a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
index 692289920eff..3b5cb977d33a 100644
--- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
+++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
@@ -1040,6 +1040,7 @@ static const Supported_NumberingType aSupportedTypes[] =
{style::NumberingType::CHARS_PERSIAN_WORD, nullptr, LANG_CTL},
{style::NumberingType::CHARS_GREEK_UPPER_LETTER, C_GR_A ", " C_GR_B
", ... (gr)", LANG_ALL},
{style::NumberingType::CHARS_GREEK_LOWER_LETTER, S_GR_A ", " S_GR_B
", ... (gr)", LANG_ALL},
+{style::NumberingType::ARABIC_ZERO, "01, 02, 03, ...", LANG_ALL},
};
static const sal_Int32 nSupported_NumberingTypes =
SAL_N_ELEMENTS(aSupportedTypes);
diff --git a/sw/qa/extras/odfexport/data/arabic-zero-numbering.odt
b/sw/qa/extras/odfexport/data/arabic-zero-numbering.odt
new file mode 100644
index ..2a445b22748a
Binary files /dev/null and
b/sw/qa/extras/odfexport/data/arabic-zero-numbering.odt differ
diff --git a/sw/qa/extras/odfexport/odfexport.cxx
b/sw/qa/extras/odfexport/odfexport.cxx
index 0bfca2fc0bc8..afb17337be13 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -2228,6 +2228,19 @@ DECLARE_ODFEXPORT_TEST(tdf99631, "tdf99631.docx")
assertXPathContent(pXmlDoc2,
"//config:config-item[@config:name='VisibleAreaWidth']", "4515");
assertXPathContent(pXmlDoc2,
"//config:config-item[@config:name='VisibleAreaHeight']", "1354");
}
+
+DECLARE_ODFEXPORT_TEST(testArabicZeroNumbering, "arabic-zero-numbering.odt")
+{
+auto xNumberingRules
+=
getProperty>(getParagraph(1),
"NumberingRules");
+comphelper::SequenceAsHashMap aMap(xNumberingRules->getByIndex(0));
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected: 64
+// - Actual : 4
+// i.e. numbering type was ARABIC, not ARABIC_ZERO.
+
CPPUNIT_ASSERT_EQUAL(static_cast(style::NumberingType::ARABIC_ZERO),
+ aMap["NumberingType"].get());
+}
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
___
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 |6 ++
loleaflet/css/leaflet.css | 14 --
2 files changed, 6 insertions(+), 14 deletions(-)
New commits:
commit 26219bb4a2bab28dc144f8621ab0768e2b3f67ab
Author: Jan Holesovsky
AuthorDate: Thu Apr 2 09:10:33 2020 +0200
Commit: Jan Holesovsky
CommitDate: Thu Apr 2 12:26:13 2020 +0200
mobile: No ruler on mobile phones.
Change-Id: I8641830f69276ee7bbfc1c29330e98731cfd26bc
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91548
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Jan Holesovsky
diff --git a/loleaflet/css/device-mobile.css b/loleaflet/css/device-mobile.css
index 2ce4d27d2..5b1143739 100644
--- a/loleaflet/css/device-mobile.css
+++ b/loleaflet/css/device-mobile.css
@@ -55,6 +55,12 @@ div#w2ui-overlay-actionbar.w2ui-overlay{
display: none !important;
}
+/* No ruler on mobile phones. */
+.loleaflet-ruler {
+ height: 0px;
+ display: none;
+}
+
/* Related to menubar.css */
.document-logo {
width: 35px;
diff --git a/loleaflet/css/leaflet.css b/loleaflet/css/leaflet.css
index 0f36d..7caea9340 100644
--- a/loleaflet/css/leaflet.css
+++ b/loleaflet/css/leaflet.css
@@ -832,20 +832,6 @@ input.clipboard {
margin: 0px;
}
-/* The 20px above is 5% of the 400px below. */
-@media screen and (max-height: 400px) {
- .loleaflet-ruler {
- height: 0px;
- display: none;
- }
-}
-@media (max-width: 767px), (max-device-height: 767px) {
- .loleaflet-ruler {
- height: 0px;
- display: none;
- }
-}
-
.loleaflet-ruler-breakcontainer {
height: 100%;
position: absolute;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Gökay ŞATIR - license statement
All of my past & future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. -- Gökay Şatır. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] online.git: fuzzer/Admin.cpp fuzzer/admin-data Makefile.am net/WebSocketHandler.hpp wsd/Admin.cpp wsd/Admin.hpp wsd/Auth.cpp
Makefile.am | 14 +-
fuzzer/Admin.cpp | 22 ++
fuzzer/admin-data/load |9 +
net/WebSocketHandler.hpp |2 +-
wsd/Admin.cpp|6 +-
wsd/Admin.hpp|6 +++---
wsd/Auth.cpp |2 +-
7 files changed, 54 insertions(+), 7 deletions(-)
New commits:
commit a4e0a00bfe746ccf058dfd46de34bf4fabf5c059
Author: Miklos Vajna
AuthorDate: Wed Apr 1 17:22:23 2020 +0200
Commit: Miklos Vajna
CommitDate: Thu Apr 2 12:11:24 2020 +0200
Add an initial libfuzzer based fuzzer for the admin console
Run the actual fuzzer like this:
./admin_fuzzer -max_len=16384 fuzzer/admin-data/
Change-Id: I5891df8033ff1837afce86775ee62447587f2f20
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91504
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Miklos Vajna
diff --git a/Makefile.am b/Makefile.am
index e4e6ed5db..3ce60690d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -131,7 +131,9 @@ noinst_PROGRAMS = clientnb \
loolsocketdump
if ENABLE_LIBFUZZER
-noinst_PROGRAMS += clientsession_fuzzer
+noinst_PROGRAMS += \
+ admin_fuzzer \
+ clientsession_fuzzer
else
noinst_PROGRAMS += loolwsd_fuzzer
endif
@@ -161,6 +163,16 @@ loolwsd_fuzzer_SOURCES = $(loolwsd_sources) \
$(shared_sources) \
kit/DummyLibreOfficeKit.cpp
+admin_fuzzer_CPPFLAGS = \
+ -DKIT_IN_PROCESS=1 \
+ $(AM_CPPFLAGS)
+admin_fuzzer_SOURCES = \
+ $(loolwsd_sources) \
+ $(loolforkit_sources) \
+ $(shared_sources) \
+ fuzzer/Admin.cpp
+admin_fuzzer_LDFLAGS = -fsanitize=fuzzer $(AM_LDFLAGS)
+
clientsession_fuzzer_CPPFLAGS = \
-DKIT_IN_PROCESS=1 \
$(AM_CPPFLAGS)
diff --git a/fuzzer/Admin.cpp b/fuzzer/Admin.cpp
new file mode 100644
index 0..695b928b0
--- /dev/null
+++ b/fuzzer/Admin.cpp
@@ -0,0 +1,22 @@
+#include
+
+#include "Admin.hpp"
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)
+{
+Admin& admin = Admin::instance();
+auto handler = std::make_shared(&admin);
+
+std::string input(reinterpret_cast(data), size);
+std::stringstream ss(input);
+std::string line;
+while (std::getline(ss, line, '\n'))
+{
+std::vector lineVector(line.data(), line.data() + line.size());
+handler->handleMessage(lineVector);
+}
+
+return 0;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fuzzer/admin-data/load b/fuzzer/admin-data/load
new file mode 100644
index 0..971d315e5
--- /dev/null
+++ b/fuzzer/admin-data/load
@@ -0,0 +1,9 @@
+auth
jwt=eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJsb29sIiwic3ViIjoiYWRtaW4iLCJhdWQiOiJhZG1pbiIsIm5tZSI6ImFkbWluIiwiZXhwIjoiMTU4NTU3ODM1NiJ9.v_VuMvhuUHlcQN-vTzPl3UzIbkmXd5brIVc_RjSa10KjOo9lG6JXw1Jpvin1pbP2Q4QtyQo5o9yGlVW_JdMoA7neeQkq4FwA2MCJzXu9Kp62SB8KVqDkVafNBS4ZV_oGLU8tAjuGDWPC9oZj4H-07j6L9LC3SWbKlLUvdsC5nixXRiijHj6TWP_7HnVrPX1OuaaJM47Q--Wu7_3fI5pj4OLKYzLPX6ONlhO3YQKY1GaVLvIzbRo2J-A0x0KFk_k0JWo6dEtSK3Hr47xxyn3nt1AuyHowgxO8G2IKPGcFjrMcyKS2khh3DGNa5Re21Jm-e3LhtNX-sCpWnXhTuQqBxQ
+documents
+subscribe adddoc rmdoc resetidle propchange modifications
+mem_consumed
+active_docs_count
+active_users_count
+sent_bytes
+recv_bytes
+uptime
diff --git a/net/WebSocketHandler.hpp b/net/WebSocketHandler.hpp
index 43d710ea4..b23c3951f 100644
--- a/net/WebSocketHandler.hpp
+++ b/net/WebSocketHandler.hpp
@@ -540,7 +540,7 @@ public:
int sendMessage(const char* data, const size_t len, const WSOpCode code,
const bool flush = true) const
{
int unitReturn = -1;
-if (UnitBase::get().filterSendMessage(data, len, code, flush,
unitReturn))
+if (!Util::isFuzzing() && UnitBase::get().filterSendMessage(data, len,
code, flush, unitReturn))
return unitReturn;
//TODO: Support fragmented messages.
diff --git a/wsd/Admin.cpp b/wsd/Admin.cpp
index 7532206a5..017600af1 100644
--- a/wsd/Admin.cpp
+++ b/wsd/Admin.cpp
@@ -283,7 +283,11 @@ AdminSocketHandler::AdminSocketHandler(Admin* adminManager)
void AdminSocketHandler::sendTextFrame(const std::string& message)
{
-UnitWSD::get().onAdminQueryMessage(message);
+if (!Util::isFuzzing())
+{
+UnitWSD::get().onAdminQueryMessage(message);
+}
+
if (_isAuthenticated)
{
LOG_TRC("send admin text frame '" << message << "'");
diff --git a/wsd/Admin.hpp b/wsd/Admin.hpp
index 6a2a3c752..5d3cd4b05 100644
--- a/wsd/Admin.hpp
+++ b/wsd/Admin.hpp
@@ -38,13 +38,13 @@ public:
static void subscribeAsync(const std::shared_ptr&
handler);
+/// Process incoming websocket messages
+void handleMessage(const std::vector &data) override;
+
private:
/// Sends text frames simpl
[Libreoffice-commits] core.git: sc/source
sc/source/ui/miscdlgs/filldlg.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0ec042dd2488989e7a9c45309b408ec8b8326208 Author: Caolán McNamara AuthorDate: Thu Apr 2 09:27:46 2020 +0100 Commit: Caolán McNamara CommitDate: Thu Apr 2 12:08:14 2020 +0200 cid#1460967 Division or modulo by float zero Change-Id: I2322ac1abec040d14fbffaf495c83cf3303fee92 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91547 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/sc/source/ui/miscdlgs/filldlg.cxx b/sc/source/ui/miscdlgs/filldlg.cxx index 6fb1934c0929..f47ee81942c7 100644 --- a/sc/source/ui/miscdlgs/filldlg.cxx +++ b/sc/source/ui/miscdlgs/filldlg.cxx @@ -205,7 +205,7 @@ weld::Entry* ScFillSeriesDlg::CheckValues() m_nSelectHeight - 1 : m_nSelectWidth - 1 ; if ( aStartStr.isEmpty() ) fStartVal = fEndVal - fIncrement * nStepAmount; -if ( aIncStr.isEmpty() ) +if ( aIncStr.isEmpty() && nStepAmount != 0 ) fIncrement = (fEndVal - fStartVal) / nStepAmount; } else ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/docxexport.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit bedce5f2b383c38b8fe051e4e63b76e116c5ffb4
Author: Caolán McNamara
AuthorDate: Thu Apr 2 09:25:02 2020 +0100
Commit: Caolán McNamara
CommitDate: Thu Apr 2 12:07:59 2020 +0200
cid#1418980 Resource leak
Change-Id: I3a09b3165503bacbd2bab394eda9adc793f0bff9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91546
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sw/source/filter/ww8/docxexport.cxx
b/sw/source/filter/ww8/docxexport.cxx
index f9af8d2937cf..035f50cbeaac 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -1210,7 +1210,7 @@ void DocxExport::WriteSettings()
if (rAttributeList.hasElements())
{
-sax_fastparser::FastAttributeList* pAttributeList =
sax_fastparser::FastSerializerHelper::createAttrList();
+rtl::Reference
xAttributeList = sax_fastparser::FastSerializerHelper::createAttrList();
bool bIsProtectionTrackChanges = false;
// if grabbag protection is not enforced, allow Writer
protection to override
bool bEnforced = false;
@@ -1234,7 +1234,7 @@ void DocxExport::WriteSettings()
if (sal_Int32 nToken = DocxStringGetToken(aTokens,
rAttribute.Name))
{
OUString sValue = rAttribute.Value.get();
-pAttributeList->add(FSNS(XML_w, nToken),
sValue.toUtf8());
+xAttributeList->add(FSNS(XML_w, nToken),
sValue.toUtf8());
if ( nToken == XML_edit && sValue ==
"trackedChanges" )
bIsProtectionTrackChanges = true;
else if ( nToken == XML_edit && sValue ==
"readOnly" )
@@ -1264,8 +1264,8 @@ void DocxExport::WriteSettings()
if ( bUseGrabBagProtection )
{
-sax_fastparser::XFastAttributeListRef
xAttributeList(pAttributeList);
-pFS->singleElementNS(XML_w, XML_documentProtection,
xAttributeList);
+sax_fastparser::XFastAttributeListRef
xFastAttributeList(xAttributeList.get());
+pFS->singleElementNS(XML_w, XML_documentProtection,
xFastAttributeList);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: kit/ChildSession.cpp
kit/ChildSession.cpp | 22 +++---
1 file changed, 15 insertions(+), 7 deletions(-)
New commits:
commit 01509b4087904cacc4f71c6758c13a1920334e1f
Author: Tor Lillqvist
AuthorDate: Wed Apr 1 17:51:15 2020 +0300
Commit: Tor Lillqvist
CommitDate: Thu Apr 2 11:47:09 2020 +0200
Tweak the (normally commented-out) experimentation code a bit
Change-Id: I58b9c83a87e6e07421b5a29c13b3b00034c87a1a
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91543
Tested-by: Tor Lillqvist
Reviewed-by: Tor Lillqvist
diff --git a/kit/ChildSession.cpp b/kit/ChildSession.cpp
index 1289c862c..54d5350b5 100644
--- a/kit/ChildSession.cpp
+++ b/kit/ChildSession.cpp
@@ -930,15 +930,13 @@ bool ChildSession::downloadAs(const char* /*buffer*/, int
/*length*/, const Stri
completionHandler:^(NSDictionary *services,
NSError *error) {
if (services == nil) {
-LOG_TRC("Could not get file provider services for " <<
[[docURL absoluteString] UTF8String]);
+std::cerr << "Could not get file provider services for " <<
[[docURL absoluteString] UTF8String] << "\n";
} else if ([services count] == 0) {
-LOG_TRC("No file provider services returned for " << [[docURL
absoluteString] UTF8String]);
+std::cerr << "No file provider services returned for " <<
[[docURL absoluteString] UTF8String] << "\n";
} else {
-LOG_TRC("File provider services for " << [[docURL
absoluteString] UTF8String]);
-NSEnumerator *keyEnumerator = [services keyEnumerator];
-NSString *key;
-while ((key = (NSString*)[keyEnumerator nextObject])) {
-LOG_TRC(" " << key);
+std::cerr << "File provider services for " << [[docURL
absoluteString] UTF8String] << ":\n";
+for (auto key in [services allKeys]) {
+std::cerr << " " << [(NSString*)key UTF8String] << "\n";
}
}
}];
@@ -947,6 +945,16 @@ bool ChildSession::downloadAs(const char* /*buffer*/, int
/*length*/, const Stri
// Alas, this seems to work only for documents on iCloud Drive.
NSError *error;
auto resources = [docURL
promisedItemResourceValuesForKeys:@[NSURLUbiquitousItemContainerDisplayNameKey]
error:&error];
+if (resources == nil) {
+std::cerr << "Could not get ubiquitous container names for " <<
[[docURL absoluteString] UTF8String] << "\n";
+} else if ([resources count] == 0) {
+std::cerr << "No ubiquitous container names for " << [[docURL
absoluteString] UTF8String] << "\n";
+} else {
+std::cerr << "Ubiquitous container names for " << [[docURL
absoluteString] UTF8String] << ":\n";
+for (auto name in [resources allValues]) {
+std::cerr << " " << [(NSString*)name UTF8String] << "\n";
+}
+}
#endif
NSArray *pathComponents = [docURL pathComponents];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/source
desktop/source/lib/init.cxx | 10 ++
1 file changed, 10 insertions(+)
New commits:
commit dff729704687889f960562f0ac6fa62b47897cf9
Author: Dennis Francis
AuthorDate: Wed Apr 1 20:20:19 2020 +0530
Commit: Andras Timar
CommitDate: Thu Apr 2 11:14:37 2020 +0200
tdf#127158 :lokit: preload liblocaledata_others.so
...even if LOK_WHITELIST_LANGUAGES does not contain an Asian language.
Not preloading this module causes locale-fallbacks for example
when a calc-cell with Asian locale has some date with number-formatting,
LOOL displays the date with the fallback locale(en_US).
(more details in comments)
Change-Id: Id8a31565f7f0f0262c044028f55fdf4fe33ecec8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91510
Tested-by: Jenkins
Reviewed-by: Andras Timar
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index c54fb771080c..4cf69495f10c 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -91,6 +91,8 @@
#include
#include
+#include
+#include
#include
#include
@@ -5661,6 +5663,14 @@ static void preloadData()
}
std::cerr << "\n";
+// Hack to load and cache the module liblocaledata_others.so which is not
loaded normally
+// (when loading dictionaries of just non-Asian locales). Creating a
XCalendar4 of one Asian locale
+// will cheaply load this missing "others" locale library. Appending an
Asian locale in
+// LOK_WHITELIST_LANGUAGES env-var also works but at the cost of loading
that dictionary.
+css::uno::Reference< css::i18n::XCalendar4 > xCal =
css::i18n::LocaleCalendar2::create(comphelper::getProcessComponentContext());
+css::lang::Locale aAsianLocale = {"hi", "IN", ""};
+xCal->loadDefaultCalendar(aAsianLocale);
+
// preload all available thesauri
css::uno::Reference
xThesaurus(xLngSvcMgr->getThesaurus());
css::uno::Reference
xThesLocales(xSpellChecker, css::uno::UNO_QUERY_THROW);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: I want to join the development of libreoffice
Welcome, Am 02.04.20 um 10:47 schrieb himajin10: > https://wiki.documentfoundation.org/Development > > Building LibreOffice and reading about gerrit is good point to start > with, I believe. There is especially the GetInvolved page: https://wiki.documentfoundation.org/Development/GetInvolved Thanks for your interest in the project, Jan-Marek ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sysui/CustomTarget_share.mk
sysui/CustomTarget_share.mk |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 13aebf3dc75a73b381fb8d72c9788a8ee5aa911c Author: Stephan Bergmann AuthorDate: Thu Apr 2 09:43:13 2020 +0200 Commit: Stephan Bergmann CommitDate: Thu Apr 2 11:02:58 2020 +0200 Missing dependency ...since d2c23609083d7b3e5267b1e4c923476cbc509d00 "tdf#130911: convert desktop-translate from Perl to Python." Change-Id: I091e137041740e127606e78d2a04163647dba8af Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91544 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/sysui/CustomTarget_share.mk b/sysui/CustomTarget_share.mk index b613c56cda3c..7402dddf46b4 100644 --- a/sysui/CustomTarget_share.mk +++ b/sysui/CustomTarget_share.mk @@ -237,7 +237,8 @@ endef $(foreach launcher,$(LAUNCHERLIST),$(eval $(call sysui_Desktop_rule,$(launcher $(share_WORKDIR)/%/build.flag: $(share_SRCDIR)/share/brand.pl $(LAUNCHERS) \ - $(share_TRANSLATE) $(addprefix $(share_WORKDIR)/,$(ULFS)) + $(share_TRANSLATE) $(addprefix $(share_WORKDIR)/,$(ULFS)) \ + $(call gb_ExternalExecutable_get_dependencies,python) mkdir -p $(dir $@) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1) $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),PRL) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Minutes from the UX/design meeting 2020-Apr-01
Present: John, Heiko Comments: RGB Tickets/Topic * Bibliography entries created From document content should be persistent + https://bugs.documentfoundation.org/show_bug.cgi?id=109037 + if we automatically add the entry it's not possible to have multiple bibliography databases, which is not yet possible + but there might be use cases => recommend to close as WFM * File save dialogs appear twice if user reconsiders non-ODF format to ODF during save + https://bugs.documentfoundation.org/show_bug.cgi?id=95701 + c3 for step by step use case + a) suppress second file dialog when only the extension changes + b) add extension to the specified name like test.docx.odt + c) resolve as WFM (when the name changes it requires confirmation) => comment with recommendation c) * Simplify and upgrade the page numbering system + https://bugs.documentfoundation.org/show_bug.cgi?id=99059 + use cases in c5 + WFM (RGB) + numbering is defined by the format and needs cross-application support + omit page numbers with a style; edit field and use offset to adjust numbering; solve special use cases with extension => WFM * Grouping frames together and with other drawing elements in Writer + https://bugs.documentfoundation.org/show_bug.cgi?id=95171 + if grouping is not possible we could provide alignment or just resolve as WFM => suggest alignment * Sidebar deck for reviewing spelling and grammar mistakes + https://bugs.documentfoundation.org/show_bug.cgi?id=105663 + good for GSoC'21 + review mockup in c8 or... + WFM as this use case is not suited for the sidebar + just a few comments on the ticket, low interest (John) => WFM signature.asc Description: OpenPGP digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: svx/source
svx/source/svdraw/svdoedge.cxx |2 --
1 file changed, 2 deletions(-)
New commits:
commit 3fca0f501f6bc58039a0d49ee6704e59d90f5437
Author: Caolán McNamara
AuthorDate: Thu Apr 2 09:08:45 2020 +0100
Commit: Caolán McNamara
CommitDate: Thu Apr 2 10:53:48 2020 +0200
cid#1461094 Unchecked return value
Rectangle::IsOver is only useful for its ignored return, so remove
it and thus aMouseRect2
Change-Id: I6b93de4d0d62dd56abe52cc0b65c7d905f4c847e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91545
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index 8218f2659e95..327ed76d661c 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -2225,12 +2225,10 @@ bool SdrEdgeObj::ImpFindConnector(const Point& rPt,
const SdrPageView& rPV, SdrO
}
}
if (bFnd) {
-tools::Rectangle aMouseRect2(rPt,rPt);
aMouseRect.AdjustLeft( -nBoundHitTol );
aMouseRect.AdjustTop( -nBoundHitTol );
aMouseRect.AdjustRight(nBoundHitTol );
aMouseRect.AdjustBottom(nBoundHitTol );
-aObjBound.IsOver(aMouseRect2);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: I want to join the development of libreoffice
This is a mail resent to libreoffice dev mailing list, because I carelessly sent a personal mail. === Hi, https://wiki.documentfoundation.org/Development Building LibreOffice and reading about gerrit is good point to start with, I believe. -- himajin10 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
I want to join the development of libreoffice
I am a C ++ developer for more than 10 years, and I am familiar with the structure of libreoffice. I have also developed secondary development for libreoffice. I want to join you to develop and contribute to my own strength. How do I join? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/source
vcl/source/app/salvtables.cxx | 14 --
1 file changed, 12 insertions(+), 2 deletions(-)
New commits:
commit 2c15856b0a7ea789844d8f37633bea57ebee72db
Author: Jim Raykowski
AuthorDate: Tue Mar 24 03:36:57 2020 -0800
Commit: Jim Raykowski
CommitDate: Thu Apr 2 10:25:15 2020 +0200
tdf#131586 Keep Writer Navigator content view vertical scroll position
Change-Id: Ic968a3c6b80e13077a6b9a0cb05a8181723f29f7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90979
Tested-by: Jenkins
Reviewed-by: Jim Raykowski
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 0c5d94fbf09e..d43dda8ffec1 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -4554,13 +4554,23 @@ public:
virtual int vadjustment_get_value() const override
{
-ScrollBar* pVertScrollBar = m_xTreeView->GetVScroll();
-return pVertScrollBar->GetThumbPos();
+int nValue = -1;
+const SvTreeListEntry* pEntry = m_xTreeView->GetFirstEntryInView();
+if (pEntry)
+nValue = m_xTreeView->GetAbsPos(pEntry);
+return nValue;
}
virtual void vadjustment_set_value(int nValue) override
{
+if (nValue == -1)
+return;
+bool bUpdate = m_xTreeView->IsUpdateMode();
+if (bUpdate)
+m_xTreeView->SetUpdateMode(false);
m_xTreeView->ScrollToAbsPos(nValue);
+if (bUpdate)
+m_xTreeView->SetUpdateMode(true);
}
virtual ~SalInstanceTreeView() override
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Failing CppunitTest_xmlsecurity_signing on Windows
On 2020-04-01 21:58, Mike Kaganski wrote: > On 2020-04-01 18:19, Mike Kaganski wrote: >> Since yesterday, `make CppunitTest_xmlsecurity_signing` fails for me >> locally in x64 build on Windows >> ... > > https://gerrit.libreoffice.org/c/core/+/91531 attempts to fix this. > Thanks Miklos! Merged now as https://git.libreoffice.org/core/+/e946e8f2280a5955a7fe6f8035d7ffad6862a6b3. Still no idea why had it only started hitting me lately. -- Best regards, Mike Kaganski pEpkey.asc Description: application/pgp-keys ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-1' - loleaflet/src
loleaflet/src/control/Control.PartsPreview.js |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit eef4edf8f6e454e607f4d3bc80af8d31c15e10df
Author: Henry Castro
AuthorDate: Thu Mar 19 11:52:54 2020 -0400
Commit: Aron Budea
CommitDate: Thu Apr 2 10:13:39 2020 +0200
loleaflet: check if "parts" variable is a number of the preview thumbnail
While I was debugging Impress, I received unexpected "undefined"
value of the variable "parts"
Change-Id: Id8b6737155516fd0d8cfaa350170e9c631c55dcf
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90756
Tested-by: Henry Castro
Reviewed-by: Henry Castro
(cherry picked from commit af338541a88d4f90d1859ba60d8de6e3e90f1423)
diff --git a/loleaflet/src/control/Control.PartsPreview.js
b/loleaflet/src/control/Control.PartsPreview.js
index c6cd021fb..0dbff5411 100644
--- a/loleaflet/src/control/Control.PartsPreview.js
+++ b/loleaflet/src/control/Control.PartsPreview.js
@@ -65,7 +65,7 @@ L.Control.PartsPreview = L.Control.extend({
var selectedPart = e.selectedPart;
var selectedParts = e.selectedParts;
var docType = e.docType;
- if (docType === 'text') {
+ if (docType === 'text' || isNaN(parts)) {
return;
}
___
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-1' - loleaflet/src
loleaflet/src/layer/tile/TileLayer.js |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 678603049465851e09c189014960553b4476618e
Author: Michael Meeks
AuthorDate: Wed Apr 1 14:44:59 2020 +0100
Commit: Andras Timar
CommitDate: Thu Apr 2 10:09:09 2020 +0200
Avoid de-referencing non-existing marker.
This screws up cursors across views in some circumstances,
when there is no marker in one of the views.
Regression from 3b0478baab1e58a45fc723e9265942bf5d4c10fa
Change-Id: Ia1294d83801d656a919f97206b7b573a1b74b77f
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91508
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/loleaflet/src/layer/tile/TileLayer.js
b/loleaflet/src/layer/tile/TileLayer.js
index 17521d449..bfac945ab 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -2253,7 +2253,8 @@ L.TileLayer = L.GridLayer.extend({
this._viewLayerGroup.removeLayer(viewCursorMarker);
}
- this._viewCursors[viewId].marker.showCursorHeader();
+ if (this._viewCursors[viewId].marker)
+ this._viewCursors[viewId].marker.showCursorHeader();
},
updateAllViewCursors : function() {
___
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.2' - desktop/source
desktop/source/lib/init.cxx | 10 ++
1 file changed, 10 insertions(+)
New commits:
commit 6e5cf6d3aafaede128dd762be273729a271462f8
Author: Dennis Francis
AuthorDate: Wed Apr 1 20:20:19 2020 +0530
Commit: Andras Timar
CommitDate: Thu Apr 2 09:54:57 2020 +0200
tdf#127158 :lokit: preload liblocaledata_others.so
...even if LOK_WHITELIST_LANGUAGES does not contain an Asian language.
Not preloading this module causes locale-fallbacks for example
when a calc-cell with Asian locale has some date with number-formatting,
LOOL displays the date with the fallback locale(en_US).
(more details in comments)
Change-Id: Id8a31565f7f0f0262c044028f55fdf4fe33ecec8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91529
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index c544984ade50..612b6a51ceac 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -95,6 +95,8 @@
#include
#include
+#include
+#include
#include
#include
@@ -5662,6 +5664,14 @@ static void preloadData()
}
std::cerr << "\n";
+// Hack to load and cache the module liblocaledata_others.so which is not
loaded normally
+// (when loading dictionaries of just non-Asian locales). Creating a
XCalendar4 of one Asian locale
+// will cheaply load this missing "others" locale library. Appending an
Asian locale in
+// LOK_WHITELIST_LANGUAGES env-var also works but at the cost of loading
that dictionary.
+css::uno::Reference< css::i18n::XCalendar4 > xCal =
css::i18n::LocaleCalendar2::create(comphelper::getProcessComponentContext());
+css::lang::Locale aAsianLocale = {"hi", "IN", ""};
+xCal->loadDefaultCalendar(aAsianLocale);
+
// preload all available thesauri
css::uno::Reference
xThesaurus(xLngSvcMgr->getThesaurus());
css::uno::Reference
xThesLocales(xSpellChecker, css::uno::UNO_QUERY_THROW);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmlsecurity/source
xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx |2 +- xmlsecurity/source/xmlsec/errorcallback.cxx |5 +++-- xmlsecurity/source/xmlsec/mscrypt/akmngr.cxx |4 xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx |3 ++- xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx |4 ++-- xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx |3 +-- xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx |2 +- xmlsecurity/source/xmlsec/xmlsec_init.cxx|4 +++- xmlsecurity/source/xmlsec/xmlstreamio.cxx|4 ++-- 9 files changed, 19 insertions(+), 12 deletions(-) New commits: commit e946e8f2280a5955a7fe6f8035d7ffad6862a6b3 Author: Mike Kaganski AuthorDate: Wed Apr 1 19:53:33 2020 +0300 Commit: Miklos Vajna CommitDate: Thu Apr 2 09:54:26 2020 +0200 xmlsec-wrapper.h must be included before any xmlsec header This fixes structs size mismatch between xmlsec and its users because of XMLSEC_NO_SIZE_T not yet defined at the time of their definition. See https://lists.freedesktop.org/archives/libreoffice/2020-April/084800.html Change-Id: I8de9a012f849d9a5a84f5ce580484b66192d1e06 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91531 Tested-by: Jenkins Reviewed-by: Miklos Vajna diff --git a/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx b/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx index f11a3680f2ea..3b4e138aebee 100644 --- a/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx +++ b/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx @@ -19,6 +19,7 @@ #include #include +#include #include #include @@ -41,7 +42,6 @@ #include #include "SecurityEnvironment.hxx" -#include using namespace css::uno; using namespace css::lang; diff --git a/xmlsecurity/source/xmlsec/errorcallback.cxx b/xmlsecurity/source/xmlsec/errorcallback.cxx index 0749524056cb..a535ffa770d3 100644 --- a/xmlsecurity/source/xmlsec/errorcallback.cxx +++ b/xmlsecurity/source/xmlsec/errorcallback.cxx @@ -17,10 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include - +#include #include +#include + #include #include diff --git a/xmlsecurity/source/xmlsec/mscrypt/akmngr.cxx b/xmlsecurity/source/xmlsec/mscrypt/akmngr.cxx index 48598aed1417..ec3cecd4a751 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/akmngr.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/akmngr.cxx @@ -16,6 +16,10 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ + +#include +#include + #include "akmngr.hxx" #include diff --git a/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx index cceedb869ba2..00b6e12f7aac 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.cxx @@ -17,12 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include +#include #include "seinitializer_mscryptimpl.hxx" #include "securityenvironment_mscryptimpl.hxx" -#include #include #include #include diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx index 9d5b4df3e845..2f33df7c911c 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.cxx @@ -18,14 +18,14 @@ */ #include +#include + #include #include "securityenvironment_mscryptimpl.hxx" #include #include "akmngr.hxx" -#include - #include using namespace ::com::sun::star; diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx index bed9cbd07213..dcbad0348091 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx @@ -19,6 +19,7 @@ #include #include +#include #include #include @@ -31,8 +32,6 @@ #include #include -#include - using namespace ::com::sun::star; using namespace ::com::sun::star::uno ; using namespace ::com::sun::star::lang ; diff --git a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx index 834bf57694fa..32e4335a5207 100644 --- a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx @@ -18,6 +18,7 @@ */ #include +#include #include #include @@ -25,7 +26,6 @@ #include "securityenvironment_nssimpl.hxx" -#include #include #include diff --git
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/inc/content.hxx | 15 ---
sw/source/uibase/utlui/content.cxx |6 ++
2 files changed, 2 insertions(+), 19 deletions(-)
New commits:
commit f96ce4da54200dc06d995c82cc1834c0d06241b9
Author: Noel Grandin
AuthorDate: Thu Apr 2 08:37:27 2020 +0200
Commit: Noel Grandin
CommitDate: Thu Apr 2 09:23:35 2020 +0200
SwRegionContent is unnecessary
after
commit 5a2c0ab29719ac914d30d8789c0e386541702cbf
Date: Fri Feb 28 11:13:12 2020 +
weld writer navigator
found by loplugin:unusedmethods
Change-Id: Icbfa9de744f43fc36a2d19213185928090342f4c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91542
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sw/source/uibase/inc/content.hxx b/sw/source/uibase/inc/content.hxx
index 414db7068dcb..4bb37efaa544 100644
--- a/sw/source/uibase/inc/content.hxx
+++ b/sw/source/uibase/inc/content.hxx
@@ -53,21 +53,6 @@ class SwOutlineContent : public SwContent
boolIsMoveable() const {return bIsMoveable;};
};
-class SwRegionContent : public SwContent
-{
-
-sal_uInt8 nRegionLevel;
-
-public:
-SwRegionContent(const SwContentType* pCnt,
-const OUString& rName,
-sal_uInt8 nLevel,
-long nYPos) :
-SwContent(pCnt, rName, nYPos),
-nRegionLevel(nLevel){}
-sal_uInt8 GetRegionLevel() const {return nRegionLevel;}
-};
-
class SwURLFieldContent : public SwContent
{
OUString sURL;
diff --git a/sw/source/uibase/utlui/content.cxx
b/sw/source/uibase/utlui/content.cxx
index 366816e032f2..fa20a29864ff 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -369,8 +369,7 @@ void SwContentType::Init(bool* pbInvalidateWindow)
pParentFormat = pParentFormat->GetParent();
}
-std::unique_ptr pCnt(new SwRegionContent(this,
rSectionName,
-nLevel,
+std::unique_ptr pCnt(new SwContent(this,
rSectionName,
pFormat->FindLayoutRect( false, &aNullPt ).Top()));
SwPtrMsgPoolItem aAskItem( RES_CONTENT_VISIBLE, nullptr );
@@ -675,8 +674,7 @@ void SwContentType::FillMemberList(bool*
pbLevelOrVisibilityChanged)
pParentFormat = pParentFormat->GetParent();
}
-std::unique_ptr pCnt(new SwRegionContent(this,
sSectionName,
-nLevel,
+std::unique_ptr pCnt(new SwContent(this,
sSectionName,
pFormat->FindLayoutRect( false, &aNullPt ).Top()));
if( !pFormat->GetInfo( aAskItem ) &&
!aAskItem.pObject ) // not visible
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Tibor Nagy license statement
All of my past & future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. Figyelmeztet?s Ez az e-mail ?zenet, a fenti c?mzetteknek sz?nt, ?zleti titoktart?s al? es? bizalmas inform?ci?kat tartalmaz. T?ves k?zbes?t?s eset?n k?rj?k, ?rtes?tsen a fent megjel?lt telefon, fax sz?mokon, vagy e-mail c?men. Az eredeti p?ld?ny visszak?ld?s?r?l c?m?nkre, majd t?rl?s?r?l, azonnal rendelkezni sz?veskedjen. Notice: This e-mail contains privileged and confidential business information intended only for the use of addresses(s) named above. Should you have received it in error, please notify us by phone or e-mail, and delete after returning the original e-mail to our address. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] online.git: loleaflet/css
loleaflet/css/device-mobile.css | 171 +++
loleaflet/css/toolbar-mobile.css | 171 ---
2 files changed, 171 insertions(+), 171 deletions(-)
New commits:
commit b934b84ba0cb1bd8d8c51b18cf9fa62224f09a4f
Author: Jan Holesovsky
AuthorDate: Wed Apr 1 12:22:45 2020 +0200
Commit: Jan Holesovsky
CommitDate: Thu Apr 2 09:07:04 2020 +0200
mobile: Move the toolbar-related pieces.
Change-Id: I3cedfbdb6641d3e58f8faf16846cc25beb36e768
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91481
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Jan Holesovsky
diff --git a/loleaflet/css/device-mobile.css b/loleaflet/css/device-mobile.css
index 1dc1040fc..2ce4d27d2 100644
--- a/loleaflet/css/device-mobile.css
+++ b/loleaflet/css/device-mobile.css
@@ -342,3 +342,174 @@
button.vex-dialog-button-secondary.vex-dialog-button.vex-last {
padding-top: 160px !important;
padding-bottom: 160px !important;
}
+
+/* Related to toolbar.css */
+.insertshape-grid {
+ box-sizing: content-box;
+ position: absolute;
+ padding: 2px 0px 2px 0px;
+ display: inline-block;
+ width: 100%;
+ height: 100%;
+ overflow-y: scroll;
+}
+#toolbar-up.w2ui-toolbar{
+ padding-top: 0px;
+ padding-bottom: 0px;
+}
+#formulabar {
+ padding: 0px !important;
+ border-top: 1px solid #bb !important;
+}
+#tb_actionbar_item_fullscreen{display: none;}
+#toolbar-down {
+ height: 34px !important;
+ border-top: 1px solid #f1f1f1 !important;
+}
+#toolbar-down > .w2ui-scroll-wrapper {
+ overflow-x: scroll !important;
+ scrollbar-width: none; /*css draft (firefox only)*/
+ -ms-scrollbar: none; /*ie*/
+}
+#toolbar-down > .w2ui-scroll-wrapper::-webkit-scrollbar { /*webkit only*/
+ display: none;
+}
+#toolbar-down .w2ui-scroll-left, #toolbar-down .w2ui-scroll-right{
+ background: none;
+ height: 100%;
+ width: 0px;
+ top: 0%;
+ box-shadow: 8px 0 13px 2px #0b87e7, -6px 0px 6px 6px #007cdc;
+ border-radius: 0px;
+}
+#toolbar-down .w2ui-scroll-right{
+ right: 0;
+ -webkit-transform: rotate(180deg);
+ -moz-transform: rotate(180deg);
+ -ms-transform: rotate(180deg);
+ -o-transform: rotate(180deg);
+ transform: rotate(180deg);
+}
+#addressInput{
+ width: 60px !important;
+ border: 1px solid #bb;
+ border-bottom: none;
+ border-top: none;
+ border-left: none;
+ height: 35px !important;
+}
+.w2ui-icon.equal, .w2ui-icon.autosum{width: 38px !important;}
+#formulaInput{
+ border: 1px solid #bb;
+ border-bottom: none;
+ border-top: none;
+ border-right: none;
+ height: 35px !important;
+}
+
+#calc-inputbar-wrapper {
+ display: block;
+ border: none;
+}
+
+#calc-inputbar {
+ display: block;
+ width: 100%;
+ position: relative;
+ padding:0px;
+ margin: 0px;
+}
+
+#tb_actionbar_item_undo .w2ui-tb-image, #tb_actionbar_item_redo
.w2ui-tb-image, #tb_actionbar_item_mobile_wizard .w2ui-tb-image,
#tb_actionbar_item_prev .w2ui-tb-image, #tb_actionbar_item_next
.w2ui-tb-image, #tb_actionbar_item_insertion_mobile_wizard .w2ui-tb-image,
#tb_actionbar_item_insertcomment .w2ui-tb-image,
#tb_actionbar_item_fullscreen-presentation .w2ui-tb-image{
+ min-width: 38px;
+}
+
+#tb_actionbar_item_userlist table{
+ margin: -1px 0px auto 3px !important;
+}
+#toolbar-up .checked{
+ border-color: #fff !important;
+ background: none !important;
+}
+#toolbar-up .checked .w2ui-tb-image, #toolbar-up .w2ui-tb-image:hover,
#toolbar-up .w2ui-tb-image:focus, #toolbar-up .w2ui-tb-image:active,
#toolbar-hamburger.menuwizard-closed:active{
+ -webkit-filter: drop-shadow(0px 0px 4px #0b87e7);
+ filter: drop-shadow(0px 0px 4px #0b87e7);
+}
+#toolbar-up .over{
+ border-color: #fff !important;
+}
+#toolbar-up .over:hover .w2ui-tb-image, #toolbar-up .over:active
.w2ui-tb-image{
+ -webkit-filter: drop-shadow(0px 0px 4px #0b87e7);
+ filter: drop-shadow(0px 0px 4px #0b87e7);
+ border-color: #fff transparent;
+}
+#toolbar-down table.w2ui-button .w2ui-tb-image {
+ margin: 5px 9px 3px 9px!important;
+}
+.w2ui-toolbar .w2ui-break{
+ background-image: none;
+ background-color: #dae6f3;
+}
+#setgamma input.spinfield, #linewidth input.spinfield, #nolines
input.spinfield{
+ width: 140px !important;
+}
+td[id^=tb_spreadsheet-toolbar_item] table.w2ui-button.over {
+ background: none;
+ border-color: #fff;
+}
+td[id^=tb_spreadsheet-toolbar_item]:focus table.w2ui-button,
td[id^=tb_spreadsheet-toolbar_item]:active table.w2ui-button{
+ background-color: #eaf5ff;
+ outline: none;
+}
+td[id^=tb_spreadsheet-toolbar_item]:focus table.w2ui-button div.w2ui-icon,
td[id^=tb_spreadsheet-toolbar_item]:active table.w2ui-but
[Libreoffice-commits] online.git: 2 commits - loleaflet/css loleaflet/Makefile.am
loleaflet/Makefile.am|1
loleaflet/css/device-mobile.css | 192 +++
loleaflet/css/spreadsheet-mobile.css | 89
loleaflet/css/vex.css| 105 ---
4 files changed, 192 insertions(+), 195 deletions(-)
New commits:
commit f3635714fd93102d22fc7d921360d8bf1e2a68c7
Author: Jan Holesovsky
AuthorDate: Wed Apr 1 12:22:10 2020 +0200
Commit: Jan Holesovsky
CommitDate: Thu Apr 2 09:06:54 2020 +0200
mobile: Move the vex-related pieces.
Change-Id: I5b21d6adfef1443ecea8936788d5eca8d4b83c34
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91480
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Jan Holesovsky
diff --git a/loleaflet/css/device-mobile.css b/loleaflet/css/device-mobile.css
index 34f584a48..1dc1040fc 100644
--- a/loleaflet/css/device-mobile.css
+++ b/loleaflet/css/device-mobile.css
@@ -239,3 +239,106 @@ div#w2ui-overlay-actionbar.w2ui-overlay{
background-color: #ee;
border-radius: 0px;
}
+
+/* Related to vex.css */
+.vex-open .loleaflet-user-idle {
+ background: rgba(0, 0, 0, 0)!important;
+ font-size: xx-large!important;
+ color: #fff!important;
+ text-align: center!important;
+}
+.vex.vex-theme-plain .vex-dialog-form .vex-dialog-input select,
.vex.vex-theme-plain .vex-dialog-form .vex-dialog-input textarea,
.vex.vex-theme-plain .vex-dialog-form .vex-dialog-input input[type="date"],
.vex.vex-theme-plain .vex-dialog-form .vex-dialog-input input[type="datetime"],
.vex.vex-theme-plain .vex-dialog-form .vex-dialog-input
input[type="datetime-local"], .vex.vex-theme-plain .vex-dialog-form
.vex-dialog-input input[type="email"], .vex.vex-theme-plain .vex-dialog-form
.vex-dialog-input input[type="month"], .vex.vex-theme-plain .vex-dialog-form
.vex-dialog-input input[type="number"], .vex.vex-theme-plain .vex-dialog-form
.vex-dialog-input input[type="password"], .vex.vex-theme-plain .vex-dialog-form
.vex-dialog-input input[type="search"], .vex.vex-theme-plain .vex-dialog-form
.vex-dialog-input input[type="tel"], .vex.vex-theme-plain .vex-dialog-form
.vex-dialog-input input[type="text"], .vex.vex-theme-plain .vex-dialog-form
.vex-dialog-input input[type="time"], .vex.vex
-theme-plain .vex-dialog-form .vex-dialog-input input[type="url"],
.vex.vex-theme-plain .vex-dialog-form .vex-dialog-input input[type="week"]{
+ padding: 0 !important
+}
+.vex-dialog-input > textarea.loleaflet-annotation-textarea {
+ height: 198px;
+ border: 4px solid #f0f0f0 !important;
+ box-shadow: 0 0 1px 1px #dfdfdf;
+}
+.vex-dialog-input > textarea.loleaflet-annotation-textarea:focus {
+ height: 198px;
+ border: 4px solid #f0f0f0 !important;
+ box-shadow: 0 0 1px 1px #0b87e7 !important;
+}
+.vex-dialog-message {
+ text-align: center;
+ font-family: Trebuchet MS,Tahoma,Verdana,Arial,sans-serif !important;
+ font-size: 1em !important;
+ font-weight: 600 !important;
+}
+.vex.vex-theme-plain .vex-dialog-form .vex-dialog-input input[type="text"] {
+ border-radius: 4px !important;
+ background-color: #fff !important;
+ width: 100%;
+ width: -moz-available !important;
+ width: -webkit-fill-available !important;
+ width: fill-available !important;
+ border: 4px solid #fff !important;
+ box-shadow: 0 0 1px 1px #dfdfdf;
+}
+.vex.vex-theme-plain .vex-dialog-form .vex-dialog-input
input[type="text"]:focus {
+ border: 4px solid #fff !important;
+ box-shadow: 0 0 1px 1px #0b87e7 !important;
+ color: #0b87e7 !important;
+}
+.vex.vex-theme-plain .vex-dialog-form .vex-dialog-input
input[type="text"]:focus input{
+ color: #000 !important;
+}
+.vex-dialog-input {
+ font-family: Trebuchet MS,Tahoma,Verdana,Arial,sans-serif !important;
+ font-size: 0.8em;
+}
+.vex.vex-theme-plain .vex-content {
+ height: 100% !important;
+ max-width: 100% !important;
+ width: auto !important;
+ border: none;
+ box-shadow: none;
+ border-radius: none;
+}
+.vex.vex-theme-plain {
+ padding: 0px !important;
+ position: relative !important;
+ top: -42px !important;
+}
+.vex-open .vex-overlay {
+ z-index: 2000;
+ min-height: 100%;
+ position: absolute;
+ width: 100%;
+ width: -moz-available !important;
+ width: -webkit-fill-available !important;
+ width: fill-available !important;
+ top: 0;
+ background-color: white;
+}
+.vex.vex-theme-plain input {
+ font-size: 1.1em !important;
+}
+textarea.loleaflet-annotation-textarea {
+ min-width: -moz-available !important;
+ min-width: -webkit-fill-available !important;
+ min-width: fill-available !important;
+}
+button.vex-dialog-button-primary.vex-dialog-button.vex-first {
+ border: 1px solid #0b87e7 !important;
+ border-radius: 4px !important;
+ bac
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - i18npool/CppunitTest_i18npool_defaultnumberingprovider.mk i18npool/Module_i18npool.mk i18npool/qa i18npool/source
i18npool/CppunitTest_i18npool_defaultnumberingprovider.mk | 44
+++
i18npool/Module_i18npool.mk |1
i18npool/qa/cppunit/test_defaultnumberingprovider.cxx | 57
++
i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx | 28
4 files changed, 130 insertions(+)
New commits:
commit 2d86cf3155e1b09a758474517dceae8ee3a199ac
Author: Miklos Vajna
AuthorDate: Tue Mar 3 09:27:01 2020 +0100
Commit: Miklos Vajna
CommitDate: Thu Apr 2 09:06:03 2020 +0200
sw padded numbering: add layout
lcl_formatArabicZero() looks a bit over-complicated with its hardcoded
limit of 2. Word supports limits of 3, 4 and 5 as well, so prepare for
handling them in a generic way.
(cherry picked from commit 642b7706101a991efc7e312f59dece640d8bfb60)
Change-Id: If6e5634b11616f0ac05e1387016e22f4b171bbfb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91501
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Miklos Vajna
diff --git a/i18npool/CppunitTest_i18npool_defaultnumberingprovider.mk
b/i18npool/CppunitTest_i18npool_defaultnumberingprovider.mk
new file mode 100644
index ..421affb90b35
--- /dev/null
+++ b/i18npool/CppunitTest_i18npool_defaultnumberingprovider.mk
@@ -0,0 +1,44 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,i18npool_defaultnumberingprovider))
+
+$(eval $(call gb_CppunitTest_use_externals,i18npool_defaultnumberingprovider,\
+ boost_headers \
+))
+
+$(eval $(call
gb_CppunitTest_add_exception_objects,i18npool_defaultnumberingprovider, \
+i18npool/qa/cppunit/test_defaultnumberingprovider \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,i18npool_defaultnumberingprovider, \
+comphelper \
+cppu \
+sal \
+test \
+unotest \
+utl \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,i18npool_defaultnumberingprovider))
+
+$(eval $(call gb_CppunitTest_use_ure,i18npool_defaultnumberingprovider))
+$(eval $(call gb_CppunitTest_use_vcl,i18npool_defaultnumberingprovider))
+
+$(eval $(call
gb_CppunitTest_use_rdb,i18npool_defaultnumberingprovider,services))
+
+$(eval $(call
gb_CppunitTest_use_custom_headers,i18npool_defaultnumberingprovider,\
+ officecfg/registry \
+))
+
+$(eval $(call
gb_CppunitTest_use_configuration,i18npool_defaultnumberingprovider))
+
+# vim: set noet sw=4 ts=4:
diff --git a/i18npool/Module_i18npool.mk b/i18npool/Module_i18npool.mk
index 0e1f5e6cef72..8a770bb4f0e3 100644
--- a/i18npool/Module_i18npool.mk
+++ b/i18npool/Module_i18npool.mk
@@ -43,6 +43,7 @@ $(eval $(call gb_Module_add_check_targets,i18npool,\
CppunitTest_i18npool_test_characterclassification \
CppunitTest_i18npool_test_ordinalsuffix \
CppunitTest_i18npool_test_textsearch \
+ CppunitTest_i18npool_defaultnumberingprovider \
))
# vim: set noet sw=4 ts=4:
diff --git a/i18npool/qa/cppunit/test_defaultnumberingprovider.cxx
b/i18npool/qa/cppunit/test_defaultnumberingprovider.cxx
new file mode 100644
index ..2a1cb55502e2
--- /dev/null
+++ b/i18npool/qa/cppunit/test_defaultnumberingprovider.cxx
@@ -0,0 +1,57 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include
+
+#include
+#include
+#include
+
+#include
+#include
+
+using namespace ::com::sun::star;
+
+/// i18npool defaultnumberingprovider tests.
+class I18npoolDefaultnumberingproviderTest : public test::BootstrapFixture
+{
+};
+
+CPPUNIT_TEST_FIXTURE(I18npoolDefaultnumberingproviderTest, testArabicZero)
+{
+uno::Reference xComponentContext
+= comphelper::getComponentContext(getMultiServiceFactory());
+
+// 1 -> "01"
+uno::Reference xFormatter(
+text::DefaultNumberingProvider::create(xComponentContext),
uno::UNO_QUERY);
+uno::Sequence aProperties = {
+comphelper::makePropertyValue("NumberingType",
+
static_cast(style::NumberingType::ARABIC_ZERO)),
+comphelper::makePropertyValue("Value", static_cast(1)),
+};
+lang::Locale aLocale;
+OUString aActual = xFormatter->makeNumberingString(aProperties, aLocale);
+// Without the accompanying fix in place, this test w
[Libreoffice-commits] core.git: sw/source
sw/source/core/doc/DocumentSettingManager.cxx | 35 +++--- 1 file changed, 32 insertions(+), 3 deletions(-) New commits: commit 38b6cef2d3fe707cbc7bc79399db4524176eda07 Author: Miklos Vajna AuthorDate: Wed Apr 1 22:22:51 2020 +0200 Commit: Miklos Vajna CommitDate: Thu Apr 2 09:05:39 2020 +0200 sw: handle ContinuousEndnotes when replacing compat options 1) Use grep 'bool mb' sw/source/core/inc/DocumentSettingManager.hxx|sed 's/.*bool \(mb[A-Za-z0-9]\+\).*/\1/' to get a complete list of document settings. 2) Replace the old ad-hoc list in ReplaceCompatibilityOptions() with a list of all settings. 3) Enable the settings which were enabled already. 4) The remaining list needs manual review to determine what is and what is not a compat option, but ContinuousEndnotes is definitely a compat one. The idea is that we have a large set of strange compat options and ideally ReplaceCompatibilityOptions() could be used to reset them to a sane default (if the user explicitly asks for it), but first ReplaceCompatibilityOptions() has to really replace all compat options. Change-Id: I0a86c812226b71bcf23bacbcc047bf76aa609a40 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91535 Tested-by: Jenkins Reviewed-by: Miklos Vajna diff --git a/sw/source/core/doc/DocumentSettingManager.cxx b/sw/source/core/doc/DocumentSettingManager.cxx index c9270116cb51..24616650c450 100644 --- a/sw/source/core/doc/DocumentSettingManager.cxx +++ b/sw/source/core/doc/DocumentSettingManager.cxx @@ -580,19 +580,29 @@ void sw::DocumentSettingManager::ReplaceCompatibilityOptions(const DocumentSetti Setn32DummyCompatibilityOptions1( rSource.Getn32DummyCompatibilityOptions1() ); Setn32DummyCompatibilityOptions2( rSource.Getn32DummyCompatibilityOptions2() ); +// No mbHTMLMode +// No mbIsGlobalDoc +// No mbGlblDocSaveLinks +// No mbIsLabelDoc +// No mbPurgeOLE +// No mbKernAsianPunctuation mbParaSpaceMax = rSource.mbParaSpaceMax; mbParaSpaceMaxAtPages = rSource.mbParaSpaceMaxAtPages; mbTabCompat = rSource.mbTabCompat; mbUseVirtualDevice = rSource.mbUseVirtualDevice; +mbAddFlyOffsets = rSource.mbAddFlyOffsets; +// No mbAddVerticalFlyOffsets mbAddExternalLeading = rSource.mbAddExternalLeading; +mbUseHiResolutionVirtualDevice = rSource.mbUseHiResolutionVirtualDevice; mbOldLineSpacing = rSource.mbOldLineSpacing; mbAddParaSpacingToTableCells = rSource.mbAddParaSpacingToTableCells; mbUseFormerObjectPos = rSource.mbUseFormerObjectPos; mbUseFormerTextWrapping = rSource.mbUseFormerTextWrapping; mbConsiderWrapOnObjPos = rSource.mbConsiderWrapOnObjPos; -mbAddFlyOffsets = rSource.mbAddFlyOffsets; +// No mbMathBaselineAlignment +// No mbStylesNoDefault +// No mbFloattableNomargins mbOldNumbering = rSource.mbOldNumbering; -mbUseHiResolutionVirtualDevice = rSource.mbUseHiResolutionVirtualDevice; mbIgnoreFirstLineIndentInNumbering = rSource.mbIgnoreFirstLineIndentInNumbering; mbDoNotJustifyLinesWithManualBreak = rSource.mbDoNotJustifyLinesWithManualBreak; mbDoNotResetParaAttrsForNumFont = rSource.mbDoNotResetParaAttrsForNumFont; @@ -602,9 +612,28 @@ void sw::DocumentSettingManager::ReplaceCompatibilityOptions(const DocumentSetti mbClipAsCharacterAnchoredWriterFlyFrames = rSource.mbClipAsCharacterAnchoredWriterFlyFrames; mbUnixForceZeroExtLeading = rSource.mbUnixForceZeroExtLeading; mbTabRelativeToIndent = rSource.mbTabRelativeToIndent; -mbTabAtLeftIndentForParagraphsInList = rSource.mbTabAtLeftIndentForParagraphsInList; +// No mbProtectForm mbMsWordCompTrailingBlanks = rSource.mbMsWordCompTrailingBlanks; +// No mbInvertBorderSpacing +// No mbCollapseEmptyCellPara +mbTabAtLeftIndentForParagraphsInList = rSource.mbTabAtLeftIndentForParagraphsInList; +// No mbSmallCapsPercentage66 +// No mbTabOverflow +// No mbUnbreakableNumberings +// No mbClippedPictures +// No mbBackgroundParaOverDrawings +// No mbTabOverMargin +// No mbTreatSingleColumnBreakAsPageBreak +// No mbSurroundTextWrapSmall +// No mbPropLineSpacingShrinksFirstLine +// No mbSubtractFlys +// No mbLastBrowseMode +// No mbDisableOffPagePositioning +// No mbEmptyDbFieldHidesPara mbEmptyDbFieldHidesPara = rSource.mbEmptyDbFieldHidesPara; +mbContinuousEndnotes = rSource.mbContinuousEndnotes; +// No mbProtectBookmarks +// No mbProtectFields } sal_uInt32 sw::DocumentSettingManager::Getn32DummyCompatibilityOptions1() const ___ 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|8
loleaflet/css/selectionMarkers.css |8
2 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 4c8f194183e9c48673bb97ae6d01c394eeb1cf1c
Author: Jan Holesovsky
AuthorDate: Wed Apr 1 11:48:35 2020 +0200
Commit: Jan Holesovsky
CommitDate: Thu Apr 2 09:06:07 2020 +0200
Mobile: Markers-related bits moved.
Change-Id: I8baf9e3b4bc384d6c2ef62c5e8dd2ad3c801fe20
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91478
Tested-by: Jan Holesovsky
Reviewed-by: Jan Holesovsky
diff --git a/loleaflet/css/device-mobile.css b/loleaflet/css/device-mobile.css
index 2f11e4530..ad605dfc8 100644
--- a/loleaflet/css/device-mobile.css
+++ b/loleaflet/css/device-mobile.css
@@ -142,3 +142,11 @@ div#w2ui-overlay-actionbar.w2ui-overlay{
#mCSB_1_scrollbar_horizontal .mCSB_draggerRail, #mCSB_2_scrollbar_horizontal
.mCSB_draggerRail, #mCSB_3_scrollbar_horizontal .mCSB_draggerRail{
background-color: #f2f2f2 !important;
}
+
+/* Related to selectionMarkers.css */
+#tb_formulabar_item_formula, #tb_formulabar_item_address {
+ height: 54px !important;
+}
+#tb_formulabar_item_formula > div, #tb_formulabar_item_address > div {
+ margin-top: -16px;
+}
diff --git a/loleaflet/css/selectionMarkers.css
b/loleaflet/css/selectionMarkers.css
index 9d2af07d6..f7acfabff 100644
--- a/loleaflet/css/selectionMarkers.css
+++ b/loleaflet/css/selectionMarkers.css
@@ -26,11 +26,3 @@
#tb_formulabar_item_formula .inputbar_selection_handles{
/*display: none;*/
}
-@media (max-width: 767px), (max-device-height: 767px) and (pointer: coarse) {
- #tb_formulabar_item_formula, #tb_formulabar_item_address {
- height: 54px !important;
- }
- #tb_formulabar_item_formula > div, #tb_formulabar_item_address > div {
- margin-top: -16px;
- }
-}
___
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.2' - 2 commits - i18npool/source include/editeng offapi/com svx/inc sw/qa sw/source writerfilter/source
i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx | 14
+++
include/editeng/svxenum.hxx |4 +-
offapi/com/sun/star/style/NumberingType.idl | 18
++
svx/inc/numberingtype.hrc |1
sw/qa/extras/ooxmlexport/data/symbol_chicago_list.docx|binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx |6
+++
sw/source/filter/ww8/docxattributeoutput.cxx |1
writerfilter/source/dmapper/ConversionHelper.cxx |4 +-
8 files changed, 46 insertions(+), 2 deletions(-)
New commits:
commit cb1a5aa51adfebe6ca5e0d39a3ed84daf8d6dd39
Author: Miklos Vajna
AuthorDate: Mon Mar 2 17:17:56 2020 +0100
Commit: Miklos Vajna
CommitDate: Thu Apr 2 09:05:23 2020 +0200
sw padded numbering: add doc model and UNO API
The idea is to behave similar to Arabic numbering, but pad the result on
the left up to 2 characters. Word has this feature, so far Writer falled
back to plain Arabic numbering.
This is just the document model, not layout yet.
(cherry picked from commit 6b80bd446de4bf19df3a9b124881e1fe12402ca8)
Change-Id: I8ac90536848d00b8678129184db0849130724dee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91500
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Miklos Vajna
diff --git a/include/editeng/svxenum.hxx b/include/editeng/svxenum.hxx
index 3c4bbe266347..f425e97cde0c 100644
--- a/include/editeng/svxenum.hxx
+++ b/include/editeng/svxenum.hxx
@@ -205,7 +205,8 @@ enum SvxNumType : sal_Int16
SVX_NUM_TEXT_NUMBER = css::style::NumberingType::TEXT_NUMBER,
SVX_NUM_TEXT_CARDINAL = css::style::NumberingType::TEXT_CARDINAL,
SVX_NUM_TEXT_ORDINAL = css::style::NumberingType::TEXT_ORDINAL,
-SVX_NUM_SYMBOL_CHICAGO= css::style::NumberingType::SYMBOL_CHICAGO
+SVX_NUM_SYMBOL_CHICAGO= css::style::NumberingType::SYMBOL_CHICAGO,
+SVX_NUM_ARABIC_ZERO = css::style::NumberingType::ARABIC_ZERO
};
#endif
diff --git a/offapi/com/sun/star/style/NumberingType.idl
b/offapi/com/sun/star/style/NumberingType.idl
index 183d719c89a2..66159a818e66 100644
--- a/offapi/com/sun/star/style/NumberingType.idl
+++ b/offapi/com/sun/star/style/NumberingType.idl
@@ -492,6 +492,13 @@ published constants NumberingType
ASTERISK ASTERISK, DAGGER DAGGER, etc.
*/
const short SYMBOL_CHICAGO = 63;
+
+/** Numbering is in Arabic numbers, padded with zero to have a length of
at least two, as "01,
+02, ..., 10, 11, ...".
+
+@since LibreOffice 7.0
+ */
+const short ARABIC_ZERO = 64;
};
commit ea58353bafbb646c09ee95a7e9884323306efddf
Author: Tim Bartlett
AuthorDate: Mon Aug 19 18:40:56 2019 +1000
Commit: Miklos Vajna
CommitDate: Thu Apr 2 09:05:08 2020 +0200
tdf#55436 - Add SYMBOL_CHICAGO numbering scheme (for footnotes)
Includes adding SYMBOL_CHICAGO translations to .docx import/export filters
(cherry picked from commit 0fbcac4caa971bd8824c96fe9ef7d9338cd37cbc)
Conflicts:
i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
Change-Id: I5212739d7d04ab400a3d2aa549cb7cfd8531a4b8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91499
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Miklos Vajna
diff --git
a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
index 899ea58457d3..b7963de5c0b5 100644
--- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
+++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
@@ -66,6 +66,11 @@
#define S_HI_TWO "\xDB\xB2"
#define S_HI_THREE "\xDB\xB3"
+// Chicago footnote symbols
+#define S_DAGGER "\xE2\x80\xA0"
+#define S_DBL_DAGGER "\xE2\x80\xA1"
+#define S_SECTION "\xC2\xA7"
+
#include
#include
#include
@@ -229,6 +234,10 @@ static const sal_Unicode lowerLetter[] = {
0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A
};
+static const sal_Unicode table_Chicago[] = {
+0x002a, 0x2020, 0x2021, 0x00a7
+};
+
// Tables used for numbering in persian words
static const sal_Unicode table_PersianWord_decade1[][7]={
{0}, // 0
@@ -902,6 +911,10 @@ DefaultNumberingProvider::makeNumberingString( const
Sequence
RID_SVXSTRARY_NUMBERINGTYPE[] =
{ NC_("RID_SVXSTRARY_NUMBERINGTYPE", "First, Second, Third, ...") ,
62 /* TEXT_ORDINAL */ },
{ NC_("RID_SVXSTRARY_NUMBERINGTYPE", "A, .., AA, .., AAA, ...") ,
9 /* SVX_NUM_CHARS_UPPER_LETTER_N */ },
{ NC_("RID_SVXSTRARY_NUMBERINGTYPE", "a, .., aa, .., aaa, ...") ,
10 /* SVX_NUM_CHARS_LOWER_LETTER_N
[Libreoffice-commits] online.git: loleaflet/css
loleaflet/css/device-mobile.css | 27 +++
loleaflet/css/scrollBar.css | 27 ---
2 files changed, 27 insertions(+), 27 deletions(-)
New commits:
commit dd8d65552bd587eeafcad96b40a550b6441f2e1e
Author: Jan Holesovsky
AuthorDate: Wed Apr 1 11:42:48 2020 +0200
Commit: Jan Holesovsky
CommitDate: Thu Apr 2 09:05:35 2020 +0200
mobile: Scrollbar related bits.
Change-Id: I66f826045900555d02a5725aed0163f7007ec662
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91477
Tested-by: Jan Holesovsky
Reviewed-by: Jan Holesovsky
diff --git a/loleaflet/css/device-mobile.css b/loleaflet/css/device-mobile.css
index fe3c688ad..2f11e4530 100644
--- a/loleaflet/css/device-mobile.css
+++ b/loleaflet/css/device-mobile.css
@@ -115,3 +115,30 @@ div#w2ui-overlay-actionbar.w2ui-overlay{
#document-name-input {
display: none;
}
+
+/* Related to scollBar.css */
+.mCSB_scrollTools_vertical{
+ width: 38px !important;
+}
+#mobile-wizard-header .mCSB_container {
+ top: 1px !important;
+}
+.mCSB_scrollTools_vertical .mCSB_dragger_bar {
+ position: fixed !important;
+ margin-top: 8px !important;
+ height: 48px !important;
+ width: 48px !important;
+ right: -16px;
+ border-radius: 100px !important;
+ background: url('images/lc_scrollbar_mobile.svg') no-repeat center #fff
!important;
+ background-size: 24px !important;
+ box-shadow: 0 1px 3px 1px #0050;
+}
+#mCSB_1_dragger_horizontal > .mCSB_dragger_bar, #mCSB_2_dragger_horizontal >
.mCSB_dragger_bar, #mCSB_3_dragger_horizontal > .mCSB_dragger_bar {
+ height: 2px;
+ background-color: #bbb;
+ margin-top: 9px;
+}
+#mCSB_1_scrollbar_horizontal .mCSB_draggerRail, #mCSB_2_scrollbar_horizontal
.mCSB_draggerRail, #mCSB_3_scrollbar_horizontal .mCSB_draggerRail{
+ background-color: #f2f2f2 !important;
+}
diff --git a/loleaflet/css/scrollBar.css b/loleaflet/css/scrollBar.css
index 9e8a062ed..87ba21552 100644
--- a/loleaflet/css/scrollBar.css
+++ b/loleaflet/css/scrollBar.css
@@ -11,30 +11,3 @@
width: 100%;
overflow: auto;
}
-@media (max-width: 767px), (max-device-height: 767px) {
- .mCSB_scrollTools_vertical{
- width: 38px !important;
- }
- #mobile-wizard-header .mCSB_container {
- top: 1px !important;
- }
- .mCSB_scrollTools_vertical .mCSB_dragger_bar {
- position: fixed !important;
- margin-top: 8px !important;
- height: 48px !important;
- width: 48px !important;
- right: -16px;
- border-radius: 100px !important;
- background: url('images/lc_scrollbar_mobile.svg') no-repeat
center #fff !important;
- background-size: 24px !important;
- box-shadow: 0 1px 3px 1px #0050;
- }
- #mCSB_1_dragger_horizontal > .mCSB_dragger_bar,
#mCSB_2_dragger_horizontal > .mCSB_dragger_bar, #mCSB_3_dragger_horizontal >
.mCSB_dragger_bar {
- height: 2px;
- background-color: #bbb;
- margin-top: 9px;
- }
- #mCSB_1_scrollbar_horizontal .mCSB_draggerRail,
#mCSB_2_scrollbar_horizontal .mCSB_draggerRail, #mCSB_3_scrollbar_horizontal
.mCSB_draggerRail{
- background-color: #f2f2f2 !important;
- }
-}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: 3 commits - loleaflet/css
loleaflet/css/device-mobile.css | 61 +
loleaflet/css/menubar.css | 56 -
loleaflet/css/mobilewizard.css | 1481 +++-
3 files changed, 803 insertions(+), 795 deletions(-)
New commits:
commit ecf0951bd56ab050e9b3f75454cbc25877d96ce9
Author: Jan Holesovsky
AuthorDate: Wed Apr 1 11:36:05 2020 +0200
Commit: Jan Holesovsky
CommitDate: Thu Apr 2 09:04:08 2020 +0200
mobile: Less "elliptical" look of the hamburger menu background.
(When the menu is active.)
Change-Id: Ifdd3dd951aef4c14e596b659f2a05c1288852ca8
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91476
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Jan Holesovsky
diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css
index ad60b1a60..dc3cfacca 100644
--- a/loleaflet/css/mobilewizard.css
+++ b/loleaflet/css/mobilewizard.css
@@ -28,8 +28,8 @@ span.menu-entry-icon img {
z-index: 1501 !important;
position: relative !important;
background-color: #dae6f3 !important;
- padding-left: 8px !important;
- border-radius: 0 0 0 100px !important;
+ padding-left: 3px !important;
+ border-radius: 0 0 0 15px !important;
}
#mobile-wizard.menuwizard #mobile-wizard-titlebar{
commit 1fb97852179e63c05b73a6cabefae475c1dae5cd
Author: Jan Holesovsky
AuthorDate: Wed Apr 1 11:32:16 2020 +0200
Commit: Jan Holesovsky
CommitDate: Thu Apr 2 09:04:02 2020 +0200
mobile: No need for @media in mobilewizard.css.
The mobile-wizard is not shown on desktop at all, avoid the @media.
Should there be some bits that are mobile-phone-only, they should go to
mobile.css.
Change-Id: Iae50779df030586eadd44cbd5a2cb59939a29e47
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/91475
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Jan Holesovsky
diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css
index 84da0c98f..ad60b1a60 100644
--- a/loleaflet/css/mobilewizard.css
+++ b/loleaflet/css/mobilewizard.css
@@ -1,800 +1,797 @@
-@media (max-width: 767px) and (orientation: portrait), (max-width: 1023px) and
(orientation: landscape) {
- .menuwizard .menu-entry-icon{
- padding-left: 4%;
- }
- #mobile-wizard:not(.menuwizard) .menu-entry-with-icon {
- padding-left: 10px;
- white-space: nowrap;
- }
- span.menu-entry-icon img {
- width: 24px !important;
- margin: 4px !important;
- }
+.menuwizard .menu-entry-icon{
+ padding-left: 4%;
+}
+#mobile-wizard:not(.menuwizard) .menu-entry-with-icon {
+ padding-left: 10px;
+ white-space: nowrap;
+}
+span.menu-entry-icon img {
+ width: 24px !important;
+ margin: 4px !important;
+}
- #mobile-wizard.menuwizard #mobile-wizard-content{
- overflow: hidden !important;
- }
+#mobile-wizard.menuwizard #mobile-wizard-content{
+ overflow: hidden !important;
+}
- #mobile-wizard.menuwizard{
- top: 0px !important;
- height: 100% !important;
- z-index: 1500 !important;
- }
+#mobile-wizard.menuwizard{
+ top: 0px !important;
+ height: 100% !important;
+ z-index: 1500 !important;
+}
- #mobile-wizard.menuwizard #mobile-wizard-back.close-button{
- visibility: hidden !important;
- }
+#mobile-wizard.menuwizard #mobile-wizard-back.close-button{
+ visibility: hidden !important;
+}
- #toolbar-hamburger.menuwizard-opened{
- z-index: 1501 !important;
- position: relative !important;
- background-color: #dae6f3 !important;
- padding-left: 8px !important;
- border-radius: 0 0 0 100px !important;
- }
+#toolbar-hamburger.menuwizard-opened{
+ z-index: 1501 !important;
+ position: relative !important;
+ background-color: #dae6f3 !important;
+ padding-left: 8px !important;
+ border-radius: 0 0 0 100px !important;
+}
- #mobile-wizard.menuwizard #mobile-wizard-titlebar{
- border: none !important;
- }
- span#main-menu-btn-icon {
- filter: none !important;
- }
+#mobile-wizard.menuwizard #mobile-wizard-titlebar{
+ border: none !important;
+}
+span#main-menu-btn-icon {
+ filter: none !important;
+}
- #leadingzeroes .spinfieldimage, #decimalplaces .spinfieldimage{
- display: none;
- }
+#leadingzeroes .spinfieldimage, #decimalplaces .spinfieldimage{
+ display: none;
+}
- .ui-header.level-1.mobile-wizard.ui-widget
img[src='images/lc_downloadas-pdf.svg']{
- visibility: visible;
- }
+.ui-header.level-1.mobile-wizard.ui-widget
img[src='images/lc_downloadas-pdf.svg']{
+ visibility: visible;
+}
- .layout {
- height: 58px;
-
