[Libreoffice-commits] core.git: basic/source
basic/source/basmgr/basmgr.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 00f4722032cd3abb02180d2df6b9cb580736cb7c Author: Tomoyuki Kubota AuthorDate: Wed May 29 12:41:30 2019 +0900 Commit: Noel Grandin CommitDate: Sat Jun 29 08:30:15 2019 +0200 tdf#125564: WatchWindow should report correct type for global constants Change-Id: Ibe078e61385e78aab3933d70af14f4b38806fcf6 Reviewed-on: https://gerrit.libreoffice.org/73142 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx index 88e12775f6ce..71674e7825d0 100644 --- a/basic/source/basmgr/basmgr.cxx +++ b/basic/source/basmgr/basmgr.cxx @@ -1404,8 +1404,8 @@ uno::Any BasicManager::SetGlobalUNOConstant( const OUString& rName, const uno::A SbxVariable* pVariable = pStandardLib->Find( rName, SbxClassType::Object ); if ( pVariable ) aOldValue = sbxToUnoValue( pVariable ); - -SbxObjectRef xUnoObj = GetSbUnoObject( rName, _rValue ); +SbxObjectRef xUnoObj = GetSbUnoObject( _rValue.getValueType ().getTypeName () , _rValue ); +xUnoObj->SetName(rName); xUnoObj->SetFlag( SbxFlagBits::DontStore ); pStandardLib->Insert( xUnoObj.get() ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/uiconfig sw/uiconfig
sc/uiconfig/scalc/ui/notebookbar.ui | 359 ++ sw/uiconfig/swriter/ui/notebookbar.ui | 34 ++- 2 files changed, 265 insertions(+), 128 deletions(-) New commits: commit 086798f6791891540833564c4ec4f136f02c0043 Author: andreas kainz AuthorDate: Fri Jun 28 22:40:52 2019 +0200 Commit: andreas_kainz CommitDate: Sat Jun 29 07:42:06 2019 +0200 NB tabbed writer and calc update Change-Id: Ia2822b62df9f467db424bb9741b0081dc0d7bbf4 Reviewed-on: https://gerrit.libreoffice.org/74862 Tested-by: Jenkins Reviewed-by: andreas_kainz diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui b/sc/uiconfig/scalc/ui/notebookbar.ui index 048336b1e21e..e4b8c1950d76 100644 --- a/sc/uiconfig/scalc/ui/notebookbar.ui +++ b/sc/uiconfig/scalc/ui/notebookbar.ui @@ -9511,10 +9511,23 @@ 0 + + +False +True +0 + + + + +True +False +center +True True -True +False center True both @@ -9538,10 +9551,23 @@ 1 + + +False +True +1 + + + + +True +False +center +True - + True -True +False center True both @@ -9565,6 +9591,22 @@ 2 + ++ + + +False +True +2 + + + + +True +False +center +True True @@ -9575,7 +9617,7 @@ True -True +False both-horiz False @@ -9599,7 +9641,7 @@ True -True +False both-horiz False @@ -9627,8 +9669,24 @@ 3 + + + + + +False +True +3 + + + + +True +False +center +True - + True False 5 @@ -9639,22 +9697,9 @@ False True 5 -4 +0 - - -False -True -0 - - - - -True -False -center -True True @@ -9679,9
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - vcl/qa
vcl/qa/cppunit/complextext.cxx | 16 +---
1 file changed, 5 insertions(+), 11 deletions(-)
New commits:
commit abe0517b6fd6794fe5e2f6c363130c1c2f99c957
Author: Noel Grandin
AuthorDate: Mon Jul 16 12:52:49 2018 +0200
Commit: Thorsten Behrens
CommitDate: Sat Jun 29 02:49:53 2019 +0200
try to make the windows tinderboxes happier
at the moment about 1 in 10 builds fail
Reviewed-on: https://gerrit.libreoffice.org/57491
Tested-by: Jenkins
Reviewed-by: Noel Grandin
(cherry picked from commit 180fa02a592bc846e21e3d58c548e6ed7c7039d5)
more windows tinderbox fix
Reviewed-on: https://gerrit.libreoffice.org/58259
Tested-by: Jenkins
Reviewed-by: Noel Grandin
(cherry picked from commit 415436ad27b4522102d3fbbb6003935871029fc6)
test unreliable under windows
Reviewed-on: https://gerrit.libreoffice.org/71292
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
(cherry picked from commit 3e898d3ce8f12c6f4b4f3a8202812fe8871e0a7f)
vcl_complextext is still unreliable under windows
Reviewed-on: https://gerrit.libreoffice.org/72407
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
(cherry picked from commit 53539ce999cfe97378671a7186e38c32bdfc)
Change-Id: Ia6ecd04b81abb751bd7159ca8432c00f97ab5e2d
Reviewed-on: https://gerrit.libreoffice.org/74850
Reviewed-by: Noel Grandin
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
diff --git a/vcl/qa/cppunit/complextext.cxx b/vcl/qa/cppunit/complextext.cxx
index 97d156d4f8e8..e5963298319e 100644
--- a/vcl/qa/cppunit/complextext.cxx
+++ b/vcl/qa/cppunit/complextext.cxx
@@ -81,15 +81,14 @@ void VclComplexTextTest::testArabic()
// absolute character widths AKA text array.
#if !defined(_WIN32)
+// FIXME: fails on some windows tinderboxes
std::vector aRefCharWidths {6, 9, 16, 16, 22, 22, 26, 29, 32, 32,
36, 40, 49, 53, 56, 63, 63, 66, 72, 72};
-#endif
std::vector aCharWidths(aOneTwoThree.getLength(), 0);
long nTextWidth = pOutDev->GetTextArray(aOneTwoThree, aCharWidths.data());
-#if !defined(_WIN32)
CPPUNIT_ASSERT_EQUAL(aRefCharWidths, aCharWidths);
-#endif
+// this sporadically returns 75 or 74 on some of the windows tinderboxes
eg. tb73
CPPUNIT_ASSERT_EQUAL(72L, nTextWidth);
CPPUNIT_ASSERT_EQUAL(nTextWidth, aCharWidths.back());
@@ -98,20 +97,15 @@ void VclComplexTextTest::testArabic()
CPPUNIT_ASSERT_EQUAL(14L, pOutDev->GetTextHeight());
// exact bounding rectangle, not essentially the same as text width/height
-#if defined(MACOSX) || defined(_WIN32)
+#if defined(MACOSX)
// FIXME: fails on some Linux tinderboxes, might be a FreeType issue.
tools::Rectangle aBoundRect, aTestRect( 0, 1, 71, 15 );
pOutDev->GetTextBoundRect(aBoundRect, aOneTwoThree);
-#if defined(_WIN32)
-// if run on Win7 KVM QXL / Spice GUI, we "miss" the first pixel column?!
-if ( 1 == aBoundRect.Left() )
-{
-aTestRect.AdjustLeft(1);
-}
-#endif
CPPUNIT_ASSERT_EQUAL(aTestRect, aBoundRect);
#endif
+#endif
+
// normal orientation
tools::Rectangle aInput;
tools::Rectangle aRect = pOutDev->GetTextRect( aInput, aOneTwoThree );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - sw/source
sw/source/core/text/porrst.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 13eb1e3501faa32733668873f4aae36f2012e670
Author: Michael Stahl
AuthorDate: Wed Jun 26 19:13:37 2019 +0200
Commit: Thorsten Behrens
CommitDate: Sat Jun 29 02:49:26 2019 +0200
tdf#125751 sw: don't start recursive layout in SwTextFrame::EmptyHeight()
Not sure if this has anything to do with the bug, but i noticed it while
debugging...
This is the only place that calls GetCurrFrame() *during* formatting,
so make sure we don't do stupid recursive things.
(regression from 56b2cf0c10d9caa01ebae1d80465e342d046a85c)
Change-Id: Icd05f8d634bc9de4d5d16824d30075397e6c9960
Reviewed-on: https://gerrit.libreoffice.org/74750
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit 7a05458d39da2f4755cb6e190dce338198655137)
Reviewed-on: https://gerrit.libreoffice.org/74787
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
(cherry picked from commit 91f86a51ed6f01e9c75999e8c1a42eaa47ff3ccb)
Reviewed-on: https://gerrit.libreoffice.org/74844
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
diff --git a/sw/source/core/text/porrst.cxx b/sw/source/core/text/porrst.cxx
index 727e0319a730..b959a4c3ba6e 100644
--- a/sw/source/core/text/porrst.cxx
+++ b/sw/source/core/text/porrst.cxx
@@ -211,7 +211,8 @@ SwTwips SwTextFrame::EmptyHeight() const
SwViewShell *pSh = getRootFrame()->GetCurrShell();
if ( dynamic_cast( pSh ) != nullptr ) {
SwCursorShell *pCrSh = static_cast(pSh);
-SwContentFrame *pCurrFrame=pCrSh->GetCurrFrame();
+// this is called during formatting so avoid recursive layout
+SwContentFrame const*const pCurrFrame = pCrSh->GetCurrFrame(false);
if (pCurrFrame==static_cast(this)) {
// do nothing
} else {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - 2 commits - sw/source
sw/source/core/layout/calcmove.cxx | 16 ++-- sw/source/core/layout/paintfrm.cxx |1 + 2 files changed, 15 insertions(+), 2 deletions(-) New commits: commit f1ece42fbe7dddfdf403eb652f87a282284add47 Author: Michael Stahl AuthorDate: Wed Jun 26 19:09:51 2019 +0200 Commit: Thorsten Behrens CommitDate: Sat Jun 29 02:49:12 2019 +0200 tdf#125751 sw: fix crash on formatting in SwLayoutFrame::PaintSwFrame() It's less than ideal that the document is painted before being fully formatted, but let's try to apply a band-aid... 0x6120001a97d0 is located 144 bytes inside of 280-byte region [0x6120001a9740,0x6120001a9858) freed by thread T0 here: #1 SwFootnoteFrame::~SwFootnoteFrame() /home/ms/lo/master/sw/source/core/inc/ftnfrm.hxx:64:7 #2 SwFrame::DestroyFrame(SwFrame*) sw/source/core/layout/ssfrm.cxx:389:9 #3 SwContentFrame::Cut() sw/source/core/layout/wsfrm.cxx:1263:25 #4 SwFlowFrame::MoveBwd(bool&) sw/source/core/layout/flowfrm.cxx:2544:17 #5 SwContentFrame::MakeAll(OutputDevice*) sw/source/core/layout/calcmove.cxx:1522:17 #6 SwFrame::PrepareMake(OutputDevice*) sw/source/core/layout/calcmove.cxx:366:5 #7 SwFrame::Calc(OutputDevice*) const sw/source/core/layout/trvlfrm.cxx:1791:37 #8 SwLayoutFrame::PaintSwFrame(OutputDevice&, SwRect const&, SwPrintData const*) const sw/source/core/layout/paintfrm.cxx:3328:17 #9 SwLayoutFrame::PaintSwFrame(OutputDevice&, SwRect const&, SwPrintData const*) const sw/source/core/layout/paintfrm.cxx:3406:21 #10 SwLayoutFrame::PaintSwFrame(OutputDevice&, SwRect const&, SwPrintData const*) const sw/source/core/layout/paintfrm.cxx:3406:21 #11 SwRootFrame::PaintSwFrame(OutputDevice&, SwRect const&, SwPrintData const*) const sw/source/core/layout/paintfrm.cxx:3116:24 #12 SwViewShell::Paint(OutputDevice&, tools::Rectangle const&) sw/source/core/view/viewsh.cxx:1840:34 (reportedly a regression from 18765b9fa739337d2d891513f6e2fb7c3ce23b50) Change-Id: Iff5e783985c180b704b273fa26b7c498820640ac Reviewed-on: https://gerrit.libreoffice.org/74749 Tested-by: Jenkins Reviewed-by: Michael Stahl (cherry picked from commit 49f971e9d0a88c9f23262445a17c9b5cecdb9167) Reviewed-on: https://gerrit.libreoffice.org/74786 Reviewed-by: Thorsten Behrens (cherry picked from commit 4c993cd7c762b1fca9a674cd2bab7c0e95c78e74) Reviewed-on: https://gerrit.libreoffice.org/74843 Tested-by: Thorsten Behrens diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 2e00731cb299..53088b40b862 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -3331,6 +3331,7 @@ void SwLayoutFrame::PaintSwFrame(vcl::RenderContext& rRenderContext, SwRect cons if ( !pFrame ) return; +SwFrameDeleteGuard g(const_cast(this)); // lock because Calc() and recursion SwShortCut aShortCut( *pFrame, rRect ); bool bCnt = pFrame->IsContentFrame(); if ( bCnt ) commit 43e57bd87325486442771ae8faa20a2772481a27 Author: Michael Stahl AuthorDate: Wed Jun 26 19:02:18 2019 +0200 Commit: Thorsten Behrens CommitDate: Sat Jun 29 02:48:59 2019 +0200 tdf#125751 sw: tweak assert in SwFrame::PrepareMake() a bit more This fixes 2 cases of the assert that was added in commit e14056e6e88d9b8d988b7b88b2776a8fc952031b * tdf#125751 bugdoc would assert because on a page there were a bunch of empty section frames preceding 2 SwTextFrames; the first SwTextFrame moved backwards skipping over the empty section frames, hence the second SwTextFrame is not the mpNext of the first one's follow * writerfilter_null_ptr_deref.sample had a SwTextNode with >80k characters; turns out there is a check in SwTextFrame::CalcFollow() to format only up to 10 follow frames, so the result is 2 follow frames on the same page Change-Id: Ia08afd5a0e227d0613421d74b469c409ee91cfca Reviewed-on: https://gerrit.libreoffice.org/74748 Tested-by: Jenkins Reviewed-by: Michael Stahl (cherry picked from commit f8e4845fec50affc20272600a4baf87554b055fb) Reviewed-on: https://gerrit.libreoffice.org/74785 Reviewed-by: Thorsten Behrens (cherry picked from commit 8d0777d455e4a861d5b203d1e36d743d1432c1bd) Reviewed-on: https://gerrit.libreoffice.org/74842 Tested-by: Thorsten Behrens diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx index c1513ba9b684..68a24c89f9de 100644 --- a/sw/source/core/layout/calcmove.cxx +++ b/sw/source/core/layout/calcmove.cxx @@ -325,7 +325,13 @@ void SwFrame::PrepareMake(vcl::RenderContext* pRenderContext) && SwFlowFrame::CastFlowFrame(GetUpper()->Lower()) && SwFlowFrame::CastFlowFrame(pFrame)->IsAnFollow(
[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sw/source
sw/source/core/inc/cntfrm.hxx|3 ++-
sw/source/core/layout/tabfrm.cxx | 26 ++
2 files changed, 16 insertions(+), 13 deletions(-)
New commits:
commit c5e8780391acb1f9fd72f8956438a79dfa64ca53
Author: Michael Stahl
AuthorDate: Thu Jun 27 13:04:51 2019 +0200
Commit: Thorsten Behrens
CommitDate: Sat Jun 29 02:46:57 2019 +0200
sw: avoid deleting the iterated SwRowFrame on tdf104188-4.odt
The change in commit 1e6dec4b4313212a3bdc6bb06155fd65e795368b
was not enough to fix this problem.
SwContentFrame::CalcLowers() may move a SwTextFrame to the previous
page; in that case Calc() on the upper is a bad idea because it may then
call RemoveFollowFlowLine() and delete the SwRowFrame that is being
iterated.
There is one other (unknown) bugdoc with this problem, let's hope it's
fixed as well...
(regression from commit 18765b9fa739337d2d891513f6e2fb7c3ce23b50)
Change-Id: I3c55a0d7ef0350a482fb150d3e96c3b34853400d
Reviewed-on: https://gerrit.libreoffice.org/74793
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit 1cb7e4899b5ada902e99a0c964ee047950c07044)
Reviewed-on: https://gerrit.libreoffice.org/74835
Reviewed-by: Thorsten Behrens
diff --git a/sw/source/core/inc/cntfrm.hxx b/sw/source/core/inc/cntfrm.hxx
index aa28f580f3ad..998cf2ed1a1e 100644
--- a/sw/source/core/inc/cntfrm.hxx
+++ b/sw/source/core/inc/cntfrm.hxx
@@ -92,7 +92,8 @@ public:
inline SwContentFrame* GetNextContentFrame() const;
inline SwContentFrame* GetPrevContentFrame() const;
-static bool CalcLowers( SwLayoutFrame* pLay, const SwLayoutFrame*
pDontLeave, long nBottom, bool bSkipRowSpanCells );
+static bool CalcLowers(SwLayoutFrame & rLay, SwLayoutFrame const&
rDontLeave,
+long nBottom, bool bSkipRowSpanCells);
};
inline SwContentFrame* SwContentFrame::GetNextContentFrame() const
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 694e1b70fb03..141bc7e296af 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -1461,25 +1461,22 @@ static void lcl_InvalidateAllLowersPrt( SwLayoutFrame*
pLayFrame )
}
}
-bool SwContentFrame::CalcLowers( SwLayoutFrame* pLay, const SwLayoutFrame*
pDontLeave,
+bool SwContentFrame::CalcLowers(SwLayoutFrame & rLay, SwLayoutFrame const&
rDontLeave,
long nBottom, bool bSkipRowSpanCells )
{
-if ( !pLay )
-return true;
-
-vcl::RenderContext* pRenderContext =
pLay->getRootFrame()->GetCurrShell()->GetOut();
+vcl::RenderContext* pRenderContext =
rLay.getRootFrame()->GetCurrShell()->GetOut();
// LONG_MAX == nBottom means we have to calculate all
bool bAll = LONG_MAX == nBottom;
bool bRet = false;
-SwContentFrame *pCnt = pLay->ContainsContent();
-SwRectFnSet aRectFnSet(pLay);
+SwContentFrame *pCnt = rLay.ContainsContent();
+SwRectFnSet aRectFnSet(&rLay);
// FME 2007-08-30 #i81146# new loop control
int nLoopControlRuns = 0;
const int nLoopControlMax = 10;
const SwModify* pLoopControlCond = nullptr;
-while ( pCnt && pDontLeave->IsAnLower( pCnt ) )
+while (pCnt && rDontLeave.IsAnLower(pCnt))
{
// #115759# - check, if a format of content frame is
// possible. Thus, 'copy' conditions, found at the beginning of
@@ -1535,7 +1532,7 @@ bool SwContentFrame::CalcLowers( SwLayoutFrame* pLay,
const SwLayoutFrame* pDont
if ( nLoopControlRuns < nLoopControlMax )
{
// restart format with first content
-pCnt = pLay->ContainsContent();
+pCnt = rLay.ContainsContent();
continue;
}
@@ -1544,6 +1541,11 @@ bool SwContentFrame::CalcLowers( SwLayoutFrame* pLay,
const SwLayoutFrame* pDont
#endif
}
}
+if (!rDontLeave.IsAnLower(pCnt)) // moved backward?
+{
+pCnt = rLay.ContainsContent();
+continue; // avoid formatting new upper on different page
+}
pCnt->GetUpper()->Calc(pRenderContext);
}
if( ! bAll &&
aRectFnSet.YDiff(aRectFnSet.GetTop(pCnt->getFrameArea()), nBottom) > 0 )
@@ -1599,7 +1601,7 @@ static bool lcl_InnerCalcLayout( SwFrame *pFrame,
return bRet;
}
-static void lcl_RecalcRow( SwRowFrame* pRow, long nBottom )
+static void lcl_RecalcRow(SwRowFrame *const pRow, long const nBottom)
{
// FME 2007-08-30 #i81146# new loop control
int nLoopControlRuns_1 = 0;
@@ -1639,7 +1641,7 @@ static void lcl_RecalcRow( SwRowFrame* pRow, long nBottom
)
OSL_ENSURE(pOriginalRow->GetUpper() &&
pOriginalRow->GetUpper()->IsTabFrame(), "No table");
SwTabFrame* pOriginalTab =
static_cast(pRow->GetUpper());
-bCheck
[Libreoffice-commits] core.git: sc/source
sc/source/ui/drawfunc/drawsh.cxx | 67 ---
1 file changed, 42 insertions(+), 25 deletions(-)
New commits:
commit c2cb467a1e5194c56bb65706b7965fb2c9241b8f
Author: Muhammet Kara
AuthorDate: Fri Jun 28 23:37:10 2019 +0300
Commit: Muhammet Kara
CommitDate: Sat Jun 29 01:39:04 2019 +0200
lokdialog: Convert the Format -> Position and Size... to async exec for sc
Change-Id: I715ed025d97de8eb69b6e9ba227b955b49add855
Reviewed-on: https://gerrit.libreoffice.org/74861
Tested-by: Jenkins
Reviewed-by: Muhammet Kara
diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx
index 701f7c970659..5e680fa598d7 100644
--- a/sc/source/ui/drawfunc/drawsh.cxx
+++ b/sc/source/ui/drawfunc/drawsh.cxx
@@ -92,6 +92,20 @@ static void lcl_setModified( const SfxObjectShell* pShell )
}
}
+static void lcl_invalidateTransformAttr(const ScTabViewShell* pViewShell)
+{
+SfxBindings& rBindings=pViewShell->GetViewFrame()->GetBindings();
+rBindings.Invalidate(SID_ATTR_TRANSFORM_WIDTH);
+rBindings.Invalidate(SID_ATTR_TRANSFORM_HEIGHT);
+rBindings.Invalidate(SID_ATTR_TRANSFORM_POS_X);
+rBindings.Invalidate(SID_ATTR_TRANSFORM_POS_Y);
+rBindings.Invalidate(SID_ATTR_TRANSFORM_ANGLE);
+rBindings.Invalidate(SID_ATTR_TRANSFORM_ROT_X);
+rBindings.Invalidate(SID_ATTR_TRANSFORM_ROT_Y);
+rBindings.Invalidate(SID_ATTR_TRANSFORM_AUTOWIDTH);
+rBindings.Invalidate(SID_ATTR_TRANSFORM_AUTOHEIGHT);
+}
+
void ScDrawShell::ExecDrawAttr( SfxRequest& rReq )
{
sal_uInt16 nSlot = rReq.GetSlot();
@@ -249,6 +263,9 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq )
if( rMarkList.GetMark(0) != nullptr )
{
SdrObject* pObj =
rMarkList.GetMark(0)->GetMarkedSdrObj();
+std::shared_ptr pRequest;
+pRequest.reset(new SfxRequest(rReq));
+
if( pObj->GetObjIdentifier() == OBJ_CAPTION )
{
// Caption Itemset
@@ -258,7 +275,7 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq )
SfxItemSet
aNewGeoAttr(pView->GetGeoAttrFromMarked());
SvxAbstractDialogFactory* pFact =
SvxAbstractDialogFactory::Create();
-ScopedVclPtr
pDlg(pFact->CreateCaptionDialog(pWin ? pWin->GetFrameWeld() : nullptr, pView));
+VclPtr
pDlg(pFact->CreateCaptionDialog(pWin ? pWin->GetFrameWeld() : nullptr, pView));
const sal_uInt16* pRange =
pDlg->GetInputRanges( *aNewAttr.GetPool() );
SfxItemSet aCombSet( *aNewAttr.GetPool(),
pRange );
@@ -266,23 +283,34 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq )
aCombSet.Put( aNewGeoAttr );
pDlg->SetInputSet( &aCombSet );
-if (pDlg->Execute() == RET_OK)
-{
-rReq.Done(*(pDlg->GetOutputItemSet()));
-
pView->SetAttributes(*pDlg->GetOutputItemSet());
-
pView->SetGeoAttrToMarked(*pDlg->GetOutputItemSet());
-}
+pDlg->StartExecuteAsync([=](sal_Int32 nResult){
+if (nResult == RET_OK)
+{
+
pRequest->Done(*(pDlg->GetOutputItemSet()));
+
pView->SetAttributes(*pDlg->GetOutputItemSet());
+
pView->SetGeoAttrToMarked(*pDlg->GetOutputItemSet());
+}
+
+
lcl_invalidateTransformAttr(pViewData->GetViewShell());
+pDlg->disposeOnce();
+});
}
else
{
SfxItemSet
aNewAttr(pView->GetGeoAttrFromMarked());
SvxAbstractDialogFactory* pFact =
SvxAbstractDialogFactory::Create();
-ScopedVclPtr
pDlg(pFact->CreateSvxTransformTabDialog(pWin ? pWin->GetFrameWeld() : nullptr,
&aNewAttr, pView));
-if (pDlg->Execute() == RET_OK)
-{
-rReq.Done(*(pDlg->GetOutputItemSet()));
-
pView->SetGeoAttrToMarked(*pDlg->GetOutputItemSet());
-}
+VclPtr
pDlg(pFact->CreateSvxTransformTabDialog(pWin ? pWin->GetFrameWeld() : null
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/shells/drwbassh.cxx | 176 ++-
1 file changed, 94 insertions(+), 82 deletions(-)
New commits:
commit f86578129a14e2e70a50a9e13afaed7ad522463a
Author: Muhammet Kara
AuthorDate: Fri Jun 28 22:44:10 2019 +0300
Commit: Muhammet Kara
CommitDate: Sat Jun 29 00:51:21 2019 +0200
lokdialog: Convert the Format -> Position and Size... to async exec for sw
Change-Id: Ie3383ebe7a712d711e28c626be9e0aaeed5379bb
Reviewed-on: https://gerrit.libreoffice.org/74860
Tested-by: Jenkins
Reviewed-by: Muhammet Kara
diff --git a/sw/source/uibase/shells/drwbassh.cxx
b/sw/source/uibase/shells/drwbassh.cxx
index 94799bc4a80a..ef90e5b7abe0 100644
--- a/sw/source/uibase/shells/drwbassh.cxx
+++ b/sw/source/uibase/shells/drwbassh.cxx
@@ -172,7 +172,7 @@ void SwDrawBaseShell::Execute(SfxRequest const &rReq)
if( rMarkList.GetMark(0) != nullptr )
{
SdrObject* pObj =
rMarkList.GetMark(0)->GetMarkedSdrObj();
-ScopedVclPtr pDlg;
+VclPtr pDlg;
bool bCaption = false;
// Allowed anchorages:
@@ -191,7 +191,7 @@ void SwDrawBaseShell::Execute(SfxRequest const &rReq)
SvxAbstractDialogFactory* pFact =
SvxAbstractDialogFactory::Create();
VclPtr pCaptionDlg =
pFact->CreateCaptionDialog(
rReq.GetFrameWeld(), pSdrView, nAllowedAnchors );
-pDlg.disposeAndReset(pCaptionDlg);
+pDlg.reset(pCaptionDlg);
pCaptionDlg->SetValidateFramePosLink( LINK(this,
SwDrawBaseShell, ValidatePosition) );
}
else
@@ -199,7 +199,7 @@ void SwDrawBaseShell::Execute(SfxRequest const &rReq)
SvxAbstractDialogFactory* pFact =
SvxAbstractDialogFactory::Create();
VclPtr pTransform =
pFact->CreateSvxTransformTabDialog(rReq.GetFrameWeld(), nullptr, pSdrView,
nAllowedAnchors);
-pDlg.disposeAndReset(pTransform);
+pDlg.reset(pTransform);
pTransform->SetValidateFramePosLink( LINK(this,
SwDrawBaseShell, ValidatePosition) );
}
SfxItemSet aNewAttr(pSdrView->GetGeoAttrFromMarked());
@@ -239,99 +239,111 @@ void SwDrawBaseShell::Execute(SfxRequest const &rReq)
pDlg->SetInputSet( &aSet );
-if (pDlg->Execute() == RET_OK)
-{
-const SfxItemSet* pOutSet =
pDlg->GetOutputItemSet();
-pSh->StartAllAction();
+pDlg->StartExecuteAsync([=](sal_Int32 nResult){
+if (nResult == RET_OK)
+{
+SwFormatVertOrient
aVOrientFinal(pFrameFormat->GetFormatAttr(RES_VERT_ORIENT));
+SwFormatHoriOrient
aHOrientFinal(pFrameFormat->GetFormatAttr(RES_HORI_ORIENT));
-// #i30451#
-pSh->StartUndo(SwUndoId::INSFMTATTR);
+const SfxItemSet* pOutSet =
pDlg->GetOutputItemSet();
+pSh->StartAllAction();
-pSdrView->SetGeoAttrToMarked(*pOutSet);
+// #i30451#
+pSh->StartUndo(SwUndoId::INSFMTATTR);
-if (bCaption)
-pSdrView->SetAttributes(*pOutSet);
+pSdrView->SetGeoAttrToMarked(*pOutSet);
-bool bPosCorr =
-SfxItemState::SET != pOutSet->GetItemState(
-SID_ATTR_TRANSFORM_POS_X, false ) &&
-SfxItemState::SET != pOutSet->GetItemState(
-SID_ATTR_TRANSFORM_POS_Y, false );
+if (bCaption)
+pSdrView->SetAttributes(*pOutSet);
-SfxItemSet aFrameAttrSet(GetPool(),
svl::Items{});
+bool bPosCorr =
+SfxItemState::SET != pOutSet->GetItemState(
+SID_ATTR_TRANSFORM_POS_X, false ) &&
+SfxItemState::SET != pOutSet->GetItemState(
+SID_ATTR_TRANSFORM_POS_Y, false );
-bool bSingleSelection = rMarkList.GetMarkCount()
== 1;
+SfxItemSet aFrameAttrSet(GetPool(),
svl::Items{
[Libreoffice-commits] core.git: cui/source
cui/source/customize/SvxNotebookbarConfigPage.cxx | 268 --
cui/source/inc/SvxNotebookbarConfigPage.hxx | 20 +
cui/source/inc/cfg.hxx|4
3 files changed, 221 insertions(+), 71 deletions(-)
New commits:
commit 9105b85c708f42024ce063b9a944466c0afdfe9a
Author: Sumit Chauhan
AuthorDate: Fri Jun 28 14:17:58 2019 +0530
Commit: Szymon Kłos
CommitDate: Fri Jun 28 21:15:00 2019 +0200
Category Target and Function Target enhanced in customization Tab
Better filters available in Category Target for selecting category .
We now have sfxlo-PriorityHBox , sfxlo-PriorityMergedHBox and
svtlo-ManagedMenuButton as category.Changes are also done in Function
Target, lists are now more generic.
Change-Id: Ia52890c09bb8083c2f907b5a9fe90eab4ec86aeb
Reviewed-on: https://gerrit.libreoffice.org/74836
Tested-by: Jenkins
Reviewed-by: Szymon Kłos
diff --git a/cui/source/customize/SvxNotebookbarConfigPage.cxx
b/cui/source/customize/SvxNotebookbarConfigPage.cxx
index c8ad0b8d3c18..1938e8a1835e 100644
--- a/cui/source/customize/SvxNotebookbarConfigPage.cxx
+++ b/cui/source/customize/SvxNotebookbarConfigPage.cxx
@@ -64,19 +64,26 @@
#include
#include
#include
+#include
+#include
-static bool isCategoryAvailable(OUString& sClassId, OUString& sUIItemID,
OUString& sActiveCategory,
+namespace uno = com::sun::star::uno;
+namespace frame = com::sun::star::frame;
+namespace lang = com::sun::star::lang;
+namespace container = com::sun::star::container;
+namespace beans = com::sun::star::beans;
+namespace graphic = com::sun::star::graphic;
+
+static bool isCategoryAvailable(OUString& sClassId, OUString& sUIItemId,
OUString& sActiveCategory,
bool& isCategory)
{
-if (sClassId == "GtkMenu" && sUIItemID != sActiveCategory)
+if (sUIItemId == sActiveCategory)
+return true;
+else if ((sClassId == "GtkMenu" || sClassId == "GtkGrid") && sUIItemId !=
sActiveCategory)
{
isCategory = false;
return false;
}
-else if (sActiveCategory == "All Commands")
-return true;
-else if (sUIItemID == sActiveCategory)
-return true;
return false;
}
@@ -104,6 +111,20 @@ static OUString getFileName(const OUString& aFileName)
return "None";
}
+static OUString getModuleId(const OUString& sModuleName)
+{
+if (sModuleName == "Writer")
+return OUString("com.sun.star.text.TextDocument");
+else if (sModuleName == "Draw")
+return OUString("com.sun.star.drawing.DrawingDocument");
+else if (sModuleName == "Impress")
+return OUString("com.sun.star.presentation.PresentationDocument");
+else if (sModuleName == "Calc")
+return OUString("com.sun.star.sheet.SpreadsheetDocument");
+else
+return OUString("None");
+}
+
SvxNotebookbarConfigPage::SvxNotebookbarConfigPage(TabPageParent pParent,
const SfxItemSet& rSet)
: SvxConfigPage(pParent, rSet)
{
@@ -180,8 +201,8 @@ void SvxNotebookbarConfigPage::Init()
m_xSaveInListBox->append(sSaveInListBoxID, sScopeName);
m_xSaveInListBox->set_active_id(sSaveInListBoxID);
-m_xTopLevelListBox->append("All Commands", "All Commands");
-m_xTopLevelListBox->set_active_id("All Commands");
+m_xTopLevelListBox->append("NotebookBar", "All Commands");
+m_xTopLevelListBox->set_active_id("NotebookBar");
SelectElement();
}
@@ -223,18 +244,69 @@ short SvxNotebookbarConfigPage::QueryReset()
return nValue;
}
-void SvxConfigPage::InsertEntryIntoNotebookbarTabUI(OUString& sUIItemID,
OUString& sUIItemCommand,
-int nPos, int nStartCol,
int nSpace)
+void SvxConfigPage::InsertEntryIntoNotebookbarTabUI(OUString& sClassId,
OUString& sUIItemId,
+OUString& sUIItemCommand,
int nPos,
+int nStartCol)
{
-auto xImage = GetSaveInData()->GetImage(sUIItemCommand);
-if (xImage.is())
-m_xContentsListBox->set_image(nPos, xImage, nStartCol);
-OUStringBuffer sDataInTree;
-for (int nIdx = 0; nIdx < nSpace; nIdx++)
-sDataInTree.append("");
-sDataInTree.append("-> ");
-sDataInTree.append(sUIItemID);
-m_xContentsListBox->set_text(nPos, sDataInTree.makeStringAndClear(),
nStartCol + 1);
+OUString sAppName, sFileName;
+CustomNotebookbarGenerator::getFileNameAndAppName(sAppName, sFileName);
+
+css::uno::Reference m_xCommandToLabelMap,
+m_xGlobalCommandToLabelMap;
+uno::Reference xContext =
::comphelper::getProcessComponentContext();
+uno::Reference xNameAccess(
+css::frame::theUICommandDescription::get(xContext));
+
+uno::Sequence aPropSeq, aGlobalPropSeq;
+
+xNameAccess->getByName("com.sun.star.text.GlobalDocument") >>=
m_xGlobalCommandToLabelMap;
+xNameAccess->getByName(getModuleId
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - sfx2/source
sfx2/source/doc/SfxRedactionHelper.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 40b8c8c912ea26227784d2f0ebf526c5f5d19b34
Author: Muhammet Kara
AuthorDate: Fri Jun 28 20:18:50 2019 +0300
Commit: Andras Timar
CommitDate: Fri Jun 28 15:01:01 2019 -0400
Fix undefined reference to static constexpr for pre-C++17
Change-Id: I451dba37688441f26aa48e62b1baa3aa24678073
diff --git a/sfx2/source/doc/SfxRedactionHelper.cxx
b/sfx2/source/doc/SfxRedactionHelper.cxx
index 6e602b048acf..267d6eb938bd 100644
--- a/sfx2/source/doc/SfxRedactionHelper.cxx
+++ b/sfx2/source/doc/SfxRedactionHelper.cxx
@@ -60,6 +60,8 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::uno;
+constexpr OUStringLiteral SfxRedactionHelper::m_aPredefinedTargets[6];
+
bool SfxRedactionHelper::isRedactMode(const SfxRequest& rReq)
{
const SfxItemSet* pArgs = rReq.GetArgs();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmlhelp/source
xmlhelp/source/cxxhelp/provider/databases.cxx | 30 +-
1 file changed, 15 insertions(+), 15 deletions(-)
New commits:
commit 049189f49dba87e0b6d948e2b6a5e416f1fca36b
Author: Eike Rathke
AuthorDate: Fri Jun 28 18:02:38 2019 +0200
Commit: Eike Rathke
CommitDate: Fri Jun 28 20:49:29 2019 +0200
Use LanguageTag::getFallbackStrings() instead of old dumb hard coded stuff
So finding correct offline help will actually work with language
tags containing scripts or variants.
Change-Id: I493041fbfe62dc7cd2e035592fe94ef9fe3c2480
Reviewed-on: https://gerrit.libreoffice.org/74855
Reviewed-by: Eike Rathke
Tested-by: Jenkins
diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx
b/xmlhelp/source/cxxhelp/provider/databases.cxx
index 9f75248910b6..04aba4c5991e 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.cxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.cxx
@@ -400,23 +400,23 @@ OUString Databases::processLang( const OUString& Language
)
if( it == m_aLangSet.end() )
{
-sal_Int32 idx;
-osl::DirectoryItem aDirItem;
+// XXX the old code looked for '-' and '_' as separator between
+// language and country, no idea if '_' actually still can happen
+// (probably not), but play safe and keep that and transform to proper
+// BCP47.
+const OUString aBcp47( Language.replaceAll( "_", "-"));
-if( osl::FileBase::E_None == osl::DirectoryItem::get(
getInstallPathAsURL() + Language,aDirItem ) )
-{
-ret = Language;
-m_aLangSet[ Language ] = ret;
-}
-/* FIXME-BCP47: this is wrong, does not work as soon as script or
- * variant is involved in the language tag. */
-else if( ( ( idx = Language.indexOf( '-' ) ) != -1 ||
- ( idx = Language.indexOf( '_' ) ) != -1 ) &&
-osl::FileBase::E_None == osl::DirectoryItem::get(
getInstallPathAsURL() + Language.copy( 0,idx ),
- aDirItem ) )
+// Try if language tag or fallbacks are installed.
+osl::DirectoryItem aDirItem;
+std::vector aFallbacks( LanguageTag(
aBcp47).getFallbackStrings(true));
+for (auto const & rFB : aFallbacks)
{
-ret = Language.copy( 0,idx );
-m_aLangSet[ Language ] = ret;
+if (osl::FileBase::E_None == osl::DirectoryItem::get(
getInstallPathAsURL() + rFB, aDirItem))
+{
+ret = rFB;
+m_aLangSet[ Language ] = ret;
+break; // for
+}
}
}
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sfx2/source
sfx2/source/appl/newhelp.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit cb1c5ae7af997d7643da97235caf95789ba09416
Author: Julien Nabet
AuthorDate: Tue Jun 25 18:32:54 2019 +0200
Commit: Julien Nabet
CommitDate: Fri Jun 28 20:34:30 2019 +0200
tdf#126071: fix assertion with offline help viewer
See bt here:
https://bugs.documentfoundation.org/attachment.cgi?id=152373
+
https://bugs.documentfoundation.org/show_bug.cgi?id=126071#c1
Change-Id: I6b9dcd0771d2e6df0cd89b3b0243d0d8defba685
(cherry picked from commit 0328e0af9532d5ab26840cf58b9dcbb69bb8c33d)
Reviewed-on: https://gerrit.libreoffice.org/74846
Reviewed-by: Eike Rathke
Tested-by: Jenkins
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 034a8987de36..19abe18a466d 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -206,7 +206,7 @@ namespace sfx2
Boundary aBoundary = xBreak->getWordBoundary(
rSearchString, nStartPos, aLocale,
WordType::ANYWORD_IGNOREWHITESPACES, true );
-while ( aBoundary.startPos != aBoundary.endPos )
+while ( aBoundary.startPos < aBoundary.endPos )
{
nStartPos = aBoundary.endPos;
OUString sSearchToken( rSearchString.copy(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - xmlhelp/source
xmlhelp/source/cxxhelp/provider/databases.cxx | 30 ++
xmlhelp/source/cxxhelp/provider/databases.hxx |9 ---
2 files changed, 13 insertions(+), 26 deletions(-)
New commits:
commit 393bfc06fd5a805657296fb36fefd2197b88555c
Author: Eike Rathke
AuthorDate: Fri Jun 28 16:03:23 2019 +0200
Commit: Eike Rathke
CommitDate: Fri Jun 28 18:02:58 2019 +0200
Fix Help collator loading, processLang() does not return only the language
... but a tag of an installed language, e.g. "en-US".
Adding a country then resulted in "en-US-US", used to load a
collator.
Further inspection of processLang() needed which can't work for
sr-Latn or ca-valencia, for example.
Change-Id: Id587ede738143c506da1ff2822aa605d0e7bee83
Reviewed-on: https://gerrit.libreoffice.org/74847
Reviewed-by: Eike Rathke
Tested-by: Jenkins
(cherry picked from commit 41cf4e6604bfb9b51ce54c5ea64d77249c7545d7)
Reviewed-on: https://gerrit.libreoffice.org/74849
diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx
b/xmlhelp/source/cxxhelp/provider/databases.cxx
index e12ae7930853..bf73b4586a01 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.cxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.cxx
@@ -408,6 +408,8 @@ OUString Databases::processLang( const OUString& Language )
ret = Language;
m_aLangSet[ Language ] = ret;
}
+/* FIXME-BCP47: this is wrong, does not work as soon as script or
+ * variant is involved in the language tag. */
else if( ( ( idx = Language.indexOf( '-' ) ) != -1 ||
( idx = Language.indexOf( '_' ) ) != -1 ) &&
osl::FileBase::E_None == osl::DirectoryItem::get(
getInstallPathAsURL() + Language.copy( 0,idx ),
@@ -423,16 +425,6 @@ OUString Databases::processLang( const OUString& Language )
return ret;
}
-OUString Databases::country( const OUString& Language )
-{
-sal_Int32 idx;
-if( ( idx = Language.indexOf( '-' ) ) != -1 ||
-( idx = Language.indexOf( '_' ) ) != -1 )
-return Language.copy( 1+idx );
-
-return OUString();
-}
-
helpdatafileproxy::Hdf* Databases::getHelpDataFile( const OUString& Database,
const OUString& Language, bool helpText,
const OUString* pExtensionPath )
@@ -495,10 +487,11 @@ Databases::getCollator( const OUString& Language )
if( ! it->second.is() )
{
it->second = Collator::create(m_xContext);
-OUString langStr = processLang(Language);
-OUString countryStr = country(Language);
+LanguageTag aLanguageTag( Language);
+OUString countryStr = aLanguageTag.getCountry();
if( countryStr.isEmpty() )
{
+const OUString langStr = aLanguageTag.getLanguage();
if( langStr == "de" )
countryStr = "DE";
else if( langStr == "en" )
@@ -515,13 +508,14 @@ Databases::getCollator( const OUString& Language )
countryStr = "JP";
else if( langStr == "ko" )
countryStr = "KR";
+
+// XXX NOTE: there are no complex language tags involved in those
+// "add country" cases, only because of this we can use this
+// simplified construction.
+if (!countryStr.isEmpty())
+aLanguageTag.reset( langStr + "-" + countryStr);
}
-/* FIXME-BCP47: all this does not look right for language tag context,
- * also check processLang() and country() methods */
-it->second->loadDefaultCollator( Locale( langStr,
- countryStr,
- OUString() ),
- 0 );
+it->second->loadDefaultCollator( aLanguageTag.getLocale(), 0);
}
return it->second;
diff --git a/xmlhelp/source/cxxhelp/provider/databases.hxx
b/xmlhelp/source/cxxhelp/provider/databases.hxx
index 3900e9918cdc..c7ffa765b348 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.hxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.hxx
@@ -204,18 +204,11 @@ namespace chelp {
OUString* o_pExtensionRegistryPath = nullptr );
/**
- * Maps a given language-locale combination to language.
+ * Maps a given language-locale combination to language or locale.
*/
OUString processLang( const OUString& Language );
-/**
- * Maps a given language-locale combination to locale.
- * The returned string maybe empty
- */
-
-static OUString country( const OUString& Language );
-
void replaceName( OUString& oustring ) const;
const OUString& getProductName() const { return m_vReplacement[0]; }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesk
[Libreoffice-commits] core.git: ucbhelper/source
ucbhelper/source/client/interceptedinteraction.cxx | 18 +-
ucbhelper/source/client/proxydecider.cxx | 129 +
ucbhelper/source/provider/contenthelper.cxx| 21 ---
ucbhelper/source/provider/contentinfo.cxx |8 -
ucbhelper/source/provider/propertyvalueset.cxx | 28 +---
ucbhelper/source/provider/providerhelper.cxx | 40 +-
ucbhelper/source/provider/resultsetmetadata.cxx| 21 ---
7 files changed, 100 insertions(+), 165 deletions(-)
New commits:
commit e1c62463433824c3bdfb3245a19366881544afb9
Author: Arkadiy Illarionov
AuthorDate: Fri Jun 28 01:35:35 2019 +0300
Commit: Arkadiy Illarionov
CommitDate: Fri Jun 28 17:37:54 2019 +0200
Simplify Sequence iterations in ucbhelper
Use range-based loops or replace with STL functions
Change-Id: I4e9f5ae006ecbc7513db7574e0f8e08c6940cdb7
Reviewed-on: https://gerrit.libreoffice.org/74828
Tested-by: Jenkins
Reviewed-by: Arkadiy Illarionov
diff --git a/ucbhelper/source/client/interceptedinteraction.cxx
b/ucbhelper/source/client/interceptedinteraction.cxx
index afc2f3bf9576..682732958aee 100644
--- a/ucbhelper/source/client/interceptedinteraction.cxx
+++ b/ucbhelper/source/client/interceptedinteraction.cxx
@@ -48,17 +48,13 @@ InterceptedInteraction::EInterceptionState
InterceptedInteraction::intercepted(
css::uno::Reference< css::task::XInteractionContinuation >
InterceptedInteraction::extractContinuation(const css::uno::Sequence<
css::uno::Reference< css::task::XInteractionContinuation > >& lContinuations,
const css::uno::Type&
aType )
{
-const css::uno::Reference< css::task::XInteractionContinuation >*
pContinuations = lContinuations.getConstArray();
-
-sal_Int32 c = lContinuations.getLength();
-sal_Int32 i = 0;
-
-for (i=0; i xCheck(pContinuations[i],
css::uno::UNO_QUERY);
-if (xCheck->queryInterface(aType).hasValue())
-return pContinuations[i];
-}
+const css::uno::Reference< css::task::XInteractionContinuation >*
pContinuations = std::find_if(lContinuations.begin(), lContinuations.end(),
+[&aType](const css::uno::Reference<
css::task::XInteractionContinuation >& rContinuation) {
+css::uno::Reference< css::uno::XInterface > xCheck(rContinuation,
css::uno::UNO_QUERY);
+return xCheck->queryInterface(aType).hasValue();
+});
+if (pContinuations != lContinuations.end())
+return *pContinuations;
return css::uno::Reference< css::task::XInteractionContinuation >();
}
diff --git a/ucbhelper/source/client/proxydecider.cxx
b/ucbhelper/source/client/proxydecider.cxx
index 0e290006e94a..e80fa5b708f6 100644
--- a/ucbhelper/source/client/proxydecider.cxx
+++ b/ucbhelper/source/client/proxydecider.cxx
@@ -707,92 +707,85 @@ void SAL_CALL InternetProxyDecider_Impl::changesOccurred(
{
osl::Guard< osl::Mutex > aGuard( m_aMutex );
-sal_Int32 nCount = Event.Changes.getLength();
-if ( nCount )
+for ( const util::ElementChange& rElem : Event.Changes )
{
-const util::ElementChange* pElementChanges
-= Event.Changes.getConstArray();
-for ( sal_Int32 n = 0; n < nCount; ++n )
+OUString aKey;
+if ( ( rElem.Accessor >>= aKey ) && !aKey.isEmpty() )
{
-const util::ElementChange& rElem = pElementChanges[ n ];
-OUString aKey;
-if ( ( rElem.Accessor >>= aKey ) && !aKey.isEmpty() )
+if ( aKey == PROXY_TYPE_KEY )
{
-if ( aKey == PROXY_TYPE_KEY )
+sal_Int32 tmp;
+if ( !( rElem.Element >>= tmp ) )
{
-sal_Int32 tmp;
-if ( !( rElem.Element >>= tmp ) )
-{
-OSL_FAIL( "InternetProxyDecider - changesOccurred - "
-"Error getting config item value!" );
-}
-else
-m_nProxyType = static_cast(tmp);
+OSL_FAIL( "InternetProxyDecider - changesOccurred - "
+"Error getting config item value!" );
}
-else if ( aKey == NO_PROXY_LIST_KEY )
+else
+m_nProxyType = static_cast(tmp);
+}
+else if ( aKey == NO_PROXY_LIST_KEY )
+{
+OUString aNoProxyList;
+if ( !( rElem.Element >>= aNoProxyList ) )
{
-OUString aNoProxyList;
-if ( !( rElem.Element >>= aNoProxyList ) )
-{
-OSL_FAIL( "InternetProxyDecider - changesOccurred - "
-"
[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - vcl/source
vcl/source/window/dialog.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d9b32fdee82e05042681a3fd4b634055edfaf00b
Author: Caolán McNamara
AuthorDate: Thu Jun 27 20:50:35 2019 +0100
Commit: Michael Stahl
CommitDate: Fri Jun 28 17:35:00 2019 +0200
Resolves: tdf#126134 EndDialog on disposed dialog
Change-Id: I079fb2bb786b66b843e8e3960643cf2db6387c79
Reviewed-on: https://gerrit.libreoffice.org/74823
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index e88d5aacaea2..b95dfb299f41 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -1092,7 +1092,7 @@ void Dialog::RemoveFromDlgList()
void Dialog::EndDialog( long nResult )
{
-if ( !mbInExecute )
+if (!mbInExecute || IsDisposed())
return;
const bool bModal = GetType() != WindowType::MODELESSDIALOG;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: unotools/source
unotools/source/config/cmdoptions.cxx |8 -
unotools/source/config/compatibility.cxx | 10 -
unotools/source/config/configitem.cxx | 125 +++---
unotools/source/config/confignode.cxx |5
unotools/source/config/dynamicmenuoptions.cxx |3
unotools/source/config/eventcfg.cxx | 17 +-
unotools/source/config/fontcfg.cxx| 25 +---
unotools/source/config/historyoptions.cxx |9 -
unotools/source/config/lingucfg.cxx | 21 +--
unotools/source/config/moduleoptions.cxx | 54 +++--
unotools/source/config/optionsdlg.cxx | 14 --
unotools/source/config/pathoptions.cxx|3
unotools/source/config/securityoptions.cxx| 24 +---
unotools/source/config/viewoptions.cxx| 21 +--
unotools/source/i18n/localedatawrapper.cxx| 90 +--
unotools/source/ucbhelper/progresshandlerwrap.cxx |8 -
unotools/source/ucbhelper/ucbhelper.cxx |8 -
unotools/source/ucbhelper/ucblockbytes.cxx|9 -
18 files changed, 172 insertions(+), 282 deletions(-)
New commits:
commit 1e084caf573255a93ce86053d584976f317074df
Author: Arkadiy Illarionov
AuthorDate: Thu Jun 27 23:29:01 2019 +0300
Commit: Arkadiy Illarionov
CommitDate: Fri Jun 28 17:33:40 2019 +0200
Simplify Sequence iterations in unotools
Use range-based loops or replace with STL functions
Change-Id: I220c5cd5dcc19fc35e1ad729ae69246f4a79ce2d
Reviewed-on: https://gerrit.libreoffice.org/74825
Tested-by: Jenkins
Reviewed-by: Arkadiy Illarionov
diff --git a/unotools/source/config/cmdoptions.cxx
b/unotools/source/config/cmdoptions.cxx
index 2c8f18e76aea..56b61ad2704a 100644
--- a/unotools/source/config/cmdoptions.cxx
+++ b/unotools/source/config/cmdoptions.cxx
@@ -277,11 +277,9 @@ Sequence< OUString >
SvtCommandOptions_Impl::impl_GetPropertyNames()
Sequence< OUString > lDisabledItems = GetNodeNames( SETNODE_DISABLED,
utl::ConfigNameFormat::LocalPath );
// Expand all keys
-for (sal_Int32 i=0; i OUString {
+return SETNODE_DISABLED PATHDELIMITER + rItem + PATHDELIMITER
PROPERTYNAME_CMD; });
// Return result.
return lDisabledItems;
diff --git a/unotools/source/config/compatibility.cxx
b/unotools/source/config/compatibility.cxx
index a1523d3aae41..f0d211de6957 100644
--- a/unotools/source/config/compatibility.cxx
+++ b/unotools/source/config/compatibility.cxx
@@ -159,7 +159,6 @@
SvtCompatibilityOptions_Impl::SvtCompatibilityOptions_Impl() : ConfigItem( ROOTN
// See impl_GetPropertyNames() for further information.
Sequence< OUString > lNodes;
Sequence< OUString > lNames = impl_GetPropertyNames( lNodes );
-sal_uInt32 nCount = lNodes.getLength();
Sequence< Any > lValues = GetProperties( lNames );
// Safe impossible cases.
@@ -171,11 +170,11 @@
SvtCompatibilityOptions_Impl::SvtCompatibilityOptions_Impl() : ConfigItem( ROOTN
// 4 subkeys for every item!
bool bDefaultFound = false;
sal_Int32 nDestStep= 0;
-for ( sal_uInt32 nItem = 0; nItem < nCount; ++nItem )
+for ( const auto& rNode : lNodes )
{
SvtCompatibilityEntry aItem;
-aItem.setValue( SvtCompatibilityEntry::Index::Name, lNodes[
nItem ] );
+aItem.setValue( SvtCompatibilityEntry::Index::Name, rNode );
for ( int i = static_cast(SvtCompatibilityEntry::Index::Module);
i < static_cast(SvtCompatibilityEntry::Index::INVALID); ++i )
{
@@ -292,14 +291,13 @@ Sequence< OUString >
SvtCompatibilityOptions_Impl::impl_GetPropertyNames( Sequen
// expand list to result list ...
Sequence< OUString > lProperties( rItems.getLength() * (
SvtCompatibilityEntry::getElementCount() - 1 ) );
-sal_Int32 nSourceCount = rItems.getLength();
sal_Int32 nDestStep= 0;
// Copy entries to destination and expand every item with 2 supported sub
properties.
-for ( sal_Int32 nSourceStep = 0; nSourceStep < nSourceCount; ++nSourceStep
)
+for ( const auto& rItem : rItems )
{
OUString sFixPath = SETNODE_ALLFILEFORMATS;
sFixPath += PATHDELIMITER;
-sFixPath += rItems[ nSourceStep ];
+sFixPath += rItem;
sFixPath += PATHDELIMITER;
for ( int i = static_cast(SvtCompatibilityEntry::Index::Module);
i < static_cast(SvtCompatibilityEntry::Index::INVALID); ++i )
{
diff --git a/unotools/source/config/configitem.cxx
b/unotools/source/config/configitem.cxx
index 6f5e99940703..4af2eb3bc977 100644
--- a/unotools/source/config/configitem.cxx
+++ b/unotools/source/config/configitem.cxx
@@ -35,6 +35,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -98,34 +99,21 @@ ConfigChangeListener_Impl::ConfigChangeListener_Impl(
{
}
-static bool lcl_Find(
-const OUString& rTemp,
-const
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - 2 commits - vcl/headless vcl/inc vcl/Library_vcl.mk vcl/Library_vclplug_kde5.mk vcl/osx vcl/qt5 vcl/source vcl/unx vcl/win
vcl/Library_vcl.mk|1
vcl/Library_vclplug_kde5.mk |1
vcl/headless/svpframe.cxx |2
vcl/headless/svpgdi.cxx | 63 -
vcl/inc/WidgetDrawInterface.hxx | 57
vcl/inc/headless/svpgdi.hxx | 21
vcl/inc/qt5/Qt5Graphics.hxx | 49 --
vcl/inc/qt5/Qt5Graphics_Controls.hxx | 32 +++---
vcl/inc/qt5/Qt5SvpGraphics.hxx| 11 +-
vcl/inc/quartz/salgdi.h | 10 +-
vcl/inc/salgdi.hxx| 139 +++---
vcl/inc/unx/gtk/gtkgdi.hxx| 17 ++-
vcl/inc/win/salgdi.h |5 -
vcl/osx/salnativewidgets.cxx |2
vcl/qt5/Qt5Frame.cxx |2
vcl/qt5/Qt5Graphics.cxx | 25 ++---
vcl/qt5/Qt5Graphics_Controls.cxx |4
vcl/qt5/Qt5Instance.cxx |5 -
vcl/qt5/Qt5SvpGraphics.cxx| 66 +-
vcl/qt5/Qt5SvpVirtualDevice.hxx |8 -
vcl/source/gdi/salgdilayout.cxx | 56 +++-
vcl/source/gdi/salnativewidgets-none.cxx | 53 ---
vcl/source/outdev/nativecontrols.cxx |2
vcl/unx/gtk/gtksalframe.cxx |2
vcl/unx/gtk/salnativewidgets-gtk.cxx |8 +
vcl/unx/gtk3/gtk3gtkframe.cxx |2
vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx | 49 +++---
vcl/unx/kde5/KDE5SalFrame.cxx |3
vcl/unx/kde5/KDE5SalFrame.hxx |6 -
vcl/unx/kde5/KDE5SalGraphics.cxx | 85 --
vcl/unx/kde5/KDE5SalGraphics.hxx | 84 --
vcl/unx/kde5/KDE5SalInstance.cxx | 17 ---
vcl/unx/kde5/KDE5SalInstance.hxx |4
vcl/win/gdi/salnativewidgets-luna.cxx |2
34 files changed, 247 insertions(+), 646 deletions(-)
New commits:
commit 201fbc259cdbd49f0135dae41533693359f821d2
Author: Jan-Marek Glogowski
AuthorDate: Sun Jun 16 14:19:09 2019 +
Commit: Jan-Marek Glogowski
CommitDate: Fri Jun 28 17:18:27 2019 +0200
tdf#125919 VCL cleanup WidgetDrawInterface
I don't understand why WidgetDrawInterface, which is basically a
copy of the SalGraphics native controls interface, duplicated it,
instead of cleaning things up.
The whole commit message of commit 8fcfa3853a81, which added this
code, is just: "custom widgets: Custom Widget Themes". That's it.
So this patch does, what the original one skipped: replacing the
SalGraphics interface with the WidgetDrawInterface. One result is
the addition of handleDamage to SalGraphics to correctly handle
the damage done by a custom widget theme to the underlying
SalGraphics implementation.
Reviewed-on: https://gerrit.libreoffice.org/74118
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski
(cherry picked from commit 4a478227f5af8322164ecce66fd056e9bf2eac89)
Change-Id: I5fda1a64b28e6560fb3c62e02b6dcda827f698e2
Reviewed-on: https://gerrit.libreoffice.org/74772
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index deb7cf049106..c8391717c492 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -300,7 +300,6 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/source/gdi/salgdiimpl \
vcl/source/gdi/sallayout \
vcl/source/gdi/salmisc \
-vcl/source/gdi/salnativewidgets-none \
vcl/source/gdi/vectorgraphicdata \
vcl/source/gdi/textlayout \
vcl/source/gdi/virdev \
diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx
index f54103ff1ecc..4259a84d5a0b 100644
--- a/vcl/headless/svpframe.cxx
+++ b/vcl/headless/svpframe.cxx
@@ -441,7 +441,7 @@ void SvpSalFrame::UpdateSettings( AllSettings& rSettings )
}
rSettings.SetStyleSettings(aStyleSettings);
#ifndef IOS // For now...
-pGraphics->updateSettings(rSettings);
+pGraphics->UpdateSettings(rSettings);
#endif
if (bFreeGraphics)
ReleaseGraphics(pGraphics);
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 0f6fda87fd5b..b335d2ed630b 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -1866,69 +1866,6 @@ bool SvpSalGraphics::drawEPS( long, long, long, long,
void*, sal_uInt32 )
return false;
}
-/* Widget drawing */
-
-bool SvpSalGraphics::IsNativeControlSupported(ControlType eType, ControlPart
ePart)
-{
-if (hasWidgetDraw())
-return m_pWidgetDraw->isNativeControlSupported(eType, ePart);
-
-return false;
-}
-
-bool SvpSalGraphics::hitTestNativeControl(ControlType eType, ControlPart ePart,
- const tools::Rectangle&
rBoundingControlRegion,
- const Point& rPosition, bool& rIsInside)
-{
-if (hasWidgetDraw()
[Libreoffice-commits] core.git: xmlhelp/source
xmlhelp/source/cxxhelp/provider/databases.cxx | 30 ++
xmlhelp/source/cxxhelp/provider/databases.hxx |9 ---
2 files changed, 13 insertions(+), 26 deletions(-)
New commits:
commit 41cf4e6604bfb9b51ce54c5ea64d77249c7545d7
Author: Eike Rathke
AuthorDate: Fri Jun 28 16:03:23 2019 +0200
Commit: Eike Rathke
CommitDate: Fri Jun 28 17:01:28 2019 +0200
Fix Help collator loading, processLang() does not return only the language
... but a tag of an installed language, e.g. "en-US".
Adding a country then resulted in "en-US-US", used to load a
collator.
Further inspection of processLang() needed which can't work for
sr-Latn or ca-valencia, for example.
Change-Id: Id587ede738143c506da1ff2822aa605d0e7bee83
Reviewed-on: https://gerrit.libreoffice.org/74847
Reviewed-by: Eike Rathke
Tested-by: Jenkins
diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx
b/xmlhelp/source/cxxhelp/provider/databases.cxx
index 26b673982333..9f75248910b6 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.cxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.cxx
@@ -408,6 +408,8 @@ OUString Databases::processLang( const OUString& Language )
ret = Language;
m_aLangSet[ Language ] = ret;
}
+/* FIXME-BCP47: this is wrong, does not work as soon as script or
+ * variant is involved in the language tag. */
else if( ( ( idx = Language.indexOf( '-' ) ) != -1 ||
( idx = Language.indexOf( '_' ) ) != -1 ) &&
osl::FileBase::E_None == osl::DirectoryItem::get(
getInstallPathAsURL() + Language.copy( 0,idx ),
@@ -423,16 +425,6 @@ OUString Databases::processLang( const OUString& Language )
return ret;
}
-OUString Databases::country( const OUString& Language )
-{
-sal_Int32 idx;
-if( ( idx = Language.indexOf( '-' ) ) != -1 ||
-( idx = Language.indexOf( '_' ) ) != -1 )
-return Language.copy( 1+idx );
-
-return OUString();
-}
-
helpdatafileproxy::Hdf* Databases::getHelpDataFile( const OUString& Database,
const OUString& Language, bool helpText,
const OUString* pExtensionPath )
@@ -495,10 +487,11 @@ Databases::getCollator( const OUString& Language )
if( ! it->second.is() )
{
it->second = Collator::create(m_xContext);
-OUString langStr = processLang(Language);
-OUString countryStr = country(Language);
+LanguageTag aLanguageTag( Language);
+OUString countryStr = aLanguageTag.getCountry();
if( countryStr.isEmpty() )
{
+const OUString langStr = aLanguageTag.getLanguage();
if( langStr == "de" )
countryStr = "DE";
else if( langStr == "en" )
@@ -515,13 +508,14 @@ Databases::getCollator( const OUString& Language )
countryStr = "JP";
else if( langStr == "ko" )
countryStr = "KR";
+
+// XXX NOTE: there are no complex language tags involved in those
+// "add country" cases, only because of this we can use this
+// simplified construction.
+if (!countryStr.isEmpty())
+aLanguageTag.reset( langStr + "-" + countryStr);
}
-/* FIXME-BCP47: all this does not look right for language tag context,
- * also check processLang() and country() methods */
-it->second->loadDefaultCollator( Locale( langStr,
- countryStr,
- OUString() ),
- 0 );
+it->second->loadDefaultCollator( aLanguageTag.getLocale(), 0);
}
return it->second;
diff --git a/xmlhelp/source/cxxhelp/provider/databases.hxx
b/xmlhelp/source/cxxhelp/provider/databases.hxx
index 3900e9918cdc..c7ffa765b348 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.hxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.hxx
@@ -204,18 +204,11 @@ namespace chelp {
OUString* o_pExtensionRegistryPath = nullptr );
/**
- * Maps a given language-locale combination to language.
+ * Maps a given language-locale combination to language or locale.
*/
OUString processLang( const OUString& Language );
-/**
- * Maps a given language-locale combination to locale.
- * The returned string maybe empty
- */
-
-static OUString country( const OUString& Language );
-
void replaceName( OUString& oustring ) const;
const OUString& getProductName() const { return m_vReplacement[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-3' - instsetoo_native/inc_common instsetoo_native/inc_openoffice
instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp |binary
instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf | 62 -
instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt | 578
+-
instsetoo_native/inc_openoffice/windows/msi_templates/Dialog.idt| 62 -
instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt |2
instsetoo_native/inc_openoffice/windows/msi_templates/TextStyl.idt | 25
6 files changed, 355 insertions(+), 374 deletions(-)
New commits:
commit 498dfee819286f6c13278a0b8fcab85611a6feee
Author: Roman Kuznetsov
AuthorDate: Mon Jun 17 19:13:18 2019 +0200
Commit: Roman Kuznetsov
CommitDate: Fri Jun 28 17:00:40 2019 +0200
tdf#99891 Update installer fonts to match newer versions of Windows
Change-Id: I6f607e44b92ae9958b6013f9292743a1c7b76d34
Reviewed-on: https://gerrit.libreoffice.org/74185
Tested-by: Jenkins
Reviewed-by: Roman Kuznetsov
(cherry picked from commit d8932ff5df0939b5c5e378b7ad0a63a25df5b3b0)
Reviewed-on: https://gerrit.libreoffice.org/74832
diff --git
a/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp
b/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp
old mode 100644
new mode 100755
index 5a163cf86c23..0d5d1a058038
Binary files
a/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp and
b/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp differ
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
index d8927314f54f..2517ec085a72 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
@@ -26,7 +26,7 @@ en-US = "&Look in:"
en-US = "Browse to the destination folder."
[OOO_CONTROL_7]
-en-US = "{&MSSansBold8}Change Current Destination Folder"
+en-US = "{&DialogDefaultBold}Change Current Destination Folder"
[OOO_CONTROL_9]
en-US = "Create new folder|"
@@ -74,7 +74,7 @@ en-US = "Cancel"
en-US = "&Next >"
[OOO_CONTROL_27]
-en-US = "{&TahomaBold10}Welcome to the Installation Wizard for [ProductName]"
+en-US = "{&DialogDefaultBold}Welcome to the Installation Wizard for
[ProductName]"
[OOO_CONTROL_28]
en-US = "The Installation Wizard will create a server image of [ProductName]
at a specified network location. To continue, click Next."
@@ -95,7 +95,7 @@ en-US = "< &Back"
en-US = "Cancel"
[OOO_CONTROL_36]
-en-US = "{\Tahoma8}{80}"
+en-US = "{\DialogDefault}{80}"
[OOO_CONTROL_37]
en-US = "&Organization:"
@@ -107,10 +107,10 @@ en-US = "Please enter your information."
en-US = "Install this application for:"
[OOO_CONTROL_40]
-en-US = "{&MSSansBold8}User Information"
+en-US = "{&DialogDefaultBold}User Information"
[OOO_CONTROL_41]
-en-US = "{\Tahoma8}{50}"
+en-US = "{\DialogDefault}{50}"
[OOO_CONTROL_42]
en-US = "&User Name:"
@@ -137,7 +137,7 @@ en-US = "Select the program features you want installed."
en-US = "Click on an icon in the list below to change how a feature is
installed."
[OOO_CONTROL_54]
-en-US = "{&MSSansBold8}Custom Setup"
+en-US = "{&DialogDefaultBold}Custom Setup"
[OOO_CONTROL_55]
en-US = "Feature Description:"
@@ -164,7 +164,7 @@ en-US = "Feature size"
en-US = "Custom Setup allows you to selectively install program features."
[OOO_CONTROL_65]
-en-US = "{&MSSansBold8}Custom Setup Tips"
+en-US = "{&DialogDefaultBold}Custom Setup Tips"
[OOO_CONTROL_66]
en-US = "Will not be installed."
@@ -203,7 +203,7 @@ en-US = "&Change..."
en-US = "Click Next to install to this folder, or click Change to install to a
different folder."
[OOO_CONTROL_90]
-en-US = "{&MSSansBold8}Destination Folder"
+en-US = "{&DialogDefaultBold}Destination Folder"
[OOO_CONTROL_91]
en-US = "[INSTALLDIR]"
@@ -221,7 +221,7 @@ en-US = "The disk space required for the installation of
the selected features."
en-US = "The highlighted volumes do not have enough disk space available for
the currently selected features. You can remove files from the highlighted
volumes, choose to install less features onto local drives, or select different
destination drives."
[OOO_CONTROL_98]
-en-US = "{&MSSansBold8}Disk Space Requirements"
+en-US = "{&DialogDefaultBold}Disk Space Requirements"
[OOO_CONTROL_100]
en-US = "OK"
@@ -233,7 +233,7 @@ en-US = "Some files that need to be updated are currently
in use."
en-US = "The following applications are using files that need to be updated by
this setup. Close these applications and click Retry to continue."
[OOO_CONTROL_105]
-en-US = "{&MSSansBold8}Files in Use"
+en-US = "{&DialogDefaultBold}Files in Use"
[OOO_CONTROL_106]
en-US = "&Exit"
@@ -254,7 +254,7 @@ en-US = "&Look in:"
en-US = "Browse to the destination folder."
[OOO_CONTROL_115]
-en-US = "{&MSSansBold8}Change Current Destination Folder"
+en-US = "{&DialogDefaultBold
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - sfx2/source
sfx2/source/appl/newhelp.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 03ef64befed26a03b35d6e977649face888f41a5
Author: Julien Nabet
AuthorDate: Tue Jun 25 18:32:54 2019 +0200
Commit: Julien Nabet
CommitDate: Fri Jun 28 16:40:48 2019 +0200
tdf#126071: fix assertion with offline help viewer
See bt here:
https://bugs.documentfoundation.org/attachment.cgi?id=152373
+
https://bugs.documentfoundation.org/show_bug.cgi?id=126071#c1
Change-Id: I6b9dcd0771d2e6df0cd89b3b0243d0d8defba685
(cherry picked from commit 0328e0af9532d5ab26840cf58b9dcbb69bb8c33d)
Reviewed-on: https://gerrit.libreoffice.org/74845
Reviewed-by: Eike Rathke
Tested-by: Jenkins
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 8f6ccd8af2be..fc60111090e1 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -207,7 +207,7 @@ namespace sfx2
Boundary aBoundary = xBreak->getWordBoundary(
rSearchString, nStartPos, aLocale,
WordType::ANYWORD_IGNOREWHITESPACES, true );
-while ( aBoundary.startPos != aBoundary.endPos )
+while ( aBoundary.startPos < aBoundary.endPos )
{
nStartPos = aBoundary.endPos;
OUString sSearchToken( rSearchString.copy(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5f1387841bdb9290022a40f3870819d5bf853ed3 Author: Andras Timar AuthorDate: Fri Jun 28 16:37:56 2019 +0200 Commit: Gerrit Code Review CommitDate: Fri Jun 28 16:38:04 2019 +0200 Update git submodules * Update translations from branch 'libreoffice-6-3' - Updated Slovenian translation Change-Id: I80220e271368a62da3f79db8de5ac9f6399b13df diff --git a/translations b/translations index f3ad292ee6de..9c48e8189d25 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit f3ad292ee6de193750afa5860eb992f457187b98 +Subproject commit 9c48e8189d252ce85ac6145203acec8cd101c44d ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Branch 'libreoffice-6-3' - source/sl
source/sl/cui/messages.po | 126 +-- source/sl/dbaccess/messages.po |4 source/sl/desktop/messages.po | 50 - source/sl/filter/source/config/fragments/filters.po|6 source/sl/helpcontent2/source/auxiliary.po | 24 source/sl/helpcontent2/source/text/sbasic/guide.po |8 source/sl/helpcontent2/source/text/sbasic/python.po|3 source/sl/helpcontent2/source/text/sbasic/shared.po| 12 source/sl/helpcontent2/source/text/sbasic/shared/03.po |4 source/sl/helpcontent2/source/text/scalc/01.po | 18 source/sl/helpcontent2/source/text/shared/00.po| 10 source/sl/helpcontent2/source/text/shared/01.po|4 source/sl/helpcontent2/source/text/shared/explorer/database.po |4 source/sl/helpcontent2/source/text/shared/guide.po | 18 source/sl/helpcontent2/source/text/shared/optionen.po |4 source/sl/helpcontent2/source/text/simpress.po |6 source/sl/helpcontent2/source/text/smath/01.po |4 source/sl/helpcontent2/source/text/swriter/01.po |6 source/sl/helpcontent2/source/text/swriter/guide.po| 28 source/sl/officecfg/registry/data/org/openoffice/Office/UI.po |6 source/sl/sc/messages.po | 194 ++--- source/sl/scp2/source/winexplorerext.po|4 source/sl/sd/messages.po | 68 - source/sl/sfx2/messages.po |4 source/sl/shell/messages.po|6 source/sl/starmath/messages.po | 360 +- source/sl/svx/messages.po | 10 source/sl/sw/messages.po | 82 +- 28 files changed, 524 insertions(+), 549 deletions(-) New commits: commit 9c48e8189d252ce85ac6145203acec8cd101c44d Author: Andras Timar AuthorDate: Fri Jun 28 16:37:56 2019 +0200 Commit: Andras Timar CommitDate: Fri Jun 28 16:37:56 2019 +0200 Updated Slovenian translation Change-Id: I80220e271368a62da3f79db8de5ac9f6399b13df diff --git a/source/sl/cui/messages.po b/source/sl/cui/messages.po index 26bf1a381fd..92bd71a5536 100644 --- a/source/sl/cui/messages.po +++ b/source/sl/cui/messages.po @@ -3,8 +3,8 @@ msgid "" msgstr "" "Project-Id-Version: LibreOffice 6.3\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"; -"POT-Creation-Date: 2019-06-14 13:43+0200\n" -"PO-Revision-Date: 2019-06-16 21:35+0200\n" +"POT-Creation-Date: 2019-06-23 15:35+0200\n" +"PO-Revision-Date: 2019-06-28 16:11+0200\n" "Last-Translator: Martin Srebotnjak \n" "Language-Team: sl.libreoffice.org\n" "Language: sl\n" @@ -1810,7 +1810,7 @@ msgstr "Orodja > Samopopravki > Možnosti samopopravkov ... > Zamenjaj ponuja se #: cui/inc/tipoftheday.hrc:47 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Writer can handle styles conditionally: paragraph styles that have different properties depending on the context." -msgstr "Program Writer zna ravnati s slogi pogojno: slogi odstavka imajo različne lastnosti glede na kontekst." +msgstr "Program Writer zna ravnati s slogi pogojno: slogi odstavka imajo lahko različne lastnosti glede na kontekst." #. https://help.libreoffice.org/6.2/en-US/text/swriter/01/05130100.html #: cui/inc/tipoftheday.hrc:48 @@ -1834,7 +1834,7 @@ msgstr "Če želite program začasno zagnati s svežim uporabniškim profilom al #: cui/inc/tipoftheday.hrc:51 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "Change the basic fonts for the predefined template or current document per Tools > Options > %PRODUCTNAME Writer > Basic Fonts." -msgstr "Spremenite osnovne pisave za vnaprej določeno predlogo ali trenutni dokument prek ukaza Orodja > Možnosti > %PRODUCTNAME Writer > Osnovne pisave." +msgstr "Spremenite osnovne pisave za vnaprej določeno predlogo ali trenutni dokument prek ukaza %PRODUCTNAME > NastavitveOrodja > Možnosti > %PRODUCTNAME Writer > Osnovne pisave." #. https://help.libreoffice.org/6.2/en-US/text/shared/optionen/01040300.html #: cui/inc/tipoftheday.hrc:52 @@ -1846,7 +1846,7 @@ msgstr "Pogosto uporabljena besedila definirajte kot samobesedilo. Poimensko, pr #: cui/inc/tipoftheday.hrc:53 msgctxt "RID_CUI_TIPOFTHEDAY" msgid "%PRODUCTNAME can automatically add a numbered caption when you insert objects. See Tools > Options > %PRODUCTNAME Writer > AutoCaption." -msgstr "%PRODUCTNAME lahko samodejno doda oštevilčeni napis, ko vstavljate predmete. Glejte Orodja > Možnosti > %PRODUCTNAME Writer > Samodejni napis." +msgstr "Ko vstavljate predmete, lahko %PRODUCTNAME samodejno doda oštevilčeni napis. Glejte %PRODUCTNAME >
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - sw/qa sw/source
sw/qa/extras/ooxmlexport/data/tdf78657_picture_hyperlink.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport13.cxx| 11 +++
sw/source/filter/ww8/docxattributeoutput.cxx | 30 +++---
3 files changed, 34 insertions(+), 7 deletions(-)
New commits:
commit 0151b1fe4ebb62a25dcb885a1b8d8c6540b16ee6
Author: Tünde Tóth
AuthorDate: Mon Jun 24 17:19:30 2019 +0200
Commit: Xisco Faulí
CommitDate: Fri Jun 28 15:54:40 2019 +0200
tdf#78657 DOCX export: fix hyperlink inserted to image
Hyperlink inserted to image lost after export.
tdf78657_picture_hyperlink.docx: Test file from Microsoft Word 2016.
Reviewed-on: https://gerrit.libreoffice.org/74653
Tested-by: Jenkins
Reviewed-by: László Németh
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
Change-Id: I1b2b9fe023aea3f46848a9d616374f7c08598756
Reviewed-on: https://gerrit.libreoffice.org/74841
Tested-by: Jenkins
Reviewed-by: Xisco Faulí
diff --git a/sw/qa/extras/ooxmlexport/data/tdf78657_picture_hyperlink.docx
b/sw/qa/extras/ooxmlexport/data/tdf78657_picture_hyperlink.docx
new file mode 100644
index ..bc4759ecc342
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/tdf78657_picture_hyperlink.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
index ce6871b45df5..f7d09f590363 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
@@ -355,6 +355,17 @@ DECLARE_OOXMLEXPORT_TEST(testTdf125324, "tdf125324.docx")
assertXPath(pXmlDoc,
"/root/page/body/txt[2]/anchored/fly/tab/infos/bounds", "top", "4193");
}
+DECLARE_OOXMLEXPORT_TEST(testTdf78657, "tdf78657_picture_hyperlink.docx")
+{
+xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+xmlDocPtr pXmlRels = parseExport("word/_rels/document.xml.rels");
+if (!pXmlDoc || !pXmlRels)
+return;
+assertXPath(pXmlDoc,
"/w:document/w:body/w:p/w:r/w:drawing/wp:inline/wp:docPr/a:hlinkClick", 1);
+assertXPath(pXmlDoc,
"/w:document/w:body/w:p/w:r/w:drawing/wp:inline/a:graphic/a:graphicData/pic:pic/pic:nvPicPr/pic:cNvPr/a:hlinkClick",
1);
+assertXPath(pXmlRels,
"/rels:Relationships/rels:Relationship[@Target='http://www.google.com']",
"TargetMode", "External");
+}
+
DECLARE_OOXMLEXPORT_TEST(testTdf125518, "tdf125518.odt")
{
xmlDocPtr pXmlDoc = parseExport("word/document.xml");
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index b7316b003745..2bdbc30c7aa1 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -4820,10 +4820,25 @@ void DocxAttributeOutput::FlyFrameGraphic( const
SwGrfNode* pGrfNode, const Size
docPrattrList->add( XML_title, OUStringToOString( pGrfNode ?
pGrfNode->GetTitle() : pOLEFrameFormat->GetObjTitle(), RTL_TEXTENCODING_UTF8
).getStr());
XFastAttributeListRef docPrAttrListRef( docPrattrList );
m_pSerializer->startElementNS( XML_wp, XML_docPr, docPrAttrListRef );
-// TODO hyperlink
-// m_pSerializer->singleElementNS( XML_a, XML_hlinkClick,
-// FSNS( XML_xmlns, XML_a ),
"http://schemas.openxmlformats.org/drawingml/2006/main";,
-// FSNS( XML_r, XML_id ), "rId4");
+
+//TODO: internal hyperlink
+OUString sURL, sRelId;
+if(pSdrObj)
+{
+uno::Reference< drawing::XShape > xShape(
const_cast(pSdrObj)->getUnoShape(), uno::UNO_QUERY );
+uno::Reference< beans::XPropertySet > xPropSet( xShape, uno::UNO_QUERY
);
+xPropSet->getPropertyValue("HyperLinkURL") >>= sURL;
+if(!sURL.isEmpty())
+{
+sRelId = GetExport().GetFilter().addRelation(
m_pSerializer->getOutputStream(),
+oox::getRelationship(Relationship::HYPERLINK),
+sURL, true );
+m_pSerializer->singleElementNS( XML_a, XML_hlinkClick,
+FSNS( XML_xmlns, XML_a ),
"http://schemas.openxmlformats.org/drawingml/2006/main";,
+FSNS( XML_r, XML_id ), sRelId.toUtf8());
+}
+}
+
m_pSerializer->endElementNS( XML_wp, XML_docPr );
m_pSerializer->startElementNS(XML_wp, XML_cNvGraphicFramePr);
@@ -4845,9 +4860,10 @@ void DocxAttributeOutput::FlyFrameGraphic( const
SwGrfNode* pGrfNode, const Size
// It seems pic:cNvpr and wp:docPr are pretty much the same thing with the
same attributes
m_pSerializer->startElementNS(XML_pic, XML_cNvPr, docPrAttrListRef);
-// TODO hyperlink
-// m_pSerializer->singleElementNS( XML_a, XML_hlinkClick,
-// FSNS( XML_r, XML_id ), "rId4");
+if(!sURL.isEmpty())
+m_pSerializer->singleElementNS( XML_a, XML_hlinkClick,
+FSNS( XML_r, XML_id ), sRelId.toUtf8());
+
m_pSerializer->endElementNS( XML_pic, XML_cNvPr );
m_pSerializer->startElementNS(XM
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/appl/newhelp.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0328e0af9532d5ab26840cf58b9dcbb69bb8c33d
Author: Julien Nabet
AuthorDate: Tue Jun 25 18:32:54 2019 +0200
Commit: Julien Nabet
CommitDate: Fri Jun 28 15:36:58 2019 +0200
tdf#126071: fix assertion with offline help viewer
See bt here:
https://bugs.documentfoundation.org/attachment.cgi?id=152373
+
https://bugs.documentfoundation.org/show_bug.cgi?id=126071#c1
Change-Id: I6b9dcd0771d2e6df0cd89b3b0243d0d8defba685
Reviewed-on: https://gerrit.libreoffice.org/74716
Reviewed-by: Eike Rathke
Tested-by: Jenkins
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 8f6ccd8af2be..fc60111090e1 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -207,7 +207,7 @@ namespace sfx2
Boundary aBoundary = xBreak->getWordBoundary(
rSearchString, nStartPos, aLocale,
WordType::ANYWORD_IGNOREWHITESPACES, true );
-while ( aBoundary.startPos != aBoundary.endPos )
+while ( aBoundary.startPos < aBoundary.endPos )
{
nStartPos = aBoundary.endPos;
OUString sSearchToken( rSearchString.copy(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/sanitizers
solenv/sanitizers/ui/modules/scalc.suppr |4 solenv/sanitizers/ui/modules/swriter.suppr |3 --- 2 files changed, 7 deletions(-) New commits: commit ea96d97f36e0b777fa8501898c9e15f1672917ab Author: Caolán McNamara AuthorDate: Fri Jun 28 11:49:53 2019 +0100 Commit: Caolán McNamara CommitDate: Fri Jun 28 15:33:12 2019 +0200 drop some unneeded ui suppressions Change-Id: Iceb84033631d168d25b81a8cd36bdf348309da5a Reviewed-on: https://gerrit.libreoffice.org/74838 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/solenv/sanitizers/ui/modules/scalc.suppr b/solenv/sanitizers/ui/modules/scalc.suppr index 2e695948d53d..ef20914e00da 100644 --- a/solenv/sanitizers/ui/modules/scalc.suppr +++ b/solenv/sanitizers/ui/modules/scalc.suppr @@ -30,7 +30,6 @@ sc/uiconfig/scalc/ui/conditionaliconset.ui://GtkEntry[@id='entry'] no-labelled-b sc/uiconfig/scalc/ui/conditionaliconset.ui://GtkComboBoxText[@id='listbox'] no-labelled-by sc/uiconfig/scalc/ui/conditionaliconset.ui://GtkImage[@id='icon'] no-labelled-by sc/uiconfig/scalc/ui/conflictsdialog.ui://GtkLabel[@id='label1'] orphan-label -sc/uiconfig/scalc/ui/conflictsdialog.ui://svtlo-SvSimpleTableContainer[@id='container:border'] no-labelled-by sc/uiconfig/scalc/ui/consolidatedialog.ui://GtkEntry[@id='eddataarea'] no-labelled-by sc/uiconfig/scalc/ui/consolidatedialog.ui://GtkEntry[@id='eddestarea'] no-labelled-by sc/uiconfig/scalc/ui/dapiservicedialog.ui://GtkLabel[@id='label2'] orphan-label @@ -103,7 +102,6 @@ sc/uiconfig/scalc/ui/notebookbar_groups.ui://GtkLabel[@id='formatgrouplabel'] or sc/uiconfig/scalc/ui/notebookbar_groups.ui://GtkLabel[@id='tablegrouplabel'] orphan-label sc/uiconfig/scalc/ui/notebookbar_groups.ui://GtkLabel[@id='insertgrouplabel'] orphan-label sc/uiconfig/scalc/ui/notebookbar_groups.ui://GtkLabel[@id='imagegrouplabel'] orphan-label -sc/uiconfig/scalc/ui/managenamesdialog.ui://svtlo-SvSimpleTableContainer[@id='names'] no-labelled-by sc/uiconfig/scalc/ui/managenamesdialog.ui://GtkLabel[@id='info'] orphan-label sc/uiconfig/scalc/ui/managenamesdialog.ui://GtkLabel[@id='label2'] orphan-label sc/uiconfig/scalc/ui/managenamesdialog.ui://GtkEntry[@id='name'] no-labelled-by @@ -184,12 +182,10 @@ sc/uiconfig/scalc/ui/scenariodialog.ui://GtkLabel[@id='alttitle'] orphan-label sc/uiconfig/scalc/ui/scenariodialog.ui://GtkLabel[@id='createdft'] orphan-label sc/uiconfig/scalc/ui/scenariodialog.ui://GtkLabel[@id='onft'] orphan-label sc/uiconfig/scalc/ui/scgeneralpage.ui://GtkLabel[@id='label6'] orphan-label -sc/uiconfig/scalc/ui/searchresults.ui://svtlo-SvSimpleTableContainer[@id='results'] no-labelled-by sc/uiconfig/scalc/ui/searchresults.ui://GtkLabel[@id='lbSearchResults'] orphan-label sc/uiconfig/scalc/ui/sharedocumentdlg.ui://GtkLabel[@id='warning'] orphan-label sc/uiconfig/scalc/ui/sharedocumentdlg.ui://GtkLabel[@id='name'] orphan-label sc/uiconfig/scalc/ui/sharedocumentdlg.ui://GtkLabel[@id='accessed'] orphan-label -sc/uiconfig/scalc/ui/sharedocumentdlg.ui://svtlo-SvSimpleTableContainer[@id='users'] no-labelled-by sc/uiconfig/scalc/ui/sharedocumentdlg.ui://GtkLabel[@id='nouserdata'] orphan-label sc/uiconfig/scalc/ui/sharedocumentdlg.ui://GtkLabel[@id='unknownuser'] orphan-label sc/uiconfig/scalc/ui/sharedocumentdlg.ui://GtkLabel[@id='exclusive'] orphan-label diff --git a/solenv/sanitizers/ui/modules/swriter.suppr b/solenv/sanitizers/ui/modules/swriter.suppr index ecd5d213813e..819fdebd7a15 100644 --- a/solenv/sanitizers/ui/modules/swriter.suppr +++ b/solenv/sanitizers/ui/modules/swriter.suppr @@ -4,7 +4,6 @@ sw/uiconfig/swriter/ui/addressblockdialog.ui://GtkButton[@id='toaddr'] button-no sw/uiconfig/swriter/ui/alreadyexistsdialog.ui://GtkEntry[@id='edit1'] no-labelled-by sw/uiconfig/swriter/ui/alreadyexistsdialog.ui://GtkLabel[@id='label2'] orphan-label sw/uiconfig/swriter/ui/asciifilterdialog.ui://GtkLabel[@id='label5'] orphan-label -sw/uiconfig/swriter/ui/assignstylesdialog.ui://svtlo-SvSimpleTableContainer[@id='styles'] no-labelled-by sw/uiconfig/swriter/ui/assignstylesdialog.ui://GtkLabel[@id='notapplied'] orphan-label sw/uiconfig/swriter/ui/attachnamedialog.ui://GtkEntry[@id='edit1'] no-labelled-by sw/uiconfig/swriter/ui/attachnamedialog.ui://GtkLabel[@id='label2'] orphan-label @@ -234,12 +233,10 @@ sw/uiconfig/swriter/ui/sectionpage.ui://GtkEntry[@id='filename'] duplicate-mnemo sw/uiconfig/swriter/ui/sectionpage.ui://GtkEntry[@id='sectionnames-entry'] no-labelled-by sw/uiconfig/swriter/ui/selectaddressdialog.ui://GtkLabel[@id='desc'] orphan-label sw/uiconfig/swriter/ui/selectaddressdialog.ui://GtkLabel[@id='label2'] orphan-label -sw/uiconfig/swriter/ui/selectaddressdialog.ui://svtlo-SvSimpleTableContainer[@id='sources:border'] no-labelled-by sw/uiconfig/swriter/ui/selectaddressdialog.ui://GtkLabel[@id='name'] orphan-label sw/uiconfig/swriter/ui/selectaddressdialog.ui://GtkLabel[@id='table'] orpha
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - sc/source
sc/source/ui/Accessibility/AccessibleDocument.cxx | 104 +++---
1 file changed, 71 insertions(+), 33 deletions(-)
New commits:
commit d28b76a7fd88dcd9d8d601ba1d4b31d2d91b96ac
Author: Noel Grandin
AuthorDate: Wed Jun 26 09:15:34 2019 +0200
Commit: Noel Grandin
CommitDate: Fri Jun 28 15:08:57 2019 +0200
tdf#119388 calc, slow removing column, improve ScChildrenShapes
sorting the child list of shapes when we have a large list is expensive,
especially when we do it on every Notify call, so defer that.
Change-Id: I54e5807b697feb0ed578631e470f8d6fdd884cef
Reviewed-on: https://gerrit.libreoffice.org/74726
Tested-by: Jenkins
Reviewed-by: Noel Grandin
(cherry picked from commit 8fb35f06ddec551a6de887ce269d9196d9fe2337)
Reviewed-on: https://gerrit.libreoffice.org/74839
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx
b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index b7876c1a6f61..f293dbe95928 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -241,8 +241,11 @@ public:
void VisAreaChanged() const;
private:
typedef std::vector SortedShapes;
+typedef std::unordered_map,
ScAccessibleShapeData*> ShapesMap;
mutable SortedShapes maZOrderedShapes; // a null pointer represents the
sheet in the correct order
+mutable ShapesMap maShapesMap;
+mutable bool mbShapesNeedSorting; // set if maZOrderedShapes needs sorting
mutable ::accessibility::AccessibleShapeTreeInfo maShapeTreeInfo;
mutable css::uno::Reference
xSelectionSupplier;
@@ -257,7 +260,6 @@ private:
boost::optional GetAnchor(const
uno::Reference& xShape) const;
uno::Reference GetRelationSet(const
ScAccessibleShapeData* pData) const;
-void CheckWhetherAnchorChanged(const uno::Reference&
xShape) const;
void SetAnchor(const uno::Reference& xShape,
ScAccessibleShapeData* pData) const;
void AddShape(const uno::Reference& xShape, bool
bCommitChange) const;
void RemoveShape(const uno::Reference& xShape) const;
@@ -373,8 +375,10 @@ void ScChildrenShapes::Notify(SfxBroadcaster&, const
SfxHint& rHint)
uno::Reference xShape (pObj->getUnoShape(),
uno::UNO_QUERY);
if (xShape.is())
{
-std::sort(maZOrderedShapes.begin(),
maZOrderedShapes.end(), ScShapeDataLess()); // sort, because the z index or
layer could be changed
-CheckWhetherAnchorChanged(xShape);
+mbShapesNeedSorting = true; // sort, because the z index
or layer could be changed
+auto it = maShapesMap.find(xShape);
+if (it != maShapesMap.end())
+SetAnchor(xShape, it->second);
}
}
break;
@@ -417,13 +421,12 @@ bool ScChildrenShapes::ReplaceChild
(::accessibility::AccessibleShape* pCurrentC
if (pReplacement.is())
{
OSL_ENSURE(pCurrentChild->GetXShape().get() ==
pReplacement->GetXShape().get(), "XShape changes and should be inserted
sorted");
-SortedShapes::iterator aItr;
-
-if (FindShape(pCurrentChild->GetXShape(), aItr) || (aItr !=
maZOrderedShapes.end() && (*aItr)))
+auto it = maShapesMap.find(pCurrentChild->GetXShape());
+if (it != maShapesMap.end())
{
-if ((*aItr)->pAccShape.is())
+if (it->second->pAccShape.is())
{
-OSL_ENSURE((*aItr)->pAccShape == pCurrentChild, "wrong child
found");
+OSL_ENSURE(it->second->pAccShape == pCurrentChild, "wrong
child found");
AccessibleEventObject aEvent;
aEvent.EventId = AccessibleEventId::CHILD;
aEvent.Source = uno::Reference< XAccessibleContext
>(mpAccessibleDocument);
@@ -433,7 +436,7 @@ bool ScChildrenShapes::ReplaceChild
(::accessibility::AccessibleShape* pCurrentC
pCurrentChild->dispose();
}
-(*aItr)->pAccShape = pReplacement;
+it->second->pAccShape = pReplacement;
AccessibleEventObject aEvent;
aEvent.EventId = AccessibleEventId::CHILD;
aEvent.Source = uno::Reference< XAccessibleContext
>(mpAccessibleDocument);
@@ -448,10 +451,9 @@ bool ScChildrenShapes::ReplaceChild
(::accessibility::AccessibleShape* pCurrentC
::accessibility::AccessibleControlShape *
ScChildrenShapes::GetAccControlShapeFromModel(css::beans::XPropertySet* pSet)
{
-sal_Int32 count = GetCount();
-for (sal_Int32 index=0;index
pAccShape(pShape->pAccShape);
@@ -469,17 +471,14 @@ bool ScChildrenShapes::ReplaceChild
(::accessibility::AccessibleShape* pCurrentC
css::uno::Reference < css::accessibility::XAccessible >
ScChildrenShapes::GetAccessibleCaption (const css::uno::Reference <
css::drawing::XShape>& xShape)
{
-sal_Int32 count = GetCount();
-for (sal_In
[Libreoffice-commits] online.git: Branch 'distro/cib/libreoffice-6-2' - configure.ac loleaflet/Makefile.am
configure.ac | 10 -- loleaflet/Makefile.am |4 2 files changed, 14 deletions(-) New commits: commit fbb6e93d5711a71c5824dd4a718ca09be18ff0cd Author: Samuel Mehrbrodt AuthorDate: Fri Jun 28 14:36:34 2019 +0200 Commit: Samuel Mehrbrodt CommitDate: Fri Jun 28 14:36:34 2019 +0200 Remove obsolete checks Duplicate/useless after c358ddc227038f55f4cff854ba73c95558a375bc diff --git a/configure.ac b/configure.ac index a6dd3ef5a..7d70a3635 100644 --- a/configure.ac +++ b/configure.ac @@ -287,16 +287,6 @@ else fi AC_SUBST(CUSTOM_ICONS_DIRECTORY) -AC_MSG_CHECKING([for custom icon theme]) -CUSTOM_ICONS_DIRECTORY= -if test -d "$with_icon_theme"; then -CUSTOM_ICONS_DIRECTORY=`readlink -f $with_icon_theme` -AC_MSG_RESULT([$CUSTOM_ICONS_DIRECTORY]) -else -AC_MSG_RESULT([no]) -fi -AC_SUBST(CUSTOM_ICONS_DIRECTORY) - ENABLE_GTKAPP= if test "$enable_gtkapp" = "yes"; then ENABLE_GTKAPP=true diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am index 3c76d5294..4608a6694 100644 --- a/loleaflet/Makefile.am +++ b/loleaflet/Makefile.am @@ -249,10 +249,6 @@ $(builddir)/dist/images/%: $(CUSTOM_ICONS_DIRECTORY)/% $(builddir)/dist/images/%: $(srcdir)/images/% @mkdir -p $(dir $@) @cp $< $@ - @if test -d '$(CUSTOM_ICONS_DIRECTORY)'; then \ - `cp -r "$(CUSTOM_ICONS_DIRECTORY)"/* $(builddir)/dist/images/`; \ - fi - $(builddir)/dist/%.html: $(srcdir)/html/%.html @mkdir -p $(dir $@) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - chart2/qa chart2/source
chart2/qa/extras/chart2import.cxx | 19 +++
chart2/qa/extras/data/xlsx/tdf126033.xlsx |binary
chart2/source/view/main/VDataSeries.cxx |2 +-
3 files changed, 20 insertions(+), 1 deletion(-)
New commits:
commit 2ba68f936669a6516eae8a8bff000131ac63f411
Author: Balazs Varga
AuthorDate: Tue Jun 25 13:26:41 2019 +0200
Commit: Xisco Faulí
CommitDate: Fri Jun 28 14:32:12 2019 +0200
tdf#126033 chart: hide removed marker of a single data point
instead of showing a black square.
Note: the patch fixes also the OOXML import (see the unit test).
Change-Id: Ie578db3dd9ba310b0ce972832269acd5ae501778
Reviewed-on: https://gerrit.libreoffice.org/74690
Tested-by: Jenkins
Reviewed-by: László Németh
(cherry picked from commit 2783a34899379dae84889c924e49481631280ab1)
Reviewed-on: https://gerrit.libreoffice.org/74840
Reviewed-by: Xisco Faulí
diff --git a/chart2/qa/extras/chart2import.cxx
b/chart2/qa/extras/chart2import.cxx
index fa673ccbfde1..72b96c97dc48 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -74,6 +74,7 @@ public:
void testTdf108021();
void testTdf100084();
void testTdf124817();
+void testTdf126033();
void testAutoBackgroundXLSX();
void testAutoChartAreaBorderPropXLSX();
void testChartAreaStyleBackgroundXLSX();
@@ -165,6 +166,7 @@ public:
CPPUNIT_TEST(testTdf108021);
CPPUNIT_TEST(testTdf100084);
CPPUNIT_TEST(testTdf124817);
+CPPUNIT_TEST(testTdf126033);
CPPUNIT_TEST(testAutoBackgroundXLSX);
CPPUNIT_TEST(testAutoChartAreaBorderPropXLSX);
CPPUNIT_TEST(testChartAreaStyleBackgroundXLSX);
@@ -929,6 +931,23 @@ void Chart2ImportTest::testTdf124817()
CPPUNIT_ASSERT((xPropSet_2->getPropertyValue("Symbol") >>= aSymblProp) &&
(aSymblProp.BorderColor == static_cast(0xFF)));
}
+void Chart2ImportTest::testTdf126033()
+{
+load("/chart2/qa/extras/data/xlsx/", "tdf126033.xlsx");
+Reference xChartDoc = getChartDocFromSheet(0,
mxComponent);
+CPPUNIT_ASSERT_MESSAGE("failed to load chart", xChartDoc.is());
+
+// Check symbol style and size of data points
+chart2::Symbol aSymblProp;
+uno::Reference
xDataSeries(getDataSeriesFromDoc(xChartDoc, 0));
+CPPUNIT_ASSERT(xDataSeries.is());
+uno::Reference
xPropertySet(xDataSeries->getDataPointByIndex(0), uno::UNO_SET_THROW);
+CPPUNIT_ASSERT(xPropertySet->getPropertyValue("Symbol") >>= aSymblProp);
+CPPUNIT_ASSERT_EQUAL(chart2::SymbolStyle_NONE, aSymblProp.Style);
+CPPUNIT_ASSERT_EQUAL(static_cast(176), aSymblProp.Size.Width);
+CPPUNIT_ASSERT_EQUAL(static_cast(176), aSymblProp.Size.Height);
+}
+
void Chart2ImportTest::testTransparentBackground(OUString const & filename)
{
load("/chart2/qa/extras/data/xlsx/", filename);
diff --git a/chart2/qa/extras/data/xlsx/tdf126033.xlsx
b/chart2/qa/extras/data/xlsx/tdf126033.xlsx
new file mode 100644
index ..ee60103c98e4
Binary files /dev/null and b/chart2/qa/extras/data/xlsx/tdf126033.xlsx differ
diff --git a/chart2/source/view/main/VDataSeries.cxx
b/chart2/source/view/main/VDataSeries.cxx
index 6d9b7d11196c..b9ea9266abd0 100644
--- a/chart2/source/view/main/VDataSeries.cxx
+++ b/chart2/source/view/main/VDataSeries.cxx
@@ -803,7 +803,7 @@ Symbol* VDataSeries::getSymbolProperties( sal_Int32 index )
const
m_apSymbolProperties_InvisibleSymbolForSelection.reset(new
Symbol);
m_apSymbolProperties_InvisibleSymbolForSelection->Style =
SymbolStyle_STANDARD;
m_apSymbolProperties_InvisibleSymbolForSelection->StandardSymbol = 0;//square
-m_apSymbolProperties_InvisibleSymbolForSelection->Size =
m_apSymbolProperties_Series->Size;
+m_apSymbolProperties_InvisibleSymbolForSelection->Size =
com::sun::star::awt::Size(0, 0);//tdf#126033
m_apSymbolProperties_InvisibleSymbolForSelection->BorderColor =
0xff00;//invisible
m_apSymbolProperties_InvisibleSymbolForSelection->FillColor =
0xff00;//invisible
}
___
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/sbasic/shared/03131600.xhp | 34 +
1 file changed, 22 insertions(+), 12 deletions(-)
New commits:
commit 2060b9069fa292aee06cc636e8febe0ab3d79207
Author: Olivier Hallot
AuthorDate: Thu Jun 27 14:08:21 2019 -0300
Commit: Olivier Hallot
CommitDate: Fri Jun 28 14:22:23 2019 +0200
Add example on CreateUnoService for Calc functions
Most demanded from user base on how to call Calc function
with the API.
Change-Id: I0a01b941385d26f35369a4e6226da223e7c57cf4
Reviewed-on: https://gerrit.libreoffice.org/74813
Tested-by: Jenkins
Reviewed-by: Olivier Hallot
diff --git a/source/text/sbasic/shared/03131600.xhp
b/source/text/sbasic/shared/03131600.xhp
index cd5e2a8c8..bf830adf2 100644
--- a/source/text/sbasic/shared/03131600.xhp
+++ b/source/text/sbasic/shared/03131600.xhp
@@ -26,30 +26,41 @@
-
-
- CreateUnoService function
+CreateUnoService function
-
CreateUnoService Function
Instantiates a
Uno service with the ProcessServiceManager.
-Syntax:
+
+oService =
CreateUnoService( Uno service name )
+
+For a list of
available services, go to: https://api.libreoffice.org/docs/idl/ref/namespacecom_1_1sun_1_1star.html";
name="api.libreoffice.org com::sun::star Module
Reference">https://api.libreoffice.org/docs/idl/ref/namespacecom_1_1sun_1_1star.html
+
+
+
+Calc functions;API Service
+Calling Calc functions in Basic
+CreateUnoService function; Calling Calc
functions
+
+Calling Calc functions
in Basic:
-oService =
CreateUnoService( Uno service name )
+Function MyVlook(item, InRange As Object, FromCol As
Integer)
+Dim oService As Object
+oService =
createUnoService("com.sun.star.sheet.FunctionAccess")
+
REM Always use the function English name
+MyVlook = oService.callFunction("VLOOKUP",Array(item,
InRange, FromCol, True))
+End Function
-For a list of
available services, go to: https://api.libreoffice.org/docs/idl/ref/namespacecom_1_1sun_1_1star.html";
name="api.libreoffice.org com::sun::star Module
Reference">https://api.libreoffice.org/docs/idl/ref/namespacecom_1_1sun_1_1star.html
-Examples:
-oIntrospection
= CreateUnoService( "com.sun.star.beans.Introspection" )
+
+oIntrospection = CreateUnoService(
"com.sun.star.beans.Introspection" )
- filepicker;API service
+filepicker;API service
-
The following
code uses a service to open a file open dialog:
Sub Main
@@ -66,5 +77,4 @@
End Function
-
___
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 f19d3dda6b6a22d0894ec29e995f15a18b15aecc Author: Olivier Hallot AuthorDate: Thu Jun 27 14:08:21 2019 -0300 Commit: Gerrit Code Review CommitDate: Fri Jun 28 14:22:23 2019 +0200 Update git submodules * Update helpcontent2 from branch 'master' - Add example on CreateUnoService for Calc functions Most demanded from user base on how to call Calc function with the API. Change-Id: I0a01b941385d26f35369a4e6226da223e7c57cf4 Reviewed-on: https://gerrit.libreoffice.org/74813 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index ea0f53e1c29a..2060b9069fa2 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit ea0f53e1c29a43422531d62d04b4e939b5577ac7 +Subproject commit 2060b9069fa292aee06cc636e8febe0ab3d79207 ___ 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 c023bf4ee19abfcd86172b4d19c467bdadfb9201 Author: Olivier Hallot AuthorDate: Thu Jun 27 13:04:40 2019 -0300 Commit: Gerrit Code Review CommitDate: Fri Jun 28 14:21:59 2019 +0200 Update git submodules * Update helpcontent2 from branch 'master' - Split VBA Compatibility files and enhance Add examples, Add cross-links Split files Change-Id: I92bef363f008aeed367167b50c4ea9a9943a62ff Reviewed-on: https://gerrit.libreoffice.org/74812 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 11389d81999e..ea0f53e1c29a 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 11389d81999e8e8f788dc407d6398b8ed18b0870 +Subproject commit ea0f53e1c29a43422531d62d04b4e939b5577ac7 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/func/fudraw.cxx | 174 +--
sd/source/ui/func/fusel.cxx | 120 ++---
sd/source/ui/inc/fudraw.hxx |1
sd/source/ui/inc/fusel.hxx |2
4 files changed, 233 insertions(+), 64 deletions(-)
New commits:
commit 58f0144ae2136e07f6a6b9c22b6c0059fc4cb0c6
Author: Samuel Mehrbrodt
AuthorDate: Fri Jun 28 07:53:59 2019 +0200
Commit: Samuel Mehrbrodt
CommitDate: Fri Jun 28 14:21:31 2019 +0200
Related tdf#125748 Reintroduce clickable image maps in sd
Clicking on image maps had been inadvertently removed in
41a1a91b6ec08d78449a199ec300ff73c85dd148.
The context menu solution used for interactions doesn't quite work here,
since only parts of an image are clickable.
So we make those parts clickable again, but additionally we respect the
setting whether Ctrl-Click is required to follow hyperlinks.
Also the tooltip now indicates whether Ctrl-Click is required to follow
hyperlinks.
This is now consistent with sc and sw.
Change-Id: I04030ef0c2b1350afbc349176a3e1e87f3187393
Reviewed-on: https://gerrit.libreoffice.org/74830
Reviewed-by: Samuel Mehrbrodt
Tested-by: Samuel Mehrbrodt
diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx
index a1aabd63cd2c..64bef1f58aac 100644
--- a/sd/source/ui/func/fudraw.cxx
+++ b/sd/source/ui/func/fudraw.cxx
@@ -504,6 +504,8 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
}
else if (!mpView->IsAction())
{
+SdrObject* pObj = nullptr;
+SdrPageView* pPV = nullptr;
SdrViewEvent aVEvt;
SdrHitKind eHit = SdrHitKind::NONE;
SdrDragMode eDragMode = mpView->GetDragMode();
@@ -528,7 +530,16 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
}
}
-if (eHit == SdrHitKind::TextEditObj && dynamic_cast< const
FuSelection *>( this ) != nullptr)
+if (eHit == SdrHitKind::NONE)
+{
+// found nothing -> look after at the masterpage
+pObj = mpView->PickObj(aPnt, mpView->getHitTolLog(), pPV,
SdrSearchOptions::ALSOONMASTER);
+}
+else if (eHit == SdrHitKind::UnmarkedObject)
+{
+pObj = aVEvt.pObj;
+}
+else if (eHit == SdrHitKind::TextEditObj && dynamic_cast< const
FuSelection *>( this ) != nullptr)
{
sal_uInt16 nSdrObjKind = aVEvt.pObj->GetObjIdentifier();
@@ -537,10 +548,29 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
nSdrObjKind != OBJ_OUTLINETEXT &&
aVEvt.pObj->IsEmptyPresObj() )
{
+pObj = nullptr;
bDefPointer = false;
mpWindow->SetPointer(PointerStyle::Arrow);
}
}
+
+if (pObj && pMEvt && !pMEvt->IsMod2()
+&& dynamic_cast(this) != nullptr)
+{
+// test for ImageMap
+bDefPointer = !SetPointer(pObj, aPnt);
+
+if (bDefPointer
+&& (dynamic_cast(pObj) != nullptr
+|| dynamic_cast(pObj) != nullptr))
+{
+// take a glance into the group
+pObj = mpView->PickObj(aPnt, mpView->getHitTolLog(), pPV,
+ SdrSearchOptions::ALSOONMASTER |
SdrSearchOptions::DEEP);
+if (pObj)
+bDefPointer = !SetPointer(pObj, aPnt);
+}
+}
}
}
@@ -552,6 +582,52 @@ void FuDraw::ForcePointer(const MouseEvent* pMEvt)
}
/**
+ * Set cursor to pointer when in clickable area of an ImageMap
+ *
+ * @return True when pointer was set
+ */
+bool FuDraw::SetPointer(SdrObject* pObj, const Point& rPos)
+{
+bool bImageMapInfo = SdDrawDocument::GetIMapInfo(pObj) != nullptr;
+
+if (!bImageMapInfo)
+return false;
+
+const SdrLayerIDSet* pVisiLayer =
&mpView->GetSdrPageView()->GetVisibleLayers();
+sal_uInt16 nHitLog(sal_uInt16(mpWindow->PixelToLogic(Size(HITPIX,
0)).Width()));
+long n2HitLog(nHitLog * 2);
+Point aHitPosR(rPos);
+Point aHitPosL(rPos);
+Point aHitPosT(rPos);
+Point aHitPosB(rPos);
+
+aHitPosR.AdjustX(n2HitLog);
+aHitPosL.AdjustX(-n2HitLog);
+aHitPosT.AdjustY(n2HitLog);
+aHitPosB.AdjustY(-n2HitLog);
+
+if (!pObj->IsClosedObj()
+|| (SdrObjectPrimitiveHit(*pObj, aHitPosR, nHitLog,
*mpView->GetSdrPageView(), pVisiLayer,
+ false)
+&& SdrObjectPrimitiveHit(*pObj, aHitPosL, nHitLog,
*mpView->GetSdrPageView(),
+ pVisiLayer, false)
+&& SdrObjectPrimitiveHit(*pObj, aHitPosT, nHitLog,
*mpView->GetSdrPageView(),
+
[Libreoffice-commits] help.git: AllLangHelp_sbasic.mk source/text
AllLangHelp_sbasic.mk |1 source/text/sbasic/shared/compatibilitymode.xhp | 77 source/text/sbasic/shared/compatible.xhp| 45 ++ 3 files changed, 98 insertions(+), 25 deletions(-) New commits: commit ea0f53e1c29a43422531d62d04b4e939b5577ac7 Author: Olivier Hallot AuthorDate: Thu Jun 27 13:04:40 2019 -0300 Commit: Olivier Hallot CommitDate: Fri Jun 28 14:21:59 2019 +0200 Split VBA Compatibility files and enhance Add examples, Add cross-links Split files Change-Id: I92bef363f008aeed367167b50c4ea9a9943a62ff Reviewed-on: https://gerrit.libreoffice.org/74812 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/AllLangHelp_sbasic.mk b/AllLangHelp_sbasic.mk index 2d354fefa..a1f3fed2c 100644 --- a/AllLangHelp_sbasic.mk +++ b/AllLangHelp_sbasic.mk @@ -359,6 +359,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sbasic,\ helpcontent2/source/text/sbasic/shared/code-stubs \ helpcontent2/source/text/sbasic/shared/classmodule \ helpcontent2/source/text/sbasic/shared/compatible \ +helpcontent2/source/text/sbasic/shared/compatibilitymode \ helpcontent2/source/text/sbasic/shared/enum \ helpcontent2/source/text/sbasic/shared/partition \ helpcontent2/source/text/sbasic/shared/replace \ diff --git a/source/text/sbasic/shared/compatibilitymode.xhp b/source/text/sbasic/shared/compatibilitymode.xhp new file mode 100644 index 0..68b6b444a --- /dev/null +++ b/source/text/sbasic/shared/compatibilitymode.xhp @@ -0,0 +1,77 @@ + + + + + +CompatibleMode function +/text/sbasic/shared/compatibilitymode.xhp + + + + +CompatibilityMode +VBA compatibility mode + + +CompatibilityMode() Function +CompatibilityMode() function is controlling runtime mode and affects all code executed after setting or resetting the mode. + +Use this feature with caution, limit it to document conversion situations for example. +Option Compatible turns on VBA compatibility at module level for the %PRODUCTNAME Basic compiler. +This function may affect or help in the following situations: + +Creating enumerations with Enum statement +Updating Dir execution conditions. +Running RmDir command in VBA mode. In VBA only empty directories are removed by RmDir while %PRODUCTNAME Basic removes a directory recursively. +Changing behaviour of Basic Dir command. The directory flag (16) for the Dir command means that only directories are returned in %PRODUCTNAME Basic, while in VBA normal files and directories are returned. + +CompatibilityMode() function may be necessary when resorting to Option Compatible or Option VBASupport compiler modes. + +CompatibilityMode(True | False) + +Given a NOT empty directory at file:///home/me/Test + +Sub RemoveDir +CompatibilityMode( true ) +RmDir( "file:///home/me/Test" ) +End Sub + + With CompatibilityMode( true ) the program results in an error, otherwise the Test directory and all its content is deleted. + + Modifying Dir behavior + +Sub VBADirCommand + CompatibilityMode( true ) ' Shows also normal files +Entry$ = Dir( "file:///home/me/Tmp/*.*", 16 ) +Total$ = "" +While Entry$ <> "" +Total$ = Total$ + Entry$ + Chr$(13) +Entry$ = Dir +Wend +MsgBox Total$ +End Sub + + + + + +Refer to Identifying the Operating System and Getting Session Information for Option Compatible simple examples, or Access2Base shared Basic library for other class examples making use of Option Compatible compiler mode. + + + +Variables scope modification in Using Procedures and Functions with CompatibilityMode() function. + + + + + + + + diff --git a/source/text/sbasic/shared/compatible.xhp b/source/text/sbasic/shared/compatible.xhp index a2655de54..4a48a388c 100644 --- a/source/text/sbasic/shared/compatible.xhp +++ b/source/text/sbasic/shared/compatible.xhp @@ -17,19 +17,21 @@ Option Compatible -CompatibilityMode -VBA compatibility +VBA compatibility option Option Compatible Statement -Option Compatible turns on the VBA-compatible Basic compiler mode at the module level. The function CompatibilityMode() controls runtime mode and affects all code executed after setting or resetting the mode. +Option Compatible turns on the VBA-compatible Basic compiler mode at the module level. +The function CompatibilityMode() controls runtime mode and affects all code executed after setting or resetting the mode. This option may affect
[Libreoffice-commits] core.git: i18npool/inc i18npool/source
i18npool/inc/defaultnumberingprovider.hxx |4
+++
i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx | 12
++
2 files changed, 16 insertions(+)
New commits:
commit b0b1dbfb1d6b28339c2cdd79b765ec3eb5ce5aaf
Author: Noel Grandin
AuthorDate: Wed Jun 26 15:31:06 2019 +0200
Commit: Noel Grandin
CommitDate: Fri Jun 28 14:04:30 2019 +0200
tdf#125706 Fields slow down down load, part3
Cache the supported numbering types in DefaultNumberingProvider.
Takes the load time from 4.5s to 3.9s
Change-Id: I6495f37faec7dba60ff30bd13e90790e70f8e704
Reviewed-on: https://gerrit.libreoffice.org/74742
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/i18npool/inc/defaultnumberingprovider.hxx
b/i18npool/inc/defaultnumberingprovider.hxx
index f01378ab075e..eb309b83c358 100644
--- a/i18npool/inc/defaultnumberingprovider.hxx
+++ b/i18npool/inc/defaultnumberingprovider.hxx
@@ -25,12 +25,14 @@
#include
#include
#include
+#include
namespace com::sun::star::container { class XHierarchicalNameAccess; }
namespace com::sun::star::uno { class XComponentContext; }
namespace i18npool {
class TransliterationImpl;
class NativeNumberSupplierService;
+struct Supported_NumberingType;
}
namespace i18npool {
@@ -78,6 +80,8 @@ private:
css::uno::Reference < css::container::XHierarchicalNameAccess >
xHierarchicalNameAccess;
rtl::Reference translit;
rtl::Reference mxNatNum;
+std::map maSupportedTypesCache;
+
/// @throws css::uno::RuntimeException
OUString makeNumberingIdentifier( sal_Int16 index );
/// @throws css::uno::RuntimeException
diff --git
a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
index 5e21a5a4dc5d..6f45022486a0 100644
--- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
+++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
@@ -1072,17 +1072,29 @@ Sequence< sal_Int16 >
DefaultNumberingProvider::getSupportedNumberingTypes( )
sal_Int16 DefaultNumberingProvider::getNumberingType( const OUString&
rNumberingIdentifier )
{
+auto it = maSupportedTypesCache.find(rNumberingIdentifier);
+if (it != maSupportedTypesCache.end())
+return it->second->nType;
for(sal_Int16 i = 0; i < nSupported_NumberingTypes; i++)
if(rNumberingIdentifier == makeNumberingIdentifier(i))
+{
+maSupportedTypesCache.emplace(rNumberingIdentifier,
&aSupportedTypes[i]);
return aSupportedTypes[i].nType;
+}
throw RuntimeException();
}
sal_Bool DefaultNumberingProvider::hasNumberingType( const OUString&
rNumberingIdentifier )
{
+auto it = maSupportedTypesCache.find(rNumberingIdentifier);
+if (it != maSupportedTypesCache.end())
+return true;
for(sal_Int16 i = 0; i < nSupported_NumberingTypes; i++)
if(rNumberingIdentifier == makeNumberingIdentifier(i))
+{
+maSupportedTypesCache.emplace(rNumberingIdentifier,
&aSupportedTypes[i]);
return true;
+}
return false;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/qa include/oox oox/source
chart2/qa/extras/chart2export.cxx | 18 ++
chart2/qa/extras/data/xlsx/tdf126115.xlsx |binary
include/oox/export/chartexport.hxx|2 +-
oox/source/export/chartexport.cxx | 25 -
4 files changed, 35 insertions(+), 10 deletions(-)
New commits:
commit 0970a47ae926bb47458b846e9dc8ff6f3607250c
Author: Balazs Varga
AuthorDate: Fri Jun 28 12:30:19 2019 +0200
Commit: László Németh
CommitDate: Fri Jun 28 13:51:43 2019 +0200
tdf#126115 Chart OOXML Export: fix individual marker
Export linechart custom (individual) datapoint marker
settings into a tag, as the OOXML Standard requires.
Change-Id: I939196c9ea6e091ac9dadb4d62dd85d5408d599c
Reviewed-on: https://gerrit.libreoffice.org/74837
Tested-by: Jenkins
Reviewed-by: László Németh
diff --git a/chart2/qa/extras/chart2export.cxx
b/chart2/qa/extras/chart2export.cxx
index 7a0abcf0bc02..f00959bdbfeb 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -73,6 +73,7 @@ public:
void testFdo78290LineChartMarkerX();
void testFdo78290ScatterChartMarkerX();
void testFdo78290CombinationChartMarkerX();
+void testTdf126115IndividualMarker();
void testAxisNumberFormatODS();
void testAxisNumberFormatXLS();
void testDataLabelBordersDOCX();
@@ -170,6 +171,7 @@ public:
CPPUNIT_TEST(testFdo78290LineChartMarkerX);
CPPUNIT_TEST(testFdo78290ScatterChartMarkerX);
CPPUNIT_TEST(testFdo78290CombinationChartMarkerX);
+CPPUNIT_TEST(testTdf126115IndividualMarker);
CPPUNIT_TEST(testAxisNumberFormatODS);
CPPUNIT_TEST(testAxisNumberFormatXLS);
CPPUNIT_TEST(testDataLabelBordersDOCX);
@@ -801,6 +803,22 @@ void
Chart2ExportTest::testFdo78290CombinationChartMarkerX()
assertXPath(pXmlDoc,
"/c:chartSpace[1]/c:chart[1]/c:plotArea[1]/c:lineChart[1]/c:ser[1]/c:marker[1]/c:size[1]","val","7");
}
+void Chart2ExportTest::testTdf126115IndividualMarker()
+{
+// Check individual marker properties.
+load("/chart2/qa/extras/data/xlsx/", "tdf126115.xlsx");
+xmlDocPtr pXmlDoc = parseExport("xl/charts/chart", "Calc Office Open XML");
+CPPUNIT_ASSERT(pXmlDoc);
+// 1. series
+assertXPath(pXmlDoc,
"/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[1]/c:dPt/c:marker/c:symbol",
"val", "square");
+assertXPath(pXmlDoc,
"/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[1]/c:dPt/c:marker/c:size",
"val", "8");
+assertXPath(pXmlDoc,
"/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[1]/c:dPt/c:marker/c:spPr/a:solidFill/a:srgbClr",
"val", "ff");
+// 2. series
+assertXPath(pXmlDoc,
"/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[2]/c:dPt/c:marker/c:symbol",
"val", "x");
+assertXPath(pXmlDoc,
"/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[2]/c:dPt/c:marker/c:size",
"val", "15");
+assertXPath(pXmlDoc,
"/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser[2]/c:dPt/c:marker/c:spPr/a:solidFill/a:srgbClr",
"val", "7030a0");
+}
+
void Chart2ExportTest::testAxisNumberFormatODS()
{
struct
diff --git a/chart2/qa/extras/data/xlsx/tdf126115.xlsx
b/chart2/qa/extras/data/xlsx/tdf126115.xlsx
new file mode 100644
index ..f845c06e3142
Binary files /dev/null and b/chart2/qa/extras/data/xlsx/tdf126115.xlsx differ
diff --git a/include/oox/export/chartexport.hxx
b/include/oox/export/chartexport.hxx
index b39b3f52b455..4716099dd8df 100644
--- a/include/oox/export/chartexport.hxx
+++ b/include/oox/export/chartexport.hxx
@@ -182,7 +182,7 @@ private:
void exportDataLabels( const
css::uno::Reference& xSeries, sal_Int32
nSeriesLength, sal_Int32 eChartType );
void exportGrouping( bool isBar = false );
void exportTrendlines( const css::uno::Reference< css::chart2::XDataSeries
>& xSeries );
-void exportMarker( const css::uno::Reference< css::chart2::XDataSeries >&
xSeries );
+void exportMarker( const css::uno::Reference< css::beans::XPropertySet >&
xPropSet );
void exportSmooth();
void exportFirstSliceAng();
diff --git a/oox/source/export/chartexport.cxx
b/oox/source/export/chartexport.cxx
index 65b7bd3c3e23..b6c764ddbd8c 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -1930,7 +1930,7 @@ void ChartExport::exportSeries( const
Reference& xChartType,
break;
case chart::TYPEID_LINE:
{
-exportMarker(xDataSeries);
+exportMarker(xOldPropSet);
break;
}
case chart::TYPEID_PIE:
@@ -1947,12 +1947,12 @@ void ChartExport::exportSeries( const
Reference& xChartType,
}
case chart::TYPEID_SCATTER:
{
-exportMarker(xDataSeries);
+
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - sw/qa sw/source
sw/qa/extras/ooxmlexport/data/tdf125518.odt |binary
sw/qa/extras/ooxmlexport/ooxmlexport13.cxx | 23 +++
sw/source/filter/ww8/docxattributeoutput.cxx | 23 +++
sw/source/filter/ww8/docxattributeoutput.hxx | 11 +--
4 files changed, 39 insertions(+), 18 deletions(-)
New commits:
commit 609f82ef8a2019473c801fd6f537195b472165bc
Author: Vasily Melenchuk
AuthorDate: Tue May 14 17:00:59 2019 +0300
Commit: Thorsten Behrens
CommitDate: Fri Jun 28 13:34:58 2019 +0200
tdf#125518: docx export: save anchors for diagrams
Previously all diagrams were saved as inline objects ignoring
possible wrapping options and anchors.
Change-Id: I0952fb33d4be4c288c919156af9549f8195b7ead
Reviewed-on: https://gerrit.libreoffice.org/72291
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
(cherry picked from commit ece4a0f78bb60ef079722e8fa029f0ec253d0452)
Reviewed-on: https://gerrit.libreoffice.org/74737
Tested-by: Jenkins
diff --git a/sw/qa/extras/ooxmlexport/data/tdf125518.odt
b/sw/qa/extras/ooxmlexport/data/tdf125518.odt
new file mode 100644
index ..92df094a8962
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf125518.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
index e392644f0de3..ce6871b45df5 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
@@ -355,6 +355,29 @@ DECLARE_OOXMLEXPORT_TEST(testTdf125324, "tdf125324.docx")
assertXPath(pXmlDoc,
"/root/page/body/txt[2]/anchored/fly/tab/infos/bounds", "top", "4193");
}
+DECLARE_OOXMLEXPORT_TEST(testTdf125518, "tdf125518.odt")
+{
+xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+if (!pXmlDoc)
+return;
+
+// First diagram is anchored
+OUString anchorName = getXPath(pXmlDoc,
"/w:document/w:body/w:p[1]/w:r[2]/w:drawing/wp:anchor/wp:docPr", "name");
+CPPUNIT_ASSERT_EQUAL(OUString("Object1"), anchorName);
+
+// Second diagram has anchor
+anchorName = getXPath(pXmlDoc,
"/w:document/w:body/w:p[3]/w:r[1]/w:drawing/wp:anchor/wp:docPr", "name");
+CPPUNIT_ASSERT_EQUAL(OUString("Objekt1"), anchorName);
+
+// Third diagram has no anchor
+anchorName = getXPath(pXmlDoc,
"/w:document/w:body/w:p[12]/w:r[2]/w:drawing/wp:inline/wp:docPr", "name");
+CPPUNIT_ASSERT_EQUAL(OUString("Object2"), anchorName);
+
+// 4th diagram has anchor too
+anchorName = getXPath(pXmlDoc,
"/w:document/w:body/w:p[14]/w:r[3]/w:drawing/wp:anchor/wp:docPr", "name");
+CPPUNIT_ASSERT_EQUAL(OUString("Object3"), anchorName);
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index f2c30c2eb654..b7316b003745 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -4931,14 +4931,14 @@ void DocxAttributeOutput::FlyFrameGraphic( const
SwGrfNode* pGrfNode, const Size
void DocxAttributeOutput::WriteOLE2Obj( const SdrObject* pSdrObj, SwOLENode&
rOLENode, const Size& rSize, const SwFlyFrameFormat* pFlyFrameFormat )
{
-if( WriteOLEChart( pSdrObj, rSize ))
+if( WriteOLEChart( pSdrObj, rSize, pFlyFrameFormat ))
return;
if( WriteOLEMath( rOLENode ))
return;
PostponeOLE( rOLENode, rSize, pFlyFrameFormat );
}
-bool DocxAttributeOutput::WriteOLEChart( const SdrObject* pSdrObj, const Size&
rSize )
+bool DocxAttributeOutput::WriteOLEChart( const SdrObject* pSdrObj, const Size&
rSize, const SwFlyFrameFormat* pFlyFrameFormat )
{
uno::Reference< drawing::XShape > xShape(
const_cast(pSdrObj)->getUnoShape(), uno::UNO_QUERY );
if (!xShape.is())
@@ -4958,7 +4958,7 @@ bool DocxAttributeOutput::WriteOLEChart( const SdrObject*
pSdrObj, const Size& r
if (!SotExchange::IsChart(aClassID))
return false;
-m_aPostponedCharts.push_back(std::pair(pSdrObj,
rSize));
+m_aPostponedCharts.push_back(PostponedChart(pSdrObj, rSize,
pFlyFrameFormat));
return true;
}
@@ -4970,10 +4970,10 @@ void DocxAttributeOutput::WritePostponedChart()
if (m_aPostponedCharts.empty())
return;
-for (const auto& itr : m_aPostponedCharts)
+for (const PostponedChart& rChart : m_aPostponedCharts)
{
uno::Reference< chart2::XChartDocument > xChartDoc;
-uno::Reference< drawing::XShape > xShape(
const_cast(itr.first)->getUnoShape(), uno::UNO_QUERY );
+uno::Reference< drawing::XShape >
xShape(const_cast(rChart.object)->getUnoShape(), uno::UNO_QUERY );
if( xShape.is() )
{
uno::Reference< beans::XPropertySet > xPropSet( xShape,
uno::UNO_QUERY );
@@ -4984,16 +4984,8 @@ void DocxAttributeOutput::WritePostponedChart()
if( xChartDoc.is() )
{
SAL_INFO("s
[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - 2 commits - sw/source
sw/source/core/layout/calcmove.cxx | 16 ++-- sw/source/core/layout/paintfrm.cxx |1 + 2 files changed, 15 insertions(+), 2 deletions(-) New commits: commit 4c993cd7c762b1fca9a674cd2bab7c0e95c78e74 Author: Michael Stahl AuthorDate: Wed Jun 26 19:09:51 2019 +0200 Commit: Thorsten Behrens CommitDate: Fri Jun 28 13:34:30 2019 +0200 tdf#125751 sw: fix crash on formatting in SwLayoutFrame::PaintSwFrame() It's less than ideal that the document is painted before being fully formatted, but let's try to apply a band-aid... 0x6120001a97d0 is located 144 bytes inside of 280-byte region [0x6120001a9740,0x6120001a9858) freed by thread T0 here: #1 SwFootnoteFrame::~SwFootnoteFrame() /home/ms/lo/master/sw/source/core/inc/ftnfrm.hxx:64:7 #2 SwFrame::DestroyFrame(SwFrame*) sw/source/core/layout/ssfrm.cxx:389:9 #3 SwContentFrame::Cut() sw/source/core/layout/wsfrm.cxx:1263:25 #4 SwFlowFrame::MoveBwd(bool&) sw/source/core/layout/flowfrm.cxx:2544:17 #5 SwContentFrame::MakeAll(OutputDevice*) sw/source/core/layout/calcmove.cxx:1522:17 #6 SwFrame::PrepareMake(OutputDevice*) sw/source/core/layout/calcmove.cxx:366:5 #7 SwFrame::Calc(OutputDevice*) const sw/source/core/layout/trvlfrm.cxx:1791:37 #8 SwLayoutFrame::PaintSwFrame(OutputDevice&, SwRect const&, SwPrintData const*) const sw/source/core/layout/paintfrm.cxx:3328:17 #9 SwLayoutFrame::PaintSwFrame(OutputDevice&, SwRect const&, SwPrintData const*) const sw/source/core/layout/paintfrm.cxx:3406:21 #10 SwLayoutFrame::PaintSwFrame(OutputDevice&, SwRect const&, SwPrintData const*) const sw/source/core/layout/paintfrm.cxx:3406:21 #11 SwRootFrame::PaintSwFrame(OutputDevice&, SwRect const&, SwPrintData const*) const sw/source/core/layout/paintfrm.cxx:3116:24 #12 SwViewShell::Paint(OutputDevice&, tools::Rectangle const&) sw/source/core/view/viewsh.cxx:1840:34 (reportedly a regression from 18765b9fa739337d2d891513f6e2fb7c3ce23b50) Change-Id: Iff5e783985c180b704b273fa26b7c498820640ac Reviewed-on: https://gerrit.libreoffice.org/74749 Tested-by: Jenkins Reviewed-by: Michael Stahl (cherry picked from commit 49f971e9d0a88c9f23262445a17c9b5cecdb9167) Reviewed-on: https://gerrit.libreoffice.org/74786 Reviewed-by: Thorsten Behrens diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index de8d04311d64..d580e85f2354 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -3311,6 +3311,7 @@ void SwLayoutFrame::PaintSwFrame(vcl::RenderContext& rRenderContext, SwRect cons if ( !pFrame ) return; +SwFrameDeleteGuard g(const_cast(this)); // lock because Calc() and recursion SwShortCut aShortCut( *pFrame, rRect ); bool bCnt = pFrame->IsContentFrame(); if ( bCnt ) commit 8d0777d455e4a861d5b203d1e36d743d1432c1bd Author: Michael Stahl AuthorDate: Wed Jun 26 19:02:18 2019 +0200 Commit: Thorsten Behrens CommitDate: Fri Jun 28 13:34:18 2019 +0200 tdf#125751 sw: tweak assert in SwFrame::PrepareMake() a bit more This fixes 2 cases of the assert that was added in commit e14056e6e88d9b8d988b7b88b2776a8fc952031b * tdf#125751 bugdoc would assert because on a page there were a bunch of empty section frames preceding 2 SwTextFrames; the first SwTextFrame moved backwards skipping over the empty section frames, hence the second SwTextFrame is not the mpNext of the first one's follow * writerfilter_null_ptr_deref.sample had a SwTextNode with >80k characters; turns out there is a check in SwTextFrame::CalcFollow() to format only up to 10 follow frames, so the result is 2 follow frames on the same page Change-Id: Ia08afd5a0e227d0613421d74b469c409ee91cfca Reviewed-on: https://gerrit.libreoffice.org/74748 Tested-by: Jenkins Reviewed-by: Michael Stahl (cherry picked from commit f8e4845fec50affc20272600a4baf87554b055fb) Reviewed-on: https://gerrit.libreoffice.org/74785 Reviewed-by: Thorsten Behrens diff --git a/sw/source/core/layout/calcmove.cxx b/sw/source/core/layout/calcmove.cxx index 6e6c3e500543..1856e6b69d40 100644 --- a/sw/source/core/layout/calcmove.cxx +++ b/sw/source/core/layout/calcmove.cxx @@ -325,7 +325,13 @@ void SwFrame::PrepareMake(vcl::RenderContext* pRenderContext) && SwFlowFrame::CastFlowFrame(GetUpper()->Lower()) && SwFlowFrame::CastFlowFrame(pFrame)->IsAnFollow( SwFlowFrame::CastFlowFrame(GetUpper()->Lower())) -&& GetUpper()->Lower()->GetNext() == this)); +&& (GetUpper()->Lower()->GetNext() == this +// if it's more than 10 pages long... +
[Libreoffice-commits] core.git: i18npool/inc i18npool/source
i18npool/inc/defaultnumberingprovider.hxx |6
+-
i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx |5
+++--
2 files changed, 8 insertions(+), 3 deletions(-)
New commits:
commit 1ec6de1cff6a5f2c15aa85c12c6e327282ca8703
Author: Noel Grandin
AuthorDate: Wed Jun 26 15:20:32 2019 +0200
Commit: Noel Grandin
CommitDate: Fri Jun 28 12:48:40 2019 +0200
tdf#125706 Fields slow down down load, cache NativeNumberSupplierService
Cache the NativeNumberSupplierService in DefaultNumberingProvider.
Takes the load time from 5s to 4.5s.
Change-Id: I13de1cd4db8785a1c94d40fb163bcc9b80a5c7f5
Reviewed-on: https://gerrit.libreoffice.org/74741
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
diff --git a/i18npool/inc/defaultnumberingprovider.hxx
b/i18npool/inc/defaultnumberingprovider.hxx
index eb9446c7098b..f01378ab075e 100644
--- a/i18npool/inc/defaultnumberingprovider.hxx
+++ b/i18npool/inc/defaultnumberingprovider.hxx
@@ -28,7 +28,10 @@
namespace com::sun::star::container { class XHierarchicalNameAccess; }
namespace com::sun::star::uno { class XComponentContext; }
-namespace i18npool { class TransliterationImpl; }
+namespace i18npool {
+class TransliterationImpl;
+class NativeNumberSupplierService;
+}
namespace i18npool {
@@ -74,6 +77,7 @@ private:
css::uno::Reference < css::uno::XComponentContext > m_xContext;
css::uno::Reference < css::container::XHierarchicalNameAccess >
xHierarchicalNameAccess;
rtl::Reference translit;
+rtl::Reference mxNatNum;
/// @throws css::uno::RuntimeException
OUString makeNumberingIdentifier( sal_Int16 index );
/// @throws css::uno::RuntimeException
diff --git
a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
index ce6eb1dde781..5e21a5a4dc5d 100644
--- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
+++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
@@ -905,8 +905,9 @@ DefaultNumberingProvider::makeNumberingString( const
Sequence xNatNum(new
NativeNumberSupplierService);
-result +=
xNatNum->getNativeNumberStringParams(OUString::number(number), locale,
+if (!mxNatNum)
+mxNatNum.set(new NativeNumberSupplierService);
+result +=
mxNatNum->getNativeNumberStringParams(OUString::number(number), locale,
natNum,
sNatNumParams);
} else if (tableSize) {
if ( number > tableSize && !bRecycleSymbol)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: offapi/com offapi/UnoApi_offapi.mk sfx2/source sw/source unoxml/source
offapi/UnoApi_offapi.mk|1
offapi/com/sun/star/rdf/XNamedGraph2.idl | 134 ++
sfx2/source/doc/DocumentMetadataAccess.cxx | 62 +-
sw/source/core/edit/edfcol.cxx |8
unoxml/source/rdf/librdf_repository.cxx| 273 -
5 files changed, 424 insertions(+), 54 deletions(-)
New commits:
commit 47e04cf31c6165dd55dc20962ad9c72962b958bd
Author: Noel Grandin
AuthorDate: Wed Jun 26 15:19:36 2019 +0200
Commit: Noel Grandin
CommitDate: Fri Jun 28 12:47:35 2019 +0200
tdf#125706 and tdf#125665 writer, speed up RDF
The RDF stuff is slw, so (a) add some caching and (b) fold a
very hot UNO_QUERY call.
To add the caching we need to add a new UNO interface, since
XEnumeration is not amenable to being cached.
Add an optimised getStatementsGraph_NoLock2 that skips the intermediate
enumeration object, and consequently a lot of locking/unlocking.
Cache by OUString key, to avoid expensive OUString<->OString conversion
when looking up entries in the cache.
For the test document in tdf#125706, this takes the time from 7s to 5s for
me.
For the test document in tdf#125665, this takes the load time
from 60s to 7s for me.
Change-Id: I207387e975b4f107834edd0974134c481fb4012d
Reviewed-on: https://gerrit.libreoffice.org/74740
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index c86e7d5a7800..8a567218dec1 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -2981,6 +2981,7 @@ $(eval $(call
gb_UnoApi_add_idlfiles,offapi,com/sun/star/rdf,\
XLiteral \
XMetadatable \
XNamedGraph \
+ XNamedGraph2 \
XNode \
XQuerySelectResult \
XReifiedStatement \
diff --git a/offapi/com/sun/star/rdf/XNamedGraph2.idl
b/offapi/com/sun/star/rdf/XNamedGraph2.idl
new file mode 100644
index ..e90254a577d3
--- /dev/null
+++ b/offapi/com/sun/star/rdf/XNamedGraph2.idl
@@ -0,0 +1,134 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef __com_sun_star_rdf_XNamedGraph_idl__
+#define __com_sun_star_rdf_XNamedGraph_idl__
+
+#include
+
+
+
+module com { module sun { module star { module rdf {
+
+/** represents an RDF named graph that is stored in an RDF Repository.
+
+@since LibreOffice 6.4
+ */
+interface XNamedGraph2 : XNamedGraph
+{
+
+/** gets objects for matching RDF statements from a graph.
+
+this call caches its results (as opposed to getStatements in
XNamedGraph
+which cannot because it returns a mutable object).
+
+
+Note that the ODF elements that can have metadata attached all
+implement the interface XMetadatable, which inherits
+from XResource, meaning that you can simply pass them
+in as arguments here, and it will magically work.
+
+
+
+Any parameter may be `NULL`, which acts as a wildcard.
+For example, to get all statements about myURI:
+getStatements2(myURI, null, null)
+
+
+@param Subject
+the subject of the RDF triple.
+
+@param Predicate
+the predicate of the RDF triple.
+
+@param Object
+the object of the RDF triple.
+
+@returns
+a sequence of XURIs for the objects in RDF statements
+in the graph that match
+the parameters, represented as an
+enumeration of Statement
+
+@throws com::sun::star::container::NoSuchElementException
+if this graph does not exist in the repository any more
+
+@throws RepositoryException
+if an error occurs when accessing the repository.
+ */
+sequence getStatementsObjects(
+[in] XResource Subject,
+[in] XURI Predicate,
+[in] XNode Object)
+raises( com::sun::star::container::NoSuchElementException,
+RepositoryException );
+
+/** returns true if there are matching RDF stateme
[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - svx/source
svx/source/svdraw/svdotext.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 7ac1a9f5b0903af5d7ef1e14aa49f9b7ed3fda48
Author: Xisco Fauli
AuthorDate: Thu Jun 27 17:26:34 2019 +0200
Commit: Xisco Faulí
CommitDate: Fri Jun 28 12:38:03 2019 +0200
tdf#126137: Do not dereference non-existing Object
Regression from dfefe448c41921f2f1e54d3f69b8b9e89031d055
Use same logic as in c28ec6d9fbb21b363102faac0171de2754ea5d75
Change-Id: Ia489eb61873d38c31729fedb853b11570e562123
Reviewed-on: https://gerrit.libreoffice.org/74811
Tested-by: Jenkins
Reviewed-by: Noel Grandin
(cherry picked from commit b653f21313f3b8ff9da99897e3a0c2df4a685b60)
Reviewed-on: https://gerrit.libreoffice.org/74827
Reviewed-by: Michael Stahl
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index da6a4280a1eb..814b7a9e4f17 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1044,7 +1044,7 @@ SdrTextObj& SdrTextObj::operator=(const SdrTextObj& rObj)
{
pNewOutlinerParaObject = pEO->CreateParaObject();
}
-else
+else if (nullptr != rObj.getActiveText()->GetOutlinerParaObject())
{
pNewOutlinerParaObject.reset( new
OutlinerParaObject(*rObj.getActiveText()->GetOutlinerParaObject()) );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: configure.ac loleaflet/Makefile.am
configure.ac | 14 ++ loleaflet/Makefile.am |7 +++ 2 files changed, 21 insertions(+) New commits: commit 16fcd372015b3bc9a3f5d8b5abf7b76aec5c7c1f Author: Samuel Mehrbrodt AuthorDate: Fri Jun 21 10:43:53 2019 +0200 Commit: Samuel Mehrbrodt CommitDate: Fri Jun 28 12:32:43 2019 +0200 configure: Add support for custom icons Change-Id: I573b4d7e745cdea6fdbecd2c3790078d1980bdf9 Reviewed-on: https://gerrit.libreoffice.org/74491 Reviewed-by: Samuel Mehrbrodt Tested-by: Samuel Mehrbrodt diff --git a/configure.ac b/configure.ac index 7d1928b2e..c9446f35a 100644 --- a/configure.ac +++ b/configure.ac @@ -109,6 +109,10 @@ AC_ARG_WITH([app-name], AS_HELP_STRING([--with-app-name=], [Set the user-visible name of the app you build.])) +AC_ARG_WITH([icon-theme], + AS_HELP_STRING([--with-icon-theme=], + [Path to custom icon theme (similiar to loleflet/images).])) + AC_ARG_WITH(vendor, AS_HELP_STRING([--with-vendor="John the Builder"], [Set vendor of the build.]), @@ -410,6 +414,16 @@ AC_SUBST(ENABLE_IOSAPP) AM_CONDITIONAL([ENABLE_IOSAPP], [test "$ENABLE_IOSAPP" = "true"]) AC_SUBST(IOSAPP_BUNDLE_VERSION) +AC_MSG_CHECKING([for custom icon theme]) +CUSTOM_ICONS_DIRECTORY= +if test -d "$with_icon_theme"; then +CUSTOM_ICONS_DIRECTORY=`readlink -f $with_icon_theme` +AC_MSG_RESULT([$CUSTOM_ICONS_DIRECTORY]) +else +AC_MSG_RESULT([no]) +fi +AC_SUBST(CUSTOM_ICONS_DIRECTORY) + ENABLE_GTKAPP= if test "$enable_gtkapp" = "yes"; then ENABLE_GTKAPP=true diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am index 1df4350aa..456400f64 100644 --- a/loleaflet/Makefile.am +++ b/loleaflet/Makefile.am @@ -30,6 +30,8 @@ JQUERY_MINIFIED_DIST_IMAGES = $(patsubst $(JQUERY_MINIFIED_IMAGE_PATH)/%.png,$(b LOLEAFLET_IMAGES_SRC = $(shell find $(srcdir)/images -name '*.*') LOLEAFLET_IMAGES_DST = $(patsubst $(srcdir)/%,$(builddir)/dist/%,$(LOLEAFLET_IMAGES_SRC)) +LOLEAFLET_IMAGES_CUSTOM_SRC = $(shell find $(CUSTOM_ICONS_DIRECTORY) -name '*.*') +LOLEAFLET_IMAGES_CUSTOM_DST = $(patsubst $(CUSTOM_ICONS_DIRECTORY)/%,$(builddir)/dist/images/%,$(LOLEAFLET_IMAGES_CUSTOM_SRC)) LOLEAFLET_L10N_SRC = $(shell find $(srcdir)/l10n -name '*.*') if !ENABLE_IOSAPP @@ -140,6 +142,7 @@ endif build-loleaflet: | $(LOLEAFLET_L10N_DST) \ $(L10N_JSON) \ $(LOLEAFLET_IMAGES_DST) \ + $(LOLEAFLET_IMAGES_CUSTOM_DST) \ $(JQUERY_LIGHTNESS_DIST_IMAGES) \ $(JQUERY_MINIFIED_DIST_IMAGES) \ $(LOLEAFLET_PREFIX)/dist/loleaflet-src.js \ @@ -245,6 +248,10 @@ $(builddir)/dist/plugins/%.js: $(srcdir)/plugins/%.js `ln -sf $(abs_srcdir)/$< $@`; \ fi +$(builddir)/dist/images/%: $(CUSTOM_ICONS_DIRECTORY)/% + @mkdir -p $(dir $@) + @cp $< $@ + $(builddir)/dist/images/%: $(srcdir)/images/% @mkdir -p $(dir $@) @cp $< $@ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - vcl/source
vcl/source/window/dialog.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ad0652ccbf23e67e6f929663398fe4e7717c5cfe
Author: Caolán McNamara
AuthorDate: Thu Jun 27 20:50:35 2019 +0100
Commit: Caolán McNamara
CommitDate: Fri Jun 28 12:32:22 2019 +0200
Resolves: tdf#126134 EndDialog on disposed dialog
Change-Id: I079fb2bb786b66b843e8e3960643cf2db6387c79
Reviewed-on: https://gerrit.libreoffice.org/74822
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index faa88a27c1da..961cd28ee614 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -1122,7 +1122,7 @@ void Dialog::RemoveFromDlgList()
void Dialog::EndDialog( long nResult )
{
-if ( !mbInExecute )
+if (!mbInExecute || IsDisposed())
return;
const bool bModal = GetType() != WindowType::MODELESSDIALOG;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/dialog.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b399dba597c90777c0edf2c5b19d029b3bff23df
Author: Caolán McNamara
AuthorDate: Thu Jun 27 20:50:35 2019 +0100
Commit: Caolán McNamara
CommitDate: Fri Jun 28 12:31:09 2019 +0200
Resolves: tdf#126134 EndDialog on disposed dialog
Change-Id: I079fb2bb786b66b843e8e3960643cf2db6387c79
Reviewed-on: https://gerrit.libreoffice.org/74821
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 5d1dcb41769f..9d60b796b035 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -1122,7 +1122,7 @@ void Dialog::RemoveFromDlgList()
void Dialog::EndDialog( long nResult )
{
-if ( !mbInExecute )
+if (!mbInExecute || IsDisposed())
return;
const bool bModal = GetType() != WindowType::MODELESSDIALOG;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-qa] minutes of ESC call ...
On Thu, 2019-06-27 at 15:22 +0100, Michael Meeks wrote: > + fuzzit https://fuzzit.dev/ available > + offering things to OSS projects – but looks like oss-fuzz > + seem to be pushing hard to encourage people to use it > + may look on return from vacation For the record, there is also https://fuzzbuzz.io/ , which appears to be another of the same. (Automatic fuzzing is becoming popular, eh?) But I don't think there's much value in using another service that uses the same fuzzing engine(s) internally... D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - framework/source include/tools sfx2/source tools/Library_tl.mk tools/source
framework/source/loadenv/loadenv.cxx | 11 ---
include/tools/fileutil.hxx |5 ++---
sfx2/source/doc/docfile.cxx |5 +++--
tools/Library_tl.mk |1 +
tools/source/fsys/fileutil.cxx | 35 ---
5 files changed, 42 insertions(+), 15 deletions(-)
New commits:
commit c614e1fb800e531afd52c89a133a98c6e075b8c9
Author: Mike Kaganski
AuthorDate: Wed Jan 9 10:54:10 2019 +0300
Commit: Mike Kaganski
CommitDate: Fri Jun 28 11:40:20 2019 +0200
tdf#126121: WebDAV redirection detection
This rewrites URI of a document opened from a WebDAV mapped UNC path
on Windows (like "file://server/DavWWWRoot/Dir/Doc.odt") into HTTP URI
(like "http://server/Dir/Doc.odt";). This allows using WebDAV protocol
for these files, and e.g. get information about other user who locked
the document to show when asking if open read-only or a copy.
Change-Id: I643fa8df30d4b163783b279b1b973304fcafff37
Reviewed-on: https://gerrit.libreoffice.org/71746
Reviewed-by: Mike Kaganski
Tested-by: Mike Kaganski
Reviewed-on: https://gerrit.libreoffice.org/74833
diff --git a/framework/source/loadenv/loadenv.cxx
b/framework/source/loadenv/loadenv.cxx
index 2963013872f9..830b1faa6f64 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -89,6 +89,7 @@
#include
#include
#include
+#include
const char PROP_TYPES[] = "Types";
const char PROP_NAME[] = "Name";
@@ -246,21 +247,25 @@ void LoadEnv::initializeLoading(const OUString& sURL,
const uno::Sequence
xParser(util::URLTransformer::create(m_xContext));
xParser->parseStrict(m_aURL);
diff --git a/include/tools/fileutil.hxx b/include/tools/fileutil.hxx
index 06e7bf820992..d2ed87a6dff6 100644
--- a/include/tools/fileutil.hxx
+++ b/include/tools/fileutil.hxx
@@ -11,15 +11,14 @@
#define INCLUDED_TOOLS_FILEUTIL_HXX
#include
-
-class INetURLObject;
+#include
namespace tools
{
// Tests if the path is a UNC or local (drive-based) path that redirects to
// a WebDAV resource (e.g., using redirectors on Windows).
// Currently only implemented for Windows; on other platforms, returns false.
-TOOLS_DLLPUBLIC bool IsMappedWebDAVPath(const INetURLObject& aURL);
+TOOLS_DLLPUBLIC bool IsMappedWebDAVPath(const OUString& rURL, OUString*
pRealURL = nullptr);
}
#endif // INCLUDED_TOOLS_FILEUTIL_HXX
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index a06ca65c65b9..bb153e5badb5 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -231,7 +231,7 @@ bool IsFileMovable(const INetURLObject& rURL)
if (buf.st_nlink > 1 || S_ISLNK(buf.st_mode))
return false;
#elif defined _WIN32
-if (tools::IsMappedWebDAVPath(rURL))
+if
(tools::IsMappedWebDAVPath(rURL.GetMainURL(INetURLObject::DecodeMechanism::NONE)))
return false;
#endif
@@ -1365,7 +1365,8 @@ SfxMedium::LockFileResult
SfxMedium::LockOrigFileOnDemand( bool bLoading, bool b
}
catch (const uno::Exception&)
{
-if
(tools::IsMappedWebDAVPath(GetURLObject()))
+if
(tools::IsMappedWebDAVPath(GetURLObject().GetMainURL(
+
INetURLObject::DecodeMechanism::NONE)))
{
// This is a path that redirects to a
WebDAV resource;
// so failure creating lockfile is not
an error here.
diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk
index acd007cc4761..b360919f570a 100644
--- a/tools/Library_tl.mk
+++ b/tools/Library_tl.mk
@@ -108,6 +108,7 @@ ifeq ($(OS),WNT)
$(eval $(call gb_Library_use_system_win32_libs,tl,\
mpr \
+ netapi32 \
ole32 \
shell32 \
uuid \
diff --git a/tools/source/fsys/fileutil.cxx b/tools/source/fsys/fileutil.cxx
index a24f82316813..7b288ef378be 100644
--- a/tools/source/fsys/fileutil.cxx
+++ b/tools/source/fsys/fileutil.cxx
@@ -8,26 +8,42 @@
*/
#include
-#include
#if defined _WIN32
#include
-#include
#include
#include
#define WIN32_LEAN_AND_MEAN
#include
+#include
#endif
+namespace
+{
+#if defined _WIN32
+OUString UNCToDavURL(LPCWSTR sUNC)
+{
+DWORD nSize = 1024;
+auto bufURL(o3tl::make_unique(nSize));
+DWORD nResult = DavGetHTTPFromUNCPath(sUNC, bufURL.get(), &nSize);
+if (nResult == ERROR_INSUFFICIENT_BUFFER)
+{
+bufURL = o3tl::make_unique(nSize);
+nResult = DavGetHTTPFromUNCPath(sUNC, bufURL.get(), &nSize);
+}
+return nResult == ERROR_SUCCESS ? o3tl::toU(bufURL.get()) : OUString();
+}
+#endif
+}
+
namespace tools
{
-bool IsMappedWebDAVPath(const INetURLObject& aURL)
+bool IsMappedWebDAVPath(const OUString& rURL, OUString* pRealURL)
{
[Libreoffice-commits] core.git: instsetoo_native/inc_common
0 files changed New commits: commit 67b78232b244d81ba1191847b65f1b75eb26cb51 Author: Andrea Gelmini AuthorDate: Thu Jun 27 09:35:39 2019 + Commit: Michael Stahl CommitDate: Fri Jun 28 11:21:47 2019 +0200 Removed executable permission on bmp file Change-Id: Ie869a02d1df0dc84ca59f3358f839d7e2925e17d Reviewed-on: https://gerrit.libreoffice.org/74789 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp b/instsetoo_native/inc_common/windows/msi_templates/Binary/Banner.bmp old mode 100755 new mode 100644 ___ 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/AnnotationWin2.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit fc8a35ab89c5043cb8819ef6a8f7e5373d4e625e
Author: Jim MacArthur
AuthorDate: Tue Jun 11 13:08:55 2019 +0100
Commit: Samuel Mehrbrodt
CommitDate: Fri Jun 28 11:09:10 2019 +0200
AnnotationWin: Fix for GetTopReplyNote
This allows GetTopReplyNote to work when 'this' is already
the top reply note in a thread.
Change-Id: Ic4cd5d18bdd022bd22bc97a0b0257639ef3f027d
Reviewed-on: https://gerrit.libreoffice.org/74450
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/sw/source/uibase/docvw/AnnotationWin2.cxx
b/sw/source/uibase/docvw/AnnotationWin2.cxx
index b91501ea5813..eed1976e9b20 100644
--- a/sw/source/uibase/docvw/AnnotationWin2.cxx
+++ b/sw/source/uibase/docvw/AnnotationWin2.cxx
@@ -1425,7 +1425,7 @@ void SwAnnotationWin::SetViewState(ViewState bViewState)
SwAnnotationWin* SwAnnotationWin::GetTopReplyNote()
{
-SwAnnotationWin* pTopNote = nullptr;
+SwAnnotationWin* pTopNote = this;
SwAnnotationWin* pSidebarWin = IsFollow() ?
mrMgr.GetNextPostIt(KEY_PAGEUP, this) : nullptr;
while (pSidebarWin)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - svx/source
svx/source/svdraw/svdotext.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 7903b2c1733c2ebb9f1059eb9d191befd1d36baf
Author: Xisco Fauli
AuthorDate: Thu Jun 27 17:26:34 2019 +0200
Commit: Xisco Faulí
CommitDate: Fri Jun 28 10:43:06 2019 +0200
tdf#126137: Do not dereference non-existing Object
Regression from dfefe448c41921f2f1e54d3f69b8b9e89031d055
Use same logic as in c28ec6d9fbb21b363102faac0171de2754ea5d75
Change-Id: Ia489eb61873d38c31729fedb853b11570e562123
Reviewed-on: https://gerrit.libreoffice.org/74811
Tested-by: Jenkins
Reviewed-by: Noel Grandin
(cherry picked from commit b653f21313f3b8ff9da99897e3a0c2df4a685b60)
Reviewed-on: https://gerrit.libreoffice.org/74826
Reviewed-by: Xisco Faulí
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 999d7fbfc57b..f042b3b9b60c 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1049,7 +1049,7 @@ SdrTextObj& SdrTextObj::operator=(const SdrTextObj& rObj)
{
pNewOutlinerParaObject = pEO->CreateParaObject();
}
-else
+else if (nullptr != rObj.getActiveText()->GetOutlinerParaObject())
{
pNewOutlinerParaObject.reset( new
OutlinerParaObject(*rObj.getActiveText()->GetOutlinerParaObject()) );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - framework/source include/tools sfx2/source tools/Library_tl.mk tools/source
framework/source/loadenv/loadenv.cxx | 11 ---
include/tools/fileutil.hxx |5 ++---
sfx2/source/doc/docfile.cxx |3 ++-
tools/Library_tl.mk |1 +
tools/source/fsys/fileutil.cxx | 35 ---
5 files changed, 41 insertions(+), 14 deletions(-)
New commits:
commit 295557e083871ffe187b5e9c8dabf676c57311de
Author: Mike Kaganski
AuthorDate: Wed Jan 9 10:54:10 2019 +0300
Commit: Mike Kaganski
CommitDate: Fri Jun 28 10:06:15 2019 +0200
tdf#126121: WebDAV redirection detection
This rewrites URI of a document opened from a WebDAV mapped UNC path
on Windows (like "file://server/DavWWWRoot/Dir/Doc.odt") into HTTP URI
(like "http://server/Dir/Doc.odt";). This allows using WebDAV protocol
for these files, and e.g. get information about other user who locked
the document to show when asking if open read-only or a copy.
Change-Id: I643fa8df30d4b163783b279b1b973304fcafff37
Reviewed-on: https://gerrit.libreoffice.org/71746
Reviewed-by: Mike Kaganski
Tested-by: Mike Kaganski
Reviewed-on: https://gerrit.libreoffice.org/74831
diff --git a/framework/source/loadenv/loadenv.cxx
b/framework/source/loadenv/loadenv.cxx
index 178fd0ffe6c0..9fd29cd11a4a 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -88,6 +88,7 @@
#include
#include
#include
+#include
const char PROP_TYPES[] = "Types";
const char PROP_NAME[] = "Name";
@@ -238,21 +239,25 @@ void LoadEnv::initializeLoading(const OUString& sURL,
const uno::Sequence
xParser(util::URLTransformer::create(m_xContext));
xParser->parseStrict(m_aURL);
diff --git a/include/tools/fileutil.hxx b/include/tools/fileutil.hxx
index 06e7bf820992..d2ed87a6dff6 100644
--- a/include/tools/fileutil.hxx
+++ b/include/tools/fileutil.hxx
@@ -11,15 +11,14 @@
#define INCLUDED_TOOLS_FILEUTIL_HXX
#include
-
-class INetURLObject;
+#include
namespace tools
{
// Tests if the path is a UNC or local (drive-based) path that redirects to
// a WebDAV resource (e.g., using redirectors on Windows).
// Currently only implemented for Windows; on other platforms, returns false.
-TOOLS_DLLPUBLIC bool IsMappedWebDAVPath(const INetURLObject& aURL);
+TOOLS_DLLPUBLIC bool IsMappedWebDAVPath(const OUString& rURL, OUString*
pRealURL = nullptr);
}
#endif // INCLUDED_TOOLS_FILEUTIL_HXX
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index f198cb6b085a..ed96ed98395b 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -1311,7 +1311,8 @@ SfxMedium::LockFileResult
SfxMedium::LockOrigFileOnDemand( bool bLoading, bool b
}
catch (const uno::Exception&)
{
-if
(tools::IsMappedWebDAVPath(GetURLObject()))
+if
(tools::IsMappedWebDAVPath(GetURLObject().GetMainURL(
+
INetURLObject::DecodeMechanism::NONE)))
{
// This is a path that redirects to a
WebDAV resource;
// so failure creating lockfile is not
an error here.
diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk
index 252692c86863..8a77e03b4fc7 100644
--- a/tools/Library_tl.mk
+++ b/tools/Library_tl.mk
@@ -109,6 +109,7 @@ ifeq ($(OS),WNT)
$(eval $(call gb_Library_use_system_win32_libs,tl,\
mpr \
+ netapi32 \
ole32 \
shell32 \
uuid \
diff --git a/tools/source/fsys/fileutil.cxx b/tools/source/fsys/fileutil.cxx
index a24f82316813..7b288ef378be 100644
--- a/tools/source/fsys/fileutil.cxx
+++ b/tools/source/fsys/fileutil.cxx
@@ -8,26 +8,42 @@
*/
#include
-#include
#if defined _WIN32
#include
-#include
#include
#include
#define WIN32_LEAN_AND_MEAN
#include
+#include
#endif
+namespace
+{
+#if defined _WIN32
+OUString UNCToDavURL(LPCWSTR sUNC)
+{
+DWORD nSize = 1024;
+auto bufURL(o3tl::make_unique(nSize));
+DWORD nResult = DavGetHTTPFromUNCPath(sUNC, bufURL.get(), &nSize);
+if (nResult == ERROR_INSUFFICIENT_BUFFER)
+{
+bufURL = o3tl::make_unique(nSize);
+nResult = DavGetHTTPFromUNCPath(sUNC, bufURL.get(), &nSize);
+}
+return nResult == ERROR_SUCCESS ? o3tl::toU(bufURL.get()) : OUString();
+}
+#endif
+}
+
namespace tools
{
-bool IsMappedWebDAVPath(const INetURLObject& aURL)
+bool IsMappedWebDAVPath(const OUString& rURL, OUString* pRealURL)
{
#if defined _WIN32
-if (aURL.GetProtocol() == INetProtocol::File)
+if (rURL.startsWithIgnoreAsciiCase("file:"))
{
-OUString sURL = aURL.GetMainURL(INetURLObject::DecodeMechanism::NONE);
OUString aSystemPath;
-if (osl::FileBase::getSystemPathFromFileURL(sURL, aSystemPath) ==
osl::FileBase::
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/globstr.hrc |1 +
sc/source/filter/excel/xichart.cxx |4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 0269641d65dff97fa75892d15ffcb4ea81d70964
Author: Gabor Kelemen
AuthorDate: Thu Jun 27 21:19:28 2019 +0200
Commit: Andras Timar
CommitDate: Fri Jun 28 09:58:45 2019 +0200
tdf#126030 (related) Translate automatic chart title in XLS charts
The same string for XLS format is on a different code path
localize it too, just in case
Change-Id: Iacaf59080cc320498867680fc13836edbe9afe49
Reviewed-on: https://gerrit.libreoffice.org/74820
Tested-by: Jenkins
Reviewed-by: Andras Timar
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index 78437dc9f9d3..e0bc77c3a260 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -352,6 +352,7 @@
#define STR_QUICKHELP_REF NC_("STR_QUICKHELP_REF", "%1 R
x %2 C")
#define STR_FUNCTIONLIST_MORE NC_("STR_FUNCTIONLIST_MORE",
"More...")
#define STR_ERR_INVALID_AREANC_("STR_ERR_INVALID_AREA",
"Invalid range")
+#define STR_CHARTTITLE NC_("STR_CHARTTITLE", "Chart
Title")
// Templates for data pilot tables.
#define STR_PIVOT_STYLENAME_INNER
NC_("STR_PIVOT_STYLE_INNER", "Pivot Table Value")
#define STR_PIVOT_STYLENAME_RESULT
NC_("STR_PIVOT_STYLE_RESULT", "Pivot Table Result")
diff --git a/sc/source/filter/excel/xichart.cxx
b/sc/source/filter/excel/xichart.cxx
index bc86a848d8af..6c003d53d0d4 100644
--- a/sc/source/filter/excel/xichart.cxx
+++ b/sc/source/filter/excel/xichart.cxx
@@ -88,6 +88,8 @@
#include
#include
#include
+#include
+#include
#include
#include
#include
@@ -4181,7 +4183,7 @@ void XclImpChChart::FinalizeTitle()
if( !mxTitle )
mxTitle.reset( new XclImpChText( GetChRoot() ) );
if( aAutoTitle.isEmpty() )
-aAutoTitle = "Chart Title";
+aAutoTitle = ScResId(STR_CHARTTITLE);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - include/vcl vcl/source
include/vcl/button.hxx|2 +- vcl/source/control/button.cxx |4 2 files changed, 5 insertions(+), 1 deletion(-) New commits: commit d4d2cd593231f97cff938d7d6b30527e310c4244 Author: Justin Luth AuthorDate: Sat Jun 15 22:15:32 2019 +0300 Commit: Adolfo Jayme Barrientos CommitDate: Fri Jun 28 09:51:22 2019 +0200 tdf#125609 c10 vcl/button: enforce only one radio selected on init This patch does not solve the main LO 6.2 problem in bug 125609, but fixes the related problem from comments 10/11. This patch fixes two different scenarios: 1.) Sometimes buttons could fall through the other safety nets and have multiple radio buttons selected in a single group at display time. Since ImplInitStyle can be called multiple times for the same button, ensure that once everything is imported (IsRadioCheckEnabled) that any calls to this double-check that only one button is enabled. First come, first served if by programmer error multiple are marked as IsChecked in the same group. This problem existed pre-LO 6.2, so it had nothing to do with tabstops specifically. 2.) This patch specifically fixes the 6.2 regression with the Grammalecte extension Graphic Options dialog box. In this case Dialog::GrabFocusToFirstControl ended up being treated as a "click" on a tabstopped, unchecked radio, because setting the state never called the SetState/Checked function, but only the Init, and so the uncheckAllOther function never removed any tabstops. Change-Id: I98272d6c81cf582a15c2e6bf04e6ed60da1d9c71 Reviewed-on: https://gerrit.libreoffice.org/74108 Tested-by: Jenkins Reviewed-by: Justin Luth (cherry picked from commit d35171456bc230efdaa9426da1398b2db7fa0df8) Reviewed-on: https://gerrit.libreoffice.org/74775 Reviewed-by: Adolfo Jayme Barrientos Tested-by: Adolfo Jayme Barrientos diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx index bc82b7c78bd8..2a63e47a8c9b 100644 --- a/include/vcl/button.hxx +++ b/include/vcl/button.hxx @@ -289,7 +289,7 @@ private: boolmbStateChanged; Link maToggleHdl; SAL_DLLPRIVATE void ImplInitRadioButtonData(); -static SAL_DLLPRIVATE WinBits ImplInitStyle( const vcl::Window* pPrevWindow, WinBits nStyle ); +SAL_DLLPRIVATE WinBits ImplInitStyle( const vcl::Window* pPrevWindow, WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings( bool bBackground ); SAL_DLLPRIVATE void ImplDrawRadioButtonState(vcl::RenderContext& rRenderContext); SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, DrawFlags nDrawFlags, diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index 5ab14d2c2db2..8469407dfc57 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -1857,6 +1857,10 @@ WinBits RadioButton::ImplInitStyle( const vcl::Window* pPrevWindow, WinBits nSty nStyle |= WB_GROUP; if ( !(nStyle & WB_NOTABSTOP) ) nStyle |= WB_TABSTOP; + +if ( IsChecked() && IsRadioCheckEnabled() ) +ImplUncheckAllOther(); + return nStyle; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/source
android/source/src/java/org/libreoffice/LOKitInputConnectionHandler.java |
1 -
1 file changed, 1 deletion(-)
New commits:
commit 2e0e0bf789af7c0de3507cc67ff293ad2c87da33
Author: Dawid Gan
AuthorDate: Mon Jan 21 23:49:12 2019 +0100
Commit: Samuel Mehrbrodt
CommitDate: Fri Jun 28 09:47:18 2019 +0200
tdf#102040 Don't type doubled characters when using external keyboard.
Typically application should handle key press/release and multiple
actions. The onKeyPreIme may be used to handle some keys early and it's
not needed for writing text. And even if there would be a reason to use
it, then it should return true to notify that the event was handled
(otherwise we will get onKeyDown event for the same key).
Change-Id: I49ce7f411fac92ff86ca042a7f7467e910e46350
Reviewed-on: https://gerrit.libreoffice.org/66708
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git
a/android/source/src/java/org/libreoffice/LOKitInputConnectionHandler.java
b/android/source/src/java/org/libreoffice/LOKitInputConnectionHandler.java
index 804e7263594f..bbef709af297 100644
--- a/android/source/src/java/org/libreoffice/LOKitInputConnectionHandler.java
+++ b/android/source/src/java/org/libreoffice/LOKitInputConnectionHandler.java
@@ -31,7 +31,6 @@ public class LOKitInputConnectionHandler implements
InputConnectionHandler {
*/
@Override
public boolean onKeyPreIme(int keyCode, KeyEvent event) {
-LOKitShell.sendKeyEvent(event);
return false;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry sd/inc sd/Library_sd.mk sd/sdi sd/source sd/uiconfig
officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu | 8 sd/Library_sd.mk | 1 sd/inc/app.hrc | 1 sd/sdi/drviewsh.sdi | 5 sd/sdi/sdraw.sdi | 17 sd/source/ui/func/fuexecuteinteraction.cxx | 236 ++ sd/source/ui/inc/fuexecuteinteraction.hxx| 44 + sd/source/ui/view/drviews2.cxx | 9 sd/source/ui/view/drviews7.cxx | 4 sd/source/ui/view/drviewsj.cxx | 19 sd/uiconfig/simpress/popupmenu/3dobject.xml | 1 sd/uiconfig/simpress/popupmenu/3dscene.xml | 1 sd/uiconfig/simpress/popupmenu/3dscene2.xml | 1 sd/uiconfig/simpress/popupmenu/connector.xml | 1 sd/uiconfig/simpress/popupmenu/curve.xml | 1 sd/uiconfig/simpress/popupmenu/draw.xml | 1 sd/uiconfig/simpress/popupmenu/graphic.xml | 1 sd/uiconfig/simpress/popupmenu/group.xml | 1 sd/uiconfig/simpress/popupmenu/line.xml | 1 sd/uiconfig/simpress/popupmenu/measure.xml | 1 sd/uiconfig/simpress/popupmenu/media.xml | 1 sd/uiconfig/simpress/popupmenu/multiselect.xml | 1 sd/uiconfig/simpress/popupmenu/oleobject.xml | 2 sd/uiconfig/simpress/popupmenu/textbox.xml | 1 24 files changed, 357 insertions(+), 2 deletions(-) New commits: commit a08725165dfefa01dd491b3bd935d7a7d34b1877 Author: Samuel Mehrbrodt AuthorDate: Wed Jun 26 11:17:29 2019 +0200 Commit: Samuel Mehrbrodt CommitDate: Fri Jun 28 09:38:48 2019 +0200 tdf#125748 Add context menu entry to execute interaction This is a follow-up to commit 5f795576d45988d20aa9. This reintroduces the possibility to execute an interaction in edit mode by adding a context menu entry for it as discussed in the bug report. Change-Id: Ibc26c227b592b888129baa2b68590178fdadee98 Reviewed-on: https://gerrit.libreoffice.org/74731 Tested-by: Jenkins Reviewed-by: Heiko Tietze Tested-by: Heiko Tietze Reviewed-by: Samuel Mehrbrodt diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu index 4239cf258c80..46cfabd4bd2a 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu @@ -1060,6 +1060,14 @@ 1 + + + E~xecute Interaction... + + + 1 + + Change Slide Master... diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index 87fd3332594f..d777ea177a5d 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -278,6 +278,7 @@ $(eval $(call gb_Library_add_exception_objects,sd,\ sd/source/ui/func/fudraw \ sd/source/ui/func/fudspord \ sd/source/ui/func/fuediglu \ + sd/source/ui/func/fuexecuteinteraction \ sd/source/ui/func/fuexpand \ sd/source/ui/func/fuformatpaintbrush \ sd/source/ui/func/fuhhconv \ diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc index 73a974a5f93c..1ca6952d9ba4 100644 --- a/sd/inc/app.hrc +++ b/sd/inc/app.hrc @@ -140,6 +140,7 @@ #define SID_NOTES_MODE (SID_SD_START+69) #define SID_HANDOUT_MASTER_MODE (SID_SD_START+70) #define SID_LINEEND_POLYGON (SID_SD_START+71) +#define SID_EXECUTE_ANIMATION_EFFECT(SID_SD_START+72) // FREE #define SID_SWITCH_POINTEDIT(SID_SD_START+74) // FREE diff --git a/sd/sdi/drviewsh.sdi b/sd/sdi/drviewsh.sdi index 931a54ee983d..7ee014de5f76 100644 --- a/sd/sdi/drviewsh.sdi +++ b/sd/sdi/drviewsh.sdi @@ -37,6 +37,11 @@ interface ImpressEditView : DrawView ExecMethod = FuTemporary ; StateMethod = GetMenuState ; ] +SID_EXECUTE_ANIMATION_EFFECT // ole : no, status : ? +[ +ExecMethod = FuTemporary ; +StateMethod = GetMenuState ; +] SID_CUSTOM_ANIMATION_PANEL // ole : no, status : ? [ ExecMethod = FuTemporary ; diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi index cedb086080ee..50bb4ce436de 100644 --- a/sd/sdi/sdraw.sdi +++ b/sd/sdi/sdraw.sdi @@ -51,6 +51,23 @
[Libreoffice-commits] core.git: sc/source
sc/source/ui/drawfunc/drawsh.cxx | 27 +--
1 file changed, 13 insertions(+), 14 deletions(-)
New commits:
commit 7c8cc04bb2f31e97230469c6f52d10a81363d4b5
Author: Meryem Ezber
AuthorDate: Thu Jun 27 21:03:03 2019 +0300
Commit: Noel Grandin
CommitDate: Fri Jun 28 09:12:43 2019 +0200
removal of excess code block
Change-Id: I2c2161f4159be53f69fce542f7538581951750d8
Reviewed-on: https://gerrit.libreoffice.org/74817
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx
index 2b3414368a96..701f7c970659 100644
--- a/sc/source/ui/drawfunc/drawsh.cxx
+++ b/sc/source/ui/drawfunc/drawsh.cxx
@@ -239,7 +239,6 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq )
break;
case SID_ATTR_TRANSFORM:
-{
{
if ( pView->AreObjectsMarked() )
{
@@ -291,21 +290,21 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq )
else
pView->SetGeoAttrToMarked( *pArgs );
}
-}
-ScTabViewShell* pViewShell = pViewData->GetViewShell();
-SfxBindings& rBindings=pViewShell->GetViewFrame()->GetBindings();
-rBindings.Invalidate(SID_ATTR_TRANSFORM_WIDTH);
-rBindings.Invalidate(SID_ATTR_TRANSFORM_HEIGHT);
-rBindings.Invalidate(SID_ATTR_TRANSFORM_POS_X);
-rBindings.Invalidate(SID_ATTR_TRANSFORM_POS_Y);
-rBindings.Invalidate(SID_ATTR_TRANSFORM_ANGLE);
-rBindings.Invalidate(SID_ATTR_TRANSFORM_ROT_X);
-rBindings.Invalidate(SID_ATTR_TRANSFORM_ROT_Y);
-rBindings.Invalidate(SID_ATTR_TRANSFORM_AUTOWIDTH);
-rBindings.Invalidate(SID_ATTR_TRANSFORM_AUTOHEIGHT);
+ScTabViewShell* pViewShell = pViewData->GetViewShell();
+SfxBindings&
rBindings=pViewShell->GetViewFrame()->GetBindings();
+rBindings.Invalidate(SID_ATTR_TRANSFORM_WIDTH);
+rBindings.Invalidate(SID_ATTR_TRANSFORM_HEIGHT);
+rBindings.Invalidate(SID_ATTR_TRANSFORM_POS_X);
+rBindings.Invalidate(SID_ATTR_TRANSFORM_POS_Y);
+rBindings.Invalidate(SID_ATTR_TRANSFORM_ANGLE);
+rBindings.Invalidate(SID_ATTR_TRANSFORM_ROT_X);
+rBindings.Invalidate(SID_ATTR_TRANSFORM_ROT_Y);
+rBindings.Invalidate(SID_ATTR_TRANSFORM_AUTOWIDTH);
+rBindings.Invalidate(SID_ATTR_TRANSFORM_AUTOHEIGHT);
+
+}
break;
-}
default:
break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
