[Libreoffice-commits] core.git: editeng/source
editeng/source/misc/svxacorr.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a61d61f66f80c91c14825f8fe8fb9bd3f295591b Author: Xisco Fauli AuthorDate: Mon Jul 23 22:00:25 2018 +0200 Commit: Noel Grandin CommitDate: Tue Jul 24 08:53:09 2018 +0200 tdf#118517: Use xStg before resetting it Regression from 0f166ef5240ee155bf2544e6bc3c985b1e3bf646 Change-Id: I083951700895a00be8d4407871c27804ca3e5f30 Reviewed-on: https://gerrit.libreoffice.org/57881 Reviewed-by: Julien Nabet Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx index 556f60b9c426..b890b5cd0984 100644 --- a/editeng/source/misc/svxacorr.cxx +++ b/editeng/source/misc/svxacorr.cxx @@ -2568,9 +2568,9 @@ void SvxAutoCorrectLanguageLists::PutText( const OUString& rShort, try { uno::Reference < embed::XStorage > xStg = comphelper::OStorageHelper::GetStorageFromURL( sUserAutoCorrFile, embed::ElementModes::READWRITE ); +bool bRet = rAutoCorrect.PutText( xStg, sUserAutoCorrFile, rShort, rShell, sLong ); xStg = nullptr; -bool bRet = rAutoCorrect.PutText( xStg, sUserAutoCorrFile, rShort, rShell, sLong ); // Update the word list if( bRet ) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svtools/source toolkit/inc
svtools/source/inc/svtaccessiblefactory.hxx |2 +- toolkit/inc/helper/accessibilityclient.hxx |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit f5930a2235b8a51b30b4ecf1640bf9a56adffe6b Author: Jens Carl AuthorDate: Mon Jul 23 13:39:26 2018 -0700 Commit: Noel Grandin CommitDate: Tue Jul 24 08:53:32 2018 +0200 Fix semantic of sentence Follow up of ad7d72f0381f6a16db5c6c7bee538c475c233555. Change-Id: I188e96fd9d71dce5ebd83200b9d8212e5f13b948 Reviewed-on: https://gerrit.libreoffice.org/57894 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/svtools/source/inc/svtaccessiblefactory.hxx b/svtools/source/inc/svtaccessiblefactory.hxx index 4f07046323bb..7469d2d1656d 100644 --- a/svtools/source/inc/svtaccessiblefactory.hxx +++ b/svtools/source/inc/svtaccessiblefactory.hxx @@ -31,7 +31,7 @@ namespace svt instance, which is used for creating all kind of Accessibility related components. -When the AccessibleFactoryAccess goes away, this factory goes away, to, and the respective +When the AccessibleFactoryAccess goes away, also this factory goes away, and the respective library is unloaded. This class is not thread-safe. diff --git a/toolkit/inc/helper/accessibilityclient.hxx b/toolkit/inc/helper/accessibilityclient.hxx index 6af3e3edd117..f90414671d27 100644 --- a/toolkit/inc/helper/accessibilityclient.hxx +++ b/toolkit/inc/helper/accessibilityclient.hxx @@ -31,7 +31,7 @@ namespace toolkit instance, which is used for creating all kind of Accessibility related components. -When the AccessibilityClient goes away, this factory goes away, to, and the respective +When the AccessibilityClient goes away, also this factory goes away, and the respective library is unloaded. This class is not thread-safe. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/docvw/srcedtw.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 07c934e3f12718bb5a4befce04148969a2350065 Author: Takeshi Abe AuthorDate: Tue Jul 24 14:21:53 2018 +0900 Commit: Noel Grandin CommitDate: Tue Jul 24 08:40:14 2018 +0200 sw: Change TextPortions to std::vector as its usage does not require std::deque. Change-Id: I047e31972325a28f5ff92153e34893821e80fe57 Reviewed-on: https://gerrit.libreoffice.org/57898 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/sw/source/uibase/docvw/srcedtw.cxx b/sw/source/uibase/docvw/srcedtw.cxx index dd82b1b4124e..a625f02bd999 100644 --- a/sw/source/uibase/docvw/srcedtw.cxx +++ b/sw/source/uibase/docvw/srcedtw.cxx @@ -45,7 +45,7 @@ #include #include #include -#include +#include namespace { @@ -62,7 +62,7 @@ struct TextPortion #define MAX_SYNTAX_HIGHLIGHT 20 #define MAX_HIGHLIGHTTIME 200 -typedef std::deque TextPortions; +typedef std::vector TextPortions; static void lcl_Highlight(const OUString& rSource, TextPortions& aPortionList) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/docvw/AnchorOverlayObject.cxx | 18 +- sw/source/uibase/docvw/AnchorOverlayObject.hxx |2 +- sw/source/uibase/docvw/AnnotationWin.cxx |4 ++-- sw/source/uibase/docvw/ShadowOverlayObject.cxx | 16 sw/source/uibase/docvw/ShadowOverlayObject.hxx |4 ++-- 5 files changed, 14 insertions(+), 30 deletions(-) New commits: commit 98c21af70727bcaae4ec0754eb922f1b50b99604 Author: Noel Grandin AuthorDate: Mon Jul 23 15:57:28 2018 +0200 Commit: Noel Grandin CommitDate: Tue Jul 24 08:36:08 2018 +0200 use regular destructor for AnchorOverlayObject and ShadowOverlayObject no need for static methods Change-Id: I8de3bf41183ef592f9c08d8d227834fa64d772fa Reviewed-on: https://gerrit.libreoffice.org/57849 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/sw/source/uibase/docvw/AnchorOverlayObject.cxx b/sw/source/uibase/docvw/AnchorOverlayObject.cxx index 0afa6c36f0bd..e89a79daacd8 100644 --- a/sw/source/uibase/docvw/AnchorOverlayObject.cxx +++ b/sw/source/uibase/docvw/AnchorOverlayObject.cxx @@ -207,19 +207,6 @@ ImplPrimitive2DIDBlock(AnchorPrimitive, PRIMITIVE2D_ID_SWSIDEBARANCHORPRIMITIVE) return pAnchorOverlayObject; } -/*static*/ void AnchorOverlayObject::DestroyAnchorOverlayObject( AnchorOverlayObject* pAnchor ) -{ -if ( pAnchor ) -{ -if ( pAnchor->getOverlayManager() ) -{ -// remove this object from the chain -pAnchor->getOverlayManager()->remove(*pAnchor); -} -delete pAnchor; -} -} - AnchorOverlayObject::AnchorOverlayObject( const basegfx::B2DPoint& rBasePos, const basegfx::B2DPoint& rSecondPos, const basegfx::B2DPoint& rThirdPos, @@ -245,6 +232,11 @@ AnchorOverlayObject::AnchorOverlayObject( const basegfx::B2DPoint& rBasePos, AnchorOverlayObject::~AnchorOverlayObject() { +if ( getOverlayManager() ) +{ +// remove this object from the chain +getOverlayManager()->remove(*this); +} } void AnchorOverlayObject::implEnsureGeometry() diff --git a/sw/source/uibase/docvw/AnchorOverlayObject.hxx b/sw/source/uibase/docvw/AnchorOverlayObject.hxx index 2ae993fb036e..d249a220c7b7 100644 --- a/sw/source/uibase/docvw/AnchorOverlayObject.hxx +++ b/sw/source/uibase/docvw/AnchorOverlayObject.hxx @@ -46,7 +46,6 @@ class AnchorOverlayObject final : public sdr::overlay::OverlayObjectWithBasePosi const Point& aLineStart, const Point& aLineEnd, const Color& aColorAnchor ); -static void DestroyAnchorOverlayObject( AnchorOverlayObject* pAnchor ); const basegfx::B2DPoint& GetSecondPosition() const { return maSecondPosition; } const basegfx::B2DPoint& GetThirdPosition() const { return maThirdPosition; } @@ -113,6 +112,7 @@ class AnchorOverlayObject final : public sdr::overlay::OverlayObjectWithBasePosi const basegfx::B2DPoint& rSixthPos, const basegfx::B2DPoint& rSeventhPos, const Color& rBaseColor ); +public: virtual ~AnchorOverlayObject() override; }; diff --git a/sw/source/uibase/docvw/AnnotationWin.cxx b/sw/source/uibase/docvw/AnnotationWin.cxx index 07cba9d60d4b..e2fc68e8761d 100644 --- a/sw/source/uibase/docvw/AnnotationWin.cxx +++ b/sw/source/uibase/docvw/AnnotationWin.cxx @@ -166,10 +166,10 @@ void SwAnnotationWin::dispose() RemoveEventListener( LINK( this, SwAnnotationWin, WindowEventListener ) ); -sidebarwindows::AnchorOverlayObject::DestroyAnchorOverlayObject( mpAnchor ); +delete mpAnchor; mpAnchor = nullptr; -sidebarwindows::ShadowOverlayObject::DestroyShadowOverlayObject( mpShadow ); +delete mpShadow; mpShadow = nullptr; mpTextRangeOverlay.reset(); diff --git a/sw/source/uibase/docvw/ShadowOverlayObject.cxx b/sw/source/uibase/docvw/ShadowOverlayObject.cxx index b74dbae68a79..2f7385d235ec 100644 --- a/sw/source/uibase/docvw/ShadowOverlayObject.cxx +++ b/sw/source/uibase/docvw/ShadowOverlayObject.cxx @@ -180,18 +180,6 @@ ImplPrimitive2DIDBlock(ShadowPrimitive, PRIMITIVE2D_ID_SWSIDEBARSHADOWPRIMITIVE) return pShadowOverlayObject; } -/* static */ void ShadowOverlayObject::DestroyShadowOverlayObject( ShadowOverlayObject* pShadow ) -{ -if ( pShadow ) -{ -if ( pShadow->getOverlayManager() ) -{ -pShadow->getOverlayManager()->remove(*pShadow); -} -delete pShadow; -} -} - ShadowOverlayObject::ShadowOverlayObject( const basegfx::B2DPoint& rBasePos, const basegfx::B2DPoint& rSecondPosition, Color
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx |2 +- sw/source/uibase/inc/SwSpellDialogChildWindow.hxx|2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit d67d9c26476f32e4b1157f6dd6a2d2746cc9c6c8 Author: Noel Grandin AuthorDate: Mon Jul 23 15:28:01 2018 +0200 Commit: Noel Grandin CommitDate: Tue Jul 24 08:35:47 2018 +0200 loplugin:useuniqueptr in SwSpellDialogChildWindow Change-Id: Ib79e4672b7857aaacef15cd55c8633523df4d26b Reviewed-on: https://gerrit.libreoffice.org/57877 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx index 95fe970a04f4..b9a5ea30a518 100644 --- a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx +++ b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx @@ -160,7 +160,7 @@ SwSpellDialogChildWindow::~SwSpellDialogChildWindow () SwWrtShell* pWrtShell = GetWrtShell_Impl(); if(!m_pSpellState->m_bInitialCall && pWrtShell) pWrtShell->SpellEnd(); -delete m_pSpellState; +m_pSpellState.reset(); } SfxChildWinInfo SwSpellDialogChildWindow::GetInfo() const diff --git a/sw/source/uibase/inc/SwSpellDialogChildWindow.hxx b/sw/source/uibase/inc/SwSpellDialogChildWindow.hxx index a1006d8df80b..50f8fdfdeaf7 100644 --- a/sw/source/uibase/inc/SwSpellDialogChildWindow.hxx +++ b/sw/source/uibase/inc/SwSpellDialogChildWindow.hxx @@ -29,7 +29,7 @@ class SwSpellDialogChildWindow : public svx::SpellDialogChildWindow { boolm_bIsGrammarCheckingOn; -SpellState* m_pSpellState; +std::unique_ptr m_pSpellState; SwWrtShell* GetWrtShell_Impl(); boolMakeTextSelection_Impl(SwWrtShell& rSh, ShellMode eSelMode); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/AnnotationWin.hxx | 10 +- sw/source/uibase/docvw/AnnotationWin.cxx | 16 +++- sw/source/uibase/docvw/AnnotationWin2.cxx | 11 +-- sw/source/uibase/docvw/OverlayRanges.cxx |6 +++--- sw/source/uibase/docvw/OverlayRanges.hxx |2 +- 5 files changed, 17 insertions(+), 28 deletions(-) New commits: commit 3c8a7a1553710a2798058bed0768dd8cfabf9662 Author: Noel Grandin AuthorDate: Mon Jul 23 15:35:19 2018 +0200 Commit: Noel Grandin CommitDate: Tue Jul 24 08:35:26 2018 +0200 loplugin:useuniqueptr in SwAnnotationWin Change-Id: I0a4844898a85f0513da3e3fd7a977e35a9250f1e Reviewed-on: https://gerrit.libreoffice.org/57878 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/sw/inc/AnnotationWin.hxx b/sw/inc/AnnotationWin.hxx index 3b865ee71df5..54136b22faf5 100644 --- a/sw/inc/AnnotationWin.hxx +++ b/sw/inc/AnnotationWin.hxx @@ -104,13 +104,13 @@ class SwAnnotationWin : public vcl::Window SwEditWin& EditWin(); SwSidebarItem& GetSidebarItem() { return mrSidebarItem; } -OutlinerView* GetOutlinerView() { return mpOutlinerView;} +OutlinerView* GetOutlinerView() { return mpOutlinerView.get();} bool HasScrollbar() const; bool IsScrollbarVisible() const; ScrollBar* Scrollbar() { return mpVScrollbar; } ::sw::sidebarwindows::AnchorOverlayObject* Anchor() { return mpAnchor;} ::sw::sidebarwindows::ShadowOverlayObject* Shadow() { return mpShadow;} -::sw::overlay::OverlayRanges* TextRange() { return mpTextRangeOverlay;} +::sw::overlay::OverlayRanges* TextRange() { return mpTextRangeOverlay.get();} longGetPostItTextHeight(); @@ -212,8 +212,8 @@ class SwAnnotationWin : public vcl::Window ImplSVEvent * mnEventId; -OutlinerView* mpOutlinerView; -Outliner* mpOutliner; +std::unique_ptr mpOutlinerView; +std::unique_ptr mpOutliner; VclPtr mpSidebarTextControl; VclPtr mpVScrollbar; @@ -223,7 +223,7 @@ class SwAnnotationWin : public vcl::Window sw::sidebarwindows::AnchorOverlayObject* mpAnchor; sw::sidebarwindows::ShadowOverlayObject* mpShadow; -sw::overlay::OverlayRanges* mpTextRangeOverlay; +std::unique_ptr mpTextRangeOverlay; Color mColorAnchor; Color mColorDark; diff --git a/sw/source/uibase/docvw/AnnotationWin.cxx b/sw/source/uibase/docvw/AnnotationWin.cxx index ac97f4f9b11c..07cba9d60d4b 100644 --- a/sw/source/uibase/docvw/AnnotationWin.cxx +++ b/sw/source/uibase/docvw/AnnotationWin.cxx @@ -143,17 +143,8 @@ void SwAnnotationWin::dispose() } mpSidebarTextControl.disposeAndClear(); -if ( mpOutlinerView ) -{ -delete mpOutlinerView; -mpOutlinerView = nullptr; -} - -if (mpOutliner) -{ -delete mpOutliner; -mpOutliner = nullptr; -} +mpOutlinerView.reset(); +mpOutliner.reset(); if (mpMetadataAuthor) { @@ -181,8 +172,7 @@ void SwAnnotationWin::dispose() sidebarwindows::ShadowOverlayObject::DestroyShadowOverlayObject( mpShadow ); mpShadow = nullptr; -delete mpTextRangeOverlay; -mpTextRangeOverlay = nullptr; +mpTextRangeOverlay.reset(); mpMenuButton.disposeAndClear(); diff --git a/sw/source/uibase/docvw/AnnotationWin2.cxx b/sw/source/uibase/docvw/AnnotationWin2.cxx index 5e8b94fd77bf..f1c467db21f0 100644 --- a/sw/source/uibase/docvw/AnnotationWin2.cxx +++ b/sw/source/uibase/docvw/AnnotationWin2.cxx @@ -486,15 +486,15 @@ void SwAnnotationWin::InitControls() } SwDocShell* aShell = mrView.GetDocShell(); -mpOutliner = new Outliner(&aShell->GetPool(),OutlinerMode::TextObject); -aShell->GetDoc()->SetCalcFieldValueHdl( mpOutliner ); +mpOutliner.reset(new Outliner(&aShell->GetPool(),OutlinerMode::TextObject)); +aShell->GetDoc()->SetCalcFieldValueHdl( mpOutliner.get() ); mpOutliner->SetUpdateMode( true ); Rescale(); mpSidebarTextControl->EnableRTL( false ); -mpOutlinerView = new OutlinerView ( mpOutliner, mpSidebarTextControl ); +mpOutlinerView.reset(new OutlinerView ( mpOutliner.get(), mpSidebarTextControl )); mpOutlinerView->SetBackgroundColor(COL_TRANSPARENT); -mpOutliner->InsertView(mpOutlinerView ); +mpOutliner->InsertView(mpOutlinerView.get() ); mpOutlinerView->SetOutputArea( PixelToLogic( tools::Rectangle(0,0,1,1) ) ); mpOutlinerView->SetAttribs(DefaultItem()); @@ -837,8 +837,7 @@ void SwAnnotationWin::SetPosAndSize() } else { -delete mpTextRangeOverlay; -mpTextRangeOverlay = nullptr; +mpTextRangeOverlay.reset(); } } diff --git a/sw/source/uibase/docvw/OverlayRanges.cxx b/sw/source/uibase/docvw/OverlayRanges.cxx index 7c0585d8988b..9d7cace2bdca 100644 --- a/sw/source/uibase/docvw/OverlayRanges.cxx +++ b/sw/sou
[Libreoffice-commits] core.git: 2 commits - sc/inc sc/source sw/inc sw/source
sc/inc/document.hxx|6 +++--- sc/inc/validat.hxx |8 sc/source/core/data/documen2.cxx | 20 sc/source/core/data/documen4.cxx |8 sc/source/core/data/validat.cxx|6 +++--- sw/inc/modcfg.hxx |4 ++-- sw/source/uibase/config/modcfg.cxx | 12 ++-- 7 files changed, 26 insertions(+), 38 deletions(-) New commits: commit 257b099bc4d904ebd4fae0ccd668de5ce7570d18 Author: Noel Grandin AuthorDate: Mon Jul 23 15:20:38 2018 +0200 Commit: Noel Grandin CommitDate: Tue Jul 24 08:35:16 2018 +0200 loplugin:useuniqueptr in SwInsertConfig Change-Id: I5f39956e529b98f4114139b8c3ba1391e45440ef Reviewed-on: https://gerrit.libreoffice.org/57876 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/sw/inc/modcfg.hxx b/sw/inc/modcfg.hxx index f4d82aaf2be3..cfdd94814231 100644 --- a/sw/inc/modcfg.hxx +++ b/sw/inc/modcfg.hxx @@ -118,8 +118,8 @@ class SwInsertConfig : public utl::ConfigItem { friend class SwModuleOptions; -InsCaptionOptArr* pCapOptions; -InsCaptionOpt* pOLEMiscOpt; +std::unique_ptr pCapOptions; +std::unique_ptrpOLEMiscOpt; SvGlobalNameaGlobalNames[5]; diff --git a/sw/source/uibase/config/modcfg.cxx b/sw/source/uibase/config/modcfg.cxx index 3d73202fdb70..3a0b41f3a1b9 100644 --- a/sw/source/uibase/config/modcfg.cxx +++ b/sw/source/uibase/config/modcfg.cxx @@ -77,7 +77,7 @@ const InsCaptionOpt* SwModuleOptions::GetCapOption( for( sal_uInt16 nId = 0; nId <= GLOB_NAME_CHART && !bFound; nId++) bFound = *pOleId == aInsertConfig.aGlobalNames[nId ]; if(!bFound) -return aInsertConfig.pOLEMiscOpt; +return aInsertConfig.pOLEMiscOpt.get(); } return aInsertConfig.pCapOptions->Find(eType, pOleId); } @@ -103,7 +103,7 @@ bool SwModuleOptions::SetCapOption(bool bHTML, const InsCaptionOpt* pOpt) if(aInsertConfig.pOLEMiscOpt) *aInsertConfig.pOLEMiscOpt = *pOpt; else -aInsertConfig.pOLEMiscOpt = new InsCaptionOpt(*pOpt); +aInsertConfig.pOLEMiscOpt.reset(new InsCaptionOpt(*pOpt)); } } @@ -596,15 +596,15 @@ SwInsertConfig::SwInsertConfig(bool bWeb) : aGlobalNames[GLOB_NAME_MATH ] = SvGlobalName(SO3_SM_CLASSID); aGlobalNames[GLOB_NAME_CHART ] = SvGlobalName(SO3_SCH_CLASSID); if(!bIsWeb) -pCapOptions = new InsCaptionOptArr; +pCapOptions.reset(new InsCaptionOptArr); Load(); } SwInsertConfig::~SwInsertConfig() { -delete pCapOptions; -delete pOLEMiscOpt; +pCapOptions.reset(); +pOLEMiscOpt.reset(); } static void lcl_WriteOpt(const InsCaptionOpt& rOpt, Any* pValues, sal_Int32 nProp, sal_Int32 nOffset) @@ -1072,7 +1072,7 @@ void SwInsertConfig::Load() case INS_PROP_CAP_OBJECT_OLEMISC_APPLYATTRIBUTES: if(!pOLEMiscOpt) { -pOLEMiscOpt = new InsCaptionOpt(OLE_CAP); +pOLEMiscOpt.reset(new InsCaptionOpt(OLE_CAP)); } lcl_ReadOpt(*pOLEMiscOpt, pValues, nProp, nProp - INS_PROP_CAP_OBJECT_OLEMISC_ENABLE); break; commit 63ba8ffa5c390c04e22a74015a64cefc2bf228ea Author: Noel Grandin AuthorDate: Mon Jul 23 14:22:30 2018 +0200 Commit: Noel Grandin CommitDate: Tue Jul 24 08:35:05 2018 +0200 loplugin:useuniqueptr in ScValidationDataList Change-Id: Icbf8eb814e7d3bd57e78d2d1a97eb44bbfd2a432 Reviewed-on: https://gerrit.libreoffice.org/57874 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index 4fcee74748ca..7d34bd38a6a4 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -357,7 +357,7 @@ private: VclPtr mpVirtualDevice_100th_mm; std::unique_ptr mpDrawLayer; // SdrModel rtl::Reference pColorList; -ScValidationDataList* pValidationList; // validity +std::unique_ptr pValidationList; // validity SvNumberFormatterIndexTable* pFormatExchangeList;// for application of number formats TableContainer maTabs; std::vector maTabNames; // for undo document, we need the information tab name <-> index @@ -1703,8 +1703,8 @@ public: SC_DLLPUBLIC ScConditionalFormatList* GetCondFormList( SCTAB nTab ) const; -const ScValidationDataList* GetValidationList() const { return pValidationList;} -ScValidationDataList* GetValidationList() { return pValidationList;} +const ScValidationDataList* GetValidationList() const { return pValidationList.get();} +ScValidationDataList* GetValidationList() { return pValidationList.get();} SC_DLLPUBLIC void
[Libreoffice-commits] core.git: 2 commits - chart2/source include/sfx2 sfx2/source
chart2/source/controller/inc/ChartController.hxx |2 - chart2/source/controller/main/ChartController.cxx |6 ++-- chart2/source/controller/main/ChartController_Position.cxx |2 - chart2/source/controller/main/ChartController_TextEdit.cxx |2 - chart2/source/controller/main/ChartController_Tools.cxx|6 ++-- chart2/source/controller/main/ChartController_Window.cxx | 18 ++--- include/sfx2/viewfrm.hxx |4 +- sfx2/source/view/viewfrm.cxx |6 ++-- 8 files changed, 23 insertions(+), 23 deletions(-) New commits: commit e2282a94558d6d92ed5f170e3dde6f26bfe383db Author: Noel Grandin AuthorDate: Mon Jul 23 14:22:14 2018 +0200 Commit: Noel Grandin CommitDate: Tue Jul 24 08:34:55 2018 +0200 loplugin:useuniqueptr in SfxViewFrame Change-Id: I1edd00a184d8ffab4cf327aefc4e786458ccce52 Reviewed-on: https://gerrit.libreoffice.org/57873 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx index 3fafd9e1762d..e0a7db3c2c6e 100644 --- a/include/sfx2/viewfrm.hxx +++ b/include/sfx2/viewfrm.hxx @@ -66,7 +66,7 @@ class SFX2_DLLPUBLIC SfxViewFrame: public SfxShell, public SfxListener std::unique_ptr m_pImpl; SfxObjectShellRef m_xObjSh; -SfxDispatcher* m_pDispatcher; +std::unique_ptr m_pDispatcher; SfxBindings*m_pBindings; sal_uInt16 m_nAdjustPosPixelLock; @@ -112,7 +112,7 @@ public: voidDoDeactivate(bool bMDI, SfxViewFrame const *pOld); using SfxShell::GetDispatcher; -SfxDispatcher* GetDispatcher() { return m_pDispatcher; } +SfxDispatcher* GetDispatcher() { return m_pDispatcher.get(); } SfxBindings&GetBindings() { return *m_pBindings; } const SfxBindings& GetBindings() const { return *m_pBindings; } vcl::Window&GetWindow() const; diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 9d4cebb64562..d369cf65c4b6 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -1408,9 +1408,9 @@ void SfxViewFrame::Construct_Impl( SfxObjectShell *pObjSh ) m_pImpl->pWindow = nullptr; SetPool( &SfxGetpApp()->GetPool() ); -m_pDispatcher = new SfxDispatcher(this); +m_pDispatcher.reset( new SfxDispatcher(this) ); if ( !GetBindings().GetDispatcher() ) -GetBindings().SetDispatcher( m_pDispatcher ); +GetBindings().SetDispatcher( m_pDispatcher.get() ); m_xObjSh = pObjSh; if ( m_xObjSh.is() && m_xObjSh->IsPreview() ) @@ -1513,7 +1513,7 @@ void SfxViewFrame::KillDispatcher_Impl() m_pDispatcher->Pop( *pModule, SfxDispatcherPopFlags::POP_UNTIL ); else m_pDispatcher->Pop( *this ); -DELETEZ(m_pDispatcher); +m_pDispatcher.reset(); } } commit e83e5144119cba5514d07e03b6af557dae542b5b Author: Noel Grandin AuthorDate: Mon Jul 23 13:42:00 2018 +0200 Commit: Noel Grandin CommitDate: Tue Jul 24 08:34:43 2018 +0200 loplugin:useuniqueptr in ChartController Change-Id: I224db5ab179bfd84125617e643441fd9a2872e67 Reviewed-on: https://gerrit.libreoffice.org/57872 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/chart2/source/controller/inc/ChartController.hxx b/chart2/source/controller/inc/ChartController.hxx index d6f5658b62cf..2cf1978811db 100644 --- a/chart2/source/controller/inc/ChartController.hxx +++ b/chart2/source/controller/inc/ChartController.hxx @@ -389,7 +389,7 @@ private: css::uno::Reference m_xViewWindow; css::uno::Reference m_xChartView; std::shared_ptr< DrawModelWrapper > m_pDrawModelWrapper; -DrawViewWrapper* m_pDrawViewWrapper; +std::unique_ptr m_pDrawViewWrapper; Selection m_aSelection; SdrDragMode m_eDragMode; diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index b0c27a4e6a43..2467f267d27f 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -729,7 +729,7 @@ void ChartController::impl_createDrawViewController() { if( m_pDrawModelWrapper ) { -m_pDrawViewWrapper = new DrawViewWrapper(m_pDrawModelWrapper->getSdrModel(),GetChartWindow()); +m_pDrawViewWrapper.reset( new DrawViewWrapper(m_pDrawModelWrapper->getSdrModel(),GetChartWindow()) ); m_pDrawViewWrapper->attachParentReferenceDevice( getModel() ); } } @@ -742,7 +742,7 @@ void ChartController::impl_deleteDrawViewController() SolarMutexGuard aGuard; if( m_pDrawViewWrapper->IsTextEdit() ) this->EndTextEdit(); -DELETEZ( m_pDrawViewWrapper ); +m_pDrawViewWrapper.reset(); } } @@ -1470,7 +1470,7 @@ Draw
[Libreoffice-commits] core.git: 2 commits - sw/inc sw/source
sw/inc/swmodule.hxx |2 +- sw/source/uibase/app/docstyle.cxx |6 +++--- sw/source/uibase/app/swmodule.cxx |6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) New commits: commit 232d0f4f6620bf21f382d38fd98f48ad57525ff0 Author: Noel Grandin AuthorDate: Mon Jul 23 12:07:19 2018 +0200 Commit: Noel Grandin CommitDate: Tue Jul 24 08:34:10 2018 +0200 loplugin:useuniqueptr in SwModule Change-Id: I37f4df7d309e83b3232dab8268c3b7557b259ae8 Reviewed-on: https://gerrit.libreoffice.org/57869 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx index cdb88dbf3569..8e23f8856d7b 100644 --- a/sw/inc/swmodule.hxx +++ b/sw/inc/swmodule.hxx @@ -91,7 +91,7 @@ class SW_DLLPUBLIC SwModule final : public SfxModule, public SfxListener, public SvtCTLOptions* m_pCTLOptions; SvtUserOptions* m_pUserOptions; -SfxErrorHandler*m_pErrorHandler; +std::unique_ptr m_pErrorHandler; SwAttrPool *m_pAttrPool; diff --git a/sw/source/uibase/app/swmodule.cxx b/sw/source/uibase/app/swmodule.cxx index 3d2744ddd2c6..14b800abfbe5 100644 --- a/sw/source/uibase/app/swmodule.cxx +++ b/sw/source/uibase/app/swmodule.cxx @@ -171,10 +171,10 @@ SwModule::SwModule( SfxObjectFactory* pWebFact, { SetName( "StarWriter" ); SvxErrorHandler::ensure(); -m_pErrorHandler = new SfxErrorHandler( RID_SW_ERRHDL, +m_pErrorHandler.reset( new SfxErrorHandler( RID_SW_ERRHDL, ErrCodeArea::Sw, ErrCodeArea::Sw, - GetResLocale() ); + GetResLocale() ) ); m_pModuleConfig = new SwModuleOptions; @@ -225,7 +225,7 @@ SwModule::~SwModule() { css::uno::Sequence< css::uno::Any > aArgs; CallAutomationApplicationEventSinks( "Quit", aArgs ); -delete m_pErrorHandler; +m_pErrorHandler.reset(); EndListening( *SfxGetpApp() ); } commit 07d0c305187abeaa7661b0275725b29fe2e3623f Author: Noel Grandin AuthorDate: Mon Jul 23 11:18:43 2018 +0200 Commit: Noel Grandin CommitDate: Tue Jul 24 08:33:57 2018 +0200 loplugin:useuniqueptr in SwImplShellAction Change-Id: Iab0844b8ad5bbe57c4f1fb5a706bc742abf4cdb5 Reviewed-on: https://gerrit.libreoffice.org/57868 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/sw/source/uibase/app/docstyle.cxx b/sw/source/uibase/app/docstyle.cxx index 0abb4e461d3e..260ad592eaa8 100644 --- a/sw/source/uibase/app/docstyle.cxx +++ b/sw/source/uibase/app/docstyle.cxx @@ -92,7 +92,7 @@ using namespace com::sun::star; class SwImplShellAction { SwWrtShell* pSh; -CurrShell* pCurrSh; +std::unique_ptr pCurrSh; public: explicit SwImplShellAction( SwDoc& rDoc ); ~SwImplShellAction() COVERITY_NOEXCEPT_FALSE; @@ -110,7 +110,7 @@ SwImplShellAction::SwImplShellAction( SwDoc& rDoc ) if( pSh ) { -pCurrSh = new CurrShell( pSh ); +pCurrSh.reset( new CurrShell( pSh ) ); pSh->StartAllAction(); } } @@ -120,7 +120,7 @@ SwImplShellAction::~SwImplShellAction() COVERITY_NOEXCEPT_FALSE if( pCurrSh ) { pSh->EndAllAction(); -delete pCurrSh; +pCurrSh.reset(); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - compilerplugins/clang sw/source
compilerplugins/clang/test/useuniqueptr.cxx |5 + compilerplugins/clang/useuniqueptr.cxx |2 +- sw/source/uibase/config/dbconfig.cxx| 13 + sw/source/uibase/inc/dbconfig.hxx |4 ++-- 4 files changed, 13 insertions(+), 11 deletions(-) New commits: commit 4089e1d9f67a61322b1fa4330ee10f62b3684f7f Author: Noel Grandin AuthorDate: Mon Jul 23 12:21:25 2018 +0200 Commit: Noel Grandin CommitDate: Tue Jul 24 08:34:32 2018 +0200 loplugin:useuniqueptr fix check for DELETEZ inside compound stmt Change-Id: Id748b8b0c9cfe8c288dfafb5d0c2a83a8de2c91c Reviewed-on: https://gerrit.libreoffice.org/57871 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/compilerplugins/clang/test/useuniqueptr.cxx b/compilerplugins/clang/test/useuniqueptr.cxx index 24a34c0e54b9..844f7fb65d7e 100644 --- a/compilerplugins/clang/test/useuniqueptr.cxx +++ b/compilerplugins/clang/test/useuniqueptr.cxx @@ -154,11 +154,16 @@ class Foo12 { class Foo13 { int * m_pbar1; // expected-note {{member is here [loplugin:useuniqueptr]}} int * m_pbar2; // expected-note {{member is here [loplugin:useuniqueptr]}} +int * m_pbar3; // expected-note {{member is here [loplugin:useuniqueptr]}} ~Foo13() { if (m_pbar1) DELETEZ(m_pbar1); // expected-error {{unconditional call to delete on a member, should be using std::unique_ptr [loplugin:useuniqueptr]}} DELETEZ(m_pbar2); // expected-error {{unconditional call to delete on a member, should be using std::unique_ptr [loplugin:useuniqueptr]}} +if (m_pbar3) +{ +DELETEZ(m_pbar3); // expected-error {{unconditional call to delete on a member, should be using std::unique_ptr [loplugin:useuniqueptr]}} +} } }; // check for unconditional inner compound statements diff --git a/compilerplugins/clang/useuniqueptr.cxx b/compilerplugins/clang/useuniqueptr.cxx index c7f6d7a2444c..f41b55a5eb0f 100644 --- a/compilerplugins/clang/useuniqueptr.cxx +++ b/compilerplugins/clang/useuniqueptr.cxx @@ -228,7 +228,7 @@ void UseUniquePtr::CheckForSimpleDelete(const CXXMethodDecl* methodDecl, const C auto ifDeleteExpr = dyn_cast(*j); if (ifDeleteExpr) CheckDeleteExpr(methodDecl, ifDeleteExpr); -ParenExpr const * parenExpr = dyn_cast(*i); +ParenExpr const * parenExpr = dyn_cast(*j); if (parenExpr) CheckParenExpr(methodDecl, parenExpr); } commit fbd757349ea0dd2e9daecc2b6d1aa2e80aa7a319 Author: Noel Grandin AuthorDate: Mon Jul 23 12:08:56 2018 +0200 Commit: Noel Grandin CommitDate: Tue Jul 24 08:34:21 2018 +0200 loplugin:useuniqueptr in SwDBConfig Change-Id: Ibf9cdf4e09275325a876b81067245f76597ae08e Reviewed-on: https://gerrit.libreoffice.org/57870 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/sw/source/uibase/config/dbconfig.cxx b/sw/source/uibase/config/dbconfig.cxx index 91b24488bf36..34d0650dcde0 100644 --- a/sw/source/uibase/config/dbconfig.cxx +++ b/sw/source/uibase/config/dbconfig.cxx @@ -42,16 +42,14 @@ const Sequence& SwDBConfig::GetPropertyNames() SwDBConfig::SwDBConfig() : ConfigItem("Office.DataAccess", -ConfigItemMode::DelayedUpdate|ConfigItemMode::ReleaseTree), -pAdrImpl(nullptr), -pBibImpl(nullptr) +ConfigItemMode::DelayedUpdate|ConfigItemMode::ReleaseTree) { }; SwDBConfig::~SwDBConfig() { -delete pAdrImpl; -delete pBibImpl; +pAdrImpl.reset(); +pBibImpl.reset(); } void SwDBConfig::Load() @@ -59,10 +57,9 @@ void SwDBConfig::Load() const Sequence& rNames = GetPropertyNames(); if(!pAdrImpl) { - -pAdrImpl = new SwDBData; +pAdrImpl.reset(new SwDBData); pAdrImpl->nCommandType = 0; -pBibImpl = new SwDBData; +pBibImpl.reset(new SwDBData); pBibImpl->nCommandType = 0; } Sequence aValues = GetProperties(rNames); diff --git a/sw/source/uibase/inc/dbconfig.hxx b/sw/source/uibase/inc/dbconfig.hxx index 5ea79f423853..5a611f5d8be0 100644 --- a/sw/source/uibase/inc/dbconfig.hxx +++ b/sw/source/uibase/inc/dbconfig.hxx @@ -30,8 +30,8 @@ private: SAL_DLLPRIVATE static const css::uno::Sequence& GetPropertyNames(); virtual void ImplCommit() override; -SwDBData* pAdrImpl; -SwDBData* pBibImpl; +std::unique_ptr pAdrImpl; +std::unique_ptr pBibImpl; public: SwDBConfig(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sw/inc sw/source
sw/inc/docsh.hxx |4 ++-- sw/source/filter/xml/xmlimp.cxx |9 + sw/source/filter/xml/xmlimp.hxx | 10 +- sw/source/filter/xml/xmlitemi.cxx | 10 +- sw/source/filter/xml/xmltbli.cxx |4 ++-- sw/source/uibase/app/docsh.cxx|6 +++--- sw/source/uibase/app/docshini.cxx |9 - 7 files changed, 26 insertions(+), 26 deletions(-) New commits: commit c92d89b4e481d7f1777592d9f55a250e2d1a9869 Author: Noel Grandin AuthorDate: Mon Jul 23 11:16:34 2018 +0200 Commit: Noel Grandin CommitDate: Tue Jul 24 08:33:29 2018 +0200 loplugin:useuniqueptr inSwDocShell Change-Id: I9b834406b391695a18c9fdcdad9a6dd13be34c9e Reviewed-on: https://gerrit.libreoffice.org/57867 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx index d61cd712a51a..9a88de3abeb6 100644 --- a/sw/inc/docsh.hxx +++ b/sw/inc/docsh.hxx @@ -67,7 +67,7 @@ class SW_DLLPUBLIC SwDocShell { rtl::Reference< SwDoc > m_xDoc; ///< Document. rtl::Reference< SfxStyleSheetBasePool > m_xBasePool; ///< Passing through for formats. -FontList* m_pFontList; ///< Current Fontlist. +std::unique_ptr m_pFontList; ///< Current Fontlist. boolm_IsInUpdateFontList; ///< prevent nested calls of UpdateFontList std::unique_ptr m_pStyleManager; @@ -80,7 +80,7 @@ class SW_DLLPUBLIC SwDocShell SwView* m_pView; SwWrtShell* m_pWrtShell; -comphelper::EmbeddedObjectContainer* m_pOLEChildList; +std::unique_ptr m_pOLEChildList; sal_Int16 m_nUpdateDocMode; ///< contains the css::document::UpdateDocMode boolm_IsATemplate; ///< prevent nested calls of UpdateFontList diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx index 1692517501c5..2a40bc1d12da 100644 --- a/sw/source/uibase/app/docsh.cxx +++ b/sw/source/uibase/app/docsh.cxx @@ -827,7 +827,7 @@ bool SwDocShell::SaveCompleted( const uno::Reference < embed::XStorage >& xStor } } -DELETEZ(m_pOLEChildList); +m_pOLEChildList.reset(); if( bResetModified ) EnableSetModified(); } @@ -1080,7 +1080,7 @@ void SwDocShell::GetState(SfxItemSet& rSet) break; case SID_ATTR_CHAR_FONTLIST: { -rSet.Put( SvxFontListItem(m_pFontList, SID_ATTR_CHAR_FONTLIST) ); +rSet.Put( SvxFontListItem(m_pFontList.get(), SID_ATTR_CHAR_FONTLIST) ); } break; case SID_MAIL_PREPAREEXPORT: @@ -1235,7 +1235,7 @@ void SwDocShell::RemoveOLEObjects() pOLENd->IsInGlobalDocSection() ) ) { if (!m_pOLEChildList) -m_pOLEChildList = new comphelper::EmbeddedObjectContainer; +m_pOLEChildList.reset( new comphelper::EmbeddedObjectContainer ); OUString aObjName = pOLENd->GetOLEObj().GetCurrentPersistName(); GetEmbeddedObjectContainer().MoveEmbeddedObject( aObjName, *m_pOLEChildList ); diff --git a/sw/source/uibase/app/docshini.cxx b/sw/source/uibase/app/docshini.cxx index cb9241609f77..0a402d2466af 100644 --- a/sw/source/uibase/app/docshini.cxx +++ b/sw/source/uibase/app/docshini.cxx @@ -391,13 +391,13 @@ SwDocShell::~SwDocShell() } RemoveLink(); -delete m_pFontList; +m_pFontList.reset(); // we, as BroadCaster also become our own Listener // (for DocInfo/FileNames/) EndListening( *this ); -delete m_pOLEChildList; +m_pOLEChildList.reset(); } void SwDocShell::Init_Impl() @@ -441,9 +441,8 @@ void SwDocShell::UpdateFontList() OSL_ENSURE(m_xDoc.get(), "No Doc no FontList"); if (m_xDoc.get()) { -delete m_pFontList; -m_pFontList = new FontList( m_xDoc->getIDocumentDeviceAccess().getReferenceDevice(true) ); -PutItem( SvxFontListItem( m_pFontList, SID_ATTR_CHAR_FONTLIST ) ); +m_pFontList.reset( new FontList( m_xDoc->getIDocumentDeviceAccess().getReferenceDevice(true) ) ); +PutItem( SvxFontListItem( m_pFontList.get(), SID_ATTR_CHAR_FONTLIST ) ); } m_IsInUpdateFontList = false; } commit 14377b33bd35a34d5be2d015c9a8d3d108153292 Author: Noel Grandin AuthorDate: Mon Jul 23 09:53:08 2018 +0200 Commit: Noel Grandin CommitDate: Tue Jul 24 08:33:19 2018 +0200 loplugin:useuniqueptr in SwXMLImport Change-Id: I0c90d39c87bbd4a6edaa70b2413a64a41585a944 Reviewed-on: https://gerrit.libreoffice.org/57865 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index e88f90e2c621..7370eba1f353 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -59,6 +59,7 @@ #include #include #include "xmlimp.hxx" +#include "xmlimpit.hxx" #include "xmltexti.hxx" #inc
[Libreoffice-commits] core.git: 2 commits - compilerplugins/clang sw/source
compilerplugins/clang/useuniqueptr.cxx |3 +++ sw/source/filter/html/htmlatr.cxx | 14 +++--- sw/source/filter/html/htmlflywriter.cxx |5 ++--- sw/source/filter/html/wrthtml.cxx | 15 ++- sw/source/filter/html/wrthtml.hxx |6 +++--- sw/source/filter/xml/xmlexp.cxx |1 + sw/source/filter/xml/xmlexp.hxx |6 +++--- sw/source/filter/xml/xmliteme.cxx | 12 ++-- sw/source/filter/xml/xmltble.cxx|9 +++-- 9 files changed, 34 insertions(+), 37 deletions(-) New commits: commit 94e3568d3d1aa399d13c53f53a699c49da3e929c Author: Noel Grandin AuthorDate: Mon Jul 23 09:35:43 2018 +0200 Commit: Noel Grandin CommitDate: Tue Jul 24 08:33:07 2018 +0200 loplugin:useuniqueptr in SwXMLExport Change-Id: Id0354b73b0ff14b6a168b672f25483c07988494e Reviewed-on: https://gerrit.libreoffice.org/57864 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx index 8a7da0693df1..1f86cd989b28 100644 --- a/sw/source/filter/xml/xmlexp.cxx +++ b/sw/source/filter/xml/xmlexp.cxx @@ -51,6 +51,7 @@ #include #include "xmltexte.hxx" #include "xmlexp.hxx" +#include "xmlexpit.hxx" #include #include #include diff --git a/sw/source/filter/xml/xmlexp.hxx b/sw/source/filter/xml/xmlexp.hxx index 211f50840da6..22e6a42368a7 100644 --- a/sw/source/filter/xml/xmlexp.hxx +++ b/sw/source/filter/xml/xmlexp.hxx @@ -47,9 +47,9 @@ typedef std::vector< SwXMLTableLines_Impl* > SwXMLTableLinesCache_Impl; class SwXMLExport : public SvXMLExport { -SvXMLUnitConverter* m_pTwipUnitConverter; -SvXMLExportItemMapper* m_pTableItemMapper; -SwXMLTableLinesCache_Impl* m_pTableLines; +std::unique_ptrm_pTwipUnitConverter; +std::unique_ptr m_pTableItemMapper; +std::unique_ptr m_pTableLines; SvXMLItemMapEntriesRef m_xTableItemMap; SvXMLItemMapEntriesRef m_xTableRowItemMap; diff --git a/sw/source/filter/xml/xmliteme.cxx b/sw/source/filter/xml/xmliteme.cxx index 60eaedd1f562..7ba4db9501d2 100644 --- a/sw/source/filter/xml/xmliteme.cxx +++ b/sw/source/filter/xml/xmliteme.cxx @@ -207,25 +207,25 @@ inline void SwXMLTableItemMapper_Impl::SetAbsWidth( sal_uInt32 nAbs ) void SwXMLExport::InitItemExport() { -m_pTwipUnitConverter = new SvXMLUnitConverter(getComponentContext(), -util::MeasureUnit::TWIP, GetMM100UnitConverter().GetXMLMeasureUnit()); +m_pTwipUnitConverter.reset(new SvXMLUnitConverter(getComponentContext(), +util::MeasureUnit::TWIP, GetMM100UnitConverter().GetXMLMeasureUnit())); m_xTableItemMap = new SvXMLItemMapEntries( aXMLTableItemMap ); m_xTableRowItemMap = new SvXMLItemMapEntries( aXMLTableRowItemMap ); m_xTableCellItemMap = new SvXMLItemMapEntries( aXMLTableCellItemMap ); -m_pTableItemMapper = new SwXMLTableItemMapper_Impl( m_xTableItemMap, *this ); +m_pTableItemMapper.reset(new SwXMLTableItemMapper_Impl( m_xTableItemMap, *this )); } void SwXMLExport::FinitItemExport() { -delete m_pTableItemMapper; -delete m_pTwipUnitConverter; +m_pTableItemMapper.reset(); +m_pTwipUnitConverter.reset(); } void SwXMLExport::ExportTableFormat( const SwFrameFormat& rFormat, sal_uInt32 nAbsWidth ) { -static_cast(m_pTableItemMapper) +static_cast(m_pTableItemMapper.get()) ->SetAbsWidth( nAbsWidth ); ExportFormat( rFormat, XML_TABLE ); } diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx index 4077ce852723..9dbc82d0e92a 100644 --- a/sw/source/filter/xml/xmltble.cxx +++ b/sw/source/filter/xml/xmltble.cxx @@ -569,7 +569,7 @@ void SwXMLExport::ExportTableLinesAutoStyles( const SwTableLines& rLines, // pass 1: calculate columns SwXMLTableLines_Impl *pLines = new SwXMLTableLines_Impl( rLines ); if( !m_pTableLines ) -m_pTableLines = new SwXMLTableLinesCache_Impl; +m_pTableLines.reset(new SwXMLTableLinesCache_Impl); m_pTableLines->push_back( pLines ); @@ -995,10 +995,7 @@ void SwXMLExport::ExportTableLines( const SwTableLines& rLines, m_pTableLines->erase( it ); if( m_pTableLines->empty() ) -{ -delete m_pTableLines ; -m_pTableLines = nullptr; -} +m_pTableLines.reset(); // pass 2: export columns const SwXMLTableColumns_Impl& rCols = pLines->GetColumns(); @@ -1201,7 +1198,7 @@ void SwXMLExport::DeleteTableLines() for (SwXMLTableLines_Impl* p : *m_pTableLines) delete p; m_pTableLines->clear(); -delete m_pTableLines; +m_pTableLines.reset(); } } commit dba5dccfc5606ed6c6c888524460c9546143aaef Author: Noel Grandin AuthorDate: Mon Jul 23 09:24:24 2018 +0200 Commit: Noel Grandin CommitDate: Tue Jul 24 08:32:56 2018 +0200 loplugin:useuniqueptr in SwHTMLWriter Change-Id: I67f3dd615e798f8ac865b57332f6153530d81929
[Libreoffice-commits] core.git: 2 commits - include/xmlreader include/xmlscript xmlreader/source xmlscript/source
include/xmlreader/xmlreader.hxx | 12 ++-- include/xmlscript/xml_helper.hxx |2 +- xmlreader/source/xmlreader.cxx |4 ++-- xmlscript/source/xml_helper/xml_impctx.cxx |6 +++--- xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx |2 +- xmlscript/source/xmlflat_imexp/xmlbas_export.hxx |2 +- xmlscript/source/xmlflat_imexp/xmlbas_import.hxx | 14 +++--- xmlscript/source/xmllib_imexp/imp_share.hxx |4 ++-- xmlscript/source/xmlmod_imexp/imp_share.hxx |2 +- 9 files changed, 24 insertions(+), 24 deletions(-) New commits: commit 0b7fe7b2ceff8056b619b994fc765eb827f29bf3 Author: Noel Grandin AuthorDate: Mon Jul 23 16:28:13 2018 +0200 Commit: Noel Grandin CommitDate: Tue Jul 24 08:32:46 2018 +0200 loplugin:unusedfields,can-be-const in xmlreader Change-Id: I762a749b858063a1c063ee918bb6d33e06328876 Reviewed-on: https://gerrit.libreoffice.org/57852 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/include/xmlreader/xmlreader.hxx b/include/xmlreader/xmlreader.hxx index b2b97bd05afd..fb44d01ef067 100644 --- a/include/xmlreader/xmlreader.hxx +++ b/include/xmlreader/xmlreader.hxx @@ -78,8 +78,8 @@ private: // elements_ and attributes_): struct NamespaceData { -Span prefix; -int nsId; +Span const prefix; +int const nsId; NamespaceData(): nsId(-1) {} @@ -91,9 +91,9 @@ private: typedef std::vector< NamespaceData > NamespaceList; struct ElementData { -Span name; -NamespaceList::size_type inheritedNamespaces; -int defaultNamespaceId; +Span const name; +NamespaceList::size_type const inheritedNamespaces; +int const defaultNamespaceId; ElementData( Span const & theName, @@ -168,7 +168,7 @@ private: SAL_DLLPRIVATE static int toNamespaceId(NamespaceIris::size_type pos); -OUString fileUrl_; +OUString const fileUrl_; oslFileHandle fileHandle_; sal_uInt64 fileSize_; void * fileAddress_; diff --git a/xmlreader/source/xmlreader.cxx b/xmlreader/source/xmlreader.cxx index 8e544b6a07d0..699567a53a32 100644 --- a/xmlreader/source/xmlreader.cxx +++ b/xmlreader/source/xmlreader.cxx @@ -458,9 +458,9 @@ char const * XmlReader::handleReference(char const * position, char const * end) } else { struct EntityRef { char const * inBegin; -sal_Int32 inLength; +sal_Int32 const inLength; char const * outBegin; -sal_Int32 outLength; +sal_Int32 const outLength; }; static EntityRef const refs[] = { { RTL_CONSTASCII_STRINGPARAM("amp;"), commit f08a06052bfe38c2bc0a23bd2c56ff9c1cb5536c Author: Noel Grandin AuthorDate: Mon Jul 23 16:14:49 2018 +0200 Commit: Noel Grandin CommitDate: Tue Jul 24 08:32:37 2018 +0200 loplugin:unusedfields,can-be-const in xmlscript Change-Id: Ibd733b822bb2eee9de6319b5ea9e4d8dd3641cdc Reviewed-on: https://gerrit.libreoffice.org/57850 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/include/xmlscript/xml_helper.hxx b/include/xmlscript/xml_helper.hxx index 508c5789fe1b..6ee6c3f5872f 100644 --- a/include/xmlscript/xml_helper.hxx +++ b/include/xmlscript/xml_helper.hxx @@ -91,7 +91,7 @@ protected: ::std::vector< css::uno::Reference< css::xml::sax::XAttributeList > > _subElems; private: -OUString _name; +OUString const _name; ::std::vector< OUString > _attrNames; ::std::vector< OUString > _attrValues; diff --git a/xmlscript/source/xml_helper/xml_impctx.cxx b/xmlscript/source/xml_helper/xml_impctx.cxx index 48b3153228c6..3ebc809d1cfe 100644 --- a/xmlscript/source/xml_helper/xml_impctx.cxx +++ b/xmlscript/source/xml_helper/xml_impctx.cxx @@ -105,8 +105,8 @@ class DocumentHandlerImpl : t_OUString2LongMap m_URI2Uid; sal_Int32 m_uid_count; -OUString m_sXMLNS_PREFIX_UNKNOWN; -OUString m_sXMLNS; +OUString const m_sXMLNS_PREFIX_UNKNOWN; +OUString const m_sXMLNS; sal_Int32 m_nLastURI_lookup; OUString m_aLastURI_lookup; @@ -301,7 +301,7 @@ inline void DocumentHandlerImpl::getElementName( class ExtendedAttributes : public ::cppu::WeakImplHelper< xml::input::XAttributes > { -sal_Int32 m_nAttributes; +sal_Int32 const m_nAttributes; std::unique_ptr m_pUids; std::unique_ptr m_pLocalNames; std::unique_ptr m_pQNames; diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx index d0daa3746c65..9daedf961b63 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx @@ -36,7 +36,7 @@ namespace xmlscript class InputStreamProvider : public ::cppu::WeakImplHelper< io::XInputStreamProvider > { -std::vector _bytes; +
[Libreoffice-commits] core.git: 2 commits - bin/fuzzfiles bin/get_config_variables configure.ac dbaccess/source filter/qa filter/source postprocess/CustomTarget_registry.mk svl/qa vcl/inc
bin/fuzzfiles |2 +- bin/get_config_variables|2 +- configure.ac|2 +- dbaccess/source/core/api/TableDeco.cxx |2 +- filter/qa/complex/filter/detection/typeDetection/TypeDetection.java |2 +- filter/source/xslt/export/wordml/ooo2wordml_field.xsl |2 +- postprocess/CustomTarget_registry.mk|2 +- svl/qa/unit/svl.cxx |2 +- vcl/inc/svdata.hxx |2 +- 9 files changed, 9 insertions(+), 9 deletions(-) New commits: commit cec5271db3563bf393e1afe40bd5a368eeaf0b88 Author: Andrea Gelmini AuthorDate: Mon Jul 23 22:13:47 2018 +0200 Commit: Julien Nabet CommitDate: Tue Jul 24 08:22:20 2018 +0200 Fix variable name Change-Id: I6e5bef8840730f61ca976c72a808b9ffd21fe8dc Reviewed-on: https://gerrit.libreoffice.org/57883 Reviewed-by: Julien Nabet Tested-by: Jenkins diff --git a/bin/get_config_variables b/bin/get_config_variables index 43a3ad1d2ab0..60a2bdc04788 100644 --- a/bin/get_config_variables +++ b/bin/get_config_variables @@ -20,4 +20,4 @@ done unset glv_var unset glv_value -unset glv_vonfig +unset glv_config commit 5050e9d9c188524bc601b54eade5924be9ae77ea Author: Andrea Gelmini AuthorDate: Mon Jul 23 22:15:58 2018 +0200 Commit: Julien Nabet CommitDate: Tue Jul 24 08:22:05 2018 +0200 Fix typos Change-Id: I07cf04cd2acc5b50d64224edb9f2c2de2c61e356 Reviewed-on: https://gerrit.libreoffice.org/57884 Reviewed-by: Julien Nabet Tested-by: Jenkins diff --git a/bin/fuzzfiles b/bin/fuzzfiles index e650fe5ffe08..ed0432d2371c 100755 --- a/bin/fuzzfiles +++ b/bin/fuzzfiles @@ -37,5 +37,5 @@ for file in $@; do zzuf -r $ratio < $file > "$basename-$ratio-$i" done #end of for i in {1.. done #end of for ratio in ... -fi #end if of file vailidity check +fi #end if of file validity check done #end for file in $@ diff --git a/configure.ac b/configure.ac index d418e54d0d2a..9b31d8904b54 100644 --- a/configure.ac +++ b/configure.ac @@ -3233,7 +3233,7 @@ printf ("hello world\n"); fi AC_SUBST(HAVE_LD_BSYMBOLIC_FUNCTIONS) -# Use -isystem (gcc) if possible, to avoid warnigs in 3rd party headers. +# Use -isystem (gcc) if possible, to avoid warnings in 3rd party headers. # NOTE: must _not_ be used for bundled external libraries! ISYSTEM= if test "$GCC" = "yes"; then diff --git a/dbaccess/source/core/api/TableDeco.cxx b/dbaccess/source/core/api/TableDeco.cxx index d2798165b36c..be1b8512ee73 100644 --- a/dbaccess/source/core/api/TableDeco.cxx +++ b/dbaccess/source/core/api/TableDeco.cxx @@ -373,7 +373,7 @@ Any SAL_CALL ODBTableDecorator::queryInterface( const Type & rType ) Sequence< Type > SAL_CALL ODBTableDecorator::getTypes( ) { Reference xTypes(m_xTable,UNO_QUERY); -OSL_ENSURE(xTypes.is(),"Table must be a TypePropvider!"); +OSL_ENSURE(xTypes.is(),"Table must be a TypeProvider!"); return xTypes->getTypes(); } diff --git a/filter/qa/complex/filter/detection/typeDetection/TypeDetection.java b/filter/qa/complex/filter/detection/typeDetection/TypeDetection.java index b3e6c914b8af..f46b85f38371 100644 --- a/filter/qa/complex/filter/detection/typeDetection/TypeDetection.java +++ b/filter/qa/complex/filter/detection/typeDetection/TypeDetection.java @@ -274,7 +274,7 @@ public class TypeDetection extends ComplexTestCase { } } -/** To check the TypeDedection by URL the MediaDescriptor +/** To check the TypeDetection by URL the MediaDescriptor * was filled at first with the URL only, at second with XInputStream * only. The TypeDetection must return the expected value * @param fileAlias the alias name of the test file diff --git a/filter/source/xslt/export/wordml/ooo2wordml_field.xsl b/filter/source/xslt/export/wordml/ooo2wordml_field.xsl index 3e327e11a4b8..349a07e0e006 100644 --- a/filter/source/xslt/export/wordml/ooo2wordml_field.xsl +++ b/filter/source/xslt/export/wordml/ooo2wordml_field.xsl @@ -509,7 +509,7 @@ - + diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk index bc120e444939..5bb86845b423 100644 --- a/postprocess/CustomTarget_registry.mk +++ b/postprocess/CustomTarget_registry.mk @@ -584,7 +584,7 @@ $(call gb_CustomTarget_get_workdir,postprocess/registry)/Langpack-%.list : echo '$(call gb_XcuLangpackTarget_get_target,Langpack-$*.xcu)' > $@ # It can happen that localized fcfg_langpack_*.zip contains -# zero-sized org/openoffice/TypeDectection/Filter.xcu; filter them out in the +# zero-sized org/openoffice/TypeDetection/Filter.xcu; filter them out in the # find
[Libreoffice-commits] core.git: 2 commits - include/salhelper include/xmloff sc/source vcl/qt5
include/salhelper/dynload.hxx |2 +- include/xmloff/txtparae.hxx |2 +- sc/source/filter/inc/stylesbuffer.hxx |2 +- vcl/qt5/Qt5Instance.cxx |2 +- 4 files changed, 4 insertions(+), 4 deletions(-) New commits: commit cf1bb9d4cbaec9d746eb6850e905eb951587543f Author: Andrea Gelmini AuthorDate: Mon Jul 23 22:23:18 2018 +0200 Commit: Julien Nabet CommitDate: Tue Jul 24 08:21:45 2018 +0200 Fix typo Change-Id: I2f9f532890bedf4aa3d86bf2aa4b6961846a915a Reviewed-on: https://gerrit.libreoffice.org/57886 Reviewed-by: Julien Nabet Tested-by: Jenkins diff --git a/vcl/qt5/Qt5Instance.cxx b/vcl/qt5/Qt5Instance.cxx index c365afbe8ec2..3250abaf8f17 100644 --- a/vcl/qt5/Qt5Instance.cxx +++ b/vcl/qt5/Qt5Instance.cxx @@ -140,7 +140,7 @@ std::shared_ptr Qt5Instance::CreateSalBitmap() bool Qt5Instance::ImplYield(bool bWait, bool bHandleAllCurrentEvents) { -// Re-aquire the guard for user events when called via Q_EMIT ImplYieldSignal +// Re-acquire the guard for user events when called via Q_EMIT ImplYieldSignal SolarMutexGuard aGuard; bool wasEvent = DispatchUserEvents(bHandleAllCurrentEvents); if (!bHandleAllCurrentEvents && wasEvent) commit a3ecd60aa0a9b58663e851aacafcb389f9a1fe52 Author: Andrea Gelmini AuthorDate: Sat Jul 21 11:15:00 2018 +0200 Commit: Julien Nabet CommitDate: Tue Jul 24 08:21:32 2018 +0200 Fix typos Change-Id: I8758872f6a5270de3f9b9dea750b9d40c7a446db Reviewed-on: https://gerrit.libreoffice.org/57800 Reviewed-by: Julien Nabet Tested-by: Jenkins diff --git a/include/salhelper/dynload.hxx b/include/salhelper/dynload.hxx index 12d54d5cffa4..e24645f9fadd 100644 --- a/include/salhelper/dynload.hxx +++ b/include/salhelper/dynload.hxx @@ -143,7 +143,7 @@ public: m_pLoader->acquire(); } -/// Destructor, decrease the reference count and unload the library if it is tha last instance. +/// Destructor, decrease the reference count and unload the library if it is the last instance. ~ODynamicLoader() { if( m_pLoader ) diff --git a/include/xmloff/txtparae.hxx b/include/xmloff/txtparae.hxx index 2322de350385..6a09abdaf30f 100644 --- a/include/xmloff/txtparae.hxx +++ b/include/xmloff/txtparae.hxx @@ -569,7 +569,7 @@ public: * they are control shapes, and if so, whether they should be exported or * not. If not, the form layer export will be notified accordingly. * - * The reason this method is located here is tha it needs to access the + * The reason this method is located here is that it needs to access the * XMLSectionExport, which is only available here. */ void PreventExportOfControlsInMuteSections( diff --git a/sc/source/filter/inc/stylesbuffer.hxx b/sc/source/filter/inc/stylesbuffer.hxx index f187ac979733..3588512193c4 100644 --- a/sc/source/filter/inc/stylesbuffer.hxx +++ b/sc/source/filter/inc/stylesbuffer.hxx @@ -712,7 +712,7 @@ public: /** Creates the style sheet in the document described by this cell style object. */ voidcreateCellStyle(); -/** Stores tha passed final style name and creates the cell style, if it is +/** Stores the passed final style name and creates the cell style, if it is user-defined or modified built-in. */ voidfinalizeImport( const OUString& rFinalName ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Generate encryption key
Hi, On Tue, Jul 24, 2018 at 5:35 AM, Vikas Mahato wrote: > Hello all, > > I wanted to know how can we generate the encryption key for using wit > include/oox/crypto/CryptTools.hxx classes? Well, you'll need to provide some context what exactly you want to do. CryptTools.hxx just wraps common encryption tools provided by either OpenSSL or NSS. Key generation (from a password for example) is then the complicated part that differs from an algorithm to the other. Simplest you could do is take a password, calculate the hash and use that for the key, but that wouldn't be secure at all. > Thanks, > Vikas Mahato Regards, Tomaž ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/ooxmlexport/data/fdo72560d.docx |binary sw/qa/extras/ooxmlexport/ooxmlexport10.cxx |7 +++ 2 files changed, 7 insertions(+) New commits: commit 3aaa81ff68c6597381f58f2bd257190d70bd58a3 Author: Justin Luth AuthorDate: Mon Jul 23 11:54:51 2018 +0300 Commit: Justin Luth CommitDate: Tue Jul 24 06:11:45 2018 +0200 tdf#72560 ExchangeLeftRight shouldn't use DefaultParaStyle MS Word's UI is a bit confusing for RTL because the only place you can set it (at least in Word 2003) is on the Normal paragraph style - everywhere else the control is grayed out. Add a test that very specifically tests the impact of Normal style. The document does not use the "default" style at all, because the style used is based on -none-. Normal is set to RTL - does that mean that the whole document should be RTL or that Left/Right should swap? No. Parentless style provides LTR in MSWord, and thus the LO code that ExchangeLeftRight() based on DefaultStyle's bidi setting was wrong. Yes, it is determined by style/DocDefault settings, but not by DefaultStyle in particular. Change-Id: I000953e51d3d919f73aa1e97df63f266d15447b2 Reviewed-on: https://gerrit.libreoffice.org/57859 Tested-by: Jenkins Reviewed-by: Justin Luth diff --git a/sw/qa/extras/ooxmlexport/data/fdo72560d.docx b/sw/qa/extras/ooxmlexport/data/fdo72560d.docx new file mode 100644 index ..000ae73d8ad3 Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo72560d.docx differ diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx index bd90c27c4a7f..9e8d8c9d5df5 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx @@ -306,6 +306,13 @@ DECLARE_OOXMLEXPORT_TEST(testFdo72560c, "fdo72560c.docx") CPPUNIT_ASSERT_EQUAL( sal_Int32(style::ParagraphAdjust_LEFT), getProperty< sal_Int32 >( xParaEndRTL, "ParaAdjust" )); } +DECLARE_OOXMLEXPORT_TEST(testFdo72560d, "fdo72560d.docx") +{ +// The problem was libreoffice confuse when RTL was specified in "Normal" when not using Normal at all +CPPUNIT_ASSERT_EQUAL( sal_Int32(style::ParagraphAdjust_RIGHT), getProperty< sal_Int32 >( getParagraph(1), "ParaAdjust" )); +CPPUNIT_ASSERT_EQUAL( sal_Int32(style::ParagraphAdjust_RIGHT), getProperty< sal_Int32 >( getParagraph(1), "ParaAdjust" )); +} + DECLARE_OOXMLEXPORT_TEST(testRPrChangeClosed, "rprchange_closed.docx") { // Redline defined by rPrChanged wasn't removed. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/fdo72560c.docx |binary sw/qa/extras/ooxmlexport/ooxmlexport10.cxx|8 writerfilter/source/dmapper/DomainMapper_Impl.cxx | 10 ++ writerfilter/source/dmapper/StyleSheetTable.cxx |5 + writerfilter/source/dmapper/StyleSheetTable.hxx |1 + 5 files changed, 24 insertions(+) New commits: commit 0fbf627a4beca383c25cc50cfa9d555f18fade53 Author: Justin Luth AuthorDate: Tue Jul 17 09:24:58 2018 +0300 Commit: Justin Luth CommitDate: Tue Jul 24 06:09:20 2018 +0200 tdf#72560 writerfilter: StyleProperty - also check DocDefaults Styles without parents still have inheritance - from the DocDefaults. So, make sure to check those properties too in GetPropertyFromStyleSheet() (and therefore also in GetAnyProperty). Currently, this should only impact when InStyleSheetImport(), but if the docDefaults ever find a way to naturally migrate into LO as doc defaults and not into the style itself, then this will also be useful to check for paragraph properties etc. Change-Id: Ic02cd10c104c0330684308f1380a77009206a664 Reviewed-on: https://gerrit.libreoffice.org/57805 Reviewed-by: Justin Luth Tested-by: Justin Luth diff --git a/sw/qa/extras/ooxmlexport/data/fdo72560c.docx b/sw/qa/extras/ooxmlexport/data/fdo72560c.docx new file mode 100644 index ..ed0b88822066 Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo72560c.docx differ diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx index 381262a85d33..bd90c27c4a7f 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx @@ -298,6 +298,14 @@ DECLARE_OOXMLEXPORT_TEST(testFdo72560b, "fdo72560b.docx") CPPUNIT_ASSERT_EQUAL( sal_Int32(style::ParagraphAdjust_LEFT), getProperty< sal_Int32 >( xParaEndRTL, "ParaAdjust" )); } +DECLARE_OOXMLEXPORT_TEST(testFdo72560c, "fdo72560c.docx") +{ +// The problem was libreoffice confuse when RTL was specified in DocDefaults +uno::Reference xParaEndRTL(getParagraph( 2, "RTL END")); +CPPUNIT_ASSERT_EQUAL(text::WritingMode2::RL_TB, getProperty( xParaEndRTL, "WritingMode" )); +CPPUNIT_ASSERT_EQUAL( sal_Int32(style::ParagraphAdjust_LEFT), getProperty< sal_Int32 >( xParaEndRTL, "ParaAdjust" )); +} + DECLARE_OOXMLEXPORT_TEST(testRPrChangeClosed, "rprchange_closed.docx") { // Redline defined by rPrChanged wasn't removed. diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 7f0bbedfe4e0..6bfb6d7b65b6 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -715,6 +715,16 @@ uno::Any DomainMapper_Impl::GetPropertyFromStyleSheet(PropertyIds eId) pEntry = pNewEntry; } +// not found in style, try the document's DocDefault properties +{ +const PropertyMapPtr& pDefaultParaProps = GetStyleSheetTable()->GetDefaultParaProps(); +if ( pDefaultParaProps ) +{ +boost::optional aProperty = pDefaultParaProps->getProperty(eId); +if ( aProperty ) +return aProperty->second; +} +} return uno::Any(); } diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx index 2c7307a68d5c..8e71f5f28f2d 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.cxx +++ b/writerfilter/source/dmapper/StyleSheetTable.cxx @@ -394,6 +394,11 @@ StyleSheetTable::~StyleSheetTable() { } +PropertyMapPtr const & StyleSheetTable::GetDefaultParaProps() +{ +return m_pImpl->m_pDefaultParaProps; +} + PropertyMapPtr const & StyleSheetTable::GetDefaultCharProps() { return m_pImpl->m_pDefaultCharProps; diff --git a/writerfilter/source/dmapper/StyleSheetTable.hxx b/writerfilter/source/dmapper/StyleSheetTable.hxx index 1d461401055e..a5e1df2685d6 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.hxx +++ b/writerfilter/source/dmapper/StyleSheetTable.hxx @@ -97,6 +97,7 @@ public: OUString getOrCreateCharStyle( PropertyValueVector_t& rCharProperties, bool bAlwaysCreate ); +PropertyMapPtr const & GetDefaultParaProps(); /// Returns the default character properties. PropertyMapPtr const & GetDefaultCharProps(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Generate encryption key
Hello all, I wanted to know how can we generate the encryption key for using wit include/oox/crypto/CryptTools.hxx classes? Thanks, Vikas Mahato ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Question, please
As of a few weeks ago, LODE was working. You just have to be careful to follow every step carefully. You might find some helpful developers on IRC or you can try to fix it yourself. Assuming you are in the lode/dev/core folder, if that make command is failing, you likely missed one of the setup steps. I'd start by repeating the steps starting with: "./setup --help" when you are in ~/lode If that wasn't it, maybe you clone failed. You can verify the status with a "git pull" and a "git status". If that fails, then I'd remove "C:\cygwin" directory and repeat the steps in the wiki from ".\install_cygwin.ps1" in MS PowerShell. Just be sure to read the results of each command and following the associated instructions on the wiki and it will work. -- 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: Branch 'distro/lhm/libreoffice-5-2+backports' - canvas/source
canvas/source/directx/dx_canvasbitmap.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 7baa0738c725959a293966b73efc7787bea40958 Author: Michael Stahl AuthorDate: Tue Jul 24 01:18:38 2018 +0200 Commit: Thorsten Behrens CommitDate: Tue Jul 24 01:19:24 2018 +0200 canvas: error C2397: conversion from 'size_t' to 'BYTE' requires ... a narrowing conversion (at least other people's MSVC says so, mine doesn't complain) (cherry picked from commit f2d039f67743c7588df5cfd725915627b6efb0ba) Conflicts: canvas/source/directx/dx_canvasbitmap.cxx (unrelated en passant fix in 8fe0733b45c161a36fc92da488f9bf72ebfd3bbb) Change-Id: Ic87da76567778884b81361067075fd9325e2d276 diff --git a/canvas/source/directx/dx_canvasbitmap.cxx b/canvas/source/directx/dx_canvasbitmap.cxx index 81e830d0863e..35877ddb639b 100644 --- a/canvas/source/directx/dx_canvasbitmap.cxx +++ b/canvas/source/directx/dx_canvasbitmap.cxx @@ -68,7 +68,8 @@ namespace dxcanvas { // this here fills palette with grey level colors, starting // from 0,0,0 up to 255,255,255 -bmiColors[i] = { (byte)i, (byte)i, (byte)i, (byte)i }; +BYTE const b(i); +bmiColors[i] = { b,b,b,b }; } } }; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-5-2' - canvas/source
canvas/source/directx/dx_canvasbitmap.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit a92e1e04ecfd04d799703f7daf66a8338c7326bc Author: Michael Stahl AuthorDate: Thu May 26 20:34:09 2016 +0200 Commit: Thorsten Behrens CommitDate: Tue Jul 24 00:55:21 2018 +0200 canvas: error C2397: conversion from 'size_t' to 'BYTE' requires ... a narrowing conversion (at least other people's MSVC says so, mine doesn't complain) Change-Id: Ic87da76567778884b81361067075fd9325e2d276 (cherry picked from commit f2d039f67743c7588df5cfd725915627b6efb0ba) diff --git a/canvas/source/directx/dx_canvasbitmap.cxx b/canvas/source/directx/dx_canvasbitmap.cxx index e2e249a9da47..35877ddb639b 100644 --- a/canvas/source/directx/dx_canvasbitmap.cxx +++ b/canvas/source/directx/dx_canvasbitmap.cxx @@ -68,7 +68,8 @@ namespace dxcanvas { // this here fills palette with grey level colors, starting // from 0,0,0 up to 255,255,255 -bmiColors[i] = { i,i,i,i }; +BYTE const b(i); +bmiColors[i] = { b,b,b,b }; } } }; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - basic/source i18npool/source lotuswordpro/inc offapi/com oox/source qadevOOo/tests sw/qa sw/source vbahelper/source
basic/source/runtime/runtime.cxx |2 +- i18npool/source/breakiterator/data/README |4 ++-- lotuswordpro/inc/lwpobjhdr.hxx|2 +- offapi/com/sun/star/drawing/XControlShape.idl |2 +- offapi/com/sun/star/frame/XTitle.idl |2 +- offapi/com/sun/star/text/WritingMode2.idl |2 +- offapi/com/sun/star/ucb/XSourceInitialization.idl |2 +- oox/source/crypto/AgileEngine.cxx |2 +- qadevOOo/tests/java/ifc/view/_XPrintable.java |2 +- sw/qa/extras/uiwriter/uiwriter.cxx|2 +- sw/source/filter/ww8/wrtww8.hxx |4 ++-- sw/source/ui/table/instable.cxx |2 +- vbahelper/source/vbahelper/vbaapplicationbase.cxx |2 +- 13 files changed, 15 insertions(+), 15 deletions(-) New commits: commit ea96a4815e456295ca7454475e54cd8b0ba5c388 Author: Andrea Gelmini AuthorDate: Mon Jul 23 16:24:56 2018 +0200 Commit: Julien Nabet CommitDate: Mon Jul 23 23:40:22 2018 +0200 Fix typos Change-Id: If6e6df9ac592c77f19e381e50b7eb26fbf429f61 Reviewed-on: https://gerrit.libreoffice.org/57831 Reviewed-by: Julien Nabet Tested-by: Jenkins diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx index 9f242dab4ba8..99612cbee157 100644 --- a/basic/source/runtime/runtime.cxx +++ b/basic/source/runtime/runtime.cxx @@ -1818,7 +1818,7 @@ void SbiRuntime::StepSET_Impl( SbxVariableRef& refVal, SbxVariableRef& refVar, b // LHS try determine if a default prop exists // again like in StepPUT (see there too ) we are tweaking the // heuristics again for when to assign an object reference or -// use default memebers if they exists +// use default members if they exist // #FIXME we really need to get to the bottom of this mess bool bObjAssign = false; if ( refVar->GetType() == SbxOBJECT ) diff --git a/i18npool/source/breakiterator/data/README b/i18npool/source/breakiterator/data/README index 63f25a1ccd07..6246b80ae77f 100644 --- a/i18npool/source/breakiterator/data/README +++ b/i18npool/source/breakiterator/data/README @@ -441,7 +441,7 @@ Author: Oliver Bolte Date: Tue Jan 11 10:18:37 2005 + INTEGRATION: CWS i18n15 (1.16.4); FILE MERGED -2004/10/07 18:19:11 khong 1.16.4.1: #i33756# update Hangarian breakiterator +2004/10/07 18:19:11 khong 1.16.4.1: #i33756# update Hungarian breakiterator commit d2a6a31e6981800c2a920f8c6ff901c341a0466e Author: Kurt Zenker @@ -509,7 +509,7 @@ Date: Wed Mar 17 08:02:01 2004 + INTEGRATION: CWS i18n11 (1.12.14); FILE MERGED 2004/02/10 14:21:13 er 1.12.14.3: RESYNC: (1.12-1.13); FILE MERGED -2004/02/05 16:45:30 khong 1.12.14.2: #i24850# fix the problem in previousCharBlock, when target char block is in poistion 1 +2004/02/05 16:45:30 khong 1.12.14.2: #i24850# fix the problem in previousCharBlock, when target char block is in position 1 2004/02/04 02:13:48 khong 1.12.14.1: #i24098# check boundary condition for Sentence, Script, CharBlock breakiterator commit 4da98b648497af30de0fcf1a16e649ce18b0564f diff --git a/lotuswordpro/inc/lwpobjhdr.hxx b/lotuswordpro/inc/lwpobjhdr.hxx index 7c270aff5d34..12c4169bf8e8 100644 --- a/lotuswordpro/inc/lwpobjhdr.hxx +++ b/lotuswordpro/inc/lwpobjhdr.hxx @@ -76,7 +76,7 @@ private: sal_uInt32 m_nSize; //Data size bool m_bCompressed; -//localize the following memebers to save memory +//localize the following members to save memory //sal_uInt8 m_nFlagBits; //sal_uInt32 m_nVersionID; //sal_uInt32 m_nRefCount; diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx index dbbacfa82639..6513d71bf006 100644 --- a/sw/qa/extras/uiwriter/uiwriter.cxx +++ b/sw/qa/extras/uiwriter/uiwriter.cxx @@ -6368,7 +6368,7 @@ void SwUiWriterTest::testFontEmbedding() xStorable->storeToURL(aTempFile.GetURL(), aDescriptor); CPPUNIT_ASSERT(aTempFile.IsValid()); -// Check setting - No font enbedding should be enabled +// Check setting - No font embedding should be enabled pXmlDoc = parseExportInternal(aTempFile.GetURL(),"settings.xml"); CPPUNIT_ASSERT(pXmlDoc); assertXPathContent(pXmlDoc, aSettingsBaseXpath + "/config:config-item[@config:name='EmbedFonts']", "false"); diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx index a60b21f12c86..df66ce5f37aa 100644 --- a/sw/source/filter/ww8/wrtww8.hxx +++ b/sw/source/filter/ww8/wrtww8.hxx @@ -708,7 +708,7 @@ public: /// Setter for pISet. void SetCurItemSet( const SfxItemSet* pS ) { m_pISet = pS; } -/// Remember some of the memebers so that we can recurse in WriteText(). +/// Remember some of the members so that we can recurse in WriteText(). virtual void SaveData( sal_uLong nStt, sal_uLong nEnd ); /// Restore what was
[Libreoffice-commits] core.git: svx/source sw/qa sw/source
svx/source/sdr/properties/attributeproperties.cxx |4 ++-- svx/source/unodraw/unoshap2.cxx |2 +- sw/qa/extras/uiwriter/uiwriter.cxx|2 +- sw/source/core/crsr/crsrsh.cxx|2 +- sw/source/core/layout/laycache.cxx|2 +- sw/source/core/layout/tabfrm.cxx | 10 +- 6 files changed, 11 insertions(+), 11 deletions(-) New commits: commit 73ed7a5179df6543fd3b34d82b5feb9b7277b688 Author: Andrea Gelmini AuthorDate: Tue Jul 17 23:18:09 2018 +0200 Commit: Julien Nabet CommitDate: Mon Jul 23 23:39:34 2018 +0200 Fix typos Change-Id: Ia11646ac8f2f57225a1cf37725c5e0742a8489d9 Reviewed-on: https://gerrit.libreoffice.org/57605 Reviewed-by: Julien Nabet Tested-by: Jenkins diff --git a/svx/source/sdr/properties/attributeproperties.cxx b/svx/source/sdr/properties/attributeproperties.cxx index ebd3f8c14780..ae498d03803c 100644 --- a/svx/source/sdr/properties/attributeproperties.cxx +++ b/svx/source/sdr/properties/attributeproperties.cxx @@ -187,11 +187,11 @@ namespace sdr // be the case already (SdrModel::Merge and SdDrawDocument::InsertBookmarkAsPage // have already cloned the StyleSheets to the target-SdrModel when used in Draw/impress). // If none is found, ImpGetDefaultStyleSheet will be used to set a 'default' -// StyleSheet as StyleSheet implicitely later (that's what happened in the task, +// StyleSheet as StyleSheet implicitly later (that's what happened in the task, // thus the FillStyle changed to the 'default' Blue). // Note: It *may* be necessary to do more for StyleSheets, e.g. clone/copy the // StyleSheet Hierarchy from the source SdrModel and/or add the Items from there -// as hard attibutes. If needed, have a look at the older AttributeProperties::SetModel +// as hard attributes. If needed, have a look at the older AttributeProperties::SetModel // implementation from e.g. libreoffice-6-0. SfxStyleSheetBasePool* pTargetStyleSheetPool(rObj.getSdrModelFromSdrObject().GetStyleSheetPool()); diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index 4aad6e1ec6ee..20040a4ec4f4 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -208,7 +208,7 @@ void SvxShapeGroup::addUnoShape( const uno::Reference< drawing::XShape >& xShape // pSdrShape->SetModel(GetSdrObject()->GetModel()); // #85922# It makes no sense to set the layer asked -// from the group object since these is an iteration +// from the group object since this is an iteration // over the contained objects. In consequence, this // statement erases all layer information from the draw // objects. Layers need to be set at draw objects directly diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx index c4a67c96fce4..dbbacfa82639 100644 --- a/sw/qa/extras/uiwriter/uiwriter.cxx +++ b/sw/qa/extras/uiwriter/uiwriter.cxx @@ -6393,7 +6393,7 @@ void SwUiWriterTest::testFontEmbedding() // CASE 2 - font embedding enabled, but embed used fonts disabled -// Enable font embedding, diable embedding used font only +// Enable font embedding, disable embedding used font only xProps->setPropertyValue("EmbedFonts", uno::makeAny(true)); xProps->setPropertyValue("EmbedOnlyUsedFonts", uno::makeAny(false)); diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx index 6c64ad10a0d1..ccb5ffc84ccf 100644 --- a/sw/source/core/crsr/crsrsh.cxx +++ b/sw/source/core/crsr/crsrsh.cxx @@ -293,7 +293,7 @@ void SwCursorShell::EndAction( const bool bIdleEnd, const bool DoSetPosX ) void SwCursorShell::SttCursorMove() { #ifdef DBG_UTIL -OSL_ENSURE( m_nCursorMove < USHRT_MAX, "To many nested CursorMoves." ); +OSL_ENSURE( m_nCursorMove < USHRT_MAX, "Too many nested CursorMoves." ); #endif ++m_nCursorMove; StartAction(); diff --git a/sw/source/core/layout/laycache.cxx b/sw/source/core/layout/laycache.cxx index 73c38c19f4eb..675d103b3acd 100644 --- a/sw/source/core/layout/laycache.cxx +++ b/sw/source/core/layout/laycache.cxx @@ -1192,7 +1192,7 @@ void SwLayCacheIoImpl::CloseFlagRec() } else { -OSL_ENSURE( pStream->Tell() <= nFlagRecEnd, "To many data read" ); +OSL_ENSURE( pStream->Tell() <= nFlagRecEnd, "Too many data read" ); if( pStream->Tell() != nFlagRecEnd ) pStream->Seek( nFlagRecEnd ); } diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx index 7c62601414f0..73ca3241d909 100644 --- a/sw/source/core/layout/tabfrm.cxx +++ b/sw/source/core/layout/tabfrm.cxx @@ -2861,7 +2861,7 @@ void SwTabFrame::Format( vcl::Render
[Libreoffice-commits] core.git: 2 commits - bridges/source comphelper/source embedserv/source i18npool/source include/comphelper include/svx include/ucbhelper l10ntools/inc odk/examples offapi/com sc/
bridges/source/cpp_uno/gcc3_ios/unwind-cxx.h |6 +++--- comphelper/source/misc/mimeconfighelper.cxx |4 ++-- embedserv/source/embed/syswinwrapper.cxx |2 +- i18npool/source/breakiterator/data/README |2 +- include/comphelper/componentmodule.hxx |2 +- include/svx/svdglev.hxx |2 +- include/svx/svdobj.hxx |2 +- include/ucbhelper/interceptedinteraction.hxx |4 ++-- l10ntools/inc/xmlparse.hxx |2 +- odk/examples/DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/MultiPage.xba |4 ++-- offapi/com/sun/star/presentation/XSlideShowController.idl |2 +- offapi/com/sun/star/sdbc/PreparedStatement.idl |2 +- offapi/com/sun/star/sdbc/ResultSet.idl |2 +- offapi/com/sun/star/sdbc/Statement.idl |2 +- offapi/com/sun/star/ui/XContextChangeEventMultiplexer.idl |2 +- sc/inc/dpfilteredcache.hxx |2 +- sc/inc/validat.hxx |4 ++-- sc/source/ui/inc/csvcontrol.hxx |2 +- sd/source/core/drawdoc.cxx |2 +- sd/source/ui/framework/configuration/ConfigurationUpdater.hxx |2 +- sd/source/ui/sidebar/MasterPagesSelector.hxx |2 +- sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx |8 sdext/source/presenter/PresenterViewFactory.hxx |2 +- sfx2/classification/xAL.xsd |2 +- sfx2/source/appl/sfxhelp.cxx |2 +- solenv/bin/fix-includes.pl |2 +- solenv/bin/modules/installer/windows/idtglobal.pm |4 ++-- svx/source/unodraw/unoshape.cxx |2 +- vcl/opengl/shaders/lineFragmentShader.glsl |2 +- 29 files changed, 39 insertions(+), 39 deletions(-) New commits: commit c7d324a4cb236426849c52005d95a43f1d0c2c1d Author: Andrea Gelmini AuthorDate: Mon Jul 23 16:30:22 2018 +0200 Commit: Julien Nabet CommitDate: Mon Jul 23 23:39:10 2018 +0200 Fix typos Change-Id: I1cc2b1f63326d1d0e1f6e452b93af11e59a2d674 Reviewed-on: https://gerrit.libreoffice.org/57799 Reviewed-by: Julien Nabet Tested-by: Jenkins diff --git a/bridges/source/cpp_uno/gcc3_ios/unwind-cxx.h b/bridges/source/cpp_uno/gcc3_ios/unwind-cxx.h index 6d6c9dbeb987..ee7066931bfc 100644 --- a/bridges/source/cpp_uno/gcc3_ios/unwind-cxx.h +++ b/bridges/source/cpp_uno/gcc3_ios/unwind-cxx.h @@ -87,7 +87,7 @@ struct __cxa_exception // Stack of exceptions in cleanups. __cxa_exception* nextPropagatingException; - // The nuber of active cleanup handlers for this exception. + // The number of active cleanup handlers for this exception. int propagationCount; #else // Cache parsed handler data from the personality routine Phase 1 @@ -135,7 +135,7 @@ struct __cxa_dependent_exception // Stack of exceptions in cleanups. __cxa_exception* nextPropagatingException; - // The nuber of active cleanup handlers for this exception. + // The number of active cleanup handlers for this exception. int propagationCount; #else // Cache parsed handler data from the personality routine Phase 1 @@ -173,7 +173,7 @@ struct __cxa_eh_globals extern "C" __cxa_eh_globals *__cxa_get_globals () throw(); extern "C" __cxa_eh_globals *__cxa_get_globals_fast () throw(); -// Allocate memory for the exception plus the thown object. +// Allocate memory for the exception plus the thrown object. extern "C" void *__cxa_allocate_exception(size_t thrown_size) throw(); // Free the space allocated for the exception. diff --git a/include/comphelper/componentmodule.hxx b/include/comphelper/componentmodule.hxx index 1793953aaf49..67818ac3d8a3 100644 --- a/include/comphelper/com
Question, please
Hi Folks, I'm fairly new to LibreOffice and have attempted to make a build following the wiki page, "LibreOffice Development Environment". I got pretty far but am having a few issues in the step, "../../opt/bin/make 2>&1 | tee build.log". Could someone kindly point me to a developer who might be able to help me? I'd be quite grateful. Thanks, Susan. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Debugging issue #118842
Hi, I am currently working on issue #118842 (https://bugs.documentfoundation.org/show_bug.cgi?id=118842). The problem is the following: when you paste formatted text from the web browser into calc, then undo the paste, the rows height is not restored. Copying from calc itself doesn't cause this error. Simply restoring the lines height will be enough. I actually added a call to "AdjustRowHeight()" after the undo to verify that, and this removes the problem... but I hardly call that a fix :-( I'd like to understand when they're supposed to be restored and why they are not. My understanding so far is that the "undo file" generated before the paste is copied back in place when we make the "undo" (in the "UndoToDocument()" function). The process is very similar in the "working" and "non-working" paths, so I expect the problem to come from the content of the undo file. Could the "undo file" contain the already modified heights? How can I verify? If lines height are not in the undo file at all, how are they supposed to be restored? Is there a way to catch when the lines height is modified? Any answer / pointer for these questions are welcome. And obviously, if you think of other leads I should follow, I'm willing to learn them :) Best regards, Julien ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Weekly QA Report (W29-2018)
Hello, What have happened in QA in the last 7 days? * 122 bugs have been created, of which, 45 are still unconfirmed ( Total Unconfirmed bugs: 394 ) + Created bugs: http://tinyurl.com/ydcgel43 + Still unconfirmed bugs: http://tinyurl.com/y9valy83 * 1061 comments have been written by 174 users. * 42 new users have signed up to Bugzilla. == STATUSES CHANGED == * 21 bugs have been changed to 'ASSIGNED'. + Link: http://tinyurl.com/ybryqz2u + Done by: Xisco Faulí ( 8 ), Miklos Vajna ( 2 ), Mark Hung ( 2 ), Winfried Donkers ( 1 ), Markus Mohrhard ( 1 ), Gabor Kelemen ( 1 ), Justin L ( 1 ), Gülşah Köse ( 1 ), Bartosz ( 1 ), Eike Rathke ( 1 ), balazs.varga991 ( 1 ), Armin Le Grand (CIB) ( 1 ) * 21 bugs have been changed to 'NEEDINFO'. + Link: http://tinyurl.com/y87o7oa3 + Done by: Jean-Baptiste Faure ( 6 ), Timur ( 4 ), Buovjaga ( 2 ), Jacques Guilleron ( 2 ), Xisco Faulí ( 1 ), V Stuart Foote ( 1 ), raal ( 1 ), m.a.riosv ( 1 ), Alex Thurgood ( 1 ), Dieter Praas ( 1 ), Aron Budea ( 1 ) * 61 bugs have been changed to 'NEW'. + Link: http://tinyurl.com/yautqmvv + Done by: Buovjaga ( 16 ), Xisco Faulí ( 12 ), Timur ( 5 ), kompilainenn ( 4 ), raal ( 3 ), Dieter Praas ( 3 ), V Stuart Foote ( 2 ), Heiko Tietze ( 2 ), m.a.riosv ( 2 ), Jean-Baptiste Faure ( 2 ), Telesto ( 1 ), Szymon Kłos ( 1 ), Susan Gessing ( 1 ), Julien Nabet ( 1 ), MM ( 1 ), László Németh ( 1 ), Luke ( 1 ), Gülşah Köse ( 1 ), Adolfo Jayme ( 1 ), Drew Jensen ( 1 ) * 1 bug has been changed to 'REOPENED'. + Link: http://tinyurl.com/ycncmntm + Done by: Kovács Viktor ( 1 ) * 24 bugs have been changed to 'RESOLVED DUPLICATE'. + Link: http://tinyurl.com/y84ayun7 + Done by: Buovjaga ( 5 ), Xisco Faulí ( 4 ), V Stuart Foote ( 2 ), raal ( 2 ), Telesto ( 1 ), m.a.riosv ( 1 ), Mark Hung ( 1 ), Luke ( 1 ), Justin L ( 1 ), Jean-Baptiste Faure ( 1 ), Alex Thurgood ( 1 ), Timur ( 1 ), Adolfo Jayme ( 1 ), Dieter Praas ( 1 ), Aron Budea ( 1 ) * 36 bugs have been changed to 'RESOLVED FIXED'. + Link: http://tinyurl.com/y7osq8h5 + Done by: V Stuart Foote ( 4 ), Armin Le Grand (CIB) ( 4 ), Xisco Faulí ( 3 ), Miklos Vajna ( 3 ), Heiko Tietze ( 3 ), László Németh ( 3 ), Markus Mohrhard ( 2 ), Mark Hung ( 2 ), Caolán McNamara ( 2 ), Jim Raykowski ( 1 ), Noel Grandin ( 1 ), Gabor Kelemen ( 1 ), Jean-Pierre Ledure ( 1 ), Ilhan Yesil ( 1 ), Adolfo Jayme ( 1 ), Drew Jensen ( 1 ), Tamas Bunth ( 1 ), Aron Budea ( 1 ), Katarina Behrens (CIB) ( 1 ) * 4 bugs have been changed to 'RESOLVED INSUFFICIENTDATA'. + Link: http://tinyurl.com/y749odtt + Done by: Timur ( 4 ) * 8 bugs have been changed to 'RESOLVED INVALID'. + Link: http://tinyurl.com/y96t8hvf + Done by: Telesto ( 2 ), Timur ( 2 ), MT ( 1 ), ranvansakal ( 1 ), Jean-Baptiste Faure ( 1 ), Jacques Guilleron ( 1 ) * 11 bugs have been changed to 'RESOLVED NOTABUG'. + Link: http://tinyurl.com/y9utg65k + Done by: Xisco Faulí ( 2 ), Mike Kaganski ( 2 ), Jean-Baptiste Faure ( 2 ), Xavier Van Wijmeersch ( 1 ), V Stuart Foote ( 1 ), Regina Henschel ( 1 ), Justin L ( 1 ), Gerhard Weydt ( 1 ) * 5 bugs have been changed to 'RESOLVED NOTOURBUG'. + Link: http://tinyurl.com/y9oy4zvs + Done by: Alex Thurgood ( 2 ), Buovjaga ( 1 ), Timur ( 1 ), Aron Budea ( 1 ) * 3 bugs have been changed to 'RESOLVED WONTFIX'. + Link: http://tinyurl.com/ycq6rbo9 + Done by: V Stuart Foote ( 1 ), Caolán McNamara ( 1 ), Aron Budea ( 1 ) * 17 bugs have been changed to 'RESOLVED WORKSFORME'. + Link: http://tinyurl.com/ybb6c29w + Done by: Buovjaga ( 4 ), Telesto ( 2 ), Heiko Tietze ( 1 ), Jérôme ( 1 ), Alex Thurgood ( 1 ), Timur ( 1 ), Dmytro Kyrychuk ( 1 ), csongor ( 1 ), John ( 1 ), Artem ( 1 ), alexander-lo ( 1 ), stefan_lange...@t-online.de ( 1 ), Armin Le Grand (CIB) ( 1 ) * 13 bugs have been changed to 'UNCONFIRMED'. + Link: http://tinyurl.com/ybou29ng + Done by: Xisco Faulí ( 2 ), zeynepduyguolmez ( 1 ), Buovjaga ( 1 ), Hardy Strobel ( 1 ), Elmar ( 1 ), MM ( 1 ), Dr. Matthias Weisser ( 1 ), Jean-Baptiste Faure ( 1 ), Alex Fedorov ( 1 ), Dom Walden ( 1 ), Dieter Praas ( 1 ), Michael Zapf ( 1 ) * 29 bugs have been changed to 'VERIFIED FIXED'. + Link: http://tinyurl.com/ydabncom + Done by: Xisco Faulí ( 13 ), Heiko Tietze ( 10 ), Buovjaga ( 2 ), Xavier Van Wijmeersch ( 1 ), V Stuart Foote ( 1 ), Timur ( 1 ), Aron Budea ( 1 ) == KEYWORDS ADDED == * 'bibisectRequest' has been added to 5 bugs. + Link: http://tinyurl.com/ya9yaa47 + Done by: Xisco Faulí ( 2 ), Telesto ( 1 ), Luke ( 1 ), Timur ( 1 ) * 'bibisected' has been added to 25 bugs. + Link: http://tinyurl.com/y9sak2nn + Done by: Xisco Faulí ( 20 ), Buovjaga ( 3 ), sasu.liuhanen ( 1 ), raal ( 1 ) * 'bisected' has been added to 21 bugs. + Link: http://tinyurl.com/y7zsobfc +
[Libreoffice-commits] core.git: svgio/inc svgio/source
svgio/inc/svgpatternnode.hxx |1 svgio/source/svgreader/svgpatternnode.cxx | 71 +- 2 files changed, 52 insertions(+), 20 deletions(-) New commits: commit 2a1e975f4fa67162f3c7b37939fa0a3b771376f5 Author: Caolán McNamara AuthorDate: Mon Jul 23 16:10:08 2018 +0100 Commit: Caolán McNamara CommitDate: Mon Jul 23 22:17:40 2018 +0200 crashtesting: infinite recurse with moz455984-5.svg Change-Id: Idef368c44454ae144b091132cd0d6103f92a6dde Reviewed-on: https://gerrit.libreoffice.org/57854 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/svgio/inc/svgpatternnode.hxx b/svgio/inc/svgpatternnode.hxx index 5aa93b373217..956c8da1812e 100644 --- a/svgio/inc/svgpatternnode.hxx +++ b/svgio/inc/svgpatternnode.hxx @@ -55,6 +55,7 @@ namespace svgio /// link to another pattern used as style. If maXLink /// is set, the node can be fetched on demand by using // tryToFindLink (buffered) +mutable bool mbResolvingLink; // protect against infinite link recursion OUString maXLink; const SvgPatternNode* mpXLink; diff --git a/svgio/source/svgreader/svgpatternnode.cxx b/svgio/source/svgreader/svgpatternnode.cxx index 758a6022f841..5b3d2d726abe 100644 --- a/svgio/source/svgreader/svgpatternnode.cxx +++ b/svgio/source/svgreader/svgpatternnode.cxx @@ -47,6 +47,7 @@ namespace svgio mpPatternUnits(nullptr), mpPatternContentUnits(nullptr), mpaPatternTransform(nullptr), +mbResolvingLink(false), maXLink(), mpXLink(nullptr) { @@ -271,9 +272,12 @@ namespace svgio { const_cast< SvgPatternNode* >(this)->tryToFindLink(); -if(mpXLink) +if (mpXLink && !mbResolvingLink) { -return mpXLink->getPatternPrimitives(); +mbResolvingLink = true; +const drawinglayer::primitive2d::Primitive2DContainer& ret = mpXLink->getPatternPrimitives(); +mbResolvingLink = false; +return ret; } } @@ -301,9 +305,12 @@ namespace svgio const_cast< SvgPatternNode* >(this)->tryToFindLink(); -if(mpXLink) +if (mpXLink && !mbResolvingLink) { -return mpXLink->getViewBox(); +mbResolvingLink = true; +auto ret = mpXLink->getViewBox(); +mbResolvingLink = false; +return ret; } return nullptr; @@ -318,9 +325,12 @@ namespace svgio const_cast< SvgPatternNode* >(this)->tryToFindLink(); -if(mpXLink) +if (mpXLink && !mbResolvingLink) { -return mpXLink->getSvgAspectRatio(); +mbResolvingLink = true; +const SvgAspectRatio& ret = mpXLink->getSvgAspectRatio(); +mbResolvingLink = false; +return ret; } return maSvgAspectRatio; @@ -335,9 +345,12 @@ namespace svgio const_cast< SvgPatternNode* >(this)->tryToFindLink(); -if(mpXLink) +if (mpXLink && !mbResolvingLink) { -return mpXLink->getX(); +mbResolvingLink = true; +const SvgNumber& ret = mpXLink->getX(); +mbResolvingLink = false; +return ret; } return maX; @@ -352,9 +365,12 @@ namespace svgio const_cast< SvgPatternNode* >(this)->tryToFindLink(); -if(mpXLink) +if (mpXLink && !mbResolvingLink) { -return mpXLink->getY(); +mbResolvingLink = true; +const SvgNumber& ret = mpXLink->getY(); +mbResolvingLink = false; +return ret; } return maY; @@ -369,9 +385,12 @@ namespace svgio const_cast< SvgPatternNode* >(this)->tryToFindLink(); -if(mpXLink) +if (mpXLink && !mbResolvingLink) { -return mpXLink->getWidth(); +mbResolvingLink = true; +const SvgNumber& ret = mpXLink->getWidth(); +mbResolvingLink = false; +return ret; } return maWidth; @@ -386,9 +405,12 @@ namespace svgio const_cast< SvgPatternNode* >(this)->tryToFindLink(); -if(mpXLink) +if (mpXLink && !mbResolvingLink) { -return mpXLink->getHeight(); +mbResolvingLink = true; +const SvgNumber& ret = mpXLink->getHeight(); +mbResolvingLink = false; +return ret; }
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - scp2/source
scp2/source/ooo/module_langpack.ulf |6 ++ 1 file changed, 6 insertions(+) New commits: commit 74392bd6a04052c13f0f799f04d4892af716096f Author: Matthias Seidel AuthorDate: Mon Jul 23 19:17:43 2018 + Commit: Matthias Seidel CommitDate: Mon Jul 23 19:17:43 2018 + Adding strings needed for a Kabyle language pack diff --git a/scp2/source/ooo/module_langpack.ulf b/scp2/source/ooo/module_langpack.ulf index 70a3974e4b75..9750f81f6423 100644 --- a/scp2/source/ooo/module_langpack.ulf +++ b/scp2/source/ooo/module_langpack.ulf @@ -633,6 +633,12 @@ en-US = "Georgian" [STR_DESC_MODULE_LANGPACK_KA] en-US = "Installs Georgian support in %PRODUCTNAME %PRODUCTVERSION" +[STR_NAME_MODULE_LANGPACK_KAB] +en-US = "Kabyle" + +[STR_DESC_MODULE_LANGPACK_KAB] +en-US = "Installs Kabyle support in %PRODUCTNAME %PRODUCTVERSION" + [STR_NAME_MODULE_LANGPACK_EO] en-US = "Esperanto" ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/layer/tile/TileLayer.js |7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) New commits: commit dd9aefd5d81839e5c9e2c6b8cc926fcf74380ba6 Author: Henry Castro AuthorDate: Mon Jul 23 14:52:58 2018 -0400 Commit: Henry Castro CommitDate: Mon Jul 23 16:06:39 2018 -0400 loleaflet: mobile: do not zoom out when edits a document Change-Id: Ic5b78df16c8ac0ccfb7334e6809b58665cd04494 diff --git a/loleaflet/src/layer/tile/TileLayer.js b/loleaflet/src/layer/tile/TileLayer.js index f7cee95bd..b53b9b472 100644 --- a/loleaflet/src/layer/tile/TileLayer.js +++ b/loleaflet/src/layer/tile/TileLayer.js @@ -2142,8 +2142,11 @@ L.TileLayer = L.GridLayer.extend({ _fitWidthZoom: function (e, maxZoom) { if (isNaN(this._docWidthTwips)) { return; } - var size = e ? e.newSize : this._map.getSize(); - var widthTwips = size.x * this._map.options.tileWidthTwips / this._tileSize; + var oldSize = e ? e.oldSize : this._map.getSize(); + var newSize = e ? e.newSize : this._map.getSize(); + if (newSize.x - oldSize.x === 0) { return; } + + var widthTwips = newSize.x * this._map.options.tileWidthTwips / this._tileSize; var ratio = widthTwips / this._docWidthTwips; maxZoom = maxZoom ? maxZoom : this.options.maxZoom; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/layer/tile/TileLayer.js | 13 ++--- 1 file changed, 6 insertions(+), 7 deletions(-) New commits: commit f5de78f920ec6f996dd4fbc386d828616733047c Author: Henry Castro AuthorDate: Mon Apr 16 17:17:08 2018 -0400 Commit: Henry Castro CommitDate: Mon Jul 23 16:05:53 2018 -0400 loleaflet: fix when document window zooms out until it disappears Change-Id: If0f7234429130aed47dbc9156fde2e125680638f diff --git a/loleaflet/src/layer/tile/TileLayer.js b/loleaflet/src/layer/tile/TileLayer.js index 9d8cc9e8e..f7cee95bd 100644 --- a/loleaflet/src/layer/tile/TileLayer.js +++ b/loleaflet/src/layer/tile/TileLayer.js @@ -2141,20 +2141,19 @@ L.TileLayer = L.GridLayer.extend({ }, _fitWidthZoom: function (e, maxZoom) { + if (isNaN(this._docWidthTwips)) { return; } var size = e ? e.newSize : this._map.getSize(); var widthTwips = size.x * this._map.options.tileWidthTwips / this._tileSize; - maxZoom = maxZoom ? maxZoom : this._map.getZoom(); + var ratio = widthTwips / this._docWidthTwips; + maxZoom = maxZoom ? maxZoom : this.options.maxZoom; // 'fit width zoom' has no use in spreadsheets, ignore it there if (this._docType !== 'spreadsheet') { var crsScale = this._map.options.crs.scale(1); - if (this._docWidthTwips > 0) - { - var ratio = widthTwips / this._docWidthTwips; - var zoom = this._map.getZoom() + Math.floor(Math.log(ratio) / Math.log(crsScale)); + var zoom = 10 + Math.floor(Math.log(ratio) / Math.log(crsScale)); - zoom = Math.max(1, zoom); - zoom = Math.min(maxZoom, zoom); + zoom = Math.min(maxZoom, Math.max(1, zoom)); + if (this._docWidthTwips * this._map.getZoomScale(zoom, 10) < widthTwips) { this._map.setZoom(zoom, {animate: false}); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/js
loleaflet/js/main.js |1 - 1 file changed, 1 deletion(-) New commits: commit 276a9713c2a4872dd317df5df7481e256ee56137 Author: Henry Castro AuthorDate: Mon Jul 23 15:03:29 2018 -0400 Commit: Henry Castro CommitDate: Mon Jul 23 16:04:04 2018 -0400 Revert "loleflet: disable the document is automatically zoomed ..." This reverts commit dfab8731a9c02233d02f5ec723107a85dbdae2c3. Change-Id: I20ab8eee97b9d6934ea33a1cbb24030d3d5b5a7e diff --git a/loleaflet/js/main.js b/loleaflet/js/main.js index ad38b45ca..83a67153c 100644 --- a/loleaflet/js/main.js +++ b/loleaflet/js/main.js @@ -61,7 +61,6 @@ var map = L.map('map', { wopiSrc: wopiSrc, notWopiButIframe: notWopiButIframe, alwaysActive: alwaysActive, - autoFitWidth: false, idleTimeoutSecs: idleTimeoutSecs, // Dim when user is idle. outOfFocusTimeoutSecs: outOfFocusTimeoutSecs // Dim after switching tabs. }); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Release build fails for LO 6.1.0.1.0+
Le 23/07/2018 à 12:28, Michael Stahl a écrit : Thank you for your answer. Finally it works with the following options added to my autogen.input: --enable-python=fully-internal --without-system-curl Both are necessary to build LO 6.1 in release mode. It was not the case until branch 6.0. It seems I didn't use "make distclean" as I thought I did when I tested this options. Best regards. JBF On 15.07.2018 18:48, Jean-Baptiste Faure wrote: Hi, I try to build LO 6.1 in release mode as I did for previous versions, but it fails with the following error messages: /home/libo/60/instdir/program/libpyuno.so has suspicious NEEDED: libpython3.5m.so.1.0 /home/libo/60/instdir/program/libucpftp1.so has suspicious NEEDED: libcurl-gnutls.so.4 neither of these libraries can be relied upon to be available on any contemporary GNU/Linux system, so these warnings look appropriate to me. /home/libo/60/instdir/program/libucpcmis1lo.so has suspicious NEEDED: libcurl-gnutls.so.4 /home/libo/60/instdir/program/libsvllo.so has suspicious NEEDED: libcurl-gnutls.so.4 /home/libo/60/instdir/program/libpythonloaderlo.so has suspicious NEEDED: libpython3.5m.so.1.0 /home/libo/60/postprocess/CustomTarget_check_dynamic_objects.mk:20 : la recette pour la cible I am running Ubuntu 16.04 x86-64 and the version of curl installed by the system is 7.47.0, using internal curl did not help. using internal curl is really supposed to fix this. did you perhaps forget to "make ucb.clean svl.clean" after changing the flags in autogen.input? I tried to build with the option --enable-python=fully-internal without success. same question, but you'd need "make pyuno.clean". the build system can't automatically rebuild things when configure flags change. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice -- Seuls des formats ouverts peuvent assurer la pérennité de vos documents. Disclaimer: my Internet Provider being located in France, each of our exchanges over Internet will be scanned by French spying services. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: svx/source
svx/source/tbxctrls/fillctrl.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 8b1208d0b931fbac9cbbf593a2044d63b2933d8b Author: Kshitij Pathania AuthorDate: Mon Jul 23 18:40:30 2018 +0530 Commit: Szymon Kłos CommitDate: Mon Jul 23 19:34:54 2018 +0200 Notebookbar: Now no white background is visible behind areafillstyle Change-Id: Ida903be094861991fe36792caa9a6b75738e4f15 Reviewed-on: https://gerrit.libreoffice.org/57847 Tested-by: Jenkins Reviewed-by: Szymon Kłos diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index d1212ed1bdc6..0e3d2ef79936 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -526,6 +526,8 @@ VclPtr SvxFillToolBoxControl::CreateItemWindow(vcl::Window *pParent mpLbFillType = mpFillControl->mpLbFillType; mpLbFillAttr = mpFillControl->mpLbFillAttr; mpToolBoxColor = mpFillControl->mpToolBoxColor; +mpFillControl->SetBackground(); +mpFillControl->SetPaintTransparent( true ); mpFillControl->Resize(); mpToolBoxColor->InsertItem(".uno:FillColor", m_xFrame, ToolBoxItemBits::DROPDOWNONLY, Size(mpToolBoxColor->GetSizePixel().Width(), 0)); ___ 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' - sfx2/source
sfx2/source/doc/objxtor.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit d4052d2ca523cc000132620aaecb59c14c17e20d Author: Markus Mohrhard AuthorDate: Sat Jul 21 01:57:27 2018 +0200 Commit: Michael Meeks CommitDate: Mon Jul 23 19:28:56 2018 +0200 fix shutdown crash when SfxApplication has already been destroyed See e.g. http://crashreport.libreoffice.org/stats/crash_details/dc1ae6ff-923e-44f6-99a9-84893039efd7 Change-Id: I3b5a24bfb62977ca922bf3bececb6676691bf6ea Reviewed-on: https://gerrit.libreoffice.org/57789 Tested-by: Jenkins Reviewed-by: Markus Mohrhard (cherry picked from commit 715fcaff01ed048c52c69264a7a0fb773dd57b32) Reviewed-on: https://gerrit.libreoffice.org/57809 Reviewed-by: Michael Meeks diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index 959666dfcc74..e1a130c7fc79 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -314,13 +314,13 @@ SfxObjectShell::~SfxObjectShell() DELETEX(AutoReloadTimer_Impl, pImpl->pReloadTimer ); SfxApplication *pSfxApp = SfxGetpApp(); -if ( USHRT_MAX != pImpl->nVisualDocumentNumber ) +if ( USHRT_MAX != pImpl->nVisualDocumentNumber && pSfxApp ) pSfxApp->ReleaseIndex(pImpl->nVisualDocumentNumber); // Destroy Basic-Manager pImpl->aBasicManager.reset( nullptr ); -if ( pSfxApp->GetDdeService() ) +if ( pSfxApp && pSfxApp->GetDdeService() ) pSfxApp->RemoveDdeTopic( this ); pImpl->pBaseModel.set( nullptr ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/scalc/guide/edit_multitables.xhp | 56 +++ 1 file changed, 24 insertions(+), 32 deletions(-) New commits: commit c8d840200ba0175a09e5f6c68385f56e09c235ec Author: Sophia Schröder AuthorDate: Sun Jul 22 20:16:41 2018 +0200 Commit: Adolfo Jayme Barrientos CommitDate: Mon Jul 23 19:09:25 2018 +0200 Fix a typo found by Andrea Gelmini -reformatting part Change-Id: If12a0361a9b47878b7df0f562154931437e59fc6 Reviewed-on: https://gerrit.libreoffice.org/57827 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/source/text/scalc/guide/edit_multitables.xhp b/source/text/scalc/guide/edit_multitables.xhp index b787b8cef..e889dc392 100644 --- a/source/text/scalc/guide/edit_multitables.xhp +++ b/source/text/scalc/guide/edit_multitables.xhp @@ -1,7 +1,5 @@ - - - + - - - -Copying to Multiple Sheets -/text/scalc/guide/edit_multitables.xhp - + +Copying to Multiple Sheets +/text/scalc/guide/edit_multitables.xhp + - - - -copying;values, to multiple sheets + +copying;values, to multiple sheets pasting;values in multiple sheets -data;inserting in multiple sheets sheets; simultaneous multiple filling +data;inserting in multiple sheets +sheets; simultaneous multiple filling mw moved "multiple sheets" and "selecting;" to multitables.xhp, transferred "sheets;" from there and deleted "sheets;transferring.." - Copying to Multiple Sheets - +Copying to Multiple Sheets In $[officename] Calc, you can insert values, text or formulas that are simultaneously copied to other selected sheets of your document. - - -Select all desired sheets by holding down the CommandCtrl key and clicking the corresponding register tabs that are still gray at the bottom margin of the workspace. All selected register tabs are now white. -You can use Shift+CommandCtrl+Page Up or Page Down to select multiple sheets using the keyboard. - - -Now when you insert values, text or formulas into the active sheet, they will also appear in the identical positions in the other selected sheets. For example, data entered in cell A1 of the active sheet is automatically entered into cell A1 of any other seleted sheet. - - - - - - - - - + + +Select all desired sheets by holding down the CommandCtrl key and clicking the corresponding register tabs that are still gray at the bottom margin of the workspace. All selected register tabs are now white. +You can use Shift+CommandCtrl+Page Up or Page Down to select multiple sheets using the keyboard. + + +Now when you insert values, text or formulas into the active sheet, they will also appear in the identical positions in the other selected sheets. For example, data entered in cell "A1" of the active sheet is automatically entered into cell "A1" of any other selected sheet. + + + + + + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ec8b4cf748cc12f04cd201b0679868faefa6ac36 Author: Sophia Schröder AuthorDate: Sun Jul 22 20:16:41 2018 +0200 Commit: Gerrit Code Review CommitDate: Mon Jul 23 19:09:25 2018 +0200 Update git submodules * Update helpcontent2 from branch 'master' - Fix a typo found by Andrea Gelmini -reformatting part Change-Id: If12a0361a9b47878b7df0f562154931437e59fc6 Reviewed-on: https://gerrit.libreoffice.org/57827 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/helpcontent2 b/helpcontent2 index c93d46dafd47..c8d840200ba0 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit c93d46dafd476233cde4a84bc1527b317ce7854d +Subproject commit c8d840200ba0175a09e5f6c68385f56e09c235ec ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
GSOC 100 paper cuts update
Hi everyone, I have created a blog post for my GSOC update which you can see here: http://nicksonthanda.me/index.php/2018/07/23/100-paper-cuts-update-23-07/ Thanks, Nickson ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - 2 commits - configure.ac solenv/gbuild
configure.ac |4 +++- solenv/gbuild/platform/com_MSC_defs.mk |4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) New commits: commit 7049a53bd80bf0d41df5e14dee8fa0451897b5b6 Author: Christian Lohmaier AuthorDate: Fri Mar 24 12:57:11 2017 +0100 Commit: Thorsten Behrens CommitDate: Mon Jul 23 18:27:40 2018 +0200 use VS 2015 to target XP with the 7.1A SDK Change-Id: I527a524c282d4314e57c30cdd9eb89bff38443db diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk index 71eb80978129..cc73510bb451 100644 --- a/solenv/gbuild/platform/com_MSC_defs.mk +++ b/solenv/gbuild/platform/com_MSC_defs.mk @@ -54,7 +54,7 @@ gb_COMPILERDEFS := \ -D_MT \ -D_DLL \ -DCPPU_ENV=$(gb_CPPU_ENV) \ - $(if $(findstring 120_70,$(VCVER)_$(WINDOWS_SDK_VERSION)),-D_USING_V110_SDK71_) \ + $(if $(findstring 140_70,$(VCVER)_$(WINDOWS_SDK_VERSION)),-D_USING_V110_SDK71_) \ ifeq ($(CPUNAME),INTEL) gb_COMPILERDEFS += \ commit f3959e00a8487cdbf0b14f6dffd1b4d9bb64074c Author: Mike Kaganski AuthorDate: Mon Oct 23 15:31:52 2017 +0200 Commit: Thorsten Behrens CommitDate: Mon Jul 23 18:27:31 2018 +0200 tdf#112928: don't use "magic statics" for 5.4 (fails on WinXP) https://stackoverflow.com/questions/32517234/access-violation-on-static-initialization Change-Id: Ibda63c6307e6dc4ae1eec4b0c673a987f33bed94 Reviewed-on: https://gerrit.libreoffice.org/43721 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/configure.ac b/configure.ac index 87f3bd45369f..67a25ac49ed6 100644 --- a/configure.ac +++ b/configure.ac @@ -6154,7 +6154,9 @@ if test "$GCC" = "yes"; then else # MSVC has sprouted C++11 thread-safe statics in 2015 # http://blogs.msdn.com/b/vcblog/archive/2015/06/19/c-11-14-17-features-in-vs-2015-rtm.aspx -if test "$COM" = "MSC" -a "$VCVER" -ge "140"; then +# but it doesn't work on Windows XP, so don't use it for 32-bit builds baselined for Windows XP +if test "$COM" = "MSC" -a "$VCVER" -ge "140" -a "$with_windows_sdk" != "7.1A"; then +HAVE_THREADSAFE_STATICS=TRUE AC_DEFINE(HAVE_THREADSAFE_STATICS) AC_MSG_RESULT([yes]) else diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk index b2af97f5f2ac..71eb80978129 100644 --- a/solenv/gbuild/platform/com_MSC_defs.mk +++ b/solenv/gbuild/platform/com_MSC_defs.mk @@ -149,6 +149,7 @@ gb_CFLAGS := \ -Gs \ -GS \ $(if $(MSVC_USE_DEBUG_RUNTIME),-MDd,-MD) \ + $(if $(HAVE_THREADSAFE_STATICS),,-Zc:threadSafeInit-) \ -nologo \ -W4 \ -wd4091 \ @@ -190,6 +191,7 @@ gb_CXXFLAGS := \ -GS \ -Gy \ $(if $(MSVC_USE_DEBUG_RUNTIME),-MDd,-MD) \ + $(if $(HAVE_THREADSAFE_STATICS),,-Zc:threadSafeInit-) \ -nologo \ -W4 \ -wd4091 \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-5-2' - 2 commits - configure.ac solenv/gbuild
configure.ac |4 +++- solenv/gbuild/platform/com_MSC_defs.mk |4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) New commits: commit 89513bf1ae4933405c65a04d57a2a585fa8213d8 Author: Christian Lohmaier AuthorDate: Fri Mar 24 12:57:11 2017 +0100 Commit: Thorsten Behrens CommitDate: Mon Jul 23 18:17:36 2018 +0200 use VS 2015 to target XP with the 7.1A SDK Change-Id: I527a524c282d4314e57c30cdd9eb89bff38443db diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk index 71eb80978129..cc73510bb451 100644 --- a/solenv/gbuild/platform/com_MSC_defs.mk +++ b/solenv/gbuild/platform/com_MSC_defs.mk @@ -54,7 +54,7 @@ gb_COMPILERDEFS := \ -D_MT \ -D_DLL \ -DCPPU_ENV=$(gb_CPPU_ENV) \ - $(if $(findstring 120_70,$(VCVER)_$(WINDOWS_SDK_VERSION)),-D_USING_V110_SDK71_) \ + $(if $(findstring 140_70,$(VCVER)_$(WINDOWS_SDK_VERSION)),-D_USING_V110_SDK71_) \ ifeq ($(CPUNAME),INTEL) gb_COMPILERDEFS += \ commit e0c2c9658438e1d8f0a9423ae6e6a853b111008f Author: Mike Kaganski AuthorDate: Mon Oct 23 15:31:52 2017 +0200 Commit: Thorsten Behrens CommitDate: Mon Jul 23 18:17:35 2018 +0200 tdf#112928: don't use "magic statics" for 5.4 (fails on WinXP) https://stackoverflow.com/questions/32517234/access-violation-on-static-initialization Change-Id: Ibda63c6307e6dc4ae1eec4b0c673a987f33bed94 Reviewed-on: https://gerrit.libreoffice.org/43721 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/configure.ac b/configure.ac index ff114b197de2..be3f4c261a69 100644 --- a/configure.ac +++ b/configure.ac @@ -6108,7 +6108,9 @@ if test "$GCC" = "yes"; then else # MSVC has sprouted C++11 thread-safe statics in 2015 # http://blogs.msdn.com/b/vcblog/archive/2015/06/19/c-11-14-17-features-in-vs-2015-rtm.aspx -if test "$COM" = "MSC" -a "$VCVER" -ge "140"; then +# but it doesn't work on Windows XP, so don't use it for 32-bit builds baselined for Windows XP +if test "$COM" = "MSC" -a "$VCVER" -ge "140" -a "$with_windows_sdk" != "7.1A"; then +HAVE_THREADSAFE_STATICS=TRUE AC_DEFINE(HAVE_THREADSAFE_STATICS) AC_MSG_RESULT([yes]) else diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk index b2af97f5f2ac..71eb80978129 100644 --- a/solenv/gbuild/platform/com_MSC_defs.mk +++ b/solenv/gbuild/platform/com_MSC_defs.mk @@ -149,6 +149,7 @@ gb_CFLAGS := \ -Gs \ -GS \ $(if $(MSVC_USE_DEBUG_RUNTIME),-MDd,-MD) \ + $(if $(HAVE_THREADSAFE_STATICS),,-Zc:threadSafeInit-) \ -nologo \ -W4 \ -wd4091 \ @@ -190,6 +191,7 @@ gb_CXXFLAGS := \ -GS \ -Gy \ $(if $(MSVC_USE_DEBUG_RUNTIME),-MDd,-MD) \ + $(if $(HAVE_THREADSAFE_STATICS),,-Zc:threadSafeInit-) \ -nologo \ -W4 \ -wd4091 \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa
sc/qa/uitest/validity/tdf65686.py | 59 ++ 1 file changed, 59 insertions(+) New commits: commit 4897a75b4703d658f94f88caae6a66375fd73b08 Author: Zdeněk Crhonek AuthorDate: Sun Jul 22 23:10:07 2018 +0200 Commit: Zdenek Crhonek CommitDate: Mon Jul 23 17:57:01 2018 +0200 uitest for bug tdf#65686 Change-Id: I4c50618d0f570978873c13c9e503d5c3d32f9f9d Reviewed-on: https://gerrit.libreoffice.org/57830 Tested-by: Jenkins Reviewed-by: Zdenek Crhonek diff --git a/sc/qa/uitest/validity/tdf65686.py b/sc/qa/uitest/validity/tdf65686.py new file mode 100644 index ..e2bc037c3837 --- /dev/null +++ b/sc/qa/uitest/validity/tdf65686.py @@ -0,0 +1,59 @@ +# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*- +# +# 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 uitest.uihelper.common import get_state_as_dict +from uitest.uihelper.common import select_pos +from uitest.uihelper.calc import enter_text_to_cell +from libreoffice.calc.document import get_cell_by_position +from libreoffice.uno.propertyvalue import mkPropertyValues +#Bug 65686 - EDITING Data > Validity broken (for list entries at least) +class tdf65686(UITestCase): +def test_tdf65686_validity_list(self): +calc_doc = self.ui_test.create_doc_in_start_center("calc") +xCalcDoc = self.xUITest.getTopFocusWindow() +gridwin = xCalcDoc.getChild("grid_window") +document = self.ui_test.get_component() +gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"})) +#- Data > Validity +#- Select Allow List +#- Enter Entries Aap Noot Mies +#- OK +self.ui_test.execute_dialog_through_command(".uno:Validation") +xDialog = self.xUITest.getTopFocusWindow() +xTabs = xDialog.getChild("tabcontrol") +select_pos(xTabs, "0") +xallow = xDialog.getChild("allow") +xallowempty = xDialog.getChild("allowempty") +minlist = xDialog.getChild("minlist") + +props = {"TEXT": "List"} +actionProps = mkPropertyValues(props) +xallow.executeAction("SELECT", actionProps) +minlist.executeAction("TYPE", mkPropertyValues({"TEXT":"Aap"})) +minlist.executeAction("TYPE", mkPropertyValues({"KEYCODE": "RETURN"})) +minlist.executeAction("TYPE", mkPropertyValues({"TEXT":"Noot"})) +minlist.executeAction("TYPE", mkPropertyValues({"KEYCODE": "RETURN"})) +minlist.executeAction("TYPE", mkPropertyValues({"TEXT":"Mies"})) +xOKBtn = xDialog.getChild("ok") +self.ui_test.close_dialog_through_button(xOKBtn) +#- again open Data > Validity +#> there are empty lines in the list Entries +self.ui_test.execute_dialog_through_command(".uno:Validation") +xDialog = self.xUITest.getTopFocusWindow() +xallow = xDialog.getChild("allow") +xallowempty = xDialog.getChild("allowempty") +minlist = xDialog.getChild("minlist") + +self.assertEqual(get_state_as_dict(xallow)["SelectEntryText"], "List") +self.assertEqual(get_state_as_dict(minlist)["Text"], "Aap\nNoot\nMies") + +xOKBtn = xDialog.getChild("ok") +self.ui_test.close_dialog_through_button(xOKBtn) + +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
GSoC Weekly update for UI Test logger
Hello! I have updated my progress here- http://chiranias.blogspot.com/2018/07/gsoc-work-report-week-10.html Regards, Saurav ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sal/textenc
sal/textenc/tcvtkr6.tab |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6582602a126403185294afe9e3c2cd8479f9157b Author: Caolán McNamara AuthorDate: Mon Jul 23 09:23:54 2018 +0100 Commit: Stephan Bergmann CommitDate: Mon Jul 23 17:30:34 2018 +0200 ofz#9507 wrong start point for Johab block 59 Change-Id: I011f4cbb10324c4a7d4e1be3ab1355291f79730b Reviewed-on: https://gerrit.libreoffice.org/57839 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/sal/textenc/tcvtkr6.tab b/sal/textenc/tcvtkr6.tab index 1685963408c3..61d87c930b5b 100644 --- a/sal/textenc/tcvtkr6.tab +++ b/sal/textenc/tcvtkr6.tab @@ -1013,7 +1013,7 @@ static ImplUniToDBCSHighTab const aJOHABDBCSHighTab[256] = { 0x06, 0xFA, aImplUniToDBCSTab_JOHAB_56 }, /* 0x56 */ { 0x03, 0xFC, aImplUniToDBCSTab_JOHAB_57 }, /* 0x57 */ { 0x00, 0xFD, aImplUniToDBCSTab_JOHAB_58 }, /* 0x58 */ -{ 0x07, 0xFF, aImplUniToDBCSTab_JOHAB_59 }, /* 0x59 */ +{ 0x0F, 0xFF, aImplUniToDBCSTab_JOHAB_59 }, /* 0x59 */ { 0x01, 0xE9, aImplUniToDBCSTab_JOHAB_5A }, /* 0x5A */ { 0x05, 0xFA, aImplUniToDBCSTab_JOHAB_5B }, /* 0x5B */ { 0x01, 0xFD, aImplUniToDBCSTab_JOHAB_5C }, /* 0x5C */ ___ 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' - sal/textenc
sal/textenc/tcvtkr6.tab |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9e60c8c3f76ef6ca7a23a3f7d34d8c244ad8333a Author: Caolán McNamara AuthorDate: Mon Jul 23 09:23:54 2018 +0100 Commit: Stephan Bergmann CommitDate: Mon Jul 23 17:29:53 2018 +0200 ofz#9507 wrong start point for Johab block 59 Change-Id: I011f4cbb10324c4a7d4e1be3ab1355291f79730b Reviewed-on: https://gerrit.libreoffice.org/57840 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/sal/textenc/tcvtkr6.tab b/sal/textenc/tcvtkr6.tab index 1685963408c3..61d87c930b5b 100644 --- a/sal/textenc/tcvtkr6.tab +++ b/sal/textenc/tcvtkr6.tab @@ -1013,7 +1013,7 @@ static ImplUniToDBCSHighTab const aJOHABDBCSHighTab[256] = { 0x06, 0xFA, aImplUniToDBCSTab_JOHAB_56 }, /* 0x56 */ { 0x03, 0xFC, aImplUniToDBCSTab_JOHAB_57 }, /* 0x57 */ { 0x00, 0xFD, aImplUniToDBCSTab_JOHAB_58 }, /* 0x58 */ -{ 0x07, 0xFF, aImplUniToDBCSTab_JOHAB_59 }, /* 0x59 */ +{ 0x0F, 0xFF, aImplUniToDBCSTab_JOHAB_59 }, /* 0x59 */ { 0x01, 0xE9, aImplUniToDBCSTab_JOHAB_5A }, /* 0x5A */ { 0x05, 0xFA, aImplUniToDBCSTab_JOHAB_5B }, /* 0x5B */ { 0x01, 0xFD, aImplUniToDBCSTab_JOHAB_5C }, /* 0x5C */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/osl
sal/osl/w32/procimpl.cxx |1 + sal/osl/w32/socket.cxx |1 + 2 files changed, 2 insertions(+) New commits: commit 968476c557267ddf78ba894c6ce174cdc0ea84e0 Author: Stephan Bergmann AuthorDate: Mon Jul 23 17:26:07 2018 +0200 Commit: Stephan Bergmann CommitDate: Mon Jul 23 17:26:07 2018 +0200 Missing includes (--disable-pch) Change-Id: Ie3427dfbbdf6ecf96b4fc36c534022dc881b3957 diff --git a/sal/osl/w32/procimpl.cxx b/sal/osl/w32/procimpl.cxx index c4e2390f94b6..af3a967ac2a7 100644 --- a/sal/osl/w32/procimpl.cxx +++ b/sal/osl/w32/procimpl.cxx @@ -25,6 +25,7 @@ #include "file-impl.hxx" #include "procimpl.hxx" +#include #include #include #include "secimpl.hxx" diff --git a/sal/osl/w32/socket.cxx b/sal/osl/w32/socket.cxx index bf27bba1a04d..6d9be8dd2930 100644 --- a/sal/osl/w32/socket.cxx +++ b/sal/osl/w32/socket.cxx @@ -22,6 +22,7 @@ #include #include #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: 2 commits - sc/CppunitTest_sc_namedrangesobj.mk sfx2/uiconfig
sc/CppunitTest_sc_namedrangesobj.mk | 41 +--- sfx2/uiconfig/ui/documentfontspage.ui | 170 ++ 2 files changed, 97 insertions(+), 114 deletions(-) New commits: commit a1b58837206fec2fe89a8a16567b1e1499ec9385 Author: Jens Carl AuthorDate: Mon Jul 23 04:23:45 2018 + Commit: Jens Carl CommitDate: Mon Jul 23 17:21:39 2018 +0200 Remove obsolete (cargo-cult copied) dependencies Change-Id: I1a926f45510e18cf399aa2eb7e1bf0ad8f4f0226 Reviewed-on: https://gerrit.libreoffice.org/57836 Tested-by: Jenkins Reviewed-by: Jens Carl diff --git a/sc/CppunitTest_sc_namedrangesobj.mk b/sc/CppunitTest_sc_namedrangesobj.mk index 0f36a8ece33e..558981fe6bba 100644 --- a/sc/CppunitTest_sc_namedrangesobj.mk +++ b/sc/CppunitTest_sc_namedrangesobj.mk @@ -14,48 +14,19 @@ $(eval $(call gb_CppunitTest_CppunitTest,sc_namedrangesobj)) $(eval $(call gb_CppunitTest_use_external,sc_namedrangesobj,boost_headers)) $(eval $(call gb_CppunitTest_add_exception_objects,sc_namedrangesobj, \ -sc/qa/extras/scnamedrangesobj \ + sc/qa/extras/scnamedrangesobj \ )) $(eval $(call gb_CppunitTest_use_libraries,sc_namedrangesobj, \ -basegfx \ -comphelper \ -cppu \ -cppuhelper \ -drawinglayer \ -editeng \ -for \ -forui \ -i18nlangtag \ -msfilter \ -oox \ -sal \ -salhelper \ -sax \ -sb \ -sc \ -sfx \ -sot \ -subsequenttest \ -svl \ -svt \ -svx \ -svxcore \ + cppu \ + sal \ + subsequenttest \ test \ -tk \ -tl \ -ucbhelper \ unotest \ -utl \ -vbahelper \ -vcl \ -xo \ )) $(eval $(call gb_CppunitTest_set_include,sc_namedrangesobj,\ --I$(SRCDIR)/sc/source/ui/inc \ --I$(SRCDIR)/sc/inc \ -$$(INCLUDE) \ + $$(INCLUDE) \ )) $(eval $(call gb_CppunitTest_use_sdk_api,sc_namedrangesobj)) @@ -64,7 +35,7 @@ $(eval $(call gb_CppunitTest_use_ure,sc_namedrangesobj)) $(eval $(call gb_CppunitTest_use_vcl,sc_namedrangesobj)) $(eval $(call gb_CppunitTest_use_components,sc_namedrangesobj,\ -$(sc_unoapi_common_components) \ + $(sc_unoapi_common_components) \ )) $(eval $(call gb_CppunitTest_use_configuration,sc_namedrangesobj)) commit dafcb7f57961227b3ebae5f4ae8edae27bd0cbe5 Author: heiko tietze AuthorDate: Mon Jul 23 15:44:54 2018 +0200 Commit: Heiko Tietze CommitDate: Mon Jul 23 17:21:26 2018 +0200 tdf#118760 Inconsistent label "Select font scripts to embed" Fixed also alignment and accelerator issues Change-Id: I3182b98a793ebc3d2e9d11975842bf7aac010d7c Reviewed-on: https://gerrit.libreoffice.org/57848 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/sfx2/uiconfig/ui/documentfontspage.ui b/sfx2/uiconfig/ui/documentfontspage.ui index a32fb1d4ed7f..44fdaf383541 100644 --- a/sfx2/uiconfig/ui/documentfontspage.ui +++ b/sfx2/uiconfig/ui/documentfontspage.ui @@ -21,9 +21,10 @@ 6 12 - + True False +vertical _Embed fonts in the document @@ -35,13 +36,14 @@ True -0 -0 +False +True +0 -Only embed fonts that are used in documents +_Only embed fonts that are used in documents True True False @@ -50,84 +52,94 @@ True -0 -1 +False +True +1 + + + + + + + + +True +False +Font embedding + + + + + + + +0 +0 + + + + +True +False +0 +none + + +True +False +6 +12 + + +True +False +vertical + + +_Latin fonts +True +True +False +True +0 +True + + +False +True +0 + + + + +_Asian fonts +True +True +
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - vcl/unx
vcl/unx/gtk3/gtk3gtkframe.cxx | 18 +- 1 file changed, 17 insertions(+), 1 deletion(-) New commits: commit e6e9bae8f3eefa1e4529886ea995cc4cf8e3d817 Author: Caolán McNamara AuthorDate: Tue Jul 17 21:29:46 2018 +0100 Commit: Caolán McNamara CommitDate: Mon Jul 23 17:12:46 2018 +0200 Resolves: tdf#118302 drag n drop to same tab should cancel dnd dropComplete is used to do this, follow the mac pattern here to propogate this in the drag and drop from self to self case. Maybe this also affects tdf#105320 ? Change-Id: I2b8f8b0e0486f6ee45a65918fae2537750a75f2d Reviewed-on: https://gerrit.libreoffice.org/57591 Tested-by: Jenkins Reviewed-by: Xisco Faulí diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx index 49ec49862164..4ee63a98da95 100644 --- a/vcl/unx/gtk3/gtk3gtkframe.cxx +++ b/vcl/unx/gtk3/gtk3gtkframe.cxx @@ -3373,6 +3373,9 @@ namespace } } +static bool g_DropSuccessSet = false; +static bool g_DropSuccess = false; + class GtkDropTargetDropContext : public cppu::WeakImplHelper { GdkDragContext *m_pContext; @@ -3398,6 +3401,11 @@ public: virtual void SAL_CALL dropComplete(sal_Bool bSuccess) override { gtk_drag_finish(m_pContext, bSuccess, false, m_nTime); +if (GtkDragSource::g_ActiveDragSource) +{ +g_DropSuccessSet = true; +g_DropSuccess = bSuccess; +} } }; @@ -4297,9 +4305,12 @@ void GtkDragSource::startDrag(const datatransfer::dnd::DragGestureEvent& rEvent, // For LibreOffice internal D&D we provide the Transferable without Gtk // intermediaries as a shortcut, see tdf#100097 for how dbaccess depends on this g_ActiveDragSource = this; +g_DropSuccessSet = false; +g_DropSuccess = false; m_pFrame->startDrag(nDragButton, rEvent.DragOriginX, rEvent.DragOriginY, VclToGdk(sourceActions), pTargetList); + gtk_target_list_unref(pTargetList); for (auto &a : aGtkTargets) g_free(a.target); @@ -4394,7 +4405,12 @@ void GtkDragSource::dragEnd(GdkDragContext* context) { datatransfer::dnd::DragSourceDropEvent aEv; aEv.DropAction = GdkToVcl(gdk_drag_context_get_selected_action(context)); -aEv.DropSuccess = true; +// an internal drop can accept the drop but fail with dropComplete( false ) +// this is different than the GTK API +if (g_DropSuccessSet) +aEv.DropSuccess = g_DropSuccess; +else +aEv.DropSuccess = true; auto xListener = m_xListener; m_xListener.clear(); xListener->dragDropEnd(aEv); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/qt5
vcl/qt5/Qt5Instance.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit bded890a44cc3cc7ce07113565ce80469697f73f Author: Jan-Marek Glogowski AuthorDate: Mon Jul 23 11:58:07 2018 + Commit: Jan-Marek Glogowski CommitDate: Mon Jul 23 17:12:40 2018 +0200 Qt5 just release the SolarMutex for Qt events Just like the other backends, just release the SolarMutex when processing Qt events and keep it for user events. Change-Id: I0c4a7149f1541607b546a99e51e790836bc9b2f9 Reviewed-on: https://gerrit.libreoffice.org/57844 Tested-by: Jenkins Reviewed-by: Katarina Behrens Reviewed-by: Jan-Marek Glogowski diff --git a/vcl/qt5/Qt5Instance.cxx b/vcl/qt5/Qt5Instance.cxx index cf45dacf835a..c365afbe8ec2 100644 --- a/vcl/qt5/Qt5Instance.cxx +++ b/vcl/qt5/Qt5Instance.cxx @@ -140,6 +140,7 @@ std::shared_ptr Qt5Instance::CreateSalBitmap() bool Qt5Instance::ImplYield(bool bWait, bool bHandleAllCurrentEvents) { +// Re-aquire the guard for user events when called via Q_EMIT ImplYieldSignal SolarMutexGuard aGuard; bool wasEvent = DispatchUserEvents(bHandleAllCurrentEvents); if (!bHandleAllCurrentEvents && wasEvent) @@ -149,6 +150,7 @@ bool Qt5Instance::ImplYield(bool bWait, bool bHandleAllCurrentEvents) * Quoting the Qt docs: [QAbstractEventDispatcher::processEvents] processes * pending events that match flags until there are no more events to process. */ +SolarMutexReleaser aReleaser; QAbstractEventDispatcher* dispatcher = QAbstractEventDispatcher::instance(qApp->thread()); if (bWait && !wasEvent) wasEvent = dispatcher->processEvents(QEventLoop::WaitForMoreEvents); @@ -162,8 +164,6 @@ bool Qt5Instance::DoYield(bool bWait, bool bHandleAllCurrentEvents) bool bWasEvent = false; if (qApp->thread() == QThread::currentThread()) { -// release YieldMutex (and re-acquire in ImplYield) -SolarMutexReleaser aReleaser; bWasEvent = ImplYield(bWait, bHandleAllCurrentEvents); if (bWasEvent) m_aWaitingYieldCond.set(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source desktop/source
dbaccess/source/core/api/RowSetBase.hxx |2 +- desktop/source/deployment/registry/help/dp_helpbackenddb.hxx |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit deafd385566a5e65d0fe33780db2fcd3825f369e Author: Andrea Gelmini AuthorDate: Thu Jul 19 16:33:19 2018 +0200 Commit: Julien Nabet CommitDate: Mon Jul 23 16:55:32 2018 +0200 Fix typos Change-Id: I9671ad7c9e75b9e10abf46bc6b53fcd760acecbf Reviewed-on: https://gerrit.libreoffice.org/57599 Tested-by: Jenkins Reviewed-by: Julien Nabet Reviewed-by: Christian Lohmaier diff --git a/dbaccess/source/core/api/RowSetBase.hxx b/dbaccess/source/core/api/RowSetBase.hxx index 630209ae9bf3..a6508b362952 100644 --- a/dbaccess/source/core/api/RowSetBase.hxx +++ b/dbaccess/source/core/api/RowSetBase.hxx @@ -74,7 +74,7 @@ namespace dbaccess protected: typedef std::vector TDataColumns; ::osl::Mutex* m_pMutex; // this the mutex form the rowset itself -::osl::Mutex// we need a extra mutex for columns to prevend deadlock when setting new values +::osl::Mutex// we need a extra mutex for columns to prevent deadlock when setting new values // for a row m_aColumnsMutex; diff --git a/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx b/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx index 50621abd576a..ad030ee60f58 100644 --- a/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx +++ b/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx @@ -65,7 +65,7 @@ public: void addEntry(OUString const & url, Data const & data); ::boost::optional getEntry(OUString const & url); -//must also return the data urls for entries with @activ="false". That is, +//must also return the data urls for entries with @active="false". That is, //those are currently revoked. std::vector< OUString> getAllDataUrls(); ___ 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
Hello Community, I have written a blog regarding the work I've done this week: https://medium.com/@ekanshjha/gsoc18-smartart-week-10-e89dc3a2f274 Regards, Ekansh Jha ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/core/text/porfld.cxx |2 +- sw/source/uibase/uiview/viewtab.cxx | 12 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) New commits: commit c13865a4caf7898c4e59a5b22bbd493d6dad9661 Author: Noel Grandin AuthorDate: Mon Jul 23 15:08:41 2018 +0200 Commit: Noel Grandin CommitDate: Mon Jul 23 16:35:56 2018 +0200 tdf#118716 Inner border of an embedded table can't be dragged around regression from commit f14b9d30293f180500fc56d81e5390021758e7c1 convert (a>b?a:b) to std::max(a,b) In this code int a; std::max(a,0) std::max will first convert a and b to sal_uInt16, therefore potentially converting a negative number to a positive number due to the conversion rules. Then it will take the larger number. While this code int a; static_cast(a > 0 ? a : 0) will compare first, and then convert the larger number to sal_uInt16, which might result in making a "a" that is larger than 2^16 into a smaller value, but which will never convert a negative "a" value into a positive value. Change-Id: Id4f6df0089b1a74ea4ac1c5d05655e7c1d8f0c7f Reviewed-on: https://gerrit.libreoffice.org/57846 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx index 20b18918a5aa..a3cb46ea7f68 100644 --- a/sw/source/core/text/porfld.cxx +++ b/sw/source/core/text/porfld.cxx @@ -828,7 +828,7 @@ bool SwGrfNumPortion::Format( SwTextFormatInfo &rInf ) const bool bFull = rInf.Width() < rInf.X() + Width(); const bool bFly = rInf.GetFly() || ( rInf.GetLast() && rInf.GetLast()->IsFlyPortion() ); -SetAscent( std::max(GetRelPos(), 0) ); +SetAscent( GetRelPos() > 0 ? GetRelPos() : 0 ); if( GetAscent() > Height() ) Height( GetAscent() ); diff --git a/sw/source/uibase/uiview/viewtab.cxx b/sw/source/uibase/uiview/viewtab.cxx index cf6ad5d195b7..a823ec0c4705 100644 --- a/sw/source/uibase/uiview/viewtab.cxx +++ b/sw/source/uibase/uiview/viewtab.cxx @@ -1700,8 +1700,8 @@ void SwView::StateTabWin(SfxItemSet& rSet) const int nRgt = (bTableVertical ? nPageHeight : nPageWidth) - (aTabCols.GetLeftMin() + aTabCols.GetRight()); -const sal_uInt16 nL = std::max< sal_uInt16 >(nLft, 0); -const sal_uInt16 nR = std::max< sal_uInt16 >(nRgt, 0); +const sal_uInt16 nL = static_cast< sal_uInt16 >(std::max(nLft, 0)); +const sal_uInt16 nR = static_cast< sal_uInt16 >(std::max(nRgt, 0)); SvxColumnItem aColItem(nNum, nL, nR); @@ -1937,8 +1937,8 @@ void SwView::StateTabWin(SfxItemSet& rSet) const int nRgt = (bVerticalWriting ? nPageWidth : nPageHeight) - (aTabCols.GetLeftMin() + aTabCols.GetRight()); -const sal_uInt16 nL = std::max< sal_uInt16 >(nLft, 0); -const sal_uInt16 nR = std::max< sal_uInt16 >(nRgt, 0); +const sal_uInt16 nL = static_cast< sal_uInt16 >(std::max(nLft, 0)); +const sal_uInt16 nR = static_cast< sal_uInt16 >(std::max(nRgt, 0)); SvxColumnItem aColItem(0, nL, nR); @@ -2011,8 +2011,8 @@ void SwView::StateTabWin(SfxItemSet& rSet) const int nLft = aTabCols.GetLeftMin() + aTabCols.GetLeft(); const int nRgt = nPageWidth -(aTabCols.GetLeftMin() + aTabCols.GetRight()); -const sal_uInt16 nL = std::max< sal_uInt16 >(nLft, 0); -const sal_uInt16 nR = std::max< sal_uInt16 >(nRgt, 0); +const sal_uInt16 nL = static_cast< sal_uInt16 >(std::max(nLft, 0)); +const sal_uInt16 nR = static_cast< sal_uInt16 >(std::max(nRgt, 0)); aRectangle.SetLeft( nL ); if(nNum > 1) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svtools/source toolkit/inc
svtools/source/inc/svtaccessiblefactory.hxx |2 +- toolkit/inc/helper/accessibilityclient.hxx |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit ad7d72f0381f6a16db5c6c7bee538c475c233555 Author: Andrea Gelmini AuthorDate: Mon Jul 23 16:20:05 2018 +0200 Commit: Julien Nabet CommitDate: Mon Jul 23 16:31:57 2018 +0200 Fix typos of commit 26f1fc7 Thanks to Noel Grandin and Juline Nabet Change-Id: Ie12c7bd7e2b6c6a1f2c3e7173f11a84f19137568 Reviewed-on: https://gerrit.libreoffice.org/57851 Reviewed-by: Julien Nabet Reviewed-by: Noel Grandin Tested-by: Noel Grandin diff --git a/svtools/source/inc/svtaccessiblefactory.hxx b/svtools/source/inc/svtaccessiblefactory.hxx index 507ae2abfc85..4f07046323bb 100644 --- a/svtools/source/inc/svtaccessiblefactory.hxx +++ b/svtools/source/inc/svtaccessiblefactory.hxx @@ -31,7 +31,7 @@ namespace svt instance, which is used for creating all kind of Accessibility related components. -When the AccessibleFactoryAccess goes always, this factory goes always, to, and the respective +When the AccessibleFactoryAccess goes away, this factory goes away, to, and the respective library is unloaded. This class is not thread-safe. diff --git a/toolkit/inc/helper/accessibilityclient.hxx b/toolkit/inc/helper/accessibilityclient.hxx index 4fe670c6364c..6af3e3edd117 100644 --- a/toolkit/inc/helper/accessibilityclient.hxx +++ b/toolkit/inc/helper/accessibilityclient.hxx @@ -31,7 +31,7 @@ namespace toolkit instance, which is used for creating all kind of Accessibility related components. -When the AccessibilityClient goes always, this factory goes always, to, and the respective +When the AccessibilityClient goes away, this factory goes away, to, and the respective library is unloaded. This class is not thread-safe. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/doc/docfile.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 036d8cb359c3d08793ed371c554a3ce3196f725d Author: Noel Grandin AuthorDate: Mon Jul 23 11:56:08 2018 +0200 Commit: Caolán McNamara CommitDate: Mon Jul 23 16:31:41 2018 +0200 crashtesting: ooo72057-1.doc fallout from commit 65e41592a650887c pass SvStream around by std::unique_ptr The backtrace where it was was freeing the SvStream we need is below, the code seems dodgy because it is re-creating the underlying SvStream. Before 65e41592a650887c, it just leaked the SvStream. 0 SvStream::~SvStream() at tools/source/stream/stream.cxx:369 1 SvFileStream::~SvFileStream() at tools/source/stream/strmunx.cxx:300 2 SvFileStream::~SvFileStream() at tools/source/stream/strmunx.cxx:298 3 std::default_delete::operator()(SvStream*) const 4 std::unique_ptr >::reset(SvStream*) 5 std::unique_ptr >::operator=(std::unique_ptr >&&) 6 SfxMedium::GetMedium_Impl() at sfx2/source/doc/docfile.cxx:2603 7 SfxMedium::GetInputStream() at sfx2/source/doc/docfile.cxx:3329 8 ImportExcel8::ReadBasic() at sc/source/filter/excel/excimp8.cxx:391 9 ImportExcel8::PostDocLoad() at sc/source/filter/excel/excimp8.cxx:425 10 ImportExcel8::Read() (this=0x4727a10) at sc/source/filter/excel/read.cxx:1298 11 ScFormatFilterPluginImpl::ScImportExcel(SfxMedium&, ScDocument*, EXCIMPFORMAT) at sc/source/filter/excel/excel.cxx:142 Change-Id: I4fb769a7da71ef9a27ddef1581448efb3d303bde Reviewed-on: https://gerrit.libreoffice.org/57843 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index 56a976572e25..ced74fa616e2 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -2597,7 +2597,7 @@ void SfxMedium::GetMedium_Impl() if ( !GetError() && !pImpl->xStream.is() && !pImpl->xInputStream.is() ) SetError(ERRCODE_IO_ACCESSDENIED); -if ( !GetError() ) +if ( !GetError() && !pImpl->m_pInStream ) { if ( pImpl->xStream.is() ) pImpl->m_pInStream = utl::UcbStreamHelper::CreateStream( pImpl->xStream ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Crash test update
New crashtest update available at http://dev-builds.libreoffice.org/crashtest/c629e87679aaf4f620788b428219fd578881afda/ exportCrashes.csv Description: Binary data importCrash.csv Description: Binary data validationErrors.csv Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/compiler.cxx | 11 ++- 1 file changed, 10 insertions(+), 1 deletion(-) New commits: commit 0549b5dded97cd6b315531baf50a874f5bb53155 Author: Eike Rathke AuthorDate: Mon Jul 23 15:16:18 2018 +0200 Commit: Eike Rathke CommitDate: Mon Jul 23 15:18:18 2018 +0200 HandleIIOpCode: testing for ForceArray is not sufficient There are also other "force to array" context modes in which a range reference does not result in an implicit intersection. Change-Id: I3f4d85f73ecde5bbf9f011deeac2936d5f43949b diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx index cab029d5e78b..b7e62c52e3df 100644 --- a/sc/source/core/tool/compiler.cxx +++ b/sc/source/core/tool/compiler.cxx @@ -5844,9 +5844,18 @@ void ScCompiler::HandleIIOpCode(OpCode nOpCode, formula::ParamClass eClass, Form if (nNumParams != 1) return; -if (eClass == formula::ForceArray || mbMatrixFlag) +// NOTE: eClass is the CurrentFactor token's GetInForceArray() state, +// not the function's parameter classification. +if (mbMatrixFlag || +eClass == formula::ForceArray || +eClass == formula::ReferenceOrForceArray || +eClass == formula::SuppressedReferenceOrForceArray) return; +/* TODO: this assumes that there is no function taking a single + * parameter that does evaluate a range reference. There currently + * isn't any, but we should rather check that. */ + if ((*pppToken[0])->GetType() != svDoubleRef) return; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Hi everyone!
I'm Caio from south Brazil and I'm a former student at computer science at state university of maringá with previous experience with ERP development for the financial sector. I've been working with c++ for almost two and a half years since college and now I'm trying to improve my skills. I have lots of available time since I'm not currently employed and I'm aiming to use this time to contribute with the open source community. I just sent my first patch to review. I spent the last weeks studying through the Development wiki and setting up the basics to build LO and now I think maybe I'm ready. best regards, Caio Boffo Silva ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-5-2' - 2 commits - external/python3
external/python3/ExternalProject_python3.mk |2 + external/python3/internal-zlib.patch.0 | 55 2 files changed, 57 insertions(+) New commits: commit c65e855d381bcc1e048252624009eeba09163e22 Author: David Tardon AuthorDate: Thu Nov 3 17:16:29 2016 +0100 Commit: Thorsten Behrens CommitDate: Mon Jul 23 15:08:16 2018 +0200 fix build of bundled python3 with bundled zlib Change-Id: I383a04ea926187263b1d7e11c548817fa9ca3fb6 (cherry picked from commit b2c16b3563a4a8e4b54f6fc0cb1be597e7c5b27d) diff --git a/external/python3/ExternalProject_python3.mk b/external/python3/ExternalProject_python3.mk index ee4c90243462..f91399c0af52 100755 --- a/external/python3/ExternalProject_python3.mk +++ b/external/python3/ExternalProject_python3.mk @@ -93,6 +93,7 @@ $(call gb_ExternalProject_get_state_target,python3,build) : )" \ && MAKEFLAGS= $(MAKE) \ $(if $(filter MACOSX,$(OS)),DESTDIR=$(EXTERNAL_WORKDIR)/python-inst install) \ + $(if $(SYSTEM_ZLIB),,ZLIB_INCDIR=$(WORKDIR)/UnpackedTarball/zlib) \ && ln -s build/lib.* LO_lib \ ) diff --git a/external/python3/internal-zlib.patch.0 b/external/python3/internal-zlib.patch.0 index d045f468231c..abe2630bd2e7 100644 --- a/external/python3/internal-zlib.patch.0 +++ b/external/python3/internal-zlib.patch.0 @@ -19,6 +19,15 @@ --- setup.py +++ setup.py +@@ -1362,7 +1362,7 @@ + # + # You can upgrade zlib to version 1.1.4 yourself by going to + # http://www.gzip.org/zlib/ +-zlib_inc = find_file('zlib.h', [], inc_dirs) ++zlib_inc = [os.environ.get('ZLIB_INCDIR')] + have_zlib = False + if zlib_inc is not None: + zlib_h = zlib_inc[0] + '/zlib.h' @@ -1379,13 +1379,13 @@ version = line.split()[2] break commit 4fd6effb6e85398d4143f09897cc6215d75686dc Author: Stephan Bergmann AuthorDate: Fri Sep 16 16:07:47 2016 +0200 Commit: Thorsten Behrens CommitDate: Mon Jul 23 15:08:16 2018 +0200 external/python3: Fix building against external/zlib ...whose (static) library is called "zlib" instead of just "z". (I ran into this when trying to do a 32-bit Linux build in a 64-bit environment, with only very limited 32-bit support installed in the system.) Reviewed-on: https://gerrit.libreoffice.org/28964 Reviewed-by: Stephan Bergmann Tested-by: Stephan Bergmann (cherry picked from commit 5fb8a050210a7cabf49daac0da8f80b94d60de2c) Conflicts: external/python3/ExternalProject_python3.mk Change-Id: I9286975917ddf643a22803561677af035e66fb98 diff --git a/external/python3/ExternalProject_python3.mk b/external/python3/ExternalProject_python3.mk index 38ed6700435e..ee4c90243462 100755 --- a/external/python3/ExternalProject_python3.mk +++ b/external/python3/ExternalProject_python3.mk @@ -85,6 +85,7 @@ $(call gb_ExternalProject_get_state_target,python3,build) : LDFLAGS="$(strip $(LDFLAGS) \ $(if $(SYSTEM_OPENSSL),,-L$(call gb_UnpackedTarball_get_dir,openssl)) \ $(if $(SYSTEM_EXPAT),,-L$(gb_StaticLibrary_WORKDIR)) \ + $(if $(SYSTEM_ZLIB),,-L$(gb_StaticLibrary_WORKDIR)) \ $(if $(SYSBASE), -L$(SYSBASE)/usr/lib) \ $(if $(filter WNT-GCC,$(OS)-$(COM)), -shared-libgcc \ $(if $(MINGW_SHARED_GCCLIB),-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2 -Wl$(COMMA)--export-all-symbols)) \ diff --git a/external/python3/internal-zlib.patch.0 b/external/python3/internal-zlib.patch.0 new file mode 100644 index ..d045f468231c --- /dev/null +++ b/external/python3/internal-zlib.patch.0 @@ -0,0 +1,46 @@ +--- configure configure +@@ -11607,13 +11607,13 @@ + ;; + esac + +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflateCopy in -lz" >&5 +-$as_echo_n "checking for inflateCopy in -lz... " >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflateCopy in -lzlib" >&5 ++$as_echo_n "checking for inflateCopy in -lzlib... " >&6; } + if ${ac_cv_lib_z_inflateCopy+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lz $LIBS" ++LIBS="-lzlib $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +--- setup.py setup.py +@@ -1379,13 +1379,13 @@ + version = line.split()[2] + break + if version >= version_req: +-if (self.compiler.find_library_file(lib_dirs, 'z')): ++if (self.compiler.find_library_file(lib_dirs, 'zlib')): + if host_platform == "darwin": + zlib_extra_link_args = ('-Wl,-search_paths_first',) + else: +
Caio Boffo Silva license statement
All of my past & future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sfx2/source
sfx2/source/doc/objxtor.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 7b62c5266e62c3fb0ce1285949d51020075a3f81 Author: Markus Mohrhard AuthorDate: Sat Jul 21 01:57:27 2018 +0200 Commit: Michael Meeks CommitDate: Mon Jul 23 14:23:47 2018 +0200 fix shutdown crash when SfxApplication has already been destroyed See e.g. http://crashreport.libreoffice.org/stats/crash_details/dc1ae6ff-923e-44f6-99a9-84893039efd7 Change-Id: I3b5a24bfb62977ca922bf3bececb6676691bf6ea Reviewed-on: https://gerrit.libreoffice.org/57789 Tested-by: Jenkins Reviewed-by: Markus Mohrhard (cherry picked from commit 715fcaff01ed048c52c69264a7a0fb773dd57b32) Reviewed-on: https://gerrit.libreoffice.org/57808 Reviewed-by: Michael Meeks diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index a71748111969..88270d13f4a2 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -313,13 +313,13 @@ SfxObjectShell::~SfxObjectShell() DELETEZ( pImpl->pReloadTimer ); SfxApplication *pSfxApp = SfxGetpApp(); -if ( USHRT_MAX != pImpl->nVisualDocumentNumber ) +if ( USHRT_MAX != pImpl->nVisualDocumentNumber && pSfxApp ) pSfxApp->ReleaseIndex(pImpl->nVisualDocumentNumber); // Destroy Basic-Manager pImpl->aBasicManager.reset( nullptr ); -if ( pSfxApp->GetDdeService() ) +if ( pSfxApp && pSfxApp->GetDdeService() ) pSfxApp->RemoveDdeTopic( this ); pImpl->pBaseModel.set( nullptr ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source framework/source svtools/source toolkit/inc
cui/source/tabpages/autocdlg.cxx|2 +- framework/source/services/autorecovery.cxx |4 ++-- svtools/source/inc/svtaccessiblefactory.hxx |2 +- toolkit/inc/helper/accessibilityclient.hxx |2 +- 4 files changed, 5 insertions(+), 5 deletions(-) New commits: commit 26f1fc7c520b442a3c56b3346a19d921e1574f81 Author: Andrea Gelmini AuthorDate: Sun Jul 22 16:29:24 2018 +0200 Commit: Julien Nabet CommitDate: Mon Jul 23 14:18:49 2018 +0200 Fix typos Change-Id: I4bb060a6a65ca27bba8d16c268660bedef8b0ed5 Reviewed-on: https://gerrit.libreoffice.org/57821 Reviewed-by: Julien Nabet Tested-by: Jenkins diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 16a92adb7d0b..f221bb9da9e7 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -2577,7 +2577,7 @@ IMPL_LINK_NOARG(OfaSmartTagOptionsTabPage, CheckHdl, CheckBox&, void) // if the controls are currently enabled, we still have to check // if the properties button should be disabled because the currently -// seleted smart tag type does not have a properties dialog. +// selected smart tag type does not have a properties dialog. // We do this by calling SelectHdl: if ( bEnable ) SelectHdl(m_pSmartTagTypesLB); diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index 16747d702357..fb33427d2e67 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -3623,7 +3623,7 @@ void AutoRecovery::implts_doEmergencySave(const DispatchParams& aParams) officecfg::Office::Recovery::RecoveryInfo::Crashed::set(true, batch); batch->commit(); -// for all docs, store their current view/names in the configurtion +// for all docs, store their current view/names in the configuration implts_persistAllActiveViewNames(); // The called method for saving documents runs @@ -3688,7 +3688,7 @@ void AutoRecovery::implts_doSessionSave(const DispatchParams& aParams) // Be sure to know all open documents really .-) implts_verifyCacheAgainstDesktopDocumentList(); -// for all docs, store their current view/names in the configurtion +// for all docs, store their current view/names in the configuration implts_persistAllActiveViewNames(); // The called method for saving documents runs diff --git a/svtools/source/inc/svtaccessiblefactory.hxx b/svtools/source/inc/svtaccessiblefactory.hxx index bdaf70b72274..507ae2abfc85 100644 --- a/svtools/source/inc/svtaccessiblefactory.hxx +++ b/svtools/source/inc/svtaccessiblefactory.hxx @@ -31,7 +31,7 @@ namespace svt instance, which is used for creating all kind of Accessibility related components. -When the AccessibleFactoryAccess goes aways, this factory goes aways, to, and the respective +When the AccessibleFactoryAccess goes always, this factory goes always, to, and the respective library is unloaded. This class is not thread-safe. diff --git a/toolkit/inc/helper/accessibilityclient.hxx b/toolkit/inc/helper/accessibilityclient.hxx index 69d2761c36e4..4fe670c6364c 100644 --- a/toolkit/inc/helper/accessibilityclient.hxx +++ b/toolkit/inc/helper/accessibilityclient.hxx @@ -31,7 +31,7 @@ namespace toolkit instance, which is used for creating all kind of Accessibility related components. -When the AccessibilityClient goes aways, this factory goes aways, to, and the respective +When the AccessibilityClient goes always, this factory goes always, to, and the respective library is unloaded. This class is not thread-safe. ___ 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/stgcache.hxx |2 +- sot/source/sdstor/stgio.cxx|6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) New commits: commit 810eed8646eacd665004d95359f21ce5e23fc795 Author: Noel Grandin AuthorDate: Mon Jul 23 11:52:54 2018 +0200 Commit: Noel Grandin CommitDate: Mon Jul 23 13:28:10 2018 +0200 make some fields in StgCache private Change-Id: Ia44131f2ebee0c162b05c8019cf3600181aea5e0 Reviewed-on: https://gerrit.libreoffice.org/57842 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/sot/source/sdstor/stgcache.hxx b/sot/source/sdstor/stgcache.hxx index b4262c80a1bc..f0bd2e1d25a3 100644 --- a/sot/source/sdstor/stgcache.hxx +++ b/sot/source/sdstor/stgcache.hxx @@ -56,9 +56,9 @@ class StgCache void Erase( const rtl::Reference< StgPage >& ); // delete a cache element rtl::Reference< StgPage > Create( sal_Int32 ); // create a cached page -protected: SvStream* m_pStrm;// physical stream bool m_bMyStream;// true: delete stream in dtor +protected: bool m_bFile;// true: file stream sal_Int32 Page2Pos( sal_Int32 ) const;// page address --> file position public: diff --git a/sot/source/sdstor/stgio.cxx b/sot/source/sdstor/stgio.cxx index a7e8863c6efd..e05460f4ae39 100644 --- a/sot/source/sdstor/stgio.cxx +++ b/sot/source/sdstor/stgio.cxx @@ -54,7 +54,7 @@ StgIo::~StgIo() bool StgIo::Load() { -if( m_pStrm ) +if( GetStrm() ) { if( m_aHdr.Load( *this ) ) { @@ -141,8 +141,8 @@ bool StgIo::CommitAll() m_aHdr.SetTOCStart( m_pTOC->GetStart() ); if( m_aHdr.Store( *this ) ) { -m_pStrm->Flush(); -const ErrCode n = m_pStrm->GetError(); +GetStrm()->Flush(); +const ErrCode n = GetStrm()->GetError(); SetError( n ); #ifdef DBG_UTIL if( n==ERRCODE_NONE ) ValidateFATs(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/kde5/KDE5SalGraphics.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 8ab0f9f3aa3abd84c70d84613dd0412d84fd8f92 Author: Stephan Bergmann AuthorDate: Mon Jul 23 13:08:39 2018 +0200 Commit: Stephan Bergmann CommitDate: Mon Jul 23 13:08:39 2018 +0200 loplugin:unnecessaryparen Change-Id: Ie28001cf1eb5259f479caecdfb50355f98b80b7f diff --git a/vcl/unx/kde5/KDE5SalGraphics.cxx b/vcl/unx/kde5/KDE5SalGraphics.cxx index f26e559b921e..0c1aeb48c5a8 100644 --- a/vcl/unx/kde5/KDE5SalGraphics.cxx +++ b/vcl/unx/kde5/KDE5SalGraphics.cxx @@ -469,7 +469,7 @@ bool KDE5SalGraphics::drawNativeControl(ControlType type, ControlPart part, { QStyleOptionButton option; // clear FOCUSED bit, focus is drawn separately -nControlState &= ~(ControlState::FOCUSED); +nControlState &= ~ControlState::FOCUSED; draw(QStyle::CE_CheckBox, &option, m_image.get(), vclStateValue2StateFlag(nControlState, value)); } @@ -551,7 +551,7 @@ bool KDE5SalGraphics::drawNativeControl(ControlType type, ControlPart part, { QStyleOptionButton option; // clear FOCUSED bit, focus is drawn separately -nControlState &= ~(ControlState::FOCUSED); +nControlState &= ~ControlState::FOCUSED; draw(QStyle::CE_RadioButton, &option, m_image.get(), vclStateValue2StateFlag(nControlState, value)); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/qt5
vcl/qt5/Qt5Instance.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit bb035edcadf0d7e77e45b421ac6c06c1f3183465 Author: Katarina Behrens AuthorDate: Fri Jul 20 16:04:48 2018 +0200 Commit: Thorsten Behrens CommitDate: Mon Jul 23 12:40:06 2018 +0200 Avoid deadlock in case of events not driven by the user e.g. progress bar updates. Release and re-acquire SolarMutex Change-Id: Ie4e12fed7b2b8ee9bcb163334d82e466025cb7fa Reviewed-on: https://gerrit.libreoffice.org/57780 Tested-by: Jenkins Reviewed-by: Thorsten Behrens diff --git a/vcl/qt5/Qt5Instance.cxx b/vcl/qt5/Qt5Instance.cxx index fc06d47d317b..cf45dacf835a 100644 --- a/vcl/qt5/Qt5Instance.cxx +++ b/vcl/qt5/Qt5Instance.cxx @@ -140,6 +140,7 @@ std::shared_ptr Qt5Instance::CreateSalBitmap() bool Qt5Instance::ImplYield(bool bWait, bool bHandleAllCurrentEvents) { +SolarMutexGuard aGuard; bool wasEvent = DispatchUserEvents(bHandleAllCurrentEvents); if (!bHandleAllCurrentEvents && wasEvent) return true; @@ -161,6 +162,8 @@ bool Qt5Instance::DoYield(bool bWait, bool bHandleAllCurrentEvents) bool bWasEvent = false; if (qApp->thread() == QThread::currentThread()) { +// release YieldMutex (and re-acquire in ImplYield) +SolarMutexReleaser aReleaser; bWasEvent = ImplYield(bWait, bHandleAllCurrentEvents); if (bWasEvent) m_aWaitingYieldCond.set(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Release build fails for LO 6.1.0.1.0+
On 15.07.2018 18:48, Jean-Baptiste Faure wrote: Hi, I try to build LO 6.1 in release mode as I did for previous versions, but it fails with the following error messages: /home/libo/60/instdir/program/libpyuno.so has suspicious NEEDED: libpython3.5m.so.1.0 /home/libo/60/instdir/program/libucpftp1.so has suspicious NEEDED: libcurl-gnutls.so.4 neither of these libraries can be relied upon to be available on any contemporary GNU/Linux system, so these warnings look appropriate to me. /home/libo/60/instdir/program/libucpcmis1lo.so has suspicious NEEDED: libcurl-gnutls.so.4 /home/libo/60/instdir/program/libsvllo.so has suspicious NEEDED: libcurl-gnutls.so.4 /home/libo/60/instdir/program/libpythonloaderlo.so has suspicious NEEDED: libpython3.5m.so.1.0 /home/libo/60/postprocess/CustomTarget_check_dynamic_objects.mk:20 : la recette pour la cible I am running Ubuntu 16.04 x86-64 and the version of curl installed by the system is 7.47.0, using internal curl did not help. using internal curl is really supposed to fix this. did you perhaps forget to "make ucb.clean svl.clean" after changing the flags in autogen.input? I tried to build with the option --enable-python=fully-internal without success. same question, but you'd need "make pyuno.clean". the build system can't automatically rebuild things when configure flags change. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/drawinglayer include/editeng include/filter include/framework include/oox include/unotools include/vcl include/xmloff io/test
include/drawinglayer/primitive2d/animatedprimitive2d.hxx |2 +- include/editeng/adjustitem.hxx |2 +- include/editeng/hangulhanja.hxx |2 +- include/filter/msfilter/escherex.hxx |2 +- include/framework/addonsoptions.hxx |2 +- include/oox/ppt/pptfilterhelpers.hxx |2 +- include/unotools/cmdoptions.hxx |2 +- include/unotools/dynamicmenuoptions.hxx |2 +- include/vcl/IconThemeScanner.hxx |2 +- include/xmloff/xmlexp.hxx|2 +- io/test/testconnection.cxx |2 +- 11 files changed, 11 insertions(+), 11 deletions(-) New commits: commit 2bceb245e60be2cf973c7b9d586b74881f66fbef Author: Andrea Gelmini AuthorDate: Thu Jul 19 16:24:58 2018 +0200 Commit: Julien Nabet CommitDate: Mon Jul 23 11:59:51 2018 +0200 Fix typos Change-Id: Id7d0de124c4b9006db8c28e5cebb3ba38b0143ee Reviewed-on: https://gerrit.libreoffice.org/57602 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/include/drawinglayer/primitive2d/animatedprimitive2d.hxx b/include/drawinglayer/primitive2d/animatedprimitive2d.hxx index 770a0a74baea..6ccb2acd64aa 100644 --- a/include/drawinglayer/primitive2d/animatedprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/animatedprimitive2d.hxx @@ -68,7 +68,7 @@ namespace drawinglayer protected: /** write access right for classes deriving from this who want to do special things (e.g. optimization, buffering). -Caution: This is an exception from the read-only, non-modifyable paradigm +Caution: This is an exception from the read-only, non-modifiable paradigm for primitives, so special preparations may be needed. Usually should only be used for initialization (e.g. in a derived constructor) */ diff --git a/include/editeng/adjustitem.hxx b/include/editeng/adjustitem.hxx index e53c1f1d8519..beeb6bebdf9c 100644 --- a/include/editeng/adjustitem.hxx +++ b/include/editeng/adjustitem.hxx @@ -41,7 +41,7 @@ class EDITENG_DLLPUBLIC SvxAdjustItem : public SfxEnumItemInterface boolbCenter: 1; boolbBlock : 1; -// only activ when bBlock +// only active when bBlock boolbOneBlock : 1; boolbLastCenter : 1; boolbLastBlock : 1; diff --git a/include/editeng/hangulhanja.hxx b/include/editeng/hangulhanja.hxx index 2fcf02077129..034db6022c8d 100644 --- a/include/editeng/hangulhanja.hxx +++ b/include/editeng/hangulhanja.hxx @@ -194,7 +194,7 @@ namespace editeng Note an important thing about the indices: They are always relative to the previous call of ReplaceUnit. This means when you get a call to ReplaceUnit, and replace some text -in your document, than you have to remember the document position immediately behind +in your document, then you have to remember the document position immediately behind the changed text. In a next call to ReplaceUnit, an index of 0 will denote exactly this position behind the previous replacement The reason is that this class here does not know anything about your document structure, diff --git a/include/filter/msfilter/escherex.hxx b/include/filter/msfilter/escherex.hxx index e31116562d75..63219bebde51 100644 --- a/include/filter/msfilter/escherex.hxx +++ b/include/filter/msfilter/escherex.hxx @@ -818,7 +818,7 @@ public: ); // Because shadow properties depends to the line and fillstyle, the CreateShadowProperties method should be called at last. -// It activ only when at least a FillStyle or LineStyle is set. +// It's active only when at least a FillStyle or LineStyle is set. voidCreateShadowProperties( const css::uno::Reference< css::beans::XPropertySet > & ); diff --git a/include/framework/addonsoptions.hxx b/include/framework/addonsoptions.hxx index 68050cb9f611..001d248f7dc5 100644 --- a/include/framework/addonsoptions.hxx +++ b/include/framework/addonsoptions.hxx @@ -120,7 +120,7 @@ class FWE_DLLPUBLIC AddonsOptions /*- @short returns the complete addons menu @descr Call it to get all entries of the addon menu. -We return a list of all nodes with his names and properties. +We return a list of all nodes with its names and properties. @return A list of menu items is returned. @onerrorWe return an empty list. diff --git a/include/oox/ppt/pptfilterhelpers.hx
[Libreoffice-commits] core.git: cli_ure/source desktop/source extensions/source javaunohelper/com reportbuilder/java sd/source sfx2/source ucb/source xmloff/source xmlsecurity/source
cli_ure/source/climaker/climaker_emit.cxx |4 ++-- desktop/source/deployment/registry/executable/dp_executable.cxx |2 +- extensions/source/ole/oleobjw.hxx |2 +- extensions/source/ole/unoobjw.cxx |2 +- javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java |2 +- reportbuilder/java/org/libreoffice/report/pentaho/parser/rpt/ImageReadHandler.java |4 ++-- sd/source/ui/animations/CustomAnimationDialog.cxx |4 ++-- sd/source/ui/inc/ViewShell.hxx |2 +- sfx2/source/dialog/filtergrouping.cxx |2 +- ucb/source/sorter/sortresult.cxx |2 +- xmloff/source/text/txtimp.cxx |2 +- xmlsecurity/source/helper/xsecctl.cxx |2 +- xmlsecurity/source/xmlsec/nss/nssinitializer.cxx |4 ++-- 13 files changed, 17 insertions(+), 17 deletions(-) New commits: commit 7d071f35bee7bed82ac47429a594e76617518d20 Author: Andrea Gelmini AuthorDate: Sun Jul 22 23:27:34 2018 +0200 Commit: Julien Nabet CommitDate: Mon Jul 23 11:44:59 2018 +0200 Fix typos Change-Id: Iebc31a53404da41f35eed7338662365d7efbd7a2 Reviewed-on: https://gerrit.libreoffice.org/57810 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/cli_ure/source/climaker/climaker_emit.cxx b/cli_ure/source/climaker/climaker_emit.cxx index 162963b6f15d..bfd0b88a05f7 100644 --- a/cli_ure/source/climaker/climaker_emit.cxx +++ b/cli_ure/source/climaker/climaker_emit.cxx @@ -660,7 +660,7 @@ Assembly ^ TypeEmitter::type_resolve( } //In case of an instantiated polymorphic struct we want to return a -//uno.PolymorphicType (inherits Type) rather then Type. This is neaded for constructing +//uno.PolymorphicType (inherits Type) rather than Type. This is needed for constructing //the service code. We can only do that if the struct is completed. if (m_generated_structs[cts_name]) { @@ -823,7 +823,7 @@ Assembly ^ TypeEmitter::type_resolve( { for (int i = 0; i < seqBaseTypes.getLength(); i++) { -//make sure we get the interface rather then a typedef +//make sure we get the interface rather than a typedef Reference aBaseType = resolveInterfaceTypedef( seqBaseTypes[i]); diff --git a/desktop/source/deployment/registry/executable/dp_executable.cxx b/desktop/source/deployment/registry/executable/dp_executable.cxx index 5f7eb30519d3..64be7a09992e 100644 --- a/desktop/source/deployment/registry/executable/dp_executable.cxx +++ b/desktop/source/deployment/registry/executable/dp_executable.cxx @@ -244,7 +244,7 @@ void BackendImpl::ExecutablePackageImpl::processPackage_( //installed. That is an executable must have the right flags OSL_ASSERT(false); -//This won't have affect on Windows +//This won't have effect on Windows osl::File::setAttributes( dp_misc::expandUnoRcUrl(m_url), attributes); } diff --git a/extensions/source/ole/oleobjw.hxx b/extensions/source/ole/oleobjw.hxx index 793e00a12a18..1ba5b8a5ebbf 100644 --- a/extensions/source/ole/oleobjw.hxx +++ b/extensions/source/ole/oleobjw.hxx @@ -220,7 +220,7 @@ protected: CComPtr m_spDispatch; OUString m_sTypeName; // is "" ( not initialised ), "IDispatch" ( we have no idea ) or "SomeLibrary.SomeTypeName" if we managed to get a type /** This value is set during XInitialization::initialize. It indicates that the COM interface -was transported as VT_DISPATCH in a VARIANT rather then a VT_UNKNOWN +was transported as VT_DISPATCH in a VARIANT rather than a VT_UNKNOWN */ bool m_bOriginalDispatch; DispIdMap m_dispIdMap; diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx index 0c0347320096..4165fbfbac83 100644 --- a/extensions/source/ole/unoobjw.cxx +++ b/extensions/source/ole/unoobjw.cxx @@ -1650,7 +1650,7 @@ static bool writeBackOutParameter(VARIANTARG* pDest, VARIANT* pSource) // if caller accept VARIANT as out parameter, any value must be converted if (V_VT(pDest) == (VT_VARIANT | VT_BYREF)) { -// When the user provides a VARIANT rather then a concrete type +// When the user provides a VARIANT rather than a concrete type // we just copy the source to the out, in/out parameter // VT_DISPATCH, VT_UNKNOWN, VT_ARRAY, VT_BSTR in the VARIANT that // is contained in pDest are
[Libreoffice-commits] core.git: sal/textenc
sal/textenc/tcvtkr6.tab |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 934fa68365b40c9dcfe5ae4a0e712195e0c1d5a4 Author: Caolán McNamara AuthorDate: Mon Jul 23 09:23:54 2018 +0100 Commit: Caolán McNamara CommitDate: Mon Jul 23 11:42:26 2018 +0200 ofz#9507 wrong start point for Johab block 59 Change-Id: I011f4cbb10324c4a7d4e1be3ab1355291f79730b Reviewed-on: https://gerrit.libreoffice.org/57838 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/sal/textenc/tcvtkr6.tab b/sal/textenc/tcvtkr6.tab index 1685963408c3..61d87c930b5b 100644 --- a/sal/textenc/tcvtkr6.tab +++ b/sal/textenc/tcvtkr6.tab @@ -1013,7 +1013,7 @@ static ImplUniToDBCSHighTab const aJOHABDBCSHighTab[256] = { 0x06, 0xFA, aImplUniToDBCSTab_JOHAB_56 }, /* 0x56 */ { 0x03, 0xFC, aImplUniToDBCSTab_JOHAB_57 }, /* 0x57 */ { 0x00, 0xFD, aImplUniToDBCSTab_JOHAB_58 }, /* 0x58 */ -{ 0x07, 0xFF, aImplUniToDBCSTab_JOHAB_59 }, /* 0x59 */ +{ 0x0F, 0xFF, aImplUniToDBCSTab_JOHAB_59 }, /* 0x59 */ { 0x01, 0xE9, aImplUniToDBCSTab_JOHAB_5A }, /* 0x5A */ { 0x05, 0xFA, aImplUniToDBCSTab_JOHAB_5B }, /* 0x5B */ { 0x01, 0xFD, aImplUniToDBCSTab_JOHAB_5C }, /* 0x5C */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/uiconfig
cui/uiconfig/ui/bitmaptabpage.ui |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9dd24a925871b623774aec63a0fab289687125df Author: Jim Raykowski AuthorDate: Sun Jul 22 16:07:20 2018 -0800 Commit: Katarina Behrens CommitDate: Mon Jul 23 11:35:01 2018 +0200 Set can_focus true for Area tab page Bitmap listbox can_focus property needs to be true for tab navigation to stop here Change-Id: If9ed0cefc652369243d623a311ba92e2941bd43f Reviewed-on: https://gerrit.libreoffice.org/57834 Tested-by: Jenkins Reviewed-by: Katarina Behrens diff --git a/cui/uiconfig/ui/bitmaptabpage.ui b/cui/uiconfig/ui/bitmaptabpage.ui index 0489bb926c30..69ebb75224ad 100644 --- a/cui/uiconfig/ui/bitmaptabpage.ui +++ b/cui/uiconfig/ui/bitmaptabpage.ui @@ -31,7 +31,7 @@ True -False +True True True ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source sc/uiconfig sd/uiconfig svx/uiconfig sw/uiconfig
sc/source/ui/navipi/content.cxx |2 +- sc/uiconfig/scalc/ui/navigatorpanel.ui|4 ++-- sc/uiconfig/scalc/ui/sidebaralignment.ui | 10 +- sc/uiconfig/scalc/ui/sidebarcellappearance.ui |8 sc/uiconfig/scalc/ui/sidebarnumberformat.ui |4 ++-- sd/uiconfig/simpress/ui/navigatorpanel.ui |2 +- svx/uiconfig/ui/defaultshapespanel.ui | 20 ++-- svx/uiconfig/ui/sidebarparagraph.ui | 16 svx/uiconfig/ui/sidebartextpanel.ui | 18 +- sw/uiconfig/swriter/ui/navigatorpanel.ui |2 +- 10 files changed, 43 insertions(+), 43 deletions(-) New commits: commit d5a432c7d2b2c1cbfd18f38c6f671ebb0a0cddd4 Author: Jim Raykowski AuthorDate: Sun Jul 15 13:01:02 2018 -0800 Commit: Katarina Behrens CommitDate: Mon Jul 23 10:18:01 2018 +0200 tdf#118764 Add missing tab stops in sidebar panels Change-Id: I09d5df8d7f07eb4b6c4341d9cd281131fc2df23b Reviewed-on: https://gerrit.libreoffice.org/57535 Tested-by: Jenkins Reviewed-by: Katarina Behrens diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx index b800833e1b43..08c51ae97c4b 100644 --- a/sc/source/ui/navipi/content.cxx +++ b/sc/source/ui/navipi/content.cxx @@ -123,7 +123,7 @@ ScDocShell* ScContentTree::GetManualOrCurrent() // ScContentTree ScContentTree::ScContentTree(vcl::Window* pParent, ScNavigatorDlg* pNavigatorDlg) -: SvTreeListBox(pParent, WB_BORDER) +: SvTreeListBox(pParent, WB_BORDER | WB_TABSTOP) , pParentWindow(pNavigatorDlg) , nRootType(ScContentId::ROOT) , bHiddenDoc(false) diff --git a/sc/uiconfig/scalc/ui/navigatorpanel.ui b/sc/uiconfig/scalc/ui/navigatorpanel.ui index 4be59692a978..c8cb3478e5a4 100644 --- a/sc/uiconfig/scalc/ui/navigatorpanel.ui +++ b/sc/uiconfig/scalc/ui/navigatorpanel.ui @@ -77,7 +77,7 @@ True -False +True icons @@ -186,7 +186,7 @@ True -False +True Document diff --git a/sc/uiconfig/scalc/ui/sidebaralignment.ui b/sc/uiconfig/scalc/ui/sidebaralignment.ui index 246598c51a4d..e1107325eb12 100644 --- a/sc/uiconfig/scalc/ui/sidebaralignment.ui +++ b/sc/uiconfig/scalc/ui/sidebaralignment.ui @@ -38,7 +38,7 @@ True -False +True True Horizontal Alignment start @@ -102,7 +102,7 @@ True -False +True Vertical Alignment end False @@ -153,7 +153,7 @@ True -False +True False @@ -215,7 +215,7 @@ True -False +True False @@ -380,7 +380,7 @@ True -False +True True Select the angle for rotation. diff --git a/sc/uiconfig/scalc/ui/sidebarcellappearance.ui b/sc/uiconfig/scalc/ui/sidebarcellappearance.ui index 792b3798386d..0cf884eda1be 100644 --- a/sc/uiconfig/scalc/ui/sidebarcellappearance.ui +++ b/sc/uiconfig/scalc/ui/sidebarcellappearance.ui @@ -37,7 +37,7 @@ True -False +True True Select the background color of the selected cells. @@ -80,7 +80,7 @@ True -False +True center @@ -115,7 +115,7 @@ True -False +True False @@ -149,7 +149,7 @@ True -False +True True Select the line color of the borders. diff --git a/sc/uiconfig/scalc/ui/sidebarnumberformat.ui b/sc/uiconfig/scalc/ui/sidebarnumberformat.ui index 7ad1af1f8fcb..e717b9486c66 100644 --- a/sc/uiconfig/scalc/ui/sidebarnumberformat.ui +++ b/sc/uiconfig/scalc/ui/sidebarnumberformat.ui @@ -33,7 +33,7 @@ True -False +True True
[Libreoffice-commits] core.git: include/vcl sc/source vcl/source
include/vcl/menu.hxx |2 +- sc/source/ui/navipi/content.cxx|2 +- vcl/source/window/menu.cxx |6 ++ vcl/source/window/menuitemlist.cxx | 11 +++ vcl/source/window/menuitemlist.hxx |1 + 5 files changed, 20 insertions(+), 2 deletions(-) New commits: commit 7cc85bfd54645d3786828816972a2f039cb134e9 Author: SalimHabchi AuthorDate: Wed Jul 11 11:53:03 2018 +0200 Commit: Katarina Behrens CommitDate: Mon Jul 23 10:16:38 2018 +0200 tdf#118453 Reactivate navitagor submenu drag mode and display I add a function to get the data from the submenu Change-Id: If8aedc72abfc7ca967377f0e588167f9f62fe137 Reviewed-on: https://gerrit.libreoffice.org/57269 Tested-by: Jenkins Reviewed-by: Katarina Behrens diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx index 705486ab7356..f865166c0b57 100644 --- a/include/vcl/menu.hxx +++ b/include/vcl/menu.hxx @@ -263,7 +263,7 @@ public: MenuItemType GetItemType( sal_uInt16 nPos ) const; sal_uInt16 GetCurItemId() const { return nSelectedId;} OString GetCurItemIdent() const; - +OString GetItemIdentFromSubMenu(sal_uInt16 nItemId) const; void SetItemBits( sal_uInt16 nItemId, MenuItemBits nBits ); MenuItemBits GetItemBits( sal_uInt16 nItemId ) const; diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx index a0c709966c27..b800833e1b43 100644 --- a/sc/source/ui/navipi/content.cxx +++ b/sc/source/ui/navipi/content.cxx @@ -668,7 +668,7 @@ void ScContentTree::Command( const CommandEvent& rCEvt ) aPop->SetPopupMenu( 2, aDocMenu.get() ); sal_uInt16 nSelected = aPop->Execute(this, rCEvt.GetMousePosPixel()); -OString sIdent = aPop->GetItemIdent(nSelected); +OString sIdent = aPop->GetItemIdentFromSubMenu(nSelected); if (sIdent.startsWith("document")) { diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index cf509a91374a..a1e3180ace35 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -702,6 +702,12 @@ OString Menu::GetItemIdent(sal_uInt16 nId) const return pData ? pData->sIdent : OString(); } +OString Menu::GetItemIdentFromSubMenu(sal_uInt16 nId) const +{ +const MenuItemData* pData = pItemList->GetDataFromSubMenu(nId); +return pData ? pData->sIdent : OString(); +} + void Menu::SetItemBits( sal_uInt16 nItemId, MenuItemBits nBits ) { MenuItemData* pData = pItemList->GetData( nItemId ); diff --git a/vcl/source/window/menuitemlist.cxx b/vcl/source/window/menuitemlist.cxx index 7778a8004b53..1d63118af096 100644 --- a/vcl/source/window/menuitemlist.cxx +++ b/vcl/source/window/menuitemlist.cxx @@ -140,6 +140,17 @@ MenuItemData* MenuItemList::GetData( sal_uInt16 nSVId, size_t& rPos ) const return nullptr; } +MenuItemData* MenuItemList::GetDataFromSubMenu(sal_uInt16 nSVId) const +{ +for ( size_t i = 0, n = maItemList.size(); i < n; ++i ) +{ +if ( maItemList[i]->pSubMenu +&& maItemList[i]->pSubMenu->GetCurItemId() != 0 ) // if something is selected +return maItemList[i].get()->pSubMenu->GetItemList()->GetDataFromPos(nSVId - 1); +} +return nullptr; +} + MenuItemData* MenuItemList::SearchItem( sal_Unicode cSelectChar, KeyCode aKeyCode, diff --git a/vcl/source/window/menuitemlist.hxx b/vcl/source/window/menuitemlist.hxx index c25eae263dac..bb7ef90dc026 100644 --- a/vcl/source/window/menuitemlist.hxx +++ b/vcl/source/window/menuitemlist.hxx @@ -116,6 +116,7 @@ public: voidClear(); MenuItemData* GetData( sal_uInt16 nSVId, size_t& rPos ) const; +MenuItemData* GetDataFromSubMenu( sal_uInt16 nSVId ) const; MenuItemData* GetData( sal_uInt16 nSVId ) const { size_t nTemp; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: compilerplugins/clang include/oox include/svx include/xmloff oox/source svtools/source svx/source sw/source writerfilter/source xmloff/source
compilerplugins/clang/unusedfields.only-used-in-constructor.results | 48 ++-- compilerplugins/clang/unusedfields.readonly.results | 106 +++-- compilerplugins/clang/unusedfields.untouched.results| 38 +-- compilerplugins/clang/unusedfields.writeonly.results| 68 ++ include/oox/crypto/DocumentDecryption.hxx |6 include/svx/colorbox.hxx|1 include/svx/colorwindow.hxx |2 include/svx/pagectrl.hxx|7 include/svx/paraprev.hxx| 15 - include/svx/relfld.hxx |7 include/svx/svdobj.hxx |1 include/svx/svdotext.hxx|1 include/xmloff/AutoStyleEntry.hxx |1 include/xmloff/txtparae.hxx |2 oox/source/core/filterdetect.cxx|2 oox/source/crypto/DocumentDecryption.cxx|3 svtools/source/misc/transfer2.cxx |8 svx/source/dialog/pagectrl.cxx | 108 -- svx/source/dialog/paraprev.cxx | 100 - svx/source/dialog/relfld.cxx| 49 svx/source/svdraw/svdobj.cxx|2 svx/source/svdraw/svdotext.cxx | 17 - svx/source/tbxctrls/tbcontrl.cxx| 18 - sw/source/uibase/docvw/romenu.cxx | 17 - sw/source/uibase/docvw/romenu.hxx |2 writerfilter/source/dmapper/DomainMapperTableManager.cxx|1 writerfilter/source/dmapper/DomainMapperTableManager.hxx|1 xmloff/source/style/impastpl.cxx|2 xmloff/source/text/txtparae.cxx |2 29 files changed, 161 insertions(+), 474 deletions(-) New commits: commit 110a25fdc2b0dc16c9b376fa6a9fdeb5fe7a58fb Author: Noel Grandin AuthorDate: Wed Jul 18 14:49:58 2018 +0200 Commit: Noel Grandin CommitDate: Mon Jul 23 09:55:40 2018 +0200 loplugin:unusedfields Change-Id: I1827262ad95942cacff589929f9436f8383cf142 Reviewed-on: https://gerrit.libreoffice.org/57642 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/compilerplugins/clang/unusedfields.only-used-in-constructor.results b/compilerplugins/clang/unusedfields.only-used-in-constructor.results index 70b38deb71d1..21e02d81160d 100644 --- a/compilerplugins/clang/unusedfields.only-used-in-constructor.results +++ b/compilerplugins/clang/unusedfields.only-used-in-constructor.results @@ -9,9 +9,9 @@ avmedia/source/vlc/wrapper/Types.hxx:44 avmedia/source/vlc/wrapper/Types.hxx:45 libvlc_event_t::(anonymous union)::(anonymous) dummy2 const char * avmedia/source/vlc/wrapper/Types.hxx:46 -libvlc_event_t::(anonymous) padding struct (anonymous struct at /home/noel/libo/avmedia/source/vlc/wrapper/Types.hxx:43:7) +libvlc_event_t::(anonymous) padding struct (anonymous struct at /media/noel/disk2/libo4/avmedia/source/vlc/wrapper/Types.hxx:43:7) avmedia/source/vlc/wrapper/Types.hxx:47 -libvlc_event_t u union (anonymous union at /home/noel/libo/avmedia/source/vlc/wrapper/Types.hxx:41:5) +libvlc_event_t u union (anonymous union at /media/noel/disk2/libo4/avmedia/source/vlc/wrapper/Types.hxx:41:5) avmedia/source/vlc/wrapper/Types.hxx:53 libvlc_track_description_t psz_name char * basegfx/source/polygon/b2dtrapezoid.cxx:201 @@ -66,13 +66,13 @@ connectivity/source/inc/flat/EResultSet.hxx:42 connectivity::flat::OFlatResultSet m_bBookmarkable _Bool connectivity/source/inc/java/lang/Object.hxx:45 connectivity::SDBThreadAttach m_aGuard jvmaccess::class VirtualMachine::AttachGuard -cppcanvas/source/mtfrenderer/textaction.cxx:820 +cppcanvas/source/mtfrenderer/textaction.cxx:821 cppcanvas::internal::(anonymous namespace)::EffectTextAction maTextLineInfo const tools::TextLineInfo -cppcanvas/source/mtfrenderer/textaction.cxx:1655 +cppcanvas/source/mtfrenderer/textaction.cxx:1653 cppcanvas::internal::(anonymous namespace)::OutlineAction maTextLineInfo const tools::TextLineInfo cppu/source/threadpool/threadpool.cxx:355 _uno_ThreadPool dummy sal_Int32 -cppu/source/typelib/typelib.cxx:62 +cppu/source/typelib/typelib.cxx:63 AlignSize_Impl nInt16 sal_Int16 cppu/source/uno/check.cxx:38 (anonymous namespace)::C1 n1 sal_Int16 @@ -120,7 +120,7 @@ cppu/source/uno/check.cxx:138 (anonymous namespace)::Char4 chars struct (anon