[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/inc/swmodeltestbase.hxx |1
sw/qa/extras/rtfexport/rtfexport4.cxx |9 -
sw/qa/extras/rtfexport/rtfexport5.cxx |3
sw/qa/extras/rtfimport/rtfimport.cxx | 273 ++
4 files changed, 190 insertions(+), 96 deletions(-)
New commits:
commit 1129c848b360bd76174c941bb8fd98bfa5b9119c
Author: Miklos Vajna
AuthorDate: Wed Nov 6 21:31:54 2019 +0100
Commit: Miklos Vajna
CommitDate: Thu Nov 7 08:27:19 2019 +0100
sw: convert remaining uses of DECLARE_RTFIMPORT_TEST()
See commit a226cec52e536c46e03f57a5f1f7931abbeb0cdd
(CppunitTest_sw_rtfimport: convert one testcase to use
CPPUNIT_TEST_FIXTURE(), 2019-11-05) for motivation.
Change-Id: Icef8d75ac759480e841363142c474b95544bcf0e
Reviewed-on: https://gerrit.libreoffice.org/82176
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx
b/sw/qa/extras/inc/swmodeltestbase.hxx
index af6f492d90f3..4e3f1eda0eeb 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -103,7 +103,6 @@ using namespace css;
#define DECLARE_OOXMLIMPORT_TEST(TestName, filename)
DECLARE_SW_IMPORT_TEST(TestName, filename, nullptr, Test)
#define DECLARE_OOXMLEXPORT_TEST(TestName, filename)
DECLARE_SW_ROUNDTRIP_TEST(TestName, filename, nullptr, Test)
#define DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(TestName, filename)
DECLARE_SW_EXPORTONLY_TEST(TestName, filename, nullptr, Test)
-#define DECLARE_RTFIMPORT_TEST(TestName, filename)
DECLARE_SW_IMPORT_TEST(TestName, filename, nullptr, Test)
#define DECLARE_RTFEXPORT_TEST(TestName, filename)
DECLARE_SW_ROUNDTRIP_TEST(TestName, filename, nullptr, Test)
#define DECLARE_ODFIMPORT_TEST(TestName, filename)
DECLARE_SW_IMPORT_TEST(TestName, filename, nullptr, Test)
#define DECLARE_ODFEXPORT_TEST(TestName, filename)
DECLARE_SW_ROUNDTRIP_TEST(TestName, filename, nullptr, Test)
diff --git a/sw/qa/extras/rtfexport/rtfexport4.cxx
b/sw/qa/extras/rtfexport/rtfexport4.cxx
index bcac3b291cb7..a7116ba7dd79 100644
--- a/sw/qa/extras/rtfexport/rtfexport4.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport4.cxx
@@ -138,8 +138,9 @@ DECLARE_RTFEXPORT_TEST(testCjklist34, "cjklist34.rtf")
CPPUNIT_ASSERT_EQUAL(style::NumberingType::NUMBER_UPPER_ZH_TW, numFormat);
}
-DECLARE_RTFIMPORT_TEST(testTabStopFillChars, "tab-stop-fill-chars.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testTabStopFillChars)
{
+load(mpTestDocumentPath, "tab-stop-fill-chars.rtf");
// tlmdot
auto aTabstops =
getProperty>(getParagraph(1), "ParaTabStops");
CPPUNIT_ASSERT(aTabstops.hasElements());
@@ -207,8 +208,9 @@ DECLARE_RTFEXPORT_TEST(testBtlrFrame, "btlr-frame.odt")
CPPUNIT_ASSERT_EQUAL(text::WritingMode2::BT_LR, nActual);
}
-DECLARE_RTFIMPORT_TEST(testPageBorder, "page-border.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testPageBorder)
{
+load(mpTestDocumentPath, "page-border.rtf");
uno::Reference
xPageStyle(getStyles("PageStyles")->getByName("Standard"),
uno::UNO_QUERY);
auto aTopBorder = getProperty(xPageStyle, "TopBorder");
@@ -236,8 +238,9 @@ DECLARE_RTFEXPORT_TEST(testTbrlPage, "tbrl-page.rtf")
CPPUNIT_ASSERT_EQUAL(text::WritingMode2::TB_RL, nActual);
}
-DECLARE_RTFIMPORT_TEST(testTdf126309, "tdf126309.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testTdf126309)
{
+load(mpTestDocumentPath, "tdf126309.rtf");
// Without the accompanying fix in place, this test would have failed, as
// the paragraph was aligned to left, not right.
CPPUNIT_ASSERT_EQUAL(
diff --git a/sw/qa/extras/rtfexport/rtfexport5.cxx
b/sw/qa/extras/rtfexport/rtfexport5.cxx
index 9ea411fae888..e74e79073348 100644
--- a/sw/qa/extras/rtfexport/rtfexport5.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport5.cxx
@@ -181,8 +181,9 @@ DECLARE_RTFEXPORT_TEST(testParaBottomMargin,
"para-bottom-margin.rtf")
CPPUNIT_ASSERT_EQUAL(sal_Int32(2), getProperty(getParagraph(1),
"ParaTopMargin"));
}
-DECLARE_RTFIMPORT_TEST(testParaStyleBottomMargin2,
"para-style-bottom-margin-2.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testParaStyleBottomMargin2)
{
+load(mpTestDocumentPath, "para-style-bottom-margin-2.rtf");
uno::Reference xPropertySet(
getStyles("ParagraphStyles")->getByName("Standard"), uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(sal_Int32(353), getProperty(xPropertySet,
"ParaBottomMargin"));
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index ba19786d4fa2..d13ba58410f2 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -109,14 +109,16 @@ CPPUNIT_TEST_FIXTURE(Test, testN695479)
CPPUNIT_ASSERT(bDrawFound);
}
-DECLARE_RTFIMPORT_TEST(testTdf117246, "tdf117246.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testTdf117246)
{
+load(mpTestDocumentPath, "tdf117246.rtf");
// This was 2, all but the last \page was lost.
CPPUNIT_ASSERT_EQUAL(3, getPages());
}
-DECLARE_R
[Libreoffice-commits] core.git: sd/inc sw/inc
sd/inc/pageformatpanel.hrc |5 +
sw/inc/pageformatpanel.hrc |5 +
2 files changed, 10 insertions(+)
New commits:
commit c503fc6e478510f0fec72cd88b776ca683a00021
Author: Jan Holesovsky
AuthorDate: Wed Nov 6 17:25:39 2019 +0100
Commit: Jan Holesovsky
CommitDate: Thu Nov 7 08:21:10 2019 +0100
android: ODR fix of RID_PAGEFORMATPANEL_MARGINS_CM.
Without this, we get a linking error that RID_PAGEFORMATPANEL_MARGINS_CM
is defined twice.
Change-Id: Ib9c07adcb0a8def991d1e39429c1bb4947cd7d32
Reviewed-on: https://gerrit.libreoffice.org/82159
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky
diff --git a/sd/inc/pageformatpanel.hrc b/sd/inc/pageformatpanel.hrc
index 23325e26ac2f..b7309ee69748 100644
--- a/sd/inc/pageformatpanel.hrc
+++ b/sd/inc/pageformatpanel.hrc
@@ -12,6 +12,9 @@
#define NC_(Context, String) reinterpret_cast(Context "\004"
u8##String)
+namespace sd
+{
+
// To translators: this is a listbox labelled by "Margins:", inch units
const char* RID_PAGEFORMATPANEL_MARGINS_INCH[] =
{
@@ -36,6 +39,8 @@ const char* RID_PAGEFORMATPANEL_MARGINS_CM[] =
NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Wide"),
};
+}
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/sw/inc/pageformatpanel.hrc b/sw/inc/pageformatpanel.hrc
index ecad14cf51a2..048ff93a8776 100644
--- a/sw/inc/pageformatpanel.hrc
+++ b/sw/inc/pageformatpanel.hrc
@@ -12,6 +12,9 @@
#define NC_(Context, String) reinterpret_cast(Context "\004"
u8##String)
+namespace sw
+{
+
// To translators: this is a listbox labelled by "Margins:", inch units
const char* RID_PAGEFORMATPANEL_MARGINS_INCH[] =
{
@@ -38,6 +41,8 @@ const char* RID_PAGEFORMATPANEL_MARGINS_CM[] =
NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Mirrored")
};
+}
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Impress .ODP Bug Report
Eduardo Puchalski kirjoitti 6.11.2019 klo 21.31: Hello, I am Eduardo, a TI support worker, Brazil. An administrative worker was doing a presentation on LibreOffice Impress, a boss told my co-worker to change from LibreOffice to MicrosoftOffice on the administration computer, he made this change this morning, simply uninstalled Libre and installed Microsoft. After that, the extension in the file changed from .ODP to .OPD. .OPD is a very uncommon extension and we don't deal with nothing related to it. I tried to "restore" the file but I do not succeeded yet. Could you please help me with this matter? Thank you. I support free software and even have some ideas for LibreOffice interface. This is a developer mailing list. Please use the Usuários list in pt-br language instead: https://wiki.documentfoundation.org/Local_Mailing_Lists#Brazilian_Portuguese Ilmari ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/uiconfig
sw/uiconfig/swriter/ui/outlinenumberingpage.ui | 519 ++- sw/uiconfig/swriter/ui/outlinepositionpage.ui | 682 - 2 files changed, 640 insertions(+), 561 deletions(-) New commits: commit 59a8deae5c4c8692031c24e0d176ed29f84bc8ee Author: andreas kainz AuthorDate: Thu Nov 7 01:10:32 2019 +0100 Commit: andreas_kainz CommitDate: Thu Nov 7 08:15:17 2019 +0100 Chapter Numbering Dialog update Change-Id: Id82145528ac7a9d991ca8e01d87081afea9981e7 Reviewed-on: https://gerrit.libreoffice.org/82184 Tested-by: Jenkins Reviewed-by: andreas_kainz diff --git a/sw/uiconfig/swriter/ui/outlinenumberingpage.ui b/sw/uiconfig/swriter/ui/outlinenumberingpage.ui index b1984453e670..3dd2624edd16 100644 --- a/sw/uiconfig/swriter/ui/outlinenumberingpage.ui +++ b/sw/uiconfig/swriter/ui/outlinenumberingpage.ui @@ -1,5 +1,5 @@ - + @@ -22,13 +22,12 @@ - + True False -True -True 6 -12 +6 +12 True @@ -87,9 +86,9 @@ -False -True -0 +0 +0 +2 @@ -105,229 +104,184 @@ 6 12 - + True False -12 +6 +12 - + True False -6 -12 - - -True -False -True -Paragraph style: -True -style -0 - - -0 -0 -2 - - - - -True -False - - -0 -1 -2 - - - - -True -False -Number: -True -numbering -0 - - -0 -2 - - - - -True -False -Character style: -True -charstyle -0 - - -0 -3 - - - - -True -False -Show sublevels: -True -sublevelsnf -0 - - -0 -4 - - - - -True -False -Separator -0 - - -0 -5 -2 - - - - -True -False - - -1 -2 - - - - -True -False - - -1 -3 - - - - -True -False -True -True -adjustment2 - - -1 -4 - - - - -True -True -True - - -1 -6 - - - - -Tru
[Libreoffice-commits] core.git: compilerplugins/clang fpicker/source vcl/unx
compilerplugins/clang/unusedfields.only-used-in-constructor.results | 72 - compilerplugins/clang/unusedfields.readonly.results | 26 +-- compilerplugins/clang/unusedfields.untouched.results| 38 ++--- compilerplugins/clang/unusedfields.writeonly.results| 74 +- fpicker/source/office/PlacesListBox.cxx |2 fpicker/source/office/PlacesListBox.hxx |1 fpicker/source/office/RemoteFilesDialog.cxx |4 fpicker/source/office/RemoteFilesDialog.hxx |2 fpicker/source/office/autocmpledit.cxx |2 fpicker/source/office/autocmpledit.hxx |1 vcl/unx/gtk3/gtk3gtkinst.cxx|2 11 files changed, 107 insertions(+), 117 deletions(-) New commits: commit ef77870b1c5ed4df88d4585064c968379f3955a7 Author: Noel Grandin AuthorDate: Thu Nov 7 08:23:08 2019 +0200 Commit: Noel Grandin CommitDate: Thu Nov 7 08:06:27 2019 +0100 loplugin:unusedfields Change-Id: Ic1c0a2144f39373f93384bccbfc74356cac65ba0 Reviewed-on: https://gerrit.libreoffice.org/82185 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/compilerplugins/clang/unusedfields.only-used-in-constructor.results b/compilerplugins/clang/unusedfields.only-used-in-constructor.results index 7216d60220cd..1d828b56cedf 100644 --- a/compilerplugins/clang/unusedfields.only-used-in-constructor.results +++ b/compilerplugins/clang/unusedfields.only-used-in-constructor.results @@ -22,7 +22,7 @@ binaryurp/source/unmarshal.hxx:87 binaryurp::Unmarshal buffer_ com::sun::star::uno::Sequence binaryurp/source/writer.hxx:148 binaryurp::Writer state_ struct binaryurp::WriterState -canvas/source/vcl/impltools.hxx:117 +canvas/source/vcl/impltools.hxx:115 vclcanvas::tools::LocalGuard aSolarGuard class SolarMutexGuard canvas/workben/canvasdemo.cxx:83 DemoRenderer maColorWhite uno::Sequence @@ -76,9 +76,9 @@ connectivity/source/inc/flat/EResultSet.hxx:42 connectivity::flat::OFlatResultSet m_bBookmarkable _Bool connectivity/source/inc/java/lang/Object.hxx:45 connectivity::SDBThreadAttach m_aGuard jvmaccess::class VirtualMachine::AttachGuard -cppcanvas/source/mtfrenderer/textaction.cxx:811 +cppcanvas/source/mtfrenderer/textaction.cxx:810 cppcanvas::internal::(anonymous namespace)::EffectTextAction maTextLineInfo const tools::TextLineInfo -cppcanvas/source/mtfrenderer/textaction.cxx:1644 +cppcanvas/source/mtfrenderer/textaction.cxx:1643 cppcanvas::internal::(anonymous namespace)::OutlineAction maTextLineInfo const tools::TextLineInfo cppu/source/threadpool/threadpool.cxx:354 _uno_ThreadPool dummy sal_Int32 @@ -172,10 +172,6 @@ drawinglayer/source/tools/emfphelperdata.hxx:153 emfplushelper::EmfPlusHelperData mnFrameRight sal_Int32 drawinglayer/source/tools/emfphelperdata.hxx:154 emfplushelper::EmfPlusHelperData mnFrameBottom sal_Int32 -editeng/source/accessibility/AccessibleHyperlink.hxx:46 -accessibility::AccessibleHyperlink nPara sal_Int32 -editeng/source/accessibility/AccessibleHyperlink.hxx:47 -accessibility::AccessibleHyperlink nRealIdx sal_uInt16 editeng/source/editeng/impedit.hxx:465 ImpEditEngine aSelFuncSet class EditSelFunctionSet filter/source/flash/swfwriter.hxx:391 @@ -200,11 +196,11 @@ include/drawinglayer/texture/texture3d.hxx:62 drawinglayer::texture::GeoTexSvxBitmapEx maBitmap class Bitmap include/drawinglayer/texture/texture3d.hxx:64 drawinglayer::texture::GeoTexSvxBitmapEx maTransparence class Bitmap -include/filter/msfilter/svdfppt.hxx:880 +include/filter/msfilter/svdfppt.hxx:879 ImplPPTParaPropSet nDontKnow1 sal_uInt32 -include/filter/msfilter/svdfppt.hxx:881 +include/filter/msfilter/svdfppt.hxx:880 ImplPPTParaPropSet nDontKnow2 sal_uInt32 -include/filter/msfilter/svdfppt.hxx:882 +include/filter/msfilter/svdfppt.hxx:881 ImplPPTParaPropSet nDontKnow2bit06 sal_uInt16 include/LibreOfficeKit/LibreOfficeKitGtk.h:33 _LOKDocView aDrawingArea GtkDrawingArea @@ -344,7 +340,7 @@ include/svl/ondemand.hxx:55 OnDemandLocaleDataWrapper aSysLocale class SvtSysLocale include/svx/ClassificationDialog.hxx:31 svx::ClassificationDialog m_bPerParagraph const _Bool -include/svx/imapdlg.hxx:94 +include/svx/imapdlg.hxx:91 SvxIMapDlg aIMapItem class SvxIMapDlgItem include/svx/itemwin.hxx:33 SvxLineBox aDelayTimer class Timer @@ -364,8 +360,6 @@ include/vcl/NotebookBarAddonsMerger.hxx:45 AddonsParams sControlType class rtl::OUString include/vcl/NotebookBarAddonsMerger.hxx:46 AddonsParams nWidth sal_uInt16 -include/vcl/svimpbox.hxx:127 -SvImpLBox m_aFctSet class ImpLBSelEng include/xmloff/shapeimport.hxx:140 SdXML3DLightContext mbSpecular _Bool libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx:35 @@ -458,
[Libreoffice-commits] core.git: sc/CppunitTest_sc_parallelism.mk sc/qa
sc/CppunitTest_sc_parallelism.mk | 52 +++- sc/qa/unit/parallelism.cxx | 226 +++ 2 files changed, 247 insertions(+), 31 deletions(-) New commits: commit 989240664c33bc83800e27c1c0e718294321f46a Author: Dennis Francis AuthorDate: Mon Nov 4 21:16:50 2019 +0530 Commit: Dennis Francis CommitDate: Thu Nov 7 07:56:40 2019 +0100 tdf#124270 : unit-tests for spurious Err:522 fixes Change-Id: I44818c61611a6cdbcef3b71e151f7899795b3fa2 Reviewed-on: https://gerrit.libreoffice.org/82075 Tested-by: Jenkins Reviewed-by: Dennis Francis diff --git a/sc/CppunitTest_sc_parallelism.mk b/sc/CppunitTest_sc_parallelism.mk index 3b129626a169..eb7aaa446954 100644 --- a/sc/CppunitTest_sc_parallelism.mk +++ b/sc/CppunitTest_sc_parallelism.mk @@ -15,29 +15,41 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_parallelism, \ sc/qa/unit/parallelism \ )) +$(eval $(call gb_CppunitTest_use_library_objects,sc_parallelism, \ +sc \ +scqahelper \ +)) + $(eval $(call gb_CppunitTest_use_externals,sc_parallelism, \ boost_headers \ $(call gb_Helper_optional,OPENCL,clew) \ - mdds_headers \ +icu_headers \ +icui18n \ +icuuc \ +libxml2 \ +mdds_headers \ +orcus \ +orcus-parser \ )) $(eval $(call gb_CppunitTest_use_libraries,sc_parallelism, \ +$(call gb_Helper_optional,AVMEDIA,avmedia) \ basegfx \ comphelper \ cppu \ cppuhelper \ +dbtools \ drawinglayer \ editeng \ for \ forui \ i18nlangtag \ -msfilter \ -oox \ +i18nutil \ +$(call gb_Helper_optional,OPENCL,opencl) \ sal \ salhelper \ sax \ -sc \ -scqahelper \ +sb \ sfx \ sot \ svl \ @@ -50,6 +62,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sc_parallelism, \ ucbhelper \ unotest \ utl \ +vbahelper \ vcl \ xo \ )) @@ -75,43 +88,20 @@ $(eval $(call gb_CppunitTest_use_ure,sc_parallelism)) $(eval $(call gb_CppunitTest_use_vcl,sc_parallelism)) $(eval $(call gb_CppunitTest_use_components,sc_parallelism,\ -basic/util/sb \ -chart2/source/chartcore \ -chart2/source/controller/chartcontroller \ -comphelper/util/comphelp \ configmgr/source/configmgr \ -dbaccess/util/dba \ -embeddedobj/util/embobj \ -eventattacher/source/evtatt \ -filter/source/config/cache/filterconfig1 \ -forms/util/frm \ framework/util/fwk \ +i18npool/source/search/i18nsearch \ i18npool/util/i18npool \ -linguistic/source/lng \ -oox/util/oox \ -package/source/xstor/xstor \ -package/util/package2 \ sax/source/expatwrap/expwrap \ scaddins/source/analysis/analysis \ scaddins/source/datefunc/date \ -sc/util/sc \ -sc/util/scfilt \ +scaddins/source/pricing/pricing \ sfx2/util/sfx \ -sot/util/sot \ -svl/util/svl \ -svtools/util/svt \ -svx/util/svx \ -svx/util/svxcore \ -toolkit/util/tk \ ucb/source/core/ucb1 \ ucb/source/ucp/file/ucpfile1 \ -ucb/source/ucp/tdoc/ucptdoc1 \ - uui/util/uui \ -unotools/util/utl \ -unoxml/source/rdf/unordf \ unoxml/source/service/unoxml \ +uui/util/uui \ vcl/vcl.common \ -xmloff/util/xo \ )) $(eval $(call gb_CppunitTest_use_configuration,sc_parallelism)) diff --git a/sc/qa/unit/parallelism.cxx b/sc/qa/unit/parallelism.cxx index f9fd1ef4b5b9..965220e572d6 100644 --- a/sc/qa/unit/parallelism.cxx +++ b/sc/qa/unit/parallelism.cxx @@ -10,6 +10,9 @@ #include #include +#include +#include +#include #include #include #include @@ -42,6 +45,9 @@ public: void testFormulaGroupSpanEvalNonGroup(); void testArrayFormulaGroup(); void testDependentFormulaGroupCollection(); +void testFormulaGroupWithForwardSelfReference(); +void testFormulaGroupsInCyclesAndWithSelfReference(); +void testFormulaGroupsInCyclesAndWithSelfReference2(); CPPUNIT_TEST_SUITE(ScParallelismTest); CPPUNIT_TEST(testSUMIFS); @@ -57,6 +63,9 @@ public: CPPUNIT_TEST(testFormulaGroupSpanEvalNonGroup); CPPUNIT_TEST(testArrayFormulaGroup); CPPUNIT_TEST(testDependentFormulaGroupCollection); +CPPUNIT_TEST(testFormulaGroupWithForwardSelfReference); +CPPUNIT_TEST(testFormulaGroupsInCyclesAndWithSelfReference); +CPPUNIT_TEST(testFormulaGroupsInCyclesAndWithSelfReference2); CPPUNIT_TEST_SUITE_END(); private: @@ -64,6 +73,9 @@ private: bool getThreadingFlag(); void setThreadingFlag(bool bSet); +static ScUndoCut* cutToClip(ScDocShell& rDocSh, const ScRange& rRange, ScDocument* pClipDoc, bool bCreateUndo); +static void pasteFromClip(ScDocument* pDestDoc, const ScRange& rDestRange, ScDocument* pClipDoc); + ScDocument *m_pDoc; ScDocShellRef m_xDocShell; @@ -87,6 +99,47 @@ void ScParallelismTest::setThreadingFlag( bool bSet ) xBatch->commit(); } +ScUndoCut* ScParallelismTest::cutT
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/recursionhelper.hxx |5
sc/source/core/data/column4.cxx | 10
sc/source/core/data/formulacell.cxx | 18 +++
sc/source/core/tool/recursionhelper.cxx | 38
4 files changed, 67 insertions(+), 4 deletions(-)
New commits:
commit 0f4ba703038fb8678d4b1e7e6e0fd5e2d3025908
Author: Dennis Francis
AuthorDate: Fri Nov 1 21:28:41 2019 +0530
Commit: Dennis Francis
CommitDate: Thu Nov 7 07:55:48 2019 +0100
tdf#124270 : improve formula-group cycle detection
When a cycle of formula-groups is detected, do not conclude
that there is a circular dependency of cells. Only mark the
cells with Err:522 when all formula-groups in the cycle have
cleanly backed off from the dependency evaluation mode.
This commit also fixes places where we overlooked to back-off from
dependency evaluation mode on detection of a cycle of formula-groups.
Additionally mark formula-groups with self references as
"part of cycle" by setting mbPartOfCycle.
Unit tests for all these fixes are in a follow-up commit.
Change-Id: I57a88bbc88adf177d49768a5d4585b3e53729aea
Reviewed-on: https://gerrit.libreoffice.org/82074
Reviewed-by: Dennis Francis
Tested-by: Dennis Francis
diff --git a/sc/inc/recursionhelper.hxx b/sc/inc/recursionhelper.hxx
index 5962f11eb61a..cff958f52fea 100644
--- a/sc/inc/recursionhelper.hxx
+++ b/sc/inc/recursionhelper.hxx
@@ -52,6 +52,9 @@ class ScRecursionHelper
ScFormulaRecursionList::iteratoraLastIterationStart;
ScRecursionInIterationStack aRecursionInIterationStack;
ScFGListaFGList;
+// Flag list corresponding to aFGList to indicate whether each
formula-group
+// is in a depedency evaluation mode or not.
+std::vector< bool > aInDependencyEvalMode;
sal_uInt16 nRecursionCount;
sal_uInt16 nIteration;
// Count of ScFormulaCell::CheckComputeDependencies in current call-stack.
@@ -110,7 +113,9 @@ public:
/** Detects a simple cycle involving formula-groups and singleton
formula-cells. */
bool PushFormulaGroup(ScFormulaCell* pCell);
void PopFormulaGroup();
+bool AnyCycleMemberInDependencyEvalMode(ScFormulaCell* pCell);
bool AnyParentFGInCycle();
+void SetFormulaGroupDepEvalMode(bool bSet);
void AddTemporaryGroupCell(ScFormulaCell* cell);
void CleanTemporaryGroupCells();
diff --git a/sc/source/core/data/column4.cxx b/sc/source/core/data/column4.cxx
index de603298655d..8e0ae07bbef1 100644
--- a/sc/source/core/data/column4.cxx
+++ b/sc/source/core/data/column4.cxx
@@ -1685,7 +1685,17 @@ static bool
lcl_InterpretSpan(sc::formula_block::const_iterator& rSpanIter, SCRO
// Evaluate from second cell in non-grouped style (no point in
trying group-interpret again).
++itSpanStart;
for (SCROW nIdx = nSpanStart+1; nIdx <= nSpanEnd; ++nIdx,
++itSpanStart)
+{
(*itSpanStart)->Interpret(); // We know for sure that this
cell is dirty so directly call Interpret().
+// Allow early exit like above.
+if ((mxParentGroup && mxParentGroup->mbPartOfCycle) ||
!rRecursionHelper.AreGroupsIndependent())
+{
+// Set this cell as dirty as this may be interpreted
in InterpretTail()
+pCellStart->SetDirtyVar();
+bAllowThreading = false;
+return bAnyDirty;
+}
+}
}
pCellStart = nullptr; // For next sub span start detection.
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index c2886ed2ae28..acfe85bd332b 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -1517,7 +1517,7 @@ bool ScFormulaCell::Interpret(SCROW nStartOffset, SCROW
nEndOffset)
ScRecursionHelper& rRecursionHelper = pDocument->GetRecursionHelper();
bool bGroupInterpreted = false;
-if (mxGroup && !rRecursionHelper.CheckFGIndependence(mxGroup.get()))
+if ((mxGroup && !rRecursionHelper.CheckFGIndependence(mxGroup.get())) ||
!rRecursionHelper.AreGroupsIndependent())
return bGroupInterpreted;
static ForceCalculationType forceType =
ScCalcConfig::getForceCalculationType();
@@ -1525,12 +1525,15 @@ bool ScFormulaCell::Interpret(SCROW nStartOffset, SCROW
nEndOffset)
ScFormulaCell* pTopCell = mxGroup ? mxGroup->mpTopCell : this;
-if (pTopCell->mbSeenInPath && rRecursionHelper.GetDepComputeLevel())
+if (pTopCell->mbSeenInPath && rRecursionHelper.GetDepComputeLevel() &&
+rRecursionHelper.AnyCycleMemberInDependencyEvalMode(pTopCell))
{
// This call arose from a dependency calcula
[Libreoffice-commits] online.git: ios/Mobile.xcodeproj
ios/Mobile.xcodeproj/project.pbxproj | 221 ++-
1 file changed, 220 insertions(+), 1 deletion(-)
New commits:
commit 6aca28d0f1fc3a45e2dfb0677aa2162937c3ee9a
Author: Tor Lillqvist
AuthorDate: Thu Nov 7 08:42:12 2019 +0200
Commit: Tor Lillqvist
CommitDate: Thu Nov 7 08:45:05 2019 +0200
Add some more source files to the Xcode project for debugging convenience
(It is, sadly, apparently possible to set breakpoints in advance
(before the code has reached that file) only in files that are listed
in the project.)
Also drop the nonexistent "filter" directory in Resources. (It is
config/filter.)
Change-Id: I96ec9dd8dc4591db9d640b01fb07e807565670cb
diff --git a/ios/Mobile.xcodeproj/project.pbxproj
b/ios/Mobile.xcodeproj/project.pbxproj
index 0d7aa5358..f2df6f51c 100644
--- a/ios/Mobile.xcodeproj/project.pbxproj
+++ b/ios/Mobile.xcodeproj/project.pbxproj
@@ -577,6 +577,104 @@
BE8D85C6214055F3009F1860 /* fundamentalrc */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name =
fundamentalrc; path =
"../../../lobuilddir-symlink/workdir/CustomTarget/ios/resources/fundamentalrc";
sourceTree = ""; };
BE8D85C7214055F3009F1860 /* unorc */ = {isa = PBXFileReference;
fileEncoding = 4; lastKnownFileType = text; name = unorc; path =
"../../../lobuilddir-symlink/workdir/CustomTarget/ios/resources/unorc";
sourceTree = ""; };
BE8D85C8214055F3009F1860 /* rc */ = {isa = PBXFileReference;
fileEncoding = 4; lastKnownFileType = text; name = rc; path =
"../../../lobuilddir-symlink/workdir/CustomTarget/ios/resources/rc"; sourceTree
= ""; };
+ BE9273AE2372DC9600ADB598 /* EmptyPanel.hxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = EmptyPanel.hxx;
path = "../../ios-device/svx/source/sidebar/EmptyPanel.hxx"; sourceTree =
""; };
+ BE9273AF2372DC9600ADB598 /* ContextChangeEventMultiplexer.cxx
*/ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
ContextChangeEventMultiplexer.cxx; path =
"../../ios-device/svx/source/sidebar/ContextChangeEventMultiplexer.cxx";
sourceTree = ""; };
+ BE9273B02372DC9600ADB598 /* PanelFactory.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
PanelFactory.cxx; path =
"../../ios-device/svx/source/sidebar/PanelFactory.cxx"; sourceTree = "";
};
+ BE9273B12372DC9600ADB598 /* nbdtmg.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = nbdtmg.cxx;
path = "../../ios-device/svx/source/sidebar/nbdtmg.cxx"; sourceTree =
""; };
+ BE9273B22372DC9600ADB598 /* SelectionAnalyzer.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
SelectionAnalyzer.cxx; path =
"../../ios-device/svx/source/sidebar/SelectionAnalyzer.cxx"; sourceTree =
""; };
+ BE9273B32372DC9600ADB598 /* nbdtmgfact.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
nbdtmgfact.cxx; path = "../../ios-device/svx/source/sidebar/nbdtmgfact.cxx";
sourceTree = ""; };
+ BE9273B42372DC9600ADB598 /* SelectionChangeHandler.cxx */ =
{isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
SelectionChangeHandler.cxx; path =
"../../ios-device/svx/source/sidebar/SelectionChangeHandler.cxx"; sourceTree =
""; };
+ BE9273B52372DC9600ADB598 /* PanelLayout.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
PanelLayout.cxx; path = "../../ios-device/svx/source/sidebar/PanelLayout.cxx";
sourceTree = ""; };
+ BE9273B62372DC9600ADB598 /* EmptyPanel.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
EmptyPanel.cxx; path = "../../ios-device/svx/source/sidebar/EmptyPanel.cxx";
sourceTree = ""; };
+ BE9273B82372E06000ADB598 /* fmtools.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fmtools.cxx;
path = "../../ios-device/svx/source/form/fmtools.cxx"; sourceTree = "";
};
+ BE9273B92372E06000ADB598 /* fmpage.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fmpage.cxx;
path = "../../ios-device/svx/source/form/fmpage.cxx"; sourceTree = ""; };
+ BE9273BA2372E06000ADB598 /* fmdmod.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fmdmod.cxx;
path = "../../ios-device/svx/source/form/fmdmod.cxx"; sourceTree = ""; };
+ BE9273BB2372E06000ADB598 /* formcontrolfactory.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
formcontrolfactory.cxx; path =
"../../ios-device/svx/source/form/formcontrolfactory.cxx"; sourceTree =
""; };
+ BE9273BC2372E06000ADB598 /* datanavi.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/map/Map.js |6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 253e3245d1e953f79a38969ea84b10cdbbad8626
Author: Tor Lillqvist
AuthorDate: Wed Nov 6 18:00:52 2019 +0200
Commit: Tor Lillqvist
CommitDate: Thu Nov 7 07:27:25 2019 +0100
Make the sidebar show up again in the iOS app on iPad
Reduce confusion between whether to use "jsdialog" (also known as
"mobile wizard") or the sidebar.
Make core's comphelper::LibreOfficeKit::isMobile() equivalent to
window.mode.isMobile(). Decide whether to send the .uno:LOKSetMobile
message using the same condition that the function _inMobileMode()
uses, i.e. (L.Browser.mobile && screen.width < 768).
(window.mode.isMobile() is the same as _inMobileMode().)
Previously, on iPad, comphelper::LibreOfficeKit::isMobile() returned
true so the code in SidebarNotifyIdle::Invoke() in
sfx2/source/sidebar/SidebarDockingWindow.cxx did the jsdialog thing,
but the loleaflet code still did not handle the jsdialog message in
_onJSDialogMsg() in loleaflet/src/layer/tile/TileLayer.js.
Change-Id: Id7633ad3dd2dc79f1d845e07b0bf89f07ddd2625
Reviewed-on: https://gerrit.libreoffice.org/82157
Reviewed-by: Tor Lillqvist
Tested-by: Tor Lillqvist
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 1c1213aa3..f336d1c7f 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -213,7 +213,11 @@ L.Map = L.Evented.extend({
elem.parentNode.removeChild(elem);
}
- if (L.Browser.mobile)
+ // We need core's knowledge of whether it is a mobile
phone or not (which is
+ // what .uno:LOKSetMobile does) to be in sync with the
test in
+ // _onJSDialogMsg in TileLayer.js but we don't have the
clout to do so
+ // except for the iOS app out of fear of breaking
something.
+ if (L.Browser.mobile && (!window.ThisIsTheiOSApp ||
screen.width < 768))
{
this._size = new L.Point(0,0);
this._onResize();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/cib_contract3756' - sw/source
sw/source/filter/ww8/ww8par.cxx | 99 +++-
sw/source/filter/ww8/ww8par.hxx |4 +
2 files changed, 102 insertions(+), 1 deletion(-)
New commits:
commit 21562a4a22d029ab9969274c887a8c573f32af58
Author: Vasily Melenchuk
AuthorDate: Mon Oct 28 14:23:36 2019 +0300
Commit: Vasily Melenchuk
CommitDate: Thu Nov 7 06:04:35 2019 +0100
sw: support for DRM encryption for binary doc formats
DRM encryption is implemented as a service and desrption
will be called if we found corresponding streams inside
binary OLE package.
Change-Id: Ie1a5b0417e1e7851b24d410c8f41dc85dd9210f7
Reviewed-on: https://gerrit.libreoffice.org/81600
Reviewed-by: Vasily Melenchuk
Tested-by: Vasily Melenchuk
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 445744b2912a..a800b43644ba 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -25,12 +25,14 @@
#include
#include
#include
+#include
#include
#include
#include
#include
+#include
#include
#include
#include
@@ -6300,6 +6302,95 @@ ErrCode WW8Reader::OpenMainStream(
tools::SvRef& rRef, sal_uIn
return nRet;
}
+void lcl_getListOfStreams(SotStorage * pStorage,
comphelper::SequenceAsHashMap& aStreamsData, const OUString& sPrefix)
+{
+SvStorageInfoList aElements;
+pStorage->FillInfoList(&aElements);
+for (const auto & aElement : aElements)
+{
+OUString sStreamFullName = sPrefix.getLength() ? sPrefix + "/" +
aElement.GetName() : aElement.GetName();
+if (aElement.IsStorage())
+{
+SotStorage * pSubStorage =
pStorage->OpenSotStorage(aElement.GetName(), StreamMode::STD_READ |
StreamMode::SHARE_DENYALL);
+lcl_getListOfStreams(pSubStorage, aStreamsData, sStreamFullName);
+}
+else
+{
+// Read stream
+tools::SvRef rStream =
pStorage->OpenSotStream(aElement.GetName(), StreamMode::READ |
StreamMode::SHARE_DENYALL);
+assert(rStream.is());
+
+sal_Int32 nStreamSize = rStream->GetSize();
+css::uno::Sequence< sal_Int8 > oData;
+oData.realloc(nStreamSize);
+sal_Int32 nReadBytes = rStream->ReadBytes(oData.getArray(),
nStreamSize);
+assert(nStreamSize == nReadBytes);
+aStreamsData[sStreamFullName] <<= oData;
+}
+}
+}
+
+ErrCode WW8Reader::DecryptDRMPackage()
+{
+// We have DRM encrypted storage. We should try to decrypt it first, if we
can
+uno::Sequence< uno::Any > aArguments;
+uno::Reference
xComponentContext(comphelper::getProcessComponentContext());
+uno::Reference< packages::XPackageEncryption > xPackageEncryption(
+
xComponentContext->getServiceManager()->createInstanceWithArgumentsAndContext(
+"com.sun.star.comp.oox.crypto.DRMDataSpace", aArguments,
xComponentContext), uno::UNO_QUERY);
+
+if (!xPackageEncryption.is())
+{
+// We do not know how to decrypt this
+return ERRCODE_IO_ACCESSDENIED;
+}
+
+std::vector aStreamsList;
+comphelper::SequenceAsHashMap aStreamsData;
+lcl_getListOfStreams(m_pStorage.get(), aStreamsData, OUString(""));
+
+try {
+uno::Sequence aStreams =
aStreamsData.getAsConstNamedValueList();
+if (!xPackageEncryption->readEncryptionInfo(aStreams))
+{
+// We failed with decryption
+return ERRCODE_IO_ACCESSDENIED;
+}
+
+tools::SvRef rContentStream =
m_pStorage->OpenSotStream("\011DRMContent", StreamMode::READ |
StreamMode::SHARE_DENYALL);
+if (!rContentStream.is())
+{
+return ERRCODE_IO_NOTEXISTS;
+}
+
+mDecodedStream.reset(new SvMemoryStream());
+
+uno::Reference xInputStream(new
utl::OSeekableInputStreamWrapper(rContentStream.get(), false));
+uno::Reference xDecryptedStream(new
utl::OSeekableOutputStreamWrapper(*mDecodedStream.get()));
+
+if (!xPackageEncryption->decrypt(xInputStream, xDecryptedStream))
+{
+// We failed with decryption
+return ERRCODE_IO_ACCESSDENIED;
+}
+
+mDecodedStream->Seek(0);
+
+// Further reading is done from new document
+m_pStorage = new SotStorage(*mDecodedStream);
+
+// Set the media descriptor data
+uno::Sequence aEncryptionData =
xPackageEncryption->createEncryptionData("");
+m_pMedium->GetItemSet()->Put(SfxUnoAnyItem(SID_ENCRYPTIONDATA,
uno::makeAny(aEncryptionData)));
+}
+catch (const std::exception&)
+{
+return ERRCODE_IO_ACCESSDENIED;
+}
+
+return ERRCODE_NONE;
+}
+
ErrCode WW8Reader::Read(SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM,
const OUString & /* FileName */)
{
sal_uInt16 nOldBuffSize = 32768;
@@ -6331,7 +6422,13 @@ ErrCode WW8Reader::Read(SwDoc &rDoc, const OUString&
rBaseURL, SwPaM &rPaM, cons
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - chart2/source
chart2/source/controller/dialogs/ChartTypeDialogController.cxx | 387
++
1 file changed, 116 insertions(+), 271 deletions(-)
New commits:
commit 3c7eae575b84255ee0187974b8253b7957f20a82
Author: Muhammet Kara
AuthorDate: Wed Nov 6 23:58:32 2019 +0300
Commit: Muhammet Kara
CommitDate: Thu Nov 7 06:01:49 2019 +0100
Reduce code duplication in ChartTypeDialogController.cxx
by using function templates.
Change-Id: I59e18366d7481e5b33ceb6ff8b372158b513447e
Reviewed-on: https://gerrit.libreoffice.org/82179
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Muhammet Kara
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
index 3036dda89a30..04afdc14244c 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
@@ -433,7 +433,11 @@ const tTemplateServiceChartTypeParameterMap&
ColumnChartDialogController::getTem
{"com.sun.star.chart2.template.ThreeDColumnDeep" ,
ChartTypeParameter(4,false,true,GlobalStackMode_STACK_Z)}};
return s_aTemplateMap;
}
-void ColumnChartDialogController::fillSubTypeList( SvtValueSet& rSubTypeList,
const ChartTypeParameter& rParameter )
+
+namespace
+{
+template
+void ColumnChartDialogController_fillSubTypeList( AnyValueSet& rSubTypeList,
const ChartTypeParameter& rParameter )
{
rSubTypeList.Clear();
@@ -479,52 +483,16 @@ void ColumnChartDialogController::fillSubTypeList(
SvtValueSet& rSubTypeList, co
rSubTypeList.SetItemText( 3, SchResId( STR_PERCENT ) );
rSubTypeList.SetItemText( 4, SchResId( STR_DEEP ) );
}
+} // end of anon namespace
-void ColumnChartDialogController::fillSubTypeList( ValueSet& rSubTypeList,
const ChartTypeParameter& rParameter )
+void ColumnChartDialogController::fillSubTypeList( SvtValueSet& rSubTypeList,
const ChartTypeParameter& rParameter )
{
-rSubTypeList.Clear();
-
-if( rParameter.b3DLook )
-{
-switch(rParameter.nGeometry3D)
-{
-case DataPointGeometry3D::CYLINDER:
-rSubTypeList.InsertItem(1, Image(StockImage::Yes,
BMP_SAEULE_3D_1));
-rSubTypeList.InsertItem(2, Image(StockImage::Yes,
BMP_SAEULE_3D_2));
-rSubTypeList.InsertItem(3, Image(StockImage::Yes,
BMP_SAEULE_3D_3));
-rSubTypeList.InsertItem(4, Image(StockImage::Yes,
BMP_SAEULE_3D_4));
-break;
-case DataPointGeometry3D::CONE:
-rSubTypeList.InsertItem(1, Image(StockImage::Yes,
BMP_KEGEL_3D_1));
-rSubTypeList.InsertItem(2, Image(StockImage::Yes,
BMP_KEGEL_3D_2));
-rSubTypeList.InsertItem(3, Image(StockImage::Yes,
BMP_KEGEL_3D_3));
-rSubTypeList.InsertItem(4, Image(StockImage::Yes,
BMP_KEGEL_3D_4));
-break;
-case DataPointGeometry3D::PYRAMID:
-rSubTypeList.InsertItem(1, Image(StockImage::Yes,
BMP_PYRAMID_3D_1));
-rSubTypeList.InsertItem(2, Image(StockImage::Yes,
BMP_PYRAMID_3D_2));
-rSubTypeList.InsertItem(3, Image(StockImage::Yes,
BMP_PYRAMID_3D_3));
-rSubTypeList.InsertItem(4, Image(StockImage::Yes,
BMP_PYRAMID_3D_4));
-break;
-default: //DataPointGeometry3D::CUBOID:
-rSubTypeList.InsertItem(1, Image(StockImage::Yes,
BMP_COLUMNS_3D_1));
-rSubTypeList.InsertItem(2, Image(StockImage::Yes,
BMP_COLUMNS_3D_2));
-rSubTypeList.InsertItem(3, Image(StockImage::Yes,
BMP_COLUMNS_3D_3));
-rSubTypeList.InsertItem(4, Image(StockImage::Yes,
BMP_COLUMNS_3D));
-break;
-}
-}
-else
-{
-rSubTypeList.InsertItem(1, Image(StockImage::Yes, BMP_COLUMNS_2D_1));
-rSubTypeList.InsertItem(2, Image(StockImage::Yes, BMP_COLUMNS_2D_2));
-rSubTypeList.InsertItem(3, Image(StockImage::Yes, BMP_COLUMNS_2D_3));
-}
+ColumnChartDialogController_fillSubTypeList(rSubTypeList, rParameter);
+}
-rSubTypeList.SetItemText( 1, SchResId( STR_NORMAL ) );
-rSubTypeList.SetItemText( 2, SchResId( STR_STACKED ) );
-rSubTypeList.SetItemText( 3, SchResId( STR_PERCENT ) );
-rSubTypeList.SetItemText( 4, SchResId( STR_DEEP ) );
+void ColumnChartDialogController::fillSubTypeList( ValueSet& rSubTypeList,
const ChartTypeParameter& rParameter )
+{
+ColumnChartDialogController_fillSubTypeList(rSubTypeList, rParameter);
}
BarChartDialogController::BarChartDialogController()
@@ -557,7 +525,11 @@ const tTemplateServiceChartTypeParameterMap&
BarChartDialogController::getTempla
{"com.sun.star.chart2.template.ThreeDBarDeep" ,
ChartTypeParameter(4,false,true,GlobalStackMode_STACK_Z)}};
return s_aTemplateMap;
}
-void BarChartDialogController::fillSubTypeList( SvtValueSet& rSubTypeList,
const ChartTy
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/wrtsh/select.cxx | 13 ++---
1 file changed, 10 insertions(+), 3 deletions(-)
New commits:
commit 25c390e17a7f1c018b5eed1ef7dfd568b76f4a84
Author: Jim Raykowski
AuthorDate: Sat Nov 2 12:51:36 2019 -0800
Commit: Jim Raykowski
CommitDate: Thu Nov 7 00:57:48 2019 +0100
tdf#38199 Readonly mode tab key: Don't scroll if no hyperlink found
When viewing a document in readonly mode the action of the tab key is to
move among Graphic, Frame, Ole, DrawObject, or DbForm if one these is
already selected. If the cursor is inside an input field and has no multi
selection then move among InputFields. Finally if neither the previous
two cases apply then move among Hyperlinks which causes cursor position
to move to top or bottom of the document when no Hyperlink is found.
When no Hyperlink is found this patch restores the cursor position to
the position before search and does not scroll to it on EndAction.
Change-Id: I94ac882e7be124d2ddb6f86daac03a9389117cc5
Reviewed-on: https://gerrit.libreoffice.org/81955
Tested-by: Jenkins
Reviewed-by: Jim Raykowski
diff --git a/sw/source/uibase/wrtsh/select.cxx
b/sw/source/uibase/wrtsh/select.cxx
index e06f3dc69777..90664ae098f5 100644
--- a/sw/source/uibase/wrtsh/select.cxx
+++ b/sw/source/uibase/wrtsh/select.cxx
@@ -941,15 +941,22 @@ void SwWrtShell::SelectNextPrevHyperlink( bool bNext )
{
StartAction();
bool bRet = SwCursorShell::SelectNxtPrvHyperlink( bNext );
-if( !bRet )
+if( !bRet ) // didn't find? wrap and check again
{
-// will we have this feature?
+SwShellCursor* pCursor = GetCursor_();
+SwCursorSaveState aSaveState(*pCursor);
EnterStdMode();
if( bNext )
SttEndDoc(true);
else
SttEndDoc(false);
-SwCursorShell::SelectNxtPrvHyperlink( bNext );
+bRet = SwCursorShell::SelectNxtPrvHyperlink(bNext);
+if (!bRet) // didn't find again? restore cursor position and bail
+{
+pCursor->RestoreSavePos();
+EndAction(true); // don't scroll to restored cursor position
+return;
+}
}
EndAction();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sw/uiconfig
sw/uiconfig/swriter/ui/endnotepage.ui | 292 ++-- sw/uiconfig/swriter/ui/footnotepage.ui | 371 -- sw/uiconfig/swriter/ui/linenumbering.ui | 384 3 files changed, 474 insertions(+), 573 deletions(-) New commits: commit 51c23bffbd8dd9fa0b39c87a61eb051320e81f96 Author: andreas kainz AuthorDate: Thu Nov 7 00:06:54 2019 +0100 Commit: andreas_kainz CommitDate: Thu Nov 7 00:55:51 2019 +0100 Linenumbering Dialog update Change-Id: Icbfdcc293bd9dd3a73b40330e359ac141f08f998 Reviewed-on: https://gerrit.libreoffice.org/82183 Tested-by: Jenkins Reviewed-by: andreas_kainz diff --git a/sw/uiconfig/swriter/ui/linenumbering.ui b/sw/uiconfig/swriter/ui/linenumbering.ui index 42ef37824ae9..3506bd8b3df0 100644 --- a/sw/uiconfig/swriter/ui/linenumbering.ui +++ b/sw/uiconfig/swriter/ui/linenumbering.ui @@ -1,5 +1,5 @@ - + @@ -29,6 +29,9 @@ 0 0 dialog + + + False @@ -103,8 +106,8 @@ True True False -True start +True 0 True @@ -115,11 +118,11 @@ - + True False -vertical -12 +12 +24 True @@ -210,7 +213,6 @@ True False -True 1 @@ -222,7 +224,6 @@ True False -True 1 @@ -234,7 +235,6 @@ True False -True Left Right @@ -252,7 +252,6 @@ True True -start spacingadjustment 2 @@ -315,73 +314,84 @@ -True -True -0 +0 +0 - + True False -18 +0 +none - + True False -0 -none +6 +12 - + True False -6 -12 +6 +12 - + True False -6 -12 - - -True -False -Text: -True -textentry -0 - - -0 -0 - - - - -True -False -Every: -True -linesspin -0 - - -0 -1 - - +Text: +
[Libreoffice-commits] core.git: sw/uiconfig
sw/uiconfig/swriter/ui/insertfootnote.ui |8 1 file changed, 8 insertions(+) New commits: commit 274af519311f194647f34428b13e86f63bda30b2 Author: andreas kainz AuthorDate: Wed Nov 6 23:02:08 2019 +0100 Commit: andreas_kainz CommitDate: Wed Nov 6 23:43:34 2019 +0100 Insertfootnote Dialog alignment update Change-Id: I1a07821e22fd96ddf1f8b57a59173889e47aec35 Reviewed-on: https://gerrit.libreoffice.org/82181 Tested-by: Jenkins Reviewed-by: andreas_kainz diff --git a/sw/uiconfig/swriter/ui/insertfootnote.ui b/sw/uiconfig/swriter/ui/insertfootnote.ui index 556a6fb9b14b..539afc03da67 100644 --- a/sw/uiconfig/swriter/ui/insertfootnote.ui +++ b/sw/uiconfig/swriter/ui/insertfootnote.ui @@ -332,4 +332,12 @@ + + + + + + + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/po loleaflet/src
loleaflet/po/templates/loleaflet-ui.pot | 304 +++- loleaflet/src/core/Socket.js|2 2 files changed, 151 insertions(+), 155 deletions(-) New commits: commit 4c52879a6a1d94511b3f6d863f23437fbbde854f Author: Andras Timar AuthorDate: Wed Nov 6 23:30:48 2019 +0100 Commit: Andras Timar CommitDate: Wed Nov 6 23:30:48 2019 +0100 loleaflet: l10n of 'Served by:' string Change-Id: Ifb67af0a15d308baff7242f486077235f79c063a diff --git a/loleaflet/po/templates/loleaflet-ui.pot b/loleaflet/po/templates/loleaflet-ui.pot index 53b4359bd..4446e924c 100644 --- a/loleaflet/po/templates/loleaflet-ui.pot +++ b/loleaflet/po/templates/loleaflet-ui.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-02 22:37+0100\n" +"POT-Creation-Date: 2019-11-06 23:29+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -234,7 +234,7 @@ msgstr "" msgid "The server encountered a %0 error while parsing the %1 command." msgstr "" -#: src/control/Control.ContextMenu.js:161 +#: src/control/Control.ContextMenu.js:172 msgid "Paste Special" msgstr "" @@ -266,7 +266,7 @@ msgstr "" msgid "Jump to state" msgstr "" -#: src/control/Control.DocumentRepair.js:95 src/control/Control.Toolbar.js:2349 +#: src/control/Control.DocumentRepair.js:95 src/control/Control.Toolbar.js:2351 msgid "You" msgstr "" @@ -286,113 +286,126 @@ msgstr "" msgid "Start cross copy/paste" msgstr "" -#: src/control/ColorPicker.js:104 +#: src/control/ColorPicker.js:121 msgid "No color" msgstr "" -#: src/control/Control.JSDialogBuilder.js:415 +#: src/control/Control.JSDialogBuilder.js:413 msgid "\"" msgstr "" -#: src/control/Control.JSDialogBuilder.js:417 +#: src/control/Control.JSDialogBuilder.js:415 msgid "%" msgstr "" -#: src/control/Control.JSDialogBuilder.js:535 +#: src/control/Control.JSDialogBuilder.js:533 msgid "Font Name" msgstr "" -#: src/control/Control.JSDialogBuilder.js:537 +#: src/control/Control.JSDialogBuilder.js:535 msgid "Font Size" msgstr "" -#: src/control/Control.JSDialogBuilder.js:841 +#: src/control/Control.JSDialogBuilder.js:863 msgid "Rows" msgstr "" -#: src/control/Control.JSDialogBuilder.js:842 +#: src/control/Control.JSDialogBuilder.js:864 msgid "Columns" msgstr "" -#: src/control/Control.JSDialogBuilder.js:862 -#: src/control/Control.Menubar.js:614 src/control/Control.Menubar.js:665 -#: src/control/Control.Toolbar.js:882 src/layer/tile/WriterTileLayer.js:86 +#: src/control/Control.JSDialogBuilder.js:884 +#: src/control/Control.Menubar.js:621 src/control/Control.Menubar.js:672 +#: src/control/Control.Toolbar.js:876 src/layer/tile/WriterTileLayer.js:86 msgid "Insert table" msgstr "" +#: src/control/Control.LanguageDialog.js:69 src/control/Control.Menubar.js:227 +#: src/control/Control.Menubar.js:229 src/control/Control.Menubar.js:231 +#: src/control/Control.Menubar.js:335 src/control/Control.Menubar.js:449 +#: src/control/Control.Toolbar.js:1874 +msgid "None (Do not check spelling)" +msgstr "" + +#: src/control/Control.LanguageDialog.js:86 src/control/Control.Toolbar.js:966 +#: src/control/Toolbar.js:418 src/layer/marker/Annotation.js:182 +#: src/layer/tile/CalcTileLayer.js:165 src/layer/tile/TileLayer.js:378 +msgid "Cancel" +msgstr "" + #: src/control/Control.Menubar.js:21 src/control/Control.Menubar.js:250 -#: src/control/Control.Menubar.js:342 src/control/Control.Menubar.js:457 -#: src/control/Control.Menubar.js:503 src/control/Control.Menubar.js:549 +#: src/control/Control.Menubar.js:349 src/control/Control.Menubar.js:464 +#: src/control/Control.Menubar.js:510 src/control/Control.Menubar.js:556 msgid "Share..." msgstr "" #: src/control/Control.Menubar.js:23 src/control/Control.Menubar.js:252 -#: src/control/Control.Menubar.js:344 src/control/Control.Menubar.js:459 -#: src/control/Control.Menubar.js:505 src/control/Control.Menubar.js:551 +#: src/control/Control.Menubar.js:351 src/control/Control.Menubar.js:466 +#: src/control/Control.Menubar.js:512 src/control/Control.Menubar.js:558 msgid "See revision history" msgstr "" #: src/control/Control.Menubar.js:24 src/control/Control.Menubar.js:253 -#: src/control/Control.Menubar.js:345 src/control/Control.Menubar.js:462 -#: src/control/Control.Menubar.js:507 src/control/Control.Menubar.js:553 +#: src/control/Control.Menubar.js:352 src/control/Control.Menubar.js:469 +#: src/control/Control.Menubar.js:514 src/control/Control.Menubar.js:560 msgid "Download as" msgstr "" #: src/control/Control.Menubar.js:25 src/control/Control.Menubar.js:254 -#: src/control/Control.Menubar.js:346 src/control/Control.Menubar.js:463 -#: src/control/Control.Menubar.js:508 src/control/Control.Menubar.js:554 +#: src/control/Control.Menubar.js:353 src/control/Control.Menubar.js:470 +#: src/control/Control.Menubar.js:515 src/control/Control.Menubar.js:56
Re: Android Beta (no Google Play)
Le 06/11/2019 à 18:25, Tim Magee a écrit : Is there a way to download and install the LibreOffice Android Beta without Google Play? I prefer not to use Google Play because of its proprietary nature. For the same reason, I use apkpure.com instead Google Play. Best regards. JBF -- Seuls des formats ouverts peuvent assurer la pérennité de vos documents. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - desktop/source
desktop/source/lib/init.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit ae975010255fbaedd356afb952d0008ac27b39c6
Author: Szymon Kłos
AuthorDate: Wed Nov 6 19:13:12 2019 +0100
Commit: Michael Meeks
CommitDate: Wed Nov 6 22:06:13 2019 +0100
jsdialogs: refresh after event
Change-Id: Ie0128ec38dd442a04d6ea9e24cea254f5bc69791
Reviewed-on: https://gerrit.libreoffice.org/82170
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Michael Meeks
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index bac4319a778d..ac5fca9f39db 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3337,8 +3337,8 @@ static void doc_sendDialogEvent(LibreOfficeKitDocument*
/*pThis*/, unsigned nWin
} catch(...) {}
// force resend
-pWindow->GetParent()->Hide();
-pWindow->GetParent()->Show();
+pWindow->Hide();
+pWindow->Show();
}
}
___
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' - svx/source svx/uiconfig
svx/source/sidebar/text/TextPropertyPanel.cxx | 11 +++ svx/uiconfig/ui/sidebartextpanel.ui |2 +- 2 files changed, 12 insertions(+), 1 deletion(-) New commits: commit cd93a2e61f6f66dd6a0753c6f5a3e426a957fa71 Author: Michael Meeks AuthorDate: Wed Nov 6 19:58:18 2019 + Commit: Michael Meeks CommitDate: Wed Nov 6 22:04:01 2019 +0100 lok: disable text spacing for now. Change-Id: I87229ab2bc1b72987d43ce685a03627111951ce3 Reviewed-on: https://gerrit.libreoffice.org/82174 Tested-by: Jenkins CollaboraOffice Reviewed-by: Michael Meeks diff --git a/svx/source/sidebar/text/TextPropertyPanel.cxx b/svx/source/sidebar/text/TextPropertyPanel.cxx index 3518e0368a4b..eae6f95aa366 100644 --- a/svx/source/sidebar/text/TextPropertyPanel.cxx +++ b/svx/source/sidebar/text/TextPropertyPanel.cxx @@ -21,6 +21,8 @@ #include #include +#include +#include using namespace css; @@ -44,6 +46,15 @@ TextPropertyPanel::TextPropertyPanel ( vcl::Window* pParent, const css::uno::Ref get(mpToolBoxFontColorSw, "colorbar_writer"); get(mpToolBoxFontColor, "colorbar_others"); get(mpToolBoxBackgroundColor, "colorbar_background"); + +bool isMobile = false; +if (comphelper::LibreOfficeKit::isActive() && +comphelper::LibreOfficeKit::isMobile(SfxLokHelper::getView())) +isMobile = true; +VclPtr xSpacingBar; +get(xSpacingBar, "spacingbar"); +xSpacingBar->Show(!isMobile); +xSpacingBar->ShowItem(0, !isMobile); } TextPropertyPanel::~TextPropertyPanel() diff --git a/svx/uiconfig/ui/sidebartextpanel.ui b/svx/uiconfig/ui/sidebartextpanel.ui index 8fbbc18b8fb0..c2c995490525 100644 --- a/svx/uiconfig/ui/sidebartextpanel.ui +++ b/svx/uiconfig/ui/sidebartextpanel.ui @@ -332,7 +332,7 @@ -True +False True ___ 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/selectionMarkers.css |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 555ef04e67ccb0d720fc70ba90f8ca9e2f4c3733
Author: Henry Castro
AuthorDate: Wed Nov 6 15:53:52 2019 -0400
Commit: Henry Castro
CommitDate: Wed Nov 6 21:01:08 2019 +0100
loleaflet: adjust the margin property for the new cursor handler image
Change-Id: I83c83de60cd8b099d157881c63a027493130e5cb
Reviewed-on: https://gerrit.libreoffice.org/82175
Reviewed-by: Henry Castro
Tested-by: Henry Castro
diff --git a/loleaflet/css/selectionMarkers.css
b/loleaflet/css/selectionMarkers.css
index 0711a0c98..2bf7f791c 100644
--- a/loleaflet/css/selectionMarkers.css
+++ b/loleaflet/css/selectionMarkers.css
@@ -13,7 +13,7 @@
}
.leaflet-cursor-handler {
- margin-left: -12px;
+ margin-left: -14px;
width: 30px;
height: 44px;
background-image: url('images/cursor-handler.svg');
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/DomainMapper.cxx |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit a7214706efeba6eb057a6fcfed6ec12079bfefab
Author: Caolán McNamara
AuthorDate: Mon Nov 4 21:26:39 2019 +
Commit: Caolán McNamara
CommitDate: Wed Nov 6 20:53:48 2019 +0100
crashtesting: null deref on import of lp482242-3.rtf
since...
commit a991ad93dcd6807d0eacd11a50c2ae43a2cfb882
Date: Tue Oct 22 12:24:43 2019 +0200
tdf#121441 improve DOCX footnote import
Change-Id: I0c6b83bd1ff61b9fa3621896d59f126384530270
Reviewed-on: https://gerrit.libreoffice.org/82045
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 37bb2fb4f5eb..6de16cdcb1a6 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -3265,8 +3265,11 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_,
size_t len)
// This skips the one from the footnote area and just uses the
reference one.
if (!m_pImpl->IsInFootOrEndnote())
{
-auto xFootnote =
m_pImpl->GetFootnoteContext()->GetFootnote();
-xFootnote->setLabel(xFootnote->getLabel() + sText);
+if (PropertyMapPtr pFootnoteContext =
m_pImpl->GetFootnoteContext())
+{
+auto xFootnote = pFootnoteContext->GetFootnote();
+xFootnote->setLabel(xFootnote->getLabel() + sText);
+}
}
return;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - sw/qa sw/source
sw/qa/extras/uiwriter/data2/tdf128335.odt |binary
sw/qa/extras/uiwriter/uiwriter2.cxx | 40 ++
sw/source/core/draw/dview.cxx |6 +++-
3 files changed, 45 insertions(+), 1 deletion(-)
New commits:
commit b75ff29acec137be0852687eb7c1d4cf4d49b6a0
Author: Miklos Vajna
AuthorDate: Mon Nov 4 21:00:51 2019 +0100
Commit: Caolán McNamara
CommitDate: Wed Nov 6 20:51:32 2019 +0100
tdf#128335 sw textbox: fix crash on deleting multiple shapes with textboxes
This was introduced in commit 33141f999b22ce10cdbfbd76081fff211c4b5067
(SwDrawView::DeleteMarked: delete textbox of shape as well, 2014-06-23),
the problem is that in case one shape+textframe pair is anchored in an
other textframe, which is also part of a shape+textframe pair, it
matters what order we use for deleting these objects.
What happened is that the anchor position of a 2nd textbox was updated
on the deletion (cut) of the 1st textbox, and this was not properly
restored on paste.
Fix the problem by deleting in reverse order, assuming that the
container is ordered by anchor positions.
(cherry picked from commit f6e7683847e5c959948b55c35bc916c69beb615e)
Change-Id: I62bc12a5064ce397234999e8fd7b108f79de3c24
Reviewed-on: https://gerrit.libreoffice.org/82051
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/qa/extras/uiwriter/data2/tdf128335.odt
b/sw/qa/extras/uiwriter/data2/tdf128335.odt
new file mode 100644
index ..6fb758af9168
Binary files /dev/null and b/sw/qa/extras/uiwriter/data2/tdf128335.odt differ
diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx
b/sw/qa/extras/uiwriter/uiwriter2.cxx
index 765c65dfa1da..8e2c49d0c3f6 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -11,6 +11,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -29,9 +30,13 @@
#include
#include
#include
+#include
#include
#include
+#include
+#include
#include
+#include
namespace
{
@@ -1411,4 +1416,39 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf105330)
pWrtShell->GetVisibleCursor()->GetTextCursor().GetSize().getHeight());
}
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf128335)
+{
+// Load the bugdoc, which has 3 textboxes.
+SwDoc* pDoc = createDoc("tdf128335.odt");
+
+// Select the 3rd textbox.
+SwView* pView = pDoc->GetDocShell()->GetView();
+pView->GetViewFrame()->GetDispatcher()->Execute(FN_CNTNT_TO_NEXT_FRAME,
SfxCallMode::SYNCHRON);
+// Make sure SwTextShell is replaced with SwDrawShell right now, not after
120 ms, as set in the
+// SwView ctor.
+pView->StopShellTimer();
+SwXTextDocument* pXTextDocument =
dynamic_cast(mxComponent.get());
+pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, KEY_TAB);
+pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 0, KEY_TAB);
+pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, KEY_TAB);
+pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 0, KEY_TAB);
+Scheduler::ProcessEventsToIdle();
+
+// Cut it.
+pView->GetViewFrame()->GetDispatcher()->Execute(SID_CUT,
SfxCallMode::SYNCHRON);
+
+// Paste it: this makes the 3rd textbox anchored in the 2nd one.
+pView->GetViewFrame()->GetDispatcher()->Execute(SID_PASTE,
SfxCallMode::SYNCHRON);
+
+// Select all shapes.
+uno::Reference xSelectionSupplier(
+pXTextDocument->getCurrentController(), uno::UNO_QUERY);
+xSelectionSupplier->select(pXTextDocument->getDrawPages()->getByIndex(0));
+
+// Cut them.
+// Without the accompanying fix in place, this test would have crashed as
the textboxes were
+// deleted in an incorrect order.
+pView->GetViewFrame()->GetDispatcher()->Execute(SID_CUT,
SfxCallMode::SYNCHRON);
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx
index 590885d8b7f1..d080ee92d3dc 100644
--- a/sw/source/core/draw/dview.cxx
+++ b/sw/source/core/draw/dview.cxx
@@ -975,8 +975,12 @@ void SwDrawView::DeleteMarked()
::FrameNotify( Imp().GetShell(), FLY_DRAG_END );
// Only delete these now: earlier deletion would clear the mark list
as well.
-for (auto& rpTextBox : aTextBoxesToDelete)
+// Delete in reverse order, assuming that the container is sorted by
anchor positions.
+for (int i = aTextBoxesToDelete.size() - 1; i >= 0; --i)
+{
+SwFrameFormat*& rpTextBox = aTextBoxesToDelete[i];
pDoc->getIDocumentLayoutAccess().DelLayoutFormat(rpTextBox);
+}
}
pDoc->GetIDocumentUndoRedo().EndUndo(SwUndoId::EMPTY, nullptr);
if( pTmpRoot )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/ma
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/draw/shapeexport.cxx |8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) New commits: commit 1b2146431a583be27518536bed19ef01861b42a0 Author: Caolán McNamara AuthorDate: Wed Nov 6 16:31:00 2019 + Commit: Caolán McNamara CommitDate: Wed Nov 6 20:50:39 2019 +0100 tdf#127791 write events at the end of groups instead of the start because the group shape import applies the events over the children it has when it reads the events, so putting it before exportShapes means it get applied over 0 children Change-Id: If7d09865a7a34d8d13440eb559ec97580792bd4e Reviewed-on: https://gerrit.libreoffice.org/82160 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index ddd128d1d8b0..c7640016786c 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -1883,7 +1883,6 @@ void XMLShapeExport::ImpExportGroupShape( const uno::Reference< drawing::XShape SvXMLElementExport aPGR(mrExport, XML_NAMESPACE_DRAW, XML_G, bCreateNewline, true); ImpExportDescription( xShape ); // #i68101# -ImpExportEvents( xShape ); ImpExportGluePoints( xShape ); // #89764# if export of position is suppressed for group shape, @@ -1900,6 +1899,13 @@ void XMLShapeExport::ImpExportGroupShape( const uno::Reference< drawing::XShape // write members exportShapes( xShapes, nFeatures, pRefPoint ); + +/* tdf#127791 write events after shapes are exported because + the group shape import applies the events over the + children it has when it reads the events, so putting + it before exportShapes means it get applied over 0 children +*/ +ImpExportEvents( xShape ); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/func/fudraw.cxx | 15 ++-
1 file changed, 6 insertions(+), 9 deletions(-)
New commits:
commit 913b2530fff20bacb0cbb8e51be29b42983d56c8
Author: Caolán McNamara
AuthorDate: Wed Nov 6 15:00:55 2019 +
Commit: Caolán McNamara
CommitDate: Wed Nov 6 20:50:22 2019 +0100
Resolves: tdf#128631 dispatch active ole async
like we do for the other things that might create dialogs
Change-Id: I31ca267526ddeac8d0c7163af45c11be7750cb4c
Reviewed-on: https://gerrit.libreoffice.org/82143
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx
index c8bfd0d26cb0..1760454d5fe9 100644
--- a/sd/source/ui/func/fudraw.cxx
+++ b/sd/source/ui/func/fudraw.cxx
@@ -644,15 +644,12 @@ void FuDraw::DoubleClick(const MouseEvent& rMEvt)
if (nInv == SdrInventor::Default && nSdrObjKind == OBJ_OLE2)
{
-DrawDocShell* pDocSh = mpDoc->GetDocSh();
-
-if ( !pDocSh->IsUIActive() )
-{
-/**
-* activate OLE-object
-**/
-mpViewShell->ActivateObject(
static_cast(pObj), 0);
-}
+// activate OLE-object
+SfxInt16Item aItem(SID_OBJECT, 0);
+mpViewShell->GetViewFrame()->
+GetDispatcher()->ExecuteList(SID_OBJECT,
+ SfxCallMode::ASYNCHRON |
SfxCallMode::RECORD,
+ { &aItem });
}
else if (nInv == SdrInventor::Default && nSdrObjKind == OBJ_GRAF
&& pObj->IsEmptyPresObj() )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Impress .ODP Bug Report
Hello, I am Eduardo, a TI support worker, Brazil. An administrative worker was doing a presentation on LibreOffice Impress, a boss told my co-worker to change from LibreOffice to MicrosoftOffice on the administration computer, he made this change this morning, simply uninstalled Libre and installed Microsoft. After that, the extension in the file changed from .ODP to .OPD. .OPD is a very uncommon extension and we don't deal with nothing related to it. I tried to "restore" the file but I do not succeeded yet. Could you please help me with this matter? Thank you. I support free software and even have some ideas for LibreOffice interface. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/xmloff xmloff/source
include/xmloff/xmlictxt.hxx | 32
xmloff/source/core/xmlictxt.cxx | 30 --
2 files changed, 52 insertions(+), 10 deletions(-)
New commits:
commit ef0e7e146f86999b04d7274688d72fadcaf53a36
Author: Noel Grandin
AuthorDate: Wed Nov 6 20:08:56 2019 +0200
Commit: Noel Grandin
CommitDate: Wed Nov 6 20:28:52 2019 +0100
tdf#125688 removing XWeak support from SvXMLImportContext
shaves 2% off the load time
Change-Id: Icac00389dfcc3339fe4faf1731e9eeb3ff8d0f0c
Reviewed-on: https://gerrit.libreoffice.org/82139
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/xmloff/xmlictxt.hxx b/include/xmloff/xmlictxt.hxx
index 9cf531b4eef5..8dc67dac0227 100644
--- a/include/xmloff/xmlictxt.hxx
+++ b/include/xmloff/xmlictxt.hxx
@@ -24,8 +24,8 @@
#include
#include
#include
+#include
#include
-#include
#include
#include
@@ -37,15 +37,20 @@ class SvXMLImportContext;
typedef rtl::Reference SvXMLImportContextRef;
-class XMLOFF_DLLPUBLIC SvXMLImportContext : public cppu::WeakImplHelper<
css::xml::sax::XFastContextHandler >
+/**
+This class deliberately does not support XWeak, to improve performance when
loading
+large documents.
+*/
+class XMLOFF_DLLPUBLIC SvXMLImportContext : public
css::xml::sax::XFastContextHandler,
+public css::lang::XTypeProvider
+
{
friend class SvXMLImport;
-SvXMLImport& mrImport;
-
-sal_uInt16 const mnPrefix;
-OUString const maLocalName;
-
+oslInterlockedCountm_nRefCount;
+SvXMLImport& mrImport;
+sal_uInt16 mnPrefix;
+OUString maLocalName;
std::unique_ptr m_pRewindMap;
SAL_DLLPRIVATE std::unique_ptr TakeRewindMap() { return
std::move(m_pRewindMap); }
@@ -74,7 +79,7 @@ public:
* ends. By default, nothing is done.
* Note that virtual methods cannot be used inside destructors. Use
* EndElement instead if this is required. */
-virtual ~SvXMLImportContext() override;
+virtual ~SvXMLImportContext();
/** Create a children element context. By default, the import's
* CreateContext method is called to create a new default context. */
@@ -115,6 +120,17 @@ public:
const css::uno::Reference< css::xml::sax::XFastAttributeList > &
Attribs) override;
virtual void SAL_CALL characters(const OUString & aChars) override;
+
+// XInterface
+virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType
) final override;
+virtual void SAL_CALL acquire() throw () final override
+{ osl_atomic_increment(&m_nRefCount); }
+virtual void SAL_CALL release() throw () final override
+{ if (osl_atomic_decrement(&m_nRefCount) == 0) delete this; }
+
+// XTypeProvider
+virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) final
override;
+virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( )
final override;
};
#endif // INCLUDED_XMLOFF_XMLICTXT_HXX
diff --git a/xmloff/source/core/xmlictxt.cxx b/xmloff/source/core/xmlictxt.cxx
index fb4e64ef8719..8e31d497ab8e 100644
--- a/xmloff/source/core/xmlictxt.cxx
+++ b/xmloff/source/core/xmlictxt.cxx
@@ -22,19 +22,22 @@
#include
#include
#include
+#include
using namespace ::com::sun::star;
SvXMLImportContext::SvXMLImportContext( SvXMLImport& rImp, sal_uInt16 nPrfx,
const OUString& rLName )
-: mrImport(rImp)
+: m_nRefCount(0)
+, mrImport(rImp)
, mnPrefix(nPrfx)
, maLocalName(rLName)
{
}
SvXMLImportContext::SvXMLImportContext( SvXMLImport& rImp )
-: mrImport(rImp)
+: m_nRefCount(0)
+, mrImport(rImp)
, mnPrefix(0)
{
}
@@ -143,4 +146,27 @@ void SAL_CALL SvXMLImportContext::characters(const
OUString &rChars)
mrImport.Characters( rChars );
}
+// XInterface
+css::uno::Any SAL_CALL SvXMLImportContext::queryInterface( const
css::uno::Type& aType )
+{
+css::uno::Any a = ::cppu::queryInterface(
+aType,
+static_cast< XFastContextHandler* >(this),
+static_cast< XTypeProvider* >(this));
+
+return a;
+}
+
+// XTypeProvider
+css::uno::Sequence< css::uno::Type > SAL_CALL SvXMLImportContext::getTypes()
+{
+return { cppu::UnoType::get(),
+ cppu::UnoType::get() };
+}
+
+css::uno::Sequence< sal_Int8 > SAL_CALL
SvXMLImportContext::getImplementationId()
+{
+return css::uno::Sequence();
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
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' - chart2/source
chart2/source/controller/sidebar/ChartTypePanel.cxx | 49
1 file changed, 2 insertions(+), 47 deletions(-)
New commits:
commit a4fdc96db05ee1e6db338ed13c90e15297edbe7d
Author: Muhammet Kara
AuthorDate: Wed Nov 6 20:48:07 2019 +0300
Commit: Muhammet Kara
CommitDate: Wed Nov 6 20:26:04 2019 +0100
Use fillSubTypeList() instead of hard-coded images
To fill the chart sub-type valueset on the chart
type panel of chartdeck sidebar.
Change-Id: If0098aa5ff4b344a5bd31d7425593d0e52eb08d8
Reviewed-on: https://gerrit.libreoffice.org/82167
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Muhammet Kara
diff --git a/chart2/source/controller/sidebar/ChartTypePanel.cxx
b/chart2/source/controller/sidebar/ChartTypePanel.cxx
index edc7beb71425..f1ed61df9ebc 100644
--- a/chart2/source/controller/sidebar/ChartTypePanel.cxx
+++ b/chart2/source/controller/sidebar/ChartTypePanel.cxx
@@ -439,54 +439,9 @@ void ChartTypePanel::fillAllControls(const
ChartTypeParameter& rParameter,
m_nChangingCalls++;
if (m_pCurrentMainType && bAlsoResetSubTypeList)
{
-// FIXME: This is just to test. This if-block should just call
m_pCurrentMainType->fillSubTypeList(*m_pSubTypeList, rParameter);
-// after adding a new method to ColumnChartDialogController and its
children
-//m_pCurrentMainType->fillSubTypeList(*m_pSubTypeList, rParameter);
-//m_pCurrentMainType->fillSubTypeList(*m_pSubTypeList, rParameter);
-m_pSubTypeList->Clear();
-
-if (rParameter.b3DLook)
-{
-switch (rParameter.nGeometry3D)
-{
-case css::chart2::DataPointGeometry3D::CYLINDER:
-m_pSubTypeList->InsertItem(1, Image(StockImage::Yes,
BMP_SAEULE_3D_1));
-m_pSubTypeList->InsertItem(2, Image(StockImage::Yes,
BMP_SAEULE_3D_2));
-m_pSubTypeList->InsertItem(3, Image(StockImage::Yes,
BMP_SAEULE_3D_3));
-m_pSubTypeList->InsertItem(4, Image(StockImage::Yes,
BMP_SAEULE_3D_4));
-break;
-case css::chart2::DataPointGeometry3D::CONE:
-m_pSubTypeList->InsertItem(1, Image(StockImage::Yes,
BMP_KEGEL_3D_1));
-m_pSubTypeList->InsertItem(2, Image(StockImage::Yes,
BMP_KEGEL_3D_2));
-m_pSubTypeList->InsertItem(3, Image(StockImage::Yes,
BMP_KEGEL_3D_3));
-m_pSubTypeList->InsertItem(4, Image(StockImage::Yes,
BMP_KEGEL_3D_4));
-break;
-case css::chart2::DataPointGeometry3D::PYRAMID:
-m_pSubTypeList->InsertItem(1, Image(StockImage::Yes,
BMP_PYRAMID_3D_1));
-m_pSubTypeList->InsertItem(2, Image(StockImage::Yes,
BMP_PYRAMID_3D_2));
-m_pSubTypeList->InsertItem(3, Image(StockImage::Yes,
BMP_PYRAMID_3D_3));
-m_pSubTypeList->InsertItem(4, Image(StockImage::Yes,
BMP_PYRAMID_3D_4));
-break;
-default: //DataPointGeometry3D::CUBOID:
-m_pSubTypeList->InsertItem(1, Image(StockImage::Yes,
BMP_COLUMNS_3D_1));
-m_pSubTypeList->InsertItem(2, Image(StockImage::Yes,
BMP_COLUMNS_3D_2));
-m_pSubTypeList->InsertItem(3, Image(StockImage::Yes,
BMP_COLUMNS_3D_3));
-m_pSubTypeList->InsertItem(4, Image(StockImage::Yes,
BMP_COLUMNS_3D));
-break;
-}
-}
-else
-{
-m_pSubTypeList->InsertItem(1, Image(StockImage::Yes,
BMP_COLUMNS_2D_1));
-m_pSubTypeList->InsertItem(2, Image(StockImage::Yes,
BMP_COLUMNS_2D_2));
-m_pSubTypeList->InsertItem(3, Image(StockImage::Yes,
BMP_COLUMNS_2D_3));
-}
-
-m_pSubTypeList->SetItemText(1, SchResId(STR_NORMAL));
-m_pSubTypeList->SetItemText(2, SchResId(STR_STACKED));
-m_pSubTypeList->SetItemText(3, SchResId(STR_PERCENT));
-m_pSubTypeList->SetItemText(4, SchResId(STR_DEEP));
+m_pCurrentMainType->fillSubTypeList(*m_pSubTypeList, rParameter);
}
+
m_pSubTypeList->SelectItem(static_cast(rParameter.nSubTypeIndex));
m_pDim3DLookResourceGroup->fillControls(rParameter);
/*m_pStackingResourceGroup->fillControls( rParameter );
___
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' - chart2/source
chart2/source/controller/dialogs/ChartTypeDialogController.cxx | 310
++
chart2/source/controller/sidebar/ChartTypePanel.cxx|1
chart2/source/inc/ChartTypeDialogController.hxx| 12
3 files changed, 323 insertions(+)
New commits:
commit e3a1d65f9549c6c9e42cbebda511a9d9d6233b8a
Author: Muhammet Kara
AuthorDate: Wed Nov 6 20:41:53 2019 +0300
Commit: Muhammet Kara
CommitDate: Wed Nov 6 20:25:15 2019 +0100
Overload fillSubTypeList() for ValueSet param
Change-Id: Ia429db469d115e3f5190ba79ded3c191e6538fa2
Reviewed-on: https://gerrit.libreoffice.org/82166
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Muhammet Kara
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
index 3c34c96982f3..3036dda89a30 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
@@ -339,6 +339,10 @@ void ChartTypeDialogController::fillSubTypeList(
SvtValueSet& rSubTypeList, cons
{
rSubTypeList.Clear();
}
+void ChartTypeDialogController::fillSubTypeList( ValueSet& rSubTypeList, const
ChartTypeParameter& /*rParameter*/ )
+{
+rSubTypeList.Clear();
+}
bool ChartTypeDialogController::shouldShow_3DLookControl() const
{
return false;
@@ -476,6 +480,53 @@ void ColumnChartDialogController::fillSubTypeList(
SvtValueSet& rSubTypeList, co
rSubTypeList.SetItemText( 4, SchResId( STR_DEEP ) );
}
+void ColumnChartDialogController::fillSubTypeList( ValueSet& rSubTypeList,
const ChartTypeParameter& rParameter )
+{
+rSubTypeList.Clear();
+
+if( rParameter.b3DLook )
+{
+switch(rParameter.nGeometry3D)
+{
+case DataPointGeometry3D::CYLINDER:
+rSubTypeList.InsertItem(1, Image(StockImage::Yes,
BMP_SAEULE_3D_1));
+rSubTypeList.InsertItem(2, Image(StockImage::Yes,
BMP_SAEULE_3D_2));
+rSubTypeList.InsertItem(3, Image(StockImage::Yes,
BMP_SAEULE_3D_3));
+rSubTypeList.InsertItem(4, Image(StockImage::Yes,
BMP_SAEULE_3D_4));
+break;
+case DataPointGeometry3D::CONE:
+rSubTypeList.InsertItem(1, Image(StockImage::Yes,
BMP_KEGEL_3D_1));
+rSubTypeList.InsertItem(2, Image(StockImage::Yes,
BMP_KEGEL_3D_2));
+rSubTypeList.InsertItem(3, Image(StockImage::Yes,
BMP_KEGEL_3D_3));
+rSubTypeList.InsertItem(4, Image(StockImage::Yes,
BMP_KEGEL_3D_4));
+break;
+case DataPointGeometry3D::PYRAMID:
+rSubTypeList.InsertItem(1, Image(StockImage::Yes,
BMP_PYRAMID_3D_1));
+rSubTypeList.InsertItem(2, Image(StockImage::Yes,
BMP_PYRAMID_3D_2));
+rSubTypeList.InsertItem(3, Image(StockImage::Yes,
BMP_PYRAMID_3D_3));
+rSubTypeList.InsertItem(4, Image(StockImage::Yes,
BMP_PYRAMID_3D_4));
+break;
+default: //DataPointGeometry3D::CUBOID:
+rSubTypeList.InsertItem(1, Image(StockImage::Yes,
BMP_COLUMNS_3D_1));
+rSubTypeList.InsertItem(2, Image(StockImage::Yes,
BMP_COLUMNS_3D_2));
+rSubTypeList.InsertItem(3, Image(StockImage::Yes,
BMP_COLUMNS_3D_3));
+rSubTypeList.InsertItem(4, Image(StockImage::Yes,
BMP_COLUMNS_3D));
+break;
+}
+}
+else
+{
+rSubTypeList.InsertItem(1, Image(StockImage::Yes, BMP_COLUMNS_2D_1));
+rSubTypeList.InsertItem(2, Image(StockImage::Yes, BMP_COLUMNS_2D_2));
+rSubTypeList.InsertItem(3, Image(StockImage::Yes, BMP_COLUMNS_2D_3));
+}
+
+rSubTypeList.SetItemText( 1, SchResId( STR_NORMAL ) );
+rSubTypeList.SetItemText( 2, SchResId( STR_STACKED ) );
+rSubTypeList.SetItemText( 3, SchResId( STR_PERCENT ) );
+rSubTypeList.SetItemText( 4, SchResId( STR_DEEP ) );
+}
+
BarChartDialogController::BarChartDialogController()
{
}
@@ -552,6 +603,52 @@ void BarChartDialogController::fillSubTypeList(
SvtValueSet& rSubTypeList, const
rSubTypeList.SetItemText( 4, SchResId( STR_DEEP ) );
}
+void BarChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const
ChartTypeParameter& rParameter )
+{
+rSubTypeList.Clear();
+
+if( rParameter.b3DLook )
+{
+switch(rParameter.nGeometry3D)
+{
+case DataPointGeometry3D::CYLINDER:
+rSubTypeList.InsertItem(1, Image(StockImage::Yes,
BMP_ROEHRE_3D_1));
+rSubTypeList.InsertItem(2, Image(StockImage::Yes,
BMP_ROEHRE_3D_2));
+rSubTypeList.InsertItem(3, Image(StockImage::Yes,
BMP_ROEHRE_3D_3));
+rSubTypeList.InsertItem(4, Image(StockImage::Yes,
BMP_ROEHRE_3D_4));
+break;
+case DataPointGeometry3D::CONE:
+rSubTypeList.InsertItem(1, Image(StockImage::Yes,
BMP_KEGELQ_3D_1
Minutes from the UX/design meeting 2019-NOV-06
Present: Heiko (with input from Cor, Dieter, and Pedro) Tickets * clone-brush needs more functions + https://bugs.documentfoundation.org/show_bug.cgi?id=128344 + options to solve this: + change tooltip to "Clone Formatting (double click to make it sticky and Ctrl/Cmd to clone paragraph style)" + introduce menu button with default as today and the two functions "Multiple Clone" and "Close Format only" like for New, Open, Save (Dieter, Cor) + keep as it is (WF) (Heiko) => introduce a menu button * TABLE-PROPERTIES: Add "Row" tab + https://bugs.documentfoundation.org/show_bug.cgi?id=128351 + add tab for row height in properties dialog as we have for col width (Dieter, Cor) => go for it, but mockup needed * restart manually numbering of numbered lists + https://bugs.documentfoundation.org/show_bug.cgi?id=128282 + add "Restart Numbering" to paragraph context menu (Dieter) + available under Bullets and Numbering (if cursor is in a list) => WFM * Calc sheet tabs: Option to make compact (use smaller font and less padding like in <=6.2) + https://bugs.documentfoundation.org/show_bug.cgi?id=127892 + introduce an option to reduce margins on sheet tabs + new design was choosen carefully, difference is just a few pixels => no options needed (Pedro) + weird screenshot submitted by OP => looks like another issue * PARAGRAPH STYLE DIALOG: "Reset" and "Standard" buttons: confusing names + https://bugs.documentfoundation.org/show_bug.cgi?id=128469 + remove Reset (and Standard) functions from the dialogs (Heiko) + Standard is the only way to revert changes made to inherited styles (Regina) + Reset is done via Cancel but not when Apply is avilable + rename functions (Cor) => seeking for proposals on better names signature.asc Description: OpenPGP digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: compilerplugins/clang fpicker/source include/svx include/vcl sc/source sw/source
compilerplugins/clang/unnecessaryvirtual-dead.results |6 -- compilerplugins/clang/unnecessaryvirtual.results | 46 +- fpicker/source/office/fileview.cxx|5 - fpicker/source/office/fileview.hxx|2 include/svx/svdpage.hxx |2 include/vcl/dialog.hxx|4 - sc/source/ui/inc/AccessibleContextBase.hxx|2 sw/source/core/inc/dflyobj.hxx|2 8 files changed, 31 insertions(+), 38 deletions(-) New commits: commit d81f90dda7100f48995a432b999c1ba76a51846a Author: Noel Grandin AuthorDate: Wed Nov 6 20:18:33 2019 +0200 Commit: Noel Grandin CommitDate: Wed Nov 6 20:03:32 2019 +0100 loplugin:unnecessaryvirtual Change-Id: Ibffbd0f5d30ec14cace3638b2bb47c91a583711c Reviewed-on: https://gerrit.libreoffice.org/82171 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/compilerplugins/clang/unnecessaryvirtual-dead.results b/compilerplugins/clang/unnecessaryvirtual-dead.results index 625543ea99d2..01e47ee21058 100644 --- a/compilerplugins/clang/unnecessaryvirtual-dead.results +++ b/compilerplugins/clang/unnecessaryvirtual-dead.results @@ -8,12 +8,10 @@ include/canvas/base/graphicdevicebase.hxx:306 void canvas::GraphicDeviceBase::removePropertyChangeListener(const class rtl::OUString &,const class com::sun::star::uno::Reference &,) include/canvas/base/graphicdevicebase.hxx:319 void canvas::GraphicDeviceBase::removeVetoableChangeListener(const class rtl::OUString &,const class com::sun::star::uno::Reference &,) -include/vcl/tabpage.hxx:51 -void TabPage::DeactivatePage() sc/source/core/opencl/formulagroupcl.cxx:1059 void sc::opencl::DynamicKernelSlidingArgument::GenSlidingWindowFunction(class std::__cxx11::basic_stringstream &,) -slideshow/source/engine/animationfactory.cxx:443 -void slideshow::internal::(anonymous namespace)::GenericAnimation::prefetch(const class std::shared_ptr &,const class std::shared_ptr &,) +slideshow/source/engine/animationfactory.cxx:441 +void slideshow::internal::(anonymous namespace)::GenericAnimation::prefetch() vcl/inc/salframe.hxx:145 void SalFrame::SetRepresentedURL(const class rtl::OUString &,) vcl/inc/salmenu.hxx:81 diff --git a/compilerplugins/clang/unnecessaryvirtual.results b/compilerplugins/clang/unnecessaryvirtual.results index 7f4408388235..fba7f09695cb 100644 --- a/compilerplugins/clang/unnecessaryvirtual.results +++ b/compilerplugins/clang/unnecessaryvirtual.results @@ -52,6 +52,10 @@ forms/source/xforms/namedcollection.hxx:99 class com::sun::star::uno::Sequence NamedCollection::getElementNames() forms/source/xforms/namedcollection.hxx:104 unsigned char NamedCollection::hasByName(const class rtl::OUString &,) +fpicker/source/office/fileview.cxx:139 +void ViewTabListBox_Impl::~ViewTabListBox_Impl() +fpicker/source/office/fileview.hxx:76 +void SvtFileView::~SvtFileView() include/basegfx/utils/unopolypolygon.hxx:97 void basegfx::unotools::UnoPolyPolygon::modifying()const include/comphelper/interaction.hxx:54 @@ -82,9 +86,9 @@ include/svl/svdde.hxx:244 _Bool DdeTopic::StartAdviseLoop() include/svl/svdde.hxx:300 void DdeService::~DdeService() -include/svx/svdmrkv.hxx:323 -_Bool SdrMarkView::IsPointMarkable(const class SdrHdl &,)const -include/toolkit/controls/geometrycontrolmodel.hxx:184 +include/svx/svdpage.hxx:111 +void SdrObjList::sort(class std::__debug::vector > &,) +include/toolkit/controls/geometrycontrolmodel.hxx:183 void OGeometryControlModel::fillProperties(class com::sun::star::uno::Sequence &,class com::sun::star::uno::Sequence &,)const include/vbahelper/vbacollectionimpl.hxx:290 int ScVbaCollectionBase::getCount() @@ -110,12 +114,12 @@ include/vbahelper/vbareturntypes.hxx:41 type-parameter-0-0 ooo::vba::DefaultReturnHelper::getValue() include/vcl/customweld.hxx:41 class rtl::OUString weld::CustomWidgetController::GetHelpText()const -include/vcl/tabpage.hxx:51 -void TabPage::DeactivatePage() -include/vcl/weld.hxx:97 +include/vcl/dialog.hxx:115 +short Dialog::Execute() +include/vcl/dialog.hxx:138 +_Bool Dialog::StartExecuteAsync(struct VclAbstractDialog::AsyncContext &,) +include/vcl/weld.hxx:100 void weld::Widget::set_visible(_Bool,) -include/vcl/window.hxx:1157 -class rtl::OString vcl::Window::GetScreenshotId()const sc/source/core/opencl/formulagroupcl.cxx:1051 _Bool sc::opencl::DynamicKernelSlidingArgument::NeedParallelReduction()const sc/source/core/opencl/formulagroupcl.cxx:1059 @@ -126,6 +130,8 @@ sc/source/core/opencl/formulagroupcl.cxx:1518 class std::__cxx11::basic_string, class std::allocator > sc::opencl::ParallelReductionVectorRef::GenSlidingWindowDeclRef(_Bool,)const sc/source/core/opencl/formulagroupcl.cxx:1553 unsigned long sc::opencl::ParallelReductionVectorRef::Marshal(struct _cl_ker
[Libreoffice-commits] core.git: avmedia/source
avmedia/source/vlc/wrapper/SymbolLoader.hxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit c13ea2bd388ac41784db09fc5fcb51ac81900d20
Author: Stephan Bergmann
AuthorDate: Wed Nov 6 17:00:42 2019 +0100
Commit: Stephan Bergmann
CommitDate: Wed Nov 6 19:38:23 2019 +0100
Avoid OUString::createFromAscii, use OUStringLiteral instead
Change-Id: Ib337b9678f68d41319dda30f0ca7edba5dc7e7b0
Reviewed-on: https://gerrit.libreoffice.org/82155
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/avmedia/source/vlc/wrapper/SymbolLoader.hxx
b/avmedia/source/vlc/wrapper/SymbolLoader.hxx
index a4e941f60afe..601aa62edd2a 100644
--- a/avmedia/source/vlc/wrapper/SymbolLoader.hxx
+++ b/avmedia/source/vlc/wrapper/SymbolLoader.hxx
@@ -32,7 +32,7 @@ typedef void (*SymbolFunc) (void);
struct ApiMap
{
-const char *symName;
+OUStringLiteral symName;
SymbolFunc *refValue;
};
@@ -76,7 +76,7 @@ struct ApiMap
for (size_t i = 0; i < N; ++i)
{
SymbolFunc aMethod =
reinterpret_cast(osl_getFunctionSymbol
-( aModule, OUString::createFromAscii( pMap[ i ].symName
).pData ));
+( aModule, OUString( pMap[ i ].symName ).pData ));
if ( !aMethod )
{
SAL_WARN("avmedia", "Cannot load method " << pMap[ i
].symName);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/ooxmlexport/data/tdf120412_400PercentSubscript.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport10.cxx |9
+
2 files changed, 9 insertions(+)
New commits:
commit 4b2752755609a4132417e57ca52bfc773c9ef897
Author: Justin Luth
AuthorDate: Fri Oct 4 15:48:31 2019 +0300
Commit: Justin Luth
CommitDate: Wed Nov 6 19:32:40 2019 +0100
tdf#120412 better unit test
The previous unit test OUGHT to have reported exactly 100% escapement,
and the patch's purpose was to support greater than 100% escapement.
Depending on a number of patches (related to bug 99602),
this unit test verifies that 400% works.
Change-Id: I1ee36d1570c34d86dbfb0a03ee3c2026b9645b63
Reviewed-on: https://gerrit.libreoffice.org/80220
Tested-by: Jenkins
Reviewed-by: Justin Luth
diff --git a/sw/qa/extras/ooxmlexport/data/tdf120412_400PercentSubscript.docx
b/sw/qa/extras/ooxmlexport/data/tdf120412_400PercentSubscript.docx
new file mode 100644
index ..526d7d2c18c4
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/tdf120412_400PercentSubscript.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
index 17b91ecb9180..b9efb409a456 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
@@ -206,6 +206,15 @@ DECLARE_OOXMLEXPORT_TEST(textboxWpgOnly,
"textbox-wpg-only.docx")
CPPUNIT_ASSERT_EQUAL(sal_Int32(100),
getProperty(getRun(getParagraphOfText(1, xText), 1),
"CharEscapementHeight"));
}
+DECLARE_OOXMLEXPORT_TEST(testTdf120412_400PercentSubscript,
"tdf120412_400PercentSubscript.docx")
+{
+uno::Reference xPara = getParagraph(1);
+// The word "Base" should not be subscripted.
+CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.f, getProperty(getRun(xPara, 1,
"Base"), "CharEscapement"), 0);
+// The word "Subscript" should be 12pt, subscripted by 400% (48pt).
+CPPUNIT_ASSERT_DOUBLES_EQUAL( -400.f, getProperty(getRun(xPara, 2,
"Subscript"), "CharEscapement"), 0);
+}
+
DECLARE_OOXMLEXPORT_TEST(testFontEsc, "test_tdf120412.docx")
{
xmlDocPtr pXmlDoc =parseExport("word/document.xml");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: AtomicCounter::is_always_lock_free on armel
Hi,
On Wed, Nov 06, 2019 at 09:26:53AM +0100, Stephan Bergmann wrote:
> > +// gnEnterCount and gnLeaveCount are accessed both from multiple
> > threads (cf.
> > +// OpenGLWatchdogThread::execute; so need to be of atomic type) and
> > from signal handlers (cf.
> > +// VCLExceptionSignal_impl; so need to be of lock-free atomic type).
> > sig_atomic_t is chosen as
> > +// the underlying type under the assumption that it is most likely to
> > lead to an atomic type
> > +// that is actually lock-free. However, gnEnterCount and gnLeaveCount
> > are both monotonically
> > +// increasing, so will eventually overflow, so the underlying type
> > better be unsigned, which
> > +// sig_atomic_t is not guaranteed to be:
> > +using AtomicCounter =
> > std::atomic>;
> > +static_assert(AtomicCounter::is_always_lock_free);
> >
> > Looking at
> > https://en.cppreference.com/w/cpp/atomic/atomic/is_always_lock_free it is
> > "/* implemtation defined */"
> > so is it always false on armel?
>
> Yeah, my hope was that we won't ever encounter platforms where this is
> false.
>
> > Does that mean we need to drop LibreOffice support on armel or is there
> > some way out of it?
> > (even though OpenGL is probably no thing on armel, I'd be wary to just
> > remove the assert...)
>
> Given that the code used "static volatile sal_uInt64" for
> genEnter/LeaveCount before ec17c8ec5256386b0197a8ffe5d7cad3e7d70f8f, we
> don't make things worse than they originally were if we fall back to that
> type again on armel. So if the original code happened to work well enough
> on armel in practice, you could add an appropriate #if/else (with a useful
> comment) around the definition of AtomicCounter and the accompanying
> static_assert. (And address any resulting -Wvolatile on armel as
> appropriate for your needs.)
Given the introduced AtomicCounter is used later, too I tried the simplified
diff --git a/vcl/inc/opengl/zone.hxx b/vcl/inc/opengl/zone.hxx
index 3210186c3096..13ac3bf6793e 100644
--- a/vcl/inc/opengl/zone.hxx
+++ b/vcl/inc/opengl/zone.hxx
@@ -36,7 +36,9 @@ class VCL_DLLPUBLIC OpenGLZone {
// increasing, so will eventually overflow, so the underlying type better
be unsigned, which
// sig_atomic_t is not guaranteed to be:
using AtomicCounter = std::atomic>;
+#if !defined ARM32 && !defined __ARM_PCS_VFP
static_assert(AtomicCounter::is_always_lock_free);
+#endif
/// how many times have we entered a GL zone
static AtomicCounter gnEnterCount;
(atking that define from bridges...)
and that builds...
-> https://gerrit.libreoffice.org/#/c/82165/
Regards,
Rene
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice
Android Beta (no Google Play)
Is there a way to download and install the LibreOffice Android Beta without Google Play? I prefer not to use Google Play because of its proprietary nature. -Tim signature.asc Description: This is a digitally signed message part. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] online.git: loleaflet/css loleaflet/src
loleaflet/css/mobilewizard.css | 79 ---
loleaflet/src/control/Control.JSDialogBuilder.js |4 -
2 files changed, 4 insertions(+), 79 deletions(-)
New commits:
commit 94c3896809259d8857f2026417a6c844f7c3771c
Author: Muhammet Kara
AuthorDate: Wed Nov 6 18:09:33 2019 +0300
Commit: Muhammet Kara
CommitDate: Wed Nov 6 18:22:47 2019 +0100
Smarter(?) valueset image handling
Instead of adding one entry per image into the
css, just adding the image of a valueset element
into the loleaflet/images directory is enough now.
Change-Id: I5deff7c9537ede713120f581f96bfb2aefb11fa0
Reviewed-on: https://gerrit.libreoffice.org/82162
Reviewed-by: Muhammet Kara
Tested-by: Muhammet Kara
diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css
index 41b44f019..5c66db9c3 100644
--- a/loleaflet/css/mobilewizard.css
+++ b/loleaflet/css/mobilewizard.css
@@ -53,86 +53,9 @@ span#main-menu-btn-icon {
overflow: hidden;
margin: 2px 2px !important;
display: inline-block;
-}
-
-.layout.layout_empty {
- background: url('images/layout_empty.svg') no-repeat center !important;
-}
-
-.layout.layout_head03 {
- background: url('images/layout_head03.svg') no-repeat center !important;
-}
-
-.layout.layout_head02 {
- background: url('images/layout_head02.svg') no-repeat center !important;
-}
-
-.layout.layout_head02a {
- background: url('images/layout_head02a.svg') no-repeat center
!important;
-}
-
-.layout.layout_head01 {
- background: url('images/layout_head01.svg') no-repeat center !important;
-}
-
-.layout.layout_textonly {
- background: url('images/layout_textonly.svg') no-repeat center
!important;
-}
-
-.layout.layout_head03b {
- background: url('images/layout_head03b.svg') no-repeat center
!important;
-}
-
-.layout.layout_head03c {
- background: url('images/layout_head03c.svg') no-repeat center
!important;
-}
-
-.layout.layout_head03a {
- background: url('images/layout_head03a.svg') no-repeat center
!important;
-}
-
-.layout.layout_head02b {
- background: url('images/layout_head02b.svg') no-repeat center
!important;
-}
-
-.layout.layout_head04 {
- background: url('images/layout_head04.svg') no-repeat center !important;
-}
-
-.layout.layout_head06 {
- background: url('images/layout_head06.svg') no-repeat center !important;
-}
-
-.layout.layout_vertical02 {
- background: url('images/layout_vertical02.svg') no-repeat center
!important;
-}
-
-.layout.layout_vertical01 {
- background: url('images/layout_vertical01.svg') no-repeat center
!important;
-}
-
-.layout.layout_head02 {
- background: url('images/layout_head02.svg') no-repeat center !important;
-}
-
-.layout.layout_head02a {
- background: url('images/layout_head02a.svg') no-repeat center
!important;
-}
-
-.layout.columns_52x60 {
- background: url('images/columns_52x60.svg') no-repeat center !important;
-}
-
-.layout.columnstack_52x60 {
- background: url('images/columnstack_52x60.svg') no-repeat center
!important;
-}
-
-.layout.columnpercent_52x60 {
- background: url('images/columnpercent_52x60.svg') no-repeat center
!important;
-}
-.layout{
border: 1px solid #fff;
}
+
.layout.loleaflet-context-down {
background-color: #dd;
box-shadow: inset 0px -1px 2px 5px #eee;
diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js
b/loleaflet/src/control/Control.JSDialogBuilder.js
index fb5282869..cb496b70e 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -592,12 +592,14 @@ L.Control.JSDialogBuilder = L.Control.extend({
image = data.entries[index].image;
image = image.substr(0, image.lastIndexOf('.'));
image = image.substr(image.lastIndexOf('/') + 1);
- elem = L.DomUtil.create('div', 'layout ' + image +
+ elem = L.DomUtil.create('div', 'layout ' +
(data.entries[index].selected ? '
loleaflet-context-down' : ''), parentContainer);
$(elem).data('id', data.entries[index].id);
$(elem).click(function () {
builder.callback('valueset', 'selected', { id:
data.id }, $(this).data('id'), builder);
});
+ elem.style.setProperty('background', 'url("images/' +
image +
+ '.svg") no-repeat center', 'important');
}
return false;
___
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' - sd/inc sw/inc
sd/inc/pageformatpanel.hrc |5 +
sw/inc/pageformatpanel.hrc |5 +
2 files changed, 10 insertions(+)
New commits:
commit 0d52af6278c1ebcd2d6316dccb69c07a7473535d
Author: Jan Holesovsky
AuthorDate: Wed Nov 6 17:25:39 2019 +0100
Commit: Jan Holesovsky
CommitDate: Wed Nov 6 18:13:02 2019 +0100
android: ODR fix of RID_PAGEFORMATPANEL_MARGINS_CM.
Without this, we get a linking error that RID_PAGEFORMATPANEL_MARGINS_CM
is defined twice.
Change-Id: Ib9c07adcb0a8def991d1e39429c1bb4947cd7d32
Reviewed-on: https://gerrit.libreoffice.org/82158
Reviewed-by: Tor Lillqvist
Tested-by: Tor Lillqvist
Tested-by: Jenkins CollaboraOffice
diff --git a/sd/inc/pageformatpanel.hrc b/sd/inc/pageformatpanel.hrc
index 23325e26ac2f..b7309ee69748 100644
--- a/sd/inc/pageformatpanel.hrc
+++ b/sd/inc/pageformatpanel.hrc
@@ -12,6 +12,9 @@
#define NC_(Context, String) reinterpret_cast(Context "\004"
u8##String)
+namespace sd
+{
+
// To translators: this is a listbox labelled by "Margins:", inch units
const char* RID_PAGEFORMATPANEL_MARGINS_INCH[] =
{
@@ -36,6 +39,8 @@ const char* RID_PAGEFORMATPANEL_MARGINS_CM[] =
NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Wide"),
};
+}
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/sw/inc/pageformatpanel.hrc b/sw/inc/pageformatpanel.hrc
index ecad14cf51a2..048ff93a8776 100644
--- a/sw/inc/pageformatpanel.hrc
+++ b/sw/inc/pageformatpanel.hrc
@@ -12,6 +12,9 @@
#define NC_(Context, String) reinterpret_cast(Context "\004"
u8##String)
+namespace sw
+{
+
// To translators: this is a listbox labelled by "Margins:", inch units
const char* RID_PAGEFORMATPANEL_MARGINS_INCH[] =
{
@@ -38,6 +41,8 @@ const char* RID_PAGEFORMATPANEL_MARGINS_CM[] =
NC_("RID_PAGEFORMATPANEL_MARGINS_CM", "Mirrored")
};
+}
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/view/editsh.cxx | 20 +++-
1 file changed, 19 insertions(+), 1 deletion(-)
New commits:
commit ffd9e90058d2e8a54a307ca6f58f60d380eaa4f2
Author: Szymon Kłos
AuthorDate: Wed Nov 6 16:46:11 2019 +0100
Commit: Szymon Kłos
CommitDate: Wed Nov 6 18:04:07 2019 +0100
jsdialogs: .uno:Color with string argument in Calc
Change-Id: I93ac635fc16a74cfc7a956be6d6529b4d692101b
Reviewed-on: https://gerrit.libreoffice.org/82152
Tested-by: Jenkins
Reviewed-by: Szymon Kłos
diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx
index 6e0b40269d09..8c1638c2ff62 100644
--- a/sc/source/ui/view/editsh.cxx
+++ b/sc/source/ui/view/editsh.cxx
@@ -53,6 +53,7 @@
#include
#include
#include
+#include
#include
#include
@@ -955,7 +956,24 @@ void ScEditShell::ExecuteAttr(SfxRequest& rReq)
{
if (pArgs)
{
-aSet.Put( pArgs->Get( pArgs->GetPool()->GetWhich( nSlot )
) );
+Color aColor;
+OUString sColor;
+const SfxPoolItem* pColorStringItem = nullptr;
+
+if ( pArgs && SfxItemState::SET == pArgs->GetItemState(
SID_ATTR_COLOR_STR, false, &pColorStringItem ) )
+{
+sColor = static_cast(
pColorStringItem )->GetValue();
+if ( sColor == "transparent" )
+aColor = COL_TRANSPARENT;
+else
+aColor = Color( sColor.toInt32( 16 ) );
+
+aSet.Put( SvxColorItem( aColor, EE_CHAR_COLOR ) );
+}
+else
+{
+aSet.Put( pArgs->Get( pArgs->GetPool()->GetWhich(
nSlot ) ) );
+}
rBindings.Invalidate( nSlot );
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dev-tools.git: qa/createBlogReport.py
qa/createBlogReport.py |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit a7c7837108597c70e491ef1f901866477b8acab9 Author: Xisco Fauli AuthorDate: Wed Nov 6 18:00:01 2019 +0100 Commit: Xisco Fauli CommitDate: Wed Nov 6 18:00:49 2019 +0100 QA: this might cause a KeyError diff --git a/qa/createBlogReport.py b/qa/createBlogReport.py index 689b846..d729f07 100755 --- a/qa/createBlogReport.py +++ b/qa/createBlogReport.py @@ -298,16 +298,16 @@ def analyze_bugzilla_data(statList, bugzillaData, cfg): addedResolution = change['added'] removedResolution = change['removed'] +if isResolved and removedResolution: + statList['resolvedStatuses'][removedResolution] -= 1 +isResolved = False + if addedResolution: if addedResolution not in statList['resolvedStatuses']: statList['resolvedStatuses'][addedResolution] = 0 statList['resolvedStatuses'][addedResolution] += 1 isResolved = True -if isResolved and removedResolution: - statList['resolvedStatuses'][removedResolution] -= 1 -isResolved = False - if addedResolution == 'FIXED': fixedBugs[rowId] = actionDate isFixed = True ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/CppunitTest_vcl_pdfexport.mk vcl/qa vcl/source
vcl/CppunitTest_vcl_pdfexport.mk|1
vcl/qa/cppunit/pdfexport/data/pdf-image-resource-inline-xobject-ref.pdf |binary
vcl/qa/cppunit/pdfexport/pdfexport.cxx | 28
vcl/source/gdi/pdfwriter_impl.cxx | 32
+-
4 files changed, 59 insertions(+), 2 deletions(-)
New commits:
commit bd520b177637d4b7d9d93733103cff17a3c91b0a
Author: Miklos Vajna
AuthorDate: Wed Nov 6 16:48:55 2019 +0100
Commit: Miklos Vajna
CommitDate: Wed Nov 6 17:56:59 2019 +0100
vcl PDF export: fix re-exporting PDF images with page-level rotation
PDF images are effectively 1 page PDF documents. The page object may
have a /Rotate key, which was simply ignored before. We turn page
objects into form XObjects on PDF export, such rotation can be expressed
with a /Matrix key.
Add support for the 90 degrees rotation case, this can be generalized
later if wanted.
Change-Id: I55a4f63e0b986637ccdeba0b783f1db9a85c4d93
Reviewed-on: https://gerrit.libreoffice.org/82154
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/vcl/CppunitTest_vcl_pdfexport.mk b/vcl/CppunitTest_vcl_pdfexport.mk
index 45123e7c2811..2721d15e410b 100644
--- a/vcl/CppunitTest_vcl_pdfexport.mk
+++ b/vcl/CppunitTest_vcl_pdfexport.mk
@@ -16,6 +16,7 @@ $(eval $(call
gb_CppunitTest_add_exception_objects,vcl_pdfexport, \
$(eval $(call gb_CppunitTest_use_sdk_api,vcl_pdfexport))
$(eval $(call gb_CppunitTest_use_libraries,vcl_pdfexport, \
+ basegfx \
comphelper \
cppu \
cppuhelper \
diff --git
a/vcl/qa/cppunit/pdfexport/data/pdf-image-resource-inline-xobject-ref.pdf
b/vcl/qa/cppunit/pdfexport/data/pdf-image-resource-inline-xobject-ref.pdf
index b62068eae9dd..739a80c4766d 100644
Binary files
a/vcl/qa/cppunit/pdfexport/data/pdf-image-resource-inline-xobject-ref.pdf and
b/vcl/qa/cppunit/pdfexport/data/pdf-image-resource-inline-xobject-ref.pdf differ
diff --git a/vcl/qa/cppunit/pdfexport/pdfexport.cxx
b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
index ba62f301bec4..22585a9827eb 100644
--- a/vcl/qa/cppunit/pdfexport/pdfexport.cxx
+++ b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
@@ -36,6 +36,7 @@
#include
#include
#include
+#include
using namespace ::com::sun::star;
@@ -1877,6 +1878,33 @@ void
PdfExportTest::testPdfImageResourceInlineXObjectRef()
// - Actual : 0
// i.e. the sub-form was missing its image.
CPPUNIT_ASSERT_EQUAL(1, FPDFFormObj_CountObjects(pFormObject));
+
+// Check if the inner form object (original page object in the pdf image)
has the correct
+// rotation.
+FPDF_PAGEOBJECT pInnerFormObject = FPDFFormObj_GetObject(pFormObject, 0);
+CPPUNIT_ASSERT_EQUAL(FPDF_PAGEOBJ_FORM,
FPDFPageObj_GetType(pInnerFormObject));
+CPPUNIT_ASSERT_EQUAL(1, FPDFFormObj_CountObjects(pInnerFormObject));
+FPDF_PAGEOBJECT pImage = FPDFFormObj_GetObject(pInnerFormObject, 0);
+CPPUNIT_ASSERT_EQUAL(FPDF_PAGEOBJ_IMAGE, FPDFPageObj_GetType(pImage));
+double fA = 0;
+double fB = 0;
+double fC = 0;
+double fD = 0;
+double fE = 0;
+double fF = 0;
+FPDFFormObj_GetMatrix(pInnerFormObject, &fA, &fB, &fC, &fD, &fE, &fF);
+basegfx::B2DHomMatrix aMat{ fA, fC, fE, fB, fD, fF };
+basegfx::B2DTuple aScale;
+basegfx::B2DTuple aTranslate;
+double fRotate = 0;
+double fShearX = 0;
+aMat.decompose(aScale, aTranslate, fRotate, fShearX);
+int nRotateDeg = basegfx::rad2deg(fRotate);
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected: -90
+// - Actual : 0
+// i.e. rotation was lost on pdf export.
+CPPUNIT_ASSERT_EQUAL(-90, nRotateDeg);
}
CPPUNIT_TEST_SUITE_REGISTRATION(PdfExportTest);
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx
b/vcl/source/gdi/pdfwriter_impl.cxx
index faabdd8769f9..a63a2152e6b7 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -8842,6 +8842,34 @@ void
PDFWriterImpl::writeReferenceXObject(ReferenceXObjectEmit& rEmit)
aLine.append(" 0 obj\n");
aLine.append("<< /Type /XObject");
aLine.append(" /Subtype /Form");
+
+long nWidth = aSize.Width();
+long nHeight = aSize.Height();
+if (auto pRotate =
dynamic_cast(pPage->Lookup("Rotate")))
+{
+// The original page was rotated, then construct a transformation
matrix which does the
+// same with our form object.
+if (rtl::math::approxEqual(pRotate->GetValue(), 90))
+{
+std::swap(nWidth, nHeight);
+basegfx::B2DHomMatrix aMat;
+aMat.rotate(basegfx::deg2rad(pRotate->GetValue()));
+// Rotate around the origo (bottom left corner)
counter-clockwise, then translate
+// horizontally to effectively keep the bottom left corner
unchanged.
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - sc/source
sc/source/ui/view/editsh.cxx | 20 +++-
1 file changed, 19 insertions(+), 1 deletion(-)
New commits:
commit 0393cde7bb4a0ebc921aecd6f3a9d3c5839bcb17
Author: Szymon Kłos
AuthorDate: Wed Nov 6 16:46:11 2019 +0100
Commit: Szymon Kłos
CommitDate: Wed Nov 6 17:21:28 2019 +0100
jsdialogs: .uno:Color with string argument in Calc
Change-Id: I93ac635fc16a74cfc7a956be6d6529b4d692101b
Reviewed-on: https://gerrit.libreoffice.org/82153
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx
index f3c7fa8164af..2eb92e18ce4e 100644
--- a/sc/source/ui/view/editsh.cxx
+++ b/sc/source/ui/view/editsh.cxx
@@ -56,6 +56,7 @@
#include
#include
#include
+#include
#include
#include
@@ -911,7 +912,24 @@ void ScEditShell::ExecuteAttr(SfxRequest& rReq)
{
if (pArgs)
{
-aSet.Put( pArgs->Get( pArgs->GetPool()->GetWhich( nSlot )
) );
+Color aColor;
+OUString sColor;
+const SfxPoolItem* pColorStringItem = nullptr;
+
+if ( pArgs && SfxItemState::SET == pArgs->GetItemState(
SID_ATTR_COLOR_STR, false, &pColorStringItem ) )
+{
+sColor = static_cast(
pColorStringItem )->GetValue();
+if ( sColor == "transparent" )
+aColor = COL_TRANSPARENT;
+else
+aColor = Color( sColor.toInt32( 16 ) );
+
+aSet.Put( SvxColorItem( aColor, EE_CHAR_COLOR ) );
+}
+else
+{
+aSet.Put( pArgs->Get( pArgs->GetPool()->GetWhich(
nSlot ) ) );
+}
rBindings.Invalidate( nSlot );
}
}
___
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/mobilewizard.css |3 +++
loleaflet/css/toolbar.css | 11 +--
2 files changed, 12 insertions(+), 2 deletions(-)
New commits:
commit 6a377fa0445647a2b9a9ee2516cfd750bc10565f
Author: Pedro Pinto Silva
AuthorDate: Wed Nov 6 15:05:41 2019 +0100
Commit: Muhammet Kara
CommitDate: Wed Nov 6 17:12:59 2019 +0100
Impress:mobilewizard:table and paragraph properties layout
Change-Id: I9eecf18bfff03a7040dd7ca006be77f4d3fb2810
Reviewed-on: https://gerrit.libreoffice.org/82141
Reviewed-by: Muhammet Kara
Tested-by: Muhammet Kara
diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css
index 5ed84e716..41b44f019 100644
--- a/loleaflet/css/mobilewizard.css
+++ b/loleaflet/css/mobilewizard.css
@@ -252,6 +252,9 @@ p.mobile-wizard.ui-combobox-text.selected {
#mobile-wizard-content:not(.with-slide-sorter-above){
top: 63px !important;
}
+#mobile-wizard-content.with-slide-sorter-above {
+ top: 128px !important;
+}
.with-slide-sorter-above > .ui-tabs-content > div[title=Layouts]{
justify-content: center;
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index ad611f5a7..2ece95e3a 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -98,7 +98,7 @@
#selectheight > img, #selectwidth > img, #selectheight > img,
#SendToBack > span, #ObjectBackOne > span, #ObjectForwardOne > span,
#BringToFront > span, #FlipVertical > span, #FlipHorizontal > span, #Bold >
span, #Italic > span, #Underline > span, #Strikeout > span, #StyleApply > span,
#StyleUpdateByExample > span, #StyleNewByExample > span, #Shadowed > span,
#Grow > span, #Shrink > span, #Color > span, #Spacing > span, #SuperScript >
span, #SubScript > span, #AlignLeft > span, #AlignRight > span,
#AlignHorizontalCenter > span, #AlignBlock > span, #ParaLeftToRight > span,
#ParaRightToLeft > span, #AlignTop > span, #AlignVCenter > span, #AlignBottom >
span, #IncrementIndent > span, #DecrementIndent > span, #LeftPara > span,
#RightPara > span, #CenterPara > span, #JustifyPara > span, #DefaultBullet >
span, #DefaultNumbering > span, #ParaspaceIncrease > span, #ParaspaceDecrease >
span, #LineSpacing > span, #HangingIndent > span, #CellVertTop > span,
#CellVertCenter > span, #CellVertBo
ttom > span, div[id*='Row'] > span, div[id*='Column'] > span,
div[id^=Outline] > span{
display: none !important;
}
- #SendToBack, #ObjectBackOne, #ObjectForwardOne, #BringToFront,
#FlipVertical, #FlipHorizontal, #Bold, #Italic, #Underline, #Strikeout,
#StyleApply, #StyleUpdateByExample, #StyleNewByExample, #Shadowed, #Grow,
#Shrink, #Color, #Spacing, #SuperScript, #SubScript,#AlignLeft, #AlignRight,
#AlignHorizontalCenter, #AlignBlock, #ParaRightToLeft, #ParaLeftToRight,
#AlignTop, #AlignVCenter, #AlignBottom, #IncrementIndent, #DecrementIndent,
#LeftPara, #RightPara, #CenterPara, #JustifyPara, #DefaultBullet,
#DefaultNumbering, #ParaspaceIncrease, #ParaspaceDecrease, #LineSpacing,
#HangingIndent, #CellVertTop, #CellVertCenter, #CellVertBottom,
#ParaspaceIncrease, #ParaspaceDecrease, div[id*='Row'], div[id*='Column'],
#DeleteTable, #MergeCells, div[id^=Outline] > span{
+ #SendToBack, #ObjectBackOne, #ObjectForwardOne, #BringToFront,
#FlipVertical, #FlipHorizontal, #Bold, #Italic, #Underline, #Strikeout,
#StyleApply, #StyleUpdateByExample, #StyleNewByExample, #Shadowed, #Grow,
#Shrink, #Color, #Spacing, #SuperScript, #SubScript,#AlignLeft, #AlignRight,
#AlignHorizontalCenter, #AlignBlock, #ParaRightToLeft, #ParaLeftToRight,
#AlignTop, #AlignVCenter, #AlignBottom, #IncrementIndent, #DecrementIndent,
#LeftPara, #RightPara, #CenterPara, #JustifyPara, #DefaultBullet,
#DefaultNumbering, #ParaspaceIncrease, #ParaspaceDecrease, #LineSpacing,
#HangingIndent, #CellVertTop, #CellVertCenter, #CellVertBottom,
#ParaspaceIncrease, #ParaspaceDecrease, div[id*='Row'], div[id*='Column'],
#DeleteTable, #MergeCells, div[id^=Outline]{
padding: 16px 28px 16px 4% !important;
margin: 0px !important;
float:left;
@@ -128,7 +128,7 @@
#Color {
padding: 20px 20px 0px 20px !important;
}
- #Shadowed, #StyleNewByExample + div, #AlignTop, #AlignBottom + p,
#mergecells, #BackgroundColor + p, #LineSpacing, #indentlabel,
#sizelabel{clear:both;}
+ #Shadowed, #StyleNewByExample + div, #AlignTop, #AlignBottom + p,
#mergecells, #BackgroundColor + p, #LineSpacing, #indentlabel, #spacinglabel,
#sizelabel{clear:both;}
#BackgroundColor + p, #LineSpacing + p, #denominatorplaceslabel,
#decimalplaceslabel, #leadingzeroeslabel, #leftindentlabel, #orientationlabel,
#cellbackgroundlabel, .mobile-wizard.ui-text {
border-bottom: 1px solid #c2d5ed;
color: #b3c5dc !important;
@@ -228,6 +228,13 @@
vertical-align: baseline;
padding-left: 24px;
}
+ div[
[Libreoffice-commits] online.git: loleaflet/css loleaflet/images
loleaflet/css/toolbar.css | 22 +++---
loleaflet/images/lc_columnwidth.svg |1 +
loleaflet/images/lc_deletetable.svg |1 +
loleaflet/images/lc_distributecolumns.svg |1 +
loleaflet/images/lc_distributerows.svg|1 +
loleaflet/images/lc_rowheight.svg |1 +
loleaflet/images/lc_setminimalcolumnwidth.svg |4
loleaflet/images/lc_setminimalrowheight.svg |4
loleaflet/images/lc_setoptimalcolumnwidth.svg |1 +
loleaflet/images/lc_setoptimalrowheight.svg |1 +
10 files changed, 34 insertions(+), 3 deletions(-)
New commits:
commit f91e1266e2653e6f4ce345b95dfb043715999785
Author: Pedro Pinto Silva
AuthorDate: Wed Nov 6 13:08:12 2019 +0100
Commit: Michael Meeks
CommitDate: Wed Nov 6 17:09:21 2019 +0100
mobilewizard: table properties:
- detected malformed svgs from colibre theme (fix metadata)
- add missing icons
- add special styling for Delete Table and merge cells
- arrange elements
- fix spinners
Change-Id: Ie9ec6ebf273ff3a307793b45bb600bf986f1f31c
Reviewed-on: https://gerrit.libreoffice.org/82137
Reviewed-by: Michael Meeks
Tested-by: Michael Meeks
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index c2164acd0..ad611f5a7 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -95,14 +95,30 @@
border-radius:100px;
background-color: #696969;
}
- #selectheight > img, #selectwidth > img, #selectheight > img,
#SendToBack > span, #ObjectBackOne > span, #ObjectForwardOne > span,
#BringToFront > span, #FlipVertical > span, #FlipHorizontal > span, #Bold >
span, #Italic > span, #Underline > span, #Strikeout > span, #StyleApply > span,
#StyleUpdateByExample > span, #StyleNewByExample > span, #Shadowed > span,
#Grow > span, #Shrink > span, #Color > span, #Spacing > span, #SuperScript >
span, #SubScript > span, #AlignLeft > span, #AlignRight > span,
#AlignHorizontalCenter > span, #AlignBlock > span, #ParaLeftToRight > span,
#ParaRightToLeft > span, #AlignTop > span, #AlignVCenter > span, #AlignBottom >
span, #IncrementIndent > span, #DecrementIndent > span, #LeftPara > span,
#RightPara > span, #CenterPara > span, #JustifyPara > span, #DefaultBullet >
span, #DefaultNumbering > span, #ParaspaceIncrease > span, #ParaspaceDecrease >
span, #LineSpacing > span, #HangingIndent > span, #CellVertTop > span,
#CellVertCenter > span, #CellVertBo
ttom > span, #OutlineRight > span, #OutlineLeft > span, #OutlineDown > span,
#OutlineUp > span{
+ #selectheight > img, #selectwidth > img, #selectheight > img,
#SendToBack > span, #ObjectBackOne > span, #ObjectForwardOne > span,
#BringToFront > span, #FlipVertical > span, #FlipHorizontal > span, #Bold >
span, #Italic > span, #Underline > span, #Strikeout > span, #StyleApply > span,
#StyleUpdateByExample > span, #StyleNewByExample > span, #Shadowed > span,
#Grow > span, #Shrink > span, #Color > span, #Spacing > span, #SuperScript >
span, #SubScript > span, #AlignLeft > span, #AlignRight > span,
#AlignHorizontalCenter > span, #AlignBlock > span, #ParaLeftToRight > span,
#ParaRightToLeft > span, #AlignTop > span, #AlignVCenter > span, #AlignBottom >
span, #IncrementIndent > span, #DecrementIndent > span, #LeftPara > span,
#RightPara > span, #CenterPara > span, #JustifyPara > span, #DefaultBullet >
span, #DefaultNumbering > span, #ParaspaceIncrease > span, #ParaspaceDecrease >
span, #LineSpacing > span, #HangingIndent > span, #CellVertTop > span,
#CellVertCenter > span, #CellVertBo
ttom > span, div[id*='Row'] > span, div[id*='Column'] > span,
div[id^=Outline] > span{
display: none !important;
}
- #SendToBack, #ObjectBackOne, #ObjectForwardOne, #BringToFront,
#FlipVertical, #FlipHorizontal, #Bold, #Italic, #Underline, #Strikeout,
#StyleApply, #StyleUpdateByExample, #StyleNewByExample, #Shadowed, #Grow,
#Shrink, #Color, #Spacing, #SuperScript, #SubScript,#AlignLeft, #AlignRight,
#AlignHorizontalCenter, #AlignBlock, #ParaRightToLeft, #ParaLeftToRight,
#AlignTop, #AlignVCenter, #AlignBottom, #IncrementIndent, #DecrementIndent,
#LeftPara, #RightPara, #CenterPara, #JustifyPara, #DefaultBullet,
#DefaultNumbering, #ParaspaceIncrease, #ParaspaceDecrease, #LineSpacing,
#HangingIndent, #CellVertTop, #CellVertCenter, #CellVertBottom,
#ParaspaceIncrease, #ParaspaceDecrease, #OutlineRight, #OutlineLeft,
#OutlineDown, #OutlineUp{
+ #SendToBack, #ObjectBackOne, #ObjectForwardOne, #BringToFront,
#FlipVertical, #FlipHorizontal, #Bold, #Italic, #Underline, #Strikeout,
#StyleApply, #StyleUpdateByExample, #StyleNewByExample, #Shadowed, #Grow,
#Shrink, #Color, #Spacing, #SuperScript, #SubScript,#AlignLeft, #AlignRight,
#AlignHorizontalCenter, #AlignBlock, #ParaRightToLeft, #ParaLeftToRight,
#AlignTop, #AlignVCenter, #AlignBottom, #IncrementIndent, #Decr
[Libreoffice-commits] online.git: loleaflet/images
loleaflet/images/areas3d_52x60.svg |1 + loleaflet/images/areas_52x60.svg |1 + loleaflet/images/areasfull3d_52x60.svg |1 + loleaflet/images/areasfull_52x60.svg |1 + loleaflet/images/areaspiled3d_52x60.svg |1 + loleaflet/images/areaspiled_52x60.svg|1 + loleaflet/images/bar3d_52x60.svg |1 + loleaflet/images/bar3ddeep_52x60.svg |1 + loleaflet/images/bar_52x60.svg |1 + loleaflet/images/barpercent3d_52x60.svg |1 + loleaflet/images/barpercent_52x60.svg|1 + loleaflet/images/barstack3d_52x60.svg|1 + loleaflet/images/barstack_52x60.svg |1 + loleaflet/images/bubble_52x60.svg|1 + loleaflet/images/columnline_52x60.svg|1 + loleaflet/images/columnpercent3d_52x60.svg |1 + loleaflet/images/columns3d_52x60.svg |1 + loleaflet/images/columns3ddeep_52x60.svg |1 + loleaflet/images/columnstack3d_52x60.svg |1 + loleaflet/images/columnstackline_52x60.svg |1 + loleaflet/images/cone_52x60.svg |1 + loleaflet/images/conedeep_52x60.svg |1 + loleaflet/images/conehori_52x60.svg |1 + loleaflet/images/conehorideep_52x60.svg |1 + loleaflet/images/conehoripercent_52x60.svg |1 + loleaflet/images/conehoristack_52x60.svg |1 + loleaflet/images/conepercent_52x60.svg |1 + loleaflet/images/conestack_52x60.svg |1 + loleaflet/images/cylinder_52x60.svg |1 + loleaflet/images/cylinderdeep_52x60.svg |1 + loleaflet/images/cylinderhori_52x60.svg |1 + loleaflet/images/cylinderhorideep_52x60.svg |1 + loleaflet/images/cylinderhoriprocent_52x60.svg |1 + loleaflet/images/cylinderhoristack_52x60.svg |1 + loleaflet/images/cylinderpercent_52x60.svg |1 + loleaflet/images/cylinderstack_52x60.svg |1 + loleaflet/images/donut3d_52x60.svg |1 + loleaflet/images/donut3dexploded_52x60.svg |1 + loleaflet/images/donut_52x60.svg |1 + loleaflet/images/donutexploded_52x60.svg |1 + loleaflet/images/errorbothhori_30.svg|1 + loleaflet/images/errorbothverti_30.svg |1 + loleaflet/images/errordown_30.svg|1 + loleaflet/images/errorleft_30.svg|1 + loleaflet/images/errorright_30.svg |1 + loleaflet/images/errorup_30.svg |1 + loleaflet/images/net_52x60.svg |1 + loleaflet/images/netfill_52x60.svg |1 + loleaflet/images/netlinepoint_52x60.svg |1 + loleaflet/images/netlinepointstack_52x60.svg |1 + loleaflet/images/netpoint_52x60.svg |1 + loleaflet/images/netpointstack_52x60.svg |1 + loleaflet/images/netstack_52x60.svg |1 + loleaflet/images/netstackfill_52x60.svg |1 + loleaflet/images/nostackdirect3d_52x60.svg |1 + loleaflet/images/nostackdirectboth_52x60.svg |1 + loleaflet/images/nostackdirectlines_52x60.svg|1 + loleaflet/images/nostackdirectpoints_52x60.svg |1 + loleaflet/images/nostacksmooth3d_52x60.svg |1 + loleaflet/images/nostacksmoothboth_52x60.svg |1 + loleaflet/images/nostacksmoothlines_52x60.svg|1 + loleaflet/images/nostackstepped3d_52x60.svg |1 + loleaflet/images/nostacksteppedboth_52x60.svg|1 + loleaflet/images/nostacksteppedlines_52x60.svg |1 + loleaflet/images/pie3d_52x60.svg |1 + loleaflet/images/pie3dexploded_52x60.svg |1 + loleaflet/images/pie_52x60.svg |1 + loleaflet/images/pieexploded_52x60.svg |1 + loleaflet/images/pyramind_52x60.svg |1 + loleaflet/images/pyraminddeep_52x60.svg |1 + loleaflet/images/pyramindhori_52x60.svg |1 + loleaflet/images/pyramindhorideep_52x60.svg |1 + loleaflet/images/pyramindhoripercent_52x60.svg |1 + loleaflet/images/pyramindhoristack_52x60.svg |1 + loleaflet/images/pyramindpercent_52x60.svg |1 + loleaflet/images/pyramindstack_52x60.svg |1 + loleaflet/images/regavg.svg |1 + loleaflet/images/regexp.svg |1 + loleaflet/images/reglin.svg |1 + loleaflet/images/reglog.svg |1 + loleaflet/images/regpoly.svg |1 + loleaflet/images/regpow.svg |1 + loleaflet/images/stackdirect3d_52x60.svg |1 + loleaflet/images/stackdirectboth_52x60.svg |1 + loleaflet/images/stackdirectlines_52x60.sv
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/firebird/Column.cxx |1 -
1 file changed, 1 deletion(-)
New commits:
commit 032b6698c11f6b6e67fa3a12c2d34f1f7afe63f6
Author: Julien Nabet
AuthorDate: Fri Nov 1 23:14:41 2019 +0100
Commit: Julien Nabet
CommitDate: Wed Nov 6 16:58:22 2019 +0100
Base/Firebird fix column creation
Avoid these logs when saving a brand new table in embedded Firebird:
warn:legacy.osl:6038:6038:comphelper/source/property/propertycontainerhelper.cxx:181:
OPropertyContainerHelper::implPushBackProperty: name already exists!
warn:legacy.osl:6038:6038:comphelper/source/property/propertycontainerhelper.cxx:182:
OPropertyContainerHelper::implPushBackProperty: handle already exists!
...
Change-Id: I305791ad14d0bd18b3a527b848c031e02d661dbb
Reviewed-on: https://gerrit.libreoffice.org/81926
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/connectivity/source/drivers/firebird/Column.cxx
b/connectivity/source/drivers/firebird/Column.cxx
index f5da82718b5a..9c13499f8772 100644
--- a/connectivity/source/drivers/firebird/Column.cxx
+++ b/connectivity/source/drivers/firebird/Column.cxx
@@ -24,7 +24,6 @@ Column::Column()
void Column::construct()
{
-OColumn::construct();
m_sAutoIncrement = "GENERATED BY DEFAULT AS IDENTITY";
registerProperty(OMetaConnection::getPropMap().getNameByIndex(
PROPERTY_ID_AUTOINCREMENTCREATION),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: 2 commits - loleaflet/css
loleaflet/css/mobilewizard.css |6 ++
loleaflet/css/vex.css | 16 +++-
2 files changed, 17 insertions(+), 5 deletions(-)
New commits:
commit ca4ebc481b2df678de3e31a21c1de8205fe5b288
Author: Pedro Pinto Silva
AuthorDate: Wed Nov 6 11:00:51 2019 +0100
Commit: Michael Meeks
CommitDate: Wed Nov 6 16:41:53 2019 +0100
Vex: idle: differentiate styles depending on device
Change-Id: I236e64b2688e38c6651563f2c206a7b9276bae50
Reviewed-on: https://gerrit.libreoffice.org/82131
Reviewed-by: Michael Meeks
Tested-by: Michael Meeks
diff --git a/loleaflet/css/vex.css b/loleaflet/css/vex.css
index 51f6cb550..2b90f1947 100644
--- a/loleaflet/css/vex.css
+++ b/loleaflet/css/vex.css
@@ -23,13 +23,13 @@
}
/* dialog shown when user is idle */
.vex-open .loleaflet-user-idle {
- background: rgba(0, 0, 0, 0)!important;
- font-size: xx-large!important;
- color: #fff!important;
- text-align: center!important;
+ background: #ffe0 !important;
+ font-size: xx-large !important;
+ color: #7a8592 !important;
+ text-align: center !important;
}
.vex-open .loleaflet-user-idle .vex-dialog-buttons {
- display: none!important;
+ display: none !important;
}
.vex.vex-theme-plain{
@@ -53,6 +53,12 @@
/*mobile*/
@media (max-width: 767px), (max-device-height: 767px) {
+ .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.ve
x-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
}
commit 79456ef1ffb020a06af3210ce46720607ac29fae
Author: Pedro Pinto Silva
AuthorDate: Wed Nov 6 16:34:49 2019 +0100
Commit: Michael Meeks
CommitDate: Wed Nov 6 16:41:44 2019 +0100
Impress: mobilewizard: hide wizardheader when in landscape
Change-Id: I4105f94351181b61a97d7db9e6caae6d8dfcd891
Reviewed-on: https://gerrit.libreoffice.org/82150
Reviewed-by: Michael Meeks
Tested-by: Michael Meeks
diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css
index eed554616..5ed84e716 100644
--- a/loleaflet/css/mobilewizard.css
+++ b/loleaflet/css/mobilewizard.css
@@ -270,3 +270,9 @@ p.mobile-wizard.ui-combobox-text.selected {
#rotationlabel{
display: none;
}
+@media (orientation: landscape) {
+ #mobile-wizard-header{display: none;}
+}
+@media (orientation: portrait) {
+ #mobile-wizard-header{display: block;}
+}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: 2 commits - loleaflet/css
loleaflet/css/toolbar-mobile.css | 86 +++
loleaflet/css/toolbar.css|6 +-
2 files changed, 46 insertions(+), 46 deletions(-)
New commits:
commit ae119a4102be4c0ba63cd9ab142390e87ff0fb90
Author: Pedro Pinto Silva
AuthorDate: Tue Nov 5 17:24:12 2019 +0100
Commit: Michael Meeks
CommitDate: Wed Nov 6 16:30:11 2019 +0100
impress:mobilewizard:paragraph: fix icon arrangements and hide labels
Change-Id: I5c7d1be30fcbdecefe894c27c46bce29a0f082c2
Reviewed-on: https://gerrit.libreoffice.org/82081
Reviewed-by: Pedro Pinto da Silva
Reviewed-by: Michael Meeks
Tested-by: Michael Meeks
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 6b17c11a0..c2164acd0 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -95,10 +95,10 @@
border-radius:100px;
background-color: #696969;
}
- #selectheight > img, #selectwidth > img, #selectheight > img,
#SendToBack > span, #ObjectBackOne > span, #ObjectForwardOne > span,
#BringToFront > span, #FlipVertical > span, #FlipHorizontal > span, #Bold >
span, #Italic > span, #Underline > span, #Strikeout > span, #StyleApply > span,
#StyleUpdateByExample > span, #StyleNewByExample > span, #Shadowed > span,
#Grow > span, #Shrink > span, #Color > span, #Spacing > span, #SuperScript >
span, #SubScript > span, #AlignLeft > span, #AlignRight > span,
#AlignHorizontalCenter > span, #AlignBlock > span, #ParaLeftToRight > span,
#ParaRightToLeft > span, #AlignTop > span, #AlignVCenter > span, #AlignBottom >
span, #IncrementIndent > span, #DecrementIndent > span, #LeftPara > span,
#RightPara > span, #CenterPara > span, #JustifyPara > span, #DefaultBullet >
span, #DefaultNumbering > span, #ParaspaceIncrease > span, #ParaspaceDecrease >
span, #LineSpacing > span, #HangingIndent > span, #CellVertTop > span,
#CellVertCenter > span, #CellVertBo
ttom > span{
+ #selectheight > img, #selectwidth > img, #selectheight > img,
#SendToBack > span, #ObjectBackOne > span, #ObjectForwardOne > span,
#BringToFront > span, #FlipVertical > span, #FlipHorizontal > span, #Bold >
span, #Italic > span, #Underline > span, #Strikeout > span, #StyleApply > span,
#StyleUpdateByExample > span, #StyleNewByExample > span, #Shadowed > span,
#Grow > span, #Shrink > span, #Color > span, #Spacing > span, #SuperScript >
span, #SubScript > span, #AlignLeft > span, #AlignRight > span,
#AlignHorizontalCenter > span, #AlignBlock > span, #ParaLeftToRight > span,
#ParaRightToLeft > span, #AlignTop > span, #AlignVCenter > span, #AlignBottom >
span, #IncrementIndent > span, #DecrementIndent > span, #LeftPara > span,
#RightPara > span, #CenterPara > span, #JustifyPara > span, #DefaultBullet >
span, #DefaultNumbering > span, #ParaspaceIncrease > span, #ParaspaceDecrease >
span, #LineSpacing > span, #HangingIndent > span, #CellVertTop > span,
#CellVertCenter > span, #CellVertBo
ttom > span, #OutlineRight > span, #OutlineLeft > span, #OutlineDown > span,
#OutlineUp > span{
display: none !important;
}
- #SendToBack, #ObjectBackOne, #ObjectForwardOne, #BringToFront,
#FlipVertical, #FlipHorizontal, #Bold, #Italic, #Underline, #Strikeout,
#StyleApply, #StyleUpdateByExample, #StyleNewByExample, #Shadowed, #Grow,
#Shrink, #Color, #Spacing, #SuperScript, #SubScript,#AlignLeft, #AlignRight,
#AlignHorizontalCenter, #AlignBlock, #ParaRightToLeft, #ParaLeftToRight,
#AlignTop, #AlignVCenter, #AlignBottom, #IncrementIndent, #DecrementIndent,
#LeftPara, #RightPara, #CenterPara, #JustifyPara, #DefaultBullet,
#DefaultNumbering, #ParaspaceIncrease, #ParaspaceDecrease, #LineSpacing,
#HangingIndent, #CellVertTop, #CellVertCenter, #CellVertBottom,
#ParaspaceIncrease, #ParaspaceDecrease{
+ #SendToBack, #ObjectBackOne, #ObjectForwardOne, #BringToFront,
#FlipVertical, #FlipHorizontal, #Bold, #Italic, #Underline, #Strikeout,
#StyleApply, #StyleUpdateByExample, #StyleNewByExample, #Shadowed, #Grow,
#Shrink, #Color, #Spacing, #SuperScript, #SubScript,#AlignLeft, #AlignRight,
#AlignHorizontalCenter, #AlignBlock, #ParaRightToLeft, #ParaLeftToRight,
#AlignTop, #AlignVCenter, #AlignBottom, #IncrementIndent, #DecrementIndent,
#LeftPara, #RightPara, #CenterPara, #JustifyPara, #DefaultBullet,
#DefaultNumbering, #ParaspaceIncrease, #ParaspaceDecrease, #LineSpacing,
#HangingIndent, #CellVertTop, #CellVertCenter, #CellVertBottom,
#ParaspaceIncrease, #ParaspaceDecrease, #OutlineRight, #OutlineLeft,
#OutlineDown, #OutlineUp{
padding: 16px 28px 16px 4% !important;
margin: 0px !important;
float:left;
@@ -108,7 +108,7 @@
float: left;
padding: 20px 20px 20px 20px !important;
}
- #belowparaspacing{float: left;}
+ #belowparaspacing, #spacinglabel, #OutlineRight, #DefaultBullet,
#CellVertTop{float: left;}
[Libreoffice-commits] online.git: loleaflet/css
loleaflet/css/vex.css | 18 ++
1 file changed, 10 insertions(+), 8 deletions(-)
New commits:
commit 8fc3a5bdc4f40a27216e4afd972b7b352a46e593
Author: Pedro Pinto Silva
AuthorDate: Wed Nov 6 10:12:40 2019 +0100
Commit: Michael Meeks
CommitDate: Wed Nov 6 16:30:33 2019 +0100
Vex: input: fix paddings and widths (mobile and desktop)
Change-Id: I0f1882ca785b211ffd18bdbc972c1152cfa3d275
Reviewed-on: https://gerrit.libreoffice.org/82126
Reviewed-by: Pedro Pinto da Silva
Reviewed-by: Michael Meeks
Tested-by: Michael Meeks
diff --git a/loleaflet/css/vex.css b/loleaflet/css/vex.css
index ac1459f85..51f6cb550 100644
--- a/loleaflet/css/vex.css
+++ b/loleaflet/css/vex.css
@@ -42,17 +42,20 @@
box-shadow: 0 -1px 2px 0 rgba(0, 0, 0, 0.15), 0 2px 2px 0 rgba(0, 0, 0,
0.1);
border-radius: 4px;
}
-.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-closing {
-webkit-animation: vex-fadeout .25s forwards;
animation: vex-fadeout .25s forwards;
}
+.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"]{
+ width: 95% !important;
+}
/*mobile*/
@media (max-width: 767px), (max-device-height: 767px) {
+ .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.ve
x-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;
@@ -72,17 +75,16 @@
.vex.vex-theme-plain .vex-dialog-form .vex-dialog-input
input[type="text"] {
border-radius: 4px !important;
background-color: #fff !imp
[Libreoffice-commits] online.git: loleaflet/po
loleaflet/po/help-sl.po | 1921 loleaflet/po/ui-sl.po | 456 +++ 2 files changed, 1898 insertions(+), 479 deletions(-) New commits: commit 88565f3d888da7b26a765c5e6e0e13ea3a189449 Author: Andras Timar AuthorDate: Wed Nov 6 15:54:56 2019 +0100 Commit: Andras Timar CommitDate: Wed Nov 6 15:54:56 2019 +0100 Updated Slovenian translation Change-Id: I1bd235c872c97058fe33d8aa30b885d649438959 diff --git a/loleaflet/po/help-sl.po b/loleaflet/po/help-sl.po index fc28cc5b5..742cc5a62 100644 --- a/loleaflet/po/help-sl.po +++ b/loleaflet/po/help-sl.po @@ -4,615 +4,615 @@ msgid "" msgstr "" "Project-Id-Version: LibreOffice Online - Help\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-08 11:32+0200\n" -"PO-Revision-Date: 2018-12-06 23:20+0100\n" +"POT-Creation-Date: 2019-11-04 20:16+0200\n" +"PO-Revision-Date: 2019-11-05 17:56+0100\n" "Last-Translator: Martin Srebotnjak \n" "Language-Team: sl.libreoffice.org \n" "Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || " -"n%100==4 ? 2 : 3);\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" +"%100==4 ? 2 : 3);\n" +"X-Generator: Poedit 2.2.4\n" "X-Accelerator-Marker: ~\n" -"X-Generator: Translate Toolkit 2.4.0\n" "X-Poedit-SourceCharset: UTF-8\n" -#: html/loleaflet-help.html%2Bdiv.h1:25-5 +#: html/loleaflet-help.html%2Bdiv.h1:16-5 msgid "Keyboard Shortcuts" msgstr "Tipke za bližnjice" -#: html/loleaflet-help.html%2Bdiv.div.h2:27-9 +#: html/loleaflet-help.html%2Bdiv.div.h2:18-9 msgid "General Keyboard Shortcuts" msgstr "Splošne tipke za bližnjice" -#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:29-18 +#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:20-18 msgid "Undo" msgstr "Razveljavi" -#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:29-49 +#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:20-49 msgid "Ctrl + Z" msgstr "Krmilka + Z" -#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:30-18 +#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:21-18 msgid "Redo" msgstr "Ponovi" -#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:30-49 +#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:21-49 msgid "Ctrl + Y" msgstr "Krmilka + Y" -#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:31-18 +#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:22-18 msgid "Cut" msgstr "Izreži" -#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:31-48 +#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:22-48 msgid "Ctrl + X" msgstr "Krmilka + X" -#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:32-18 +#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:23-18 msgid "Paste as unformatted text" msgstr "Prilepi kot neoblikovano besedilo" -#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:32-70 +#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:23-70 msgid "Ctrl + Alt + Shift + V" msgstr "Krmilka + izmenjalka + dvigalka + V" -#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:33-18 +#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:24-18 msgid "Print (Download as PDF)" msgstr "Natisni (Prenesi kot dokument PDF)" -#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:33-68 +#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:24-68 msgid "Ctrl + P" msgstr "Krmilka + P" -#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:34-18 +#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:25-18 msgid "Display the Keyboard shortcuts help" msgstr "Prikaži pomoč za tipke za bližnjice" -#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:34-80 +#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:25-80 msgid "Ctrl + Shift + ?" msgstr "Krmilka + dvigalka + ?" -#: html/loleaflet-help.html%2Bdiv.div.h2:38-9 -#: html/loleaflet-help.html%2Bdiv.div.h2:160-9 +#: html/loleaflet-help.html%2Bdiv.div.h2:29-9 +#: html/loleaflet-help.html%2Bdiv.div.h2:151-9 msgid "Text formatting" msgstr "Oblikovanje besedila" -#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:40-18 -#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:137-18 -#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:162-18 +#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:31-18 +#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:128-18 +#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:153-18 msgid "Bold" msgstr "Krepko" -#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:40-49 -#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:137-49 -#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:162-49 +#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:31-49 +#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:128-49 +#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:153-49 msgid "Ctrl + B" msgstr "Krmilka + B" -#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:41-18 -#: html/loleaflet-help.html%2Bdiv.div.table.tr.td:138-18 -#: html/loleaflet-help.html%2Bdiv.di
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/ColorPicker.js | 37 ---
1 file changed, 26 insertions(+), 11 deletions(-)
New commits:
commit 545b85fb1d282a869ae00dd847de7d5a194b4052
Author: Marco Cecchetti
AuthorDate: Wed Nov 6 15:16:55 2019 +0100
Commit: Marco Cecchetti
CommitDate: Wed Nov 6 15:46:49 2019 +0100
loleaflet: color picker: more shades
Change-Id: If231683caa1678f3391429b10762ed800790574a
diff --git a/loleaflet/src/control/ColorPicker.js
b/loleaflet/src/control/ColorPicker.js
index 0ba1ba2cd..ea830bd94 100644
--- a/loleaflet/src/control/ColorPicker.js
+++ b/loleaflet/src/control/ColorPicker.js
@@ -8,7 +8,7 @@
L.ColorPicker = L.Class.extend({
options: {
- selectedColor: '#CC0814',
+ selectedColor: '#ff',
noColorControl: true,
selectionCallback: function () {}
},
@@ -20,18 +20,33 @@ L.ColorPicker = L.Class.extend({
// color types
BASIC_COLOR: 0,
TINT: 1,
-
- BASIC_COLORS: ['#00', '#FF011B', '#FF9838', '#FFFD59',
'#01FD55',
- '#00FFFE', '#006CE7', '#9B24F4', '#FF21F5'],
+ // we need a tight layout in order to be able to show 11 colors
as in gdoc
+ BASIC_COLORS: ['#00', '#98', '#ff', '#ff9900',
+ '#00','#00ff00','#00', /*'#4a86e8',*/
+ '#ff','#9900ff', '#ff00ff'],
TINTS: {
'#00': ['#00', '#434343', '#66', '#88',
- '#BB', '#DD', '#EE', '#FF'],
- '#FF011B': ['#99050C', '#CC0814', '#E0', '#FF011B',
- '#EA9899', '#F4', '#FFEAEA', '#FF'],
- '#FF9838': ['#783f04', '#b45f06', '#e69138', '#ff9900',
- '#f6b26b', '#f9cb9c', '#fce5cd', '#FF'],
- '#FFFD59': ['#7f6000', '#bf9000', '#f1c232', '#00',
- '#ffd966', '#ffe599', '#fff2cc', '#FF']
+ '#bb', '#dd', '#ee', '#ff'],
+ '#98': ['#5b0f00', '#85200c', '#a61c00', '#98',
+ '#cc4125', '#dd7e6b', '#e6b8af', '#ff'],
+ '#ff': ['#66', '#99', '#cc', '#ff',
+ '#e0', '#ea', '#f4', '#ff'],
+ '#ff9900': ['#783f04', '#b45f06', '#e69138', '#ff9900',
+ '#f6b26b', '#f9cb9c', '#fce5cd', '#ff'],
+ '#00': ['#7f6000', '#bf9000', '#f1c232', '#00',
+ '#ffd966', '#ffe599', '#fff2cc', '#ff'],
+ '#00ff00': ['#274e13', '#38761d', '#6aa84f', '#00ff00',
+ '#93c47d', '#b6d7a8', '#d9ead3', '#ff'],
+ '#00': ['#0c343d', '#134f5c', '#45818e', '#00',
+ '#76a5af', '#a2c4c9', '#d0e0e3', '#ff'],
+ // '#4a86e8': ['#1c4587', '#1155cc', '#3c78d8',
'#4a86e8',
+ // '#6d9eeb', '#a4c2f4', '#c9daf8', '#ff'],
+ '#ff': ['#073763', '#0b5394', '#3d85c6', '#ff',
+ '#6fa8dc', '#9fc5e8', '#cfe2f3', '#ff'],
+ '#9900ff': ['#20124d', '#351c75', '#674ea7', '#9900ff',
+ '#8e7cc3', '#b4a7d6', '#d9d2e9', '#ff'],
+ '#ff00ff': ['#4c1130', '#741b47', '#a64d79', '#ff00ff',
+ '#c27ba0', '#d5a6bd', '#ead1dc', '#ff']
}
},
___
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' - sc/source
sc/source/ui/inc/viewdata.hxx |4 +++-
sc/source/ui/view/gridwin4.cxx |3 +--
sc/source/ui/view/tabview.cxx | 39 ---
sc/source/ui/view/viewdata.cxx | 22 +++---
4 files changed, 35 insertions(+), 33 deletions(-)
New commits:
commit 933ffa881f6180b6b2505b2a49a9f0c8fc0a13d2
Author: Michael Meeks
AuthorDate: Fri Nov 1 15:40:43 2019 +
Commit: Michael Meeks
CommitDate: Wed Nov 6 15:45:53 2019 +0100
sc lok: cope with non 100% zoom better.
Do the tile rendering and alignment ourselves. More work required
to get cleaner conversion between view and document twips (view
twips being rounded to produce nice round pixel sizes when
re-converted).
Change-Id: I51edb186cfd2dc434005cc074f4ed8de19c85cb3
Reviewed-on: https://gerrit.libreoffice.org/82098
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Michael Meeks
diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx
index 0e1a275af067..40dad1b62e69 100644
--- a/sc/source/ui/inc/viewdata.hxx
+++ b/sc/source/ui/inc/viewdata.hxx
@@ -159,13 +159,15 @@ class ScBoundsProvider
const bool bColumnHeader;
const index_type MAX_INDEX;
+double mfPPTX;
+double mfPPTY;
index_type nFirstIndex;
index_type nSecondIndex;
long nFirstPositionPx;
long nSecondPositionPx;
public:
-ScBoundsProvider(ScDocument* pD, SCTAB nT, bool bColumnHeader);
+ScBoundsProvider(const ScViewData &rView, SCTAB nT, bool bColumnHeader);
void GetStartIndexAndPosition(SCCOL& nIndex, long& nPosition) const;
void GetEndIndexAndPosition(SCCOL& nIndex, long& nPosition) const;
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 75111de74eae..a861daec3177 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -1070,7 +1070,6 @@ namespace
const bool bColumnHeader = std::is_same::value;
SCTAB nTab = pViewData->GetTabNo();
-ScDocument* pDoc = pViewData->GetDocument();
IndexType nStartIndex = -1;
IndexType nEndIndex = -1;
@@ -1082,7 +1081,7 @@ namespace
const auto& rStartNearest =
rPositionHelper.getNearestByPosition(nTileStartPosPx);
const auto& rEndNearest =
rPositionHelper.getNearestByPosition(nTileEndPosPx);
-ScBoundsProvider aBoundsProvider(pDoc, nTab, bColumnHeader);
+ScBoundsProvider aBoundsProvider(*pViewData, nTab, bColumnHeader);
aBoundsProvider.Compute(rStartNearest, rEndNearest, nTileStartPosPx,
nTileEndPosPx);
aBoundsProvider.GetStartIndexAndPosition(nStartIndex, nStartPosPx);
++nStartIndex;
aBoundsProvider.GetEndIndexAndPosition(nEndIndex, nEndPosPx);
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 24794e50d57a..4904514a7f77 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -2310,16 +2310,16 @@ void ScTabView::SetAutoSpellData( SCCOL nPosX, SCROW
nPosY, const std::vectorGetRowHeight(nRow, nTab);
-return ScViewData::ToPixel(nSize, 1.0 / TWIPS_PER_PIXEL);
+const sal_uInt16 nSize = rViewData.GetDocument()->GetRowHeight(nRow, nTab);
+return ScViewData::ToPixel(nSize, rViewData.GetPPTY());
}
-long lcl_GetColWidthPx(const ScDocument* pDoc, SCCOL nCol, SCTAB nTab)
+long lcl_GetColWidthPx(const ScViewData &rViewData, SCCOL nCol, SCTAB nTab)
{
-const sal_uInt16 nSize = pDoc->GetColWidth(nCol, nTab);
-return ScViewData::ToPixel(nSize, 1.0 / TWIPS_PER_PIXEL);
+const sal_uInt16 nSize = rViewData.GetDocument()->GetColWidth(nCol, nTab);
+return ScViewData::ToPixel(nSize, rViewData.GetPPTX());
}
void lcl_getGroupIndexes(const ScOutlineArray& rArray, SCCOLROW nStart,
SCCOLROW nEnd, std::vector& rGroupIndexes)
@@ -2496,13 +2496,13 @@ OUString ScTabView::getRowColumnHeaders(const
tools::Rectangle& rRectangle)
{
SAL_INFO("sc.lok.header", "Row Header: compute start/end rows.");
long nEndHeightPx = 0;
-long nRectTopPx = rRectangle.Top() / TWIPS_PER_PIXEL;
-long nRectBottomPx = rRectangle.Bottom() / TWIPS_PER_PIXEL;
+long nRectTopPx = rRectangle.Top() * aViewData.GetPPTX();
+long nRectBottomPx = rRectangle.Bottom() * aViewData.GetPPTY();
const auto& rTopNearest =
aViewData.GetLOKHeightHelper().getNearestByPosition(nRectTopPx);
const auto& rBottomNearest =
aViewData.GetLOKHeightHelper().getNearestByPosition(nRectBottomPx);
-ScBoundsProvider aBoundingRowsProvider(pDoc, nTab, /*bColumnHeader: */
false);
+ScBoundsProvider aBoundingRowsProvider(aViewData, nTab,
/*bColumnHeader: */ false);
aBoundingRowsProvider.Compute(rTopNearest, rBottomNearest, nRectTopPx,
nRectBottomPx);
aBoundingRowsProvider.EnlargeBy(2);
aBoundingRowsProvider.GetStartIndexAndPosition(nStartRow,
nStartHeightPx);
@@ -2592,7 +2592,7 @@ OUString ScTabView::getRowCol
[Libreoffice-commits] core.git: framework/source
framework/source/loadenv/loadenv.cxx |6 +++--- framework/source/services/autorecovery.cxx |4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) New commits: commit 47d9af04db2b6139644c5e2bda628b7035f89f52 Author: Andrea Gelmini AuthorDate: Mon Nov 4 19:09:16 2019 +0100 Commit: Julien Nabet CommitDate: Wed Nov 6 15:18:25 2019 +0100 Fix typos Change-Id: I0b0d5cf589959aa0f93f57cf6f310177394562c7 Reviewed-on: https://gerrit.libreoffice.org/82040 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx index 119f7d22ffcc..e0b0fd7a4687 100644 --- a/framework/source/loadenv/loadenv.cxx +++ b/framework/source/loadenv/loadenv.cxx @@ -1087,10 +1087,10 @@ bool LoadEnv::impl_loadContent() m_aTargetLock.setResource(xTargetLock); // Add status indicator to descriptor. Loader can show a progress then. -// But don't do it, if loading should be hidden or preview is used ...! +// But don't do it, if loading should be hidden or preview is used...! // So we prevent our code against wrong using. Why? -// It could be, that using of this progress could make trouble. e.g. He make window visible ... -// but shouldn't do that. But if no indicator is available ... nobody has a chance to do that! +// It could be, that using of this progress could make trouble. e.g. He makes window visible... +// but shouldn't do that. But if no indicator is available... nobody has a chance to do that! bool bHidden= m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_HIDDEN(), false); bool bMinimized = m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_MINIMIZED(), false); bool bPreview = m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_PREVIEW(), false); diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index 8da37225f2e0..9d8479166411 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -1372,9 +1372,9 @@ void AutoRecovery::implts_dispatch(const DispatchParams& aParams) ((eJob & AutoRecovery::E_USER_AUTO_SAVE) == AutoRecovery::E_USER_AUTO_SAVE); // On the other side it makes no sense to reactivate the AutoSave operation -// if the new dispatch indicates a final decision ... +// if the new dispatch indicates a final decision... // E.g. an EmergencySave/SessionSave indicates the end of life of the current office session. -// It make no sense to reactivate an AutoSave then. +// It makes no sense to reactivate an AutoSave then. // But a Recovery or SessionRestore should reactivate a may be already active AutoSave. bool bAllowAutoSaveReactivation = true; ___ 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' - vcl/source
vcl/source/outdev/rect.cxx |4 1 file changed, 4 insertions(+) New commits: commit 81f8d21ea3ad226e68dcdeac62d3182cd4141ddd Author: Michael Meeks AuthorDate: Thu Sep 19 20:24:00 2019 +0100 Commit: Michael Meeks CommitDate: Wed Nov 6 14:28:44 2019 +0100 Drawing calc grid misses pixels on bottom and right. Change-Id: I2ac7911b35d942b7167a3243d04e1b5710ed367d Reviewed-on: https://gerrit.libreoffice.org/82097 Reviewed-by: Michael Meeks Tested-by: Michael Meeks diff --git a/vcl/source/outdev/rect.cxx b/vcl/source/outdev/rect.cxx index 0770b68db5b6..63a876eb2bdb 100644 --- a/vcl/source/outdev/rect.cxx +++ b/vcl/source/outdev/rect.cxx @@ -224,6 +224,10 @@ void OutputDevice::DrawGrid( const tools::Rectangle& rRect, const Size& rDist, D tools::Rectangle aDstRect( PixelToLogic( Point() ), GetOutputSize() ); aDstRect.Intersection( rRect ); +// FIXME: seems we have an off-by-one around the border +// here with the cairo / svp backend at least. +aDstRect.AdjustRight(1); +aDstRect.AdjustBottom(1); if( aDstRect.IsEmpty() || ImplIsRecordLayout() ) return; ___ 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 sc/source
desktop/qa/desktop_lib/test_desktop_lib.cxx |2 +-
sc/source/ui/view/gridwin.cxx |7 ++-
2 files changed, 3 insertions(+), 6 deletions(-)
New commits:
commit 227dac69d08222d2ec1b7971795afbb8296b105f
Author: Michael Meeks
AuthorDate: Mon Oct 28 21:39:14 2019 +
Commit: Michael Meeks
CommitDate: Wed Nov 6 14:27:43 2019 +0100
Revert "lok: sc: make hi-dpi/zoom compatible with retrieving cell cursor"
This reverts commit e3ff84aed5be8e0d2780d80b178fa8fc0e388859.
Change-Id: I174dd54cf7b44f12c90c61882814b6dee9be9b7c
Reviewed-on: https://gerrit.libreoffice.org/82096
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Michael Meeks
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index f36f03c33814..dc390e72c825 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -816,7 +816,7 @@ void DesktopLOKTest::testCellCursor()
OString aRectangle(aTree.get("commandValues").c_str());
// cell cursor geometry + col + row
-CPPUNIT_ASSERT_EQUAL(OString("0, 0, 1274, 254, 0, 0"), aRectangle);
+CPPUNIT_ASSERT_EQUAL(OString("0, 0, 1279, 255, 0, 0"), aRectangle);
}
void DesktopLOKTest::testCommandResult()
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 6977de2cc9cc..4719c08cc235 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -5664,7 +5664,7 @@ OString ScGridWindow::getCellCursor( int nOutputWidth,
int nOutputHeight,
return getCellCursor(zoomX, zoomY);
}
-OString ScGridWindow::getCellCursor(const Fraction& /*rZoomX*/, const
Fraction& /*rZoomY*/) const
+OString ScGridWindow::getCellCursor(const Fraction& rZoomX, const Fraction&
rZoomY) const
{
// GridWindow stores a shown cell cursor in mpOOCursors, hence
// we can use that to determine whether we would want to be showing
@@ -5680,10 +5680,7 @@ OString ScGridWindow::getCellCursor(const Fraction&
/*rZoomX*/, const Fraction&
Fraction defaultZoomX = pViewData->GetZoomX();
Fraction defaultZoomY = pViewData->GetZoomY();
-// hardcode to what we mean as 100% (256px tiles meaning 3840 twips)
-Fraction aFracX(long(256 * TWIPS_PER_PIXEL), 3840);
-Fraction aFracY(long(256 * TWIPS_PER_PIXEL), 3840);
-pViewData->SetZoom(aFracX, aFracY, true);
+pViewData->SetZoom(rZoomX, rZoomY, true);
Point aScrPos = pViewData->GetScrPos( nX, nY, eWhich, true );
long nSizeXPix;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: canvas/IwyuFilter_canvas.yaml canvas/source
canvas/IwyuFilter_canvas.yaml| 33 +++ canvas/source/cairo/cairo_cachedbitmap.cxx |3 -- canvas/source/cairo/cairo_canvas.cxx |9 -- canvas/source/cairo/cairo_canvasbitmap.cxx |1 canvas/source/cairo/cairo_canvascustomsprite.cxx |2 - canvas/source/cairo/cairo_canvashelper.cxx |5 --- canvas/source/cairo/cairo_canvashelper_text.cxx |2 - canvas/source/cairo/cairo_devicehelper.cxx |2 - canvas/source/cairo/cairo_services.cxx |9 -- canvas/source/cairo/cairo_spritecanvas.cxx |9 -- canvas/source/cairo/cairo_spritecanvashelper.cxx |5 --- canvas/source/cairo/cairo_spritedevicehelper.cxx |8 - canvas/source/cairo/cairo_spritehelper.cxx |6 canvas/source/cairo/cairo_textlayout.cxx |3 +- canvas/source/factory/cf_service.cxx |6 canvas/source/opengl/ogl_bitmapcanvashelper.cxx |2 - canvas/source/opengl/ogl_canvasbitmap.cxx|2 - canvas/source/opengl/ogl_canvascustomsprite.cxx |2 - canvas/source/opengl/ogl_canvasfont.cxx |3 -- canvas/source/opengl/ogl_canvashelper.cxx|6 canvas/source/opengl/ogl_canvastools.cxx |3 -- canvas/source/opengl/ogl_spritecanvas.cxx|5 --- canvas/source/opengl/ogl_spritedevicehelper.cxx |4 -- canvas/source/opengl/ogl_textlayout.cxx |2 - canvas/source/simplecanvas/simplecanvasimpl.cxx |2 - canvas/source/tools/canvascustomspritehelper.cxx |2 - canvas/source/tools/canvastools.cxx |1 canvas/source/tools/elapsedtime.cxx |3 -- canvas/source/tools/parametricpolypolygon.cxx|8 - canvas/source/tools/propertysethelper.cxx|3 +- canvas/source/tools/spriteredrawmanager.cxx |1 canvas/source/tools/surfaceproxy.cxx |2 - canvas/source/tools/verifyinput.cxx | 13 + canvas/source/vcl/bitmapbackbuffer.cxx |1 canvas/source/vcl/cachedbitmap.cxx |3 -- canvas/source/vcl/canvas.cxx | 12 canvas/source/vcl/canvasbitmap.cxx |2 - canvas/source/vcl/canvasbitmaphelper.cxx |9 -- canvas/source/vcl/canvascustomsprite.cxx | 13 - canvas/source/vcl/canvashelper.cxx |5 --- canvas/source/vcl/canvashelper_texturefill.cxx |9 -- canvas/source/vcl/devicehelper.cxx |3 -- canvas/source/vcl/impltools.cxx | 12 canvas/source/vcl/services.cxx | 14 - canvas/source/vcl/spritecanvas.cxx | 12 canvas/source/vcl/spritecanvashelper.cxx |2 - canvas/source/vcl/spritedevicehelper.cxx |8 + canvas/source/vcl/spritehelper.cxx |7 canvas/source/vcl/textlayout.cxx |1 49 files changed, 46 insertions(+), 234 deletions(-) New commits: commit 969b55d8da528ea6295e5e9c56fae595bf3bd4ba Author: Gabor Kelemen AuthorDate: Sat Nov 2 11:49:52 2019 +0100 Commit: Miklos Vajna CommitDate: Wed Nov 6 14:23:21 2019 +0100 tdf#42949 Fix IWYU warnings in canvas/*/*cxx Found with bin/find-unneeded-includes Only removal proposals are dealt with here. Change-Id: Ie1f6fe98f4e8bc792f5eae1ccdd697c997707004 Reviewed-on: https://gerrit.libreoffice.org/81930 Tested-by: Jenkins Reviewed-by: Miklos Vajna diff --git a/canvas/IwyuFilter_canvas.yaml b/canvas/IwyuFilter_canvas.yaml index d00a67dbd3a8..25b2157683a7 100644 --- a/canvas/IwyuFilter_canvas.yaml +++ b/canvas/IwyuFilter_canvas.yaml @@ -1,2 +1,35 @@ --- assumeFilename: canvas/source/cairo/cairo_canvas.cxx +blacklist: +canvas/source/cairo/cairo_cachedbitmap.cxx: +# Actually in use +- com/sun/star/rendering/XCanvas.hpp +canvas/source/cairo/cairo_spritecanvas.cxx: +# Needed for nested name specifier +- com/sun/star/awt/XTopWindow.hpp +# Complete type needed for return type +- basegfx/range/b2irange.hxx +canvas/source/cairo/cairo_spritecanvashelper.cxx: +# Needed for boost/polymorphic_cast.hpp +- boost/cast.hpp +canvas/source/opengl/ogl_canvastools.cxx: +# Actually in use +- com/sun/star/rendering/ARGBColor.hpp +canvas/source/opengl/ogl_spritedevicehelper.cxx: +# Needed for nested name specifier +- com/sun/star/awt/XTopWindow.hpp +canvas/source/opengl/ogl_texturecache.cxx: +# Actually in use +- com/sun/star/geometry/IntegerSize2D.hpp +canvas/source/tools/surface.cxx: +# Actually in use +- comphelper/scopeguard.hxx +canvas/source/vcl/cachedbitmap.cxx: +# Actually in use +- com/sun/star/rendering/XCanvas.hpp +canvas/source/vcl/spritecanvas.cxx: +# Actually in use +- com/sun/star/awt/XTopWindow.hpp +canvas/source/vcl/spr
waterproof laptop backpack for you
Hi,How are you? Hope you are doing well.Just to let you know we have got the following travel backpack in our stock. Ship to wordlwide.This travel backpack for men.With large capacity, anti-thief, USB Charging.Size is 17.3 inch laptop backpack also waterproof. It has oxford material. Price details for different quantity you order,1-50 units 79.50 each50-100 units 75.50 each >=100 units 72.50 each Currentcy is u s dIf yoh would like to order it today, just reply to our email with your shipping address.If yoh would like to order it today, just reply to our email with your shipping address.Thanks,Jeremy Dyson ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - sc/source
sc/source/ui/app/inputhdl.cxx | 13 +++--
sc/source/ui/inc/inputhdl.hxx |5 +
sc/source/ui/inc/output.hxx|2 +-
sc/source/ui/view/output.cxx |6 +-
sc/source/ui/view/tabview3.cxx | 38 +++---
5 files changed, 49 insertions(+), 15 deletions(-)
New commits:
commit 44018db0eefa707e2c56de40f46b7ce42d05172d
Author: Szymon Kłos
AuthorDate: Mon Jun 17 20:13:36 2019 +0200
Commit: Szymon Kłos
CommitDate: Wed Nov 6 13:53:15 2019 +0100
Show highlight ranges when chart is selected
Change-Id: Ibb9a085699065869a7f122f37a36c5873b934271
Reviewed-on: https://gerrit.libreoffice.org/82138
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 4396d3381b0b..1bda18ad5b60 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -430,9 +430,9 @@ handle_r1c1:
}
}
-static ReferenceMark lcl_GetReferenceMark( ScViewData& rViewData, ScDocShell*
pDocSh,
- long nX1, long nX2, long nY1, long
nY2,
- long nTab, const Color& rColor )
+ReferenceMark ScInputHandler::GetReferenceMark( ScViewData& rViewData,
ScDocShell* pDocSh,
+long nX1, long nX2, long nY1, long nY2,
+long nTab, const Color& rColor )
{
ScSplitPos eWhich = rViewData.GetActivePart();
@@ -491,7 +491,7 @@ void ScInputHandler::UpdateLokReferenceMarks()
PutInOrder(nX1, nX2);
PutInOrder(nY1, nY2);
-aReferenceMarks[0] = lcl_GetReferenceMark( rViewData, pDocSh,
+aReferenceMarks[0] = ScInputHandler::GetReferenceMark( rViewData,
pDocSh,
nX1, nX2, nY1, nY2,
nTab, aRefColor );
}
@@ -515,8 +515,9 @@ void ScInputHandler::UpdateLokReferenceMarks()
long nY2 = aRef.aEnd.Row();
long nTab = aRef.aStart.Tab();
-aReferenceMarks[i + nAdditionalMarks] = lcl_GetReferenceMark(
-rViewData, pDocSh, nX1, nX2, nY1, nY2, nTab, rData.nColor );
+aReferenceMarks[i + nAdditionalMarks] =
ScInputHandler::GetReferenceMark( rViewData, pDocSh,
+ nX1,
nX2, nY1, nY2,
+
nTab, Color( rData.nColor ) );
ScInputHandler::SendReferenceMarks( pActiveViewSh, aReferenceMarks
);
}
diff --git a/sc/source/ui/inc/inputhdl.hxx b/sc/source/ui/inc/inputhdl.hxx
index ecb394b5f809..8c31e46c246a 100644
--- a/sc/source/ui/inc/inputhdl.hxx
+++ b/sc/source/ui/inc/inputhdl.hxx
@@ -30,6 +30,7 @@
#include
#include
#include
+#include
#include
#include
@@ -282,6 +283,10 @@ public:
void SetDocumentDisposing( bool b );
static void SetAutoComplete(bool bSet) { bAutoComplete = bSet; }
+
+static ReferenceMark GetReferenceMark( ScViewData& rViewData, ScDocShell*
pDocSh,
+long nX1, long nX2, long nY1, long nY2,
+long nTab, const Color& rColor );
};
// ScInputHdlState
diff --git a/sc/source/ui/inc/output.hxx b/sc/source/ui/inc/output.hxx
index fed50cb1916d..128b61fe4439 100644
--- a/sc/source/ui/inc/output.hxx
+++ b/sc/source/ui/inc/output.hxx
@@ -369,7 +369,7 @@ public:
voidFindChanged();
voidSetPagebreakMode( ScPageBreakData* pPageData );
/// Draws reference mark and returns its properties
-ReferenceMark DrawRefMark( SCCOL nRefStartX, SCROW nRefStartY,
+voidDrawRefMark( SCCOL nRefStartX, SCROW nRefStartY,
SCCOL nRefEndX, SCROW nRefEndY,
const Color& rColor, bool bHandle );
ReferenceMark FillReferenceMark( SCCOL nRefStartX, SCROW nRefStartY,
diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx
index 536be2f2c2c1..54e2dfa7613c 100644
--- a/sc/source/ui/view/output.cxx
+++ b/sc/source/ui/view/output.cxx
@@ -1943,12 +1943,10 @@ ReferenceMark ScOutputData::FillReferenceMark( SCCOL
nRefStartX, SCROW nRefStart
return aResult;
}
-ReferenceMark ScOutputData::DrawRefMark( SCCOL nRefStartX, SCROW nRefStartY,
+void ScOutputData::DrawRefMark( SCCOL nRefStartX, SCROW nRefStartY,
SCCOL nRefEndX, SCROW nRefEndY,
const Color& rColor, bool bHandle )
{
-ReferenceMark aResult;
-
PutInOrder( nRefStartX, nRefEndX );
PutInOrder( nRefStartY, nRefEndY );
@@ -2071,8 +2069,6 @@ ReferenceMark ScOutputData::DrawRefMark( SCCOL
nRefStartX, SCROW nRefStartY,
}
}
}
-
-return aResult;
}
void ScOutputData::DrawOneChange( SCCOL nRefStartX, SCROW nRefStartY,
diff --git
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/SwXMLSectionList.hxx | 11 +--
sw/source/core/swg/SwXMLSectionList.cxx | 100 +---
sw/source/filter/xml/swxml.cxx |8 +-
3 files changed, 50 insertions(+), 69 deletions(-)
New commits:
commit 2b77d9dba51e1c3841428f3343e9186ca9c446ae
Author: Noel Grandin
AuthorDate: Wed Nov 6 11:19:12 2019 +0200
Commit: Noel Grandin
CommitDate: Wed Nov 6 13:38:29 2019 +0100
convert SwXMLSectionList to FastParser
Change-Id: I6bffd6891a4a90f986513a5385ef30c38f1a48c4
Reviewed-on: https://gerrit.libreoffice.org/82127
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sw/inc/SwXMLSectionList.hxx b/sw/inc/SwXMLSectionList.hxx
index af8c8cb20831..99255b85df6c 100644
--- a/sw/inc/SwXMLSectionList.hxx
+++ b/sw/inc/SwXMLSectionList.hxx
@@ -23,10 +23,6 @@
class SwXMLSectionList final : public SvXMLImport
{
-virtual SvXMLImportContext *CreateDocumentContext( sal_uInt16 nPrefix,
- const OUString& rLocalName,
- const css::uno::Reference< css::xml::sax::XAttributeList > &
xAttrList ) override;
-
public:
std::vector & m_rSectionList;
@@ -34,8 +30,11 @@ public:
const css::uno::Reference< css::uno::XComponentContext >& rContext,
std::vector & rNewSectionList);
-virtual ~SwXMLSectionList ( )
-throw() override;
+virtual ~SwXMLSectionList ( ) throw() override;
+
+private:
+virtual SvXMLImportContext *CreateFastContext( sal_Int32 Element,
+const css::uno::Reference< css::xml::sax::XFastAttributeList > &
xAttrList ) override;
};
#endif
diff --git a/sw/source/core/swg/SwXMLSectionList.cxx
b/sw/source/core/swg/SwXMLSectionList.cxx
index 1ac8c1d083f1..1940ebfea478 100644
--- a/sw/source/core/swg/SwXMLSectionList.cxx
+++ b/sw/source/core/swg/SwXMLSectionList.cxx
@@ -32,13 +32,11 @@ private:
SwXMLSectionList & m_rImport;
public:
-SvXMLSectionListContext(SwXMLSectionList& rImport,
- sal_uInt16 nPrefix,
- const OUString& rLocalName,
- const uno::Reference & xAttrList);
-virtual SvXMLImportContextRef CreateChildContext(sal_uInt16 nPrefix,
- const OUString& rLocalName,
- const uno::Reference & xAttrList)
override;
+SvXMLSectionListContext(SwXMLSectionList& rImport);
+
+virtual css::uno::Reference SAL_CALL
createFastChildContext(
+sal_Int32 Element,
+const css::uno::Reference< css::xml::sax::XFastAttributeList > &
xAttrList ) override;
};
class SwXMLParentContext : public SvXMLImportContext
@@ -47,43 +45,37 @@ private:
SwXMLSectionList & m_rImport;
public:
-SwXMLParentContext(SwXMLSectionList& rImport,
- sal_uInt16 nPrefix,
- const OUString& rLocalName)
-: SvXMLImportContext(rImport, nPrefix, rLocalName)
+SwXMLParentContext(SwXMLSectionList& rImport)
+: SvXMLImportContext(rImport)
, m_rImport(rImport)
{
}
-virtual SvXMLImportContextRef CreateChildContext(sal_uInt16 nPrefix,
- const OUString& rLocalName,
- const uno::Reference & xAttrList) override
+virtual css::uno::Reference SAL_CALL
createFastChildContext(
+sal_Int32 Element, const css::uno::Reference<
css::xml::sax::XFastAttributeList > & /*xAttrList*/ ) override
{
-if ((nPrefix == XML_NAMESPACE_OFFICE && IsXMLToken(rLocalName,
XML_BODY)) ||
-(nPrefix == XML_NAMESPACE_TEXT &&
-( IsXMLToken(rLocalName, XML_P)
- || IsXMLToken(rLocalName, XML_H)
- || IsXMLToken(rLocalName, XML_A)
- || IsXMLToken(rLocalName, XML_SPAN)
- || IsXMLToken(rLocalName, XML_SECTION)
- || IsXMLToken(rLocalName, XML_INDEX_BODY)
- || IsXMLToken(rLocalName, XML_INDEX_TITLE)
- || IsXMLToken(rLocalName, XML_INSERTION)
- || IsXMLToken(rLocalName, XML_DELETION
+if (Element == XML_ELEMENT(OFFICE, XML_BODY) ||
+Element == XML_ELEMENT(TEXT, XML_P) ||
+Element == XML_ELEMENT(TEXT, XML_H) ||
+Element == XML_ELEMENT(TEXT, XML_A) ||
+Element == XML_ELEMENT(TEXT, XML_SPAN) ||
+Element == XML_ELEMENT(TEXT, XML_SECTION) ||
+Element == XML_ELEMENT(TEXT, XML_INDEX_BODY) ||
+Element == XML_ELEMENT(TEXT, XML_INDEX_TITLE) ||
+Element == XML_ELEMENT(TEXT, XML_INSERTION) ||
+Element == XML_ELEMENT(TEXT, XML_DELETION))
{
-return new SvXMLSectionListContext(m_rImport, nPrefix, rLocalName,
xAttrList);
+return new SvXMLSectionListContext(m_rImport);
}
else
{
-return new SwXMLParentContext(m_rImport, nPrefix, rLocalName);
+return new SwXMLParentContext(m_rImport);
}
}
};
-SwXMLSectionList::SwXMLSectionList(
-const uno::Reference< uno::XComponentContext >
[Libreoffice-commits] core.git: vcl/Library_vcl.mk
vcl/Library_vcl.mk |7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) New commits: commit 5e73b07c36ec1e40337075b93207c438d49ca565 Author: Rene Engelhard AuthorDate: Wed Nov 6 07:15:51 2019 +0100 Commit: Rene Engelhard CommitDate: Wed Nov 6 13:31:58 2019 +0100 fix --disable-gui build on 32bit (missing -ldl) Change-Id: I66cd04efe5486459d9cc777a532925d25fbd1e86 Reviewed-on: https://gerrit.libreoffice.org/82118 Tested-by: Jenkins Reviewed-by: Rene Engelhard Tested-by: Rene Engelhard diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 00b98cdb2929..38bce206f72f 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -543,6 +543,12 @@ $(eval $(call gb_Library_use_externals,vcl,\ )) endif +ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS))) +$(eval $(call gb_Library_add_libs,vcl,\ +-lm $(DLOPEN_LIBS) \ +)) +endif + ifeq ($(DISABLE_GUI),TRUE) $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/unx/generic/printer/jobdata \ @@ -585,7 +591,6 @@ endif ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS))) $(eval $(call gb_Library_add_libs,vcl,\ --lm $(DLOPEN_LIBS) \ -lX11 \ -lXext \ )) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk3/gtk3gtkinst.cxx | 11 ---
1 file changed, 8 insertions(+), 3 deletions(-)
New commits:
commit f7bc0204a80a4f078c63f93b9892904686ad5b36
Author: Caolán McNamara
AuthorDate: Wed Nov 6 10:50:36 2019 +
Commit: Caolán McNamara
CommitDate: Wed Nov 6 13:09:48 2019 +0100
erase matching container if notebook page removed
Change-Id: I15c1bb40f301684e58adcf7d366d7fa1bd171b04
Reviewed-on: https://gerrit.libreoffice.org/82136
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 584ffe3266c0..d67eb85a4d5e 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -5366,11 +5366,13 @@ private:
return -1;
}
-void remove_page(GtkNotebook *pNotebook, const OString& rIdent)
+int remove_page(GtkNotebook *pNotebook, const OString& rIdent)
{
disable_notify_events();
-gtk_notebook_remove_page(pNotebook, get_page_number(pNotebook,
rIdent));
+int nPageNumber = get_page_number(pNotebook, rIdent);
+gtk_notebook_remove_page(pNotebook, nPageNumber);
enable_notify_events();
+return nPageNumber;
}
static OUString get_tab_label_text(GtkNotebook *pNotebook, guint nPage)
@@ -5874,7 +5876,10 @@ public:
unsplit_notebooks();
reset_split_data();
}
-remove_page(m_pNotebook, rIdent);
+
+unsigned int nPageIndex = remove_page(m_pNotebook, rIdent);
+if (nPageIndex < m_aPages.size())
+m_aPages.erase(m_aPages.begin() + nPageIndex);
}
virtual void append_page(const OString& rIdent, const OUString& rLabel)
override
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk3/gtk3gtksalmenu.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit dcd12b88ecb04766850159043b304cdf965924c1
Author: Caolán McNamara
AuthorDate: Wed Nov 6 10:32:15 2019 +
Commit: Caolán McNamara
CommitDate: Wed Nov 6 13:09:32 2019 +0100
set mpCloseButton to null after it is destroyed
Change-Id: If1a0bec30d2bcfdf6846712a67efbe2dcfbbec5c
Reviewed-on: https://gerrit.libreoffice.org/82133
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/vcl/unx/gtk3/gtk3gtksalmenu.cxx b/vcl/unx/gtk3/gtk3gtksalmenu.cxx
index 6602534f5882..301322d8c78d 100644
--- a/vcl/unx/gtk3/gtk3gtksalmenu.cxx
+++ b/vcl/unx/gtk3/gtk3gtksalmenu.cxx
@@ -641,7 +641,10 @@ void GtkSalMenu::ShowCloseButton(bool bShow)
if (!bShow)
{
if (mpCloseButton)
+{
gtk_widget_destroy(mpCloseButton);
+mpCloseButton = nullptr;
+}
return;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx sw/source
include/svx/itemwin.hxx|2 +-
sw/source/core/inc/bodyfrm.hxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 51bf5d51405285e0bcac40b16e6cd684e4ae6899
Author: Noel Grandin
AuthorDate: Wed Nov 6 12:48:40 2019 +0200
Commit: Noel Grandin
CommitDate: Wed Nov 6 12:59:52 2019 +0100
revert some module-private changes
see comments at
https://gerrit.libreoffice.org/#/c/82062
Change-Id: Ie128f2de770ca7c3156f63c6d4e981575a580668
Reviewed-on: https://gerrit.libreoffice.org/82135
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/svx/itemwin.hxx b/include/svx/itemwin.hxx
index 9701dd3328ab..dc8b8682a98c 100644
--- a/include/svx/itemwin.hxx
+++ b/include/svx/itemwin.hxx
@@ -84,7 +84,7 @@ public:
voidRefreshDlgUnit();
};
-class SAL_DLLPUBLIC_RTTI SvxFillTypeBox final : public FillTypeLB
+class SVX_DLLPUBLIC SvxFillTypeBox final : public FillTypeLB
{
public:
SvxFillTypeBox( vcl::Window* pParent );
diff --git a/sw/source/core/inc/bodyfrm.hxx b/sw/source/core/inc/bodyfrm.hxx
index 5bd046ec4e42..f6b046e9dd32 100644
--- a/sw/source/core/inc/bodyfrm.hxx
+++ b/sw/source/core/inc/bodyfrm.hxx
@@ -25,7 +25,7 @@ class SwBorderAttrs;
/// Container of body content (i.e. not header or footer). Typical parent is an
/// SwPageFrame, typical lower is an SwTextFrame.
-class SwBodyFrame: public SwLayoutFrame
+class SAL_DLLPUBLIC_RTTI SwBodyFrame: public SwLayoutFrame
{
protected:
virtual void Format( vcl::RenderContext* pRenderContext, const
SwBorderAttrs *pAttrs = nullptr ) override;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/ooxmlexport/data/tdf121661.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport14.cxx |8
2 files changed, 8 insertions(+)
New commits:
commit 47ce1d70a287c2e652603ba6810a6bb6745338bf
Author: Samuel Mehrbrodt
AuthorDate: Wed Nov 6 10:56:08 2019 +0100
Commit: Samuel Mehrbrodt
CommitDate: Wed Nov 6 12:47:06 2019 +0100
tdf#121661 Add test
Change-Id: I0da9ab59bbfdb5d7dfb717ac2bcff3ac74686907
Reviewed-on: https://gerrit.libreoffice.org/82130
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/sw/qa/extras/ooxmlexport/data/tdf121661.docx
b/sw/qa/extras/ooxmlexport/data/tdf121661.docx
new file mode 100644
index ..dfd2f291e339
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf121661.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
index 93d896837a36..c7f022d68311 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
@@ -100,6 +100,14 @@ DECLARE_OOXMLIMPORT_TEST(testTdf125038c, "tdf125038c.docx")
CPPUNIT_ASSERT_EQUAL(OUString("email: t...@test.test"), aActual);
}
+DECLARE_OOXMLEXPORT_TEST(testTdf121661, "tdf121661.docx")
+{
+xmlDocPtr pXmlSettings = parseExport("word/settings.xml");
+if (!pXmlSettings)
+return;
+assertXPath(pXmlSettings, "/w:settings/w:hyphenationZone", "val", "851");
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/xmloff sw/source xmloff/source
include/xmloff/xmlnumi.hxx |6 +
include/xmloff/xmlstyle.hxx|6 +
sw/source/uibase/config/StoredChapterNumbering.cxx | 88 -
xmloff/source/style/xmlnumi.cxx| 10 ++
xmloff/source/style/xmlstyle.cxx | 14 +++
5 files changed, 71 insertions(+), 53 deletions(-)
New commits:
commit 83e97fef3fa4de900eda35d02168fcae01c85eed
Author: Noel Grandin
AuthorDate: Wed Nov 6 12:32:45 2019 +0200
Commit: Noel Grandin
CommitDate: Wed Nov 6 12:35:29 2019 +0100
convert ImportStoredChapterNumberingRules to XFastParser
Change-Id: I80ceed4bf2e767b86aedd1dd7bf4f892e3077138
Reviewed-on: https://gerrit.libreoffice.org/82132
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/xmloff/xmlnumi.hxx b/include/xmloff/xmlnumi.hxx
index 8a3d08681096..654583a37563 100644
--- a/include/xmloff/xmlnumi.hxx
+++ b/include/xmloff/xmlnumi.hxx
@@ -57,6 +57,12 @@ public:
const css::uno::Reference< css::xml::sax::XAttributeList >&
xAttrList,
bool bOutl = false );
+SvxXMLListStyleContext(
+SvXMLImport& rImport,
+sal_Int32 nElement,
+const css::uno::Reference< css::xml::sax::XFastAttributeList > &
xAttrList,
+bool bOutl = false );
+
~SvxXMLListStyleContext() override;
virtual SvXMLImportContextRef CreateChildContext(
diff --git a/include/xmloff/xmlstyle.hxx b/include/xmloff/xmlstyle.hxx
index 0d7b5cfe1590..bf0e77098ced 100644
--- a/include/xmloff/xmlstyle.hxx
+++ b/include/xmloff/xmlstyle.hxx
@@ -91,6 +91,12 @@ public:
sal_uInt16 nFamily=0,
bool bDefaultStyle = false );
+SvXMLStyleContext( SvXMLImport& rImport,
+sal_Int32 nElement,
+const css::uno::Reference< css::xml::sax::XFastAttributeList > &
xAttrList,
+sal_uInt16 nFamily=0,
+bool bDefaultStyle = false );
+
virtual ~SvXMLStyleContext() override;
virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
diff --git a/sw/source/uibase/config/StoredChapterNumbering.cxx
b/sw/source/uibase/config/StoredChapterNumbering.cxx
index 2416195fb899..1a1e2cf8553c 100644
--- a/sw/source/uibase/config/StoredChapterNumbering.cxx
+++ b/sw/source/uibase/config/StoredChapterNumbering.cxx
@@ -16,7 +16,7 @@
#include
#include
#include
-#include
+#include
#include
#include
@@ -271,39 +271,27 @@ class StoredChapterNumberingDummyStyleContext
public:
StoredChapterNumberingDummyStyleContext(
SvXMLImport & rImport,
-sal_uInt16 const nPrefix, OUString const& rLocalName,
-uno::Reference const& xAttrList)
-: SvXMLImportContext(rImport, nPrefix, rLocalName)
+uno::Reference const& xAttrList)
+: SvXMLImportContext(rImport)
{
OUString name;
OUString displayName;
sal_uInt16 nFamily(0);
-for (sal_Int32 i = 0; i < xAttrList->getLength(); ++i)
-{
-OUString localName;
-sal_uInt16 const prefix(rImport.GetNamespaceMap().GetKeyByAttrName(
-xAttrList->getNameByIndex(i), &localName));
-OUString const& rValue = xAttrList->getValueByIndex(i);
-if (XML_NAMESPACE_STYLE == prefix)
+sax_fastparser::FastAttributeList *pAttribList =
+sax_fastparser::FastAttributeList::castToFastAttributeList(
xAttrList );
+
+for (auto &aIter : *pAttribList)
+if (aIter.getToken() == (XML_NAMESPACE_STYLE | XML_FAMILY))
{
-if (IsXMLToken(localName, XML_FAMILY))
-{
-if (IsXMLToken(rValue, XML_TEXT))
-{
-nFamily = XML_STYLE_FAMILY_TEXT_TEXT;
-}
-}
-else if (IsXMLToken(localName, XML_NAME))
-{
-name = rValue;
-}
-else if (IsXMLToken(localName, XML_DISPLAY_NAME))
-{
-displayName = rValue;
-}
+if (IsXMLToken(aIter.toString(), XML_TEXT))
+nFamily = XML_STYLE_FAMILY_TEXT_TEXT;
+else if (IsXMLToken(aIter.toString(), XML_NAME))
+name = aIter.toString();
+else if (IsXMLToken(aIter.toString(), XML_DISPLAY_NAME))
+displayName = aIter.toString();
}
-}
+
if (nFamily && !name.isEmpty() && !displayName.isEmpty())
{
rImport.AddStyleDisplayName(nFamily, name, displayName);
@@ -323,15 +311,14 @@ private:
public:
StoredChapterNumberingRootContext(
-SwChapterNumRules & rNumRules, SvXMLImport & rImport,
-sal_uInt16 const nPrefix, OUString const& rLocalName)
-: SvXMLImportContext(rImport, nPrefix, rLocalName)
+
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/shells/basesh.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit cb1183510c605a5d63fdc9fec6735ac5e8db92ce
Author: Szymon Kłos
AuthorDate: Wed Nov 6 10:39:16 2019 +0100
Commit: Szymon Kłos
CommitDate: Wed Nov 6 11:57:35 2019 +0100
tdf#128593 fix crash on setting table background color
Change-Id: I9596cd9817d63590f07ffd2068e79b2df5806aeb
Reviewed-on: https://gerrit.libreoffice.org/82128
Tested-by: Jenkins
Reviewed-by: Szymon Kłos
diff --git a/sw/source/uibase/shells/basesh.cxx
b/sw/source/uibase/shells/basesh.cxx
index bb9f4a975297..e65149b15995 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -2345,7 +2345,7 @@ void SwBaseShell::ExecBckCol(SfxRequest& rReq)
aBrushItem->SetGraphicPos(GPOS_NONE);
-sal_uInt16 nSlotId = SID_BACKGROUND_COLOR ? SID_BACKGROUND_COLOR :
SID_TABLE_CELL_BACKGROUND_COLOR;
+sal_uInt16 nSlotId = (nSlot == SID_BACKGROUND_COLOR) ?
SID_BACKGROUND_COLOR : SID_TABLE_CELL_BACKGROUND_COLOR;
if (pArgs && SfxItemState::SET ==
pArgs->GetItemState(SID_ATTR_COLOR_STR, false, &pColorStringItem))
{
OUString sColor = static_cast(pColorStringItem)->GetValue();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: AtomicCounter::is_always_lock_free on armel
On 06/11/2019 10:47, rene.engelh...@mailbox.org wrote: Am 6. November 2019 09:26:53 MEZ schrieb Stephan Bergmann : , you could add an appropriate #if/else (with a useful comment) around the definition of AtomicCounter and the accompanying static_assert. Can do, yes, although I would like it more if it was fine upstream... That's what I meant, provide an upstream commit. (And address any resulting -Wvolatile on armel as appropriate for your needs.) As it (is it?) only a warning one can also just ignore it ;-) Yes, that's likely all you need to do to address it appropriately for your needs. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: AtomicCounter::is_always_lock_free on armel
Hi, Am 6. November 2019 09:26:53 MEZ schrieb Stephan Bergmann : >don't make things worse than they originally were if we fall back to >that type again on armel. So if the original code happened to work >well >enough on armel in practice It built. No more data ;-) , you could add an appropriate #if/else >(with >a useful comment) around the definition of AtomicCounter and the >accompanying static_assert. Can do, yes, although I would like it more if it was fine upstream... > (And address any resulting -Wvolatile on >armel as appropriate for your needs.) As it (is it?) only a warning one can also just ignore it ;-) Regards Rene -- Diese Nachricht wurde von meinem Android-Gerät mit K-9 Mail gesendet. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/editeng include/o3tl
include/editeng/outlobj.hxx |2 ++
include/o3tl/cow_wrapper.hxx | 13 +
2 files changed, 15 insertions(+)
New commits:
commit 8cdf166552aea7cb3dbdc183b76b5457c6651cf7
Author: Caolán McNamara
AuthorDate: Wed Nov 6 09:51:48 2019 +
Commit: Caolán McNamara
CommitDate: Wed Nov 6 11:44:46 2019 +0100
ofz#12553 Timeout
before:
real1m37.479s
user1m30.682s
sys 0m0.261s
after:
real0m44.166s
user0m44.010s
sys 0m0.056s
Change-Id: I9832a2aac0278120fb62fe4a6a3e4507fc80e36f
Reviewed-on: https://gerrit.libreoffice.org/82129
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/include/editeng/outlobj.hxx b/include/editeng/outlobj.hxx
index 364ec740b57f..a28e255634e5 100644
--- a/include/editeng/outlobj.hxx
+++ b/include/editeng/outlobj.hxx
@@ -47,6 +47,8 @@ struct OutlinerParaObjData
OutlinerParaObjData( const OutlinerParaObjData& r );
+OutlinerParaObjData( OutlinerParaObjData&& r ) = default;
+
// assignment operator
OutlinerParaObjData& operator=(const OutlinerParaObjData& rCandidate) =
delete;
diff --git a/include/o3tl/cow_wrapper.hxx b/include/o3tl/cow_wrapper.hxx
index 2fa7f03f276f..b9c463b852e4 100644
--- a/include/o3tl/cow_wrapper.hxx
+++ b/include/o3tl/cow_wrapper.hxx
@@ -194,6 +194,12 @@ int cow_wrapper_client::queryUnmodified() const
{
}
+explicit impl_t( T&& v ) :
+m_value(std::move(v)),
+m_ref_count(1)
+{
+}
+
T m_value;
typename MTPolicy::ref_count_t m_ref_count;
};
@@ -227,6 +233,13 @@ int cow_wrapper_client::queryUnmodified() const
{
}
+/** Move-construct wrapped type instance from given object
+ */
+explicit cow_wrapper( value_type&& r ) :
+m_pimpl( new impl_t(std::move(r)) )
+{
+}
+
/** Shallow-copy given cow_wrapper
*/
explicit cow_wrapper( const cow_wrapper& rSrc ) : // nothrow
___
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/tdf99602_charStyleSubscript.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport13.cxx | 11
writerfilter/source/dmapper/DomainMapper.cxx | 25
--
3 files changed, 33 insertions(+), 3 deletions(-)
New commits:
commit d71cf6390a89ea6a4fab724e3a7996f28ca33661
Author: Justin Luth
AuthorDate: Fri Oct 4 15:20:26 2019 +0300
Commit: Miklos Vajna
CommitDate: Wed Nov 6 11:30:28 2019 +0100
tdf#99602 writerfilter: import subscript into character style
and superscripts (aka escapements, but who knows that term).
This isn't perfect, but I just fixed about 4 subscript bugs
under much simpler conditions. Doing this completely
compatibly with MS Word would be several magnitudes of
order more difficult, since WORD works in absolute amounts
(much easier to deal with) and LO works in relative percentages.
Normally, the default auto settings make subscripts look the best
anyway, so this should be a pretty good solution.
Change-Id: Iefdc8ad55988d96ddbbba4701795a4f7a61b1521
Reviewed-on: https://gerrit.libreoffice.org/80219
Tested-by: Jenkins
Reviewed-by: Justin Luth
Reviewed-by: Miklos Vajna
diff --git a/sw/qa/extras/ooxmlexport/data/tdf99602_charStyleSubscript.docx
b/sw/qa/extras/ooxmlexport/data/tdf99602_charStyleSubscript.docx
new file mode 100644
index ..a88c122eeba3
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/tdf99602_charStyleSubscript.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
index 5d483792f83c..0be5f82136ed 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
@@ -14,6 +14,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -244,6 +245,16 @@
DECLARE_OOXMLEXPORT_TEST(testTdf99602_subscript_charStyleSize, "tdf99602_subscri
CPPUNIT_ASSERT_DOUBLES_EQUAL( -25.f, getProperty(getRun(xPara, 2,
"Subscript"), "CharEscapement"), 0);
}
+DECLARE_OOXMLEXPORT_TEST(testTdf99602_charStyleSubscript,
"tdf99602_charStyleSubscript.docx")
+{
+uno::Reference xPara = getParagraph(1);
+// The word "Base" should not be subscripted.
+CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.f, getProperty(getRun(xPara, 1,
"Base"), "CharEscapement"), 0);
+// The word "Subscript" should be 48pt, automatically subscripted, and
automatic propertioned.
+CPPUNIT_ASSERT_EQUAL( sal_Int16(DFLT_ESC_AUTO_SUB),
getProperty(getRun(xPara, 2, "Subscript"), "CharEscapement") );
+CPPUNIT_ASSERT_EQUAL( sal_Int16(DFLT_ESC_PROP),
getProperty(getRun(xPara, 2), "CharEscapementHeight") );
+}
+
DECLARE_OOXMLEXPORT_TEST(testTdf124637_sectionMargin,
"tdf124637_sectionMargin.docx")
{
uno::Reference
xTextSectionsSupplier(mxComponent, uno::UNO_QUERY);
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index c44dcefb0abd..37bb2fb4f5eb 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1711,9 +1711,28 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const
PropertyMapPtr& rContext )
break;
case NS_ooxml::LN_EG_RPrBase_position:
// The spec says 0 is the same as the lack of the value, so don't
parse that.
-// FIXME: StyleSheets don't currently process
deferredCharacterProperties - so position is lost in charStyles
-if ( nIntValue && !IsStyleSheetImport() )
-m_pImpl->deferCharacterProperty( nSprmId, uno::makeAny( nIntValue
));
+if ( nIntValue )
+{
+if ( !IsStyleSheetImport() )
+m_pImpl->deferCharacterProperty( nSprmId, uno::makeAny(
nIntValue ));
+else
+{
+// DON'T FIXME: Truly calculating this for Character Styles
will be tricky,
+// because it depends on the final fontsize - regardless of
+// where it is set. So at the style level,
+// the escapement value would need to be grabbagged.
+// At appendText time the final fontsize needs to be
determined, and then
+// the escapement can be calculated from the grabbag'd
half-point value
+// and directly applied. Yuck.
+// It seems best to just treat charstyle escapement like
+// pre-commit e70df84352d3670508a4666c97df44f82c1ce934
+// which just assigned default values and ignored the
actual/given escapement.
+sal_Int16 nEscapement = nIntValue > 0 ? DFLT_ESC_AUTO_SUPER :
DFLT_ESC_AUTO_SUB;
+sal_Int8 nProp = DFLT_ESC_PROP;
+rContext->Insert(PROP_CHAR_ESCAPEMENT, uno::makeAny(
nEscapement ) );
+rContext->Insert(PROP_CHAR_ESCAPEMENT_HEIGHT, uno::makeAny(
nProp ) );
+}
+}
Re: Building libreoffice online on CENTOS 7
Hi, I give more information about my installation : *- I work on a VmWare installation of CentOS 7 :* [root@localhost ~]# cat /etc/redhat-release CentOS Linux release 7.7.1908 (Core) yum update yum install yum-utils yum-builddep libreoffice yum install ipa-gothic-fonts ipa-mincho-fonts ipa-pgothic-fonts ipa-pmincho-fonts *- Building of Libreoffice core :* *Libreoffice core require GCC 7.0.0 :* yum install centos-release-scl yum install devtoolset-7 scl enable devtoolset-7 bash *Libreoffice core require gperf 3.1 :* wget http://ftp.gnu.org/pub/gnu/gperf/gperf-3.1.tar.gz tar xzvf gperf-3.1.tar.gz cd gperf-3.1/ ./configure --prefix=/usr --docdir=/usr/share/doc/gperf-3.1 make make install * Libreoffice core require flex :* wget https://github.com/westes/flex/archive/v2.6.4.tar.gz tar xvzf v2.6.4.tar.gz cd flex-2.6.4/ yum install texinfo yum install gettext-devel yum install help2man ./autogen.sh ./configure --prefix=/usr --disable-static --docdir=/usr/share/doc/flex-2.6.4 make make check make install git clone -b master --single-branch https://github.com/LibreOffice/core.git cd core ./autogen.sh -with-lang="fr" make => create an other account, make in root trigger an error My libreoffice core building version seems to work. ( Test with Xming ) * - Build of POCO : * yum install mysql yum install mysql-devel yum install epel-release yum repolist all yum install unixODBC-devel yum install libiodbc libiodbc-devel mysql-connector-odbc poco-odbc root-sql-odbc yum install libtool-ltdl-devel wget https://pocoproject.org/releases/poco-1.9.4/poco-1.9.4-all.tar.gz tar xzvf poco-1.9.4-all.tar.gz chown -R root:root poco-1.9.4-all cd poco-1.9.4-all/ ./configure --prefix=/opt/poco make make install * - Installation de NPM* yum install npm npm i -g n n latest npm update -g npm npm install -g jake *- Installation de Polib* yum install python-pip pip install --upgrade pip pip install polib *Building of libreoffice online :* yum install libcap-devel yum install python36-pip pip3 install lxml git clone https://github.com/LibreOffice/online.git cd online/ ./autogen.sh ./configure --enable-silent-rules --with-lokit-path=/opt/core/include/ --with-lo-path=/opt/core/instdir/ --with-poco-includes=/opt/poco/include --with-poco-libs=/opt/poco/lib/ --enable-debug --with-max-connections=200 --with-max-documents=100 make And I get the error message : Checking for loleaflet JS errors... Checking for admin JS errors... make[3]: *** Aucune règle pour fabriquer la cible « dist/node_modules/@braintree/sanitize-url/dist.js », nécessaire pour « dist/bundle.js ». Arrêt. make[3] : on quitte le répertoire « /opt/online/loleaflet » make[2]: *** [all-local] Erreur 2 make[2] : on quitte le répertoire « /opt/online/loleaflet » make[1]: *** [all-recursive] Erreur 1 make[1] : on quitte le répertoire « /opt/online » make: *** [all] Erreur 2 There is certainly something i'm missing in my check list for Libreoffice Online. Is there an official documentation for different step of installation? On git https://github.com/LibreOffice/online, I read the README especially : It is recommended to read these files: wsd/README loleaflet/README I try to build loleaflet like mention in README and get this : [root@localhost loleaflet]# make Makefile:598: AVERTISSEMENT : surchargement de la recette pour la cible « dist/vex.css » Makefile:598: AVERTISSEMENT : ancienne recette ignorée pour la cible « dist/vex.css » /opt/online/scripts/unocommands.py --check /opt/online make[1] : on entre dans le répertoire « /opt/online/loleaflet » Makefile:598: AVERTISSEMENT : surchargement de la recette pour la cible « dist/vex.css » Makefile:598: AVERTISSEMENT : ancienne recette ignorée pour la cible « dist/vex.css » make[1]: « node_modules » est à jour. make[1] : on quitte le répertoire « /opt/online/loleaflet » make[1] : on entre dans le répertoire « /opt/online/loleaflet » Makefile:598: AVERTISSEMENT : surchargement de la recette pour la cible « dist/vex.css » Makefile:598: AVERTISSEMENT : ancienne recette ignorée pour la cible « dist/vex.css » make[1]: *** Aucune règle pour fabriquer la cible « dist/node_modules/@braintree/sanitize-url/dist.js », nécessaire pour « dist/bundle.js ». Arrêt. make[1] : on quitte le répertoire « /opt/online/loleaflet » make: *** [all-local] Erreur 2 I think I miss something in npm installation and/or configuration. cordialy -- 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
Re: Problems with SetSnapRect() for rotated and/or sheared custom shapes
Hi Regina, sorry for being late to the discussion - your assessment wrt. snap rects is correct from what I recall. Regina Henschel wrote: > So my suggestion would be now, to keep SdrObjCustomShape::SetSnapRect() to > use the passed rectangle as logical rectangle and change all callers so, > that they pass a suitable rectangle. > Sounds like the least-worst solution. Custom shapes sadly are a bit of a hack anyway, I know Armin had some plans to convert them into primitives (instead of being composed of draw shapes). That would make bound rect calculations a lot easier... Cheers, -- Thorsten signature.asc Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: chart2/source compilerplugins/clang dbaccess/source drawinglayer/source framework/source include/drawinglayer sc/source sdext/source sd/qa sd/source svx/source sw/sourc
chart2/source/view/charttypes/AreaChart.cxx |2 --
chart2/source/view/main/ChartView.cxx |2 --
compilerplugins/clang/unusedvariablecheck.cxx | 16 +++-
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx |2 --
drawinglayer/source/dumper/XShapeDumper.cxx |6 --
framework/source/uielement/menubarmanager.cxx |1 -
include/drawinglayer/XShapeDumper.hxx |6 ++
sc/source/core/data/funcdesc.cxx | 11 +++
sc/source/filter/oox/sheetdatabuffer.cxx |1 -
sc/source/filter/qpro/qproform.cxx|2 +-
sc/source/ui/vba/vbapagesetup.cxx |1 -
sc/source/ui/view/dbfunc3.cxx |1 -
sd/qa/unit/sdmodeltestbase.hxx|1 -
sd/source/core/drawdoc4.cxx |2 --
sdext/source/pdfimport/filterdet.cxx |1 -
sdext/source/pdfimport/inc/pdfparse.hxx |5 ++---
sdext/source/pdfimport/test/pdfunzip.cxx |2 --
sdext/source/pdfimport/wrapper/wrapper.cxx|1 -
svx/source/sidebar/PanelFactory.cxx |3 ---
svx/source/svdraw/gradtrns.hxx|5 ++---
svx/source/svdraw/svdhdl.cxx |1 -
svx/source/svdraw/svdmrkv.cxx |2 --
svx/source/svdraw/svdoedge.cxx|1 -
sw/source/uibase/shells/frmsh.cxx |1 -
sw/source/uibase/uiview/srcview.cxx |1 -
uui/source/iahndl-ssl.cxx |1 -
vcl/source/bitmap/bitmappaint.cxx |2 --
vcl/source/gdi/dibtools.cxx |1 -
28 files changed, 25 insertions(+), 56 deletions(-)
New commits:
commit 9e087d4a3011aa98de6151aeda9cbb40b1fd21ef
Author: Noel Grandin
AuthorDate: Wed Nov 6 09:04:58 2019 +0200
Commit: Noel Grandin
CommitDate: Wed Nov 6 10:47:15 2019 +0100
loplugin:unusedvariablecheck tweak to find more stuff
but leave the tweak commented out, since it generates false positives
Change-Id: Iaf3f92414d2618f8780561f98765e33e282afe0c
Reviewed-on: https://gerrit.libreoffice.org/82121
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/chart2/source/view/charttypes/AreaChart.cxx
b/chart2/source/view/charttypes/AreaChart.cxx
index 6ecfdad8..e9c54add6c0f 100644
--- a/chart2/source/view/charttypes/AreaChart.cxx
+++ b/chart2/source/view/charttypes/AreaChart.cxx
@@ -421,8 +421,6 @@ bool AreaChart::impl_createLine( VDataSeries* pSeries
aPoint2.PositionY = aPoly.SequenceY[nPoly][nPoint];
aPoint2.PositionZ = aPoly.SequenceZ[nPoly][nPoint];
-Stripe aStripe( aPoint1, aPoint2, fDepth );
-
m_pShapeFactory->createStripe(xSeriesGroupShape_Shapes
, Stripe( aPoint1, aPoint2, fDepth )
, pSeries->getPropertiesOfSeries(),
PropertyMapper::getPropertyNameMapForFilledSeriesProperties(), true, 1 );
diff --git a/chart2/source/view/main/ChartView.cxx
b/chart2/source/view/main/ChartView.cxx
index 8601e82e4803..0e4d1124847b 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -2893,7 +2893,6 @@ OUString ChartView::dump()
uno::Reference< drawing::XShapes > xShape(xShapes->getByIndex(i),
uno::UNO_QUERY);
if(xShape.is())
{
-XShapeDumper dumper;
OUString aString = XShapeDumper::dump(mxRootShape);
aBuffer.append(aString);
}
@@ -2902,7 +2901,6 @@ OUString ChartView::dump()
uno::Reference< drawing::XShape >
xSingleShape(xShapes->getByIndex(i), uno::UNO_QUERY);
if(!xSingleShape.is())
continue;
-XShapeDumper dumper;
OUString aString = XShapeDumper::dump(xSingleShape);
aBuffer.append(aString);
}
diff --git a/compilerplugins/clang/unusedvariablecheck.cxx
b/compilerplugins/clang/unusedvariablecheck.cxx
index 25af5438b465..07e5fe0b2ace 100644
--- a/compilerplugins/clang/unusedvariablecheck.cxx
+++ b/compilerplugins/clang/unusedvariablecheck.cxx
@@ -53,7 +53,21 @@ bool UnusedVariableCheck::VisitVarDecl( const VarDecl* var )
return true;
if( var->isDefinedOutsideFunctionOrMethod())
return true;
-if( loplugin::isExtraWarnUnusedType(var->getType()))
+
+auto type = var->getType();
+bool check = loplugin::isExtraWarnUnusedType(type);
+
+// this chunk of logic generates false+, which is why we don't leave it on
+/*
+if (!check && type->isRecordType())
+{
+auto recordDecl
+=
dyn_cast_or_null(type->getAs()->getDecl());
+if (recordDecl && recordDecl->hasDefinition() &&
recordDecl->hasTrivialDestructor())
+
Re: New LibreOffice Impress remote release for Android
Hi William, On Wed, Nov 06, 2019 at 08:43:59AM +0100, William Gathoye wrote: > Any news about this topic? The review appreciation on the Play Store is > still getting lower and lower because of this bug. We are now at 2.9/5 :( A new play store release of the remote was already discussed in the ESC call last week (somewhat implicitly), I'm not sure why the minutes from that was not sent to the list, perhaps I hit the moderation queue. :-/ Anyhow, I've added this to the agenda explicitly for this week. (Assuming that I got the situation correctly, and this is a case where the bug is already fixed in git, just the binary release is lacking.) Regards, 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 'distro/collabora/cp-6.2' - Makefile.in
Makefile.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit afa3e4b4950e51c0c597dfedf443029e4c9e79ee Author: Andras Timar AuthorDate: Wed Nov 6 10:38:14 2019 +0100 Commit: Andras Timar CommitDate: Wed Nov 6 10:38:14 2019 +0100 Revert "make check on linux includes now uicheck" This reverts commit 90a286ad4e2c35ac98a8100a2bd33d71f2c7. diff --git a/Makefile.in b/Makefile.in index 92d47681e707..44f1e72a75b6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -14,7 +14,7 @@ gb_Top_MODULE_CHECK_TARGETS := slowcheck unitcheck subsequentcheck perfcheck uic MAKECMDGOALS?=all build_goal:=$(if $(filter build check,$(MAKECMDGOALS)),all)\ $(if $(filter build-nocheck uicheck,$(MAKECMDGOALS)),build)\ - $(if $(filter check,$(MAKECMDGOALS)),subsequentcheck $(if $(filter Linux, $(shell uname)), uicheck))\ + $(if $(filter check,$(MAKECMDGOALS)),subsequentcheck)\ $(filter all build-l10n-only build-non-l10n-only debugrun help showmodules translations $(gb_Top_MODULE_CHECK_TARGETS) check packageinfo gbuildtojson,$(MAKECMDGOALS)) SRCDIR := @SRC_ROOT@ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/uiconfig
sd/uiconfig/simpress/ui/prntopts.ui | 289 ++-- 1 file changed, 145 insertions(+), 144 deletions(-) New commits: commit d746e6f7cbc9e7225b965c1b506a0050dd386e53 Author: andreas kainz AuthorDate: Wed Nov 6 00:27:09 2019 +0100 Commit: andreas_kainz CommitDate: Wed Nov 6 10:13:27 2019 +0100 Impress Options Dialog Print update Change-Id: I401562e96c05a6c2af0bbe928bd92f7e611cced6 Reviewed-on: https://gerrit.libreoffice.org/82111 Tested-by: Jenkins Reviewed-by: andreas_kainz diff --git a/sd/uiconfig/simpress/ui/prntopts.ui b/sd/uiconfig/simpress/ui/prntopts.ui index 4d5c81345f7e..aad5a13ca704 100644 --- a/sd/uiconfig/simpress/ui/prntopts.ui +++ b/sd/uiconfig/simpress/ui/prntopts.ui @@ -12,34 +12,34 @@ True False -12 +24 - + True False -True 0 none - + True False 6 12 - + True False 6 12 - -_Page name + +Default True True False True 0 +True True @@ -48,14 +48,15 @@ - -D_ate + +_Fit to page True True False True 0 True +pagedefaultrb 0 @@ -63,14 +64,15 @@ - -Ti_me + +_Tile pages True True False True 0 True +pagedefaultrb 0 @@ -78,8 +80,8 @@ - -H_idden pages + +Paper tray from printer s_ettings True True False @@ -89,18 +91,91 @@ 0 +5 + + + + +B_rochure +True +True +False +True +0 +True +pagedefaultrb + + +0 3 + + +True +False +18 + + +True +False +vertical +6 + + +Fr_ont +True +True +False +True +0 +True + + + + + +False +True +0 + + + + +Ba_ck +True +True +False +True +0 +True + + +
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - chart2/Library_chartcontroller.mk chart2/source
chart2/Library_chartcontroller.mk |1
chart2/source/controller/dialogs/ChartResourceGroupDlgs.cxx | 128
chart2/source/controller/dialogs/ChartResourceGroups.cxx| 99 -
chart2/source/controller/dialogs/tp_ChartType.cxx |1
chart2/source/inc/ChartResourceGroupDlgs.hxx| 68 ++
chart2/source/inc/ChartResourceGroups.hxx | 42 ---
6 files changed, 205 insertions(+), 134 deletions(-)
New commits:
commit 972d139b0437a1db517741d56cff6aef88cbec58
Author: Muhammet Kara
AuthorDate: Wed Nov 6 11:19:53 2019 +0300
Commit: Muhammet Kara
CommitDate: Wed Nov 6 09:55:22 2019 +0100
Move SplinePropertiesDialog & SteppedPropertiesDialog to reuse
Change-Id: I2937c617bed0d000734784301421237f282014e9
Reviewed-on: https://gerrit.libreoffice.org/82124
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Muhammet Kara
diff --git a/chart2/Library_chartcontroller.mk
b/chart2/Library_chartcontroller.mk
index 9793aa861a6f..54f615922608 100644
--- a/chart2/Library_chartcontroller.mk
+++ b/chart2/Library_chartcontroller.mk
@@ -86,6 +86,7 @@ $(eval $(call
gb_Library_add_exception_objects,chartcontroller,\
chart2/source/controller/chartapiwrapper/WrappedSymbolProperties \
chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty \
chart2/source/controller/dialogs/ChangingResource \
+chart2/source/controller/dialogs/ChartResourceGroupDlgs \
chart2/source/controller/dialogs/ChartResourceGroups \
chart2/source/controller/dialogs/ChartTypeDialogController \
chart2/source/controller/dialogs/DataBrowser \
diff --git a/chart2/source/controller/dialogs/ChartResourceGroupDlgs.cxx
b/chart2/source/controller/dialogs/ChartResourceGroupDlgs.cxx
new file mode 100644
index ..73e0cbdac8be
--- /dev/null
+++ b/chart2/source/controller/dialogs/ChartResourceGroupDlgs.cxx
@@ -0,0 +1,128 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include
+#include
+
+#include
+#include
+
+namespace chart
+{
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::chart2;
+
+SplinePropertiesDialog::SplinePropertiesDialog(weld::Window* pParent)
+: GenericDialogController(pParent, "modules/schart/ui/smoothlinesdlg.ui",
"SmoothLinesDialog")
+, m_xLB_Spline_Type(m_xBuilder->weld_combo_box("SplineTypeComboBox"))
+,
m_xMF_SplineResolution(m_xBuilder->weld_spin_button("ResolutionSpinbutton"))
+, m_xFT_SplineOrder(m_xBuilder->weld_label("PolynomialsLabel"))
+, m_xMF_SplineOrder(m_xBuilder->weld_spin_button("PolynomialsSpinButton"))
+{
+m_xDialog->set_title(SchResId(STR_DLG_SMOOTH_LINE_PROPERTIES));
+
+m_xLB_Spline_Type->connect_changed(LINK(this, SplinePropertiesDialog,
SplineTypeListBoxHdl));
+}
+
+void SplinePropertiesDialog::fillControls(const ChartTypeParameter& rParameter)
+{
+switch (rParameter.eCurveStyle)
+{
+case CurveStyle_CUBIC_SPLINES:
+m_xLB_Spline_Type->set_active(CUBIC_SPLINE_POS);
+break;
+case CurveStyle_B_SPLINES:
+m_xLB_Spline_Type->set_active(B_SPLINE_POS);
+break;
+default:
+m_xLB_Spline_Type->set_active(CUBIC_SPLINE_POS);
+break;
+}
+m_xMF_SplineOrder->set_value(rParameter.nSplineOrder);
+m_xMF_SplineResolution->set_value(rParameter.nCurveResolution);
+
+//dis/enabling
+m_xFT_SplineOrder->set_sensitive(m_xLB_Spline_Type->get_active() ==
B_SPLINE_POS);
+m_xMF_SplineOrder->set_sensitive(m_xLB_Spline_Type->get_active() ==
B_SPLINE_POS);
+}
+
+void SplinePropertiesDialog::fillParameter(ChartTypeParameter& rParameter,
bool bSmoothLines)
+{
+if (!bSmoothLines)
+rParameter.eCurveStyle = CurveStyle_LINES;
+else if (m_xLB_Spline_Type->get_active() == CUBIC_SPLINE_POS)
+rParameter.eCurveStyle = CurveStyle_CUBIC_SPLINES;
+else if (m_xLB_Spline_Type->get_active() == B_SPLINE_POS)
+rParameter.eCurveStyle = CurveStyle_B_SPLINES;
+
+rParameter.nCurveResolution = m_xMF_SplineResolution->get_value(
[Libreoffice-commits] core.git: solenv/bin
solenv/bin/native-code.py |1 + 1 file changed, 1 insertion(+) New commits: commit baac552474a67d9261c12d68dff4c121e5090a55 Author: Tor Lillqvist AuthorDate: Tue Nov 5 18:46:27 2019 +0200 Commit: Tor Lillqvist CommitDate: Wed Nov 6 09:49:51 2019 +0100 Add org_apache_openoffice_comp_sw_sidebar_SwPanelFactory_get_implementation That was not enough to make the sidebar show up, though. Change-Id: I5b647e499d5cb06691ad312757836ad6a0cc588e Reviewed-on: https://gerrit.libreoffice.org/82123 Reviewed-by: Tor Lillqvist Tested-by: Tor Lillqvist diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py index 8ad5f8ed8887..ac1ef608ad24 100755 --- a/solenv/bin/native-code.py +++ b/solenv/bin/native-code.py @@ -350,6 +350,7 @@ edit_constructor_list = [ "com_sun_star_comp_Writer_XMLOasisSettingsExporter_get_implementation", "com_sun_star_comp_Writer_XMLOasisStylesExporter_get_implementation", "com_sun_star_comp_Writer_WriterModule_get_implementation", +"org_apache_openoffice_comp_sw_sidebar_SwPanelFactory_get_implementation", ] # math ___ 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/docxexport.cxx |8
writerfilter/source/dmapper/DomainMapper.cxx |3 +++
writerfilter/source/dmapper/SettingsTable.cxx |7 +++
writerfilter/source/dmapper/SettingsTable.hxx |1 +
4 files changed, 19 insertions(+)
New commits:
commit c58b39b77dcafcf63872e7dc4270c7258072b193
Author: Samuel Mehrbrodt
AuthorDate: Fri Nov 1 11:25:19 2019 +0100
Commit: Samuel Mehrbrodt
CommitDate: Wed Nov 6 09:31:43 2019 +0100
tdf#121661 Roundtrip w:hyphenationZone via InteropGrabBag
Change-Id: I097afb54ff31bd1c878231b51eac5af9f27d35e9
Reviewed-on: https://gerrit.libreoffice.org/81880
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/sw/source/filter/ww8/docxexport.cxx
b/sw/source/filter/ww8/docxexport.cxx
index 0185e98b5f0a..c6226fd130ab 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -1146,6 +1146,14 @@ void DocxExport::WriteSettings()
hasProtectionProperties = true;
}
}
+else if (rProp.Name == "HyphenationZone")
+{
+sal_Int16 nHyphenationZone;
+rProp.Value >>= nHyphenationZone;
+if (nHyphenationZone > 0)
+pFS->singleElementNS(XML_w, XML_hyphenationZone,
FSNS(XML_w, XML_val),
+ OString::number(nHyphenationZone));
+}
}
}
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 23fd1683b8ef..c44dcefb0abd 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -229,6 +229,9 @@ DomainMapper::~DomainMapper()
// Add the saved DocumentProtection settings
aProperties["DocumentProtection"] <<=
m_pImpl->GetSettingsTable()->GetDocumentProtectionSettings();
+// Add the saved w:hypenationZone setting
+aProperties["HyphenationZone"] <<=
m_pImpl->GetSettingsTable()->GetHypenationZone();
+
uno::Reference
xDocProps(m_pImpl->GetTextDocument(), uno::UNO_QUERY);
if (xDocProps.is())
{
diff --git a/writerfilter/source/dmapper/SettingsTable.cxx
b/writerfilter/source/dmapper/SettingsTable.cxx
index 004ee6431d22..a861ac7a9ff7 100644
--- a/writerfilter/source/dmapper/SettingsTable.cxx
+++ b/writerfilter/source/dmapper/SettingsTable.cxx
@@ -244,6 +244,7 @@ struct SettingsTable_Impl
boolm_bDoNotUseHTMLParagraphAutoSpacing;
boolm_bNoColumnBalance;
boolm_bAutoHyphenation;
+sal_Int16 m_nHyphenationZone;
boolm_bWidowControl;
boolm_bSplitPgBreakAndParaMark;
boolm_bMirrorMargin;
@@ -277,6 +278,7 @@ struct SettingsTable_Impl
, m_bDoNotUseHTMLParagraphAutoSpacing(false)
, m_bNoColumnBalance(false)
, m_bAutoHyphenation(false)
+, m_nHyphenationZone(0)
, m_bWidowControl(false)
, m_bSplitPgBreakAndParaMark(false)
, m_bMirrorMargin(false)
@@ -465,6 +467,7 @@ void SettingsTable::lcl_sprm(Sprm& rSprm)
case NS_ooxml::LN_CT_Settings_rsids: // 92549; revision save Ids -
probably not necessary
break;
case NS_ooxml::LN_CT_Settings_hyphenationZone: // 92508;
+m_pImpl->m_nHyphenationZone = nIntValue;
break;
case NS_ooxml::LN_CT_Compat_useFELayout: // 92422;
// useFELayout (Do Not Bypass East Asian/Complex Script Layout Code -
support of old versions of Word - ignored)
@@ -641,6 +644,10 @@ bool SettingsTable::GetProtectForm() const
{
return m_pImpl->m_bProtectForm;
}
+sal_Int16 SettingsTable::GetHypenationZone() const
+{
+return m_pImpl->m_nHyphenationZone;
+}
uno::Sequence const &
SettingsTable::GetThemeFontLangProperties() const
{
return m_pImpl->m_pThemeFontLangProps;
diff --git a/writerfilter/source/dmapper/SettingsTable.hxx
b/writerfilter/source/dmapper/SettingsTable.hxx
index 2b4a49085e20..631ab5d92634 100644
--- a/writerfilter/source/dmapper/SettingsTable.hxx
+++ b/writerfilter/source/dmapper/SettingsTable.hxx
@@ -77,6 +77,7 @@ class SettingsTable : public LoggedProperties, public
LoggedTable
bool GetDoNotExpandShiftReturn() const;
bool GetNoColumnBalance() const;
bool GetProtectForm() const;
+sal_Int16 GetHypenationZone() const;
css::uno::Sequence const &
GetThemeFontLangProperties() const;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: AtomicCounter::is_always_lock_free on armel
[assuming
Cc: "libreoffice@lists.freedesktop.org Stephan Bergmann"
was a typo, and the original mail was meant to be sent to
libreoffice@lists.freedesktop.org]
On 06/11/2019 07:05, Rene Engelhard wrote:
LibreOffice 6.4.0 alpha1 was just accepted into Debian experimental and failed
on armel
(old arm gnueabi):
In file included from /<>/vcl/source/app/svmain.cxx:90:
/<>/vcl/inc/opengl/zone.hxx:39:34: error: static assertion failed
39 | static_assert(AtomicCounter::is_always_lock_free);
| ~~~^~~
make[2]: *** [/<>/solenv/gbuild/LinkTarget.mk:296:
/<>/workdir/CxxObject/vcl/source/app/svmain.o] Error 1
If I run git blame/log I see
commit ec17c8ec5256386b0197a8ffe5d7cad3e7d70f8f
Author: Stephan Bergmann
Date: Tue Sep 17 20:39:43 2019 +0200
-Werror=volatile in OpenGLZone
Recent GCC 10 trunk in C++20 mode reports issues like
> vcl/inc/opengl/zone.hxx:37:21: error: ‘++’ expression of ‘volatile’-qualified type is deprecated [-Werror=volatile]
>37 | OpenGLZone() { gnEnterCount++; }
> | ^~~~
so look for a type that is more appropriate here (see the comment added to
vcl/inc/opengl/zone.hxx for details). (Though calls like
OpenGLZone::isInZone(), comparing gnEnterCount and gnLeaveCount, in
OpenGLWatchdogThread::execute are still not done atomically, of course.)
Change-Id: Ie5563addc65f629336f89cbccb73f7b9ac5e9870
Reviewed-on: https://gerrit.libreoffice.org/79072
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
which added
+// gnEnterCount and gnLeaveCount are accessed both from multiple threads
(cf.
+// OpenGLWatchdogThread::execute; so need to be of atomic type) and from
signal handlers (cf.
+// VCLExceptionSignal_impl; so need to be of lock-free atomic type).
sig_atomic_t is chosen as
+// the underlying type under the assumption that it is most likely to lead
to an atomic type
+// that is actually lock-free. However, gnEnterCount and gnLeaveCount are
both monotonically
+// increasing, so will eventually overflow, so the underlying type better
be unsigned, which
+// sig_atomic_t is not guaranteed to be:
+using AtomicCounter = std::atomic>;
+static_assert(AtomicCounter::is_always_lock_free);
Looking at https://en.cppreference.com/w/cpp/atomic/atomic/is_always_lock_free it is
"/* implemtation defined */"
so is it always false on armel?
Yeah, my hope was that we won't ever encounter platforms where this is
false.
Does that mean we need to drop LibreOffice support on armel or is there some
way out of it?
(even though OpenGL is probably no thing on armel, I'd be wary to just
remove the assert...)
Given that the code used "static volatile sal_uInt64" for
genEnter/LeaveCount before ec17c8ec5256386b0197a8ffe5d7cad3e7d70f8f, we
don't make things worse than they originally were if we fall back to
that type again on armel. So if the original code happened to work well
enough on armel in practice, you could add an appropriate #if/else (with
a useful comment) around the definition of AtomicCounter and the
accompanying static_assert. (And address any resulting -Wvolatile on
armel as appropriate for your needs.)
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/rtfimport/rtfimport.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit a226cec52e536c46e03f57a5f1f7931abbeb0cdd
Author: Miklos Vajna
AuthorDate: Tue Nov 5 22:55:40 2019 +0100
Commit: Miklos Vajna
CommitDate: Wed Nov 6 08:59:51 2019 +0100
CppunitTest_sw_rtfimport: convert one testcase to use CPPUNIT_TEST_FIXTURE()
Let's see if this causes any problems before doing a mass-conversion.
Benefits are:
- ctags can jump to the testcase if Writer-specific macros are not used
- the Writer-specific macros just overcomplicate things for people not
familiar with Writer
Change-Id: Icc057a789acc220f5625461944dc6b8f35aad334
Reviewed-on: https://gerrit.libreoffice.org/82109
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 82f3211c612f..ba19786d4fa2 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -60,8 +60,9 @@ protected:
AllSettings m_aSavedSettings;
};
-DECLARE_RTFIMPORT_TEST(testN695479, "n695479.rtf")
+CPPUNIT_TEST_FIXTURE(Test, testN695479)
{
+load(mpTestDocumentPath, "n695479.rtf");
uno::Reference xTextFramesSupplier(mxComponent,
uno::UNO_QUERY);
uno::Reference
xIndexAccess(xTextFramesSupplier->getTextFrames(),
uno::UNO_QUERY);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
