[Libreoffice-commits] core.git: include/test test/source
include/test/cppunitasserthelper.hxx | 72 + test/source/sheet/databaserange.cxx| 21 --- test/source/sheet/xarealink.cxx| 21 --- test/source/sheet/xcelladdressable.cxx | 20 -- test/source/sheet/xsheetcellrangecontainer.cxx | 21 --- 5 files changed, 76 insertions(+), 79 deletions(-) New commits: commit afc5d7aedf4d115bfaa539301b155db37be87054 Author: Jens CarlDate: Fri Nov 3 22:56:02 2017 + Create CppUnit::assertion_traits helper file Place the CppUnit:assertion_traits for ::table::CellAddress and ::table::CellRangeAddress into a file, so that they can be used/shared from several locations. Avoid copy/paste action. Change-Id: Ie2358ea1ac6925eef05644bea03a2ae526cd7fc6 Reviewed-on: https://gerrit.libreoffice.org/44291 Tested-by: Jenkins Reviewed-by: Jens Carl diff --git a/include/test/cppunitasserthelper.hxx b/include/test/cppunitasserthelper.hxx new file mode 100644 index ..0b26a228ba31 --- /dev/null +++ b/include/test/cppunitasserthelper.hxx @@ -0,0 +1,72 @@ +/* -*- 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/. + */ + +#ifndef INCLUDED_TEST_CPPUNITASSERTHELPER_HXX +#define INCLUDED_TEST_CPPUNITASSERTHELPER_HXX + +#include + +#include +#include + +#include + +using namespace com::sun::star; +using namespace com::sun::star::uno; + +CPPUNIT_NS_BEGIN + +/** @brief Trait used by CPPUNIT_ASSERT* macros to compare com::sun::star::table::CellAddress. + * + * This specialization from @c struct @c assertion_traits<> helps to compare + * @see com::sun::star::table::CellAddress. + */ +template<> +struct assertion_traits +{ +static bool equal(const table::CellAddress& x, const table::CellAddress& y) +{ +return x == y; +} + +static std::string toString( const table::CellAddress& x ) +{ +OStringStream ost; +ost << "Sheet: " << x.Sheet << " Column: " << x.Column << " Row: " << x.Row; +return ost.str(); +} +}; + +/** @brief Trait used by CPPUNIT_ASSERT* macros to compare com::sun::star::table::CellRangeAddress. + * + * This specialization from @c struct @c assertion_traits<> helps to compare + * @see com::sun::star::table::CellRangeAddress. + */ +template<> +struct assertion_traits +{ +static bool equal(const table::CellRangeAddress& x, const table::CellRangeAddress& y) +{ +return x == y; +} + +static std::string toString( const table::CellRangeAddress& x ) +{ +OStringStream ost; +ost << "Sheet: " << x.Sheet << " StartColumn: " << x.StartColumn << " StartRow: " << x.StartRow +<< " EndColumn: " << x.EndColumn << " EndRow: " << x.EndRow; +return ost.str(); +} +}; + +CPPUNIT_NS_END + +#endif // INCLUDED_TEST_CPPUNITASSERTHELPER_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/test/source/sheet/databaserange.cxx b/test/source/sheet/databaserange.cxx index 8e6f56cb1ed1..91ee88184863 100644 --- a/test/source/sheet/databaserange.cxx +++ b/test/source/sheet/databaserange.cxx @@ -8,6 +8,7 @@ */ #include +#include #include #include @@ -19,26 +20,6 @@ using namespace com::sun::star; using namespace com::sun::star::uno; -CPPUNIT_NS_BEGIN - -template<> struct assertion_traits -{ -static bool equal(const table::CellRangeAddress& x, const table::CellRangeAddress& y) -{ -return x == y; -} - -static std::string toString( const table::CellRangeAddress& x ) -{ -OStringStream ost; -ost << "Sheet: " << x.Sheet << " StartColumn: " << x.StartColumn << " StartRow: " << x.StartRow -<< " EndColumn: " << x.EndColumn << " EndRow: " << x.EndRow; -return ost.str(); -} -}; - -CPPUNIT_NS_END - namespace apitest { void DatabaseRange::testMoveCells() diff --git a/test/source/sheet/xarealink.cxx b/test/source/sheet/xarealink.cxx index 89704052da45..ec7ce49a01f8 100644 --- a/test/source/sheet/xarealink.cxx +++ b/test/source/sheet/xarealink.cxx @@ -8,6 +8,7 @@ */ #include +#include #include #include @@ -18,26 +19,6 @@ using namespace com::sun::star; using namespace com::sun::star::uno; -CPPUNIT_NS_BEGIN - -template<> struct assertion_traits -{ -static bool equal(const table::CellRangeAddress& x, const table::CellRangeAddress& y) -{ -return x == y; -} - -static std::string toString( const table::CellRangeAddress& x ) -{ -OStringStream ost; -ost << "Sheet: " << x.Sheet << " StartColumn: " << x.StartColumn << " StartRow: " << x.StartRow -<<
[Libreoffice-bugs] [Bug 93433] incomplete display of long autocorrect list in the replacement table and possible data loss when saving
https://bugs.documentfoundation.org/show_bug.cgi?id=93433 --- Comment #39 from tommy27--- Created attachment 137513 --> https://bugs.documentfoundation.org/attachment.cgi?id=137513=edit wrong display of autocorrect list just moving up/down the scrollbar In reply to Buovjaga from comment #38) > (In reply to tommy27 from comment #37) > > > > > > the first entry should be "___z" > > and the last one "zzzoticoniii" > > > > this was tested with this LibO interface locale setting (it-IT). > > Yep I see zzzoticoniii and then the ø entries start. please tell me which is your "locale setting" there's obviously a different alphabetical sorting method between my PC and yours. moreover check my screenshots... this is how the top and bottom of the list are displayed just moving the scrollbar up/down from top to bottom multiple times... sometimes you don't see the correct end of the list and sometimes neither the top of if. did you try doing this up/down thing many times in your PC of did you only try once to scroll to bottom? this was tested with latest daily build: 6.0.0.0.alpha1+ Build ID: 8ce49eab696d830d420fbf48b22ac151167bbd62 CPU threads: 4; OS: Windows 6.3; UI render: default; TinderBox: Win-x86@42, Branch:master, Time: 2017-11-03_23:12:37 Locale: it-IT (it_IT); Calc: group -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: desktop/source
desktop/source/deployment/registry/component/dp_component.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e7be51491c2295e546549b750d9723753731725a Author: Julien NabetDate: Fri Nov 3 17:59:31 2017 +0100 Following 42bfbc216474b4f60d5a5e52a88d95baded5191c as suggested by Stephan in comment of https://gerrit.libreoffice.org/#/c/44233/ Change-Id: Ia0a8c36441339628fd61ba862df73db11bbed302 Reviewed-on: https://gerrit.libreoffice.org/44276 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx index a41c68d1de5e..26c624e98dc0 100644 --- a/desktop/source/deployment/registry/component/dp_component.cxx +++ b/desktop/source/deployment/registry/component/dp_component.cxx @@ -991,7 +991,7 @@ void BackendImpl::removeFromUnoRc( const OUString rcterm( dp_misc::makeRcTerm(url_) ); const ::osl::MutexGuard guard( getMutex() ); unorc_verify_init( xCmdEnv ); -t_stringlist aRcItemList = getRcItemList(kind); +t_stringlist & aRcItemList = getRcItemList(kind); aRcItemList.erase(std::remove(aRcItemList.begin(), aRcItemList.end(), rcterm), aRcItemList.end()); // write immediately: m_unorc_modified = true; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 107834] [META] Tab stops bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=107834 Bug 107834 depends on bug 46938, which changed state. Bug 46938 Summary: FILESAVE: DOCX - Tab stops added to lines that didnt already have them https://bugs.documentfoundation.org/show_bug.cgi?id=46938 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 46938] FILESAVE: DOCX - Tab stops added to lines that didnt already have them
https://bugs.documentfoundation.org/show_bug.cgi?id=46938 Justin Lchanged: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 104520] [META] DOCX (OOXML) bug tracker
https://bugs.documentfoundation.org/show_bug.cgi?id=104520 Bug 104520 depends on bug 46938, which changed state. Bug 46938 Summary: FILESAVE: DOCX - Tab stops added to lines that didnt already have them https://bugs.documentfoundation.org/show_bug.cgi?id=46938 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 46938] FILESAVE: DOCX - Tab stops added to lines that didnt already have them
https://bugs.documentfoundation.org/show_bug.cgi?id=46938 Commit Notificationchanged: What|Removed |Added Whiteboard|BSA |BSA target:6.0.0 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 46938] FILESAVE: DOCX - Tab stops added to lines that didnt already have them
https://bugs.documentfoundation.org/show_bug.cgi?id=46938 --- Comment #10 from Commit Notification--- Justin Luth committed a patch related to this issue. It has been pushed to "master": http://cgit.freedesktop.org/libreoffice/core/commit/?id=b41d698fa121f3a4d1afdde56f88a135fc71b48a tdf#46938 ooxmlexport: override style tabstops when tabs removed It will be available in 6.0.0. The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ooxmlexport/data/tdf46938_clearTabStop.docx |binary sw/qa/extras/ooxmlexport/ooxmlexport11.cxx |6 sw/source/filter/ww8/docxattributeoutput.cxx | 20 +++ 3 files changed, 26 insertions(+) New commits: commit b41d698fa121f3a4d1afdde56f88a135fc71b48a Author: Justin LuthDate: Thu Nov 2 11:16:13 2017 +0300 tdf#46938 ooxmlexport: override style tabstops when tabs removed Having no tabs defined is the default value, so nothing generally needs to be written. But if the paragraph style defines tabstops, but the current paragraph doesn't have any, then those style tabstops need to be cleared. Change-Id: I7a818c658403cc683b0c5b7452b6c88ea00f771d Reviewed-on: https://gerrit.libreoffice.org/44244 Tested-by: Jenkins Reviewed-by: Justin Luth diff --git a/sw/qa/extras/ooxmlexport/data/tdf46938_clearTabStop.docx b/sw/qa/extras/ooxmlexport/data/tdf46938_clearTabStop.docx new file mode 100644 index ..8dea12fcb5c8 Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf46938_clearTabStop.docx differ diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx index 1375a2edef89..e3d18b3fb7e9 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx @@ -46,6 +46,12 @@ DECLARE_OOXMLEXPORT_TEST(testTdf92524_autoColor, "tdf92524_autoColor.doc") CPPUNIT_ASSERT_EQUAL(COL_AUTO, getProperty(getParagraph(1), "ParaBackColor")); } +DECLARE_OOXMLEXPORT_TEST(testTdf46938_clearTabStop, "tdf46938_clearTabStop.docx") +{ +// Number of tabstops should be zero, overriding the one in the style +CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty< uno::Sequence >(getParagraph(1), "ParaTabStops").getLength()); +} + DECLARE_OOXMLEXPORT_TEST(testTdf82065_Ind_start_strict, "tdf82065_Ind_start_strict.docx") { uno::Reference xPropertySet(getStyles("NumberingStyles")->getByName("WWNum1"), uno::UNO_QUERY); diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 146b7b9e3a5f..57e182dc34ac 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -7610,7 +7610,27 @@ void DocxAttributeOutput::ParaTabStop( const SvxTabStopItem& rTabStop ) // must contain at least one , so don't write it empty if( nCount == 0 ) +{ +// clear style tabs - otherwise style will override... +if( GetExport().m_pStyAttr ) +{ +const SvxTabStopItem* pStyleTabs = GetExport().m_pStyAttr->GetItem(RES_PARATR_TABSTOP); +if( pStyleTabs && pStyleTabs->Count() ) +{ +m_pSerializer->startElementNS( XML_w, XML_tabs, FSEND ); +for( int i = 0; i < pStyleTabs->Count(); ++i ) +{ +m_pSerializer->singleElementNS( XML_w, XML_tab, +FSNS( XML_w, XML_val ), OString("clear"), +FSNS( XML_w, XML_pos ), OString::number(pStyleTabs->At(i).GetTabPos()), +FSEND ); +} +m_pSerializer->endElementNS( XML_w, XML_tabs ); +} +} + return; +} if( nCount == 1 && rTabStop[ 0 ].GetAdjustment() == SvxTabAdjust::Default ) { GetExport().setDefaultTabStop( rTabStop[ 0 ].GetTabPos()); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Writer] Macro for "Edit->Links->[Select All]->Break Link
Hello Could someone help me with a Basic Macro that does "Writer Menu->Edit->Links->[Select All]->Break Link" Jambunathan K. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Writer] Macro for "Edit->Links->[Select All]->Remove Links
Hello Could someone help me with a Basic Macro that does "Edit->Links->[Select All]->Remove Links" Jambunathan K. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-bugs] [Bug 79585] RTL: RTL Layout Problem in Impress
https://bugs.documentfoundation.org/show_bug.cgi?id=79585 --- Comment #15 from Omer Zak--- Still happens in: Version: 5.4.2.2.0+ Build ID: 1:5.4.2-3~bpo9+1 CPU threads: 8; OS: Linux 4.9; UI render: default; VCL: gtk2; Locale: en-US (en_US.utf8); Calc: group OS: Debian 64bit Stretch (Debian 9.2, with some backported packages) -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: officecfg/registry svx/source
officecfg/registry/data/org/openoffice/Office/Common.xcu |4 ++-- officecfg/registry/schema/org/openoffice/Office/Common.xcs |6 +++--- svx/source/dialog/ClassificationDialog.cxx |4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) New commits: commit bcdc5f56f064e875f58a2f22872393d1fef31839 Author: Tomaž VajngerlDate: Sat Nov 4 02:37:07 2017 +0900 TSCP: make the configuration key names shorter Change-Id: If28e283666f4e1f87758c401b2d4fb5986eb6d8c Reviewed-on: https://gerrit.libreoffice.org/44281 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu b/officecfg/registry/data/org/openoffice/Office/Common.xcu index 33c1db97f618..c7d198e38cd4 100644 --- a/officecfg/registry/data/org/openoffice/Office/Common.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu @@ -539,9 +539,9 @@ - + - + diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index 22c92a7124fa..8eeced165011 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -6393,15 +6393,15 @@ 3 - + Specifies if the intellectual property section in the advanced classification dialog should be expanded when the dialog is open. true - + - Specifies if the intellectual property text is free-form or limited to ';', '/' and ' ' characters. + Specifies if the intellectual property text in the advanced classification is free-form or limited to ';', '/' and ' ' (space) and delete key. true diff --git a/svx/source/dialog/ClassificationDialog.cxx b/svx/source/dialog/ClassificationDialog.cxx index 6c70d97dd83f..3210d1a2f761 100644 --- a/svx/source/dialog/ClassificationDialog.cxx +++ b/svx/source/dialog/ClassificationDialog.cxx @@ -41,7 +41,7 @@ VCL_BUILDER_FACTORY(IntellectualPropertyPartEdit) void IntellectualPropertyPartEdit::KeyInput(const KeyEvent& rKeyEvent) { -bool bTextIsFreeForm = officecfg::Office::Common::Classification::AdvancedClassificationDialogIntellectualPropertyTextInputIsFreeForm::get(); +bool bTextIsFreeForm = officecfg::Office::Common::Classification::IntellectualPropertyTextInputIsFreeForm::get(); if (bTextIsFreeForm) { @@ -230,7 +230,7 @@ ClassificationDialog::ClassificationDialog(vcl::Window* pParent, const bool bPer m_pRecentlyUsedListBox->SetSelectHdl(LINK(this, ClassificationDialog, SelectRecentlyUsedHdl)); -bool bExpand = officecfg::Office::Common::Classification::AdvancedClassificationDialogIntellectualPropertySectionExpanded::get(); +bool bExpand = officecfg::Office::Common::Classification::IntellectualPropertySectionExpanded::get(); m_pIntellectualPropertyExpander->set_expanded(bExpand); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extras/source include/svx officecfg/registry svx/source svx/uiconfig
extras/source/glade/libreoffice-catalog.xml.in |8 +- include/svx/ClassificationDialog.hxx | 11 ++ officecfg/registry/data/org/openoffice/Office/Common.xcu |2 officecfg/registry/schema/org/openoffice/Office/Common.xcs |6 + svx/source/dialog/ClassificationDialog.cxx | 50 - svx/uiconfig/ui/classificationdialog.ui|2 6 files changed, 72 insertions(+), 7 deletions(-) New commits: commit 49d53fa8a4d0c69a58000d05b903e757e30e6930 Author: Tomaž VajngerlDate: Sat Nov 4 02:29:33 2017 +0900 TSCP: limit the input to the IPPart entry field Limit the input keys to the IPPart entry field. The limit is by default set to free-form with the configuration key. When the limitation is activated it is only possible to input chars '/', ';', ' ' (space) and delete. Change-Id: Id3eb7e0198fb60e07894d6ff22a32351cca9d589 Reviewed-on: https://gerrit.libreoffice.org/44280 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in index 8fb5d4c803c7..85a65eaf3df1 100644 --- a/extras/source/glade/libreoffice-catalog.xml.in +++ b/extras/source/glade/libreoffice-catalog.xml.in @@ -677,8 +677,12 @@ generic-name="Text View" parent="GtkTextView" icon-name="widget-gtk-textentry"/> - + + m_pIntellectualPropertyPartListBox; VclPtr m_pIntellectualPropertyPartNumberListBox; VclPtr m_pIntellectualPropertyPartAddButton; -VclPtr m_pIntellectualPropertyPartEdit; +VclPtr m_pIntellectualPropertyPartEdit; VclPtr m_pIntellectualPropertyExpander; SfxClassificationHelper maHelper; diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu b/officecfg/registry/data/org/openoffice/Office/Common.xcu index c6bbd2d46058..33c1db97f618 100644 --- a/officecfg/registry/data/org/openoffice/Office/Common.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu @@ -541,5 +541,7 @@ + + diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index fe7f8e806a7b..22c92a7124fa 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -6399,6 +6399,12 @@ true + + + Specifies if the intellectual property text is free-form or limited to ';', '/' and ' ' characters. + +true + diff --git a/svx/source/dialog/ClassificationDialog.cxx b/svx/source/dialog/ClassificationDialog.cxx index 2e8b0c4ad8fc..6c70d97dd83f 100644 --- a/svx/source/dialog/ClassificationDialog.cxx +++ b/svx/source/dialog/ClassificationDialog.cxx @@ -25,11 +25,55 @@ #include #include #include +#include #include namespace svx { + +IntellectualPropertyPartEdit::IntellectualPropertyPartEdit(vcl::Window* pParent) +: Edit(pParent, WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK|WB_TABSTOP) +{ +} + +VCL_BUILDER_FACTORY(IntellectualPropertyPartEdit) + +void IntellectualPropertyPartEdit::KeyInput(const KeyEvent& rKeyEvent) +{ +bool bTextIsFreeForm = officecfg::Office::Common::Classification::AdvancedClassificationDialogIntellectualPropertyTextInputIsFreeForm::get(); + +if (bTextIsFreeForm) +{ +Edit::KeyInput(rKeyEvent); +} +else +{ +// Ignore key combination with modifier keys +if (rKeyEvent.GetKeyCode().IsMod3() + || rKeyEvent.GetKeyCode().IsMod2() + || rKeyEvent.GetKeyCode().IsMod1()) +{ +return; +} + +switch (rKeyEvent.GetKeyCode().GetCode()) +{ +// Allowed characters +case KEY_BACKSPACE: +case KEY_DELETE: +case KEY_DIVIDE: +case KEY_SEMICOLON: +case KEY_SPACE: +Edit::KeyInput(rKeyEvent); +return; +// Anything else is ignored +default: +break; +} +} +} + namespace { constexpr size_t RECENTLY_USED_LIMIT = 5; @@ -51,7 +95,7 @@ bool fileExists(OUString const & sFilename) return osl::FileBase::E_None == eRC; } -bool stringToclassificationType(OString const & rsType, svx::ClassificationType & reType) +bool stringToClassificationType(OString const & rsType, svx::ClassificationType & reType) { if (rsType == "CATEGORY") reType = svx::ClassificationType::CATEGORY; @@ -296,7 +340,7 @@ void ClassificationDialog::readRecentlyUsed() // Convert string to classification type, but continue only if // conversion was successful. -
[Libreoffice-commits] core.git: include/sfx2 include/svx sd/source svx/Library_svx.mk svx/source sw/source
include/sfx2/classificationhelper.hxx |5 + include/svx/ClassificationCommon.hxx | 37 + sd/source/ui/view/drviews2.cxx |6 ++ svx/Library_svx.mk |1 svx/source/dialog/ClassificationCommon.cxx | 79 + sw/source/core/edit/edfcol.cxx |9 ++- 6 files changed, 134 insertions(+), 3 deletions(-) New commits: commit 40918d0321f9e9a958fa80f309213e199cf21bce Author: Tomaž VajngerlDate: Fri Nov 3 21:57:18 2017 +0900 TSCP: add a full text. value of the header/footer as doc. property Change-Id: I4742066c34802017790c1c21ec04a7760d4fe1f7 Reviewed-on: https://gerrit.libreoffice.org/44279 Reviewed-by: Tomaž Vajngerl Tested-by: Tomaž Vajngerl diff --git a/include/sfx2/classificationhelper.hxx b/include/sfx2/classificationhelper.hxx index 6467976c952b..0ea432ffbe99 100644 --- a/include/sfx2/classificationhelper.hxx +++ b/include/sfx2/classificationhelper.hxx @@ -182,6 +182,11 @@ public: { return aKey.startsWith(makeIntellectualPropertyPartKey()); } + +OUString makeFullTextualRepresentationKey() const +{ +return getPolicyKey() + "FullTexturalRepresentation"; +} }; } diff --git a/include/svx/ClassificationCommon.hxx b/include/svx/ClassificationCommon.hxx new file mode 100644 index ..04e0494cc7ad --- /dev/null +++ b/include/svx/ClassificationCommon.hxx @@ -0,0 +1,37 @@ +/* -*- 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/. + * + */ + +#ifndef INCLUDED_SVX_CLASSIFICATIONCOMMON_HXX +#define INCLUDED_SVX_CLASSIFICATIONCOMMON_HXX + +#include +#include +#include +#include +#include +#include + +namespace svx { +namespace classification { + +SVX_DLLPUBLIC OUString convertClassificationResultToString(std::vector const & rResults); + +SVX_DLLPUBLIC bool addOrInsertDocumentProperty(css::uno::Reference const & rxPropertyContainer, + OUString const & rsKey, OUString const & rsValue); + +SVX_DLLPUBLIC void insertFullTextualRepresentationAsDocumentProperty(css::uno::Reference const & rxPropertyContainer, + sfx::ClassificationKeyCreator const & rKeyCreator, + std::vector const & rResults); + +}} // end svx::classification namespace + +#endif // INCLUDED_SVX_CLASSIFICATIONCOMMON_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index d01957dcf10c..8a0c20a41889 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -59,6 +59,7 @@ #include #include #include +#include #include #include #include @@ -473,8 +474,13 @@ public: aHelper.SetBACName(rResult.msName, SfxClassificationHelper::getPolicyType()); } +// Initialize key creator sfx::ClassificationKeyCreator aKeyCreator(SfxClassificationHelper::getPolicyType()); +// Insert full text as document property + svx::classification::insertFullTextualRepresentationAsDocumentProperty(xPropertyContainer, aKeyCreator, rResults); + +// Insert Object into master page Outliner* pOutliner = m_rDrawViewShell.GetDoc()->GetInternalOutliner(); OutlinerMode eOutlinerMode = pOutliner->GetMode(); pOutliner->Init(OutlinerMode::TextObject); diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk index c04dfc8e6dc4..6bdbadaf2e3b 100644 --- a/svx/Library_svx.mk +++ b/svx/Library_svx.mk @@ -117,6 +117,7 @@ $(eval $(call gb_Library_add_exception_objects,svx,\ svx/source/dialog/crashreportdlg \ svx/source/dialog/crashreportui) \ svx/source/dialog/ctredlin \ +svx/source/dialog/ClassificationCommon \ svx/source/dialog/ClassificationDialog \ svx/source/dialog/ClassificationEditView \ svx/source/dialog/databaseregistrationui \ diff --git a/svx/source/dialog/ClassificationCommon.cxx b/svx/source/dialog/ClassificationCommon.cxx new file mode 100644 index ..60cfcf520ab4 --- /dev/null +++ b/svx/source/dialog/ClassificationCommon.cxx @@ -0,0 +1,79 @@ +/* -*- 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/.
[Libreoffice-commits] core.git: include/svx svx/source
include/svx/ClassificationDialog.hxx |2 + include/svx/strings.hrc|3 + svx/source/dialog/ClassificationDialog.cxx | 45 +++-- 3 files changed, 41 insertions(+), 9 deletions(-) New commits: commit 8f1f4d5a6f4b376975e9e2f318e8c92d4bade90a Author: Tomaž VajngerlDate: Fri Nov 3 21:04:32 2017 +0900 TSCP: Ask if it is OK to change the classification category Change-Id: I30ccdfb9d0584d8ee9b12666b1f96eb9ba8676ee Reviewed-on: https://gerrit.libreoffice.org/44278 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl diff --git a/include/svx/ClassificationDialog.hxx b/include/svx/ClassificationDialog.hxx index 85a70eb95f95..59502eca4286 100644 --- a/include/svx/ClassificationDialog.hxx +++ b/include/svx/ClassificationDialog.hxx @@ -48,6 +48,8 @@ private: const bool m_bPerParagraph; const std::function m_aParagraphSignHandler; +sal_Int32 m_nCurrentSelectedCategory; + DECL_LINK(ButtonClicked, Button*, void); DECL_LINK(SelectClassificationHdl, ListBox&, void); DECL_LINK(SelectMarkingHdl, ListBox&, void); diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc index 208ba1bc7e49..bed776d4ce1a 100644 --- a/include/svx/strings.hrc +++ b/include/svx/strings.hrc @@ -1646,6 +1646,9 @@ #define RID_SUBSETSTR_TANGUT NC_("RID_SUBSETMAP", "Tangut") #define RID_SUBSETSTR_TANGUT_COMPONENTS NC_("RID_SUBSETMAP", "Tangut Components") +// TSCP Classification +#define RID_CLASSIFICATION_CHANGE_CATEGORY NC_("RID_CLASSIFICATION_CHANGE_CATEGORY", "Do you really want to change the classification category?") + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/ClassificationDialog.cxx b/svx/source/dialog/ClassificationDialog.cxx index 30f6c796240f..2e8b0c4ad8fc 100644 --- a/svx/source/dialog/ClassificationDialog.cxx +++ b/svx/source/dialog/ClassificationDialog.cxx @@ -9,13 +9,16 @@ */ #include +#include +#include + #include #include #include #include #include #include - +#include #include #include #include @@ -371,9 +374,9 @@ void ClassificationDialog::readIn(std::vector const & rInp sal_Int32 nParagraph = -1; for (ClassificationResult const & rClassificationResult : rInput) { -OUString msAbbreviatedName = rClassificationResult.msAbbreviatedName; -if (msAbbreviatedName.isEmpty()) -msAbbreviatedName = maHelper.GetAbbreviatedBACName(rClassificationResult.msName); +OUString sAbbreviatedName = rClassificationResult.msAbbreviatedName; +if (sAbbreviatedName.isEmpty()) +sAbbreviatedName = maHelper.GetAbbreviatedBACName(rClassificationResult.msName); switch (rClassificationResult.meType) { @@ -386,21 +389,23 @@ void ClassificationDialog::readIn(std::vector const & rInp case svx::ClassificationType::CATEGORY: { m_pClassificationListBox->SelectEntry(rClassificationResult.msName); +m_nCurrentSelectedCategory = m_pClassificationListBox->GetSelectedEntryPos(); m_pInternationalClassificationListBox->SelectEntryPos(m_pClassificationListBox->GetSelectedEntryPos()); -insertField(rClassificationResult.meType, msAbbreviatedName, rClassificationResult.msName, rClassificationResult.msIdentifier); + +insertField(rClassificationResult.meType, sAbbreviatedName, rClassificationResult.msName, rClassificationResult.msIdentifier); } break; case svx::ClassificationType::MARKING: { m_pMarkingListBox->SelectEntry(rClassificationResult.msName); -insertField(rClassificationResult.meType, msAbbreviatedName, rClassificationResult.msName, rClassificationResult.msIdentifier); +insertField(rClassificationResult.meType, sAbbreviatedName, rClassificationResult.msName, rClassificationResult.msIdentifier); } break; case svx::ClassificationType::INTELLECTUAL_PROPERTY_PART: { -insertField(rClassificationResult.meType, msAbbreviatedName, rClassificationResult.msName, rClassificationResult.msIdentifier); +insertField(rClassificationResult.meType, sAbbreviatedName, rClassificationResult.msName, rClassificationResult.msIdentifier); } break; @@ -485,12 +490,17 @@ std::vector ClassificationDialog::getResult() IMPL_LINK(ClassificationDialog, SelectClassificationHdl, ListBox&, rBox, void) { const sal_Int32 nSelected = rBox.GetSelectedEntryPos(); -if (nSelected >= 0) +if (nSelected >= 0 && m_nCurrentSelectedCategory != nSelected) { std::unique_ptr
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/data/org/openoffice/Office/Common.xcu |2 -- 1 file changed, 2 deletions(-) New commits: commit 5c5ccedcb7f79ad9c5319751c246b3ebfb93523c Author: Tomaž VajngerlDate: Fri Nov 3 13:55:07 2017 +0900 setting the default values not needed in xcu Change-Id: I9bb60f1e7c58bbb63e8933578b83b77a178f325b Reviewed-on: https://gerrit.libreoffice.org/44277 Reviewed-by: Tomaž Vajngerl Tested-by: Tomaž Vajngerl diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu b/officecfg/registry/data/org/openoffice/Office/Common.xcu index 2d98eec21da9..c6bbd2d46058 100644 --- a/officecfg/registry/data/org/openoffice/Office/Common.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu @@ -538,10 +538,8 @@ -3 -true ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 113636] Calc failing to show cell references
https://bugs.documentfoundation.org/show_bug.cgi?id=113636 --- Comment #1 from Alexandre Monobe--- Created attachment 137512 --> https://bugs.documentfoundation.org/attachment.cgi?id=137512=edit example Here's what I see whem I look for the references. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 113636] Calc failing to show cell references
https://bugs.documentfoundation.org/show_bug.cgi?id=113636 Alexandre Monobechanged: What|Removed |Added Hardware|x86-64 (AMD64) |All -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 113636] Calc failing to show cell references
https://bugs.documentfoundation.org/show_bug.cgi?id=113636 Alexandre Monobechanged: What|Removed |Added Hardware|All |x86-64 (AMD64) -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 113636] New: Calc failing to show cell references
https://bugs.documentfoundation.org/show_bug.cgi?id=113636 Bug ID: 113636 Summary: Calc failing to show cell references Product: LibreOffice Version: 5.4.2.2 release Hardware: All OS: Linux (All) Status: UNCONFIRMED Severity: normal Priority: medium Component: Calc Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: alexandremon...@yahoo.com.br Description: Any formula or operation done in any cell won't show any of it's references. Even though the "Show references in colours" is enabled on Tools -> Options. It's curious that it seems this issue is not affecting all distros... It seems the ones that LO's is already using GTK3 are ok. To reproduce the issue take any distro with LO + GTK2 and do this simple: Put this formula at B1 =sum(A1:A10) Then double click B1 and see that LO don't show the formula references. Steps to Reproduce: 1. Make a formula/operation 2. Double click that cell and check if the references are shown Actual Results: The cell with the formula/operation is opened but NO REFERENCES are shown, no colours, no highlights, nothing. Expected Results: The formula cell should show highlights with different colour highlights to each range/cell used. Reproducible: Always User Profile Reset: No Additional Info: User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:58.0) Gecko/20100101 Firefox/58.0 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 60315] RTL: Slide pane context menu opens going left rather than going right
https://bugs.documentfoundation.org/show_bug.cgi?id=60315 --- Comment #12 from Commit Notification--- Caolán McNamara committed a patch related to this issue. It has been pushed to "master": http://cgit.freedesktop.org/libreoffice/core/commit/?id=d8f0e4144d51ff5709d005d289d71aa32f323913 Resolves: rtl: tdf#60315 slide pane context menu misplaced It will be available in 6.0.0. The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 60315] RTL: Slide pane context menu opens going left rather than going right
https://bugs.documentfoundation.org/show_bug.cgi?id=60315 Commit Notificationchanged: What|Removed |Added Whiteboard||target:6.0.0 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: sd/source
sd/source/ui/slidesorter/controller/SlideSorterController.cxx | 15 +++--- 1 file changed, 5 insertions(+), 10 deletions(-) New commits: commit d8f0e4144d51ff5709d005d289d71aa32f323913 Author: Caolán McNamaraDate: Fri Nov 3 16:24:14 2017 + Resolves: rtl: tdf#60315 slide pane context menu misplaced so use same (slighty crazed) logic as DrawViewShell::Command to get the right place when rtl is enabled Change-Id: Icb4a39310ab98bd186cbafd516ca5f323da8cce1 Reviewed-on: https://gerrit.libreoffice.org/44274 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx index 9107111302e4..63056255ed1d 100644 --- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx +++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx @@ -353,15 +353,7 @@ bool SlideSorterController::Command ( pWindow->ReleaseMouse(); Point aMenuLocation (0,0); -if (rEvent.IsMouseEvent()) -{ -// We have to explicitly specify the location of the menu -// when the slide sorter is placed in an undocked child -// menu. But when it is docked it does not hurt, so we -// specify the location always. -aMenuLocation = rEvent.GetMousePosPixel(); -} -else +if (!rEvent.IsMouseEvent()) { // The event is not a mouse event. Use the center of the // focused page as top left position of the context menu. @@ -384,7 +376,10 @@ bool SlideSorterController::Command ( if (pDispatcher != nullptr) { mbContextMenuOpen = true; -pDispatcher->ExecutePopup( aPopupId, pWindow, ); +if (!rEvent.IsMouseEvent()) +pDispatcher->ExecutePopup(aPopupId, pWindow, ); +else +pDispatcher->ExecutePopup(aPopupId); mbContextMenuOpen = false; mrSlideSorter.GetView().UpdatePageUnderMouse(); ::rtl::Reference pFunction(GetCurrentSelectionFunction()); ___ 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/gtk3gtkframe.cxx |9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) New commits: commit 5228db64eb9f55c945f1b460f2955fc3edfad791 Author: Caolán McNamaraDate: Fri Nov 3 15:53:22 2017 + gtk3: fix popover placement in RTL Change-Id: I8c20b277ce943f915941b2af9353f98c66f9065c Reviewed-on: https://gerrit.libreoffice.org/44271 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx index d24bef907c00..0659d0740533 100644 --- a/vcl/unx/gtk3/gtk3gtkframe.cxx +++ b/vcl/unx/gtk3/gtk3gtkframe.cxx @@ -2454,7 +2454,7 @@ bool GtkSalFrame::ShowTooltip(const OUString& rHelpText, const tools::Rectangle& #if GTK_CHECK_VERSION(3,12,0) namespace { -void set_pointing_to(GtkPopover *pPopOver, const tools::Rectangle& rHelpArea) +void set_pointing_to(GtkPopover *pPopOver, const tools::Rectangle& rHelpArea, const SalFrameGeometry& rGeometry) { GdkRectangle aRect; aRect.x = rHelpArea.Left(); @@ -2475,6 +2475,9 @@ namespace break; } +if (AllSettings::GetLayoutRTL()) +aRect.x = rGeometry.nWidth-aRect.width-1-aRect.x; + gtk_popover_set_pointing_to(pPopOver, ); } } @@ -2497,7 +2500,7 @@ sal_uIntPtr GtkSalFrame::ShowPopover(const OUString& rHelpText, const tools::Rec else if (nFlags & QuickHelpFlags::Right) gtk_popover_set_position(GTK_POPOVER(pWidget), GTK_POS_LEFT); -set_pointing_to(GTK_POPOVER(pWidget), rHelpArea); +set_pointing_to(GTK_POPOVER(pWidget), rHelpArea, maGeometry); gtk_popover_set_modal(GTK_POPOVER(pWidget), false); @@ -2517,7 +2520,7 @@ bool GtkSalFrame::UpdatePopover(sal_uIntPtr nId, const OUString& rHelpText, cons #if GTK_CHECK_VERSION(3,12,0) GtkWidget *pWidget = reinterpret_cast (nId); -set_pointing_to(GTK_POPOVER(pWidget), rHelpArea); +set_pointing_to(GTK_POPOVER(pWidget), rHelpArea, maGeometry); GtkWidget *pLabel = gtk_bin_get_child(GTK_BIN(pWidget)); OString sUTF = OUStringToOString(rHelpText, RTL_TEXTENCODING_UTF8); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 113623] FILESAVE ODT: Error saving the document. Write Error. Error in writing sub-document styles.xml.
https://bugs.documentfoundation.org/show_bug.cgi?id=113623 --- Comment #6 from V Stuart Foote--- Created attachment 137511 --> https://bugs.documentfoundation.org/attachment.cgi?id=137511=edit TB39 20171101, SAL_LOG of Writer error crash on save So went back to the 2017-11-01 TB39 x86 build--dae6ba564fcf20299b7a560aeb346efc84364d41, and this issue was already present. Attaching SAL_LOG, sorry for the the OpenGL Info noise. Not sure what it means but this looks to be the failing sequence... line 82368 --> SfxDocumentEvent: OnSaveAs line 83245 --> SwXMLWriter::WriteThroughComponent: stream settings.xml line 83261 --> SwXMLWriter::WriteThroughComponent: stream styles.xml line 83275 --> com.sun.start.comp.Writer.XMLOasisStylesExporter line 83623 --> saxwriter.cxx:128 cached Sequence not written line 83983 --> SfxDocumentEvent: OnSaveAsFailed line 85838 get the painting for the Error Box, at line 85885. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
Crash test update
New crashtest update available at http://dev-builds.libreoffice.org/crashtest/9a236714e539c772cad7b56caf21dc12b79e77df/ exportCrashes.csv Description: Binary data importCrash.csv Description: Binary data validationErrors.csv Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/sfx2 sfx2/source
include/sfx2/frmdescr.hxx|2 +- sfx2/source/doc/frmdescr.cxx | 20 ++-- 2 files changed, 7 insertions(+), 15 deletions(-) New commits: commit 8ce49eab696d830d420fbf48b22ac151167bbd62 Author: Takeshi AbeDate: Fri Nov 3 20:48:38 2017 +0900 sfx2: Omit unnecessary indirection of SfxFrameDescriptor_Impl Change-Id: I43c9df757d78420bd119a06e7f7224e40690b753 Reviewed-on: https://gerrit.libreoffice.org/44255 Reviewed-by: Noel Grandin Reviewed-by: Takeshi Abe Tested-by: Takeshi Abe diff --git a/include/sfx2/frmdescr.hxx b/include/sfx2/frmdescr.hxx index 8433afa93887..cd0184c1f2e4 100644 --- a/include/sfx2/frmdescr.hxx +++ b/include/sfx2/frmdescr.hxx @@ -66,7 +66,7 @@ class SFX2_DLLPUBLIC SfxFrameDescriptor ScrollingMode eScroll; boolbHasBorder; boolbHasBorderSet; -std::unique_ptr< SfxFrameDescriptor_Impl > pImpl; +std::unique_ptr m_pArgs; public: SfxFrameDescriptor(); diff --git a/sfx2/source/doc/frmdescr.cxx b/sfx2/source/doc/frmdescr.cxx index 143c8742b2f4..2912b57c529e 100644 --- a/sfx2/source/doc/frmdescr.cxx +++ b/sfx2/source/doc/frmdescr.cxx @@ -25,19 +25,11 @@ #include #include -struct SfxFrameDescriptor_Impl -{ -std::unique_ptr pArgs; - -SfxFrameDescriptor_Impl() {} -}; - SfxFrameDescriptor::SfxFrameDescriptor() : aMargin( -1, -1 ), eScroll( ScrollingMode::Auto ), bHasBorder( true ), -bHasBorderSet( false ), -pImpl( new SfxFrameDescriptor_Impl ) +bHasBorderSet( false ) { } @@ -47,9 +39,9 @@ SfxFrameDescriptor::~SfxFrameDescriptor() SfxItemSet* SfxFrameDescriptor::GetArgs() { -if( !pImpl->pArgs ) -pImpl->pArgs.reset( new SfxAllItemSet( SfxGetpApp()->GetPool() ) ); -return pImpl->pArgs.get(); +if( !m_pArgs ) +m_pArgs.reset( new SfxAllItemSet( SfxGetpApp()->GetPool() ) ); +return m_pArgs.get(); } void SfxFrameDescriptor::SetURL( const OUString& rURL ) @@ -61,8 +53,8 @@ void SfxFrameDescriptor::SetURL( const OUString& rURL ) void SfxFrameDescriptor::SetActualURL( const OUString& rURL ) { aActualURL = INetURLObject(rURL); -if ( pImpl->pArgs ) -pImpl->pArgs->ClearItem(); +if ( m_pArgs ) +m_pArgs->ClearItem(); } /* 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-bugs] [Bug 113611] The data could not be loaded completely because the maximum number of rows per sheet was exceeded.
https://bugs.documentfoundation.org/show_bug.cgi?id=113611 --- Comment #5 from Eike Rathke--- Filter how? What does Excel do there? -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: external/libstaroffice external/redland solenv/gbuild
external/libstaroffice/Library_staroffice.mk |1 + external/redland/Library_raptor.mk |5 + external/redland/Library_rdf.mk |5 + solenv/gbuild/platform/com_MSC_class.mk |2 -- 4 files changed, 11 insertions(+), 2 deletions(-) New commits: commit f218f8f6c8c587d2d78679f935093329f145fede Author: Stephan BergmannDate: Fri Nov 3 16:41:53 2017 +0100 -I$(dir $(3)) in gb_CObject__command_pattern is no longer needed ...in com_MSC_class.mk now, similar to ecbaf980625a9e7b06abe91c7c70e78f6ad469a7 for com_GCC_class.mk. Three libraries built from external sources (for Windows only) needed adjustment. Change-Id: Id8976a30b80efff6119afb18ccaf6811fe27d2f8 Reviewed-on: https://gerrit.libreoffice.org/44270 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/external/libstaroffice/Library_staroffice.mk b/external/libstaroffice/Library_staroffice.mk index 23d805d3a8e0..afa8a032518f 100644 --- a/external/libstaroffice/Library_staroffice.mk +++ b/external/libstaroffice/Library_staroffice.mk @@ -19,6 +19,7 @@ $(eval $(call gb_Library_set_warnings_not_errors,staroffice)) $(eval $(call gb_Library_set_include,staroffice,\ -I$(call gb_UnpackedTarball_get_dir,libstaroffice)/inc \ +-I$(call gb_UnpackedTarball_get_dir,libstaroffice)/src/lib \ $$(INCLUDE) \ )) diff --git a/external/redland/Library_raptor.mk b/external/redland/Library_raptor.mk index 333c2947fef0..1f171c1bc752 100644 --- a/external/redland/Library_raptor.mk +++ b/external/redland/Library_raptor.mk @@ -9,6 +9,11 @@ $(eval $(call gb_Library_Library,raptor2)) +$(eval $(call gb_Library_set_include,raptor2, \ +-I$(call gb_UnpackedTarball_get_dir,raptor)/src \ +$$(INCLUDE) \ +)) + $(eval $(call gb_Library_use_unpacked,raptor2,raptor)) $(eval $(call gb_Library_use_externals,raptor2,\ diff --git a/external/redland/Library_rdf.mk b/external/redland/Library_rdf.mk index 6ce13e38d351..9e2f7279fa55 100644 --- a/external/redland/Library_rdf.mk +++ b/external/redland/Library_rdf.mk @@ -9,6 +9,11 @@ $(eval $(call gb_Library_Library,rdf)) +$(eval $(call gb_Library_set_include,rdf, \ +-I$(call gb_UnpackedTarball_get_dir,redland)/src \ +$$(INCLUDE) \ +)) + $(eval $(call gb_Library_use_unpacked,rdf,redland)) $(eval $(call gb_Library_set_warnings_not_errors,rdf)) diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 3bc5e3235420..b00741184d27 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -55,7 +55,6 @@ $(call gb_Helper_abbreviate_dirs,\ -Fd$(PDBFILE) \ $(PCHFLAGS) \ $(if $(COMPILER_TEST),,$(gb_COMPILERDEPFLAGS)) \ - -I$(dir $(3)) \ $(INCLUDE) \ $(if $(filter YES,$(CXXOBJECT_X64)), -U_X86_ -D_AMD64_,) \ -c $(3) \ @@ -83,7 +82,6 @@ $(call gb_Helper_abbreviate_dirs,\ $(if $(EXTERNAL_CODE),$(if $(COM_IS_CLANG),-Wno-undef),$(gb_DEFS_INTERNAL)) \ $(gb_LTOFLAGS) \ $(gb_COMPILERDEPFLAGS) \ - -I$(dir $(3)) \ $(6) \ -c $(3) \ -Yc$(notdir $(patsubst %.cxx,%.hxx,$(3))) -Fp$(1) -Fo$(1).obj) $(call gb_create_deps,$(call gb_PrecompiledHeader_get_dep_target_tmp,$(2)),$(1),$(3)) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sc/source
sc/source/ui/docshell/docsh.cxx | 14 ++ sc/source/ui/docshell/impex.cxx | 27 --- 2 files changed, 38 insertions(+), 3 deletions(-) New commits: commit 12f09377b91b6d70efb3448d098f4dbd677a67d1 Author: Eike RathkeDate: Fri Nov 3 23:10:01 2017 +0100 SYLK import: set and evaluate col/row overflow to display dialog Change-Id: Id997aac2fd90f53652c81884c51833c92494e32f diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index a9faf61da2b6..f9d2cc684d91 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -1345,6 +1345,8 @@ bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) else if (aFltName == pFilterSylk) { ErrCode eError = SCERR_IMPORT_UNKNOWN; +bool bOverflowRow, bOverflowCol, bOverflowCell; +bOverflowRow = bOverflowCol = bOverflowCell = false; if( !rMedium.IsStorage() ) { ScImportExport aImpEx( ); @@ -1358,6 +1360,10 @@ bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) aDocument.StartAllListeners(); sc::SetFormulaDirtyContext aCxt; aDocument.SetAllFormulasDirty(aCxt); + +bOverflowRow = aImpEx.IsOverflowRow(); +bOverflowCol = aImpEx.IsOverflowCol(); +bOverflowCell = aImpEx.IsOverflowCell(); } else { @@ -1367,6 +1373,14 @@ bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) if ( eError != ERRCODE_NONE && !GetError() ) SetError(eError); +else if (!GetError() && (bOverflowRow || bOverflowCol || bOverflowCell)) +{ +// precedence: row, column, cell +ErrCode nWarn = (bOverflowRow ? SCWARN_IMPORT_ROW_OVERFLOW : +(bOverflowCol ? SCWARN_IMPORT_COLUMN_OVERFLOW : + SCWARN_IMPORT_CELL_OVERFLOW)); +SetError(nWarn); +} bSetColWidths = true; bSetSimpleTextColWidths = true; bSetRowHeights = true; diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index 911c8ea584b0..953956213faa 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -1764,7 +1764,7 @@ bool ScImportExport::Sylk2Doc( SvStream& rStrm ) { SAL_WARN("sc.ui","ScImportExport::Sylk2Doc - ;X invalid nCol=" << nCol); nCol = std::max(0, std::min(nCol, MAXCOL)); -bInvalidCol = true; +bInvalidCol = bOverflowCol = true; } break; } @@ -1776,7 +1776,7 @@ bool ScImportExport::Sylk2Doc( SvStream& rStrm ) { SAL_WARN("sc.ui","ScImportExport::Sylk2Doc - ;Y invalid nRow=" << nRow); nRow = std::max(0, std::min(nRow, MAXROW)); -bInvalidRow = true; +bInvalidRow = bOverflowRow = true; } break; } @@ -1788,7 +1788,7 @@ bool ScImportExport::Sylk2Doc( SvStream& rStrm ) { SAL_WARN("sc.ui","ScImportExport::Sylk2Doc - ;C invalid nRefCol=" << nRefCol); nRefCol = std::max(0, std::min(nRefCol, MAXCOL)); -bInvalidRefCol = true; +bInvalidRefCol = bOverflowCol = true; } break; } @@ -1800,7 +1800,7 @@ bool ScImportExport::Sylk2Doc( SvStream& rStrm ) { SAL_WARN("sc.ui","ScImportExport::Sylk2Doc - ;R invalid nRefRow=" << nRefRow); nRefRow = std::max(0, std::min(nRefRow, MAXROW)); -bInvalidRefRow = true; +bInvalidRefRow = bOverflowRow = true; } break; } @@ -1925,7 +1925,7 @@ bool ScImportExport::Sylk2Doc( SvStream& rStrm ) { SAL_WARN("sc.ui","ScImportExport::Sylk2Doc - ;X invalid nCol=" << nCol); nCol = std::max(0, std::min(nCol, MAXCOL)); -bInvalidCol = true; +bInvalidCol = bOverflowCol = true; } break; } @@ -1937,7 +1937,7 @@ bool
[Libreoffice-bugs] [Bug 113635] FILEOPEN: EMF+ Intersect of images are not working correctly
https://bugs.documentfoundation.org/show_bug.cgi?id=113635 Bartoszchanged: What|Removed |Added Assignee|libreoffice-b...@lists.free |gan...@poczta.onet.pl |desktop.org | -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 113635] FILEOPEN: EMF+ Intersect of images are not working correctly
https://bugs.documentfoundation.org/show_bug.cgi?id=113635 Bartoszchanged: What|Removed |Added Keywords||regression -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 113635] FILEOPEN: EMF+ Intersect of images are not working correctly
https://bugs.documentfoundation.org/show_bug.cgi?id=113635 Bartoszchanged: What|Removed |Added Blocks||111486 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=111486 [Bug 111486] [META] Regressions from EMF+ reworking -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 111486] [META] Regressions from EMF+ reworking
https://bugs.documentfoundation.org/show_bug.cgi?id=111486 Bartoszchanged: What|Removed |Added Depends on||113635 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=113635 [Bug 113635] FILEOPEN: EMF+ Intersect of images are not working correctly -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 113635] FILEOPEN: EMF+ Intersect of images are not working correctly
https://bugs.documentfoundation.org/show_bug.cgi?id=113635 Bartoszchanged: What|Removed |Added Status|NEW |ASSIGNED -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 113635] FILEOPEN: EMF+ Intersect of images are not working correctly
https://bugs.documentfoundation.org/show_bug.cgi?id=113635 Bartoszchanged: What|Removed |Added CC||gan...@poczta.onet.pl --- Comment #1 from Bartosz --- Created attachment 137509 --> https://bugs.documentfoundation.org/attachment.cgi?id=137509=edit Sample file -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 113635] FILEOPEN: EMF+ Intersect of images are not working correctly
https://bugs.documentfoundation.org/show_bug.cgi?id=113635 Bartoszchanged: What|Removed |Added Status|UNCONFIRMED |NEW Ever confirmed|0 |1 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 113635] New: FILEOPEN: EMF+ Intersect of images are not working correctly
https://bugs.documentfoundation.org/show_bug.cgi?id=113635 Bug ID: 113635 Summary: FILEOPEN: EMF+ Intersect of images are not working correctly Product: LibreOffice Version: 6.0.0.0.alpha0+ Hardware: All OS: All Status: UNCONFIRMED Severity: normal Priority: medium Component: Calc Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: gan...@poczta.onet.pl Description: EMF+ EmfPlusRecordTypeSetClipRect and EmfPlusRecordTypeSetClipPath records needs to be updated after move to new engine. Steps to Reproduce: 1. Drag test_libuemf_p.emf file into Writer document 2. 3. Actual Results: Intersect star is not show correctly Expected Results: Intersect star is shows correctly Reproducible: Always User Profile Reset: No Additional Info: User-Agent: Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Ubuntu Chromium/62.0.3202.62 Chrome/62.0.3202.62 Safari/537.36 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sc/source
sc/source/core/data/column.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit 76c54edc8ee972c63da8ed1f5d6ab75ea552da46 Author: Eike RathkeDate: Thu Nov 2 12:53:14 2017 +0100 Resolves: tdf#111428 swap ScColumn::mnBlkCountFormula This is a combination of 2 commits. (cherry picked from commit 423df1fa929784c14e3a133c06468589fe9269cd) (cherry picked from commit 911e2aff3cc37cb7410292728ffea05fffbfb0b3) CellStoreEvent remembered the original ScColumn::mnBlkCountFormula, hence after inserting a column to the left the quick check of ScColumn::HasFormulaCell() whether there are any formula cells worked on the swapped in count (originally the one to the right) that happens to be empty in the scenario. Things worked correctly by accident if the next column to the right already contained a formula cell. c44fed96c49bea7365bf1200e06788860966795c Change-Id: If993856ceee657736f516a81c293506041a6b7eb Reviewed-on: https://gerrit.libreoffice.org/44210 Reviewed-by: Markus Mohrhard Tested-by: Eike Rathke diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx index 45f211cbedd1..5a817c2f747e 100644 --- a/sc/source/core/data/column.cxx +++ b/sc/source/core/data/column.cxx @@ -1899,6 +1899,9 @@ void ScColumn::SwapCol(ScColumn& rCol) maCellTextAttrs.swap(rCol.maCellTextAttrs); maCellNotes.swap(rCol.maCellNotes); +// Swap all CellStoreEvent mdds event_func related. +std::swap( mnBlkCountFormula, rCol.mnBlkCountFormula); + // notes update caption UpdateNoteCaptions(0, MAXROW); rCol.UpdateNoteCaptions(0, MAXROW); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 103100] [META] Writer table bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=103100 Bug 103100 depends on bug 113445, which changed state. Bug 113445 Summary: Sections inside tables: lack of rendered content due to loop control https://bugs.documentfoundation.org/show_bug.cgi?id=113445 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 113550] FILEOPEN: RTF: Incorrect text indent
https://bugs.documentfoundation.org/show_bug.cgi?id=113550 Miklos Vajnachanged: What|Removed |Added Status|NEW |ASSIGNED Assignee|libreoffice-b...@lists.free |vmik...@collabora.co.uk |desktop.org | -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 113587] Single Document version reappears after being deleted
https://bugs.documentfoundation.org/show_bug.cgi?id=113587 Julien Nabetchanged: What|Removed |Added Summary|Single Document version |Single Document version |reapperas after being |reappears after being |deleted |deleted -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/odfimport/odfimport.cxx |3 +++ sw/source/core/doc/docnew.cxx|3 +++ 2 files changed, 6 insertions(+) New commits: commit 2e39e519767d58a20829baca2fb0a2418b70f772 Author: Michael StahlDate: Fri Nov 3 21:48:37 2017 +0100 sw: ODF import: prevent shapes from inheriting paragraph default margins The problem is that even with the vertical-pos default fix, we don't render ShapesWithWrapping.odt the same as Word does: https://beta.opendocumentformat.org/rendercompare/upload/223/86/191/1 The shape still has a spurious bottom margin, which should not exist. This has a surprising cause: the default-style family="paragraph" has the attribute fo:margin-bottom="0.1388in" on paragraph-properties, which gets imported as the pool's default item of RES_UL_SPACE; there is nothing that prevents the shape from using this pool default item if it doesn't have a margin set on itself. Prevent that by overriding the pool default in SwDoc::mpDfltFrameFormat, which already carries a XFillStyleItem for similar reasons. The mpDfltFrameFormat is used by a lot more than just shapes, but none of that stuff should inherit paragraph defaults. As an aside the fo:margin-* properties are also allowed on style:graphic-properties, but it turns out that the implementation of the default-style family="graphic", in SvxUnoDrawPool/SwSvxUnoDrawPool, does not have the corresponding properties, hence cannot import these. Not sure if it would be better to have multiple SvxULSpace items with different IDs, so the paragraphs and shapes and etc. can have separate defaults. Change-Id: Ie6a196db567beb7a48b4176f383c88490dcfb8e7 diff --git a/sw/qa/extras/odfimport/odfimport.cxx b/sw/qa/extras/odfimport/odfimport.cxx index 365c01c21949..032a4a5da574 100644 --- a/sw/qa/extras/odfimport/odfimport.cxx +++ b/sw/qa/extras/odfimport/odfimport.cxx @@ -798,6 +798,9 @@ DECLARE_ODFIMPORT_TEST(testWordAsCharShape, "Word2010AsCharShape.odt") uno::Reference const xShape(getShape(1)); CPPUNIT_ASSERT_EQUAL(text::TextContentAnchorType_AS_CHARACTER, getProperty(xShape, "AnchorType")); CPPUNIT_ASSERT_EQUAL(text::VertOrientation::TOP, getProperty(xShape, "VertOrient")); +// also, the paragraph default fo:bottom-margin was wrongly applied to +// the shape +CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty(xShape, "BottomMargin")); } DECLARE_ODFIMPORT_TEST(testTdf100033_2, "tdf100033_2.odt") diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx index 24ad79bd6210..2fae0c3597d4 100644 --- a/sw/source/core/doc/docnew.cxx +++ b/sw/source/core/doc/docnew.cxx @@ -294,6 +294,9 @@ SwDoc::SwDoc() // it is possible to set this attribute here. It will be not reset when importing. mpDfltTextFormatColl->SetFormatAttr(XFillStyleItem(drawing::FillStyle_NONE)); mpDfltFrameFormat->SetFormatAttr(XFillStyleItem(drawing::FillStyle_NONE)); +// prevent paragraph default margins being applied to everything +mpDfltFrameFormat->SetFormatAttr(SvxULSpaceItem(RES_UL_SPACE)); +mpDfltFrameFormat->SetFormatAttr(SvxLRSpaceItem(RES_LR_SPACE)); /* * DefaultFormats and DefaultFormatCollections (FormatColl) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 108580] Cannot run LibreOffice, api-ms-win-crt-runtime-l1-1-0.dll is missing ( for local solution see comment 7)
https://bugs.documentfoundation.org/show_bug.cgi?id=108580 Adolfo Jaymechanged: What|Removed |Added Whiteboard|target:6.0.0 target:5.4.4 |target:6.0.0 target:5.4.3 |target:5.4.3| -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 113622] Impress can't play videos anymore
https://bugs.documentfoundation.org/show_bug.cgi?id=113622 Xisco Faulíchanged: What|Removed |Added Status|UNCONFIRMED |NEEDINFO CC||xiscofa...@libreoffice.org Ever confirmed|0 |1 --- Comment #1 from Xisco Faulí --- Thank you for reporting the bug. Please attach a sample document, as this makes it easier for us to verify the bug. I have set the bug's status to 'NEEDINFO'. Please change it back to 'UNCONFIRMED' once the requested document is provided. (Please note that the attachment will be public, remove any sensitive information before attaching it. See https://wiki.documentfoundation.org/QA/FAQ#How_can_I_eliminate_confidential_data_from_a_sample_document.3F for help on how to do so.) -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 113623] FILESAVE ODT: Error saving the document. Write Error. Error in writing sub-document styles.xml.
https://bugs.documentfoundation.org/show_bug.cgi?id=113623 --- Comment #5 from V Stuart Foote--- OP to comment #2 means a commit range for the issue, nothing jumps out at me though... https://cgit.freedesktop.org/libreoffice/core/log/?qt=range=b03fe77699b1ad30a9441bd9b283f25579ac261e..06cad1a9a42ea74434f9ed0e4027163d029eb4a1 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 113623] FILESAVE ODT: Error saving the document. Write Error. Error in writing sub-document styles.xml.
https://bugs.documentfoundation.org/show_bug.cgi?id=113623 V Stuart Footechanged: What|Removed |Added Status|UNCONFIRMED |NEW Ever confirmed|0 |1 OS|All |Windows (All) --- Comment #4 from V Stuart Foote --- With 2017-11-03 TB42 64-bit Windows build, getting a save error with Writer documents. "Write Error. Error in writing sub-document styles.xml" Build has no issue saving from Calc, Impress, Draw or Formula editor. Just from Writer with error as above. =-testing-= On Windows 10 Home 64-bit en-US with Version: 6.0.0.0.alpha1+ (x64) Build ID: 8c374022790b54834fa54615e1953c8ee30641a8 CPU threads: 4; OS: Windows 10.0; UI render: GL; TinderBox: Win-x86_64@42, Branch:master, Time: 2017-11-03_01:58:27 Locale: en-US (en_US); Calc: group -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 113623] FILESAVE ODT: Error saving the document. Write Error. Error in writing sub-document styles.xml.
https://bugs.documentfoundation.org/show_bug.cgi?id=113623 V Stuart Footechanged: What|Removed |Added CC||vstuart.fo...@utsa.edu --- Comment #3 from V Stuart Foote --- *** Bug 113631 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 112466] Cannot import libreoffice 5.2 basic macro library into libreoffice 5.3
https://bugs.documentfoundation.org/show_bug.cgi?id=112466 --- Comment #6 from Frederic Bron--- Anything I can change in my macros to make it work? I am completely blocked with no macros working. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 113631] Write Error Error in writing sub-document styles.xml
https://bugs.documentfoundation.org/show_bug.cgi?id=113631 V Stuart Footechanged: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |DUPLICATE --- Comment #2 from V Stuart Foote --- *** This bug has been marked as a duplicate of bug 113623 *** -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: framework/source include/vcl uui/source vcl/source
framework/source/dispatch/closedispatcher.cxx |9 --- framework/source/loadenv/loadenv.cxx |4 --- include/vcl/dialog.hxx|8 +- include/vcl/msgbox.hxx|5 +-- include/vcl/svapp.hxx |6 uui/source/iahndl.cxx | 33 +++--- vcl/source/app/svapp.cxx | 16 vcl/source/window/dialog.cxx | 10 --- vcl/source/window/msgbox.cxx |6 ++-- 9 files changed, 12 insertions(+), 85 deletions(-) New commits: commit fdcd11ff68fcd9e46aad6efc20779a063f4f6182 Author: Caolán McNamaraDate: Thu Nov 2 17:23:00 2017 + Resolves: tdf#113160 changing all warning dialogs to non-modal is unsafe existing code doesn't expect that so stuff crashes partial revert of... commit db6b703d391838c481fd090065f6d329edcd4efa Date: Thu Aug 24 18:32:38 2017 +0200 Allow non-modal Dialogs during FileImport/Load Change-Id: I152feb849186cf035664a700d3f94ee049cdf6d3 Reviewed-on: https://gerrit.libreoffice.org/44227 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx index 2055cdc5d517..70d40f58f1cc 100644 --- a/framework/source/dispatch/closedispatcher.cxx +++ b/framework/source/dispatch/closedispatcher.cxx @@ -38,7 +38,6 @@ #include #include #include -#include #include #include @@ -367,14 +366,6 @@ IMPL_LINK_NOARG(CloseDispatcher, impl_asyncCallback, LinkParamNone*, void) } } -// if we still have dialogs open, temporary suppress termination -if (bTerminateApp && Dialog::AreDialogsOpen()) -{ -Application::SetShutdownDelayed(); -bCloseFrame = true; -bTerminateApp = false; -} - // Do it now ... bool bSuccess = false; if (bCloseFrame) diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx index 3d6da4e3e003..3bfd87e3244c 100644 --- a/framework/source/loadenv/loadenv.cxx +++ b/framework/source/loadenv/loadenv.cxx @@ -371,10 +371,6 @@ void LoadEnv::startLoading() if (!bStarted) bStarted = impl_loadContent(); -// This may have triggered Dialogs (error cases) that may have -// delayed the shutdown, so give delayed shutdown a chance -Application::TriggerShutdownDelayed(); - // not started => general error // We can't say - what was the reason for. if (!bStarted) diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx index d7d7ce292cf6..d28ff0ac6d64 100644 --- a/include/vcl/dialog.hxx +++ b/include/vcl/dialog.hxx @@ -39,11 +39,8 @@ public: /** Use given parent or get a default one using GetDefaultParent(...) */ Default, -/** Suppress Parent so that Parent is not blocked (kind of modal mode) */ -NoParent, - -/** Suppress Parent (no modal, see above) and additionally center on default parent */ -NoParentCentered +/** No Parent */ +NoParent }; private: @@ -168,7 +165,6 @@ public: voidEndDialog( long nResult = 0 ); static void EndAllDialogs( vcl::Window const * pParent ); -static bool AreDialogsOpen(); voidGetDrawWindowBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder, sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const; diff --git a/include/vcl/msgbox.hxx b/include/vcl/msgbox.hxx index 7c377170566c..18b869318b90 100644 --- a/include/vcl/msgbox.hxx +++ b/include/vcl/msgbox.hxx @@ -69,9 +69,8 @@ protected: SAL_DLLPRIVATE void ImplPosControls(); public: -MessBox( vcl::Window* pParent, MessBoxStyle nMessBoxStyle, WinBits n, -const OUString& rTitle, const OUString& rMessage, -Dialog::InitFlag eInitFlag = Dialog::InitFlag::NoParentCentered); +MessBox(vcl::Window* pParent, MessBoxStyle nMessBoxStyle, WinBits n, +const OUString& rTitle, const OUString& rMessage); virtual ~MessBox() override; virtual voiddispose() override; diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx index e895dde09a7d..dd10349a41b2 100644 --- a/include/vcl/svapp.hxx +++ b/include/vcl/svapp.hxx @@ -1384,12 +1384,6 @@ public: // For vclbootstrapprotector: static void setDeInitHook(Link const & hook); -// for delayed shutdown: set using SetShutdownDelayed, then -// trigger using TriggerShutdownDelayed which may actually shutdown -// when SetShutdownDelayed is set -static void SetShutdownDelayed(); -static void
[Libreoffice-bugs] [Bug 113633] Turn hidden buttons to visible toggle buttons in line spacing group button
https://bugs.documentfoundation.org/show_bug.cgi?id=113633 --- Comment #1 from Heiko Tietze--- Menus are not toggle buttons so there wont get a lowered appearance, I guess. But some kind of indicator is definitely needed. And that could be done with a dashed rectangle or a highlighted background, like in other menus buttons. Workaround today: get the information from the custom value field. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 83103] Indent spacing after numbering wrong when numbering value has 4 or more characters
https://bugs.documentfoundation.org/show_bug.cgi?id=83103 --- Comment #19 from Heiko Tietze--- (In reply to almos from comment #18) > How about aligning everything to the longest number? That needs code. Alexandre's idea sounds good though I'm not sure that MS right aligns the numbers. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] online.git: Changes to 'refs/tags/2.1.5-rc2'
Tag '2.1.5-rc2' created by Andras Timarat 2017-11-03 20:50 + 2.1.5-rc2 Changes since 2.1.5-rc1-6: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - debian/changelog loolwsd.spec.in
debian/changelog |6 ++ loolwsd.spec.in |2 +- 2 files changed, 7 insertions(+), 1 deletion(-) New commits: commit e424147870761cdc6e43a670c9608c759a307d2c Author: Andras TimarDate: Fri Nov 3 21:50:24 2017 +0100 Bumo version for packages 2.1.5-2 Change-Id: I82f94e5273e8996e09179dc5005b011fd195c14a diff --git a/debian/changelog b/debian/changelog index ada4761d..ccef62ae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +loolwsd (2.1.5-2) unstable; urgency=medium + + * see the git log: http://col.la/cool21 + + -- Andras Timar Fri, 03 Nov 2017 21:10:00 +0100 + loolwsd (2.1.5-1) unstable; urgency=medium * see the git log: http://col.la/cool21 diff --git a/loolwsd.spec.in b/loolwsd.spec.in index ef545acf..baf4c9e8 100644 --- a/loolwsd.spec.in +++ b/loolwsd.spec.in @@ -12,7 +12,7 @@ Name: loolwsd%{name_suffix} Name: loolwsd %endif Version:@PACKAGE_VERSION@ -Release:1%{?dist} +Release:2%{?dist} %if 0%{?suse_version} == 1110 Group: Productivity/Office/Suite BuildRoot: %{_tmppath}/%{name}-%{version}-build ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - loleaflet/po
loleaflet/po/help-kn.po | 60 ++--- loleaflet/po/ui-am.po| 14 loleaflet/po/ui-ca.po| 52 +--- loleaflet/po/ui-cs.po| 54 + loleaflet/po/ui-cy.po| 30 -- loleaflet/po/ui-da.po|9 ++--- loleaflet/po/ui-de.po|6 +-- loleaflet/po/ui-es.po| 29 - loleaflet/po/ui-gl.po| 67 +++-- loleaflet/po/ui-it.po| 76 ++- loleaflet/po/ui-nl.po| 32 --- loleaflet/po/ui-pt_BR.po |4 +- loleaflet/po/ui-tr.po| 54 + 13 files changed, 250 insertions(+), 237 deletions(-) New commits: commit ab1078ddbf708c8de7f892c1bfd0547b05e8bc78 Author: Andras TimarDate: Fri Nov 3 12:09:00 2017 +0100 Updated translations from Pootle Change-Id: I0a435fed6e8c81af561630f5aa4760331020f169 Reviewed-on: https://gerrit.libreoffice.org/44252 Reviewed-by: Andras Timar Tested-by: Andras Timar diff --git a/loleaflet/po/help-kn.po b/loleaflet/po/help-kn.po index d8c9bd6c..5da870db 100644 --- a/loleaflet/po/help-kn.po +++ b/loleaflet/po/help-kn.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-10-05 08:01+\n" +"POT-Creation-Date: 2017-11-03 09:01+\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -12,7 +12,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Translate Toolkit 2.2.3\n" "X-Pootle-Path: /kn/libo_online/loleaflet-help-kn.po\n" -"X-Pootle-Revision: 2780598\n" +"X-Pootle-Revision: 2846269\n" #: dist%2Floleaflet-help.html+div.h1%3A25 msgid "Keyboard Shortcuts" @@ -139,20 +139,18 @@ msgstr "" #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A45 #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A166 -#, fuzzy msgid "Ctrl + Shift + P" -msgstr "Ctrl + Shift + ?" +msgstr "Ctrl + Shift + P" #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A46 #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A167 msgid "Subscript" -msgstr "" +msgstr "ಠಡಿಲà³à²" #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A46 #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A167 -#, fuzzy msgid "Ctrl + Shift + B" -msgstr "Ctrl + Shift + ?" +msgstr "Ctrl + Shift + B" #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A47 #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A141 @@ -161,9 +159,8 @@ msgstr "" #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A47 #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A141 -#, fuzzy msgid "Ctrl + M" -msgstr "Ctrl + Z" +msgstr "Ctrl + M" #: dist%2Floleaflet-help.html+div.div.h2%3A49 #: dist%2Floleaflet-help.html+div.div.h2%3A170 @@ -179,75 +176,68 @@ msgstr "" #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A51 #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A146 #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A172 -#, fuzzy msgid "Ctrl + E" -msgstr "Ctrl + Z" +msgstr "Ctrl + E" #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A52 #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A147 #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A173 msgid "Align Left" -msgstr "" +msgstr "à²à²¡à²à³à²à³ ಹà³à²à²¦à²¿à²¸à³" #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A52 #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A147 #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A173 -#, fuzzy msgid "Ctrl + L" -msgstr "Ctrl + Z" +msgstr "Ctrl + L" #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A53 #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A148 #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A174 msgid "Align Right" -msgstr "" +msgstr "ಬಲà²à³à²à³ ಹà³à²à²¦à²¿à²¸à³" #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A53 #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A148 #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A174 -#, fuzzy msgid "Ctrl + R" -msgstr "Ctrl + Z" +msgstr "Ctrl + R" #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A54 #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A149 #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A175 msgid "Justify" -msgstr "" +msgstr "ಸರಿಹà³à²à²¦à²¿à²¸à³" #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A54 #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A149 #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A175 -#, fuzzy msgid "Ctrl + J" -msgstr "Ctrl + Z" +msgstr "Ctrl + J" #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A55 msgid "Apply Default paragraph style" msgstr "" #: dist%2Floleaflet-help.html+div.div.table.tr.td%3A55 -#, fuzzy msgid "Ctrl + 0" -msgstr "Ctrl + Z" +msgstr
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - loolwsd-systemplate-setup
loolwsd-systemplate-setup |1 + 1 file changed, 1 insertion(+) New commits: commit 84c8b20b6800701e8ab7c8347ad4c112ad8810d7 Author: Andras TimarDate: Mon Oct 30 11:01:14 2017 +0100 copy system hyphenation dictionaries to systemplate Change-Id: Ie7e5a2644436d5de61f65b2d8ec5201471100787 (cherry picked from commit 61a2d94f2b34392f83eb4d62d8ced459eed58bab) Reviewed-on: https://gerrit.libreoffice.org/44051 Reviewed-by: Andras Timar Tested-by: Andras Timar diff --git a/loolwsd-systemplate-setup b/loolwsd-systemplate-setup index 790bbb38..be94a154 100755 --- a/loolwsd-systemplate-setup +++ b/loolwsd-systemplate-setup @@ -36,6 +36,7 @@ find etc/passwd etc/group etc/hosts \ usr/lib/locale/locale_archive \ usr/share/zoneinfo/* \ usr/share/liblangtag \ + usr/share/hyphen \ usr/lib/libpng* usr/lib64/libpng* lib/*-linux-gnu/libpng* \ -type f ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - loleaflet/dist loleaflet/src wsd/DocumentBroker.cpp
loleaflet/dist/loleaflet.html |2 + loleaflet/dist/toolbar.css| 25 ++ loleaflet/dist/toolbar/toolbar.js | 37 ++ loleaflet/src/map/handler/Map.WOPI.js |2 + wsd/DocumentBroker.cpp|1 5 files changed, 67 insertions(+) New commits: commit 41dfc1ab2c4006c5c38dfa10550e218442154e54 Author: Jan HolesovskyDate: Tue Oct 31 17:58:58 2017 +0100 Save As: UI for changing the document name. Change-Id: I23aba95ff0f8d867b021ba3cf0a6bc5eb4754f9d Reviewed-on: https://gerrit.libreoffice.org/44282 Reviewed-by: Andras Timar Tested-by: Andras Timar diff --git a/loleaflet/dist/loleaflet.html b/loleaflet/dist/loleaflet.html index 13e60e54..5d3ccd8a 100644 --- a/loleaflet/dist/loleaflet.html +++ b/loleaflet/dist/loleaflet.html @@ -53,6 +53,8 @@ + + diff --git a/loleaflet/dist/toolbar.css b/loleaflet/dist/toolbar.css index 0b65e88f..6564ae95 100644 --- a/loleaflet/dist/toolbar.css +++ b/loleaflet/dist/toolbar.css @@ -72,6 +72,31 @@ width: 700px; } +#document-name-input { +position: fixed; +z-index: 1050; +right: 35px; +top: 2px; +width: 200px; +font-size: 16px; +//font-weight: bold; +border: 1px solid transparent; +background-color: transparent; +} + +#document-name-input.editable:focus { +border: 1px solid #bb; +background-color: white; +} + +#document-name-input.editable:hover { +border: 1px solid #bb; +background-color: white; +background-image: url('../images/lc_editdoc.svg'); +background-position: right; +background-repeat: no-repeat; +} + #closebuttonwrapper { position: fixed; z-index: 1050; diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js index ea7e567b..1e1a89f5 100644 --- a/loleaflet/dist/toolbar/toolbar.js +++ b/loleaflet/dist/toolbar/toolbar.js @@ -774,6 +774,27 @@ function onSearchKeyPress(e) { } } +function documentNameConfirm() { + var value = $('#document-name-input').val(); + if (value !== null && value != '') { + map.saveAs(value); + } + map._onGotFocus(); +} + +function documentNameCancel() { + $('#document-name-input').val(map['wopi'].BaseFileName); + map._onGotFocus(); +} + +function onDocumentNameKeyPress(e) { + if (e.keyCode === 13) { // Enter key + documentNameConfirm(); + } else if (e.keyCode === 27) { // Escape key + documentNameCancel(); + } +} + function sortFontSizes() { var oldVal = $('.fontsizes-select').val(); var selectList = $('.fontsizes-select option'); @@ -963,6 +984,22 @@ map.on('wopiprops', function(e) { evt.preventDefault(); }); } + if (e.BaseFileName !== null) { + // set the document name into the name field + $('#document-name-input').val(e.BaseFileName); + } + if (e.UserCanNotWriteRelative === false) { + // Save As allowed + $('#document-name-input').prop('disabled', false); + $('#document-name-input').addClass('editable'); + $('#document-name-input').on('keypress', onDocumentNameKeyPress); + $('#document-name-input').on('focus', function() { map._onLostFocus(); /* hide the caret in the main document */ }); + $('#document-name-input').on('blur', documentNameCancel); + } else { + $('#document-name-input').prop('disabled', true); + $('#document-name-input').removeClass('editable'); + $('#document-name-input').off('keypress', onDocumentNameKeyPress); + } }); map.on('doclayerinit', function () { diff --git a/loleaflet/src/map/handler/Map.WOPI.js b/loleaflet/src/map/handler/Map.WOPI.js index e2a3840d..f06e30fc 100644 --- a/loleaflet/src/map/handler/Map.WOPI.js +++ b/loleaflet/src/map/handler/Map.WOPI.js @@ -8,6 +8,7 @@ L.Map.WOPI = L.Handler.extend({ // So use '*' because we still needs to send 'close' message to the parent frame which // wouldn't be possible otherwise. PostMessageOrigin: '*', + BaseFileName: '', DocumentLoadedTime: false, HidePrintOption: false, HideSaveOption: false, @@ -61,6 +62,7 @@ L.Map.WOPI = L.Handler.extend({ this.PostMessageOrigin = wopiInfo['PostMessageOrigin']; } + this.BaseFileName = wopiInfo['BaseFileName']; this.HidePrintOption = !!wopiInfo['HidePrintOption']; this.HideSaveOption = !!wopiInfo['HideSaveOption']; this.HideExportOption = !!wopiInfo['HideExportOption']; diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp index 966c3184..a6a91c1a 100644 ---
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - loleaflet/src
loleaflet/src/control/Toolbar.js |5 - loleaflet/src/core/Socket.js | 31 +-- loleaflet/src/map/handler/Map.WOPI.js |2 +- 3 files changed, 34 insertions(+), 4 deletions(-) New commits: commit dd2c950185e3622441929167672df39b9bd40f07 Author: Jan HolesovskyDate: Fri Nov 3 19:00:58 2017 +0100 Save As: Reload the newly created document after the Save As. Change-Id: Ibf979cce4fea13a31ece089394dab296158a159b Reviewed-on: https://gerrit.libreoffice.org/44283 Reviewed-by: Andras Timar Tested-by: Andras Timar diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js index c47e523d..337188a0 100644 --- a/loleaflet/src/control/Toolbar.js +++ b/loleaflet/src/control/Toolbar.js @@ -85,6 +85,9 @@ L.Map.include({ }, saveAs: function (url, format, options) { + if (url === undefined || url == null) { + return; + } if (format === undefined || format === null) { format = ''; } @@ -94,7 +97,7 @@ L.Map.include({ this.showBusy(_('Saving...'), false); this._socket.sendMessage('saveas ' + - 'url=' + url + ' ' + + 'url=wopi:' + encodeURIComponent(url) + ' ' + 'format=' + format + ' ' + 'options=' + options); }, diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js index e5028b69..cc7e8d6c 100644 --- a/loleaflet/src/core/Socket.js +++ b/loleaflet/src/core/Socket.js @@ -119,6 +119,12 @@ L.Socket = L.Class.extend({ this.socket.send(msg); }, + _getParameterByName: function(url, name) { + name = name.replace(/[\[]/, '\\[').replace(/[\]]/, '\\]'); + var regex = new RegExp('[\\?&]' + name + '=([^
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - vcl/win
vcl/win/gdi/winlayout.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit de811bb2359757b90a0a9851963bd8702b97dab0 Author: Mike KaganskiDate: Fri Nov 3 13:19:10 2017 +0200 Related: tdf#113347: properly check HRESULT value HRESULT's "success" value S_OK is 0; they are failed when their values are negative. So, the incorrect check resulted in false failures. Change-Id: I56560ced73e335af49c66d58201d5455e555e431 Reviewed-on: https://gerrit.libreoffice.org/44180 Tested-by: Jenkins Reviewed-by: Mike Kaganski (cherry picked from commit 11459949e920fab6074bab85e3e1a748e9aee1ee) Reviewed-on: https://gerrit.libreoffice.org/44253 Reviewed-by: Michael Stahl Tested-by: Michael Stahl diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx index 47eda10aedf3..f9d1c2812066 100644 --- a/vcl/win/gdi/winlayout.cxx +++ b/vcl/win/gdi/winlayout.cxx @@ -562,7 +562,7 @@ bool D2DWriteTextOutRenderer::BindFont(HDC hDC) // Initially bind to an empty rectangle to get access to the font face, // we'll update it once we've calculated a bounding rect in DrawGlyphs -if (!BindDC(mhDC = hDC)) +if (FAILED(BindDC(mhDC = hDC))) return false; mlfEmHeight = 0; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 43808] [META] Right-To-Left (aka Complex Text Layout) language issues (RTL/CTL)
https://bugs.documentfoundation.org/show_bug.cgi?id=43808 V Stuart Footechanged: What|Removed |Added Depends on||113629 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=113629 [Bug 113629] Jump punctuation marks, while type Old Hungarian keyboard layout -- a weak BiDi filter issue -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 60533] Brackets (..), {..}, [..] inverted )..(, }..{, ]..[ when switch to RTL text direction with all fonts (Affect : calc, impress, draw).
https://bugs.documentfoundation.org/show_bug.cgi?id=60533 V Stuart Footechanged: What|Removed |Added See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=11 ||3629 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 113629] Jump punctuation marks, while type Old Hungarian keyboard layout -- a weak BiDi filter issue
https://bugs.documentfoundation.org/show_bug.cgi?id=113629 V Stuart Footechanged: What|Removed |Added CC||vstuart.fo...@utsa.edu See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=60 ||533 Blocks||43808 Summary|Jump punctuation marks, |Jump punctuation marks, |while type Old Hungarian|while type Old Hungarian |keyboard layout |keyboard layout -- a weak ||BiDi filter issue Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=43808 [Bug 43808] [META] Right-To-Left (aka Complex Text Layout) language issues (RTL/CTL) -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sw/source
sw/source/core/undo/untblk.cxx | 12 ++-- 1 file changed, 10 insertions(+), 2 deletions(-) New commits: commit 39285d3621674097c415808084178faff6691664 Author: Fyodor YemelyanenkoDate: Thu Oct 26 11:12:39 2017 +1000 tdf#108124 fix: crash during redo, when document contains images Redo action fixed to reinsert images to document correctly. For details, pls see https://bugs.documentfoundation.org/show_bug.cgi?id=108124 Change-Id: Ie20dfcc8b9bfd5096c3c9459446c2a972129f3bf Reviewed-on: https://gerrit.libreoffice.org/43862 Reviewed-by: Michael Stahl Tested-by: Michael Stahl (cherry picked from commit c263c25052ca7812ec8789b8825bca11da845054) Reviewed-on: https://gerrit.libreoffice.org/44264 Tested-by: Jenkins diff --git a/sw/source/core/undo/untblk.cxx b/sw/source/core/undo/untblk.cxx index 9c5ac1eb8ec0..9b44e00522ea 100644 --- a/sw/source/core/undo/untblk.cxx +++ b/sw/source/core/undo/untblk.cxx @@ -285,9 +285,17 @@ void SwUndoInserts::RedoImpl(::sw::UndoRedoContext & rContext) pTextNd->ChgFormatColl( pLastNdColl ); } -for (size_t n = m_FlyUndos.size(); 0 < n; --n) +// tdf#108124 (10/25/2017) +// During UNDO we call SwUndoInsLayFormat::UndoImpl in reverse order, +// firstly for m_FlyUndos[ m_FlyUndos.size()-1 ], etc. +// As absolute node index of fly stored in SwUndoFlyBase::nNdPgPos we +// should recover from Undo in direct order (last should be recovered first) +// During REDO we should recover Flys (Images) in direct order, +// firstly m_FlyUndos[0], then with m_FlyUndos[1] index, etc. + +for (size_t n = 0; m_FlyUndos.size() > n; ++n) { -m_FlyUndos[ n-1 ]->RedoImpl(rContext); +m_FlyUndos[n]->RedoImpl(rContext); } pHistory->Rollback( pDoc, nSetPos ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 72341] Increase/Decrease font doesn' t apply to bullet in RTL paragraph when text script isn't RTL
https://bugs.documentfoundation.org/show_bug.cgi?id=72341 --- Comment #13 from Omer Zak--- Still happens in: Version: 5.4.2.2.0+ Build ID: 1:5.4.2-3~bpo9+1 CPU threads: 8; OS: Linux 4.9; UI render: default; VCL: gtk2; Locale: en-US (en_US.utf8); Calc: group OS: Debian 64bit Stretch (Debian 9.2, with some backported packages) Happens only when I change the text size using the CTRL+[ and CTRL+] shortcuts. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 113634] odt files do not open
https://bugs.documentfoundation.org/show_bug.cgi?id=113634 Xisco Faulíchanged: What|Removed |Added Status|UNCONFIRMED |NEEDINFO CC||xiscofa...@libreoffice.org Ever confirmed|0 |1 --- Comment #1 from Xisco Faulí --- Thank you for reporting the bug. Please attach a sample document, as this makes it easier for us to verify the bug. I have set the bug's status to 'NEEDINFO'. Please change it back to 'UNCONFIRMED' once the requested document is provided. (Please note that the attachment will be public, remove any sensitive information before attaching it. See https://wiki.documentfoundation.org/QA/FAQ#How_can_I_eliminate_confidential_data_from_a_sample_document.3F for help on how to do so.) -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 71732] [META] Bugs related to text rendering, typography and font features in LO
https://bugs.documentfoundation.org/show_bug.cgi?id=71732 Bug 71732 depends on bug 106954, which changed state. Bug 106954 Summary: Font LaDanse recognized but not rendered in Writer https://bugs.documentfoundation.org/show_bug.cgi?id=106954 What|Removed |Added Status|NEEDINFO|RESOLVED Resolution|--- |WORKSFORME -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 106954] Font LaDanse recognized but not rendered in Writer
https://bugs.documentfoundation.org/show_bug.cgi?id=106954 V Stuart Footechanged: What|Removed |Added Status|NEEDINFO|RESOLVED Resolution|--- |WORKSFORME -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 71037] FORMATTING: wrong page number direction in footnote' s continuation notice
https://bugs.documentfoundation.org/show_bug.cgi?id=71037 --- Comment #9 from Omer Zak--- LibreOffice crashed when I tried to edit the example document. My attempt was to insert more text to enlarge the document to 13 pages. Version: 5.4.2.2.0+ Build ID: 1:5.4.2-3~bpo9+1 CPU threads: 8; OS: Linux 4.9; UI render: default; VCL: gtk2; Locale: en-US (en_US.utf8); Calc: group OS: Debian 64bit Stretch (Debian 9.2, with some backported packages) -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 69109] Editing: RTL character string causes (left to right) numerics to flip order to also be RTL
https://bugs.documentfoundation.org/show_bug.cgi?id=69109 --- Comment #9 from Omer Zak--- Still happens in: Version: 5.4.2.2.0+ Build ID: 1:5.4.2-3~bpo9+1 CPU threads: 8; OS: Linux 4.9; UI render: default; VCL: gtk2; Locale: en-US (en_US.utf8); Calc: group OS: Debian 64bit Stretch (Debian 9.2, with some backported packages) -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 113634] New: odt files do not open
https://bugs.documentfoundation.org/show_bug.cgi?id=113634 Bug ID: 113634 Summary: odt files do not open Product: LibreOffice Version: 6.0.0.0.alpha1+ Master Hardware: Other OS: Android Status: UNCONFIRMED Severity: normal Priority: medium Component: Android Viewer Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: fahri...@gmail.com Description: After waiting for a while, it stays on the white screen and then when I click on it closes Steps to Reproduce: 1.ODT files can not be opened correctly. Actual Results: white screen and click then crashed Expected Results: it must open corretly Reproducible: Always User Profile Reset: Yes Additional Info: User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/61.0.3163.100 Safari/537.36 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 106954] Font LaDanse recognized but not rendered in Writer
https://bugs.documentfoundation.org/show_bug.cgi?id=106954 --- Comment #6 from kwpk.it+...@gmail.com --- This bug should be closed; after acquiring a recent set of font files, the font renders properly. The font files I had used previously were about 15 years old... I don't know what broke, but acquiring a recent set of font files is an entirely adequate resolution for this problem. Please do close this bug report. I had previously commented with the above information,but I don't see the comment; I don't know what went wrong with this. My sincere thanks for following up! -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: sw/source
sw/source/filter/xml/xmlmeta.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 7cca1dc560aeceb430ef6a0db2f7823e717ee585 Author: Caolán McNamaraDate: Fri Nov 3 13:58:52 2017 + ofz#4042 Integer-overflow Change-Id: Iccd150e8d704e065b8a3e060a1c9a2b6310e3641 Reviewed-on: https://gerrit.libreoffice.org/44265 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/sw/source/filter/xml/xmlmeta.cxx b/sw/source/filter/xml/xmlmeta.cxx index 0d75cfc9b606..b4d5d8189b9d 100644 --- a/sw/source/filter/xml/xmlmeta.cxx +++ b/sw/source/filter/xml/xmlmeta.cxx @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include @@ -148,7 +149,7 @@ void SwXMLImport::SetStatistics( if( nTokens & XML_TOK_META_STAT_PARA ) nProgressReference = (sal_Int32)aDocStat.nPara; else if ( nTokens & XML_TOK_META_STAT_PAGE ) -nProgressReference = 10 * (sal_Int32)aDocStat.nPage; +o3tl::checked_multiply(aDocStat.nPage, 10, nProgressReference); ProgressBarHelper* pProgress = GetProgressBarHelper(); pProgress->SetReference( nProgressReference + 3*PROGRESS_BAR_STEP ); pProgress->SetValue( 0 ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 43808] [META] Right-To-Left (aka Complex Text Layout) language issues (RTL/CTL)
https://bugs.documentfoundation.org/show_bug.cgi?id=43808 Bug 43808 depends on bug 68808, which changed state. Bug 68808 Summary: EDITING: Font name combobox shows wrong font for fields when paragraph is RTL https://bugs.documentfoundation.org/show_bug.cgi?id=68808 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |WORKSFORME -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 113438] [META] Font name combobox bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=113438 Bug 113438 depends on bug 68808, which changed state. Bug 68808 Summary: EDITING: Font name combobox shows wrong font for fields when paragraph is RTL https://bugs.documentfoundation.org/show_bug.cgi?id=68808 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |WORKSFORME -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 68808] EDITING: Font name combobox shows wrong font for fields when paragraph is RTL
https://bugs.documentfoundation.org/show_bug.cgi?id=68808 Omer Zakchanged: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |WORKSFORME --- Comment #5 from Omer Zak --- Works for me at: Version: 5.4.2.2.0+ Build ID: 1:5.4.2-3~bpo9+1 CPU threads: 8; OS: Linux 4.9; UI render: default; VCL: gtk2; Locale: en-US (en_US.utf8); Calc: group OS: Debian 64bit Stretch (Debian 9.2, with some backported packages) -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: sc/source
sc/source/filter/excel/xichart.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit bd74993aef9b30ca42810543d8b8bf13490ee9ce Author: Caolán McNamaraDate: Fri Nov 3 14:11:46 2017 + ofz#4043 Null-deference READ Change-Id: I2af7adc55c5b219086aad3157ccac1ce88a8ba97 Reviewed-on: https://gerrit.libreoffice.org/44266 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx index 49aa0c9ac3c9..627c8f998521 100644 --- a/sc/source/filter/excel/xichart.cxx +++ b/sc/source/filter/excel/xichart.cxx @@ -1233,9 +1233,9 @@ namespace { void lclUpdateText( XclImpChTextRef& rxText, const XclImpChText* xDefText ) { -if( rxText ) +if (rxText) rxText->UpdateText( xDefText ); -else +else if (xDefText) { XclImpChTextRef xNew(new XclImpChText(*xDefText)); rxText = xNew; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/CppunitTest_sc_cellrangeobj.mk
sc/CppunitTest_sc_cellrangeobj.mk |1 + 1 file changed, 1 insertion(+) New commits: commit be7d7d0f5b8657f4981b7622e8ce874a7cb25d2d Author: Stephan BergmannDate: Fri Nov 3 20:32:41 2017 +0100 Missing dependency At least on macOS, CppunitTest_sc_cellrangeobj failed for me with the try- catch(...)-abort block in Scheduler::ProcessTaskScheduling (vcl/source/app/scheduler.cxx) due to a com.sun.star.uno.DeploymentException "component context fails to supply service com.sun.star.linguistic2.LinguServiceManager of type com.sun.star.linguistic2.XLinguServiceManager2". Change-Id: I5b3c0f6cbd2f56bc86c62e048c87ad6ef5f83876 diff --git a/sc/CppunitTest_sc_cellrangeobj.mk b/sc/CppunitTest_sc_cellrangeobj.mk index 16fd329ae6fe..1ac628931f28 100644 --- a/sc/CppunitTest_sc_cellrangeobj.mk +++ b/sc/CppunitTest_sc_cellrangeobj.mk @@ -74,6 +74,7 @@ $(eval $(call gb_CppunitTest_use_components,sc_cellrangeobj,\ framework/util/fwk \ i18npool/source/search/i18nsearch \ i18npool/util/i18npool \ +linguistic/source/lng \ oox/util/oox \ package/source/xstor/xstor \ package/util/package2 \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 65563] RTL: Arabic/ Hebrew text appears left aligned during cell edit when horizontal text alignment is set to Default
https://bugs.documentfoundation.org/show_bug.cgi?id=65563 --- Comment #15 from Omer Zak--- Still happens in: Version: 5.4.2.2.0+ Build ID: 1:5.4.2-3~bpo9+1 CPU threads: 8; OS: Linux 4.9; UI render: default; VCL: gtk2; Locale: en-US (en_US.utf8); Calc: group OS: Debian 64bit Stretch (Debian 9.2, with some backported packages) I tested with Hebrew text, while the spreadsheet is set to default (LTR) direction (Sheet > Right-To-Left is unchecked). -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 63929] "show hidden characters" should show bidi markers
https://bugs.documentfoundation.org/show_bug.cgi?id=63929 --- Comment #5 from Omer Zak--- Still happens in: Version: 5.4.2.2.0+ Build ID: 1:5.4.2-3~bpo9+1 CPU threads: 8; OS: Linux 4.9; UI render: default; VCL: gtk2; Locale: en-US (en_US.utf8); Calc: group OS: Debian 64bit Stretch (Debian 9.2, with some backported packages) Note: I used View > Formatting Marks because I found no "Show Nonprinting Characters" in version 5.4.2. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 108580] Cannot run LibreOffice, api-ms-win-crt-runtime-l1-1-0.dll is missing ( for local solution see comment 7)
https://bugs.documentfoundation.org/show_bug.cgi?id=108580 Oliver Brinzingchanged: What|Removed |Added CC||oliver.brinz...@gmx.de --- Comment #24 from Oliver Brinzing --- . -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 107521] Improve DirectWrite implementation font rendering on Windows
https://bugs.documentfoundation.org/show_bug.cgi?id=107521 --- Comment #22 from Petr Vones--- FYI the broken font anti-aliasing rendering (original Bug 112158) is fixed in 5.3.7.2 for me. Thanks. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 83103] Indent spacing after numbering wrong when numbering value has 4 or more characters
https://bugs.documentfoundation.org/show_bug.cgi?id=83103 --- Comment #18 from almos--- (In reply to Heiko Tietze from comment #16) > Would cover for longer numbers since the problem also exists with > alphanumeric values >99. In that case, using default settings, tabstop at > 1.5cm is enough. But to also have a good alignment with the first 20 roman > numbers my take is 1.8cm. How about aligning everything to the longest number? -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 113633] Turn hidden buttons to visible toggle buttons in line spacing group button
https://bugs.documentfoundation.org/show_bug.cgi?id=113633 Yousuf Philips (jay)changed: What|Removed |Added Status|UNCONFIRMED |NEW Ever confirmed|0 |1 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 103429] [META] Split and group buttons in toolbar and sidebar bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=103429 Yousuf Philips (jay)changed: What|Removed |Added Depends on||113633 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=113633 [Bug 113633] Turn hidden buttons to visible toggle buttons in line spacing group button -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 113633] New: Turn hidden buttons to visible toggle buttons in line spacing group button
https://bugs.documentfoundation.org/show_bug.cgi?id=113633 Bug ID: 113633 Summary: Turn hidden buttons to visible toggle buttons in line spacing group button Product: LibreOffice Version: 6.0.0.0.alpha1+ Master Hardware: All OS: All Status: UNCONFIRMED Severity: enhancement Priority: medium Component: Writer Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: philip...@hotmail.com CC: tietze.he...@gmail.com, vstuart.fo...@utsa.edu Blocks: 103429 When you open the line spacing group button, you cant easily see what the current line spacing is because the buttons are not toggle buttons and the button outlines only appear when you mouse over the buttons. Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=103429 [Bug 103429] [META] Split and group buttons in toolbar and sidebar bugs and enhancements -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: sd/source
sd/source/core/drawdoc.cxx |5 - sd/source/core/sdpage.cxx |9 ++--- sd/source/ui/view/drviews1.cxx |9 ++--- 3 files changed, 16 insertions(+), 7 deletions(-) New commits: commit 127b828766b31cf7f69acd8eb80e0a3cbb4f7ca6 Author: Julien NabetDate: Fri Nov 3 19:18:20 2017 +0100 Revert "A first step to refactor ShapeList (sd)" This reverts commit c5857a0371dcc7977e68d48f08f2a3ecefb67b89. Change-Id: I59326867bdf71dcf20a86e03499884452675c557 Reviewed-on: https://gerrit.libreoffice.org/44284 Reviewed-by: Julien Nabet Tested-by: Julien Nabet diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx index 393bc68c2e3e..948bba6dc85d 100644 --- a/sd/source/core/drawdoc.cxx +++ b/sd/source/core/drawdoc.cxx @@ -732,9 +732,12 @@ void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* pSPool SfxStyleSheet* pTitleSheet = static_cast (pSPool->GetTitleSheet(aName)); +SdrObject* pObj = nullptr; +rPresentationShapes.seekShape(0); + // Now look for title and outline text objects, then make those objects // listeners. -for (auto const& pObj : rPresentationShapes.getList()) +while( (pObj = rPresentationShapes.getNextShape()) ) { if (pObj->GetObjInventor() == SdrInventor::Default) { diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 3ac3b29568de..6d7358947ca6 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -199,9 +199,12 @@ SdrObject* SdPage::GetPresObj(PresObjKind eObjKind, int nIndex, bool bFuzzySearc // first sort all matching shapes with z-order std::vector< SdrObject* > aMatches; -for (auto const& shape : maPresentationShapeList.getList()) +SdrObject* pObj = nullptr; +maPresentationShapeList.seekShape(0); + +while( (pObj = maPresentationShapeList.getNextShape()) ) { -SdAnimationInfo* pInfo = SdDrawDocument::GetShapeUserData(*shape); +SdAnimationInfo* pInfo = SdDrawDocument::GetShapeUserData(*pObj); if( pInfo ) { bool bFound = false; @@ -228,7 +231,7 @@ SdrObject* SdPage::GetPresObj(PresObjKind eObjKind, int nIndex, bool bFuzzySearc } if( bFound ) { -aMatches.push_back( shape ); +aMatches.push_back( pObj ); } } } diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index 8c322a76ff99..976d8dd1cb7b 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -1063,13 +1063,16 @@ bool DrawViewShell::SwitchPage(sal_uInt16 nSelectedPage) { // set pages for all available handout presentation objects sd::ShapeList& rShapeList = pMaster->GetPresentationShapeList(); -for (auto const& shape : rShapeList.getList()) +SdrObject* pObj = nullptr; +rShapeList.seekShape(0); + +while( (pObj = rShapeList.getNextShape()) ) { -if( pMaster->GetPresObjKind(shape) == PRESOBJ_HANDOUT ) +if( pMaster->GetPresObjKind(pObj) == PRESOBJ_HANDOUT ) { // #i105146# We want no content to be displayed for PageKind::Handout, // so just never set a page as content - static_cast (shape)->SetReferencedPage(nullptr); + static_cast (pObj)->SetReferencedPage(nullptr); } } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 83103] Indent spacing after numbering wrong when numbering value has 4 or more characters
https://bugs.documentfoundation.org/show_bug.cgi?id=83103 --- Comment #17 from Alexandre Monobe--- (In reply to Yousuf Philips (jay) from comment #15) > As the numbers get wider, they will take up more space, which will push the > following text farther away and there isnt much that can be done. Alex: what > do you think should happen? > > Heiko, Stuart: thoughts? I expect consistency. In this case the MS Word choice seems much better: the text always start at the same point, if the numbering is too big it only affects the numbering starting point. Let's see if I can illustrate: LibreOffice way: I. asd XXXI. aasd MS Office way: I. ASD XXXI. ASD -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 101698] F11 opened navigator panel instead of Styles and formatting panel
https://bugs.documentfoundation.org/show_bug.cgi?id=101698 --- Comment #8 from Rpnpif--- This issue is still present with Version: 5.4.2.2 Build ID: 22b09f6418e8c2d508a9eaf86b2399209b0990f4 Threads CPU : 2; OS : Linux 4.9; UI Render : GL; VCL : gtk2; Locale : fr-FR (fr_FR.utf8); Calc: group -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 45904] move java based api tests to c++
https://bugs.documentfoundation.org/show_bug.cgi?id=45904 --- Comment #74 from Commit Notification--- Jens Carl committed a patch related to this issue. It has been pushed to "master": http://cgit.freedesktop.org/libreoffice/core/commit/?id=6f29841acb201b118bbf5815163fb50d83929e9f tdf#45904 Move Java _XSheetCellRangeContainer test to C++ It will be available in 6.0.0. The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 112347] GTK2: Document is not displayed in full screen after switching workspace
https://bugs.documentfoundation.org/show_bug.cgi?id=112347 --- Comment #14 from krajcsi--- (In reply to krajcsi from comment #13) > On one of my computers: > Graphics: Card: Intel Device 5916 >Display Server: X.Org 1.18.4 drivers: intel (unloaded: fbdev,vesa) >Resolution: 1920x1080@60.00hz, 1920x1080@60.00hz >GLX Renderer: Mesa DRI Intel HD Graphics 620 (Kabylake GT2) >GLX Version: 3.0 Mesa 17.0.7 > > On another computer (two video cards): > Graphics: Card-1: Intel Sky Lake Integrated Graphics >Card-2: NVIDIA GM108M [GeForce 940MX] >Display Server: X.Org 1.18.4 drivers: intel (unloaded: fbdev,vesa) >Resolution: 1600x900@60.00hz, 1920x1080@60.00hz >GLX Renderer: Mesa DRI Intel HD Graphics 520 (Skylake GT2) >GLX Version: 3.0 Mesa 17.0.7 > > Graphics: Card-1: Intel Sky Lake Integrated Graphics >Card-2: NVIDIA GM108M [GeForce 940MX] >Display Server: X.Org 1.18.4 driver: nvidia >Resolution: 1920x1080@60.05hz, 1920x1080@60.00hz >GLX Renderer: GeForce 940MX/PCIe/SSE2 >GLX Version: 4.5.0 NVIDIA 384.98 > > All of them produce the bug with Linux Mint 17.3 Mate 1.18. > > Let me know if any other info is needed. Sorry, it's Linux Mint 18.2, not 17.3. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: include/test qadevOOo/Jar_OOoRunner.mk qadevOOo/objdsc qadevOOo/tests sc/qa test/Library_subsequenttest.mk test/source
include/test/sheet/xsheetcellrangecontainer.hxx | 40 ++ qadevOOo/Jar_OOoRunner.mk |1 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangesObj.csv |4 qadevOOo/tests/java/ifc/sheet/_XSheetCellRangeContainer.java| 198 -- sc/qa/extras/sccellrangesobj.cxx| 10 test/Library_subsequenttest.mk |1 test/source/sheet/xsheetcellrangecontainer.cxx | 121 ++ 7 files changed, 170 insertions(+), 205 deletions(-) New commits: commit 6f29841acb201b118bbf5815163fb50d83929e9f Author: Jens CarlDate: Fri Nov 3 07:15:10 2017 + tdf#45904 Move Java _XSheetCellRangeContainer test to C++ Change-Id: I463fc54aa4139fbc43b6124765bf18ad8c0e6ddc Reviewed-on: https://gerrit.libreoffice.org/44247 Tested-by: Jenkins Reviewed-by: Jens Carl diff --git a/include/test/sheet/xsheetcellrangecontainer.hxx b/include/test/sheet/xsheetcellrangecontainer.hxx new file mode 100644 index ..f0b0c7355420 --- /dev/null +++ b/include/test/sheet/xsheetcellrangecontainer.hxx @@ -0,0 +1,40 @@ +/* -*- 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/. + */ + +#ifndef INCLUDED_TEST_SHEET_XSHEETCELLRANGECONTAINER_HXX +#define INCLUDED_TEST_SHEET_XSHEETCELLRANGECONTAINER_HXX + +#include + +#include +#include +#include + +#include + +namespace apitest { + +class OOO_DLLPUBLIC_TEST XSheetCellRangeContainer +{ +public: +virtual css::uno::Reference< css::uno::XInterface > init() =0; + +void testAddRemoveRangeAddress(); +void testAddRemoveRangeAddresses(); + +protected: +~XSheetCellRangeContainer() {} +css::uno::Sequence< com::sun::star::table::CellRangeAddress > createCellRangeAddresses(); +}; + +} + +#endif // INCLUDED_TEST_SHEET_XSHEETCELLRANGECONTAINER_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk index 16ebecb84344..7faba4235a32 100644 --- a/qadevOOo/Jar_OOoRunner.mk +++ b/qadevOOo/Jar_OOoRunner.mk @@ -618,7 +618,6 @@ $(eval $(call gb_Jar_add_sourcefiles,OOoRunner,\ qadevOOo/tests/java/ifc/sheet/_XSheetAnnotationsSupplier \ qadevOOo/tests/java/ifc/sheet/_XSheetAuditing \ qadevOOo/tests/java/ifc/sheet/_XSheetCellCursor \ -qadevOOo/tests/java/ifc/sheet/_XSheetCellRangeContainer \ qadevOOo/tests/java/ifc/sheet/_XSheetFilterableEx \ qadevOOo/tests/java/ifc/sheet/_XSpreadsheetView \ qadevOOo/tests/java/ifc/style/_CharacterProperties \ diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangesObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangesObj.csv index a17fa72c561f..bedb81212c36 100644 --- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangesObj.csv +++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScCellRangesObj.csv @@ -113,10 +113,6 @@ "ScCellRangesObj";"com::sun::star::style::CharacterPropertiesComplex";"CharFontPitchComplex" "ScCellRangesObj";"com::sun::star::style::CharacterPropertiesComplex";"CharPostureComplex" "ScCellRangesObj";"com::sun::star::style::CharacterPropertiesComplex";"CharLocaleComplex" -"ScCellRangesObj";"com::sun::star::sheet::XSheetCellRangeContainer";"addRangeAddress()" -"ScCellRangesObj";"com::sun::star::sheet::XSheetCellRangeContainer";"removeRangeAddress()" -"ScCellRangesObj";"com::sun::star::sheet::XSheetCellRangeContainer";"addRangeAddresses()" -"ScCellRangesObj";"com::sun::star::sheet::XSheetCellRangeContainer";"removeRangeAddresses()" "ScCellRangesObj";"com::sun::star::sheet::XFormulaQuery";"queryDependents()" "ScCellRangesObj";"com::sun::star::sheet::XFormulaQuery";"queryPrecedents()" "ScCellRangesObj";"com::sun::star::sheet::SheetCellRanges";"ConditionalFormat" diff --git a/qadevOOo/tests/java/ifc/sheet/_XSheetCellRangeContainer.java b/qadevOOo/tests/java/ifc/sheet/_XSheetCellRangeContainer.java deleted file mode 100644 index ee5fbcc68467.. --- a/qadevOOo/tests/java/ifc/sheet/_XSheetCellRangeContainer.java +++ /dev/null @@ -1,198 +0,0 @@ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding
[Libreoffice-bugs] [Bug 112347] GTK2: Document is not displayed in full screen after switching workspace
https://bugs.documentfoundation.org/show_bug.cgi?id=112347 --- Comment #13 from krajcsi--- On one of my computers: Graphics: Card: Intel Device 5916 Display Server: X.Org 1.18.4 drivers: intel (unloaded: fbdev,vesa) Resolution: 1920x1080@60.00hz, 1920x1080@60.00hz GLX Renderer: Mesa DRI Intel HD Graphics 620 (Kabylake GT2) GLX Version: 3.0 Mesa 17.0.7 On another computer (two video cards): Graphics: Card-1: Intel Sky Lake Integrated Graphics Card-2: NVIDIA GM108M [GeForce 940MX] Display Server: X.Org 1.18.4 drivers: intel (unloaded: fbdev,vesa) Resolution: 1600x900@60.00hz, 1920x1080@60.00hz GLX Renderer: Mesa DRI Intel HD Graphics 520 (Skylake GT2) GLX Version: 3.0 Mesa 17.0.7 Graphics: Card-1: Intel Sky Lake Integrated Graphics Card-2: NVIDIA GM108M [GeForce 940MX] Display Server: X.Org 1.18.4 driver: nvidia Resolution: 1920x1080@60.05hz, 1920x1080@60.00hz GLX Renderer: GeForce 940MX/PCIe/SSE2 GLX Version: 4.5.0 NVIDIA 384.98 All of them produce the bug with Linux Mint 17.3 Mate 1.18. Let me know if any other info is needed. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 90653] Opening .csv : Problem with rows
https://bugs.documentfoundation.org/show_bug.cgi?id=90653 --- Comment #10 from Tristan Miller--- (In reply to Andreas Säger from comment #9) > The csv is invalid because it contains text values with line breaks that are > indistinguishable from line breaks between 2 records. Any csv parser will > fail with this. Could you elaborate on this? True, the line breaks may be semantically wrong, but I don't see how they make the file syntactically incorrect or harder/impossible to parse. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: Branch 'feature/qt5' - vcl/CustomTarget_kf5_moc.mk vcl/inc vcl/source vcl/unx
vcl/CustomTarget_kf5_moc.mk| 22 vcl/inc/CommonSalLayout.hxx| 19 -- vcl/inc/jobset.h |2 - vcl/inc/salgdi.hxx |2 - vcl/inc/unx/glyphcache.hxx |2 - vcl/source/gdi/CommonSalLayout.cxx | 45 + vcl/unx/generic/glyphs/freetype_glyphcache.cxx |2 - 7 files changed, 37 insertions(+), 57 deletions(-) New commits: commit 868d27410d3aae8cd0a8aae70be201b671df091b Author: Jan-Marek GlogowskiDate: Fri Nov 3 18:43:30 2017 +0100 Fix multiple problems 1. Linking problem on Windows due to Windows macros via include 2. Drop the custom MOC target for the old KF5 plugin 3. Correctly handle QT5 build without using QFont 4. ImplJobSetup is in the VL library, not the gen plugin Change-Id: Iad97b1b9b57a8c356aaa88178aff03d0c14558c7 diff --git a/vcl/CustomTarget_kf5_moc.mk b/vcl/CustomTarget_kf5_moc.mk deleted file mode 100644 index f636ef5d125c.. --- a/vcl/CustomTarget_kf5_moc.mk +++ /dev/null @@ -1,22 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_CustomTarget_CustomTarget,vcl/unx/kf5)) - -$(call gb_CustomTarget_get_target,vcl/unx/kf5) : \ - $(call gb_CustomTarget_get_workdir,vcl/unx/kf5)/Kf5Timer.moc \ - $(call gb_CustomTarget_get_workdir,vcl/unx/kf5)/Kf5Widget.moc \ - -$(call gb_CustomTarget_get_workdir,vcl/unx/kf5)/%.moc : \ - $(SRCDIR)/vcl/unx/kf5/%.hxx \ - | $(call gb_CustomTarget_get_workdir,vcl/unx/kf5)/.dir - $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MOC,1) - $(MOC5) $< -o $@ - -# vim: set noet sw=4: diff --git a/vcl/inc/CommonSalLayout.hxx b/vcl/inc/CommonSalLayout.hxx index a44fee5cfe10..a8808bac8414 100644 --- a/vcl/inc/CommonSalLayout.hxx +++ b/vcl/inc/CommonSalLayout.hxx @@ -45,13 +45,6 @@ class Qt5Font; class VCL_DLLPUBLIC CommonSalLayout : public GenericSalLayout { -#if ENABLE_QT5 -friend hb_blob_t* getFontTable(hb_face_t*, hb_tag_t, void*); -explicitCommonSalLayout(const FontSelectPattern , -FreetypeFont *pFreetypeFont, -Qt5Font *pFont, bool bUseQt5); -#endif - hb_font_t* mpHbFont; const FontSelectPattern& mrFontSelData; css::uno::Reference mxBreak; @@ -84,19 +77,23 @@ class VCL_DLLPUBLIC CommonSalLayout : public GenericSalLayout public: #if defined(_WIN32) explicitCommonSalLayout(HDC, WinFontInstance&, const WinFontFace&); -const FontSelectPattern& getFontSelData() const { return mrFontSelData; }; +const FontSelectPattern& getFontSelData() const { return mrFontSelData; } HFONT getHFONT() const { return mhFont; } WinFontInstance&getWinFontInstance() const { return mrWinFontInstance; } boolhasHScale() const; #elif defined(MACOSX) || defined(IOS) explicitCommonSalLayout(const CoreTextStyle&); -const CoreTextStyle&getFontData() const { return mrCoreTextStyle; }; +const CoreTextStyle&getFontData() const { return mrCoreTextStyle; } #else explicitCommonSalLayout(FreetypeFont&); -const FreetypeFont* getFreetypeFont() const { return mpFreetypeFont; }; +const FreetypeFont* getFreetypeFont() const { return mpFreetypeFont; } #if ENABLE_QT5 +explicitCommonSalLayout(const FontSelectPattern , +FreetypeFont *pFreetypeFont, +Qt5Font *pFont, bool bUseQt5); explicitCommonSalLayout(Qt5Font&); -const Qt5Font* getQt5Font() const { return mpQFont; }; +const Qt5Font* getQt5Font() const { return mpQFont; } +booluseQt5() const { return mbUseQt5; } #endif #endif diff --git a/vcl/inc/jobset.h b/vcl/inc/jobset.h index dc04e9a54bd1..5ff4c38e9a24 100644 --- a/vcl/inc/jobset.h +++ b/vcl/inc/jobset.h @@ -29,7 +29,7 @@ #define JOBSETUP_SYSTEM_UNIX3 #define JOBSETUP_SYSTEM_MAC 4 -class VCL_PLUGIN_PUBLIC ImplJobSetup +class VCL_DLLPUBLIC ImplJobSetup { private: sal_uInt16 mnSystem; //< System - JOBSETUP_SYSTEM_ diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx index a368630ebd74..1a9157ca9747 100644 --- a/vcl/inc/salgdi.hxx +++ b/vcl/inc/salgdi.hxx @@ -21,7 +21,6 @@ #define INCLUDED_VCL_INC_SALGDI_HXX #include -#include #include
[Libreoffice-bugs] [Bug 103638] When tracking changes, deleting a paragraph break does not update the view until show changes is toggled
https://bugs.documentfoundation.org/show_bug.cgi?id=103638 --- Comment #3 from Buovjaga--- Still repro. Arch Linux 64-bit, KDE Plasma 5 Version: 6.0.0.0.alpha1+ Build ID: 64024d7c18bd114eb9958cf80eea9129e09923bd CPU threads: 8; OS: Linux 4.13; UI render: default; VCL: kde4; Locale: fi-FI (fi_FI.UTF-8); Calc: group Built on November 3rd 2017 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 106081] Find and replace dialog elements may float into an arrangement, where Close button does not work
https://bugs.documentfoundation.org/show_bug.cgi?id=106081 --- Comment #2 from Buovjaga--- Still repro. Arch Linux 64-bit, KDE Plasma 5 Version: 6.0.0.0.alpha1+ Build ID: 64024d7c18bd114eb9958cf80eea9129e09923bd CPU threads: 8; OS: Linux 4.13; UI render: default; VCL: kde4; Locale: fi-FI (fi_FI.UTF-8); Calc: group Built on November 3rd 2017 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit a5c4b406a8ff80aaa2df96ce455d3b080b77a9a4 Author: Stephan BergmannDate: Fri Nov 3 18:42:44 2017 +0100 Only downcast to OOXMLFastContextHandlerShape when actually necessary After bd3c5c4c234e3dc6b89cd235321945a41a08d562 "[API CHANGE] tdf#65393 Import signature line images from ooxml", UBSan CppunitTest_chart2_export had started to fail with > writerfilter/source/ooxml/OOXMLFastContextHandler.cxx:1898:25: runtime error: downcast of address 0x61200070a440 which does not point to an object of type 'writerfilter::ooxml::OOXMLFastContextHandlerShape' > 0x61200070a440: note: object is of type 'writerfilter::ooxml::OOXMLFastContextHandlerWrapper' > 0e 10 00 20 50 86 4a 00 a2 7f 00 00 01 00 00 00 be be be be 00 00 00 00 00 00 00 00 00 00 00 00 > ^~~ > vptr for 'writerfilter::ooxml::OOXMLFastContextHandlerWrapper' Change-Id: I028ef619766466e8cd9bb0ca09174b926fc6d23c diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx index e25e7bc40fae..138954023f89 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx @@ -1895,11 +1895,10 @@ OOXMLFastContextHandlerWrapper::lcl_createFastChildContext // here until we need a more generic solution. bool bIsWrap = Element == static_cast(NMSP_vmlWord | XML_wrap); bool bIsSignatureLine = Element == static_cast(NMSP_vmlOffice | XML_signatureline); -bool bIsShapeSent = static_cast (mpParent)->isShapeSent(); bool bSkipImages = getDocument()->IsSkipImages() && oox::getNamespace(Element) == static_cast(NMSP_dml) && !((oox::getBaseToken(Element) == XML_linkedTxbx) || (oox::getBaseToken(Element) == XML_txbx)); -if ( bInNamespaces && ((!bIsWrap && !bIsSignatureLine) || bIsShapeSent) ) +if ( bInNamespaces && ((!bIsWrap && !bIsSignatureLine) || static_cast (mpParent)->isShapeSent()) ) xResult.set(OOXMLFactory::createFastChildContextFromStart(this, Element)); else if (mxContext.is() && !bSkipImages) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 92134] Sidebar hiding button flickers, when mouse hovers over the resizing edge
https://bugs.documentfoundation.org/show_bug.cgi?id=92134 Buovjagachanged: What|Removed |Added Priority|medium |low Severity|minor |trivial --- Comment #13 from Buovjaga --- (In reply to Buovjaga from comment #10) > Now tested on Win 8.1 32-bit. > > The flicker can be seen, but it is not as regular as in Win 7. > Most of the time only the triangle in the button can be seen flickering > slightly. > > Version: 5.1.0.0.alpha1+ > Build ID: 2885e157674dbefa7d9b984a399fabd1238eeedd > TinderBox: Win-x86@39, Branch:master, Time: 2015-06-22_07:52:27 > Locale: fi-FI (fi_FI) Same result in a Win 10 virtual machine. Focus your eyes on the triangle and do a lot of back and forth hovering. Version: 6.0.0.0.alpha1+ (x64) Build ID: 7e03c4eed72452fdfb87341214a21956c08ba969 CPU threads: 4; OS: Windows 10.0; UI render: default; TinderBox: Win-x86_64@42, Branch:master, Time: 2017-10-26_00:58:29 Locale: fi-FI (fi_FI); Calc: group -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs