[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - sd/qa xmloff/inc xmloff/source
sd/qa/unit/data/pptx/shape-text-rotate.pptx |binary
sd/qa/unit/export-tests.cxx | 24
xmloff/inc/EnhancedCustomShapeToken.hxx |1 +
xmloff/source/draw/EnhancedCustomShapeToken.cxx |1 +
xmloff/source/draw/shapeexport.cxx |3 ++-
5 files changed, 28 insertions(+), 1 deletion(-)
New commits:
commit 496f11ade958b3b755f733aaadd3924924895a80
Author: Szymon KÅos
Date: Thu Oct 26 10:33:45 2017 +0200
ODP: export TextPreRotateAngle
Reviewed-on: https://gerrit.libreoffice.org/43910
Reviewed-by: Szymon KÅos
Tested-by: Szymon KÅos
Reviewed-on: https://gerrit.libreoffice.org/44079
Reviewed-by: Andras Timar
Tested-by: Andras Timar
(cherry picked from commit e7a0948db44f049b1cf03a6e6fcaca7e63e88ac2)
Change-Id: I13eb005195ebbdee5016bf279cba423e388723a0
diff --git a/sd/qa/unit/data/pptx/shape-text-rotate.pptx
b/sd/qa/unit/data/pptx/shape-text-rotate.pptx
new file mode 100755
index ..4a433c748d32
Binary files /dev/null and b/sd/qa/unit/data/pptx/shape-text-rotate.pptx differ
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index 1927a71f67bf..f42673006e82 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -94,6 +94,7 @@ public:
void testTransparentBackground();
void testEmbeddedPdf();
void testTdf100926();
+void testTextRotation();
CPPUNIT_TEST_SUITE(SdExportTest);
@@ -110,6 +111,7 @@ public:
CPPUNIT_TEST(testTransparentBackground);
CPPUNIT_TEST(testEmbeddedPdf);
CPPUNIT_TEST(testTdf100926);
+CPPUNIT_TEST(testTextRotation);
CPPUNIT_TEST_SUITE_END();
@@ -684,6 +686,28 @@ void SdExportTest::testTdf100926()
xDocShRef->DoClose();
}
+void SdExportTest::testTextRotation()
+{
+::sd::DrawDocShellRef xDocShRef =
loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/shape-text-rotate.pptx"),
PPTX);
+utl::TempFile tempFile;
+xDocShRef = saveAndReload(xDocShRef.get(), ODP, &tempFile);
+
+uno::Reference xPage(getPage(0, xDocShRef));
+uno::Reference xPropSet(getShape(0, xPage));
+
+CPPUNIT_ASSERT(xPropSet.is());
+
+auto aGeomPropSeq =
xPropSet->getPropertyValue("CustomShapeGeometry").get>();
+comphelper::SequenceAsHashMap aCustomShapeGeometry(aGeomPropSeq);
+
+auto it = aCustomShapeGeometry.find("TextRotateAngle");
+CPPUNIT_ASSERT(it != aCustomShapeGeometry.end());
+
+CPPUNIT_ASSERT_EQUAL((double)(-90),
aCustomShapeGeometry["TextRotateAngle"].get());
+
+xDocShRef->DoClose();
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(SdExportTest);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/xmloff/inc/EnhancedCustomShapeToken.hxx
b/xmloff/inc/EnhancedCustomShapeToken.hxx
index dafe8b8ec8ec..92e200333dbc 100644
--- a/xmloff/inc/EnhancedCustomShapeToken.hxx
+++ b/xmloff/inc/EnhancedCustomShapeToken.hxx
@@ -93,6 +93,7 @@ namespace xmloff { namespace EnhancedCustomShapeToken {
EAS_MirroredY,
EAS_ViewBox,
EAS_TextRotateAngle,
+EAS_TextPreRotateAngle,
EAS_ExtrusionAllowed,
EAS_ConcentricGradientFillAllowed,
EAS_TextPathAllowed,
diff --git a/xmloff/source/draw/EnhancedCustomShapeToken.cxx
b/xmloff/source/draw/EnhancedCustomShapeToken.cxx
index 076ae2728fbd..9e6c25b49e4d 100644
--- a/xmloff/source/draw/EnhancedCustomShapeToken.cxx
+++ b/xmloff/source/draw/EnhancedCustomShapeToken.cxx
@@ -108,6 +108,7 @@ static const TokenTable pTokenTableArray[] =
{ "MirroredY", EAS_MirroredY },
{ "ViewBox",EAS_ViewBox },
{ "TextRotateAngle",EAS_TextRotateAngle },
+{ "TextPreRotateAngle", EAS_TextPreRotateAngle },
{ "ExtrusionAllowed", EAS_ExtrusionAllowed },
{ "TextPathAllowed",EAS_TextPathAllowed },
{ "ConcentricGradientFillAllowed", EAS_ConcentricGradientFillAllowed
},
diff --git a/xmloff/source/draw/shapeexport.cxx
b/xmloff/source/draw/shapeexport.cxx
index e4ec98689841..34786ce43d31 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -4268,10 +4268,11 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport,
const uno::Reference< bean
}
}
break;
+case EAS_TextPreRotateAngle :
case EAS_TextRotateAngle :
{
double fTextRotateAngle = 0;
-if ( rGeoProp.Value >>= fTextRotateAngle )
+if ( ( rGeoProp.Value >>= fTextRotateAngle ) &&
fTextRotateAngle != 0 )
{
::sax::Converter::convertDouble(
aStrBuffer, fTextRotateAngle );
___
Libreoffice-commits mailing list
libreoffi
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - sc/qa sc/source
sc/qa/unit/data/ods/pivottable_no_columns_layout.ods |binary
sc/qa/unit/subsequent_filters-test.cxx | 30 +++
sc/source/core/data/dpoutputgeometry.cxx |2 -
sc/source/filter/xml/xmldpimp.cxx|1
4 files changed, 32 insertions(+), 1 deletion(-)
New commits:
commit d5c7c8d8bde74e89db18212ccd48f972f1b49e3b
Author: Tamás Zolnai
Date: Sat Oct 28 08:02:10 2017 +0200
tdf#113268: Pivot table: Missing popup button after opening a ODS
Wrong row number was calculated here. This ++nCurRow is usefull
only when headerlayout flag is set. It's a MSO compatibility flag
so it's not there by default in LO created tables.
Reviewed-on: https://gerrit.libreoffice.org/43552
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai
(cherry picked from commit 291874c09c4bcde61f2c6808f2df6079f38d74e0)
Change-Id: Id7989d898f2647f1ba45ed95e0aa615e3b4fa311
Reviewed-on: https://gerrit.libreoffice.org/43974
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/sc/qa/unit/data/ods/pivottable_no_columns_layout.ods
b/sc/qa/unit/data/ods/pivottable_no_columns_layout.ods
new file mode 100755
index ..e6ddca7299fc
Binary files /dev/null and
b/sc/qa/unit/data/ods/pivottable_no_columns_layout.ods differ
diff --git a/sc/qa/unit/subsequent_filters-test.cxx
b/sc/qa/unit/subsequent_filters-test.cxx
index 2a1819b35c08..90fc2de69629 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -243,6 +243,7 @@ public:
void testTdf97598XLSX();
void testTdf111974XLSM();
void testTdf112501();
+void testPivotTableNoColumnsLayout();
CPPUNIT_TEST_SUITE(ScFiltersTest);
CPPUNIT_TEST(testBooleanFormatXLSX);
@@ -363,6 +364,7 @@ public:
CPPUNIT_TEST(testTdf97598XLSX);
CPPUNIT_TEST(testTdf111974XLSM);
CPPUNIT_TEST(testTdf112501);
+CPPUNIT_TEST(testPivotTableNoColumnsLayout);
CPPUNIT_TEST_SUITE_END();
@@ -3959,6 +3961,34 @@ void ScFiltersTest::testTdf112501()
}
}
+void ScFiltersTest::testPivotTableNoColumnsLayout()
+{
+// tdf#113268 - Pivot table: Missing popup button after opening a pivot
table from ODS
+ScDocShellRef xDocSh = loadDoc("pivottable_no_columns_layout.",
FORMAT_ODS);
+CPPUNIT_ASSERT_MESSAGE("Failed to load file", xDocSh.Is());
+ScDocument& rDoc = xDocSh->GetDocument();
+
+// There should be exactly 2 pivot tables
+ScDPCollection* pDPs = rDoc.GetDPCollection();
+CPPUNIT_ASSERT_EQUAL(static_cast(2), pDPs->GetCount());
+
+// Check first pivot table's popup button (headerlayout flag)
+{
+const ScPatternAttr* pPattern = rDoc.GetPattern(0, 1, 1);
+const SfxPoolItem& rPoolItem = pPattern->GetItem(ATTR_MERGE_FLAG);
+const ScMergeFlagAttr& rMergeFlag = static_cast(rPoolItem);
+CPPUNIT_ASSERT(rMergeFlag.GetValue() & ScMF::ButtonPopup);
+}
+
+// Check second pivot table's popup button
+{
+const ScPatternAttr* pPattern = rDoc.GetPattern(3, 0, 1);
+const SfxPoolItem& rPoolItem = pPattern->GetItem(ATTR_MERGE_FLAG);
+const ScMergeFlagAttr& rMergeFlag = static_cast(rPoolItem);
+CPPUNIT_ASSERT(rMergeFlag.GetValue() & ScMF::ButtonPopup);
+}
+}
+
ScFiltersTest::ScFiltersTest()
: ScBootstrapFixture( "sc/qa/unit/data" )
diff --git a/sc/source/core/data/dpoutputgeometry.cxx
b/sc/source/core/data/dpoutputgeometry.cxx
index 61d0633eafcd..34a4c7370416 100644
--- a/sc/source/core/data/dpoutputgeometry.cxx
+++ b/sc/source/core/data/dpoutputgeometry.cxx
@@ -239,7 +239,7 @@ ScDPOutputGeometry::getFieldButtonType(const ScAddress&
rPos) const
nCurRow += static_cast(nColumnFields);
}
-else
+else if (mbHeaderLayout)
++nCurRow;
if (nRowFields)
diff --git a/sc/source/filter/xml/xmldpimp.cxx
b/sc/source/filter/xml/xmldpimp.cxx
index cc39b95ce0aa..12f4f78cb842 100644
--- a/sc/source/filter/xml/xmldpimp.cxx
+++ b/sc/source/filter/xml/xmldpimp.cxx
@@ -345,6 +345,7 @@ void ScXMLDataPilotTableContext::SetButtons()
aGeometry.setPageFieldCount(mnPageFieldCount);
aGeometry.setDataFieldCount(mnDataFieldCount);
aGeometry.setDataLayoutType(toFieldType(mnDataLayoutType));
+aGeometry.setHeaderLayout(bHeaderGridLayout);
std::vector aRowDims, aColDims, aPageDims;
pDPSave->GetAllDimensionsByOrientation(sheet::DataPilotFieldOrientation_ROW,
aRowDims);
___
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-5.3' - sc/qa sc/source
sc/qa/unit/data/xlsx/pivottable_tabular_mode.xlsx |binary
sc/qa/unit/subsequent_export-test.cxx | 20 +++
sc/source/filter/excel/xepivotxml.cxx | 57 --
3 files changed, 64 insertions(+), 13 deletions(-)
New commits:
commit 24a673cd37ad8f63ad69904ef076ccfbdc59129d
Author: Tamás Zolnai
Date: Fri Oct 27 22:03:32 2017 +0200
tdf#113159: Pivot table: tabular mode is converted to oultine mode
... after RT XLSX in Calc
Reviewed-on: https://gerrit.libreoffice.org/43537
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai
(cherry picked from commit 8cf0b4b4cd748094889a6a9ac6883dd457113b74)
Change-Id: I9725ca55aed973133db1d5fe47463575148e00b8
Reviewed-on: https://gerrit.libreoffice.org/43971
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/sc/qa/unit/data/xlsx/pivottable_tabular_mode.xlsx
b/sc/qa/unit/data/xlsx/pivottable_tabular_mode.xlsx
new file mode 100755
index ..0bcfe1742d95
Binary files /dev/null and b/sc/qa/unit/data/xlsx/pivottable_tabular_mode.xlsx
differ
diff --git a/sc/qa/unit/subsequent_export-test.cxx
b/sc/qa/unit/subsequent_export-test.cxx
index dbf92510144a..4b6370ba64c8 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -216,6 +216,7 @@ public:
void testPivotTableErrorItemFilterXLSX();
void testPivotTableOutlineModeXLSX();
void testPivotTableDuplicatedMemberFilterXLSX();
+void testPivotTableTabularModeXLSX();
CPPUNIT_TEST_SUITE(ScExportTest);
CPPUNIT_TEST(test);
@@ -332,6 +333,7 @@ public:
CPPUNIT_TEST(testPivotTableErrorItemFilterXLSX);
CPPUNIT_TEST(testPivotTableOutlineModeXLSX);
CPPUNIT_TEST(testPivotTableDuplicatedMemberFilterXLSX);
+CPPUNIT_TEST(testPivotTableTabularModeXLSX);
CPPUNIT_TEST_SUITE_END();
@@ -5191,6 +5193,24 @@ void
ScExportTest::testPivotTableDuplicatedMemberFilterXLSX()
assertXPath(pTable,
"/x:pivotTableDefinition/x:pivotFields/x:pivotField[5]/x:items", "count", "21");
}
+void ScExportTest::testPivotTableTabularModeXLSX()
+{
+ScDocShellRef xShell = loadDoc("pivottable_tabular_mode.", FORMAT_XLSX);
+CPPUNIT_ASSERT(xShell.Is());
+
+std::shared_ptr pXPathFile =
ScBootstrapFixture::exportTo(&(*xShell), FORMAT_XLSX);
+xmlDocPtr pTable = XPathHelper::parseExport(pXPathFile, m_xSFactory,
"xl/pivotTables/pivotTable1.xml");
+CPPUNIT_ASSERT(pTable);
+
+// In tabular mode both outline and compact flag should be false
+assertXPath(pTable, "/x:pivotTableDefinition", "outline", "0");
+assertXPath(pTable, "/x:pivotTableDefinition", "outlineData", "0");
+assertXPath(pTable, "/x:pivotTableDefinition", "compact", "0");
+assertXPath(pTable, "/x:pivotTableDefinition", "compactData", "0");
+assertXPath(pTable,
"/x:pivotTableDefinition/x:pivotFields/x:pivotField[1]", "compact", "0");
+assertXPath(pTable,
"/x:pivotTableDefinition/x:pivotFields/x:pivotField[1]", "outline", "0");
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(ScExportTest);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sc/source/filter/excel/xepivotxml.cxx
b/sc/source/filter/excel/xepivotxml.cxx
index d567c8e1e87b..9c33b8277977 100644
--- a/sc/source/filter/excel/xepivotxml.cxx
+++ b/sc/source/filter/excel/xepivotxml.cxx
@@ -19,6 +19,7 @@
#include
#include
+#include
#include
#include
@@ -614,7 +615,7 @@ void XclExpXmlPivotTables::SavePivotTableXml(
XclExpXmlStream& rStrm, const ScDP
// Dimension order here is significant as they specify the order of
// appearance in each axis.
const ScDPSaveData::DimsType& rDims = rSaveData.GetDimensions();
-
+bool bTabularMode = false;
for (const auto & i : rDims)
{
const ScDPSaveDimension& rDim = *i;
@@ -657,6 +658,8 @@ void XclExpXmlPivotTables::SavePivotTableXml(
XclExpXmlStream& rStrm, const ScDP
default:
;
}
+if(rDim.GetLayoutInfo())
+bTabularMode |= (rDim.GetLayoutInfo()->LayoutMode ==
sheet::DataPilotFieldLayoutMode::TABULAR_LAYOUT);
}
sax_fastparser::FSHelperPtr& pPivotStrm = rStrm.GetCurrentStream();
@@ -674,8 +677,8 @@ void XclExpXmlPivotTables::SavePivotTableXml(
XclExpXmlStream& rStrm, const ScDP
XML_useAutoFormatting, XclXmlUtils::ToPsz10(false),
XML_itemPrintTitles, XclXmlUtils::ToPsz10(true),
XML_indent, XclXmlUtils::ToPsz10(false),
-XML_outline, XclXmlUtils::ToPsz10(true),
-XML_outlineData, XclXmlUtils::ToPsz10(true),
+XML_outline, XclXmlUtils::ToPsz10(!bTabularMode),
+XML_outlineData, XclXmlUtils::ToPsz10(!bTabularMode),
XML_compact, XclXmlUtils::ToPsz10(false),
XML_compactData, XclXmlUtils::ToPsz10(false),
FSEND);
@@ -732,26 +735,52 @@ void XclExpXmlPivotTables::SavePivotTableXml(
XclExpXmlStream& rStrm, const ScDP
continue;
}
+bool bDimInTabularMode
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - sw/source
sw/source/core/edit/edfcol.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 62d34ffaef1ec248d8c67138064155b23f8c7645
Author: Szymon KÅos
Date: Tue Oct 31 10:08:28 2017 +0100
Watermark: set Auto size
Change-Id: I8800094387ec5fdc49e21c7c02bfc419f13998ed
Reviewed-on: https://gerrit.libreoffice.org/44105
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx
index 6d8ac2eb87e6..2201ada112c3 100644
--- a/sw/source/core/edit/edfcol.cxx
+++ b/sw/source/core/edit/edfcol.cxx
@@ -61,6 +61,7 @@
#include
#define WATERMARK_NAME "PowerPlusWaterMarkObject"
+#define WATERMARK_AUTO_SIZE sal_uInt32(1)
namespace
{
@@ -466,6 +467,7 @@ void lcl_placeWatermarkInHeader(const SfxWatermarkItem&
rWatermark,
xPropertySet->setPropertyValue(UNO_NAME_TEXT_WRAP,
uno::makeAny(text::WrapTextMode_THROUGHT));
xPropertySet->setPropertyValue(UNO_NAME_VERT_ORIENT_RELATION,
uno::makeAny(static_cast(text::RelOrientation::PAGE_PRINT_AREA)));
xPropertySet->setPropertyValue(UNO_NAME_CHAR_FONT_NAME,
uno::makeAny(sFont));
+xPropertySet->setPropertyValue(UNO_NAME_CHAR_HEIGHT,
uno::makeAny(WATERMARK_AUTO_SIZE));
xPropertySet->setPropertyValue("Transformation",
uno::makeAny(aMatrix));
xPropertySet->setPropertyValue(UNO_NAME_HORI_ORIENT,
uno::makeAny(static_cast(text::HoriOrientation::CENTER)));
xPropertySet->setPropertyValue(UNO_NAME_VERT_ORIENT,
uno::makeAny(static_cast(text::VertOrientation::CENTER)));
___
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-5.3' - include/oox oox/source sd/qa
include/oox/drawingml/drawingmltypes.hxx | 15 +++
oox/source/export/chartexport.cxx| 22 +-
oox/source/export/drawingml.cxx |4 +++-
sd/qa/unit/data/pptx/smartart-rotation2.pptx |binary
sd/qa/unit/export-tests-ooxml2.cxx | 13 +
5 files changed, 32 insertions(+), 22 deletions(-)
New commits:
commit ea524432686ca8779c7aba0144d8a72e1b03fa83
Author: Szymon KÅos
Date: Fri Oct 6 16:04:25 2017 +0200
SmartArt: export text rotation in the PPTX
Change-Id: I74bfc172fe7434d14de468ecfd3412636e53780c
Reviewed-on: https://gerrit.libreoffice.org/43202
Tested-by: Jenkins
Reviewed-by: Szymon KÅos
(cherry picked from commit 3cbb6e73ecbff5d83be817c0dab680c5d925c6fa)
Reviewed-on: https://gerrit.libreoffice.org/43984
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/include/oox/drawingml/drawingmltypes.hxx
b/include/oox/drawingml/drawingmltypes.hxx
index a845f728541f..c6e4437e129a 100644
--- a/include/oox/drawingml/drawingmltypes.hxx
+++ b/include/oox/drawingml/drawingmltypes.hxx
@@ -150,6 +150,21 @@ struct IndexRange {
/** retrieve the content of CT_IndexRange */
IndexRange GetIndexRange( const css::uno::Reference<
css::xml::sax::XFastAttributeList >& xAttributes );
+/**
+* nRotation is a 100th of a degree and the return value is
+* in a 60,000th of a degree
+*
+* Also rotation is in opposite directions so multiply with -1
+*/
+inline OString calcRotationValue(sal_Int32 nRotation)
+{
+if (nRotation > 18000) // 180 degree
+{
+nRotation -= 36000;
+}
+nRotation *= -600;
+return OString::number(nRotation);
+}
const sal_Int32 EMU_PER_HMM = 360; /// 360 EMUs per 1/100 mm.
const sal_Int32 EMU_PER_PT = 12700;
diff --git a/oox/source/export/chartexport.cxx
b/oox/source/export/chartexport.cxx
index b1e9368d7c7a..18b9a02bcd0d 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -1030,26 +1030,6 @@ void ChartExport::exportLegend( const Reference<
css::chart::XChartDocument >& x
pFS->endElement( FSNS( XML_c, XML_legend ) );
}
-namespace {
-
-/**
- * nRotation is a 100th of a degree and the return value is
- * in a 60,000th of a degree
- *
- * Also rotation is in opposite directions so multiply with -1
- */
-OString calcRotationValue(sal_Int32 nRotation)
-{
-if (nRotation > 18000) // 180 degree
-{
-nRotation -= 36000;
-}
-nRotation *= -600;
-return OString::number(nRotation);
-}
-
-}
-
void ChartExport::exportTitle( const Reference< XShape >& xShape )
{
OUString sText;
@@ -1082,7 +1062,7 @@ void ChartExport::exportTitle( const Reference< XShape >&
xShape )
pFS->singleElement( FSNS( XML_a, XML_bodyPr ),
XML_vert, sWritingMode,
-XML_rot, calcRotationValue(nRotation).getStr(),
+XML_rot, oox::drawingml::calcRotationValue(nRotation).getStr(),
FSEND );
// TODO: lstStyle
pFS->singleElement( FSNS( XML_a, XML_lstStyle ),
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 444f26b0405e..7a142d9ed8bc 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -2193,6 +2193,8 @@ void DrawingML::WriteText( const Reference< XInterface >&
rXIface, const OUStrin
if( !xXText.is() )
return;
+sal_Int32 nTextRotateAngle = 0;
+
#define DEFLRINS 254
#define DEFTBINS 127
sal_Int32 nLeft, nRight, nTop, nBottom;
@@ -2232,7 +2234,6 @@ void DrawingML::WriteText( const Reference< XInterface >&
rXIface, const OUStrin
{
for ( sal_Int32 i = 0, nElems = aProps.getLength(); i < nElems;
++i )
{
-sal_Int32 nTextRotateAngle = 0;
if ( aProps[ i ].Name == "TextPreRotateAngle" && ( aProps[ i
].Value >>= nTextRotateAngle ) )
{
if ( nTextRotateAngle == -90 )
@@ -2289,6 +2290,7 @@ void DrawingML::WriteText( const Reference< XInterface >&
rXIface, const OUStrin
XML_anchor, sVerticalAlignment,
XML_anchorCtr, bHorizontalCenter ? "1" :
nullptr,
XML_vert, sWritingMode,
+ XML_rot, (nTextRotateAngle != 0) ?
oox::drawingml::calcRotationValue( nTextRotateAngle * 100 ).getStr() : nullptr,
FSEND );
if( !presetWarp.isEmpty())
{
diff --git a/sd/qa/unit/data/pptx/smartart-rotation2.pptx
b/sd/qa/unit/data/pptx/smartart-rotation2.pptx
new file mode 100755
index ..e1c4493a7407
Binary files /dev/null and b/sd/qa/unit/data/pptx/smartart-rotation2.pptx differ
diff --git a/sd/qa/unit/export-tests-ooxml2.cxx
b/sd/qa/unit/export-tests-ooxml2.cxx
index f2e36afb68a7..6f3897ec9ecc 100644
--- a/sd/qa/unit/export-tests-ooxml2.cxx
+++ b/sd/qa/unit/export-tests-ooxml2.cxx
@@ -119,
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - sw/source
sw/source/uibase/docvw/srcedtw.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 4995e2b316f4c5c5028a0df1b2e8aad7218fb976
Author: Aron Budea
Date: Tue Oct 31 13:15:34 2017 +0100
tdf#113548: another case of crash in GrabFocus during dispose
Change-Id: I70776b80f70985a122e28854177c6d0c43839d65
Reviewed-on: https://gerrit.libreoffice.org/44113
Reviewed-by: Aron Budea
Tested-by: Aron Budea
(cherry picked from commit a83a0345e493b928b0b0b93bf106ddb71df69893)
Reviewed-on: https://gerrit.libreoffice.org/44136
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/sw/source/uibase/docvw/srcedtw.cxx
b/sw/source/uibase/docvw/srcedtw.cxx
index 1e7da99e0b69..3aa380234d7f 100644
--- a/sw/source/uibase/docvw/srcedtw.cxx
+++ b/sw/source/uibase/docvw/srcedtw.cxx
@@ -794,7 +794,8 @@ void SwSrcEditWindow::HandleWheelCommand( const
CommandEvent& rCEvt )
void SwSrcEditWindow::GetFocus()
{
-m_pOutWin->GrabFocus();
+if (m_pOutWin)
+m_pOutWin->GrabFocus();
}
static bool lcl_GetLanguagesForEncoding(rtl_TextEncoding eEnc, LanguageType
aLanguages[])
___
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/deployment/registry/configuration/dp_configuration.cxx
|2 +-
desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx
|4 ++--
desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx
|4 ++--
desktop/source/deployment/registry/dp_backend.cxx
|2 +-
desktop/source/deployment/registry/dp_backenddb.cxx
|4 ++--
desktop/source/deployment/registry/help/dp_help.cxx
|2 +-
desktop/source/deployment/registry/help/dp_helpbackenddb.cxx
|2 +-
desktop/source/deployment/registry/help/dp_helpbackenddb.hxx
|3 +--
desktop/source/deployment/registry/inc/dp_backend.h
|3 +--
desktop/source/deployment/registry/inc/dp_backenddb.hxx
|2 +-
10 files changed, 13 insertions(+), 15 deletions(-)
New commits:
commit 18537be0cd5a50cd9a2853a8e06660c820c2e7f8
Author: Julien Nabet
Date: Tue Oct 31 23:50:41 2017 +0100
Replace some lists by vectors in deployment/registry (desktop)
Change-Id: I264a8b4d8fc90f647d5a6f1aef4a190353d494e5
Reviewed-on: https://gerrit.libreoffice.org/44143
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
diff --git
a/desktop/source/deployment/registry/configuration/dp_configuration.cxx
b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
index 499806e43895..a7807d9515e6 100644
--- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx
+++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
@@ -213,7 +213,7 @@ BackendImpl::BackendImpl(
//are still registers. Only after revoking and restarting OOo the
folders
//can be removed. This works now, because the extension manager is a
singleton
//and the backends are only create once per process.
-std::list folders = m_backendDb->getAllDataUrls();
+std::vector folders = m_backendDb->getAllDataUrls();
deleteUnusedFolders(folders);
configmgrini_verify_init( xCmdEnv );
diff --git
a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx
b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx
index b4b47a25260f..ead87464821a 100644
---
a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx
+++
b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx
@@ -127,11 +127,11 @@ ConfigurationBackendDb::getEntry(OUString const & url)
}
}
-std::list ConfigurationBackendDb::getAllDataUrls()
+std::vector ConfigurationBackendDb::getAllDataUrls()
{
try
{
-std::list listRet;
+std::vector listRet;
Reference doc = getDocument();
Reference root = doc->getFirstChild();
diff --git
a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx
b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx
index ce6443f12d7f..09cbf05a9d3d 100644
---
a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx
+++
b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx
@@ -22,7 +22,7 @@
#include
#include
-#include
+#include
#include
#include
@@ -70,7 +70,7 @@ public:
void addEntry(OUString const & url, Data const & data);
::boost::optional getEntry(OUString const & url);
-std::list< OUString> getAllDataUrls();
+std::vector< OUString> getAllDataUrls();
};
diff --git a/desktop/source/deployment/registry/dp_backend.cxx
b/desktop/source/deployment/registry/dp_backend.cxx
index e9f31e266d79..46be07058768 100644
--- a/desktop/source/deployment/registry/dp_backend.cxx
+++ b/desktop/source/deployment/registry/dp_backend.cxx
@@ -248,7 +248,7 @@ void PackageRegistryBackend::deleteTempFolder(
//then created a Folder with a same name and a trailing '_'
//If the folderURL has no '_' then there is no corresponding tmp file.
void PackageRegistryBackend::deleteUnusedFolders(
-std::list< OUString> const & usedFolders)
+std::vector< OUString> const & usedFolders)
{
try
{
diff --git a/desktop/source/deployment/registry/dp_backenddb.cxx
b/desktop/source/deployment/registry/dp_backenddb.cxx
index e4329c90ed68..f7054869a45e 100644
--- a/desktop/source/deployment/registry/dp_backenddb.cxx
+++ b/desktop/source/deployment/registry/dp_backenddb.cxx
@@ -565,12 +565,12 @@ std::list< OUString> BackendDb::readList(
}
}
-std::list BackendDb::getOneChildFromAllEntries(
+std::vector BackendDb::getOneChildFromAllEntries(
OUString const & name)
{
try
{
-std::list listRet;
+std::vector listRet;
Reference doc = getDocument();
Reference root = doc->getFirstChild();
diff --git a/desktop/source/deployment/registry/help/dp_help.cxx
b/desk
[Libreoffice-commits] core.git: lotuswordpro/inc lotuswordpro/source
lotuswordpro/inc/lwpbasetype.hxx|4
lotuswordpro/inc/lwpfoundry.hxx |9 -
lotuswordpro/inc/lwpidxmgr.hxx |6
lotuswordpro/inc/lwpobjfactory.hxx |4
lotuswordpro/inc/lwpoverride.hxx| 64 ++
lotuswordpro/inc/xfilter/xfnumberstyle.hxx | 27 +---
lotuswordpro/source/filter/LotusWordProImportFilter.hxx |5
lotuswordpro/source/filter/lwp9reader.hxx |3
lotuswordpro/source/filter/lwpbreaksoverride.hxx|7 -
lotuswordpro/source/filter/lwpcelllayout.hxx|4
lotuswordpro/source/filter/lwpcharborderoverride.hxx|7 -
lotuswordpro/source/filter/lwpfootnote.hxx |5
lotuswordpro/source/filter/lwpholder.hxx| 12 -
lotuswordpro/source/filter/lwplayout.hxx|4
lotuswordpro/source/filter/lwplaypiece.hxx | 99 +++-
lotuswordpro/source/filter/lwplnopts.hxx|5
lotuswordpro/source/filter/lwpnotes.hxx |5
lotuswordpro/source/filter/lwpnumberingoverride.hxx |8 -
lotuswordpro/source/filter/lwpnumericfmt.hxx| 11 -
lotuswordpro/source/filter/lwppagelayout.hxx|6
lotuswordpro/source/filter/lwppara.hxx | 14 +-
lotuswordpro/source/filter/lwpparaborderoverride.hxx|9 -
lotuswordpro/source/filter/lwpstory.hxx |3
lotuswordpro/source/filter/lwptable.hxx |8 -
lotuswordpro/source/filter/lwptaboverride.hxx |7 -
lotuswordpro/source/filter/lwptblcell.hxx | 55
lotuswordpro/source/filter/lwptblformula.hxx|8 -
lotuswordpro/source/filter/lwptoc.hxx |6
lotuswordpro/source/filter/lwpvpointer.hxx |5
29 files changed, 167 insertions(+), 243 deletions(-)
New commits:
commit bbf1312b2d775a851a38290e3c12c677f6acbfde
Author: Noel Grandin
Date: Tue Oct 31 16:04:38 2017 +0200
loplugin:finalclasses in lotuswordpro
Change-Id: I09a570741f5801980ae07fb90835e543519df046
Reviewed-on: https://gerrit.libreoffice.org/44135
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
diff --git a/lotuswordpro/inc/lwpbasetype.hxx b/lotuswordpro/inc/lwpbasetype.hxx
index 7da677280c4c..99f33050b2fe 100644
--- a/lotuswordpro/inc/lwpbasetype.hxx
+++ b/lotuswordpro/inc/lwpbasetype.hxx
@@ -101,7 +101,7 @@ private:
/**
* @brief point class
*/
-class LwpPoint
+class LwpPoint final
{
public:
LwpPoint();
@@ -111,7 +111,7 @@ public:
sal_Int32 GetY() const {return m_nY;}
inline void SetX(sal_Int32 nX);
inline void SetY(sal_Int32 nY);
-protected:
+private:
sal_Int32 m_nX;
sal_Int32 m_nY;
};
diff --git a/lotuswordpro/inc/lwpfoundry.hxx b/lotuswordpro/inc/lwpfoundry.hxx
index 7c5ff3bee569..30b604b295fa 100644
--- a/lotuswordpro/inc/lwpfoundry.hxx
+++ b/lotuswordpro/inc/lwpfoundry.hxx
@@ -177,17 +177,16 @@ public:
class LwpOrderedObject;
class LwpListList;
-class LwpOrderedObjectManager
+class LwpOrderedObjectManager final
{
public:
LwpOrderedObjectManager(){}
-protected:
-LwpObjectID m_Head;
-public:
void Read(LwpObjectStream *pStrm);
LwpOrderedObject* Enumerate(LwpOrderedObject* pLast);
-protected:
+private:
LwpListList* GetNextActiveListList(LwpListList* pLast);
+
+LwpObjectID m_Head;
};
class LwpStyleManager;
diff --git a/lotuswordpro/inc/lwpidxmgr.hxx b/lotuswordpro/inc/lwpidxmgr.hxx
index 21f902a76cda..fc01fed425a4 100644
--- a/lotuswordpro/inc/lwpidxmgr.hxx
+++ b/lotuswordpro/inc/lwpidxmgr.hxx
@@ -77,11 +77,11 @@ struct LwpKey
/**
* @brief LwpIndexManager, to read all index records and maintain the index
information
*/
-class LwpIndexManager
+class LwpIndexManager final
{
public:
LwpIndexManager();
-protected:
+private:
static const sal_uInt8 MAXOBJECTIDS;
std::vector m_ObjectKeys; //the ordered vector
std::vector m_RootObjs;//For those object ids in
RootObjIndex
@@ -93,7 +93,7 @@ protected:
sal_uInt32 m_ChildIndex[256]; //Offset of leaf index
sal_uInt16 m_nLeafCount;
-protected:
+
void ReadRootData(LwpObjectStream *pObjStrm ); //Read root index data
//Add new method to handle ObjIndex
diff --git a/lotuswordpro/inc/lwpobjfactory.hxx
b/lotuswordpro/inc/lwpobjfactory.hxx
index 37c3c3a48420..f3a00e1f769c 100644
--- a/lotuswordpro/inc/lwpobjfactory.hxx
+++ b/lotuswordpro/inc/lwpobjfactory.hxx
@@ -77,11 +77,10 @@
/**
* @brief object factory used for lwp object creation and maintenance
*/
-class LwpObjectFactory
+class LwpObjectFactory final
{
public:
explicit LwpObjectFactory(LwpSvStream* pSvStream);
-public:
~LwpObjectFactory();
//For object Factory and object manager
@@ -106,7 +105,6 @@ private:
LwpIdToObjMap m_IdToObjList;
LwpIndexMa
[Libreoffice-commits] mso-dumper.git: msodumper/pptrecord.py
msodumper/pptrecord.py | 28 ++--
1 file changed, 14 insertions(+), 14 deletions(-)
New commits:
commit c99d5a22f9dfebd595308d9dc5f20112674a3b8c
Author: Noel Grandin
Date: Mon Oct 23 16:34:09 2017 +0200
improve parsing of PPT records
I didn't know what to do with the ColorPropertyHandler constructor
call, but it definitely should be reading 4 bytes, not 2 bytes and
4 bytes.
Without this change, I get clearly corrupt DFF_PST_StyleTextPropAtom
data when dumping some PPT files produced by LO.
Change-Id: I98fc6cd3398fee2687c98fe9f9d7bd330b1ab4e5
Reviewed-on: https://gerrit.libreoffice.org/43738
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
diff --git a/msodumper/pptrecord.py b/msodumper/pptrecord.py
index f9283d4..48cc5a2 100644
--- a/msodumper/pptrecord.py
+++ b/msodumper/pptrecord.py
@@ -841,7 +841,7 @@ class TextStyles(BaseRecordHandler):
self.appendParaProp("bullet size %d"%bulletSize)
if styleMask & 0x0020:
-bulletColorAtom = ColorPropertyHandler(self.readUnsignedInt(2),
self.readUnsignedInt(4), False, False, [], self.appendParaProp)
+bulletColorAtom = ColorPropertyHandler(0, self.readUnsignedInt(4),
False, False, [], self.appendParaProp)
bulletColorAtom.output()
self.appendParaProp("bullet color atom")
@@ -849,18 +849,6 @@ class TextStyles(BaseRecordHandler):
paraAlignment = self.readSignedInt(2)
self.appendParaProp("para alignment %4.4Xh"%paraAlignment)
-if styleMask & 0x0400:
-paraIndent = self.readSignedInt(2)
-self.appendParaProp("para indent %d"%paraIndent)
-
-if styleMask & 0x0200:
-unused = self.readSignedInt(2)
-self.appendParaProp("unused para property %4.4Xh"%unused)
-
-if styleMask & 0x0100:
-paraLeftMargin = self.readSignedInt(2)
-self.appendParaProp("para left margin %d"%paraLeftMargin)
-
if styleMask & 0x1000:
paraLineSpacing = self.readSignedInt(2)
self.appendParaProp("para linespacing %d"%paraLineSpacing)
@@ -873,6 +861,18 @@ class TextStyles(BaseRecordHandler):
paraSpaceAfter = self.readSignedInt(2)
self.appendParaProp("para space after %d"%paraSpaceAfter)
+if styleMask & 0x0100:
+paraLeftMargin = self.readSignedInt(2)
+self.appendParaProp("para left margin %d"%paraLeftMargin)
+
+if styleMask & 0x0400:
+paraIndent = self.readSignedInt(2)
+self.appendParaProp("para indent %d"%paraIndent)
+
+if styleMask & 0x0200:
+unused = self.readSignedInt(2)
+self.appendParaProp("unused para property %4.4Xh"%unused)
+
if styleMask & 0x8000:
paraDefaultTabSize = self.readSignedInt(2)
self.appendParaProp("para default tab size %d"%paraDefaultTabSize)
@@ -926,7 +926,7 @@ class TextStyles(BaseRecordHandler):
self.appendCharProp("char font size %d"%fontSize)
if styleMask & 0x4:
-charColorAtom = ColorPropertyHandler(self.readUnsignedInt(2),
self.readUnsignedInt(4), False, False, [], self.appendCharProp)
+charColorAtom = ColorPropertyHandler(0, self.readUnsignedInt(4),
False, False, [], self.appendCharProp)
charColorAtom.output()
self.appendCharProp("char color atom")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: mysqlc/source
mysqlc/source/mysqlc_connection.hxx|7 +--
mysqlc/source/mysqlc_databasemetadata.hxx |4 +---
mysqlc/source/mysqlc_preparedstatement.hxx |4 +---
mysqlc/source/mysqlc_resultset.hxx |3 +--
mysqlc/source/mysqlc_resultsetmetadata.hxx |4 ++--
mysqlc/source/mysqlc_statement.hxx |3 +--
6 files changed, 7 insertions(+), 18 deletions(-)
New commits:
commit 6084ca8a637abb57b3d7236c303e22afa6423b43
Author: Noel Grandin
Date: Tue Oct 31 14:42:47 2017 +0200
loplugin:finalclasses in mysqlc
Change-Id: I3f0ae04c30e863c123404c6e99f7ae27bc5715c7
Reviewed-on: https://gerrit.libreoffice.org/44134
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
diff --git a/mysqlc/source/mysqlc_connection.hxx
b/mysqlc/source/mysqlc_connection.hxx
index b3fd5a78bfe9..63c121c99a2e 100644
--- a/mysqlc/source/mysqlc_connection.hxx
+++ b/mysqlc/source/mysqlc_connection.hxx
@@ -82,20 +82,15 @@ namespace connectivity
typedef std::vector< css::uno::WeakReferenceHelper > OWeakRefArray;
-class OConnection : public OBase_Mutex,
+class OConnection final : public OBase_Mutex,
public OConnection_BASE,
public
connectivity::mysqlc::OSubComponent
{
friend class connectivity::mysqlc::OSubComponent;
-private:
ConnectionSettings m_settings;
-
-private:
css::uno::Reference< css::container::XNameAccess > m_typeMap;
css::uno::Reference< css::util::XStringSubstitution >
m_xParameterSubstitution;
-protected:
-
// Data attributes
diff --git a/mysqlc/source/mysqlc_databasemetadata.hxx
b/mysqlc/source/mysqlc_databasemetadata.hxx
index 172c5ee364bd..9f09e534215d 100644
--- a/mysqlc/source/mysqlc_databasemetadata.hxx
+++ b/mysqlc/source/mysqlc_databasemetadata.hxx
@@ -39,15 +39,13 @@ namespace connectivity
typedef ::cppu::WeakImplHelper1< css::sdbc::XDatabaseMetaData>
ODatabaseMetaData_BASE;
-class ODatabaseMetaData : public ODatabaseMetaData_BASE
+class ODatabaseMetaData final : public ODatabaseMetaData_BASE
{
OConnection&m_rConnection;
-protected:
sql::DatabaseMetaData * meta;
rtl::OUString identifier_quote_string;
boolidentifier_quote_string_set;
-private:
rtl::OUString impl_getStringMetaData( const sal_Char* _methodName,
const sql::SQLString& (sql::DatabaseMetaData::*Method)() );
rtl::OUString impl_getStringMetaData( const sal_Char* _methodName,
sql::SQLString (sql::DatabaseMetaData::*Method)() );
sal_Int32 impl_getInt32MetaData( const sal_Char* _methodName,
unsigned int (sql::DatabaseMetaData::*Method)() );
diff --git a/mysqlc/source/mysqlc_preparedstatement.hxx
b/mysqlc/source/mysqlc_preparedstatement.hxx
index 652b3558f012..b82f88ecac38 100644
--- a/mysqlc/source/mysqlc_preparedstatement.hxx
+++ b/mysqlc/source/mysqlc_preparedstatement.hxx
@@ -47,16 +47,14 @@ namespace connectivity
css::sdbc::XResultSetMetaDataSupplier,
css::lang::XServiceInfo>
OPreparedStatement_BASE;
-class OPreparedStatement : public OCommonStatement,
+class OPreparedStatement final : public OCommonStatement,
public OPreparedStatement_BASE
{
-protected:
unsigned intm_paramCount; // number of placeholders
Reference< XResultSetMetaData > m_xMetaData;
void checkParameterIndex(sal_Int32 parameter);
-protected:
void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,
const Any& rValue) SAL_OVERRIDE;
virtual ~OPreparedStatement();
public:
diff --git a/mysqlc/source/mysqlc_resultset.hxx
b/mysqlc/source/mysqlc_resultset.hxx
index 5ed4f8c9d0d2..a05cbb88cef6 100644
--- a/mysqlc/source/mysqlc_resultset.hxx
+++ b/mysqlc/source/mysqlc_resultset.hxx
@@ -63,12 +63,11 @@ namespace connectivity
css::sdbc::XColumnLocate,
css::lang::XServiceInfo>
OResultSet_BASE;
-class OResultSet : public OBase_Mutex,
+class OResultSet final : public OBase_Mutex,
public OResultSet_BASE,
public ::cppu::OPropertySetHelper,
public OPropertyArrayUsageHelper
{
-protected:
css::uno::WeakReferenceHelper m_aStatement;
css::uno::Reference< css::sdbc::XResultSetMetaData> m_xMetaData;
sql::ResultSet *m_result;
diff --git a/mysqlc/source/mysqlc_resultsetmetadata.hxx
b/mysqlc/source/mysqlc_resultsetmetadata.hxx
index 4a5282643b32..d8ad1217e00b
[Libreoffice-commits] core.git: include/oox oox/inc oox/source
include/oox/dump/dffdumper.hxx |6 +---
include/oox/dump/dumperbase.hxx |8 +++---
include/oox/dump/xlsbdumper.hxx |3 --
include/oox/ppt/backgroundproperties.hxx |4 +--
include/oox/ppt/pptshape.hxx |7 +
include/oox/ppt/presentationfragmenthandler.hxx |7 +
include/oox/ppt/slidemastertextstylescontext.hxx |4 +--
oox/inc/drawingml/linepropertiescontext.hxx |4 +--
oox/inc/drawingml/misccontexts.hxx |4 +--
oox/inc/drawingml/objectdefaultcontext.hxx |4 +--
oox/inc/drawingml/shapestylecontext.hxx |4 +--
oox/inc/drawingml/spdefcontext.hxx |4 +--
oox/inc/drawingml/textbodycontext.hxx|8 +++---
oox/inc/drawingml/textbodypropertiescontext.hxx |4 +--
oox/inc/drawingml/textcharacterpropertiescontext.hxx |4 +--
oox/inc/drawingml/texteffectscontext.hxx | 11 +++-
oox/inc/drawingml/textliststylecontext.hxx |4 +--
oox/inc/drawingml/textparagraphpropertiescontext.hxx |4 +--
oox/inc/drawingml/transform2dcontext.hxx |4 +--
oox/source/drawingml/diagram/datamodelcontext.hxx|4 +--
oox/source/drawingml/effectpropertiescontext.hxx |7 ++---
oox/source/drawingml/hyperlinkcontext.hxx|4 +--
oox/source/drawingml/texttabstoplistcontext.hxx | 24 +--
oox/source/shape/LockedCanvasContext.hxx |5 +--
oox/source/shape/WpgContext.hxx |4 +--
oox/source/shape/WpsContext.hxx |4 +--
26 files changed, 69 insertions(+), 81 deletions(-)
New commits:
commit 7d8d7ebbc69015166f4dea22748e6c8586d51013
Author: Noel Grandin
Date: Tue Oct 31 14:39:47 2017 +0200
loplugin:finalclasses in oox
Change-Id: I12c274877a0975971863456e9abdcb811ee2bd80
Reviewed-on: https://gerrit.libreoffice.org/44133
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
diff --git a/include/oox/dump/dffdumper.hxx b/include/oox/dump/dffdumper.hxx
index 56c8b87d3dd6..19d69bb6fd9a 100644
--- a/include/oox/dump/dffdumper.hxx
+++ b/include/oox/dump/dffdumper.hxx
@@ -31,14 +31,14 @@ namespace oox {
namespace dump {
-class DffStreamObject : public SequenceRecordObjectBase
+class DffStreamObject final : public SequenceRecordObjectBase
{
public:
sal_uInt16 getVer() const { return mnInstVer & 0x000F; }
sal_uInt16 getInst() const { return (mnInstVer & 0xFFF0) >> 4; }
bool isContainer() const { return getVer() == 15; }
-protected:
+private:
DffStreamObject() {}
using SequenceRecordObjectBase::construct;
@@ -47,13 +47,11 @@ protected:
virtual voidimplWriteExtHeader() override;
virtual voidimplDumpRecordBody() override;
-private:
sal_uInt32 dumpDffSimpleColor( const String& rName );
voiddumpDffOpt();
sal_uInt16 dumpDffOptPropHeader();
-private:
sal_uInt16 mnInstVer;
sal_Int32 mnRealSize;
};
diff --git a/include/oox/dump/dumperbase.hxx b/include/oox/dump/dumperbase.hxx
index 1343b533038d..dcde6ff1808f 100644
--- a/include/oox/dump/dumperbase.hxx
+++ b/include/oox/dump/dumperbase.hxx
@@ -1543,7 +1543,7 @@ void InputObjectBase::dumpHexPair( const String& rName,
sal_Unicode cSep )
}
-class BinaryStreamObject : public InputObjectBase
+class BinaryStreamObject final : public InputObjectBase
{
public:
explicitBinaryStreamObject(
@@ -1551,7 +1551,7 @@ public:
const BinaryInputStreamRef& rxStrm,
const OUString& rSysFileName );
-protected:
+private:
voiddumpBinaryStream( bool bShowOffset = true );
virtual voidimplDump() override;
@@ -1587,7 +1587,7 @@ protected:
};
-class TextLineStreamObject : public TextStreamObjectBase
+class TextLineStreamObject final : public TextStreamObjectBase
{
public:
explicitTextLineStreamObject(
@@ -1601,7 +1601,7 @@ public:
const BinaryInputStreamRef& rxStrm,
rtl_TextEncoding eTextEnc );
-protected:
+private:
virtual voidimplDumpText( TextInputStream& rTextStrm ) override;
voidimplDumpLine( const OUString& rLine, sal_uInt32 nLine );
};
diff --git a/include/oox/dump/xlsbdumper.hxx b/include/oox/dump/xlsbdumper.hxx
index ea553ab87087..f031aef54b52 100644
--- a/include/oox/dump/xlsbdumper.hxx
+++ b/include/oox/dump/xlsbdumper.hxx
@@ -46,9 +46,8 @@ namespace dump {
namespace xlsb {
-class RecordObjectBase : public SequenceRecordObjectBase
+class RecordObjectBase final : public SequenceRecordObjectBase
{
-protected:
explicitRecordObjectBase();
virtual
[Libreoffice-commits] core.git: include/package package/inc package/source
include/package/Deflater.hxx |3 +--
include/package/Inflater.hxx |3 +--
package/inc/ByteChucker.hxx |3 +--
package/inc/ByteGrabber.hxx |3 +--
package/inc/CRC32.hxx |3 +--
package/inc/ZipEnumeration.hxx|3 +--
package/inc/ZipPackage.hxx|3 +--
package/inc/ZipPackageBuffer.hxx |3 +--
package/source/manifest/ManifestImport.hxx|4 ++--
package/source/xstor/oseekinstream.hxx|3 +--
package/source/xstor/selfterminatefilestream.hxx |3 +--
package/source/zipapi/MemoryByteGrabber.hxx |3 +--
package/source/zipapi/XUnbufferedStream.hxx |3 +--
package/source/zippackage/ZipPackageFolderEnumeration.hxx |3 +--
package/source/zippackage/ZipPackageSink.hxx |3 +--
package/source/zippackage/wrapstreamforshare.hxx |3 +--
16 files changed, 17 insertions(+), 32 deletions(-)
New commits:
commit ee1d6af9b73256e13975ec4e95aff6d69a00fed9
Author: Noel Grandin
Date: Tue Oct 31 14:15:25 2017 +0200
loplugin:finalclasses in package
Change-Id: I020ea1f3bea5c3deab05b9a2154102548c7622cf
Reviewed-on: https://gerrit.libreoffice.org/44132
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
diff --git a/include/package/Deflater.hxx b/include/package/Deflater.hxx
index d29cea948889..dc2e6df699af 100644
--- a/include/package/Deflater.hxx
+++ b/include/package/Deflater.hxx
@@ -27,11 +27,10 @@ struct z_stream_s;
namespace ZipUtils {
-class DLLPUBLIC_PACKAGE Deflater
+class DLLPUBLIC_PACKAGE Deflater final
{
typedef struct z_stream_s z_stream;
-protected:
css::uno::Sequence< sal_Int8 > sInBuffer;
boolbFinish;
boolbFinished;
diff --git a/include/package/Inflater.hxx b/include/package/Inflater.hxx
index a974534bc901..c978c8a8c918 100644
--- a/include/package/Inflater.hxx
+++ b/include/package/Inflater.hxx
@@ -27,11 +27,10 @@ struct z_stream_s;
namespace ZipUtils {
-class DLLPUBLIC_PACKAGE Inflater
+class DLLPUBLIC_PACKAGE Inflater final
{
typedef struct z_stream_s z_stream;
-protected:
boolbFinished, bNeedDict;
sal_Int32 nOffset, nLength, nLastInflateError;
z_stream* pStream;
diff --git a/package/inc/ByteChucker.hxx b/package/inc/ByteChucker.hxx
index 7e1b07c6680f..b3870c0c6163 100644
--- a/package/inc/ByteChucker.hxx
+++ b/package/inc/ByteChucker.hxx
@@ -30,9 +30,8 @@
namespace com { namespace sun { namespace star {
namespace io { class XSeekable; class XOutputStream; }
} } }
-class ByteChucker
+class ByteChucker final
{
-protected:
css::uno::Reference < css::io::XOutputStream > xStream;
css::uno::Reference < css::io::XSeekable > xSeek;
css::uno::Sequence < sal_Int8 > a1Sequence, a2Sequence, a4Sequence;
diff --git a/package/inc/ByteGrabber.hxx b/package/inc/ByteGrabber.hxx
index 865e3486b489..60a8e1e9f0e5 100644
--- a/package/inc/ByteGrabber.hxx
+++ b/package/inc/ByteGrabber.hxx
@@ -32,9 +32,8 @@
namespace com { namespace sun { namespace star {
namespace io { class XSeekable; class XInputStream; }
} } }
-class ByteGrabber
+class ByteGrabber final
{
-protected:
::osl::Mutex m_aMutex;
css::uno::Reference < css::io::XInputStream > xStream;
diff --git a/package/inc/CRC32.hxx b/package/inc/CRC32.hxx
index 854d11849b2a..778756475414 100644
--- a/package/inc/CRC32.hxx
+++ b/package/inc/CRC32.hxx
@@ -25,9 +25,8 @@
namespace com { namespace sun { namespace star {
namespace io { class XInputStream; }
} } }
-class CRC32
+class CRC32 final
{
-protected:
sal_uInt32 nCRC;
public:
CRC32();
diff --git a/package/inc/ZipEnumeration.hxx b/package/inc/ZipEnumeration.hxx
index 0b6402a50c21..c84ae2ce2410 100644
--- a/package/inc/ZipEnumeration.hxx
+++ b/package/inc/ZipEnumeration.hxx
@@ -21,9 +21,8 @@
#include "HashMaps.hxx"
-class ZipEnumeration
+class ZipEnumeration final
{
-protected:
EntryHash &rEntryHash;
EntryHash::const_iterator aIterator;
public:
diff --git a/package/inc/ZipPackage.hxx b/package/inc/ZipPackage.hxx
index f89dd57d7be4..61b0fc883575 100644
--- a/package/inc/ZipPackage.hxx
+++ b/package/inc/ZipPackage.hxx
@@ -57,7 +57,7 @@ enum InitialisationMode
e_IMode_XStream
};
-class ZipPackage : public cppu::WeakImplHelper
+class ZipPackage final : public cppu::WeakImplHelper
<
css::lang::XInitialization,
css::lang::XSingleServiceFactory,
@@ -68,7 +68,6 @@ class ZipPackage : public cppu::WeakImplHelper
css::beans::XPropertySet
>
{
-protected:
rtl::Reference m_aMutexHolder;
[Libreoffice-commits] core.git: basctl/source basic/source
basctl/source/basicide/baside2.cxx |2 +-
basctl/source/basicide/basides1.cxx |2 +-
basctl/source/basicide/bastypes.cxx |4 ++--
basctl/source/basicide/macrodlg.cxx |2 +-
basctl/source/inc/basobj.hxx|5 ++---
basctl/source/inc/bastypes.hxx |2 +-
basic/source/classes/sbunoobj.cxx | 10 --
basic/source/inc/date.hxx |2 +-
basic/source/runtime/methods.cxx|6 +++---
basic/source/sbx/sbxbool.cxx|2 +-
basic/source/sbx/sbxbyte.cxx|2 +-
basic/source/sbx/sbxchar.cxx|2 +-
basic/source/sbx/sbxconv.hxx|2 +-
basic/source/sbx/sbxdbl.cxx |2 +-
basic/source/sbx/sbxint.cxx |6 +++---
basic/source/sbx/sbxlng.cxx |2 +-
basic/source/sbx/sbxscan.cxx| 18 +++---
basic/source/sbx/sbxsng.cxx |2 +-
basic/source/sbx/sbxuint.cxx|2 +-
basic/source/sbx/sbxulng.cxx|2 +-
basic/source/sbx/sbxvalue.cxx |6 +++---
basic/source/sbx/sbxvar.cxx |4 ++--
22 files changed, 40 insertions(+), 47 deletions(-)
New commits:
commit 5d618d73ed8669a75b7b01774f6ea51e99e5b740
Author: Noel Grandin
Date: Tue Oct 31 16:00:24 2017 +0200
loplugin:constantparam in basic,basctl
Change-Id: If918c42d4b82d78c07786cfa47c74d0dfb7493d6
Reviewed-on: https://gerrit.libreoffice.org/44131
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
diff --git a/basctl/source/basicide/baside2.cxx
b/basctl/source/basicide/baside2.cxx
index e77e86dd1759..08c27f819639 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -338,7 +338,7 @@ void ModulWindow::BasicExecute()
if ( !pMethod )
{
// If not in a method then prompt the user
-ChooseMacro( uno::Reference< frame::XModel >(), false );
+ChooseMacro( uno::Reference< frame::XModel >() );
return;
}
if ( pMethod )
diff --git a/basctl/source/basicide/basides1.cxx
b/basctl/source/basicide/basides1.cxx
index 74161eec8161..db3945369fc8 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -269,7 +269,7 @@ void Shell::ExecuteGlobal( SfxRequest& rReq )
break;
case SID_BASICIDE_CHOOSEMACRO:
{
-ChooseMacro( nullptr, false );
+ChooseMacro( nullptr );
}
break;
case SID_BASICIDE_CREATEMACRO:
diff --git a/basctl/source/basicide/bastypes.cxx
b/basctl/source/basicide/bastypes.cxx
index fa0300dcb641..951c25287a86 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -564,7 +564,7 @@ void TabBar::Sort()
}
}
-void CutLines( OUString& rStr, sal_Int32 nStartLine, sal_Int32 nLines, bool
bEraseTrailingEmptyLines )
+void CutLines( OUString& rStr, sal_Int32 nStartLine, sal_Int32 nLines )
{
sal_Int32 nStartPos = 0;
sal_Int32 nLine = 0;
@@ -596,7 +596,7 @@ void CutLines( OUString& rStr, sal_Int32 nStartLine,
sal_Int32 nLines, bool bEra
rStr = rStr.copy( 0, nStartPos );
rStr += aEndStr;
-if ( bEraseTrailingEmptyLines )
+// erase trailing empty lines
{
sal_Int32 n = nStartPos;
sal_Int32 nLen = rStr.getLength();
diff --git a/basctl/source/basicide/macrodlg.cxx
b/basctl/source/basicide/macrodlg.cxx
index d391ad20c708..9bb61bc870f0 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -304,7 +304,7 @@ void MacroChooser::DeleteMacro()
sal_uInt16 nStart, nEnd;
pMethod->GetLineRange( nStart, nEnd );
pModule->GetMethods()->Remove( pMethod );
-CutLines( aSource, nStart-1, nEnd-nStart+1, true );
+CutLines( aSource, nStart-1, nEnd-nStart+1 );
pModule->SetSource32( aSource );
// update module in library
diff --git a/basctl/source/inc/basobj.hxx b/basctl/source/inc/basobj.hxx
index 8e5e9badc8af..91862bff751f 100644
--- a/basctl/source/inc/basobj.hxx
+++ b/basctl/source/inc/basobj.hxx
@@ -77,9 +77,8 @@ namespace basctl
const css::uno::Reference< css::frame::XModel >& rxLimitToDocument,
const css::uno::Reference< css::frame::XFrame >& xDocFrame,
bool bChooseOnly );
inline OUString ChooseMacro(
-const css::uno::Reference< css::frame::XModel >& rxLimitToDocument,
-bool bChooseOnly )
-{ return ChooseMacro(rxLimitToDocument, css::uno::Reference<
css::frame::XFrame >(), bChooseOnly); }
+const css::uno::Reference< css::frame::XModel >& rxLimitToDocument )
+{ return ChooseMacro(rxLimitToDocument, css::uno::Reference<
css::frame::XFrame >(), false/*bChooseOnly*/); }
/// @throws css::container::NoSuchElementException
/// @throws css::uno::RuntimeException
diff --git a/basctl/source/inc/bastypes.hxx b/basctl/source/inc/bastypes.hxx
index 73b78afb7ced..429f4137a971 100
[Libreoffice-commits] core.git: basegfx/source drawinglayer/source include/basegfx
basegfx/source/curve/b2dcubicbezier.cxx|9 +-
basegfx/source/inc/stringconversiontools.hxx | 10 +--
basegfx/source/polygon/b2dpolypolygontools.cxx | 21 ++
basegfx/source/polygon/b3dpolygontools.cxx | 56 ++---
basegfx/source/polygon/b3dpolypolygontools.cxx | 14 +---
basegfx/source/tools/stringconversiontools.cxx |2
drawinglayer/source/primitive3d/polygonprimitive3d.cxx |2
include/basegfx/polygon/b2dpolypolygontools.hxx|7 --
include/basegfx/polygon/b3dpolygontools.hxx|3
include/basegfx/polygon/b3dpolypolygontools.hxx|9 +-
10 files changed, 36 insertions(+), 97 deletions(-)
New commits:
commit 094542511fae905106a9daa19c049ff669e61bdc
Author: Noel Grandin
Date: Tue Oct 31 15:43:39 2017 +0200
loplugin:constantparam in basegfx
Change-Id: Ieabdd6f8d76cfc2ed75f2ec618def6591a9adc93
Reviewed-on: https://gerrit.libreoffice.org/44130
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
diff --git a/basegfx/source/curve/b2dcubicbezier.cxx
b/basegfx/source/curve/b2dcubicbezier.cxx
index 446d976b1c02..3f4a100ae2e1 100644
--- a/basegfx/source/curve/b2dcubicbezier.cxx
+++ b/basegfx/source/curve/b2dcubicbezier.cxx
@@ -113,8 +113,7 @@ namespace basegfx
const B2DPoint& rfEB, // edge on B
const B2DPoint& rfPB, // end point
B2DPolygon& rTarget,// target polygon
-const double& rfAngleBound, // angle bound in [0.0 .. 2PI]
-bool bAllowUnsharpen) // #i37443# allow the criteria to
get unsharp in recursions
+const double& rfAngleBound) // angle bound in [0.0 .. 2PI]
{
sal_uInt16 nMaxRecursionDepth(8);
const B2DVector aLeft(rfEA - rfPA);
@@ -231,7 +230,7 @@ namespace basegfx
}
else
{
-ImpSubDivAngle(rfPA, aS1L, aS2L, aS3C, rTarget,
rfAngleBound, bAllowUnsharpen, nMaxRecursionDepth);
+ImpSubDivAngle(rfPA, aS1L, aS2L, aS3C, rTarget,
rfAngleBound, true/*bAllowUnsharpen*/, nMaxRecursionDepth);
}
// right
@@ -241,7 +240,7 @@ namespace basegfx
}
else
{
-ImpSubDivAngle(aS3C, aS2R, aS1R, rfPB, rTarget,
rfAngleBound, bAllowUnsharpen, nMaxRecursionDepth);
+ImpSubDivAngle(aS3C, aS2R, aS1R, rfPB, rTarget,
rfAngleBound, true/*bAllowUnsharpen*/, nMaxRecursionDepth);
}
}
}
@@ -551,7 +550,7 @@ namespace basegfx
if(isBezier())
{
// use support method #i37443# and allow unsharpen the criteria
-ImpSubDivAngleStart(maStartPoint, maControlPointA,
maControlPointB, maEndPoint, rTarget, fAngleBound * F_PI180,
true/*bAllowUnsharpen*/);
+ImpSubDivAngleStart(maStartPoint, maControlPointA,
maControlPointB, maEndPoint, rTarget, fAngleBound * F_PI180);
}
else
{
diff --git a/basegfx/source/inc/stringconversiontools.hxx
b/basegfx/source/inc/stringconversiontools.hxx
index b49804849855..f2ccb1ac3324 100644
--- a/basegfx/source/inc/stringconversiontools.hxx
+++ b/basegfx/source/inc/stringconversiontools.hxx
@@ -36,22 +36,20 @@ namespace basegfx
const sal_Int32 nLen);
inline bool isOnNumberChar(const sal_Unicode aChar,
- bool bSignAllowed,
- bool bDotAllowed)
+ bool bSignAllowed)
{
const bool bPredicate( (u'0' <= aChar && u'9' >= aChar)
|| (bSignAllowed && u'+' == aChar)
|| (bSignAllowed && u'-' == aChar)
-|| (bDotAllowed && u'.' == aChar));
+|| (u'.' == aChar));
return bPredicate;
}
inline bool isOnNumberChar(const OUString& rStr,
- const sal_Int32 nPos,
- boolbSignAllowed = true)
+ const sal_Int32 nPos)
{
-return isOnNumberChar(rStr[nPos], bSignAllowed, true);
+return isOnNumberChar(rStr[nPos], true/*bSignAllowed*/);
}
bool getDoubleChar(double& o_fRetval,
diff --git a/basegfx/source/polygon/b2dpolypolygontools.cxx
b/basegfx/source/polygon/b2dpolypolygontools.cxx
index 6e0a62f18a89..644e08bb6358 100644
--- a/basegfx/source/polygon/b2dpolypolygontools.cxx
+++ b/basegfx/source/polygon/b2dpolypolygontools.cxx
@@ -231,7 +231,7 @@ namespace basegfx
return fabs(getSigne
[Libreoffice-commits] core.git: canvas/source chart2/source codemaker/source include/codemaker
canvas/source/opengl/ogl_spritedevicehelper.cxx |8 ++--
canvas/source/vcl/canvashelper_texturefill.cxx | 13 +++-
chart2/source/controller/dialogs/DialogModel.cxx| 26 +++-
chart2/source/controller/sidebar/ChartElementsPanel.cxx |2 -
chart2/source/inc/TitleHelper.hxx |3 -
chart2/source/tools/StatisticsHelper.cxx| 12 ++-
chart2/source/tools/TitleHelper.cxx |5 +--
chart2/source/view/charttypes/VSeriesPlotter.cxx| 11 +++---
codemaker/source/codemaker/global.cxx |8
include/codemaker/global.hxx|3 -
10 files changed, 29 insertions(+), 62 deletions(-)
New commits:
commit 1a284d1f98069f55d5211882431f516691c2a6f0
Author: Noel Grandin
Date: Tue Oct 31 15:26:23 2017 +0200
loplugin:constantparam in c*
Change-Id: I10c7b62e6458062324367b94b207f776af79f598
Reviewed-on: https://gerrit.libreoffice.org/44129
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
diff --git a/canvas/source/opengl/ogl_spritedevicehelper.cxx
b/canvas/source/opengl/ogl_spritedevicehelper.cxx
index 1c2a0525c9f4..46535fc9a409 100644
--- a/canvas/source/opengl/ogl_spritedevicehelper.cxx
+++ b/canvas/source/opengl/ogl_spritedevicehelper.cxx
@@ -52,7 +52,7 @@ static void initContext()
glShadeModel(GL_FLAT);
}
-static void initTransformation(const ::Size& rSize, bool bMirror)
+static void initTransformation(const ::Size& rSize)
{
// use whole window
glViewport( 0,0,
@@ -62,9 +62,9 @@ static void initTransformation(const ::Size& rSize, bool
bMirror)
// model coordinate system is already in device pixel
glMatrixMode(GL_MODELVIEW);
glLoadIdentity();
-glTranslated(-1.0, (bMirror ? -1.0 : 1.0), 0.0);
+glTranslated(-1.0, 1.0, 0.0);
glScaled( 2.0 / rSize.Width(),
- (bMirror ? 2.0 : -2.0) / rSize.Height(),
+ -2.0 / rSize.Height(),
1.0 );
// clear to black
@@ -281,7 +281,7 @@ namespace oglcanvas
SystemChildWindow* pChildWindow = mxContext->getChildWindow();
const ::Size& rOutputSize = pChildWindow->GetSizePixel();
-initTransformation(rOutputSize, false);
+initTransformation(rOutputSize);
// render the actual spritecanvas content
mpSpriteCanvas->renderRecordedActions();
diff --git a/canvas/source/vcl/canvashelper_texturefill.cxx
b/canvas/source/vcl/canvashelper_texturefill.cxx
index 0452aca5fcd9..631f0f154458 100644
--- a/canvas/source/vcl/canvashelper_texturefill.cxx
+++ b/canvas/source/vcl/canvashelper_texturefill.cxx
@@ -488,9 +488,8 @@ namespace vclcanvas
const ::canvas::ParametricPolyPolygon::Values&
rValues,
const std::vector< ::Color >&
rColors,
const ::basegfx::B2DHomMatrix&
rTextureTransform,
- const ::tools::Rectangle&
rBounds,
- unsigned int
nStepCount,
- bool
bFillNonOverlapping )
+ const ::tools::Rectangle&
rBounds,
+ unsigned int
nStepCount )
{
switch( rValues.meType )
{
@@ -510,7 +509,7 @@ namespace vclcanvas
rTextureTransform,
rBounds,
nStepCount,
- bFillNonOverlapping,
+ false/*bFillNonOverlapping*/,
rValues,
rColors );
break;
@@ -585,8 +584,7 @@ namespace vclcanvas
rColors,
aTotalTransform,
aPolygonDeviceRectOrig,
-nStepCount,
-false );
+nStepCount );
rOutDev.Pop();
if( p2ndOutDev && nTransparency < 253 )
@@ -611,8 +609,7 @@ namespace vclcanvas
rColors,
aTotalTransform,
aPolygonDeviceRectOrig,
-nStepCount,
-false );
+nStepCount );
rOutDev.Pop();
if( p2ndOutDev && nTransparency < 253 )
diff --git a/chart2/source/controller/dialogs/DialogModel.cxx
b/chart2/source/controller/dialogs/DialogModel.cxx
index 2efc9f77db44..752908ec9c89 100644
[Libreoffice-commits] core.git: 2 commits - connectivity/source dbaccess/source desktop/source drawinglayer/source extensions/source forms/source include/connectivity include/drawinglayer svx/source
connectivity/source/commontools/DateConversion.cxx | 26 ++-
connectivity/source/commontools/TColumnsHelper.cxx |4 -
connectivity/source/commontools/TIndexes.cxx|2
connectivity/source/commontools/TKeys.cxx |4 -
connectivity/source/commontools/dbexception.cxx |4 -
connectivity/source/commontools/dbtools.cxx | 18 ++---
connectivity/source/commontools/dbtools2.cxx|4 -
connectivity/source/drivers/hsqldb/HTables.cxx |2
connectivity/source/drivers/hsqldb/HViews.cxx |6 -
connectivity/source/drivers/jdbc/DatabaseMetaData.cxx | 16 ++--
connectivity/source/drivers/jdbc/tools.cxx |5 -
connectivity/source/drivers/mysql/YTables.cxx |2
connectivity/source/drivers/mysql/YViews.cxx|6 -
connectivity/source/inc/java/tools.hxx |7 --
dbaccess/source/core/api/FilteredContainer.cxx |2
dbaccess/source/core/api/KeySet.cxx |2
dbaccess/source/core/api/SingleSelectQueryComposer.cxx | 17 ++--
dbaccess/source/core/api/column.cxx |4 -
dbaccess/source/core/api/definitioncolumn.cxx |2
dbaccess/source/core/api/tablecontainer.cxx |2
dbaccess/source/core/api/viewcontainer.cxx |2
dbaccess/source/core/dataaccess/ContentHelper.cxx |2
dbaccess/source/core/inc/sdbcoretools.hxx |2
dbaccess/source/core/misc/sdbcoretools.cxx |4 -
dbaccess/source/ui/app/AppController.cxx|4 -
dbaccess/source/ui/browser/sbagrid.cxx |2
dbaccess/source/ui/control/SqlNameEdit.cxx |6 -
dbaccess/source/ui/dlg/adminpages.cxx |4 -
dbaccess/source/ui/dlg/adminpages.hxx |7 --
dbaccess/source/ui/dlg/generalpage.cxx |2
dbaccess/source/ui/misc/DExport.cxx |2
dbaccess/source/ui/misc/WCopyTable.cxx |4 -
dbaccess/source/ui/querydesign/QueryDesignView.cxx |2
dbaccess/source/ui/querydesign/querycontroller.cxx |2
dbaccess/source/ui/relationdesign/RelationController.cxx|2
dbaccess/source/ui/tabledesign/TableController.cxx |4 -
dbaccess/source/ui/uno/copytablewizard.cxx |2
desktop/source/deployment/inc/dp_registry.hxx |2
desktop/source/deployment/manager/dp_manager.cxx|2
desktop/source/deployment/registry/dp_registry.cxx |4 -
drawinglayer/source/primitive3d/sdrextrudelathetools3d.cxx | 11 +--
drawinglayer/source/primitive3d/sdrextrudeprimitive3d.cxx |2
drawinglayer/source/primitive3d/sdrlatheprimitive3d.cxx |2
extensions/source/dbpilots/controlwizard.cxx|2
extensions/source/propctrlr/formcomponenthandler.cxx|2
extensions/source/propctrlr/formlinkdialog.cxx |2
forms/source/component/DatabaseForm.cxx |3
include/connectivity/dbconversion.hxx |2
include/connectivity/dbexception.hxx|3
include/connectivity/dbtools.hxx| 42
include/drawinglayer/primitive3d/sdrextrudelathetools3d.hxx |1
svx/source/form/tabwin.cxx |2
52 files changed, 115 insertions(+), 155 deletions(-)
New commits:
commit 8c9b5a901dcbb430bbf225ed0a2d7a286b1d5185
Author: Noel Grandin
Date: Tue Oct 31 12:57:08 2017 +0200
loplugin:constantparam in connectivity
Change-Id: Ia13d0931bbdf642fe04119ea1112788fb143eba8
Reviewed-on: https://gerrit.libreoffice.org/44110
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/connectivity/source/commontools/DateConversion.cxx
b/connectivity/source/commontools/DateConversion.cxx
index e51339378526..39acab5c1092 100644
--- a/connectivity/source/commontools/DateConversion.cxx
+++ b/connectivity/source/commontools/DateConversion.cxx
@@ -44,7 +44,7 @@ using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::util;
using namespace ::com::sun::star::uno;
-OUString DBTypeConversion::toSQLString(sal_Int32 eType, const Any& _rVal, bool
bQuote,
+OUString DBTypeConversion::toSQLString(sal_Int32 eType, const Any& _rVal,
const Reference< XTypeConverter
>& _rxTypeConverter)
{
OUStringBuffer aRet;
@@ -76,8 +76,7 @@ OUString DBTypeConversion::toSQLString(sal_Int32 eType, const
Any& _rVal, bool b
case DataType::CHAR:
case DataType::VARCHAR:
case DataType::LONGVARCHAR:
-if (bQuot
[Libreoffice-commits] core.git: filter/source
filter/source/graphicfilter/icgm/class4.cxx |6 -- 1 file changed, 4 insertions(+), 2 deletions(-) New commits: commit dae6ba564fcf20299b7a560aeb346efc84364d41 Author: Caolán McNamara Date: Tue Oct 31 15:42:27 2017 + ofz: Divide-by-zero Change-Id: Id6153afbfd04ac2eafc8a8670144e157cb527538 Reviewed-on: https://gerrit.libreoffice.org/44126 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/filter/source/graphicfilter/icgm/class4.cxx b/filter/source/graphicfilter/icgm/class4.cxx index 8bcb4b3f703a..659eba8d43ad 100644 --- a/filter/source/graphicfilter/icgm/class4.cxx +++ b/filter/source/graphicfilter/icgm/class4.cxx @@ -647,8 +647,10 @@ void CGM::ImplDoClass4() bool bDirection = ImplGetEllipse( aCenter, aRadius, fOrientation ); ImplGetVector( &vector[ 0 ] ); -fStartAngle = acos( vector[ 0 ] / sqrt( vector[ 0 ] * vector[ 0 ] + vector[ 1 ] * vector[ 1 ] ) ) * 57.29577951308; -fEndAngle = acos( vector[ 2 ] / sqrt( vector[ 2 ] * vector[ 2 ] + vector[ 3 ] * vector[ 3 ] ) ) * 57.29577951308; +double fStartSqrt = sqrt(vector[0] * vector[0] + vector[1] * vector[1]); +fStartAngle = fStartSqrt ? (acos(vector[0] / fStartSqrt) * 57.29577951308) : 0.0; +double fEndSqrt = sqrt(vector[2] * vector[2] + vector[3] * vector[3]); +fEndAngle = fEndSqrt ? (acos(vector[2] / fEndSqrt) * 57.29577951308) : 0.0; if ( vector[ 1 ] > 0 ) fStartAngle = 360 - fStartAngle; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/qt5' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/qt5' -
0 files changed New commits: commit 27b757bd1f848e69ebfc4068e99c7898a00e4a2d Author: Thorsten Behrens Date: Wed Nov 1 00:29:09 2017 +0100 Trigger CI Change-Id: I5680ac9f706af4e3df22c9105e2405c2c474caf6 ___ 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/view/drviews2.cxx | 114 +++--
1 file changed, 64 insertions(+), 50 deletions(-)
New commits:
commit 8ea346b87c8f62d93bec283515abae8db36a08ed
Author: Tomaž Vajngerl
Date: Sat Oct 28 12:23:56 2017 +0900
TSCP: don't modify the class. object, delete and create a new one
In Impress advanced classification, a new text object is created
the first time and added to a master page, and then later,
if changed, the object ismodified. The modification however
didn't work, so instead of modifiying, try to delete all text
objects (identified for classification) from the master page and
then create a new one from scratch.
Change-Id: I2263949a1c08e98ce066883648d866175f42c91d
Reviewed-on: https://gerrit.libreoffice.org/44016
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index e96a69db7c60..f041d80e92ac 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -265,11 +265,10 @@ class ClassificationCollector
private:
sd::DrawViewShell& m_rDrawViewShell;
std::vector m_aResults;
-SdrRectObj* m_pRectObject;
+
public:
ClassificationCollector(sd::DrawViewShell & rDrawViewShell)
: m_rDrawViewShell(rDrawViewShell)
-, m_pRectObject(nullptr)
{}
std::vector getResults()
@@ -277,11 +276,6 @@ public:
return m_aResults;
}
-SdrRectObj* getObject()
-{
-return m_pRectObject;
-}
-
bool collect()
{
OUString sPolicy =
SfxClassificationHelper::policyTypeToString(SfxClassificationHelper::getPolicyType());
@@ -320,7 +314,6 @@ public:
if (hasCustomPropertyField(aSections, sKey))
{
bFound = true;
-m_pRectObject = pRectObject;
const OUString sBlank("");
sal_Int32 nCurrentParagraph = -1;
@@ -392,19 +385,59 @@ public:
class ClassificationInserter
{
+private:
sd::DrawViewShell& m_rDrawViewShell;
+
+/// Delete the previous existing classification object(s) - if they exists
+void deleteExistingObjects()
+{
+OUString sPolicy =
SfxClassificationHelper::policyTypeToString(SfxClassificationHelper::getPolicyType());
+OUString sKey = sPolicy + "BusinessAuthorizationCategory:Name";
+
+const sal_uInt16 nCount =
m_rDrawViewShell.GetDoc()->GetMasterSdPageCount(PageKind::Standard);
+
+for (sal_uInt16 nPageIndex = 0; nPageIndex < nCount; ++nPageIndex)
+{
+SdPage* pMasterPage =
m_rDrawViewShell.GetDoc()->GetMasterSdPage(nPageIndex, PageKind::Standard);
+for (size_t nObject = 0; nObject < pMasterPage->GetObjCount();
++nObject)
+{
+SdrObject* pObject = pMasterPage->GetObj(nObject);
+SdrRectObj* pRectObject = dynamic_cast(pObject);
+if (pRectObject && pRectObject->GetTextKind() == OBJ_TEXT)
+{
+OutlinerParaObject* pOutlinerParagraphObject =
pRectObject->GetOutlinerParaObject();
+if (pOutlinerParagraphObject)
+{
+const EditTextObject& rEditText =
pOutlinerParagraphObject->GetTextObject();
+std::vector aSections;
+rEditText.GetAllSections(aSections);
+
+if (hasCustomPropertyField(aSections, sKey))
+{
+
pMasterPage->RemoveObject(pRectObject->GetOrdNum());
+}
+}
+}
+}
+}
+}
+
public:
ClassificationInserter(sd::DrawViewShell & rDrawViewShell)
: m_rDrawViewShell(rDrawViewShell)
{}
-bool insert(std::vector const & rResults,
SdrRectObj* pRectObj)
+
+bool insert(std::vector const & rResults)
{
// Set to MASTER mode
EditMode eOldMode = m_rDrawViewShell.GetEditMode();
if (eOldMode != EditMode::MasterPage)
m_rDrawViewShell.ChangeEditMode(EditMode::MasterPage, false);
+// Delete the previous existing object - if exists
+deleteExistingObjects();
+
uno::Reference xDocumentProperties =
SfxObjectShell::Current()->getDocProperties();
// Clear properties
@@ -424,21 +457,10 @@ public:
OUString sPolicy =
SfxClassificationHelper::policyTypeToString(SfxClassificationHelper::getPolicyType());
sal_Int32 nTextNumber = 1;
-Outliner* pOutliner;
-OutlinerMode eOutlinerMode = OutlinerMode::DontKnow;
-if (pRectObj == nullptr)
-{
-pOutliner = m_rDrawViewShell.GetDoc()->GetInternalOutliner();
-eOutlinerMode = pOutliner->GetMode();
-pOutliner->Init(OutlinerMode::TextObj
[Libreoffice-commits] core.git: Changes to 'feature/qt5'
New branch 'feature/qt5' available with the following commits: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: editeng/source include/tools sw/source
editeng/source/uno/unoipset.cxx | 16 ++--
include/tools/helpers.hxx | 18 +-
sw/source/filter/xml/xmlimp.cxx | 20 +---
3 files changed, 24 insertions(+), 30 deletions(-)
New commits:
commit 013618308c2d24702de18c12922931b130b6fade
Author: Caolán McNamara
Date: Tue Oct 31 08:54:42 2017 +
ofz#3934 Integer-overflow
Change-Id: I2c58cca6f01d7c50244dfec6acdfaa988cdbaa07
Reviewed-on: https://gerrit.libreoffice.org/44102
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/editeng/source/uno/unoipset.cxx b/editeng/source/uno/unoipset.cxx
index cc2a5c6c1861..8d4b41e4ffb1 100644
--- a/editeng/source/uno/unoipset.cxx
+++ b/editeng/source/uno/unoipset.cxx
@@ -19,9 +19,8 @@
#include
#include
-
#include
-
+#include
#include
#include
#include
@@ -272,9 +271,6 @@ uno::Reference< beans::XPropertySetInfo > const &
SvxItemPropertySet::getProper
#ifndef TWIPS_TO_MM
#define TWIPS_TO_MM(val) ((val * 127 + 36) / 72)
#endif
-#ifndef MM_TO_TWIPS
-#define MM_TO_TWIPS(val) ((val * 72 + 63) / 127)
-#endif
/** converts the given any with a metric to 100th/mm if needed */
void SvxUnoConvertToMM( const MapUnit eSourceMapUnit, uno::Any & rMetric )
throw()
@@ -324,19 +320,19 @@ void SvxUnoConvertFromMM( const MapUnit
eDestinationMapUnit, uno::Any & rMetric
switch( rMetric.getValueTypeClass() )
{
case uno::TypeClass_BYTE:
-rMetric <<=
(sal_Int8)(MM_TO_TWIPS(*o3tl::forceAccess(rMetric)));
+rMetric <<=
(sal_Int8)(sanitiseMm100ToTwip(*o3tl::forceAccess(rMetric)));
break;
case uno::TypeClass_SHORT:
-rMetric <<=
(sal_Int16)(MM_TO_TWIPS(*o3tl::forceAccess(rMetric)));
+rMetric <<=
(sal_Int16)(sanitiseMm100ToTwip(*o3tl::forceAccess(rMetric)));
break;
case uno::TypeClass_UNSIGNED_SHORT:
-rMetric <<=
(sal_uInt16)(MM_TO_TWIPS(*o3tl::forceAccess(rMetric)));
+rMetric <<=
(sal_uInt16)(sanitiseMm100ToTwip(*o3tl::forceAccess(rMetric)));
break;
case uno::TypeClass_LONG:
-rMetric <<=
(sal_Int32)(MM_TO_TWIPS(*o3tl::forceAccess(rMetric)));
+rMetric <<=
(sal_Int32)(sanitiseMm100ToTwip(*o3tl::forceAccess(rMetric)));
break;
case uno::TypeClass_UNSIGNED_LONG:
-rMetric <<=
(sal_uInt32)(MM_TO_TWIPS(*o3tl::forceAccess(rMetric)));
+rMetric <<=
(sal_uInt32)(sanitiseMm100ToTwip(*o3tl::forceAccess(rMetric)));
break;
default:
OSL_FAIL("AW: Missing unit translation to 100th mm!");
diff --git a/include/tools/helpers.hxx b/include/tools/helpers.hxx
index 30064cf93fc6..8325f095bad8 100644
--- a/include/tools/helpers.hxx
+++ b/include/tools/helpers.hxx
@@ -11,7 +11,7 @@
#include
#include
-
+#include
#include
#include
@@ -55,6 +55,22 @@ inline long FRound( double fVal )
return fVal > 0.0 ? static_cast( fVal + 0.5 ) : -static_cast(
-fVal + 0.5 );
}
+// return (n >= 0)? (n*72+63)/127: (n*72-63)/127;
+inline sal_Int64 sanitiseMm100ToTwip(sal_Int64 n)
+{
+if (n >= 0)
+{
+if (o3tl::checked_multiply(n, 72, n) ||
o3tl::checked_add(n, 63, n))
+n = SAL_MAX_INT64;
+}
+else
+{
+if (o3tl::checked_multiply(n, 72, n) ||
o3tl::checked_sub(n, 63, n))
+n = SAL_MIN_INT64;
+}
+return n / 127;
+}
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index f2f583fbf63e..f46cf200a416 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -70,6 +70,7 @@
#include
#include
#include
+#include
#include
#include
@@ -972,25 +973,6 @@ SvXMLImportContext *SwXMLImport::CreateFontDeclsContext(
return pFSContext;
}
-namespace
-{
-// return (n >= 0)? (n*72+63)/127: (n*72-63)/127;
-sal_Int64 sanitiseMm100ToTwip(sal_Int64 n)
-{
-if (n >= 0)
-{
-if (o3tl::checked_multiply(n, 72, n) ||
o3tl::checked_add(n, 63, n))
-n = SAL_MAX_INT64;
-}
-else
-{
-if (o3tl::checked_multiply(n, 72, n) ||
o3tl::checked_sub(n, 63, n))
-n = SAL_MIN_INT64;
-}
-return n / 127;
-}
-}
-
void SwXMLImport::SetViewSettings(const Sequence < PropertyValue > &
aViewProps)
{
if (IsInsertMode() || IsStylesOnlyMode() || IsBlockMode() ||
m_bOrganizerMode || !GetModel().is() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: emfio/source
emfio/source/reader/emfreader.cxx | 11 +++
1 file changed, 7 insertions(+), 4 deletions(-)
New commits:
commit aab1018339fba9e6c618a17dfb2a01464555c4dc
Author: Caolán McNamara
Date: Tue Oct 31 09:02:24 2017 +
ofz#3939 Integer-overflow
Change-Id: Ic35cf6dd77d536ba3ab486b1c752d81037fe7cae
Reviewed-on: https://gerrit.libreoffice.org/44103
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/emfio/source/reader/emfreader.cxx
b/emfio/source/reader/emfreader.cxx
index cfcb6e3feea5..bcd8b7a83855 100644
--- a/emfio/source/reader/emfreader.cxx
+++ b/emfio/source/reader/emfreader.cxx
@@ -1413,14 +1413,17 @@ namespace emfio
ReadDIB(aBitmap, aTmp, true);
// test if it is sensible to crop
-if ( ( cxSrc > 0 ) && ( cySrc > 0 ) &&
-( xSrc >= 0 ) && ( ySrc >= 0 ) &&
-( xSrc + cxSrc <=
aBitmap.GetSizePixel().Width() ) &&
-( ySrc + cySrc <=
aBitmap.GetSizePixel().Height() ) )
+if ( (cxSrc > 0) && (cySrc > 0) &&
+ (xSrc >= 0) && (ySrc >= 0) &&
+ (aBitmap.GetSizePixel().Width() >= cxSrc)
&&
+ (xSrc <= aBitmap.GetSizePixel().Width() -
cxSrc) &&
+ (aBitmap.GetSizePixel().Height() >=
cySrc) &&
+ (ySrc <= aBitmap.GetSizePixel().Height()
- cySrc) )
{
tools::Rectangle aCropRect( Point( xSrc,
ySrc ), Size( cxSrc, cySrc ) );
aBitmap.Crop( aCropRect );
}
+
maBmpSaveList.emplace_back(new
BSaveStruct(aBitmap, aRect, dwRop));
}
}
___
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/filter/ww8/ww8par.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit b3788aeede87fdbe8566d223bca80ef1a5d48845
Author: Caolán McNamara
Date: Tue Oct 31 14:05:06 2017 +
ofz#3953 Integer-overflow
Change-Id: Iaf50389680926989170340982337d1e760a2ec3a
Reviewed-on: https://gerrit.libreoffice.org/44120
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 52862a07d17d..5caf9c1772b3 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -2057,6 +2057,9 @@ void WW8ReaderSave::Restore( SwWW8ImplReader* pRdr )
void SwWW8ImplReader::Read_HdFtFootnoteText( const SwNodeIndex* pSttIdx,
WW8_CP nStartCp, WW8_CP nLen, ManTypes nType )
{
+if (nStartCp < 0 || nLen < 0)
+return;
+
// Saves Flags (amongst other things) and resets them
WW8ReaderSave aSave( this );
___
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/filter/ww8/ww8scan.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 18dc74eb341bab121caac37b2525bc332a20324f Author: Caolán McNamara Date: Tue Oct 31 15:38:29 2017 + ofz: Integer-overflow Change-Id: I29dbad16a8098ca93af0fda461d151cd310eef4c Reviewed-on: https://gerrit.libreoffice.org/44124 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index 4afa6b66a32b..e07b12129518 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -1885,7 +1885,7 @@ static bool WW8GetFieldPara(WW8PLCFspecial& rPLCF, WW8FieldDesc& rF) // still new (nested) beginnings ? WW8SkipField( rPLCF ); // nested Field in description rF.bCodeNest = true; -if( !rPLCF.Get( rF.nSRes, pData ) ) +if (!rPLCF.Get(rF.nSRes, pData) || rF.nSRes < 0) goto Err; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: emfio/source
emfio/source/reader/emfreader.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit d4dba27466b0f89226b073277c3ffc48161bd9e8
Author: Caolán McNamara
Date: Tue Oct 31 14:31:31 2017 +
ofz#3951 Integer-overflow
Change-Id: I30a6b7c00cc7895ed4c307fe0bbe685bd29217ed
Reviewed-on: https://gerrit.libreoffice.org/44121
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/emfio/source/reader/emfreader.cxx
b/emfio/source/reader/emfreader.cxx
index 4205d8dee225..cfcb6e3feea5 100644
--- a/emfio/source/reader/emfreader.cxx
+++ b/emfio/source/reader/emfreader.cxx
@@ -1538,8 +1538,10 @@ namespace emfio
// const basegfx::B2DVector aTransVec(aWT *
basegfx::B2DVector(aLogFont.lfWidth, aLogFont.lfHeight));
// aLogFont.lfWidth = aTransVec.getX();
// aLogFont.lfHeight = aTransVec.getY();
-if (mpInputStream->good())
+if (mpInputStream->good() && aLogFont.lfHeight !=
SAL_MIN_INT32 && aLogFont.lfWidth != SAL_MIN_INT32)
+{
CreateObjectIndexed(nIndex,
o3tl::make_unique( aLogFont ));
+}
}
}
break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configmgr/source
configmgr/source/winreg.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e90329ff3896cf33528b47830f49fcd05590bd6a
Author: Andras Timar
Date: Tue Oct 31 23:40:06 2017 +0100
typo: xs::boolean -> xs:boolean
Change-Id: I4a7df6bf56a5b8367d3717fc4e48b535e829e96f
diff --git a/configmgr/source/winreg.cxx b/configmgr/source/winreg.cxx
index 995202806931..773775dfde92 100644
--- a/configmgr/source/winreg.cxx
+++ b/configmgr/source/winreg.cxx
@@ -77,7 +77,7 @@ namespace {
// "Type"="xs:boolean"
// becomes the following in configuration:
//
-//
+//
// false
//
//
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[ANN] mdds 1.3.0 has been released
Hi there, Just to let you all know that we've just released mdds 1.3.0, and the internal mdds package on the master branch now uses this latest version. This is an API compatible release from the previous one, so the API version remains 1.2. The main difference in this release is the removal of block storage indirection which has been primarily contributed from Dennis Francis. Although the scope of the change may be small, a substantial amount of changes has been made to a large part of multi_type_vector to make this happen. I've done my best to review the change, and ensured that all tests - normal ones and memory tests - pass, there is always a risk for regression. So please watch out for any potential issues. Thanks! Kohei ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: configure.ac sw/source
configure.ac |2 +-
sw/source/core/edit/edfcol.cxx |4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 3bb58b6b42ca4b96dfbe2c3ac82f77a8e98b7db6
Author: Andrea Gelmini
Date: Tue Oct 31 21:53:42 2017 +0100
Fix typos
Change-Id: I89d6849a166a245eec7654ea6e1cfd62ee0c3c60
Reviewed-on: https://gerrit.libreoffice.org/44138
Reviewed-by: Julien Nabet
Tested-by: Julien Nabet
diff --git a/configure.ac b/configure.ac
index 752c78272d7c..30e0de323c99 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6476,7 +6476,7 @@ AC_SUBST([JITC_PROCESSOR_TYPE])
# Misc Windows Stuff
AC_ARG_WITH(ucrt-dir,
AS_HELP_STRING([--with-ucrt-dir],
-[path to the directory with the arch-specific subdirectories of the
Windows Universtal CRT redistributables
+[path to the directory with the arch-specific subdirectories of the
Windows Universal CRT redistributables
from the Windows 10 SDK for packaging into the installsets (without
those the target system needs to install
the Visual C++ Runtimes manually)]),
,)
diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx
index d6ee2c0f8af0..0162cfaab48e 100644
--- a/sw/source/core/edit/edfcol.cxx
+++ b/sw/source/core/edit/edfcol.cxx
@@ -804,7 +804,7 @@ std::vector
SwEditShell::CollectAdvancedClassificatio
uno::Reference
xTextPortionEnumerationAccess(xParagraphs->nextElement(), uno::UNO_QUERY);
uno::Reference xTextPortions =
xTextPortionEnumerationAccess->createEnumeration();
-// Check font weitght
+// Check font weight
uno::Reference
xParagraphPropertySet(xTextPortionEnumerationAccess, uno::UNO_QUERY_THROW);
uno::Any aAny = xParagraphPropertySet->getPropertyValue("CharWeight");
@@ -812,7 +812,7 @@ std::vector
SwEditShell::CollectAdvancedClassificatio
aResult.push_back({ svx::ClassificationType::PARAGRAPH, sWeight,
sBlank });
-// Process portions..
+// Process portions
while (xTextPortions->hasMoreElements())
{
uno::Reference
xTextPortion(xTextPortions->nextElement(), uno::UNO_QUERY);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/redland
external/redland/ExternalProject_rasqal.mk |2 +- external/redland/ExternalProject_redland.mk |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 2ab246dee99cc94957647cde44515e97b854aac0 Author: osnola Date: Tue Oct 31 12:23:31 2017 +0100 redland: pass opt. flags to configure Change-Id: Iab2e324ce1b7a7b64970b30314f1078d7e1d6ba5 Reviewed-on: https://gerrit.libreoffice.org/44112 Tested-by: Jenkins Reviewed-by: David Tardon diff --git a/external/redland/ExternalProject_rasqal.mk b/external/redland/ExternalProject_rasqal.mk index 5f350233e673..92e7adce08ff 100644 --- a/external/redland/ExternalProject_rasqal.mk +++ b/external/redland/ExternalProject_rasqal.mk @@ -21,7 +21,7 @@ $(eval $(call gb_ExternalProject_register_targets,rasqal,\ $(call gb_ExternalProject_get_state_target,rasqal,build): $(call gb_ExternalProject_run,build,\ - CFLAGS="$(CFLAGS) $(if $(filter TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden)" \ + CFLAGS="$(CFLAGS) $(if $(filter TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \ LDFLAGS=" \ $(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN") \ $(if $(SYSBASE),$(if $(filter LINUX SOLARIS,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl))" \ diff --git a/external/redland/ExternalProject_redland.mk b/external/redland/ExternalProject_redland.mk index 6203fccd3d7c..8c840ef87997 100644 --- a/external/redland/ExternalProject_redland.mk +++ b/external/redland/ExternalProject_redland.mk @@ -22,7 +22,7 @@ $(eval $(call gb_ExternalProject_register_targets,redland,\ $(call gb_ExternalProject_get_state_target,redland,build): $(call gb_ExternalProject_run,build,\ - CFLAGS="$(CFLAGS) $(if $(filter TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden)" \ + CFLAGS="$(CFLAGS) $(if $(filter TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \ LDFLAGS=" \ $(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN") \ $(if $(SYSBASE),$(if $(filter LINUX SOLARIS,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl))" \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/openldap
external/openldap/ExternalProject_openldap.mk |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 73419efbe2402a78354615a4b564674a02741eee Author: osnola Date: Tue Oct 31 12:22:41 2017 +0100 openldap: pass opt. flags to configure Change-Id: Iffd71c9d662a0461ea663979e0c4a5bd8760d56a Reviewed-on: https://gerrit.libreoffice.org/44111 Tested-by: Jenkins Reviewed-by: David Tardon diff --git a/external/openldap/ExternalProject_openldap.mk b/external/openldap/ExternalProject_openldap.mk index 6e66c436de9a..0c7aaa6ae17d 100644 --- a/external/openldap/ExternalProject_openldap.mk +++ b/external/openldap/ExternalProject_openldap.mk @@ -41,10 +41,10 @@ $(call gb_ExternalProject_get_state_target,openldap,build) : ac_cv_func_memcmp_working=yes \ ) \ $(if $(SYSTEM_NSS), \ - CPPFLAGS="$(CPPFLAGS) $(NSS_CFLAGS)" CFLAGS="$(CFLAGS) $(NSS_CFLAGS)" LDFLAGS="$(LDFLAGS) $(NSS_LIBS)" \ + CPPFLAGS="$(CPPFLAGS) $(NSS_CFLAGS)" CFLAGS="$(CFLAGS) $(NSS_CFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" LDFLAGS="$(LDFLAGS) $(NSS_LIBS)" \ , \ CPPFLAGS="$(CPPFLAGS) -I$(call gb_UnpackedTarball_get_dir,nss)/dist/public/nss -I$(call gb_UnpackedTarball_get_dir,nss)/dist/out/include" \ - CFLAGS="$(CFLAGS) -I$(call gb_UnpackedTarball_get_dir,nss)/dist/public/nss -I$(call gb_UnpackedTarball_get_dir,nss)/dist/out/include" \ + CFLAGS="$(CFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) -I$(call gb_UnpackedTarball_get_dir,nss)/dist/public/nss -I$(call gb_UnpackedTarball_get_dir,nss)/dist/out/include" \ ) \ $(if $(openldap_LDFLAGS),LDFLAGS="$(LDFLAGS) $(openldap_LDFLAGS)") \ && MAKEFLAGS= && $(MAKE) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/docvw/srcedtw.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit a83a0345e493b928b0b0b93bf106ddb71df69893
Author: Aron Budea
Date: Tue Oct 31 13:15:34 2017 +0100
tdf#113548: another case of crash in GrabFocus during dispose
Change-Id: I70776b80f70985a122e28854177c6d0c43839d65
Reviewed-on: https://gerrit.libreoffice.org/44113
Reviewed-by: Aron Budea
Tested-by: Aron Budea
diff --git a/sw/source/uibase/docvw/srcedtw.cxx
b/sw/source/uibase/docvw/srcedtw.cxx
index 5d6a131bfcbb..bf49abb9bf7c 100644
--- a/sw/source/uibase/docvw/srcedtw.cxx
+++ b/sw/source/uibase/docvw/srcedtw.cxx
@@ -793,7 +793,8 @@ void SwSrcEditWindow::HandleWheelCommand( const
CommandEvent& rCEvt )
void SwSrcEditWindow::GetFocus()
{
-m_pOutWin->GrabFocus();
+if (m_pOutWin)
+m_pOutWin->GrabFocus();
}
static bool lcl_GetLanguagesForEncoding(rtl_TextEncoding eEnc, LanguageType
aLanguages[])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/ooxmlexport/ooxmlexport11.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 97ffdd33cae49f9fd039206cbcd6fc0a10bb1757
Author: Justin Luth
Date: Tue Oct 31 13:27:01 2017 +0300
related tdf#82065: tinderbox failed - give some unit test allowance
Change-Id: I64e29a1b4a90ae3a840659c9636b921661397c1f
Reviewed-on: https://gerrit.libreoffice.org/44108
Tested-by: Jenkins
Reviewed-by: Justin Luth
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index bb368bccbfcc..1375a2edef89 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -59,7 +59,7 @@ DECLARE_OOXMLEXPORT_TEST(testTdf82065_Ind_start_strict,
"tdf82065_Ind_start_stri
if (rProp.Name == "IndentAt")
{
-CPPUNIT_ASSERT_EQUAL_MESSAGE("IndentAt", sal_uInt32(6001),
rProp.Value.get() );
+CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("IndentAt", double(6001),
rProp.Value.get(), 10 );
bFoundIndentAt = true;
}
}
___
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/core/edit/edfcol.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit fcb532e730d9f2d4d1a70a33797f60186c651a61
Author: Szymon KÅos
Date: Tue Oct 31 10:08:28 2017 +0100
Watermark: set Auto size
Change-Id: I8800094387ec5fdc49e21c7c02bfc419f13998ed
Reviewed-on: https://gerrit.libreoffice.org/44104
Tested-by: Jenkins
Reviewed-by: Szymon KÅos
diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx
index 457fb80a01b8..d6ee2c0f8af0 100644
--- a/sw/source/core/edit/edfcol.cxx
+++ b/sw/source/core/edit/edfcol.cxx
@@ -89,6 +89,7 @@
#include
#define WATERMARK_NAME "PowerPlusWaterMarkObject"
+#define WATERMARK_AUTO_SIZE sal_uInt32(1)
namespace
{
@@ -1294,6 +1295,7 @@ void lcl_placeWatermarkInHeader(const SfxWatermarkItem&
rWatermark,
xPropertySet->setPropertyValue(UNO_NAME_TEXT_WRAP,
uno::makeAny(text::WrapTextMode_THROUGH));
xPropertySet->setPropertyValue(UNO_NAME_VERT_ORIENT_RELATION,
uno::makeAny(static_cast(text::RelOrientation::PAGE_PRINT_AREA)));
xPropertySet->setPropertyValue(UNO_NAME_CHAR_FONT_NAME,
uno::makeAny(sFont));
+xPropertySet->setPropertyValue(UNO_NAME_CHAR_HEIGHT,
uno::makeAny(WATERMARK_AUTO_SIZE));
xPropertySet->setPropertyValue("Transformation",
uno::makeAny(aMatrix));
xPropertySet->setPropertyValue(UNO_NAME_HORI_ORIENT,
uno::makeAny(static_cast(text::HoriOrientation::CENTER)));
xPropertySet->setPropertyValue(UNO_NAME_VERT_ORIENT,
uno::makeAny(static_cast(text::VertOrientation::CENTER)));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - oox/source sd/qa
oox/source/export/drawingml.cxx | 17 +
sd/qa/unit/data/pptx/group-rot.pptx |binary
sd/qa/unit/data/pptx/group.pptx |binary
sd/qa/unit/export-tests-ooxml2.cxx | 30 ++
4 files changed, 47 insertions(+)
New commits:
commit 8d366246234e5df784e7596e4c5b21891ae463c1
Author: Szymon KÅos
Date: Tue Oct 24 22:39:08 2017 +0200
PPTX export: correct position of rotated groups
* added testcase for tdf#113263
Change-Id: I7abf68d8fb4ffd8b883cfbf4d69916912add8182
Reviewed-on: https://gerrit.libreoffice.org/43794
Tested-by: Jenkins
Reviewed-by: Szymon KÅos
Reviewed-on: https://gerrit.libreoffice.org/44082
Reviewed-by: Andras Timar
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index e33dca9f5fe6..40e0c7abe7d2 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1174,11 +1174,17 @@ void DrawingML::WriteShapeTransformation( const
Reference< XShape >& rXShape, sa
awt::Point aPos = rXShape->getPosition();
awt::Size aSize = rXShape->getSize();
+bool bPositiveY = true;
+bool bPositiveX = true;
+
if (m_xParent.is())
{
awt::Point aParentPos = m_xParent->getPosition();
aPos.X -= aParentPos.X;
aPos.Y -= aParentPos.Y;
+
+bPositiveX = aParentPos.X > 0;
+bPositiveY = aParentPos.Y > 0;
}
if ( aSize.Width < 0 )
@@ -1196,6 +1202,17 @@ void DrawingML::WriteShapeTransformation( const
Reference< XShape >& rXShape, sa
aPos.X-=(1-faccos*cos(nRotation*F_PI18000))*aSize.Width/2-facsin*sin(nRotation*F_PI18000)*aSize.Height/2;
aPos.Y-=(1-faccos*cos(nRotation*F_PI18000))*aSize.Height/2+facsin*sin(nRotation*F_PI18000)*aSize.Width/2;
}
+else if(nRotation == 18000)
+{
+if (!bFlipV && bPositiveX)
+{
+aPos.X -= aSize.Width;
+}
+if (!bFlipH && bPositiveY)
+{
+aPos.Y -= aSize.Height;
+}
+}
// The RotateAngle property's value is independent from any flipping,
and that's exactly what we need here.
uno::Reference xPropertySet(rXShape,
uno::UNO_QUERY);
diff --git a/sd/qa/unit/data/pptx/group-rot.pptx
b/sd/qa/unit/data/pptx/group-rot.pptx
new file mode 100755
index ..11b2d6367da0
Binary files /dev/null and b/sd/qa/unit/data/pptx/group-rot.pptx differ
diff --git a/sd/qa/unit/data/pptx/group.pptx b/sd/qa/unit/data/pptx/group.pptx
new file mode 100755
index ..8895fe2a2203
Binary files /dev/null and b/sd/qa/unit/data/pptx/group.pptx differ
diff --git a/sd/qa/unit/export-tests-ooxml2.cxx
b/sd/qa/unit/export-tests-ooxml2.cxx
index edac049c2ba7..9bad50abbdab 100644
--- a/sd/qa/unit/export-tests-ooxml2.cxx
+++ b/sd/qa/unit/export-tests-ooxml2.cxx
@@ -109,6 +109,8 @@ public:
void testTdf112552();
void testTdf112647();
void testSmartartRotation2();
+void testGroupsPosition();
+void testGroupsRotatedPosition();
void testAccentColor();
CPPUNIT_TEST_SUITE(SdOOXMLExportTest2);
@@ -140,6 +142,8 @@ public:
CPPUNIT_TEST(testTdf112552);
CPPUNIT_TEST(testTdf112647);
CPPUNIT_TEST(testSmartartRotation2);
+CPPUNIT_TEST(testGroupsPosition);
+CPPUNIT_TEST(testGroupsRotatedPosition);
CPPUNIT_TEST(testAccentColor);
CPPUNIT_TEST_SUITE_END();
@@ -842,6 +846,32 @@ void SdOOXMLExportTest2::testSmartartRotation2()
assertXPath(pXmlDocContent,
"/p:sld/p:cSld/p:spTree/p:sp[3]/p:txBody/a:bodyPr", "rot", "1080");
}
+void SdOOXMLExportTest2::testGroupsPosition()
+{
+::sd::DrawDocShellRef xDocShRef =
loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/group.pptx"), PPTX);
+utl::TempFile tempFile;
+xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
+xDocShRef->DoClose();
+
+xmlDocPtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml");
+assertXPath(pXmlDocContent,
"/p:sld/p:cSld/p:spTree/p:sp[3]/p:spPr/a:xfrm/a:off", "x", "4817880");
+assertXPath(pXmlDocContent,
"/p:sld/p:cSld/p:spTree/p:sp[3]/p:spPr/a:xfrm/a:off", "y", "1810440");
+assertXPath(pXmlDocContent,
"/p:sld/p:cSld/p:spTree/p:sp[1]/p:spPr/a:xfrm/a:off", "x", "457200");
+assertXPath(pXmlDocContent,
"/p:sld/p:cSld/p:spTree/p:sp[1]/p:spPr/a:xfrm/a:off", "y", "1798560");
+}
+
+void SdOOXMLExportTest2::testGroupsRotatedPosition()
+{
+::sd::DrawDocShellRef xDocShRef =
loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/group-rot.pptx"),
PPTX);
+utl::TempFile tempFile;
+xDocShRef = saveAndReload(xDocShRef.get(), PPTX, &tempFile);
+xDocShRef->DoClose();
+
+xmlDocPtr pXmlDocContent = parseExport(tempFile, "ppt/slides/slide1.xml");
+assertXPath(pXmlDocContent,
"/p:sld/p:cSld/p:spTree/p:sp[3]/p:spPr/a:xfrm/a:off", "x", "2857320");
+assertXPath(pXmlDocContent,
"/p:sld/p:cSld/p:spTree/p:sp[3]/p
[Libreoffice-commits] core.git: wizards/source
wizards/source/access2base/Module.xba |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 6ceed2e47bf5567c3e01e2cc9bffd566958848ba Author: Jean-Pierre Ledure Date: Tue Oct 31 17:00:24 2017 +0100 Access2Base - Correct parsing error in Module Error occurrs when function name starts with "REM" diff --git a/wizards/source/access2base/Module.xba b/wizards/source/access2base/Module.xba index 64eea2f102c9..4e6156c81b9f 100644 --- a/wizards/source/access2base/Module.xba +++ b/wizards/source/access2base/Module.xba @@ -496,7 +496,7 @@ Dim bEndStatement As Boolean, bQuote As Boolean plStart = lStart + 1 sMatch = Right(sMatch, Len(sMatch) - 1) End If - Case UCase(Left(sMatch, 3)) = "REM" + Case UCase(Left(sMatch, 4)) = "REM " Or UCase(Left(sMatch, 4)) = "REM" & vbTab Or UCase(Left(sMatch, 4)) = "REM" & vbNewLine bEndStatement = True Case UCase(Left(sMatch, 4)) = "THEN" Or UCase(Left(sMatch, 4)) = "ELSE" If psPattern = "%$" Then @@ -610,7 +610,7 @@ Const cstName = "\w*" '"[A-Za-z_][A-Za-z_0-9]*" ReDim Preserve _ProcDecPositions(0 To iProc) ReDim Preserve _ProcEndPositions(0 To iProc) ReDim Preserve _ProcTypes(0 To iProc) - _ProcDecpositions(iProc) = lPosition + _ProcDecPositions(iProc) = lPosition lPosition = lPosition + Len(sDecProc) ' Identify procedure type Select Case True ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - loleaflet/src
loleaflet/src/control/Control.Menubar.js |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit c46441b0f82d1957fd6b021017fa8e83f89f7a88
Author: Jan Holesovsky
Date: Fri Oct 27 08:44:44 2017 +0200
Use just "Language" in the Calc and Impress Tools menu.
Change-Id: If5bcaf0e7e3aa8867682afaaee87645b05182143
Reviewed-on: https://gerrit.libreoffice.org/43929
Reviewed-by: Aron Budea
Tested-by: Aron Budea
diff --git a/loleaflet/src/control/Control.Menubar.js
b/loleaflet/src/control/Control.Menubar.js
index 42976fc2..c31f6edb 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -246,7 +246,7 @@ L.Control.Menubar = L.Control.extend({
},
{name: _('Tools'), id: 'tools', type: 'menu', menu: [
{name: _('Automatic spell checking'), type:
'unocommand', uno: '.uno:SpellOnline'},
- {name: _('Language for entire document'), type:
'menu', menu: [
+ {name: _('Language'), type: 'menu', menu: [
{name: _('None (Do not check
spelling)'), id: 'nonelanguage', type: 'unocommand', uno:
'.uno:LanguageStatus?Language:string=Default_LANGUAGE_NONE'}]}
]},
{name: _('Help'), id: 'help', type: 'menu', menu: [
@@ -301,7 +301,7 @@ L.Control.Menubar = L.Control.extend({
},
{name: _('Tools'), id: 'tools', type: 'menu', menu: [
{name: _('Automatic spell checking'), type:
'unocommand', uno: '.uno:SpellOnline'},
- {name: _('Language for entire document'), type:
'menu', menu: [
+ {name: _('Language'), type: 'menu', menu: [
{name: _('None (Do not check
spelling)'), id: 'nonelanguage', type: 'unocommand', uno:
'.uno:LanguageStatus?Language:string=Default_LANGUAGE_NONE'}]}
]},
{name: _('Help'), id: 'help', type: 'menu', menu: [
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source
filter/source/graphicfilter/icgm/actimpr.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit f550ed4db708bd892b75bead4731bd67d30a8949 Author: Caolán McNamara Date: Tue Oct 31 08:57:01 2017 + ofz#3932 Divide-by-zero Change-Id: I912e082826f8433254edafe146bf5e746fdf914a Reviewed-on: https://gerrit.libreoffice.org/44100 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/filter/source/graphicfilter/icgm/actimpr.cxx b/filter/source/graphicfilter/icgm/actimpr.cxx index a5cff6dab0d6..155ad22208d9 100644 --- a/filter/source/graphicfilter/icgm/actimpr.cxx +++ b/filter/source/graphicfilter/icgm/actimpr.cxx @@ -755,7 +755,8 @@ void CGMImpressOutAct::DrawText( awt::Point const & rTextPos, awt::Size& rTextSi maXShape->setSize( awt::Size( nWidth, nHeight ) ); double nX = mpCGM->pElement->nCharacterOrientation[ 2 ]; double nY = mpCGM->pElement->nCharacterOrientation[ 3 ]; -double nOrientation = acos( nX / sqrt( nX * nX + nY * nY ) ) * 57.29577951308; +double fSqrt = sqrt(nX * nX + nY * nY); +double nOrientation = fSqrt != 0.0 ? (acos(nX / fSqrt) * 57.29577951308) : 0.0; if ( nY < 0 ) nOrientation = 360 - nOrientation; ___ 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/filter/ww8/ww8scan.cxx |8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 6b61c3f7fdcdd8721bf51c39fdcce7e9851a6686
Author: Caolán McNamara
Date: Tue Oct 31 08:49:39 2017 +
ofz#3935 Integer-overflow
Change-Id: I2f79eaf7887b48a6aab2041ac7949a62c4bce256
Reviewed-on: https://gerrit.libreoffice.org/44101
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 3f5d39c8f3c8..4afa6b66a32b 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -2235,11 +2235,17 @@ void WW8PLCF::GeneratePLCF(SvStream& rSt, sal_Int32
nPN, sal_Int32 ncpN)
bool failure = false;
nIMax = ncpN;
-if ((nIMax < 1) || (nIMax > (WW8_CP_MAX - 4) / (4 + nStru)) || ((nPN +
ncpN) > USHRT_MAX) || nPN < 0)
+if ((nIMax < 1) || (nIMax > (WW8_CP_MAX - 4) / (4 + nStru)) || nPN < 0)
failure = true;
if (!failure)
{
+sal_Int32 nResult;
+failure = o3tl::checked_add(nPN, ncpN, nResult) || nResult > USHRT_MAX;
+}
+
+if (!failure)
+{
size_t nSiz = (4 + nStru) * nIMax + 4;
size_t nElems = ( nSiz + 3 ) / 4;
pPLCF_PosArray.reset( new sal_Int32[ nElems ] ); // Pointer to
Pos-array
___
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/core/layout/wsfrm.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 933ee1db1b8e136c931df0f7e32bd20f0d87d5be
Author: Miklos Vajna
Date: Tue Oct 31 16:08:58 2017 +0100
sw: fix loplugin:redundantcast warning
Change-Id: Ibf4c817b97083b838fb81c2eb8deff3b9167589f
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index 8e8a1653bb0b..16cb40082a14 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -80,7 +80,7 @@ void SwFrameAreaDefinition::setFrameAreaSizeValid(bool bNew)
void SwFrameAreaDefinition::setFramePrintAreaValid(bool bNew)
{
-if(static_cast< bool >(mbFramePrintAreaValid) != bNew)
+if(mbFramePrintAreaValid != bNew)
{
mbFramePrintAreaValid = bNew;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: postprocess/CustomTarget_signing.mk
postprocess/CustomTarget_signing.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 37eab9181cdd099935148bc911163f861a2c8d3f Author: Christian Lohmaier Date: Mon Oct 30 22:26:56 2017 +0100 msc-externals: don't attempt to chmod nonexisting files 440ac656f783a7a5e33431410a1c038b7d04c42e forgot to also guard the chmod and thus 64bit builds on windows fail when attempting to sign, as in this case there is no cross-compiled explorer extension and the dlls are not copied into instdir Change-Id: Ie17a079b64256d3ef0bf253bdda6cfe722dac3e2 Reviewed-on: https://gerrit.libreoffice.org/44076 Reviewed-by: Christian Lohmaier Tested-by: Christian Lohmaier diff --git a/postprocess/CustomTarget_signing.mk b/postprocess/CustomTarget_signing.mk index 573c396f49de..b3aaf264f76c 100644 --- a/postprocess/CustomTarget_signing.mk +++ b/postprocess/CustomTarget_signing.mk @@ -33,7 +33,7 @@ ifneq ($(ENABLE_DBGUTIL),TRUE) cat $(SRCDIR)/postprocess/signing/no_signing.txt > $$EXCLUDELIST && \ echo "$(foreach lib,$(gb_MERGEDLIBS),$(call gb_Library_get_filename,$(lib)))" | tr ' ' '\n' >> $$EXCLUDELIST && \ $(if $(UCRT_REDISTDIR),chmod u+w $(foreach lib,$(UCRT_DLLS),$(INSTDIR)/$(LIBO_URE_LIB_FOLDER)/$(lib)) &&) \ - chmod u+w $(foreach lib,$(MSVC_DLLS),$(INSTDIR)/program/shlxthdl/$(lib)) && \ + $(if $(BUILD_X64),chmod u+w $(foreach lib,$(MSVC_DLLS),$(INSTDIR)/program/shlxthdl/$(lib)) &&) \ $(PERL) $(SRCDIR)/postprocess/signing/signing.pl \ -e $$EXCLUDELIST \ -l $(subst .done,_log.txt,$@) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: config_host.mk.in configure.ac external/msc-externals postprocess/CustomTarget_signing.mk Repository.mk
Repository.mk |1
config_host.mk.in |2 +
configure.ac | 28 +
external/msc-externals/Module_msc-externals.mk | 11 +
external/msc-externals/Package_ucrt.mk | 16 ++
postprocess/CustomTarget_signing.mk|1
6 files changed, 59 insertions(+)
New commits:
commit 71d9a61302e65fe091cf70c13fa72b3df09b7e3a
Author: Christian Lohmaier
Date: Mon Oct 30 22:15:19 2017 +0100
tdf#108580 ship universal crts with the program as workaround
the universal crts redistributables are available as part of the Windows
10 SDK. Point to the dir (or a copy of the dir) using --with-ucrt-dir
Use --without-ucrt-dir (or --with-ucrt-dir=no) if you don't want to ship
them as part of LO and are annoyed by the configure warning.
Change-Id: I5487e3f6e583222fa053b2fc03176f061d57746c
Reviewed-on: https://gerrit.libreoffice.org/44074
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier
diff --git a/Repository.mk b/Repository.mk
index 96cddc13b97d..19566560f60a 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -814,6 +814,7 @@ $(eval $(call gb_Helper_register_packages_for_install,ure,\
jvmfwk_jreproperties \
$(if $(filter MACOSX,$(OS)),bridges_jnilib_java_uno) \
) \
+ $(if $(UCRT_REDISTDIR),ucrt) \
))
$(eval $(call gb_Helper_register_packages_for_install,postgresqlsdbc,\
diff --git a/config_host.mk.in b/config_host.mk.in
index 13cef74e5216..7fca9f3601d3 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -570,6 +570,8 @@ export TMPDIR=@TEMP_DIRECTORY@
export TOUCH=@TOUCH@
export UCRTSDKDIR=@UCRTSDKDIR@
export UCRTVERSION=@UCRTVERSION@
+export UCRT_REDISTDIR=@UCRT_REDISTDIR@
+export UCRT_DLLS=@UCRT_DLLS@
export UNOWINREG_DLL=@UNOWINREG_DLL@
export USE_LIBRARY_BIN_TAR=@USE_LIBRARY_BIN_TAR@
export USE_XINERAMA=@USE_XINERAMA@
diff --git a/configure.ac b/configure.ac
index 5535fa48bce5..752c78272d7c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6474,6 +6474,13 @@ fi
AC_SUBST([JITC_PROCESSOR_TYPE])
# Misc Windows Stuff
+AC_ARG_WITH(ucrt-dir,
+AS_HELP_STRING([--with-ucrt-dir],
+[path to the directory with the arch-specific subdirectories of the
Windows Universtal CRT redistributables
+from the Windows 10 SDK for packaging into the installsets (without
those the target system needs to install
+the Visual C++ Runtimes manually)]),
+,)
+UCRT_REDISTDIR="$with_ucrt_dir"
if test $_os = "WINNT"; then
find_msvc_x64_dlls
find_msms
@@ -6481,8 +6488,29 @@ if test $_os = "WINNT"; then
MSVC_DLLS="$msvcdlls"
MSM_PATH="$msmdir"
SCPDEFS="$SCPDEFS -DWITH_VC${VCVER}_REDIST"
+if test "$UCRT_REDISTDIR" = "no"; then
+dnl explicitly disabled
+UCRT_REDISTDIR=""
+else
+UCRT_REDISTDIR="$UCRT_REDISTDIR/$WINDOWS_SDK_ARCH"
+#
https://blogs.msdn.microsoft.com/vcblog/2015/03/03/introducing-the-universal-crt/
+# "note that the set of DLLs are necessary is different on different
+# versions of Windows, so you must include all of the DLLs in order
for
+# your program to run on all supported versions of Windows"
+if test -f "$UCRT_REDISTDIR/ucrtbase.dll"; then
+cd "$UCRT_REDISTDIR";
+UCRT_DLLS=$(ls *.dll | paste -d " " -s)
+cd -
+else
+UCRT_REDISTDIR=""
+AC_MSG_WARN([No --with-ucrt-dir not specified or dlls not found -
installer will have runtime dependency])
+add_warning "No --with-ucrt-dir not specified or dlls not found -
installer will have runtime dependency"
+fi
+fi
fi
+AC_SUBST(UCRT_REDISTDIR)
+AC_SUBST(UCRT_DLLS)
AC_SUBST(MSVC_DLL_PATH)
AC_SUBST(MSVC_DLLS)
AC_SUBST(MSM_PATH)
diff --git a/external/msc-externals/Module_msc-externals.mk
b/external/msc-externals/Module_msc-externals.mk
index 2fa56b458e71..9435d5d96059 100644
--- a/external/msc-externals/Module_msc-externals.mk
+++ b/external/msc-externals/Module_msc-externals.mk
@@ -17,4 +17,15 @@ $(eval $(call gb_Module_add_targets,msc-externals,\
endif
+# TODO: hackaround to install the universal crts locally (tdf#108580)
+# ideally we can create a chained installer or similar that installs them
+# systemwide using windows update
+ifneq ($(UCRT_REDISTDIR),)
+
+$(eval $(call gb_Module_add_targets,msc-externals,\
+ Package_ucrt \
+))
+
+endif
+
# vim: set noet sw=4 ts=4:
diff --git a/external/msc-externals/Package_ucrt.mk
b/external/msc-externals/Package_ucrt.mk
new file mode 100644
index ..05d51d369f47
--- /dev/null
+++ b/external/msc-externals/Package_ucrt.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License,
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - include/oox oox/source sd/qa
include/oox/drawingml/drawingmltypes.hxx | 15 +++
oox/source/export/chartexport.cxx| 22 +-
oox/source/export/drawingml.cxx |4 +++-
sd/qa/unit/data/pptx/smartart-rotation2.pptx |binary
sd/qa/unit/export-tests-ooxml2.cxx | 14 +-
5 files changed, 32 insertions(+), 23 deletions(-)
New commits:
commit 27b4c48e63d95fd90ab3f4c5014b98cdf94ae611
Author: Szymon KÅos
Date: Fri Oct 6 16:04:25 2017 +0200
SmartArt: export text rotation in the PPTX
Slightly modified unittest from master.
libreoffice-5-4 doesn't export shape groups so far.
Change-Id: I74bfc172fe7434d14de468ecfd3412636e53780c
Reviewed-on: https://gerrit.libreoffice.org/43202
Tested-by: Jenkins
Reviewed-by: Szymon KÅos
Reviewed-on: https://gerrit.libreoffice.org/43364
Reviewed-by: Miklos Vajna
diff --git a/include/oox/drawingml/drawingmltypes.hxx
b/include/oox/drawingml/drawingmltypes.hxx
index 0b1ea4be7c72..751f7865c374 100644
--- a/include/oox/drawingml/drawingmltypes.hxx
+++ b/include/oox/drawingml/drawingmltypes.hxx
@@ -151,6 +151,21 @@ struct IndexRange {
/** retrieve the content of CT_IndexRange */
IndexRange GetIndexRange( const css::uno::Reference<
css::xml::sax::XFastAttributeList >& xAttributes );
+/**
+* nRotation is a 100th of a degree and the return value is
+* in a 60,000th of a degree
+*
+* Also rotation is in opposite directions so multiply with -1
+*/
+inline OString calcRotationValue(sal_Int32 nRotation)
+{
+if (nRotation > 18000) // 180 degree
+{
+nRotation -= 36000;
+}
+nRotation *= -600;
+return OString::number(nRotation);
+}
const sal_Int32 EMU_PER_HMM = 360; /// 360 EMUs per 1/100 mm.
const sal_Int32 EMU_PER_PT = 12700;
diff --git a/oox/source/export/chartexport.cxx
b/oox/source/export/chartexport.cxx
index 28f8c6c4d7f8..a3a1e957a76f 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -1038,26 +1038,6 @@ void ChartExport::exportLegend( const Reference<
css::chart::XChartDocument >& x
pFS->endElement( FSNS( XML_c, XML_legend ) );
}
-namespace {
-
-/**
- * nRotation is a 100th of a degree and the return value is
- * in a 60,000th of a degree
- *
- * Also rotation is in opposite directions so multiply with -1
- */
-OString calcRotationValue(sal_Int32 nRotation)
-{
-if (nRotation > 18000) // 180 degree
-{
-nRotation -= 36000;
-}
-nRotation *= -600;
-return OString::number(nRotation);
-}
-
-}
-
void ChartExport::exportTitle( const Reference< XShape >& xShape )
{
OUString sText;
@@ -1090,7 +1070,7 @@ void ChartExport::exportTitle( const Reference< XShape >&
xShape )
pFS->singleElement( FSNS( XML_a, XML_bodyPr ),
XML_vert, sWritingMode,
-XML_rot, calcRotationValue(nRotation).getStr(),
+XML_rot, oox::drawingml::calcRotationValue(nRotation).getStr(),
FSEND );
// TODO: lstStyle
pFS->singleElement( FSNS( XML_a, XML_lstStyle ),
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 48720d923144..506370a5e5a2 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -2098,6 +2098,8 @@ void DrawingML::WriteText( const Reference< XInterface >&
rXIface, const OUStrin
if( !xXText.is() )
return;
+sal_Int32 nTextRotateAngle = 0;
+
#define DEFLRINS 254
#define DEFTBINS 127
sal_Int32 nLeft, nRight, nTop, nBottom;
@@ -2137,7 +2139,6 @@ void DrawingML::WriteText( const Reference< XInterface >&
rXIface, const OUStrin
{
for ( sal_Int32 i = 0, nElems = aProps.getLength(); i < nElems;
++i )
{
-sal_Int32 nTextRotateAngle = 0;
if ( aProps[ i ].Name == "TextPreRotateAngle" && ( aProps[ i
].Value >>= nTextRotateAngle ) )
{
if ( nTextRotateAngle == -90 )
@@ -2194,6 +2195,7 @@ void DrawingML::WriteText( const Reference< XInterface >&
rXIface, const OUStrin
XML_anchor, sVerticalAlignment,
XML_anchorCtr, bHorizontalCenter ? "1" :
nullptr,
XML_vert, sWritingMode,
+ XML_rot, (nTextRotateAngle != 0) ?
oox::drawingml::calcRotationValue( nTextRotateAngle * 100 ).getStr() : nullptr,
FSEND );
if( !presetWarp.isEmpty())
{
diff --git a/sd/qa/unit/data/pptx/smartart-rotation2.pptx
b/sd/qa/unit/data/pptx/smartart-rotation2.pptx
new file mode 100755
index ..e1c4493a7407
Binary files /dev/null and b/sd/qa/unit/data/pptx/smartart-rotation2.pptx differ
diff --git a/sd/qa/unit/export-tests-ooxml2.cxx
b/sd/qa/unit/export-tests-ooxml2.cxx
index abce5cda2c36..f4219ed5cd58 100644
--- a/sd/qa/unit/export-tests-ooxml2.cxx
+++ b/sd/qa/unit/export-tests-ooxml2.cxx
@@ -
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - vcl/unx
vcl/unx/gtk/gtksalframe.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 6b51d804949b6860ffac4480c27e540558cb44d3
Author: Maxim Monastirsky
Date: Sun Oct 22 19:47:25 2017 +0300
tdf#113353 gtk2: No decoration for floating toolbars
Some window managers need this explicit setting.
Change-Id: I007f066e29002d8988132f72ef55fbe3b679fa8c
Reviewed-on: https://gerrit.libreoffice.org/43697
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
(cherry picked from commit d76c4e5c9aaf8bd27ec97679bcaeba5b18aca493)
Reviewed-on: https://gerrit.libreoffice.org/43716
Reviewed-by: Miklos Vajna
diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx
index 6f97912171fe..5a06b220adad 100644
--- a/vcl/unx/gtk/gtksalframe.cxx
+++ b/vcl/unx/gtk/gtksalframe.cxx
@@ -1223,6 +1223,7 @@ void GtkSalFrame::Init( SalFrame* pParent,
SalFrameStyleFlags nStyle )
{
eType = GDK_WINDOW_TYPE_HINT_TOOLBAR;
lcl_set_accept_focus( GTK_WINDOW(m_pWindow), false, true );
+gtk_window_set_decorated( GTK_WINDOW(m_pWindow), false );
}
if( (nStyle & SalFrameStyleFlags::PARTIAL_FULLSCREEN )
&& getDisplay()->getWMAdaptor()->isLegacyPartialFullscreen() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/schema/oo-ad-ldap.xcd.sample |2 +- officecfg/registry/schema/oo-ldap.xcd.sample|2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit b8d1944111bad07c105e94c82baf5f699a5b9688 Author: Andras Timar Date: Tue Oct 31 14:39:08 2017 +0100 typo: compelete -> complete Change-Id: I999e57473b4b25cb73224947f3f3173288300f9f diff --git a/officecfg/registry/schema/oo-ad-ldap.xcd.sample b/officecfg/registry/schema/oo-ad-ldap.xcd.sample index 970c895e66e9..589e89d456bf 100644 --- a/officecfg/registry/schema/oo-ad-ldap.xcd.sample +++ b/officecfg/registry/schema/oo-ad-ldap.xcd.sample @@ -30,7 +30,7 @@ To customize values in this file, replace the data within ... elements flagged as "CUSTOMIZE" with the values for your organization. If a certain setting is not necessary for your installation, - you can remove the compelete corresponding ... element. + you can remove the complete corresponding ... element. --> http://openoffice.org/2001/registry";> diff --git a/officecfg/registry/schema/oo-ldap.xcd.sample b/officecfg/registry/schema/oo-ldap.xcd.sample index 84b37bba833f..acc3fe8c8f36 100644 --- a/officecfg/registry/schema/oo-ldap.xcd.sample +++ b/officecfg/registry/schema/oo-ldap.xcd.sample @@ -30,7 +30,7 @@ To customize values in this file, replace the data within ... elements flagged as "CUSTOMIZE" with the values for your organization. If a certain setting is not necessary for your installation, - you can remove the compelete corresponding ... element. + you can remove the complete corresponding ... element. --> http://openoffice.org/2001/registry";> ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - include/registry reportdesign/inc reportdesign/source sc/source
include/registry/registry.hxx|9 +--
reportdesign/inc/RptObject.hxx | 65 ++-
reportdesign/source/filter/xml/xmlComponent.hxx |3 -
reportdesign/source/filter/xml/xmlFunction.hxx |3 -
reportdesign/source/filter/xml/xmlGroup.hxx |3 -
reportdesign/source/ui/inc/ColorChanger.hxx |3 -
reportdesign/source/ui/inc/DefaultInspection.hxx | 12 +---
reportdesign/source/ui/inc/metadata.hxx | 20 +++
reportdesign/source/ui/inc/propbrw.hxx |4 -
sc/source/core/data/compressedarray.cxx |2
10 files changed, 57 insertions(+), 67 deletions(-)
New commits:
commit 2bf2541c6b849a5153462327f8d167a386464dda
Author: Noel Grandin
Date: Mon Oct 30 17:09:51 2017 +0200
loplugin:finalclasses in reportdesign
Change-Id: I6fab8ce7d1c9a5e52a981dc7530fafb2373e27f6
Reviewed-on: https://gerrit.libreoffice.org/44098
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/registry/registry.hxx b/include/registry/registry.hxx
index 36b7d77858d3..2036c730fa9e 100644
--- a/include/registry/registry.hxx
+++ b/include/registry/registry.hxx
@@ -80,7 +80,7 @@ class RegistryKey;
The class is implemented inline and use a C-Api.
*/
-class Registry
+class Registry final
{
public:
/** Default constructor.
@@ -180,8 +180,8 @@ public:
/// returns the used registry Api.
const Registry_Api* getApi() const { return m_pApi; }
-protected:
+private:
/// stores the used and initialized registry Api.
const Registry_Api* m_pApi;
/// stores the handle of the underlying registry file on which most of the
functions work.
@@ -270,7 +270,7 @@ protected:
RegistryValueList is a helper class to work with a list value.
*/
template
-class RegistryValueList
+class RegistryValueList final
{
public:
/// Default constructor
@@ -308,7 +308,8 @@ public:
}
friend class RegistryKey;
-protected:
+
+private:
/** sets the data of the value list.
@param registry specifies the registry files where the appropriate key
is located.
diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx
index fd4cba36923f..5a8e53d912d2 100644
--- a/reportdesign/inc/RptObject.hxx
+++ b/reportdesign/inc/RptObject.hxx
@@ -122,30 +122,16 @@ public:
// OCustomShape
-class REPORTDESIGN_DLLPUBLIC OCustomShape: public SdrObjCustomShape , public
OObjectBase
+class REPORTDESIGN_DLLPUBLIC OCustomShape final : public SdrObjCustomShape ,
public OObjectBase
{
friend class OReportPage;
friend class DlgEdFactory;
-
public:
static OCustomShape* Create( const css::uno::Reference<
css::report::XReportComponent>& _xComponent )
{
return new OCustomShape( _xComponent );
}
-protected:
-OCustomShape(const css::uno::Reference< css::report::XReportComponent>&
_xComponent);
-OCustomShape(const OUString& _sComponentName);
-
-virtual void NbcMove( const Size& rSize ) override;
-virtual void NbcResize(const Point& rRef, const Fraction& xFact, const
Fraction& yFact) override;
-virtual void NbcSetLogicRect(const tools::Rectangle& rRect) override;
-virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) override;
-
-virtual SdrPage* GetImplPage() const override;
-
-public:
-
virtual ~OCustomShape() override;
virtual css::uno::Reference< css::beans::XPropertySet> getAwtComponent()
override;
@@ -156,39 +142,30 @@ public:
private:
virtual void impl_setUnoShape( const css::uno::Reference<
css::uno::XInterface >& rxUnoShape ) override;
+
+OCustomShape(const css::uno::Reference< css::report::XReportComponent>&
_xComponent);
+OCustomShape(const OUString& _sComponentName);
+
+virtual void NbcMove( const Size& rSize ) override;
+virtual void NbcResize(const Point& rRef, const Fraction& xFact, const
Fraction& yFact) override;
+virtual void NbcSetLogicRect(const tools::Rectangle& rRect) override;
+virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) override;
+
+virtual SdrPage* GetImplPage() const override;
};
// OOle2Obj
-class REPORTDESIGN_DLLPUBLIC OOle2Obj: public SdrOle2Obj , public OObjectBase
+class REPORTDESIGN_DLLPUBLIC OOle2Obj final : public SdrOle2Obj , public
OObjectBase
{
friend class OReportPage;
friend class DlgEdFactory;
-
-sal_uInt16 m_nType;
-boolm_bOnlyOnce;
-void impl_createDataProvider_nothrow( const css::uno::Reference<
css::frame::XModel>& _xModel);
-virtual void impl_setUnoShape( const css::uno::Reference<
css::uno::XInterface >& rxUnoShape ) override;
-
public:
static OOle2Obj* Create( const css::uno::Reference<
css::report::XReportComponent>& _xComponent,sal_uInt16 _nType )
{
return new OOle2Obj( _xComponent,_nType );
}
-protected:
-OOle2Obj(const css::uno::Reference< css::report::XReportComponent>
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/rtfexport/data/tdf113408.rtf | 24
sw/qa/extras/rtfexport/rtfexport.cxx |6 ++
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 16 +---
writerfilter/source/rtftok/rtfdocumentimpl.hxx |2 +-
4 files changed, 40 insertions(+), 8 deletions(-)
New commits:
commit 1970a686273c5d4fc1eeb4430283e37085d9f647
Author: Miklos Vajna
Date: Tue Oct 31 09:48:33 2017 +0100
tdf#113408 RTF import style dedup: separate paragraph and character handling
The problem was that the paragraph in question had no left margin, while
it should have one. The reason for this is that the style deduplication
logic took both the current paragraph and character style, but the
direct formatting only contained character formatting, so it tried to
emit the default values for all paragraph formatting.
This started to show up after commit
657c6cc3acec0528209a8584b838cd6de581c437 (tdf#104228 RTF import: fix
override of style left/right para margin, 2016-12-13), but the root
cause is much older, it was there since commit
321d7ec2071472b3765a00806715e7ad9f8a306f (fdo#82078 RTF import: fix bold
text spilling over to non-bold text, 2014-09-06).
Change-Id: If03240a85cc9de89afe9111c2d29de2672e407bf
Reviewed-on: https://gerrit.libreoffice.org/44097
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/sw/qa/extras/rtfexport/data/tdf113408.rtf
b/sw/qa/extras/rtfexport/data/tdf113408.rtf
new file mode 100644
index ..60d9bc98d70f
--- /dev/null
+++ b/sw/qa/extras/rtfexport/data/tdf113408.rtf
@@ -0,0 +1,24 @@
+{\rtf1\adeflang1037\ansi\ansicpg1252\uc1\adeff1\deff0\stshfdbch0\stshfloch0\stshfhich0\stshfbi0\deflang1033\deflangfe1033\themelang1033\themelangfe0\themelangcs1025
+{\fonttbl
+{\f0\fbidi \froman\fcharset238\fprq2 Times New Roman;}
+}
+{\stylesheet
+{Normal;}
+{\s66\li720\ri0 List Paragraph;}
+}
+{\*\listtable
+{\list\listtemplateid1275618250\listhybrid
+{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0
+\levelstartat1\levelspace0\levelindent0
+{\leveltext\leveltemplateid67698703\'02\'00.;}
+{\levelnumbers\'01;}
+\rtlch\fcs1 \af0 \fbias0 \fi-360\li720 }
+{\listname ;}
+\listid1880166401}
+}
+{\*\listoverridetable
+{\listoverride\listid1880166401\listoverridecount0\ls9}
+}
+\paperw12240\paperh15840\margl1440\margr1440\margt1800\margb1440\gutter0\viewkind1
+\pard \s66\li720\ri0\itap0 \par
+}
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx
b/sw/qa/extras/rtfexport/rtfexport.cxx
index 5923007b8d3a..1d75996fcdda 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -743,6 +743,12 @@ DECLARE_RTFEXPORT_TEST(testPictureWrapPolygon,
"picture-wrap-polygon.rtf")
CPPUNIT_ASSERT_EQUAL(sal_Int32(convertTwipToMm100(-67)),
getProperty(getShape(1), "VertOrientPosition"));
}
+DECLARE_RTFEXPORT_TEST(testTdf113408, "tdf113408.rtf")
+{
+// This was 0, left margin was not inherited from style properly.
+CPPUNIT_ASSERT_EQUAL(static_cast(1270),
getProperty(getParagraph(1), "ParaLeftMargin"));
+}
+
DECLARE_RTFEXPORT_TEST(testAbi10039, "abi10039.odt")
{
// Make sure we don't just crash on export, and additionally the shape
should not be inline (as it's at-page anchored originally).
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 386d3085d903..6f7ee8062fee 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -439,7 +439,7 @@ static void lcl_copyFlatten(RTFReferenceProperties& rProps,
RTFSprms& rStyleAttr
rStyleAttributes.set(rAttribute.first, rAttribute.second);
}
-writerfilter::Reference::Pointer_t
RTFDocumentImpl::getProperties(RTFSprms& rAttributes, RTFSprms& rSprms)
+writerfilter::Reference::Pointer_t
RTFDocumentImpl::getProperties(RTFSprms& rAttributes, RTFSprms& rSprms, Id
nStyleType)
{
int nStyle = 0;
if (!m_aStates.empty())
@@ -461,13 +461,15 @@ writerfilter::Reference::Pointer_t
RTFDocumentImpl::getProperties(RT
RTFSprms aStyleSprms;
RTFSprms aStyleAttributes;
// Ensure the paragraph style is a flat list.
-lcl_copyFlatten(rProps, aStyleAttributes, aStyleSprms);
+if (!nStyleType || nStyleType ==
NS_ooxml::LN_Value_ST_StyleType_paragraph)
+lcl_copyFlatten(rProps, aStyleAttributes, aStyleSprms);
if (itChar != m_aStyleTableEntries.end())
{
// Found active character style, then update
aStyleSprms/Attributes.
RTFReferenceProperties& rCharProps =
*static_cast(itChar->second.get());
-lcl_copyFlatten(rCharProps, aStyleAttributes, aStyleSprms);
+if (!nStyleType || nStyleType ==
NS_ooxml::LN_Value_ST_StyleType_character)
+lcl_copyFlatten(rCharProps, aStyleAttributes, aStyleSprms);
}
// Get rid of
[Libreoffice-commits] core.git: cui/source editeng/inc editeng/source include/editeng sc/source sd/source sw/source
cui/source/tabpages/page.cxx |4 +-
editeng/inc/editdoc.hxx |4 +-
editeng/source/editeng/editdbg.cxx |4 +-
editeng/source/editeng/editdoc.cxx |8 ++---
editeng/source/items/paperinf.cxx|5 +--
editeng/source/rtf/rtfitem.cxx | 37 +++
include/editeng/paperinf.hxx |2 -
sc/source/ui/view/printfun.cxx |2 -
sd/source/ui/sidebar/SlideBackground.cxx |2 -
sw/source/ui/envelp/envfmt.cxx |4 +-
sw/source/uibase/sidebar/PageFormatPanel.cxx |2 -
11 files changed, 33 insertions(+), 41 deletions(-)
New commits:
commit 4f798ed25645b3b1c2e5100a6353cfbc4650becc
Author: Noel Grandin
Date: Tue Oct 31 10:41:55 2017 +0200
loplugin:constantparam in editeng
Change-Id: I0a07326d5b63e82ef16e02f75fd8523e3b73e1f4
Reviewed-on: https://gerrit.libreoffice.org/44096
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 4e895fa09ff7..bc83dcfc3f57 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -514,7 +514,7 @@ void SvxPageDescPage::Reset( const SfxItemSet* rSet )
Swap( aPaperSize );
// Actual Paper Format
-Paper ePaper = SvxPaperInfo::GetSvxPaper( aPaperSize, MapUnit::Map100thMM,
true );
+Paper ePaper = SvxPaperInfo::GetSvxPaper( aPaperSize, MapUnit::Map100thMM
);
if ( PAPER_USER != ePaper )
aPaperSize = SvxPaperInfo::GetPaperSize( ePaper, MapUnit::Map100thMM );
@@ -996,7 +996,7 @@ IMPL_LINK_NOARG(SvxPageDescPage, PaperSizeModify_Impl,
Edit&, void)
MapUnit eUnit = GetItemSet().GetPool()->GetMetric( nWhich );
Size aSize( GetCoreValue( *m_pPaperWidthEdit, eUnit ),
GetCoreValue( *m_pPaperHeightEdit, eUnit ) );
-Paper ePaper = SvxPaperInfo::GetSvxPaper( aSize, eUnit, true );
+Paper ePaper = SvxPaperInfo::GetSvxPaper( aSize, eUnit );
m_pPaperSizeBox->SetSelection( ePaper );
UpdateExample_Impl( true );
diff --git a/editeng/inc/editdoc.hxx b/editeng/inc/editdoc.hxx
index 13414dfcb101..c5f6f7ddf1fb 100644
--- a/editeng/inc/editdoc.hxx
+++ b/editeng/inc/editdoc.hxx
@@ -792,7 +792,7 @@ public:
sal_uLong GetTextLen() const;
OUString GetParaAsString( sal_Int32 nNode ) const;
-static OUString GetParaAsString(const ContentNode* pNode, sal_Int32
nStartPos = 0, sal_Int32 nEndPos = -1, bool bResolveFields = true);
+static OUString GetParaAsString(const ContentNode* pNode, sal_Int32
nStartPos = 0, sal_Int32 nEndPos = -1);
EditPaM GetStartPaM() const;
EditPaM GetEndPaM() const;
@@ -829,7 +829,7 @@ inline EditCharAttrib*
GetAttrib(CharAttribList::AttribsType& rAttribs, sal_Int3
return (nAttr < (sal_Int32)rAttribs.size()) ? rAttribs[nAttr].get() :
nullptr;
}
-void CheckOrderedList(const CharAttribList::AttribsType& rAttribs, bool
bStart);
+void CheckOrderedList(const CharAttribList::AttribsType& rAttribs);
class EditEngineItemPool : public SfxItemPool
{
diff --git a/editeng/source/editeng/editdbg.cxx
b/editeng/source/editeng/editdbg.cxx
index 67b5ab852337..c93477eb7309 100644
--- a/editeng/source/editeng/editdbg.cxx
+++ b/editeng/source/editeng/editdbg.cxx
@@ -498,12 +498,12 @@ bool ParaPortion::DbgCheckTextPortions(ParaPortion const&
rPara)
return nXLen == rPara.pNode->Len();
}
-void CheckOrderedList(const CharAttribList::AttribsType& rAttribs, bool bStart)
+void CheckOrderedList(const CharAttribList::AttribsType& rAttribs)
{
sal_Int32 nPrev = 0;
for (const std::unique_ptr& rAttr : rAttribs)
{
-sal_Int32 const nCur = bStart ? rAttr->GetStart() : rAttr->GetEnd();
+sal_Int32 const nCur = rAttr->GetStart();
assert(nCur >= nPrev);
nPrev = nCur;
}
diff --git a/editeng/source/editeng/editdoc.cxx
b/editeng/source/editeng/editdoc.cxx
index 3938a8b68fdd..db5b4b28799d 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -2182,10 +2182,9 @@ OUString EditDoc::GetParaAsString( sal_Int32 nNode )
const
}
OUString EditDoc::GetParaAsString(
-const ContentNode* pNode, sal_Int32 nStartPos, sal_Int32 nEndPos,
-bool bResolveFields)
+const ContentNode* pNode, sal_Int32 nStartPos, sal_Int32 nEndPos)
{
-return pNode->GetExpandedText(nStartPos, nEndPos, bResolveFields);
+return pNode->GetExpandedText(nStartPos, nEndPos, true/*bResolveFields*/);
}
EditPaM EditDoc::GetStartPaM() const
@@ -3007,8 +3006,7 @@ void CharAttribList::DbgCheckAttribs(CharAttribList
const& rAttribs)
assert(zero_set.insert(std::make_pair(rAttr->GetStart(),
rAttr->Which())).second && "duplicate 0-length attribute detected");
}
}
-CheckOrderedList(rAttribs.GetAttribs(), true);
-//CheckOrderedList(rAttribs.GetAttribs(), false); // this does not work -
need 2nd
[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - include/oox oox/source sd/qa sd/source
include/oox/drawingml/clrscheme.hxx | 33 +++
include/oox/export/utils.hxx| 15 +
include/oox/ppt/presentationfragmenthandler.hxx |1
oox/source/export/drawingml.cxx |2
oox/source/ppt/presentationfragmenthandler.cxx | 76
sd/qa/unit/data/pptx/accent-color.pptx |binary
sd/qa/unit/export-tests-ooxml2.cxx | 19 ++
sd/source/filter/eppt/epptooxml.hxx |4
sd/source/filter/eppt/pptx-epptooxml.cxx| 212 ++--
9 files changed, 308 insertions(+), 54 deletions(-)
New commits:
commit c344d74a6961ec39685d718fbb7c29dd186ca0a4
Author: Szymon KÅos
Date: Tue Oct 17 22:14:38 2017 +0200
PPTX export: remember color schemes in theme
Remember color scheme from loaded pptx file
or use default values.
Change-Id: Icb69c51603afc5f332c20c75e4ed5f659f4b5614
Reviewed-on: https://gerrit.libreoffice.org/43470
Tested-by: Jenkins
Reviewed-by: Szymon KÅos
Reviewed-on: https://gerrit.libreoffice.org/44081
Reviewed-by: Andras Timar
diff --git a/include/oox/drawingml/clrscheme.hxx
b/include/oox/drawingml/clrscheme.hxx
index ccb1517e44eb..ccf918d7ba74 100644
--- a/include/oox/drawingml/clrscheme.hxx
+++ b/include/oox/drawingml/clrscheme.hxx
@@ -28,9 +28,42 @@
#include
#include
+#include
namespace oox { namespace drawingml {
+enum PredefinedClrSchemeId {
+//dk1,
+//lt1,
+dk2 = 0,
+lt2,
+accent1,
+accent2,
+accent3,
+accent4,
+accent5,
+accent6,
+hlink,
+folHlink,
+Count
+};
+
+static std::map PredefinedClrNames =
+{
+//{ dk1, "dk1" },
+//{ lt1, "lt1" },
+{ dk2, "dk2" },
+{ lt2, "lt2" },
+{ accent1, "accent1" },
+{ accent2, "accent2" },
+{ accent3, "accent3" },
+{ accent4, "accent4" },
+{ accent5, "accent5" },
+{ accent6, "accent6" },
+{ hlink, "hlink" },
+{ folHlink, "folHlink" }
+};
+
class ClrMap
{
std::map < sal_Int32, sal_Int32 > maClrMap;
diff --git a/include/oox/export/utils.hxx b/include/oox/export/utils.hxx
index 599e45ee55f8..9f13cf87c4c8 100644
--- a/include/oox/export/utils.hxx
+++ b/include/oox/export/utils.hxx
@@ -24,8 +24,19 @@
#include
#include
-#define I32S(x) OString::number( (sal_Int32) x ).getStr()
-#define I64S(x) OString::number( (sal_Int64) x ).getStr()
+inline OString I32S_(sal_Int32 x) { return OString::number(x); }
+inline OString I32SHEX_(sal_Int32 x)
+{
+OString aStr = OString::number(x, 16);
+while (aStr.getLength() < 6)
+aStr = OString("0") + aStr;
+return aStr.getStr();
+}
+inline OString I64S_(sal_Int64 x) { return OString::number(x); }
+inline OString DS_(double x) { return OString::number(x); }
+#define I32S(x) I32S_(x).getStr()
+#define I32SHEX(x) I32SHEX_(x).getStr()
+#define I64S(x) I64S_(x).getStr()
#define IS(x) OString::number( x ).getStr()
#define BS(x) (x ? "1":"0")
#define USS(x) OUStringToOString( x, RTL_TEXTENCODING_UTF8 ).getStr()
diff --git a/include/oox/ppt/presentationfragmenthandler.hxx
b/include/oox/ppt/presentationfragmenthandler.hxx
index aeda119cd2f1..637e70643be7 100644
--- a/include/oox/ppt/presentationfragmenthandler.hxx
+++ b/include/oox/ppt/presentationfragmenthandler.hxx
@@ -53,6 +53,7 @@ protected:
private:
void importSlide(sal_uInt32 nSlide, bool bFirstSlide, bool bImportNotes);
+void saveThemeToGrabBag(oox::drawingml::ThemePtr pThemePtr, const
OUString& sTheme);
std::vector< OUString > maSlideMasterVector;
std::vector< OUString > maSlidesVector;
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 14f7c363ec4b..e33dca9f5fe6 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -2790,7 +2790,7 @@ void DrawingML::WriteStyleProperties( sal_Int32 nTokenId,
const Sequence< Proper
aProperties[i].Value >>= aTransformations;
}
mpFS->startElementNS( XML_a, nTokenId, XML_idx, I32S( nIdx ), FSEND );
-WriteColor( sSchemeClr, aTransformations );
+WriteColor(sSchemeClr, aTransformations);
mpFS->endElementNS( XML_a, nTokenId );
}
else
diff --git a/oox/source/ppt/presentationfragmenthandler.cxx
b/oox/source/ppt/presentationfragmenthandler.cxx
index b67eb8b56817..3aa58f62c7bd 100644
--- a/oox/source/ppt/presentationfragmenthandler.cxx
+++ b/oox/source/ppt/presentationfragmenthandler.cxx
@@ -61,6 +61,22 @@ using namespace ::com::sun::star::xml::sax;
namespace oox { namespace ppt {
+static std::map PredefinedClrTokens =
+{
+//{ dk1, XML_dk1 },
+//{ lt1, XML_lt1 },
+{ dk2, XML_dk2 },
+{ lt2, XML_lt2 },
+{ accent1, XML_accent1 },
+{ accent2, XML_accent2 },
+{ accent3, XML_accent3 },
+{ accent4, XML_accent4 },
+{ accent5, XML_accent5 },
+{ accent6, XML_accent6 },
+{ hlink, XML_hlink },
+{ folHlink, XML_folHlink }
+};
+
PresentationFragmentHandler
[Libreoffice-commits] core.git: filter/source framework/source hwpfilter/source include/filter sw/source
filter/source/msfilter/escherex.cxx |7 +
filter/source/msfilter/msdffimp.cxx | 32 +++---
framework/source/dispatch/closedispatcher.cxx |4 +--
framework/source/inc/pattern/frame.hxx|9 +--
framework/source/uielement/menubarmanager.cxx | 10
hwpfilter/source/hwpfile.cxx |4 +--
hwpfilter/source/hwpfile.h|2 -
include/filter/msfilter/escherex.hxx |2 -
include/filter/msfilter/msdffimp.hxx |3 --
sw/source/filter/ww8/wrtw8esh.cxx |4 +--
10 files changed, 28 insertions(+), 49 deletions(-)
New commits:
commit 7383ab517030db0c2d7bf4f393f38743fbcaba04
Author: Noel Grandin
Date: Tue Oct 31 09:47:39 2017 +0200
loplugin:constantparam in f*
Change-Id: I87145db3af6c3eb180cea6b4244f98b00205a306
Reviewed-on: https://gerrit.libreoffice.org/44095
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
diff --git a/filter/source/msfilter/escherex.cxx
b/filter/source/msfilter/escherex.cxx
index 5075c342bbd5..9a83f2697ea8 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -5315,15 +5315,12 @@ sal_uInt32 EscherEx::GetColor( const sal_uInt32
nSOColor )
return nColor;
}
-sal_uInt32 EscherEx::GetColor( const Color& rSOColor, bool bSwap )
+sal_uInt32 EscherEx::GetColor( const Color& rSOColor )
{
sal_uInt32 nColor = ( rSOColor.GetRed() << 16 );
nColor |= ( rSOColor.GetGreen() << 8 );
nColor |= rSOColor.GetBlue();
-
-if ( !bSwap )
-nColor = GetColor( nColor );
-
+nColor = GetColor( nColor );
return nColor;
}
diff --git a/filter/source/msfilter/msdffimp.cxx
b/filter/source/msfilter/msdffimp.cxx
index c4786ff88d86..b2208e978059 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -749,16 +749,16 @@ void SvxMSDffManager::SolveSolver( const
SvxMSDffSolverContainer& rSolver )
if ( nN )
{
OUString aPropName( "EndShape" );
-SetPropValue( Any(aXShape), xPropSet,
aPropName, true );
+SetPropValue( Any(aXShape), xPropSet,
aPropName );
aPropName = "EndGluePointIndex";
-SetPropValue( Any(nId), xPropSet,
aPropName, true );
+SetPropValue( Any(nId), xPropSet,
aPropName );
}
else
{
OUString aPropName( "StartShape" );
-SetPropValue( Any(aXShape), xPropSet,
aPropName, true );
+SetPropValue( Any(aXShape), xPropSet,
aPropName );
aPropName = "StartGluePointIndex";
-SetPropValue( Any(nId), xPropSet,
aPropName, true );
+SetPropValue( Any(nId), xPropSet,
aPropName );
}
// Not sure what this is good for, repaint or
broadcast of object change.
@@ -7266,23 +7266,19 @@ SdrOle2Obj* SvxMSDffManager::CreateSdrOLEFromStorage(
}
bool SvxMSDffManager::SetPropValue( const uno::Any& rAny, const
uno::Reference< css::beans::XPropertySet > & rXPropSet,
-const OUString& rPropName, bool bTestPropertyAvailability )
+const OUString& rPropName )
{
-bool bRetValue = true;
-if ( bTestPropertyAvailability )
+bool bRetValue = false;
+try
+{
+uno::Reference< beans::XPropertySetInfo >
+aXPropSetInfo( rXPropSet->getPropertySetInfo() );
+if ( aXPropSetInfo.is() )
+bRetValue = aXPropSetInfo->hasPropertyByName( rPropName );
+}
+catch( const uno::Exception& )
{
bRetValue = false;
-try
-{
-uno::Reference< beans::XPropertySetInfo >
-aXPropSetInfo( rXPropSet->getPropertySetInfo() );
-if ( aXPropSetInfo.is() )
-bRetValue = aXPropSetInfo->hasPropertyByName( rPropName );
-}
-catch( const uno::Exception& )
-{
-bRetValue = false;
-}
}
if ( bRetValue )
{
diff --git a/framework/source/dispatch/closedispatcher.cxx
b/framework/source/dispatch/closedispatcher.cxx
index 2d89836b3453..2055cdc5d517 100644
--- a/framework/source/dispatch/closedispatcher.cxx
+++ b/framework/source/dispatch/closedispatcher.cxx
@@ -465,7 +465,7 @@ bool CloseDispatcher::implts_prepareFrameForClosing(const
css::uno::Reference< c
size_t i = 0;
for (i=0; iclose() method to define
-the right owner in case closing failed.
-
@return [bool]
sal_True
[Libreoffice-commits] core.git: configure.ac
configure.ac |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 29adb38857d1b1cfb486d5da958b12895a1e6120
Author: Rene Engelhard
Date: Tue Oct 31 12:14:58 2017 +
Revert "Up the required mdds package to 1.3.0 (latest)."
This isn't actually needed.
This reverts commit 33a3de2f0ce2b18d8149dc68c3de16541adfc530.
diff --git a/configure.ac b/configure.ac
index 76b32a0a0ca1..5535fa48bce5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8654,7 +8654,7 @@ AC_SUBST(SYSTEM_BOOST)
dnl ===
dnl Check for system mdds
dnl ===
-libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds-1.2 >= 1.3.0],
["-I${WORKDIR}/UnpackedTarball/mdds/include"])
+libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds-1.2 >= 1.2.3],
["-I${WORKDIR}/UnpackedTarball/mdds/include"])
dnl ===
dnl Check for system glm
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: i18nlangtag/source include/i18nlangtag include/linguistic jvmfwk/source linguistic/source
i18nlangtag/source/isolang/mslangid.cxx| 30 +++--
i18nlangtag/source/languagetag/languagetag.cxx |6 +--
include/i18nlangtag/mslangid.hxx | 10 +
include/linguistic/spelldta.hxx|3 -
jvmfwk/source/elements.cxx | 11 ++
linguistic/source/spelldta.cxx | 42 ++---
6 files changed, 40 insertions(+), 62 deletions(-)
New commits:
commit eb5d232342b1d0f596b6e9c5f8df740a6ec614ff
Author: Noel Grandin
Date: Tue Oct 31 09:07:27 2017 +0200
loplugin:constantparam in i18nlangtag
Change-Id: I148a47a9b63b78651ec18cd947f45b8f4dbb9345
Reviewed-on: https://gerrit.libreoffice.org/44094
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/i18nlangtag/source/isolang/mslangid.cxx
b/i18nlangtag/source/isolang/mslangid.cxx
index 5e2df2ee86c4..6d4b98781640 100644
--- a/i18nlangtag/source/isolang/mslangid.cxx
+++ b/i18nlangtag/source/isolang/mslangid.cxx
@@ -144,26 +144,20 @@ LanguageType MsLangId::resolveSystemLanguageByScriptType(
LanguageType nLang, sa
// static
css::lang::Locale MsLangId::Conversion::convertLanguageToLocale(
-LanguageType nLang, bool bResolveSystem )
+LanguageType nLang )
{
css::lang::Locale aLocale;
-if (!bResolveSystem && simplifySystemLanguages( nLang) == LANGUAGE_SYSTEM)
-; // nothing => empty locale
-else
+// Still resolve LANGUAGE_DONTKNOW if resolving is not requested,
+// but not LANGUAGE_SYSTEM or others.
+LanguageType nOrigLang = nLang;
+nLang = MsLangId::getRealLanguage(nLang);
+convertLanguageToLocaleImpl( nLang, aLocale, true );
+if (aLocale.Language.isEmpty() && simplifySystemLanguages(nOrigLang) ==
LANGUAGE_SYSTEM)
{
-// Still resolve LANGUAGE_DONTKNOW if resolving is not requested,
-// but not LANGUAGE_SYSTEM or others.
-LanguageType nOrigLang = nLang;
-if (bResolveSystem || nLang == LANGUAGE_DONTKNOW)
-nLang = MsLangId::getRealLanguage( nLang);
-convertLanguageToLocaleImpl( nLang, aLocale, true);
-if (bResolveSystem && aLocale.Language.isEmpty() &&
simplifySystemLanguages( nOrigLang) == LANGUAGE_SYSTEM)
-{
-// None found but resolve requested, last resort is "en-US".
-aLocale.Language = "en";
-aLocale.Country = "US";
-aLocale.Variant.clear();
-}
+// None found but resolve requested, last resort is "en-US".
+aLocale.Language = "en";
+aLocale.Country = "US";
+aLocale.Variant.clear();
}
return aLocale;
}
@@ -187,7 +181,7 @@ css::lang::Locale MsLangId::getFallbackLocale(
{
// empty language => LANGUAGE_SYSTEM
if (rLocale.Language.isEmpty())
-return Conversion::lookupFallbackLocale(
Conversion::convertLanguageToLocale( LANGUAGE_SYSTEM, true));
+return Conversion::lookupFallbackLocale(
Conversion::convertLanguageToLocale( LANGUAGE_SYSTEM ));
else
return Conversion::lookupFallbackLocale( rLocale);
}
diff --git a/i18nlangtag/source/languagetag/languagetag.cxx
b/i18nlangtag/source/languagetag/languagetag.cxx
index 1e65fe593f6d..3f887de7d6c1 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -961,7 +961,7 @@ LanguageTag::ImplPtr LanguageTag::registerImpl() const
// May have involved canonicalize(), so compare with
// pImpl->maBcp47 instead of maBcp47!
aBcp47 = LanguageTagImpl::convertToBcp47(
-MsLangId::Conversion::convertLanguageToLocale(
pImpl->mnLangID, true));
+MsLangId::Conversion::convertLanguageToLocale(
pImpl->mnLangID ));
bInsert = (aBcp47 == pImpl->maBcp47);
}
}
@@ -1344,7 +1344,7 @@ void LanguageTagImpl::convertLocaleToBcp47()
// locale via LanguageTag::convertToBcp47(LanguageType) and
// LanguageTag::convertToLocale(LanguageType) would instantiate another
// LanguageTag.
-maLocale = MsLangId::Conversion::convertLanguageToLocale(
LANGUAGE_SYSTEM, true);
+maLocale = MsLangId::Conversion::convertLanguageToLocale(
LANGUAGE_SYSTEM );
}
if (maLocale.Language.isEmpty())
{
@@ -1488,7 +1488,7 @@ void LanguageTagImpl::convertLangToLocale()
mbInitializedLangID = true;
}
// Resolve system here! The original is remembered as mbSystemLocale.
-maLocale = MsLangId::Conversion::convertLanguageToLocale( mnLangID, true);
+maLocale = MsLangId::Conversion::convertLanguageToLocale( mnLangID );
mbInitializedLocale = true;
}
diff --git a/include/i18nlangtag/mslangid.hxx b/include/i18nlangtag/mslangid.hxx
index c9851e098e1c..fde9087a4f7f 100644
--- a/include/i18nlangtag/mslangid.hxx
+++ b/include/i18nlangtag/
[Libreoffice-commits] core.git: configure.ac
configure.ac |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 33a3de2f0ce2b18d8149dc68c3de16541adfc530
Author: Kohei Yoshida
Date: Mon Oct 30 18:17:10 2017 -0400
Up the required mdds package to 1.3.0 (latest).
Change-Id: Idce0a561c8fc163450504d1570a16cad2f0faf09
Reviewed-on: https://gerrit.libreoffice.org/44078
Tested-by: Jenkins
Reviewed-by: Kohei Yoshida
diff --git a/configure.ac b/configure.ac
index 5535fa48bce5..76b32a0a0ca1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8654,7 +8654,7 @@ AC_SUBST(SYSTEM_BOOST)
dnl ===
dnl Check for system mdds
dnl ===
-libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds-1.2 >= 1.2.3],
["-I${WORKDIR}/UnpackedTarball/mdds/include"])
+libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds-1.2 >= 1.3.0],
["-I${WORKDIR}/UnpackedTarball/mdds/include"])
dnl ===
dnl Check for system glm
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/oox oox/source registry/inc registry/source registry/tools reportdesign/source
include/oox/ole/olehelper.hxx |3 +--
oox/source/ole/axbinaryreader.cxx |2 +-
oox/source/ole/axbinarywriter.cxx |6 +++---
oox/source/ole/axcontrol.cxx |8
oox/source/ole/olehelper.cxx | 13 +
registry/inc/regapi.hxx |6 ++
registry/source/reflread.cxx |6 +++---
registry/source/reflwrit.cxx |8 +++-
registry/source/registry.cxx |5 ++---
registry/tools/regview.cxx|2 +-
reportdesign/source/ui/report/ViewsWindow.cxx |8
11 files changed, 29 insertions(+), 38 deletions(-)
New commits:
commit 693d40fed862614e05fbad167f7f09005683d6da
Author: Noel Grandin
Date: Tue Oct 31 08:50:15 2017 +0200
loplugin:constantparam in oox,registry,reportdesign
Change-Id: I914fa6c6ef2f660eb6b8570c9c5f86cef477be80
Reviewed-on: https://gerrit.libreoffice.org/44093
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
diff --git a/include/oox/ole/olehelper.hxx b/include/oox/ole/olehelper.hxx
index 128b49796334..1a34748f79ee 100644
--- a/include/oox/ole/olehelper.hxx
+++ b/include/oox/ole/olehelper.hxx
@@ -130,8 +130,7 @@ namespace OleHelper
*/
OOX_DLLPUBLIC bool importStdPic(
StreamDataSequence& orGraphicData,
-BinaryInputStream& rInStrm,
-bool bWithGuid );
+BinaryInputStream& rInStrm );
}
class OOX_DLLPUBLIC OleFormCtrlExportHelper final
diff --git a/oox/source/ole/axbinaryreader.cxx
b/oox/source/ole/axbinaryreader.cxx
index 9c9cb5db7c17..5a1ae682df11 100644
--- a/oox/source/ole/axbinaryreader.cxx
+++ b/oox/source/ole/axbinaryreader.cxx
@@ -168,7 +168,7 @@ bool AxBinaryPropertyReader::FontProperty::readProperty(
AxAlignedInputStream& r
bool AxBinaryPropertyReader::PictureProperty::readProperty(
AxAlignedInputStream& rInStrm )
{
-return OleHelper::importStdPic( mrPicData, rInStrm, true );
+return OleHelper::importStdPic( mrPicData, rInStrm );
}
AxBinaryPropertyReader::AxBinaryPropertyReader( BinaryInputStream& rInStrm,
bool b64BitPropFlags ) :
diff --git a/oox/source/ole/axbinarywriter.cxx
b/oox/source/ole/axbinarywriter.cxx
index 0feeb9dc71c8..a0e4b83f23ce 100644
--- a/oox/source/ole/axbinarywriter.cxx
+++ b/oox/source/ole/axbinarywriter.cxx
@@ -86,10 +86,10 @@ void AxAlignedOutputStream::align( size_t nSize )
namespace {
-void lclWriteString( AxAlignedOutputStream& rOutStrm, OUString const & rValue,
sal_uInt32 nSize, bool bArrayString )
+void lclWriteString( AxAlignedOutputStream& rOutStrm, OUString const & rValue,
sal_uInt32 nSize )
{
bool bCompressed = getFlag( nSize, AX_STRING_COMPRESSED );
-rOutStrm.writeCompressedUnicodeArray( rValue, bCompressed || bArrayString
);
+rOutStrm.writeCompressedUnicodeArray( rValue, bCompressed );
}
} // namespace
@@ -106,7 +106,7 @@ bool AxBinaryPropertyWriter::PairProperty::writeProperty(
AxAlignedOutputStream&
bool AxBinaryPropertyWriter::StringProperty::writeProperty(
AxAlignedOutputStream& rOutStrm )
{
-lclWriteString( rOutStrm, mrValue, mnSize, false );
+lclWriteString( rOutStrm, mrValue, mnSize );
return true;
}
diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx
index 326931b674fe..7ab805691c82 100644
--- a/oox/source/ole/axcontrol.cxx
+++ b/oox/source/ole/axcontrol.cxx
@@ -743,7 +743,7 @@ bool ComCtlModelBase::importComplexPart( BinaryInputStream&
rInStrm )
sal_uInt32 nContFlags = rInStrm.readuInt32();
bool bReadOk =
(!getFlag( nContFlags, COMCTL_COMPLEX_FONT ) ||
OleHelper::importStdFont( maFontData, rInStrm, true )) &&
-(!getFlag( nContFlags, COMCTL_COMPLEX_MOUSEICON ) ||
OleHelper::importStdPic( maMouseIcon, rInStrm, true ));
+(!getFlag( nContFlags, COMCTL_COMPLEX_MOUSEICON ) ||
OleHelper::importStdPic( maMouseIcon, rInStrm ));
return bReadOk && !rInStrm.isEof();
}
return false;
@@ -978,7 +978,7 @@ void AxCommandButtonModel::importPictureData( sal_Int32
nPropId, BinaryInputStre
{
switch( nPropId )
{
-case XML_Picture: OleHelper::importStdPic( maPictureData, rInStrm,
true );break;
+case XML_Picture: OleHelper::importStdPic( maPictureData, rInStrm );
break;
default:AxFontDataModel::importPictureData( nPropId,
rInStrm );
}
}
@@ -1242,7 +1242,7 @@ void AxImageModel::importPictureData( sal_Int32 nPropId,
BinaryInputStream& rInS
{
switch( nPropId )
{
-case XML_Picture: OleHelper::importStdPic( maPictureData, rInStrm,
true );break;
+case XML_Picture: OleHelper::importStdPic( maPictureData, rInStrm );
break;
default:AxControlModelBase::importPictureData( nPropId,
rInStrm );
}
}
@@ -1426
[Libreoffice-commits] core.git: sdext/source sd/source
sd/source/ui/inc/SlideSorter.hxx|1
sd/source/ui/slidesorter/controller/SlsClipboard.cxx|2
sd/source/ui/slidesorter/controller/SlsTransferableData.cxx |4 -
sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx |2
sd/source/ui/slidesorter/shell/SlideSorter.cxx |3
sd/source/ui/slidesorter/shell/SlideSorterService.cxx |1
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 35
--
7 files changed, 17 insertions(+), 31 deletions(-)
New commits:
commit c0cf07d3da5245e594f8f1ad11479e85bd15b88f
Author: Noel Grandin
Date: Mon Oct 30 13:41:01 2017 +0200
loplugin:constantparam in sd
Change-Id: I1c5e5a26d343ac3aa244d7b053f2ec6922edbb21
Reviewed-on: https://gerrit.libreoffice.org/44085
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sd/source/ui/inc/SlideSorter.hxx b/sd/source/ui/inc/SlideSorter.hxx
index 83f949fa91d3..fae76ff19fdd 100644
--- a/sd/source/ui/inc/SlideSorter.hxx
+++ b/sd/source/ui/inc/SlideSorter.hxx
@@ -115,7 +115,6 @@ public:
*/
static std::shared_ptr CreateSlideSorter (
ViewShellBase& rBase,
-ViewShell* pViewShell,
vcl::Window& rParentWindow);
/** Return the control of the vertical scroll bar.
diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
index 42f91e1a3ce1..b65926d52844 100644
--- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
@@ -436,8 +436,6 @@ void Clipboard::CreateSlideTransferable (
mrSlideSorter.GetView().BrkAction();
SdTransferable* pTransferable = TransferableData::CreateTransferable (
pDocument,
-nullptr,
-false,
dynamic_cast(mrSlideSorter.GetViewShell()),
aRepresentatives);
diff --git a/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx
b/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx
index 946e54bf86af..e02d8363dcaa 100644
--- a/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx
@@ -26,12 +26,10 @@ namespace sd { namespace slidesorter { namespace controller
{
SdTransferable* TransferableData::CreateTransferable (
SdDrawDocument* pSrcDoc,
-::sd::View* pWorkView,
-bool bInitOnGetData,
SlideSorterViewShell* pViewShell,
const ::std::vector& rRepresentatives)
{
-SdTransferable* pTransferable = new SdTransferable (pSrcDoc, pWorkView,
bInitOnGetData);
+SdTransferable* pTransferable = new SdTransferable (pSrcDoc, nullptr,
false/*bInitOnGetData*/);
std::shared_ptr pData (new TransferableData(pViewShell,
rRepresentatives));
pTransferable->AddUserData(pData);
return pTransferable;
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx
b/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx
index bfc0be13bb71..ae4c84f7c55e 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx
@@ -58,8 +58,6 @@ public:
static SdTransferable* CreateTransferable (
SdDrawDocument* pSrcDoc,
-::sd::View* pWorkView,
-bool bInitOnGetData,
SlideSorterViewShell* pViewShell,
const ::std::vector&
rRepresentatives);
diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx
b/sd/source/ui/slidesorter/shell/SlideSorter.cxx
index af850c64b6ff..398cc2a0edc3 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorter.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorter.cxx
@@ -89,13 +89,12 @@ std::shared_ptr SlideSorter::CreateSlideSorter(
std::shared_ptr SlideSorter::CreateSlideSorter (
ViewShellBase& rBase,
-ViewShell* pViewShell,
vcl::Window& rParentWindow)
{
std::shared_ptr pSlideSorter(
new SlideSorter(
rBase,
-pViewShell,
+nullptr,
rParentWindow));
pSlideSorter->Init();
return pSlideSorter;
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx
b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx
index afe884dde902..df1b20bcc53c 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx
@@ -96,7 +96,6 @@ void SAL_CALL SlideSorterService::initialize (const
Sequence& rArguments)
if (pBase != nullptr && pParentWindow)
mpSlideSorter = SlideSorter::CreateSlideSorter(
*pBase,
-nullptr,
*pParentWindow);
Resize();
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index fb8728bca212..fa763df01918 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+
[Libreoffice-commits] core.git: Branch 'feature/calc-parallel' - 1151 commits - accessibility/inc accessibility/source android/source apple_remote/source avmedia/inc avmedia/Library_avmedia.mk avmedia
Rebased ref, commits from common ancestor:
commit a0e25475cee4cce0dbd082d1c893bd711d7a9962
Author: Tor Lillqvist
Date: Mon Oct 16 18:40:51 2017 +0300
Add OFFSET to blacklist for threaded calculation
Change-Id: Ia1aaf40aa4e8e6f41ca190272365528bf37bf130
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index db28d42ebcf3..43f0825b3f1e 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -1341,6 +1341,7 @@ void ScTokenArray::CheckToken( const FormulaToken& r )
static const std::set aThreadedCalcBlackList({
ocIndirect,
ocMacro,
+ocOffset,
ocTableOp
});
commit babc1820b780689b41097a9dc0346f0c1288bf90
Author: Tor Lillqvist
Date: Mon Oct 16 18:31:07 2017 +0300
Add INDIRECT to blacklist for threaded calculation
Change-Id: I9a2066c396802551c3eda2c8db32b6d1a4171dfd
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index fe007d680b30..db28d42ebcf3 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -1339,6 +1339,7 @@ bool ScTokenArray::AddFormulaToken(
void ScTokenArray::CheckToken( const FormulaToken& r )
{
static const std::set aThreadedCalcBlackList({
+ocIndirect,
ocMacro,
ocTableOp
});
commit 6c74f5ad2696446261a7b902c284c95fa6ad1949
Author: Tor Lillqvist
Date: Mon Oct 16 18:28:24 2017 +0300
Check whether ScTokenArray::CheckToken() has disabled threading of the group
Otherwise the aThreadedCalcBlackList check in CheckToken() has no
effect, we would still attempt the threaded code path.
Change-Id: I08dc2dd174459615ab8a11dbb819e39fc5437d10
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index 002d72dbad88..61b0f5a87702 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -4345,7 +4345,7 @@ bool ScFormulaCell::InterpretFormulaGroup()
return false;
}
-if (!bThreadingProhibited && !ScCalcConfig::isOpenCLEnabled() &&
officecfg::Office::Calc::Formula::Calculation::UseThreadedCalculationForFormulaGroups::get())
+if (!bThreadingProhibited && !ScCalcConfig::isOpenCLEnabled() &&
pCode->GetVectorState() != FormulaVectorDisabledNotInSubSet &&
officecfg::Office::Calc::Formula::Calculation::UseThreadedCalculationForFormulaGroups::get())
{
// iterate over code in the formula ...
// ensure all input is pre-calculated -
commit 9e7bf2c755ee3cb01572d36141d6ea7cc6dc18ab
Author: Tor Lillqvist
Date: Wed Oct 4 22:55:19 2017 +0300
Avoid unused private field warning in the NDEBUG case
Change-Id: I5e37b9a8325af35a15c01409f9eaa2f92459cc28
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 73f450dc8163..a53258a2fb70 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -6747,6 +6747,7 @@ ScMutationGuard::ScMutationGuard(ScDocument* pDocument,
ScMutationGuardFlags nFl
mpDocument(pDocument),
mnFlags(nFlags)
{
+(void) mpDocument;
for (unsigned b = 0; b <
static_cast(ScMutationGuardFlags::N); b++)
{
if (static_cast(mnFlags) & (1 << b))
commit 6442b4ccb2b7845918d99eebfaf786a2665fc04c
Author: Tor Lillqvist
Date: Wed Oct 4 16:55:59 2017 +0300
Move ScDocument::GetNonThreadedContext() inline
Did not have any impact on performance, though.
Change-Id: I7e769b4a74e0ff9e0aabfb7e291fc4b987441954
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index c86d48b6c3cf..04544fe5a64e 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -564,7 +564,11 @@ public:
SC_DLLPUBLIC void InitDrawLayer( SfxObjectShell* pDocShell = nullptr );
-SC_DLLPUBLIC ScInterpreterContext GetNonThreadedContext() const;
+ScInterpreterContext GetNonThreadedContext() const
+{
+// GetFormatTable() asserts that we are not in a threaded calculation
+return ScInterpreterContext(*this, GetFormatTable());
+}
SC_DLLPUBLIC sfx2::LinkManager* GetLinkManager();
SC_DLLPUBLIC const sfx2::LinkManager* GetLinkManager() const;
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 0df71931c355..73f450dc8163 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -6769,13 +6769,6 @@ ScMutationGuard::~ScMutationGuard()
#endif
}
-ScInterpreterContext ScDocument::GetNonThreadedContext() const
-{
-// GetFormatTable() asserts that we are not in a threaded calculation
-ScInterpreterContext aResult(*this, GetFormatTable());
-return aResult;
-}
-
thread_local ScDocumentThreadSpecific ScDocument::maThreadSpecific;
ScRecursionHelper& ScDocument::GetRecursionHelper()
commit 4cfe1747eb16f62fda4150efe27a7a522e726216
Author: Tor Lillqvist
Date: Wed Oct 4 13:11:10 2017 +0300
Display the threaded calculation state in Hel
[Libreoffice-commits] core.git: Branch 'distro/escriba/escriba-5.2' - sw/qa sw/source
sw/qa/extras/uiwriter/data/tdf113520.fodt | 292 ++ sw/qa/extras/uiwriter/uiwriter.cxx| 37 +++ sw/source/core/layout/tabfrm.cxx | 15 + 3 files changed, 342 insertions(+), 2 deletions(-) New commits: commit d41478d65ab999fbc1778a5c7de8adb12fc8db73 Author: Miklos Vajna Date: Mon Oct 30 16:32:39 2017 +0100 tdf#113520 sw split sections in tables: avoid empty page after content del The problem was that since split sections are allowed in nested tables, deleting enough content so that the full content of a page is removed results in an empty page, having only a 0 height table. I.e. the split section gets removed properly, the inner table (and its row and column) as well, but the outer table is still there, though it is marked to have 0 height. This results in a situation that the previous page doesn't have free space (the in-table section tries to take as much space as it can), but on the other hand we try (and fail) to move the 0 height table on the current page to the previous one, as it doesn't have free space. At the end the "empty" page still has an invisible table frame, so it is not removed. Fix the problem by allowing the move of a 0 height follow table frame from the current page to the previous one, even it has no empty space. Reviewed-on: https://gerrit.libreoffice.org/44059 Reviewed-by: Miklos Vajna Tested-by: Jenkins (cherry picked from commit c9c956f2716c58e2573a9ac07073f712d736ed02) Conflicts: sw/source/core/layout/tabfrm.cxx Change-Id: I2a5fac88b8b7dc2b91d041b58a4ad1b328f56a6b diff --git a/sw/qa/extras/uiwriter/data/tdf113520.fodt b/sw/qa/extras/uiwriter/data/tdf113520.fodt new file mode 100644 index ..e82f98cb6e4f --- /dev/null +++ b/sw/qa/extras/uiwriter/data/tdf113520.fodt @@ -0,0 +1,292 @@ + +http://www.w3.org/1999/xlink"; xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML"; xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oas is:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office"; xmlns:ooow="http://openoffice.org/2004/writer"; xmlns:oooc="http://openoffice.org/2004/calc"; xmlns:dom="http://www.w3.org/2001/xml-events"; xmlns:xforms="http://www.w3.org/2002/xforms"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:rpt="http://openoffice.org/2005/report"; xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml"; xmlns:grddl="http://www.w3.org/2003/g/data-view#"; xmlns:officeooo="http://openoffice.org/2009/office"; xmlns:tableooo="http://openoffice.org/2009/table"; xmlns:drawooo="http://openoffice.org/2010/draw"; xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names: experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.text"> + +LibreOfficeDev/6.0.0.0.alpha1$Linux_X86_64 LibreOffice_project/10dd4c228fd4b01fea4b85bbe6d79536cefc9671 +2014-11-10T09:45:40.73 +2017-10-26T12:28:06.120632908 +6 +PT2M38S +Miklos Vajna + + + + + true + false + + + 0 + 1 + false + 100 + false + false + + + + + false + true + true + true + true + 0 + true + + false + false + false + false + false + false + false + false + false + false + false + false + false + true + false + true + true + false + false + false + false + + false + false + false + true + false + false + + false + false + false + false + true + 508478 + false + true + true + false + true + true + false + true + 0 + false + true + high-resolution + false + false + false + true + true + true + writer-data-source-ooxml + true + false + false + true + fals
[Libreoffice-commits] core.git: Branch 'distro/escriba/escriba-5.2.1' - sw/qa sw/source
sw/qa/extras/uiwriter/data/tdf113520.fodt | 292 ++ sw/qa/extras/uiwriter/uiwriter.cxx| 37 +++ sw/source/core/layout/tabfrm.cxx | 15 + 3 files changed, 342 insertions(+), 2 deletions(-) New commits: commit dfdb003fd063d9731cabce49370441ad5b111833 Author: Miklos Vajna Date: Mon Oct 30 16:32:39 2017 +0100 tdf#113520 sw split sections in tables: avoid empty page after content del The problem was that since split sections are allowed in nested tables, deleting enough content so that the full content of a page is removed results in an empty page, having only a 0 height table. I.e. the split section gets removed properly, the inner table (and its row and column) as well, but the outer table is still there, though it is marked to have 0 height. This results in a situation that the previous page doesn't have free space (the in-table section tries to take as much space as it can), but on the other hand we try (and fail) to move the 0 height table on the current page to the previous one, as it doesn't have free space. At the end the "empty" page still has an invisible table frame, so it is not removed. Fix the problem by allowing the move of a 0 height follow table frame from the current page to the previous one, even it has no empty space. Reviewed-on: https://gerrit.libreoffice.org/44059 Reviewed-by: Miklos Vajna Tested-by: Jenkins (cherry picked from commit c9c956f2716c58e2573a9ac07073f712d736ed02) Conflicts: sw/source/core/layout/tabfrm.cxx Change-Id: I2a5fac88b8b7dc2b91d041b58a4ad1b328f56a6b diff --git a/sw/qa/extras/uiwriter/data/tdf113520.fodt b/sw/qa/extras/uiwriter/data/tdf113520.fodt new file mode 100644 index ..e82f98cb6e4f --- /dev/null +++ b/sw/qa/extras/uiwriter/data/tdf113520.fodt @@ -0,0 +1,292 @@ + +http://www.w3.org/1999/xlink"; xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML"; xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oas is:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office"; xmlns:ooow="http://openoffice.org/2004/writer"; xmlns:oooc="http://openoffice.org/2004/calc"; xmlns:dom="http://www.w3.org/2001/xml-events"; xmlns:xforms="http://www.w3.org/2002/xforms"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:rpt="http://openoffice.org/2005/report"; xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml"; xmlns:grddl="http://www.w3.org/2003/g/data-view#"; xmlns:officeooo="http://openoffice.org/2009/office"; xmlns:tableooo="http://openoffice.org/2009/table"; xmlns:drawooo="http://openoffice.org/2010/draw"; xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names: experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.text"> + +LibreOfficeDev/6.0.0.0.alpha1$Linux_X86_64 LibreOffice_project/10dd4c228fd4b01fea4b85bbe6d79536cefc9671 +2014-11-10T09:45:40.73 +2017-10-26T12:28:06.120632908 +6 +PT2M38S +Miklos Vajna + + + + + true + false + + + 0 + 1 + false + 100 + false + false + + + + + false + true + true + true + true + 0 + true + + false + false + false + false + false + false + false + false + false + false + false + false + false + true + false + true + true + false + false + false + false + + false + false + false + true + false + false + + false + false + false + false + true + 508478 + false + true + true + false + true + true + false + true + 0 + false + true + high-resolution + false + false + false + true + true + true + writer-data-source-ooxml + true + false + false + true + fals
[Libreoffice-commits] online.git: wsd/Storage.cpp
wsd/Storage.cpp |4
1 file changed, 4 deletions(-)
New commits:
commit 12aaff7d1ae356e7bd734aaffc459e641b682ee3
Author: Tor Lillqvist
Date: Tue Oct 31 12:09:47 2017 +0200
Bin some superfluous vertical whitespace
Change-Id: I770342c34c87e38597d5eb3695c432af69273ce1
diff --git a/wsd/Storage.cpp b/wsd/Storage.cpp
index 95a489cb..1f402287 100644
--- a/wsd/Storage.cpp
+++ b/wsd/Storage.cpp
@@ -308,8 +308,6 @@ StorageBase::SaveResult
LocalStorage::saveLocalFileToStorage(const Authorization
{
LOG_INF("Copying " << _jailedFilePath << " to " << _uri.getPath());
Poco::File(_jailedFilePath).copyTo(_uri.getPath());
-
-
}
// update its fileinfo object. This is used later to check if someone
else changed the
@@ -478,8 +476,6 @@ Poco::Timestamp iso8601ToTimestamp(const std::string&
iso8601Time)
return timestamp;
}
-
-
} // anonymous namespace
std::unique_ptr WopiStorage::getWOPIFileInfo(const
Authorization& auth)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa
sc/qa/extras/sccellrangeobj.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit 773376103a07bf6254cef1c47f3c850d1c517688 Author: Andrea Gelmini Date: Mon Oct 30 16:39:26 2017 +0100 Removed duplicated include Change-Id: I492238cb7c16f240010266765a342c3514f989a5 Reviewed-on: https://gerrit.libreoffice.org/44061 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/sc/qa/extras/sccellrangeobj.cxx b/sc/qa/extras/sccellrangeobj.cxx index 66489225af1e..6a65aa3f0760 100644 --- a/sc/qa/extras/sccellrangeobj.cxx +++ b/sc/qa/extras/sccellrangeobj.cxx @@ -31,7 +31,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: sfx2/source
sfx2/source/doc/doctempl.cxx | 40
1 file changed, 40 deletions(-)
New commits:
commit c1316dcae2b30e626b0c0f134120f9522df93744
Author: Takeshi Abe
Date: Tue Oct 31 18:37:29 2017 +0900
sfx2: Kill dead code
which has been obsoleted since 387a35cedd74fee295dfeb2ad59a74cd8dabc451.
Change-Id: Icd3f0044ea67b0cecf4491399e875197282ea476
Reviewed-on: https://gerrit.libreoffice.org/44106
Reviewed-by: Julien Nabet
Tested-by: Julien Nabet
diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index 1d2315606f97..96588028caf7 100644
--- a/sfx2/source/doc/doctempl.cxx
+++ b/sfx2/source/doc/doctempl.cxx
@@ -1294,7 +1294,6 @@ RegionData_Impl::~RegionData_Impl()
size_t RegionData_Impl::GetEntryPos( const OUString& rTitle, bool& rFound )
const
{
-#if 1 // Don't use binary search today
const size_t nCount = maEntries.size();
for ( size_t i=0; iCompare( rTitle );
-
-if ( nCompVal < 0 ) // pMid < pData
-nStart = nMid + 1;
-else
-nEnd = nMid - 1;
-}
-
-if ( nCompVal == 0 )
-{
-rFound = sal_True;
-}
-else
-{
-if ( nCompVal < 0 ) // pMid < pData
-nMid++;
-}
-
-return nMid;
-#endif
}
___
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/core/access/acccontext.cxx|4 sw/source/core/access/accfrmobj.cxx | 12 sw/source/core/access/acctable.cxx | 42 - sw/source/core/crsr/callnk.cxx |2 sw/source/core/crsr/crsrsh.cxx | 30 sw/source/core/crsr/crstrvl.cxx | 22 sw/source/core/crsr/swcrsr.cxx | 15 sw/source/core/crsr/trvlcol.cxx |6 sw/source/core/crsr/trvlfnfl.cxx| 10 sw/source/core/crsr/trvltbl.cxx |6 sw/source/core/crsr/viscrs.cxx | 12 sw/source/core/doc/DocumentDrawModelManager.cxx |2 sw/source/core/doc/doc.cxx |2 sw/source/core/doc/docfly.cxx | 16 sw/source/core/doc/htmltbl.cxx |8 sw/source/core/doc/notxtfrm.cxx | 63 - sw/source/core/doc/tblrwcl.cxx | 16 sw/source/core/docnode/ndtbl.cxx| 50 - sw/source/core/docnode/ndtbl1.cxx | 74 - sw/source/core/docnode/node.cxx | 18 sw/source/core/draw/dflyobj.cxx | 42 - sw/source/core/draw/dpage.cxx | 12 sw/source/core/draw/dview.cxx |2 sw/source/core/edit/autofmt.cxx | 17 sw/source/core/edit/edattr.cxx |4 sw/source/core/edit/editsh.cxx |2 sw/source/core/fields/expfld.cxx|6 sw/source/core/fields/postithelper.cxx |8 sw/source/core/fields/reffld.cxx| 48 - sw/source/core/frmedt/fecopy.cxx| 20 sw/source/core/frmedt/fedesc.cxx|2 sw/source/core/frmedt/fefly1.cxx| 52 - sw/source/core/frmedt/feshview.cxx | 98 +- sw/source/core/frmedt/fetab.cxx | 66 - sw/source/core/frmedt/fews.cxx | 130 +-- sw/source/core/frmedt/tblsel.cxx| 207 ++-- sw/source/core/inc/flyfrms.hxx |2 sw/source/core/inc/frame.hxx| 133 ++- sw/source/core/inc/frmtool.hxx |2 sw/source/core/layout/anchoreddrawobject.cxx| 12 sw/source/core/layout/anchoredobject.cxx| 12 sw/source/core/layout/atrfrm.cxx| 14 sw/source/core/layout/calcmove.cxx | 396 + sw/source/core/layout/colfrm.cxx| 18 sw/source/core/layout/dbg_lay.cxx | 30 sw/source/core/layout/findfrm.cxx | 20 sw/source/core/layout/flowfrm.cxx | 14 sw/source/core/layout/fly.cxx | 167 ++- sw/source/core/layout/flycnt.cxx| 208 ++-- sw/source/core/layout/flyincnt.cxx | 44 - sw/source/core/layout/flylay.cxx| 173 ++-- sw/source/core/layout/frmtool.cxx | 150 +-- sw/source/core/layout/ftnfrm.cxx| 114 +- sw/source/core/layout/hffrm.cxx | 95 +- sw/source/core/layout/layact.cxx| 155 +-- sw/source/core/layout/laycache.cxx | 30 sw/source/core/layout/layouter.cxx | 12 sw/source/core/layout/newfrm.cxx|6 sw/source/core/layout/objectformatter.cxx |2 sw/source/core/layout/objectformattertxtfrm.cxx |2 sw/source/core/layout/pagechg.cxx | 130 +-- sw/source/core/layout/paintfrm.cxx | 178 ++-- sw/source/core/layout/sectfrm.cxx | 147 +-- sw/source/core/layout/ssfrm.cxx | 124 +- sw/sou
[Libreoffice-commits] core.git: sw/source
sw/source/ui/frmdlg/column.cxx |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 420452e56c2f18b85e6a59dbba80c06d96e28abd
Author: heiko tietze
Date: Fri Oct 27 20:36:10 2017 +0200
tdf#67670 Change default column spacing to 0.5cm
Change-Id: I12cf2abb5ed415425e0ee83bc92542ad74cb787c
Reviewed-on: https://gerrit.libreoffice.org/43964
Reviewed-by: Heiko Tietze
Tested-by: Heiko Tietze
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index e188e3a2a345..db28e793044a 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -583,6 +583,9 @@ void SwColumnPage::Reset(const SfxItemSet *rSet)
m_aEd3.SetMetric(aMetric);
m_aDistEd1.SetMetric(aMetric);
m_aDistEd2.SetMetric(aMetric);
+//default spacing between cols = 0.5cm
+m_aDistEd1.SetPrcntValue(50, FUNIT_CM);
+m_aDistEd2.SetPrcntValue(50, FUNIT_CM);
delete m_pColMgr;
m_pColMgr = new SwColMgr(*rSet);
@@ -1315,7 +1318,7 @@ IMPL_LINK( SwColumnPage, SetDefaultsHdl, ValueSet *, pVS,
void )
{
m_pCLNrEdt->SetValue( nItem );
m_pAutoWidthBox->Check();
-m_aDistEd1.SetPrcntValue(0);
+m_aDistEd1.SetPrcntValue(50, FUNIT_CM);
ColModify(nullptr);
}
else
@@ -1323,7 +1326,7 @@ IMPL_LINK( SwColumnPage, SetDefaultsHdl, ValueSet *, pVS,
void )
m_bLockUpdate = true;
m_pCLNrEdt->SetValue( 2 );
m_pAutoWidthBox->Check(false);
-m_aDistEd1.SetPrcntValue(0);
+m_aDistEd1.SetPrcntValue(50, FUNIT_CM);
ColModify(nullptr);
// now set the width ratio to 2 : 1 or 1 : 2 respectively
const long nSmall = static_cast< long >(m_pColMgr->GetActualSize() /
3);
___
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-5.3' - filter/source
filter/source/msfilter/msdffimp.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit d4a84bf09c42faa7e0954477834cd4c4e83248f5
Author: Szymon KÅos
Date: Thu Oct 26 18:13:05 2017 +0200
tdf#113162 corect the size only for watermark 2
Missing part for: 91d909ac8ec53ea135401babe8227f9c41b779b8
Change-Id: Id35d61084e034c7381c8e8016e50dd66aaf41d59
Reviewed-on: https://gerrit.libreoffice.org/43950
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/filter/source/msfilter/msdffimp.cxx
b/filter/source/msfilter/msdffimp.cxx
index 6e92dfe58c56..1a8d53138700 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -4416,7 +4416,8 @@ SdrObject* SvxMSDffManager::ImportShape( const
DffRecordHeader& rHd, SvStream& r
aFont.SetFamilyName( aFontName );
auto nTextWidth = pOut->GetTextWidth( aObjectText );
-if ( nTextWidth && aObjData.eShapeType ==
mso_sptTextPlainText )
+OUString aObjName = GetPropertyString(DFF_Prop_wzName,
rSt);
+if ( nTextWidth && aObjData.eShapeType ==
mso_sptTextPlainText && aObjName.match("PowerPlusWaterMarkObject"))
{
fRatio = aFont.GetFontSize().Height();
fRatio /= nTextWidth;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: wizards/com
wizards/com/sun/star/wizards/common/HelpIds.py |1 + 1 file changed, 1 insertion(+) New commits: commit 3c2e060f114c1e6d883af1fe63515b07ac886a5c Author: Gabor Kelemen Date: Mon Oct 30 22:22:01 2017 +0100 Fix Wizard HIDs moved off by one In commit b3f96d2ccba362a2898bc3a4d365ce7c4d0698e2 I made a mistake that caused a lot of Wizard HIDS go off by one i.e. they were attached to the next UI item. I noticed this in the Fax wizard. Adding one more empty array item seems to fix this. Problem was caused by the replacement of this line with an empty item: "", "HID:WIZARDS_HID_IS_BTN_NONE", # HID:41002 Change-Id: Id7df502ac843ab0e572ca59a046f5bacdda7e9bc Reviewed-on: https://gerrit.libreoffice.org/44075 Tested-by: Jenkins Reviewed-by: Andras Timar diff --git a/wizards/com/sun/star/wizards/common/HelpIds.py b/wizards/com/sun/star/wizards/common/HelpIds.py index c76b9e3eaa8b..971fc149c51a 100644 --- a/wizards/com/sun/star/wizards/common/HelpIds.py +++ b/wizards/com/sun/star/wizards/common/HelpIds.py @@ -772,6 +772,7 @@ class HelpIds: "", "", "", +"", "HID:WIZARDS_HID_IS_BTN_OK", # HID:41003 "HID:WIZARDS_HID_IS_BTN_CANCEL", # HID:41004 "HID:WIZARDS_HID_IS_BTN_IMG1", # HID:41005 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx sd/source svx/source sw/source
include/svx/ClassificationField.hxx |4
sd/source/ui/view/drviews2.cxx | 55 +-
svx/source/dialog/ClassificationDialog.cxx | 48 +
svx/source/dialog/ClassificationEditView.cxx | 24 +-
sw/source/core/edit/edfcol.cxx | 221 +--
5 files changed, 255 insertions(+), 97 deletions(-)
New commits:
commit 73f57984110a3c5bb19168dd0789c0c3c809b24e
Author: Tomaž Vajngerl
Date: Fri Oct 27 16:03:52 2017 +0900
TSCP: proper collecting and applying of paragraph and text weight
Change-Id: I22edc4adb87706a176c3afa3500963c4a5b46ee7
Reviewed-on: https://gerrit.libreoffice.org/44015
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/include/svx/ClassificationField.hxx
b/include/svx/ClassificationField.hxx
index 559ed66511d8..b57f29cbafbe 100644
--- a/include/svx/ClassificationField.hxx
+++ b/include/svx/ClassificationField.hxx
@@ -22,7 +22,8 @@ enum class ClassificationType
CATEGORY,
MARKING,
TEXT,
-INTELLECTUAL_PROPERTY_PART
+INTELLECTUAL_PROPERTY_PART,
+PARAGRAPH,
};
class SVX_DLLPUBLIC ClassificationField : public SvxFieldData
@@ -61,7 +62,6 @@ struct SVX_DLLPUBLIC ClassificationResult
ClassificationType meType;
OUString msString;
OUString msAbbreviatedString;
-sal_Int32 mnParagraph;
};
} // end svx namespace
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 49706a9cdd0d..e96a69db7c60 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -299,7 +299,6 @@ public:
const sal_uInt16 nCount =
m_rDrawViewShell.GetDoc()->GetMasterSdPageCount(PageKind::Standard);
-sal_Int32 nParagraph = 1;
bool bFound = false;
for (sal_uInt16 nPageIndex = 0; nPageIndex < nCount; ++nPageIndex)
@@ -323,8 +322,34 @@ public:
bFound = true;
m_pRectObject = pRectObject;
const OUString sBlank("");
+sal_Int32 nCurrentParagraph = -1;
+
for (editeng::Section const & rSection : aSections)
{
+// Insert new paragraph if needed
+while (nCurrentParagraph <
rSection.mnParagraph)
+{
+nCurrentParagraph++;
+
+// Get Weight of current paragraph
+FontWeight eFontWeight = WEIGHT_NORMAL;
+SfxItemSet
aItemSet(rEditText.GetParaAttribs(nCurrentParagraph));
+if (const SfxPoolItem* pItem =
aItemSet.GetItem(EE_CHAR_WEIGHT, false))
+{
+const SvxWeightItem* pWeightItem =
dynamic_cast(pItem);
+if (pWeightItem &&
pWeightItem->GetWeight() == WEIGHT_BOLD)
+eFontWeight = WEIGHT_BOLD;
+}
+
+// Font weight to string
+OUString sWeightProperty = "NORMAL";
+if (eFontWeight == WEIGHT_BOLD)
+sWeightProperty = "BOLD";
+
+// Insert into collection
+m_aResults.push_back({
svx::ClassificationType::PARAGRAPH, sWeightProperty, sBlank });
+}
+
const SvxFieldItem* pFieldItem =
findField(rSection);
const editeng::CustomPropertyField*
pCustomPropertyField = pFieldItem ? dynamic_cast(pFieldItem->GetField()) : nullptr;
if (pCustomPropertyField)
@@ -333,22 +358,22 @@ public:
if (aKey.startsWith(sPolicy +
"Marking:Text:"))
{
OUString aValue =
lcl_getProperty(xPropertyContainer, aKey);
-m_aResults.push_back({
svx::ClassificationType::TEXT, aValue, sBlank, nParagraph });
+m_aResults.push_back({
svx::ClassificationType::TEXT, aValue, sBlank });
}
else if (aKey.startsWith(sPolicy +
"BusinessAuthorizationCategory:Name"))
{
OUString aValue =
lcl_getProperty(xPropertyContainer, aKey);
-m_aResults.push_back({
svx::ClassificationType::CATEGORY, aValue, sBlank, nParagraph });
+m_aResults.push_back({
svx::ClassificationTy
[Libreoffice-commits] libcdr.git: docs/doxygen
docs/doxygen/doxygen.cfg | 2470 ++-
1 file changed, 1606 insertions(+), 864 deletions(-)
New commits:
commit 69236603f705f39ad031dbac40eced4072afdfd0
Author: Fridrich Å trba
Date: Tue Oct 31 09:50:57 2017 +0100
doxygen -u
Change-Id: I8bc533a2b6e5ca7e935cde7bf2e00ae86224a95b
diff --git a/docs/doxygen/doxygen.cfg b/docs/doxygen/doxygen.cfg
index 4d62189..c61ce8a 100644
--- a/docs/doxygen/doxygen.cfg
+++ b/docs/doxygen/doxygen.cfg
@@ -1,107 +1,129 @@
-# Doxyfile 1.7.3
+# Doxyfile 1.8.13
# This file describes the settings to be used by the documentation system
# doxygen (www.doxygen.org) for a project.
#
-# All text after a hash (#) is considered a comment and will be ignored.
+# All text after a double hash (##) is considered a comment and is placed in
+# front of the TAG it is preceding.
+#
+# All text after a single hash (#) is considered a comment and will be ignored.
# The format is:
-# TAG = value [value, ...]
-# For lists items can also be appended using:
-# TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ").
+# TAG = value [value, ...]
+# For lists, items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (\" \").
#---
# Project related configuration options
#---
# This tag specifies the encoding used for all characters in the config file
-# that follow. The default is UTF-8 which is also the encoding used for all
-# text before the first occurrence of this tag. Doxygen uses libiconv (or the
-# iconv built into libc) for the transcoding. See
-# http://www.gnu.org/software/libiconv for the list of possible encodings.
+# that follow. The default is UTF-8 which is also the encoding used for all
text
+# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
+# built into libc) for the transcoding. See
http://www.gnu.org/software/libiconv
+# for the list of possible encodings.
+# The default value is: UTF-8.
DOXYFILE_ENCODING = UTF-8
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
-# by quotes) that should identify the project.
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
+# double-quotes, unless you are using Doxywizard) that should identify the
+# project for which the documentation is generated. This name is used in the
+# title of most generated pages and in a few other places.
+# The default value is: My Project.
PROJECT_NAME = libcdr
-# The PROJECT_NUMBER tag can be used to enter a project or revision number.
-# This could be handy for archiving the generated documentation or
-# if some version control system is used.
+# The PROJECT_NUMBER tag can be used to enter a project or revision number.
This
+# could be handy for archiving the generated documentation or if some version
+# control system is used.
PROJECT_NUMBER =
-# Using the PROJECT_BRIEF tag one can provide an optional one line description
for a project that appears at the top of each page and should give viewer a
quick idea about the purpose of the project. Keep the description short.
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer a
+# quick idea about the purpose of the project. Keep the description short.
PROJECT_BRIEF =
-# With the PROJECT_LOGO tag one can specify an logo or icon that is
-# included in the documentation. The maximum height of the logo should not
-# exceed 55 pixels and the maximum width should not exceed 200 pixels.
-# Doxygen will copy the logo to the output directory.
+# With the PROJECT_LOGO tag one can specify a logo or an icon that is included
+# in the documentation. The maximum height of the logo should not exceed 55
+# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
+# the logo to the output directory.
PROJECT_LOGO =
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
-# base path where the generated documentation will be put.
-# If a relative path is entered, it will be relative to the location
-# where doxygen was started. If left blank the current directory will be used.
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
+# into which the generated documentation will be written. If a relative path is
+# entered, it will be relative to the location where doxygen was started. If
+# left blank the current directory will be used.
OUTPUT_DIRECTORY = ./
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
-# 4096 sub-directories (in 2 levels) under the output directory of each output
-# format and will distribute
[Libreoffice-commits] libmspub.git: docs/doxygen
docs/doxygen/doxygen.cfg | 2470 ++-
1 file changed, 1606 insertions(+), 864 deletions(-)
New commits:
commit ecff3c33df4bdbf525aa5227a36e6a20bedc4993
Author: Fridrich Å trba
Date: Tue Oct 31 09:47:04 2017 +0100
doxygen -u
Change-Id: If1d88d56e527873e5587ba78f7fc80e64cdeb0c2
diff --git a/docs/doxygen/doxygen.cfg b/docs/doxygen/doxygen.cfg
index 292724b..8e21007 100644
--- a/docs/doxygen/doxygen.cfg
+++ b/docs/doxygen/doxygen.cfg
@@ -1,107 +1,129 @@
-# Doxyfile 1.7.3
+# Doxyfile 1.8.13
# This file describes the settings to be used by the documentation system
# doxygen (www.doxygen.org) for a project.
#
-# All text after a hash (#) is considered a comment and will be ignored.
+# All text after a double hash (##) is considered a comment and is placed in
+# front of the TAG it is preceding.
+#
+# All text after a single hash (#) is considered a comment and will be ignored.
# The format is:
-# TAG = value [value, ...]
-# For lists items can also be appended using:
-# TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ").
+# TAG = value [value, ...]
+# For lists, items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (\" \").
#---
# Project related configuration options
#---
# This tag specifies the encoding used for all characters in the config file
-# that follow. The default is UTF-8 which is also the encoding used for all
-# text before the first occurrence of this tag. Doxygen uses libiconv (or the
-# iconv built into libc) for the transcoding. See
-# http://www.gnu.org/software/libiconv for the list of possible encodings.
+# that follow. The default is UTF-8 which is also the encoding used for all
text
+# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
+# built into libc) for the transcoding. See
http://www.gnu.org/software/libiconv
+# for the list of possible encodings.
+# The default value is: UTF-8.
DOXYFILE_ENCODING = UTF-8
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
-# by quotes) that should identify the project.
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
+# double-quotes, unless you are using Doxywizard) that should identify the
+# project for which the documentation is generated. This name is used in the
+# title of most generated pages and in a few other places.
+# The default value is: My Project.
PROJECT_NAME = libmspub
-# The PROJECT_NUMBER tag can be used to enter a project or revision number.
-# This could be handy for archiving the generated documentation or
-# if some version control system is used.
+# The PROJECT_NUMBER tag can be used to enter a project or revision number.
This
+# could be handy for archiving the generated documentation or if some version
+# control system is used.
PROJECT_NUMBER =
-# Using the PROJECT_BRIEF tag one can provide an optional one line description
for a project that appears at the top of each page and should give viewer a
quick idea about the purpose of the project. Keep the description short.
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer a
+# quick idea about the purpose of the project. Keep the description short.
PROJECT_BRIEF =
-# With the PROJECT_LOGO tag one can specify an logo or icon that is
-# included in the documentation. The maximum height of the logo should not
-# exceed 55 pixels and the maximum width should not exceed 200 pixels.
-# Doxygen will copy the logo to the output directory.
+# With the PROJECT_LOGO tag one can specify a logo or an icon that is included
+# in the documentation. The maximum height of the logo should not exceed 55
+# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
+# the logo to the output directory.
PROJECT_LOGO =
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
-# base path where the generated documentation will be put.
-# If a relative path is entered, it will be relative to the location
-# where doxygen was started. If left blank the current directory will be used.
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
+# into which the generated documentation will be written. If a relative path is
+# entered, it will be relative to the location where doxygen was started. If
+# left blank the current directory will be used.
OUTPUT_DIRECTORY = ./
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
-# 4096 sub-directories (in 2 levels) under the output directory of each output
-# format and will distribut
[Libreoffice-commits] core.git: filter/source
filter/source/msfilter/msdffimp.cxx | 11 ++-
1 file changed, 6 insertions(+), 5 deletions(-)
New commits:
commit 13d79459e5d30b927f50885d42f7ce404124a2d0
Author: Caolán McNamara
Date: Mon Oct 30 20:24:47 2017 +
ofz#3931 Integer-overflow
Change-Id: Iab9e4c300e0b860d7fac5274b7ca6345c56343f8
Reviewed-on: https://gerrit.libreoffice.org/44072
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/filter/source/msfilter/msdffimp.cxx
b/filter/source/msfilter/msdffimp.cxx
index f2d424de9f02..c4786ff88d86 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -928,15 +928,16 @@ void DffPropertyReader::ApplyLineAttributes( SfxItemSet&
rSet, const MSO_SPT eSh
}
MSO_LineDashing eLineDashing = (MSO_LineDashing)GetPropertyValue(
DFF_Prop_lineDashing, mso_lineSolid );
-if ( eLineDashing == mso_lineSolid )
+if (eLineDashing == mso_lineSolid || nLineWidth < 0)
rSet.Put(XLineStyleItem( drawing::LineStyle_SOLID ) );
else
{
sal_uInt16 nDots = 1;
sal_uInt32 nDotLen = nLineWidth / 360;
sal_uInt16 nDashes = 0;
-sal_uInt32 nDashLen = ( 8 * nLineWidth ) / 360;
-sal_uInt32 nDistance = ( 3 * nLineWidth ) / 360;
+const bool bHugeWidth = static_cast(nLineWidth) >=
SAL_MAX_UINT32/8U; //then rougher approx is fine
+sal_uInt32 nDashLen = bHugeWidth ? (nDotLen * 8U) : ((8U *
nLineWidth) / 360);
+sal_uInt32 nDistance = bHugeWidth ? (nDotLen * 3U) : ((3U *
nLineWidth) / 360);
switch ( eLineDashing )
{
@@ -953,7 +954,7 @@ void DffPropertyReader::ApplyLineAttributes( SfxItemSet&
rSet, const MSO_SPT eSh
{
nDots = 0;
nDashes = 1;
-nDashLen = ( 4 * nLineWidth ) / 360;
+nDashLen = bHugeWidth ? (nDotLen * 4U) : ((4U *
nLineWidth) / 360);
}
break;
@@ -961,7 +962,7 @@ void DffPropertyReader::ApplyLineAttributes( SfxItemSet&
rSet, const MSO_SPT eSh
{
nDots = 1;
nDashes = 1;
-nDashLen = ( 4 * nLineWidth ) / 360;
+nDashLen = bHugeWidth ? (nDotLen * 4U) : ((4U *
nLineWidth) / 360);
}
break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/RotateFlyFrame2' - 37 commits - comphelper/source compilerplugins/clang configmgr/source download.lst extras/Package_tplpresnt.mk extras/source filter/s
Rebased ref, commits from common ancestor:
commit 4e5817b8520f2d517444e24163d66dd13580e727
Author: Armin Le Grand
Date: Mon Oct 30 21:30:32 2017 +0100
RotateFlyFrame2: Unified FrameAreaDefinition
Isolated all Frame AreaDefinition and it's layout flags to
SwFrameAreaDefinition class which is now base for SwFrame.
Adapted calls to get/set and WriteAccess hekper classes accordingly.
This allows much deeper understanding what Writer is doing when
layouting it's frames and needed when reaction on such changes
is necessary
Change-Id: I96220a1d140e69c76cc63023aae26e4ed17f3504
diff --git a/sw/source/core/access/acccontext.cxx
b/sw/source/core/access/acccontext.cxx
index 5e56fa85ff44..04dd13dfbaeb 100644
--- a/sw/source/core/access/acccontext.cxx
+++ b/sw/source/core/access/acccontext.cxx
@@ -1123,7 +1123,7 @@ void SwAccessibleContext::InvalidatePosOrSize( const
SwRect& )
{
SolarMutexGuard aGuard;
-OSL_ENSURE( GetFrame() && !GetFrame()->getSwFrame().IsEmpty(), "context
should have a size" );
+OSL_ENSURE( GetFrame() && !GetFrame()->geFrameArea().IsEmpty(), "context
should have a size" );
bool bIsOldShowingState;
bool bIsNewShowingState = IsShowing( *(GetMap()) );
@@ -1170,7 +1170,7 @@ void SwAccessibleContext::InvalidateChildPosOrSize(
// this happens during layout, e.g. when a page is deleted and next page's
// header/footer moves backward such an event is generated
SAL_INFO_IF(rChildFrameOrObj.GetSwFrame() &&
-rChildFrameOrObj.GetSwFrame()->getSwFrame().IsEmpty(),
+rChildFrameOrObj.GetSwFrame()->geFrameArea().IsEmpty(),
"sw.a11y", "child context should have a size");
if ( rChildFrameOrObj.AlwaysIncludeAsChild() )
diff --git a/sw/source/core/access/accfrmobj.cxx
b/sw/source/core/access/accfrmobj.cxx
index f233263694ea..1e79cb1fd93c 100644
--- a/sw/source/core/access/accfrmobj.cxx
+++ b/sw/source/core/access/accfrmobj.cxx
@@ -243,16 +243,16 @@ SwRect SwAccessibleChild::GetBox( const SwAccessibleMap&
rAccMap ) const
if ( mpFrame->IsPageFrame() &&
static_cast< const SwPageFrame * >( mpFrame )->IsEmptyPage() )
{
-aBox = SwRect( mpFrame->getSwFrame().Left(),
mpFrame->getSwFrame().Top()-1, 1, 1 );
+aBox = SwRect( mpFrame->geFrameArea().Left(),
mpFrame->geFrameArea().Top()-1, 1, 1 );
}
else if ( mpFrame->IsTabFrame() )
{
-aBox = SwRect( mpFrame->getSwFrame() );
-aBox.Intersection( mpFrame->GetUpper()->getSwFrame() );
+aBox = SwRect( mpFrame->geFrameArea() );
+aBox.Intersection( mpFrame->GetUpper()->geFrameArea() );
}
else
{
-aBox = mpFrame->getSwFrame();
+aBox = mpFrame->geFrameArea();
}
}
else if( mpDrawObj )
@@ -268,7 +268,7 @@ SwRect SwAccessibleChild::GetBox( const SwAccessibleMap&
rAccMap ) const
{
aBox = SwRect( mpDrawObj->GetCurrentBoundRect() );
// tdf#91260 drawing object may be partially off-page
-aBox.Intersection(pPage->getSwFrame());
+aBox.Intersection(pPage->geFrameArea());
}
}
else if ( mpWindow )
@@ -294,7 +294,7 @@ SwRect SwAccessibleChild::GetBounds( const SwAccessibleMap&
rAccMap ) const
if( mpFrame->IsPageFrame() &&
static_cast< const SwPageFrame * >( mpFrame )->IsEmptyPage() )
{
-aBound = SwRect( mpFrame->getSwFrame().Left(),
mpFrame->getSwFrame().Top()-1, 0, 0 );
+aBound = SwRect( mpFrame->geFrameArea().Left(),
mpFrame->geFrameArea().Top()-1, 0, 0 );
}
else
aBound = mpFrame->PaintArea();
diff --git a/sw/source/core/access/acctable.cxx
b/sw/source/core/access/acctable.cxx
index 0abbc829a8cf..feaa4f4148d6 100644
--- a/sw/source/core/access/acctable.cxx
+++ b/sw/source/core/access/acctable.cxx
@@ -156,14 +156,14 @@ void SwAccessibleTableData_Impl::CollectData( const
SwFrame *pFrame )
// #i77106#
if ( IncludeRow( *pLower ) )
{
-maRows.insert( pLower->getSwFrame().Top() -
maTabFramePos.getY() );
+maRows.insert( pLower->geFrameArea().Top() -
maTabFramePos.getY() );
CollectData( pLower );
}
}
else if( pLower->IsCellFrame() &&
rLower.IsAccessible( mbIsInPagePreview ) )
{
-maColumns.insert( pLower->getSwFrame().Left() -
maTabFramePos.getX() );
+maColumns.insert( pLower->geFrameArea().Left() -
maTabFramePos.getX() );
}
else
{
@@ -196,7 +196,7 @@ void SwAccessibleTableData_Impl::CollectRowHeaderData(
const SwFrame *pFrame )
//if(mpTabFrame->GetTable()->GetTabLines()[ 0 ] != pLine)
//return ;
-maR
[Libreoffice-commits] core.git: include/sfx2 sfx2/source sw/source
include/sfx2/app.hxx |4 ++--
include/sfx2/docfilt.hxx |3 +--
include/sfx2/evntconf.hxx |2 +-
include/sfx2/mgetempl.hxx |2 +-
sfx2/source/config/evntconf.cxx |4 ++--
sfx2/source/dialog/mgetempl.cxx |6 +-
sfx2/source/doc/docfilt.cxx | 12
sfx2/source/view/viewfrm.cxx |7 ---
sw/source/filter/html/htmlbas.cxx |2 +-
9 files changed, 17 insertions(+), 25 deletions(-)
New commits:
commit 3ad6957dc12c0667a69ca6b8361ccde490f9c1da
Author: Noel Grandin
Date: Mon Oct 30 13:30:44 2017 +0200
loplugin:constantparam in sfx2
Change-Id: Id52809401fb848d7169a665903e67ba28f4af598
Reviewed-on: https://gerrit.libreoffice.org/44084
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx
index ec1747a53cba..d3384e7f5a38 100644
--- a/include/sfx2/app.hxx
+++ b/include/sfx2/app.hxx
@@ -163,8 +163,8 @@ public:
static OUString ChooseScript();
static void MacroOrganizer( sal_Int16 nTabId );
static ErrCode CallBasic( const OUString&, BasicManager*,
SbxArray *pArgs, SbxValue *pRet );
-static ErrCode CallAppBasic( const OUString& i_macroName,
SbxArray* i_args = nullptr )
-{ return CallBasic( i_macroName,
SfxApplication::GetBasicManager(), i_args, nullptr ); }
+static ErrCode CallAppBasic( const OUString& i_macroName )
+{ return CallBasic( i_macroName,
SfxApplication::GetBasicManager(), nullptr, nullptr ); }
static BasicManager*GetBasicManager();
css::script::XLibraryContainer * GetDialogContainer();
css::script::XLibraryContainer * GetBasicContainer();
diff --git a/include/sfx2/docfilt.hxx b/include/sfx2/docfilt.hxx
index 95fde5036d06..d5e0507d577a 100644
--- a/include/sfx2/docfilt.hxx
+++ b/include/sfx2/docfilt.hxx
@@ -114,8 +114,7 @@ public:
/// @throws css::lang::WrappedTargetException
/// @throws css::uno::RuntimeException
static OUString GetTypeFromStorage(
-const css::uno::Reference& xStorage,
-bool bTemplate = false );
+const css::uno::Reference& xStorage );
};
#endif
diff --git a/include/sfx2/evntconf.hxx b/include/sfx2/evntconf.hxx
index 8a4d004c075d..bf59d805a074 100644
--- a/include/sfx2/evntconf.hxx
+++ b/include/sfx2/evntconf.hxx
@@ -98,7 +98,7 @@ class SFX2_DLLPUBLIC SfxEventConfiguration
{
public:
static void ConfigureEvent( const OUString& aName,
const SvxMacro&, SfxObjectShell const * pObjSh);
-static SvxMacro*ConvertToMacro( const css::uno::Any&
rElement, SfxObjectShell* pDoc, bool bBlowUp );
+static SvxMacro*ConvertToMacro( const css::uno::Any&
rElement, SfxObjectShell* pDoc );
};
#endif
diff --git a/include/sfx2/mgetempl.hxx b/include/sfx2/mgetempl.hxx
index fb018865cc35..42aeef6c1135 100644
--- a/include/sfx2/mgetempl.hxx
+++ b/include/sfx2/mgetempl.hxx
@@ -87,7 +87,7 @@ friend class SfxStyleDialog;
virtual voidReset(const SfxItemSet *) override;
static boolExecute_Impl( sal_uInt16 nId, const OUString& rStr, const
OUString& rRefStr,
- sal_uInt16 nFamily, sal_uInt16 nMask = 0 );
+ sal_uInt16 nFamily );
using TabPage::ActivatePage;
virtual voidActivatePage(const SfxItemSet &) override;
using TabPage::DeactivatePage;
diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx
index 58c6f2251feb..9de6fb043487 100644
--- a/sfx2/source/config/evntconf.cxx
+++ b/sfx2/source/config/evntconf.cxx
@@ -242,9 +242,9 @@ void SfxEventConfiguration::ConfigureEvent( const OUString&
aName, const SvxMacr
}
-SvxMacro* SfxEventConfiguration::ConvertToMacro( const css::uno::Any&
rElement, SfxObjectShell* pDoc, bool bBlowUp )
+SvxMacro* SfxEventConfiguration::ConvertToMacro( const css::uno::Any&
rElement, SfxObjectShell* pDoc )
{
-return SfxEvents_Impl::ConvertToMacro( rElement, pDoc, bBlowUp );
+return SfxEvents_Impl::ConvertToMacro( rElement, pDoc, true/*bBlowUp*/ );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index e93adca35721..b6e78d3a5ff9 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -371,22 +371,18 @@ IMPL_LINK_NOARG( SfxManageStyleSheetPage,
EditLinkStyleHdl_Impl, Button*, void )
// Internal: Perform functions through the Dispatcher
bool SfxManageStyleSheetPage::Execute_Impl(
-sal_uInt16 nId, const OUString &rStr, const OUString& rRefStr, sal_uInt16
nFamily,
-sal_uInt16 nMask)
+sal_uInt16 nId, const OUString &rStr, const OUString& rRefStr, sal_uInt16
nFamily)
{
SfxDispatcher &rDispatcher = *SfxGetpApp()->GetDispatcher_Impl();
SfxStringItem aI
[Libreoffice-commits] core.git: vcl/source
vcl/source/edit/textdoc.cxx |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit c2b018b94408703aef4e5d3429a9c0ab826f5b7c Author: Julien Nabet Date: Mon Oct 30 22:29:37 2017 +0100 tdf#113519: fix crash by releasing returned unique_ptr Regression from https://cgit.freedesktop.org/libreoffice/core/commit/?id=19910c461230f70bb9e98ad44db3525f0d755724 tdf#112658: fix leak when calling TextEngine::SetAttrib Change-Id: Iee82196ca10d82e898d8806a11874c3bedc28895 Reviewed-on: https://gerrit.libreoffice.org/44077 Reviewed-by: Julien Nabet Tested-by: Julien Nabet diff --git a/vcl/source/edit/textdoc.cxx b/vcl/source/edit/textdoc.cxx index 8734ea6e5705..267d774818d3 100644 --- a/vcl/source/edit/textdoc.cxx +++ b/vcl/source/edit/textdoc.cxx @@ -328,8 +328,7 @@ TextNode* TextNode::Split( sal_Int32 nPos ) SAL_WARN_IF( rAttrib.GetStart() < nPos, "vcl", "Start < nPos!" ); SAL_WARN_IF( rAttrib.GetEnd() < nPos, "vcl", "End < nPos!" ); // move all into the new node (this) -maCharAttribs.RemoveAttrib( nAttr ); -pNew->maCharAttribs.InsertAttrib( &rAttrib ); + pNew->maCharAttribs.InsertAttrib(maCharAttribs.RemoveAttrib(nAttr).release()); rAttrib.GetStart() = rAttrib.GetStart() - nPos; rAttrib.GetEnd() = rAttrib.GetEnd() - nPos; nAttr--; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - include/oox oox/source sd/qa
include/oox/drawingml/drawingmltypes.hxx | 15 +++
oox/source/export/chartexport.cxx| 22 +-
oox/source/export/drawingml.cxx |4 +++-
sd/qa/unit/data/pptx/smartart-rotation2.pptx |binary
sd/qa/unit/export-tests-ooxml2.cxx | 13 +
5 files changed, 32 insertions(+), 22 deletions(-)
New commits:
commit 54293c1fae0c774c72a8564a25844aecf6d40f7f
Author: Szymon KÅos
Date: Fri Oct 6 16:04:25 2017 +0200
SmartArt: export text rotation in the PPTX
Change-Id: I74bfc172fe7434d14de468ecfd3412636e53780c
Reviewed-on: https://gerrit.libreoffice.org/43202
Tested-by: Jenkins
Reviewed-by: Szymon KÅos
Reviewed-on: https://gerrit.libreoffice.org/44080
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/include/oox/drawingml/drawingmltypes.hxx
b/include/oox/drawingml/drawingmltypes.hxx
index 2aac13c669a7..aaed34b11ab9 100644
--- a/include/oox/drawingml/drawingmltypes.hxx
+++ b/include/oox/drawingml/drawingmltypes.hxx
@@ -150,6 +150,21 @@ struct IndexRange {
/** retrieve the content of CT_IndexRange */
IndexRange GetIndexRange( const css::uno::Reference<
css::xml::sax::XFastAttributeList >& xAttributes );
+/**
+* nRotation is a 100th of a degree and the return value is
+* in a 60,000th of a degree
+*
+* Also rotation is in opposite directions so multiply with -1
+*/
+inline OString calcRotationValue(sal_Int32 nRotation)
+{
+if (nRotation > 18000) // 180 degree
+{
+nRotation -= 36000;
+}
+nRotation *= -600;
+return OString::number(nRotation);
+}
const sal_Int32 EMU_PER_HMM = 360; /// 360 EMUs per 1/100 mm.
diff --git a/oox/source/export/chartexport.cxx
b/oox/source/export/chartexport.cxx
index 41faecacdbdb..e2c386194d0b 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -1038,26 +1038,6 @@ void ChartExport::exportLegend( const Reference<
css::chart::XChartDocument >& x
pFS->endElement( FSNS( XML_c, XML_legend ) );
}
-namespace {
-
-/**
- * nRotation is a 100th of a degree and the return value is
- * in a 60,000th of a degree
- *
- * Also rotation is in opposite directions so multiply with -1
- */
-OString calcRotationValue(sal_Int32 nRotation)
-{
-if (nRotation > 18000) // 180 degree
-{
-nRotation -= 36000;
-}
-nRotation *= -600;
-return OString::number(nRotation);
-}
-
-}
-
void ChartExport::exportTitle( const Reference< XShape >& xShape )
{
OUString sText;
@@ -1090,7 +1070,7 @@ void ChartExport::exportTitle( const Reference< XShape >&
xShape )
pFS->singleElement( FSNS( XML_a, XML_bodyPr ),
XML_vert, sWritingMode,
-XML_rot, calcRotationValue(nRotation).getStr(),
+XML_rot, oox::drawingml::calcRotationValue(nRotation).getStr(),
FSEND );
// TODO: lstStyle
pFS->singleElement( FSNS( XML_a, XML_lstStyle ),
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 4f1aa7223ee1..14f7c363ec4b 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -2079,6 +2079,8 @@ void DrawingML::WriteText( const Reference< XInterface >&
rXIface, const OUStrin
if( !xXText.is() )
return;
+sal_Int32 nTextRotateAngle = 0;
+
#define DEFLRINS 254
#define DEFTBINS 127
sal_Int32 nLeft, nRight, nTop, nBottom;
@@ -2118,7 +2120,6 @@ void DrawingML::WriteText( const Reference< XInterface >&
rXIface, const OUStrin
{
for ( sal_Int32 i = 0, nElems = aProps.getLength(); i < nElems;
++i )
{
-sal_Int32 nTextRotateAngle = 0;
if ( aProps[ i ].Name == "TextPreRotateAngle" && ( aProps[ i
].Value >>= nTextRotateAngle ) )
{
if ( nTextRotateAngle == -90 )
@@ -2175,6 +2176,7 @@ void DrawingML::WriteText( const Reference< XInterface >&
rXIface, const OUStrin
XML_anchor, sVerticalAlignment,
XML_anchorCtr, bHorizontalCenter ? "1" :
nullptr,
XML_vert, sWritingMode,
+ XML_rot, (nTextRotateAngle != 0) ?
oox::drawingml::calcRotationValue( nTextRotateAngle * 100 ).getStr() : nullptr,
FSEND );
if( !presetWarp.isEmpty())
{
diff --git a/sd/qa/unit/data/pptx/smartart-rotation2.pptx
b/sd/qa/unit/data/pptx/smartart-rotation2.pptx
new file mode 100755
index ..e1c4493a7407
Binary files /dev/null and b/sd/qa/unit/data/pptx/smartart-rotation2.pptx differ
diff --git a/sd/qa/unit/export-tests-ooxml2.cxx
b/sd/qa/unit/export-tests-ooxml2.cxx
index 4b467568921b..12cdd1580806 100644
--- a/sd/qa/unit/export-tests-ooxml2.cxx
+++ b/sd/qa/unit/export-tests-ooxml2.cxx
@@ -108,6 +108,7 @@ public:
void testTdf105739();
void testTdf112552();
void testTdf112647();
+vo
[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - sd/qa xmloff/inc xmloff/source
sd/qa/unit/data/pptx/shape-text-rotate.pptx |binary
sd/qa/unit/export-tests.cxx | 24
xmloff/inc/EnhancedCustomShapeToken.hxx |1 +
xmloff/source/draw/EnhancedCustomShapeToken.cxx |1 +
xmloff/source/draw/shapeexport.cxx |3 ++-
5 files changed, 28 insertions(+), 1 deletion(-)
New commits:
commit e7a0948db44f049b1cf03a6e6fcaca7e63e88ac2
Author: Szymon KÅos
Date: Thu Oct 26 10:33:45 2017 +0200
ODP: export TextPreRotateAngle
Change-Id: I13eb005195ebbdee5016bf279cba423e388723a0
Reviewed-on: https://gerrit.libreoffice.org/43910
Reviewed-by: Szymon KÅos
Tested-by: Szymon KÅos
Reviewed-on: https://gerrit.libreoffice.org/44079
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/sd/qa/unit/data/pptx/shape-text-rotate.pptx
b/sd/qa/unit/data/pptx/shape-text-rotate.pptx
new file mode 100755
index ..4a433c748d32
Binary files /dev/null and b/sd/qa/unit/data/pptx/shape-text-rotate.pptx differ
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index 6bbb2a53648b..f7240647814d 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -93,6 +93,7 @@ public:
void testTdf62176();
void testTransparentBackground();
void testEmbeddedPdf();
+void testTextRotation();
CPPUNIT_TEST_SUITE(SdExportTest);
@@ -108,6 +109,7 @@ public:
CPPUNIT_TEST(testTdf62176);
CPPUNIT_TEST(testTransparentBackground);
CPPUNIT_TEST(testEmbeddedPdf);
+CPPUNIT_TEST(testTextRotation);
CPPUNIT_TEST_SUITE_END();
@@ -653,6 +655,28 @@ void SdExportTest::testEmbeddedPdf()
#endif
}
+void SdExportTest::testTextRotation()
+{
+::sd::DrawDocShellRef xDocShRef =
loadURL(m_directories.getURLFromSrc("sd/qa/unit/data/pptx/shape-text-rotate.pptx"),
PPTX);
+utl::TempFile tempFile;
+xDocShRef = saveAndReload(xDocShRef.get(), ODP, &tempFile);
+
+uno::Reference xPage(getPage(0, xDocShRef));
+uno::Reference xPropSet(getShape(0, xPage));
+
+CPPUNIT_ASSERT(xPropSet.is());
+
+auto aGeomPropSeq =
xPropSet->getPropertyValue("CustomShapeGeometry").get>();
+comphelper::SequenceAsHashMap aCustomShapeGeometry(aGeomPropSeq);
+
+auto it = aCustomShapeGeometry.find("TextRotateAngle");
+CPPUNIT_ASSERT(it != aCustomShapeGeometry.end());
+
+CPPUNIT_ASSERT_EQUAL((double)(-90),
aCustomShapeGeometry["TextRotateAngle"].get());
+
+xDocShRef->DoClose();
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(SdExportTest);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/xmloff/inc/EnhancedCustomShapeToken.hxx
b/xmloff/inc/EnhancedCustomShapeToken.hxx
index dafe8b8ec8ec..92e200333dbc 100644
--- a/xmloff/inc/EnhancedCustomShapeToken.hxx
+++ b/xmloff/inc/EnhancedCustomShapeToken.hxx
@@ -93,6 +93,7 @@ namespace xmloff { namespace EnhancedCustomShapeToken {
EAS_MirroredY,
EAS_ViewBox,
EAS_TextRotateAngle,
+EAS_TextPreRotateAngle,
EAS_ExtrusionAllowed,
EAS_ConcentricGradientFillAllowed,
EAS_TextPathAllowed,
diff --git a/xmloff/source/draw/EnhancedCustomShapeToken.cxx
b/xmloff/source/draw/EnhancedCustomShapeToken.cxx
index 076ae2728fbd..9e6c25b49e4d 100644
--- a/xmloff/source/draw/EnhancedCustomShapeToken.cxx
+++ b/xmloff/source/draw/EnhancedCustomShapeToken.cxx
@@ -108,6 +108,7 @@ static const TokenTable pTokenTableArray[] =
{ "MirroredY", EAS_MirroredY },
{ "ViewBox",EAS_ViewBox },
{ "TextRotateAngle",EAS_TextRotateAngle },
+{ "TextPreRotateAngle", EAS_TextPreRotateAngle },
{ "ExtrusionAllowed", EAS_ExtrusionAllowed },
{ "TextPathAllowed",EAS_TextPathAllowed },
{ "ConcentricGradientFillAllowed", EAS_ConcentricGradientFillAllowed
},
diff --git a/xmloff/source/draw/shapeexport.cxx
b/xmloff/source/draw/shapeexport.cxx
index e4ec98689841..34786ce43d31 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -4268,10 +4268,11 @@ void ImpExportEnhancedGeometry( SvXMLExport& rExport,
const uno::Reference< bean
}
}
break;
+case EAS_TextPreRotateAngle :
case EAS_TextRotateAngle :
{
double fTextRotateAngle = 0;
-if ( rGeoProp.Value >>= fTextRotateAngle )
+if ( ( rGeoProp.Value >>= fTextRotateAngle ) &&
fTextRotateAngle != 0 )
{
::sax::Converter::convertDouble(
aStrBuffer, fTextRotateAngle );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commi
[Libreoffice-commits] help.git: 2 commits - source/text
source/text/scalc/01/02140700.xhp | 21 + source/text/schart/01/three_d_view.xhp | 10 +- 2 files changed, 18 insertions(+), 13 deletions(-) New commits: commit 305f83a24245f6e8889a33bab2f8d4657b8b2767 Author: Gabor Kelemen Date: Mon Oct 30 21:23:53 2017 +0100 Fixes on help page of chart 3D View - Add missing bookmarks - Add missing ahelp - Fix a broken bookmark Change-Id: I6a1c90dc7fd5677907e25f50fe0b5e942902fc47 Reviewed-on: https://gerrit.libreoffice.org/44091 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen diff --git a/source/text/schart/01/three_d_view.xhp b/source/text/schart/01/three_d_view.xhp index 48c8f693e..86140ff78 100644 --- a/source/text/schart/01/three_d_view.xhp +++ b/source/text/schart/01/three_d_view.xhp @@ -110,7 +110,7 @@ Edges are rounded by 5%. Illumination - Set the light sources for the 3D view. + Set the light sources for the 3D view. Click any of the eight buttons to switch a directed light source on or off. @@ -129,14 +129,14 @@ Use the Ambient light list box to define the ambient light which shines with a uniform intensity from all directions. preview right bar - + Drag the right slider to set the vertical height and direction of the selected light source.preview bottom bar - + Drag the bottom slider to set the horizontal position and direction of the selected light source.preview right bottom button - + Click to switch between an illumination model of a sphere or a cube.Light source Click to enable or disable the specular light source with highlights. @@ -150,7 +150,7 @@ Click to enable or disable the uniform light source. Select a color for the selected light source. - + Select a color using the color dialog.Ambient light Select a color for the ambient light. commit f3adeb50a47416d9f36285ffc1744db4a770b5ad Author: Gabor Kelemen Date: Mon Oct 30 20:06:46 2017 +0100 Fix bookmarks in Fill Random Number page - Add missing ahelps and bookmarks - Fix menu path Change-Id: Ibf8b8775aa90922645fbc445ff5c987e5110c692 Reviewed-on: https://gerrit.libreoffice.org/44090 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen diff --git a/source/text/scalc/01/02140700.xhp b/source/text/scalc/01/02140700.xhp index eee3aa0e3..4849000c4 100644 --- a/source/text/scalc/01/02140700.xhp +++ b/source/text/scalc/01/02140700.xhp @@ -27,21 +27,22 @@ Fill Random Numbers -Populate a cell range with automatically generated pseudo random numbers with the selected distribution function and its parameters. +Populate a cell range with automatically generated pseudo random numbers with the selected distribution function and its parameters. fill range;random numbers random rumbers;fill range random rumbers;distribution -Menu Edit â Fill â Random Numbers +Choose Sheet - Fill Cells - Random Number Data Cell Range -Define the range of cells to fill with random numbers. If you have previously selected a range, it will be displayed here. + +Define the range of cells to fill with random numbers. If you have previously selected a range, it will be displayed here. Random number generator Distribution - + The distribution function for the random number generator. Valid distributions function and their parameters are @@ -177,12 +178,16 @@ Options Enable custom seed -Set the initial value of the random number generator to a known value Seed. + +Set the initial value of the random number generator to a known value Seed. Seed -Value set to initiate the random number generator algorithm. It is used to initialize (seed) the random number generator in order to reproduce the same sequence of pseudorandom numbers. Specify a positive integer number (1, 2, ...) to produce a specific sequence, or leave the field blank if you don't need this particular feature. + +Value set to initiate the random number generator algorithm. It is used to initialize (seed) the random number generator in order to reproduce the same sequence of pseudorandom numbers. Specify a positive integer number (1, 2, ...) to produce a specific sequence, or leave the field blank if you don't need this particular feature. Enable rounding -Truncate the number to a given number of Decimal Places. + +Truncate the number to a given number of Decimal Places. Decimal places -Number of decimal places of the numbers generated. + +Number of decimal places of the numbers generated. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2891ee3e4e8b7e1b519de99ae74603c0197a2e40 Author: Gabor Kelemen Date: Mon Oct 30 21:23:53 2017 +0100 Updated core Project: help 305f83a24245f6e8889a33bab2f8d4657b8b2767 Fixes on help page of chart 3D View - Add missing bookmarks - Add missing ahelp - Fix a broken bookmark Change-Id: I6a1c90dc7fd5677907e25f50fe0b5e942902fc47 Reviewed-on: https://gerrit.libreoffice.org/44091 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen diff --git a/helpcontent2 b/helpcontent2 index f3adeb50a474..305f83a24245 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit f3adeb50a47416d9f36285ffc1744db4a770b5ad +Subproject commit 305f83a24245f6e8889a33bab2f8d4657b8b2767 commit 48e65ffefaa8489d8e29355f52a0236bff27916e Author: Gabor Kelemen Date: Mon Oct 30 20:06:46 2017 +0100 Updated core Project: help f3adeb50a47416d9f36285ffc1744db4a770b5ad Fix bookmarks in Fill Random Number page - Add missing ahelps and bookmarks - Fix menu path Change-Id: Ibf8b8775aa90922645fbc445ff5c987e5110c692 Reviewed-on: https://gerrit.libreoffice.org/44090 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen diff --git a/helpcontent2 b/helpcontent2 index 21af07ced40c..f3adeb50a474 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 21af07ced40ccb60932beb54d0fa2a23459ca252 +Subproject commit f3adeb50a47416d9f36285ffc1744db4a770b5ad ___ 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/schart/01/wiz_chart_elements.xhp |3 --- 1 file changed, 3 deletions(-) New commits: commit 21af07ced40ccb60932beb54d0fa2a23459ca252 Author: Gabor Kelemen Date: Fri Oct 27 00:44:58 2017 +0200 Drop some duplicated ahelps without bookmarks Change-Id: I04c5a607dd5196ec7daac2a66c382f99f950534e Reviewed-on: https://gerrit.libreoffice.org/44089 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen diff --git a/source/text/schart/01/wiz_chart_elements.xhp b/source/text/schart/01/wiz_chart_elements.xhp index f1735bbf9..d9588db8c 100644 --- a/source/text/schart/01/wiz_chart_elements.xhp +++ b/source/text/schart/01/wiz_chart_elements.xhp @@ -75,9 +75,6 @@ You cannot enter the text directly, it is automatically generated from the Name cell range. Select one of the position options. When the chart is finished, you can specify other positions using the Format menu. Grids -Displays grid lines that are perpendicular to the x-axis. -Displays grid lines that are perpendicular to the y-axis. -Displays grid lines that are perpendicular to the z-axis. This option is only available for three-dimensional charts. The visible grid lines can help to estimate the data values in the chart. The distance of the grid lines corresponds to the interval settings in the Scale tab of the axis properties. Grid lines are not available for pie charts. ___ 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 5533f323e8678bde23f3723920e29239a3079519 Author: Gabor Kelemen Date: Fri Oct 27 00:44:58 2017 +0200 Updated core Project: help 21af07ced40ccb60932beb54d0fa2a23459ca252 Drop some duplicated ahelps without bookmarks Change-Id: I04c5a607dd5196ec7daac2a66c382f99f950534e Reviewed-on: https://gerrit.libreoffice.org/44089 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen diff --git a/helpcontent2 b/helpcontent2 index a88e4cf56857..21af07ced40c 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit a88e4cf568578b9b4eff34b6e4ae0f2b01c710ad +Subproject commit 21af07ced40ccb60932beb54d0fa2a23459ca252 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sax sal/osl sax/qa sax/source sc/source sfx2/source xmloff/source
include/sax/tools/converter.hxx |5 -
sal/osl/unx/file.cxx | 32 ++--
sal/osl/unx/file_error_transl.cxx|6 +-
sal/osl/unx/file_error_transl.hxx| 10 ---
sal/osl/unx/file_misc.cxx| 39 +++
sal/osl/unx/file_stat.cxx| 14 ++---
sal/osl/unx/file_url.cxx | 18 +++---
sal/osl/unx/file_volume.cxx |4 -
sax/qa/cppunit/test_converter.cxx| 12 +---
sax/source/tools/converter.cxx | 13 +
sc/source/filter/oox/revisionfragment.cxx|2
sc/source/filter/oox/sheetdatabuffer.cxx |2
sc/source/filter/xml/XMLCalculationSettingsContext.cxx |2
sc/source/filter/xml/XMLTrackedChangesContext.cxx|2
sfx2/source/bastyp/frmhtmlw.cxx |4 -
sfx2/source/doc/SfxDocumentMetaData.cxx |2
xmloff/source/chart/SchXMLCalculationSettingsContext.cxx |2
xmloff/source/core/DocumentSettingsContext.cxx |2
xmloff/source/core/xmluconv.cxx |2
xmloff/source/draw/ximppage.cxx |2
xmloff/source/forms/handler/vcl_date_handler.cxx |2
xmloff/source/text/XMLChangedRegionImportContext.cxx |2
xmloff/source/text/txtflde.cxx |2
xmloff/source/text/txtfldi.cxx |7 +-
xmloff/source/xforms/SchemaRestrictionContext.cxx|2
25 files changed, 86 insertions(+), 104 deletions(-)
New commits:
commit 0b413caadfbe68b278ca5ba33b6d204687586ea9
Author: Noel Grandin
Date: Mon Oct 30 17:10:28 2017 +0200
loplugin:constantparam in sal,sax
Change-Id: I7ca2fd05d1cf61f9038c529a853e72fedb1c9ed0
Reviewed-on: https://gerrit.libreoffice.org/44087
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/sax/tools/converter.hxx b/include/sax/tools/converter.hxx
index 095102804ace..b98516a9da87 100644
--- a/include/sax/tools/converter.hxx
+++ b/include/sax/tools/converter.hxx
@@ -170,17 +170,14 @@ public:
/** convert util::DateTime to XMLSchema-2 "time" or "dateTime" string */
static void convertTimeOrDateTime(OUStringBuffer& rBuffer,
-const css::util::DateTime& rDateTime,
-sal_Int16 const* pTimeZoneOffset);
+const css::util::DateTime& rDateTime);
/** convert XMLSchema-2 "date" or "dateTime" string to util::DateTime */
static bool parseDateTime( css::util::DateTime& rDateTime,
- boost::optional * pTimeZoneOffset,
const OUString& rString );
/** convert XMLSchema-2 "time" or "dateTime" string to util::DateTime */
static bool parseTimeOrDateTime(css::util::DateTime& rDateTime,
- boost::optional * pTimeZoneOffset,
const OUString& rString);
/** convert XMLSchema-2 "date" or "dateTime" string to util::DateTime or
diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index b97e157c29be..de36b3d26a9c 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -299,7 +299,7 @@ oslFileError FileHandle_Impl::setSize(sal_uInt64 uSize)
if (ftruncate_with_name(m_fd, nSize, m_strFilePath) == -1)
{
/* Failure. Save original result. Try fallback algorithm */
-oslFileError result = oslTranslateFileError(OSL_FET_ERROR, errno);
+oslFileError result = oslTranslateFileError(errno);
/* Check against current size. Fail upon 'shrink' */
if (uSize <= getSize())
@@ -379,7 +379,7 @@ oslFileError FileHandle_Impl::readAt(
}
if (nBytes == -1)
-return oslTranslateFileError(OSL_FET_ERROR, errno);
+return oslTranslateFileError(errno);
*pBytesRead = nBytes;
@@ -402,7 +402,7 @@ oslFileError FileHandle_Impl::writeAt(
ssize_t nBytes = ::pwrite(m_fd, pBuffer, nBytesToWrite, nOffset);
if (nBytes == -1)
-return oslTranslateFileError(OSL_FET_ERROR, errno);
+return oslTranslateFileError(errno);
m_size = std::max(m_size, sal::static_int_cast< sal_uInt64 >(nOffset +
nBytes));
@@ -422,7 +422,7 @@ oslFileError FileHandle_Impl::readFileAt(
// not seekable (pipe)
ssize_t nBytes = ::read(m_fd, pBuffer, nBytesRequested);
if (nBytes == -1)
-return oslTranslateFileError(OSL_FET_ERROR, errno);
+return oslTranslateFileError(errno);
*pBytesRead = nBytes;
@@ -503,7 +503,7 @@ oslFileError FileHandle_Impl::writeFileAt(
// not seekable (pipe)
ssize_t nBytes = ::write(m_fd, pBuffer, nBytesToWrite);
if (nBytes == -1
[Libreoffice-commits] help.git: source/text
source/text/scalc/00/0402.xhp |2 +- source/text/scalc/01/02140500.xhp | 16 +--- 2 files changed, 10 insertions(+), 8 deletions(-) New commits: commit a88e4cf568578b9b4eff34b6e4ae0f2b01c710ad Author: Gabor Kelemen Date: Fri Oct 27 00:36:15 2017 +0200 tdf#113249 Update Fill Sheets page - Fix page title and command location with plurals in menu command name - Extend description with information about pasted content location as requested in the bug report - Highlight the information that this works only with two or more selected sheets - Fix text pointing to the page Paste Special - Remove redundant bookmark Change-Id: Iaf700d1ed0966a829e7bb32abd29a75365b7 Reviewed-on: https://gerrit.libreoffice.org/44088 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen diff --git a/source/text/scalc/00/0402.xhp b/source/text/scalc/00/0402.xhp index a1ea6a505..55800e353 100644 --- a/source/text/scalc/00/0402.xhp +++ b/source/text/scalc/00/0402.xhp @@ -36,7 +36,7 @@ Choose Sheet - Fill Cells - Right Choose Sheet - Fill Cells - Up Choose Sheet - Fill Cells - Left -Choose Sheet - Fill Cells - Sheet +Choose Sheet - Fill Cells - Sheets Choose Sheet - Fill Cells - Series diff --git a/source/text/scalc/01/02140500.xhp b/source/text/scalc/01/02140500.xhp index f6cde812c..88de08012 100644 --- a/source/text/scalc/01/02140500.xhp +++ b/source/text/scalc/01/02140500.xhp @@ -21,20 +21,22 @@ -Fill Sheet +Fill Sheets /text/scalc/01/02140500.xhp - -Fill Sheet - Specifies the options for transferring sheets or ranges of a certain sheet. + +Fill Sheets + Specifies the options for transferring sheets or ranges of a certain sheet to the same cells on other selected sheets. - In contrast to copying an area to the clipboard, you can filter certain information and calculate values. This command is only visible if you have selected two sheets in the document. To select multiple sheets, click each sheet tab while pressing Command Ctrl or Shift. + This menu command is only active if you have selected at least two sheets in the document. + To select multiple sheets, click each sheet tab while pressing Command Ctrl or Shift. + In contrast to copying an area to the clipboard, you can filter certain information and calculate values. Filling a Sheet @@ -44,12 +46,12 @@ Press CommandCtrl and click the tab of the sheet where you want to insert the contents. -Select the command Edit - Fill - Sheet. In the dialog which appears, the check box Numbers must be selected (or Paste All) if you want to combine operations with the values. You can also choose the desired operation here. +Select the command Sheet - Fill Cells - Sheets. In the dialog which appears, the check box Numbers must be selected (or Paste All) if you want to combine operations with the values. You can also choose the desired operation here. Click OK. - This dialog is similar to the Paste Contents dialog, where you can find additional tips. + This dialog is similar to the Paste Special dialog, where you can find additional tips. ___ 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 e64baee9194f2bd3b7ad5e67fcab1102433fec9b Author: Gabor Kelemen Date: Fri Oct 27 00:36:15 2017 +0200 Updated core Project: help a88e4cf568578b9b4eff34b6e4ae0f2b01c710ad tdf#113249 Update Fill Sheets page - Fix page title and command location with plurals in menu command name - Extend description with information about pasted content location as requested in the bug report - Highlight the information that this works only with two or more selected sheets - Fix text pointing to the page Paste Special - Remove redundant bookmark Change-Id: Iaf700d1ed0966a829e7bb32abd29a75365b7 Reviewed-on: https://gerrit.libreoffice.org/44088 Reviewed-by: Gabor Kelemen Tested-by: Gabor Kelemen diff --git a/helpcontent2 b/helpcontent2 index 284c7122cb4a..a88e4cf56857 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 284c7122cb4aeaff14b6b9017fcccf81968f5fd5 +Subproject commit a88e4cf568578b9b4eff34b6e4ae0f2b01c710ad ___ 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/shared/autopi/01020200.xhp | 20 ++-- source/text/shared/autopi/01020300.xhp | 20 ++-- source/text/shared/autopi/01020400.xhp |6 +++--- source/text/shared/autopi/01020500.xhp |8 4 files changed, 27 insertions(+), 27 deletions(-) New commits: commit 284c7122cb4aeaff14b6b9017fcccf81968f5fd5 Author: Gabor Kelemen Date: Tue Oct 31 00:01:54 2017 +0100 Fix the Fax Wizard HID mess Some bookmarks were missing, most were misplaced Change-Id: I5663999f874fe554cd74bb9b76f0fb9dae83852a Reviewed-on: https://gerrit.libreoffice.org/44092 Reviewed-by: Andras Timar Tested-by: Andras Timar diff --git a/source/text/shared/autopi/01020200.xhp b/source/text/shared/autopi/01020200.xhp index c083482f7..06b94e7d3 100644 --- a/source/text/shared/autopi/01020200.xhp +++ b/source/text/shared/autopi/01020200.xhp @@ -40,28 +40,28 @@ - + Logo Includes a company logo. - + Date Includes a date field. Type of message - - + + Includes a communication type line. Select the line from the list box. - + Subject line Includes a subject line. - - + + Salutation Includes a salutation. Select the salutation from the list box. - - + + Complimentary close Includes a greeting. Select the greeting from the list box. - + Footer Includes a footer. Go to Fax Wizard - Sender and Recipient diff --git a/source/text/shared/autopi/01020300.xhp b/source/text/shared/autopi/01020300.xhp index 97fedfa29..d14f85de1 100644 --- a/source/text/shared/autopi/01020300.xhp +++ b/source/text/shared/autopi/01020300.xhp @@ -40,24 +40,24 @@ - + Use user data for return address Inserts placeholders for the address on the fax template. Later in the fax document, click the placeholder to enter the actual data. - + New return address Select to enter the address data in the following text boxes. The data is inserted as normal text in the fax document. - - - - - - + + + + + + (Address data fields) Enter the sender address data. - + Use placeholders as receiver address Inserts placeholders for the address on the fax template. Later in the fax document, click the placeholder to enter the actual data. - + Use address database for mail merge Inserts database fields for a later mail merge with the fax document. Go to Fax Wizard - Footer diff --git a/source/text/shared/autopi/01020400.xhp b/source/text/shared/autopi/01020400.xhp index 49980f920..15a67523f 100644 --- a/source/text/shared/autopi/01020400.xhp +++ b/source/text/shared/autopi/01020400.xhp @@ -40,13 +40,13 @@ - + Footer Specifies the text to be printed in the footer area. - + Include only on second and following pages Suppresses the footer on the first page of a multipage fax document. - + Include page number Prints a page number in the footer area. Go to Fax Wizard - Name and location diff --git a/source/text/shared/autopi/01020500.xhp b/source/text/shared/autopi/01020500.xhp index 08fbd9ed5..8a1d8e892 100644 --- a/source/text/shared/autopi/01020500.xhp +++ b/source/text/shared/autopi/01020500.xhp @@ -40,16 +40,16 @@ - + Template name Enter the name of the fax template. - + ... Click to enter or select the complete path, including the file name of the fax template. - + Create a fax from this template Creates and saves the fax template, then opens a new fax document based on that template. - + Make manual changes to this fax template Creates and saves the fax template, then opens the template for further editing. Go to Fax Wizard ___ 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 b1588a085e30cf6197d6d9659dae7e7c1716e460 Author: Gabor Kelemen Date: Tue Oct 31 00:01:54 2017 +0100 Updated core Project: help 284c7122cb4aeaff14b6b9017fcccf81968f5fd5 Fix the Fax Wizard HID mess Some bookmarks were missing, most were misplaced Change-Id: I5663999f874fe554cd74bb9b76f0fb9dae83852a Reviewed-on: https://gerrit.libreoffice.org/44092 Reviewed-by: Andras Timar Tested-by: Andras Timar diff --git a/helpcontent2 b/helpcontent2 index 4df523054a84..284c7122cb4a 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 4df523054a84cbade8cf2aff4f72400baca9ca55 +Subproject commit 284c7122cb4aeaff14b6b9017fcccf81968f5fd5 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
