[Libreoffice-commits] core.git: sw/qa sw/source

[Nickson Thanda]

 sw/qa/extras/uiwriter/uiwriter.cxx |   15 +++
 sw/source/core/edit/autofmt.cxx|8 
 sw/source/uibase/docvw/edtwin.cxx  |3 +--
 3 files changed, 24 insertions(+), 2 deletions(-)

New commits:
commit 391134e4cc0cf444ac50c6df02073de57ad9c466
Author: Nickson Thanda 
Date:   Fri Jun 22 04:59:16 2018 +0100

tdf#51223 can now undo auto-capitalise with enter

Change-Id: I1ff1bd0137415349d1eb89bef0947453f72a8ef5
Reviewed-on: https://gerrit.libreoffice.org/56267
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index e6ab7cdaf515..3dc0e7a233ea 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -345,6 +345,7 @@ public:
 void testTdf116789();
 void testTdf117225();
 void testTdf91801();
+void testTdf51223();
 
 CPPUNIT_TEST_SUITE(SwUiWriterTest);
 CPPUNIT_TEST(testReplaceForward);
@@ -541,6 +542,7 @@ public:
 CPPUNIT_TEST(testTdf116789);
 CPPUNIT_TEST(testTdf117225);
 CPPUNIT_TEST(testTdf91801);
+CPPUNIT_TEST(testTdf51223);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -6311,6 +6313,19 @@ void SwUiWriterTest::testTdf91801()
 CPPUNIT_ASSERT_EQUAL(555.0, xCell->getValue());
 }
 
+void SwUiWriterTest::testTdf51223()
+{
+SwDoc* pDoc = createDoc();
+SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
+sw::UndoManager& rUndoManager = pDoc->GetUndoManager();
+sal_uLong nIndex = pWrtShell->GetCursor()->GetNode().GetIndex();
+pWrtShell->Insert("i");
+pWrtShell->SplitNode(true);
+CPPUNIT_ASSERT_EQUAL(OUString("I"), 
static_cast(pDoc->GetNodes()[nIndex])->GetText());
+rUndoManager.Undo();
+CPPUNIT_ASSERT_EQUAL(OUString("i"), 
static_cast(pDoc->GetNodes()[nIndex])->GetText());
+
+}
 CPPUNIT_TEST_SUITE_REGISTRATION(SwUiWriterTest);
 CPPUNIT_PLUGIN_IMPLEMENT();
 
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index 19dff285050c..33a41866af1a 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -2611,6 +2611,14 @@ void SwEditShell::AutoFormatBySplitNode()
 
 SwAutoFormat aFormat( this, aAFFlags, &pCursor->GetMark()->nNode,
 &pCursor->GetPoint()->nNode );
+SvxAutoCorrect* pACorr = SvxAutoCorrCfg::Get().GetAutoCorrect();
+if( pACorr && !pACorr->IsAutoCorrFlag( ACFlags::CapitalStartSentence | 
ACFlags::CapitalStartWord |
+ACFlags::AddNonBrkSpace | 
ACFlags::ChgOrdinalNumber |
+ACFlags::ChgToEnEmDash | ACFlags::SetINetAttr 
| ACFlags::Autocorrect ))
+pACorr = nullptr;
+
+if( pACorr )
+AutoCorrect( *pACorr,false, u'\0' );
 
 //JP 30.09.96: DoTable() builds on PopCursor and MoveCursor!
 Pop(PopMode::DeleteCurrent);
diff --git a/sw/source/uibase/docvw/edtwin.cxx 
b/sw/source/uibase/docvw/edtwin.cxx
index 09f2794b067e..bbf7c8400dd6 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -1851,8 +1851,7 @@ KEYINPUT_CHECKTABLE:
 SelectionType::TableCell | 
SelectionType::DrawObject |
 SelectionType::DrawObjectEditMode)) )
 {
-eKeyState = SwKeyState::CheckAutoCorrect;
-eNextKeyState = SwKeyState::AutoFormatByInput;
+eKeyState = SwKeyState::AutoFormatByInput;
 }
 else
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sd/source

[Justin Luth]

 sd/source/ui/inc/DrawViewShell.hxx |4 
 sd/source/ui/view/drviews4.cxx |7 +++
 sd/source/ui/view/drviewsh.cxx |2 +-
 3 files changed, 12 insertions(+), 1 deletion(-)

New commits:
commit 6fffd09833a5bd602b0117f48656afd07fd40f41
Author: Justin Luth 
Date:   Tue May 22 19:32:25 2018 +0300

tdf#109190 sd: only MakeVisible on mouseclick-up

Since MakeVisible is called on both
mousebuttom-down and mousebuttom-up,
this also eliminates useless double-processing.

In the problematic use case, the user pressed Ctrl-A to select
a tall table. When clicking to de-select the cells, the contents
moved around in unexpected ways because the rectangle is at the
end of the selection during down-click, not at the cursor location.
The re-arrangment of the screen invalidates the mouse-up,
so the intended cursor position shifted.

In the bug's calendar example, position the screen so that items
20-31 are hidden, select the whole month, and then click
on 5. Before, it would move the screen down to show 31, and
the cursor would be placed at the screen position where 5
had originally been. Solved by only repositioning on
mouse-click up.

However, mouseButtonDown must still be honoured while
selecting, otherwise you can't select off-screen content
with the mouse.

Change-Id: I41c90a7b113dc59a3c8c385139a5bb41993646fa
Reviewed-on: https://gerrit.libreoffice.org/56262
Tested-by: Jenkins
Reviewed-by: Justin Luth 

diff --git a/sd/source/ui/inc/DrawViewShell.hxx 
b/sd/source/ui/inc/DrawViewShell.hxx
index 37afa1bcb039..b8f1dab8f038 100644
--- a/sd/source/ui/inc/DrawViewShell.hxx
+++ b/sd/source/ui/inc/DrawViewShell.hxx
@@ -114,6 +114,8 @@ public:
 virtual voidMouseButtonUp(const MouseEvent& rMEvt, ::sd::Window* pWin) 
override;
 virtual voidMouseButtonDown(const MouseEvent& rMEvt, ::sd::Window* 
pWin) override;
 virtual voidCommand(const CommandEvent& rCEvt, ::sd::Window* pWin) 
override;
+boolIsMouseButtonDown() { return mbMouseButtonDown; }
+boolIsMouseSelecting() { return mbMouseSelecting; }
 
 virtual voidResize() override;
 
@@ -443,6 +445,8 @@ private:
 css::uno::Reference< css::lang::XEventListener >  mxScannerListener;
 rtl::Reference mxClipEvtLstnr;
 bool  mbPastePossible;
+bool  mbMouseButtonDown;
+bool  mbMouseSelecting;
 
 virtual void Notify (SfxBroadcaster& rBC, const SfxHint& rHint) override;
 
diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx
index 9356034fa8b1..41f387897f56 100644
--- a/sd/source/ui/view/drviews4.cxx
+++ b/sd/source/ui/view/drviews4.cxx
@@ -269,6 +269,7 @@ void DrawViewShell::FreshNavigatrTree()
 void DrawViewShell::MouseButtonDown(const MouseEvent& rMEvt,
 ::sd::Window* pWin)
 {
+mbMouseButtonDown = true;
 // We have to check if a context menu is shown and we have an UI
 // active inplace client. In that case we have to ignore the mouse
 // button down event. Otherwise we would crash (context menu has been
@@ -300,6 +301,9 @@ void DrawViewShell::MouseButtonDown(const MouseEvent& rMEvt,
 
 void DrawViewShell::MouseMove(const MouseEvent& rMEvt, ::sd::Window* pWin)
 {
+if ( IsMouseButtonDown() )
+mbMouseSelecting = true;
+
 if ( !IsInputLocked() )
 {
 if ( mpDrawView->IsAction() )
@@ -409,6 +413,8 @@ void DrawViewShell::MouseMove(const MouseEvent& rMEvt, 
::sd::Window* pWin)
 
 void DrawViewShell::MouseButtonUp(const MouseEvent& rMEvt, ::sd::Window* pWin)
 {
+mbMouseButtonDown = false;
+
 if ( !IsInputLocked() )
 {
 bool bIsSetPageOrg = mpDrawView->IsSetPageOrg();
@@ -446,6 +452,7 @@ void DrawViewShell::MouseButtonUp(const MouseEvent& rMEvt, 
::sd::Window* pWin)
 //else the corresponding entry is set false .
 FreshNavigatrTree();
 }
+mbMouseSelecting = false;
 }
 
 void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin)
diff --git a/sd/source/ui/view/drviewsh.cxx b/sd/source/ui/view/drviewsh.cxx
index 54915188b498..bbdcc47c66da 100644
--- a/sd/source/ui/view/drviewsh.cxx
+++ b/sd/source/ui/view/drviewsh.cxx
@@ -58,7 +58,7 @@ void DrawViewShell::GotoBookmark(const OUString& rBookmark)
 
 void DrawViewShell::MakeVisible(const ::tools::Rectangle& rRect, vcl::Window& 
rWin)
 {
-if ( SlideShow::IsRunning( GetViewShellBase() ) )
+if ( (IsMouseButtonDown() && !IsMouseSelecting()) || SlideShow::IsRunning( 
GetViewShellBase() ) )
 return;
 
 // tdf#98646 check if Rectangle which contains the bounds of the region to
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo

[Libreoffice-commits] core.git: include/svx

[Stephan Bergmann]

 include/svx/colorbox.hxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit c9d316ecdb54ea2ee17b76c10c70e997c32c500d
Author: Stephan Bergmann 
Date:   Mon Jul 2 10:11:33 2018 +0200

-Werror,-Wunused-private-field

Change-Id: I27512b518bada81c607c5dd73c6e5155ec1b19d8

diff --git a/include/svx/colorbox.hxx b/include/svx/colorbox.hxx
index b257bc833ce9..16baabb4ff3e 100644
--- a/include/svx/colorbox.hxx
+++ b/include/svx/colorbox.hxx
@@ -99,7 +99,6 @@ private:
 Link m_aSelectedLink;
 ListBoxColorWrapper m_aColorWrapper;
 Color m_aAutoDisplayColor;
-Color m_aSaveColor;
 NamedColor m_aSelectedColor;
 std::shared_ptr m_xPaletteManager;
 BorderColorStatus m_aBorderColorStatus;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/svx

[Stephan Bergmann]

 include/svx/paraprev.hxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 7de66670069219c3507734aefc2d600a3bef2071
Author: Stephan Bergmann 
Date:   Mon Jul 2 10:17:52 2018 +0200

-Werror,-Wunused-private-field

Change-Id: I1c32a6e7e517acc2e8bb3e7898329cb38ed4accb

diff --git a/include/svx/paraprev.hxx b/include/svx/paraprev.hxx
index dbac8a6b82b4..2c882e082be4 100644
--- a/include/svx/paraprev.hxx
+++ b/include/svx/paraprev.hxx
@@ -94,7 +94,6 @@ class SVX_DLLPUBLIC ParaPrevWindow final : public 
weld::CustomWidgetController
 // line distance
 SvxPrevLineSpaceeLine;
 
-OUStringaText;
 tools::RectangleLines[9];
 
 virtual void Paint(vcl::RenderContext& rRenderContext, const 
tools::Rectangle& rRect) override;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: compilerplugins/clang connectivity/source filter/source framework/inc framework/source include/sfx2 include/svx sc/source sfx2/source svx/source

[Noel Grandin]

 compilerplugins/clang/constantparam.bitmask.results  |4 
 compilerplugins/clang/constantparam.booleans.results |  484 +++
 compilerplugins/clang/constantparam.constructors.results |   76 +-
 compilerplugins/clang/constantparam.numbers.results  |  278 
 connectivity/source/inc/dbase/dindexnode.hxx |5 
 filter/source/svg/svgfilter.cxx  |7 
 framework/inc/uielement/statusbarmerger.hxx  |3 
 framework/source/uielement/statusbarmanager.cxx  |2 
 framework/source/uielement/statusbarmerger.cxx   |7 
 include/sfx2/tabdlg.hxx  |1 
 include/svx/colorwindow.hxx  |3 
 include/svx/fntctrl.hxx  |2 
 sc/source/core/data/postit.cxx   |   17 
 sfx2/source/dialog/tabdlg.cxx|5 
 svx/source/dialog/fntctrl.cxx|   10 
 svx/source/tbxctrls/tbcontrl.cxx |5 
 16 files changed, 452 insertions(+), 457 deletions(-)

New commits:
commit 7c610a2a74ca2bde7673b3ceee11c1b3f6b9d498
Author: Noel Grandin 
Date:   Sun Jul 1 15:08:10 2018 +0200

loplugin:constantparam

Change-Id: I9fbfa6163c1d4650c52b00dc911972f07fe7c0e5
Reviewed-on: https://gerrit.libreoffice.org/56778
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/compilerplugins/clang/constantparam.bitmask.results 
b/compilerplugins/clang/constantparam.bitmask.results
index 5e23a23e48c5..b40a1f713344 100644
--- a/compilerplugins/clang/constantparam.bitmask.results
+++ b/compilerplugins/clang/constantparam.bitmask.results
@@ -37,7 +37,7 @@ sc/inc/rangelst.hxx:48
 sc/inc/rangeutl.hxx:162
 void ScRangeStringConverter::GetStringFromAddress(class rtl::OUString 
&,const class ScAddress &,const class ScDocument *,enum 
formula::FormulaGrammar::AddressConvention,char16_t,_Bool,enum ScRefFlags)
 enum ScRefFlags nFormatFlags setBits=0x8008 clearBits=0x7ff0
-sc/inc/xmlwrap.hxx:92
+sc/inc/xmlwrap.hxx:89
 _Bool ScXMLImportWrapper::Import(enum ImportFlags,class ErrCode &)
 enum ImportFlags nMode setBits=0x1
 sc/source/ui/view/cellsh1.cxx:111
@@ -52,7 +52,7 @@ sw/source/core/view/viewsh.cxx:716
 sw/source/filter/html/swhtml.hxx:713
 void SwHTMLParser::SetFrameFormatAttrs(class SfxItemSet &,enum 
HtmlFrameFormatFlags,class SfxItemSet &)
 enum HtmlFrameFormatFlags nFlags setBits=0x1
-sw/source/filter/ww8/wrtw8esh.cxx:1529
+sw/source/filter/ww8/wrtw8esh.cxx:1540
 enum ShapeFlag AddMirrorFlags(enum ShapeFlag,const class SwMirrorGrf &)
 enum ShapeFlag nFlags setBits=0xa00 clearBits=0x5ef
 xmloff/inc/MetaExportComponent.hxx:32
diff --git a/compilerplugins/clang/constantparam.booleans.results 
b/compilerplugins/clang/constantparam.booleans.results
index a2e0645a9b2d..96d9b570b2eb 100644
--- a/compilerplugins/clang/constantparam.booleans.results
+++ b/compilerplugins/clang/constantparam.booleans.results
@@ -114,11 +114,11 @@ chart2/source/controller/inc/ChartController.hxx:367
 class chart::ChartController::TheModelRef & 
chart::ChartController::TheModelRef::operator=(class 
chart::ChartController::TheModel *)
  ###1
 0
-chart2/source/controller/inc/ViewElementListProvider.hxx:50
+chart2/source/controller/inc/ViewElementListProvider.hxx:51
 class Graphic chart::ViewElementListProvider::GetSymbolGraphic(int,const 
class SfxItemSet *) const
 int nStandardSymbol
 0
-chart2/source/inc/AxisHelper.hxx:190
+chart2/source/inc/AxisHelper.hxx:194
 class com::sun::star::uno::Reference 
chart::AxisHelper::getChartTypeByIndex(const class 
com::sun::star::uno::Reference 
&,int)
 int nIndex
 0
@@ -238,7 +238,7 @@ cppu/source/uno/sequence.cxx:313
 _Bool icopyConstructFromElements(struct _sal_Sequence **,void *,struct 
_typelib_TypeDescriptionReference *,int,int,void (*)(void *),int)
 int nStartIndex
 0
-cui/source/inc/cuitabarea.hxx:745
+cui/source/inc/cuitabarea.hxx:752
 void SvxColorTabPage::SetPropertyList(enum XPropertyListType,const class 
rtl::Reference &)
 enum XPropertyListType t
 0
@@ -322,7 +322,7 @@ desktop/source/deployment/gui/dp_gui_theextmgr.hxx:90
 void dp_gui::TheExtensionManager::ToTop(enum ToTopFlags)
 enum ToTopFlags nFlags
 1
-desktop/source/lib/init.cxx:3913
+desktop/source/lib/init.cxx:3988
 struct _LibreOfficeKit * libreofficekit_hook_2(const char *,const char *)
 const char * user_profile_path
 0
@@ -463,18 +463,14 @@ framework/inc/uielement/uicommanddescription.hxx:83
 _Bool 
 1
 helpcompiler/inc/HelpCompiler.hxx:69
-void fs::path::path(const class std::basic_string, class std::allocator > &,enum fs::convert)
+void fs::path::path(const class std::__cxx11::basic_string, class std::allocator > &,enum fs::convert)
 enum fs::convert 
 0
-helpcompiler/inc/HelpCompiler.hxx:196
-void HelpProcessingExce

[Libreoffice-commits] translations.git: Branch 'libreoffice-6-1' - source/sl

[Andras Timar]

 source/sl/cui/messages.po |  412 +++
 source/sl/extensions/messages.po  |   22 
 source/sl/filter/messages.po  |  216 +--
 source/sl/filter/source/config/fragments/filters.po   |   15 
 source/sl/filter/source/config/fragments/types.po |4 
 source/sl/fpicker/messages.po |4 
 source/sl/helpcontent2/source/auxiliary.po|   12 
 source/sl/helpcontent2/source/text/sbasic/shared.po   |   38 
 source/sl/helpcontent2/source/text/sbasic/shared/03.po|  514 +
 source/sl/helpcontent2/source/text/scalc/00.po|4 
 source/sl/helpcontent2/source/text/scalc/01.po|  144 --
 source/sl/helpcontent2/source/text/scalc/06.po|4 
 source/sl/helpcontent2/source/text/scalc/guide.po |6 
 source/sl/helpcontent2/source/text/shared/00.po   |   16 
 source/sl/helpcontent2/source/text/shared/01.po   |   18 
 source/sl/helpcontent2/source/text/shared/05.po   |4 
 source/sl/helpcontent2/source/text/shared/optionen.po |8 
 source/sl/helpcontent2/source/text/swriter.po |  198 +++
 source/sl/helpcontent2/source/text/swriter/00.po  |   54 
 source/sl/helpcontent2/source/text/swriter/01.po  |   16 
 source/sl/helpcontent2/source/text/swriter/guide.po   |   30 
 source/sl/officecfg/registry/data/org/openoffice/Office/UI.po |   40 
 source/sl/sc/messages.po  |  561 --
 source/sl/sd/messages.po  |4 
 source/sl/sfx2/messages.po|  158 +-
 source/sl/svtools/messages.po |   11 
 source/sl/svx/messages.po |   53 
 source/sl/sw/messages.po  |  128 +-
 source/sl/writerperfect/messages.po   |6 
 29 files changed, 1729 insertions(+), 971 deletions(-)

New commits:
commit 7d6ab9800c51e2ec2f89f4fe5f8374b99a49184c
Author: Andras Timar 
Date:   Mon Jul 2 10:36:47 2018 +0200

Updated Slovenian translation

Change-Id: I73a5ac1483726d4c0baf8ec6dca87448a3b6c557

diff --git a/source/sl/cui/messages.po b/source/sl/cui/messages.po
index 762c6671efe..c7936f71304 100644
--- a/source/sl/cui/messages.po
+++ b/source/sl/cui/messages.po
@@ -3,14 +3,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LibreOffice 6.1\n"
 "Report-Msgid-Bugs-To: 
https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n";
-"POT-Creation-Date: 2018-06-14 10:09+0200\n"
-"PO-Revision-Date: 2018-06-17 00:33+0200\n"
+"POT-Creation-Date: 2018-06-27 07:12+0200\n"
+"PO-Revision-Date: 2018-06-18 15:05+0200\n"
 "Last-Translator: Martin Srebotnjak \n"
 "Language-Team: sl.libreoffice.org\n"
-"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || 
n%100==4 ? 2 : 3);\n"
 "X-Generator: Virtaal 0.7.1\n"
 "X-Accelerator-Marker: ~\n"
@@ -3816,107 +3816,107 @@ msgctxt "colorconfigwin|shadows"
 msgid "Shadows"
 msgstr "Sence"
 
-#: cui/uiconfig/ui/colorpage.ui:60
+#: cui/uiconfig/ui/colorpage.ui:82
 msgctxt "colorpage|label21"
 msgid "Palette:"
 msgstr "Paleta:"
 
-#: cui/uiconfig/ui/colorpage.ui:101
+#: cui/uiconfig/ui/colorpage.ui:122
 msgctxt "colorpage|label20"
 msgid "Recent Colors"
 msgstr "Nedavne barve"
 
-#: cui/uiconfig/ui/colorpage.ui:156
+#: cui/uiconfig/ui/colorpage.ui:174
 msgctxt "colorpage|RGB"
 msgid "RGB"
 msgstr "RGB"
 
-#: cui/uiconfig/ui/colorpage.ui:173
+#: cui/uiconfig/ui/colorpage.ui:189
 msgctxt "colorpage|CMYK"
 msgid "CMYK"
 msgstr "CMYK"
 
-#: cui/uiconfig/ui/colorpage.ui:190
+#: cui/uiconfig/ui/colorpage.ui:204
 msgctxt "colorpage|delete"
 msgid "Delete"
 msgstr "Izbriši"
 
-#: cui/uiconfig/ui/colorpage.ui:208
+#: cui/uiconfig/ui/colorpage.ui:219
 msgctxt "colorpage|label22"
 msgid "Custom Palette"
 msgstr "Paleta po meri"
 
-#: cui/uiconfig/ui/colorpage.ui:260
+#: cui/uiconfig/ui/colorpage.ui:283
 msgctxt "colorpage|label1"
 msgid "Colors"
 msgstr "Barve"
 
-#: cui/uiconfig/ui/colorpage.ui:305
+#: cui/uiconfig/ui/colorpage.ui:328
 msgctxt "colorpage|oldpreview-atkobject"
 msgid "Old Color"
 msgstr "Stara barva"
 
-#: cui/uiconfig/ui/colorpage.ui:335
+#: cui/uiconfig/ui/colorpage.ui:358
 msgctxt "colorpage|label7"
 msgid "B"
 msgstr "B"
 
-#: cui/uiconfig/ui/colorpage.ui:350
+#: cui/uiconfig/ui/colorpage.ui:371
 msgctxt "colorpage|label8"
 msgid "G"
 msgstr "G"
 
-#: cui/uiconfig/ui/colorpage.ui:365
+#: cui/uiconfig/ui/colorpage.ui:384
 msgctxt "colorpage|label9"
 msgid "R"
 msgstr "R"
 
-#: cui/uiconfig/ui/colorpage.ui:380
+#: cui/uiconfig/ui/colorpage.ui:397

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - include/ucbhelper ucbhelper/Library_ucbhelper.mk ucbhelper/source ucb/source

[Mike Kaganski]

 include/ucbhelper/proxydecider.hxx |4 
 ucb/source/ucp/webdav-neon/NeonSession.cxx |2 
 ucb/source/ucp/webdav-neon/NeonSession.hxx |2 
 ucbhelper/Library_ucbhelper.mk |4 
 ucbhelper/source/client/proxydecider.cxx   |  154 -
 5 files changed, 159 insertions(+), 7 deletions(-)

New commits:
commit dc58872a7296c0577e7dbe2ba41c33246386749d
Author: Mike Kaganski 
Date:   Tue Jun 26 14:39:49 2018 +1000

tdf#114227: Add support for PAC to ucbhelper::InternetProxyDecider on 
Windows

Change-Id: I62c76efb354949699615a44d9482df24e3eaa314
Reviewed-on: https://gerrit.libreoffice.org/56433
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
(cherry picked from commit 2e142c0ee54744d35517f0b9c49a24302fb32d47)
Reviewed-on: https://gerrit.libreoffice.org/56688
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/include/ucbhelper/proxydecider.hxx 
b/include/ucbhelper/proxydecider.hxx
index 0ee4400a1392..3c873e2fe193 100644
--- a/include/ucbhelper/proxydecider.hxx
+++ b/include/ucbhelper/proxydecider.hxx
@@ -119,10 +119,10 @@ public:
   * If host is not empty this parameter must always contain a valid
   * port number, for instance the default port for the requested
   * protocol(i.e. 80 or http).
-  * @return a InternetProxyServer reference. If member aName of the
+  * @return a InternetProxyServer struct. If member aName of the
   * InternetProxyServer is empty no proxy server is to be used.
   */
-const InternetProxyServer &
+InternetProxyServer
 getProxy( const OUString & rProtocol,
   const OUString & rHost,
   sal_Int32 nPort ) const;
diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx 
b/ucb/source/ucp/webdav-neon/NeonSession.cxx
index f9ccc0072c49..3af9a6aba60f 100644
--- a/ucb/source/ucp/webdav-neon/NeonSession.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonSession.cxx
@@ -1696,7 +1696,7 @@ void NeonSession::abort()
 SAL_INFO( "ucb.ucp.webdav", "neon commands cannot be aborted" );
 }
 
-const ucbhelper::InternetProxyServer & NeonSession::getProxySettings() const
+ucbhelper::InternetProxyServer NeonSession::getProxySettings() const
 {
 if ( m_aScheme == "http" || m_aScheme == "https" )
 {
diff --git a/ucb/source/ucp/webdav-neon/NeonSession.hxx 
b/ucb/source/ucp/webdav-neon/NeonSession.hxx
index 28b23678326c..db20772a62f2 100644
--- a/ucb/source/ucp/webdav-neon/NeonSession.hxx
+++ b/ucb/source/ucp/webdav-neon/NeonSession.hxx
@@ -219,7 +219,7 @@ private:
   const OUString & inPath,
   const DAVRequestEnvironment & rEnv );
 
-const ucbhelper::InternetProxyServer & getProxySettings() const;
+ucbhelper::InternetProxyServer getProxySettings() const;
 
 bool removeExpiredLocktoken( const OUString & inURL,
  const DAVRequestEnvironment & rEnv );
diff --git a/ucbhelper/Library_ucbhelper.mk b/ucbhelper/Library_ucbhelper.mk
index 85c8e16f1573..8734c5291d91 100644
--- a/ucbhelper/Library_ucbhelper.mk
+++ b/ucbhelper/Library_ucbhelper.mk
@@ -50,5 +50,9 @@ $(eval $(call gb_Library_add_exception_objects,ucbhelper,\
 ucbhelper/source/provider/simplenameclashresolverequest \
 ))
 
+$(eval $(call gb_Library_use_system_win32_libs,ucbhelper,\
+Winhttp \
+))
+
 # vim: set noet sw=4 ts=4:
 
diff --git a/ucbhelper/source/client/proxydecider.cxx 
b/ucbhelper/source/client/proxydecider.cxx
index cc0dd60afeab..fdf4506add26 100644
--- a/ucbhelper/source/client/proxydecider.cxx
+++ b/ucbhelper/source/client/proxydecider.cxx
@@ -34,6 +34,13 @@
 #include 
 #include 
 
+#ifdef _WIN32
+#include 
+#define WIN32_LEAN_AND_MEAN
+#include 
+#include 
+#endif
+
 using namespace com::sun::star;
 using namespace ucbhelper;
 
@@ -131,7 +138,7 @@ public:
 
 void dispose();
 
-const InternetProxyServer & getProxy( const OUString & rProtocol,
+InternetProxyServer getProxy(const OUString& rProtocol,
   const OUString & rHost,
   sal_Int32 nPort ) const;
 
@@ -428,8 +435,138 @@ bool InternetProxyDecider_Impl::shouldUseProxy( const 
OUString & rHost,
 return true;
 }
 
+#ifdef _WIN32
+namespace
+{
+struct GetPACProxyData
+{
+const OUString& m_rProtocol;
+const OUString& m_rHost;
+sal_Int32 m_nPort;
+bool m_bAutoDetect = false;
+OUString m_sAutoConfigUrl;
+InternetProxyServer m_ProxyServer;
+
+GetPACProxyData(const OUString& rProtocol, const OUString& rHost, 
sal_Int32 nPort)
+: m_rProtocol(rProtocol)
+, m_rHost(rHost)
+, m_nPort(nPort)
+{
+}
+};
+
+// Tries to get proxy configuration using WinHttpGetProxyForUrl, which 
supports Web Proxy Auto-Discovery
+// (WPAD) protocol and manually configured address to get Proxy 
Auto-Configuration (PAC) file.
+// The WinINet/WinHTTP functions cannot correctly run i

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - 10 commits - configure.ac cui/source download.lst drawinglayer/source i18npool/inc i18npool/source i18nutil/source lotuswordpro/sourc

[Eike Rathke]

 configure.ac |2 
 cui/source/options/personalization.cxx   |   14 +++-
 cui/source/options/personalization.hxx   |4 -
 download.lst |4 -
 drawinglayer/source/tools/emfphelperdata.cxx |9 ++
 i18npool/inc/collator_unicode.hxx|2 
 i18npool/source/breakiterator/breakiterator_unicode.cxx  |   26 
 i18npool/source/collator/collator_unicode.cxx|   16 ++---
 i18npool/source/collator/gencoll_rule.cxx|2 
 i18npool/source/ordinalsuffix/ordinalsuffix.cxx  |2 
 i18npool/source/transliteration/ignoreDiacritics_CTL.cxx |6 -
 i18nutil/source/utility/unicode.cxx  |8 +-
 lotuswordpro/source/filter/localtime.cxx |2 
 opencl/source/openclconfig.cxx   |2 
 package/source/manifest/ManifestDefines.hxx  |9 ++
 package/source/manifest/ManifestImport.cxx   |   48 +--
 package/source/manifest/ManifestImport.hxx   |   12 +++
 vcl/inc/scrptrun.h   |2 
 vcl/source/window/status.cxx |3 
 xmlsecurity/qa/unit/signing/data/encryptedGPG_odf13.odt  |binary
 xmlsecurity/qa/unit/signing/signing.cxx  |8 ++
 21 files changed, 134 insertions(+), 47 deletions(-)

New commits:
commit 511ee4354f33b9db5a741af7d56c001a3cb016b3
Author: Eike Rathke 
Date:   Mon Dec 18 20:38:59 2017 +0100

Explicitly qualify ICU types with icu:: namespace

It will be required by ICU 61 anyway, see
https://ssl.icu-project.org/repos/icu/trunk/icu4c/readme.html#RecBuild

Change-Id: If7f1330550981fd28eb7eea6329f21e116291cca
Reviewed-on: https://gerrit.libreoffice.org/46740
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 
Reviewed-on: https://gerrit.libreoffice.org/56779
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 3aabc93b8a3f55eb0a3f9e413b124fd8deab7e47)

diff --git a/lotuswordpro/source/filter/localtime.cxx 
b/lotuswordpro/source/filter/localtime.cxx
index 47d202412724..3805c5d6f973 100644
--- a/lotuswordpro/source/filter/localtime.cxx
+++ b/lotuswordpro/source/filter/localtime.cxx
@@ -174,7 +174,7 @@ bool LtgLocalTime(long rtime,LtTm& rtm)
 
 if ((rtime > 3 * DAY_SEC)&&(rtime < LONG_MAX - 3 * DAY_SEC))
 {
-TimeZone* pLocalZone = TimeZone::createDefault();
+icu::TimeZone* pLocalZone = icu::TimeZone::createDefault();
 long offset = (pLocalZone->getRawOffset())/1000;
 delete pLocalZone;
 long ltime = rtime + offset;
commit 8714906f5430525027bcfb84b90eb5b80e512c8c
Author: Thorsten Behrens 
Date:   Thu Jun 28 15:17:40 2018 +0200

ODF1.3: import new OpenPGP encryption markup

With OFFICE-3940 the loext markup got accepted for ODF1.3 (and
the redundant KeyInfo element removed). Make sure manifest parser
can import new markup.

Change-Id: Id3c88654e8e6e0e256cd68fbb43f1ef670849cf7
Reviewed-on: https://gerrit.libreoffice.org/56597
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 
(cherry picked from commit a7bf6488ebb544e1efaed0a1e53073df9cc2064d)
Reviewed-on: https://gerrit.libreoffice.org/56678
Reviewed-by: Katarina Behrens 
(cherry picked from commit dd9232a6b2bcd32c7279e1476445214c6bb9e417)

diff --git a/package/source/manifest/ManifestDefines.hxx 
b/package/source/manifest/ManifestDefines.hxx
index c68c241c7514..44c0cb4c5254 100644
--- a/package/source/manifest/ManifestDefines.hxx
+++ b/package/source/manifest/ManifestDefines.hxx
@@ -46,6 +46,15 @@
 #define ATTRIBUTE_ALGORITHM "loext:PGPAlgorithm"
 #define ELEMENT_CIPHERDATA "loext:CipherData"
 #define ELEMENT_CIPHERVALUE "loext:CipherValue"
+#define ELEMENT_MANIFEST13_KEYINFO "manifest:keyinfo"
+#define ELEMENT_ENCRYPTEDKEY13 "manifest:encrypted-key"
+#define ELEMENT_ENCRYPTIONMETHOD13 "manifest:encryption-method"
+#define ELEMENT_PGPDATA13 "manifest:PGPData"
+#define ELEMENT_PGPKEYID13 "manifest:PGPKeyID"
+#define ELEMENT_PGPKEYPACKET13 "manifest:PGPKeyPacket"
+#define ATTRIBUTE_ALGORITHM13 "manifest:PGPAlgorithm"
+#define ELEMENT_CIPHERDATA13 "manifest:CipherData"
+#define ELEMENT_CIPHERVALUE13 "manifest:CipherValue"
 
 #define ELEMENT_ENCRYPTION_DATA "manifest:encryption-data"
 #define ATTRIBUTE_CHECKSUM_TYPE "manifest:checksum-type"
diff --git a/package/source/manifest/ManifestImport.cxx 
b/package/source/manifest/ManifestImport.cxx
index 98a9d61128b5..fda529838214 100644
--- a/package/source/manifest/ManifestImport.cxx
+++ b/package/source/manifest/ManifestImport.cxx
@@ -69,6 +69,16 @@ ManifestImport::ManifestImport( vector < Sequence < 
PropertyValue > > & rNewManV
 , sCipherDataElement( ELEMENT_CIPHERDATA )
 , sCipherValueElement   ( ELEMENT_CIPHERVALUE )
 
+, s

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - configure.ac

[Andras Timar]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7ae2ee5d0125e9e63657bed76f2218069fe94cbe
Author: Andras Timar 
Date:   Mon Jul 2 10:53:35 2018 +0200

Bump version to 6.0-6

Change-Id: Ib7022c8c365cbcf9e4771198f81e0c205b78cded

diff --git a/configure.ac b/configure.ac
index cd47842148f5..68d0accb1fa4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([Collabora Office],[6.0.10.5],[],[],[https://collaboraoffice.com/])
+AC_INIT([Collabora Office],[6.0.10.6],[],[],[https://collaboraoffice.com/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: icon-themes/colibre officecfg/registry

[andreas kainz]

 icon-themes/colibre/links.txt|7 ++
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |   24 
++
 2 files changed, 31 insertions(+)

New commits:
commit 2fbcfc8ab619e64642e97aeb2f7a8c8585615d59
Author: andreas kainz 
Date:   Mon Jul 2 08:30:58 2018 +0200

Colibre icons: add icons for Common Align actions

Change-Id: Ia234b76039759d6f71ec6578e7ffa4ff4236dae2
Reviewed-on: https://gerrit.libreoffice.org/56797
Tested-by: Jenkins
Reviewed-by: andreas_kainz 

diff --git a/icon-themes/colibre/links.txt b/icon-themes/colibre/links.txt
index f69a4a8dd635..a1f642f3a2e2 100644
--- a/icon-themes/colibre/links.txt
+++ b/icon-themes/colibre/links.txt
@@ -589,6 +589,13 @@ cmd/sc_cellverttop.png cmd/sc_aligntop.png
 cmd/sc_cellvertcenter.png cmd/sc_alignverticalcenter.png
 cmd/sc_cellvertbottom.png cmd/sc_alignbottom.png
 
+cmd/sc_commonaligntop.png cmd/sc_aligntop.png
+cmd/sc_commonalignverticalcenter.png cmd/sc_alignverticalcenter.png
+cmd/sc_commonalignbottom.png cmd/sc_alignbottom.png
+cmd/lc_commonaligntop.png cmd/lc_aligntop.png
+cmd/lc_commonalignverticalcenter.png cmd/lc_alignverticalcenter.png
+cmd/lc_commonalignbottom.png cmd/lc_alignbottom.png
+
 # paragraph line spacing drop down
 cmd/lc_linespacing.png cmd/lc_spacepara15.png
 cmd/sc_linespacing.png cmd/sc_spacepara15.png
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 7797f58ec856..40181b7e4f4f 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -6035,41 +6035,65 @@
 
   Centered
 
+
+  1
+
   
   
 
   Right
 
+
+  1
+
   
   
 
   Top
 
+
+  1
+
   
   
 
   Center
 
+
+  1
+
   
   
 
   Bottom
 
+
+  1
+
   
   
 
   Justified
 
+
+  1
+
   
   
 
   Default
 
+
+  1
+
   
   
 
   Default
 
+
+  1
+
   
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: icon-themes/karasa_jaga

[Rizal Muttaqin]

 dev/null   
 |binary
 icon-themes/karasa_jaga/cmd/32/dsbrowserexplorer.png   
 |binary
 icon-themes/karasa_jaga/cmd/32/flowchartshapes.flowchart-card.png  
 |binary
 icon-themes/karasa_jaga/cmd/32/flowchartshapes.flowchart-collate.png   
 |binary
 icon-themes/karasa_jaga/cmd/32/flowchartshapes.flowchart-delay.png 
 |binary
 icon-themes/karasa_jaga/cmd/32/flowchartshapes.flowchart-display.png   
 |binary
 icon-themes/karasa_jaga/cmd/32/flowchartshapes.flowchart-document.png  
 |binary
 icon-themes/karasa_jaga/cmd/32/flowchartshapes.flowchart-internal-storage.png  
 |binary
 icon-themes/karasa_jaga/cmd/32/flowchartshapes.flowchart-manual-input.png  
 |binary
 icon-themes/karasa_jaga/cmd/32/flowchartshapes.flowchart-merge.png 
 |binary
 icon-themes/karasa_jaga/cmd/32/flowchartshapes.flowchart-punched-tape.png  
 |binary
 icon-themes/karasa_jaga/cmd/32/flowchartshapes.flowchart-sequential-access.png 
 |binary
 icon-themes/karasa_jaga/cmd/32/flowchartshapes.flowchart-stored-data.png   
 |binary
 icon-themes/karasa_jaga/cmd/32/flowchartshapes.flowchart-terminator.png
 |binary
 icon-themes/karasa_jaga/cmd/32/fontworksameletterheights.png   
 |binary
 icon-themes/karasa_jaga/cmd/32/footnotedialog.png  
 |binary
 icon-themes/karasa_jaga/cmd/32/formfilter.png  
 |binary
 icon-themes/karasa_jaga/cmd/32/sectionshrink.png   
 |binary
 icon-themes/karasa_jaga/cmd/32/sectionshrinkbottom.png 
 |binary
 icon-themes/karasa_jaga/cmd/32/sectionshrinktop.png
 |binary
 icon-themes/karasa_jaga/cmd/32/sendmail.png
 |binary
 icon-themes/karasa_jaga/cmd/lc_crookrotate.png 
 |binary
 icon-themes/karasa_jaga/cmd/lc_crookslant.png  
 |binary
 icon-themes/karasa_jaga/cmd/lc_dsbrowserexplorer.png   
 |binary
 icon-themes/karasa_jaga/cmd/lc_flowchartshapes.flowchart-card.png  
 |binary
 icon-themes/karasa_jaga/cmd/lc_flowchartshapes.flowchart-decision.png  
 |binary
 icon-themes/karasa_jaga/cmd/lc_flowchartshapes.flowchart-delay.png 
 |binary
 icon-themes/karasa_jaga/cmd/lc_flowchartshapes.flowchart-display.png   
 |binary
 icon-themes/karasa_jaga/cmd/lc_flowchartshapes.flowchart-document.png  
 |binary
 icon-themes/karasa_jaga/cmd/lc_flowchartshapes.flowchart-multidocument.png 
 |binary
 
icon-themes/karasa_jaga/cmd/lc_flowchartshapes.flowchart-off-page-connector.png 
|binary
 icon-themes/karasa_jaga/cmd/lc_flowchartshapes.flowchart-punched-tape.png  
 |binary
 icon-themes/karasa_jaga/cmd/lc_flowchartshapes.flowchart-terminator.png
 |binary
 icon-themes/karasa_jaga/cmd/lc_fontheight.png  
 |binary
 icon-themes/karasa_jaga/cmd/lc_fontworksameletterheights.png   
 |binary
 icon-themes/karasa_jaga/cmd/lc_formfilter.png  
 |binary
 icon-themes/karasa_jaga/cmd/lc_grow.png
 |binary
 icon-themes/karasa_jaga/cmd/lc_insertauthoritiesentry.png  
 |binary
 icon-themes/karasa_jaga/cmd/lc_insertbreak.png 
 |binary
 icon-themes/karasa_jaga/cmd/lc_insertpagebreak.png 
 |binary
 icon-themes/karasa_jaga/cmd/lc_linewidth.png   
 |binary
 icon-themes/karasa_jaga/cmd/lc_rotateleft.png  
 |binary
 icon-themes/karasa_jaga/cmd/lc_rotateright.png 
 |binary
 icon-themes/karasa_jaga/cmd/lc_sectionshrink.png   
 |binary
 icon-themes/karasa_jaga/cmd/lc_sectionshrinkbottom.png 
 |binary
 icon-themes/karasa_jaga/cmd/lc_sectionshrinktop.png
 |binary
 icon-themes/karasa_jaga/cmd/lc_sendmail.png
 |binary
 icon-themes/karasa_jaga/cmd/lc_shrink.png  
 |binary
 icon-themes/karasa_jaga/cmd/lc_tablemodefix.png
 |binary
 icon-themes/karasa_jaga/cmd/lc_tablemodefixprop.png
 |binary
 icon-themes/karasa_jaga/cmd/lc_tablemodevariable.png   
 |binary
 icon-themes/karasa_jaga/cmd/sc_crookrotate.png 
 |binary
 icon-themes/karasa_jaga/cmd/sc_crookslant.png  
 |binary
 icon-themes/karasa_jaga/cmd/sc_dsbrowserexplorer.png   
 |binary
 icon-themes/karasa_jaga/cmd/sc_fontheight.png  
 |binary
 icon-themes/karasa_jaga/cmd/sc_fontworksamelett

Re: Close EasyHack tdf#96099 "Reduce number of typedefs used for trivial container types"?

[Eike Rathke]

Hi,

On Friday, 2018-06-29 10:16:17 +0200, Stephan Bergmann wrote:

> Following good tradition of not discussing the usefulness of EasyHack bugs
> directly in bugzilla, lets do that here:
> 
> Shall we close the EasyHack
>  "Reduce number
> of typedefs used for trivial container types" for good now?

Yes.

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key 0x6A6CD5B765632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
Care about Free Software, support the FSFE https://fsfe.org/support/?erack


signature.asc
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sw/inc sw/source

[Miklos Vajna]

 sw/inc/calbck.hxx  |   12 ++--
 sw/source/core/access/acctable.cxx |8 
 sw/source/core/attr/calbck.cxx |   10 +-
 3 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit 74b33394c45889b640a852ad156e31a5ba60e45b
Author: Miklos Vajna 
Date:   Mon Jul 2 09:08:15 2018 +0200

sw: prefix members of SwAccSingleTableSelHander_Impl

Also use the 's_' prefix in sw::ClientIteratorBase, like it's done
almost everywhere else.

Change-Id: Id2c28037eb4f69ce1f27e0365e2b078ffc300935
Reviewed-on: https://gerrit.libreoffice.org/56798
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins

diff --git a/sw/inc/calbck.hxx b/sw/inc/calbck.hxx
index 967e4be6a314..25e815177f0a 100644
--- a/sw/inc/calbck.hxx
+++ b/sw/inc/calbck.hxx
@@ -285,13 +285,13 @@ namespace sw
 // is marked down to become the current object in the next step
 // this is necessary because iteration requires access to members 
of the current object
 WriterListener* m_pPosition;
-static SW_DLLPUBLIC ClientIteratorBase* our_pClientIters;
+static SW_DLLPUBLIC ClientIteratorBase* s_pClientIters;
 
 ClientIteratorBase( const SwModify& rModify )
 : m_rRoot(rModify)
 {
-MoveTo(our_pClientIters);
-our_pClientIters = this;
+MoveTo(s_pClientIters);
+s_pClientIters = this;
 m_pCurrent = m_pPosition = m_rRoot.m_pWriterListeners;
 }
 WriterListener* GetLeftOfPos() { return m_pPosition->m_pLeft; }
@@ -306,9 +306,9 @@ namespace sw
 }
 ~ClientIteratorBase() override
 {
-assert(our_pClientIters);
-if(our_pClientIters == this)
-our_pClientIters = unique() ? nullptr : GetNextInRing();
+assert(s_pClientIters);
+if(s_pClientIters == this)
+s_pClientIters = unique() ? nullptr : GetNextInRing();
 MoveTo(nullptr);
 }
 // return "true" if an object was removed from a client chain in 
iteration
diff --git a/sw/source/core/access/acctable.cxx 
b/sw/source/core/access/acctable.cxx
index 0f770311fd11..f203335bd71b 100644
--- a/sw/source/core/access/acctable.cxx
+++ b/sw/source/core/access/acctable.cxx
@@ -478,7 +478,7 @@ void SwAccessibleTableData_Impl::GetRowColumnAndExtent(
 
 class SwAccSingleTableSelHander_Impl : public SwAccTableSelHander_Impl
 {
-bool bSelected;
+bool m_bSelected;
 
 public:
 
@@ -486,19 +486,19 @@ public:
 
 virtual ~SwAccSingleTableSelHander_Impl() {}
 
-bool IsSelected() const { return bSelected; }
+bool IsSelected() const { return m_bSelected; }
 
 virtual void Unselect( sal_Int32, sal_Int32 ) override;
 };
 
 inline SwAccSingleTableSelHander_Impl::SwAccSingleTableSelHander_Impl() :
-bSelected( true )
+m_bSelected( true )
 {
 }
 
 void SwAccSingleTableSelHander_Impl::Unselect( sal_Int32, sal_Int32 )
 {
-bSelected = false;
+m_bSelected = false;
 }
 
 class SwAccAllTableSelHander_Impl : public SwAccTableSelHander_Impl
diff --git a/sw/source/core/attr/calbck.cxx b/sw/source/core/attr/calbck.cxx
index 59451cd06083..b6f00ca93d4a 100644
--- a/sw/source/core/attr/calbck.cxx
+++ b/sw/source/core/attr/calbck.cxx
@@ -220,9 +220,9 @@ void SwModify::Add( SwClient* pDepend )
 if(pDepend->m_pRegisteredIn != this )
 {
 #if OSL_DEBUG_LEVEL > 0
-if(sw::ClientIteratorBase::our_pClientIters)
+if(sw::ClientIteratorBase::s_pClientIters)
 {
-for(auto& rIter : 
sw::ClientIteratorBase::our_pClientIters->GetRingContainer())
+for(auto& rIter : 
sw::ClientIteratorBase::s_pClientIters->GetRingContainer())
 {
 SAL_WARN_IF(&rIter.m_rRoot == m_pWriterListeners, "sw.core", 
"a " << typeid(*pDepend).name() << " client added as listener to a " << 
typeid(*this).name() << " during client iteration.");
 }
@@ -272,9 +272,9 @@ SwClient* SwModify::Remove( SwClient* pDepend )
 pR->m_pLeft = pL;
 
 // update ClientIterators
-if(sw::ClientIteratorBase::our_pClientIters)
+if(sw::ClientIteratorBase::s_pClientIters)
 {
-for(auto& rIter : 
sw::ClientIteratorBase::our_pClientIters->GetRingContainer())
+for(auto& rIter : 
sw::ClientIteratorBase::s_pClientIters->GetRingContainer())
 {
 if (&rIter.m_rRoot == this &&
 (rIter.m_pCurrent == pDepend || rIter.m_pPosition == pDepend))
@@ -362,5 +362,5 @@ void sw::WriterMultiListener::EndListeningAll()
 m_vDepends.clear();
 }
 
-sw::ClientIteratorBase* sw::ClientIteratorBase::our_pClientIters = nullptr;
+sw::ClientIteratorBase* sw::ClientIteratorBase::s_pClientIters = nullptr;
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-com

[Libreoffice-commits] core.git: Branch 'feature/qt5+kde5' - vcl/unx

[Katarina Behrens]

 vcl/unx/kde5/KDE5SalGraphics.cxx |   36 +++-
 vcl/unx/kde5/KDE5SalGraphics.hxx |6 ++
 2 files changed, 33 insertions(+), 9 deletions(-)

New commits:
commit 72a2500327ef6aaa3854b248fef5bfc1ccc99101
Author: Katarina Behrens 
Date:   Mon Jul 2 11:41:10 2018 +0200

Draw button focus so that it doesn't obscure the actual button

Change-Id: I0df51b8dfd75dd966639d0893c379f2038c949ff

diff --git a/vcl/unx/kde5/KDE5SalGraphics.cxx b/vcl/unx/kde5/KDE5SalGraphics.cxx
index 75e7c8664ab4..9377a134fdc4 100644
--- a/vcl/unx/kde5/KDE5SalGraphics.cxx
+++ b/vcl/unx/kde5/KDE5SalGraphics.cxx
@@ -81,6 +81,7 @@ void QImage2BitmapBuffer(QImage* pImg, BitmapBuffer* pBuf)
 KDE5SalGraphics::KDE5SalGraphics()
 : SvpSalGraphics()
 {
+initStyles();
 }
 
 bool KDE5SalGraphics::IsNativeControlSupported(ControlType type, ControlPart 
part)
@@ -218,12 +219,6 @@ bool KDE5SalGraphics::drawNativeControl(ControlType type, 
ControlPart part,
 case ControlType::Tooltip:
 
m_image->fill(QApplication::palette().color(QPalette::ToolTipBase).rgb());
 break;
-case ControlType::Pushbutton:
-if (nControlState & ControlState::FOCUSED)
-
m_image->fill(QApplication::palette().color(QPalette::Highlight).rgb());
-else
-
m_image->fill(QApplication::palette().color(QPalette::Button).rgb());
-break;
 case ControlType::Scrollbar:
 if ((part == ControlPart::DrawBackgroundVert)
 || (part == ControlPart::DrawBackgroundHorz))
@@ -241,9 +236,21 @@ bool KDE5SalGraphics::drawNativeControl(ControlType type, 
ControlPart part,
 
 if (type == ControlType::Pushbutton)
 {
-QStyleOptionButton option;
-draw(QStyle::CE_PushButton, &option, m_image.get(),
- vclStateValue2StateFlag(nControlState, value));
+if (part == ControlPart::Entire)
+{
+QStyleOptionButton option;
+draw(QStyle::CE_PushButton, &option, m_image.get(),
+ vclStateValue2StateFlag(nControlState, value));
+}
+else if (part == ControlPart::Focus)
+{
+QStyleOptionButton option;
+option.state = QStyle::State_HasFocus;
+option.rect = m_image->rect();
+QPainter painter(m_image.get());
+m_focusedButton->style()->drawControl(QStyle::CE_PushButton, 
&option, &painter,
+  m_focusedButton.get());
+}
 }
 else if (type == ControlType::Menubar)
 {
@@ -991,4 +998,15 @@ bool KDE5SalGraphics::hitTestNativeControl(ControlType 
nType, ControlPart nPart,
 return false;
 }
 
+void KDE5SalGraphics::initStyles()
+{
+// button focus
+m_focusedButton.reset(new QPushButton());
+QString aHighlightColor = 
QApplication::palette().color(QPalette::Highlight).name();
+QString focusStyleSheet("background-color: rgb(0,0,0,0%); border: 1px; 
border-radius: 2px; "
+"border-color: %1; border-style:solid;");
+focusStyleSheet.replace("%1", aHighlightColor);
+m_focusedButton->setStyleSheet(focusStyleSheet);
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/kde5/KDE5SalGraphics.hxx b/vcl/unx/kde5/KDE5SalGraphics.hxx
index 77121459e8be..e70159ba9568 100644
--- a/vcl/unx/kde5/KDE5SalGraphics.hxx
+++ b/vcl/unx/kde5/KDE5SalGraphics.hxx
@@ -25,6 +25,7 @@
 #include 
 
 #include 
+#include 
 
 class KDE5SalFrame;
 
@@ -49,6 +50,11 @@ public:
 
 std::unique_ptr m_image;
 QRect lastPopupRect;
+
+private:
+void initStyles();
+
+std::unique_ptr m_focusedButton;
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - nlpsolver/src

[Julien Nabet]

 nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseEvolutionarySolver.java |   
 6 ++
 1 file changed, 6 insertions(+)

New commits:
commit b8fc43af43626c3895033063d10eb547f64c01d0
Author: Julien Nabet 
Date:   Sun Jun 24 21:35:06 2018 +0200

tdf#43388: add missing info for Evolutionary Algorithm Solver

Add SolverConstraintOperator.INTEGER_value case and in the same time
the also missing SolverConstraintOperator.BINARY_value case

Change-Id: I18b826e74a2381dedaea3090919118b8d5dad072
Reviewed-on: https://gerrit.libreoffice.org/56359
Tested-by: Jenkins
Reviewed-by: Julien Nabet 
(cherry picked from commit 02a66f29fec36aed5fb1e800a08c1390d3674b59)
Reviewed-on: https://gerrit.libreoffice.org/56434
Reviewed-by: Christian Lohmaier 

diff --git 
a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseEvolutionarySolver.java 
b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseEvolutionarySolver.java
index 701e6ba63226..c0b10c2f4951 100644
--- a/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseEvolutionarySolver.java
+++ b/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver/BaseEvolutionarySolver.java
@@ -105,6 +105,12 @@ public abstract class BaseEvolutionarySolver extends 
BaseNLPSolver {
 case SolverConstraintOperator.LESS_EQUAL_value:
 setDefaultYAt(i + 1, BasicBound.MINDOUBLE, 
constraint.Data);
 break;
+case SolverConstraintOperator.INTEGER_value:
+setDefaultYAt(i + 1, BasicBound.MINDOUBLE, 
BasicBound.MAXDOUBLE);
+break;
+case SolverConstraintOperator.BINARY_value:
+setDefaultYAt(i + 1, 0, 1);
+break;
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - vcl/quartz

[Bartosz Kosiorek]

 vcl/quartz/salbmp.cxx |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit a3786926c8a56c9eecb6547eb70c1dba98373788
Author: Bartosz Kosiorek 
Date:   Thu Jun 28 09:52:50 2018 +0200

tdf#117335 Fix displaying GIF images

To fix regression the sal_uInt16 was used instead of sal_uInt8.
Verified on macOS High Sierra 10.13.5.
I also checked if with this fix, there is no issue with displaying EMF 
(tdf#113197)
Sample document from tdf#113197 is displaying correctly.

Change-Id: I6504717d831a193b0a878ced2f335d34a993aed6
Reviewed-on: https://gerrit.libreoffice.org/56578
Tested-by: Jenkins
Reviewed-by: Armin Le Grand 
Reviewed-by: Bartosz Kosiorek 
(cherry picked from commit 054a3586bb4808728a5cd58ea8a867539c08e55c)
Reviewed-on: https://gerrit.libreoffice.org/56667
Reviewed-by: Christian Lohmaier 

diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx
index 7146461c7af1..d7de93591f8a 100644
--- a/vcl/quartz/salbmp.cxx
+++ b/vcl/quartz/salbmp.cxx
@@ -438,13 +438,13 @@ class ImplPixelFormat8 : public ImplPixelFormat
 private:
 sal_uInt8* pData;
 const BitmapPalette& mrPalette;
-const sal_uInt8 mnPaletteCount;
+const sal_uInt16 mnPaletteCount;
 
 public:
 explicit ImplPixelFormat8( const BitmapPalette& rPalette )
 : pData(nullptr)
 , mrPalette(rPalette)
-, mnPaletteCount(static_cast< sal_uInt8 >(rPalette.GetEntryCount()))
+, mnPaletteCount(rPalette.GetEntryCount())
 {
 }
 virtual void StartLine( sal_uInt8* pLine ) override { pData = pLine; }
@@ -473,7 +473,7 @@ class ImplPixelFormat4 : public ImplPixelFormat
 private:
 sal_uInt8* pData;
 const BitmapPalette& mrPalette;
-const sal_uInt8 mnPaletteCount;
+const sal_uInt16 mnPaletteCount;
 sal_uInt32 mnX;
 sal_uInt32 mnShift;
 
@@ -481,7 +481,7 @@ public:
 explicit ImplPixelFormat4( const BitmapPalette& rPalette )
 : pData(nullptr)
 , mrPalette(rPalette)
-, mnPaletteCount(static_cast< sal_uInt8 >(rPalette.GetEntryCount()))
+, mnPaletteCount(rPalette.GetEntryCount())
 , mnX(0)
 , mnShift(0)
 {
@@ -526,14 +526,14 @@ class ImplPixelFormat1 : public ImplPixelFormat
 private:
 sal_uInt8* pData;
 const BitmapPalette& mrPalette;
-const sal_uInt8 mnPaletteCount;
+const sal_uInt16 mnPaletteCount;
 sal_uInt32 mnX;
 
 public:
 explicit ImplPixelFormat1( const BitmapPalette& rPalette )
 : pData(nullptr)
 , mrPalette(rPalette)
-, mnPaletteCount(static_cast< sal_uInt8 >(rPalette.GetEntryCount()))
+, mnPaletteCount(rPalette.GetEntryCount())
 , mnX(0)
 {
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - external/firebird

[Andras Timar]

 external/firebird/UnpackedTarball_firebird.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7adcac2a172954b735dcb0079987c1c8d630f576
Author: Andras Timar 
Date:   Mon Jul 2 13:04:20 2018 +0200

Resolve conflict with firebird-cygwin-msvc.patch

Change-Id: I7dbc8f71c25a6c6fb508614c3cb9e396f178ff8a

diff --git a/external/firebird/UnpackedTarball_firebird.mk 
b/external/firebird/UnpackedTarball_firebird.mk
index 31a3ea53d7df..84caf692b9f0 100644
--- a/external/firebird/UnpackedTarball_firebird.mk
+++ b/external/firebird/UnpackedTarball_firebird.mk
@@ -28,7 +28,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
external/firebird/libc++.patch \

external/firebird/0001-Avoid-hangup-in-SS-when-error-happens-at-system-atta.patch.1
 \

external/firebird/0002-Backported-fix-for-CORE-5452-Segfault-when-engine-s-.patch.1
 \
-   external/firebird/macos-segv-fix.patch \
 ))
 
 ifeq ($(OS),WNT)
@@ -43,6 +42,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
external/firebird/firebird-configure-x86-64-macosx.patch.1 \
external/firebird/firebird-macosx.patch.1 \
external/firebird/macosx-elcapitan-dyld.patch \
+   external/firebird/macos-segv-fix.patch \
 ))
 endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - include/vcl vcl/unx

[Caolán McNamara]

 include/vcl/ppdparser.hxx |2 +-
 vcl/unx/generic/printer/jobdata.cxx   |3 ++-
 vcl/unx/generic/printer/ppdparser.cxx |   12 ++--
 3 files changed, 9 insertions(+), 8 deletions(-)

New commits:
commit 0cefb4f0552a9d1ec3afd64e695596480a1c9757
Author: Caolán McNamara 
Date:   Tue Jun 19 21:43:43 2018 +0100

forcepoint#50 fix end detection

rBuffer.size() of 26, nBytes of 25, rBuffer[25] is the first zero
so aLine.getLength() of 25, nBytes reduced by aLine.getLength()+1 and
nRun increased by same, so nBytes wraps and nRun is 26.

contains...

forcepoint: rework to explore loop

Change-Id: I14f6a3269fc3347a9976d899519e74f58d5975c8
Reviewed-on: https://gerrit.libreoffice.org/56125
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit 6e5e83025c948b699bb65839ef810a45a98ba014)

Change-Id: Ia9f4789e081e6b77a21321f37d71cabfc7c84550
Reviewed-on: https://gerrit.libreoffice.org/56481
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/include/vcl/ppdparser.hxx b/include/vcl/ppdparser.hxx
index a3a04b86fdff..2cac587cd1c0 100644
--- a/include/vcl/ppdparser.hxx
+++ b/include/vcl/ppdparser.hxx
@@ -269,7 +269,7 @@ public:
 
 // for printer setup
 char*   getStreamableBuffer( sal_uLong& rBytes ) const;
-voidrebuildFromStreamBuffer( char* pBuffer, sal_uLong nBytes );
+voidrebuildFromStreamBuffer(const std::vector &rBuffer);
 
 // convenience
 int getRenderResolution() const;
diff --git a/vcl/unx/generic/printer/jobdata.cxx 
b/vcl/unx/generic/printer/jobdata.cxx
index 92f9204b51e2..43e33bc22d0d 100644
--- a/vcl/unx/generic/printer/jobdata.cxx
+++ b/vcl/unx/generic/printer/jobdata.cxx
@@ -279,8 +279,9 @@ bool JobData::constructFromStreamBuffer( const void* pData, 
sal_uInt32 bytes, Jo
 nBytes = aStream.ReadBytes(aRemain.data(), nBytes);
 if (nBytes)
 {
+aRemain.resize(nBytes+1);
 aRemain[nBytes] = 0;
-
rJobData.m_aContext.rebuildFromStreamBuffer(aRemain.data(), nBytes);
+rJobData.m_aContext.rebuildFromStreamBuffer(aRemain);
 bContext = true;
 }
 }
diff --git a/vcl/unx/generic/printer/ppdparser.cxx 
b/vcl/unx/generic/printer/ppdparser.cxx
index b81359c8fea5..65a1b1cf30e3 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -1926,17 +1926,18 @@ char* PPDContext::getStreamableBuffer( sal_uLong& 
rBytes ) const
 return pBuffer;
 }
 
-void PPDContext::rebuildFromStreamBuffer( char* pBuffer, sal_uLong nBytes )
+void PPDContext::rebuildFromStreamBuffer(const std::vector &rBuffer)
 {
 if( ! m_pParser )
 return;
 
 m_aCurrentValues.clear();
 
-char* pRun = pBuffer;
-while( nBytes && *pRun )
+const size_t nBytes = rBuffer.size() - 1;
+size_t nRun = 0;
+while (nRun < nBytes && rBuffer[nRun])
 {
-OString aLine( pRun );
+OString aLine(rBuffer.data() + nRun);
 sal_Int32 nPos = aLine.indexOf(':');
 if( nPos != -1 )
 {
@@ -1955,8 +1956,7 @@ void PPDContext::rebuildFromStreamBuffer( char* pBuffer, 
sal_uLong nBytes )
 << " }");
 }
 }
-nBytes -= aLine.getLength()+1;
-pRun += aLine.getLength()+1;
+nRun += aLine.getLength()+1;
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - 2 commits - icon-themes/colibre icon-themes/colibre_svg

[andreas kainz]

 icon-themes/colibre/avmedia/res/avaudiologo.png |binary
 icon-themes/colibre/avmedia/res/avemptylogo.png |binary
 icon-themes/colibre/cmd/lc_basicstop.png|binary
 icon-themes/colibre/cmd/lc_mediapause.png   |binary
 icon-themes/colibre/cmd/sc_mediapause.png   |binary
 icon-themes/colibre_svg/avmedia/res/avaudiologo.svg |2 +-
 icon-themes/colibre_svg/avmedia/res/avemptylogo.svg |2 +-
 icon-themes/colibre_svg/cmd/lc_basicstop.svg|2 +-
 icon-themes/colibre_svg/cmd/lc_mediapause.svg   |2 +-
 icon-themes/colibre_svg/cmd/sc_mediapause.svg   |3 ++-
 10 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit fbab4c3b9748bb0a9b5de1c2ad5d57caccfb305c
Author: andreas kainz 
Date:   Mon Jul 2 08:14:11 2018 +0200

Colibre icons: update mediaplayer icons

Change-Id: I97cf021a65e6daedc742cf76089622a7ba6b309e
Reviewed-on: https://gerrit.libreoffice.org/56794
Reviewed-by: andreas_kainz 
Tested-by: andreas_kainz 
(cherry picked from commit 683fa7b68673c8c6563ee493b8b5682bb6fd1b8a)
Reviewed-on: https://gerrit.libreoffice.org/56801
Tested-by: Jenkins

diff --git a/icon-themes/colibre/cmd/lc_basicstop.png 
b/icon-themes/colibre/cmd/lc_basicstop.png
index 80119467f7aa..574a93ed6ec6 100644
Binary files a/icon-themes/colibre/cmd/lc_basicstop.png and 
b/icon-themes/colibre/cmd/lc_basicstop.png differ
diff --git a/icon-themes/colibre/cmd/lc_mediapause.png 
b/icon-themes/colibre/cmd/lc_mediapause.png
index fd5ca11ad742..3e76dea2f95a 100644
Binary files a/icon-themes/colibre/cmd/lc_mediapause.png and 
b/icon-themes/colibre/cmd/lc_mediapause.png differ
diff --git a/icon-themes/colibre/cmd/sc_mediapause.png 
b/icon-themes/colibre/cmd/sc_mediapause.png
index 92c11599ee2b..4972c7c4fc54 100644
Binary files a/icon-themes/colibre/cmd/sc_mediapause.png and 
b/icon-themes/colibre/cmd/sc_mediapause.png differ
diff --git a/icon-themes/colibre_svg/cmd/lc_basicstop.svg 
b/icon-themes/colibre_svg/cmd/lc_basicstop.svg
index ca046e37ac07..7229dc63014e 100644
--- a/icon-themes/colibre_svg/cmd/lc_basicstop.svg
+++ b/icon-themes/colibre_svg/cmd/lc_basicstop.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg";>
\ No newline at end of file
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/icon-themes/colibre_svg/cmd/lc_mediapause.svg 
b/icon-themes/colibre_svg/cmd/lc_mediapause.svg
index 2a8d135a8a36..6cbb62f89512 100644
--- a/icon-themes/colibre_svg/cmd/lc_mediapause.svg
+++ b/icon-themes/colibre_svg/cmd/lc_mediapause.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg";>
\ No newline at end of file
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/icon-themes/colibre_svg/cmd/sc_mediapause.svg 
b/icon-themes/colibre_svg/cmd/sc_mediapause.svg
index fc0eaa9e45fc..e5d9b4515d1f 100644
--- a/icon-themes/colibre_svg/cmd/sc_mediapause.svg
+++ b/icon-themes/colibre_svg/cmd/sc_mediapause.svg
@@ -1,4 +1,5 @@
 http://www.w3.org/2000/svg";>
 
+
  />
- 
\ No newline at end of file
+ 
\ No newline at end of file
commit 4dd3d95b9fdbbab3a803bcbb1abf225c7924ff3b
Author: andreas kainz 
Date:   Mon Jul 2 08:07:57 2018 +0200

Colibre icons: update avmedia icons

Change-Id: I6212e22935676bc2d5107c91f2af29e0b9e9e076
Reviewed-on: https://gerrit.libreoffice.org/56793
Reviewed-by: andreas_kainz 
Tested-by: andreas_kainz 
(cherry picked from commit cb5a5653b53427075cb945791f3cf173258acd7c)
Reviewed-on: https://gerrit.libreoffice.org/56800
Tested-by: Jenkins

diff --git a/icon-themes/colibre/avmedia/res/avaudiologo.png 
b/icon-themes/colibre/avmedia/res/avaudiologo.png
index 26290de1c42a..75ed159a2603 100644
Binary files a/icon-themes/colibre/avmedia/res/avaudiologo.png and 
b/icon-themes/colibre/avmedia/res/avaudiologo.png differ
diff --git a/icon-themes/colibre/avmedia/res/avemptylogo.png 
b/icon-themes/colibre/avmedia/res/avemptylogo.png
index eda604419439..a077d2daa5b8 100644
Binary files a/icon-themes/colibre/avmedia/res/avemptylogo.png and 
b/icon-themes/colibre/avmedia/res/avemptylogo.png differ
diff --git a/icon-themes/colibre_svg/avmedia/res/avaudiologo.svg 
b/icon-themes/colibre_svg/avmedia/res/avaudiologo.svg
index 6067e1646fe5..fd8b3f56991b 100644
--- a/icon-themes/colibre_svg/avmedia/res/avaudiologo.svg
+++ b/icon-themes/colibre_svg/avmedia/res/avaudiologo.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg";>
\ No newline at end of file
+http://www.w3.org/2000/svg";>
\ No newline at end of file
diff --git a/icon-themes/colibre_svg/avmedia/res/avemptylogo.svg 
b/icon-themes/colibre_svg/avmedia/res/avemptylogo.svg
index 3d1bdfebed17..14bfd24dc765 100644
--- a/icon-themes/colibre_svg/avmedia/res/avemptylogo.svg
+++ b/icon-themes/colibre_svg/avmedia/res/avemptylogo.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg";>
\ No newline at end of file
+http://www.w3.org/2000/svg";>
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-com

Re: Close EasyHack tdf#96099 "Reduce number of typedefs used for trivial container types"?

[Stephan Bergmann]

On 29/06/18 10:16, Stephan Bergmann wrote:
Shall we close the EasyHack 
 "Reduce 
number of typedefs used for trivial container types" for good now?


done, 
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: desktop/source

[Jacek Fraczek]

 desktop/source/migration/migration.cxx   |   30 ++-
 desktop/source/pkgchk/unopkg/unopkg_misc.cxx |7 +-
 2 files changed, 14 insertions(+), 23 deletions(-)

New commits:
commit 10b34eb9f33a19e1189bd822244c04484ae06404
Author: Jacek Fraczek 
Date:   Sat Jun 23 21:28:30 2018 +0200

tdf#88205 Adapt uses of css::uno::Sequence to use initializer_list ctor

Change-Id: Ib06c8ed707bdfd87b294b2597614249fac2c1f18
Reviewed-on: https://gerrit.libreoffice.org/56342
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/desktop/source/migration/migration.cxx 
b/desktop/source/migration/migration.cxx
index a42602bc7204..c40993338e46 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -240,10 +240,9 @@ bool MigrationImpl::doMigration()
 if (sModuleIdentifier.isEmpty())
 continue;
 
-uno::Sequence< uno::Any > lArgs(2);
-OUString aOldCfgDataPath = m_aInfo.userdata + 
"/user/config/soffice.cfg/modules/";
-lArgs[0] <<= aOldCfgDataPath + i.sModuleShortName;
-lArgs[1] <<= embed::ElementModes::READ;
+
+OUString aOldCfgDataPath = m_aInfo.userdata + 
"/user/config/soffice.cfg/modules/" + i.sModuleShortName;
+uno::Sequence< uno::Any > lArgs {uno::makeAny(aOldCfgDataPath), 
uno::makeAny(embed::ElementModes::READ)};
 
 uno::Reference< uno::XComponentContext > 
xContext(comphelper::getProcessComponentContext());
 uno::Reference< lang::XSingleServiceFactory > 
xStorageFactory(embed::FileSystemStorageFactory::create(xContext));
@@ -769,8 +768,7 @@ uno::Reference< XNameAccess > 
MigrationImpl::getConfigAccess(const sal_Char* pPa
 comphelper::getProcessComponentContext()));
 
 // access the provider
-uno::Sequence< uno::Any > theArgs(1);
-theArgs[ 0 ] <<= sConfigURL;
+uno::Sequence< uno::Any > theArgs {uno::makeAny(sConfigURL)};
 xNameAccess.set(
 theConfigProvider->createInstanceWithArguments(
 sAccessSrvc, theArgs ), uno::UNO_QUERY_THROW );
@@ -870,9 +868,8 @@ std::vector< MigrationModuleInfo > 
MigrationImpl::dectectUIChangesForAllModules(
 const OUString MENUBAR("menubar");
 const OUString TOOLBAR("toolbar");
 
-uno::Sequence< uno::Any > lArgs(2);
-lArgs[0] <<= m_aInfo.userdata + "/user/config/soffice.cfg/modules";
-lArgs[1] <<= embed::ElementModes::READ;
+uno::Sequence< uno::Any > lArgs {uno::makeAny(m_aInfo.userdata + 
"/user/config/soffice.cfg/modules"),
+ uno::makeAny(embed::ElementModes::READ)};
 
 uno::Reference< lang::XSingleServiceFactory > xStorageFactory(
 
embed::FileSystemStorageFactory::create(comphelper::getProcessComponentContext()));
@@ -1046,17 +1043,14 @@ void MigrationImpl::mergeOldToNewVersion(const 
uno::Reference< ui::XUIConfigurat
 }
 }
 
-} while (nIndex>=0);
+} while (nIndex >= 0);
 
 if (nIndex == -1) {
-uno::Sequence< beans::PropertyValue > aPropSeq(3);
-
-aPropSeq[0].Name = ITEM_DESCRIPTOR_COMMANDURL;
-aPropSeq[0].Value <<= elem.m_sCommandURL;
-aPropSeq[1].Name = ITEM_DESCRIPTOR_LABEL;
-aPropSeq[1].Value <<= retrieveLabelFromCommand(elem.m_sCommandURL, 
sModuleIdentifier);
-aPropSeq[2].Name = ITEM_DESCRIPTOR_CONTAINER;
-aPropSeq[2].Value <<= elem.m_xPopupMenu;
+uno::Sequence< beans::PropertyValue > aPropSeq {
+beans::PropertyValue(ITEM_DESCRIPTOR_COMMANDURL, 0, 
uno::makeAny(elem.m_sCommandURL), beans::PropertyState_DIRECT_VALUE),
+beans::PropertyValue(ITEM_DESCRIPTOR_LABEL, 0, 
uno::makeAny(retrieveLabelFromCommand(elem.m_sCommandURL, sModuleIdentifier)), 
beans::PropertyState_DIRECT_VALUE),
+beans::PropertyValue(ITEM_DESCRIPTOR_CONTAINER, 0, 
uno::makeAny(elem.m_xPopupMenu), beans::PropertyState_DIRECT_VALUE)
+};
 
 if (elem.m_sPrevSibling.isEmpty())
 xTemp->insertByIndex(0, uno::makeAny(aPropSeq));
diff --git a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx 
b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
index 70c8ac5249ee..4a68a61aa52d 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
@@ -353,16 +353,13 @@ Reference connectToOffice(
 Reference const & xLocalComponentContext,
 bool verbose )
 {
-Sequence args( 3 );
-args[ 0 ] = "--nologo";
-args[ 1 ] = "--nodefault";
-
 OUString pipeId( ::dp_misc::generateRandomPipeId() );
 OUStringBuffer buf;
 buf.append( "--accept=pipe,name=" );
 buf.append( pipeId );
 buf.append( ";urp;" );
-args[ 2 ] = buf.makeStringAndClear();
+
+Sequence args { "--nologo", "--nodefault", 
buf.makeStringAndClear() };
 OUString appURL( getExecutableDir() + "

[Libreoffice-commits] core.git: download.lst external/libnumbertext solenv/flatpak-manifest.in

[László Németh]

 download.lst|4 ++--
 external/libnumbertext/ExternalPackage_numbertext.mk|4 
 external/libnumbertext/UnpackedTarball_libnumbertext.mk |6 --
 external/libnumbertext/configure.patch  |   10 --
 solenv/flatpak-manifest.in  |6 +++---
 5 files changed, 9 insertions(+), 21 deletions(-)

New commits:
commit 77f81dabfd75ef756f6ed7ba9086db19a58984c9
Author: László Németh 
Date:   Sun Jul 1 22:22:46 2018 +0200

libnumbertext: update to 1.0-1

New languages: Albanian, Galician (by Adrián Chaves),
Norwegian Bokmål and Nynorsk, Ukrainian (based on Russian).

Change-Id: I6b40dfdafe3023edc661b0a9e9f2dedbc94364f8
Reviewed-on: https://gerrit.libreoffice.org/56785
Tested-by: Jenkins
Reviewed-by: László Németh 

diff --git a/download.lst b/download.lst
index 205234a725dd..dd3519b74a8d 100644
--- a/download.lst
+++ b/download.lst
@@ -148,8 +148,8 @@ export LIBGPGERROR_SHA256SUM := 
4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf
 export LIBGPGERROR_TARBALL := libgpg-error-1.27.tar.bz2
 export LIBLANGTAG_SHA256SUM := 
d6242790324f1432fb0a6fae71b6851f520b2c5a87675497cf8ea14c2924d52e
 export LIBLANGTAG_TARBALL := liblangtag-0.6.2.tar.bz2
-export LIBNUMBERTEXT_SHA256SUM := 
98dd193983c9bdd31af053ddf7687640d2365b470755c8ec669b171d18b72227
-export LIBNUMBERTEXT_TARBALL := libnumbertext-1.0.2.tar.xz
+export LIBNUMBERTEXT_SHA256SUM := 
349258f4c3a8b090893e847b978b22e8dc1343d4ada3bfba811b97144f1dd67b
+export LIBNUMBERTEXT_TARBALL := libnumbertext-1.0.4.tar.xz
 export LIBTOMMATH_SHA256SUM := 
083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483
 export LIBTOMMATH_TARBALL := ltm-1.0.zip
 export XMLSEC_SHA256SUM := 
8d8276c9c720ca42a3b0023df8b7ae41a2d6c5f9aa8d20ed1672d84cc8982d50
diff --git a/external/libnumbertext/ExternalPackage_numbertext.mk 
b/external/libnumbertext/ExternalPackage_numbertext.mk
index c041422c2abd..995b97f7c87b 100644
--- a/external/libnumbertext/ExternalPackage_numbertext.mk
+++ b/external/libnumbertext/ExternalPackage_numbertext.mk
@@ -23,6 +23,7 @@ $(eval $(call 
gb_ExternalPackage_add_unpacked_files,libnumbertext_numbertext,$(L
data/fi.sor \
data/fr.sor \
data/fr.sor \
+   data/gl.sor \
data/he.sor \
data/hr.sor \
data/hu.sor \
@@ -36,6 +37,7 @@ $(eval $(call 
gb_ExternalPackage_add_unpacked_files,libnumbertext_numbertext,$(L
data/lt.sor \
data/lv.sor \
data/ms.sor \
+   data/no.sor \
data/nl.sor \
data/pl.sor \
data/pt.sor \
@@ -44,11 +46,13 @@ $(eval $(call 
gb_ExternalPackage_add_unpacked_files,libnumbertext_numbertext,$(L
data/ru.sor \
data/sh.sor \
data/sl.sor \
+   data/sq.sor \
data/sr.sor \
data/Suzhou.sor \
data/sv.sor \
data/th.sor \
data/tr.sor \
+   data/uk.sor \
data/vi.sor \
data/zh.sor \
 ))
diff --git a/external/libnumbertext/UnpackedTarball_libnumbertext.mk 
b/external/libnumbertext/UnpackedTarball_libnumbertext.mk
index f5c1607562e3..ac2a14133205 100644
--- a/external/libnumbertext/UnpackedTarball_libnumbertext.mk
+++ b/external/libnumbertext/UnpackedTarball_libnumbertext.mk
@@ -13,10 +13,4 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,libnumbertext,$(LIBNUMBERTEXT_TARBA
 
 $(eval $(call gb_UnpackedTarball_update_autoconf_configs,libnumbertext))
 
-$(eval $(call gb_UnpackedTarball_set_patchlevel,libnumbertext,0))
-
-$(eval $(call gb_UnpackedTarball_add_patches,libnumbertext, \
-external/libnumbertext/configure.patch \
-))
-
 # vim: set noet sw=4 ts=4:
diff --git a/external/libnumbertext/configure.patch 
b/external/libnumbertext/configure.patch
deleted file mode 100644
index f31ab31cdc57..
--- a/external/libnumbertext/configure.patch
+++ /dev/null
@@ -1,10 +0,0 @@
 configure.ac
-+++ configure.ac
-@@ -22,7 +22,6 @@
- 
- dnl Checks for typedefs, structures, and compiler characteristics.
- AC_LANG([C++])
--CXXFLAGS='-Wall -std=c++11'
- 
- AC_CHECK_HEADERS([codecvt regex])
- 
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 7554a0ddc8c3..a8478dc2d12b 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -585,10 +585,10 @@
 "dest-filename": 
"external/tarballs/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"
 },
 {
-"url": 
"https://dev-www.libreoffice.org/src/libnumbertext-1.0.2.tar.xz";,
-"sha256": 
"98dd193983c9bdd31af053ddf7687640d2365b470755c8ec669b171d18b72227",
+"url": 
"https://dev-www.libreoffice.org/src/libnumbertext-1.0.4.tar.xz";,
+"sha256": 
"349258f4c3a8b090893e847b978b22e8dc1343d4ada3bfba811b97144f1dd67b",
 "type": "file",
-"dest-filename": 
"external/tarballs/libnumbertext-1.0.2.tar.xz"
+

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - icon-themes/colibre officecfg/registry

[andreas kainz]

 icon-themes/colibre/links.txt|7 ++
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |   24 
++
 2 files changed, 31 insertions(+)

New commits:
commit 5f423351c3362579ce34c64db5dc5cd66da90678
Author: andreas kainz 
Date:   Mon Jul 2 08:30:58 2018 +0200

Colibre icons: add icons for Common Align actions

Change-Id: Ia234b76039759d6f71ec6578e7ffa4ff4236dae2
Reviewed-on: https://gerrit.libreoffice.org/56797
Tested-by: Jenkins
Reviewed-by: andreas_kainz 
(cherry picked from commit 2fbcfc8ab619e64642e97aeb2f7a8c8585615d59)
Reviewed-on: https://gerrit.libreoffice.org/56802

diff --git a/icon-themes/colibre/links.txt b/icon-themes/colibre/links.txt
index 0edb2380dc95..5caafc1c11af 100644
--- a/icon-themes/colibre/links.txt
+++ b/icon-themes/colibre/links.txt
@@ -589,6 +589,13 @@ cmd/sc_cellverttop.png cmd/sc_aligntop.png
 cmd/sc_cellvertcenter.png cmd/sc_alignverticalcenter.png
 cmd/sc_cellvertbottom.png cmd/sc_alignbottom.png
 
+cmd/sc_commonaligntop.png cmd/sc_aligntop.png
+cmd/sc_commonalignverticalcenter.png cmd/sc_alignverticalcenter.png
+cmd/sc_commonalignbottom.png cmd/sc_alignbottom.png
+cmd/lc_commonaligntop.png cmd/lc_aligntop.png
+cmd/lc_commonalignverticalcenter.png cmd/lc_alignverticalcenter.png
+cmd/lc_commonalignbottom.png cmd/lc_alignbottom.png
+
 # paragraph line spacing drop down
 cmd/lc_linespacing.png cmd/lc_spacepara15.png
 cmd/sc_linespacing.png cmd/sc_spacepara15.png
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index c46229b7b5a5..ad609bca111e 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -6035,41 +6035,65 @@
 
   Centered
 
+
+  1
+
   
   
 
   Right
 
+
+  1
+
   
   
 
   Top
 
+
+  1
+
   
   
 
   Center
 
+
+  1
+
   
   
 
   Bottom
 
+
+  1
+
   
   
 
   Justified
 
+
+  1
+
   
   
 
   Default
 
+
+  1
+
   
   
 
   Default
 
+
+  1
+
   
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: GSoC weekly update: Smarart Editing in Impress

[Ekansh Jha]

Hello Community,

I have written a blog regarding the work I've done this week:
https://medium.com/@ekanshjha/gsoc18-smartart-week-7-e3c5dbd9eccd

Regards,
Ekansh Jha
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - icon-themes/karasa_jaga

[Rizal Muttaqin]

 dev/null   
 |binary
 icon-themes/karasa_jaga/cmd/32/dsbrowserexplorer.png   
 |binary
 icon-themes/karasa_jaga/cmd/32/flowchartshapes.flowchart-card.png  
 |binary
 icon-themes/karasa_jaga/cmd/32/flowchartshapes.flowchart-collate.png   
 |binary
 icon-themes/karasa_jaga/cmd/32/flowchartshapes.flowchart-delay.png 
 |binary
 icon-themes/karasa_jaga/cmd/32/flowchartshapes.flowchart-display.png   
 |binary
 icon-themes/karasa_jaga/cmd/32/flowchartshapes.flowchart-document.png  
 |binary
 icon-themes/karasa_jaga/cmd/32/flowchartshapes.flowchart-internal-storage.png  
 |binary
 icon-themes/karasa_jaga/cmd/32/flowchartshapes.flowchart-manual-input.png  
 |binary
 icon-themes/karasa_jaga/cmd/32/flowchartshapes.flowchart-merge.png 
 |binary
 icon-themes/karasa_jaga/cmd/32/flowchartshapes.flowchart-punched-tape.png  
 |binary
 icon-themes/karasa_jaga/cmd/32/flowchartshapes.flowchart-sequential-access.png 
 |binary
 icon-themes/karasa_jaga/cmd/32/flowchartshapes.flowchart-stored-data.png   
 |binary
 icon-themes/karasa_jaga/cmd/32/flowchartshapes.flowchart-terminator.png
 |binary
 icon-themes/karasa_jaga/cmd/32/fontworksameletterheights.png   
 |binary
 icon-themes/karasa_jaga/cmd/32/footnotedialog.png  
 |binary
 icon-themes/karasa_jaga/cmd/32/formfilter.png  
 |binary
 icon-themes/karasa_jaga/cmd/32/sectionshrink.png   
 |binary
 icon-themes/karasa_jaga/cmd/32/sectionshrinkbottom.png 
 |binary
 icon-themes/karasa_jaga/cmd/32/sectionshrinktop.png
 |binary
 icon-themes/karasa_jaga/cmd/32/sendmail.png
 |binary
 icon-themes/karasa_jaga/cmd/lc_crookrotate.png 
 |binary
 icon-themes/karasa_jaga/cmd/lc_crookslant.png  
 |binary
 icon-themes/karasa_jaga/cmd/lc_dsbrowserexplorer.png   
 |binary
 icon-themes/karasa_jaga/cmd/lc_flowchartshapes.flowchart-card.png  
 |binary
 icon-themes/karasa_jaga/cmd/lc_flowchartshapes.flowchart-decision.png  
 |binary
 icon-themes/karasa_jaga/cmd/lc_flowchartshapes.flowchart-delay.png 
 |binary
 icon-themes/karasa_jaga/cmd/lc_flowchartshapes.flowchart-display.png   
 |binary
 icon-themes/karasa_jaga/cmd/lc_flowchartshapes.flowchart-document.png  
 |binary
 icon-themes/karasa_jaga/cmd/lc_flowchartshapes.flowchart-multidocument.png 
 |binary
 
icon-themes/karasa_jaga/cmd/lc_flowchartshapes.flowchart-off-page-connector.png 
|binary
 icon-themes/karasa_jaga/cmd/lc_flowchartshapes.flowchart-punched-tape.png  
 |binary
 icon-themes/karasa_jaga/cmd/lc_flowchartshapes.flowchart-terminator.png
 |binary
 icon-themes/karasa_jaga/cmd/lc_fontheight.png  
 |binary
 icon-themes/karasa_jaga/cmd/lc_fontworksameletterheights.png   
 |binary
 icon-themes/karasa_jaga/cmd/lc_formfilter.png  
 |binary
 icon-themes/karasa_jaga/cmd/lc_grow.png
 |binary
 icon-themes/karasa_jaga/cmd/lc_insertauthoritiesentry.png  
 |binary
 icon-themes/karasa_jaga/cmd/lc_insertbreak.png 
 |binary
 icon-themes/karasa_jaga/cmd/lc_insertpagebreak.png 
 |binary
 icon-themes/karasa_jaga/cmd/lc_linewidth.png   
 |binary
 icon-themes/karasa_jaga/cmd/lc_rotateleft.png  
 |binary
 icon-themes/karasa_jaga/cmd/lc_rotateright.png 
 |binary
 icon-themes/karasa_jaga/cmd/lc_sectionshrink.png   
 |binary
 icon-themes/karasa_jaga/cmd/lc_sectionshrinkbottom.png 
 |binary
 icon-themes/karasa_jaga/cmd/lc_sectionshrinktop.png
 |binary
 icon-themes/karasa_jaga/cmd/lc_sendmail.png
 |binary
 icon-themes/karasa_jaga/cmd/lc_shrink.png  
 |binary
 icon-themes/karasa_jaga/cmd/lc_tablemodefix.png
 |binary
 icon-themes/karasa_jaga/cmd/lc_tablemodefixprop.png
 |binary
 icon-themes/karasa_jaga/cmd/lc_tablemodevariable.png   
 |binary
 icon-themes/karasa_jaga/cmd/sc_crookrotate.png 
 |binary
 icon-themes/karasa_jaga/cmd/sc_crookslant.png  
 |binary
 icon-themes/karasa_jaga/cmd/sc_dsbrowserexplorer.png   
 |binary
 icon-themes/karasa_jaga/cmd/sc_fontheight.png  
 |binary
 icon-themes/karasa_jaga/cmd/sc_fontworksamelett

[Libreoffice-commits] core.git: sc/source

[Eike Rathke]

 sc/source/ui/dbgui/scuiasciiopt.cxx |   30 
 sc/source/ui/docshell/impex.cxx |   54 +---
 sc/source/ui/inc/impex.hxx  |   13 
 sc/source/ui/inc/scuiasciiopt.hxx   |3 +-
 4 files changed, 83 insertions(+), 17 deletions(-)

New commits:
commit c807e7ea7a0725a4d8375eda07d6f70870e0d50a
Author: Eike Rathke 
Date:   Mon Jul 2 14:41:59 2018 +0200

Resolves: tdf#56910 detect a Space (blank) separator if not selected

On populating the CSV import dialog for the first time attempt to
detect a possible space (blank) separator if field separators
don't include it already. This can be necessary because of the
"accept broken misquoted CSV fields" feature that tries to ignore
trailing blanks after a quoted field and if no separator follows
continues to add content to the field assuming the single double
quote was in error. If this blank separator is detected it is
added to field separators and the line and subsequent lines are
reread with the new separators.

Change-Id: I3c6d74ce8883f1d279a810e800e54b349d85ac71
Reviewed-on: https://gerrit.libreoffice.org/56810
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx 
b/sc/source/ui/dbgui/scuiasciiopt.cxx
index b885e9b9c7ec..aeb718be4d08 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -288,7 +288,8 @@ ScImportAsciiDlg::ScImportAsciiDlg( vcl::Window* pParent, 
const OUString& aDatNa
 aColumnUser ( ScResId( SCSTR_COLUMN_USER ) ),
 aTextSepList(SCSTR_TEXTSEP),
 mcTextSep   ( ScAsciiOptions::cDefaultTextSep ),
-meCall(eCall)
+meCall(eCall),
+mbDetectSpaceSep(eCall != SC_TEXTTOCOLUMNS)
 {
 get(pFtCharSet, "textcharset");
 get(pLbCharSet, "charset");
@@ -558,7 +559,7 @@ void ScImportAsciiDlg::dispose()
 ModalDialog::dispose();
 }
 
-bool ScImportAsciiDlg::GetLine( sal_uLong nLine, OUString &rText )
+bool ScImportAsciiDlg::GetLine( sal_uLong nLine, OUString &rText, sal_Unicode& 
rcDetectSep )
 {
 if (nLine >= ASCIIDLG_MAXROWS || !mpDatStream)
 return false;
@@ -591,7 +592,7 @@ bool ScImportAsciiDlg::GetLine( sal_uLong nLine, OUString 
&rText )
 break;
 }
 rText = ReadCsvLine(*mpDatStream, !bFixed, maFieldSeparators,
-mcTextSep);
+mcTextSep, rcDetectSep);
 mnStreamPos = mpDatStream->Tell();
 mpRowPosArray[++mnRowPosCount] = mnStreamPos;
 } while (nLine >= mnRowPosCount && mpDatStream->good());
@@ -606,7 +607,7 @@ bool ScImportAsciiDlg::GetLine( sal_uLong nLine, OUString 
&rText )
 else
 {
 Seek( mpRowPosArray[nLine]);
-rText = ReadCsvLine(*mpDatStream, !bFixed, maFieldSeparators, 
mcTextSep);
+rText = ReadCsvLine(*mpDatStream, !bFixed, maFieldSeparators, 
mcTextSep, rcDetectSep);
 mnStreamPos = mpDatStream->Tell();
 }
 
@@ -805,6 +806,12 @@ IMPL_LINK( ScImportAsciiDlg, LbColTypeHdl, ListBox&, 
rListBox, void )
 
 IMPL_LINK_NOARG(ScImportAsciiDlg, UpdateTextHdl, ScCsvTableBox&, void)
 {
+// Checking the separator can only be done once for the very first time
+// when the dialog wasn't already presented to the user.
+// As a side effect this has the benefit that the check is only done on the
+// first set of visible lines.
+sal_Unicode cDetectSep = (mbDetectSpaceSep && !pRbFixed->IsChecked() && 
!pCkbSpace->IsChecked() ? 0 : 0x);
+
 sal_Int32 nBaseLine = mpTableBox->GetFirstVisLine();
 sal_Int32 nRead = mpTableBox->GetVisLineCount();
 // If mnRowPosCount==0, this is an initializing call, read ahead for row
@@ -817,12 +824,25 @@ IMPL_LINK_NOARG(ScImportAsciiDlg, UpdateTextHdl, 
ScCsvTableBox&, void)
 sal_Int32 i;
 for (i = 0; i < nRead; i++)
 {
-if (!GetLine( nBaseLine + i, maPreviewLine[i]))
+if (!GetLine( nBaseLine + i, maPreviewLine[i], cDetectSep))
 break;
 }
 for (; i < CSV_PREVIEW_LINES; i++)
 maPreviewLine[i].clear();
 
+if (mbDetectSpaceSep)
+{
+mbDetectSpaceSep = false;
+if (cDetectSep == ' ')
+{
+// Expect space to be appended by now so all subsequent
+// GetLine()/ReadCsvLine() actually used it.
+assert(maFieldSeparators.endsWith(" "));
+// Preselect Space in UI.
+pCkbSpace->Check();
+}
+}
+
 mpTableBox->Execute( CSVCMD_SETLINECOUNT, mnRowPosCount);
 bool bMergeSep = pCkbAsOnce->IsChecked();
 bool bRemoveSpace = pCkbRemoveSpace->IsChecked();
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index 3b3068764f24..854bc92b9635 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -564,7 +564,7 @@ enum QuoteType
 FIELDEND_QUOTE if end of field quote
 DO

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - include/oox oox/source

[Justin Luth]

 include/oox/export/shapes.hxx |2 +
 oox/source/export/shapes.cxx  |   68 --
 2 files changed, 22 insertions(+), 48 deletions(-)

New commits:
commit aadbe0e83c0ae0190e1bc36360893fce8f8a2b68
Author: Justin Luth 
Date:   Tue Jun 19 11:02:07 2018 +0300

NFC oox export shape: move replicated code into function

Reviewed-on: https://gerrit.libreoffice.org/56083
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
Reviewed-by: Justin Luth 
(cherry picked from commit 3ef18b28ade43a38bb46a2400e4e81a9ae8796bc)
Reviewed-on: https://gerrit.libreoffice.org/56137

Change-Id: I1d306769bee8390626b513c63c5b889ba3d3d3d6
Reviewed-on: https://gerrit.libreoffice.org/56750
Reviewed-by: Justin Luth 
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 

diff --git a/include/oox/export/shapes.hxx b/include/oox/export/shapes.hxx
index 5c1d7d860ca7..e56bd570512c 100644
--- a/include/oox/export/shapes.hxx
+++ b/include/oox/export/shapes.hxx
@@ -25,6 +25,7 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -216,6 +217,7 @@ public:
 
 void WriteTableCellProperties(const css::uno::Reference< 
css::beans::XPropertySet >& rXPropSet);
 
+void WriteBorderLine(const sal_Int32 XML_line, const 
css::table::BorderLine2& rBorderLine);
 void WriteTableCellBorders(const css::uno::Reference< 
css::beans::XPropertySet >& rXPropSet);
 
 sal_Int32 GetNewShapeID( const css::uno::Reference< css::drawing::XShape 
>& rShape );
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index a80809c663e2..2f0f142995dc 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -76,7 +76,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -1727,68 +1726,41 @@ void ShapeExport::WriteTableCellProperties(const 
Reference< XPropertySet>& xCell
 mpFS->endElementNS( XML_a, XML_tcPr );
 }
 
-void ShapeExport::WriteTableCellBorders(const Reference< XPropertySet>& 
xCellPropSet)
+void ShapeExport::WriteBorderLine(const sal_Int32 XML_line, const BorderLine2& 
rBorderLine)
 {
-BorderLine2 aBorderLine;
-
-// lnL - Left Border Line Properties of table cell
-xCellPropSet->getPropertyValue("LeftBorder") >>= aBorderLine;
-sal_Int32 nLeftBorder = aBorderLine.LineWidth;
-util::Color aLeftBorderColor = aBorderLine.Color;
-
 // While importing the table cell border line width, it converts EMU->Hmm then 
divided result by 2.
 // To get original value of LineWidth need to multiple by 2.
-nLeftBorder = nLeftBorder*2;
-nLeftBorder = oox::drawingml::convertHmmToEmu( nLeftBorder );
+sal_Int32 nBorderWidth = rBorderLine.LineWidth;
+nBorderWidth *= 2;
+nBorderWidth = oox::drawingml::convertHmmToEmu( nBorderWidth );
 
-if(nLeftBorder > 0)
+if ( nBorderWidth > 0 )
 {
-mpFS->startElementNS( XML_a, XML_lnL, XML_w, I32S(nLeftBorder), FSEND 
);
-DrawingML::WriteSolidFill(aLeftBorderColor);
-mpFS->endElementNS( XML_a, XML_lnL );
+mpFS->startElementNS( XML_a, XML_line, XML_w, I32S(nBorderWidth), 
FSEND );
+DrawingML::WriteSolidFill( util::Color(rBorderLine.Color) );
+mpFS->endElementNS( XML_a, XML_line );
 }
+}
+
+void ShapeExport::WriteTableCellBorders(const Reference< XPropertySet>& 
xCellPropSet)
+{
+BorderLine2 aBorderLine;
+
+// lnL - Left Border Line Properties of table cell
+xCellPropSet->getPropertyValue("LeftBorder") >>= aBorderLine;
+WriteBorderLine( XML_lnL, aBorderLine );
 
 // lnR - Right Border Line Properties of table cell
 xCellPropSet->getPropertyValue("RightBorder") >>= aBorderLine;
-sal_Int32 nRightBorder = aBorderLine.LineWidth;
-util::Color aRightBorderColor = aBorderLine.Color;
-nRightBorder = nRightBorder * 2 ;
-nRightBorder = oox::drawingml::convertHmmToEmu( nRightBorder );
-
-if(nRightBorder > 0)
-{
-mpFS->startElementNS( XML_a, XML_lnR, XML_w, I32S(nRightBorder), 
FSEND);
-DrawingML::WriteSolidFill(aRightBorderColor);
-mpFS->endElementNS( XML_a, XML_lnR);
-}
+WriteBorderLine( XML_lnR, aBorderLine );
 
 // lnT - Top Border Line Properties of table cell
 xCellPropSet->getPropertyValue("TopBorder") >>= aBorderLine;
-sal_Int32 nTopBorder = aBorderLine.LineWidth;
-util::Color aTopBorderColor = aBorderLine.Color;
-nTopBorder = nTopBorder * 2;
-nTopBorder = oox::drawingml::convertHmmToEmu( nTopBorder );
-
-if(nTopBorder > 0)
-{
-mpFS->startElementNS( XML_a, XML_lnT, XML_w, I32S(nTopBorder), FSEND);
-DrawingML::WriteSolidFill(aTopBorderColor);
-mpFS->endElementNS( XML_a, XML_lnT);
-}
+WriteBorderLine( XML_lnT, aBorderLine );
 
 // lnB - Bottom Border Line Properties of table cell
 xCellPropSet->getPropertyValue("BottomBorder") >>= aBorderLine;
-sal_Int32 nBottomBorder = aBorderLine.LineWidth;
-util::Color aBottomBorderColor = aBorderLine.Colo

[Libreoffice-commits] online.git: loleaflet/js

[Andras Timar]

 loleaflet/js/toolbar.js |   14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)

New commits:
commit 3f0f2c671cd8e991b1dcbc73ae0e288ce9d73cde
Author: Andras Timar 
Date:   Mon Jul 2 16:53:16 2018 +0200

loleaflet: no fill or automatic color handling in color picker

Change-Id: Iab98aadf54f0c1b041fe46eb2be1a798662d935b

diff --git a/loleaflet/js/toolbar.js b/loleaflet/js/toolbar.js
index 387913c67..862bb7964 100644
--- a/loleaflet/js/toolbar.js
+++ b/loleaflet/js/toolbar.js
@@ -216,10 +216,10 @@ function onClick(e, id, item, subItem) {
else if (id === 'insertgraphic') {
L.DomUtil.get('insertgraphic').click();
}
-   else if (id === 'fontcolor' && e.color) {
+   else if (id === 'fontcolor' && typeof e.color !== 'undefined') {
onColorPick(id, e.color);
}
-   else if (id === 'backcolor' && e.color) {
+   else if (id === 'backcolor' && typeof e.color !== 'undefined') {
onColorPick(id, e.color)
}
else if (id === 'sum') {
@@ -544,11 +544,17 @@ function insertShapes() {
 }
 
 function onColorPick(id, color) {
-   if (map.getPermission() !== 'edit' || color === undefined) {
+   if (map.getPermission() !== 'edit') {
return;
}
+// no fill or automatic color is -1
+   if (color === '') {
+   color = -1;
+   }
// transform from #FF to an Int
-   color = parseInt(color.replace('#', ''), 16);
+   else {
+   color = parseInt(color.replace('#', ''), 16);
+   }
var command = {};
var fontcolor, backcolor;
if (id === 'fontcolor') {
___
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-3' - 2 commits - loleaflet/dist scripts/locorestrings.py

[Andras Timar]

 loleaflet/dist/l10n/locore/af.json  |1 +
 loleaflet/dist/l10n/locore/am.json  |1 +
 loleaflet/dist/l10n/locore/ar.json  |1 +
 loleaflet/dist/l10n/locore/as.json  |1 +
 loleaflet/dist/l10n/locore/ast.json |1 +
 loleaflet/dist/l10n/locore/az.json  |1 +
 loleaflet/dist/l10n/locore/be.json  |1 +
 loleaflet/dist/l10n/locore/bg.json  |1 +
 loleaflet/dist/l10n/locore/bn-IN.json   |1 +
 loleaflet/dist/l10n/locore/bn.json  |1 +
 loleaflet/dist/l10n/locore/bo.json  |1 +
 loleaflet/dist/l10n/locore/br.json  |1 +
 loleaflet/dist/l10n/locore/bs.json  |1 +
 loleaflet/dist/l10n/locore/ca-valencia.json |1 +
 loleaflet/dist/l10n/locore/ca.json  |1 +
 loleaflet/dist/l10n/locore/cs.json  |1 +
 loleaflet/dist/l10n/locore/cy.json  |1 +
 loleaflet/dist/l10n/locore/da.json  |1 +
 loleaflet/dist/l10n/locore/de.json  |1 +
 loleaflet/dist/l10n/locore/dz.json  |1 +
 loleaflet/dist/l10n/locore/el.json  |1 +
 loleaflet/dist/l10n/locore/en-GB.json   |1 +
 loleaflet/dist/l10n/locore/en-ZA.json   |1 +
 loleaflet/dist/l10n/locore/eo.json  |1 +
 loleaflet/dist/l10n/locore/es.json  |1 +
 loleaflet/dist/l10n/locore/et.json  |1 +
 loleaflet/dist/l10n/locore/eu.json  |1 +
 loleaflet/dist/l10n/locore/fa.json  |1 +
 loleaflet/dist/l10n/locore/fi.json  |1 +
 loleaflet/dist/l10n/locore/fr.json  |1 +
 loleaflet/dist/l10n/locore/ga.json  |1 +
 loleaflet/dist/l10n/locore/gd.json  |1 +
 loleaflet/dist/l10n/locore/gl.json  |1 +
 loleaflet/dist/l10n/locore/gu.json  |1 +
 loleaflet/dist/l10n/locore/gug.json |1 +
 loleaflet/dist/l10n/locore/he.json  |1 +
 loleaflet/dist/l10n/locore/hi.json  |1 +
 loleaflet/dist/l10n/locore/hr.json  |1 +
 loleaflet/dist/l10n/locore/hu.json  |1 +
 loleaflet/dist/l10n/locore/id.json  |1 +
 loleaflet/dist/l10n/locore/is.json  |1 +
 loleaflet/dist/l10n/locore/it.json  |1 +
 loleaflet/dist/l10n/locore/ja.json  |1 +
 loleaflet/dist/l10n/locore/ka.json  |1 +
 loleaflet/dist/l10n/locore/kk.json  |1 +
 loleaflet/dist/l10n/locore/km.json  |1 +
 loleaflet/dist/l10n/locore/kmr-Latn.json|1 +
 loleaflet/dist/l10n/locore/kn.json  |1 +
 loleaflet/dist/l10n/locore/ko.json  |1 +
 loleaflet/dist/l10n/locore/kok.json |1 +
 loleaflet/dist/l10n/locore/lb.json  |1 +
 loleaflet/dist/l10n/locore/lt.json  |1 +
 loleaflet/dist/l10n/locore/lv.json  |1 +
 loleaflet/dist/l10n/locore/mk.json  |1 +
 loleaflet/dist/l10n/locore/ml.json  |1 +
 loleaflet/dist/l10n/locore/mn.json  |1 +
 loleaflet/dist/l10n/locore/mr.json  |1 +
 loleaflet/dist/l10n/locore/my.json  |1 +
 loleaflet/dist/l10n/locore/nb.json  |1 +
 loleaflet/dist/l10n/locore/ne.json  |1 +
 loleaflet/dist/l10n/locore/nl.json  |1 +
 loleaflet/dist/l10n/locore/nn.json  |1 +
 loleaflet/dist/l10n/locore/nso.json |1 +
 loleaflet/dist/l10n/locore/oc.json  |1 +
 loleaflet/dist/l10n/locore/om.json  |1 +
 loleaflet/dist/l10n/locore/or.json  |1 +
 loleaflet/dist/l10n/locore/pa-IN.json   |1 +
 loleaflet/dist/l10n/locore/pl.json  |1 +
 loleaflet/dist/l10n/locore/pt-BR.json   |1 +
 loleaflet/dist/l10n/locore/pt.json  |1 +
 loleaflet/dist/l10n/locore/ro.json  |1 +
 loleaflet/dist/l10n/locore/ru.json  |1 +
 loleaflet/dist/l10n/locore/rw.json  |1 +
 loleaflet/dist/l10n/locore/sa-IN.json   |1 +
 loleaflet/dist/l10n/locore/si.json  |1 +
 loleaflet/dist/l10n/locore/sid.json |1 +
 loleaflet/dist/l10n/locore/sk.json  |1 +
 loleaflet/dist/l10n/locore/sl.json  |1 +
 loleaflet/dist/l10n/locore/sq.json  |1 +
 loleaflet/dist/l10n/locore/sr-Latn.json |1 +
 loleaflet/dist/l10n/locore/sr.json  |1 +
 loleaflet/dist/l10n/locore/ss.json  |1 +
 loleaflet/dist/l10n/locore/sv.json  |1 +
 loleaflet/dist/l10n/locore/sw-TZ.json   |1 +
 loleaflet/dist/l10n/locore/ta.json  |1 +
 loleaflet/dist/l10n/locore/te.json  |1 +
 loleaflet/dist/l10n/locore/tg.json  |1 +
 loleaflet/dist/l10n/locore/th.json  |1 +
 loleaflet/dist/l10n/locore/tn.json  |1 +
 loleaflet/dist/l10n/locore/tr.json  |1 +
 loleaflet/dist/l10n/locore/ts.json  |1 +
 loleaflet/dist/l10n/locore/tt.json  |1 +
 loleaflet/dist/l10n/locore/ug.

[Libreoffice-commits] help.git: source/text

[László Németh]

 source/text/shared/01/05020301.xhp |   96 +
 1 file changed, 96 insertions(+)

New commits:
commit a88deb16532bf8d35e1d92486c84ecfc304ddc1a
Author: László Németh 
Date:   Mon Jul 2 16:05:27 2018 +0200

tdf#115007 add NatNum12 help and ask translators for extending

language support in number and date formatting by extending
the newly integrated libnumbertext (http://www.numbertext.org)
and default date formats of LibreOffice:

Translators: (1) please, modify the list of NatNum12 functions
according to libnumbertext language support of your language.
Other arguments could be ordinal-feminine, ordinal-masculine,
ordinal-neuter, formal, article, etc. To show the available
NatNum12 arguments of your language, open
https://numbertext.github.io/#testimonials in a browser, and
select "Functions (help)" in the pop-up menu.

As you can see in the examples for NatNum12 date formats
and in the extended en_US.xml and hu_HU.xml locale data files, it's
possible to support also special number formatting needs of your
language, including spelling out numbers, money amounts and dates
with automatic selection of prepositions [like Catalan "de" or "d'"
before month names], articles [Hungarian "a" or "az"] and suffixes
[in Hungarian or likely Estonian, Finnish, Turkish etc. languages:
"in", "from", "to" etc. suffixes of day and month names], check
http://numbertext.org or write your questions on LibreOffice l10n
mailing list.

Change-Id: I330a674f2832fba90ad0903d3e428f3d1fae7a98
Reviewed-on: https://gerrit.libreoffice.org/55708
Tested-by: Jenkins
Reviewed-by: László Németh 

diff --git a/source/text/shared/01/05020301.xhp 
b/source/text/shared/01/05020301.xhp
index c8aa2a007..7931063d1 100644
--- a/source/text/shared/01/05020301.xhp
+++ b/source/text/shared/01/05020301.xhp
@@ -988,6 +988,7 @@
 
 NatNum modifiers
 To display 
numbers using native number characters, use a [NatNum1], [NatNum2], ..., 
[NatNum11] modifier at the beginning of a number format 
codes.this will be extended with the libnumbertext 
work
+To spell out 
numbers in various number, currency and date formats, use a [NatNum12] modifier 
with the chosen arguments at the beginning of a number format code. See NatNum12 section 
below.
 The [NatNum1] 
modifier always uses a one to one character mapping to convert numbers to a 
string that matches the native number format code of the corresponding locale. 
The other modifiers produce different results if they are used with different 
locales. A locale can be the language and the territory for which the format 
code is defined, or a modifier such as [$-yyy] that follows the native number 
modifier. In this case, yyy is the hexadecimal MS-LCID that is also used in 
currency format codes. For example, to display a number using Japanese short 
Kanji characters in an English US locale, use the following number format 
code:
 [NatNum1][$-411]0
 In the 
following list, the Microsoft Excel [DBNumX] modifier that corresponds to %PRODUCTNAME [NatNum] modifier is shown. If you want, 
you can use a [DBNumX] modifier instead of [NatNum] modifier for your locale. 
Whenever possible, %PRODUCTNAME internally maps 
[DBNumX] modifiers to [NatNumN] modifiers.
@@ -2456,5 +2457,100 @@
   
 
 
+
+
+
+NatNum12 modifier
+
+To spell out 
numbers in various number, currency and date formats, use a [NatNum12] modifier 
with the chosen arguments at the beginning of a number format code.
+
+Common NatNum12 formatting examples
+
+
+  
+
+  Formatting code
+
+
+  Explanation
+
+  
+  
+
+  [NatNum12]
+
+
+  Spell out as cardinal number: 1 → one
+
+  
+  
+
+  [NatNum12 ordinal]
+
+
+  Spell out as ordinal number: 1 → first
+
+  
+  
+
+  [NatNum12 ordinal-number]
+
+
+  Spell out as ordinal indicator: 1 → 1st
+
+  
+  
+
+  [NatNum12 capitalize]
+
+
+  Spell out with capitalization, as cardinal number: 1 → 
One
+
+  
+  
+
+  [NatNum12 upper ordinal]
+
+
+  Spell out in upper case, as ordinal number: 1 → 
FIRST
+
+  
+  
+
+  [NatNum12 title]
+
+
+  Spell out in title case, as cardinal number: 101 → Hundred 
One
+
+  
+  
+
+  [NatNum12 USD]
+
+
+  Spell out as a money amount of a given currency specified by 
3-letter ISO code: 1 → one U.S. dollar
+
+  
+  
+
+  [NatNum12 D=ordinal-number]D" of "
+
+
+  Spell out as a date in format "1st of May"
+
+  
+  
+
+  [NatNum12 =title year,D=capitalize ordinal]D" of ", 

+
+
+  Spell out as a date in format "First of May, Nineteen 
Ninety-nine"
+
+  
+
+
+Other possible 
arguments: "money" before 3-letter currency codes, for example [NatNum12 
capitalize money USD]0.00 will format number "1.99" as "On

[Libreoffice-commits] core.git: sw/qa sw/source test/source

[Mike Kaganski]

 sw/qa/extras/layout/data/tdf117923.doc |binary
 sw/qa/extras/layout/layout.cxx |   15 +++
 sw/source/filter/ww8/ww8par.cxx|3 +++
 test/source/xmltesttools.cxx   |7 ++-
 4 files changed, 24 insertions(+), 1 deletion(-)

New commits:
commit 942f1056b51e53358d42ff8da8a1bbdce9ba5303
Author: Mike Kaganski 
Date:   Mon Jul 2 20:31:32 2018 +1000

tdf#117923: handle direct formatting for numbering in .doc

Since commit df07d6cb9f62c0a2c4b29bd850d4efb4fcd4790b, we do for DOCX.
DOC also has this problem, so set the relevant compatibility flag on
import for this format, too.

Change-Id: I3aef593341edffa878a06566da815cb72aa38004
Reviewed-on: https://gerrit.libreoffice.org/56812
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/sw/qa/extras/layout/data/tdf117923.doc 
b/sw/qa/extras/layout/data/tdf117923.doc
new file mode 100644
index ..c43cf40c9f52
Binary files /dev/null and b/sw/qa/extras/layout/data/tdf117923.doc differ
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index 2356832cc4ba..1ff1c23c6df4 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -24,6 +24,7 @@ public:
 void testTableExtrusion2();
 void testTdf116848();
 void testTdf117245();
+void testTdf117923();
 
 CPPUNIT_TEST_SUITE(SwLayoutWriter);
 CPPUNIT_TEST(testTdf116830);
@@ -34,6 +35,7 @@ public:
 CPPUNIT_TEST(testTableExtrusion2);
 CPPUNIT_TEST(testTdf116848);
 CPPUNIT_TEST(testTdf117245);
+CPPUNIT_TEST(testTdf117923);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -194,6 +196,19 @@ void SwLayoutWriter::testTdf117245()
 assertXPath(pXmlDoc, "/root/page/body/txt[2]/LineBreak", 1);
 }
 
+void SwLayoutWriter::testTdf117923()
+{
+createDoc("tdf117923.doc");
+xmlDocPtr pXmlDoc = parseLayoutDump();
+
+// Check that we actually test the line we need
+assertXPathContent(pXmlDoc, "/root/page/body/tab/row/cell/txt[3]", "GHI 
GHI GHI GHI");
+assertXPath(pXmlDoc, "/root/page/body/tab/row/cell/txt[3]/Special", 
"nType", "POR_NUMBER");
+assertXPath(pXmlDoc, "/root/page/body/tab/row/cell/txt[3]/Special", 
"rText", "2.");
+// The numbering height was 960.
+assertXPath(pXmlDoc, "/root/page/body/tab/row/cell/txt[3]/Special", 
"nHeight", "220");
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SwLayoutWriter);
 CPPUNIT_PLUGIN_IMPLEMENT();
 
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index c2a7c02f7f5b..301c37a12409 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -1795,6 +1795,9 @@ void SwWW8ImplReader::ImportDop()
 m_rDoc.getIDocumentSettingAccess().set(DocumentSettingId::TAB_COMPAT, 
true);
 // #i24363# tab stops relative to indent
 
m_rDoc.getIDocumentSettingAccess().set(DocumentSettingId::TABS_RELATIVE_TO_INDENT,
 false);
+// tdf#117923
+m_rDoc.getIDocumentSettingAccess().set(
+DocumentSettingId::APPLY_PARAGRAPH_MARK_FORMAT_TO_NUMBERING, true);
 
 // Import Default Tabs
 long nDefTabSiz = m_xWDop->dxaTab;
diff --git a/test/source/xmltesttools.cxx b/test/source/xmltesttools.cxx
index 45347b0c111b..c3e314e49ed4 100644
--- a/test/source/xmltesttools.cxx
+++ b/test/source/xmltesttools.cxx
@@ -88,7 +88,12 @@ OUString XmlTestTools::getXPathContent(xmlDocPtr pXmlDoc, 
const OString& rXPath)
 xmlXPathNodeSetGetLength(pXmlNodes) > 0);
 
 xmlNodePtr pXmlNode = pXmlNodes->nodeTab[0];
-OUString s(convert((pXmlNode->children[0]).content));
+xmlNodePtr pXmlChild = pXmlNode->children;
+OUString s;
+while (pXmlChild && pXmlChild->type != XML_TEXT_NODE)
+pXmlChild = pXmlChild->next;
+if (pXmlChild && pXmlChild->type == XML_TEXT_NODE)
+s = convert(pXmlChild->content);
 xmlXPathFreeObject(pXmlObj);
 return s;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[ANN] ODF extension schema & validation

[Michael Stahl]

hi all,

the result of a TDF-sponsored project have landed on master now: we have 
an ODF schema that contains LibreOffice extensions, and this is used in 
all unit tests if --with-export-validation is given, which is the default.


notably this means that if you add a new feature to the ODF filters and 
you add the required unit test for the new feature, then most likely the 
test will fail with a complaint from the validator; in this case the 
schema needs to be updated to contain the new elements and attributes.


the schema files are in core.git in the schema/libreoffice directory.

the extension schema uses the RelaxNG "include" feature to refer to the 
ODF schema; this means that it only contains those parts of the schema 
that actually need to be changed - this works well in many cases because 
the ODF schema is quite well structured with many named patterns, but 
unfortunately there are a few places where that isn't the case and large 
chunks needed to be copied to override them.


in the easy case, to add an attribute you just want to search for the 
corresponding element, which will have a "foo-attlist" named pattern, 
and then add another attribute like this:


  

  

  

  

currently only the features that are actually exported in the unit tests 
have been added to the schema; there is still some work to do here to 
add everything; the crashtesting script also does ODF validation of all 
files and now also uses the custom schema, so those results will be 
interesting...


during this work we found a couple bugs where the schema and the export 
filter didn't agree; this led to updating at least one not-yet-accepted 
proposal at OASIS, and 2 bug fixes in LO code.


unfortunately it turned out that there are a lot of extensions already 
for which no proposal exists, and in many cases not even an entry on the 
Wiki [2], so clearly something like this extension schema is needed :)


[1] git grep TODO schema/libreoffice
[2] 
https://wiki.documentfoundation.org/Development/ODF_Implementer_Notes/List_of_LibreOffice_ODF_Extensions

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

GSOC 100 paper cuts update

[Nick Thanda]

Hi everyone,



I have been working on tdf#51223 -  Cannot undo auto-capitalise with enter. 
Added a unit test for it

https://gerrit.libreoffice.org/#/c/56267/



I have started work on tdf# 88296 - Show Caps Lock status in LibreOffice UI.
https://gerrit.libreoffice.org/#/c/56784.



Thanks,

Nickson



___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sc/source

[Eike Rathke]

 sc/source/ui/dbgui/scuiasciiopt.cxx |   30 
 sc/source/ui/docshell/impex.cxx |   54 +---
 sc/source/ui/inc/impex.hxx  |   13 
 sc/source/ui/inc/scuiasciiopt.hxx   |3 +-
 4 files changed, 83 insertions(+), 17 deletions(-)

New commits:
commit 33b7319e2e08812a2f7d3126e4b1ec90875d6165
Author: Eike Rathke 
Date:   Mon Jul 2 14:41:59 2018 +0200

Resolves: tdf#56910 detect a Space (blank) separator if not selected

On populating the CSV import dialog for the first time attempt to
detect a possible space (blank) separator if field separators
don't include it already. This can be necessary because of the
"accept broken misquoted CSV fields" feature that tries to ignore
trailing blanks after a quoted field and if no separator follows
continues to add content to the field assuming the single double
quote was in error. If this blank separator is detected it is
added to field separators and the line and subsequent lines are
reread with the new separators.

Change-Id: I3c6d74ce8883f1d279a810e800e54b349d85ac71
Reviewed-on: https://gerrit.libreoffice.org/56810
Reviewed-by: Eike Rathke 
Tested-by: Jenkins
(cherry picked from commit c807e7ea7a0725a4d8375eda07d6f70870e0d50a)
Reviewed-on: https://gerrit.libreoffice.org/56814

diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx 
b/sc/source/ui/dbgui/scuiasciiopt.cxx
index b885e9b9c7ec..aeb718be4d08 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -288,7 +288,8 @@ ScImportAsciiDlg::ScImportAsciiDlg( vcl::Window* pParent, 
const OUString& aDatNa
 aColumnUser ( ScResId( SCSTR_COLUMN_USER ) ),
 aTextSepList(SCSTR_TEXTSEP),
 mcTextSep   ( ScAsciiOptions::cDefaultTextSep ),
-meCall(eCall)
+meCall(eCall),
+mbDetectSpaceSep(eCall != SC_TEXTTOCOLUMNS)
 {
 get(pFtCharSet, "textcharset");
 get(pLbCharSet, "charset");
@@ -558,7 +559,7 @@ void ScImportAsciiDlg::dispose()
 ModalDialog::dispose();
 }
 
-bool ScImportAsciiDlg::GetLine( sal_uLong nLine, OUString &rText )
+bool ScImportAsciiDlg::GetLine( sal_uLong nLine, OUString &rText, sal_Unicode& 
rcDetectSep )
 {
 if (nLine >= ASCIIDLG_MAXROWS || !mpDatStream)
 return false;
@@ -591,7 +592,7 @@ bool ScImportAsciiDlg::GetLine( sal_uLong nLine, OUString 
&rText )
 break;
 }
 rText = ReadCsvLine(*mpDatStream, !bFixed, maFieldSeparators,
-mcTextSep);
+mcTextSep, rcDetectSep);
 mnStreamPos = mpDatStream->Tell();
 mpRowPosArray[++mnRowPosCount] = mnStreamPos;
 } while (nLine >= mnRowPosCount && mpDatStream->good());
@@ -606,7 +607,7 @@ bool ScImportAsciiDlg::GetLine( sal_uLong nLine, OUString 
&rText )
 else
 {
 Seek( mpRowPosArray[nLine]);
-rText = ReadCsvLine(*mpDatStream, !bFixed, maFieldSeparators, 
mcTextSep);
+rText = ReadCsvLine(*mpDatStream, !bFixed, maFieldSeparators, 
mcTextSep, rcDetectSep);
 mnStreamPos = mpDatStream->Tell();
 }
 
@@ -805,6 +806,12 @@ IMPL_LINK( ScImportAsciiDlg, LbColTypeHdl, ListBox&, 
rListBox, void )
 
 IMPL_LINK_NOARG(ScImportAsciiDlg, UpdateTextHdl, ScCsvTableBox&, void)
 {
+// Checking the separator can only be done once for the very first time
+// when the dialog wasn't already presented to the user.
+// As a side effect this has the benefit that the check is only done on the
+// first set of visible lines.
+sal_Unicode cDetectSep = (mbDetectSpaceSep && !pRbFixed->IsChecked() && 
!pCkbSpace->IsChecked() ? 0 : 0x);
+
 sal_Int32 nBaseLine = mpTableBox->GetFirstVisLine();
 sal_Int32 nRead = mpTableBox->GetVisLineCount();
 // If mnRowPosCount==0, this is an initializing call, read ahead for row
@@ -817,12 +824,25 @@ IMPL_LINK_NOARG(ScImportAsciiDlg, UpdateTextHdl, 
ScCsvTableBox&, void)
 sal_Int32 i;
 for (i = 0; i < nRead; i++)
 {
-if (!GetLine( nBaseLine + i, maPreviewLine[i]))
+if (!GetLine( nBaseLine + i, maPreviewLine[i], cDetectSep))
 break;
 }
 for (; i < CSV_PREVIEW_LINES; i++)
 maPreviewLine[i].clear();
 
+if (mbDetectSpaceSep)
+{
+mbDetectSpaceSep = false;
+if (cDetectSep == ' ')
+{
+// Expect space to be appended by now so all subsequent
+// GetLine()/ReadCsvLine() actually used it.
+assert(maFieldSeparators.endsWith(" "));
+// Preselect Space in UI.
+pCkbSpace->Check();
+}
+}
+
 mpTableBox->Execute( CSVCMD_SETLINECOUNT, mnRowPosCount);
 bool bMergeSep = pCkbAsOnce->IsChecked();
 bool bRemoveSpace = pCkbRemoveSpace->IsChecked();
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index 3b3068764f24..854bc92b9635 100644
--- a/sc/source/ui/docshell/impex.cxx
+++

[Libreoffice-commits] core.git: basegfx/Library_basegfx.mk basegfx/source include/basegfx include/svx oox/source qadevOOo/Jar_OOoRunner.mk solenv/clang-format svx/source sw/qa xmloff/source

[Armin Le Grand]

 basegfx/Library_basegfx.mk|1 
 basegfx/source/tools/unotools.cxx |  256 --
 include/basegfx/utils/unotools.hxx|   38 --
 include/svx/unoprov.hxx   |   43 +-
 include/svx/unoshape.hxx  |   34 -
 oox/source/drawingml/shape.cxx|   13 
 qadevOOo/Jar_OOoRunner.mk |1 
 solenv/clang-format/blacklist |1 
 svx/source/customshapes/EnhancedCustomShapeEngine.cxx |3 
 svx/source/svdraw/svdoashp.cxx|3 
 svx/source/svdraw/svdopath.cxx|   14 
 svx/source/unodraw/XPropertyTable.cxx |6 
 svx/source/unodraw/unopage.cxx|   18 -
 svx/source/unodraw/unoprov.cxx|   27 -
 svx/source/unodraw/unoshap2.cxx   |  323 ++
 svx/source/unodraw/unoshape.cxx   |3 
 svx/source/xoutdev/xattr.cxx  |   10 
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx  |   21 -
 sw/qa/extras/ooxmlimport/ooxmlimport2.cxx |7 
 sw/qa/extras/rtfimport/rtfimport.cxx  |   20 -
 xmloff/source/draw/xexptran.cxx   |1 
 21 files changed, 212 insertions(+), 631 deletions(-)

New commits:
commit 36bade04d3780bc54c51b46bb0b63e69789658a5
Author: Armin Le Grand 
Date:   Thu Jun 28 19:48:59 2018 +0200

tdf106792 Get rid of SvxShapePolyPolygonBezier

SvxShapePolyPolygonBezier was an implementation for the UNO
Shape group of polygons with bezier parts (filled/unfilled/
closed/open), e.g. com.sun.star.drawing.OpenBezierShape.
It was differing from SvxShapePolyPolygon just by supporting
drawing::PolyPolygonBezierCoords instead of the simple
drawing::PointSequenceSequence and some details.
This leads to problems - the ShapeType *does change* e.g.
when you edit a non-bezier Shape in Draw/Impress and change
parts to curve (also when closing, see ShapeTypes above).
This is why SvxShape::getShapeType() already detects this
identifier by using thze internal ShapePolyType (e.g.
OBJ_PATHLINE).
So there is no reason to have two separate UNO API imple-
mentations for sthe same type of SvxShape at all. Get rid
of the extra one and unify this implementation detail.
Also cleaned up double basegfx tooling for conversions of
UNO API Poly/bezier data and B2DPolygon.
Adapted test for "tdf113946.docx", see comment there.
Adapted test for "tdf90097.rtf", see comment there. Also
needed to use the Linux values, also check comment there.
Adapted test for "tdf105127.docx", see comment there.
Adapted test for "tdf85232.docx", see comment there.
Had to fic a problem with test for "tdf96674.docx"- the
adaption of the RotateAngle for line objects goes havoc
together with the UNO API when scaling is involved. That
old aGeo rotate stuff just kills the existing rotation due
to numerical inprecise stuff. The UNP API - in trying not
just to apply a rptation, but manipulate the existing one
then goes wrong in not re-getting the current rotation
value anymore. ARGH! This is the original reason for the
ols tdf#96674 task - i doubt that the additional code to
make a line not exactly hor/ver is needed.
Checked and it is not needed, thus removed the change from
tdf#96674 in shape.cxx.

Change-Id: I2bb8d4cfe33fee3671f3dad60e5c18609a394f9d
Reviewed-on: https://gerrit.libreoffice.org/56614
Tested-by: Jenkins
Reviewed-by: Armin Le Grand 

diff --git a/basegfx/Library_basegfx.mk b/basegfx/Library_basegfx.mk
index de744b5a15ce..76d06b777668 100644
--- a/basegfx/Library_basegfx.mk
+++ b/basegfx/Library_basegfx.mk
@@ -74,7 +74,6 @@ $(eval $(call gb_Library_add_exception_objects,basegfx,\
 basegfx/source/tools/stringconversiontools \
 basegfx/source/tools/tools \
 basegfx/source/tools/unopolypolygon \
-basegfx/source/tools/unotools \
 basegfx/source/tools/zoomtools \
 basegfx/source/tuple/b2dtuple \
 basegfx/source/tuple/b2i64tuple \
diff --git a/basegfx/source/tools/unotools.cxx 
b/basegfx/source/tools/unotools.cxx
deleted file mode 100644
index a80b6b9994a3..
--- a/basegfx/source/tools/unotools.cxx
+++ /dev/null
@@ -1,256 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor l

[Libreoffice-commits] core.git: solenv/gbuild

[Michael Stahl]

 solenv/gbuild/platform/com_GCC_defs.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit fa503091cce61b0288645efeeab0937b11fe5403
Author: Michael Stahl 
Date:   Mon Jul 2 16:55:26 2018 +0200

gbuild: avoid -Wunused-macros with clang and icecream+ccache

On Fedora, the recommended way to use icecream with ccache is to set
CCACHE_PREFIX=icecc - but then $CC does not indicate that icecream is
used.

Change-Id: Ie757e6c00b07df7664c368c0e9f9c9bc599f3651
Reviewed-on: https://gerrit.libreoffice.org/56815
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/solenv/gbuild/platform/com_GCC_defs.mk 
b/solenv/gbuild/platform/com_GCC_defs.mk
index f2905d4588dd..64068b3ffd2c 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -55,7 +55,7 @@ gb_CFLAGS_COMMON := \
-Wstrict-prototypes \
-Wundef \
-Wunreachable-code \
-   $(if $(and $(COM_IS_CLANG),$(findstring icecc,$(CC))),,-Wunused-macros) 
\
+   $(if $(and $(COM_IS_CLANG),$(or $(findstring icecc,$(CC)),$(findstring 
icecc,$(CCACHE_PREFIX,,-Wunused-macros) \
-finput-charset=UTF-8 \
-fmessage-length=0 \
-fno-common \
@@ -69,7 +69,7 @@ gb_CXXFLAGS_COMMON := \
-Wextra \
-Wundef \
-Wunreachable-code \
-   $(if $(and $(COM_IS_CLANG),$(findstring 
icecc,$(CXX))),,-Wunused-macros) \
+   $(if $(and $(COM_IS_CLANG),$(or $(findstring icecc,$(CC)),$(findstring 
icecc,$(CCACHE_PREFIX,,-Wunused-macros) \
-finput-charset=UTF-8 \
-fmessage-length=0 \
-fno-common \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - 2 commits - instsetoo_native/inc_common setup_native/source

[Andras Timar]

 instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp |binary
 instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp  |binary
 setup_native/source/packinfo/finals_instsetoo.txt.in|2 +-
 3 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c093abcd85f01f7a9079882430e76b60685839e7
Author: Andras Timar 
Date:   Mon Jul 2 19:17:33 2018 +0200

fixup of 'Enable MSP patching'

Change-Id: I57745de650f2ba0a1bda55aebcd0db1f8c5b

diff --git a/setup_native/source/packinfo/finals_instsetoo.txt.in 
b/setup_native/source/packinfo/finals_instsetoo.txt.in
index b871d6c64238..d7395c464f2e 100644
--- a/setup_native/source/packinfo/finals_instsetoo.txt.in
+++ b/setup_native/source/packinfo/finals_instsetoo.txt.in
@@ -30,4 +30,4 @@
 # OpenOffice   pro de  
msi\OOO300_m6_native_packed-1_de.9352\openofficeorg30.msi
 # OpenOfficeLanguagePack   pro es  
msi\OOO300_m6_native_packed-1_es.9352\openofficeorg30.msi
 # URE  pro en-US   
msi\OOO300_m6_native_packed-1_en-US.9352\ure14.msi
-CollaboraOfficepro 
en-US,ar,as,ast,bg,bn-IN,br,ca,ca-valencia,cy,cs,da,de,el,en-GB,es,et,eu,fi,fr,ga,gd,gl,gu,he,hi,hr,hu,id,is,it,ja,km,kn,ko,lt,lv,ml,mr,nb,nl,nn,oc,or,pa-IN,pl,pt,pt-BR,ro,ru,sk,sl,sr,sr-Latn,sv,ta,te,tr,uk,vi,zh-CN,zh-TW
   
c:\lo\src\cp-6.0-5-@WINDOWS_SDK_ARCH@\Collabora_Office_6.0-5-Win_@WINDOWS_SDK_ARCH@.msi
+CollaboraOfficepro 
en-US,ar,as,ast,bg,bn-IN,br,ca,ca-valencia,cy,cs,da,de,el,en-GB,es,et,eu,fi,fr,ga,gd,gl,gu,he,hi,hr,hu,id,is,it,ja,km,kn,ko,lt,lv,ml,mr,nb,nl,nn,oc,or,pa-IN,pl,pt,pt-BR,ro,ru,sk,sl,sr,sr-Latn,sv,ta,te,tr,uk,vi,zh-CN,zh-TW
   
c:\lo\src\cp-6.0-5-@WINDOWS_SDK_ARCH@\Collabora_Office_6.0-5_Win_@WINDOWS_SDK_ARCH@.msi
commit 94711800344721bb99bae92b2b11605ad0b75ce6
Author: Andras Timar 
Date:   Mon Jul 2 19:15:58 2018 +0200

Collabora Office Windows installer bitmaps with white background

Change-Id: I818381269e085ca58cb529c76dc2bf5dba1e3c5c

diff --git 
a/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp 
b/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp
index 6df027c6e13e..c40ecd8b02fc 100644
Binary files 
a/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp and 
b/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp differ
diff --git a/instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp 
b/instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp
index 496e0d308c89..0fc8f7fb6c72 100644
Binary files 
a/instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp and 
b/instsetoo_native/inc_common/windows/msi_templates/Binary/Image.bmp differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

[Sophia Schröder]

 source/text/shared/01/0105.xhp |   31 ++-
 1 file changed, 14 insertions(+), 17 deletions(-)

New commits:
commit 2757436140048949862c3a776e2140a3fb7ecd47
Author: Sophia Schröder 
Date:   Sat May 26 09:20:44 2018 +0100

Further small cleanups and improvements

in /shared/01/0105*.xhp file

Change-Id: I783c0226648a61971cb891b15348ecae35e153bc
Reviewed-on: https://gerrit.libreoffice.org/54832
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/shared/01/0105.xhp 
b/source/text/shared/01/0105.xhp
index 2e58b8d41..aeead7cb8 100644
--- a/source/text/shared/01/0105.xhp
+++ b/source/text/shared/01/0105.xhp
@@ -1,6 +1,5 @@
 
 
-   
 
- 
-   
+
 
-
-Close
-/text/shared/01/0105.xhp
-
+  
+Close
+/text/shared/01/0105.xhp
+  
 
 
 
-
+  Can this be killed?
 documents; closing
 closing;documents
 mw deleted "backing window"
@@ -36,19 +34,18 @@
 
 Close
 Closes the current document without exiting the 
program.
-
+  
 
 
-
+  
 
-The 
Close command closes all of the open windows for the current 
document.
-If you have 
made changes to the current document, you are prompted if you want to save your 
changes.no longer the default
-
-id="par_id3159399" If you open a document for printing, and do not make any 
changes, you are still prompted to save your changes when you close the 
document. This is because $[officename] keeps track of when a document is 
printed.
-When you close 
the last open document window, you see the Start Center.
+The 
Close command closes all of the open windows for the current 
document.
+If you have 
made changes to the current document, you are prompted if you want to save your 
changes.
+no longer the default: id="par_id3159399" If you open a document for 
printing, and do not make any changes, you are still prompted to save your 
changes when you close the document. This is because $[officename] keeps track 
of when a document is printed.
+When you close 
the last open document window, you see the Start 
Center.
 
-Close the 
current window
-Exit 
$[officename]
+  Close the 
current window
+  Exit 
$[officename]
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/inc sc/qa sc/source sc/uiconfig

[Dennis Francis]

 sc/inc/strings.hrc|   23 
 sc/qa/uitest/statistics/data/regression.ods   |binary
 sc/qa/uitest/statistics/regression.py |  314 
 sc/source/ui/StatisticsDialogs/RegressionDialog.cxx   |  707 
--
 sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx|   28 
 sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx |6 
 sc/source/ui/inc/RegressionDialog.hxx |   49 
 sc/source/ui/inc/StatisticsTwoVariableDialog.hxx  |2 
 sc/source/ui/inc/TableFillingAndNavigationTools.hxx   |2 
 sc/uiconfig/scalc/ui/regressiondialog.ui  |  156 +-
 10 files changed, 882 insertions(+), 405 deletions(-)

New commits:
commit b7a02f2bb66b990289eb7f4dc80069d1545179a4
Author: Dennis Francis 
Date:   Mon Jun 25 23:42:26 2018 +0530

tdf#109042 : Add support for multivariate regression...

to regression tool. This means we now support more than
one X variable(independent variable). One caveat is that
all X variable observations needs to be present adjacent
to each other in the same table. For example if data is
grouped by columns, a valid organization of X variables
look like :-

  X Variables >

  AB   C ...

  XVar1XVar2   XVar3 ... XVarN   |
  0.1  0.450.32  ... Observations
  0.34 0.230.54  ... |
  0.23 0.560.90  ... |
  0.32 0.110.78  ... V

This patch also makes our regression tool output to have
similar structure to what Excel and Gnumeric does. This
means more statistical measures are added including
confidence intervals for all parmeter estimates.

We already have support for Logarithmic and Power regression
in addition to plain Linear regression. This patch's
multivariate support extends to all of these types of
regressions.

Earlier all regression statistics were computed separately
from scratch, which mostly compute the same regression
multiple times. This would slow things down if the
data-set being analysed is big. This is not true anymore
as we use LINEST() formula. LINEST() formula provides all
the necessary statistics needed in regression analysis, so
here it is called just once and its output components are
referenced to compute other statistics(derived).

Following are the UI changes for the regression dialog box :-

1. Changed the regression-type selectors from check-boxes
   to radio-buttons. So only one type of regression can
   be done at a time. This is because the output of a single
   regression type itself shows a lot of information and
   if do all types of regression, it is hard to read and
   interpret especially for bigger data-sets with lots of
   X variables.

2. Allow the variable's ranges to have label in them, via
   a checkbox. If labels are provided, they are used to
   annotate the variable specific statistics and the user
   can easily identify the stats corresponding to each
   variable.

3. More robust input validity checks, with error messages
   at the bottom of the dialog to let the user know which
   of their entry is invalid.

4. User can enter the confidence level (default = 95%)
   for computing the confidence intervals of each estimate.

5. Make residual computations optional via a check-box,
   as this involves writing a table with all X's and Y
   with predicted Y and residual for each observation.
   If the data-set is big, or the user just care about
   the estimates and confidence intervals, they can
   avoid this.

Finally the patch includes a uitest that tests all
3 types of regressions with a small dataset. The ground
truths for the tests were obtained by running
regression tool in Gnumeric.

Change-Id: I9762b716eae14b9fbd16e2c7228edf9e1930dc93
Reviewed-on: https://gerrit.libreoffice.org/56809
Tested-by: Jenkins
Reviewed-by: Michael Meeks 
Reviewed-by: Tomaž Vajngerl 

diff --git a/sc/inc/strings.hrc b/sc/inc/strings.hrc
index 470f06161690..a91f295e1591 100644
--- a/sc/inc/strings.hrc
+++ b/sc/inc/strings.hrc
@@ -218,6 +218,7 @@
 #define STR_EXPONENTIAL_SMOOTHING_UNDO_NAME 
NC_("STR_EXPONENTIAL_SMOOTHING_UNDO_NAME", "Exponential Smoothing")
 /* AnalysisOfVarianceDialog */
 #define STR_ANALYSIS_OF_VARIANCE_UNDO_NAME  
NC_("STR_ANALYSIS_OF_VARIANCE_UNDO_NAME", "Analysis of Variance")
+#define STR_LABEL_ANOVA NC_("STR_LABEL_ANOVA", 
"Analysis of Variance (ANOVA)")
 #define STR_ANOVA_SINGLE_FACTOR_LABEL   
NC_("STR_ANOVA_SINGLE_FACTOR_LABEL", "ANOVA - Single Factor")
 #define STR_ANOVA_TWO_

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - 2 commits - configure.ac download.lst external/python3

[Andras Timar]

 configure.ac   |2 
 download.lst   |4 -
 external/python3/UnpackedTarball_python3.mk|1 
 external/python3/python-3.5.5-CVE-2017-1000158.patch.1 |   62 +
 4 files changed, 66 insertions(+), 3 deletions(-)

New commits:
commit bb9c949c31d8a17a34baeaebb7bbac81f9056d61
Author: Andras Timar 
Date:   Mon Jul 2 23:11:36 2018 +0200

Fix Python CVE-2017-1000158

Change-Id: Id686120f85d44c8a0d65ae8683bcb7ed6e42854b

diff --git a/external/python3/UnpackedTarball_python3.mk 
b/external/python3/UnpackedTarball_python3.mk
index 35d6e643a1b0..9ed7a1ccce38 100644
--- a/external/python3/UnpackedTarball_python3.mk
+++ b/external/python3/UnpackedTarball_python3.mk
@@ -26,6 +26,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\
external/python3/python-3.3.5-pyexpat-symbols.patch.1 \
external/python3/ubsan.patch.0 \
external/python3/python-3.5.tweak.strip.soabi.patch \
+   external/python3/python-3.5.5-CVE-2017-1000158.patch.1 \
 ))
 
 ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD SOLARIS,$(OS)),)
diff --git a/external/python3/python-3.5.5-CVE-2017-1000158.patch.1 
b/external/python3/python-3.5.5-CVE-2017-1000158.patch.1
new file mode 100644
index ..9bd472fd713d
--- /dev/null
+++ b/external/python3/python-3.5.5-CVE-2017-1000158.patch.1
@@ -0,0 +1,62 @@
+From fd8614c5c5466a14a945db5b059c10c0fb8f76d9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= 
+Date: Fri, 8 Dec 2017 22:34:12 +0100
+Subject: [PATCH] bpo-30657: Fix CVE-2017-1000158 (#4664)
+
+Fixes possible integer overflow in PyBytes_DecodeEscape.
+
+Co-Authored-By: Jay Bosamiya 
+---
+ Misc/ACKS | 2 ++
+ .../NEWS.d/next/Security/2017-12-01-18-51-03.bpo-30657.Fd8kId.rst | 2 ++
+ Objects/bytesobject.c | 8 +++-
+ 3 files changed, 11 insertions(+), 1 deletion(-)
+ create mode 100644 
Misc/NEWS.d/next/Security/2017-12-01-18-51-03.bpo-30657.Fd8kId.rst
+
+diff --git a/Misc/ACKS b/Misc/ACKS
+index fbf110d801b5..1a35aad66ce7 100644
+--- a/Misc/ACKS
 b/Misc/ACKS
+@@ -167,6 +167,7 @@ Médéric Boquien
+ Matias Bordese
+ Jonas Borgström
+ Jurjen Bos
++Jay Bosamiya
+ Peter Bosch
+ Dan Boswell
+ Eric Bouck
+@@ -651,6 +652,7 @@ Ken Howard
+ Brad Howes
+ Mike Hoy
+ Ben Hoyt
++Miro Hrončok
+ Chiu-Hsiang Hsu
+ Chih-Hao Huang
+ Christian Hudon
+diff --git 
a/Misc/NEWS.d/next/Security/2017-12-01-18-51-03.bpo-30657.Fd8kId.rst 
b/Misc/NEWS.d/next/Security/2017-12-01-18-51-03.bpo-30657.Fd8kId.rst
+new file mode 100644
+index ..75359b6d8833
+--- /dev/null
 b/Misc/NEWS.d/next/Security/2017-12-01-18-51-03.bpo-30657.Fd8kId.rst
+@@ -0,0 +1,2 @@
++Fixed possible integer overflow in PyBytes_DecodeEscape, CVE-2017-1000158.
++Original patch by Jay Bosamiya; rebased to Python 3 by Miro Hrončok.
+diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c
+index 77dd45e84af8..9b29dc38b44f 100644
+--- a/Objects/bytesobject.c
 b/Objects/bytesobject.c
+@@ -970,7 +970,13 @@ PyObject *PyBytes_DecodeEscape(const char *s,
+ char *p, *buf;
+ const char *end;
+ PyObject *v;
+-Py_ssize_t newlen = recode_encoding ? 4*len:len;
++Py_ssize_t newlen;
++/* Check for integer overflow */
++if (recode_encoding && (len > PY_SSIZE_T_MAX / 4)) {
++PyErr_SetString(PyExc_OverflowError, "string is too large");
++return NULL;
++}
++newlen = recode_encoding ? 4*len:len;
+ v = PyBytes_FromStringAndSize((char *)NULL, newlen);
+ if (v == NULL)
+ return NULL;
commit 695489e29958ac66e6941afdedfdf9dd7e2cdde7
Author: Andras Timar 
Date:   Mon Jul 2 23:00:26 2018 +0200

Revert "python3: upgrade to release 3.5.5"

MSP does not like this

This reverts commit c34783711b2eb207825de7fc7b7a6655ea65e576.

diff --git a/configure.ac b/configure.ac
index 68d0accb1fa4..6e6f44db6562 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8078,7 +8078,7 @@ internal)
 SYSTEM_PYTHON=
 PYTHON_VERSION_MAJOR=3
 PYTHON_VERSION_MINOR=5
-PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.5
+PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.4
 if ! grep -q -i python.*${PYTHON_VERSION} ${SRC_ROOT}/download.lst; then
 AC_MSG_ERROR([PYTHON_VERSION ${PYTHON_VERSION} but no matching file in 
download.lst])
 fi
diff --git a/download.lst b/download.lst
index 8880f5e3ae84..3db3fe1cdd97 100644
--- a/download.lst
+++ b/download.lst
@@ -226,8 +226,8 @@ export POPPLER_SHA256SUM := 
2c096431adfb74bc2f53be466889b7646e1b599f28fa036094f3
 export POPPLER_TARBALL := poppler-0.66.0.tar.xz
 export POSTGRESQL_SHA256SUM := 
db61d498105a7d5fe46185e67ac830c878cdd7dc1f82a87f06b842217924c461
 export POSTGRESQL_TARBALL := 
c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2
-export PYTHON_SHA256SUM := 
063d2c3b0402d619

[Libreoffice-commits] core.git: include/xmloff sc/source xmloff/source

[Vikas]

 include/xmloff/xmltoken.hxx  |8 ++
 sc/source/filter/xml/xmlexprt.cxx|   81 +++
 sc/source/filter/xml/xmlexprt.hxx|3 
 sc/source/ui/dataprovider/datatransformation.cxx |   50 ++
 sc/source/ui/inc/datatransformation.hxx  |   22 +-
 xmloff/source/core/xmltoken.cxx  |7 +
 xmloff/source/token/tokens.txt   |7 +
 7 files changed, 176 insertions(+), 2 deletions(-)

New commits:
commit cb875f3ef1aa14b931131c4c0ddc595e3841273d
Author: Vikas 
Date:   Fri Jun 29 13:52:02 2018 +0530

Export data transformations to odf

Change-Id: Ie36aef4a4ee550a1bb5407305f13726d55eeea58
Reviewed-on: https://gerrit.libreoffice.org/56665
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard 

diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index 5a1cd6157887..862741d0a0eb 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -3278,6 +3278,14 @@ namespace xmloff { namespace token {
 XML_DATA_MAPPINGS,
 XML_DATA_MAPPING,
 XML_DATA_FREQUENCY,
+XML_DATA_TRANSFORMATIONS,
+XML_COLUMN_REMOVE_TRANSFORMATION,
+XML_COLUMN_SPLIT_TRANSFORMATION,
+XML_COLUMN_MERGE_TRANSFORMATION,
+XML_COLUMN_SORT_TRANSFORMATION,
+XML_SORT_PARAM,
+XML_MERGE_STRING,
+//Already defined XML_SEPARATOR,
 
 // regina, ODF1.2 additional symbols in charts
 XML_STAR,
diff --git a/sc/source/filter/xml/xmlexprt.cxx 
b/sc/source/filter/xml/xmlexprt.cxx
index bcfe73fe22d8..58d0e197b975 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -159,6 +159,8 @@
 #include 
 #include 
 
+
+
 //! not found in unonames.hxx
 #define SC_LAYERID "LayerID"
 
@@ -4061,6 +4063,7 @@ void ScXMLExport::WriteExternalDataMapping()
 
 sc::ExternalDataMapper& rDataMapper = pDoc->GetExternalDataMapper();
 auto& rDataSources = rDataMapper.getDataSources();
+
 if (!rDataSources.empty())
 {
 SvXMLElementExport aMappings(*this, XML_NAMESPACE_CALC_EXT, 
XML_DATA_MAPPINGS, true, true);
@@ -4071,11 +4074,89 @@ void ScXMLExport::WriteExternalDataMapping()
 AddAttribute(XML_NAMESPACE_CALC_EXT, XML_DATA_FREQUENCY, 
OUString::number(itr.getUpdateFrequency()));
 AddAttribute(XML_NAMESPACE_CALC_EXT, XML_ID, itr.getID());
 AddAttribute(XML_NAMESPACE_CALC_EXT, XML_DATABASE_NAME, 
itr.getDBName());
+
+// Add the data transformations
+WriteExternalDataTransformations(itr.getDataTransformation());
+
 SvXMLElementExport aMapping(*this, XML_NAMESPACE_CALC_EXT, 
XML_DATA_MAPPING, true, true);
 }
 }
 }
 
+void ScXMLExport::WriteExternalDataTransformations(const 
std::vector>& aDataTransformations)
+{
+SvXMLElementExport aTransformations(*this, XML_NAMESPACE_CALC_EXT, 
XML_DATA_TRANSFORMATIONS, true, true);
+for (auto& itr : aDataTransformations)
+{
+sc::TransformationType aTransformationType = 
itr->getTransformationType();
+
+switch(aTransformationType)
+{
+case sc::TransformationType::DELETE_TRANSFORMATION:
+{
+// Delete Columns Transformation
+std::shared_ptr 
aDeleteTransformation = 
std::dynamic_pointer_cast(itr);
+std::set aColumns = aDeleteTransformation->getColumns();
+SvXMLElementExport aTransformation(*this, 
XML_NAMESPACE_CALC_EXT, XML_COLUMN_REMOVE_TRANSFORMATION, true, true);
+for(auto& col : aColumns)
+{
+// Add Columns
+AddAttribute(XML_NAMESPACE_CALC_EXT, XML_COLUMN, 
OUString::number(col));
+SvXMLElementExport aCol(*this, XML_NAMESPACE_CALC_EXT, 
XML_COLUMN, true, true);
+}
+}
+break;
+case sc::TransformationType::SPLIT_TRANSFORMATION:
+{
+std::shared_ptr 
aSplitTransformation = 
std::dynamic_pointer_cast(itr);
+
+AddAttribute(XML_NAMESPACE_CALC_EXT, XML_COLUMN, 
OUString::number(aSplitTransformation->getColumn()));
+AddAttribute(XML_NAMESPACE_CALC_EXT, XML_SEPARATOR, 
OUString::number(aSplitTransformation->getSeparator()));
+SvXMLElementExport aTransformation(*this, 
XML_NAMESPACE_CALC_EXT, XML_COLUMN_SPLIT_TRANSFORMATION, true, true);
+}
+break;
+case sc::TransformationType::MERGE_TRANSFORMATION:
+{
+// Merge Transformation
+std::shared_ptr 
aMergeTransformation = 
std::dynamic_pointer_cast(itr);
+std::set aColumns = aMergeTransformation->getColumns();
+
+AddAttribute(XML_NAMESPACE_CALC_EXT, XML_MERGE_STRING, 
aMergeTransformation->getMergeString());
+SvXMLElementExport aTransformation(*this, 

[Libreoffice-commits] help.git: help3xsl/default.css

[Adolfo Jayme Barrientos]

 help3xsl/default.css |   48 
 1 file changed, 24 insertions(+), 24 deletions(-)

New commits:
commit 139bd7c195abf3c1d73ed06c33f64fafeb5244be
Author: Adolfo Jayme Barrientos 
Date:   Mon Jul 2 16:46:43 2018 -0500

Helponline: Improve a few colors some more

Change-Id: I3d9db610057119cdb08b1f31152700ed18d6ea16

diff --git a/help3xsl/default.css b/help3xsl/default.css
index b27e96622..03eaf34ca 100644
--- a/help3xsl/default.css
+++ b/help3xsl/default.css
@@ -41,7 +41,7 @@ h6,
 .listitemintable,
 .tablecontent,
 .input {
-font-family: -apple-system, system-ui, "Segoe UI", Roboto, Ubuntu, Oxygen, 
"Oxygen Sans", Cantarell, "Noto Sans", "Lucida Grande", "Helvetica Neue", 
Helvetica, Arial, sans-serif, FreeSerif, NanumGothic, "Noto Sans Tibetan", 
Taprom;
+font-family: -apple-system, system-ui, "Segoe UI", Roboto, Ubuntu, 
Cantarell, "Noto Sans", "DejaVu Sans", "Lucida Grande", "Helvetica Neue", 
Helvetica, Arial, sans-serif, FreeSerif, NanumGothic, "Noto Sans Tibetan", 
Taprom;
 }
 .input {
 transition-property: background-color;
@@ -140,7 +140,7 @@ pre,
 }
 .note {
 border-left: 4px solid #FFDE09;
-background-color: #FFFADE;
+background-color: #FFF4D0;
 }
 .tip {
 border-left: 4px solid #38618C;
@@ -191,7 +191,7 @@ table, th, td {
 margin-top: 0px;
 }
 .tableheadcell {
-background: #4F8A10;
+background: #148603;
 color: white;
 vertical-align:top;
 }
@@ -203,7 +203,7 @@ h4,
 h5,
 h6 {
 margin-bottom: 0.67rem;
-color: #4F8A10;
+color: #148603;
 }
 p,
 ol,
@@ -214,7 +214,7 @@ td {
 h1 {
 font-size: 1.83rem;
 font-weight: 300;
-border-bottom: 2px solid #4F8A10;
+border-bottom: 2px solid #148603;
 padding-bottom: 6px;
 }
 h1 a {
@@ -244,7 +244,7 @@ h6 {
 }
 .howtoget {
 background: #CCF4C6;
-border-left: 4px solid #4F8A10;
+border-left: 4px solid #148603;
 border-radius: 0 4px 4px 0;
 box-shadow: 0 2px 2px -2px rgba(0,0,0,0.2);
 padding: 0.3em;
@@ -330,7 +330,7 @@ h6 {
 font-size: 1rem;
 font-weight: bold;
 padding: 1px;
-border: solid 1px #4F8A10;
+border: solid 1px #148603;
 }
 #DisplayArea {
 overflow: auto;
@@ -407,7 +407,7 @@ header {
 }
 .lang nav a, .modules nav a {
 color: #fff;
-background-color: #31363A;
+background-color: #26;
 display: block;
 line-height: 1.5;
 padding: 3px 6px;
@@ -418,7 +418,7 @@ header {
 white-space: nowrap;
 }
 footer {
-border-top: 2px solid #4F8A10;
+border-top: 2px solid #148603;
 background: linear-gradient(to bottom, rgba(0,0,0,0.025) 0%,rgba(0,0,0,0) 
100%);
 padding: 15px 10px 0 10px;
 margin: 25px 0 0 0;
@@ -437,7 +437,7 @@ footer p {
 opacity: 0;
 }
 label[for=accordion-1] {
-color: #4F8A10;
+color: #148603;
 display: block;
 padding: 10px 0 10px 20px;
 font-size: 22px;
@@ -459,7 +459,7 @@ aside input[type=checkbox]:checked ~ .contents-treeview {
 .index-label {
 float: left;
 font-size: 22px;
-color: #4F8A10;
+color: #148603;
 padding-left: 20px;
 margin: 20px 0 0 0;
 }
@@ -479,70 +479,70 @@ aside input[type=checkbox]:checked ~ .contents-treeview {
 #Bookmarks p {
 font-size: 22px;
 font-weight: bold;
-color: #4F8A10;
+color: #148603;
 }
 #WRITER::before {
 content: "WRITER";
 display: block;
 font-size: 22px;
 font-weight: bold;
-color: #4F8A10;
+color: #148603;
 }
 #CALC::before {
 content: "CALC";
 display: block;
 font-size: 22px;
 font-weight: bold;
-color: #4F8A10;
+color: #148603;
 }
 #IMPRESS::before {
 content: "IMPRESS";
 display: block;
 font-size: 22px;
 font-weight: bold;
-color: #4F8A10;
+color: #148603;
 }
 #DRAW::before {
 content: "DRAW";
 display: block;
 font-size: 22px;
 font-weight: bold;
-color: #4F8A10;
+color: #148603;
 }
 #BASE::before {
 content: "BASE";
 display: block;
 font-size: 22px;
 font-weight: bold;
-color: #4F8A10;
+color: #148603;
 }
 #MATH::before {
 content: "MATH";
 display: block;
 font-size: 22px;
 font-weight: bold;
-color: #4F8A10;
+color: #148603;
 }
 #CHART::before {
 content: "CHART";
 display: block;
 font-size: 22px;
 font-weight: bold;
-color: #4F8A10;
+color: #148603;
 }
 #BASIC::before {
 content: "BASIC";
 display: block;
 font-size: 22px;
 font-weight: bold;
-color: #4F8A10;
+color: #148603;
 }
 #GLOBAL::before {
 content: "GLOBAL";
 display: block;
 font-size: 22px;
 font-weight: bold;
-color: #4F8A10;
+color: #148603;
 }
 .pagination {
 padding: 0;
@@ -680,7 +680,7 @@ li.disabled a {
 }
 .contents-treeview label:before {
 content: "⊞";
-color: #4F8A10;
+color: #148603;
 width: 16px;
 margin: 0 5px 0 0;
 display: inline-block;
@@ -740,7 +740,7 @@ li.disabled a {
 top: 8

[Libreoffice-commits] help.git: Branch 'libreoffice-6-1' - help3xsl/default.css

[Adolfo Jayme Barrientos]

 help3xsl/default.css |   48 
 1 file changed, 24 insertions(+), 24 deletions(-)

New commits:
commit c540bbfe6098cb0a8862d69e7b98745eb1443894
Author: Adolfo Jayme Barrientos 
Date:   Mon Jul 2 16:46:43 2018 -0500

Helponline: Improve a few colors some more

Change-Id: I3d9db610057119cdb08b1f31152700ed18d6ea16
(cherry picked from commit 139bd7c195abf3c1d73ed06c33f64fafeb5244be)
Reviewed-on: https://gerrit.libreoffice.org/56836
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/help3xsl/default.css b/help3xsl/default.css
index b27e96622..03eaf34ca 100644
--- a/help3xsl/default.css
+++ b/help3xsl/default.css
@@ -41,7 +41,7 @@ h6,
 .listitemintable,
 .tablecontent,
 .input {
-font-family: -apple-system, system-ui, "Segoe UI", Roboto, Ubuntu, Oxygen, 
"Oxygen Sans", Cantarell, "Noto Sans", "Lucida Grande", "Helvetica Neue", 
Helvetica, Arial, sans-serif, FreeSerif, NanumGothic, "Noto Sans Tibetan", 
Taprom;
+font-family: -apple-system, system-ui, "Segoe UI", Roboto, Ubuntu, 
Cantarell, "Noto Sans", "DejaVu Sans", "Lucida Grande", "Helvetica Neue", 
Helvetica, Arial, sans-serif, FreeSerif, NanumGothic, "Noto Sans Tibetan", 
Taprom;
 }
 .input {
 transition-property: background-color;
@@ -140,7 +140,7 @@ pre,
 }
 .note {
 border-left: 4px solid #FFDE09;
-background-color: #FFFADE;
+background-color: #FFF4D0;
 }
 .tip {
 border-left: 4px solid #38618C;
@@ -191,7 +191,7 @@ table, th, td {
 margin-top: 0px;
 }
 .tableheadcell {
-background: #4F8A10;
+background: #148603;
 color: white;
 vertical-align:top;
 }
@@ -203,7 +203,7 @@ h4,
 h5,
 h6 {
 margin-bottom: 0.67rem;
-color: #4F8A10;
+color: #148603;
 }
 p,
 ol,
@@ -214,7 +214,7 @@ td {
 h1 {
 font-size: 1.83rem;
 font-weight: 300;
-border-bottom: 2px solid #4F8A10;
+border-bottom: 2px solid #148603;
 padding-bottom: 6px;
 }
 h1 a {
@@ -244,7 +244,7 @@ h6 {
 }
 .howtoget {
 background: #CCF4C6;
-border-left: 4px solid #4F8A10;
+border-left: 4px solid #148603;
 border-radius: 0 4px 4px 0;
 box-shadow: 0 2px 2px -2px rgba(0,0,0,0.2);
 padding: 0.3em;
@@ -330,7 +330,7 @@ h6 {
 font-size: 1rem;
 font-weight: bold;
 padding: 1px;
-border: solid 1px #4F8A10;
+border: solid 1px #148603;
 }
 #DisplayArea {
 overflow: auto;
@@ -407,7 +407,7 @@ header {
 }
 .lang nav a, .modules nav a {
 color: #fff;
-background-color: #31363A;
+background-color: #26;
 display: block;
 line-height: 1.5;
 padding: 3px 6px;
@@ -418,7 +418,7 @@ header {
 white-space: nowrap;
 }
 footer {
-border-top: 2px solid #4F8A10;
+border-top: 2px solid #148603;
 background: linear-gradient(to bottom, rgba(0,0,0,0.025) 0%,rgba(0,0,0,0) 
100%);
 padding: 15px 10px 0 10px;
 margin: 25px 0 0 0;
@@ -437,7 +437,7 @@ footer p {
 opacity: 0;
 }
 label[for=accordion-1] {
-color: #4F8A10;
+color: #148603;
 display: block;
 padding: 10px 0 10px 20px;
 font-size: 22px;
@@ -459,7 +459,7 @@ aside input[type=checkbox]:checked ~ .contents-treeview {
 .index-label {
 float: left;
 font-size: 22px;
-color: #4F8A10;
+color: #148603;
 padding-left: 20px;
 margin: 20px 0 0 0;
 }
@@ -479,70 +479,70 @@ aside input[type=checkbox]:checked ~ .contents-treeview {
 #Bookmarks p {
 font-size: 22px;
 font-weight: bold;
-color: #4F8A10;
+color: #148603;
 }
 #WRITER::before {
 content: "WRITER";
 display: block;
 font-size: 22px;
 font-weight: bold;
-color: #4F8A10;
+color: #148603;
 }
 #CALC::before {
 content: "CALC";
 display: block;
 font-size: 22px;
 font-weight: bold;
-color: #4F8A10;
+color: #148603;
 }
 #IMPRESS::before {
 content: "IMPRESS";
 display: block;
 font-size: 22px;
 font-weight: bold;
-color: #4F8A10;
+color: #148603;
 }
 #DRAW::before {
 content: "DRAW";
 display: block;
 font-size: 22px;
 font-weight: bold;
-color: #4F8A10;
+color: #148603;
 }
 #BASE::before {
 content: "BASE";
 display: block;
 font-size: 22px;
 font-weight: bold;
-color: #4F8A10;
+color: #148603;
 }
 #MATH::before {
 content: "MATH";
 display: block;
 font-size: 22px;
 font-weight: bold;
-color: #4F8A10;
+color: #148603;
 }
 #CHART::before {
 content: "CHART";
 display: block;
 font-size: 22px;
 font-weight: bold;
-color: #4F8A10;
+color: #148603;
 }
 #BASIC::before {
 content: "BASIC";
 display: block;
 font-size: 22px;
 font-weight: bold;
-color: #4F8A10;
+color: #148603;
 }
 #GLOBAL::before {
 content: "GLOBAL";
 display: block;
 font-size: 22px;
 font-weight: bold;
-color: #4F8A10;
+color: #148603;
 }
 .pagination {
 padding: 0;
@@ -680,7 +680,7 @@ li.disabled a {
 }
 .conten

[Libreoffice-commits] core.git: g

[Thorsten Behrens]

 g |  284 +++---
 1 file changed, 142 insertions(+), 142 deletions(-)

New commits:
commit 4c475bc6763e29f7af2caadc7add42d26e1d6f75
Author: Thorsten Behrens 
Date:   Mon Jul 2 18:11:22 2018 +0200

./g: indent & de-tabbify to make code readable

Change-Id: Ica2a0dd281f77bfab223fa1526ba0720c9c280f1
Reviewed-on: https://gerrit.libreoffice.org/56821
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/g b/g
index 13bc73939e49..12d7631ff39b 100755
--- a/g
+++ b/g
@@ -31,52 +31,52 @@ usage()
 
 refresh_submodule_hooks()
 {
-local repo=$1
-local hook
-local hook_name
+local repo=$1
+local hook
+local hook_name
 
 if [ -d "${repo?}"/.git ] ; then
 # use core's hook by default
-   for hook_name in "${COREDIR?}/.git-hooks"/* ; do
+for hook_name in "${COREDIR?}/.git-hooks"/* ; do
 hook="${repo?}/.git/hooks/${hook_name##*/}"
 if [ ! -e "${hook?}" ] || [ -L "${hook?}" ] ; then
-   rm -f "${hook?}"
-   ln -sf "${hook_name}" "${hook?}"
+rm -f "${hook?}"
+ln -sf "${hook_name}" "${hook?}"
 fi
-   done
+done
 # override if need be by the submodules' own hooks
-   for hook_name in "${COREDIR?}/${repo?}/.git-hooks"/* ; do
+for hook_name in "${COREDIR?}/${repo?}/.git-hooks"/* ; do
 hook="${repo?}/.git/hooks/${hook_name##*/}"
 if [ ! -e "${hook?}" ] || [ -L "${hook?}" ] ; then
-   rm -f "${hook?}"
-   ln -sf "${hook_name}" "${hook?}"
-   fi
-   done
+rm -f "${hook?}"
+ln -sf "${hook_name}" "${hook?}"
+fi
+done
 elif [ -d .git/modules/"${repo}"/hooks ] ; then
-   for hook_name in "${COREDIR?}/.git-hooks"/* ; do
+for hook_name in "${COREDIR?}/.git-hooks"/* ; do
 hook=".git/modules/${repo?}/hooks/${hook_name##*/}"
 if [ ! -e "${hook?}" ] || [ -L "${hook?}" ] ; then
-   rm -f "${hook?}"
-   ln -sf "${hook_name}" "${hook?}"
+rm -f "${hook?}"
+ln -sf "${hook_name}" "${hook?}"
 fi
-   done
+done
 # override if need be by the submodules' own hooks
-   for hook_name in "${COREDIR?}/${repo?}/.git-hooks"/* ; do
+for hook_name in "${COREDIR?}/${repo?}/.git-hooks"/* ; do
 hook=".git/modules/${repo?}/hooks/${hook_name##*/}"
 if [ ! -e "${hook?}" ] || [ -L "${hook?}" ] ; then
-   rm -f "${hook?}"
-   ln -sf "${hook_name}" "${hook?}"
-   fi
-   done
+rm -f "${hook?}"
+ln -sf "${hook_name}" "${hook?}"
+fi
+done
 fi
 
 }
 
 refresh_all_hooks()
 {
-local repo
-local hook_name
-local hook
+local repo
+local hook_name
+local hook
 
 pushd "${COREDIR?}" > /dev/null
 for hook_name in "${COREDIR?}/.git-hooks"/* ; do
@@ -96,20 +96,20 @@ local hook
 
 set_push_url()
 {
-local repo
+local repo
 
 repo="$1"
 if [ -n "$repo" ] ; then
-   pushd "${COREDIR?}/${repo?}" > /dev/null
+pushd "${COREDIR?}/${repo?}" > /dev/null
 else
-   pushd "${COREDIR?}" > /dev/null
-   repo="core"
+pushd "${COREDIR?}" > /dev/null
+repo="core"
 fi
 echo "setting up push url for ${repo?}"
 if [ "${repo?}" = "helpcontent2" ] ; then
-   git config remote.origin.pushurl "ssh://${PUSH_USER}logerrit/help"
+git config remote.origin.pushurl "ssh://${PUSH_USER}logerrit/help"
 else
-   git config remote.origin.pushurl "ssh://${PUSH_USER}logerrit/${repo?}"
+git config remote.origin.pushurl "ssh://${PUSH_USER}logerrit/${repo?}"
 fi
 popd > /dev/null
 }
@@ -119,19 +119,19 @@ set_push_urls()
 PUSH_USER="$1"
 set_push_url
 for repo in ${SUBMODULES_ACTIVE?} ; do
-   set_push_url "${repo?}"
+set_push_url "${repo?}"
 done
 }
 
 get_active_submodules()
 {
-SUBMODULES_ACTIVE=""
-local repo
+SUBMODULES_ACTIVE=""
+local repo
 
 for repo in ${SUBMODULES_ALL?} ; do
-   if [ -d "${repo?}"/.git ] || [ -f "${repo?}"/.git ] ; then
-   SUBMODULES_ACTIVE="${repo?} ${SUBMODULES_ACTIVE?}"
-   fi
+if [ -d "${repo?}"/.git ] || [ -f "${repo?}"/.git ] ; then
+SUBMODULES_ACTIVE="${repo?} ${SUBMODULES_ACTIVE?}"
+fi
 done
 }
 
@@ -139,10 +139,10 @@ get_configured_submodules()
 {
 SUBMODULES_CONFIGURED=""
 if [ -f config_host.mk ] ; then
-   SUBMODULES_CONFIGURED=$(< config_host.mk grep -a GIT_NEEDED_SUBMODULES 
| sed -e "s/.*=//")
+SUBMODULES_CONFIGURED=$(< config_host.mk grep -a GIT_NEEDED_SUBMODULES 
| sed -e "s/.*=//")
 else
-   # if we need the configured submodule before the configuration is done. 
we assumed you want them all
-   SUBMODULES_CONFIGURED

[Libreoffice-commits] core.git: g

[Thorsten Behrens]

 g |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5fce97a58b8f764e35bf98128591c9a89537da05
Author: Thorsten Behrens 
Date:   Mon Jul 2 18:11:47 2018 +0200

./g: don't exit early on ./g checkout -f

Change-Id: I33f54c365bce64feb1c58fc8e4faddb7ad77
Reviewed-on: https://gerrit.libreoffice.org/56822
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/g b/g
index 12d7631ff39b..746babe23539 100755
--- a/g
+++ b/g
@@ -201,7 +201,7 @@ do_checkout()
 git checkout "$@" || return $?
 for cmd in "$@" ; do
 if [ "$cmd" = "-f" ]; then
-return 0
+continue
 elif [ "$cmd" = "-b" ] ; then
 create_branch=1
 elif [ "$create_branch" = "1" ] ; then
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: GSoC weekly update: ListBox separate read values from input values

[Hrishabh Rajput]

Hello Community,

Weekly Status for Listbox separate read values from the input values.

Week 7:

1. Set up the ListFilter input field, which would help in filtering data
when list source type is value list. (Not fully working).
Started working on the dropdown = false case.

2. Fixed the previous FilterColumn problem of not being able to take
the user input.

The progress can be seen here: https://gerrit.libreoffice.org/#/c/54791/

Regards,
Hrishabh

On Thu, Jun 28, 2018 at 1:27 AM, Hrishabh Rajput 
wrote:

> Hello community
>
> Week 5 and 6:
> Project Status:
> Currently, the project can take the input in the following list contents:
> 1. SQL
> 2. SQL [Native]
> 3. Tablefields
> 4. Query
> 5. Table
> and can correctly show the list entries which are marked true in any
> given boolean column of the database table, with corresponding bound
> values. Currently, working on making this available in list content Value
> list.
>
> What's not working :
> 1. FilterColumn only takes the default value. Disregards the
> value entered by the user.
> 2. Shows error when no 3rd column is passed in list content, which is
> the basis for visibility of all entries. It should take the default values
> and make all entries visible.
>
> Regards,
> Hrishabh
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Weekly QA Report (W26-2018)

[Xisco Fauli]

Hello,

What have happened in QA in the last 7 days?

  * 108 bugs have been created, of which, 51 are still unconfirmed (
Total Unconfirmed bugs: 383 )
        + Created bugs: http://tinyurl.com/y7l8vrto
        + Still unconfirmed bugs: http://tinyurl.com/y9f9hvek

  * 996 comments have been written by 164 users.

  * 43 new users have signed up to Bugzilla.

== STATUSES CHANGED ==
  * 20 bugs have been changed to 'ASSIGNED'.
        + Link: http://tinyurl.com/yddk7jbx
        + Done by: Xisco Faulí ( 3 ), Miklos Vajna ( 2 ), Justin L ( 2
), Dennis Francis ( 2 ), balazs.varga991 ( 2 ), Julien Nabet ( 1 ),
Serge Krot (CIB) ( 1 ), nicksonthanda10 ( 1 ), Luke Deller ( 1 ), Gabor
Kelemen ( 1 ), Laurent BP ( 1 ), Eike Rathke ( 1 ), Aron Budea ( 1 ),
Armin Le Grand (CIB) ( 1 )

  * 3 bugs have been changed to 'CLOSED'.
        + Link: http://tinyurl.com/yakxfr29
        + Done by: Regina Henschel ( 3 )

  * 12 bugs have been changed to 'NEEDINFO'.
        + Link: http://tinyurl.com/ybuofjoo
        + Done by: Xisco Faulí ( 4 ), Heiko Tietze ( 2 ), dieterp ( 2 ),
V Stuart Foote ( 1 ), Tor Lillqvist ( 1 ), Eike Rathke ( 1 ), tommy27 ( 1 )

  * 51 bugs have been changed to 'NEW'.
        + Link: http://tinyurl.com/y8eduoga
        + Done by: Buovjaga ( 10 ), Susan Gessing ( 4 ), Julien Nabet (
4 ), Drew Jensen ( 4 ), dieterp ( 4 ), Aron Budea ( 4 ), Xisco Faulí ( 3
), V Stuart Foote ( 3 ), Heiko Tietze ( 2 ), Gabor Kelemen ( 2 ),
kompilainenn ( 2 ), Olivier Hallot ( 1 ), m.a.riosv ( 1 ), Khaled Hosny
( 1 ), Lior Kaplan ( 1 ), Joel Madero ( 1 ), jalojo ( 1 ), Timur ( 1 ),
Gerhard Weydt ( 1 ), tommy27 ( 1 )

  * 1 bug has been changed to 'REOPENED'.
        + Link: http://tinyurl.com/lyhzm3t
        + Done by: jenniferlee26888 ( 1 )

  * 11 bugs have been changed to 'RESOLVED DUPLICATE'.
        + Link: http://tinyurl.com/y6vz5ouy
        + Done by: Aron Budea ( 2 ), Heiko Tietze ( 1 ), Telesto ( 1 ),
Regina Henschel ( 1 ), perdrisat ( 1 ), OfficeUser ( 1 ), Mike Kaganski
( 1 ), Mark Hung ( 1 ), Alex Thurgood ( 1 ), Adolfo Jayme ( 1 )

  * 29 bugs have been changed to 'RESOLVED FIXED'.
        + Link: http://tinyurl.com/y8r9b8os
        + Done by: Samuel Mehrbrodt (CIB) ( 5 ), Mike Kaganski ( 5 ),
Justin L ( 4 ), Miklos Vajna ( 2 ), Buovjaga ( 2 ), Xisco Faulí ( 1 ),
Tor Lillqvist ( 1 ), Thomas Lendo ( 1 ), Thorsten Behrens (CIB) ( 1 ),
Noel Grandin ( 1 ), László Németh ( 1 ), Gabor Kelemen ( 1 ), Bartosz (
1 ), Adolfo Jayme ( 1 ), b7007 ( 1 ), Armin Le Grand (CIB) ( 1 )

  * 1 bug has been changed to 'RESOLVED INSUFFICIENTDATA'.
        + Link: http://tinyurl.com/yboa8rkf
        + Done by: dieterp ( 1 )

  * 3 bugs have been changed to 'RESOLVED INVALID'.
        + Link: http://tinyurl.com/y7x8p56w
        + Done by: Robert Orzanna ( 1 ), Mike Kaganski ( 1 ), Eyal
Rozenberg ( 1 )

  * 8 bugs have been changed to 'RESOLVED NOTABUG'.
        + Link: http://tinyurl.com/y9neb3sr
        + Done by: V Stuart Foote ( 2 ), Buovjaga ( 2 ), Xisco Faulí ( 1
), Regina Henschel ( 1 ), q12w ( 1 ), Gabor Kelemen ( 1 )

  * 2 bugs have been changed to 'RESOLVED NOTOURBUG'.
        + Link: http://tinyurl.com/ydbfgavj
        + Done by: Xisco Faulí ( 1 ), V Stuart Foote ( 1 )

  * 3 bugs have been changed to 'RESOLVED WONTFIX'.
        + Link: http://tinyurl.com/ya7tr9ej
        + Done by: Buovjaga ( 1 ), Heiko Tietze ( 1 ), Jean-Baptiste
Faure ( 1 )

  * 18 bugs have been changed to 'RESOLVED WORKSFORME'.
        + Link: http://tinyurl.com/yc3kwq9d
        + Done by: Julien Nabet ( 2 ), Elmar ( 2 ), Alex Thurgood ( 2 ),
Buovjaga ( 1 ), Heiko Tietze ( 1 ), Telesto ( 1 ), Regina Henschel ( 1
), qiyi.caitian ( 1 ), Victor Porton ( 1 ), Camelot ( 1 ), Timur ( 1 ),
Pavel Lobashov ( 1 ), dieterp ( 1 ), tommy27 ( 1 ), kompilainenn ( 1 )

  * 13 bugs have been changed to 'UNCONFIRMED'.
        + Link: http://tinyurl.com/y9jmz5nj
        + Done by: Xisco Faulí ( 4 ), support ( 2 ), dieterp ( 2 ), Aron
Budea ( 2 ), Buovjaga ( 1 ), Iceflower S ( 1 ), Emil Tanev ( 1 )

  * 15 bugs have been changed to 'VERIFIED FIXED'.
        + Link: http://tinyurl.com/ycusar26
        + Done by: Xisco Faulí ( 7 ), Gerhard Weydt ( 3 ), Jean-Baptiste
Faure ( 2 ), Buovjaga ( 1 ), Timur ( 1 ), tommy27 ( 1 )

== KEYWORDS ADDED ==
  * 'accessibility' has been added to 1 bug.
        + Link: http://tinyurl.com/yb24r6cl
        + Done by: Alex ARNAUD ( 1 )

  * 'bibisectNotNeeded' has been added to 1 bug.
        + Link: http://tinyurl.com/ydbjmukw
        + Done by: Buovjaga ( 1 )

  * 'bibisectRequest' has been added to 1 bug.
        + Link: http://tinyurl.com/y7xky5uk
        + Done by: Telesto ( 1 )

  * 'bibisected' has been added to 30 bugs.
        + Link: http://tinyurl.com/ycc7jmvc
        + Done by: Buovjaga ( 26 ), Xisco Faulí ( 4 )

  * 'bisected' has been added to 5 bugs.
        + Link: http://tinyurl.com/y7gyaql2
        + Done by: Xisco Faulí ( 4 ), Buovjaga ( 1 )

  * 'dataLoss' has been added to 1 bug.
        + Link: http://tinyurl.com/ycsh6xqq

[Libreoffice-commits] core.git: sc/source

[Markus Mohrhard]

 sc/source/ui/inc/dataproviderdlg.hxx  |2 +-
 sc/source/ui/miscdlgs/dataproviderdlg.cxx |8 
 sc/source/ui/view/cellsh2.cxx |3 ++-
 3 files changed, 7 insertions(+), 6 deletions(-)

New commits:
commit bb1d5780226bb1b9156580972eea9aa849178742
Author: Markus Mohrhard 
Date:   Mon Jul 2 02:41:32 2018 +0200

store the data provider settings in the document

Change-Id: I049187432437a4bf2539fae54d44ad1266c54149
Reviewed-on: https://gerrit.libreoffice.org/56787
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard 

diff --git a/sc/source/ui/inc/dataproviderdlg.hxx 
b/sc/source/ui/inc/dataproviderdlg.hxx
index 5a45fb7cce39..a56f4f612b45 100644
--- a/sc/source/ui/inc/dataproviderdlg.hxx
+++ b/sc/source/ui/inc/dataproviderdlg.hxx
@@ -61,7 +61,7 @@ public:
 void splitColumn();
 void mergeColumns();
 
-void import();
+void import(ScDocument* pDoc);
 };
 
 #endif
diff --git a/sc/source/ui/miscdlgs/dataproviderdlg.cxx 
b/sc/source/ui/miscdlgs/dataproviderdlg.cxx
index 78953cb3d4fd..8e07d04b8145 100644
--- a/sc/source/ui/miscdlgs/dataproviderdlg.cxx
+++ b/sc/source/ui/miscdlgs/dataproviderdlg.cxx
@@ -481,7 +481,7 @@ IMPL_LINK(ScDataProviderDlg, ImportHdl, Window*, pCtrl, 
void)
 {
 if (pCtrl == mpDataProviderCtrl.get())
 {
-import();
+import(mpDoc.get());
 }
 }
 
@@ -521,9 +521,9 @@ void ScDataProviderDlg::mergeColumns()
 mpList->addEntry(pMergeColumnEntry);
 }
 
-void ScDataProviderDlg::import()
+void ScDataProviderDlg::import(ScDocument* pDoc)
 {
-sc::ExternalDataSource aSource = 
mpDataProviderCtrl->getDataSource(mpDoc.get());
+sc::ExternalDataSource aSource = mpDataProviderCtrl->getDataSource(pDoc);
 std::vector> aListEntries = mpList->getEntries();
 for (size_t i = 1; i < aListEntries.size(); ++i)
 {
@@ -536,7 +536,7 @@ void ScDataProviderDlg::import()
 
aSource.AddDataTransformation(pTransformationCtrl->getTransformation());
 }
 aSource.setDBData(pDBData);
-aSource.refresh(mpDoc.get(), true);
+aSource.refresh(pDoc, true);
 mpTable->Invalidate();
 }
 
diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx
index 59d2466d420a..b8b64d869880 100644
--- a/sc/source/ui/view/cellsh2.cxx
+++ b/sc/source/ui/view/cellsh2.cxx
@@ -790,7 +790,8 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
 ScopedVclPtrInstance< ScDataProviderDlg > aDialog( 
pTabViewShell->GetDialogParent(), xDoc);
 if (aDialog->Execute() == RET_OK)
 {
-// handle the import here
+ScDocument* pDoc = GetViewData()->GetDocument();
+aDialog->import(pDoc);
 }
 }
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - include/svtools sc/inc sc/source svtools/source

[Noel Grandin]

 include/svtools/treelist.hxx  |2 +-
 include/svtools/treelistbox.hxx   |2 +-
 sc/inc/fielduno.hxx   |2 +-
 sc/inc/funcuno.hxx|2 +-
 sc/source/ui/unoobj/fielduno.cxx  |4 ++--
 sc/source/ui/unoobj/funcuno.cxx   |6 +++---
 svtools/source/contnr/treelist.cxx|7 ---
 svtools/source/contnr/treelistbox.cxx |5 ++---
 8 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit 0df31898281a771821d62ad419c7343da72cfb51
Author: Noel Grandin 
Date:   Mon Jul 2 11:02:59 2018 +0200

loplugin:useuniqueptr in ScFunctionAccess

Change-Id: I678bfbc54a1c35540bb7f2b76f4f7e5c7c62b23c
Reviewed-on: https://gerrit.libreoffice.org/56826
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/sc/inc/funcuno.hxx b/sc/inc/funcuno.hxx
index d93cc41c6a2f..df65d249c212 100644
--- a/sc/inc/funcuno.hxx
+++ b/sc/inc/funcuno.hxx
@@ -61,7 +61,7 @@ class ScFunctionAccess : public cppu::WeakImplHelper<
 {
 private:
 ScTempDocCache  aDocCache;
-ScDocOptions*   pOptions;
+std::unique_ptr pOptions;
 SfxItemPropertyMap aPropertyMap;
 boolmbArray;
 boolmbValid;
diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx
index 68cf909663f4..59de6fc42165 100644
--- a/sc/source/ui/unoobj/funcuno.cxx
+++ b/sc/source/ui/unoobj/funcuno.cxx
@@ -176,7 +176,7 @@ ScFunctionAccess::ScFunctionAccess() :
 
 ScFunctionAccess::~ScFunctionAccess()
 {
-delete pOptions;
+pOptions.reset();
 {
 // SfxBroadcaster::RemoveListener checks DBG_TESTSOLARMUTEX():
 SolarMutexGuard g;
@@ -241,7 +241,7 @@ void SAL_CALL ScFunctionAccess::setPropertyValue(
 else
 {
 if ( !pOptions )
-pOptions = new ScDocOptions();
+pOptions.reset( new ScDocOptions() );
 
 // options aren't initialized from configuration - always get the same 
default behaviour
 
@@ -259,7 +259,7 @@ uno::Any SAL_CALL ScFunctionAccess::getPropertyValue( const 
OUString& aPropertyN
 return uno::Any( mbArray );
 
 if ( !pOptions )
-pOptions = new ScDocOptions();
+pOptions.reset( new ScDocOptions() );
 
 // options aren't initialized from configuration - always get the same 
default behaviour
 
commit 6118675b1f6bd37589d88d5893dffd41501cf624
Author: Noel Grandin 
Date:   Mon Jul 2 10:59:43 2018 +0200

loplugin:useuniqueptr in ScHeaderFieldsObj

Change-Id: Ibf9251880e658605e83179c9de7ac2104d2c1c14
Reviewed-on: https://gerrit.libreoffice.org/56825
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/sc/inc/fielduno.hxx b/sc/inc/fielduno.hxx
index 8664e2b673a8..c600f29d79e9 100644
--- a/sc/inc/fielduno.hxx
+++ b/sc/inc/fielduno.hxx
@@ -114,7 +114,7 @@ class ScHeaderFieldsObj : public cppu::WeakImplHelper<
 {
 private:
 ScHeaderFooterTextData& mrData;
-ScEditSource* mpEditSource;
+std::unique_ptr mpEditSource;
 
 /// List of refresh listeners.
 comphelper::OInterfaceContainerHelper2* mpRefreshListeners;
diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx
index 0316b832cc75..77856751701d 100644
--- a/sc/source/ui/unoobj/fielduno.cxx
+++ b/sc/source/ui/unoobj/fielduno.cxx
@@ -428,12 +428,12 @@ 
ScHeaderFieldsObj::ScHeaderFieldsObj(ScHeaderFooterTextData& rData) :
 mrData(rData),
 mpRefreshListeners( nullptr )
 {
-mpEditSource = new ScHeaderFooterEditSource(rData);
+mpEditSource.reset( new ScHeaderFooterEditSource(rData) );
 }
 
 ScHeaderFieldsObj::~ScHeaderFieldsObj()
 {
-delete mpEditSource;
+mpEditSource.reset();
 
 // increment refcount to prevent double call off dtor
 osl_atomic_increment( &m_refCount );
commit b82d6a3ddc1e70c2f61b8f8fdbfeb9345206472f
Author: Noel Grandin 
Date:   Mon Jul 2 09:54:39 2018 +0200

return by std::unique_ptr from CreateViewData

Change-Id: I83572646fb2ebe8afe8cff581e574375798e74f7
Reviewed-on: https://gerrit.libreoffice.org/56818
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/include/svtools/treelist.hxx b/include/svtools/treelist.hxx
index c246a5610ad8..0d190ab3a022 100644
--- a/include/svtools/treelist.hxx
+++ b/include/svtools/treelist.hxx
@@ -317,7 +317,7 @@ public:
 SvViewDataEntry* GetViewData( SvTreeListEntry* pEntry );
 boolHasViewData() const;
 
-virtual SvViewDataEntry* CreateViewData( SvTreeListEntry* pEntry );
+virtual std::unique_ptr CreateViewData( SvTreeListEntry* 
pEntry );
 virtual voidInitViewData( SvViewDataEntry*, SvTreeListEntry* 
pEntry );
 
 virtual voidModelHasCleared();
diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx
index b29908debe4a..5bb92a84a005 100644
--- a/include/svtools/treelistbox.hxx
+++ b/include/svtools/treelistbox.hxx
@@ -297,7 +297,7 @@ protected:
 boolEditingCanceled() const;
 
 // R

[Libreoffice-commits] core.git: accessibility/source basctl/source cui/source dbaccess/source include/svtools reportdesign/source sc/source sd/source sfx2/source svtools/source svx/source sw/source

[Noel Grandin]

 accessibility/source/extended/accessiblelistbox.cxx |2 -
 basctl/source/basicide/bastype2.cxx |4 +-
 cui/source/customize/cfg.cxx|4 +-
 cui/source/customize/cfgutil.cxx|8 ++--
 cui/source/customize/eventdlg.cxx   |2 -
 cui/source/dialogs/hlmarkwn.cxx |2 -
 cui/source/dialogs/scriptdlg.cxx|6 +--
 cui/source/options/optaboutconfig.cxx   |2 -
 dbaccess/source/ui/app/AppDetailPageHelper.cxx  |2 -
 dbaccess/source/ui/browser/unodatbr.cxx |   14 +++
 dbaccess/source/ui/control/marktree.cxx |   11 +++--
 dbaccess/source/ui/control/tabletree.cxx|2 -
 dbaccess/source/ui/dlg/tablespage.cxx   |4 +-
 include/svtools/treelist.hxx|3 -
 include/svtools/treelistbox.hxx |2 -
 include/svtools/treelistentry.hxx   |4 ++
 reportdesign/source/ui/dlg/Navigator.cxx|2 -
 sc/source/ui/cctrl/checklistmenu.cxx|8 ++--
 sc/source/ui/miscdlgs/conflictsdlg.cxx  |4 +-
 sc/source/ui/navipi/content.cxx |6 +--
 sc/source/ui/xmlsource/xmlsourcedlg.cxx |4 +-
 sd/source/ui/animations/CustomAnimationList.cxx |2 -
 sd/source/ui/dlg/sdtreelb.cxx   |2 -
 sfx2/source/appl/newhelp.cxx|2 -
 sfx2/source/dialog/templdlg.cxx |2 -
 svtools/source/contnr/foldertree.cxx|2 -
 svtools/source/contnr/svimpbox.cxx  |   12 +++---
 svtools/source/contnr/treelist.cxx  |   38 
 svtools/source/contnr/treelistbox.cxx   |   14 +--
 svtools/source/contnr/treelistentry.cxx |   25 +
 svtools/source/uno/treecontrolpeer.cxx  |4 +-
 svx/source/form/navigatortree.cxx   |2 -
 sw/source/uibase/utlui/content.cxx  |2 -
 33 files changed, 90 insertions(+), 113 deletions(-)

New commits:
commit 904c97bbdf4c76709dbcacb11292668b98a9efd8
Author: Noel Grandin 
Date:   Mon Jul 2 17:23:59 2018 +0200

move SvTreeList::*Sibling to SvTreeListEntry

since they don't depend on SvTreeList at all

Change-Id: If48c83976a95943e5cfa92490d68f74281cf4b5f
Reviewed-on: https://gerrit.libreoffice.org/56819
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/accessibility/source/extended/accessiblelistbox.cxx 
b/accessibility/source/extended/accessiblelistbox.cxx
index bd5c81129a1c..0f194f0d404a 100644
--- a/accessibility/source/extended/accessiblelistbox.cxx
+++ b/accessibility/source/extended/accessiblelistbox.cxx
@@ -265,7 +265,7 @@ namespace accessibility
 while (pEntryChild)
 {
 RemoveChildEntries(pEntryChild);
-pEntryChild = SvTreeListBox::NextSibling(pEntryChild);
+pEntryChild = pEntryChild->NextSibling();
 }
 }
 
diff --git a/basctl/source/basicide/bastype2.cxx 
b/basctl/source/basicide/bastype2.cxx
index 5d3071bd7e5f..5997980df2ea 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -506,7 +506,7 @@ SvTreeListEntry* TreeListBox::ImpFindEntry( 
SvTreeListEntry* pParent, const OUSt
 if (  rText == GetEntryText( pEntry ) )
 return pEntry;
 
-pEntry = pParent ? NextSibling( pEntry ) : GetEntry( ++nRootPos );
+pEntry = pParent ? pEntry->NextSibling() : GetEntry( ++nRootPos );
 }
 return nullptr;
 }
@@ -625,7 +625,7 @@ SvTreeListEntry* TreeListBox::FindEntry( SvTreeListEntry* 
pParent, const OUStrin
 if ( ( pBasicEntry->GetType() == eType  ) && ( rText == GetEntryText( 
pEntry ) ) )
 return pEntry;
 
-pEntry = pParent ? NextSibling( pEntry ) : GetEntry( ++nRootPos );
+pEntry = pParent ? pEntry->NextSibling() : GetEntry( ++nRootPos );
 }
 return nullptr;
 }
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 63d19ebdd808..44784ae283f5 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -1823,12 +1823,12 @@ void SvxConfigPage::MoveEntry( bool bMoveUp )
 {
 // Move Up is just a Move Down with the source and target reversed
 pTargetEntry = pSourceEntry;
-pSourceEntry = SvTreeListBox::PrevSibling( pTargetEntry );
+pSourceEntry = pTargetEntry->PrevSibling();
 pToSelect = pTargetEntry;
 }
 else
 {
-pTargetEntry = SvTreeListBox::NextSibling( pSourceEntry );
+pTargetEntry = pSourceEntry->NextSibling();
 pToSelect = pSourceEntry;
 }
 
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 5dc7153f1c94..1907bae13dee 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/cust

[Libreoffice-commits] core.git: 2 commits - sw/source

[Noel Grandin]

 sw/source/core/inc/layact.hxx|2 +-
 sw/source/core/layout/layact.cxx |8 +++-
 sw/source/core/text/porfld.cxx   |4 ++--
 sw/source/core/text/porfld.hxx   |2 +-
 4 files changed, 7 insertions(+), 9 deletions(-)

New commits:
commit 1c588317c6e55ede11c577ea16e1af85eee4810a
Author: Noel Grandin 
Date:   Mon Jul 2 14:36:54 2018 +0200

loplugin:useuniqueptr in SwGrfNumPortion

Change-Id: I87f60bc3b6dc11246202801f39cbc7cf464e1890
Reviewed-on: https://gerrit.libreoffice.org/56829
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx
index 9b76c0f5a7a0..20b18918a5aa 100644
--- a/sw/source/core/text/porfld.cxx
+++ b/sw/source/core/text/porfld.cxx
@@ -800,7 +800,7 @@ SwGrfNumPortion::~SwGrfNumPortion()
 if (pGraph)
 pGraph->StopAnimation( nullptr, nId );
 }
-delete pBrush;
+pBrush.reset();
 }
 
 void SwGrfNumPortion::StopAnimation( OutputDevice* pOut )
@@ -993,7 +993,7 @@ void SwGrfNumPortion::Paint( const SwTextPaintInfo &rInf ) 
const
 
 if( bDraw && aTmp.HasArea() )
 {
-DrawGraphic( pBrush, const_cast(rInf.GetOut()),
+DrawGraphic( pBrush.get(), const_cast(rInf.GetOut()),
 aTmp, aRepaint, m_bReplace ? GRFNUM_REPLACE : GRFNUM_YES );
 }
 }
diff --git a/sw/source/core/text/porfld.hxx b/sw/source/core/text/porfld.hxx
index 28acae3141cd..a0476bbb58f2 100644
--- a/sw/source/core/text/porfld.hxx
+++ b/sw/source/core/text/porfld.hxx
@@ -154,7 +154,7 @@ public:
 
 class SwGrfNumPortion : public SwNumberPortion
 {
-SvxBrushItem* pBrush;
+std::unique_ptr pBrush;
 longnId;// For StopAnimation
 SwTwips nYPos;  // _Always_ contains the current RelPos
 SwTwips nGrfHeight;
commit ecf56400b31511ebb737ba6c9200d1b075867ec7
Author: Noel Grandin 
Date:   Mon Jul 2 11:13:15 2018 +0200

loplugin:useuniqueptr in SwLayAction

Change-Id: I0552a113a3eaf1265e65d32b2b04cc768571d9ff
Reviewed-on: https://gerrit.libreoffice.org/56827
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/sw/source/core/inc/layact.hxx b/sw/source/core/inc/layact.hxx
index 9240ef9d2a98..adb79928ce5d 100644
--- a/sw/source/core/inc/layact.hxx
+++ b/sw/source/core/inc/layact.hxx
@@ -60,7 +60,7 @@ class SwLayAction
 // painting.
 const SwTabFrame *m_pOptTab;
 
-SwWait *m_pWait;
+std::unique_ptr m_pWait;
 
 // If a paragraph (or anything else) moved more than one page when
 // formatting, it adds its new page number here.
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index 761a85c51741..b390ab771371 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -78,7 +78,7 @@ void SwLayAction::CheckWaitCursor()
 if ( !m_pWait && IsWaitAllowed() && IsPaint() &&
  ((std::clock() - m_nStartTicks) * 1000 / CLOCKS_PER_SEC >= 
CLOCKS_PER_SEC/2) )
 {
-m_pWait = new SwWait( *m_pRoot->GetFormat()->GetDoc()->GetDocShell(), 
true );
+m_pWait.reset( new SwWait( 
*m_pRoot->GetFormat()->GetDoc()->GetDocShell(), true ) );
 }
 }
 
@@ -319,8 +319,7 @@ void SwLayAction::Action(OutputDevice* pRenderContext)
 //TurboMode? Hands-off during idle-format
 if ( IsPaint() && !IsIdle() && TurboAction() )
 {
-delete m_pWait;
-m_pWait = nullptr;
+m_pWait.reset();
 m_pRoot->ResetTurboFlag();
 m_bActionInProgress = false;
 m_pRoot->DeleteEmptySct();
@@ -348,8 +347,7 @@ void SwLayAction::Action(OutputDevice* pRenderContext)
 }
 m_pRoot->DeleteEmptySct();
 
-delete m_pWait;
-m_pWait = nullptr;
+m_pWait.reset();
 
 //Turbo-Action permitted again for all cases.
 m_pRoot->ResetTurboFlag();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - sc/inc sc/source sw/source

[Noel Grandin]

 sc/inc/textuno.hxx  |6 +-
 sc/source/ui/unoobj/textuno.cxx |   16 ++---
 sw/source/core/inc/SwGrammarMarkUp.hxx  |4 -
 sw/source/core/inc/wrong.hxx|   15 +++--
 sw/source/core/text/SwGrammarMarkUp.cxx |   13 ++--
 sw/source/core/text/wrong.cxx   |   77 ++--
 sw/source/core/txtnode/SwGrammarContact.cxx |   20 +++
 7 files changed, 66 insertions(+), 85 deletions(-)

New commits:
commit 3769a6271120e0e856b53f906654bc2c593804fe
Author: Noel Grandin 
Date:   Mon Jul 2 16:56:17 2018 +0200

loplugin:useuniqueptr in ScHeaderFooterTextData

Change-Id: Ia359ee8e9e4876f6bbf86702c476c9f9602295a0
Reviewed-on: https://gerrit.libreoffice.org/56832
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/sc/inc/textuno.hxx b/sc/inc/textuno.hxx
index 0d3919727436..bb90c82f85f4 100644
--- a/sc/inc/textuno.hxx
+++ b/sc/inc/textuno.hxx
@@ -105,8 +105,8 @@ private:
 std::unique_ptr mpTextObj;
 css::uno::WeakReference xContentObj;
 ScHeaderFooterPart  nPart;
-ScEditEngineDefaulter*  pEditEngine;
-SvxEditEngineForwarder* pForwarder;
+std::unique_ptr  pEditEngine;
+std::unique_ptr pForwarder;
 boolbDataValid;
 
 public:
@@ -120,7 +120,7 @@ public:
 SvxTextForwarder*   GetTextForwarder();
 void UpdateData();
 void UpdateData(EditEngine& rEditEngine);
-ScEditEngineDefaulter*  GetEditEngine() { GetTextForwarder(); return 
pEditEngine; }
+ScEditEngineDefaulter*  GetEditEngine() { GetTextForwarder(); return 
pEditEngine.get(); }
 
 ScHeaderFooterPart  GetPart() const { return nPart; }
 const css::uno::Reference 
GetContentObj() const { return xContentObj; }
diff --git a/sc/source/ui/unoobj/textuno.cxx b/sc/source/ui/unoobj/textuno.cxx
index 49fc91b2037a..7d92fd868a67 100644
--- a/sc/source/ui/unoobj/textuno.cxx
+++ b/sc/source/ui/unoobj/textuno.cxx
@@ -187,8 +187,6 @@ ScHeaderFooterTextData::ScHeaderFooterTextData(
 mpTextObj(pTextObj ? pTextObj->Clone() : nullptr),
 xContentObj( xContent ),
 nPart( nP ),
-pEditEngine( nullptr ),
-pForwarder( nullptr ),
 bDataValid(false)
 {
 }
@@ -197,8 +195,8 @@ ScHeaderFooterTextData::~ScHeaderFooterTextData()
 {
 SolarMutexGuard aGuard; //  needed for EditEngine dtor
 
-delete pForwarder;
-delete pEditEngine;
+pForwarder.reset();
+pEditEngine.reset();
 }
 
 SvxTextForwarder* ScHeaderFooterTextData::GetTextForwarder()
@@ -207,7 +205,7 @@ SvxTextForwarder* ScHeaderFooterTextData::GetTextForwarder()
 {
 SfxItemPool* pEnginePool = EditEngine::CreatePool();
 pEnginePool->FreezeIdRanges();
-ScHeaderEditEngine* pHdrEngine = new ScHeaderEditEngine( pEnginePool );
+std::unique_ptr pHdrEngine(new ScHeaderEditEngine( 
pEnginePool ));
 
 pHdrEngine->EnableUndo( false );
 pHdrEngine->SetRefMapMode(MapMode(MapUnit::MapTwip));
@@ -232,18 +230,18 @@ SvxTextForwarder* 
ScHeaderFooterTextData::GetTextForwarder()
 ScHeaderFooterTextObj::FillDummyFieldData( aData );
 pHdrEngine->SetData( aData );
 
-pEditEngine = pHdrEngine;
-pForwarder = new SvxEditEngineForwarder(*pEditEngine);
+pEditEngine = std::move(pHdrEngine);
+pForwarder.reset( new SvxEditEngineForwarder(*pEditEngine) );
 }
 
 if (bDataValid)
-return pForwarder;
+return pForwarder.get();
 
 if (mpTextObj)
 pEditEngine->SetText(*mpTextObj);
 
 bDataValid = true;
-return pForwarder;
+return pForwarder.get();
 }
 
 void ScHeaderFooterTextData::UpdateData()
commit 09d9419bf2072fdab2d7c1d1c6a8dee70b9f0f8a
Author: Noel Grandin 
Date:   Mon Jul 2 15:20:42 2018 +0200

loplugin:useuniqueptr in SwWrongList

and simplify, just use copy constructors and operator=, instead of
special-case CopyFrom methods

Change-Id: I3e14fa08e820cf7ae2c5424ae22ae95516933773
Reviewed-on: https://gerrit.libreoffice.org/56831
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/sw/source/core/inc/SwGrammarMarkUp.hxx 
b/sw/source/core/inc/SwGrammarMarkUp.hxx
index f37605556353..94cf6c93a6aa 100644
--- a/sw/source/core/inc/SwGrammarMarkUp.hxx
+++ b/sw/source/core/inc/SwGrammarMarkUp.hxx
@@ -39,10 +39,10 @@ class SwGrammarMarkUp : public SwWrongList
 
 public:
 SwGrammarMarkUp() : SwWrongList( WRONGLIST_GRAMMAR ) {}
+SwGrammarMarkUp(SwGrammarMarkUp const &);
 
 virtual ~SwGrammarMarkUp() override;
-virtual SwWrongList* Clone() override;
-virtual void CopyFrom( const SwWrongList& rCopy ) override;
+virtual std::unique_ptr Clone() override;
 
 /* SwWrongList::Move() + handling of maSentence */
 void MoveGrammar( sal_Int32 nPos, sal_Int32 nDiff );
diff --git a/sw/source/core/inc/wrong.hxx b/sw/source/core/inc/wrong.hxx
index 0003d54266ba..695a33b6219d 100644
--- a/sw/source/core/inc/

[Libreoffice-commits] core.git: sw/source

[Noel Grandin]

 sw/source/core/text/pordrop.hxx |8 
 sw/source/core/text/txtdrop.cxx |6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 24218c21712bc900a6641bd1844878f07b173df7
Author: Noel Grandin 
Date:   Mon Jul 2 14:45:07 2018 +0200

loplugin:useuniqueptr in SwDropPortionPart

Change-Id: I9aaaeb2b5cb05d350059554555ecb0c195c51a74
Reviewed-on: https://gerrit.libreoffice.org/56830
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/sw/source/core/text/pordrop.hxx b/sw/source/core/text/pordrop.hxx
index e0f7a4ea21f4..7d2293d17648 100644
--- a/sw/source/core/text/pordrop.hxx
+++ b/sw/source/core/text/pordrop.hxx
@@ -33,8 +33,8 @@ extern SwDropCapCache *pDropCapCache;
 // attribute changes inside them.
 class SwDropPortionPart
 {
-SwDropPortionPart* pFollow;
-SwFont* pFnt;
+std::unique_ptr pFollow;
+std::unique_ptr pFnt;
 TextFrameIndex nLen;
 sal_uInt16 nWidth;
 bool m_bJoinBorderWithNext;
@@ -45,8 +45,8 @@ public:
 : pFollow( nullptr ), pFnt( &rFont ), nLen( nL ), nWidth( 0 ), 
m_bJoinBorderWithNext(false), m_bJoinBorderWithPrev(false) {};
 ~SwDropPortionPart();
 
-SwDropPortionPart* GetFollow() const { return pFollow; };
-void SetFollow( SwDropPortionPart* pNew ) { pFollow = pNew; };
+SwDropPortionPart* GetFollow() const { return pFollow.get(); };
+void SetFollow( std::unique_ptr pNew ) { pFollow = 
std::move(pNew); };
 SwFont& GetFont() const { return *pFnt; }
 TextFrameIndex GetLen() const { return nLen; }
 sal_uInt16 GetWidth() const { return nWidth; }
diff --git a/sw/source/core/text/txtdrop.cxx b/sw/source/core/text/txtdrop.cxx
index 317eb084a4c1..6ced927d91cb 100644
--- a/sw/source/core/text/txtdrop.cxx
+++ b/sw/source/core/text/txtdrop.cxx
@@ -95,8 +95,8 @@ SwDropSave::~SwDropSave()
 /// SwDropPortionPart DTor
 SwDropPortionPart::~SwDropPortionPart()
 {
-delete pFollow;
-delete pFnt;
+pFollow.reset();
+pFnt.reset();
 }
 
 /// SwDropPortion CTor, DTor
@@ -641,7 +641,7 @@ SwDropPortion *SwTextFormatter::NewDropPortion( 
SwTextFormatInfo &rInf )
 if ( ! pCurrPart )
 pDropPor->SetPart( pPart );
 else
-pCurrPart->SetFollow( pPart );
+pCurrPart->SetFollow( std::unique_ptr(pPart) );
 
 pCurrPart = pPart;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/svx svx/source sw/inc sw/source

[Noel Grandin]

 include/svx/cube3d.hxx   |2 +-
 include/svx/extrud3d.hxx |2 +-
 include/svx/lathe3d.hxx  |2 +-
 include/svx/polygn3d.hxx |2 +-
 include/svx/scene3d.hxx  |2 +-
 include/svx/sphere3d.hxx |2 +-
 include/svx/svdoashp.hxx |2 +-
 include/svx/svdobj.hxx   |2 +-
 include/svx/svdocapt.hxx |2 +-
 include/svx/svdocirc.hxx |2 +-
 include/svx/svdoedge.hxx |2 +-
 include/svx/svdograf.hxx |2 +-
 include/svx/svdogrp.hxx  |2 +-
 include/svx/svdomeas.hxx |2 +-
 include/svx/svdomedia.hxx|2 +-
 include/svx/svdoole2.hxx |2 +-
 include/svx/svdopage.hxx |2 +-
 include/svx/svdopath.hxx |2 +-
 include/svx/svdorect.hxx |2 +-
 include/svx/svdotable.hxx|2 +-
 include/svx/svdotext.hxx |2 +-
 include/svx/svdouno.hxx  |2 +-
 include/svx/svdovirt.hxx |2 +-
 svx/source/engine3d/cube3d.cxx   |5 +++--
 svx/source/engine3d/extrud3d.cxx |5 +++--
 svx/source/engine3d/lathe3d.cxx  |5 +++--
 svx/source/engine3d/polygn3d.cxx |5 +++--
 svx/source/engine3d/scene3d.cxx  |5 +++--
 svx/source/engine3d/sphere3d.cxx |5 +++--
 svx/source/svdraw/svdoashp.cxx   |5 +++--
 svx/source/svdraw/svdobj.cxx |9 +
 svx/source/svdraw/svdocapt.cxx   |5 +++--
 svx/source/svdraw/svdocirc.cxx   |5 +++--
 svx/source/svdraw/svdoedge.cxx   |5 +++--
 svx/source/svdraw/svdograf.cxx   |5 +++--
 svx/source/svdraw/svdogrp.cxx|5 +++--
 svx/source/svdraw/svdomeas.cxx   |5 +++--
 svx/source/svdraw/svdomedia.cxx  |5 +++--
 svx/source/svdraw/svdoole2.cxx   |4 ++--
 svx/source/svdraw/svdopage.cxx   |5 +++--
 svx/source/svdraw/svdopath.cxx   |5 +++--
 svx/source/svdraw/svdorect.cxx   |5 +++--
 svx/source/svdraw/svdotext.cxx   |5 +++--
 svx/source/svdraw/svdouno.cxx|5 +++--
 svx/source/svdraw/svdovirt.cxx   |5 +++--
 svx/source/table/svdotable.cxx   |4 ++--
 sw/inc/dcontact.hxx  |2 +-
 sw/source/core/draw/dcontact.cxx |5 +++--
 sw/source/core/draw/dflyobj.cxx  |9 +
 sw/source/core/inc/dflyobj.hxx   |4 ++--
 50 files changed, 103 insertions(+), 80 deletions(-)

New commits:
commit dbdf5ef32e2fc041183b762d9a1561430c96470b
Author: Noel Grandin 
Date:   Sun Jul 1 22:04:20 2018 +0200

use std::unique_ptr for CreateObjectSpecificViewContact

Change-Id: I0fed54d345a43fe0bc21ebbe424e6fdc7eac9523
Reviewed-on: https://gerrit.libreoffice.org/56823
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/include/svx/cube3d.hxx b/include/svx/cube3d.hxx
index 570805f8a908..b67d6995a5de 100644
--- a/include/svx/cube3d.hxx
+++ b/include/svx/cube3d.hxx
@@ -55,7 +55,7 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC E3dCubeObj final : public 
E3dCompoundObject
 boolbPosIsCenter : 1;
 
 void SetDefaultAttributes(const E3dDefaultAttributes& rDefault);
-virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() 
override;
+virtual std::unique_ptr 
CreateObjectSpecificViewContact() override;
 
 private:
 // protected destructor - due to final, make private
diff --git a/include/svx/extrud3d.hxx b/include/svx/extrud3d.hxx
index 656a1114a3ee..4bdb696decdf 100644
--- a/include/svx/extrud3d.hxx
+++ b/include/svx/extrud3d.hxx
@@ -38,7 +38,7 @@ private:
 // geometry, which determines the object
 basegfx::B2DPolyPolygon maExtrudePolygon;
 
-virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() 
override;
+virtual std::unique_ptr 
CreateObjectSpecificViewContact() override;
 virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties() 
override;
 void SetDefaultAttributes(const E3dDefaultAttributes& rDefault);
 
diff --git a/include/svx/lathe3d.hxx b/include/svx/lathe3d.hxx
index 073bf5787e3c..8875621dc4ea 100644
--- a/include/svx/lathe3d.hxx
+++ b/include/svx/lathe3d.hxx
@@ -37,7 +37,7 @@ class SVX_DLLPUBLIC E3dLatheObj final : public 
E3dCompoundObject
 {
 basegfx::B2DPolyPolygon maPolyPoly2D;
 
-virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() 
override;
+virtual std::unique_ptr 
CreateObjectSpecificViewContact() override;
 virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties() 
override;
 void SetDefaultAttributes(const E3dDefaultAttributes& rDefault);
 
diff --git a/include/svx/polygn3d.hxx b/include/svx/polygn3d.hxx
index da2225c74360..9d5940adf9e4 100644
--- a/include/svx/polygn3d.hxx
+++ b/include/svx/polygn3d.hxx
@@ -36,7 +36,7 @@ private:
 SVX_DLLPRIVATE void CreateDefaultTexture();
 
 protected:
-virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() 
override;
+virtual std::unique_ptr 
CreateObjectSpecificViewContact() override;
 
 // protected destructor
   

[Libreoffice-commits] core.git: sw/qa

[Andrea Gelmini]

 sw/qa/extras/rtfimport/rtfimport.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 71654c950e7d56453cf314cfd179cd8afb9ce879
Author: Andrea Gelmini 
Date:   Mon Jul 2 23:35:30 2018 +0200

Fix typo

Change-Id: I8f2692a7f917b53c28783599b589fd0a39e3b880
Reviewed-on: https://gerrit.libreoffice.org/56835
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index c7d2a2ca2af3..ab7df4cdcf31 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -1252,7 +1252,7 @@ DECLARE_RTFIMPORT_TEST(testTdf90097, "tdf90097.rtf")
 // thus I will correct the values here.
 // Indeed need to use the Linux values, I have no idea why these differ
 // from Mac/Win ones, but the disable above hints to that (maybe a problem
-// of it's own). Factor between Twips and 100thmm is ca. 1.76 -> stable 
change
+// of its own). Factor between Twips and 100thmm is ca. 1.76 -> stable 
change
 
 // Vertical flip for the line shape was ignored, so Y coordinates were 
swapped.
 CPPUNIT_ASSERT_EQUAL(static_cast(4972), rPolygon[0].X); // was: 
2819, win is 10927
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits