[Libreoffice-commits] core.git: 2 commits - oox/source vcl/unx
oox/source/drawingml/diagram/diagramlayoutatoms.cxx | 21 +---
vcl/unx/generic/dtrans/X11_selection.cxx|1
2 files changed, 19 insertions(+), 3 deletions(-)
New commits:
commit 1f66bd9cbd961d1923c260b2d74249e363a0c217
Author: ekuiitr
Date: Wed Jul 4 16:52:22 2018 +0530
Support txAnchorVert parameter
Specifies the y-axis anchoring of the text area in a shape according to:
t(top), mid(middle, default), b(bottom).
Change-Id: I98927f687334fd989ae43385de7dd91f8e2929b1
Reviewed-on: https://gerrit.libreoffice.org/56939
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index 72fc01a5fe9f..e0fd7d246c60 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -553,9 +553,24 @@ void AlgAtom::layoutShape( const ShapePtr& rShape,
break;
}
-// text centered vertically by default
-pTextBody->getTextProperties().meVA =
css::drawing::TextVerticalAdjust_CENTER;
-
pTextBody->getTextProperties().maPropertyMap.setProperty(PROP_TextVerticalAdjust,
css::drawing::TextVerticalAdjust_CENTER);
+const sal_Int32 atxAnchorVert = maMap.count(XML_txAnchorVert) ?
maMap.find(XML_txAnchorVert)->second : XML_mid;
+
+switch(atxAnchorVert)
+{
+case XML_t:
+pTextBody->getTextProperties().meVA =
css::drawing::TextVerticalAdjust_TOP;
+break;
+case XML_b:
+pTextBody->getTextProperties().meVA =
css::drawing::TextVerticalAdjust_BOTTOM;
+break;
+case XML_mid:
+// text centered vertically by default
+default:
+pTextBody->getTextProperties().meVA =
css::drawing::TextVerticalAdjust_CENTER;
+break;
+}
+
+
pTextBody->getTextProperties().maPropertyMap.setProperty(PROP_TextVerticalAdjust,
pTextBody->getTextProperties().meVA);
// normalize list level
sal_Int32 nBaseLevel =
pTextBody->getParagraphs().front()->getProperties().getLevel();
commit fb9c1c191e76755ffa6acb09d4f50533cb589d1b
Author: Noel Grandin
Date: Tue Jul 10 12:32:56 2018 +0200
tdf#118661 LibreOffice remains in background after closing it
regression from
commit d0f44d8ba7e87aa263008d3cfc4e68294d783162
tdf#84323 - sal - add sane sleep interface: cleanup osl_waitThread
Change-Id: I55c2fa6c8993cc6268b1c5d9331c665c401e8efe
Reviewed-on: https://gerrit.libreoffice.org/57228
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx
b/vcl/unx/generic/dtrans/X11_selection.cxx
index 43f0d228002c..c2d8858d1c61 100644
--- a/vcl/unx/generic/dtrans/X11_selection.cxx
+++ b/vcl/unx/generic/dtrans/X11_selection.cxx
@@ -943,6 +943,7 @@ bool SelectionManager::getPasteData( Atom selection, Atom
type, Sequence< sal_In
}
else
{
+aGuard.clear();
osl::Thread::wait(std::chrono::milliseconds(100));
aGuard.reset();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/qa
sd/qa/unit/import-tests-smartart.cxx | 21 -
1 file changed, 20 insertions(+), 1 deletion(-)
New commits:
commit 2d61cb923e5e3999f6fd660aec26504311f0407c
Author: ekuiitr
Date: Fri Jun 15 23:42:13 2018 +0530
Unit test for Chevron Smartart and
modified Unit test for Line algorithm.
It checks the position of the childs and
compare it with position of that child in MSO.
It also checks whether the childs are in the
same horizontal level or not.
Change-Id: I8e6dcaaf2923fe9d0d24e945486ba2f2954927d3
Reviewed-on: https://gerrit.libreoffice.org/55891
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky
diff --git a/sd/qa/unit/import-tests-smartart.cxx
b/sd/qa/unit/import-tests-smartart.cxx
index 97f304723004..e4960ada1121 100644
--- a/sd/qa/unit/import-tests-smartart.cxx
+++ b/sd/qa/unit/import-tests-smartart.cxx
@@ -242,7 +242,26 @@ void SdImportTestSmartArt::testPyramid()
void SdImportTestSmartArt::testChevron()
{
-//FIXME : so far this only introduce the test document, but the actual
importer was not fixed yet.
+sd::DrawDocShellRef xDocShRef =
loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/smartart-chevron.pptx"),
PPTX);
+uno::Reference xShapeGroup(getShapeFromPage(0, 0,
xDocShRef), uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(3), xShapeGroup->getCount());
+
+uno::Reference xText0(xShapeGroup->getByIndex(0),
uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_EQUAL(OUString("a"), xText0->getString());
+uno::Reference xText1(xShapeGroup->getByIndex(1),
uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_EQUAL(OUString("b"), xText1->getString());
+uno::Reference xText2(xShapeGroup->getByIndex(2),
uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_EQUAL(OUString("c"), xText2->getString());
+
+uno::Reference xShape0(xShapeGroup->getByIndex(0),
uno::UNO_QUERY_THROW);
+uno::Reference xShape1(xShapeGroup->getByIndex(1),
uno::UNO_QUERY_THROW);
+uno::Reference xShape2(xShapeGroup->getByIndex(2),
uno::UNO_QUERY_THROW);
+
+CPPUNIT_ASSERT(xShape0->getPosition().X < xShape1->getPosition().X &&
xShape1->getPosition().X < xShape2->getPosition().X);
+CPPUNIT_ASSERT_EQUAL(xShape0->getPosition().Y, xShape1->getPosition().Y);
+CPPUNIT_ASSERT_EQUAL(xShape1->getPosition().Y, xShape2->getPosition().Y);
+
+xDocShRef->DoClose();
}
void SdImportTestSmartArt::testCycle()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/qa
sd/qa/unit/data/pptx/smartart-rightoleftblockdiagram.pptx |binary
sd/qa/unit/import-tests-smartart.cxx | 60 ++
2 files changed, 60 insertions(+)
New commits:
commit 6d7c22092e66b6479ab4542286a0c0690e20b4dd
Author: ekuiitr
Date: Mon Jul 2 11:44:51 2018 +0530
Unit test for Snake Algorithm
Added unit tests for snake algorithm which tests the position of the
child nodes in normal from left to right layout and from right to left
layout.
Change-Id: I25eeb5f8a98e06e748c95b72ffdf9e1a63a4d251
Reviewed-on: https://gerrit.libreoffice.org/56795
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky
diff --git a/sd/qa/unit/data/pptx/smartart-rightoleftblockdiagram.pptx
b/sd/qa/unit/data/pptx/smartart-rightoleftblockdiagram.pptx
new file mode 100755
index ..1a6421b9b265
Binary files /dev/null and
b/sd/qa/unit/data/pptx/smartart-rightoleftblockdiagram.pptx differ
diff --git a/sd/qa/unit/import-tests-smartart.cxx
b/sd/qa/unit/import-tests-smartart.cxx
index 5c340e99e077..97f304723004 100644
--- a/sd/qa/unit/import-tests-smartart.cxx
+++ b/sd/qa/unit/import-tests-smartart.cxx
@@ -39,6 +39,7 @@ public:
void testBasicRadicals();
void testEquation();
void testSegmentedCycle();
+void testBaseRtoL();
CPPUNIT_TEST_SUITE(SdImportTestSmartArt);
@@ -62,6 +63,7 @@ public:
CPPUNIT_TEST(testBasicRadicals);
CPPUNIT_TEST(testEquation);
CPPUNIT_TEST(testSegmentedCycle);
+CPPUNIT_TEST(testBaseRtoL);
CPPUNIT_TEST_SUITE_END();
};
@@ -95,6 +97,19 @@ void SdImportTestSmartArt::testBase()
xPropSet->getPropertyValue("ParaAdjust") >>= nParaAdjust;
CPPUNIT_ASSERT_EQUAL(style::ParagraphAdjust_CENTER,
static_cast(nParaAdjust));
+uno::Reference xShape0(xShapeGroup->getByIndex(0),
uno::UNO_QUERY_THROW);
+uno::Reference xShape1(xShapeGroup->getByIndex(1),
uno::UNO_QUERY_THROW);
+uno::Reference xShape2(xShapeGroup->getByIndex(2),
uno::UNO_QUERY_THROW);
+uno::Reference xShape3(xShapeGroup->getByIndex(3),
uno::UNO_QUERY_THROW);
+uno::Reference xShape4(xShapeGroup->getByIndex(4),
uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_EQUAL(xShape0->getPosition().Y,xShape1->getPosition().Y);
+CPPUNIT_ASSERT_EQUAL(xShape2->getPosition().Y,xShape3->getPosition().Y);
+CPPUNIT_ASSERT(xShape2->getPosition().Y > xShape0->getPosition().Y);
+CPPUNIT_ASSERT(xShape4->getPosition().Y > xShape2->getPosition().Y);
+CPPUNIT_ASSERT(xShape0->getPosition().X < xShape1->getPosition().X);
+CPPUNIT_ASSERT(xShape2->getPosition().X < xShape3->getPosition().X);
+CPPUNIT_ASSERT((xShape2->getPosition().X < xShape4->getPosition().X) &&
(xShape3->getPosition().X > xShape4->getPosition().X));
+
xDocShRef->DoClose();
}
@@ -280,6 +295,51 @@ void SdImportTestSmartArt::testSegmentedCycle()
//FIXME : so far this only introduce the test document, but the actual
importer was not fixed yet.
}
+void SdImportTestSmartArt::testBaseRtoL()
+{
+sd::DrawDocShellRef xDocShRef =
loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/smartart-rightoleftblockdiagram.pptx"),
PPTX);
+uno::Reference xShapeGroup(getShapeFromPage(0, 0,
xDocShRef), uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(5), xShapeGroup->getCount());
+
+uno::Reference xText0(xShapeGroup->getByIndex(0),
uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_EQUAL(OUString("a"), xText0->getString());
+uno::Reference xText1(xShapeGroup->getByIndex(1),
uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_EQUAL(OUString("b"), xText1->getString());
+uno::Reference xText2(xShapeGroup->getByIndex(2),
uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_EQUAL(OUString("c"), xText2->getString());
+uno::Reference xText3(xShapeGroup->getByIndex(3),
uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_EQUAL(OUString("d"), xText3->getString());
+uno::Reference xText4(xShapeGroup->getByIndex(4),
uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_EQUAL(OUString("e"), xText4->getString());
+
+uno::Reference xShape(xShapeGroup->getByIndex(0),
uno::UNO_QUERY_THROW);
+
+sal_Int32 nFillColor = 0;
+xShape->getPropertyValue("FillColor") >>= nFillColor;
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0x4F81BD), nFillColor);
+
+sal_Int16 nParaAdjust = 0;
+uno::Reference xParagraph(getParagraphFromShape(0,
xShape));
+uno::Reference xPropSet(xParagraph,
uno::UNO_QUERY_THROW);
+xPropSet->getPropertyValue("ParaAdjust") >>= nParaAdjust;
+CPPUNIT_ASSERT_EQUAL(style::ParagraphAdjust_CENTER,
static_cast(nParaAdjust));
+
+uno::Reference xShape0(xShapeGroup->getByIndex(0),
uno::UNO_QUERY_THROW);
+uno::Reference xShape1(xShapeGroup->getByIndex(1),
uno::UNO_
[Libreoffice-commits] core.git: sd/qa
sd/qa/unit/data/pptx/smartart-basicprocess.pptx |binary sd/qa/unit/data/pptx/smartart-basicradicals.pptx|binary sd/qa/unit/data/pptx/smartart-chevron.pptx |binary sd/qa/unit/data/pptx/smartart-cycle.pptx|binary sd/qa/unit/data/pptx/smartart-equation.pptx |binary sd/qa/unit/data/pptx/smartart-hierarchy.pptx|binary sd/qa/unit/data/pptx/smartart-horizontalbulletlist.pptx |binary sd/qa/unit/data/pptx/smartart-invertedPyramid.pptx |binary sd/qa/unit/data/pptx/smartart-matrix.pptx |binary sd/qa/unit/data/pptx/smartart-mutidirectional.pptx |binary sd/qa/unit/data/pptx/smartart-pyramid.pptx |binary sd/qa/unit/data/pptx/smartart-segmentedcycle.pptx |binary sd/qa/unit/data/pptx/smartart-venndiagram.pptx |binary sd/qa/unit/import-tests-smartart.cxx| 91 14 files changed, 91 insertions(+) New commits: commit 2704821c6b6e829b5ef5c32cdc8eb2a03b6114a9 Author: ekuiitr Date: Fri May 11 13:48:10 2018 +0530 smartart : test documents Change-Id: I163a080cfae988db38fbd7b3d9de1531f6ba4089 Reviewed-on: https://gerrit.libreoffice.org/54112 Tested-by: Jenkins Reviewed-by: Jan Holesovsky diff --git a/sd/qa/unit/data/pptx/smartart-basicprocess.pptx b/sd/qa/unit/data/pptx/smartart-basicprocess.pptx new file mode 100755 index ..b1f10c38587f Binary files /dev/null and b/sd/qa/unit/data/pptx/smartart-basicprocess.pptx differ diff --git a/sd/qa/unit/data/pptx/smartart-basicradicals.pptx b/sd/qa/unit/data/pptx/smartart-basicradicals.pptx new file mode 100644 index ..1a99daeeb3eb Binary files /dev/null and b/sd/qa/unit/data/pptx/smartart-basicradicals.pptx differ diff --git a/sd/qa/unit/data/pptx/smartart-chevron.pptx b/sd/qa/unit/data/pptx/smartart-chevron.pptx new file mode 100644 index ..883fbeb495cd Binary files /dev/null and b/sd/qa/unit/data/pptx/smartart-chevron.pptx differ diff --git a/sd/qa/unit/data/pptx/smartart-cycle.pptx b/sd/qa/unit/data/pptx/smartart-cycle.pptx new file mode 100644 index ..bea0524d39df Binary files /dev/null and b/sd/qa/unit/data/pptx/smartart-cycle.pptx differ diff --git a/sd/qa/unit/data/pptx/smartart-equation.pptx b/sd/qa/unit/data/pptx/smartart-equation.pptx new file mode 100644 index ..dbd6ad2e4971 Binary files /dev/null and b/sd/qa/unit/data/pptx/smartart-equation.pptx differ diff --git a/sd/qa/unit/data/pptx/smartart-hierarchy.pptx b/sd/qa/unit/data/pptx/smartart-hierarchy.pptx new file mode 100755 index ..8a556e26ffec Binary files /dev/null and b/sd/qa/unit/data/pptx/smartart-hierarchy.pptx differ diff --git a/sd/qa/unit/data/pptx/smartart-horizontalbulletlist.pptx b/sd/qa/unit/data/pptx/smartart-horizontalbulletlist.pptx new file mode 100755 index ..c3cd642181d8 Binary files /dev/null and b/sd/qa/unit/data/pptx/smartart-horizontalbulletlist.pptx differ diff --git a/sd/qa/unit/data/pptx/smartart-invertedPyramid.pptx b/sd/qa/unit/data/pptx/smartart-invertedPyramid.pptx new file mode 100755 index ..3fb3dcaf5f19 Binary files /dev/null and b/sd/qa/unit/data/pptx/smartart-invertedPyramid.pptx differ diff --git a/sd/qa/unit/data/pptx/smartart-matrix.pptx b/sd/qa/unit/data/pptx/smartart-matrix.pptx new file mode 100755 index ..3a8354e81351 Binary files /dev/null and b/sd/qa/unit/data/pptx/smartart-matrix.pptx differ diff --git a/sd/qa/unit/data/pptx/smartart-mutidirectional.pptx b/sd/qa/unit/data/pptx/smartart-mutidirectional.pptx new file mode 100755 index ..fd723982a6bf Binary files /dev/null and b/sd/qa/unit/data/pptx/smartart-mutidirectional.pptx differ diff --git a/sd/qa/unit/data/pptx/smartart-pyramid.pptx b/sd/qa/unit/data/pptx/smartart-pyramid.pptx new file mode 100755 index ..7c2296f9db9e Binary files /dev/null and b/sd/qa/unit/data/pptx/smartart-pyramid.pptx differ diff --git a/sd/qa/unit/data/pptx/smartart-segmentedcycle.pptx b/sd/qa/unit/data/pptx/smartart-segmentedcycle.pptx new file mode 100644 index ..b3c92a491bb5 Binary files /dev/null and b/sd/qa/unit/data/pptx/smartart-segmentedcycle.pptx differ diff --git a/sd/qa/unit/data/pptx/smartart-venndiagram.pptx b/sd/qa/unit/data/pptx/smartart-venndiagram.pptx new file mode 100755 index ..f69fd26da53f Binary files /dev/null and b/sd/qa/unit/data/pptx/smartart-venndiagram.pptx differ diff --git a/sd/qa/unit/import-tests-smartart.cxx b/sd/qa/unit/import-tests-smartart.cxx index 27d81f99b7ee..5c340e99e077 100644 --- a/sd/qa/unit/import-tests-smartart.cxx +++ b/sd/qa/unit/import-tests-smartart.cxx @@ -26,6 +26,19 @@ public: void testDir(); void testMaxDepth(); void testRotation(); +void testPyramid(); +void testChevron(); +void testCycle(); +void testvenndiagram(); +void testmatrix(); +void testHierarchy(); +void testInvertedPyramid
[Libreoffice-commits] core.git: oox/source
oox/source/drawingml/diagram/diagramlayoutatoms.cxx | 15 ++-
1 file changed, 2 insertions(+), 13 deletions(-)
New commits:
commit 3f8fdfced059bdec7f28164eb3c0e99974c6780a
Author: ekuiitr
Date: Mon Jun 11 00:11:23 2018 +0530
coverity#1436015 UNUSED_VALUE
I got to know that, earlier the code I've submitted about line algorithm
creates error. I've fixed that in this patch. Moreover, child width and
height doesn't depend of nIncX and nIncY, so I've removed that code, it
relates only to the position of the child.
Change-Id: I9f4bdec87fc20340c21daed60246b9898967ab50
Reviewed-on: https://gerrit.libreoffice.org/55564
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index c085fb6daa7f..72fc01a5fe9f 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -356,15 +356,9 @@ void AlgAtom::layoutShape( const ShapePtr& rShape,
double fSpace = 0.3;
awt::Size aChildSize = rShape->getSize();
-if (nIncX)
-aChildSize.Width /= (nCount + (nCount-1)*fSpace);
-if (nIncY)
-aChildSize.Height /= (nCount + (nCount-1)*fSpace);
-if(nCount <= 2 && nIncY)
-aChildSize.Height /= 2;
-else
-aChildSize.Height /= (nCount+1);
+aChildSize.Width /= (nCount + (nCount-1)*fSpace);
+aChildSize.Height /= (nCount + (nCount-1)*fSpace);
awt::Point aCurrPos(0, 0);
if (nIncX == -1)
@@ -372,11 +366,6 @@ void AlgAtom::layoutShape( const ShapePtr& rShape,
if (nIncY == -1)
aCurrPos.Y = rShape->getSize().Height - aChildSize.Height;
-if(nCount <= 2 && nIncY == -1)
-aCurrPos.Y = rShape->getSize().Height - aChildSize.Height*2;
-else
-aCurrPos.Y = rShape->getSize().Height -
aChildSize.Height*(nCount+1);
-
for (auto & aCurrShape : rShape->getChildren())
{
aCurrShape->setPosition(aCurrPos);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/source
oox/source/drawingml/diagram/diagramlayoutatoms.cxx | 21 ++--
1 file changed, 19 insertions(+), 2 deletions(-)
New commits:
commit cf7b97d1328ec2f2c8254abb9ce67d63d9c54c80
Author: ekuiitr
Date: Wed Jun 6 13:00:27 2018 +0530
Support autoTxRot parameter in Text algorithm
Specifies how text is oriented relative to the shape, according to values:
none, upright(default) and gravity.
Change-Id: I3fcaa545965a9e2853943e4dc8215fa66576ac39
Reviewed-on: https://gerrit.libreoffice.org/55359
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index 366759581bc0..c085fb6daa7f 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -544,8 +544,25 @@ void AlgAtom::layoutShape( const ShapePtr& rShape,
break;
}
-if (rShape->getRotation())
-pTextBody->getTextProperties().moRotation =
-rShape->getRotation();
+const sal_Int32 nautoTxRot = maMap.count(XML_autoTxRot) ?
maMap.find(XML_autoTxRot)->second : XML_upr;
+
+switch(nautoTxRot)
+{
+case XML_upr:
+{
+if (rShape->getRotation())
+pTextBody->getTextProperties().moRotation =
-F_PI180*90*rShape->getRotation();
+}
+break;
+case XML_grav:
+{
+if (rShape->getRotation()==90*F_PI180 ||
rShape->getRotation()==180*F_PI180)
+pTextBody->getTextProperties().moRotation =
180*F_PI180;
+}
+break;
+case XML_none:
+break;
+}
// text centered vertically by default
pTextBody->getTextProperties().meVA =
css::drawing::TextVerticalAdjust_CENTER;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/qa
sd/qa/unit/import-tests-smartart.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit 0d0716411e3d66e8beb9093ebe94fb5545106fbf
Author: ekuiitr
Date: Wed May 30 19:04:03 2018 +0530
Unit test for Line algorithm
TestMaxDepth test checks the linear (lin) algorithm such that it arranges
child layout nodes along a linear path.
Change-Id: Ibf6f654d2f68f31a1c1a0f57044b411add954fa0
Reviewed-on: https://gerrit.libreoffice.org/55080
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky
diff --git a/sd/qa/unit/import-tests-smartart.cxx
b/sd/qa/unit/import-tests-smartart.cxx
index e86dab7f4745..27d81f99b7ee 100644
--- a/sd/qa/unit/import-tests-smartart.cxx
+++ b/sd/qa/unit/import-tests-smartart.cxx
@@ -165,6 +165,10 @@ void SdImportTestSmartArt::testMaxDepth()
uno::Reference xText1(xShapeGroup->getByIndex(1),
uno::UNO_QUERY_THROW);
CPPUNIT_ASSERT_EQUAL(OUString("second"), xText1->getString());
+uno::Reference xShape0(xShapeGroup->getByIndex(0),
uno::UNO_QUERY_THROW);
+uno::Reference xShape1(xShapeGroup->getByIndex(1),
uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_EQUAL(xShape0->getPosition().Y , xShape1->getPosition().Y);
// Confirms shapes are in same Y axis-level.
+
xDocShRef->DoClose();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/source
oox/source/drawingml/diagram/diagramlayoutatoms.cxx | 10 ++
1 file changed, 10 insertions(+)
New commits:
commit f1368d6a45456b5682d588371cfa2efa5571d798
Author: ekuiitr
Date: Sun May 27 01:49:09 2018 +0530
Smartart: Corrected Line Algorithm
Earlier it display odd height of the children nodes as compared to
their width.
Change-Id: I379fb192afc5078d089ef276f35ca5a95ff60cfb
Reviewed-on: https://gerrit.libreoffice.org/54866
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index 92b6e9129591..366759581bc0 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -361,12 +361,22 @@ void AlgAtom::layoutShape( const ShapePtr& rShape,
if (nIncY)
aChildSize.Height /= (nCount + (nCount-1)*fSpace);
+if(nCount <= 2 && nIncY)
+aChildSize.Height /= 2;
+else
+aChildSize.Height /= (nCount+1);
+
awt::Point aCurrPos(0, 0);
if (nIncX == -1)
aCurrPos.X = rShape->getSize().Width - aChildSize.Width;
if (nIncY == -1)
aCurrPos.Y = rShape->getSize().Height - aChildSize.Height;
+if(nCount <= 2 && nIncY == -1)
+aCurrPos.Y = rShape->getSize().Height - aChildSize.Height*2;
+else
+aCurrPos.Y = rShape->getSize().Height -
aChildSize.Height*(nCount+1);
+
for (auto & aCurrShape : rShape->getChildren())
{
aCurrShape->setPosition(aCurrPos);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/source
oox/source/drawingml/diagram/diagramlayoutatoms.cxx | 99
1 file changed, 84 insertions(+), 15 deletions(-)
New commits:
commit 8d43de9a88dc7c7fec0e7c794cef14953fb34b6e
Author: ekuiitr
Date: Mon May 21 01:07:19 2018 +0530
tdf#117761 Corrected Snake Algorithm
Now it displays correct position of child layout nodes along a
linear path in two dimensions, with the correct number of rows and
columns and aspect ratio, this algorithm is for smartarts
like Basic Block List - grouped blocks of information.
It also specifies the behaviour of the direction that
additional nodes are added to new rows or columns
in the snake algorithm.
Added Reverse Algorithm and SameDirection Algorithm in this patch,
rather than commiting new Patch.
Change-Id: I85ba53690fd716f0387cfdb21f8874e63bc44194
Reviewed-on: https://gerrit.libreoffice.org/54606
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index 3c8993bd687d..92b6e9129591 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -402,18 +402,19 @@ void AlgAtom::layoutShape( const ShapePtr& rShape,
// TODO: get values from constraints
sal_Int32 nCount = rShape->getChildren().size();
double fSpace = 0.3;
-double fAspectRatio = 0.6;
+double fAspectRatio = 0.54; // diagram should not spill outside,
earlier it was 0.6
sal_Int32 nCol = 1;
sal_Int32 nRow = 1;
-for ( ; nColgetSize().Height;
const double fShapeWidth = rShape->getSize().Width;
-if ((fShapeHeight / nRow) / (fShapeWidth / nCol) >=
fAspectRatio)
+if ((fShapeHeight / nCol) / (fShapeWidth / nRow) >=
fAspectRatio)
break;
}
+
SAL_INFO("oox.drawingml", "Snake layout grid: " << nCol << "x" <<
nRow);
sal_Int32 nWidth = rShape->getSize().Width / (nCol +
(nCol-1)*fSpace);
@@ -426,20 +427,89 @@ void AlgAtom::layoutShape( const ShapePtr& rShape,
aCurrPos.Y = rShape->getSize().Height - aChildSize.Height;
sal_Int32 nStartX = aCurrPos.X;
-sal_Int32 nColIdx = 0;
+sal_Int32 nColIdx = 0,index = 0;
-for (auto & aCurrShape : rShape->getChildren())
+sal_Int32 num = rShape->getChildren().size();
+
+const sal_Int32 aContDir = maMap.count(XML_contDir) ?
maMap.find(XML_contDir)->second : XML_sameDir;
+
+switch(aContDir)
{
-aCurrShape->setPosition(aCurrPos);
-aCurrShape->setSize(aChildSize);
-aCurrShape->setChildSize(aChildSize);
-aCurrPos.X += nIncX * (aChildSize.Width +
fSpace*aChildSize.Width);
-if (++nColIdx == nCol)
+case XML_sameDir:
+for (auto & aCurrShape : rShape->getChildren())
+{
+aCurrShape->setPosition(aCurrPos);
+aCurrShape->setSize(aChildSize);
+aCurrShape->setChildSize(aChildSize);
+
+index++; // counts index of child, helpful for positioning.
+
+if(index%nCol==0 || ((index/nCol)+1)!=nRow)
+aCurrPos.X += nIncX * (aChildSize.Width +
fSpace*aChildSize.Width);
+
+if(++nColIdx == nCol) // condition for next row
+{
+// if last row, then position children according to
number of shapes.
+if((index+1)%nCol!=0 && (index+1)>=3 &&
((index+1)/nCol+1)==nRow && num!=nRow*nCol)
+// position first child of last row
+aCurrPos.X = nStartX + (nIncX * (aChildSize.Width
+ fSpace*aChildSize.Width))/2;
+else
+// if not last row, positions first child of that
row
+aCurrPos.X = nStartX;
+aCurrPos.Y += nIncY * (aChildSize.Height +
fSpace*aChildSize.Height);
+nColIdx = 0;
+}
+
+// positions children in the last row.
+if(index%nCol!=0 && index>=3 && ((index/nCol)+1)==nRow)
+aCurrPos.X += (nIncX * (aChildSize.Width +
fSpace*aChildSize.Width));
+}
+break;
+case XML_revDir:
+for (auto & aCurrShape : rShape->getChildren())
{
-aCurrPos.X = nStartX;
-
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sw/source
sw/source/ui/envelp/label1.cxx | 13 - 1 file changed, 12 insertions(+), 1 deletion(-) New commits: commit d631bc8370fca37a33c51b5a29aca6815760f258 Author: ekuiitr Date: Tue Feb 6 22:49:11 2018 +0530 tdf#88802 disable arrow if database or table or field not selected Change-Id: I5a29b58f6e8981ee3de73ccaa83ed04e4ee71dc6 Reviewed-on: https://gerrit.libreoffice.org/49314 Tested-by: Jenkins Reviewed-by: Julien Nabet Reviewed-on: https://gerrit.libreoffice.org/50266 Reviewed-by: Heiko Tietze diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx index a1fc7fa5655b..17ff82d9dd33 100644 --- a/sw/source/ui/envelp/label1.cxx +++ b/sw/source/ui/envelp/label1.cxx @@ -267,7 +267,11 @@ SwLabPage::SwLabPage(vcl::Window* pParent, const SfxItemSet& rSet) m_pAddrBox->SetClickHdl (LINK(this, SwLabPage, AddrHdl )); m_pDatabaseLB->SetSelectHdl(LINK(this, SwLabPage, DatabaseHdl )); m_pTableLB->SetSelectHdl(LINK(this, SwLabPage, DatabaseHdl )); +m_pDBFieldLB->SetSelectHdl(LINK(this, SwLabPage, DatabaseHdl )); m_pInsertBT->SetClickHdl (LINK(this, SwLabPage, FieldHdl)); +// Disable insert button first, +// it'll be enabled if m_pDatabaseLB, m_pTableLB and m_pInsertBT are filled +m_pInsertBT->Disable(); m_pContButton->SetClickHdl (LINK(this, SwLabPage, PageHdl )); m_pSheetButton->SetClickHdl (LINK(this, SwLabPage, PageHdl )); m_pMakeBox->SetSelectHdl(LINK(this, SwLabPage, MakeHdl )); @@ -344,7 +348,14 @@ IMPL_LINK( SwLabPage, DatabaseHdl, ListBox&, rListBox, void ) if (&rListBox == m_pDatabaseLB) GetDBManager()->GetTableNames(m_pTableLB, sActDBName); -GetDBManager()->GetColumnNames(m_pDBFieldLB, sActDBName, m_pTableLB->GetSelectEntry()); +if (&rListBox == m_pDatabaseLB || &rListBox == m_pTableLB) +GetDBManager()->GetColumnNames(m_pDBFieldLB, sActDBName, m_pTableLB->GetSelectEntry()); + +if (!m_pDatabaseLB->GetSelectEntry().isEmpty() && !m_pTableLB->GetSelectEntry().isEmpty() +&& !m_pDBFieldLB->GetSelectEntry().isEmpty()) +m_pInsertBT->Enable(true); +else +m_pInsertBT->Enable(false); } IMPL_LINK_NOARG(SwLabPage, FieldHdl, Button*, void) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sw/source
sw/source/ui/envelp/label1.cxx | 13 - 1 file changed, 12 insertions(+), 1 deletion(-) New commits: commit c4aa77b3a90102d6987e2eb31438c03d03e69157 Author: ekuiitr Date: Tue Feb 6 22:49:11 2018 +0530 tdf#88802 disable arrow if database or table or field not selected Change-Id: I5a29b58f6e8981ee3de73ccaa83ed04e4ee71dc6 Reviewed-on: https://gerrit.libreoffice.org/49314 Tested-by: Jenkins Reviewed-by: Julien Nabet (cherry picked from commit 9cb54f6973406faec7fa46038cd9332c6d76db70) Reviewed-on: https://gerrit.libreoffice.org/49948 Reviewed-by: Heiko Tietze diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx index f4fa9edfdc72..3f8daf71e599 100644 --- a/sw/source/ui/envelp/label1.cxx +++ b/sw/source/ui/envelp/label1.cxx @@ -265,7 +265,11 @@ SwLabPage::SwLabPage(vcl::Window* pParent, const SfxItemSet& rSet) m_pAddrBox->SetClickHdl (LINK(this, SwLabPage, AddrHdl )); m_pDatabaseLB->SetSelectHdl(LINK(this, SwLabPage, DatabaseHdl )); m_pTableLB->SetSelectHdl(LINK(this, SwLabPage, DatabaseHdl )); +m_pDBFieldLB->SetSelectHdl(LINK(this, SwLabPage, DatabaseHdl )); m_pInsertBT->SetClickHdl (LINK(this, SwLabPage, FieldHdl)); +// Disable insert button first, +// it'll be enabled if m_pDatabaseLB, m_pTableLB and m_pInsertBT are filled +m_pInsertBT->Disable(); m_pContButton->SetClickHdl (LINK(this, SwLabPage, PageHdl )); m_pSheetButton->SetClickHdl (LINK(this, SwLabPage, PageHdl )); m_pMakeBox->SetSelectHdl(LINK(this, SwLabPage, MakeHdl )); @@ -342,7 +346,14 @@ IMPL_LINK( SwLabPage, DatabaseHdl, ListBox&, rListBox, void ) if (&rListBox == m_pDatabaseLB) GetDBManager()->GetTableNames(m_pTableLB, sActDBName); -GetDBManager()->GetColumnNames(m_pDBFieldLB, sActDBName, m_pTableLB->GetSelectedEntry()); +if (&rListBox == m_pDatabaseLB || &rListBox == m_pTableLB) +GetDBManager()->GetColumnNames(m_pDBFieldLB, sActDBName, m_pTableLB->GetSelectedEntry()); + +if (!m_pDatabaseLB->GetSelectedEntry().isEmpty() && !m_pTableLB->GetSelectedEntry().isEmpty() +&& !m_pDBFieldLB->GetSelectedEntry().isEmpty()) +m_pInsertBT->Enable(true); +else +m_pInsertBT->Enable(false); } IMPL_LINK_NOARG(SwLabPage, FieldHdl, Button*, void) ___ 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/ui/envelp/label1.cxx | 13 - 1 file changed, 12 insertions(+), 1 deletion(-) New commits: commit 9cb54f6973406faec7fa46038cd9332c6d76db70 Author: ekuiitr Date: Tue Feb 6 22:49:11 2018 +0530 tdf#88802 disable arrow if database or table or field not selected Change-Id: I5a29b58f6e8981ee3de73ccaa83ed04e4ee71dc6 Reviewed-on: https://gerrit.libreoffice.org/49314 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx index f4fa9edfdc72..3f8daf71e599 100644 --- a/sw/source/ui/envelp/label1.cxx +++ b/sw/source/ui/envelp/label1.cxx @@ -265,7 +265,11 @@ SwLabPage::SwLabPage(vcl::Window* pParent, const SfxItemSet& rSet) m_pAddrBox->SetClickHdl (LINK(this, SwLabPage, AddrHdl )); m_pDatabaseLB->SetSelectHdl(LINK(this, SwLabPage, DatabaseHdl )); m_pTableLB->SetSelectHdl(LINK(this, SwLabPage, DatabaseHdl )); +m_pDBFieldLB->SetSelectHdl(LINK(this, SwLabPage, DatabaseHdl )); m_pInsertBT->SetClickHdl (LINK(this, SwLabPage, FieldHdl)); +// Disable insert button first, +// it'll be enabled if m_pDatabaseLB, m_pTableLB and m_pInsertBT are filled +m_pInsertBT->Disable(); m_pContButton->SetClickHdl (LINK(this, SwLabPage, PageHdl )); m_pSheetButton->SetClickHdl (LINK(this, SwLabPage, PageHdl )); m_pMakeBox->SetSelectHdl(LINK(this, SwLabPage, MakeHdl )); @@ -342,7 +346,14 @@ IMPL_LINK( SwLabPage, DatabaseHdl, ListBox&, rListBox, void ) if (&rListBox == m_pDatabaseLB) GetDBManager()->GetTableNames(m_pTableLB, sActDBName); -GetDBManager()->GetColumnNames(m_pDBFieldLB, sActDBName, m_pTableLB->GetSelectedEntry()); +if (&rListBox == m_pDatabaseLB || &rListBox == m_pTableLB) +GetDBManager()->GetColumnNames(m_pDBFieldLB, sActDBName, m_pTableLB->GetSelectedEntry()); + +if (!m_pDatabaseLB->GetSelectedEntry().isEmpty() && !m_pTableLB->GetSelectedEntry().isEmpty() +&& !m_pDBFieldLB->GetSelectedEntry().isEmpty()) +m_pInsertBT->Enable(true); +else +m_pInsertBT->Enable(false); } IMPL_LINK_NOARG(SwLabPage, FieldHdl, Button*, void) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/source
desktop/source/migration/services/jvmfwk.cxx|3 +--
desktop/source/migration/services/oo3extensionmigration.cxx |2 +-
desktop/source/migration/services/wordbookmigration.cxx |2 +-
desktop/source/offacc/acceptor.cxx |3 +--
4 files changed, 4 insertions(+), 6 deletions(-)
New commits:
commit 155dd4ebec9c38c0c478f648b09045e037818aea
Author: ekuiitr
Date: Fri Jan 26 00:07:43 2018 +0530
tdf#88205 Adapt uses of css::uno::Sequence to use initializer_list ctor
Change-Id: Idc14e71c732ce031b9bec556401dc84fd0757b6b
Reviewed-on: https://gerrit.libreoffice.org/48636
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/desktop/source/migration/services/jvmfwk.cxx
b/desktop/source/migration/services/jvmfwk.cxx
index fc858ec3a039..24e0d50930c0 100644
--- a/desktop/source/migration/services/jvmfwk.cxx
+++ b/desktop/source/migration/services/jvmfwk.cxx
@@ -152,8 +152,7 @@ OUString jvmfwk_getImplementationName()
css::uno::Sequence< OUString > jvmfwk_getSupportedServiceNames()
{
-OUString str_name = SERVICE_NAME;
-return css::uno::Sequence< OUString >( &str_name, 1 );
+return { SERVICE_NAME };
}
// XServiceInfo
diff --git a/desktop/source/migration/services/oo3extensionmigration.cxx
b/desktop/source/migration/services/oo3extensionmigration.cxx
index 4510c93d2831..b98b90bf559f 100644
--- a/desktop/source/migration/services/oo3extensionmigration.cxx
+++ b/desktop/source/migration/services/oo3extensionmigration.cxx
@@ -63,7 +63,7 @@ OUString OO3ExtensionMigration_getImplementationName()
Sequence< OUString > OO3ExtensionMigration_getSupportedServiceNames()
{
-return Sequence< OUString > { "com.sun.star.migration.Extensions" };
+return { "com.sun.star.migration.Extensions" };
}
diff --git a/desktop/source/migration/services/wordbookmigration.cxx
b/desktop/source/migration/services/wordbookmigration.cxx
index ab2264e4d683..8730a8707b29 100644
--- a/desktop/source/migration/services/wordbookmigration.cxx
+++ b/desktop/source/migration/services/wordbookmigration.cxx
@@ -40,7 +40,7 @@ namespace migration
Sequence< OUString > WordbookMigration_getSupportedServiceNames()
{
-return Sequence< OUString > { "com.sun.star.migration.Wordbooks" };
+return { "com.sun.star.migration.Wordbooks" };
}
diff --git a/desktop/source/offacc/acceptor.cxx
b/desktop/source/offacc/acceptor.cxx
index 6244b79e2c4e..40287169ae97 100644
--- a/desktop/source/offacc/acceptor.cxx
+++ b/desktop/source/offacc/acceptor.cxx
@@ -188,8 +188,7 @@ OUString Acceptor::getImplementationName()
}
Sequence Acceptor::impl_getSupportedServiceNames()
{
-Sequence aSequence { "com.sun.star.office.Acceptor" };
-return aSequence;
+return { "com.sun.star.office.Acceptor" };
}
Sequence Acceptor::getSupportedServiceNames()
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/rtftok/rtfcontrolwords.cxx | 3652 -
writerfilter/source/rtftok/rtfcontrolwords.hxx |2
writerfilter/source/rtftok/rtftokenizer.cxx| 12
3 files changed, 1833 insertions(+), 1833 deletions(-)
New commits:
commit 061145e2172886f0bd8b33f16ede7c21dba6f3f6
Author: ekuiitr
Date: Tue Jan 23 12:07:03 2018 +0530
tdf#105910 Allow defaults to be used as parameters for RTF control words.
[MS-RTF] specifies in "Conventions of an RTF Reader" section
("Change Formatting Property" action), that if a control word
requires a parameter, and it isn't specified, then a control-word-
specific default value is used. This patch implements the said
rule.
[MS-RTF]: https://www.microsoft.com/download/details.aspx?id=10725
Change-Id: Ic0b76bf16b01c65e1b89c243698fd46fd6426d90
Reviewed-on: https://gerrit.libreoffice.org/48375
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/writerfilter/source/rtftok/rtfcontrolwords.cxx
b/writerfilter/source/rtftok/rtfcontrolwords.cxx
index 1894055baf63..f1c39391fc6e 100644
--- a/writerfilter/source/rtftok/rtfcontrolwords.cxx
+++ b/writerfilter/source/rtftok/rtfcontrolwords.cxx
@@ -17,1831 +17,1831 @@ namespace rtftok
{
RTFSymbol aRTFControlWords[] = {
// sKeyword nControlType nIndex
-{ "'", CONTROL_SYMBOL, RTF_HEXCHAR },
-{ "-", CONTROL_SYMBOL, RTF_OPTHYPH },
-{ "*", CONTROL_SYMBOL, RTF_IGNORE },
-{ ":", CONTROL_SYMBOL, RTF_SUBENTRY },
-{ "\\", CONTROL_SYMBOL, RTF_BACKSLASH },
-{ "\n", CONTROL_SYMBOL, RTF_PAR },
-{ "\r", CONTROL_SYMBOL, RTF_PAR },
-{ "\r\n", CONTROL_SYMBOL, RTF_PAR },
-{ "_", CONTROL_SYMBOL, RTF_NOBRKHYPH },
-{ "{", CONTROL_SYMBOL, RTF_LBRACE },
-{ "|", CONTROL_SYMBOL, RTF_FORMULA },
-{ "}", CONTROL_SYMBOL, RTF_RBRACE },
-{ "~", CONTROL_SYMBOL, RTF_NOBREAK },
-{ "ab", CONTROL_TOGGLE, RTF_AB },
-{ "absh", CONTROL_VALUE, RTF_ABSH },
-{ "abslock", CONTROL_FLAG, RTF_ABSLOCK },
-{ "absnoovrlp", CONTROL_TOGGLE, RTF_ABSNOOVRLP },
-{ "absw", CONTROL_VALUE, RTF_ABSW },
-{ "acaps", CONTROL_TOGGLE, RTF_ACAPS },
-{ "acccircle", CONTROL_TOGGLE, RTF_ACCCIRCLE },
-{ "acccomma", CONTROL_TOGGLE, RTF_ACCCOMMA },
-{ "accdot", CONTROL_TOGGLE, RTF_ACCDOT },
-{ "accnone", CONTROL_TOGGLE, RTF_ACCNONE },
-{ "accunderdot", CONTROL_TOGGLE, RTF_ACCUNDERDOT },
-{ "acf", CONTROL_VALUE, RTF_ACF },
-{ "adeff", CONTROL_VALUE, RTF_ADEFF },
-{ "additive", CONTROL_FLAG, RTF_ADDITIVE },
-{ "adeflang", CONTROL_VALUE, RTF_ADEFLANG },
-{ "adjustright", CONTROL_FLAG, RTF_ADJUSTRIGHT },
-{ "adn", CONTROL_VALUE, RTF_ADN },
-{ "aenddoc", CONTROL_FLAG, RTF_AENDDOC },
-{ "aendnotes", CONTROL_FLAG, RTF_AENDNOTES },
-{ "aexpnd", CONTROL_VALUE, RTF_AEXPND },
-{ "af", CONTROL_VALUE, RTF_AF },
-{ "afelev", CONTROL_FLAG, RTF_AFELEV },
-{ "afs", CONTROL_VALUE, RTF_AFS },
-{ "aftnbj", CONTROL_FLAG, RTF_AFTNBJ },
-{ "aftncn", CONTROL_DESTINATION, RTF_AFTNCN },
-{ "aftnnalc", CONTROL_FLAG, RTF_AFTNNALC },
-{ "aftnnar", CONTROL_FLAG, RTF_AFTNNAR },
-{ "aftnnauc", CONTROL_FLAG, RTF_AFTNNAUC },
-{ "aftnnchi", CONTROL_FLAG, RTF_AFTNNCHI },
-{ "aftnnchosung", CONTROL_FLAG, RTF_AFTNNCHOSUNG },
-{ "aftnncnum", CONTROL_FLAG, RTF_AFTNNCNUM },
-{ "aftnndbar", CONTROL_FLAG, RTF_AFTNNDBAR },
-{ "aftnndbnum", CONTROL_FLAG, RTF_AFTNNDBNUM },
-{ "aftnndbnumd", CONTROL_FLAG, RTF_AFTNNDBNUMD },
-{ "aftnndbnumk", CONTROL_FLAG, RTF_AFTNNDBNUMK },
-{ "aftnndbnumt", CONTROL_FLAG, RTF_AFTNNDBNUMT },
-{ "aftnnganada", CONTROL_FLAG, RTF_AFTNNGANADA },
-{ "aftnngbnum", CONTROL_FLAG, RTF_AFTNNGBNUM },
-{ "aftnngbnumd", CONTROL_FLAG, RTF_AFTNNGBNUMD },
-{ "aftnngbnumk", CONTROL_FLAG, RTF_AFTNNGBNUMK },
-{ "aftnngbnuml", CONTROL_FLAG, RTF_AFTNNGBNUML },
-{ "aftnnrlc", CONTROL_FLAG, RTF_AFTNNRLC },
-{ "aftnnruc", CONTROL_FLAG, RTF_AFTNNRUC },
-{ "aftnnzodiac", CONTROL_FLAG, RTF_AFTNNZODIAC },
-{ "aftnnzodiacd", CONTROL_FLAG, RTF_AFTNNZODIACD },
-{ "aftnnzodiacl", CONTROL_FLAG, RTF_AFTNNZODIACL },
-{ "aftnrestart", CONTROL_FLAG, RTF_AFTNRESTART },
-{ "aftnrstcont", CONTROL_FLAG, RTF_AFTNRSTCONT },
-{ "aftnsep", CONTROL_DESTINATION, R
[Libreoffice-commits] core.git: starmath/inc starmath/source
starmath/inc/types.hxx |2 ++ starmath/source/ooxmlimport.cxx |2 ++ 2 files changed, 4 insertions(+) New commits: commit 412d66c05fda48aeb820a035eee3fd1680a1b7ff Author: ekuiitr Date: Thu Jan 18 22:58:16 2018 +0800 tdf#115030 Formula use "dot" instead of "acute" math command. Change-Id: I5a382f73a786f45ce0b83864b21e5e6ae357fad4 Reviewed-on: https://gerrit.libreoffice.org/48440 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/starmath/inc/types.hxx b/starmath/inc/types.hxx index 9d57536260ba..78e33b62905a 100644 --- a/starmath/inc/types.hxx +++ b/starmath/inc/types.hxx @@ -144,6 +144,8 @@ sal_Unicode const MS_COMBCHECK = 0x030C; sal_Unicode const MS_VEC = 0x20D7; sal_Unicode const MS_DOT = 0x02D9; sal_Unicode const MS_DDOT = 0x00A8; +sal_Unicode const MS_COMBDOT = 0x0307; +sal_Unicode const MS_COMBDDOT = 0x0308; sal_Unicode const MS_DDDOT = 0x20DB; sal_Unicode const MS_AND = 0x2227; sal_Unicode const MS_OR = 0x2228; diff --git a/starmath/source/ooxmlimport.cxx b/starmath/source/ooxmlimport.cxx index 1059edc9395c..6cfefc210569 100644 --- a/starmath/source/ooxmlimport.cxx +++ b/starmath/source/ooxmlimport.cxx @@ -208,9 +208,11 @@ OUString SmOoxmlImport::handleAcc() acc = "widehat"; break; case MS_DOT: +case MS_COMBDOT: acc = "dot"; break; case MS_DDOT: +case MS_COMBDDOT: acc = "ddot"; break; case MS_DDDOT: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basic/source editeng/source oox/source scripting/source sc/source
basic/source/classes/sb.cxx | 15 +++
basic/source/classes/sbunoobj.cxx |4 +---
editeng/source/editeng/editobj.cxx | 16 +++-
oox/source/ole/vbacontrol.cxx |5 ++---
sc/source/ui/vba/vbafiledialogitems.cxx | 10 --
scripting/source/provider/BrowseNodeFactoryImpl.cxx | 13 +
6 files changed, 26 insertions(+), 37 deletions(-)
New commits:
commit 728104b31c89c93c8211fcd78a2c7a38192268eb
Author: ekuiitr
Date: Wed Dec 27 18:55:49 2017 +0800
tdf#96099 Removed some trivial typedefs related to UnOrderedMap and size_t.
Change-Id: I59d3d0b2c1097b5ca96505dc99a4a104b4f8ab48
Reviewed-on: https://gerrit.libreoffice.org/47082
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 1dcd71704399..79e40d298660 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -173,14 +173,13 @@ void SAL_CALL DocBasicItem::disposing( const
lang::EventObject& /*rEvent*/ )
namespace {
typedef ::rtl::Reference< DocBasicItem > DocBasicItemRef;
-typedef std::unordered_map< const StarBASIC *, DocBasicItemRef >
DocBasicItemMap;
-class GaDocBasicItems : public rtl::Static {};
+class GaDocBasicItems : public rtl::Static,GaDocBasicItems> {};
const DocBasicItem* lclFindDocBasicItem( const StarBASIC* pDocBasic )
{
-DocBasicItemMap::iterator it = GaDocBasicItems::get().find( pDocBasic );
-DocBasicItemMap::iterator end = GaDocBasicItems::get().end();
+auto it = GaDocBasicItems::get().find( pDocBasic );
+auto end = GaDocBasicItems::get().end();
return (it != end) ? it->second.get() : nullptr;
}
@@ -193,13 +192,13 @@ void lclInsertDocBasicItem( StarBASIC& rDocBasic )
void lclRemoveDocBasicItem( StarBASIC& rDocBasic )
{
-DocBasicItemMap::iterator it = GaDocBasicItems::get().find( &rDocBasic );
+auto it = GaDocBasicItems::get().find( &rDocBasic );
if( it != GaDocBasicItems::get().end() )
{
it->second->stopListening();
GaDocBasicItems::get().erase( it );
}
-DocBasicItemMap::iterator it_end = GaDocBasicItems::get().end();
+auto it_end = GaDocBasicItems::get().end();
for( it = GaDocBasicItems::get().begin(); it != it_end; ++it )
{
it->second->clearDependingVarsOnDelete( rDocBasic );
@@ -1936,8 +1935,8 @@ Reference< frame::XModel > StarBASIC::GetModelFromBasic(
SbxObject* pBasic )
void StarBASIC::DetachAllDocBasicItems()
{
-DocBasicItemMap& rItems = GaDocBasicItems::get();
-DocBasicItemMap::iterator it = rItems.begin(), itEnd = rItems.end();
+std::unordered_map< const StarBASIC *, DocBasicItemRef >& rItems =
GaDocBasicItems::get();
+auto it = rItems.begin(), itEnd = rItems.end();
for (; it != itEnd; ++it)
{
DocBasicItemRef xItem = it->second;
diff --git a/basic/source/classes/sbunoobj.cxx
b/basic/source/classes/sbunoobj.cxx
index 829db9b695e4..8a67a697e5f0 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -3200,8 +3200,6 @@ Reference< XTypeDescriptionEnumeration >
getTypeDescriptorEnumeration( const OUS
return xEnum;
}
-typedef std::unordered_map< OUString, Any > VBAConstantsHash;
-
VBAConstantHelper&
VBAConstantHelper::instance()
{
@@ -3278,7 +3276,7 @@ VBAConstantHelper::getVBAConstant( const OUString& rName )
SbxVariable* pConst = nullptr;
init();
-VBAConstantsHash::const_iterator it = aConstHash.find(
rName.toAsciiLowerCase() );
+auto it = aConstHash.find( rName.toAsciiLowerCase() );
if ( it != aConstHash.end() )
{
diff --git a/editeng/source/editeng/editobj.cxx
b/editeng/source/editeng/editobj.cxx
index 59f1c17fcd0a..b9a8fd82baff 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -878,15 +878,13 @@ public:
void EditTextObjectImpl::GetAllSections( std::vector& rAttrs
) const
{
-typedef std::vector SectionBordersType;
-typedef std::vector ParagraphsType;
-ParagraphsType aParaBorders(aContents.size());
+std::vector> aParaBorders(aContents.size());
// First pass: determine section borders for each paragraph.
for (size_t nPara = 0; nPara < aContents.size(); ++nPara)
{
const ContentInfo& rC = *aContents[nPara].get();
-SectionBordersType& rBorders = aParaBorders[nPara];
+std::vector& rBorders = aParaBorders[nPara];
rBorders.push_back(0);
rBorders.push_back(rC.GetText().getLength());
for (const auto & aAttrib : rC.maCharAttribs)
@@ -902,12 +900,12 @@ void EditTextObjectImpl::GetAllSections(
std::vector& rAttrs )
}
// Sort and remove duplicates for each paragraph.
-ParagraphsType::ite
[Libreoffice-commits] core.git: cui/source
cui/source/tabpages/tabarea.cxx |2 -- cui/source/tabpages/tabline.cxx |2 -- 2 files changed, 4 deletions(-) New commits: commit b426b026b79a342c41f6f148bf17d5df66b22927 Author: ekuiitr Date: Sun Dec 24 22:51:43 2017 +0800 tdf#111723 Fixed - Dialog does not remember the last opened tab page Change-Id: Ife6d0eb9ea13d2a0534f316db001dbb3b6a716eb Reviewed-on: https://gerrit.libreoffice.org/47050 Reviewed-by: Tamás Zolnai Tested-by: Tamás Zolnai diff --git a/cui/source/tabpages/tabarea.cxx b/cui/source/tabpages/tabarea.cxx index f1dbfc6417bb..97135d944270 100644 --- a/cui/source/tabpages/tabarea.cxx +++ b/cui/source/tabpages/tabarea.cxx @@ -80,8 +80,6 @@ SvxAreaTabDialog::SvxAreaTabDialog m_nTransparenceTabPage = AddTabPage( "RID_SVXPAGE_TRANSPARENCE", SvxTransparenceTabPage::Create, nullptr); -SetCurPageId( "RID_SVXPAGE_AREA" ); - CancelButton& rBtnCancel = GetCancelButton(); rBtnCancel.SetClickHdl( LINK( this, SvxAreaTabDialog, CancelHdlImpl ) ); } diff --git a/cui/source/tabpages/tabline.cxx b/cui/source/tabpages/tabline.cxx index 21d64d055743..df0938f6b79a 100644 --- a/cui/source/tabpages/tabline.cxx +++ b/cui/source/tabpages/tabline.cxx @@ -93,8 +93,6 @@ SvxLineTabDialog::SvxLineTabDialog m_nStyleTabPage = AddTabPage( "RID_SVXPAGE_LINE_DEF", SvxLineDefTabPage::Create, nullptr); m_nEndTabPage = AddTabPage( "RID_SVXPAGE_LINEEND_DEF", SvxLineEndDefTabPage::Create, nullptr); -SetCurPageId( "RID_SVXPAGE_LINE" ); - CancelButton& rBtnCancel = GetCancelButton(); rBtnCancel.SetClickHdl( LINK( this, SvxLineTabDialog, CancelHdlImpl ) ); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: accessibility/inc basctl/inc
accessibility/inc/pch/precompiled_acc.hxx |1 - basctl/inc/pch/precompiled_basctl.hxx |1 - 2 files changed, 2 deletions(-) New commits: commit adad3724e6c3e85b1b286ccddaf810f3c782424b Author: ekuiitr Date: Thu Dec 7 22:02:27 2017 +0800 tdf#63154 removed some solar.h references Change-Id: Ib3672f84acc54d5838ab7ccf02d368968aa8b5af Reviewed-on: https://gerrit.libreoffice.org/46029 Tested-by: Jenkins Reviewed-by: Michael Meeks Tested-by: Michael Meeks diff --git a/accessibility/inc/pch/precompiled_acc.hxx b/accessibility/inc/pch/precompiled_acc.hxx index 5e8055059bad..fde5a69bd67b 100644 --- a/accessibility/inc/pch/precompiled_acc.hxx +++ b/accessibility/inc/pch/precompiled_acc.hxx @@ -367,7 +367,6 @@ #include #include #include -#include #include #include #include diff --git a/basctl/inc/pch/precompiled_basctl.hxx b/basctl/inc/pch/precompiled_basctl.hxx index 0d7d626cd34f..97cc996fb631 100644 --- a/basctl/inc/pch/precompiled_basctl.hxx +++ b/basctl/inc/pch/precompiled_basctl.hxx @@ -562,7 +562,6 @@ #include #include #include -#include #include #include #include ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/core/drawdoc3.cxx |4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
New commits:
commit 6a68f46e8e931c3d4b095a9394d6c050ac9c49d2
Author: ekuiitr
Date: Tue Dec 5 21:44:23 2017 +0800
tdf#57950 replaced some O(U)StringBuffer::append() with operator+
Change-Id: Idd32e3f68787186c157ba7382cab39b0b974ac20
Reviewed-on: https://gerrit.libreoffice.org/45879
Tested-by: Jenkins
Reviewed-by: Muhammet Kara
Reviewed-by: Noel Grandin
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index dfb48c863ffe..5aba6cf3f448 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -1444,9 +1444,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
}
else
{
-OUStringBuffer aBuf(rLayoutName);
-aBuf.append(SD_LT_SEPARATOR).append(STR_LAYOUT_OUTLINE);
-OUString aSearchFor(aBuf.makeStringAndClear());
+OUString aSearchFor = rLayoutName + SD_LT_SEPARATOR
STR_LAYOUT_OUTLINE;
for (sal_uInt16 nMP = 0; nMP < pSourceDoc->GetMasterPageCount();
++nMP)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: editeng/source
editeng/source/items/svxfont.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit c7d3440fed86c7ef986cdaf57dfe2017325ff190
Author: ekuiitr
Date: Mon Dec 4 00:58:09 2017 +0530
tdf#96505 removed "L" literal
Change-Id: Ie12d65d0a8aaff3ede099e0301cafbc41ebdc2c6
Reviewed-on: https://gerrit.libreoffice.org/45736
Tested-by: Jenkins
Reviewed-by: Mark Hung
Reviewed-by: Mike Kaganski
diff --git a/editeng/source/items/svxfont.cxx b/editeng/source/items/svxfont.cxx
index 9714006eda2c..1895536c090d 100644
--- a/editeng/source/items/svxfont.cxx
+++ b/editeng/source/items/svxfont.cxx
@@ -322,8 +322,8 @@ void SvxFont::SetPhysFont( OutputDevice *pOut ) const
{
Font aNewFont( *this );
Size aSize( aNewFont.GetFontSize() );
-aNewFont.SetFontSize( Size( aSize.Width() * nPropr / 100L,
-aSize.Height() * nPropr / 100L ) );
+aNewFont.SetFontSize( Size( aSize.Width() * nPropr / 100,
+aSize.Height() * nPropr / 100 ) );
if ( !rCurrentFont.IsSameInstance( aNewFont ) )
pOut->SetFont( aNewFont );
}
@@ -516,7 +516,7 @@ void SvxFont::DrawPrev( OutputDevice *pOut, Printer*
pPrinter,
else
nTmpEsc = nEsc;
Size aSize = GetFontSize();
-aPos.Y() -= ( nTmpEsc * aSize.Height() ) / 100L;
+aPos.Y() -= ( nTmpEsc * aSize.Height() ) / 100;
}
Font aOldFont( ChgPhysFont( pOut ) );
Font aOldPrnFont( ChgPhysFont( pPrinter ) );
___
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/core/sdpage.cxx |5 + 1 file changed, 1 insertion(+), 4 deletions(-) New commits: commit a4a182e24d2e3e954831a0a7c70a7299f28950cb Author: ekuiitr Date: Sun Oct 15 20:23:47 2017 +0530 tdf#112689 - Replace chained O(U)StringBuffer::append() with operator+ replaced use of append with operator+ Change-Id: I9eb36fd1f94475df57de7015f8dfabf95676b87d Reviewed-on: https://gerrit.libreoffice.org/43403 Reviewed-by: Julien Nabet Tested-by: Julien Nabet diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index e1d8193d1112..9a4a74bd618c 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -128,10 +128,7 @@ SdPage::SdPage(SdDrawDocument& rNewDoc, bool bMasterPage) // The name of the layout of the page is used by SVDRAW to determine the // presentation template of the outline objects. Therefore, it already // contains the designator for the outline (STR_LAYOUT_OUTLINE). -OUStringBuffer aBuf(SdResId(STR_LAYOUT_DEFAULT_NAME)); -aBuf.append(SD_LT_SEPARATOR).append(STR_LAYOUT_OUTLINE); -maLayoutName = aBuf.makeStringAndClear(); - +maLayoutName = SdResId(STR_LAYOUT_DEFAULT_NAME)+ SD_LT_SEPARATOR STR_LAYOUT_OUTLINE; Size aPageSize(GetSize()); if (aPageSize.Width() > aPageSize.Height()) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/uiconfig
chart2/uiconfig/ui/tp_LegendPosition.ui |1 - 1 file changed, 1 deletion(-) New commits: commit ee2051f27592e8dfa6c0069b261d6742614fd2e1 Author: ekuiitr Date: Tue Oct 17 17:35:40 2017 +0530 tdf#105991 - Changing legend's font also changes the legend position corrected the error Change-Id: Iece8f4c440c01eabe108ba4e9a93fe1fb919f0e3 Reviewed-on: https://gerrit.libreoffice.org/43445 Reviewed-by: Tamás Zolnai Tested-by: Tamás Zolnai diff --git a/chart2/uiconfig/ui/tp_LegendPosition.ui b/chart2/uiconfig/ui/tp_LegendPosition.ui index 18db310c701d..53302b506877 100644 --- a/chart2/uiconfig/ui/tp_LegendPosition.ui +++ b/chart2/uiconfig/ui/tp_LegendPosition.ui @@ -33,7 +33,6 @@ False True 0 -True True right ___ 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/ui/vba/vbacolumn.cxx |8 +++-
1 file changed, 3 insertions(+), 5 deletions(-)
New commits:
commit 8eacd3be08bf6e1a97900624611822de9b00a379
Author: ekuiitr
Date: Sun Oct 15 02:03:15 2017 +0530
tdf#112689 - Replace chained O(U)StringBuffer::append() with operator+
changed OUStringBuffer::append() to op+. deleted unnecessary variable.
Change-Id: Ibe27f7f587f7130e7c31e33a29a88c5ea6478740
Reviewed-on: https://gerrit.libreoffice.org/43395
Reviewed-by: Julien Nabet
Tested-by: Jenkins
diff --git a/sw/source/ui/vba/vbacolumn.cxx b/sw/source/ui/vba/vbacolumn.cxx
index 89ef096d97c1..676d93e1712f 100644
--- a/sw/source/ui/vba/vbacolumn.cxx
+++ b/sw/source/ui/vba/vbacolumn.cxx
@@ -62,16 +62,14 @@ SwVbaColumn::Select( )
void SwVbaColumn::SelectColumn( const uno::Reference< frame::XModel >& xModel,
const uno::Reference< text::XTextTable >& xTextTable, sal_Int32 nStartColumn,
sal_Int32 nEndColumn )
{
-OUStringBuffer aRangeName;
OUString sStartCol = SwVbaTableHelper::getColumnStr( nStartColumn );
-aRangeName.append(sStartCol).append(sal_Int32( 1 ) );
+OUString aRangeName = sStartCol + OUString::number( 1 );
OUString sEndCol = SwVbaTableHelper::getColumnStr( nEndColumn );
sal_Int32 nRowCount = xTextTable->getRows()->getCount();
-aRangeName.append(':').append( sEndCol ).append( nRowCount );
+aRangeName += ":" + sEndCol + OUString::number(nRowCount);
uno::Reference< table::XCellRange > xCellRange( xTextTable,
uno::UNO_QUERY_THROW );
-OUString sSelRange = aRangeName.makeStringAndClear();
-uno::Reference< table::XCellRange > xSelRange =
xCellRange->getCellRangeByName( sSelRange );
+uno::Reference< table::XCellRange > xSelRange =
xCellRange->getCellRangeByName( aRangeName );
uno::Reference< view::XSelectionSupplier > xSelection(
xModel->getCurrentController(), uno::UNO_QUERY_THROW );
xSelection->select( uno::makeAny( xSelRange ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source sw/source
sfx2/source/dialog/versdlg.cxx | 12
sw/source/ui/vba/vbarow.cxx|8 +++-
2 files changed, 7 insertions(+), 13 deletions(-)
New commits:
commit 2b5b8fd39c93166d9e6e696c010482413b155f78
Author: ekuiitr
Date: Fri Oct 13 16:45:29 2017 +0530
tdf#112689 - Replace chained O(U)StringBuffer::append() with operator+
changed sfx2 module file, converted OUStringBuffer::append() with operator+
Change-Id: Ie85542358875324f9ddadffa01395aebccda9be9
Reviewed-on: https://gerrit.libreoffice.org/43357
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx
index 17e61ffe3fca..ce9e44fc6aa1 100644
--- a/sfx2/source/dialog/versdlg.cxx
+++ b/sfx2/source/dialog/versdlg.cxx
@@ -236,10 +236,8 @@ SfxVersionDialog::SfxVersionDialog ( SfxViewFrame*
pVwFrame, bool bIsSaveVersion
OUString sHeader1(get("datetime")->GetText());
OUString sHeader2(get("savedby")->GetText());
OUString sHeader3(get("comments")->GetText());
-OUStringBuffer sHeader;
-sHeader.append(sHeader1).append("\t").append(sHeader2)
-.append("\t ").append(sHeader3);
-m_pVersionBox->InsertHeaderEntry(sHeader.makeStringAndClear());
+OUString sHeader = sHeader1 + "\t" + sHeader2 + "\t" + sHeader3;
+m_pVersionBox->InsertHeaderEntry(sHeader);
HeaderBar &rBar = m_pVersionBox->GetTheHeaderBar();
HeaderBarItemBits nBits = rBar.GetItemBits(1) |
HeaderBarItemBits::FIXEDPOS | HeaderBarItemBits::FIXED;
@@ -556,10 +554,8 @@ SfxCmisVersionsDialog::SfxCmisVersionsDialog (
SfxViewFrame* pVwFrame )
OUString sHeader1(get("datetime")->GetText());
OUString sHeader2(get("savedby")->GetText());
OUString sHeader3(get("comments")->GetText());
-OUStringBuffer sHeader;
-sHeader.append(sHeader1).append("\t").append(sHeader2)
-.append("\t ").append(sHeader3);
-m_pVersionBox->InsertHeaderEntry(sHeader.makeStringAndClear());
+OUString sHeader = sHeader1 + "\t" + sHeader2 + "\t" + sHeader3;
+m_pVersionBox->InsertHeaderEntry(sHeader);
HeaderBar &rBar = m_pVersionBox->GetTheHeaderBar();
HeaderBarItemBits nBits = rBar.GetItemBits(1) |
HeaderBarItemBits::FIXEDPOS | HeaderBarItemBits::FIXED;
diff --git a/sw/source/ui/vba/vbarow.cxx b/sw/source/ui/vba/vbarow.cxx
index 67f905a65719..088ecfbfaa53 100644
--- a/sw/source/ui/vba/vbarow.cxx
+++ b/sw/source/ui/vba/vbarow.cxx
@@ -82,18 +82,16 @@ SwVbaRow::Select( )
void SwVbaRow::SelectRow( const uno::Reference< frame::XModel >& xModel, const
uno::Reference< text::XTextTable >& xTextTable, sal_Int32 nStartRow, sal_Int32
nEndRow )
{
-OUStringBuffer aRangeName;
-aRangeName.append('A').append(sal_Int32( nStartRow + 1 ) );
+OUString aRangeName = "A" + OUString::number(nStartRow + 1);
SwVbaTableHelper aTableHelper( xTextTable );
sal_Int32 nColCount = aTableHelper.getTabColumnsCount( nEndRow );
// FIXME: the column count > 26
//sal_Char cCol = 'A' + nColCount - 1;
OUString sCol = SwVbaTableHelper::getColumnStr( nColCount - 1);
-aRangeName.append(':').append( sCol ).append( sal_Int32( nEndRow + 1 ) );
+aRangeName += ":" +sCol + OUString::number(nEndRow + 1);
uno::Reference< table::XCellRange > xCellRange( xTextTable,
uno::UNO_QUERY_THROW );
-OUString sSelRange = aRangeName.makeStringAndClear();
-uno::Reference< table::XCellRange > xSelRange =
xCellRange->getCellRangeByName( sSelRange );
+uno::Reference< table::XCellRange > xSelRange =
xCellRange->getCellRangeByName( aRangeName );
uno::Reference< view::XSelectionSupplier > xSelection(
xModel->getCurrentController(), uno::UNO_QUERY_THROW );
xSelection->select( uno::makeAny( xSelRange ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
