[Libreoffice-commits] core.git: include/vcl vcl/inc vcl/opengl vcl/qa vcl/source vcl/unx vcl/workben
include/vcl/BitmapAlphaClampFilter.hxx |2 - include/vcl/BitmapColorQuantizationFilter.hxx |2 - include/vcl/BitmapDuoToneFilter.hxx |4 +-- include/vcl/BitmapEmbossGreyFilter.hxx |4 +-- include/vcl/BitmapGaussianSeparableBlurFilter.hxx |2 - include/vcl/BitmapMonochromeFilter.hxx |2 - include/vcl/BitmapMosaicFilter.hxx |4 +-- include/vcl/BitmapSeparableUnsharpenFilter.hxx |2 - include/vcl/BitmapSimpleColorQuantizationFilter.hxx |2 - include/vcl/BitmapSmoothenFilter.hxx|2 - include/vcl/BitmapSolarizeFilter.hxx|2 - include/vcl/BitmapTools.hxx |4 +-- include/vcl/bitmapaccess.hxx|2 - include/vcl/builder.hxx | 24 ++-- include/vcl/commandevent.hxx| 12 +- include/vcl/dockwin.hxx | 12 +- include/vcl/errinf.hxx |8 +++--- include/vcl/event.hxx | 10 include/vcl/evntpost.hxx|2 - include/vcl/filter/pdfdocument.hxx |4 +-- include/vcl/font/Feature.hxx|2 - include/vcl/graph.hxx |8 +++--- include/vcl/graphicfilter.hxx |4 +-- include/vcl/i18nhelp.hxx|2 - include/vcl/metaact.hxx |6 ++--- include/vcl/pdfwriter.hxx |2 - include/vcl/print.hxx |6 ++--- include/vcl/salctype.hxx|2 - include/vcl/salnativewidgets.hxx|2 - include/vcl/svapp.hxx |2 - include/vcl/textdata.hxx|4 +-- include/vcl/toolkit/dialog.hxx |2 - include/vcl/txtattr.hxx |4 +-- include/vcl/unohelp2.hxx|2 - include/vcl/vclevent.hxx|2 - include/vcl/vectorgraphicdata.hxx |4 +-- include/vcl/weld.hxx|2 - vcl/inc/BitmapColorizeFilter.hxx|2 - vcl/inc/BitmapFastScaleFilter.hxx |6 ++--- vcl/inc/BitmapInterpolateScaleFilter.hxx|4 +-- vcl/inc/BitmapScaleConvolutionFilter.hxx|4 +-- vcl/inc/BitmapScaleSuperFilter.hxx |4 +-- vcl/inc/ControlCacheKey.hxx |8 +++--- vcl/inc/PhysicalFontFamily.hxx |2 - vcl/inc/canvasbitmap.hxx|2 - vcl/inc/font/FeatureCollector.hxx |4 +-- vcl/inc/headless/svpframe.hxx |2 - vcl/inc/headless/svpvd.hxx |4 +-- vcl/inc/impanmvw.hxx| 16 ++--- vcl/inc/impfontcharmap.hxx |2 - vcl/inc/impfontmetricdata.hxx |2 - vcl/inc/implimagetree.hxx |4 +-- vcl/inc/listbox.hxx |6 ++--- vcl/inc/opengl/FixedTextureAtlas.hxx|6 ++--- vcl/inc/opengl/LineRenderUtils.hxx |6 ++--- vcl/inc/opengl/PackedTextureAtlas.hxx |4 +-- vcl/inc/opengl/texture.hxx |2 - vcl/inc/opengl/zone.hxx |2 - vcl/inc/outdev.h|2 - vcl/inc/ppdparser.hxx |2 - vcl/inc/printdlg.hxx|8 +++--- vcl/inc/printerinfomanager.hxx |2 - vcl/inc/sallayout.hxx |6 ++--- vcl/inc/salsession.hxx |6 ++--- vcl/inc/salwtype.hxx|4 +-- vcl/inc/unx/fc_fontoptions.hxx |2 - vcl/inc/unx/freetype_glyphcache.hxx |4 +-- vcl/inc/unx/gendata.hxx |2 - vcl/inc/unx/glyphcache.hxx |2 - vcl/inc/unx/gtk/gtkdata.hxx |2 - vcl/inc/unx/gtk/gtkgdi.hxx |2 - vcl/inc/unx/gtk/gtksalmenu.hxx |6 ++--- vcl/inc/unx/salbmp.h|4 +-- vcl/inc/unx/saldisp.hxx |2 - vcl/inc/unx/salgdi.h|4 +-- vcl/inc/unx/wmadaptor.hxx |2 - vcl/inc/unx/x11/xrender_peer.hxx|2 - vcl/opengl/PackedTextureAtlas.cxx |2 -
[Libreoffice-commits] online.git: cypress_test/integration_tests loleaflet/src
cypress_test/integration_tests/mobile/writer/focus_spec.js |7 ---
loleaflet/src/map/handler/Map.TouchGesture.js |2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
New commits:
commit 7b4bf196d21f9cde807852b98164b00367ef1eb7
Author: Tamás Zolnai
AuthorDate: Mon Mar 16 10:29:30 2020 +0100
Commit: Tamás Zolnai
CommitDate: Mon Mar 16 10:29:30 2020 +0100
Revert "cypress: mobile: reenable a focus related test."
This reverts commit 584e707ddb779fc909a98d03ae9488d6c3e39650.
diff --git a/cypress_test/integration_tests/mobile/writer/focus_spec.js
b/cypress_test/integration_tests/mobile/writer/focus_spec.js
index 17153f33a..a0c385fc9 100644
--- a/cypress_test/integration_tests/mobile/writer/focus_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/focus_spec.js
@@ -201,9 +201,10 @@ describe('Focus tests', function() {
.dblclick(posX, posY);
});
- // Document grabs the focus
- cy.document().its('activeElement.className')
- .should('be.eq', 'clipboard');
+ // Document still has the focus
+ // TODO: Focus is inconsistent here.
+ //cy.document().its('activeElement.className')
+ // .should('be.eq', 'clipboard');
});
it('Focus with hamburger menu.', function() {
diff --git a/loleaflet/src/map/handler/Map.TouchGesture.js
b/loleaflet/src/map/handler/Map.TouchGesture.js
index 99ff04a9f..1fc7479c6 100644
--- a/loleaflet/src/map/handler/Map.TouchGesture.js
+++ b/loleaflet/src/map/handler/Map.TouchGesture.js
@@ -313,7 +313,7 @@ L.Map.TouchGesture = L.Handler.extend({
// by the double-tap and triple-tap handlers below.
// Note: Hammer has requireFailure() which supressses this call
// when multi-taps are detected. This isn't working for us.
- if (e.tapCount > 1 && !L.Browser.cypressTest)
+ if (e.tapCount > 1)
return;
var point = e.pointers[0],
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source writerperfect/source
writerfilter/source/dmapper/BorderHandler.hxx|2 -
writerfilter/source/dmapper/DomainMapperTableHandler.hxx |4 +--
writerfilter/source/dmapper/DomainMapper_Impl.cxx| 14 +-
writerfilter/source/dmapper/DomainMapper_Impl.hxx| 20 +++
writerfilter/source/dmapper/FontTable.hxx|2 -
writerfilter/source/dmapper/FormControlHelper.hxx|2 -
writerfilter/source/dmapper/GraphicImport.cxx|2 -
writerfilter/source/dmapper/LoggedResources.hxx |2 -
writerfilter/source/dmapper/ModelEventListener.hxx |4 +--
writerfilter/source/dmapper/PropertyMap.cxx |2 -
writerfilter/source/dmapper/PropertyMap.hxx |2 -
writerfilter/source/dmapper/StyleSheetTable.cxx | 10 +++
writerfilter/source/dmapper/TableData.hxx|2 -
writerfilter/source/dmapper/TblStylePrHandler.hxx|2 -
writerfilter/source/ooxml/OOXMLDocumentImpl.hxx |6 ++--
writerfilter/source/ooxml/OOXMLFactory.hxx |6 ++--
writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx |6 ++--
writerfilter/source/ooxml/OOXMLPropertySet.hxx | 20 +++
writerfilter/source/ooxml/OOXMLStreamImpl.hxx|4 +--
writerfilter/source/rtftok/rtfcharsets.hxx |4 +--
writerfilter/source/rtftok/rtfdocumentimpl.hxx |4 +--
writerfilter/source/rtftok/rtffly.hxx|4 +--
writerfilter/source/rtftok/rtfreferencetable.hxx |2 -
writerfilter/source/rtftok/rtfsprm.hxx |2 -
writerfilter/source/rtftok/rtfvalue.hxx |4 +--
writerperfect/source/common/WPXSvInputStream.cxx |6 ++--
26 files changed, 69 insertions(+), 69 deletions(-)
New commits:
commit 7d02e8995404d3d7a6df7766567cc295b974b654
Author: Noel Grandin
AuthorDate: Mon Mar 16 09:21:39 2020 +0200
Commit: Noel Grandin
CommitDate: Mon Mar 16 10:59:41 2020 +0100
Revert "loplugin:constfields in writerfilter"
This reverts commit e7c6c05ae5a62e1705ffda97c5405eecd1f62a1e.
Change-Id: I9072c4ef9c1a941ac3169e2b53dfd25ae7863770
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90545
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/writerfilter/source/dmapper/BorderHandler.hxx
b/writerfilter/source/dmapper/BorderHandler.hxx
index 97bc7802973f..6eec32327a14 100644
--- a/writerfilter/source/dmapper/BorderHandler.hxx
+++ b/writerfilter/source/dmapper/BorderHandler.hxx
@@ -51,7 +51,7 @@ private:
sal_Int32 m_nLineColor;
sal_Int32 m_nLineDistance;
boolm_bShadow;
-bool const m_bOOXML;
+boolm_bOOXML;
o3tl::enumarray m_aFilledLines;
o3tl::enumarray m_aBorderLines;
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.hxx
b/writerfilter/source/dmapper/DomainMapperTableHandler.hxx
index 9733a3fd908c..142b7817cc37 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.hxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.hxx
@@ -42,8 +42,8 @@ struct TableInfo;
/// A horizontally merged cell is in fact a range of cells till its merge is
performed.
struct HorizontallyMergedCell
{
-sal_Int32 const m_nFirstRow;
-sal_Int32 const m_nFirstCol;
+sal_Int32 m_nFirstRow;
+sal_Int32 m_nFirstCol;
sal_Int32 m_nLastRow;
sal_Int32 m_nLastCol;
HorizontallyMergedCell(sal_Int32 nFirstRow, sal_Int32 nFirstCol)
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 919ea9c195f7..3e87fcb0a2b5 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -170,7 +170,7 @@ namespace {
struct FieldConversion
{
const char* cFieldServiceName;
-FieldId const eFieldId;
+FieldId eFieldId;
};
}
@@ -225,7 +225,7 @@ static bool IsFieldNestingAllowed(const FieldContextPtr&
pOuter, const FieldCont
uno::Any FloatingTableInfo::getPropertyValue(const OUString )
{
-for( beans::PropertyValue const & propVal : m_aFrameProperties )
+for( beans::PropertyValue const & propVal :
std::as_const(m_aFrameProperties) )
if( propVal.Name == propertyName )
return propVal.Value ;
return uno::Any() ;
@@ -3038,8 +3038,8 @@ static sal_Int16 lcl_ParseNumberingType( const OUString&
rCommand )
//todo: might make sense to hash this list, too
struct NumberingPairs
{
-const char* cWordName;
-sal_Int16 const nType;
+const sal_Char* cWordName;
+sal_Int16 nType;
};
static const NumberingPairs aNumberingPairs[] =
{
@@ -4071,9 +4071,9 @@ void DomainMapper_Impl::handleAuthor
constexpr sal_uInt8 SET_DATE = 0x04;
struct
[Libreoffice-commits] core.git: sw/source
sw/source/core/inc/UndoTable.hxx | 34 -
sw/source/core/undo/untbl.cxx| 144 +++
2 files changed, 89 insertions(+), 89 deletions(-)
New commits:
commit 5a2c340e00050e21f29ae880593ef4f9ec1ba08d
Author: Miklos Vajna
AuthorDate: Mon Mar 16 09:10:09 2020 +0100
Commit: Miklos Vajna
CommitDate: Mon Mar 16 11:00:18 2020 +0100
sw: prefix members of SwUndoTableCpyTable, SwUndoTableHeadline, ...
... SwUndoTableMerge and SwUndoTableToText
See tdf#94879 for motivation.
Change-Id: Ib1465f4faff62628dfcd11a0e33b4adde8862c56
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90550
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/sw/source/core/inc/UndoTable.hxx b/sw/source/core/inc/UndoTable.hxx
index 27f6c5dc8e72..1b6b36684b21 100644
--- a/sw/source/core/inc/UndoTable.hxx
+++ b/sw/source/core/inc/UndoTable.hxx
@@ -98,15 +98,15 @@ public:
class SwUndoTableToText : public SwUndo
{
-OUString sTableNm;
-std::unique_ptr pDDEFieldType;
-std::unique_ptr pTableSave;
+OUString m_sTableName;
+std::unique_ptr m_pDDEFieldType;
+std::unique_ptr m_pTableSave;
SwTableToTextSaves m_vBoxSaves;
-std::unique_ptr pHistory;
-sal_uLong nSttNd, nEndNd;
-sal_Unicode cSeparator;
-sal_uInt16 nHdlnRpt;
-bool bCheckNumFormat : 1;
+std::unique_ptr m_pHistory;
+sal_uLong m_nStartNode, m_nEndNode;
+sal_Unicode m_cSeparator;
+sal_uInt16 m_nHeadlineRepeat;
+bool m_bCheckNumFormat : 1;
public:
SwUndoTableToText( const SwTable& rTable, sal_Unicode cCh );
@@ -209,12 +209,12 @@ class SwUndoMove;
class SwUndoTableMerge : public SwUndo, private SwUndRng
{
-sal_uLong nTableNode;
-std::unique_ptr pSaveTable;
+sal_uLong m_nTableNode;
+std::unique_ptr m_pSaveTable;
std::set m_Boxes;
-std::vector aNewSttNds;
+std::vector m_aNewStartNodes;
std::vector> m_vMoves;
-std::unique_ptr pHistory;
+std::unique_ptr m_pHistory;
public:
SwUndoTableMerge( const SwPaM& rTableSel );
@@ -229,7 +229,7 @@ public:
void SetSelBoxes( const SwSelBoxes& rBoxes );
void AddNewBox( sal_uLong nSttNdIdx )
-{ aNewSttNds.push_back( nSttNdIdx ); }
+{ m_aNewStartNodes.push_back( nSttNdIdx ); }
void SaveCollection( const SwTableBox& rBox );
};
@@ -267,7 +267,7 @@ struct UndoTableCpyTable_Entry;
class SwUndoTableCpyTable : public SwUndo
{
std::vector> m_vArr;
-std::unique_ptr pInsRowUndo;
+std::unique_ptr m_pInsRowUndo;
//b6341295: When redlining is active, PrepareRedline has to create the
//redlining attributes for the new and the old table cell content
@@ -355,9 +355,9 @@ public:
class SwUndoTableHeadline : public SwUndo
{
-sal_uLong nTableNd;
-sal_uInt16 nOldHeadline;
-sal_uInt16 nNewHeadline;
+sal_uLong m_nTableNode;
+sal_uInt16 m_nOldHeadline;
+sal_uInt16 m_nNewHeadline;
public:
SwUndoTableHeadline( const SwTable&, sal_uInt16 nOldHdl, sal_uInt16
nNewHdl );
diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx
index 0251de1591d8..d8d06f970263 100644
--- a/sw/source/core/undo/untbl.cxx
+++ b/sw/source/core/undo/untbl.cxx
@@ -399,19 +399,19 @@ SwTableToTextSave::SwTableToTextSave( SwDoc& rDoc,
sal_uLong nNd, sal_uLong nEnd
SwUndoTableToText::SwUndoTableToText( const SwTable& rTable, sal_Unicode cCh )
: SwUndo( SwUndoId::TABLETOTEXT, rTable.GetFrameFormat()->GetDoc() ),
-sTableNm( rTable.GetFrameFormat()->GetName() ),
-nSttNd( 0 ), nEndNd( 0 ),
-cSeparator( cCh ), nHdlnRpt( rTable.GetRowsToRepeat() )
+m_sTableName( rTable.GetFrameFormat()->GetName() ),
+m_nStartNode( 0 ), m_nEndNode( 0 ),
+m_cSeparator( cCh ), m_nHeadlineRepeat( rTable.GetRowsToRepeat() )
{
-pTableSave.reset( new SaveTable( rTable ) );
+m_pTableSave.reset( new SaveTable( rTable ) );
m_vBoxSaves.reserve(rTable.GetTabSortBoxes().size());
if( auto pDDETable = dynamic_cast() )
-
pDDEFieldType.reset(static_cast(pDDETable->GetDDEFieldType()->Copy().release()));
+
m_pDDEFieldType.reset(static_cast(pDDETable->GetDDEFieldType()->Copy().release()));
-bCheckNumFormat = rTable.GetFrameFormat()->GetDoc()->IsInsTableFormatNum();
+m_bCheckNumFormat =
rTable.GetFrameFormat()->GetDoc()->IsInsTableFormatNum();
-pHistory.reset(new SwHistory);
+m_pHistory.reset(new SwHistory);
const SwTableNode* pTableNd = rTable.GetTableNode();
sal_uLong nTableStt = pTableNd->GetIndex(), nTableEnd =
pTableNd->EndOfSectionIndex();
@@ -427,22 +427,22 @@ SwUndoTableToText::SwUndoTableToText( const SwTable&
rTable, sal_Unicode cCh )
nTableStt <= pAPos->nNode.GetIndex() &&
pAPos->nNode.GetIndex() < nTableEnd )
{
-pHistory->AddChangeFlyAnchor(*pFormat);
+m_pHistory->AddChangeFlyAnchor(*pFormat);
}
}
-if(
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - chart2/source sw/qa
chart2/source/inc/ChartTypeHelper.hxx|3 ++
chart2/source/tools/ChartTypeHelper.cxx |9 +++
chart2/source/view/charttypes/AreaChart.cxx |3 +-
chart2/source/view/charttypes/VSeriesPlotter.cxx |5 +++-
chart2/source/view/inc/VDataSeries.hxx |1
chart2/source/view/main/ChartView.cxx| 28 +++
chart2/source/view/main/VDataSeries.cxx | 16 -
dev/null |binary
sw/qa/extras/layout/layout.cxx | 16 -
9 files changed, 48 insertions(+), 33 deletions(-)
New commits:
commit 2af4d304992d2a508e0d79cd855b93ca7559ebef
Author: Xisco Faulí
AuthorDate: Wed Mar 11 17:59:40 2020 +0100
Commit: Xisco Faulí
CommitDate: Mon Mar 16 10:38:17 2020 +0100
tdf#131291: Revert "tdf#129173 tdf#129175 Fix number format of data labels"
This reverts commit d979eb16b9144c7ed230d7b0a4d0c1474664d7d0.
Revert it only in libreoffice-6-3 branch
Change-Id: Ib73a0344932eeec792935f46e4a86041ed448287
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90284
Tested-by: Jenkins
Reviewed-by: Xisco Faulí
diff --git a/chart2/source/inc/ChartTypeHelper.hxx
b/chart2/source/inc/ChartTypeHelper.hxx
index b97a256802c3..c2945dfb9380 100644
--- a/chart2/source/inc/ChartTypeHelper.hxx
+++ b/chart2/source/inc/ChartTypeHelper.hxx
@@ -78,6 +78,9 @@ public:
static OUString getRoleOfSequenceForDataLabelNumberFormatDetection( const
css::uno::Reference<
css::chart2::XChartType >& xChartType );
+static bool shouldLabelNumberFormatKeyBeDetectedFromYAxis( const
css::uno::Reference<
+css::chart2::XChartType >& xChartType );
+
static bool isSupportingOnlyDeepStackingFor3D( const css::uno::Reference<
css::chart2::XChartType >& xChartType );
};
diff --git a/chart2/source/tools/ChartTypeHelper.cxx
b/chart2/source/tools/ChartTypeHelper.cxx
index c8efc90b3f0f..78d841755374 100644
--- a/chart2/source/tools/ChartTypeHelper.cxx
+++ b/chart2/source/tools/ChartTypeHelper.cxx
@@ -657,6 +657,15 @@ OUString
ChartTypeHelper::getRoleOfSequenceForDataLabelNumberFormatDetection( co
return aRet;
}
+bool ChartTypeHelper::shouldLabelNumberFormatKeyBeDetectedFromYAxis( const
uno::Reference< XChartType >& xChartType )
+{
+bool bRet = true;
+OUString aChartTypeName = xChartType->getChartType();
+if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE) )
+bRet = false;
+return bRet;
+}
+
bool ChartTypeHelper::isSupportingOnlyDeepStackingFor3D( const uno::Reference<
XChartType >& xChartType )
{
bool bRet = false;
diff --git a/chart2/source/view/charttypes/AreaChart.cxx
b/chart2/source/view/charttypes/AreaChart.cxx
index 89ba4db47b2f..2699121ed357 100644
--- a/chart2/source/view/charttypes/AreaChart.cxx
+++ b/chart2/source/view/charttypes/AreaChart.cxx
@@ -724,7 +724,6 @@ void AreaChart::createShapes()
if( m_nDimension==3 && m_bArea &&
rXSlot.m_aSeriesVector.size()!=1 )
fLogicY = fabs( fLogicY );
-double fLogicValueForLabeDisplay = fLogicY;
std::map< sal_Int32, double >& rLogicYSumMap =
aLogicYSumMapByX[nIndex];
if (rPosHelper.isPercentY() &&
rLogicYSumMap[nAttachedAxisIndex] != 0.0)
{
@@ -752,6 +751,8 @@ void AreaChart::createShapes()
if( rLogicYForNextSeriesMap.find(nAttachedAxisIndex) ==
rLogicYForNextSeriesMap.end() )
rLogicYForNextSeriesMap[nAttachedAxisIndex] = 0.0;
+double fLogicValueForLabeDisplay = fLogicY;
+
fLogicY += rLogicYForNextSeriesMap[nAttachedAxisIndex];
rLogicYForNextSeriesMap[nAttachedAxisIndex] = fLogicY;
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx
b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index 16fc40428b5a..6a3b142a0ce9 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -367,7 +367,10 @@ OUString VSeriesPlotter::getLabelTextForValue( VDataSeries
const & rDataSeries
}
else
{
-nNumberFormatKey = rDataSeries.detectNumberFormatKey( nPointIndex
);
+if( rDataSeries.shouldLabelNumberFormatKeyBeDetectedFromYAxis() &&
m_aAxesNumberFormats.hasFormat(1,rDataSeries.getAttachedAxisIndex()) ) //y-axis
+nNumberFormatKey =
m_aAxesNumberFormats.getFormat(1,rDataSeries.getAttachedAxisIndex());
+else
+nNumberFormatKey = rDataSeries.detectNumberFormatKey(
nPointIndex );
}
if(nNumberFormatKey<0)
nNumberFormatKey=0;
diff --git a/chart2/source/view/inc/VDataSeries.hxx
b/chart2/source/view/inc/VDataSeries.hxx
index b65ea66f1009..4a20eb79bfea 100644
--- a/chart2/source/view/inc/VDataSeries.hxx
+++
[Libreoffice-commits] core.git: include/xmloff xmloff/inc xmloff/source
include/xmloff/ProgressBarHelper.hxx |2 include/xmloff/SinglePropertySetInfoCache.hxx|2 include/xmloff/XMLCharContext.hxx|2 include/xmloff/XMLFontAutoStylePool.hxx |2 include/xmloff/XMLFontStylesContext.hxx |2 include/xmloff/controlpropertyhdl.hxx|2 include/xmloff/i18nmap.hxx |4 - include/xmloff/numehelp.hxx |2 include/xmloff/prstylei.hxx |2 include/xmloff/shapeimport.hxx |2 include/xmloff/xmlement.hxx |8 +-- include/xmloff/xmlevent.hxx |2 include/xmloff/xmlexp.hxx|6 +- include/xmloff/xmlimp.hxx|2 include/xmloff/xmlimppr.hxx |2 include/xmloff/xmlnumfe.hxx |2 include/xmloff/xmlnumfi.hxx |4 - include/xmloff/xmlnumi.hxx |2 include/xmloff/xmlprcon.hxx |6 +- include/xmloff/xmlstyle.hxx |2 include/xmloff/xmltkmap.hxx |6 +- include/xmloff/xmluconv.hxx |2 xmloff/inc/MultiPropertySetHelper.hxx|2 xmloff/inc/WordWrapPropertyHdl.hxx |2 xmloff/inc/XMLBackgroundImageContext.hxx |2 xmloff/inc/XMLBitmapRepeatOffsetPropertyHandler.hxx |6 +- xmloff/inc/XMLClipPropertyHandler.hxx|2 xmloff/inc/XMLRectangleMembersHandler.hxx|2 xmloff/inc/XMLTextHeaderFooterContext.hxx|4 - xmloff/inc/animations.hxx|2 xmloff/inc/propimp0.hxx |2 xmloff/inc/txtfldi.hxx | 14 ++--- xmloff/inc/txtvfldi.hxx | 16 +++--- xmloff/source/chart/ColorPropertySet.hxx |2 xmloff/source/chart/SchXMLAxisContext.hxx|6 +- xmloff/source/chart/SchXMLChartContext.cxx |2 xmloff/source/chart/SchXMLChartContext.hxx | 12 ++-- xmloff/source/chart/SchXMLExport.cxx |4 - xmloff/source/chart/SchXMLImport.cxx |2 xmloff/source/chart/SchXMLPlotAreaContext.hxx| 12 ++-- xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx |4 - xmloff/source/chart/SchXMLSeries2Context.cxx |2 xmloff/source/chart/SchXMLSeries2Context.hxx |6 +- xmloff/source/chart/SchXMLTableContext.cxx |2 xmloff/source/chart/XMLAxisPositionPropertyHdl.hxx |2 xmloff/source/chart/XMLErrorIndicatorPropertyHdl.hxx |2 xmloff/source/chart/XMLSymbolTypePropertyHdl.cxx |4 - xmloff/source/chart/XMLSymbolTypePropertyHdl.hxx |2 xmloff/source/chart/transporttypes.hxx |2 xmloff/source/core/DocumentSettingsContext.cxx |2 xmloff/source/core/RDFaImportHelper.cxx |8 +-- xmloff/source/core/xmlerror.cxx | 14 ++--- xmloff/source/core/xmlexp.cxx|6 +- xmloff/source/core/xmlimp.cxx|2 xmloff/source/core/xmltoken.cxx |4 - xmloff/source/draw/EnhancedCustomShapeToken.cxx |2 xmloff/source/draw/XMLNumberStyles.cxx | 14 ++--- xmloff/source/draw/animexp.cxx |8 +-- xmloff/source/draw/sdpropls.hxx |4 - xmloff/source/draw/sdxmlexp.cxx |8 +-- xmloff/source/draw/sdxmlexp_impl.hxx |2 xmloff/source/draw/xexptran.cxx | 28 +-- xmloff/source/draw/ximpshap.hxx |2 xmloff/source/draw/ximpstyl.hxx |2 xmloff/source/forms/elementexport.hxx|6 +- xmloff/source/forms/gridcolumnproptranslator.cxx |4 - xmloff/source/forms/propertyimport.hxx |2 xmloff/source/script/xmlscripti.cxx |2 xmloff/source/style/PageHeaderFooterContext.hxx |4 - xmloff/source/style/PageMasterPropHdl.hxx|2
[Libreoffice-commits] core.git: xmlhelp/source
xmlhelp/source/cxxhelp/inc/tvread.hxx |2 +-
xmlhelp/source/cxxhelp/provider/content.cxx | 10 +-
xmlhelp/source/cxxhelp/provider/databases.hxx | 12 ++--
xmlhelp/source/cxxhelp/provider/db.hxx|2 +-
xmlhelp/source/cxxhelp/provider/resultsetbase.hxx |2 +-
xmlhelp/source/cxxhelp/provider/urlparameter.hxx |2 +-
6 files changed, 15 insertions(+), 15 deletions(-)
New commits:
commit 073817736f359821b668921cfad20c96943486bd
Author: Noel Grandin
AuthorDate: Mon Mar 16 09:24:00 2020 +0200
Commit: Noel Grandin
CommitDate: Mon Mar 16 10:29:56 2020 +0100
Revert "loplugin:constfields in xmlhelp"
This reverts commit 04e9a4c012f12dc26fda10aabb8d229555c711ab.
Change-Id: I2d1b44c84197d88bc58adf0280c8e1fd84795293
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90546
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/xmlhelp/source/cxxhelp/inc/tvread.hxx
b/xmlhelp/source/cxxhelp/inc/tvread.hxx
index 4753b9859930..fe529d3bfcfa 100644
--- a/xmlhelp/source/cxxhelp/inc/tvread.hxx
+++ b/xmlhelp/source/cxxhelp/inc/tvread.hxx
@@ -265,7 +265,7 @@ namespace treeview {
css::uno::Reference< css::ucb::XSimpleFileAccess3 > m_xSFA;
IteratorState
m_eState;
-OUString const
m_aLanguage;
+OUString
m_aLanguage;
css::uno::Sequence< css::uno::Reference
< css::deployment::XPackage > >
m_aUserPackagesSeq;
diff --git a/xmlhelp/source/cxxhelp/provider/content.cxx
b/xmlhelp/source/cxxhelp/provider/content.cxx
index 88ebe87bfece..4ad2c3fa78c8 100644
--- a/xmlhelp/source/cxxhelp/provider/content.cxx
+++ b/xmlhelp/source/cxxhelp/provider/content.cxx
@@ -134,9 +134,9 @@ private:
uno::Reference< uno::XComponentContext > m_xContext;
uno::Reference< ucb::XContentProvider > m_xProvider;
-uno::Sequence< beans::Property > const m_seq;
-URLParameter const m_aURLParameter;
-Databases* const m_pDatabases;
+uno::Sequence< beans::Property > m_seq;
+URLParameter m_aURLParameter;
+Databases* m_pDatabases;
public:
@@ -171,9 +171,9 @@ private:
uno::Reference< uno::XComponentContext > m_xContext;
uno::Reference< ucb::XContentProvider > m_xProvider;
-uno::Sequence< beans::Property > const m_seq;
+uno::Sequence< beans::Property > m_seq;
URLParameter m_aURLParameter;
-Databases* const m_pDatabases;
+Databases* m_pDatabases;
public:
diff --git a/xmlhelp/source/cxxhelp/provider/databases.hxx
b/xmlhelp/source/cxxhelp/provider/databases.hxx
index 3577b39d975f..6edf6a0ce78d 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.hxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.hxx
@@ -54,10 +54,10 @@ namespace chelp {
{
private:
-OUString const m_aStartId;
-OUString const m_aProgramSwitch;
-OUString const m_aTitle;
-int const m_nOrder;
+OUString m_aStartId;
+OUString m_aProgramSwitch;
+OUString m_aTitle;
+int m_nOrder;
public:
@@ -223,7 +223,7 @@ namespace chelp {
css::uno::Reference< css::lang::XMultiComponentFactory > m_xSMgr;
css::uno::Reference< css::ucb::XSimpleFileAccess3 > m_xSFA;
-bool const m_bShowBasic;
+bool m_bShowBasic;
std::vector m_vCustomCSSDoc;
OUString m_aCSS;
@@ -377,7 +377,7 @@ namespace chelp {
const css::uno::Reference< css::deployment::XPackage >& xPackage,
OUString* o_pExtensionPath, OUString* o_pExtensionRegistryPath );
-bool const
m_bHelpText;
+bool
m_bHelpText;
}; // end class DataBaseIterator
diff --git a/xmlhelp/source/cxxhelp/provider/db.hxx
b/xmlhelp/source/cxxhelp/provider/db.hxx
index ce7dbc29d15d..607b987ff838 100644
--- a/xmlhelp/source/cxxhelp/provider/db.hxx
+++ b/xmlhelp/source/cxxhelp/provider/db.hxx
@@ -51,7 +51,7 @@ namespace helpdatafileproxy {
class Hdf
{
-OUString const m_aFileURL;
+OUString m_aFileURL;
std::unique_ptr m_pStringToDataMap;
std::unique_ptr m_pStringToValPosMap;
css::uno::Reference< css::ucb::XSimpleFileAccess3 >
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx
b/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx
index
[Libreoffice-commits] online.git: android/app android/lib
android/app/src/main/java/org/libreoffice/androidapp/SettingsActivity.java
|3 ---
android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java
|8
android/app/src/main/res/menu/navigation_menu.xml
|4 ++--
android/app/src/main/res/values/strings.xml
|1 +
android/app/src/main/res/xml/libreoffice_preferences.xml
|9 -
android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
|8 +++-
android/lib/src/main/java/org/libreoffice/androidlib/SlideShowActivity.java
|5 -
7 files changed, 22 insertions(+), 16 deletions(-)
New commits:
commit 05198a9723dec59eeae6e4ba9f3a9856938acc21
Author: Jan Holesovsky
AuthorDate: Sat Mar 14 00:07:50 2020 +0100
Commit: Jan Holesovsky
CommitDate: Mon Mar 16 09:51:27 2020 +0100
android: Re-introduce Settings in the Navigation menu.
Contains only the ability to turn on the chrome://inspect debugging even
in the production builds.
Change-Id: I2acc4a13851ed8140cb5b95712a684a56f29dfa2
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90485
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Jan Holesovsky
diff --git
a/android/app/src/main/java/org/libreoffice/androidapp/SettingsActivity.java
b/android/app/src/main/java/org/libreoffice/androidapp/SettingsActivity.java
index 510979a7a..c51d098af 100644
--- a/android/app/src/main/java/org/libreoffice/androidapp/SettingsActivity.java
+++ b/android/app/src/main/java/org/libreoffice/androidapp/SettingsActivity.java
@@ -34,9 +34,6 @@ public class SettingsActivity extends AppCompatActivity {
if (!BuildConfig.DEBUG) {
findPreference("ENABLE_SHOW_DEBUG_INFO").setVisible(false);
}
-else {
-findPreference("ENABLE_CHROME_DEBUGGING").setVisible(false);
-}
}
@Override
diff --git
a/android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java
b/android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java
index c9989069a..1ef2acc45 100644
---
a/android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java
+++
b/android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java
@@ -272,14 +272,14 @@ public class LibreOfficeUIActivity extends
AppCompatActivity implements Settings
break;
*/
+case R.id.action_settings:
+startActivity(new Intent(getApplicationContext(),
SettingsActivity.class));
+return true;
+
case R.id.action_about:
AboutDialogFragment aboutDialogFragment = new
AboutDialogFragment();
aboutDialogFragment.show(getSupportFragmentManager(),
"AboutDialogFragment");
return true;
-
-/*case R.id.action_settings:
-startActivity(new Intent(getApplicationContext(),
SettingsActivity.class));
-return true;*/
}
return false;
}
diff --git a/android/app/src/main/res/menu/navigation_menu.xml
b/android/app/src/main/res/menu/navigation_menu.xml
index 55f86fcab..b89655b9f 100644
--- a/android/app/src/main/res/menu/navigation_menu.xml
+++ b/android/app/src/main/res/menu/navigation_menu.xml
@@ -48,10 +48,10 @@
android:title="@string/sort_oldest"/>
-
+
+ android:title="@string/action_settings"/>
diff --git a/android/app/src/main/res/values/strings.xml
b/android/app/src/main/res/values/strings.xml
index 663779278..29213c2df 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -17,6 +17,7 @@
List
Grid
File Manager Settings
+Editor Settings
Hidden Files/Folders
Enable to show hidden
files/folders
Select how to order files: A-Z, by size
or by date.
diff --git a/android/app/src/main/res/xml/libreoffice_preferences.xml
b/android/app/src/main/res/xml/libreoffice_preferences.xml
index 7ffdbd8dd..f8a3b14f5 100644
--- a/android/app/src/main/res/xml/libreoffice_preferences.xml
+++ b/android/app/src/main/res/xml/libreoffice_preferences.xml
@@ -1,7 +1,7 @@
http://schemas.android.com/apk/res/android;
xmlns:app="http://schemas.android.com/apk/res-auto;>
-
@@ -29,6 +29,13 @@
android:defaultValue="false"
app:iconSpaceReserved="false" />
+
+
+
+
https://developers.google.com/web/tools/chrome-devtools/remote-debugging/webviews
-if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-if ((getApplicationInfo().flags &
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk3/gtk3gtkframe.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit cc17485472ca4217013cebaa32f7b574c020a394 Author: Andrea Gelmini AuthorDate: Thu Feb 13 18:33:29 2020 +0100 Commit: Andras Timar CommitDate: Mon Mar 16 09:53:13 2020 +0100 Fix typo Change-Id: Iedeb55e5b907c6b837b0d70c2a17f6e23f824cd9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88626 Tested-by: Andras Timar Reviewed-by: Andras Timar diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx index 36b12d9742e1..d4c04ff0a88f 100644 --- a/vcl/unx/gtk3/gtk3gtkframe.cxx +++ b/vcl/unx/gtk3/gtk3gtkframe.cxx @@ -903,7 +903,7 @@ void GtkSalFrame::InitCommon() g_signal_connect_after( G_OBJECT(m_pWindow), "focus-in-event", G_CALLBACK(signalFocus), this ); g_signal_connect_after( G_OBJECT(m_pWindow), "focus-out-event", G_CALLBACK(signalFocus), this ); -if (GTK_IS_WINDOW(m_pWindow)) // i.e. not if its a GtkEventBox which doesn't have the signal +if (GTK_IS_WINDOW(m_pWindow)) // i.e. not if it's a GtkEventBox which doesn't have the signal g_signal_connect( G_OBJECT(m_pWindow), "set-focus", G_CALLBACK(signalSetFocus), this ); g_signal_connect( G_OBJECT(m_pWindow), "map-event", G_CALLBACK(signalMap), this ); g_signal_connect( G_OBJECT(m_pWindow), "unmap-event", G_CALLBACK(signalUnmap), this ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: android/app
android/app/src/main/AndroidManifest.xml |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 829ddbdbf3f4761473eb03c09657bb3079c99557 Author: Jan Holesovsky AuthorDate: Thu Mar 12 19:24:25 2020 +0100 Commit: Jan Holesovsky CommitDate: Mon Mar 16 09:52:02 2020 +0100 android: Make the app movable to the SD card. Change-Id: Ib5bfe6e4a403efa3e0ec294dadcfad6f410b6b1b Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90484 Tested-by: Jenkins CollaboraOffice Reviewed-by: Jan Holesovsky diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 79cea3f49..6912a0b57 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,6 +1,7 @@ http://schemas.android.com/apk/res/android; -package="org.libreoffice.androidapp"> +package="org.libreoffice.androidapp" +android:installLocation="auto"> https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sc/qa
sc/qa/uitest/calc_tests/data/tdf131291.ods |binary
sc/qa/uitest/chart/chartDataLabels.py | 75 +
2 files changed, 75 insertions(+)
New commits:
commit 285313d2703aadbcf4007523b94c832b99e7c12b
Author: Xisco Fauli
AuthorDate: Thu Mar 12 17:34:12 2020 +0100
Commit: Xisco Faulí
CommitDate: Mon Mar 16 10:36:20 2020 +0100
tdf#131291: Add UItest
Change-Id: I65aede1899d2c509fd52f8db0657ec3a5791f681
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90430
Tested-by: Jenkins
Reviewed-by: Xisco Faulí
Signed-off-by: Xisco Fauli
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90390
diff --git a/sc/qa/uitest/calc_tests/data/tdf131291.ods
b/sc/qa/uitest/calc_tests/data/tdf131291.ods
new file mode 100644
index ..76a87c2c226c
Binary files /dev/null and b/sc/qa/uitest/calc_tests/data/tdf131291.ods differ
diff --git a/sc/qa/uitest/chart/chartDataLabels.py
b/sc/qa/uitest/chart/chartDataLabels.py
index d1d1cf367a18..e4977c7bde8a 100644
--- a/sc/qa/uitest/chart/chartDataLabels.py
+++ b/sc/qa/uitest/chart/chartDataLabels.py
@@ -15,6 +15,8 @@ from uitest.debug import sleep
import org.libreoffice.unotest
import pathlib
+from com.sun.star.lang import Locale
+
def get_url_for_data_file(file_name):
return
pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri()
@@ -212,4 +214,77 @@ class chartDataLabels(UITestCase):
self.ui_test.close_dialog_through_button(xOKBtn)
self.ui_test.close_doc()
+
+ def test_tdf131291(self):
+calc_doc = self.ui_test.load_file(get_url_for_data_file("tdf131291.ods"))
+xCalcDoc = self.xUITest.getTopFocusWindow()
+gridwin = xCalcDoc.getChild("grid_window")
+document = self.ui_test.get_component()
+
+gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT": "Object 1"}))
+gridwin.executeAction("ACTIVATE", tuple())
+xChartMainTop = self.xUITest.getTopFocusWindow()
+xChartMain = xChartMainTop.getChild("chart_window")
+xSeriesObj = xChartMain.getChild("CID/D=0:CS=0:CT=0:Series=0")
+
+xDataSeries =
document.Sheets[0].Charts[0].getEmbeddedObject().getFirstDiagram().CoordinateSystems[0].ChartTypes[0].DataSeries
+self.assertTrue(xDataSeries[0].Label.ShowNumber)
+self.assertFalse(xDataSeries[0].Label.ShowNumberInPercent)
+
+self.ui_test.execute_dialog_through_action(xSeriesObj, "COMMAND",
mkPropertyValues({"COMMAND": "FormatDataLabels"}))
+xDialog = self.xUITest.getTopFocusWindow()
+
+xTabs = xDialog.getChild("tabcontrol")
+select_pos(xTabs, "1")
+
+self.assertTrue(xDataSeries[0].Label.ShowNumber)
+self.assertFalse(xDataSeries[0].Label.ShowNumberInPercent)
+
+xNumberFormatBtn = xDialog.getChild("PB_NUMBERFORMAT")
+
+def handle_number_dlg(dialog):
+categoryformat = dialog.getChild("categorylb")
+formatted = dialog.getChild("formatted")
+
+# Select currency
+categoryformat.getChild("4").executeAction("SELECT", tuple());
+
+self.assertEqual(get_state_as_dict(categoryformat)["SelectEntryText"],
"Currency")
+
+self.assertEqual(get_state_as_dict(formatted)["Text"],
"[$$-409]#,##0.00;[RED]-[$$-409]#,##0.00")
+
+xOKButton = dialog.getChild("ok")
+self.ui_test.close_dialog_through_button(xOKButton)
+
+self.ui_test.execute_blocking_action(xNumberFormatBtn.executeAction,
args=('CLICK', ()),
+dialog_handler=handle_number_dlg)
+
+xOKBtn = xDialog.getChild("ok")
+self.ui_test.close_dialog_through_button(xOKBtn)
+
+xNumberFormats =
document.Sheets[0].Charts[0].getEmbeddedObject().getNumberFormats()
+xLocale = Locale()
+xFormat =
xNumberFormats.queryKey("[$$-409]#,##0.00;[RED]-[$$-409]#,##0.00", xLocale,
True)
+
+self.assertTrue(xDataSeries[0].Label.ShowNumber)
+self.assertFalse(xDataSeries[0].Label.ShowNumberInPercent)
+self.assertEqual(xDataSeries[0].NumberFormat, xFormat)
+
+#reopen and verify the previous changes
+self.ui_test.execute_dialog_through_action(xSeriesObj, "COMMAND",
mkPropertyValues({"COMMAND": "FormatDataLabels"}))
+xDialog = self.xUITest.getTopFocusWindow()
+
+self.assertTrue(xDataSeries[0].Label.ShowNumber)
+self.assertFalse(xDataSeries[0].Label.ShowNumberInPercent)
+# tdf#131291: it would fail here: AssertionError: 0 != 104
+self.assertEqual(xDataSeries[0].NumberFormat, xFormat)
+
+xOKBtn = xDialog.getChild("ok")
+self.ui_test.close_dialog_through_button(xOKBtn)
+
+self.assertTrue(xDataSeries[0].Label.ShowNumber)
+self.assertFalse(xDataSeries[0].Label.ShowNumberInPercent)
+self.assertEqual(xDataSeries[0].NumberFormat, xFormat)
+self.ui_test.close_doc()
+
# vim: set shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source uui/source
sfx2/source/view/viewfrm.cxx |6 --
uui/source/iahndl-locking.cxx |9 +
2 files changed, 9 insertions(+), 6 deletions(-)
New commits:
commit 10136818b4ef138fc2d5ec3af194beffed009480
Author: Samuel Mehrbrodt
AuthorDate: Mon Mar 16 10:40:13 2020 +0100
Commit: Samuel Mehrbrodt
CommitDate: Mon Mar 16 11:55:23 2020 +0100
Some more places to check for AllowOverrideLocking option
Change-Id: Id09f691ef7e3fbae03771a43af1c7b1d940365bc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90554
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 3bf812e439a6..8616da00b358 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -169,13 +169,15 @@ private:
public:
SfxQueryOpenAsTemplate(weld::Window* pParent, bool bAllowIgnoreLock,
LockFileEntry& rLockData)
: m_xQueryBox(Application::CreateMessageDialog(pParent,
VclMessageType::Question,
- VclButtonsType::NONE,
-
QueryString(bAllowIgnoreLock, rLockData)))
+ VclButtonsType::NONE,
""))
{
m_xQueryBox->add_button(SfxResId(STR_QUERY_OPENASTEMPLATE_OPENCOPY_BTN),
RET_YES);
+bAllowIgnoreLock
+= bAllowIgnoreLock &&
officecfg::Office::Common::Misc::AllowOverrideLocking::get();
if (bAllowIgnoreLock)
m_xQueryBox->add_button(SfxResId(STR_QUERY_OPENASTEMPLATE_OPEN_BTN),
RET_IGNORE);
m_xQueryBox->add_button(GetStandardText( StandardButtonType::Cancel ),
RET_CANCEL);
+m_xQueryBox->set_primary_text(QueryString(bAllowIgnoreLock,
rLockData));
m_xQueryBox->set_default_response(RET_YES);
}
short run() { return m_xQueryBox->run(); }
diff --git a/uui/source/iahndl-locking.cxx b/uui/source/iahndl-locking.cxx
index 07a69699e9b8..52b9d2108347 100644
--- a/uui/source/iahndl-locking.cxx
+++ b/uui/source/iahndl-locking.cxx
@@ -79,13 +79,14 @@ handleLockedDocumentRequest_(
std::vector< OUString > aArguments;
aArguments.push_back( aDocumentURL );
+bool bAllowOverride = xRetry.is() &&
officecfg::Office::Common::Misc::AllowOverrideLocking::get();
+
sal_Int32 nResult = RET_CANCEL;
if ( nMode == UUI_DOC_LOAD_LOCK )
{
aArguments.push_back( !aInfo.isEmpty()
? aInfo
: Translate::get( STR_UNKNOWNUSER, aResLocale) );
-bool bAllowOverride = xRetry.is() &&
officecfg::Office::Common::Misc::AllowOverrideLocking::get();
aArguments.push_back( bAllowOverride
? Translate::get(
STR_OPENLOCKED_ALLOWIGNORE_MSG, aResLocale )
: "" );
@@ -93,7 +94,7 @@ handleLockedDocumentRequest_(
aMessage = UUIInteractionHelper::replaceMessageWithArguments(
aMessage, aArguments );
-OpenLockedQueryBox aDialog(pParent, aResLocale, aMessage, xRetry.is());
+OpenLockedQueryBox aDialog(pParent, aResLocale, aMessage,
bAllowOverride);
nResult = aDialog.run();
}
else if ( nMode == UUI_DOC_SAVE_LOCK )
@@ -102,12 +103,12 @@ handleLockedDocumentRequest_(
? aInfo
: Translate::get( STR_UNKNOWNUSER,
aResLocale ) );
-aMessage = Translate::get(xRetry.is() ? STR_OVERWRITE_IGNORELOCK_MSG :
STR_TRYLATER_MSG,
+aMessage = Translate::get(bAllowOverride ?
STR_OVERWRITE_IGNORELOCK_MSG : STR_TRYLATER_MSG,
aResLocale);
aMessage = UUIInteractionHelper::replaceMessageWithArguments(
aMessage, aArguments );
-TryLaterQueryBox aDialog(pParent, aResLocale, aMessage, xRetry.is());
+TryLaterQueryBox aDialog(pParent, aResLocale, aMessage,
bAllowOverride);
nResult = aDialog.run();
}
else if ( nMode == UUI_DOC_OWN_LOAD_LOCK ||
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: common/Session.cpp net/Socket.hpp net/WebSocketHandler.hpp wsd/DocumentBroker.cpp wsd/LOOLWSD.cpp
common/Session.cpp |2 +-
net/Socket.hpp |4 ++--
net/WebSocketHandler.hpp |6 +++---
wsd/DocumentBroker.cpp |2 +-
wsd/LOOLWSD.cpp |4 ++--
5 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit cd42700054646d6f9c2bc89769fb9e05f829776c
Author: Miklos Vajna
AuthorDate: Mon Mar 16 10:34:12 2020 +0100
Commit: Miklos Vajna
CommitDate: Mon Mar 16 11:55:19 2020 +0100
Rework the somewhat odd sendTextMessage() interface
It took both an std::string and a length. Take a char* and a length
instead.
Change-Id: Id37dfa67fe1baae09b69819680848a0a8a1d80ed
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90552
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Miklos Vajna
diff --git a/common/Session.cpp b/common/Session.cpp
index 15dbe86d7..d24b615a9 100644
--- a/common/Session.cpp
+++ b/common/Session.cpp
@@ -221,7 +221,7 @@ void Session::shutdown(bool goingAway, const std::string&
statusMessage)
{
// skip the queue; FIXME: should we flush SessionClient's queue ?
std::string closeMsg = "close: " + statusMessage;
-_protocol->sendTextMessage(closeMsg, closeMsg.size());
+_protocol->sendTextMessage(closeMsg.c_str(), closeMsg.size());
_protocol->shutdown(goingAway, statusMessage);
}
}
diff --git a/net/Socket.hpp b/net/Socket.hpp
index 1e632516e..a6395b9b4 100644
--- a/net/Socket.hpp
+++ b/net/Socket.hpp
@@ -395,7 +395,7 @@ public:
/// Clear all external references
virtual void dispose() { _msgHandler.reset(); }
-virtual int sendTextMessage(const std::string , const size_t len, bool
flush = false) const = 0;
+virtual int sendTextMessage(const char* msg, const size_t len, bool flush
= false) const = 0;
virtual int sendBinaryMessage(const char *data, const size_t len, bool
flush = false) const = 0;
virtual void shutdown(bool goingAway = false, const std::string
= "") = 0;
@@ -410,7 +410,7 @@ class SimpleSocketHandler : public ProtocolHandlerInterface
{
public:
SimpleSocketHandler() {}
-int sendTextMessage(const std::string &, const size_t, bool) const
override { return 0; }
+int sendTextMessage(const char*, const size_t, bool) const override {
return 0; }
int sendBinaryMessage(const char *, const size_t , bool ) const override
{ return 0; }
void shutdown(bool, const std::string &) override {}
void getIOStats(uint64_t &, uint64_t &) override {}
diff --git a/net/WebSocketHandler.hpp b/net/WebSocketHandler.hpp
index 3a01fea17..43d710ea4 100644
--- a/net/WebSocketHandler.hpp
+++ b/net/WebSocketHandler.hpp
@@ -519,13 +519,13 @@ public:
/// Sends a WebSocket Text message.
int sendMessage(const std::string& msg) const
{
-return sendTextMessage(msg, msg.size());
+return sendTextMessage(msg.c_str(), msg.size());
}
/// Implementation of the ProtocolHandlerInterface.
-int sendTextMessage(const std::string , const size_t len, bool flush =
false) const override
+int sendTextMessage(const char* msg, const size_t len, bool flush = false)
const override
{
-return sendMessage(msg.data(), len, WSOpCode::Text, flush);
+return sendMessage(msg, len, WSOpCode::Text, flush);
}
/// Implementation of the ProtocolHandlerInterface.
diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 8b0c883c0..8c229fd18 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -1512,7 +1512,7 @@ std::shared_ptr
DocumentBroker::createNewClientSession(
{
const std::string statusReady = "statusindicator: ready";
LOG_TRC("Sending to Client [" << statusReady << "].");
-ws->sendTextMessage(statusReady, statusReady.size());
+ws->sendTextMessage(statusReady.c_str(), statusReady.size());
}
// In case of WOPI, if this session is not set as readonly, it might
be set so
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index a06687788..ecceaca34 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -1763,7 +1763,7 @@ static std::shared_ptr
{
LOG_WRN("DocBroker with docKey [" << docKey << "] that is marked
to be destroyed. Rejecting client request.");
std::string msg("error: cmd=load kind=docunloading");
-proto->sendTextMessage(msg, msg.size());
+proto->sendTextMessage(msg.data(), msg.size());
proto->shutdown(true, "error: cmd=load kind=docunloading");
return nullptr;
}
@@ -1782,7 +1782,7 @@ static std::shared_ptr
// Indicate to the client that we're connecting to the docbroker.
const std::string statusConnect = "statusindicator: connect";
LOG_TRC("Sending to Client [" << statusConnect << "].");
-proto->sendTextMessage(statusConnect, statusConnect.size());
+proto->sendTextMessage(statusConnect.data(), statusConnect.size());
if
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/draw/ximpshap.cxx |7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
New commits:
commit 6ddec950dc642dcf07956cce42c450a0b775963f
Author: Stephan Bergmann
AuthorDate: Wed Mar 11 16:06:05 2020 +0100
Commit: Stephan Bergmann
CommitDate: Mon Mar 16 10:14:35 2020 +0100
Avoid -Werror=maybe-uninitialized
...as seen at least with GCC 10 trunk and --enable-optimized, when
bMirroredX/Y
were used without checking that reading them with >>= had succeeded.
Assuming that in this code (added with
b4a6977e05d87fe0a79b266ec30e4f403404f1b4
"tdf#129532 tdf#98839 fixes for mirror of custom shapes") it cannot be
guaranteed that rItem.Value is of the right type (so o3tl::forceAccess,
which
uses assert to verify the right type, would not be appropriate), but that
it is
an exception-worthy error if rItem.Value is not of the right type (so
o3tl::doAccess, which throws a css::uno::RuntimeException upon a wrong
type, is
appropriate).
Change-Id: Ibe6991d69a1d6a0c2c41c839c240050a6355e98b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90337
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index 99a5d313f1b5..fdfbbc2562a8 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -87,6 +87,7 @@
#include
#include
#include
+#include
#include
using namespace ::com::sun::star;
@@ -3774,8 +3775,7 @@ void SdXMLCustomShapeContext::EndElement()
if (aI != maCustomShapeGeometry.end())
{
beans::PropertyValue& rItem = *aI;
-bool bMirroredX;
-rItem.Value >>= bMirroredX;
+bool bMirroredX = *o3tl::doAccess(rItem.Value);
rItem.Value <<= !bMirroredX;
rItem.Handle = -1;
rItem.State = beans::PropertyState_DIRECT_VALUE;
@@ -3801,8 +3801,7 @@ void SdXMLCustomShapeContext::EndElement()
if (aI != maCustomShapeGeometry.end())
{
beans::PropertyValue& rItem = *aI;
-bool bMirroredY;
-rItem.Value >>= bMirroredY;
+bool bMirroredY = *o3tl::doAccess(rItem.Value);
rItem.Value <<= !bMirroredY;
rItem.Handle = -1;
rItem.State = beans::PropertyState_DIRECT_VALUE;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/externalrefmgr.hxx|1 -
sc/source/filter/xml/XMLCodeNameProvider.hxx |2 --
2 files changed, 3 deletions(-)
New commits:
commit bbdb751a10d6a9dc38f391559fa654fa554539a8
Author: Stephan Bergmann
AuthorDate: Mon Mar 16 10:37:26 2020 +0100
Commit: Stephan Bergmann
CommitDate: Mon Mar 16 11:28:27 2020 +0100
-Werror,-Wunused-private-field
Appears to be a mis-merge of 9d4c36d7914e2746a751a56de01063c9159f0f99
"Revert
'loplugin:constfields in sc'".
Change-Id: I69a51cdc95fe0a2741b469d2400af51713c6afe3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90553
Reviewed-by: Noel Grandin
Reviewed-by: Stephan Bergmann
Tested-by: Jenkins
diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx
index 835ddd106bf4..368ceb4385fd 100644
--- a/sc/inc/externalrefmgr.hxx
+++ b/sc/inc/externalrefmgr.hxx
@@ -71,7 +71,6 @@ private:
ScExternalRefLink(const ScExternalRefLink&) = delete;
sal_uInt16 mnFileId;
-OUStringmaFilterName;
ScDocument* mpDoc;
boolmbDoRefresh;
};
diff --git a/sc/source/filter/xml/XMLCodeNameProvider.hxx
b/sc/source/filter/xml/XMLCodeNameProvider.hxx
index aded4b411a0a..b04abe5c3c6b 100644
--- a/sc/source/filter/xml/XMLCodeNameProvider.hxx
+++ b/sc/source/filter/xml/XMLCodeNameProvider.hxx
@@ -30,8 +30,6 @@ class ScDocument;
class XMLCodeNameProvider : public ::cppu::WeakImplHelper<
css::container::XNameAccess >
{
ScDocument* mpDoc;
-OUString msDocName;
-OUString msCodeNameProp;
static bool _getCodeName( const css::uno::Any& aAny,
OUString& rCodeName );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Your presentation on LibreOffice code
Hi Arvind, Am 15.03.20 um 17:15 schrieb Arvind Kumar: [some text about modifying the key handling in gtk3] I don't think you're on the right track. In theory you should be able to create a keyboard mapping with your special characters, so the keypress is translated to the correct key code. If you want to generate single glyphs from multiple keystrokes, then you should have a look into input method handling (IM), like ibus or fcitx, which is normally used to type complex-glyph based languages, like Chinese. OTOH, since you're using Private Use Area (PUA) codes, this won't work well, if other software doesn't use your font, as PUAs - per definition - can't have fallbacks in other fonts, as they are font specific. But it should work just fine with any LO document type, if you select your font, which already shows up in LO. > The other problem I had when I hard coded the value of nGlyphIndex is > that the cursor does not move all the way to the end of the glyph but is > in the center of the glyph so that the next keystroke results in an > overlap of the right half of the glyph with the left half of the next > glyph. This is the case only with the glyph in the font file I > generated. Note that I have used my fontfile with other programs written > using Gtk+ and they work fine. Hard to say, if this is a general problem of your font or a bug in LO or just caused by your changes to the VCL gtk3 plugin key handling code in LO. If you have some other working example document, like a UTF-8 encoded text file, which you know is displayed correctly in some Gtk application, than you could copy and paste that text into Writer and then select your font. That should already work, without any code changes. If not, please open a bug report at https://bugs.documentfoundation.org/ > Any ideas would be appreciated. Quoting your old mail: > This is needed for some Indian languages. Maybe try contact either people from unicode.org or icu-project.org? They should eventually be able to assign some code point ranges for your language / glyphs, so other programs can also represent your glyphs correctly. I have no idea, how the unicode people work, but especially if you have an actively used language, that would be my way to go. HTH Jan-Marek ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: officecfg/registry uui/source
officecfg/registry/schema/org/openoffice/Office/Common.xcs |6 ++
uui/source/iahndl-locking.cxx |4 +++-
uui/source/openlocked.cxx |3 ++-
3 files changed, 11 insertions(+), 2 deletions(-)
New commits:
commit 3621c927b4555cb437fb89d28473228cb5d8e11a
Author: Samuel Mehrbrodt
AuthorDate: Thu Mar 12 16:26:23 2020 +0100
Commit: Samuel Mehrbrodt
CommitDate: Mon Mar 16 08:44:15 2020 +0100
Add option to disallow opening files locked by other users
Change-Id: I316b80a56b0d6dcb257fbc805fbac3afc93472ae
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90425
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index b217416756da..e7c339e2e22e 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -5499,6 +5499,12 @@
true
+
+
+ Whether the user can open a file for editing although it has
been locked by another user.
+
+true
+
Determines if a warning dialog should be
diff --git a/uui/source/iahndl-locking.cxx b/uui/source/iahndl-locking.cxx
index f4297754d6b5..07a69699e9b8 100644
--- a/uui/source/iahndl-locking.cxx
+++ b/uui/source/iahndl-locking.cxx
@@ -31,6 +31,7 @@
#include
#include
+#include
#include
#include "getcontinuations.hxx"
@@ -84,7 +85,8 @@ handleLockedDocumentRequest_(
aArguments.push_back( !aInfo.isEmpty()
? aInfo
: Translate::get( STR_UNKNOWNUSER, aResLocale) );
-aArguments.push_back( xRetry.is()
+bool bAllowOverride = xRetry.is() &&
officecfg::Office::Common::Misc::AllowOverrideLocking::get();
+aArguments.push_back( bAllowOverride
? Translate::get(
STR_OPENLOCKED_ALLOWIGNORE_MSG, aResLocale )
: "" );
aMessage = Translate::get(STR_OPENLOCKED_MSG, aResLocale);
diff --git a/uui/source/openlocked.cxx b/uui/source/openlocked.cxx
index eb50450adc86..fa2a4616c7c1 100644
--- a/uui/source/openlocked.cxx
+++ b/uui/source/openlocked.cxx
@@ -19,6 +19,7 @@
#include
#include "openlocked.hxx"
+#include
#include
#include
#include
@@ -29,7 +30,7 @@ OpenLockedQueryBox::OpenLockedQueryBox(weld::Window* pParent,
const std::locale&
m_xQueryBox->set_title(Translate::get(STR_OPENLOCKED_TITLE, rResLocale));
m_xQueryBox->add_button(Translate::get(STR_OPENLOCKED_OPENREADONLY_BTN,
rResLocale), RET_YES);
m_xQueryBox->add_button(Translate::get(STR_OPENLOCKED_OPENCOPY_BTN,
rResLocale), RET_NO);
-if (bEnableOverride)
+if (bEnableOverride &&
officecfg::Office::Common::Misc::AllowOverrideLocking::get())
{
// Present option to ignore the (stale?) lock file and open the
document
m_xQueryBox->add_button(Translate::get(STR_ALREADYOPEN_OPEN_BTN,
rResLocale), RET_IGNORE);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/unotools unotools/source unoxml/source uui/source
include/unotools/configitem.hxx |2 +-
include/unotools/intlwrapper.hxx|2 +-
include/unotools/streamhelper.hxx |2 +-
include/unotools/tempfile.hxx |2 +-
include/unotools/transliterationwrapper.hxx |2 +-
include/unotools/viewoptions.hxx|4 ++--
unotools/source/config/configvaluecontainer.cxx |2 +-
unotools/source/config/defaultoptions.cxx |4 ++--
unotools/source/config/fontcfg.cxx |8
unotools/source/config/lingucfg.cxx |2 +-
unotools/source/config/pathoptions.cxx |4 ++--
unotools/source/config/viewoptions.cxx |2 +-
unotools/source/misc/wincodepage.cxx| 12 ++--
unoxml/source/dom/document.cxx |2 +-
unoxml/source/rdf/librdf_repository.cxx |2 +-
uui/source/fltdlg.cxx |2 +-
uui/source/logindlg.hxx |4 ++--
uui/source/passworddlg.hxx |2 +-
18 files changed, 30 insertions(+), 30 deletions(-)
New commits:
commit 6d40302d89e1a72841c8a64733c7a26080a65cb8
Author: Noel Grandin
AuthorDate: Sun Mar 15 18:31:45 2020 +0200
Commit: Noel Grandin
CommitDate: Mon Mar 16 08:21:14 2020 +0100
Revert "loplugin:constfields in unotools..uui"
This reverts commit d8ac55e3e53564aca4b0bade5a5b5cb01b4519b1.
Change-Id: Ib7cf67d5d0b7780dfde9453cdddb8f11ca5d3a6a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90542
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/unotools/configitem.hxx b/include/unotools/configitem.hxx
index edeaf03af55c..16153e20715f 100644
--- a/include/unotools/configitem.hxx
+++ b/include/unotools/configitem.hxx
@@ -74,7 +74,7 @@ namespace utl
m_xHierarchyAccess;
css::uno::Reference< css::util::XChangesListener >
xChangeLstnr;
-ConfigItemMode const m_nMode;
+ConfigItemMode m_nMode;
boolm_bIsModified;
boolm_bEnableInternalNotification;
sal_Int16 m_nInValueChange;
diff --git a/include/unotools/intlwrapper.hxx b/include/unotools/intlwrapper.hxx
index 47ded1a273a9..8a893eb78aad 100644
--- a/include/unotools/intlwrapper.hxx
+++ b/include/unotools/intlwrapper.hxx
@@ -50,7 +50,7 @@ class LocaleDataWrapper;
class UNOTOOLS_DLLPUBLIC IntlWrapper
{
private:
-LanguageTag const maLanguageTag;
+LanguageTag maLanguageTag;
css::uno::Reference< css::uno::XComponentContext > m_xContext;
std::unique_ptr pLocaleData;
diff --git a/include/unotools/streamhelper.hxx
b/include/unotools/streamhelper.hxx
index 5b2b7f762157..05c5a5b45e84 100644
--- a/include/unotools/streamhelper.hxx
+++ b/include/unotools/streamhelper.hxx
@@ -38,7 +38,7 @@ class UNOTOOLS_DLLPUBLIC OInputStreamHelper final : public
cppu::WeakImplHelper<
::osl::Mutexm_aMutex;
SvLockBytesRef m_xLockBytes;
sal_uInt64 m_nActPos;
-sal_Int32 const m_nAvailable; // this is typically the
chunk(buffer) size
+sal_Int32 m_nAvailable; // this is typically the chunk(buffer) size
public:
OInputStreamHelper(const SvLockBytesRef& _xLockBytes,
diff --git a/include/unotools/tempfile.hxx b/include/unotools/tempfile.hxx
index b20a4f2fdf40..60ae7710c59c 100644
--- a/include/unotools/tempfile.hxx
+++ b/include/unotools/tempfile.hxx
@@ -48,7 +48,7 @@ class UNOTOOLS_DLLPUBLIC TempFile
OUStringaName;
std::unique_ptr
pStream;
-bool constbIsDirectory;
+boolbIsDirectory;
boolbKillingFileEnabled;
public:
diff --git a/include/unotools/transliterationwrapper.hxx
b/include/unotools/transliterationwrapper.hxx
index 882975bac2a5..a87cf29ca32c 100644
--- a/include/unotools/transliterationwrapper.hxx
+++ b/include/unotools/transliterationwrapper.hxx
@@ -43,7 +43,7 @@ class UNOTOOLS_DLLPUBLIC TransliterationWrapper
{
css::uno::Reference< css::i18n::XExtendedTransliteration > xTrans;
LanguageTag aLanguageTag;
-TransliterationFlags const nType;
+TransliterationFlags nType;
mutable bool bFirstCall;
TransliterationWrapper( const TransliterationWrapper& ) = delete;
diff --git a/include/unotools/viewoptions.hxx b/include/unotools/viewoptions.hxx
index 461e5ead6e26..8eb088077b54 100644
--- a/include/unotools/viewoptions.hxx
+++ b/include/unotools/viewoptions.hxx
@@ -234,8 +234,8 @@ class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC SvtViewOptions
final : public utl::deta
/// specify which list of views in configuration is used! This can't
be a static value!!!
/// ... because we need this value to work with right static data
container.
-EViewType
[Libreoffice-commits] core.git: include/vbahelper vbahelper/source
include/vbahelper/vbacollectionimpl.hxx |2 +-
include/vbahelper/vbadialogbase.hxx |2 +-
include/vbahelper/vbadocumentsbase.hxx |2 +-
include/vbahelper/vbaeventshelperbase.hxx|4 ++--
include/vbahelper/vbafontbase.hxx|2 +-
include/vbahelper/vbahelper.hxx |6 +++---
include/vbahelper/vbashape.hxx |2 +-
vbahelper/source/msforms/vbacontrol.cxx |4 ++--
vbahelper/source/msforms/vbacontrols.cxx |4 ++--
vbahelper/source/msforms/vbacontrols.hxx |4 ++--
vbahelper/source/msforms/vbalistcontrolhelper.cxx|4 ++--
vbahelper/source/msforms/vbamultipage.cxx|2 +-
vbahelper/source/msforms/vbatextbox.hxx |2 +-
vbahelper/source/vbahelper/vbacolorformat.hxx|2 +-
vbahelper/source/vbahelper/vbacommandbar.hxx |4 ++--
vbahelper/source/vbahelper/vbacommandbarcontrol.hxx |2 +-
vbahelper/source/vbahelper/vbacommandbarcontrols.hxx |2 +-
17 files changed, 25 insertions(+), 25 deletions(-)
New commits:
commit 1133c399ff7a5d33c5351f776cc24d3b48592eba
Author: Noel Grandin
AuthorDate: Sun Mar 15 18:32:13 2020 +0200
Commit: Noel Grandin
CommitDate: Mon Mar 16 08:17:02 2020 +0100
Revert "loplugin:constfields in vbahelper"
This reverts commit cc34b5a4c2d231de3882508654f15765d29f44c9.
Change-Id: I891826d88dd4e8bc8e6896889f4c1880c798080f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90543
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/vbahelper/vbacollectionimpl.hxx
b/include/vbahelper/vbacollectionimpl.hxx
index 05c9e37bf638..73058d0f4b7c 100644
--- a/include/vbahelper/vbacollectionimpl.hxx
+++ b/include/vbahelper/vbacollectionimpl.hxx
@@ -238,7 +238,7 @@ typedef InheritedHelperInterfaceImpl< Ifc... > BaseColBase;
protected:
css::uno::Reference< css::container::XIndexAccess > m_xIndexAccess;
css::uno::Reference< css::container::XNameAccess > m_xNameAccess;
-bool const mbIgnoreCase;
+bool mbIgnoreCase;
/// @throws css::uno::RuntimeException
virtual css::uno::Any getItemByStringIndex( const OUString& sIndex )
diff --git a/include/vbahelper/vbadialogbase.hxx
b/include/vbahelper/vbadialogbase.hxx
index c5578f10d009..4c7a2636917a 100644
--- a/include/vbahelper/vbadialogbase.hxx
+++ b/include/vbahelper/vbadialogbase.hxx
@@ -45,7 +45,7 @@ typedef InheritedHelperInterfaceWeakImpl< ov::XDialogBase >
VbaDialogBase_BASE;
class VBAHELPER_DLLPUBLIC VbaDialogBase : public VbaDialogBase_BASE
{
protected:
-sal_Int32 const mnIndex;
+sal_Int32 mnIndex;
css::uno::Reference< css::frame::XModel > m_xModel;
public:
VbaDialogBase( const css::uno::Reference< ov::XHelperInterface >& xParent,
const css::uno::Reference< css::uno::XComponentContext >& xContext, const
css::uno::Reference< css::frame::XModel >& xModel, sal_Int32 nIndex
):VbaDialogBase_BASE( xParent, xContext ), mnIndex( nIndex ), m_xModel( xModel
) {}
diff --git a/include/vbahelper/vbadocumentsbase.hxx
b/include/vbahelper/vbadocumentsbase.hxx
index 6530d734a0c9..ac6d316a0256 100644
--- a/include/vbahelper/vbadocumentsbase.hxx
+++ b/include/vbahelper/vbadocumentsbase.hxx
@@ -56,7 +56,7 @@ public:
};
private:
-DOCUMENT_TYPE const meDocType;
+DOCUMENT_TYPE meDocType;
public:
/// @throws css::uno::RuntimeException
diff --git a/include/vbahelper/vbaeventshelperbase.hxx
b/include/vbahelper/vbaeventshelperbase.hxx
index f1bf3a805da9..91c8bf72c7c5 100644
--- a/include/vbahelper/vbaeventshelperbase.hxx
+++ b/include/vbahelper/vbaeventshelperbase.hxx
@@ -119,8 +119,8 @@ protected:
struct EventQueueEntry
{
-sal_Int32 const mnEventId;
-css::uno::Sequence< css::uno::Any > const maArgs;
+sal_Int32 mnEventId;
+css::uno::Sequence< css::uno::Any > maArgs;
/*implicit*/ EventQueueEntry( sal_Int32 nEventId ) : mnEventId(
nEventId ) {}
EventQueueEntry( sal_Int32 nEventId, const css::uno::Sequence<
css::uno::Any >& rArgs ) : mnEventId( nEventId ), maArgs( rArgs ) {}
};
diff --git a/include/vbahelper/vbafontbase.hxx
b/include/vbahelper/vbafontbase.hxx
index d12e13ddfbf1..32c8270e1783 100644
--- a/include/vbahelper/vbafontbase.hxx
+++ b/include/vbahelper/vbafontbase.hxx
@@ -47,7 +47,7 @@ class VBAHELPER_DLLPUBLIC VbaFontBase : public
VbaFontBase_BASE
protected:
css::uno::Reference< css::beans::XPropertySet > mxFont;
css::uno::Reference< css::container::XIndexAccess > mxPalette;
-bool const mbFormControl;
+bool mbFormControl;
public:
// use local constants there is no need to expose these constants
diff --git a/include/vbahelper/vbahelper.hxx b/include/vbahelper/vbahelper.hxx
index d130c4e6ea1c..f56b34730c08 100644
--- a/include/vbahelper/vbahelper.hxx
+++ b/include/vbahelper/vbahelper.hxx
@@
Parallel building of nss with gyp+ninja (Re: Tracing where build time is spent)
On Monday 17 of February 2020, Luboš Luňák wrote: > On Monday 17 of February 2020, Jan-Marek Glogowski wrote: > > From > > https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/Building: > > > > "Ideally, also install gyp and ninja and put them on your path. This is > > recommended, as the build is faster and more reliable." > > > > I had the impression, that just the gyp and ninja build supports > > parallel build currently. > > I've tried it, and yes, it builds so much faster. On Linux it's easy, on > Windows it seems to require something called MozillaBuild, which is an .exe > installer of all kinds of Unix tools. I've eventually managed to get nss to > build with gyp+ninja even on Windows with this, but I'll need to look more > into it to get it to build with gbuild. Still, I think this is the way to > go. FWIW, this is now in gerrit as https://gerrit.libreoffice.org/c/core/+/90115 and the follow-up patches. It currently doesn't build in Jenkins, as it is still pending on buildbots getting updated to the latest LODE. -- Luboš Luňák l.lu...@collabora.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] online.git: cypress_test/integration_tests
cypress_test/integration_tests/mobile/calc/focus_spec.js |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 4c57f43d60389b0368afc02394ff68411abeb49e
Author: Tamás Zolnai
AuthorDate: Mon Mar 16 12:31:19 2020 +0100
Commit: Tamás Zolnai
CommitDate: Mon Mar 16 12:31:38 2020 +0100
cypress: mobile: skip this unstable test.
Change-Id: Ie9f78fd2bc50bd153a490271322236b2c5a3bf6d
diff --git a/cypress_test/integration_tests/mobile/calc/focus_spec.js
b/cypress_test/integration_tests/mobile/calc/focus_spec.js
index 5b3136698..a4a457bc6 100644
--- a/cypress_test/integration_tests/mobile/calc/focus_spec.js
+++ b/cypress_test/integration_tests/mobile/calc/focus_spec.js
@@ -48,7 +48,7 @@ describe('Calc focus tests', function() {
.should('be.eq', 'clipboard');
});
- it('Focus on second tap.', function() {
+ it.skip('Focus on second tap.', function() {
// Click on edit button
cy.get('#mobile-edit-button').click();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3cee74b9411f808508ad400b822da4f15110b7e2 Author: Christian Lohmaier AuthorDate: Mon Mar 16 13:16:32 2020 +0100 Commit: Gerrit Code Review CommitDate: Mon Mar 16 13:16:32 2020 +0100 Update git submodules * Update translations from branch 'master' to 7b4a46ae144ea71701de6d479c3c6ef74610e52c - update translations for master and force-fix errors using pocheck Change-Id: I71b810540431152e930de7cfd52e82fb3352603c diff --git a/translations b/translations index 610e3f90e150..7b4a46ae144e 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 610e3f90e150d90bd5305f53d5e39f111f197d4f +Subproject commit 7b4a46ae144ea71701de6d479c3c6ef74610e52c ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/ooxmlexport5.cxx |6 ++
writerfilter/source/dmapper/SettingsTable.cxx | 17 +
2 files changed, 23 insertions(+)
New commits:
commit 53f099c842d39266a0b4786a1af3db5628746634
Author: Justin Luth
AuthorDate: Thu Mar 12 21:44:57 2020 +0300
Commit: Miklos Vajna
CommitDate: Mon Mar 16 14:01:08 2020 +0100
tdf#131304 .docx: provide default compatibilityMode value
When a docx is imported without specifying a compat mode,
populate the appropriate compatibilityMode setting,
which will be written out at save time.
"12: Use word processing features specified in ECMA-376.
This is the default."
The immediate benefit for LO is that this will provide a
cacheable result - instead of repeated lookup attempts
for something that doesn't exist.
Perhaps more importantly, it paves the way
for allowing LO to export new documents
as compatible with 2013, while leaving existing
documents at their current level.
Both Word and LO treat the missing compatSetting
correctly as mode 12, so this should not have any
affect on layout or any other compatibility aspect.
Therefore I can't see any reason why
it shouldn't be explicitly written.
MS Word also writes it out on a round-trip.
Writing it out doesn't limit us in any way either.
As soon as it is in docx format, it will be treated
as mode 12 anyway, so why not make it explicit?
Well, I guess that since MS Word has
been filling this in since 2010 at least, we
could "assume" that if it is missing and has been
modified in the past 5 years it was
created by LO and thus treat it differently,
contrary to standard. But that doesn't seem
like a very good idea at all.
Change-Id: If68cecc14bf4446c5ca25fd2dd6eebddf8d954a1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90439
Tested-by: Jenkins
Reviewed-by: Justin Luth
Reviewed-by: Mike Kaganski
Reviewed-by: Miklos Vajna
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
index 2e7fa5962fb8..470e47714940 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
@@ -1007,6 +1007,12 @@ DECLARE_OOXMLEXPORT_TEST(tdf89991_revisionView,
"tdf89991.docx")
{
assertXPath(pXmlSettings, "/w:settings/w:revisionView", "insDel",
"0");
assertXPath(pXmlSettings, "/w:settings/w:revisionView", "formatting",
"0");
+
+// There was no compatibilityMode defined.
+// 12: Use word processing features specified in ECMA-376. This is the
default.
+assertXPath(pXmlSettings, "/w:settings/w:compat/w:compatSetting[1]",
"name", "compatibilityMode");
+assertXPath(pXmlSettings, "/w:settings/w:compat/w:compatSetting[1]",
"uri", "http://schemas.microsoft.com/office/word;);
+assertXPath(pXmlSettings, "/w:settings/w:compat/w:compatSetting[1]",
"val", "12");
}
}
diff --git a/writerfilter/source/dmapper/SettingsTable.cxx
b/writerfilter/source/dmapper/SettingsTable.cxx
index 7028f06e7fe9..71bff9b68dab 100644
--- a/writerfilter/source/dmapper/SettingsTable.cxx
+++ b/writerfilter/source/dmapper/SettingsTable.cxx
@@ -29,6 +29,7 @@
#include
#include
#include
+#include
#include
#include
#include "ConversionHelper.hxx"
@@ -683,6 +684,22 @@ uno::Sequence const &
SettingsTable::GetThemeFontLangPrope
uno::Sequence SettingsTable::GetCompatSettings() const
{
+if ( GetWordCompatibilityMode() == -1 )
+{
+// the default value for an undefined compatibilityMode is 12 (Word
2007)
+uno::Sequence aCompatSetting(
comphelper::InitPropertySequence({
+{ "name", uno::Any(OUString("compatibilityMode")) },
+{ "uri",
uno::Any(OUString("http://schemas.microsoft.com/office/word;)) },
+{ "val", uno::Any(OUString("12")) } //12: Use word processing
features specified in ECMA-376. This is the default.
+}));
+
+beans::PropertyValue aValue;
+aValue.Name = "compatSetting";
+aValue.Value <<= aCompatSetting;
+
+m_pImpl->m_aCompatSettings.push_back(aValue);
+}
+
return comphelper::containerToSequence(m_pImpl->m_aCompatSettings);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/images
loleaflet/images/lc_downloadas-epub.svg |7 +++ 1 file changed, 7 insertions(+) New commits: commit 669f5d38cd9b9e2046ebf6168fbac86d1249e0cd Author: Pedro Pinto Silva AuthorDate: Mon Mar 16 12:53:33 2020 +0100 Commit: Pedro Pinto da Silva CommitDate: Mon Mar 16 12:55:23 2020 +0100 Mobile: Writer: Hamburger menu: add new epub icon to download options Change-Id: Idbef68f6c3f8908dc3f2f38a8e91d441b0f6a4b7 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90559 Tested-by: Pedro Pinto da Silva Reviewed-by: Pedro Pinto da Silva diff --git a/loleaflet/images/lc_downloadas-epub.svg b/loleaflet/images/lc_downloadas-epub.svg new file mode 100644 index 0..3b0d8ebbc --- /dev/null +++ b/loleaflet/images/lc_downloadas-epub.svg @@ -0,0 +1,7 @@ +http://www.w3.org/2000/svg;> + + + + + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css
loleaflet/css/vex.css |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 7f2556deb610f98a09514cd0f62dd37498378e21
Author: Pedro Pinto Silva
AuthorDate: Thu Mar 12 15:36:14 2020 +0100
Commit: Pedro Pinto da Silva
CommitDate: Mon Mar 16 12:54:56 2020 +0100
Desktop: Vex-bottom-right-corner: Fix missing z-index and
remove duplicated rule
Change-Id: I502aea7c7fb012a446ae415738a6c90b1306
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90414
Tested-by: Jenkins CollaboraOffice
Tested-by: Pedro Pinto da Silva
Reviewed-by: Pedro Pinto da Silva
diff --git a/loleaflet/css/vex.css b/loleaflet/css/vex.css
index 54d8c3357..a59a9d9e4 100644
--- a/loleaflet/css/vex.css
+++ b/loleaflet/css/vex.css
@@ -36,7 +36,7 @@
display: none !important;
}
-.vex.vex-theme-plain{
+.vex.vex-theme-plain, .vex.vex-theme-bottom-right-corner{
z-index: 2001 !important;
}
@@ -123,7 +123,6 @@
.vex.vex-theme-plain {
padding: 0px !important;
position: relative !important;
- z-index: 2001 !important;
top: -42px !important;
}
.vex-open .vex-overlay {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/layer/tile/TileLayer.js |5 +
1 file changed, 5 insertions(+)
New commits:
commit 9374a2883537d41d6994e5a77fd45bb5fbe9a0d7
Author: Muhammet Kara
AuthorDate: Mon Mar 16 10:58:06 2020 +0300
Commit: Muhammet Kara
CommitDate: Mon Mar 16 13:39:55 2020 +0100
Jump view to cursor on switching tab
Change-Id: I76baf85858b46ba23ad6b6dd01d8716027cc43f2
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90548
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Muhammet Kara
diff --git a/loleaflet/src/layer/tile/TileLayer.js
b/loleaflet/src/layer/tile/TileLayer.js
index 2bb1a8215..52660885a 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -1061,6 +1061,11 @@ L.TileLayer = L.GridLayer.extend({
horizontalDirection = sign(this._cellCursor.getWest() -
this._prevCellCursor.getWest());
verticalDirection = sign(this._cellCursor.getNorth() -
this._prevCellCursor.getNorth());
}
+ else if (!this._isEmptyRectangle(this._cellCursor)) {
+ // This is needed for jumping view to cursor position
on tab switch
+ horizontalDirection = sign(this._cellCursor.getWest() -
L.Point(0, 0));
+ verticalDirection = sign(this._cellCursor.getNorth() -
L.Point(0, 0));
+ }
var onPgUpDn = false;
if (!this._isEmptyRectangle(this._cellCursor) &&
!this._prevCellCursor.equals(this._cellCursor)) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/Executable_cppunittester.mk
sal/Executable_cppunittester.mk |8 1 file changed, 8 insertions(+) New commits: commit bc0ba22e794332c339effe817ab766ee8a1b3e40 Author: Mike Kaganski AuthorDate: Mon Mar 16 12:59:54 2020 +0300 Commit: Mike Kaganski CommitDate: Mon Mar 16 14:02:00 2020 +0100 Avoid stack overflow in testTdf124815 on Windows Regression from commit 2af67c35d283abefe6030a5b90b831b0b797dd62. It happens in row 217, in a recursive calculation of cell values, starting on row 454 down to 0, with 237 repeated patterns on stack: === ucrtbased.dll!__acrt_FlsGetValue(unsigned long fls_index) Line 472 ucrtbased.dll!__crt_state_management::get_current_state_index() Line 101 ucrtbased.dll!__crt_state_management::dual_state_global::value() Line 147 ucrtbased.dll!_query_new_mode() Line 30 ucrtbased.dll!heap_alloc_dbg(const unsigned __int64 size, const int block_use, const char * const file_name, const int line_number) Line 447 ucrtbased.dll!_malloc_dbg(unsigned __int64 size, int block_use, const char * file_name, int line_number) Line 496 ucrtbased.dll!malloc(unsigned __int64 size) Line 27 sclo.dll!operator new(unsigned __int64 size) Line 35 sclo.dll!std::_Default_allocate_traits::_Allocate(const unsigned __int64 _Bytes) Line 52 sclo.dll!std::_Allocate<16,std::_Default_allocate_traits,0>(const unsigned __int64 _Bytes) Line 180 sclo.dll!std::allocator::allocate(const unsigned __int64 _Count) Line 785 sclo.dll!std::_Container_base12::_Alloc_proxy>(std::allocator && _Al) Line 1098 sclo.dll!std::vector>::vector>() Line 445 sclo.dll!sc::TokenStringContext::TokenStringContext(const ScDocument * pDoc, formula::FormulaGrammar::Grammar eGram) Line 38 sclo.dll!sc::FormulaLogger::GroupScope::Impl::Impl(sc::FormulaLogger & rLogger, const rtl::OUString & rPrefix, const ScDocument & rDoc, const ScFormulaCell & rCell, bool bOutputEnabled) Line 80 sclo.dll!std::make_unique(sc::FormulaLogger & <_Args_0>, const rtl::OUString & <_Args_1>, const ScDocument & <_Args_2>, const ScFormulaCell & <_Args_3>, bool & <_Args_4>) Line 2055 sclo.dll!sc::FormulaLogger::GroupScope::GroupScope(sc::FormulaLogger & rLogger, const rtl::OUString & rPrefix, const ScDocument & rDoc, const ScFormulaCell & rCell, bool bOutputEnabled) Line 127 sclo.dll!sc::FormulaLogger::enterGroup(const ScDocument & rDoc, const ScFormulaCell & rCell) Line 352 sclo.dll!ScFormulaCell::InterpretFormulaGroup(long nStartOffset, long nEndOffset) Line 4573 sclo.dll!ScFormulaCell::Interpret(long nStartOffset, long nEndOffset) Line 1606 sclo.dll!ScFormulaCell::MaybeInterpret() Line 446 sclo.dll!ScFormulaCell::GetErrCode() Line 2956 sclo.dll!ScInterpreter::GetCellValueOrZero(const ScAddress & rPos, ScRefCellValue & rCell) Line 202 sclo.dll!ScInterpreter::GetCellValue(const ScAddress & rPos, ScRefCellValue & rCell) Line 186 sclo.dll!ScInterpreter::GetDouble() Line 2088 sclo.dll!ScInterpreter::CalculateAddSub(bool _bSub) Line 1277 sclo.dll!ScInterpreter::ScAdd() Line 1261 sclo.dll!ScInterpreter::Interpret() Line 4032 sclo.dll!ScFormulaCell::InterpretTail(ScInterpreterContext & rContext, ScFormulaCell::ScInterpretTailParameter eTailParam) Line 1939 sclo.dll!ScFormulaCell::Interpret(long nStartOffset, long nEndOffset) Line 1632 ... ... sclo.dll!ScFormulaCell::MaybeInterpret() Line 446 sclo.dll!ScFormulaCell::GetErrCode() Line 2956 sclo.dll!ScInterpreter::GetCellValueOrZero(const ScAddress & rPos, ScRefCellValue & rCell) Line 202 sclo.dll!ScInterpreter::GetCellValue(const ScAddress & rPos, ScRefCellValue & rCell) Line 186 sclo.dll!ScInterpreter::GetDouble() Line 2088 sclo.dll!ScInterpreter::CalculateAddSub(bool _bSub) Line 1300 sclo.dll!ScInterpreter::ScAdd() Line 1261 sclo.dll!ScInterpreter::Interpret() Line 4032 sclo.dll!ScFormulaCell::InterpretTail(ScInterpreterContext & rContext, ScFormulaCell::ScInterpretTailParameter eTailParam) Line 1939 sclo.dll!ScFormulaCell::Interpret(long nStartOffset, long nEndOffset) Line 1632 sclo.dll!ScFormulaCell::MaybeInterpret() Line 446 sclo.dll!ScFormulaCell::GetErrCode() Line 2956 sclo.dll!ScInterpreter::GetCellValueOrZero(const ScAddress & rPos, ScRefCellValue & rCell) Line 202 sclo.dll!ScInterpreter::GetCellValue(const ScAddress & rPos, ScRefCellValue & rCell) Line 186 sclo.dll!ScInterpreter::GetDouble() Line 2088 sclo.dll!ScInterpreter::CalculateAddSub(bool _bSub) Line 1300 sclo.dll!ScInterpreter::ScAdd() Line 1261 sclo.dll!ScInterpreter::Interpret() Line 4032 sclo.dll!ScFormulaCell::InterpretTail(ScInterpreterContext & rContext, ScFormulaCell::ScInterpretTailParameter eTailParam) Line 1939 sclo.dll!ScFormulaCell::Interpret(long nStartOffset, long nEndOffset) Line 1632 sclo.dll!ScFormulaCell::MaybeInterpret()
[Libreoffice-commits] online.git: Makefile.am
Makefile.am |1 + 1 file changed, 1 insertion(+) New commits: commit 370392d71e410ef6687da78ec61f0308e67bd7ba Author: Andras Timar AuthorDate: Mon Mar 16 12:37:43 2020 +0100 Commit: Andras Timar CommitDate: Mon Mar 16 12:37:43 2020 +0100 add missing test/lokassert.hpp to dist tarball Change-Id: I13bc2926cad6483b1cef7ddd6547d45b8705b185 diff --git a/Makefile.am b/Makefile.am index 5a67a5faf..e4e6ed5db 100644 --- a/Makefile.am +++ b/Makefile.am @@ -259,6 +259,7 @@ kit_headers = kit/ChildSession.hpp \ noinst_HEADERS = $(wsd_headers) $(shared_headers) $(kit_headers) \ test/WopiTestServer.hpp \ test/countloolkits.hpp \ + test/lokassert.hpp \ test/test.hpp \ test/helpers.hpp ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit b0887393ceb0bf283841fe212baf5be3571782b9
Author: Miklos Vajna
AuthorDate: Mon Mar 16 13:45:20 2020 +0100
Commit: Miklos Vajna
CommitDate: Mon Mar 16 14:34:02 2020 +0100
DOCX import: declare w14 as a supported feature
This is needed (but not enough) to support markup like this:
Change-Id: I598b0452b5d29624ed0a6795682c29a09fd0dcfe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90564
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index 08292c8d4459..e369705fc5d3 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -125,6 +125,7 @@ bool OOXMLFastContextHandler::prepareMceContext(Token_t
nElement, const uno::Ref
static const char* aFeatures[] = {
"wps",
"wpg",
+"w14",
};
for (const char *p : aFeatures)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/css loleaflet/images loleaflet/src
loleaflet/css/mobilewizard.css|9 +
loleaflet/images/lc_delbreakmenu.svg | 10 ++
loleaflet/images/lc_deletecolumnbreak.svg |9 +
loleaflet/images/lc_deleterowbreak.svg| 10 ++
loleaflet/images/lc_groupoutlinemenu.svg |1 +
loleaflet/images/lc_insertbreakmenu.svg |1 +
loleaflet/images/lc_insertcolumnsmenu.svg |1 +
loleaflet/images/lc_insertrowbreak.svg| 11 ++-
loleaflet/images/lc_insertrowsmenu.svg|1 +
loleaflet/src/control/Control.Menubar.js | 10 +-
10 files changed, 49 insertions(+), 14 deletions(-)
New commits:
commit 7918f69a2452045e2e88639947d05278e4aa7028
Author: Pedro Pinto Silva
AuthorDate: Mon Mar 16 11:18:41 2020 +0100
Commit: Pedro Pinto da Silva
CommitDate: Mon Mar 16 12:22:00 2020 +0100
Mobile: Calc: Hamburger menu: sheet and submenus: add icons
- Remove default gray elements for submenus
- Fix some icon sizes from 32 pc to 24 px
- Add new delete icons
- Add icon for data > group outline etc
Change-Id: I62e234d995fc6e875c5344715661dfd3202ef6a6
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90557
Tested-by: Jenkins CollaboraOffice
Tested-by: Pedro Pinto da Silva
Reviewed-by: Pedro Pinto da Silva
diff --git a/loleaflet/css/mobilewizard.css b/loleaflet/css/mobilewizard.css
index 00a109811..897879943 100644
--- a/loleaflet/css/mobilewizard.css
+++ b/loleaflet/css/mobilewizard.css
@@ -43,14 +43,7 @@
#leadingzeroes .spinfieldimage, #decimalplaces .spinfieldimage,
.menu-entry-icon.setanchoratchar, .menu-entry-icon.setanchortochar,
.menu-entry-icon.setanchortopage, .menu-entry-icon.setanchortocellresize,
.menu-entry-icon.setanchortocell{
display: none;
}
- .ui-header.level-2.mobile-wizard.ui-widget
img[src='images/lc_deleterowbreak.svg'],
.ui-header.level-2.mobile-wizard.ui-widget
img[src='images/lc_deletecolumnbreak.svg']{
- visibility: hidden;
- }
- .menu-entry-icon.deleterowbreak, .menu-entry-icon.deletecolumnbreak{
- background-color: #ee;
- border-radius: 100px;
- box-shadow: inset 0 0px 0 8px white;
- }
+
.ui-header.level-1.mobile-wizard.ui-widget
img[src='images/lc_downloadas-pdf.svg']{
visibility: visible;
}
diff --git a/loleaflet/images/lc_delbreakmenu.svg
b/loleaflet/images/lc_delbreakmenu.svg
new file mode 100644
index 0..b6753cbdc
--- /dev/null
+++ b/loleaflet/images/lc_delbreakmenu.svg
@@ -0,0 +1,10 @@
+http://www.w3.org/2000/svg;>
+
+
+
+
+
+
+
+
+
diff --git a/loleaflet/images/lc_deletecolumnbreak.svg
b/loleaflet/images/lc_deletecolumnbreak.svg
new file mode 100644
index 0..59ffdd0f2
--- /dev/null
+++ b/loleaflet/images/lc_deletecolumnbreak.svg
@@ -0,0 +1,9 @@
+http://www.w3.org/2000/svg;>
+
+
+
+
+
+
+
+
diff --git a/loleaflet/images/lc_deleterowbreak.svg
b/loleaflet/images/lc_deleterowbreak.svg
new file mode 100644
index 0..b6753cbdc
--- /dev/null
+++ b/loleaflet/images/lc_deleterowbreak.svg
@@ -0,0 +1,10 @@
+http://www.w3.org/2000/svg;>
+
+
+
+
+
+
+
+
+
diff --git a/loleaflet/images/lc_groupoutlinemenu.svg
b/loleaflet/images/lc_groupoutlinemenu.svg
new file mode 100644
index 0..a8bd1bf35
--- /dev/null
+++ b/loleaflet/images/lc_groupoutlinemenu.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg;>
\ No newline at end of file
diff --git a/loleaflet/images/lc_insertbreakmenu.svg
b/loleaflet/images/lc_insertbreakmenu.svg
new file mode 100644
index 0..65af4963c
--- /dev/null
+++ b/loleaflet/images/lc_insertbreakmenu.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg;>
\ No newline at end of file
diff --git a/loleaflet/images/lc_insertcolumnsmenu.svg
b/loleaflet/images/lc_insertcolumnsmenu.svg
new file mode 100644
index 0..38a4af1d6
--- /dev/null
+++ b/loleaflet/images/lc_insertcolumnsmenu.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg;>
\ No newline at end of file
diff --git a/loleaflet/images/lc_insertrowbreak.svg
b/loleaflet/images/lc_insertrowbreak.svg
index 65af4963c..e5d519167 100644
--- a/loleaflet/images/lc_insertrowbreak.svg
+++ b/loleaflet/images/lc_insertrowbreak.svg
@@ -1 +1,10 @@
-http://www.w3.org/2000/svg;>
\ No newline at end of file
+http://www.w3.org/2000/svg;>
+
+
+
+
+
+
+
+
+
diff --git a/loleaflet/images/lc_insertrowsmenu.svg
b/loleaflet/images/lc_insertrowsmenu.svg
new file mode 100644
index 0..9d11d146d
--- /dev/null
+++ b/loleaflet/images/lc_insertrowsmenu.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg;>
\ No newline at end of file
diff --git a/loleaflet/src/control/Control.Menubar.js
b/loleaflet/src/control/Control.Menubar.js
index 88b455d69..7bd57d538 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -581,19 +581,19 @@ L.Control.Menubar = L.Control.extend({
GSoC Proposal LibreOffice
I have made a draft proposal on the project "Styles Inspector". https://docs.google.com/document/d/1ZHlAfXU_7sXery6PnP1p831rhMnj1WYI-WiVKEGlxeE/edit?usp=sharing All input positive, negative from anyone is welcome. Please have a look and tell me what do you think :) Sincerely, Shivam Kumar Singh ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: oox/IwyuFilter_oox.yaml oox/source
oox/IwyuFilter_oox.yaml | 66 oox/source/core/binarycodec.cxx |2 oox/source/core/fastparser.cxx |2 oox/source/core/fasttokenhandler.cxx|1 oox/source/core/filterdetect.cxx|1 oox/source/core/relations.cxx |3 oox/source/core/relationshandler.cxx|3 oox/source/core/xmlfilterbase.cxx | 11 -- oox/source/crypto/AgileEngine.cxx |3 oox/source/crypto/CryptTools.cxx|2 oox/source/crypto/DocumentDecryption.cxx|2 oox/source/crypto/DocumentEncryption.cxx|1 oox/source/crypto/Standard2007Engine.cxx|1 oox/source/docprop/docprophandler.cxx |1 oox/source/docprop/ooxmldocpropimport.cxx |1 oox/source/drawingml/ThemeOverrideFragmentHandler.cxx |1 oox/source/drawingml/chart/chartspaceconverter.cxx |3 oox/source/drawingml/chart/converterbase.cxx|4 oox/source/drawingml/chart/datasourcecontext.cxx|1 oox/source/drawingml/chart/plotareacontext.cxx |1 oox/source/drawingml/chart/seriesconverter.cxx |5 - oox/source/drawingml/chart/titlecontext.cxx |1 oox/source/drawingml/chart/typegroupcontext.cxx |1 oox/source/drawingml/connectorshapecontext.cxx |6 - oox/source/drawingml/customshapegeometry.cxx|1 oox/source/drawingml/diagram/datamodel.cxx |4 oox/source/drawingml/diagram/diagramlayoutatoms.cxx |1 oox/source/drawingml/diagram/layoutnodecontext.cxx |1 oox/source/drawingml/effectproperties.cxx |2 oox/source/drawingml/effectpropertiescontext.cxx|5 - oox/source/drawingml/fillproperties.cxx |4 oox/source/drawingml/graphicshapecontext.cxx|8 - oox/source/drawingml/hyperlinkcontext.cxx |2 oox/source/drawingml/lineproperties.cxx |3 oox/source/drawingml/linepropertiescontext.cxx |1 oox/source/drawingml/misccontexts.cxx |3 oox/source/drawingml/objectdefaultcontext.cxx |1 oox/source/drawingml/presetgeometrynames.cxx|1 oox/source/drawingml/scene3dcontext.cxx |5 - oox/source/drawingml/shape.cxx | 14 --- oox/source/drawingml/shape3dproperties.cxx | 10 -- oox/source/drawingml/shapecontext.cxx |5 - oox/source/drawingml/shapegroupcontext.cxx |5 - oox/source/drawingml/shapepropertiescontext.cxx |6 - oox/source/drawingml/spdefcontext.cxx |1 oox/source/drawingml/table/tablecell.cxx|7 - oox/source/drawingml/table/tablecontext.cxx |2 oox/source/drawingml/table/tablepartstylecontext.cxx|1 oox/source/drawingml/table/tableproperties.cxx |6 - oox/source/drawingml/table/tablerow.cxx |7 - oox/source/drawingml/textbody.cxx |2 oox/source/drawingml/textbodycontext.cxx|1 oox/source/drawingml/textbodyproperties.cxx |1 oox/source/drawingml/textbodypropertiescontext.cxx |7 - oox/source/drawingml/textcharacterpropertiescontext.cxx |5 - oox/source/drawingml/texteffectscontext.cxx |1 oox/source/drawingml/textfield.cxx |3 oox/source/drawingml/textliststylecontext.cxx |1 oox/source/drawingml/textparagraphproperties.cxx|4 oox/source/drawingml/textrun.cxx|1 oox/source/drawingml/texttabstoplistcontext.cxx |3 oox/source/drawingml/themefragmenthandler.cxx |1 oox/source/dump/dumperbase.cxx |1 oox/source/dump/oledumper.cxx |7 - 64 files changed, 77 insertions(+), 190 deletions(-) New commits: commit ef08f18e926f0627b51a529910aaade4353be9af Author: Gabor Kelemen AuthorDate: Sun Mar 15 00:26:24 2020 +0100 Commit: Miklos Vajna CommitDate: Mon Mar 16 13:59:28 2020 +0100 tdf#42949 Fix IWYU warnings in oox/source/[cd]*/*cxx Found with bin/find-unneeded-includes Only removal proposals are dealt with here. Change-Id: Ie3c59da7b9e0ad06fcd7f247e47bcc17ea35b17a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90503 Tested-by: Jenkins Reviewed-by: Miklos Vajna diff --git a/oox/IwyuFilter_oox.yaml b/oox/IwyuFilter_oox.yaml index 8b3931312af3..41091bc9b4eb 100644 --- a/oox/IwyuFilter_oox.yaml +++ b/oox/IwyuFilter_oox.yaml @@ -4,3 +4,69 @@ blacklist:
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.Tabs.js|8 +++-
loleaflet/src/control/Control.Toolbar.js |2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 98258da7189fb14f0aae88d5073d64fce71ae764
Author: Dennis Francis
AuthorDate: Sat Mar 7 17:39:12 2020 +0530
Commit: Andras Timar
CommitDate: Mon Mar 16 15:55:30 2020 +0100
Scroll to last tab when a new sheet is inserted
Before the patch on inserting a new sheet using '+' button
in a spreadsheet with lots of sheets, the scroll position remains
unchanged. With this change, it scrolls to the newly inserted tab
at the end.
Change-Id: Iaa343aac51636043ab4629a847e2315e5076c4ab
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90159
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/loleaflet/src/control/Control.Tabs.js
b/loleaflet/src/control/Control.Tabs.js
index 8c56372da..182a154c0 100644
--- a/loleaflet/src/control/Control.Tabs.js
+++ b/loleaflet/src/control/Control.Tabs.js
@@ -165,7 +165,13 @@ L.Control.Tabs = L.Control.extend({
// Restore horizontal scroll position
scrollDiv = L.DomUtil.get('spreadsheet-tab-scroll');
if (scrollDiv) {
- scrollDiv.scrollLeft = horizScrollPos;
+ if (this._map.insertPage &&
this._map.insertPage.scrollToEnd) {
+ this._map.insertPage.scrollToEnd =
false;
+ scrollDiv.scrollLeft =
scrollDiv.scrollWidth;
+ }
+ else {
+ scrollDiv.scrollLeft = horizScrollPos;
+ }
}
}
},
diff --git a/loleaflet/src/control/Control.Toolbar.js
b/loleaflet/src/control/Control.Toolbar.js
index a26a63304..9e8d87d8c 100644
--- a/loleaflet/src/control/Control.Toolbar.js
+++ b/loleaflet/src/control/Control.Toolbar.js
@@ -252,7 +252,7 @@ function onClick(e, id, item, subItem) {
else if (id === 'insertsheet') {
var nPos = $('#spreadsheet-tab-scroll')[0].childElementCount;
map.insertPage(nPos);
-
$('#spreadsheet-tab-scroll').scrollLeft($('#spreadsheet-tab-scroll').prop('scrollWidth'));
+ map.insertPage.scrollToEnd = true;
}
else if (id === 'firstrecord') {
$('#spreadsheet-tab-scroll').scrollLeft(0);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/admin loleaflet/Makefile.am
loleaflet/Makefile.am | 16 ---
loleaflet/admin/build/build.js | 14 -
loleaflet/admin/build/deps.js | 43 -
3 files changed, 13 insertions(+), 60 deletions(-)
New commits:
commit 4ea1b49376f7da6361afedf016ebca26bd64748c
Author: Henry Castro
AuthorDate: Thu Mar 12 16:37:06 2020 -0400
Commit: Henry Castro
CommitDate: Mon Mar 16 16:12:00 2020 +0100
loleaflet: makefile: do not execute javascript to get admin files
Change-Id: I84f3128499f038691abc762adec50c32f103b9f9
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90448
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Henry Castro
diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 915117a83..3a09ef370 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -71,6 +71,16 @@ define npm_source
done
endef
+LOLEAFLET_ADMIN_JS =\
+ admin/src/Base.js \
+ admin/src/Admin.js \
+ admin/src/AdminSocketBase.js \
+ admin/src/Util.js \
+ admin/src/AdminSocketOverview.js \
+ admin/src/AdminSocketAnalytics.js \
+ admin/src/AdminSocketSettings.js \
+ admin/src/AdminSocketHistory.js
+
NODE_MODULES_SRC =\
autolinker@1.4.3 \
json-js@1.1.2 \
@@ -147,8 +157,6 @@ NODE_MODULES_JS_DST = $(patsubst
%.js,$(builddir)/dist/%.js,$(NODE_MODULES_JS))
LOLEAFLET_LIBS_JS_SRC = $(patsubst %.js,$(srcdir)/js/%.js,$(LOLEAFLET_LIBS_JS))
LOLEAFLET_LIBS_JS_DST = $(patsubst
%.js,$(builddir)/dist/%.js,$(LOLEAFLET_LIBS_JS))
-GET_FILES_JS = $(strip $(shell NODE_PATH=$(abs_builddir)/node_modules $(NODE)
-e "try {console.log(require('$(1)').getFiles().join(' '))} catch(e) {}"))
-
LOLEAFLET_JS =\
src/Leaflet.js \
src/errormessages.js \
@@ -335,7 +343,9 @@ $(builddir)/dist/admin-bundle.js: $(LOLEAFLET_ADMIN_DST) \
$(LOLEAFLET_PREFIX)/dist/admin-src.js: $(LOLEAFLET_ADMIN_ALL)
@echo "Checking for admin JS errors..."
@NODE_PATH=$(abs_builddir)/node_modules $(NODE)
node_modules/eslint/bin/eslint.js $(srcdir)/admin/src --ignore-path
$(srcdir)/.eslintignore --config $(srcdir)/.eslintrc
- @awk 'FNR == 1 {print ""} 1' $(patsubst %.js,$(srcdir)/%.js,$(call
GET_FILES_JS,$(srcdir)/admin/build/build.js)) > $@
+ @awk 'FNR == 1 {print ""} 1' $(patsubst
%.js,$(srcdir)/%.js,$(LOLEAFLET_ADMIN_JS)) > $@
+
+
if ENABLE_DEBUG
$(LOLEAFLET_PREFIX)/dist/loleaflet-src.js: $(LOLEAFLET_JS_DST)
diff --git a/loleaflet/admin/build/build.js b/loleaflet/admin/build/build.js
deleted file mode 100644
index 96296fd3f..0
--- a/loleaflet/admin/build/build.js
+++ /dev/null
@@ -1,14 +0,0 @@
-/* -*- js-indent-level: 8 -*- */
-var deps = require('./deps.js').deps;
-
-exports.getFiles = function () {
- var files = [];
-
- for (var i in deps) {
- for (var j = 0, len = deps[i].src.length; j < len; j++) {
- files.push('admin/' + deps[i].src[j]);
- }
- }
-
- return files;
-};
diff --git a/loleaflet/admin/build/deps.js b/loleaflet/admin/build/deps.js
deleted file mode 100644
index f40535624..0
--- a/loleaflet/admin/build/deps.js
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- js-indent-level: 8 -*- */
-var deps = {
- AdminCore: {
- src: ['src/Base.js',
- 'src/Admin.js',
- 'src/AdminSocketBase.js'],
- desc: 'Core admin scripts infrastructure'
- },
-
- Util: {
- src: ['src/Util.js'],
- desc: 'Utility class',
- deps: ['AdminCore']
- },
-
- AdminSocketOverview: {
- src: ['src/AdminSocketOverview.js'],
- desc: 'Socket to handle messages in overview page.',
- deps: ['AdminCore']
- },
-
- AdminSocketAnalytics: {
- src: ['src/AdminSocketAnalytics.js'],
- desc: 'Socket to handle messages in analytics page.',
- deps: ['AdminCore']
- },
-
- AdminSocketSettings: {
- src: ['src/AdminSocketSettings.js'],
- desc: 'Socket to handle settings from server',
- deps: ['AdminCore']
- },
-
- AdminSocketHistory: {
- src: ['src/AdminSocketHistory.js'],
- desc: 'Socket to query document history.',
- deps: ['AdminCore']
- }
-};
-
-if (typeof exports !== 'undefined') {
- exports.deps = deps;
-}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/rtftok/rtfdispatchvalue.cxx | 1009 +---
writerfilter/source/rtftok/rtfdocumentimpl.hxx |7
2 files changed, 563 insertions(+), 453 deletions(-)
New commits:
commit b0308f336a26eee83c57b6f15c0f788ccc4486f1
Author: Miklos Vajna
AuthorDate: Mon Mar 16 15:36:58 2020 +0100
Commit: Miklos Vajna
CommitDate: Mon Mar 16 16:26:13 2020 +0100
writerfilter: extract dispatch...Value() from disptachValue()
This function was a 1582 lines monster. Extract clusters of RTF value
keywords into their own function to makes this a bit more readable.
Change-Id: Icf95ca11f5f909379acbfd576915485c7eb868ad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90569
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/writerfilter/source/rtftok/rtfdispatchvalue.cxx
b/writerfilter/source/rtftok/rtfdispatchvalue.cxx
index 4f7c71ecf73e..cc880a195e20 100644
--- a/writerfilter/source/rtftok/rtfdispatchvalue.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchvalue.cxx
@@ -108,14 +108,10 @@ static int getNumberFormat(int nParam)
namespace rtftok
{
-RTFError RTFDocumentImpl::dispatchValue(RTFKeyword nKeyword, int nParam)
+bool RTFDocumentImpl::dispatchTableSprmValue(RTFKeyword nKeyword, int nParam)
{
-setNeedSect(true);
-checkUnicode(/*bUnicode =*/nKeyword != RTF_U, /*bHex =*/true);
-RTFSkipDestination aSkip(*this);
int nSprm = 0;
tools::SvRef pIntValue(new RTFValue(nParam));
-// Trivial table sprms.
switch (nKeyword)
{
case RTF_LEVELJC:
@@ -157,9 +153,17 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword
nKeyword, int nParam)
if (nSprm > 0)
{
m_aStates.top().getTableSprms().set(nSprm, pIntValue);
-return RTFError::OK;
+return true;
}
-// Trivial character sprms.
+
+return false;
+}
+
+bool RTFDocumentImpl::dispatchCharacterSprmValue(RTFKeyword nKeyword, int
nParam)
+{
+int nSprm = 0;
+tools::SvRef pIntValue(new RTFValue(nParam));
+
switch (nKeyword)
{
case RTF_FS:
@@ -196,9 +200,16 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword
nKeyword, int nParam)
if (nSprm > 0)
{
m_aStates.top().getCharacterSprms().set(nSprm, pIntValue);
-return RTFError::OK;
+return true;
}
-// Trivial character attributes.
+
+return false;
+}
+
+bool RTFDocumentImpl::dispatchCharacterAttributeValue(RTFKeyword nKeyword, int
nParam)
+{
+int nSprm = 0;
+
switch (nKeyword)
{
case RTF_LANG:
@@ -222,128 +233,524 @@ RTFError RTFDocumentImpl::dispatchValue(RTFKeyword
nKeyword, int nParam)
break;
}
break;
-case RTF_LANGFE: // this one is always CJK apparently
-nSprm = NS_ooxml::LN_CT_Language_eastAsia;
+case RTF_LANGFE: // this one is always CJK apparently
+nSprm = NS_ooxml::LN_CT_Language_eastAsia;
+break;
+default:
+break;
+}
+if (nSprm > 0)
+{
+LanguageTag aTag((LanguageType(static_cast(nParam;
+auto pValue = new RTFValue(aTag.getBcp47());
+putNestedAttribute(m_aStates.top().getCharacterSprms(),
NS_ooxml::LN_EG_RPrBase_lang, nSprm,
+ pValue);
+// Language is a character property, but we should store it at a
paragraph level as well for fields.
+if (nKeyword == RTF_LANG && m_bNeedPap)
+putNestedAttribute(m_aStates.top().getParagraphSprms(),
NS_ooxml::LN_EG_RPrBase_lang,
+ nSprm, pValue);
+return true;
+}
+
+return false;
+}
+
+bool RTFDocumentImpl::dispatchParagraphSprmValue(RTFKeyword nKeyword, int
nParam)
+{
+int nSprm = 0;
+tools::SvRef pIntValue(new RTFValue(nParam));
+
+switch (nKeyword)
+{
+case RTF_ITAP:
+nSprm = NS_ooxml::LN_tblDepth;
+// tdf#117268: If \itap0 is encountered inside tables (between
\cellxN and \cell), then
+// use the default value (1), as Word apparently does
+if (nParam == 0 && (m_nTopLevelCells != 0 || m_nNestedCells != 0))
+{
+nParam = 1;
+pIntValue = new RTFValue(nParam);
+}
+break;
+default:
+break;
+}
+if (nSprm > 0)
+{
+m_aStates.top().getParagraphSprms().set(nSprm, pIntValue);
+if (nKeyword == RTF_ITAP && nParam > 0)
+{
+while (m_aTableBufferStack.size() <
sal::static_int_cast(nParam))
+{
+m_aTableBufferStack.emplace_back(RTFBuffer_t());
+}
+// Invalid tables may omit INTBL after ITAP
+dispatchFlag(RTF_INTBL); // sets newly pushed buffer as current
+assert(m_aStates.top().getCurrentBuffer() ==
_aTableBufferStack.back());
+}
+return true;
+}
+
+return false;
+}
+
+bool
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - chart2/source comphelper/source desktop/source include/comphelper sc/source sd/source sfx2/source svx/source
chart2/source/controller/main/ChartController_Window.cxx |4 -
comphelper/source/misc/lok.cxx | 31 ++-
desktop/source/lib/init.cxx | 20 +++--
include/comphelper/lok.hxx | 14 --
sc/source/ui/app/inputhdl.cxx|2
sc/source/ui/app/inputwin.cxx|2
sc/source/ui/condformat/condformatdlg.cxx|2
sc/source/ui/condformat/condformatdlgentry.cxx |2
sc/source/ui/drawfunc/fuins2.cxx |2
sc/source/ui/sidebar/AlignmentPropertyPanel.cxx |2
sc/source/ui/view/gridwin.cxx|5 +-
sc/source/ui/view/viewfun5.cxx |2
sd/source/core/sdpage.cxx| 20 -
sd/source/ui/func/futext.cxx |2
sfx2/source/sidebar/Deck.cxx |2
sfx2/source/sidebar/SidebarController.cxx|4 -
sfx2/source/sidebar/SidebarDockingWindow.cxx |6 +-
svx/source/sidebar/text/TextPropertyPanel.cxx| 10 ++--
18 files changed, 81 insertions(+), 51 deletions(-)
New commits:
commit fc5400b167f1f6a9a788acfd5894622f440ee5f5
Author: Tor Lillqvist
AuthorDate: Mon Mar 16 13:50:00 2020 +0200
Commit: Tor Lillqvist
CommitDate: Mon Mar 16 15:14:01 2020 +0100
Rename isMobile to isMobilePhone and introduce a separate isTablet
The intended semantics of isMobile() has been to say whether the
device is a mobile phone ot not. Not whether it is a mobile device in
general. So make that explicit.
Adjust call sites as necessary. Also, in a couple of places where it
is likely that what is relevant is whether it is a mobile device in
general, not just whether it is a mobile phone, check both isMobile()
and isTablet().
For stable interoperability with current Online, keep accepting also
the .uno:LOKSetMobile "command" (and .uno:LOKUnSetMobile, except that
Online never sends that), but Online will be changed to use
.uno:LOKSetMobilePhone.
Also drop the default value for the bool parameter to
setMobilePhone(). Default bool parameters can be quite confusing, and
it was especially silly in this case as there is one (1) call site.
Change-Id: I2a71c37323ee151cbc671bd8e714e1dee10f8b1c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90560
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tor Lillqvist
diff --git a/chart2/source/controller/main/ChartController_Window.cxx
b/chart2/source/controller/main/ChartController_Window.cxx
index 8cd01a2e1e09..df059206c4ba 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -931,8 +931,8 @@ void ChartController::execute_MouseButtonUp( const
MouseEvent& rMEvt )
void ChartController::execute_DoubleClick( const Point* pMousePixel )
{
-bool isMobile =
comphelper::LibreOfficeKit::isMobile(SfxLokHelper::getView());
-if (isMobile)
+bool isMobilePhone =
comphelper::LibreOfficeKit::isMobilePhone(SfxLokHelper::getView());
+if (isMobilePhone)
return;
bool bEditText = false;
diff --git a/comphelper/source/misc/lok.cxx b/comphelper/source/misc/lok.cxx
index 7bfd776369e3..1f78c29f8b97 100644
--- a/comphelper/source/misc/lok.cxx
+++ b/comphelper/source/misc/lok.cxx
@@ -87,8 +87,11 @@ static LanguageAndLocale g_aLanguageAndLocale;
/// Scaling of the cairo or CoreGraphics canvas painting for hi-dpi
static double g_fDPIScale(1.0);
-/// List of pairs
-static std::map g_vIsViewMobile;
+/// Which views are on mobile phones?
+static std::map g_vIsViewMobilePhone;
+
+/// Which views are on tablets?
+static std::map g_vIsViewTablet;
void setActive(bool bActive)
{
@@ -100,18 +103,28 @@ bool isActive()
return g_bActive;
}
-void setMobile(int nViewId, bool bMobile)
+void setMobilePhone(int nViewId, bool bIsMobilePhone)
+{
+g_vIsViewMobilePhone[nViewId] = bIsMobilePhone;
+}
+
+bool isMobilePhone(int nViewId)
{
-if (g_vIsViewMobile.find(nViewId) != g_vIsViewMobile.end())
-g_vIsViewMobile[nViewId] = bMobile;
+if (g_vIsViewMobilePhone.find(nViewId) != g_vIsViewMobilePhone.end())
+return g_vIsViewMobilePhone[nViewId];
else
-g_vIsViewMobile.insert(std::make_pair(nViewId, bMobile));
+return false;
+}
+
+void setTablet(int nViewId, bool bIsTablet)
+{
+g_vIsViewTablet[nViewId] = bIsTablet;
}
-bool isMobile(int nViewId)
+bool isTablet(int nViewId)
{
-if (g_vIsViewMobile.find(nViewId) != g_vIsViewMobile.end())
-return g_vIsViewMobile[nViewId];
+if (g_vIsViewTablet.find(nViewId) != g_vIsViewTablet.end())
+return g_vIsViewTablet[nViewId];
else
return false;
}
diff --git
[Libreoffice-commits] online.git: loleaflet/images
loleaflet/images/lc_chartelementspanel.svg |1 + loleaflet/images/lc_charttypepanel.svg |6 ++ 2 files changed, 7 insertions(+) New commits: commit 3e9a853000ead871544eedad58fde73c839b6108 Author: Pedro Pinto Silva AuthorDate: Mon Mar 16 16:28:55 2020 +0100 Commit: Pedro Pinto da Silva CommitDate: Mon Mar 16 16:30:45 2020 +0100 Mobile: Calc: mobilewizard: chart: add missing icons Change-Id: Ib5120276a27a713497c246e832575ea42b97efb0 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90572 Tested-by: Pedro Pinto da Silva Reviewed-by: Pedro Pinto da Silva diff --git a/loleaflet/images/lc_chartelementspanel.svg b/loleaflet/images/lc_chartelementspanel.svg new file mode 100644 index 0..146ecc73e --- /dev/null +++ b/loleaflet/images/lc_chartelementspanel.svg @@ -0,0 +1 @@ +http://www.w3.org/2000/svg;> \ No newline at end of file diff --git a/loleaflet/images/lc_charttypepanel.svg b/loleaflet/images/lc_charttypepanel.svg new file mode 100644 index 0..1914d --- /dev/null +++ b/loleaflet/images/lc_charttypepanel.svg @@ -0,0 +1,6 @@ +http://www.w3.org/2000/svg;> + + + + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: drawinglayer/source emfio/qa
drawinglayer/source/tools/primitive2dxmldump.cxx | 24 ++-
emfio/qa/cppunit/emf/EmfImportTest.cxx |9
2 files changed, 32 insertions(+), 1 deletion(-)
New commits:
commit e11796866f94d2f51023e6bc2b23a39af10a7d96
Author: Bartosz Kosiorek
AuthorDate: Sun Mar 15 23:23:49 2020 +0100
Commit: Bartosz Kosiorek
CommitDate: Mon Mar 16 16:52:24 2020 +0100
tdf#124424 EMF+ Extend test options of SvgLinearGradientPrimitive2D
The extended options were used in LinearGradient tests
Change-Id: I44336edda2d82f936b6e931668bdac46ee7899e2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90541
Tested-by: Jenkins
Reviewed-by: Bartosz Kosiorek
diff --git a/drawinglayer/source/tools/primitive2dxmldump.cxx
b/drawinglayer/source/tools/primitive2dxmldump.cxx
index e4fadac945a3..7d706849c63c 100644
--- a/drawinglayer/source/tools/primitive2dxmldump.cxx
+++ b/drawinglayer/source/tools/primitive2dxmldump.cxx
@@ -14,6 +14,7 @@
#include
#include
+#include
#include
#include
@@ -138,7 +139,7 @@ xmlDocPtr Primitive2dXmlDump::dumpAndParse(
std::unique_ptr pBuffer(new sal_uInt8[nSize + 1]);
pStream->ReadBytes(pBuffer.get(), nSize);
pBuffer[nSize] = 0;
-
+SAL_INFO("drawinglayer", "Parsed XML: " << pBuffer.get());
xmlDocPtr pDoc = xmlParseDoc(reinterpret_cast(pBuffer.get()));
return pDoc;
@@ -252,6 +253,7 @@ void Primitive2dXmlDump::decomposeAndWrite(
double fRotate, fShearX;
if(rTextSimplePortionPrimitive2D.getTextTransform().decompose(aScale,
aTranslate, fRotate, fShearX))
{
+rWriter.attribute("width", aScale.getX());
rWriter.attribute("height", aScale.getY());
}
rWriter.attribute("x", aTranslate.getX());
@@ -314,10 +316,30 @@ void Primitive2dXmlDump::decomposeAndWrite(
{
const SvgLinearGradientPrimitive2D&
rSvgLinearGradientPrimitive2D = dynamic_cast(*pBasePrimitive);
rWriter.startElement("svglineargradient");
+basegfx::B2DPoint aStartAttribute =
rSvgLinearGradientPrimitive2D.getStart();
basegfx::B2DPoint aEndAttribute =
rSvgLinearGradientPrimitive2D.getEnd();
+rWriter.attribute("startx", aStartAttribute.getX());
+rWriter.attribute("starty", aStartAttribute.getY());
rWriter.attribute("endx", aEndAttribute.getX());
rWriter.attribute("endy", aEndAttribute.getY());
+//rWriter.attribute("spreadmethod",
(int)rSvgLinearGradientPrimitive2D.getSpreadMethod());
+rWriter.attributeDouble("opacity",
rSvgLinearGradientPrimitive2D.getGradientEntries().front().getOpacity());
+
+rWriter.startElement("transform");
+basegfx::B2DHomMatrix const & rMatrix =
rSvgLinearGradientPrimitive2D.getGradientTransform();
+rWriter.attributeDouble("xy11", rMatrix.get(0,0));
+rWriter.attributeDouble("xy12", rMatrix.get(0,1));
+rWriter.attributeDouble("xy13", rMatrix.get(0,2));
+rWriter.attributeDouble("xy21", rMatrix.get(1,0));
+rWriter.attributeDouble("xy22", rMatrix.get(1,1));
+rWriter.attributeDouble("xy23", rMatrix.get(1,2));
+rWriter.attributeDouble("xy31", rMatrix.get(2,0));
+rWriter.attributeDouble("xy32", rMatrix.get(2,1));
+rWriter.attributeDouble("xy33", rMatrix.get(2,2));
+rWriter.endElement();
+
+writePolyPolygon(rWriter,
rSvgLinearGradientPrimitive2D.getPolyPolygon());
rWriter.endElement();
}
diff --git a/emfio/qa/cppunit/emf/EmfImportTest.cxx
b/emfio/qa/cppunit/emf/EmfImportTest.cxx
index 9ce4e15f4965..636216a79fc2 100644
--- a/emfio/qa/cppunit/emf/EmfImportTest.cxx
+++ b/emfio/qa/cppunit/emf/EmfImportTest.cxx
@@ -175,10 +175,19 @@ void Test::TestLinearGradient()
assertXPath(pDocument, "/primitive2D/metafile/transform/mask/polypolygon",
"height", "7610");
assertXPath(pDocument, "/primitive2D/metafile/transform/mask/polypolygon",
"width", "15232");
assertXPath(pDocument, "/primitive2D/metafile/transform/mask/polypolygon",
"path", "m0 0h15232v7610h-15232z");
+
+assertXPath(pDocument,
"/primitive2D/metafile/transform/mask/svglineargradient[1]", "startx", "0");
+assertXPath(pDocument,
"/primitive2D/metafile/transform/mask/svglineargradient[1]", "starty", "-1");
assertXPath(pDocument,
"/primitive2D/metafile/transform/mask/svglineargradient[1]", "endx", "0");
assertXPath(pDocument,
"/primitive2D/metafile/transform/mask/svglineargradient[1]", "endy", "-1");
+assertXPath(pDocument,
"/primitive2D/metafile/transform/mask/svglineargradient[1]", "opacity",
"0.392156862745098");
+assertXPath(pDocument,
[Libreoffice-commits] core.git: instsetoo_native/inc_openoffice
instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit e6d008f131c7ca532a9e8410b424b3323d581978 Author: Roman Kuznetsov AuthorDate: Mon Mar 16 08:58:08 2020 +0100 Commit: Mike Kaganski CommitDate: Mon Mar 16 15:36:13 2020 +0100 tdf#128281 Increase a checkbox height in Windows installer Change-Id: Ic0bc2af1dd565dc9c24a74de8900da771f052a95 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90402 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt index 41708a651b5a..a573077997f6 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt @@ -214,8 +214,8 @@ ReadyToInstall DlgTitleText13 6 380 25 65538 OOO_CONTROL_170 ReadyToInstall DlgTitle2 Text13 6 380 25 65538 OOO_CONTROL_171 ReadyToInstall DlgTitle3 Text13 6 380 25 65538 OOO_CONTROL_172 ReadyToInstall InstallNow PushButton 330 243 66 17 3 OOO_CONTROL_173 Cancel -ReadyToInstall DesktopLink CheckBox21 100 300 10 3 CREATEDESKTOPLINK OOO_CONTROL_319 EnableQuickstart -ReadyToInstall EnableQuickstartCheckBox21 125 300 15 3 QUICKSTART OOO_CONTROL_321 Back +ReadyToInstall DesktopLink CheckBox21 100 300 15 3 CREATEDESKTOPLINK OOO_CONTROL_319 EnableQuickstart +ReadyToInstall EnableQuickstartCheckBox21 130 300 15 3 QUICKSTART OOO_CONTROL_321 Back ReadyToRemove BackPushButton 264 243 66 17 3 OOO_CONTROL_174 RemoveNow ReadyToRemove Banner Bitmap 0 0 474 44 1 BannerBmp ReadyToRemove BannerLine Line0 44 474 0 1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/cib_contract138c' - 3 commits - configure.ac officecfg/registry sfx2/source uui/source
configure.ac |2 +-
officecfg/registry/schema/org/openoffice/Office/Common.xcs |6 ++
sfx2/source/view/viewfrm.cxx |6 --
uui/source/iahndl-locking.cxx | 11 +++
uui/source/openlocked.cxx |3 ++-
5 files changed, 20 insertions(+), 8 deletions(-)
New commits:
commit 4953968ca5507f487433b421147e9f9ad07178ec
Author: Samuel Mehrbrodt
AuthorDate: Mon Mar 16 15:27:19 2020 +0100
Commit: Samuel Mehrbrodt
CommitDate: Mon Mar 16 15:27:19 2020 +0100
Release 6.2.9.4
Change-Id: Id3fadd12ba951323be1600b3939323bf801637e3
diff --git a/configure.ac b/configure.ac
index b3724fff8595..048e78059163 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
# several non-alphanumeric characters, those are split off and used only for
the
# ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no
idea.
-AC_INIT([LibreOffice],[6.2.9.3],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.2.9.4],[],[],[http://documentfoundation.org/])
AC_PREREQ([2.59])
commit ce1594ad5fb948449f2beac0a2adeaaa07405b4a
Author: Samuel Mehrbrodt
AuthorDate: Mon Mar 16 10:40:13 2020 +0100
Commit: Samuel Mehrbrodt
CommitDate: Mon Mar 16 15:26:50 2020 +0100
Some more places to check for AllowOverrideLocking option
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90554
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
(cherry picked from commit 10136818b4ef138fc2d5ec3af194beffed009480)
Change-Id: Id09f691ef7e3fbae03771a43af1c7b1d940365bc
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 814a45f42b6f..f15e0fc670be 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -183,13 +183,15 @@ private:
std::unique_ptr m_xQueryBox;
public:
SfxQueryOpenAsTemplate(weld::Window* pParent, bool bAllowIgnoreLock)
-: m_xQueryBox(Application::CreateMessageDialog(pParent,
VclMessageType::Question, VclButtonsType::NONE,
- SfxResId(bAllowIgnoreLock ?
STR_QUERY_OPENASTEMPLATE_ALLOW_IGNORE : STR_QUERY_OPENASTEMPLATE)))
+: m_xQueryBox(Application::CreateMessageDialog(pParent,
VclMessageType::Question, VclButtonsType::NONE, ""))
{
m_xQueryBox->add_button(SfxResId(STR_QUERY_OPENASTEMPLATE_OPENCOPY_BTN),
RET_YES);
+bAllowIgnoreLock
+= bAllowIgnoreLock &&
officecfg::Office::Common::Misc::AllowOverrideLocking::get();
if (bAllowIgnoreLock)
m_xQueryBox->add_button(SfxResId(STR_QUERY_OPENASTEMPLATE_OPEN_BTN),
RET_IGNORE);
m_xQueryBox->add_button(Button::GetStandardText(
StandardButtonType::Cancel ), RET_CANCEL);
+m_xQueryBox->set_primary_text(SfxResId(bAllowIgnoreLock ?
STR_QUERY_OPENASTEMPLATE_ALLOW_IGNORE : STR_QUERY_OPENASTEMPLATE));
m_xQueryBox->set_default_response(RET_YES);
}
short run() { return m_xQueryBox->run(); }
diff --git a/uui/source/iahndl-locking.cxx b/uui/source/iahndl-locking.cxx
index 8a9af9c77b35..5ecdfbfba502 100644
--- a/uui/source/iahndl-locking.cxx
+++ b/uui/source/iahndl-locking.cxx
@@ -81,13 +81,14 @@ handleLockedDocumentRequest_(
std::vector< OUString > aArguments;
aArguments.push_back( aDocumentURL );
+bool bAllowOverride = xRetry.is() &&
officecfg::Office::Common::Misc::AllowOverrideLocking::get();
+
sal_Int32 nResult = RET_CANCEL;
if ( nMode == UUI_DOC_LOAD_LOCK )
{
aArguments.push_back( !aInfo.isEmpty()
? aInfo
: Translate::get( STR_UNKNOWNUSER, aResLocale) );
-bool bAllowOverride = xRetry.is() &&
officecfg::Office::Common::Misc::AllowOverrideLocking::get();
aArguments.push_back( bAllowOverride
? Translate::get(
STR_OPENLOCKED_ALLOWIGNORE_MSG, aResLocale )
: "" );
@@ -95,7 +96,7 @@ handleLockedDocumentRequest_(
aMessage = UUIInteractionHelper::replaceMessageWithArguments(
aMessage, aArguments );
-OpenLockedQueryBox aDialog(pParent, aResLocale, aMessage, xRetry.is());
+OpenLockedQueryBox aDialog(pParent, aResLocale, aMessage,
bAllowOverride);
nResult = aDialog.run();
}
else if ( nMode == UUI_DOC_SAVE_LOCK )
@@ -104,12 +105,12 @@ handleLockedDocumentRequest_(
? aInfo
: Translate::get( STR_UNKNOWNUSER,
aResLocale ) );
-aMessage = Translate::get(xRetry.is() ? STR_OVERWRITE_IGNORELOCK_MSG :
STR_TRYLATER_MSG,
+aMessage = Translate::get(bAllowOverride ?
STR_OVERWRITE_IGNORELOCK_MSG : STR_TRYLATER_MSG,
aResLocale);
aMessage =
[Libreoffice-commits] online.git: android/app
android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java
| 11 +
android/app/src/main/java/org/libreoffice/androidapp/ui/RecentFilesAdapter.java
| 57 +++---
2 files changed, 54 insertions(+), 14 deletions(-)
New commits:
commit 10c695cfbbb8a9072388f5f0a03f557aa51955cf
Author: mert
AuthorDate: Tue Mar 10 19:08:11 2020 +0300
Commit: Andras Timar
CommitDate: Mon Mar 16 15:50:05 2020 +0100
android: fix crash on removed/renamed file on recent files
Change-Id: Iedeaba896ecca17c0c7e5c038b1c370b72484c68
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90290
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Mert Tümer
diff --git
a/android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java
b/android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java
index 1ef2acc45..bd9116c94 100644
---
a/android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java
+++
b/android/app/src/main/java/org/libreoffice/androidapp/ui/LibreOfficeUIActivity.java
@@ -113,7 +113,7 @@ public class LibreOfficeUIActivity extends
AppCompatActivity implements Settings
public static final String EXPLORER_VIEW_TYPE_KEY = "EXPLORER_VIEW_TYPE";
public static final String EXPLORER_PREFS_KEY = "EXPLORER_PREFS";
public static final String SORT_MODE_KEY = "SORT_MODE";
-private static final String RECENT_DOCUMENTS_KEY = "RECENT_DOCUMENTS_LIST";
+public static final String RECENT_DOCUMENTS_KEY = "RECENT_DOCUMENTS_LIST";
private static final String ENABLE_SHOW_HIDDEN_FILES_KEY =
"ENABLE_SHOW_HIDDEN_FILES";
public static final String NEW_FILE_PATH_KEY = "NEW_FILE_PATH_KEY";
@@ -208,6 +208,12 @@ public class LibreOfficeUIActivity extends
AppCompatActivity implements Settings
recentRecyclerView.setAdapter(new RecentFilesAdapter(this,
recentUris));
}
+/** access shared preferences from the activity instance */
+public SharedPreferences getPrefs()
+{
+return prefs;
+}
+
/** Create the Navigation menu and set up the actions and everything
there. */
public void setupNavigationDrawer() {
drawerLayout = findViewById(R.id.drawer_layout);
@@ -986,6 +992,9 @@ public class LibreOfficeUIActivity extends
AppCompatActivity implements Settings
Uri shortcutUri = Uri.parse(pathString);
String filename = RecentFilesAdapter.getUriFilename(this,
shortcutUri);
+if (filename == null)
+continue;
+
Intent intent = getIntentToEdit(shortcutUri);
ShortcutInfo.Builder builder = new ShortcutInfo.Builder(this,
filename)
.setShortLabel(filename)
diff --git
a/android/app/src/main/java/org/libreoffice/androidapp/ui/RecentFilesAdapter.java
b/android/app/src/main/java/org/libreoffice/androidapp/ui/RecentFilesAdapter.java
index 4a06899a9..371b7ab03 100644
---
a/android/app/src/main/java/org/libreoffice/androidapp/ui/RecentFilesAdapter.java
+++
b/android/app/src/main/java/org/libreoffice/androidapp/ui/RecentFilesAdapter.java
@@ -22,6 +22,7 @@ import android.widget.TextView;
import org.libreoffice.androidapp.R;
import java.text.SimpleDateFormat;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -34,11 +35,11 @@ class RecentFilesAdapter extends
RecyclerView.Adapter recentUris;
+private ArrayList recentFiles;
RecentFilesAdapter(LibreOfficeUIActivity activity, List recentUris) {
this.mActivity = activity;
-this.recentUris = recentUris;
+initRecentFiles(recentUris);
}
@Override
@@ -47,6 +48,26 @@ class RecentFilesAdapter extends
RecyclerView.Adapter recentUris) {
+this.recentFiles = new ArrayList<>();
+boolean invalidUriFound = false;
+String joined = "";
+for (Uri u: recentUris) {
+String filename = getUriFilename(mActivity, u);
+if (null != filename) {
+long length = getUriFileLength(mActivity, u);
+recentFiles.add(new RecentFile(u, filename, length));
+joined = joined.concat(u.toString()+"\n");
+}
+else
+invalidUriFound = true;
+}
+if (invalidUriFound) {
+
mActivity.getPrefs().edit().putString(mActivity.RECENT_DOCUMENTS_KEY,
joined).apply();
+}
+}
+
/** Return the filename of the given Uri. */
public static String getUriFilename(Activity activity, Uri uri) {
String filename = "";
@@ -60,11 +81,8 @@ class RecentFilesAdapter extends
RecyclerView.Adapter segments = uri.getPathSegments();
-if (segments.size() > 0)
-filename = segments.get(segments.size() - 1);
-}
+if (filename.isEmpty())
+return null;
return filename;
}
@@ -91,17 +109,18 @@ class
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.Toolbar.js |6 +---
loleaflet/src/layer/tile/TileLayer.js | 33 +++---
loleaflet/src/map/handler/Map.TouchGesture.js |6 ++--
3 files changed, 25 insertions(+), 20 deletions(-)
New commits:
commit 2462bf7a19daa56fe2fea9681587c22e6503c360
Author: mert
AuthorDate: Wed Feb 26 16:58:30 2020 +0300
Commit: Andras Timar
CommitDate: Mon Mar 16 15:57:57 2020 +0100
hyperlink popup clean up
hyperlink popups shouldnt contain href for links
also we shouldnt show popup for internal links
core must handle it
Change-Id: Ice5535890a6c45cea7a3d9f70b21ad5f9e66f2eb
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89550
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/loleaflet/src/control/Control.Toolbar.js
b/loleaflet/src/control/Control.Toolbar.js
index 9e8d87d8c..79d392563 100644
--- a/loleaflet/src/control/Control.Toolbar.js
+++ b/loleaflet/src/control/Control.Toolbar.js
@@ -2626,10 +2626,8 @@ function setupToolbar(e) {
map._docLayer._twipsToLatLng(bottomRightTwips, map.getZoom()));
//click pos tweak
cellCursor._northEast.lng =
cellCursor._southWest.lng;
- map.hyperlinkPopup = new L.Popup({className:
'hyperlink-popup', closeButton: false, closeOnClick: false})
- .setContent('' + e.url + '')
- .setLatLng(cellCursor._northEast)
- .openOn(map);
+ map._docLayer._closeURLPopUp();
+
map._docLayer._showURLPopUp(cellCursor._northEast, e.url);
} else {
map.fire('warn', {url: e.url, map: map, cmd:
'openlink'});
}
diff --git a/loleaflet/src/layer/tile/TileLayer.js
b/loleaflet/src/layer/tile/TileLayer.js
index 52660885a..d302dccc4 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -1112,6 +1112,21 @@ L.TileLayer = L.GridLayer.extend({
}
},
+ _showURLPopUp: function(position, url) {
+ // # for internal links
+ if (!url.startsWith('#')) {
+ this._map.hyperlinkPopup = new L.Popup({className:
'hyperlink-popup', closeButton: false, closeOnClick: false})
+ .setContent(''+url+'')
+ .setLatLng(position)
+ .openOn(this._map);
+ }
+ },
+
+ _closeURLPopUp: function() {
+ this._map.closePopup(this._map.hyperlinkPopup);
+ this._map.hyperlinkPopup = null;
+ },
+
_onHyperlinkClickedMsg: function (textMsg) {
var link = null;
var coords = null;
@@ -1148,13 +1163,9 @@ L.TileLayer = L.GridLayer.extend({
this._map.lastActionByUser = false;
this._map.hyperlinkUnderCursor = obj.hyperlink;
- this._map.closePopup(this._map.hyperlinkPopup);
- this._map.hyperlinkPopup = null;
+ this._closeURLPopUp();
if (obj.hyperlink && obj.hyperlink.link) {
- this._map.hyperlinkPopup = new L.Popup({className:
'hyperlink-popup', closeButton: false, closeOnClick: false})
- .setContent('' + obj.hyperlink.link + '')
- .setLatLng(cursorPos)
- .openOn(this._map);
+ this._showURLPopUp(cursorPos, obj.hyperlink.link);
}
if (!this._map.editorHasFocus() && (modifierViewId ===
this._viewId) && (this._map._permission === 'edit')) {
@@ -2915,19 +2926,15 @@ L.TileLayer = L.GridLayer.extend({
targetURL = targetURL.split('"').join('');
targetURL = this._map.makeURLFromStr(targetURL);
- this._map.closePopup(this._map.hyperlinkPopup);
- this._map.hyperlinkPopup = null;
+ this._closeURLPopUp();
if (targetURL) {
- this._map.hyperlinkPopup = new
L.Popup({className: 'hyperlink-popup', closeButton: false, closeOnClick: false})
- .setContent('' + targetURL + '')
-
.setLatLng(this._cellCursorMarker._bounds._northEast)
- .openOn(this._map);
+
this._showURLPopUp(this._cellCursorMarker._bounds._northEast, targetURL);
}
}
else if (this._map.hyperlinkPopup)
{
- this._map.closePopup(this._map.hyperlinkPopup);
+
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sc/source
sc/source/filter/oox/numberformatsbuffer.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 95d35dd3109263a1708fab143accc0f45a05758d
Author: Eike Rathke
AuthorDate: Sun Mar 15 18:22:05 2020 +0100
Commit: Xisco Faulí
CommitDate: Mon Mar 16 16:47:18 2020 +0100
Resolves: tdf#129985 OOXML import: do not force a fixed-locale number format
... instead of system locale.
Change-Id: Ie7b4c6a560468f142df6916f50bfda9daaf7c379
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90538
Reviewed-by: Eike Rathke
Tested-by: Jenkins
(cherry picked from commit 5b88a664b1ad2b5761a4672678845cc77be6cd4d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90399
Reviewed-by: Xisco Faulí
diff --git a/sc/source/filter/oox/numberformatsbuffer.cxx
b/sc/source/filter/oox/numberformatsbuffer.cxx
index 2ca5a3dc88f2..2787dacd3aa0 100644
--- a/sc/source/filter/oox/numberformatsbuffer.cxx
+++ b/sc/source/filter/oox/numberformatsbuffer.cxx
@@ -2054,7 +2054,7 @@ void NumberFormatsBuffer::insertBuiltinFormats()
{
// do not put the current system locale for default table
Locale aLocale;
-if( (*aVIt)->mpcParent[ 0 ] != '\0' )
+if( (*aVIt)->mpcParent[ 0 ] != '\0' &&
OUString::createFromAscii((*aVIt)->mpcLocale) != maLocaleStr )
aLocale = aSysLocale;
for( const BuiltinFormat* pBuiltin = (*aVIt)->mpFormats; pBuiltin &&
(pBuiltin->mnNumFmtId >= 0); ++pBuiltin )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source vcl/win
vcl/source/app/svapp.cxx | 11 ++-
vcl/win/app/salinfo.cxx | 10 +-
2 files changed, 19 insertions(+), 2 deletions(-)
New commits:
commit 3741d70743c297029f54b20b0ca711f40cff7097
Author: Samuel Mehrbrodt
AuthorDate: Thu Mar 12 14:12:59 2020 +0100
Commit: Samuel Mehrbrodt
CommitDate: Mon Mar 16 16:55:01 2020 +0100
Some more checks for correct screen size
Change-Id: Id5a811e4227052fd9117ab2b099de31e8e3b90c2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90413
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 1f422e33617a..301b934b4ab9 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -1245,7 +1245,16 @@ unsigned int Application::GetDisplayExternalScreen()
tools::Rectangle Application::GetScreenPosSizePixel( unsigned int nScreen )
{
SalSystem* pSys = ImplGetSalSystem();
-return pSys ? pSys->GetDisplayScreenPosSizePixel( nScreen ) :
tools::Rectangle();
+if (!pSys)
+{
+SAL_WARN("vcl", "Requesting screen size/pos for screen #" << nScreen
<< " failed");
+assert(false);
+return tools::Rectangle();
+}
+tools::Rectangle aRect = pSys->GetDisplayScreenPosSizePixel(nScreen);
+if (aRect.getHeight() == 0)
+SAL_WARN("vcl", "Requesting screen size/pos for screen #" << nScreen
<< " returned 0 height.");
+return aRect;
}
namespace {
diff --git a/vcl/win/app/salinfo.cxx b/vcl/win/app/salinfo.cxx
index ccb6d3806f95..a19ca597f9c5 100644
--- a/vcl/win/app/salinfo.cxx
+++ b/vcl/win/app/salinfo.cxx
@@ -20,6 +20,7 @@
#include
#include
+#include
#include
#include
@@ -155,7 +156,14 @@ unsigned int WinSalSystem::GetDisplayBuiltInScreen()
tools::Rectangle WinSalSystem::GetDisplayScreenPosSizePixel( unsigned int
nScreen )
{
initMonitors();
-return (nScreen < m_aMonitors.size()) ? m_aMonitors[nScreen].m_aArea :
tools::Rectangle();
+if (nScreen >= m_aMonitors.size())
+{
+SAL_WARN("vcl", "Requested screen size/pos for screen #"
+<< nScreen << ", but only " << m_aMonitors.size()
<< " screens found.");
+assert(false);
+return tools::Rectangle();
+}
+return m_aMonitors[nScreen].m_aArea;
}
int WinSalSystem::ShowNativeMessageBox(const OUString& rTitle, const OUString&
rMessage)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: android/lib
android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java | 22
+++---
1 file changed, 16 insertions(+), 6 deletions(-)
New commits:
commit 56632cc1c9bce65787608f60d454cd016b9e1eee
Author: Jan Holesovsky
AuthorDate: Mon Mar 16 17:35:37 2020 +0100
Commit: Michael Meeks
CommitDate: Mon Mar 16 19:40:09 2020 +0100
android: Cosmetic improvements to the content Uri download / upload.
Change-Id: I290211e0024dfc86c1f57314bbef00f7117928bd
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90584
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Michael Meeks
diff --git
a/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
b/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
index e02ce5382..8e5c3c7fe 100644
--- a/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
+++ b/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
@@ -484,11 +484,13 @@ public class LOActivity extends AppCompatActivity {
byte[] buffer = new byte[1024];
int length;
-while ((length = inputStream.read(buffer)) > 0) {
+long bytes = 0;
+while ((length = inputStream.read(buffer)) != -1) {
outputStream.write(buffer, 0, length);
+bytes += length;
}
-Log.e(TAG, "Success copying from " + uri + " to " + mTempFile);
-return true;
+
+Log.i(TAG, "Success copying " + bytes + " bytes from " + uri +
" to " + mTempFile);
} finally {
if (inputStream != null)
inputStream.close();
@@ -496,10 +498,14 @@ public class LOActivity extends AppCompatActivity {
outputStream.close();
}
} catch (FileNotFoundException e) {
+Log.e(TAG, "file not found: " + e.getMessage());
return false;
} catch (IOException e) {
+Log.e(TAG, "exception: " + e.getMessage());
return false;
}
+
+return true;
}
/** Check that we have created a temp file, and if yes, copy it back to
the content: URI. */
@@ -513,16 +519,20 @@ public class LOActivity extends AppCompatActivity {
try {
try {
+inputStream = new FileInputStream(mTempFile);
+
Uri uri = getIntent().getData();
outputStream = contentResolver.openOutputStream(uri);
-inputStream = new FileInputStream(mTempFile);
byte[] buffer = new byte[1024];
int length;
-while ((length = inputStream.read(buffer)) > 0) {
+long bytes = 0;
+while ((length = inputStream.read(buffer)) != -1) {
outputStream.write(buffer, 0, length);
+bytes += length;
}
-Log.e(TAG, "Success copying from " + mTempFile + " to " + uri);
+
+Log.i(TAG, "Success copying " + bytes + " bytes from " +
mTempFile + " to " + uri);
} finally {
if (inputStream != null)
inputStream.close();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: android/lib
android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 67757fac7e88edc528d10f9071c66ba22644dc67
Author: Jan Holesovsky
AuthorDate: Mon Mar 16 17:38:23 2020 +0100
Commit: Michael Meeks
CommitDate: Mon Mar 16 19:40:31 2020 +0100
android: Fix file corruption.
The problem was that when we were uploading back to the content Uri and
the length was shorter than the original content, the file remained as
long as before the save - which then was detected as corrupted file upon
further load.
Change-Id: Ica09a64739dbf7933d5722149134e461ae79bd80
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90585
Tested-by: Michael Meeks
Reviewed-by: Michael Meeks
diff --git
a/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
b/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
index 8e5c3c7fe..434b467ce 100644
--- a/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
+++ b/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
@@ -522,7 +522,7 @@ public class LOActivity extends AppCompatActivity {
inputStream = new FileInputStream(mTempFile);
Uri uri = getIntent().getData();
-outputStream = contentResolver.openOutputStream(uri);
+outputStream = contentResolver.openOutputStream(uri, "wt");
byte[] buffer = new byte[1024];
int length;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: android/lib
android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java | 24
+++---
1 file changed, 18 insertions(+), 6 deletions(-)
New commits:
commit da9897f72575a502711cbb7b84fc7817cb31c2bd
Author: Jan Holesovsky
AuthorDate: Mon Mar 16 18:35:43 2020 +0100
Commit: Michael Meeks
CommitDate: Mon Mar 16 19:42:06 2020 +0100
android: Use "wt" mode even for Export As.
And use a real tempfile for that when I'm touching this code.
Change-Id: Iad6ea41b9e9c6459f66f1dee0258092ead1b8de5
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90587
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Michael Meeks
diff --git
a/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
b/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
index 434b467ce..c1edd099a 100644
--- a/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
+++ b/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
@@ -613,20 +613,32 @@ public class LOActivity extends AppCompatActivity {
}
String format = getFormatForRequestCode(requestCode);
if (format != null) {
-final File tempFile = new
File(LOActivity.this.getCacheDir(), "temp.file");
-LOActivity.this.saveAs(tempFile.toURI().toString(),
format);
-try (InputStream inputStream = new
FileInputStream(tempFile)) {
-OutputStream outputStream =
getContentResolver().openOutputStream(intent.getData());
+InputStream inputStream = null;
+OutputStream outputStream = null;
+try {
+final File tempFile =
File.createTempFile("LibreOffice", "." + format, this.getCacheDir());
+LOActivity.this.saveAs(tempFile.toURI().toString(),
format);
+
+inputStream = new FileInputStream(tempFile);
+outputStream =
getContentResolver().openOutputStream(intent.getData(), "wt");
+
byte[] buffer = new byte[4096];
int len;
-while ((len = inputStream.read(buffer)) > 0) {
+while ((len = inputStream.read(buffer)) != -1) {
outputStream.write(buffer, 0, len);
}
outputStream.flush();
-outputStream.close();
} catch (Exception e) {
Toast.makeText(this, "Something went wrong while
Saving as: " + e.getMessage(), Toast.LENGTH_SHORT).show();
e.printStackTrace();
+} finally {
+try {
+if (inputStream != null)
+inputStream.close();
+if (outputStream != null)
+outputStream.close();
+} catch (Exception e) {
+}
}
return;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-1' - 2 commits - vcl/source vcl/win
vcl/source/app/svapp.cxx | 11 ++-
vcl/source/window/menu.cxx |7 +++
vcl/win/app/salinfo.cxx| 10 +-
3 files changed, 26 insertions(+), 2 deletions(-)
New commits:
commit 5d8e07231b6e8b106292f212a3c80be004e11d6a
Author: Samuel Mehrbrodt
AuthorDate: Thu Mar 12 14:12:59 2020 +0100
Commit: Thorsten Behrens
CommitDate: Mon Mar 16 18:26:57 2020 +0100
Some more checks for correct screen size
Change-Id: Id5a811e4227052fd9117ab2b099de31e8e3b90c2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90413
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
(cherry picked from commit 3741d70743c297029f54b20b0ca711f40cff7097)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90576
Tested-by: Thorsten Behrens
Reviewed-by: Thorsten Behrens
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 33420e5456fc..5a02e96b05a5 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -1229,7 +1229,16 @@ unsigned int Application::GetDisplayExternalScreen()
tools::Rectangle Application::GetScreenPosSizePixel( unsigned int nScreen )
{
SalSystem* pSys = ImplGetSalSystem();
-return pSys ? pSys->GetDisplayScreenPosSizePixel( nScreen ) :
tools::Rectangle();
+if (!pSys)
+{
+SAL_WARN("vcl", "Requesting screen size/pos for screen #" << nScreen
<< " failed");
+assert(false);
+return tools::Rectangle();
+}
+tools::Rectangle aRect = pSys->GetDisplayScreenPosSizePixel(nScreen);
+if (aRect.getHeight() == 0)
+SAL_WARN("vcl", "Requesting screen size/pos for screen #" << nScreen
<< " returned 0 height.");
+return aRect;
}
namespace {
diff --git a/vcl/win/app/salinfo.cxx b/vcl/win/app/salinfo.cxx
index 90fa81b04d0e..ba914e280e82 100644
--- a/vcl/win/app/salinfo.cxx
+++ b/vcl/win/app/salinfo.cxx
@@ -21,6 +21,7 @@
#include
#include
+#include
#include
#include
@@ -161,7 +162,14 @@ unsigned int WinSalSystem::GetDisplayBuiltInScreen()
tools::Rectangle WinSalSystem::GetDisplayScreenPosSizePixel( unsigned int
nScreen )
{
initMonitors();
-return (nScreen < m_aMonitors.size()) ? m_aMonitors[nScreen].m_aArea :
tools::Rectangle();
+if (nScreen >= m_aMonitors.size())
+{
+SAL_WARN("vcl", "Requested screen size/pos for screen #"
+<< nScreen << ", but only " << m_aMonitors.size()
<< " screens found.");
+assert(false);
+return tools::Rectangle();
+}
+return m_aMonitors[nScreen].m_aArea;
}
int WinSalSystem::ShowNativeMessageBox(const OUString& rTitle, const OUString&
rMessage)
commit a22c6cdc74584ae6c9efd731ea524de210ec8c2c
Author: Samuel Mehrbrodt
AuthorDate: Wed Mar 11 12:41:58 2020 +0100
Commit: Thorsten Behrens
CommitDate: Mon Mar 16 18:26:42 2020 +0100
Add some fallback minimum size when screen size detection goes wrong
Change-Id: I97ec2359b8ae406e310a5d043ac068ddd89b3fd1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90320
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
(cherry picked from commit 643a1492bd648fbd803ca86aca600cc2bdaf5819)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90575
Tested-by: Thorsten Behrens
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index a2d6083c234f..e2733c607e24 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -2927,6 +2927,13 @@ sal_uInt16 PopupMenu::ImplExecute( const
VclPtr& pW, const tools::R
nMaxHeight = std::min(nMaxHeight, std::max(nHeightAbove,
nHeightBelow));
}
+// In certain cases this might be misdetected with a height of 0, leading
to menus not being displayed.
+// So assume that the available screen size matches at least the system
requirements
+SAL_WARN_IF(nMaxHeight < 768, "vcl",
+"Available height misdetected as " << nMaxHeight
+ << "px. Setting to 768px
instead.");
+nMaxHeight = std::max(nMaxHeight, 768l);
+
if (pStartedFrom && pStartedFrom->IsMenuBar())
nMaxHeight -= pW->GetSizePixel().Height();
sal_Int32 nLeft, nTop, nRight, nBottom;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sc/source
sc/source/ui/docshell/docsh4.cxx |2 -- 1 file changed, 2 deletions(-) New commits: commit 67a52b17b51495a6112f42de7cb465d69f2bb139 Author: Samuel Mehrbrodt AuthorDate: Tue Mar 10 09:15:09 2020 +0100 Commit: Thorsten Behrens CommitDate: Mon Mar 16 18:27:33 2020 +0100 tdf#126742 Don't change visible area while retrieving it This leads to funny size changes in embedded calc docs Change-Id: I2c4a0fbebb782faae7508e7d61c8da9d440a5916 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90247 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt (cherry picked from commit c185263f45a556e6c695c766476e67fbd2ea3593) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90386 Reviewed-by: Thorsten Behrens diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index ced26c3261d2..9c04bae44b0f 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -2114,8 +2114,6 @@ tools::Rectangle ScDocShell::GetVisArea( sal_uInt16 nAspect ) const nStartRow = nEndRow; tools::Rectangle aNewArea = m_aDocument .GetMMRect( nStartCol,nStartRow, nEndCol,nEndRow, nVisTab ); -//TODO/LATER: different methods for setting VisArea?! -const_cast(this)->SfxObjectShell::SetVisArea( aNewArea ); return aNewArea; } else ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/gbuild sw/qa
solenv/gbuild/UITest.mk |1 +
sw/qa/uitest/findReplace/findReplace.py |2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 8ea5a522f76dd089446e901f3cd324f98cd973e7
Author: Noel Grandin
AuthorDate: Mon Mar 16 15:29:52 2020 +0200
Commit: Noel Grandin
CommitDate: Mon Mar 16 19:09:26 2020 +0100
make python warnings in our UITests error early
rather than erroring only on some of the buildbots (in particular one of
the daily buildbots seems to have this on by default)
And fix a invalid escape sequence we discover in the process.
Change-Id: Icd62dae2959e5117dec8949ce55dd484503fc446
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90565
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/solenv/gbuild/UITest.mk b/solenv/gbuild/UITest.mk
index f90a1abe1b21..e428dbd03c48 100644
--- a/solenv/gbuild/UITest.mk
+++ b/solenv/gbuild/UITest.mk
@@ -73,6 +73,7 @@ else
PYTHONPATH="$(PYPATH)" \
TestUserDir="$(call gb_Helper_make_url,$(dir $(call
gb_UITest_get_target,$*)))" \
PYTHONDONTWRITEBYTECODE=0 \
+ PYTHONWARNINGS=error \
$(gb_TEST_ENV_VARS) \
$(gb_UITest_COMMAND) \
--soffice="$(gb_UITest_SOFFICEARG)" \
diff --git a/sw/qa/uitest/findReplace/findReplace.py
b/sw/qa/uitest/findReplace/findReplace.py
index f465e9b44aed..83821ae8662b 100644
--- a/sw/qa/uitest/findReplace/findReplace.py
+++ b/sw/qa/uitest/findReplace/findReplace.py
@@ -126,7 +126,7 @@ class findReplace(UITestCase):
self.ui_test.execute_modeless_dialog_through_command(".uno:SearchDialog")
xDialog = self.xUITest.getTopFocusWindow()
searchterm = xDialog.getChild("searchterm")
-searchterm.executeAction("TYPE",
mkPropertyValues({"TEXT":"T(est|other)\>"})) #find
+searchterm.executeAction("TYPE",
mkPropertyValues({"TEXT":"T(est|other)\\>"})) #find
replaceterm = xDialog.getChild("replaceterm")
replaceterm.executeAction("TYPE",
mkPropertyValues({"TEXT":"replaced$1"})) #replace
regexp = xDialog.getChild("regexp")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basctl/source reportdesign/source sc/source sd/source sw/source vcl/source
basctl/source/dlged/dlgedview.cxx |1 -
reportdesign/source/ui/report/SectionView.cxx |1 -
sc/source/ui/view/olinewin.cxx|1 -
sd/source/ui/slidesorter/view/SlideSorterView.cxx |1 -
sw/source/core/view/vprint.cxx|1 -
vcl/source/control/button.cxx | 17 -
vcl/source/control/imp_listbox.cxx|1 -
vcl/source/control/prgsbar.cxx|1 -
vcl/source/control/slider.cxx |1 -
vcl/source/control/spinbtn.cxx|7 ---
vcl/source/control/spinfld.cxx|5 -
vcl/source/treelist/iconviewimpl.cxx |4
vcl/source/treelist/svimpbox.cxx |5 -
vcl/source/window/status.cxx | 21 ++---
14 files changed, 2 insertions(+), 65 deletions(-)
New commits:
commit a7de363cead5cd0021d2e3df4573d4cbe27df23b
Author: Noel Grandin
AuthorDate: Mon Mar 16 15:48:43 2020 +0200
Commit: Noel Grandin
CommitDate: Mon Mar 16 19:09:02 2020 +0100
remove unnecessary Window::Update() calls, which immediately follow
Invalidate
Update() is effectively "paint immediately". Rather just let the
invalidate do it's thing and have the widget paint on the next paint
loop, along with the rest of the stuff.
This is probably mostly cargo-cult, from the days when our
invalidate/paint timer could take a long time to kick in.
Change-Id: Idff06526e9a2892244cfd8ce6947916032b0d1a9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90567
Reviewed-by: Caolán McNamara
Reviewed-by: Noel Grandin
Tested-by: Jenkins
diff --git a/basctl/source/dlged/dlgedview.cxx
b/basctl/source/dlged/dlgedview.cxx
index 3eda45a289d1..3ec0f72e1fda 100644
--- a/basctl/source/dlged/dlgedview.cxx
+++ b/basctl/source/dlged/dlgedview.cxx
@@ -110,7 +110,6 @@ void DlgEdView::MakeVisible( const tools::Rectangle& rRect,
vcl::Window& rWin )
rWin.Scroll( -nScrollX, -nScrollY );
aMap.SetOrigin( Point( aOrg.X() - nScrollX, aOrg.Y() - nScrollY ) );
rWin.SetMapMode( aMap );
-rWin.Update();
rWin.Invalidate();
// update scroll bars
diff --git a/reportdesign/source/ui/report/SectionView.cxx
b/reportdesign/source/ui/report/SectionView.cxx
index 9a23632da48a..100703eef03e 100644
--- a/reportdesign/source/ui/report/SectionView.cxx
+++ b/reportdesign/source/ui/report/SectionView.cxx
@@ -110,7 +110,6 @@ void OSectionView::MakeVisible( const tools::Rectangle&
rRect, vcl::Window& rWin
rWin.Scroll( -nScrollX, -nScrollY );
aMap.SetOrigin( Point( aOrg.X() - nScrollX, aOrg.Y() - nScrollY ) );
rWin.SetMapMode( aMap );
-rWin.Update();
rWin.Invalidate();
if ( m_pReportWindow )
diff --git a/sc/source/ui/view/olinewin.cxx b/sc/source/ui/view/olinewin.cxx
index feaec576e295..ea117e566c90 100644
--- a/sc/source/ui/view/olinewin.cxx
+++ b/sc/source/ui/view/olinewin.cxx
@@ -123,7 +123,6 @@ void ScOutlineWindow::ScrollPixel( long nDiff )
ScrollRel( nDiff, nStart, nEnd );
Invalidate( GetRectangle( 0, nInvStart, GetOutputSizeLevel() - 1, nInvEnd
) );
-Update();
// if focus becomes invisible, move it to next visible button
ImplMoveFocusToVisible( nDiff < 0 );
diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx
b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
index 31df3f5ae004..82eb09404c3d 100644
--- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx
+++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
@@ -826,7 +826,6 @@ SlideSorterView::DrawLock::~DrawLock()
if (mpWindow)
{
mpWindow->Invalidate(mrView.maRedrawRegion);
-mpWindow->Update();
}
}
diff --git a/sw/source/core/view/vprint.cxx b/sw/source/core/view/vprint.cxx
index 5f09eb999216..be73000769d9 100644
--- a/sw/source/core/view/vprint.cxx
+++ b/sw/source/core/view/vprint.cxx
@@ -114,7 +114,6 @@ void SwPaintQueue::Repaint()
{
// for previewing, since rows/columns are known in
PaintHdl (UI)
pSh->GetWin()->Invalidate();
-pSh->GetWin()->Update();
}
}
else
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index e859625f6d63..43636df0f94a 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -1462,7 +1462,6 @@ bool PushButton::PreNotify( NotifyEvent& rNEvt )
else
{
pBorder->Invalidate( InvalidateFlags::NoErase );
-pBorder->Update();
}
}
else if( (GetStyle() & WB_FLATBUTTON) ||
@@ -2206,7 +2205,6 @@ void RadioButton::ImplCallClick( bool bGrabFocus,
GetFocusFlags nFocusFlags )
mbChecked =
[Libreoffice-commits] online.git: wsd/LOOLWSD.cpp wsd/LOOLWSD.hpp
wsd/LOOLWSD.cpp | 58
wsd/LOOLWSD.hpp |4 +++
2 files changed, 33 insertions(+), 29 deletions(-)
New commits:
commit 4d9d769d950e6555de4392fb10c82efa53002611
Author: Michael Meeks
AuthorDate: Mon Mar 16 16:19:37 2020 +
Commit: Michael Meeks
CommitDate: Mon Mar 16 19:36:42 2020 +0100
Expose disk space and session checks via LOOLWSD class.
Change-Id: I7b135d325147694cc33946b34a29ab96b2e2b918
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90577
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Michael Meeks
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index ecceaca34..177360dbc 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -256,8 +256,31 @@ inline void shutdownLimitReached(const
std::shared_ptr
}
#endif
-inline void checkSessionLimitsAndWarnClients()
+#if !MOBILEAPP
+/// Internal implementation to alert all clients
+/// connected to any document.
+void alertAllUsersInternal(const std::string& msg)
+{
+std::lock_guard docBrokersLock(DocBrokersMutex);
+
+LOG_INF("Alerting all users: [" << msg << "]");
+
+if (UnitWSD::get().filterAlertAllusers(msg))
+return;
+
+for (auto& brokerIt : DocBrokers)
+{
+std::shared_ptr docBroker = brokerIt.second;
+docBroker->addCallback([msg, docBroker](){
docBroker->alertAllUsers(msg); });
+}
+}
+#endif
+
+} // end anonymous namespace
+
+void LOOLWSD::checkSessionLimitsAndWarnClients()
{
+#if !ENABLE_SUPPORT_KEY
#if !MOBILEAPP
ssize_t docBrokerCount = DocBrokers.size() -
ConvertToBroker::getInstanceCount();
if (LOOLWSD::MaxDocuments < 1 &&
@@ -276,29 +299,10 @@ inline void checkSessionLimitsAndWarnClients()
}
}
#endif
-}
-
-#if !MOBILEAPP
-/// Internal implementation to alert all clients
-/// connected to any document.
-void alertAllUsersInternal(const std::string& msg)
-{
-std::lock_guard docBrokersLock(DocBrokersMutex);
-
-LOG_INF("Alerting all users: [" << msg << "]");
-
-if (UnitWSD::get().filterAlertAllusers(msg))
-return;
-
-for (auto& brokerIt : DocBrokers)
-{
-std::shared_ptr docBroker = brokerIt.second;
-docBroker->addCallback([msg, docBroker](){
docBroker->alertAllUsers(msg); });
-}
-}
#endif
+}
-static void checkDiskSpaceAndWarnClients(const bool cacheLastCheck)
+void LOOLWSD::checkDiskSpaceAndWarnClients(const bool cacheLastCheck)
{
#if !MOBILEAPP
try
@@ -317,8 +321,6 @@ static void checkDiskSpaceAndWarnClients(const bool
cacheLastCheck)
#endif
}
-}
-
/// Remove dead and idle DocBrokers.
/// The client of idle document should've greyed-out long ago.
/// Returns true if at least one is removed.
@@ -378,7 +380,7 @@ static int forkChildren(const int number)
if (number > 0)
{
-checkDiskSpaceAndWarnClients(false);
+LOOLWSD::checkDiskSpaceAndWarnClients(false);
#ifdef KIT_IN_PROCESS
forkLibreOfficeKit(LOOLWSD::ChildRoot, LOOLWSD::SysTemplate,
LOOLWSD::LoTemplate, LO_JAIL_SUBPATH, number);
@@ -2874,12 +2876,10 @@ private:
// Add and load the session.
docBroker->addSession(clientSession);
-checkDiskSpaceAndWarnClients(true);
-#if !ENABLE_SUPPORT_KEY
+LOOLWSD::checkDiskSpaceAndWarnClients(true);
// Users of development versions get just an
info
// when reaching max documents or connections
-checkSessionLimitsAndWarnClients();
-#endif
+LOOLWSD::checkSessionLimitsAndWarnClients();
}
catch (const UnauthorizedRequestException& exc)
{
diff --git a/wsd/LOOLWSD.hpp b/wsd/LOOLWSD.hpp
index 166de2817..383263314 100644
--- a/wsd/LOOLWSD.hpp
+++ b/wsd/LOOLWSD.hpp
@@ -191,6 +191,10 @@ public:
/// child kit processes and cleans up DocBrokers.
static void doHousekeeping();
+static void checkDiskSpaceAndWarnClients(const bool cacheLastCheck);
+
+static void checkSessionLimitsAndWarnClients();
+
/// Close document with @docKey and a @message
static void closeDocument(const std::string& docKey, const std::string&
message);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: android/lib
android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java |4
++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit b10113158efc2f646cc4ef14e6cb94521746e749
Author: Jan Holesovsky
AuthorDate: Mon Mar 16 11:20:51 2020 +0100
Commit: Michael Meeks
CommitDate: Mon Mar 16 19:38:16 2020 +0100
android: Dismiss the progress dialog on error too.
Change-Id: Ib88e98769bb59134ca90268a6a177459023aa842
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90583
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Michael Meeks
diff --git
a/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
b/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
index 470431e5b..e02ce5382 100644
--- a/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
+++ b/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
@@ -781,7 +781,7 @@ public class LOActivity extends AppCompatActivity {
});
// update progress bar when loading
-if (message.startsWith("'statusindicator")) {
+if (message.startsWith("'statusindicator") ||
message.startsWith("'error:")) {
runOnUiThread(new Runnable() {
public void run() {
// update progress bar if it exists
@@ -798,7 +798,7 @@ public class LOActivity extends AppCompatActivity {
mProgressDialog.determinateProgress(progress);
}
-else if (message.startsWith("'statusindicatorfinish:")) {
+else if (message.startsWith("'statusindicatorfinish:") ||
message.startsWith("'error:")) {
mProgressDialog.dismiss();
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Your presentation on LibreOffice code
Jan-Marek Glogowski wrote: > If you want to generate single glyphs from multiple keystrokes, then you > should have a look into input method handling (IM), like ibus or fcitx, > which> is normally used to type complex-glyph based languages, like Chinese. I know this is outside LO, but is this as easy as editing a file and adding my mapping, and if so, is there an example I can look at? > Hard to say, if this is a general problem of your font or a bug in LO or > just caused by your changes to the VCL gtk3 plugin key handling code in LO. > > If you have some other working example document, like a UTF-8 encoded > text file, which you know is displayed correctly in some Gtk > application, than you could copy and paste that text into Writer and > then select your font. That should already work, without any code changes. I just tested this and it works very well and correctly shows my text! So it now comes down to the input mechanism and making it work for the keystrokes. LayoutText is not the right place? > Maybe try contact either people from unicode.org or icu-project.org? > They should eventually be able to assign some code point ranges for your > language / glyphs, so other programs can also represent your glyphs > correctly. I have no idea, how the unicode people work, but especially > if you have an actively used language, that would be my way to go. Unicode is the problem! In the early 1990s, UTF-8 encoding started off as 31-bit encoding scheme. IEEE came up with a 32-bit scheme. Unicode should have done the same thing. It was well intentioned when it started off and was supposed to accommodate all languages. Today, Unicode Consortium is run by people from large firms who, over time, restricted Unicode to 16 and 20-bits and there is no space for every character. Of course, Unicode neatly fits in with the ancient DBCS technology of Microsoft. Another problem is that even GTK's code tests for unicode compatibility and will not accept "non-standard" strings, for example, file names not recognized as unicode compatible. Thanks! -a ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/tdf128646.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport5.cxx | 14 ++
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 30 --
3 files changed, 42 insertions(+), 2 deletions(-)
New commits:
commit 2be656908e9f30d0b0f795cc67096f0d673a3a21
Author: László Németh
AuthorDate: Fri Mar 13 17:08:34 2020 +0100
Commit: László Németh
CommitDate: Mon Mar 16 22:23:32 2020 +0100
tdf#128646 DOCX import: don't hide shape of hidden paragraph
if the shape is not hidden, but it's anchored to
an empty table cell paragraph.
Change-Id: I97e42431d083d3c70ff67981676e322ca8e7f89d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90568
Tested-by: Jenkins
Reviewed-by: László Németh
diff --git a/sw/qa/extras/ooxmlexport/data/tdf128646.docx
b/sw/qa/extras/ooxmlexport/data/tdf128646.docx
new file mode 100644
index ..9648df35a2f3
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf128646.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
index 470e47714940..cc4cc8f33bfa 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
@@ -641,6 +641,20 @@ DECLARE_OOXMLEXPORT_TEST(testTdf95033, "tdf95033.docx")
assertXPath(pXmlDocument,
"/w:document/w:body/w:tbl/w:tr[9]/w:tc[2]/w:tcPr/w:tcBorders/w:bottom[@w:val =
'nil']", 0);
}
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf128646, "tdf128646.docx")
+{
+// The problem was that not hidden shapes anchored to empty hidden
paragraphs were imported as hidden.
+xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+
+
assertXPath(pXmlDoc,"/w:document/w:body/w:tbl/w:tr/w:tc/w:p[7]/w:pPr/w:rPr/w:vanish",
1);
+if (!mbExported)
+// originally no (the same as )
+
assertXPath(pXmlDoc,"/w:document/w:body/w:tbl/w:tr/w:tc/w:p[7]/w:r/w:rPr/w:vanish",
0);
+else
+// This was hidden ()
+
assertXPath(pXmlDoc,"/w:document/w:body/w:tbl/w:tr/w:tc/w:p[7]/w:r/w:rPr/w:vanish",
"val", "false");
+}
+
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testFdo77129, "fdo77129.docx")
{
// The problem was that text after TOC field was missing if footer
reference comes in field.
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 3e87fcb0a2b5..cc4311d0aaff 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1751,10 +1751,11 @@ void DomainMapper_Impl::finishParagraph( const
PropertyMapPtr& pPropertyMap, con
css::uno::Reference
xParaProps(xTextRange, uno::UNO_QUERY);
-// table style has got bigger precedence than docDefault style
-// collect these pending paragraph properties to process in
endTable()
+// table style precedence and not hidden shapes anchored to
hidden empty table paragraphs
if (xParaProps && m_nTableDepth > 0)
{
+// table style has got bigger precedence than docDefault
style
+// collect these pending paragraph properties to process
in endTable()
uno::Reference xCur =
xTextRange->getText( )->createTextCursor( );
xCur->gotoEnd(false);
xCur->goLeft(1, false);
@@ -1763,6 +1764,31 @@ void DomainMapper_Impl::finishParagraph( const
PropertyMapPtr& pPropertyMap, con
xParaCursor->gotoStartOfParagraph(false);
TableParagraph aPending{xParaCursor, xCur, pParaContext,
xParaProps};
m_aParagraphsToEndTable.push_back(aPending);
+
+// hidden empty paragraph with a not hidden shape, set as
not hidden
+o3tl::optional pHidden;
+if ( !m_aAnchoredObjectAnchors.empty() && (pHidden =
pParaContext->getProperty(PROP_CHAR_HIDDEN)) )
+{
+bool bIsHidden;
+pHidden->second >>= bIsHidden;
+if (bIsHidden)
+{
+bIsHidden = false;
+pHidden =
GetTopContext()->getProperty(PROP_CHAR_HIDDEN);
+if (pHidden)
+pHidden->second >>= bIsHidden;
+if (!bIsHidden)
+{
+uno::Reference xCur3 =
xTextRange->getText()->createTextCursorByRange(xParaCursor);
+xCur3->goRight(1, true);
+if (xCur3->getString() == SAL_NEWLINE_STRING)
+{
+uno::Reference< beans::XPropertySet >
xProp( xCur3, uno::UNO_QUERY );
+
[Libreoffice-commits] core.git: svx/source
svx/source/tbxctrls/layctrl.cxx |8
1 file changed, 8 insertions(+)
New commits:
commit 1fbeba66e823cea043fdd3f4c50d7b90585aaf30
Author: TJ Holt
AuthorDate: Thu Mar 12 13:36:42 2020 -0700
Commit: Jim Raykowski
CommitDate: Tue Mar 17 00:24:45 2020 +0100
tdf#127443 Table creation with keyboard
Change-Id: If0efe4c49e2da96677f24182afc39e640421b0a2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90192
Tested-by: Jenkins
Reviewed-by: Jim Raykowski
diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx
index 6683500ec4a0..88b110e8c1f1 100644
--- a/svx/source/tbxctrls/layctrl.cxx
+++ b/svx/source/tbxctrls/layctrl.cxx
@@ -189,7 +189,11 @@ bool TableWidget::KeyInput(const KeyEvent& rKEvt)
break;
case KEY_DOWN:
if ( nNewLine < TABLE_CELLS_VERT )
+{
nNewLine++;
+if ( nNewCol == 0 )
+nNewCol = 1;
+}
else
mxControl->CloseAndShowTableDialog();
break;
@@ -201,7 +205,11 @@ bool TableWidget::KeyInput(const KeyEvent& rKEvt)
break;
case KEY_RIGHT:
if ( nNewCol < TABLE_CELLS_HORIZ )
+{
nNewCol++;
+if ( nNewLine == 0 )
+nNewLine = 1;
+}
else
mxControl->CloseAndShowTableDialog();
break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/images loleaflet/src
loleaflet/images/lc_sdtabledesignpanel.svg |1 +
loleaflet/src/control/Control.JSDialogBuilder.js |5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 6b4539f40ea40e492965feb1e429e23db4be761d
Author: Pedro Pinto Silva
AuthorDate: Mon Mar 16 17:42:46 2020 +0100
Commit: Pedro Pinto da Silva
CommitDate: Mon Mar 16 18:29:49 2020 +0100
Mobile: Impress: mobileWizard: Table properties: Add id to table design and
add respective icon
Change-Id: I73ab3844fe0fbf8cb8178cb46e850ff5d3eb37c0
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90579
Tested-by: Jenkins CollaboraOffice
Tested-by: Pedro Pinto da Silva
Reviewed-by: Pedro Pinto da Silva
diff --git a/loleaflet/images/lc_sdtabledesignpanel.svg
b/loleaflet/images/lc_sdtabledesignpanel.svg
new file mode 100644
index 0..c3c697518
--- /dev/null
+++ b/loleaflet/images/lc_sdtabledesignpanel.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg;>
\ No newline at end of file
diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js
b/loleaflet/src/control/Control.JSDialogBuilder.js
index c9c1965d1..f0171fb41 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -242,8 +242,9 @@ L.Control.JSDialogBuilder = L.Control.extend({
var leftDiv = L.DomUtil.create('div', 'ui-header-left',
sectionTitle);
var titleClass = '';
- if (sectionTitle.id === 'paperformat' || sectionTitle.id ===
'orientation' || sectionTitle.id === 'masterslide')
- iconPath = 'images/lc_'+ sectionTitle.id +'.svg';
+ console.debug('sectionTitle.id' + sectionTitle.id);
+ if (sectionTitle.id === 'paperformat' || sectionTitle.id ===
'orientation' || sectionTitle.id === 'masterslide' || sectionTitle.id ===
'SdTableDesignPanel')
+ iconPath = 'images/lc_'+ sectionTitle.id.toLowerCase()
+'.svg';
if (iconPath) {
var icon = L.DomUtil.create('img', 'menu-entry-icon',
leftDiv);
icon.src = iconPath;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/DomainMapper.cxx | 43 +--
writerfilter/source/dmapper/NumberingManager.cxx | 21 +--
writerfilter/source/ooxml/model.xml | 10 -
writerfilter/source/rtftok/rtfdispatchflag.cxx | 23
writerfilter/source/rtftok/rtfdispatchvalue.cxx | 11 +++--
5 files changed, 88 insertions(+), 20 deletions(-)
New commits:
commit 496197fe4dff2cd94ceeb42fc04d0263ac8d8971
Author: Miklos Vajna
AuthorDate: Mon Mar 16 17:25:31 2020 +0100
Commit: Miklos Vajna
CommitDate: Mon Mar 16 18:07:54 2020 +0100
DOCX import: tokenize
Which means CT_NumFmt has to be a property resource, not a single value,
and also ST_NumberFormat needs to recognize "custom" as a valid value.
Adapt the RTF tokenizer to emit the new token format.
This is needed (but not enough) to support markup like this:
Change-Id: I767e4b92fc41f9425f446d6eaad1d875e2233964
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90578
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index cd21f22d6acd..d84c94b2fbfe 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1179,6 +1179,37 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
m_pImpl->startOrEndPermissionRange(nIntValue);
break;
}
+case NS_ooxml::LN_CT_NumFmt_val:
+{
+try
+{
+uno::Reference xFtnEdnSettings;
+if (m_pImpl->IsInFootnoteProperties())
+{
+uno::Reference
xFootnotesSupplier(
+m_pImpl->GetTextDocument(), uno::UNO_QUERY);
+if (xFootnotesSupplier.is())
+xFtnEdnSettings =
xFootnotesSupplier->getFootnoteSettings();
+}
+else
+{
+uno::Reference xEndnotesSupplier(
+m_pImpl->GetTextDocument(), uno::UNO_QUERY);
+if (xEndnotesSupplier.is())
+xFtnEdnSettings =
xEndnotesSupplier->getEndnoteSettings();
+}
+if (xFtnEdnSettings.is())
+{
+sal_Int16 nNumType =
ConversionHelper::ConvertNumberingType(nIntValue);
+
xFtnEdnSettings->setPropertyValue(getPropertyName(PROP_NUMBERING_TYPE),
+ uno::makeAny(nNumType));
+}
+}
+catch (const uno::Exception&)
+{
+}
+}
+break;
default:
SAL_WARN("writerfilter", "DomainMapper::lcl_attribute: unhandled
token: " << nName);
}
@@ -2279,10 +2310,18 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const
PropertyMapPtr& rContext )
//endnotes in word can be at section end or document end - writer supports
only the latter
// -> so this property can be ignored
break;
-case NS_ooxml::LN_EG_FtnEdnNumProps_numStart:
-case NS_ooxml::LN_EG_FtnEdnNumProps_numRestart:
case NS_ooxml::LN_CT_FtnProps_numFmt:
case NS_ooxml::LN_CT_EdnProps_numFmt:
+{
+writerfilter::Reference::Pointer_t pProperties =
rSprm.getProps();
+if (pProperties.get())
+{
+pProperties->resolve(*this);
+}
+}
+break;
+case NS_ooxml::LN_EG_FtnEdnNumProps_numStart:
+case NS_ooxml::LN_EG_FtnEdnNumProps_numRestart:
{
try
{
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx
b/writerfilter/source/dmapper/NumberingManager.cxx
index 7084547c4d1a..9c337708d255 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -100,7 +100,7 @@ void ListLevel::SetValue( Id nId, sal_Int32 nValue )
case NS_ooxml::LN_CT_Lvl_start:
m_nIStartAt = nValue;
break;
-case NS_ooxml::LN_CT_Lvl_numFmt:
+case NS_ooxml::LN_CT_NumFmt_val:
m_nNFC = nValue;
break;
case NS_ooxml::LN_CT_Lvl_isLgl:
@@ -738,6 +738,8 @@ void ListsManager::lcl_attribute( Id nName, Value& rVal )
break;
case NS_ooxml::LN_CT_Lvl_start:
case NS_ooxml::LN_CT_Lvl_numFmt:
+case NS_ooxml::LN_CT_NumFmt_format:
+case NS_ooxml::LN_CT_NumFmt_val:
case NS_ooxml::LN_CT_Lvl_isLgl:
case NS_ooxml::LN_CT_Lvl_legacy:
if ( pCurrentLvl.get( ) )
@@ -960,18 +962,29 @@ void ListsManager::lcl_sprm( Sprm& rSprm )
bIsStartVisited = true;
break;
case NS_ooxml::LN_CT_Lvl_numFmt:
-case NS_ooxml::LN_CT_Lvl_isLgl:
-case NS_ooxml::LN_CT_Lvl_legacy:
+{
+
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/layer/tile/TileLayer.js |3 +++
1 file changed, 3 insertions(+)
New commits:
commit c34ca443b2037b4cf200a17013481c1cc75090a4
Author: mert
AuthorDate: Mon Mar 16 12:34:00 2020 +0300
Commit: Andras Timar
CommitDate: Mon Mar 16 18:09:20 2020 +0100
mobile: fix hyperlink popup does not disappear.
popups dont disapper on impress also other types of documents
when tapping on graphics
Change-Id: I3b6c64f3347e6ea6aa52c9568bec3233b748d932
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90555
Tested-by: Andras Timar
Reviewed-by: Andras Timar
diff --git a/loleaflet/src/layer/tile/TileLayer.js
b/loleaflet/src/layer/tile/TileLayer.js
index d302dccc4..4937e7c31 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -919,6 +919,9 @@ L.TileLayer = L.GridLayer.extend({
},
_onGraphicSelectionMsg: function (textMsg) {
+ if (this._map.hyperlinkPopup !== null) {
+ this._closeURLPopUp();
+ }
if (textMsg.match('EMPTY')) {
this._resetSelectionRanges();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa
sc/qa/uitest/calc_dialogs/openDialogs.py |3 -
sc/qa/uitest/calc_tests/data/tdf130371.ods |binary
sc/qa/uitest/calc_tests9/tdf130371.py | 72 +
3 files changed, 74 insertions(+), 1 deletion(-)
New commits:
commit 9a7fb5f2c4eea895e545437081ad50582bf7cacf
Author: Xisco Fauli
AuthorDate: Mon Mar 16 15:49:23 2020 +0100
Commit: Xisco Faulí
CommitDate: Mon Mar 16 18:13:56 2020 +0100
tdf#130371: Add UItest
Change-Id: Ia1bd884d3aa4210e777ea59aece50940d3aa6f68
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90571
Tested-by: Jenkins
Reviewed-by: Xisco Faulí
diff --git a/sc/qa/uitest/calc_dialogs/openDialogs.py
b/sc/qa/uitest/calc_dialogs/openDialogs.py
index 7d38ba004da1..d49701aae5f4 100644
--- a/sc/qa/uitest/calc_dialogs/openDialogs.py
+++ b/sc/qa/uitest/calc_dialogs/openDialogs.py
@@ -73,7 +73,8 @@ dialogs = [
# {"command": ".uno:AddName", "closeButton": "cancel"},
# Cancel button tested in uitest/demo_ui/edit.py
# "add" button tested in uitest/calc_tests/create_range_name.py
-{"command": ".uno:DefineName", "closeButton": "cancel"},
+#{"command": ".uno:DefineName", "closeButton": "cancel"},
+# tested in sc/qa/uitest/calc_tests9/tdf130371.py
# {"command": ".uno:SheetInsertName", "closeButton": "close"},
# dialog does not open
{"command": ".uno:CreateNames", "closeButton": "cancel", "skipTestOK":
True},
diff --git a/sc/qa/uitest/calc_tests/data/tdf130371.ods
b/sc/qa/uitest/calc_tests/data/tdf130371.ods
new file mode 100644
index ..41099bda3c51
Binary files /dev/null and b/sc/qa/uitest/calc_tests/data/tdf130371.ods differ
diff --git a/sc/qa/uitest/calc_tests9/tdf130371.py
b/sc/qa/uitest/calc_tests9/tdf130371.py
new file mode 100644
index ..6a8f00cbf7ef
--- /dev/null
+++ b/sc/qa/uitest/calc_tests9/tdf130371.py
@@ -0,0 +1,72 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+from uitest.framework import UITestCase
+from libreoffice.uno.propertyvalue import mkPropertyValues
+from uitest.uihelper.common import get_state_as_dict
+import org.libreoffice.unotest
+import pathlib
+
+def get_url_for_data_file(file_name):
+return
pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri()
+
+class namedRanges(UITestCase):
+
+def test_tdf130371(self):
+calc_doc =
self.ui_test.load_file(get_url_for_data_file("tdf130371.ods"))
+xCalcDoc = self.xUITest.getTopFocusWindow()
+gridwin = xCalcDoc.getChild("grid_window")
+document = self.ui_test.get_component()
+
+text1 = "value\t$Sheet2.$B$2\tSheet2"
+text2 = "value\t$Sheet3.$B$2\tSheet3"
+text3 = "value\t$Sheet4.$B$2\tSheet4"
+
+self.ui_test.execute_dialog_through_command(".uno:DefineName")
+xDialog = self.xUITest.getTopFocusWindow()
+namesList = xDialog.getChild('names')
+self.assertEqual(2, len(namesList.getChildren()))
+self.assertEqual(get_state_as_dict(namesList.getChild('0'))["Text"],
text1)
+self.assertEqual(get_state_as_dict(namesList.getChild('1'))["Text"],
text2)
+
+xOkBtn = xDialog.getChild("ok")
+xOkBtn.executeAction("CLICK", tuple())
+
+gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "B3"}))
+self.xUITest.executeCommand(".uno:Copy")
+
+self.xUITest.executeCommand(".uno:JumpToNextTable")
+self.xUITest.executeCommand(".uno:JumpToNextTable")
+
+self.xUITest.executeCommand(".uno:Paste")
+
+self.ui_test.execute_dialog_through_command(".uno:DefineName")
+xDialog = self.xUITest.getTopFocusWindow()
+namesList = xDialog.getChild('names')
+self.assertEqual(3, len(namesList.getChildren()))
+self.assertEqual(get_state_as_dict(namesList.getChild('0'))["Text"],
text1)
+self.assertEqual(get_state_as_dict(namesList.getChild('1'))["Text"],
text2)
+self.assertEqual(get_state_as_dict(namesList.getChild('2'))["Text"],
text3)
+
+xOkBtn = xDialog.getChild("ok")
+xOkBtn.executeAction("CLICK", tuple())
+
+self.xUITest.executeCommand(".uno:Undo")
+
+self.ui_test.execute_dialog_through_command(".uno:DefineName")
+xDialog = self.xUITest.getTopFocusWindow()
+namesList = xDialog.getChild('names')
+self.assertEqual(2, len(namesList.getChildren()))
+self.assertEqual(get_state_as_dict(namesList.getChild('0'))["Text"],
text1)
+self.assertEqual(get_state_as_dict(namesList.getChild('1'))["Text"],
text2)
+
+xCancelBtn = xDialog.getChild("cancel")
+xCancelBtn.executeAction("CLICK", tuple())
+
+self.ui_test.close_doc()
+
+# vim: set shiftwidth=4 softtabstop=4
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/data/xlsx/tdf129985.xlsx |binary
sc/qa/unit/subsequent_export-test.cxx | 15 +++
2 files changed, 15 insertions(+)
New commits:
commit 2f7f34bf9fb744a2615426e4414dff3ca6fbe6e4
Author: Xisco Fauli
AuthorDate: Mon Mar 16 16:40:06 2020 +0100
Commit: Xisco Faulí
CommitDate: Mon Mar 16 18:14:18 2020 +0100
tdf#129985: Add unittest
Change-Id: I9a8b923da6ca20fef9a61b9e478267d8c91ace58
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90573
Tested-by: Jenkins
Reviewed-by: Xisco Faulí
diff --git a/sc/qa/unit/data/xlsx/tdf129985.xlsx
b/sc/qa/unit/data/xlsx/tdf129985.xlsx
new file mode 100644
index ..0877ca9b8976
Binary files /dev/null and b/sc/qa/unit/data/xlsx/tdf129985.xlsx differ
diff --git a/sc/qa/unit/subsequent_export-test.cxx
b/sc/qa/unit/subsequent_export-test.cxx
index 5dad9a32ad66..5a1bba02b5f1 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -194,6 +194,7 @@ public:
void testPreserveTextWhitespaceXLSX();
void testPreserveTextWhitespace2XLSX();
void testTextDirectionXLSX();
+void testTdf129985();
void testRefStringXLSX();
void testRefStringConfigXLSX();
@@ -327,6 +328,7 @@ public:
CPPUNIT_TEST(testMoveCellAnchoredShapesODS);
CPPUNIT_TEST(testMatrixMultiplicationXLSX);
CPPUNIT_TEST(testTextDirectionXLSX);
+CPPUNIT_TEST(testTdf129985);
CPPUNIT_TEST(testRefStringXLSX);
CPPUNIT_TEST(testRefStringConfigXLSX);
@@ -4002,6 +4004,19 @@ void ScExportTest::testTextDirectionXLSX()
xDocSh->DoClose();
}
+void ScExportTest::testTdf129985()
+{
+ScDocShellRef xDocSh = loadDoc("tdf129985.", FORMAT_XLSX);
+CPPUNIT_ASSERT(xDocSh.is());
+
+xmlDocPtr pDoc = XPathHelper::parseExport2(*this, *xDocSh, m_xSFactory,
"xl/styles.xml", FORMAT_XLSX);
+CPPUNIT_ASSERT(pDoc);
+
+assertXPath(pDoc, "/x:styleSheet/x:numFmts/x:numFmt[2]", "formatCode",
"m/d/");
+
+xDocSh->DoClose();
+}
+
void ScExportTest::testTdf88657ODS()
{
ScDocShellRef xDocSh = loadDoc("tdf88657.", FORMAT_ODS);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.ContextMenu.js |7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
New commits:
commit ed70636427c0be301a2c2afa0dcc9c860bdad2cf
Author: Tamás Zolnai
AuthorDate: Mon Mar 16 18:01:23 2020 +0100
Commit: Tamás Zolnai
CommitDate: Mon Mar 16 20:27:35 2020 +0100
Enable spellchecking context menu items for Impress/Calc.
Change-Id: I0684130d3d90b4c8ba4b3dea2c912549456e8420
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90590
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tamás Zolnai
diff --git a/loleaflet/src/control/Control.ContextMenu.js
b/loleaflet/src/control/Control.ContextMenu.js
index 5b29ce168..c606ef5a1 100644
--- a/loleaflet/src/control/Control.ContextMenu.js
+++ b/loleaflet/src/control/Control.ContextMenu.js
@@ -37,7 +37,8 @@ L.Control.ContextMenu = L.Control.extend({
'FormatTrendline',
'FormatTrendlineEquation', 'FormatSelection', 'FormatStockLoss',
'FormatStockGain', 'InsertDataLabel'
, 'DeleteDataLabel', 'ResetDataPoint',
'InsertTrendline', 'InsertMeanValue',
'InsertXErrorBars' , 'InsertYErrorBars', 'ResetAllDataPoints' , 'DeleteAxis',
- 'InsertAxisTitle', 'InsertMinorGrid',
'InsertMajorGrid' , 'InsertAxis', 'DeleteMajorGrid' , 'DeleteMinorGrid'],
+ 'InsertAxisTitle', 'InsertMinorGrid',
'InsertMajorGrid' , 'InsertAxis', 'DeleteMajorGrid' , 'DeleteMinorGrid',
+ 'SpellCheckIgnoreAll',
'LanguageStatus', 'SpellCheckApplySuggestion'],
text: ['TableInsertMenu',
'InsertRowsBefore', 'InsertRowsAfter',
'InsertColumnsBefore', 'InsertColumnsAfter',
@@ -46,8 +47,8 @@ L.Control.ContextMenu = L.Control.extend({
'MergeCells', 'SetOptimalColumnWidth',
'SetOptimalRowHeight',
'UpdateCurIndex','RemoveTableOf',
'ReplyComment', 'DeleteComment',
'DeleteAuthor', 'DeleteAllNotes',
- 'SpellingAndGrammarDialog',
'LanguageStatus', 'FontDialog', 'FontDialogForParagraph',
- 'SpellCheckIgnore', 'SpellCheckIgnoreAll',
'SpellCheckApplySuggestion'],
+ 'SpellingAndGrammarDialog', 'FontDialog',
'FontDialogForParagraph',
+ 'SpellCheckIgnore'],
spreadsheet: ['MergeCells', 'SplitCell',
'RecalcPivotTable', 'FormatCellDialog',
'ShowNote', 'DeleteNote',
'SetAnchorToCell', 'SetAnchorToCellResize'],
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa
sc/qa/uitest/chart/chartWall.py | 45 +---
1 file changed, 42 insertions(+), 3 deletions(-)
New commits:
commit 036820d685c3a76c7fbfe35f47ab7b133e8a55af
Author: Xisco Fauli
AuthorDate: Mon Mar 16 19:23:50 2020 +0100
Commit: Xisco Faulí
CommitDate: Mon Mar 16 22:00:52 2020 +0100
uitest: chartWall.py: assert changes in chart
Change-Id: I8c9f4614a76015b0032347290f6b92b2892ddd10
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90588
Tested-by: Jenkins
Reviewed-by: Xisco Faulí
diff --git a/sc/qa/uitest/chart/chartWall.py b/sc/qa/uitest/chart/chartWall.py
index 29452bf98238..d0546401bf7c 100644
--- a/sc/qa/uitest/chart/chartWall.py
+++ b/sc/qa/uitest/chart/chartWall.py
@@ -13,7 +13,7 @@ from libreoffice.uno.propertyvalue import mkPropertyValues
from uitest.uihelper.common import get_state_as_dict, type_text
import org.libreoffice.unotest
import pathlib
-from uitest.path import get_srcdir_url
+
def get_url_for_data_file(file_name):
return
pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri()
@@ -41,6 +41,12 @@ class chartWall(UITestCase):
xOKBtn = xDialog.getChild("ok")
self.ui_test.close_dialog_through_button(xOKBtn)
+xWall =
document.Sheets[0].Charts[0].getEmbeddedObject().getFirstDiagram().Wall
+self.assertEqual(xWall.LineWidth, 0)
+self.assertEqual(xWall.LineTransparence, 0)
+self.assertEqual(hex(xWall.FillColor), '0xe6e6e6')
+self.assertEqual(xWall.FillTransparence, 0)
+
gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT": "Object 1"}))
gridwin.executeAction("ACTIVATE", tuple())
xChartMainTop = self.xUITest.getTopFocusWindow()
@@ -51,8 +57,6 @@ class chartWall(UITestCase):
#Click on tab "Borders".
tabcontrol = xDialog.getChild("tabcontrol")
select_pos(tabcontrol, "0")
-# print(xDialog.getChildren())
-#
xWidth = xDialog.getChild("MTR_FLD_LINE_WIDTH")
transparency = xDialog.getChild("MTR_LINE_TRANSPARENT")
@@ -63,6 +67,11 @@ class chartWall(UITestCase):
xOKBtn = xDialog.getChild("ok")
self.ui_test.close_dialog_through_button(xOKBtn)
+self.assertEqual(xWall.LineWidth, 100)
+self.assertEqual(xWall.LineTransparence, 5)
+self.assertEqual(hex(xWall.FillColor), '0xe6e6e6')
+self.assertEqual(xWall.FillTransparence, 0)
+
#reopen and verify tab "Borders".
gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT": "Object 1"}))
gridwin.executeAction("ACTIVATE", tuple())
@@ -80,6 +89,11 @@ class chartWall(UITestCase):
self.assertEqual(get_state_as_dict(xWidth)["Text"], "0.10 cm")
self.assertEqual(get_state_as_dict(transparency)["Text"], "5%")
+self.assertEqual(xWall.LineWidth, 100)
+self.assertEqual(xWall.LineTransparence, 5)
+self.assertEqual(hex(xWall.FillColor), '0xe6e6e6')
+self.assertEqual(xWall.FillTransparence, 0)
+
#Click on tab "Area"
tabcontrol = xDialog.getChild("tabcontrol")
select_pos(tabcontrol, "1")
@@ -107,6 +121,11 @@ class chartWall(UITestCase):
xOKBtn = xDialog.getChild("ok")
self.ui_test.close_dialog_through_button(xOKBtn)
+self.assertEqual(xWall.LineWidth, 100)
+self.assertEqual(xWall.LineTransparence, 5)
+self.assertEqual(hex(xWall.FillColor), '0x23a9d3')
+self.assertEqual(xWall.FillTransparence, 0)
+
#reopen and verify tab "Area".
gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT": "Object 1"}))
gridwin.executeAction("ACTIVATE", tuple())
@@ -127,6 +146,11 @@ class chartWall(UITestCase):
self.assertEqual(get_state_as_dict(gCustom)["Text"], "169")
self.assertEqual(get_state_as_dict(bCustom)["Text"], "211")
+self.assertEqual(xWall.LineWidth, 100)
+self.assertEqual(xWall.LineTransparence, 5)
+self.assertEqual(hex(xWall.FillColor), '0x23a9d3')
+self.assertEqual(xWall.FillTransparence, 0)
+
#change tab "Transparency"
select_pos(tabcontrol, "2")
transparency = xDialog.getChild("RBT_TRANS_LINEAR")
@@ -138,6 +162,11 @@ class chartWall(UITestCase):
xOKBtn = xDialog.getChild("ok")
self.ui_test.close_dialog_through_button(xOKBtn)
+self.assertEqual(xWall.LineWidth, 100)
+self.assertEqual(xWall.LineTransparence, 5)
+self.assertEqual(hex(xWall.FillColor), '0x23a9d3')
+self.assertEqual(xWall.FillTransparence, 51)
+
#reopen and verify tab "Transparency"
gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT": "Object 1"}))
gridwin.executeAction("ACTIVATE", tuple())
@@ -156,8 +185,18 @@ class chartWall(UITestCase):
self.assertEqual(get_state_as_dict(transparency)["Checked"], "true")
self.assertEqual(get_state_as_dict(transparencyPercent)["Text"], "51%")
+self.assertEqual(xWall.LineWidth, 100)
+self.assertEqual(xWall.LineTransparence, 5)
+self.assertEqual(hex(xWall.FillColor), '0x23a9d3')
+self.assertEqual(xWall.FillTransparence, 51)
+
xOKBtn =
[Libreoffice-commits] core.git: uitest/impress_tests uitest/writer_tests1
uitest/impress_tests/backgrounds.py |8 +--- uitest/writer_tests1/pageDialog.py |8 2 files changed, 9 insertions(+), 7 deletions(-) New commits: commit bc6eb8e096416d42d2308a529d5c0d81778dca60 Author: Xisco Fauli AuthorDate: Mon Mar 16 19:30:30 2020 +0100 Commit: Xisco Faulí CommitDate: Mon Mar 16 22:02:39 2020 +0100 uitest: use hex instead of int for colors Change-Id: I7309a546546637a1837df8ac99807c2deb22c72a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90589 Tested-by: Jenkins Reviewed-by: Xisco Faulí diff --git a/uitest/impress_tests/backgrounds.py b/uitest/impress_tests/backgrounds.py index b0c36db36ab4..6e2493b063f1 100644 --- a/uitest/impress_tests/backgrounds.py +++ b/uitest/impress_tests/backgrounds.py @@ -18,13 +18,15 @@ class ImpressBackgrounds(UITestCase): if btn == 'btnnone': self.assertEqual(document.DrawPages.getByIndex(0).Background, None) elif btn == 'btncolor': - self.assertEqual(document.DrawPages.getByIndex(0).Background.FillColor, 7512015) - self.assertEqual(document.DrawPages.getByIndex(0).Background.FillColor, 7512015) +self.assertEqual( + hex(document.DrawPages.getByIndex(0).Background.FillColor), '0x729fcf') +self.assertEqual( + hex(document.DrawPages.getByIndex(0).Background.FillColor), '0x729fcf') elif btn == 'btngradient': self.assertEqual( document.DrawPages.getByIndex(0).Background.FillGradient.Style, LINEAR) self.assertEqual( - document.DrawPages.getByIndex(0).Background.FillGradient.StartColor, 14543051) + hex(document.DrawPages.getByIndex(0).Background.FillGradient.StartColor), '0xdde8cb') self.assertEqual( document.DrawPages.getByIndex(0).Background.FillGradient.Angle, 300) self.assertEqual( diff --git a/uitest/writer_tests1/pageDialog.py b/uitest/writer_tests1/pageDialog.py index 233c269d891f..73e523444c6e 100644 --- a/uitest/writer_tests1/pageDialog.py +++ b/uitest/writer_tests1/pageDialog.py @@ -36,16 +36,16 @@ class WriterPageDialog(UITestCase): document.StyleFamilies.PageStyles.Standard.BackColor, -1) elif btn == 'btncolor': self.assertEqual( -document.StyleFamilies.PageStyles.Standard.BackColor, 7512015) +hex(document.StyleFamilies.PageStyles.Standard.BackColor), '0x729fcf') self.assertEqual( -document.StyleFamilies.PageStyles.Standard.FillColor, 7512015) +hex(document.StyleFamilies.PageStyles.Standard.FillColor), '0x729fcf') self.assertEqual( -document.StyleFamilies.PageStyles.Standard.FillColor, 7512015) +hex(document.StyleFamilies.PageStyles.Standard.FillColor), '0x729fcf') elif btn == 'btngradient': self.assertEqual( document.StyleFamilies.PageStyles.Standard.FillGradient.Style, LINEAR) self.assertEqual( - document.StyleFamilies.PageStyles.Standard.FillGradient.StartColor, 14543051) + hex(document.StyleFamilies.PageStyles.Standard.FillGradient.StartColor), '0xdde8cb') self.assertEqual( document.StyleFamilies.PageStyles.Standard.FillGradient.Angle, 300) self.assertEqual( ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-bugs] [Bug 60684] Images right-click save in wrong format as PNG in all modules
https://bugs.documentfoundation.org/show_bug.cgi?id=60684 Xisco Faulí changed: What|Removed |Added URL|https://rs4264979.wixsite.c | |om/mysite/post/hoe-gmail-e- | |mailfout-550-op-te-lossen | -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 131291] EDITING: Chart: Not possible to change format in labels ( only 6.3 )
https://bugs.documentfoundation.org/show_bug.cgi?id=131291 Xisco Faulí changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 131203] In the case of import of some DOCX documents with tables with specified table column width, created with Apache POI library, LO crashes
https://bugs.documentfoundation.org/show_bug.cgi?id=131203 Dieter changed: What|Removed |Added Status|UNCONFIRMED |NEEDINFO CC||dgp-m...@gmx.de Ever confirmed|0 |1 --- Comment #7 from Dieter --- (In reply to Artur Linhart from comment #5) > Unfortunatelly, I am not able top upgrade to the higher version, there is no > Debian package available for my operating system til now... I have set the bug's status to 'NEEDINFO'. Please change it back to 'UNCONFIRMED' if the bug is still present in the latest version. Change to RESOLVED WORKSFORME, if the problem went away. BTW: Have you checked downloads on LO page? https://www.libreoffice.org/download/download/ -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 131071] FILEOPEN DOCX Default font size of table not applied
https://bugs.documentfoundation.org/show_bug.cgi?id=131071 Justin L changed: What|Removed |Added Status|NEW |ASSIGNED Assignee|libreoffice-b...@lists.free |jl...@mail.com |desktop.org | --- Comment #4 from Justin L --- proposed fix at https://gerrit.libreoffice.org/c/core/+/90558 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 126649] Line style presets arrangement and additional one.
https://bugs.documentfoundation.org/show_bug.cgi?id=126649 Dieter changed: What|Removed |Added Component|Draw|LibreOffice CC||dgp-m...@gmx.de --- Comment #18 from Dieter --- (In reply to Heiko Tietze from comment #17) > *** Bug 131322 has been marked as a duplicate of this bug. *** => Component "LibreOffice" -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 131291] EDITING: Chart: Not possible to change format in labels ( only 6.3 )
https://bugs.documentfoundation.org/show_bug.cgi?id=131291 Commit Notification changed: What|Removed |Added Whiteboard|target:7.0.0 target:6.4.3 |target:7.0.0 target:6.4.3 ||target:6.3.6 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 131291] EDITING: Chart: Not possible to change format in labels ( only 6.3 )
https://bugs.documentfoundation.org/show_bug.cgi?id=131291 --- Comment #4 from Commit Notification --- Xisco Faulí committed a patch related to this issue. It has been pushed to "libreoffice-6-3": https://git.libreoffice.org/core/commit/2af4d304992d2a508e0d79cd855b93ca7559ebef tdf#131291: Revert "tdf#129173 tdf#129175 Fix number format of data labels" It will be available in 6.3.6. The patch should be included in the daily builds available at https://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: https://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 129900] Exiting Writer's Print Preview mode is slow in long documents
https://bugs.documentfoundation.org/show_bug.cgi?id=129900 Timur changed: What|Removed |Added Version|6.3.4.2 release |6.0.0.3 release Status|NEW |RESOLVED Priority|medium |low Keywords||regression Severity|normal |minor Resolution|--- |WORKSFORME --- Comment #7 from Timur --- I don't repro ESC slowness in 5.4. I *do* in 6.1 oldest. (I guess it started in 6.0). And slower in 6.3 (like 8 sec in oldest and 5 sec in master). In 7.0+ it's shorter (like 2 sec). So I'll close as WFM (there was an issue but not anymore). Max, please test with master from https://dev-builds.libreoffice.org/daily/master/current.html to confirm. It will be separate to your working LO. If you think it's not good enough, set New (already confirmed) and we may try to track 1st slowness. I won't because it's a minor issue and delay. Note: I add load time, although that's not the point. 5.4 oldest real0m23,747s user0m20,991s sys 0m0,655s 5.4 master real0m56,090s user0m29,866s sys 0m1,313s 6.1 oldest real0m43,481s user0m40,247s sys 0m1,017s 6.1 master real1m10,217s user0m43,155s sys 0m1,177s 6.3 oldest real0m49,571s user0m34,007s sys 0m1,481s 6.3. master (not updated) real1m24,885s user0m26,936s sys 0m1,319s 7.0+ oldest real0m40,184s user0m21,996s sys 0m1,074s 7.0+ master real0m32,694s user0m19,179s sys 0m1,338s -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 76541] FILEOPEN: Incorrect formula view when it contains 2 equal signs, DOC, DOCX
https://bugs.documentfoundation.org/show_bug.cgi?id=76541 Timur changed: What|Removed |Added Keywords||implementationError Version|4.1 all versions|3.5.0 release -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 76541] FILEOPEN: Incorrect formula view when it contains 2 equal signs, DOC, DOCX
https://bugs.documentfoundation.org/show_bug.cgi?id=76541 Timur changed: What|Removed |Added See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=95 ||230 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 95230] Fileopen DOCX: LO doesn't set brackets properly and shows red "?" signs in formula text
https://bugs.documentfoundation.org/show_bug.cgi?id=95230 Timur changed: What|Removed |Added See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=76 ||541 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 120358] Long multi-layered numbered list in a table became mis-ordered after some editing
https://bugs.documentfoundation.org/show_bug.cgi?id=120358 Dieter changed: What|Removed |Added CC||dgp-m...@gmx.de Blocks||103100 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=103100 [Bug 103100] [META] Writer table bugs -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 103100] [META] Writer table bugs
https://bugs.documentfoundation.org/show_bug.cgi?id=103100 Dieter changed: What|Removed |Added Depends on||120358 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=120358 [Bug 120358] Long multi-layered numbered list in a table became mis-ordered after some editing -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 108741] [META] Shapes bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=108741 Bug 108741 depends on bug 131322, which changed state. Bug 131322 Summary: Line styles (under "text box and shape") do not allow for multiple parallel lines https://bugs.documentfoundation.org/show_bug.cgi?id=131322 What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |DUPLICATE -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 103494] [META] Textbox bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=103494 Bug 103494 depends on bug 131322, which changed state. Bug 131322 Summary: Line styles (under "text box and shape") do not allow for multiple parallel lines https://bugs.documentfoundation.org/show_bug.cgi?id=131322 What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |DUPLICATE -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-ux-advise] [Bug 131322] Line styles (under "text box and shape") do not allow for multiple parallel lines
https://bugs.documentfoundation.org/show_bug.cgi?id=131322 Heiko Tietze changed: What|Removed |Added Resolution|--- |DUPLICATE Status|UNCONFIRMED |RESOLVED --- Comment #3 from Heiko Tietze --- We are restricted to the ODF definition. And lines are simple - as needed for an office suite. You can solve your problem with a couple of shapes, but I admit it's not convenient. *** This bug has been marked as a duplicate of bug 126649 *** -- You are receiving this mail because: You are on the CC list for the bug. ___ Libreoffice-ux-advise mailing list Libreoffice-ux-advise@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-ux-advise
[Libreoffice-bugs] [Bug 131322] Line styles (under "text box and shape") do not allow for multiple parallel lines
https://bugs.documentfoundation.org/show_bug.cgi?id=131322 Heiko Tietze changed: What|Removed |Added Resolution|--- |DUPLICATE Status|UNCONFIRMED |RESOLVED --- Comment #3 from Heiko Tietze --- We are restricted to the ODF definition. And lines are simple - as needed for an office suite. You can solve your problem with a couple of shapes, but I admit it's not convenient. *** This bug has been marked as a duplicate of bug 126649 *** -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 126649] Line style presets arrangement and additional one.
https://bugs.documentfoundation.org/show_bug.cgi?id=126649 Heiko Tietze changed: What|Removed |Added CC||mikeweilg...@gmail.com --- Comment #17 from Heiko Tietze --- *** Bug 131322 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 130723] FORMATTING:hyperlinks broken into 2 after saving
https://bugs.documentfoundation.org/show_bug.cgi?id=130723 Dieter changed: What|Removed |Added Status|UNCONFIRMED |NEEDINFO Ever confirmed|0 |1 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 130723] FORMATTING:hyperlinks broken into 2 after saving
https://bugs.documentfoundation.org/show_bug.cgi?id=130723 --- Comment #8 from Dieter --- Created attachment 158718 --> https://bugs.documentfoundation.org/attachment.cgi?id=158718=edit screenshot of opened file Screenshot shows open file from comment 0. I can't see any problem. I've opened it with Version: 7.0.0.0.alpha0+ (x64) Build ID: c63148ba139bd6b9ae7a0f9e24e51f29e5370963 CPU threads: 4; OS: Windows 10.0 Build 18363; UI render: Skia/Raster; VCL: win; Locale: de-DE (de_DE); UI-Language: en-GB Calc: threaded and also with Version: 6.3.5.2 (x64) Build-ID: dd0751754f11728f69b42ee2af66670068624673 CPU-Threads: 4; BS: Windows 10.0; UI-Render: Standard; VCL: win; Gebietsschema: de-DE (de_DE); UI-Sprache: de-DE Calc: threaded Could you please try to reproduce it with the latest version of LibreOffice from https://www.libreoffice.org/download/libreoffice-fresh/ ? I have set the bug's status to 'NEEDINFO'. Please change it back to 'UNCONFIRMED' if the bug is still present in the latest version. Change to RESOLVED WORKSFORME, if the problem went away. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 108804] [META] Print preview bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=108804 Bug 108804 depends on bug 129900, which changed state. Bug 129900 Summary: Exiting Writer's Print Preview mode is slow in long documents https://bugs.documentfoundation.org/show_bug.cgi?id=129900 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |WORKSFORME -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 131291] EDITING: Chart: Not possible to change format in labels ( only 6.3 )
https://bugs.documentfoundation.org/show_bug.cgi?id=131291 --- Comment #3 from Commit Notification --- Xisco Fauli committed a patch related to this issue. It has been pushed to "libreoffice-6-4": https://git.libreoffice.org/core/commit/285313d2703aadbcf4007523b94c832b99e7c12b tdf#131291: Add UItest It will be available in 6.4.3. The patch should be included in the daily builds available at https://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: https://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 131291] EDITING: Chart: Not possible to change format in labels ( only 6.3 )
https://bugs.documentfoundation.org/show_bug.cgi?id=131291 Commit Notification changed: What|Removed |Added Whiteboard|target:7.0.0|target:7.0.0 target:6.4.3 -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 131374] New: Missing common word in EN(US) Dictionary.
https://bugs.documentfoundation.org/show_bug.cgi?id=131374 Bug ID: 131374 Summary: Missing common word in EN(US) Dictionary. Product: LibreOffice Version: 6.4.1.2 release Hardware: x86-64 (AMD64) OS: Linux (All) Status: UNCONFIRMED Severity: normal Priority: medium Component: Writer Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: stephan.schut...@gmail.com Description: Both spellings of this word is not in the dictionary. (red squiggly marked) https://duckduckgo.com/?q=define+scaleability=canonical=v204-1=definition Steps to Reproduce: 1. Open Writer 2. Ensure dictionary EN (US) is installed 3. Type text including the word "scalability" and view the incorrect behavior. Actual Results: identified as a misspelled word. Expected Results: Recognized as a correctly spelled word. Reproducible: Always User Profile Reset: No Additional Info: In general, I come across many words that are not present in the dictionary. Also, this suite does not appear to use any local or online service to "understand" what is written and suggest the correct wording etc. I suppose many would appreciate extended language services as offered by G-suite (google) and Grammarly... maybe in verson 7? -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 130723] FORMATTING:hyperlinks broken into 2 after saving
https://bugs.documentfoundation.org/show_bug.cgi?id=130723 Dieter changed: What|Removed |Added Status|NEEDINFO|UNCONFIRMED Ever confirmed|1 |0 --- Comment #10 from Dieter --- (In reply to VincentYu from comment #9) > You need to follow my steps 5,6,7 to open the navigation pane and expand the > hyperlinks subtree to see all the hyperlinks. Or you can zoom into one of > the links and click, then only part of the link will change color and not > the full link, which shows that it is broken into 2 links. Sorry, you're right. I also can see the broken hyperlink, but if I create an new one (I also tried §§1.1), save and reopen the document, this doesn't happen. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 119634] PDF export with lossless compression without reduce resolution saves a very erratic size
https://bugs.documentfoundation.org/show_bug.cgi?id=119634 Timur changed: What|Removed |Added Keywords|bibisectRequest |bibisected, bisected CC||qui...@gmail.com --- Comment #16 from Timur --- I previously tested attachment 145141 from comment 1 in Windows and reproduced from 6.1. I now tested in Linux. It's mostly 13,7 MB on 1st export but size is erratic if repeated few times (on 2nd or 3rd or 4th). So best to try 5 times. Question: can we set images resolution in PDF export headless mode? If not, that's a good candidate for a new bug. 3b744b816e7f6291eb9e4bf87b6d920f8cd35ecb is the first bad commit commit 3b744b816e7f6291eb9e4bf87b6d920f8cd35ecb Author: Jenkins Build User Date: Tue May 8 02:30:57 2018 +0200 source sha:c6cf2320d2a464594e759289c34796538d31f02b Previous: commit 1b2ea80a9faf52e9b1b6312a25e646674425ef0f (HEAD, refs/bisect/good-1b2ea80a9faf52e9b1b6312a25e646674425ef0f) Author: Jenkins Build User Date: Tue May 8 02:07:23 2018 +0200 source sha:ecf50fe71596c3edba8ce437481ab80ae1cd8935 Single commit: https://gerrit.libreoffice.org/plugins/gitiles/core/+/c6cf2320d2a464594e759289c34796538d31f02b%5E!/ commit c6cf2320d2a464594e759289c34796538d31f02b[log] author Tomaž Vajngerl Fri Apr 27 18:30:45 2018 +0900 committer Tomaž VajngerlTue May 08 02:25:14 2018 +0200 tree2f00c66eada2d30ed58d45836b1a75dc4a5f257d parent ecf50fe71596c3edba8ce437481ab80ae1cd8935 [diff] config entries for the new graphic manager, deprecate old entries Add 2 new GraphicManager config entries GraphicMemoryLimit and GraphicAllowedIdleTime. At the same time, deprecate the existing config entries used in GraphicObject's GraphicManager, which are not relevant anymore. Change-Id: Idb775e5e1a623f6c23d0c67fea5334a6c713c6c2 Reviewed-on: https://gerrit.libreoffice.org/53561 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl CC: Tomaž. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 129900] Exiting Writer's Print Preview mode is slow in long documents
https://bugs.documentfoundation.org/show_bug.cgi?id=129900 Dieter changed: What|Removed |Added Ever confirmed|0 |1 Keywords||perf OS|Linux (All) |All Status|UNCONFIRMED |NEW --- Comment #6 from Dieter --- I confirm it with your document Result in Version: 6.3.5.2 (x64) Build-ID: dd0751754f11728f69b42ee2af66670068624673 CPU-Threads: 4; BS: Windows 10.0; UI-Render: Standard; VCL: win; Gebietsschema: de-DE (de_DE); UI-Sprache: de-DE Calc: threaded Exit print preview: 5,8 Result in Version: 5.4.7.2 (x64) Build-ID: c838ef25c16710f8838b1faec480ebba495259d0 CPU-Threads: 4; BS: Windows 6.19; UI-Render: GL; Gebietsschema: de-DE (de_DE); Calc: group Exit print preview: 2,8 sec -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 130723] FORMATTING:hyperlinks broken into 2 after saving
https://bugs.documentfoundation.org/show_bug.cgi?id=130723 --- Comment #9 from VincentYu --- (In reply to Dieter from comment #8) > Created attachment 158718 [details] > screenshot of opened file > > Screenshot shows open file from comment 0. I can't see any problem. I've > opened it with > > Version: 7.0.0.0.alpha0+ (x64) > Build ID: c63148ba139bd6b9ae7a0f9e24e51f29e5370963 > CPU threads: 4; OS: Windows 10.0 Build 18363; UI render: Skia/Raster; VCL: > win; > Locale: de-DE (de_DE); UI-Language: en-GB > Calc: threaded > > and also with > > Version: 6.3.5.2 (x64) > Build-ID: dd0751754f11728f69b42ee2af66670068624673 > CPU-Threads: 4; BS: Windows 10.0; UI-Render: Standard; VCL: win; > Gebietsschema: de-DE (de_DE); UI-Sprache: de-DE > Calc: threaded > > Could you please try to reproduce it with the latest version of LibreOffice > from https://www.libreoffice.org/download/libreoffice-fresh/ ? I have set > the bug's status to 'NEEDINFO'. Please change it back to 'UNCONFIRMED' if > the bug is still present in the latest version. Change to RESOLVED > WORKSFORME, if the problem went away. You need to follow my steps 5,6,7 to open the navigation pane and expand the hyperlinks subtree to see all the hyperlinks. Or you can zoom into one of the links and click, then only part of the link will change color and not the full link, which shows that it is broken into 2 links. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 103100] [META] Writer table bugs
https://bugs.documentfoundation.org/show_bug.cgi?id=103100 Dieter changed: What|Removed |Added Depends on||131126 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=131126 [Bug 131126] WRITER: Numbering should be separate for table columns and inserting a new row shouldn't increase number in vertically merged cell where rows don't change -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 103369] [META] Bullet, numbered, and outline list bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=103369 Dieter changed: What|Removed |Added Depends on||131126 Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=131126 [Bug 131126] WRITER: Numbering should be separate for table columns and inserting a new row shouldn't increase number in vertically merged cell where rows don't change -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 131126] WRITER: Numbering should be separate for table columns and inserting a new row shouldn't increase number in vertically merged cell where rows don't change
https://bugs.documentfoundation.org/show_bug.cgi?id=131126 Dieter changed: What|Removed |Added Keywords||needsUXEval Blocks||103100, 103369 CC||dgp-m...@gmx.de, ||libreoffice-ux-advise@lists ||.freedesktop.org --- Comment #2 from Dieter --- I confirm the observed behaviour with Version: 7.0.0.0.alpha0+ (x64) Build ID: c63148ba139bd6b9ae7a0f9e24e51f29e5370963 CPU threads: 4; OS: Windows 10.0 Build 18363; UI render: Skia/Raster; VCL: win; Locale: de-DE (de_DE); UI-Language: en-GB Calc: threaded I'm not sure, this is a bug, but the main problem is, that you can't create a numbering for only column (at least I couldn't). So for me it sounds like an enhancement request, or example "Allow numbering per column / row in a table cc: Design-Team for further input Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=103100 [Bug 103100] [META] Writer table bugs https://bugs.documentfoundation.org/show_bug.cgi?id=103369 [Bug 103369] [META] Bullet, numbered, and outline list bugs and enhancements -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-ux-advise] [Bug 131126] WRITER: Numbering should be separate for table columns and inserting a new row shouldn't increase number in vertically merged cell where rows don't change
https://bugs.documentfoundation.org/show_bug.cgi?id=131126 Dieter changed: What|Removed |Added Keywords||needsUXEval Blocks||103100, 103369 CC||dgp-m...@gmx.de, ||libreoffice-ux-advise@lists ||.freedesktop.org --- Comment #2 from Dieter --- I confirm the observed behaviour with Version: 7.0.0.0.alpha0+ (x64) Build ID: c63148ba139bd6b9ae7a0f9e24e51f29e5370963 CPU threads: 4; OS: Windows 10.0 Build 18363; UI render: Skia/Raster; VCL: win; Locale: de-DE (de_DE); UI-Language: en-GB Calc: threaded I'm not sure, this is a bug, but the main problem is, that you can't create a numbering for only column (at least I couldn't). So for me it sounds like an enhancement request, or example "Allow numbering per column / row in a table cc: Design-Team for further input Referenced Bugs: https://bugs.documentfoundation.org/show_bug.cgi?id=103100 [Bug 103100] [META] Writer table bugs https://bugs.documentfoundation.org/show_bug.cgi?id=103369 [Bug 103369] [META] Bullet, numbered, and outline list bugs and enhancements -- You are receiving this mail because: You are on the CC list for the bug. ___ Libreoffice-ux-advise mailing list Libreoffice-ux-advise@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-ux-advise
[Libreoffice-bugs] [Bug 131373] New: UI: Set slide-name from slide title, automatically
https://bugs.documentfoundation.org/show_bug.cgi?id=131373 Bug ID: 131373 Summary: UI: Set slide-name from slide title, automatically Product: LibreOffice Version: unspecified Hardware: All OS: All Status: UNCONFIRMED Severity: enhancement Priority: medium Component: Impress Assignee: libreoffice-bugs@lists.freedesktop.org Reporter: k...@mazarredos.com Set slide-name from slide title instead of 'Slide 1', 'Slide 2'... to ease navigation between slides in Navigator pane. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 131375] New: Enhanced writing assistance
https://bugs.documentfoundation.org/show_bug.cgi?id=131375
Bug ID: 131375
Summary: Enhanced writing assistance
Product: LibreOffice
Version: 7.0.0.0.alpha0+ Master
Hardware: All
OS: All
Status: UNCONFIRMED
Severity: enhancement
Priority: medium
Component: Writer
Assignee: libreoffice-bugs@lists.freedesktop.org
Reporter: stephan.schut...@gmail.com
Description:
When working with Libreoffice I often wish for assistance in writing style and
choice of words. Also, the correct spelling of words as it pertains to the
context of the text written. Example: {Who|Whom} and many other examples that
would build correct and good language practices. Current implementations:
services in G-suite and Grammarly. An excellent implementation of this would be
a compelling argument to use Libre office over Word.
Actual Results:
Limited support for grammar and spelling.
Expected Results:
Sames as above: this is an enhancement request.
Reproducible: Always
User Profile Reset: No
Additional Info:
Simply use writer and note the missing language services and compare to an
editor using Grammarly or use Google's editor. You will see that in Libre
office there is no analysis of the "tone" in your language, nor the level of
language used, nor good dictionaries or high-level help with grammar. Some of
these are implemented in word by the way. It would be a good move on the part
of Libre office to prioritize service like this I think.
--
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 76541] FILEOPEN: Incorrect formula view when it contains 2 equal signs, DOC, DOCX
https://bugs.documentfoundation.org/show_bug.cgi?id=76541 --- Comment #9 from Timur --- Created attachment 158719 --> https://bugs.documentfoundation.org/attachment.cgi?id=158719=edit Test compared MSO LO Repro 7.0+ as seen in screenshot. -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 102187] [META] Options dialog bugs and enhancements
https://bugs.documentfoundation.org/show_bug.cgi?id=102187 Bug 102187 depends on bug 41442, which changed state. Bug 41442 Summary: Control File Locking from Options https://bugs.documentfoundation.org/show_bug.cgi?id=41442 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |WORKSFORME -- You are receiving this mail because: You are the assignee for the bug.___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
