[Libreoffice-commits] core.git: filter/source
filter/source/msfilter/escherex.cxx | 30 +-
1 file changed, 17 insertions(+), 13 deletions(-)
New commits:
commit 5d2141e7004275ed08dc1a8f37bdadd73eca276e
Author: Tomaž Vajngerl
Date: Wed Dec 27 11:02:51 2017 +0900
escherex: dynamic_cast followed by static_cast
Change-Id: I551dd671d9ee61a79b4c69f8d593aea2a7e517c6
Reviewed-on: https://gerrit.libreoffice.org/47076
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/filter/source/msfilter/escherex.cxx
b/filter/source/msfilter/escherex.cxx
index cdc634d66647..fc74cf75490f 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -1245,13 +1245,15 @@ bool
EscherPropertyContainer::CreateOLEGraphicProperties(const uno::Reference
(pSdrOLE2) ) // no access to the native graphic object
+SdrObject* pObject = GetSdrObjectFromXShape(rXShape); // SJ: leaving
unoapi, because currently there is
+const SdrOle2Obj* pOle2Obj = pObject == nullptr ? nullptr :
dynamic_cast(pObject);
+if (pOle2Obj != nullptr) // no access to the native graphic object
{
-const Graphic* pGraphic =
static_cast(pSdrOLE2)->GetGraphic();
-if ( pGraphic )
+const Graphic* pGraphic = pOle2Obj->GetGraphic();
+if (pGraphic)
{
-std::unique_ptr xGraphicObject(new
GraphicObject(*pGraphic));
+Graphic aGraphic(*pGraphic);
+std::unique_ptr xGraphicObject(new
GraphicObject(aGraphic));
bRetValue = CreateGraphicProperties(rXShape, *xGraphicObject);
}
}
@@ -1294,10 +1296,11 @@ bool
EscherPropertyContainer::CreateMediaGraphicProperties(const uno::Reference<
boolbRetValue = false;
if ( rXShape.is() )
{
-SdrObject* pSdrMedia( GetSdrObjectFromXShape( rXShape ) ); // SJ:
leaving unoapi, because currently there is
-if ( dynamic_cast(pSdrMedia) != nullptr )
// no access to the native graphic object
+SdrObject* pSdrObject(GetSdrObjectFromXShape(rXShape)); // SJ:
leaving unoapi, because currently there is
+auto* pSdrMediaObj = dynamic_cast(pSdrObject);
+if (pSdrMediaObj != nullptr) // no access to the native
graphic object
{
-std::unique_ptr xGraphicObject(new
GraphicObject(static_cast(pSdrMedia)->getSnapshot()));
+std::unique_ptr xGraphicObject(new
GraphicObject(pSdrMediaObj->getSnapshot()));
bRetValue = CreateGraphicProperties(rXShape, *xGraphicObject);
}
}
@@ -4561,8 +4564,8 @@ sal_uInt32 EscherConnectorListEntry::GetConnectorRule(
bool bFirst )
if (aType == "drawing.Custom")
{
-SdrObject* pCustoShape( GetSdrObjectFromXShape( aXShape ) );
-if ( dynamic_cast(pCustoShape) !=
nullptr )
+SdrObject* pCustoShape(GetSdrObjectFromXShape(aXShape));
+if (dynamic_cast(pCustoShape) !=
nullptr)
{
const SdrCustomShapeGeometryItem& rGeometryItem =
pCustoShape->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY );
@@ -4606,15 +4609,16 @@ sal_uInt32 EscherConnectorListEntry::GetConnectorRule(
bool bFirst )
}
else if ( nGluePointType ==
drawing::EnhancedCustomShapeGluePointType::SEGMENTS )
{
-SdrObject* pPoly = pCustoShape->DoConvertToPolyObj( true,
true );
-if ( dynamic_cast( pPoly ) != nullptr
)
+SdrObject* pObject = pCustoShape->DoConvertToPolyObj(true,
true);
+const SdrPathObj* pSdrPathObj = dynamic_cast(pObject);
+if (pSdrPathObj != nullptr)
{
sal_Int16 a, b, nIndex = 0;
sal_uInt32 nDistance = 0x;
// #i74631# use explicit constructor here. Also
XPolyPolygon is not necessary,
// reducing to PolyPolygon
-const tools::PolyPolygon
aPolyPoly(static_cast(pPoly)->GetPathPoly());
+const tools::PolyPolygon
aPolyPoly(pSdrPathObj->GetPathPoly());
for ( a = 0; a < aPolyPoly.Count(); a++ )
{
___
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/msfilter/escherex.cxx | 540 +---
1 file changed, 267 insertions(+), 273 deletions(-)
New commits:
commit 03b9b00ae7ca132244fc669186e6577bd776c738
Author: Tomaž Vajngerl
Date: Wed Dec 27 11:00:55 2017 +0900
escherex: remove css:: and whitespace
Change-Id: If1ec648a3c017b6c7f208ad2ed4fda1abfb0483e
Reviewed-on: https://gerrit.libreoffice.org/47075
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/filter/source/msfilter/escherex.cxx
b/filter/source/msfilter/escherex.cxx
index 578c368dcfe7..cdc634d66647 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -95,8 +95,7 @@
#include
#include
-using namespace ::com::sun::star;
-
+using namespace css;
EscherExContainer::EscherExContainer( SvStream& rSt, const sal_uInt16
nRecType, const sal_uInt16 nInstance ) :
rStrm ( rSt )
@@ -331,7 +330,7 @@ sal_uInt32 EscherPropertyContainer::ImplGetColor( const
sal_uInt32 nSOColor, boo
}
sal_uInt32 EscherPropertyContainer::GetGradientColor(
-const css::awt::Gradient* pGradient,
+const awt::Gradient* pGradient,
sal_uInt32 nStartColor )
{
sal_uInt32 nIntensity = 100;
@@ -357,7 +356,7 @@ sal_uInt32 EscherPropertyContainer::GetGradientColor(
}
void EscherPropertyContainer::CreateGradientProperties(
-const css::awt::Gradient & rGradient )
+const awt::Gradient & rGradient )
{
sal_uInt32 nFillType = ESCHER_FillShadeScale;
sal_uInt32 nAngle = 0;
@@ -369,8 +368,8 @@ void EscherPropertyContainer::CreateGradientProperties(
switch ( rGradient.Style )
{
-case css::awt::GradientStyle_LINEAR :
-case css::awt::GradientStyle_AXIAL :
+case awt::GradientStyle_LINEAR :
+case awt::GradientStyle_AXIAL :
{
nFillType = ESCHER_FillShadeScale;
nAngle = (rGradient.Angle * 0x1) / 10;
@@ -378,10 +377,10 @@ void EscherPropertyContainer::CreateGradientProperties(
sal::static_int_cast(GradientStyle::Linear)) ?
0 : 50;
}
break;
-case css::awt::GradientStyle_RADIAL :
-case css::awt::GradientStyle_ELLIPTICAL :
-case css::awt::GradientStyle_SQUARE :
-case css::awt::GradientStyle_RECT :
+case awt::GradientStyle_RADIAL :
+case awt::GradientStyle_ELLIPTICAL :
+case awt::GradientStyle_SQUARE :
+case awt::GradientStyle_RECT :
{
nFillLR = (rGradient.XOffset * 0x1) / 100;
nFillTB = (rGradient.YOffset * 0x1) / 100;
@@ -393,7 +392,7 @@ void EscherPropertyContainer::CreateGradientProperties(
bWriteFillTo = true;
}
break;
-case css::awt::GradientStyle::GradientStyle_MAKE_FIXED_SIZE : break;
+case awt::GradientStyle::GradientStyle_MAKE_FIXED_SIZE : break;
}
AddOpt( ESCHER_Prop_fillType, nFillType );
AddOpt( ESCHER_Prop_fillAngle, nAngle );
@@ -410,49 +409,49 @@ void EscherPropertyContainer::CreateGradientProperties(
}
void EscherPropertyContainer::CreateGradientProperties(
-const css::uno::Reference< css::beans::XPropertySet > & rXPropSet , bool
bTransparentGradient)
+const uno::Reference & rXPropSet , bool
bTransparentGradient)
{
-css::uno::Any aAny;
-css::awt::Gradient const * pGradient = nullptr;
+uno::Any aAny;
+awt::Gradient const * pGradient = nullptr;
-sal_uInt32 nFillType = ESCHER_FillShadeScale;
-sal_Int32 nAngle = 0;
-sal_uInt32 nFillFocus = 0;
-sal_uInt32 nFillLR = 0;
-sal_uInt32 nFillTB = 0;
-sal_uInt32 nFirstColor = 0;// like the control var nChgColors in import
logic
-boolbWriteFillTo = false;
+sal_uInt32 nFillType = ESCHER_FillShadeScale;
+sal_Int32 nAngle = 0;
+sal_uInt32 nFillFocus = 0;
+sal_uInt32 nFillLR = 0;
+sal_uInt32 nFillTB = 0;
+sal_uInt32 nFirstColor = 0;// like the control var nChgColors in import
logic
+bool bWriteFillTo = false;
// Transparency gradient: Means the third setting in transparency page is
set
if (bTransparentGradient && EscherPropertyValueHelper::GetPropertyValue(
aAny, rXPropSet, "FillTransparenceGradient" ) )
{
-pGradient = o3tl::doAccess(aAny);
+pGradient = o3tl::doAccess(aAny);
-css::uno::Any aAnyTemp;
+uno::Any aAnyTemp;
const rtl::OUString aPropName( "FillStyle" );
if ( EscherPropertyValueHelper::GetPropertyValue(
aAnyTemp, rXPropSet, aPropName ) )
{
-css::drawing::FillStyle eFS;
+drawing::FillStyle eFS;
if ( ! ( aAnyTemp >>= eFS ) )
-eFS = css::drawing::FillStyle_SOLID;
+eFS = drawing::FillStyle_SOLID;
// solid and transparency
-if ( eFS == css::drawing::FillStyle_SOLID)
+if ( eFS == drawing::FillStyle_SOLID)
[Libreoffice-commits] core.git: cui/source
cui/source/tabpages/tabarea.cxx |2 -- cui/source/tabpages/tabline.cxx |2 -- 2 files changed, 4 deletions(-) New commits: commit b426b026b79a342c41f6f148bf17d5df66b22927 Author: ekuiitr Date: Sun Dec 24 22:51:43 2017 +0800 tdf#111723 Fixed - Dialog does not remember the last opened tab page Change-Id: Ife6d0eb9ea13d2a0534f316db001dbb3b6a716eb Reviewed-on: https://gerrit.libreoffice.org/47050 Reviewed-by: Tamás Zolnai Tested-by: Tamás Zolnai diff --git a/cui/source/tabpages/tabarea.cxx b/cui/source/tabpages/tabarea.cxx index f1dbfc6417bb..97135d944270 100644 --- a/cui/source/tabpages/tabarea.cxx +++ b/cui/source/tabpages/tabarea.cxx @@ -80,8 +80,6 @@ SvxAreaTabDialog::SvxAreaTabDialog m_nTransparenceTabPage = AddTabPage( "RID_SVXPAGE_TRANSPARENCE", SvxTransparenceTabPage::Create, nullptr); -SetCurPageId( "RID_SVXPAGE_AREA" ); - CancelButton& rBtnCancel = GetCancelButton(); rBtnCancel.SetClickHdl( LINK( this, SvxAreaTabDialog, CancelHdlImpl ) ); } diff --git a/cui/source/tabpages/tabline.cxx b/cui/source/tabpages/tabline.cxx index 21d64d055743..df0938f6b79a 100644 --- a/cui/source/tabpages/tabline.cxx +++ b/cui/source/tabpages/tabline.cxx @@ -93,8 +93,6 @@ SvxLineTabDialog::SvxLineTabDialog m_nStyleTabPage = AddTabPage( "RID_SVXPAGE_LINE_DEF", SvxLineDefTabPage::Create, nullptr); m_nEndTabPage = AddTabPage( "RID_SVXPAGE_LINEEND_DEF", SvxLineEndDefTabPage::Create, nullptr); -SetCurPageId( "RID_SVXPAGE_LINE" ); - CancelButton& rBtnCancel = GetCancelButton(); rBtnCancel.SetClickHdl( LINK( this, SvxLineTabDialog, CancelHdlImpl ) ); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - extensions.lst
extensions.lst | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) New commits: commit 283f9bd000c187fe29edc04a23fcaf0da7459ece Author: Andrea Pescetti Date: Tue Dec 26 22:02:37 2017 + #i127637# Sort components for languages that need multiple OXT files. diff --git a/extensions.lst b/extensions.lst index 881b69982889..fadba4b8d02e 100644 --- a/extensions.lst +++ b/extensions.lst @@ -38,11 +38,6 @@ # [ language=all && ENABLE_XXX ] #file://XXX.oxt -# Danish dictionary and synonyms -[ language=da ] -b38cba04b6513dd42b031199d617cce6 https://sourceforge.net/projects/aoo-extensions/files/1388/12/DanskeSynonymer.oxt/download "danske-synonymer.oxt" -6ee1e24fb17e44577d8e3200f3e44adc https://sourceforge.net/projects/aoo-extensions/files/1429/6/dict-da-current.oxt/download "dict-da.oxt" - # Asturian dictionary [ language=ast ] 931373dea3bed9621dd55713b53b38ae https://sourceforge.net/projects/aoo-extensions/files/3932/2/ort_ast_20150417_2259.oxt/download "dict-ast.oxt" @@ -59,6 +54,11 @@ [ language=ca_XR ] 6112a73444a1ad3cf70736649e228f0f https://sourceforge.net/projects/aoo-extensions/files/1395/0/dict_valencian_llit.oxt/download "dict-ca_xr.oxt" +# Danish dictionary and synonyms +[ language=da ] +6ee1e24fb17e44577d8e3200f3e44adc https://sourceforge.net/projects/aoo-extensions/files/1429/6/dict-da-current.oxt/download "dict-da.oxt" +b38cba04b6513dd42b031199d617cce6 https://sourceforge.net/projects/aoo-extensions/files/1388/12/DanskeSynonymer.oxt/download "danske-synonymer.oxt" + # German dictionary [ language=de || language=de_DE || language=nl || language=ru ] ea35a6a6761655107da3e99ee56c171f https://sourceforge.net/projects/aoo-extensions/files/1075/15/dict-de_de-frami_2017-01-12.oxt/download "dict-de_de.oxt" @@ -97,8 +97,8 @@ # Hungarian dictionary and grammar checker [ language=hu ] -76345f925e34fef2d29bade4f29108e9 https://sourceforge.net/projects/aoo-extensions/files/3423/4/lightproof-hu_HU-1.3.oxt/download "lightproof-hu_hu.oxt" d320e43e815c2dfd599dbfb7cd0e41fb https://sourceforge.net/projects/aoo-extensions/files/1283/9/dict-hu.oxt/download "dict-hu.oxt" +76345f925e34fef2d29bade4f29108e9 https://sourceforge.net/projects/aoo-extensions/files/3423/4/lightproof-hu_HU-1.3.oxt/download "lightproof-hu_hu.oxt" # Italian dictionary [ language=it || language=de || language=de_DE ] commit f2525d80a4ae4425bc43a1b43b96026294f29352 Author: Andrea Pescetti Date: Tue Dec 26 21:14:26 2017 + #i127637# Standardize on lowercase filenames for all bundled extensions. diff --git a/extensions.lst b/extensions.lst index 8dac95593825..881b69982889 100644 --- a/extensions.lst +++ b/extensions.lst @@ -40,7 +40,7 @@ # Danish dictionary and synonyms [ language=da ] -b38cba04b6513dd42b031199d617cce6 https://sourceforge.net/projects/aoo-extensions/files/1388/12/DanskeSynonymer.oxt/download "DanskeSynonymer.oxt" +b38cba04b6513dd42b031199d617cce6 https://sourceforge.net/projects/aoo-extensions/files/1388/12/DanskeSynonymer.oxt/download "danske-synonymer.oxt" 6ee1e24fb17e44577d8e3200f3e44adc https://sourceforge.net/projects/aoo-extensions/files/1429/6/dict-da-current.oxt/download "dict-da.oxt" # Asturian dictionary @@ -97,7 +97,7 @@ # Hungarian dictionary and grammar checker [ language=hu ] -76345f925e34fef2d29bade4f29108e9 https://sourceforge.net/projects/aoo-extensions/files/3423/4/lightproof-hu_HU-1.3.oxt/download "lightproof-hu_HU-1.3.oxt" +76345f925e34fef2d29bade4f29108e9 https://sourceforge.net/projects/aoo-extensions/files/3423/4/lightproof-hu_HU-1.3.oxt/download "lightproof-hu_hu.oxt" d320e43e815c2dfd599dbfb7cd0e41fb https://sourceforge.net/projects/aoo-extensions/files/1283/9/dict-hu.oxt/download "dict-hu.oxt" # Italian dictionary @@ -120,6 +120,10 @@ [ language=nl ] 5c0de383ef649cffefc128cfb36b4d43 https://sourceforge.net/projects/aoo-extensions/files/1456/6/nl-dict-v2.00g.oxt/download "dict-nl.oxt" +# Norwegian dictionary +[ language=nb ] +c06841f7f193e4f083482440999d801b https://sourceforge.net/projects/aoo-extensions/files/1216/2/dictionary-no-no-2.2.oxt/download "dict-no_no.oxt" + # Polish dictionary [ language=pl ] a69f9221864b1360e38ff3f0b0cc9222 https://sourceforge.net/projects/aoo-extensions/files/806/4/pl-dict.oxt/download "dict-pl.oxt" @@ -144,10 +148,6 @@ [ language=sl ] a95158fff7aa901938b9bc67c4937a88 https://sourceforge.net/projects/aoo-extensions/files/3280/10/pack-sl.oxt/download "dict-sl.oxt" -# Norwegian dictionary -[ language=nb ] -c06841f7f193e4f083482440999d801b https://sourceforge.net/projects/aoo-extensions/files/1216/2/dictionary-no-no-2.2.oxt/download "dict-no_no.oxt" - # Swedish dictionary [ language=sv ] 32ab4edf1496a7cf5469ee1643eb0128 https://sourceforge.net/projects/aoo-extensions/files/5959/1/dict-sv.oxt/download "dict-sv.oxt"
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/core/api/KeySet.cxx | 140 ++--
1 file changed, 58 insertions(+), 82 deletions(-)
New commits:
commit a9b202a6b7000e7af34f2a639ca207122a3968bf
Author: Julien Nabet
Date: Tue Dec 26 19:35:13 2017 +0100
Use for-range loops in dbaccess/KeySet (2nd pass)
+ remove an unused var
Change-Id: I62659f4ca5ac734f46d00e59b12fb6f54a177ecb
Reviewed-on: https://gerrit.libreoffice.org/47071
Reviewed-by: Noel Grandin
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/dbaccess/source/core/api/KeySet.cxx
b/dbaccess/source/core/api/KeySet.cxx
index 61b20adc8b4d..32007654544b 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -199,18 +199,15 @@ void OKeySet::findTableColumnsMatching_throw( const
Any& i_aTable,
::dbtools::throwGenericSQLException("Could not find any key column.",
*this );
}
-for ( SelectColumnsMetaData::const_iterator keyColumn =
o_pKeyColumnNames->begin();
-keyColumn != o_pKeyColumnNames->end();
-++keyColumn
-)
+for (auto const& keyColumn : *o_pKeyColumnNames)
{
-if ( !xTblColumns->hasByName( keyColumn->second.sRealName ) )
+if ( !xTblColumns->hasByName( keyColumn.second.sRealName ) )
continue;
-Reference xProp( xTblColumns->getByName(
keyColumn->second.sRealName ), UNO_QUERY );
+Reference xProp( xTblColumns->getByName(
keyColumn.second.sRealName ), UNO_QUERY );
bool bAuto = false;
if ( ( xProp->getPropertyValue( PROPERTY_ISAUTOINCREMENT ) >>= bAuto )
&& bAuto )
-m_aAutoColumns.push_back( keyColumn->first );
+m_aAutoColumns.push_back( keyColumn.first );
}
}
@@ -256,23 +253,21 @@ OUStringBuffer OKeySet::createKeyFilter()
OUStringBuffer aFilter;
// create the where clause
Reference xMeta = m_xConnection->getMetaData();
-SelectColumnsMetaData::const_iterator aPosEnd = m_pKeyColumnNames->end();
-for(SelectColumnsMetaData::const_iterator aPosIter =
m_pKeyColumnNames->begin();aPosIter != aPosEnd; ++aPosIter)
+for (auto const& keyColumnName : *m_pKeyColumnNames)
{
if ( ! aFilter.isEmpty() )
aFilter.append(aAnd);
-appendOneKeyColumnClause(::dbtools::quoteTableName(xMeta,
aPosIter->second.sTableName, ::dbtools::EComposeRule::InDataManipulation),
- ::dbtools::quoteName(aQuote,
aPosIter->second.sRealName),
+appendOneKeyColumnClause(::dbtools::quoteTableName(xMeta,
keyColumnName.second.sTableName, ::dbtools::EComposeRule::InDataManipulation),
+ ::dbtools::quoteName(aQuote,
keyColumnName.second.sRealName),
*aIter++,
aFilter);
}
-aPosEnd = m_pForeignColumnNames->end();
-for(SelectColumnsMetaData::const_iterator aPosIter =
m_pForeignColumnNames->begin(); aPosIter != aPosEnd; ++aPosIter)
+for (auto const& foreignColumnName : * m_pForeignColumnNames)
{
if ( ! aFilter.isEmpty() )
aFilter.append(aAnd);
-appendOneKeyColumnClause(::dbtools::quoteTableName(xMeta,
aPosIter->second.sTableName, ::dbtools::EComposeRule::InDataManipulation),
- ::dbtools::quoteName(aQuote,
aPosIter->second.sRealName),
+appendOneKeyColumnClause(::dbtools::quoteTableName(xMeta,
foreignColumnName.second.sTableName,
::dbtools::EComposeRule::InDataManipulation),
+ ::dbtools::quoteName(aQuote,
foreignColumnName.second.sRealName),
*aIter++,
aFilter);
}
@@ -612,20 +607,17 @@ void OKeySet::insertRow( const ORowSetRow&
_rInsertRow,const connectivity::OSQLT
OUStringBuffer aValues(" VALUES ( ");
OUString aQuote = getIdentifierQuoteString();
-SelectColumnsMetaData::const_iterator aIter = m_pColumnNames->begin();
-SelectColumnsMetaData::const_iterator aEnd = m_pColumnNames->end();
-sal_Int32 j = 1;
bool bRefetch = true;
bool bModified = false;
-for(;aIter != aEnd;++aIter,++j)
+for (auto const& columnName : *m_pColumnNames)
{
-if((_rInsertRow->get())[aIter->second.nPosition].isModified())
+if((_rInsertRow->get())[columnName.second.nPosition].isModified())
{
if ( bRefetch )
{
-bRefetch =
std::find(m_aFilterColumns.begin(),m_aFilterColumns.end(),aIter->second.sRealName)
== m_aFilterColumns.end();
+bRefetch =
std::find(m_aFilterColumns.begin(),m_aFilterColumns.end(),columnName.second.sRealName)
== m_aFilterColumns.end();
}
-aSql.append(::dbtools::quoteName( aQuote,aIter->second.sRealName)
+ ",");
+aSql.append(::dbtools::quoteName(
aQuote,columnName.second.sRealName) + ",");
aVa
[Libreoffice-commits] core.git: sw/source
sw/source/filter/html/htmltab.cxx | 19 ---
1 file changed, 12 insertions(+), 7 deletions(-)
New commits:
commit e2dab2bb2ce4f113f4fd2aa24042c0c297cef674
Author: Caolán McNamara
Date: Tue Dec 26 21:07:14 2017 +
ofz#4794 Null-dereference
Change-Id: I2fc9f5ca60c2a476c031befd0253b1829538230d
diff --git a/sw/source/filter/html/htmltab.cxx
b/sw/source/filter/html/htmltab.cxx
index 6d3c6e50894f..6a8a66e2510a 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -3926,13 +3926,18 @@ void SwHTMLParser::BuildTableCell( HTMLTable
*pCurTable, bool bReadOptions,
{
const SwEndNode *pEndNd = pStNd->EndOfSectionNode();
SwContentNode *pCNd = m_xDoc->GetNodes()[pEndNd->GetIndex()-1]
->GetContentNode();
-//Added defaults to CJK and CTL
-SvxFontHeightItem aFontHeight( 40, 100, RES_CHRATR_FONTSIZE );
-pCNd->SetAttr( aFontHeight );
-SvxFontHeightItem aFontHeightCJK( 40, 100, RES_CHRATR_CJK_FONTSIZE
);
-pCNd->SetAttr( aFontHeightCJK );
-SvxFontHeightItem aFontHeightCTL( 40, 100, RES_CHRATR_CTL_FONTSIZE
);
-pCNd->SetAttr( aFontHeightCTL );
+if (!pCNd)
+eState = SvParserState::Error;
+else
+{
+//Added defaults to CJK and CTL
+SvxFontHeightItem aFontHeight( 40, 100, RES_CHRATR_FONTSIZE );
+pCNd->SetAttr( aFontHeight );
+SvxFontHeightItem aFontHeightCJK( 40, 100,
RES_CHRATR_CJK_FONTSIZE );
+pCNd->SetAttr( aFontHeightCJK );
+SvxFontHeightItem aFontHeightCTL( 40, 100,
RES_CHRATR_CTL_FONTSIZE );
+pCNd->SetAttr( aFontHeightCTL );
+}
}
xSaveStruct->AddContents( new HTMLTableCnts(pStNd) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 4 commits - extensions.lst
extensions.lst | 149 - 1 file changed, 75 insertions(+), 74 deletions(-) New commits: commit 8cc0fa0ead89370dc2249a5334758d437dec1b1b Author: Andrea Pescetti Date: Tue Dec 26 21:03:17 2017 + #i127637# Use conventional filenames for locale-dependent dictionaries. diff --git a/extensions.lst b/extensions.lst index b31b1917bc3b..8dac95593825 100644 --- a/extensions.lst +++ b/extensions.lst @@ -49,27 +49,27 @@ # Catalan dictionary [ language=ca ] -4cf4e4a9d85f14761d38943b7e1fd76d https://sourceforge.net/projects/aoo-extensions/files/1205/5/ca.3.0.0.oxt/download "ca.3.0.0.oxt" +4cf4e4a9d85f14761d38943b7e1fd76d https://sourceforge.net/projects/aoo-extensions/files/1205/5/ca.3.0.0.oxt/download "dict-ca.oxt" # Valencian AVL dictionary (this is incompatible with Catalan) [ language=ca_XV ] -d425579a9a2e26663abaecdd661be419 https://sourceforge.net/projects/aoo-extensions/files/1475/1/ca-valencia.3.0.0.oxt/download "ca-valencia.3.0.0.oxt" +d425579a9a2e26663abaecdd661be419 https://sourceforge.net/projects/aoo-extensions/files/1475/1/ca-valencia.3.0.0.oxt/download "dict-ca_xv.oxt" # Valencian RACV dictionary (this is incompatible with Catalan) [ language=ca_XR ] -6112a73444a1ad3cf70736649e228f0f https://sourceforge.net/projects/aoo-extensions/files/1395/0/dict_valencian_llit.oxt/download "dict_valencian_llit.oxt" +6112a73444a1ad3cf70736649e228f0f https://sourceforge.net/projects/aoo-extensions/files/1395/0/dict_valencian_llit.oxt/download "dict-ca_xr.oxt" # German dictionary [ language=de || language=de_DE || language=nl || language=ru ] -ea35a6a6761655107da3e99ee56c171f https://sourceforge.net/projects/aoo-extensions/files/1075/15/dict-de_de-frami_2017-01-12.oxt/download "dict-de_de-frami_2017-01-12.oxt" +ea35a6a6761655107da3e99ee56c171f https://sourceforge.net/projects/aoo-extensions/files/1075/15/dict-de_de-frami_2017-01-12.oxt/download "dict-de_de.oxt" # German (Austria) dictionary [ language=de || language=de_AT || language=de_DE ] -0cf6783cb0f1355ef3869aa9699700b3 https://sourceforge.net/projects/aoo-extensions/files/1697/12/dict-de_at-frami_2017-01-12.oxt/download "dict-de_at-frami_2017-01-12.oxt" +0cf6783cb0f1355ef3869aa9699700b3 https://sourceforge.net/projects/aoo-extensions/files/1697/12/dict-de_at-frami_2017-01-12.oxt/download "dict-de_at.oxt" # German (Switzerland) dictionary [ language=de || language=de_CH || language=de_DE ] -48f7f27f22bf1006a6d9f91d55a7cffc https://sourceforge.net/projects/aoo-extensions/files/1699/12/dict-de_ch-frami_2017-01-12.oxt/download "dict-de_ch-frami_2017-01-12.oxt" +48f7f27f22bf1006a6d9f91d55a7cffc https://sourceforge.net/projects/aoo-extensions/files/1699/12/dict-de_ch-frami_2017-01-12.oxt/download "dict-de_ch.oxt" # English dictionary [ language=en.* || language=de || language=it ] @@ -77,11 +77,11 @@ # English (USA, en_US) dictionary [ language==nl || language==ru ] -e2eab80772ab1aa09716954219351a80 https://sourceforge.net/projects/aoo-extensions/files/1470/1/en_US.oxt/download "en_US.oxt" +e2eab80772ab1aa09716954219351a80 https://sourceforge.net/projects/aoo-extensions/files/1470/1/en_US.oxt/download "dict-en_us.oxt" # Spanish dictionary [ language=es || language=ca || language=ca_XV ] -1b999fcef948148e269161a08e7acf20 https://sourceforge.net/projects/aoo-extensions/files/1657/4/es_es.oxt/download "es_es.oxt" +1b999fcef948148e269161a08e7acf20 https://sourceforge.net/projects/aoo-extensions/files/1657/4/es_es.oxt/download "dict-es_es.oxt" # Basque dictionary [ language=eu ] @@ -126,7 +126,7 @@ # Portuguese (European) dictionary [ language=pt || language=pt_PT ] -a1414b7be0cacb7a810166833a02fa66 https://sourceforge.net/projects/aoo-extensions/files/1196/41/oo3x-pt-pt-17.5.29.1.oxt/download "oo3x-pt-pt-17.5.29.1.oxt" +a1414b7be0cacb7a810166833a02fa66 https://sourceforge.net/projects/aoo-extensions/files/1196/41/oo3x-pt-pt-17.5.29.1.oxt/download "dict-pt_pt.oxt" # Romanian dictionary [ language=ro ] @@ -146,7 +146,7 @@ # Norwegian dictionary [ language=nb ] -c06841f7f193e4f083482440999d801b https://sourceforge.net/projects/aoo-extensions/files/1216/2/dictionary-no-no-2.2.oxt/download "dictionary-no-no-2.2.oxt" +c06841f7f193e4f083482440999d801b https://sourceforge.net/projects/aoo-extensions/files/1216/2/dictionary-no-no-2.2.oxt/download "dict-no_no.oxt" # Swedish dictionary [ language=sv ] commit 12d2b65cc40eb1ab7c134ef2fc1c255e3fc665a0 Author: Andrea Pescetti Date: Tue Dec 26 20:35:37 2017 + #i127637# Sort dictionaries by language code of the dictionary. diff --git a/extensions.lst b/extensions.lst index 62cc5686c35d..b31b1917bc3b 100644 --- a/extensions.lst +++ b/extensions.lst @@ -38,6 +38,39 @@ # [ language=all && ENABLE_XXX ] #file://XXX.oxt +# Danish dictionary and synonyms +[ language=da ] +b38cba04b6
[Libreoffice-commits] core.git: sw/source
sw/source/filter/html/htmltab.cxx |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit f03ad9ee3458c76db21c10e18bdb49d27f7be1c3
Author: Caolán McNamara
Date: Tue Dec 26 21:00:35 2017 +
ofz#4796 Null-dereference
Change-Id: Iad537d2bb2bed1225e5647a918c923e6d95aea75
diff --git a/sw/source/filter/html/htmltab.cxx
b/sw/source/filter/html/htmltab.cxx
index 33c7de3e6fe3..6d3c6e50894f 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -4772,8 +4772,11 @@ void SwHTMLParser::BuildTableCaption( HTMLTable
*pCurTable )
// If there's an adjustment for the cell, we need to close it
std::unique_ptr xCntxt(PopContext());
-EndContext(xCntxt.get());
-xCntxt.reset();
+if (xCntxt)
+{
+EndContext(xCntxt.get());
+xCntxt.reset();
+}
SetAttr( false );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/headless vcl/inc vcl/qa
vcl/headless/svpbmp.cxx|5 +-
vcl/headless/svpgdi.cxx| 95 +++--
vcl/inc/headless/svpgdi.hxx|4 +
vcl/qa/cppunit/BitmapTest.cxx |9 ++-
vcl/qa/cppunit/svm/svmtest.cxx | 12 ++---
5 files changed, 109 insertions(+), 16 deletions(-)
New commits:
commit 33761c69e9d3fa16e7a5b176200d183dc3236627
Author: Ashod Nakashian
Date: Sun Dec 3 23:35:26 2017 -0500
vcl-svp: Store 24-bit images in 3-byte pixels
This adds support in headless rendering for more
compact 24-bit RGB image storage in 3-byte pixels
instead of 4 bytes.
There is a conversion necessary to accomodate Cairo,
which requires 4-byte pixels, but that is relatively.
Early tests show no loss of performance at runtime.
Unit tests updated since the bitmap memory bytes
are crc-ed, which obviously are different in size
if not in content.
(cherry picked from commit 354ad875092fd0c3b12f232950375206ec5d66a6)
Reviewed-on: https://gerrit.libreoffice.org/46679
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
(cherry picked from commit 11adb51f2553dc4a838c8668d94909771d70e1ab)
Change-Id: I3919f7c56d14d09e67f163f035b4c7683b49087c
Reviewed-on: https://gerrit.libreoffice.org/47009
Tested-by: Jenkins
Reviewed-by: Ashod Nakashian
diff --git a/vcl/headless/svpbmp.cxx b/vcl/headless/svpbmp.cxx
index cb7a8654798a..0ba815998d8f 100644
--- a/vcl/headless/svpbmp.cxx
+++ b/vcl/headless/svpbmp.cxx
@@ -96,14 +96,15 @@ BitmapBuffer* ImplCreateDIB(
pDIB->maColorMask = ColorMask(aRedMask, aGreenMask, aBlueMask);
break;
}
+case 24:
+pDIB->mnFormat = SVP_24BIT_FORMAT;
+break;
default:
nBitCount = 32;
SAL_FALLTHROUGH;
case 32:
-{
pDIB->mnFormat = SVP_CAIRO_FORMAT;
break;
-}
}
pDIB->mnFormat |= ScanlineFormat::TopDown;
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index bcb0e46e8bec..6a5409e7f2e9 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -24,6 +24,7 @@
#include
#include
+#include
#include
#include
#include
@@ -124,25 +125,110 @@ namespace
}
}
+BitmapBuffer* FastConvert24BitRgbTo32BitCairo(const BitmapBuffer* pSrc)
+{
+if (pSrc == nullptr)
+return nullptr;
+
+assert(pSrc->mnFormat == SVP_24BIT_FORMAT);
+const long nWidth = pSrc->mnWidth;
+const long nHeight = pSrc->mnHeight;
+BitmapBuffer* pDst = new BitmapBuffer;
+pDst->mnFormat = (ScanlineFormat::N32BitTcArgb |
ScanlineFormat::TopDown);
+pDst->mnWidth = nWidth;
+pDst->mnHeight = nHeight;
+pDst->mnBitCount = 32;
+pDst->maColorMask = pSrc->maColorMask;
+pDst->maPalette = pSrc->maPalette;
+
+long nScanlineBase;
+const bool bFail = o3tl::checked_multiply(pDst->mnBitCount,
nWidth, nScanlineBase);
+if (bFail)
+{
+SAL_WARN("vcl.gdi", "checked multiply failed");
+pDst->mpBits = nullptr;
+delete pDst;
+return nullptr;
+}
+
+pDst->mnScanlineSize = AlignedWidth4Bytes(nScanlineBase);
+if (pDst->mnScanlineSize < nScanlineBase/8)
+{
+SAL_WARN("vcl.gdi", "scanline calculation wraparound");
+pDst->mpBits = nullptr;
+delete pDst;
+return nullptr;
+}
+
+try
+{
+pDst->mpBits = new sal_uInt8[ pDst->mnScanlineSize * nHeight ];
+}
+catch (const std::bad_alloc&)
+{
+// memory exception, clean up
+pDst->mpBits = nullptr;
+delete pDst;
+return nullptr;
+}
+
+for (long y = 0; y < nHeight; ++y)
+{
+sal_uInt8* pS = pSrc->mpBits + y * pSrc->mnScanlineSize;
+sal_uInt8* pD = pDst->mpBits + y * pDst->mnScanlineSize;
+for (long x = 0; x < nWidth; ++x)
+{
+#if defined ANDROID
+static_assert((SVP_CAIRO_FORMAT & ~ScanlineFormat::TopDown) ==
ScanlineFormat::N32BitTcRgba, "Expected SVP_CAIRO_FORMAT set to N32BitTcBgra");
+static_assert((SVP_24BIT_FORMAT & ~ScanlineFormat::TopDown) ==
ScanlineFormat::N24BitTcRgb, "Expected SVP_24BIT_FORMAT set to N24BitTcRgb");
+pD[0] = pS[0];
+pD[1] = pS[1];
+pD[2] = pS[2];
+pD[3] = 0xff; // Alpha
+#elif defined OSL_BIGENDIAN
+static_assert((SVP_CAIRO_FORMAT & ~ScanlineFormat::TopDown) ==
ScanlineFormat::N32BitTcArgb, "Expected SVP_CAIRO_FORMAT set to N32BitTcBgra");
+static_assert((SVP_24BIT_FORMAT & ~ScanlineFormat::TopDown) ==
ScanlineFormat::N24BitTcRgb, "Expected SVP_24BIT_FORMAT set to N24BitTcRgb");
+pD[0] = 0xff; // Alpha
[Libreoffice-commits] core.git: external/cairo vcl/headless
external/cairo/cairo/cairo-1.10.2.patch | 137
vcl/headless/svpgdi.cxx | 25 -
2 files changed, 143 insertions(+), 19 deletions(-)
New commits:
commit 54596087e57ea533253e19eea594d9b6c06e8d26
Author: Ashod Nakashian
Date: Sat Dec 9 16:28:42 2017 -0500
vcl-svp: add 24-bit (3-byte) RGB surface support to Cairo
(cherry picked from commit e8ba02b1d56dc7b59a4f0a7373995b28653a0597)
Reviewed-on: https://gerrit.libreoffice.org/46681
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
(cherry picked from commit 31c044e2501b9d4a0917e4e09133660bbe2a24dc)
Change-Id: I7707219eae4c2d6d40c8dc957207b63d3049a75f
Reviewed-on: https://gerrit.libreoffice.org/47010
Tested-by: Jenkins
Reviewed-by: Ashod Nakashian
diff --git a/external/cairo/cairo/cairo-1.10.2.patch
b/external/cairo/cairo/cairo-1.10.2.patch
index d564d53ab9e0..f50501926faa 100644
--- a/external/cairo/cairo/cairo-1.10.2.patch
+++ b/external/cairo/cairo/cairo-1.10.2.patch
@@ -1,5 +1,6 @@
misc/cairo-1.10.2/build/Makefile.win32.features2010-08-18
09:47:30.0 +0200
-+++ misc/build/cairo-1.10.2/build/Makefile.win32.features 2011-12-20
09:57:06.428170146 +0100
+diff -ruNw misc/cairo-1.10.2/build/Makefile.win32.features
misc/build/cairo-1.10.2/build/Makefile.win32.features
+--- misc/cairo-1.10.2/build/Makefile.win32.features2015-10-27
17:04:21.0 -0400
misc/build/cairo-1.10.2/build/Makefile.win32.features 2017-11-24
21:43:14.103524768 -0500
@@ -30,7 +30,7 @@
CAIRO_HAS_FC_FONT=0
CAIRO_HAS_PS_SURFACE=1
@@ -9,9 +10,10 @@
CAIRO_HAS_TEST_SURFACES=0
CAIRO_HAS_TEE_SURFACE=0
CAIRO_HAS_XML_SURFACE=0
misc/cairo-1.10.2/configure2010-12-25 15:22:57.0 +0100
-+++ misc/build/cairo-1.10.2/configure 2010-12-25 15:22:57.0 +0100
-@@ -19259,59 +19259,10 @@
+diff -ruNw misc/cairo-1.10.2/configure misc/build/cairo-1.10.2/configure
+--- misc/cairo-1.10.2/configure2015-12-09 15:41:45.0 -0500
misc/build/cairo-1.10.2/configure 2017-11-24 21:43:14.103524768 -0500
+@@ -20580,61 +20580,12 @@
rm -f confcache
@@ -58,8 +60,8 @@
have_libz=yes
$as_echo "#define HAVE_ZLIB 1" >>confdefs.h
--
--
+
+
-else
- have_libz="no (requires zlib http://www.gzip.org/zlib/)"
-fi
@@ -68,10 +70,12 @@
-else
- have_libz="no (requires zlib http://www.gzip.org/zlib/)"
-fi
-
-
+-
+-
save_LIBS="$LIBS"
-@@ -29424,7 +29424,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lzo2a_decompress in
-llzo2" >&5
+ $as_echo_n "checking for lzo2a_decompress in -llzo2... " >&6; }
+@@ -30069,7 +30020,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE_VERSION - OK"
>&5
$as_echo "$FREETYPE_VERSION - OK" >&6; }
ft_NONPKGCONFIG_CFLAGS=`$FREETYPE_CONFIG --cflags`
@@ -80,7 +84,7 @@
else { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE_VERSION -
Too old" >&5
$as_echo "$FREETYPE_VERSION - Too old" >&6; }
use_ft="no ($FREETYPE_VERSION found; version
$FREETYPE_MIN_VERSION from release $FREETYPE_MIN_RELEASE required)"
-@@ -29434,7 +29434,7 @@
+@@ -30079,7 +30030,7 @@
fi
ft_CFLAGS="$FREETYPE_CFLAGS"
@@ -89,7 +93,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether
cairo's FreeType font backend feature could be enabled" >&5
-@@ -30121,7 +30121,7 @@
+@@ -30686,7 +30637,7 @@
# The ps backend requires zlib.
use_ps=$have_libz
@@ -98,7 +102,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether
cairo's PostScript surface backend feature could be enabled" >&5
-@@ -30549,7 +30549,7 @@
+@@ -31082,7 +31033,7 @@
# The pdf backend requires zlib.
use_pdf=$have_libz
@@ -107,7 +111,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether
cairo's PDF surface backend feature could be enabled" >&5
-@@ -32296,7 +32296,7 @@
+@@ -32973,7 +32924,7 @@
use_xml=$have_libz
@@ -116,4 +120,107 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether
cairo's xml surface backend feature could be enabled" >&5
-$as_echo_n "checking whether cairo's xml surface backend feature could be
enabled... " >&6; }
+diff -ruNw misc/cairo-1.10.2/src/cairo.h misc/build/cairo-1.10.2/src/cairo.h
+--- misc/cairo-1.10.2/src/cairo.h 2015-10-27 17:04:21.0 -0400
misc/build/cairo-1.10.2/src/cairo.h2017-12-17 12:09:59.880406411
-0500
+@@ -397,6 +397,8 @@
+ * with red in the upper 5 bits, then green in the middle
+ * 6 bits, and blue in the lower 5 bits. (Since 1.2)
+ * @CAIRO_FORMAT_RGB30: like RGB24 but with 10bpc. (Since 1.12)
++ * @CAIRO_FORMAT_RGB24_888: each pixel is a 24-bit quantity,
++ * with Red, Green, Blue taking 8-bits each, in that order. (Since 1.1x)
+ *
+ * #cairo_format_t is used to identify the memory format of
[Libreoffice-commits] core.git: include/svx
include/svx/strings.hrc |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6723728ae206cfbe68c18475bbdc18072d24e620
Author: Stanislav Horacek
Date: Mon Dec 25 11:22:51 2017 +0100
remove redundant space in question about modified image
Change-Id: I293d535ef2bf8c9fd458944d9da3dcc2066326e3
Reviewed-on: https://gerrit.libreoffice.org/47056
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index 1fbcfc2066b2..402596978a0f 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -1339,7 +1339,7 @@
#define STR_COLORTABLE
NC_("STR_COLORTABLE", "Color Palette")
// String for saving modified image (instead of original)
-#define RID_SVXSTR_SAVE_MODIFIED_IMAGE
NC_("RID_SVXSTR_SAVE_MODIFIED_IMAGE", "The image has been modified. By default
the original image will be saved.\nDo you want to save the modified version
instead ?")
+#define RID_SVXSTR_SAVE_MODIFIED_IMAGE
NC_("RID_SVXSTR_SAVE_MODIFIED_IMAGE", "The image has been modified. By default
the original image will be saved.\nDo you want to save the modified version
instead?")
#define RID_ADD_TO_FAVORITES
NC_("RID_SUBSETMAP", "Add to favorites")
#define RID_REMOVE_FAVORITES
NC_("RID_SUBSETMAP", "Remove from favorites")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basic/source framework/inc framework/source include/basic
basic/source/classes/sb.cxx |4 ++--
basic/source/inc/iosys.hxx|6 +++---
basic/source/inc/runtime.hxx |4 ++--
basic/source/runtime/iosys.cxx|6 +++---
basic/source/runtime/runtime.cxx |2 +-
basic/source/sbx/sbxbase.cxx |2 +-
framework/inc/classes/imagewrapper.hxx|2 +-
framework/inc/xml/xmlnamespaces.hxx |2 +-
framework/source/fwe/classes/imagewrapper.cxx |2 +-
framework/source/fwe/xml/xmlnamespaces.cxx|2 +-
include/basic/basmgr.hxx |2 +-
include/basic/sbstar.hxx |4 ++--
include/basic/sbxcore.hxx |2 +-
13 files changed, 20 insertions(+), 20 deletions(-)
New commits:
commit 2a421b26c0100b35d28b86a5d79afa15af9580dd
Author: Noel Grandin
Date: Tue Dec 26 08:32:51 2017 +0200
loplugin:passstuffbyref improved return in basic,framework
Change-Id: Ib19836febb59f4e2bb07dc874cfc6baabc653237
Reviewed-on: https://gerrit.libreoffice.org/47065
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 294f7ee5744c..1be75c333424 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -1448,7 +1448,7 @@ sal_uInt16 StarBASIC::GetCol1() { return
GetSbData()->nCol1; }
sal_uInt16 StarBASIC::GetCol2() { return GetSbData()->nCol2; }
// Specific to error handler
-ErrCode StarBASIC::GetErrorCode() { return GetSbData()->nCode; }
+ErrCode const & StarBASIC::GetErrorCode() { return GetSbData()->nCode; }
const OUString& StarBASIC::GetErrorText() { return GetSbData()->aErrMsg; }
// From 1996-03-29:
@@ -1763,7 +1763,7 @@ bool StarBASIC::ErrorHdl()
return aErrorHdl.Call( this );
}
-Link StarBASIC::GetGlobalErrorHdl()
+Link const & StarBASIC::GetGlobalErrorHdl()
{
return GetSbData()->aErrHdl;
}
diff --git a/basic/source/inc/iosys.hxx b/basic/source/inc/iosys.hxx
index 7d7e9e832633..9e1b4fe80778 100644
--- a/basic/source/inc/iosys.hxx
+++ b/basic/source/inc/iosys.hxx
@@ -60,10 +60,10 @@ class SbiStream
public:
SbiStream();
~SbiStream();
-ErrCode Open( const OString&, StreamMode, SbiStreamFlags, short );
-ErrCode Close();
+ErrCode const & Open( const OString&, StreamMode, SbiStreamFlags, short );
+ErrCode const & Close();
ErrCode Read(OString&, sal_uInt16 = 0, bool bForceReadingPerByte=false);
-ErrCode Read( char& );
+ErrCode const & Read( char& );
ErrCode Write( const OString& );
bool IsText() const { return !bool(nMode & SbiStreamFlags::Binary); }
diff --git a/basic/source/inc/runtime.hxx b/basic/source/inc/runtime.hxx
index 86baec31ac53..d566276922dc 100644
--- a/basic/source/inc/runtime.hxx
+++ b/basic/source/inc/runtime.hxx
@@ -167,7 +167,7 @@ public:
void Abort(); // with current error code
voidStop();
-ErrCode GetErr(){ return nErr; }
+ErrCode const & GetErr(){ return nErr; }
const OUString& GetErrorMsg() { return aErrorMsg; }
sal_Int32 GetErl() { return nErl; }
voidEnableReschedule( bool bEnable ) { bReschedule = bEnable; }
@@ -186,7 +186,7 @@ public:
SbiDllMgr* GetDllMgr();
SbiRTLData* GetRTLData() const { return
const_cast(&aRTLData); }
-std::shared_ptr GetNumberFormatter();
+std::shared_ptr const & GetNumberFormatter();
sal_uInt32 GetStdDateIdx() const { return nStdDateIdx; }
sal_uInt32 GetStdTimeIdx() const { return nStdTimeIdx; }
sal_uInt32 GetStdDateTimeIdx() const { return nStdDateTimeIdx; }
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index 34ad8c28936b..49932c9e8316 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -445,7 +445,7 @@ voidUCBStream::SetSize( sal_uInt64 )
}
-ErrCode SbiStream::Open
+ErrCode const & SbiStream::Open
( const OString& rName, StreamMode nStrmMode, SbiStreamFlags nFlags, short nL )
{
nMode = nFlags;
@@ -511,7 +511,7 @@ ErrCode SbiStream::Open
return nError;
}
-ErrCode SbiStream::Close()
+ErrCode const & SbiStream::Close()
{
if( pStrm )
{
@@ -553,7 +553,7 @@ ErrCode SbiStream::Read(OString& rBuf, sal_uInt16 n, bool
bForceReadingPerByte)
return nError;
}
-ErrCode SbiStream::Read( char& ch )
+ErrCode const & SbiStream::Read( char& ch )
{
nExpandOnWriteTo = 0;
if (aLine.isEmpty())
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index 2b81778917e0..e4353dba40c5 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -357,7 +357,7 @@ SbiDllMgr* SbiInstance::GetDllMgr()
}
// #39629 create NumberFormatter with the help of a static method now
-std::shared_ptr SbiInstance::GetNumberFormatter()
+std::shared_ptr c
Re: Bug 83260
My assumptions from email below weren't fully correct... There is RedlineGuard class (https://opengrok.libreoffice.org/xref/core/sw/source/core/undo/undobj.cxx#190), instance of which is constructed just before UndoImpl called. Constructor sets RedlineFlags to value, that been during editing, which is Undone now, In destructor it sets flags back to their current values. This should help Undo mechanism to work properly. But in reality it not saves from crushes. For now I'll do my further investigations on this issue. -- Исходное сообщение -- От: "Yemelyanenko Fyodor" Кому: "libreoffice@lists.freedesktop.org" Отправлено: 22.12.2017 16:56:53 Тема: Bug 83260 >Hello! > >I'm working on bug 83260 >(https://bugs.documentfoundation.org/show_bug.cgi?id=83260) and have an >issue... >In short, when redlining (change tracking) is ON undo will crush LO >during some circumstances. > >This is connected with redlining implementation in LO. When you toggle >Show in Edit->Changes->Show and doc already has some deleted >paragraphs, >these paragraph moved from special section of document do document >section. As a result, such move invalidate Undo indexes and during Undo >LO will crush in many cases. > >For now I see 2 possible solutions: >1. Rewrite redlining, so Show option will change how doc is viewed, but >not how it is formed (list of nodes) >2. When toggling change tracking or show option ON/OFF - clean >Undo/Redo. > >For now, I prefer option 2 :-) > >Do we need to warn user, that we going to purge Undo/Redo (say, by >displaying some warning?) >Any additional suggestions will be appreciated. > >___ >LibreOffice mailing list >LibreOffice@lists.freedesktop.org >https://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: minutes of ESC call ...
* Hackfests & Events (Thorsten) + FOSDEM hack-fest / meetings + confirmed for following Monday/Tuesday at ICAB + dates confirmed (Monday + Tuesday), book your travel! + Bedford – overbooked right now; didn’t get a group rate (Heiko) + hurry to book. + La Grande Cloche over the street. + Hamburg – 1st new-style hackfest + deferred to next year ... + https://wiki.documentfoundation.org/Hackfests/HackfestTNG + should meet with locals + fallback plan for March in either Italy or Germany +*still looking for people who want help learning how to fix their problems interactively at a hackfest.*** Here, here!!! I'd love to learn how to fix spelling, grammar and other mistakes in the sources of our UI, help system and so by myself instead just to tell: "Here is one!!1!11!" and waiting for others (e.g. Gabor, Olivier, Sophie) to correct them (or not). Were good to learn that vis a vis with someone for sending my first patches in Gerrit. * mentoring/easyhack update committer... 1 week 1 month 3 months12 months open 67(-14)117(-14)119(-13) 123(-13) reviews 599(-4)2202(208) 4894(-30) 18690(136) merged 428(86)1551(229) 3557(192) 11871(204) abandoned 28(-14)135(14) 267(17) 744(18) own commits 339(-8)1545(76)4246(-9)13944(181) review commits 56(-15)343(5) 866(-9) 3337(5) contributor... 1 week 1 month 3 months12 months open 17(-6) 38(3) 39(1)43(1) reviews 845(-80) 3324(190) 7735(111) 24245(279) merged 13(-15) 85(-9) 234(-9) 1183(-1) abandoned 2(-6) 23(-1) 57(-4) 346(-1) own commits 13(-15) 86(-9) 240(-10) 866(-11) review commits 0(0)0(0)0(0) 0(0) + easyHack statistics: needsDevEval 37(37) needsUXEval 1(1) cleanup_comments 206(206) total 255(255) assigned 24(24) open 192(192) + top 5 contributors: Gelmini, Andrea made 24 patches in 1 month, and 211 patches in 1 year Goncharuk, Lera made 8 patches in 1 month, and 13 patches in 1 year Donkers, Winfried made 8 patches in 1 month, and 29 patches in 1 year Gabriel Chiquini made 4 patches in 1 month, and 6 patches in 1 year Latini, Marina made 3 patches in 1 month, and 4 patches in 1 year + top 5 reviewers: Pootle bot made 237 review comments in 1 month, and 741 in 1 year Holešovský, Jan made 203 review comments in 1 month, and 1143 in 1 year Behrens, Thorsten made 195 review comments in 1 month, and 1068 in 1 year Stahl, Michael made 195 review comments in 1 month, and 1987 in 1 year Rathke, Eike made 152 review comments in 1 month, and 1142 in 1 year + big CONGRATULATIONS to contributors who have at least 1 merged patch, since last report: * XHTML export filter (Miklos) + remember recent commits for XHTML / XSLT. + added a new flag to HTML export to produce XHTML + far from perfect but a good start. + profiling XHTML export – a large cost is compiling XSLT thing. + 2x XHTML exports in writer. + XSLT is the default still, but now have the C++ one too. + in case no-one shouts: prefer to move to C++ not XSLT + no time for it just now to do it completely. + thoughts ? + no fan of XSLT (Thorsten) + fixing bits here & there had to re-write. + one good bit – exercises the flat-odf filter + Regina working on fixing that. + perhaps keep it around and deprecate it. + generally the concept is powerful if you love XSLT (Thorsten) + patch to change type of pictures (Kendy) + useful for flat-odt (Thorsten) * Commit Access * Developer Certification (Stephan/Bjoern/Kendy/Thorsten) + sleep for 16 weeks. * Jenkins / CI update (Christian) from:Thu Dec 14 16:17:23 2017 master linux rel jobs: 204 ok: 201 ko: 3 fail ratio: 1.47 % break: 2 broken duration: 0.17% master linux dbg jobs: 133 ok: 130 ko: 1 fail ratio: 0.75 % break: 1 broken duration: 0.74% master mac reljobs: 141 ok: 140 ko: 1 fail ratio: 0.71 % break: 1 broken duration: 1.15% master mac dbgjobs: 137 ok: 135 ko: 2 fail ratio: 1.46 % break: 2 broken duration: 2.71% master win reljobs: 94 ok: 85 ko: 9 fail ratio: 9.57 % break: 9 broken duration:11.47% master win dbgjobs: 114 ok: 101 ko: 13 fail ratio: 11.40 % break: 12 broken duration: 9.92% master win64 dbg jobs: 106 ok: 93 ko: 13 fail ratio: 12.26 % break: 12 broken duration: 8.68%
[Libreoffice-commits] core.git: sw/uiconfig
sw/uiconfig/swriter/ui/picturepage.ui |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2bf1cc7372088ec31ac5f0fb60de57feda59d3b7 Author: Stanislav Horacek Date: Mon Dec 25 17:40:01 2017 +0100 mark angle value in picturepage.ui as untranslatable Change-Id: I20c2c13770d8bef2d4f8e117101fb92e8182e26e Reviewed-on: https://gerrit.libreoffice.org/47059 Tested-by: Jenkins Reviewed-by: Katarina Behrens diff --git a/sw/uiconfig/swriter/ui/picturepage.ui b/sw/uiconfig/swriter/ui/picturepage.ui index 4a9364e8dffd..e4e7afbb9ab0 100644 --- a/sw/uiconfig/swriter/ui/picturepage.ui +++ b/sw/uiconfig/swriter/ui/picturepage.ui @@ -304,7 +304,7 @@ True True ⢠-0,00 +0,00 adjustmentANGLE 2 True ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - cui/source
cui/source/options/optgenrl.cxx | 17 ++---
1 file changed, 10 insertions(+), 7 deletions(-)
New commits:
commit 29840645e2cb8231040bcbac1b1fe98f494c92c9
Author: Tor Lillqvist
Date: Fri Dec 22 15:23:43 2017 +0200
Avoid crash without GPG
Change-Id: I5489012544fdf736784608b274359ea99f9ffe45
(cherry picked from commit 1b73ed91e1cce20b3b552a36d449fb96cc57bf4f)
Reviewed-on: https://gerrit.libreoffice.org/46977
Tested-by: Jenkins
Reviewed-by: Katarina Behrens
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index c25144f04266..0816a8c49821 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -308,15 +308,18 @@ void SvxGeneralTabPage::InitCryptography()
{
xSEInitializer = xml::crypto::GPGSEInitializer::create(
comphelper::getProcessComponentContext() );
uno::Reference xSC =
xSEInitializer->createSecurityContext( OUString() );
-uno::Reference xSE =
xSC->getSecurityEnvironment();
-uno::Sequence> xCertificates =
xSE->getPersonalCertificates();
-
-if (xCertificates.hasElements())
+if (xSC.is())
{
-for (auto& xCert : xCertificates)
+uno::Reference xSE =
xSC->getSecurityEnvironment();
+uno::Sequence>
xCertificates = xSE->getPersonalCertificates();
+
+if (xCertificates.hasElements())
{
-m_pSigningKeyLB->InsertEntry( xCert->getIssuerName());
-m_pEncryptionKeyLB->InsertEntry( xCert->getIssuerName());
+for (auto& xCert : xCertificates)
+{
+m_pSigningKeyLB->InsertEntry( xCert->getIssuerName());
+m_pEncryptionKeyLB->InsertEntry( xCert->getIssuerName());
+}
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: 6 commits - loleaflet/dist loleaflet/reference.html loleaflet/src
loleaflet/dist/loleaflet.css |1
loleaflet/reference.html | 23 +++
loleaflet/src/control/Control.LokDialog.js | 191 -
loleaflet/src/layer/tile/TileLayer.js | 14 --
loleaflet/src/map/handler/Map.Keyboard.js | 26 ++-
5 files changed, 119 insertions(+), 136 deletions(-)
New commits:
commit d1c8de9bf9021dedb67446439f117b1b64c7e2d9
Author: Pranav Kant
Date: Sat Dec 23 18:36:28 2017 +0530
loleaflet: Unify dialog key handling logic with document's
Change-Id: I422e813d76df9b52a860a05d09a89362dfb0b616
diff --git a/loleaflet/src/control/Control.LokDialog.js
b/loleaflet/src/control/Control.LokDialog.js
index 3e23fa6a..b6cb4c41 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -224,7 +224,9 @@ L.Control.LokDialog = L.Control.extend({
this._postWindowMouseEvent(lokEventType,
this._toRawDlgId(strDlgId), e.offsetX, e.offsetY, 1, buttons, 0);
}, this);
L.DomEvent.on(dialogCanvas, 'keyup keypress keydown',
function(e) {
- this._handleDialogKeyEvent(e,
this._toRawDlgId(strDlgId));
+ // _onKeyDown fn below requires this kind of structure
but leaflet DomEvent.on doesn't pass it
+ e.originalEvent = e;
+ map['keyboard']._onKeyDown(e,
L.bind(this._postWindowKeyboardEvent, this, this._toRawDlgId(strDlgId)));
}, this);
L.DomEvent.on(dialogCanvas, 'contextmenu', function() {
return false;
@@ -244,42 +246,6 @@ L.Control.LokDialog = L.Control.extend({
' char=' + charcode + ' key=' +
keycode);
},
- _handleDialogKeyEvent: function(e, winid) {
- var docLayer = this._map._docLayer;
- this.modifier = 0;
- var shift = e.shiftKey ?
this._map['keyboard'].keyModifier.shift : 0;
- var ctrl = e.ctrlKey ? this._map['keyboard'].keyModifier.ctrl :
0;
- var alt = e.altKey ? this._map['keyboard'].keyModifier.alt : 0;
- var cmd = e.metaKey ? this._map['keyboard'].keyModifier.ctrl :
0;
- this.modifier = shift | ctrl | alt | cmd;
-
- var charCode = e.charCode;
- var keyCode = e.keyCode;
- var unoKeyCode = this._map['keyboard']._toUNOKeyCode(keyCode);
-
- if (this.modifier) {
- unoKeyCode |= this.modifier;
- if (e.type !== 'keyup') {
- this._postWindowKeyboardEvent(winid, 'input',
charCode, unoKeyCode);
- return;
- }
- }
-
- if (e.type === 'keydown' &&
this._map['keyboard'].handleOnKeyDownKeys[keyCode]) {
- this._postWindowKeyboardEvent(winid, 'input', charCode,
unoKeyCode);
- }
- else if (e.type === 'keypress' &&
(!this._map['keyboard'].handleOnKeyDownKeys[keyCode] || charCode !== 0)) {
- if (charCode === keyCode && charCode !== 13) {
- keyCode = 0;
- unoKeyCode =
this._map['keyboard']._toUNOKeyCode(keyCode);
- }
- this._postWindowKeyboardEvent(winid, 'input', charCode,
unoKeyCode);
- }
- else if (e.type === 'keyup') {
- this._postWindowKeyboardEvent(winid, 'up', charCode,
unoKeyCode);
- }
- },
-
_onDialogClose: function(dialogId, notifyBackend) {
if (notifyBackend)
this._sendCloseWindow(dialogId);
diff --git a/loleaflet/src/layer/tile/TileLayer.js
b/loleaflet/src/layer/tile/TileLayer.js
index 26d12f8a..0046421b 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -1430,20 +1430,6 @@ L.TileLayer = L.GridLayer.extend({
}
},
- _postKeyboardEvents: function(type, charcodes, keycodes) {
- // Both are arrays
- if (typeof(charcodes.length) !== 'number' &&
typeof(keycodes.length) !== 'number')
- return;
-
- // both have same length
- if (charcodes.length !== keycodes.length)
- return;
-
- for (var i = 0; i < charcodes.length; i++) {
- this._postKeyboardEvent(type, charcodes[i],
keycodes[i]);
- }
- },
-
_postKeyboardEvent: function(type, charcode, keycode) {
if (this._docType === 'spreadsheet' && this._prevCellCursor &&
type === 'input') {
if (keycode === 1030) { // PgUp
diff --git a/loleaflet/src/map/handler/Map.Keyboard.js
b/loleaflet/src/map/handler/Map.Ke
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - extensions.lst
extensions.lst |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f0503de97c8c1523d6f36315ee40519692734d8d Author: Andrea Pescetti Date: Tue Dec 26 10:35:36 2017 + #i127637# Use version-independent filenames for bundled extensions. diff --git a/extensions.lst b/extensions.lst index c31217233aa1..5511c9a92aff 100644 --- a/extensions.lst +++ b/extensions.lst @@ -39,7 +39,7 @@ # English dictionary [ language=en.* || language=de || language=it ] -f4cb089a1101cc06e49d8bbb2886e5cf https://sourceforge.net/projects/aoo-extensions/files/17102/38/dict-en-20171101.oxt/download "dict-en-20171101.oxt" +f4cb089a1101cc06e49d8bbb2886e5cf https://sourceforge.net/projects/aoo-extensions/files/17102/38/dict-en-20171101.oxt/download "dict-en.oxt" # English (USA, en_US) dictionary [ language==nl || language==ru ] ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/outdev/font.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit b41fa706e0d4d16d9865ba295a8960376c96597f Author: Mike Kaganski Date: Tue Dec 26 08:29:51 2017 +0100 Remove redundant call to OutputDevice::ImplRefreshAllFontData Since commit 40809ce46999e9cedb2fe5db8e9d53ebb6c182bf, OutputDevice::AddTempDevFont called OutputDevice::ImplRefreshAllFontData twice: first time explicitly before return, second time in UpdateFontsGuard destructor. Change-Id: Ie67bdcbd98de5f6053379af700239246412b88db Reviewed-on: https://gerrit.libreoffice.org/47066 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx index 382400fe4eaf..778f6e2ed1a7 100644 --- a/vcl/source/outdev/font.cxx +++ b/vcl/source/outdev/font.cxx @@ -161,7 +161,6 @@ bool OutputDevice::AddTempDevFont( const OUString& rFileURL, const OUString& rFo if( mpAlphaVDev ) mpAlphaVDev->AddTempDevFont( rFileURL, rFontName ); -OutputDevice::ImplRefreshAllFontData(true); return true; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
