[Libreoffice-commits] core.git: sw/inc sw/qa sw/source
sw/inc/SwSmartTagMgr.hxx|3 + sw/inc/unodraw.hxx |3 - sw/inc/unotbl.hxx |2 - sw/inc/unotxdoc.hxx |6 +-- sw/qa/extras/tiledrendering/tiledrendering.cxx | 12 +++ sw/source/core/access/acccontext.cxx|5 +-- sw/source/core/access/acchyperlink.cxx |2 - sw/source/core/access/accmap.cxx|2 - sw/source/core/access/accnotexthyperlink.cxx|2 - sw/source/core/access/accpara.cxx | 11 ++ sw/source/core/access/accpara.hxx |2 - sw/source/core/access/acctable.cxx |5 +-- sw/source/core/access/acctextframe.cxx |2 - sw/source/core/bastyp/SwSmartTagMgr.cxx |2 - sw/source/core/doc/notxtfrm.cxx | 14 +++- sw/source/core/layout/paintfrm.cxx | 24 -- sw/source/core/swg/SwXMLTextBlocks1.cxx |5 +-- sw/source/core/txtnode/fmtatr2.cxx |5 +-- sw/source/core/unocore/unobkm.cxx |4 +- sw/source/core/unocore/unochart.cxx |9 + sw/source/core/unocore/unocoll.cxx |7 +--- sw/source/core/unocore/unodraw.cxx | 29 +++-- sw/source/core/unocore/unoframe.cxx |7 +--- sw/source/core/unocore/unoftn.cxx |6 +-- sw/source/core/unocore/unoobj.cxx |8 ++-- sw/source/core/unocore/unoportenum.cxx | 39 +++- sw/source/core/unocore/unoredline.cxx | 10 ++ sw/source/core/unocore/unorefmk.cxx |4 +- sw/source/core/unocore/unosect.cxx |2 - sw/source/core/unocore/unotbl.cxx | 21 ++-- sw/source/core/unocore/unotext.cxx |7 +--- sw/source/filter/ww8/ww8par.cxx |5 +-- sw/source/filter/ww8/ww8par5.cxx|4 +- sw/source/filter/xml/XMLRedlineImportHelper.cxx |4 +- sw/source/ui/dbui/dbinsdlg.cxx |5 +-- sw/source/ui/dbui/mmaddressblockpage.cxx|7 +--- sw/source/ui/dbui/mmoutputtypepage.cxx |5 +-- sw/source/ui/vba/vbadocuments.cxx |3 + sw/source/uibase/dbui/dbmgr.cxx |9 ++--- sw/source/uibase/dochdl/swdtflvr.cxx|2 - sw/source/uibase/docvw/AnnotationWin2.cxx |9 + sw/source/uibase/docvw/DashedLine.cxx |8 +--- sw/source/uibase/docvw/SidebarWinAcc.cxx|5 +-- sw/source/uibase/table/chartins.cxx |5 +-- sw/source/uibase/uno/unotxdoc.cxx | 35 +++-- sw/source/uibase/uno/unotxvw.cxx|8 ++-- 46 files changed, 153 insertions(+), 221 deletions(-) New commits: commit 7d7d4cf217e82db8839dbc49dcab1ab72c203b4e Author: Noel AuthorDate: Fri Feb 19 14:33:17 2021 +0200 Commit: Noel Grandin CommitDate: Sat Feb 20 10:21:07 2021 +0100 loplugin:refcounting in sw Change-Id: I56f2f5aa4d9105e93f28701b8352d1fb97829ead Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111215 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/sw/inc/SwSmartTagMgr.hxx b/sw/inc/SwSmartTagMgr.hxx index e6d60c530f84..f1c254f93e45 100644 --- a/sw/inc/SwSmartTagMgr.hxx +++ b/sw/inc/SwSmartTagMgr.hxx @@ -21,12 +21,13 @@ #define INCLUDED_SW_INC_SWSMARTTAGMGR_HXX #include +#include // Wrapper for the svx SmartTagMgr class SwSmartTagMgr final : public SmartTagMgr { private: -static SwSmartTagMgr* spTheSwSmartTagMgr; +static rtl::Reference spTheSwSmartTagMgr; SwSmartTagMgr(const OUString& rModuleName); virtual ~SwSmartTagMgr() override; diff --git a/sw/inc/unodraw.hxx b/sw/inc/unodraw.hxx index 22ddffda5881..e9e69318cdea 100644 --- a/sw/inc/unodraw.hxx +++ b/sw/inc/unodraw.hxx @@ -80,8 +80,7 @@ SwXDrawPageBaseClass; class SwXDrawPage final : public SwXDrawPageBaseClass { SwDoc* m_pDoc; -css::uno::Reference< css::uno::XAggregation > m_xPageAgg; -SwFmDrawPage* m_pDrawPage; +rtl::Reference m_pDrawPage; public: SwXDrawPage(SwDoc* pDoc); virtual ~SwXDrawPage() override; diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx index 7ec4121a9ad8..e7d9a224e259 100644 --- a/sw/inc/unotbl.hxx +++ b/sw/inc/unotbl.hxx @@ -141,7 +141,7 @@ public: virtual sal_Bool SAL_CALL hasElements( ) override; SwTableBox* GetTableBox() const { return m_pBox; } -static SwXCell* CreateXCell(SwFrameFormat* pTableFormat, SwTableBox* pBox, SwTable *pTable = nullptr ); +static rtl::Reference CreateXCell(SwFrameFormat* pTableFormat, SwTableBox* pBox, SwTable *pTable = nullptr ); SwTableBox* FindBox(SwTable* pTable, SwTableBox* pBox); SwFrameFormat* GetFrameFormat() const { return m_pTableFormat; } double GetForcedNumericalValue() const; d
[Libreoffice-commits] core.git: sw/uiconfig
sw/uiconfig/swriter/ui/readonlymenu.ui |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) New commits: commit 4959e43e1618b281c03ec58948fb61801add30b3 Author: Caolán McNamara AuthorDate: Fri Feb 19 20:17:49 2021 + Commit: Caolán McNamara CommitDate: Sat Feb 20 11:27:19 2021 +0100 missing labels for two menu entries in writer readonly context menu since... commit 45d57a0dba8bb5a92150cc07bdff0b37b3041007 Date: Tue Apr 18 13:13:27 2017 +0100 convert readonly menu to .ui Change-Id: Iaa65fc38be666067a3922e716902c8112da8ddde Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111245 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/sw/uiconfig/swriter/ui/readonlymenu.ui b/sw/uiconfig/swriter/ui/readonlymenu.ui index ff77542e297e..8a212193ae28 100644 --- a/sw/uiconfig/swriter/ui/readonlymenu.ui +++ b/sw/uiconfig/swriter/ui/readonlymenu.ui @@ -153,12 +153,16 @@ True False - +As Link +True + True False +Copy +True ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source svtools/source svtools/uiconfig svtools/UIConfig_svt.mk svx/uiconfig svx/UIConfig_svx.mk vcl/source vcl/uiconfig vcl/UIConfig_vcl.mk
sc/source/ui/cctrl/checklistmenu.cxx |2 +- svtools/UIConfig_svt.mk |1 + svtools/source/control/toolbarmenu.cxx |4 ++-- svtools/uiconfig/ui/interimparent.ui |2 +- svx/UIConfig_svx.mk |3 --- vcl/UIConfig_vcl.mk |2 ++ vcl/source/control/calendar.cxx |2 +- vcl/uiconfig/ui/interimdockparent.ui |2 +- vcl/uiconfig/ui/interimtearableparent.ui |2 +- 9 files changed, 10 insertions(+), 10 deletions(-) New commits: commit 1e0ade8b56c644868a72156186ab5c83e2abfb69 Author: Caolán McNamara AuthorDate: Fri Feb 19 20:24:30 2021 + Commit: Caolán McNamara CommitDate: Sat Feb 20 11:27:55 2021 +0100 move docking adapters to vcl Change-Id: I9be6f65734c24196758dea6853219a168c53a7fd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111250 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index 6608912d3f2a..9dd2e5a8c0c9 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -568,7 +568,7 @@ ScCheckListMenuControl::~ScCheckListMenuControl() ScCheckListMenuWindow::ScCheckListMenuWindow(vcl::Window* pParent, ScDocument* pDoc, bool bCanHaveSubMenu, bool bTreeMode, int nWidth, ScCheckListMenuWindow* pParentMenu, vcl::ILibreOfficeKitNotifier* pNotifier) -: DockingWindow(pParent, "InterimDockParent", "svx/ui/interimdockparent.ui") +: DockingWindow(pParent, "InterimDockParent", "vcl/ui/interimdockparent.ui") , mxParentMenu(pParentMenu) , mxBox(m_pUIBuilder->get("box")) { diff --git a/svtools/UIConfig_svt.mk b/svtools/UIConfig_svt.mk index 5df446e6970e..7aab72726644 100644 --- a/svtools/UIConfig_svt.mk +++ b/svtools/UIConfig_svt.mk @@ -21,6 +21,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svt,\ svtools/uiconfig/ui/fixedimagecontrol \ svtools/uiconfig/ui/fixedtextcontrol \ svtools/uiconfig/ui/graphicexport \ + svtools/uiconfig/ui/interimparent \ svtools/uiconfig/ui/inputbox \ svtools/uiconfig/ui/javadisableddialog \ svtools/uiconfig/ui/listcontrol \ diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx index 98f74b605e25..802321bb12c6 100644 --- a/svtools/source/control/toolbarmenu.cxx +++ b/svtools/source/control/toolbarmenu.cxx @@ -174,11 +174,11 @@ InterimToolbarPopup::InterimToolbarPopup(const css::uno::Reference xPopup, bool bTearable) : DockingWindow(pParent, !bTearable ? OString("InterimDockParent") : OString("InterimTearableParent"), -!bTearable ? OUString("svx/ui/interimdockparent.ui") : OUString("svx/ui/interimtearableparent.ui"), +!bTearable ? OUString("vcl/ui/interimdockparent.ui") : OUString("vcl/ui/interimtearableparent.ui"), rFrame) , m_xBox(m_pUIBuilder->get("box")) , m_xFrame(rFrame) -, m_xBuilder(Application::CreateInterimBuilder(m_xBox.get(), "svx/ui/interimparent.ui", false)) +, m_xBuilder(Application::CreateInterimBuilder(m_xBox.get(), "svt/ui/interimparent.ui", false)) , m_xContainer(m_xBuilder->weld_container("container")) , m_xPopup(std::move(xPopup)) { diff --git a/svx/uiconfig/ui/interimparent.ui b/svtools/uiconfig/ui/interimparent.ui similarity index 94% rename from svx/uiconfig/ui/interimparent.ui rename to svtools/uiconfig/ui/interimparent.ui index 20ae8f229e27..7502685e3ed4 100644 --- a/svx/uiconfig/ui/interimparent.ui +++ b/svtools/uiconfig/ui/interimparent.ui @@ -1,6 +1,6 @@ - + True diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk index b8e18d763c1f..667ef8ad8f33 100644 --- a/svx/UIConfig_svx.mk +++ b/svx/UIConfig_svx.mk @@ -84,9 +84,6 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\ svx/uiconfig/ui/imapdialog \ svx/uiconfig/ui/imapmenu \ svx/uiconfig/ui/inspectortextpanel \ - svx/uiconfig/ui/interimdockparent \ - svx/uiconfig/ui/interimparent \ - svx/uiconfig/ui/interimtearableparent \ svx/uiconfig/ui/labelbox \ svx/uiconfig/ui/lightingwindow \ svx/uiconfig/ui/linkwarndialog \ diff --git a/vcl/UIConfig_vcl.mk b/vcl/UIConfig_vcl.mk index faaa0f25c673..8047f56e7dba 100644 --- a/vcl/UIConfig_vcl.mk +++ b/vcl/UIConfig_vcl.mk @@ -16,6 +16,8 @@ $(eval $(call gb_UIConfig_add_uifiles,vcl,\ vcl/uiconfig/ui/editmenu \ vcl/uiconfig/ui/errornocontentdialog \ vcl/uiconfig/ui/errornoprinterdialog \ + vcl/uiconfig/ui/interimdockparent \ + vcl/uiconfig/ui/interimtearableparent \ vcl/uiconfig/ui/menutogglebutton \ vcl/uiconfig/ui/printdialog \ vcl/uiconfig/ui/printerdevicepage \ diff --git a/vcl/source/control/calendar.cxx b/vcl/source/control/calendar.cxx
[Libreoffice-commits] core.git: include/svtools include/vcl sc/source svtools/source vcl/source
include/svtools/toolbarmenu.hxx|3 +-- include/vcl/dockwin.hxx| 11 +++ sc/source/ui/cctrl/checklistmenu.cxx | 13 + sc/source/ui/inc/checklistmenu.hxx |3 +-- svtools/source/control/toolbarmenu.cxx | 12 +++- vcl/source/control/calendar.cxx| 13 + vcl/source/window/dockwin.cxx | 20 7 files changed, 46 insertions(+), 29 deletions(-) New commits: commit 41fe604a2e48c8c921a29bf4240abf8929582e2e Author: Caolán McNamara AuthorDate: Fri Feb 19 20:54:17 2021 + Commit: Caolán McNamara CommitDate: Sat Feb 20 11:28:21 2021 +0100 merge together interimdockparent usage and their uses of VclBuilder can be contained to vcl Change-Id: I0cbbd3175e4ec857187b7f1716232a3514fe9605 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111251 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/include/svtools/toolbarmenu.hxx b/include/svtools/toolbarmenu.hxx index a9b0a9f5415c..e68043b34ed5 100644 --- a/include/svtools/toolbarmenu.hxx +++ b/include/svtools/toolbarmenu.hxx @@ -82,10 +82,9 @@ public: void unsetPopover(); }; -class SVT_DLLPUBLIC InterimToolbarPopup final : public DockingWindow +class SVT_DLLPUBLIC InterimToolbarPopup final : public InterimDockingWindow { private: -VclPtr m_xBox; css::uno::Reference m_xFrame; std::unique_ptr m_xBuilder; std::unique_ptr m_xContainer; diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx index b52091f0c642..390c96267f0b 100644 --- a/include/vcl/dockwin.hxx +++ b/include/vcl/dockwin.hxx @@ -378,6 +378,17 @@ inline void DockingWindow::SetIdleDebugName( const char *pDebugName ) maLayoutIdle.SetDebugName( pDebugName ); } +class VCL_DLLPUBLIC InterimDockingWindow : public DockingWindow +{ +protected: +VclPtr m_xBox; +public: +InterimDockingWindow(vcl::Window* pParent, +const css::uno::Reference &rFrame = css::uno::Reference(), +bool bTearable = false); +virtual ~InterimDockingWindow() override; +virtual void dispose() override; +}; #endif // INCLUDED_VCL_DOCKWIN_HXX diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index 9dd2e5a8c0c9..b2da89bb7717 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -21,7 +21,6 @@ #include #include -#include #include #include #include @@ -568,14 +567,13 @@ ScCheckListMenuControl::~ScCheckListMenuControl() ScCheckListMenuWindow::ScCheckListMenuWindow(vcl::Window* pParent, ScDocument* pDoc, bool bCanHaveSubMenu, bool bTreeMode, int nWidth, ScCheckListMenuWindow* pParentMenu, vcl::ILibreOfficeKitNotifier* pNotifier) -: DockingWindow(pParent, "InterimDockParent", "vcl/ui/interimdockparent.ui") +: InterimDockingWindow(pParent) , mxParentMenu(pParentMenu) -, mxBox(m_pUIBuilder->get("box")) { if (pNotifier) SetLOKNotifier(pNotifier); setDeferredProperties(); -mxControl.reset(new ScCheckListMenuControl(this, mxBox.get(), pDoc, bCanHaveSubMenu, bTreeMode, nWidth)); +mxControl.reset(new ScCheckListMenuControl(this, m_xBox.get(), pDoc, bCanHaveSubMenu, bTreeMode, nWidth)); SetBackground(Application::GetSettings().GetStyleSettings().GetMenuColor()); set_id("check_list_menu"); } @@ -588,7 +586,7 @@ bool ScCheckListMenuWindow::EventNotify(NotifyEvent& rNEvt) rMenuControl.queueCloseSubMenu(); rMenuControl.clearSelectedMenuItem(); } -return DockingWindow::EventNotify(rNEvt); +return InterimDockingWindow::EventNotify(rNEvt); } ScCheckListMenuWindow::~ScCheckListMenuWindow() @@ -599,14 +597,13 @@ ScCheckListMenuWindow::~ScCheckListMenuWindow() void ScCheckListMenuWindow::dispose() { mxControl.reset(); -mxBox.disposeAndClear(); mxParentMenu.clear(); -DockingWindow::dispose(); +InterimDockingWindow::dispose(); } void ScCheckListMenuWindow::GetFocus() { -DockingWindow::GetFocus(); +InterimDockingWindow::GetFocus(); if (!mxControl) return; mxControl->GrabFocus(); diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx index 602d6d86109d..a00e1447557c 100644 --- a/sc/source/ui/inc/checklistmenu.hxx +++ b/sc/source/ui/inc/checklistmenu.hxx @@ -297,7 +297,7 @@ private: * This class implements a popup window for field button, for quick access * of hide-item list, and possibly more stuff related to field options. */ -class ScCheckListMenuWindow : public DockingWindow +class ScCheckListMenuWindow : public InterimDockingWindow { public: explicit ScCheckListMenuWindow(vcl::Window* pParent, ScDocument* pDoc, @@ -315,7 +315,6 @@ public: private: VclPtr mxParentMenu; -VclPtr mxBox; std::unique_ptr> mxControl; }; diff --g
[Libreoffice-commits] core.git: sc/source sd/source sfx2/source svx/source sw/source
sc/source/ui/inc/inputwin.hxx |1 - sd/source/ui/annotations/annotationmanager.cxx |1 - sd/source/ui/sidebar/MasterPagesSelector.hxx |1 - sd/source/ui/slideshow/slideshowimpl.hxx |1 - sfx2/source/view/frame.cxx |1 - svx/source/stbctrls/zoomsliderctrl.cxx |1 - sw/source/uibase/inc/inputwin.hxx |1 - 7 files changed, 7 deletions(-) New commits: commit a87fa0206bbcbcf9aa13ee17f6f41d34e176775e Author: Caolán McNamara AuthorDate: Fri Feb 19 21:15:12 2021 + Commit: Caolán McNamara CommitDate: Sat Feb 20 11:28:45 2021 +0100 drop some unneeded includes Change-Id: I0fe18c3e535bee2213606b7189778c40403a97ad Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111255 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx index e5556b030501..eb1e138b24e2 100644 --- a/sc/source/ui/inc/inputwin.hxx +++ b/sc/source/ui/inc/inputwin.hxx @@ -29,7 +29,6 @@ #include #include #include -#include #include #include diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index ce004490037a..fdd296b92f8a 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -28,7 +28,6 @@ #include #include #include -#include #include #include diff --git a/sd/source/ui/sidebar/MasterPagesSelector.hxx b/sd/source/ui/sidebar/MasterPagesSelector.hxx index 28b7be099c5a..925fffa4f709 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.hxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.hxx @@ -26,7 +26,6 @@ #include "PreviewValueSet.hxx" #include #include -#include #include diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx index 193681259aa8..3561ccd5721c 100644 --- a/sd/source/ui/slideshow/slideshowimpl.hxx +++ b/sd/source/ui/slideshow/slideshowimpl.hxx @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx index 24224233b964..a99e9dead483 100644 --- a/sfx2/source/view/frame.cxx +++ b/sfx2/source/view/frame.cxx @@ -26,7 +26,6 @@ #include #include -#include #include #include #include diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx b/svx/source/stbctrls/zoomsliderctrl.cxx index 9860edcc54d7..3003eaace9bf 100644 --- a/svx/source/stbctrls/zoomsliderctrl.cxx +++ b/svx/source/stbctrls/zoomsliderctrl.cxx @@ -19,7 +19,6 @@ #include #include -#include #include #include #include diff --git a/sw/source/uibase/inc/inputwin.hxx b/sw/source/uibase/inc/inputwin.hxx index 7b74c148bb86..f4cd41508572 100644 --- a/sw/source/uibase/inc/inputwin.hxx +++ b/sw/source/uibase/inc/inputwin.hxx @@ -24,7 +24,6 @@ #include #include -#include #include #include ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source include/svx sd/source svx/source
dbaccess/source/ui/browser/sbagrid.cxx|2 - dbaccess/source/ui/inc/sbagrid.hxx|2 - include/svx/fmgridif.hxx |2 - include/svx/tbcontrl.hxx |3 - include/svx/unoapi.hxx|3 + include/svx/unopage.hxx |3 + sd/source/ui/unoidl/unomodel.cxx |8 ++--- svx/source/accessibility/AccessibleControlShape.cxx |5 +-- svx/source/accessibility/AccessibleFrameSelector.cxx | 10 ++ svx/source/accessibility/AccessibleShape.cxx |4 +- svx/source/accessibility/GraphCtlAccessibleContext.cxx|2 - svx/source/accessibility/charmapacc.cxx |4 +- svx/source/accessibility/svxpixelctlaccessiblecontext.cxx |7 +--- svx/source/accessibility/svxrectctaccessiblecontext.cxx | 12 +++ svx/source/dialog/charmap.cxx |2 - svx/source/dialog/docrecovery.cxx |6 +-- svx/source/dialog/weldeditview.cxx|7 +--- svx/source/fmcomp/fmgridif.cxx|6 +-- svx/source/form/fmobj.cxx |2 - svx/source/form/formcontroller.cxx| 18 +-- svx/source/gallery2/galtheme.cxx |2 - svx/source/inc/StylesPreviewWindow.hxx|3 - svx/source/sdr/overlay/overlaypolypolygon.cxx |7 +--- svx/source/sdr/primitive2d/sdrdecompositiontools.cxx | 13 +++- svx/source/svdraw/svdobj.cxx |3 + svx/source/svdraw/svdotextdecomposition.cxx | 19 ++-- svx/source/svdraw/svdotextpathdecomposition.cxx | 22 +- svx/source/table/accessibletableshape.cxx |6 +-- svx/source/tbxctrls/StylesPreviewWindow.cxx |7 +--- svx/source/tbxctrls/tbcontrl.cxx |9 + svx/source/unodraw/UnoGraphicExporter.cxx |3 - svx/source/unodraw/unomod.cxx |5 +-- svx/source/unodraw/unopage.cxx|6 +-- 33 files changed, 94 insertions(+), 119 deletions(-) New commits: commit d8ed3bda462b351d2b98ec57cfdb879e0eec0010 Author: Noel AuthorDate: Fri Feb 19 15:53:30 2021 +0200 Commit: Noel Grandin CommitDate: Sat Feb 20 11:38:55 2021 +0100 loplugin:refcounting in svx Change-Id: I79afd219a29ad176ce72020579d2b29a0b3ec09d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111220 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index 093f243ca738..f10ee9ccb0df 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -108,7 +108,7 @@ SbaXGridControl::~SbaXGridControl() { } -FmXGridPeer* SbaXGridControl::imp_CreatePeer(vcl::Window* pParent) +rtl::Reference SbaXGridControl::imp_CreatePeer(vcl::Window* pParent) { FmXGridPeer* pReturn = new SbaXGridPeer(m_xContext); diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx index 2bef1cfbbcd2..5bf7752311ba 100644 --- a/dbaccess/source/ui/inc/sbagrid.hxx +++ b/dbaccess/source/ui/inc/sbagrid.hxx @@ -83,7 +83,7 @@ namespace dbaui virtual void SAL_CALL createPeer(const css::uno::Reference< css::awt::XToolkit > & rToolkit, const css::uno::Reference< css::awt::XWindowPeer > & rParentPeer) override; protected: -virtual FmXGridPeer*imp_CreatePeer(vcl::Window* pParent) override; +virtual rtl::Reference imp_CreatePeer(vcl::Window* pParent) override; }; // SbaXGridPeer diff --git a/include/svx/fmgridif.hxx b/include/svx/fmgridif.hxx index 2703b6a016d7..8db610a77414 100644 --- a/include/svx/fmgridif.hxx +++ b/include/svx/fmgridif.hxx @@ -310,7 +310,7 @@ public: virtual void SAL_CALL setFocus() override; protected: -virtual FmXGridPeer*imp_CreatePeer(vcl::Window* pParent); +virtual rtl::Reference imp_CreatePeer(vcl::Window* pParent); // ImplCreatePeer would be better, but doesn't work because it's not exported }; diff --git a/include/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx index c020ccd52a8d..995bbb05a1cb 100644 --- a/include/svx/tbcontrl.hxx +++ b/include/svx/tbcontrl.hxx @@ -186,8 +186,7 @@ private: #define MAX_FAMILIES 5 SfxStyleSheetBasePool* pStyleSheetPool; -SfxStyleControllerItem_Impl* pBoundItems[MAX_FAMILIES]; -css::uno::Reference m_xBoundItems[MAX_FAMILIES]; +rtl::Reference m_xBoundItems[MAX_FAMILIES]; std::unique_ptr pFamilyState[MAX_FAMILIES]; sal_uInt16 nActFamily; // Id in the ToolBox = Position - 1 diff --git a/include/svx/unoapi.hxx b/include/svx/unoapi.h
Re: Local LO build on Raspberry pi 4b doesn't launch
I got this error during build [CXX] store/source/storcach.cxx /home/pi/lo/libreoffice/store/source/lockbyte.cxx:701:1: error: ‘store::{anonymous}::MemoryLockBytes::~MemoryLockBytes()’ defined but not used [-Werror=unused-function] 701 | MemoryLockBytes::~MemoryLockBytes() | ^~~ /home/pi/lo/libreoffice/store/source/lockbyte.cxx:697:1: error: ‘store::{anonymous}::MemoryLockBytes::MemoryLockBytes()’ defined but not used [-Werror=unused-function] 697 | MemoryLockBytes::MemoryLockBytes() | ^~~ /home/pi/lo/libreoffice/store/source/lockbyte.cxx:561:1: error: ‘store::{anonymous}::MappedLockBytes::~MappedLockBytes()’ defined but not used [-Werror=unused-function] 561 | MappedLockBytes::~MappedLockBytes() | ^~~ /home/pi/lo/libreoffice/store/source/lockbyte.cxx:556:1: error: ‘store::{anonymous}::MappedLockBytes::MappedLockBytes(const store::{anonymous}::FileMapping&)’ defined but not used [-Werror=unused-function] 556 | MappedLockBytes::MappedLockBytes (FileMapping const & rMapping) | ^~~ /home/pi/lo/libreoffice/store/source/lockbyte.cxx:329:1: error: ‘store::{anonymous}::FileLockBytes::~FileLockBytes()’ defined but not used [-Werror=unused-function] 329 | FileLockBytes::~FileLockBytes() | ^ /home/pi/lo/libreoffice/store/source/lockbyte.cxx:324:1: error: ‘store::{anonymous}::FileLockBytes::FileLockBytes(const store::{anonymous}::FileHandle&)’ defined but not used [-Werror=unused-function] 324 | FileLockBytes::FileLockBytes (FileHandle const & rFile) | ^ cc1plus: all warnings being treated as errors -- Sent from: http://document-foundation-mail-archive.969070.n3.nabble.com/Dev-f1639786.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sd/qa
sd/qa/unit/uiimpress.cxx | 34 ++ 1 file changed, 34 insertions(+) New commits: commit e61c0af4718af5dcb2efa94fba2f031dd0c92e1d Author: msrijita18 AuthorDate: Sun Feb 14 12:28:32 2021 +0530 Commit: Xisco Fauli CommitDate: Sat Feb 20 14:36:52 2021 +0100 Add unittest for tdf#123841 Unfilled rectangles make filled rectangles Change-Id: Ic429ab5aa21102a44c9a559438bf3659a9d9137c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110849 Tested-by: Xisco Fauli Reviewed-by: Xisco Fauli diff --git a/sd/qa/unit/uiimpress.cxx b/sd/qa/unit/uiimpress.cxx index db2d6f4c61a3..f284806edceb 100644 --- a/sd/qa/unit/uiimpress.cxx +++ b/sd/qa/unit/uiimpress.cxx @@ -619,6 +619,40 @@ CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testSpellOnlineParameter) CPPUNIT_ASSERT_EQUAL(!bSet, pImpressDocument->GetDoc()->GetOnlineSpell()); } +CPPUNIT_TEST_FIXTURE(SdUiImpressTest, testTdf123841) +{ +// To check if selecting unfilled rectangle produces unfilled rectangle +mxComponent = loadFromDesktop("private:factory/simpress", + "com.sun.star.presentation.PresentationDocument"); +auto pImpressDocument = dynamic_cast(mxComponent.get()); +CPPUNIT_ASSERT(pImpressDocument); + +uno::Sequence aArgs( +comphelper::InitPropertySequence({ { "KeyModifier", uno::makeAny(KEY_MOD1) } })); +dispatchCommand(mxComponent, ".uno:Rect_Unfilled", aArgs); +Scheduler::ProcessEventsToIdle(); + +uno::Reference xDrawPagesSupplier(mxComponent, uno::UNO_QUERY); +uno::Reference xDraws = xDrawPagesSupplier->getDrawPages(); + +int getShapes = xDraws->getCount(); +CPPUNIT_ASSERT_EQUAL(1, getShapes); + +uno::Reference xDrawPage(xDrawPagesSupplier->getDrawPages()->getByIndex(0), + uno::UNO_QUERY); + +for (int i = 0; i < 3; i++) +{ +uno::Reference XPropSet(xDrawPage->getByIndex(i), uno::UNO_QUERY); +drawing::FillStyle eFillStyle = drawing::FillStyle_NONE; +XPropSet->getPropertyValue("FillStyle") >>= eFillStyle; + +// Without the fix in place, this test would have failed with +// with drawing::FillStyle_NONE != drawing::FillStyle_SOLID +CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_NONE, eFillStyle); +} +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa
sw/qa/uitest/data/tdf122780.docx|binary sw/qa/uitest/writer_tests7/tdf122780.py | 29 + 2 files changed, 29 insertions(+) New commits: commit 85779dce8c2dd4fb8330d0c38b3599985d33b0ef Author: Xisco Fauli AuthorDate: Fri Feb 19 20:40:04 2021 +0100 Commit: Xisco Fauli CommitDate: Sat Feb 20 14:37:56 2021 +0100 tdf#122780: sw: Add UItest Change-Id: I9cd0c3e25842d69ee34f40ce206c022f86fc9545 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111242 Tested-by: Jenkins Reviewed-by: Xisco Fauli diff --git a/sw/qa/uitest/data/tdf122780.docx b/sw/qa/uitest/data/tdf122780.docx new file mode 100644 index ..eca63620d357 Binary files /dev/null and b/sw/qa/uitest/data/tdf122780.docx differ diff --git a/sw/qa/uitest/writer_tests7/tdf122780.py b/sw/qa/uitest/writer_tests7/tdf122780.py new file mode 100644 index ..0a18a4a85fae --- /dev/null +++ b/sw/qa/uitest/writer_tests7/tdf122780.py @@ -0,0 +1,29 @@ +# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-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/. +# + +from uitest.framework import UITestCase +from libreoffice.uno.propertyvalue import mkPropertyValues +from uitest.uihelper.common import get_state_as_dict, get_url_for_data_file + +class tdf122780(UITestCase): + + def test_tdf122780(self): +writer_doc = self.ui_test.load_file(get_url_for_data_file("tdf122780.docx")) + self.ui_test.execute_dialog_through_command(".uno:SetDocumentProperties") + +# Without the fix in place, this test would have hung here +xDialog = self.xUITest.getTopFocusWindow() +self.assertEqual("Normal_x005F", get_state_as_dict(xDialog.getChild('showtemplate'))['Text'][:12]) +self.assertEqual(32767, len(get_state_as_dict(xDialog.getChild('showtemplate'))['Text'])) +xOkBtn = xDialog.getChild("ok") +xOkBtn.executeAction("CLICK", tuple()) + +self.ui_test.close_doc() + +# 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: sw/qa
sw/qa/uitest/data/tdf49683.rtf | 81 - sw/qa/uitest/writer_tests4/tdf49683.py | 32 - 2 files changed, 113 deletions(-) New commits: commit aa644cd9f39670521ba0c93c152fc428e7bf01b4 Author: Xisco Fauli AuthorDate: Fri Feb 19 15:52:36 2021 +0100 Commit: Xisco Fauli CommitDate: Sat Feb 20 14:39:09 2021 +0100 uitest: sw: remove duplicated test Not sure why this test was added, but the fix for tdf#49683 already contains a unittest, see 831b712d3da08f0050d2ee92c384ad8e6a2e461c Change-Id: I6c52e075118ba0e438dfdff8b0ca3be94b0dd5bc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111227 Tested-by: Jenkins Reviewed-by: Xisco Fauli diff --git a/sw/qa/uitest/data/tdf49683.rtf b/sw/qa/uitest/data/tdf49683.rtf deleted file mode 100644 index 6dd4739e7460.. --- a/sw/qa/uitest/data/tdf49683.rtf +++ /dev/null @@ -1,81 +0,0 @@ -{\rtf1\ansi\deff4\adeflang1025 -{\fonttbl{\f0\froman\fprq2\fcharset0 Times New Roman;}{\f1\froman\fprq2\fcharset2 Symbol;}{\f2\fswiss\fprq2\fcharset0 Arial;}{\f3\froman\fprq2\fcharset128 Times New Roman;}{\f4\fswiss\fprq0\fcharset0 Arial;}{\f5\fswiss\fprq2\fcharset128 Arial Narrow;}{\f6\froman\fprq2\fcharset0 Garamond;}{\f7\fnil\fprq2\fcharset128 WenQuanYi Zen Hei;}{\f8\fswiss\fprq2\fcharset0 Lucida Sans Unicode;}{\f9\fnil\fprq2\fcharset0 MS Mincho;}{\f10\fnil\fprq2\fcharset128 Lohit Hindi;}{\f11\fnil\fprq0\fcharset128 Lohit Hindi;}} -{\colortbl;\red0\green0\blue0;\red128\green128\blue128;} -{\stylesheet{\s0\snext0\aspalpha\nowidctlpar{\*\hyphen2\hyphlead2\hyphtrail2\hyphmax0}\hich\af8\langfe255\dbch\af6\afs24\cf0\kerning1\lang1081\loch\f6\fs24\lang1043 Standaard;} -{\s15\sbasedon0\snext16\aspalpha\sb240\sa120\keepn\hich\af7\langfe255\dbch\af10\afs28\loch\f5\fs28\lang1043 Kop;} -{\s16\sbasedon0\snext16\aspalpha\sb0\sa120\hich\af8\langfe255\dbch\af6\afs24\loch\f6\fs24\lang1043 Tekstblok;} -{\s17\sbasedon16\snext17\aspalpha\sb0\sa120\hich\af8\langfe255\dbch\af4\afs24\loch\f4\fs24\lang1043 Lijst;} -{\s18\sbasedon0\snext18\aspalpha\sb120\sa120\noline\i\hich\af8\langfe255\dbch\af11\afs24\ai\loch\f6\fs24\lang1043 Bijschrift;} -{\s19\sbasedon0\snext19\aspalpha\hich\af8\langfe255\dbch\af4\afs24\loch\f4\fs24\lang1043 Index;} -{\s20\sbasedon0\snext16\aspalpha\sb240\sa120\keepn\hich\af9\langfe255\dbch\af2\afs28\loch\f2\fs28\lang1043 Heading;} -{\s21\sbasedon0\snext21\aspalpha\sb120\sa120\i\hich\af8\langfe255\dbch\af4\afs24\ai\loch\f4\fs24\lang1043 caption;} -{\s22\sbasedon0\snext16\aspalpha\sb240\sa120\keepn\hich\af9\langfe255\dbch\af2\afs28\loch\f2\fs28\lang1043 WW-Heading;} -{\s23\sbasedon0\snext23\aspalpha\sb120\sa120\i\hich\af8\langfe255\dbch\af4\afs24\ai\loch\f4\fs24\lang1043 WW-caption;} -{\s24\sbasedon0\snext24\tqc\tx4818\tqr\tx9637\aspalpha\hich\af8\langfe255\dbch\af6\afs24\loch\f6\fs24\lang1043 header;} -{\s25\sbasedon0\snext25\qr\aspalpha\hich\af8\langfe255\dbch\af6\afs22\loch\f6\fs22\lang1043 _GegegRiagg;} -{\s26\sbasedon0\snext26\tqc\tx4320\tqr\tx8640\aspalpha\hich\af8\langfe255\dbch\af6\afs24\loch\f6\fs24\lang1043 WW-header;} -{\s27\sbasedon0\snext27\aspalpha\hich\af8\langfe255\dbch\af6\afs18\loch\f6\fs18\lang1043 _GegegDoc;} -{\s28\sbasedon0\snext28\aspalpha\hich\af8\langfe255\dbch\af6\afs24\loch\f6\fs24\lang1043 Table Contents;} -{\s29\sbasedon0\snext29\aspalpha\hich\af8\langfe255\dbch\af6\afs24\loch\f6\fs24\lang1043 WW-Table Contents;} -{\s30\sbasedon27\snext30\aspalpha\hich\af8\langfe255\dbch\af6\afs22\loch\f6\fs22\lang1043 _GegegVast11;} -{\s31\sbasedon30\snext31\aspalpha\b\hich\af8\langfe255\dbch\af6\afs22\ab\loch\f6\fs22\lang1043 _GegegVast11Vet;} -{\s32\sbasedon29\snext32\qc\aspalpha\b\hich\af8\langfe255\dbch\af6\afs24\ab\loch\f6\fs24\lang1043 Table Heading;} -{\s33\sbasedon0\snext33\tqc\tx4320\tqr\tx8640\aspalpha\noline\hich\af8\langfe255\dbch\af6\afs24\loch\f6\fs24\lang1043 Koptekst;} -{\s34\sbasedon0\snext34\aspalpha\noline\hich\af8\langfe255\dbch\af6\afs24\loch\f6\fs24\lang1043 Inhoud tabel;} -{\s35\sbasedon34\snext35\qc\aspalpha\noline\b\hich\af8\langfe255\dbch\af6\afs24\ab\loch\f6\fs24\lang1043 Tabelkop;} -}{\info{\keywords bhavb}{\author Cor Nouws}{\creatim\yr2009\mo10\dy20\hr14\min33}{\revtim\yr2009\mo10\dy20\hr14\min47}{\printim\yr0\mo0\dy0\hr0\min0}{\comment LibreOffice 3.4.5}{\vern3400}}\deftab709\deftab709\deftab709\deftab709\deftab709\deftab709\deftab709\deftab709\deftab709\deftab709\deftab709\deftab709\deftab709\deftab709\deftab709\deftab709\deftab709\deftab709\deftab709\deftab709 - -{\*\pgdsctbl -{\pgdsc0\pgdscuse195\pgwsxn11906\pghsxn16838\marglsxn1417\margrsxn1417\margtsxn1247\headery709\margbsxn1134{\header\trowd\trql\trleft-1102\ltrrow\trpaddft3\trpaddt0\trpaddfl3\trpaddl0\trpaddfb3\trpaddb0\trpaddfr3\trpaddr0\cellx-270\cellx-89\cellx7970\pard\plain \s27\aspalpha\hich\af8\langfe255\dbch\af6\afs18\loch\f6\fs18\lang1043\intbl{\i0\b0\rtlch \ltrch\loch -Kenmerk:}\cell\pard\plain \s27\aspalpha\hich\af8\langfe255\dbch\af
[Libreoffice-commits] core.git: svgio/inc svgio/source
svgio/inc/svgcharacternode.hxx |3 ++- svgio/source/svgreader/svgcharacternode.cxx |4 ++-- svgio/source/svguno/xsvgparser.cxx | 11 +-- 3 files changed, 9 insertions(+), 9 deletions(-) New commits: commit f56ae6badbb1eeb53c443bedbe8e96fd36ed426c Author: Noel AuthorDate: Sat Feb 20 12:49:30 2021 +0200 Commit: Noel Grandin CommitDate: Sat Feb 20 17:48:01 2021 +0100 loplugin:refcounting in svgio Change-Id: Id7669026fbe4b6cc92e2b137cba0c6c3c33f7712 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111259 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/svgio/inc/svgcharacternode.hxx b/svgio/inc/svgcharacternode.hxx index 46d7ec995b18..2a3331808949 100644 --- a/svgio/inc/svgcharacternode.hxx +++ b/svgio/inc/svgcharacternode.hxx @@ -21,6 +21,7 @@ #define INCLUDED_SVGIO_INC_SVGCHARACTERNODE_HXX #include +#include #include @@ -133,7 +134,7 @@ namespace svgio::svgreader OUString maText; /// local helpers -drawinglayer::primitive2d::TextSimplePortionPrimitive2D* createSimpleTextPrimitive( + rtl::Reference createSimpleTextPrimitive( SvgTextPosition& rSvgTextPosition, const SvgStyleAttributes& rSvgStyleAttributes) const; void decomposeTextWithStyle( diff --git a/svgio/source/svgreader/svgcharacternode.cxx b/svgio/source/svgreader/svgcharacternode.cxx index dc24adc7ffc0..a0ab6d9b08a9 100644 --- a/svgio/source/svgreader/svgcharacternode.cxx +++ b/svgio/source/svgreader/svgcharacternode.cxx @@ -209,12 +209,12 @@ namespace svgio::svgreader } } -drawinglayer::primitive2d::TextSimplePortionPrimitive2D* SvgCharacterNode::createSimpleTextPrimitive( + rtl::Reference SvgCharacterNode::createSimpleTextPrimitive( SvgTextPosition& rSvgTextPosition, const SvgStyleAttributes& rSvgStyleAttributes) const { // prepare retval, index and length -drawinglayer::primitive2d::TextSimplePortionPrimitive2D* pRetval = nullptr; + rtl::Reference pRetval; sal_uInt32 nLength(getText().getLength()); if(nLength) diff --git a/svgio/source/svguno/xsvgparser.cxx b/svgio/source/svguno/xsvgparser.cxx index 511640e6f6d7..ddd9d20cd74c 100644 --- a/svgio/source/svguno/xsvgparser.cxx +++ b/svgio/source/svguno/xsvgparser.cxx @@ -30,6 +30,7 @@ #include #include #include +#include #include @@ -124,9 +125,8 @@ namespace svgio::svgreader if(xSVGStream.is()) { // local document handler -SvgDocHdl* pSvgDocHdl = new SvgDocHdl(aAbsolutePath); -uno::Reference xSvgDocHdl(pSvgDocHdl); -parseSvgXML(xSVGStream, xSvgDocHdl); +rtl::Reference pSvgDocHdl = new SvgDocHdl(aAbsolutePath); +parseSvgXML(xSVGStream, pSvgDocHdl); // decompose to primitives for(std::unique_ptr const & pCandidate : pSvgDocHdl->getSvgDocument().getSvgNodeVector()) @@ -154,9 +154,8 @@ namespace svgio::svgreader if (!xSvgStream.is()) return aAnyResult; -SvgDocHdl* pSvgDocHdl = new SvgDocHdl(aAbsolutePath); -uno::Reference xSvgDocHdl(pSvgDocHdl); -parseSvgXML(xSvgStream, xSvgDocHdl); +rtl::Reference pSvgDocHdl = new SvgDocHdl(aAbsolutePath); +parseSvgXML(xSvgStream, pSvgDocHdl); // decompose to primitives for (std::unique_ptr const & pCandidate : pSvgDocHdl->getSvgDocument().getSvgNodeVector()) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sot/source
sot/source/sdstor/ucbstorage.cxx | 10 -- 1 file changed, 4 insertions(+), 6 deletions(-) New commits: commit 85a74ebd929d6396daf591a01f7975fd7e4f Author: Noel AuthorDate: Sat Feb 20 12:49:59 2021 +0200 Commit: Noel Grandin CommitDate: Sat Feb 20 17:48:23 2021 +0100 loplugin:refcounting in sot Change-Id: I29d50f536779c28570c8920ad34d0770934af0c2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111261 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx index ee6576c6b87c..bb936124a2ff 100644 --- a/sot/source/sdstor/ucbstorage.cxx +++ b/sot/source/sdstor/ucbstorage.cxx @@ -1577,18 +1577,17 @@ void UCBStorage_Impl::Init() { if ( !pStream->GetError() ) { -::utl::OInputStreamWrapper* pHelper = new ::utl::OInputStreamWrapper( *pStream ); -css::uno::Reference < css::io::XInputStream > xInputStream( pHelper ); +rtl::Reference<::utl::OInputStreamWrapper> pHelper = new ::utl::OInputStreamWrapper( *pStream ); // create a manifest reader object that will read in the manifest from the stream Reference < css::packages::manifest::XManifestReader > xReader = css::packages::manifest::ManifestReader::create( ::comphelper::getProcessComponentContext() ) ; -Sequence < Sequence < PropertyValue > > aProps = xReader->readManifestSequence( xInputStream ); +Sequence < Sequence < PropertyValue > > aProps = xReader->readManifestSequence( pHelper ); // cleanup xReader = nullptr; -xInputStream = nullptr; +pHelper = nullptr; SetProps( aProps, OUString() ); } } @@ -2125,8 +2124,7 @@ sal_Int16 UCBStorage_Impl::Commit() // get the stream from the temp file and create an output stream wrapper SvStream* pStream = pTempFile->GetStream( StreamMode::STD_READWRITE ); -::utl::OOutputStreamWrapper* pHelper = new ::utl::OOutputStreamWrapper( *pStream ); -css::uno::Reference < css::io::XOutputStream > xOutputStream( pHelper ); +rtl::Reference<::utl::OOutputStreamWrapper> xOutputStream = new ::utl::OOutputStreamWrapper( *pStream ); // create a manifest writer object that will fill the stream Reference < css::packages::manifest::XManifestWriter > xWriter = ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: starmath/source
starmath/source/AccessibleSmElement.cxx | 10 -- starmath/source/AccessibleSmElementsControl.cxx |9 - starmath/source/accessibility.cxx | 14 +- 3 files changed, 13 insertions(+), 20 deletions(-) New commits: commit 7c992bd895574eb1faf473875f8e655e9b73cb79 Author: Noel AuthorDate: Sat Feb 20 12:49:48 2021 +0200 Commit: Noel Grandin CommitDate: Sat Feb 20 19:21:34 2021 +0100 loplugin:refcounting in starmath Change-Id: I165272a8f7bd514b60719db360a2a19236b6658a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111260 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/starmath/source/AccessibleSmElement.cxx b/starmath/source/AccessibleSmElement.cxx index 848af8af6b0d..30d19cc8afc3 100644 --- a/starmath/source/AccessibleSmElement.cxx +++ b/starmath/source/AccessibleSmElement.cxx @@ -168,17 +168,15 @@ uno::Reference AccessibleSmElement::getAccessibleRelatio { OContextEntryGuard aGuard(this); -utl::AccessibleRelationSetHelper* pRelationSetHelper = new utl::AccessibleRelationSetHelper; -uno::Reference xSet = pRelationSetHelper; -return xSet; +return new utl::AccessibleRelationSetHelper; } uno::Reference AccessibleSmElement::getAccessibleStateSet() { OExternalLockGuard aGuard(this); -utl::AccessibleStateSetHelper* pStateSetHelper = new utl::AccessibleStateSetHelper; -uno::Reference xStateSet = pStateSetHelper; +rtl::Reference pStateSetHelper += new utl::AccessibleStateSetHelper; if (m_pSmElementsControl && !rBHelper.bDisposed && !rBHelper.bInDispose) { @@ -199,7 +197,7 @@ uno::Reference AccessibleSmElement::getAccessibleStateSet() else pStateSetHelper->AddState(AccessibleStateType::DEFUNC); -return xStateSet; +return pStateSetHelper; } // XAccessibleComponent diff --git a/starmath/source/AccessibleSmElementsControl.cxx b/starmath/source/AccessibleSmElementsControl.cxx index 0b82f3f87e5a..922c8097fd6a 100644 --- a/starmath/source/AccessibleSmElementsControl.cxx +++ b/starmath/source/AccessibleSmElementsControl.cxx @@ -192,7 +192,8 @@ uno::Reference AccessibleSmElementsControl::getAccessibleChild(sal_ if (!xChild.is()) { sal_uInt16 nHighlightItemId = m_pControl->itemHighlighted(); -AccessibleSmElement* pChild = new AccessibleSmElement(m_pControl, nItemId, c); +rtl::Reference pChild += new AccessibleSmElement(m_pControl, nItemId, c); if (pChild->itemId() == nHighlightItemId) pChild->SetFocus(true); m_aAccessibleChildren[c] = pChild; @@ -342,9 +343,7 @@ uno::Reference AccessibleSmElementsControl::getAccessibl uno::Reference AccessibleSmElementsControl::getAccessibleStateSet() { SolarMutexGuard aGuard; -::utl::AccessibleStateSetHelper* pStateSet = new ::utl::AccessibleStateSetHelper; - -uno::Reference xStateSet(pStateSet); +rtl::Reference<::utl::AccessibleStateSetHelper> pStateSet = new ::utl::AccessibleStateSetHelper; if (!m_pControl) pStateSet->AddState(AccessibleStateType::DEFUNC); @@ -364,7 +363,7 @@ uno::Reference AccessibleSmElementsControl::getAccessibleSt pStateSet->AddState(AccessibleStateType::OPAQUE); } -return xStateSet; +return pStateSet; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx index efc6bc691043..851f122c5ad5 100644 --- a/starmath/source/accessibility.cxx +++ b/starmath/source/accessibility.cxx @@ -337,11 +337,9 @@ Reference< XAccessibleRelationSet > SAL_CALL SmGraphicAccessible::getAccessibleR Reference< XAccessibleStateSet > SAL_CALL SmGraphicAccessible::getAccessibleStateSet() { SolarMutexGuard aGuard; -::utl::AccessibleStateSetHelper *pStateSet = +rtl::Reference<::utl::AccessibleStateSetHelper> pStateSet = new ::utl::AccessibleStateSetHelper; -Reference xStateSet( pStateSet ); - if (!pWin) pStateSet->AddState( AccessibleStateType::DEFUNC ); else @@ -360,7 +358,7 @@ Reference< XAccessibleStateSet > SAL_CALL SmGraphicAccessible::getAccessibleStat pStateSet->AddState( AccessibleStateType::OPAQUE ); } -return xStateSet; +return pStateSet; } Locale SAL_CALL SmGraphicAccessible::getLocale() @@ -703,7 +701,7 @@ sal_Bool SAL_CALL SmGraphicAccessible::copyText( { OUString sText( getTextRange(nStartIndex, nEndIndex) ); -vcl::unohelper::TextDataObject* pDataObj = new vcl::unohelper::TextDataObject( sText ); +rtl::Reference pDataObj = new vcl::unohelper::TextDataObject( sText ); SolarMutexReleaser aReleaser; xClipboard->setContents( pDataObj, nullptr ); @@ -1717,11 +1715,9 @@ uno::Reference< XAccessibleRelationSet > SAL_CALL SmEditAccessible::getAccessibl uno::Reference< XAccessibleStateSet > SAL_CALL SmEditAccessible:
[Libreoffice-commits] core.git: include/sfx2 sfx2/source
include/sfx2/stbitem.hxx |3 ++- sfx2/source/appl/appdispatchprovider.cxx |2 +- sfx2/source/appl/appopen.cxx |4 ++-- sfx2/source/appl/helpinterceptor.cxx |3 +-- sfx2/source/appl/workwin.cxx |5 ++--- sfx2/source/control/thumbnailviewacc.cxx |4 ++-- sfx2/source/dialog/infobar.cxx |9 ++--- sfx2/source/dialog/mailmodel.cxx |7 +++ sfx2/source/doc/docfile.cxx |8 +++- sfx2/source/doc/doctemplateslocal.cxx| 16 +++- sfx2/source/doc/objmisc.cxx |8 sfx2/source/doc/objstor.cxx | 10 -- sfx2/source/doc/sfxbasemodel.cxx | 12 +--- sfx2/source/view/sfxbasecontroller.cxx |4 ++-- sfx2/source/view/viewprn.cxx |2 +- 15 files changed, 41 insertions(+), 56 deletions(-) New commits: commit d49277fc7c017c5a62a0c28af782cfc04a6460ab Author: Noel AuthorDate: Sat Feb 20 12:50:48 2021 +0200 Commit: Noel Grandin CommitDate: Sat Feb 20 19:21:52 2021 +0100 loplugin:refcounting in sfx2 Change-Id: I22ca5dab32fb4bf9a1ab7d478105db2d12e14b14 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111262 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/include/sfx2/stbitem.hxx b/include/sfx2/stbitem.hxx index 8929e2efb2f3..060866e4c3eb 100644 --- a/include/sfx2/stbitem.hxx +++ b/include/sfx2/stbitem.hxx @@ -61,12 +61,13 @@ class SFX2_DLLPUBLIC SfxStatusBarControl: public svt::StatusbarController sal_uInt16 nId; VclPtr pBar; -protected: +public: // new controller API // XInterface virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; +protected: // XEventListener using svt::StatusbarController::disposing; diff --git a/sfx2/source/appl/appdispatchprovider.cxx b/sfx2/source/appl/appdispatchprovider.cxx index a62872a9a420..af86f8bcc02c 100644 --- a/sfx2/source/appl/appdispatchprovider.cxx +++ b/sfx2/source/appl/appdispatchprovider.cxx @@ -133,7 +133,7 @@ Reference < XDispatch > SAL_CALL SfxAppDispatchProvider::queryDispatch( if ( pSlot ) { -SfxOfficeDispatch* pDispatch = new SfxOfficeDispatch( pAppDisp, pSlot, aURL ) ; +rtl::Reference pDispatch = new SfxOfficeDispatch( pAppDisp, pSlot, aURL ) ; pDispatch->SetFrame(m_xFrame); pDispatch->SetMasterUnoCommand( bMasterCommand ); xDisp = pDispatch; diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index e59e58b08033..4a6c1f403bbb 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -676,8 +676,8 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) // intercept all incoming interactions and provide useful information // later if the following transaction was finished. -sfx2::PreventDuplicateInteraction* pHandler = new sfx2::PreventDuplicateInteraction(comphelper::getProcessComponentContext()); -uno::Reference xHandler(static_cast< css::task::XInteractionHandler* >(pHandler), css::uno::UNO_QUERY); +rtl::Reference pHandler = new sfx2::PreventDuplicateInteraction(comphelper::getProcessComponentContext()); +uno::Reference xHandler(pHandler); uno::Reference xWrappedHandler; // wrap existing handler or create new UUI handler diff --git a/sfx2/source/appl/helpinterceptor.cxx b/sfx2/source/appl/helpinterceptor.cxx index ccab2578e750..7fd631b05951 100644 --- a/sfx2/source/appl/helpinterceptor.cxx +++ b/sfx2/source/appl/helpinterceptor.cxx @@ -112,8 +112,7 @@ Reference< XDispatch > SAL_CALL HelpInterceptor_Impl::queryDispatch( if ( bHelpURL ) { DBG_ASSERT( xResult.is(), "invalid dispatch" ); -HelpDispatch_Impl* pHelpDispatch = new HelpDispatch_Impl( *this, xResult ); -xResult.set( static_cast< ::cppu::OWeakObject* >(pHelpDispatch), UNO_QUERY ); +xResult = new HelpDispatch_Impl( *this, xResult ); } return xResult; diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx index 217ae75436bf..d3af7dfa6950 100644 --- a/sfx2/source/appl/workwin.cxx +++ b/sfx2/source/appl/workwin.cxx @@ -485,9 +485,8 @@ SfxWorkWindow::SfxWorkWindow( vcl::Window *pWin, SfxFrame *pFrm, SfxFrame* pMast // create and initialize layout manager listener Reference< css::frame::XFrame > xFrame = GetFrameInterface(); -LayoutManagerListener* pLayoutManagerListener = new LayoutManagerListener( this ); -m_xLayoutManagerListener.set( static_cast< cppu::OWeakObject* >( pLayoutManagerListener ), - css::uno::UNO_QUERY ); +rtl::Reference pLayoutManagerListener = new LayoutManagerListener( this ); +m_xLayoutManagerListener = pLayoutManagerListener; pLayoutManagerListener->setFrame(
Re: Onenote alternative for libreoffice is needed
Hello Peter, Am 20.02.21 um 15:49 schrieb peter20...@tutanota.com: > LibreOffice is amazing already but an alternative to onenote is > needed. A way to store notes and been able to store the database > locally or on the cloud. maybe you could have a look on Joplin for this purpose: https://joplinapp.org/ Regards, Andreas ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Onenote alternative for libreoffice is needed
On 20.2.2021 16.49, peter20...@tutanota.com wrote: LibreOffice is amazing already but an alternative to onenote is needed. A way to store notes and been able to store the database locally or on the cloud. No, it is not needed. There are dozens of open source alternatives to OneNote. This thread and its comments list most of them, but some new ones have been created since: https://www.reddit.com/r/opensource/comments/gk1xl5/list_of_opensource_notetaking_softwares/ Ilmari ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Onenote alternative for libreoffice is needed
LibreOffice is amazing already but an alternative to onenote is needed. A way to store notes and been able to store the database locally or on the cloud. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: starmath/source
starmath/source/cfgitem.cxx |8 +++- starmath/source/parse.cxx |3 +-- 2 files changed, 8 insertions(+), 3 deletions(-) New commits: commit aac0412d549ec6a2763a2beee1fdb24b501c6982 Author: Caolán McNamara AuthorDate: Sat Feb 20 19:51:32 2021 + Commit: Caolán McNamara CommitDate: Sat Feb 20 21:52:59 2021 +0100 ofz#31177 avoid config layer for fuzzing Change-Id: Id476c3075ed20e97e93ea58813007941bd090027 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111263 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx index 34dbdebba656..8b9739ac14b9 100644 --- a/starmath/source/cfgitem.cxx +++ b/starmath/source/cfgitem.cxx @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -138,12 +139,13 @@ struct SmCfgOther SmCfgOther(); }; +constexpr sal_uInt16 nDefaultSmSyntaxVersion(5); SmCfgOther::SmCfgOther() : ePrintSize(PRINT_SIZE_NORMAL) , nPrintZoomFactor(100) // Defaulted as 5 so I have time to code the parser 6 -, nSmSyntaxVersion(5) +, nSmSyntaxVersion(nDefaultSmSyntaxVersion) , bPrintTitle(true) , bPrintFormulaText(true) , bPrintFrame(true) @@ -1117,6 +1119,8 @@ bool SmMathConfig::IsAutoCloseBrackets() const sal_uInt16 SmMathConfig::GetDefaultSmSyntaxVersion() const { +if (utl::ConfigManager::IsFuzzing()) +return nDefaultSmSyntaxVersion; if (!pOther) const_cast(this)->LoadOther(); return pOther->nSmSyntaxVersion; @@ -1166,6 +1170,8 @@ void SmMathConfig::SetDefaultSmSyntaxVersion( sal_uInt16 nVal ) bool SmMathConfig::IsIgnoreSpacesRight() const { +if (utl::ConfigManager::IsFuzzing()) +return false; if (!pOther) const_cast(this)->LoadOther(); return pOther->bIgnoreSpacesRight; diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx index 3a9ad138e409..1de0a0518eef 100644 --- a/starmath/source/parse.cxx +++ b/starmath/source/parse.cxx @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #include @@ -1570,7 +1569,7 @@ std::unique_ptr SmParser::DoBlank() // Ignore trailing spaces, if corresponding option is set if ( m_aCurToken.eType == TNEWLINE || - (m_aCurToken.eType == TEND && !utl::ConfigManager::IsFuzzing() && SM_MOD()->GetConfig()->IsIgnoreSpacesRight()) ) + (m_aCurToken.eType == TEND && SM_MOD()->GetConfig()->IsIgnoreSpacesRight()) ) { pBlankNode->Clear(); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/uiconfig
sfx2/uiconfig/ui/dockingwindow.ui |1 - 1 file changed, 1 deletion(-) New commits: commit 130a866a2e289d78a680a57c0cdf84e7dd17d285 Author: Caolán McNamara AuthorDate: Sat Feb 20 20:12:44 2021 + Commit: Caolán McNamara CommitDate: Sat Feb 20 22:15:57 2021 +0100 no need for this .ui to require LibreOffice lib Change-Id: Ifb202a34d745e08023c94a1646eca1d9e8b8cb2c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111264 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/sfx2/uiconfig/ui/dockingwindow.ui b/sfx2/uiconfig/ui/dockingwindow.ui index d28f3038573c..cafd817de877 100644 --- a/sfx2/uiconfig/ui/dockingwindow.ui +++ b/sfx2/uiconfig/ui/dockingwindow.ui @@ -2,7 +2,6 @@ - False True ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
dependency-confusion
Hi, I certainly did not understand everything in https://medium.com/@alex.birsan/dependency-confusion-4a5d60fec610, but I wonder if LibreOffice could be subject to this kind of vulnerability? Best regards JBF -- Seuls des formats ouverts peuvent assurer la pérennité de vos documents. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: icon-themes/elementary icon-themes/elementary_svg
icon-themes/elementary/links.txt | 146 +-- 1 file changed, 64 insertions(+), 82 deletions(-) New commits: commit e61db880c26fe65ff02e914465ba58e947baf47c Author: Rizal Muttaqin AuthorDate: Sun Feb 21 07:32:32 2021 +0700 Commit: Rizal Muttaqin CommitDate: Sun Feb 21 05:08:15 2021 +0100 elementary: tdf#133038 change some formatting icons for Catalan Change-Id: I3b51677f9451220c0c039c61467e903eabfc0395 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111266 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin diff --git a/icon-themes/elementary/cmd/32/ca/bold.png b/icon-themes/elementary/cmd/32/es/bold.png similarity index 100% rename from icon-themes/elementary/cmd/32/ca/bold.png rename to icon-themes/elementary/cmd/32/es/bold.png diff --git a/icon-themes/elementary/cmd/32/ca/underline.png b/icon-themes/elementary/cmd/32/es/underline.png similarity index 100% rename from icon-themes/elementary/cmd/32/ca/underline.png rename to icon-themes/elementary/cmd/32/es/underline.png diff --git a/icon-themes/elementary/cmd/32/ca/underlinedouble.png b/icon-themes/elementary/cmd/32/es/underlinedouble.png similarity index 100% rename from icon-themes/elementary/cmd/32/ca/underlinedouble.png rename to icon-themes/elementary/cmd/32/es/underlinedouble.png diff --git a/icon-themes/elementary/cmd/32/ca/italic.png b/icon-themes/elementary/cmd/32/it/italic.png similarity index 100% rename from icon-themes/elementary/cmd/32/ca/italic.png rename to icon-themes/elementary/cmd/32/it/italic.png diff --git a/icon-themes/elementary/cmd/ca/lc_bold.png b/icon-themes/elementary/cmd/es/lc_bold.png similarity index 100% rename from icon-themes/elementary/cmd/ca/lc_bold.png rename to icon-themes/elementary/cmd/es/lc_bold.png diff --git a/icon-themes/elementary/cmd/ca/lc_underline.png b/icon-themes/elementary/cmd/es/lc_underline.png similarity index 100% rename from icon-themes/elementary/cmd/ca/lc_underline.png rename to icon-themes/elementary/cmd/es/lc_underline.png diff --git a/icon-themes/elementary/cmd/ca/lc_underlinedouble.png b/icon-themes/elementary/cmd/es/lc_underlinedouble.png similarity index 100% rename from icon-themes/elementary/cmd/ca/lc_underlinedouble.png rename to icon-themes/elementary/cmd/es/lc_underlinedouble.png diff --git a/icon-themes/elementary/cmd/ca/sc_bold.png b/icon-themes/elementary/cmd/es/sc_bold.png similarity index 100% rename from icon-themes/elementary/cmd/ca/sc_bold.png rename to icon-themes/elementary/cmd/es/sc_bold.png diff --git a/icon-themes/elementary/cmd/ca/sc_underline.png b/icon-themes/elementary/cmd/es/sc_underline.png similarity index 100% rename from icon-themes/elementary/cmd/ca/sc_underline.png rename to icon-themes/elementary/cmd/es/sc_underline.png diff --git a/icon-themes/elementary/cmd/ca/sc_underlinedouble.png b/icon-themes/elementary/cmd/es/sc_underlinedouble.png similarity index 100% rename from icon-themes/elementary/cmd/ca/sc_underlinedouble.png rename to icon-themes/elementary/cmd/es/sc_underlinedouble.png diff --git a/icon-themes/elementary/cmd/ca/lc_italic.png b/icon-themes/elementary/cmd/it/lc_italic.png similarity index 100% rename from icon-themes/elementary/cmd/ca/lc_italic.png rename to icon-themes/elementary/cmd/it/lc_italic.png diff --git a/icon-themes/elementary/cmd/ca/sc_italic.png b/icon-themes/elementary/cmd/it/sc_italic.png similarity index 100% rename from icon-themes/elementary/cmd/ca/sc_italic.png rename to icon-themes/elementary/cmd/it/sc_italic.png diff --git a/icon-themes/elementary/links.txt b/icon-themes/elementary/links.txt index 5604fcce39c2..690f9c50e07d 100644 --- a/icon-themes/elementary/links.txt +++ b/icon-themes/elementary/links.txt @@ -380,22 +380,17 @@ cmd/32/bg/spelldialog.png cmd/32/bg/spelling.png cmd/32/bg/spellingandgrammardialog.png cmd/32/bg/spelling.png cmd/32/bg/tablesort.png cmd/32/bg/sortascending.png cmd/32/bg/textformfield.png cmd/32/bg/edit.png -cmd/32/bg/underline.png cmd/32/ca/underline.png +cmd/32/bg/underline.png cmd/32/hu/underline.png cmd/32/bg/underlinedouble.png cmd/32/hu/underlinedouble.png cmd/32/bg/underlinesimple.png cmd/32/hu/underline.png cmd/32/bg/underlinesingle.png cmd/32/hu/underline.png -cmd/32/ca/underlinesimple.png cmd/32/ca/underline.png -cmd/32/ca/underlinesingle.png cmd/32/ca/underline.png -cmd/32/es/bold.png cmd/32/ca/bold.png cmd/32/es/italic.png cmd/32/de/italic.png cmd/32/es/numberformatdecdecimals.png cmd/32/de/numberformatdecdecimals.png cmd/32/es/numberformatdecimal.png cmd/32/de/numberformatdecimal.png cmd/32/es/numberformatincdecimals.png cmd/32/de/numberformatincdecimals.png cmd/32/es/numberformatthousands.png cmd/32/de/numberformatthousands.png -cmd/32/es/underline.png cmd/32/ca/underline.png -cmd/32/es/underlinedouble.png cmd/32/ca/underlinedouble.png -cmd/32/es/underlinesimple.png cmd/32/ca/underline.png -cmd/32/es/underlinesingle.png cmd/32/ca/underline.png +cmd/32/es/underlinesimple.png cmd/32/es/underli
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - icon-themes/elementary icon-themes/elementary_svg
icon-themes/elementary/links.txt | 146 +-- 1 file changed, 64 insertions(+), 82 deletions(-) New commits: commit a1f5d08fbaed7d1f7acf14227a9d28d12bba8ef2 Author: Rizal Muttaqin AuthorDate: Sun Feb 21 07:32:32 2021 +0700 Commit: Rizal Muttaqin CommitDate: Sun Feb 21 05:08:43 2021 +0100 elementary: tdf#133038 change some formatting icons for Catalan Change-Id: I3b51677f9451220c0c039c61467e903eabfc0395 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin diff --git a/icon-themes/elementary/cmd/32/ca/bold.png b/icon-themes/elementary/cmd/32/es/bold.png similarity index 100% rename from icon-themes/elementary/cmd/32/ca/bold.png rename to icon-themes/elementary/cmd/32/es/bold.png diff --git a/icon-themes/elementary/cmd/32/ca/underline.png b/icon-themes/elementary/cmd/32/es/underline.png similarity index 100% rename from icon-themes/elementary/cmd/32/ca/underline.png rename to icon-themes/elementary/cmd/32/es/underline.png diff --git a/icon-themes/elementary/cmd/32/ca/underlinedouble.png b/icon-themes/elementary/cmd/32/es/underlinedouble.png similarity index 100% rename from icon-themes/elementary/cmd/32/ca/underlinedouble.png rename to icon-themes/elementary/cmd/32/es/underlinedouble.png diff --git a/icon-themes/elementary/cmd/32/ca/italic.png b/icon-themes/elementary/cmd/32/it/italic.png similarity index 100% rename from icon-themes/elementary/cmd/32/ca/italic.png rename to icon-themes/elementary/cmd/32/it/italic.png diff --git a/icon-themes/elementary/cmd/ca/lc_bold.png b/icon-themes/elementary/cmd/es/lc_bold.png similarity index 100% rename from icon-themes/elementary/cmd/ca/lc_bold.png rename to icon-themes/elementary/cmd/es/lc_bold.png diff --git a/icon-themes/elementary/cmd/ca/lc_underline.png b/icon-themes/elementary/cmd/es/lc_underline.png similarity index 100% rename from icon-themes/elementary/cmd/ca/lc_underline.png rename to icon-themes/elementary/cmd/es/lc_underline.png diff --git a/icon-themes/elementary/cmd/ca/lc_underlinedouble.png b/icon-themes/elementary/cmd/es/lc_underlinedouble.png similarity index 100% rename from icon-themes/elementary/cmd/ca/lc_underlinedouble.png rename to icon-themes/elementary/cmd/es/lc_underlinedouble.png diff --git a/icon-themes/elementary/cmd/ca/sc_bold.png b/icon-themes/elementary/cmd/es/sc_bold.png similarity index 100% rename from icon-themes/elementary/cmd/ca/sc_bold.png rename to icon-themes/elementary/cmd/es/sc_bold.png diff --git a/icon-themes/elementary/cmd/ca/sc_underline.png b/icon-themes/elementary/cmd/es/sc_underline.png similarity index 100% rename from icon-themes/elementary/cmd/ca/sc_underline.png rename to icon-themes/elementary/cmd/es/sc_underline.png diff --git a/icon-themes/elementary/cmd/ca/sc_underlinedouble.png b/icon-themes/elementary/cmd/es/sc_underlinedouble.png similarity index 100% rename from icon-themes/elementary/cmd/ca/sc_underlinedouble.png rename to icon-themes/elementary/cmd/es/sc_underlinedouble.png diff --git a/icon-themes/elementary/cmd/ca/lc_italic.png b/icon-themes/elementary/cmd/it/lc_italic.png similarity index 100% rename from icon-themes/elementary/cmd/ca/lc_italic.png rename to icon-themes/elementary/cmd/it/lc_italic.png diff --git a/icon-themes/elementary/cmd/ca/sc_italic.png b/icon-themes/elementary/cmd/it/sc_italic.png similarity index 100% rename from icon-themes/elementary/cmd/ca/sc_italic.png rename to icon-themes/elementary/cmd/it/sc_italic.png diff --git a/icon-themes/elementary/links.txt b/icon-themes/elementary/links.txt index 3add4ded606a..19ba62a57f58 100644 --- a/icon-themes/elementary/links.txt +++ b/icon-themes/elementary/links.txt @@ -380,22 +380,17 @@ cmd/32/bg/spelldialog.png cmd/32/bg/spelling.png cmd/32/bg/spellingandgrammardialog.png cmd/32/bg/spelling.png cmd/32/bg/tablesort.png cmd/32/bg/sortascending.png cmd/32/bg/textformfield.png cmd/32/bg/edit.png -cmd/32/bg/underline.png cmd/32/ca/underline.png +cmd/32/bg/underline.png cmd/32/hu/underline.png cmd/32/bg/underlinedouble.png cmd/32/hu/underlinedouble.png cmd/32/bg/underlinesimple.png cmd/32/hu/underline.png cmd/32/bg/underlinesingle.png cmd/32/hu/underline.png -cmd/32/ca/underlinesimple.png cmd/32/ca/underline.png -cmd/32/ca/underlinesingle.png cmd/32/ca/underline.png -cmd/32/es/bold.png cmd/32/ca/bold.png cmd/32/es/italic.png cmd/32/de/italic.png cmd/32/es/numberformatdecdecimals.png cmd/32/de/numberformatdecdecimals.png cmd/32/es/numberformatdecimal.png cmd/32/de/numberformatdecimal.png cmd/32/es/numberformatincdecimals.png cmd/32/de/numberformatincdecimals.png cmd/32/es/numberformatthousands.png cmd/32/de/numberformatthousands.png -cmd/32/es/underline.png cmd/32/ca/underline.png -cmd/32/es/underlinedouble.png cmd/32/ca/underlinedouble.png -cmd/32/es/underlinesimple.png cmd/32/ca/underline.png -cmd/32/es/underlinesingle.png cmd/32/ca/underline.png +cmd/32/es/underlinesimple.png cmd/32/es/underli