[Libreoffice-commits] core.git: svgio/inc svgio/source
svgio/inc/svggradientnode.hxx | 14 +++---
svgio/inc/svgmarkernode.hxx|2 +-
svgio/inc/svgnode.hxx |2 +-
svgio/inc/svgpatternnode.hxx |2 +-
svgio/inc/svgsvgnode.hxx |2 +-
svgio/inc/svgtoken.hxx |4 ++--
svgio/inc/svgtools.hxx |2 +-
svgio/source/svgreader/svggradientnode.cxx | 14 +++---
svgio/source/svgreader/svgmarkernode.cxx |2 +-
svgio/source/svgreader/svgnode.cxx |2 +-
svgio/source/svgreader/svgpatternnode.cxx |2 +-
svgio/source/svgreader/svgsvgnode.cxx |2 +-
svgio/source/svgreader/svgtoken.cxx|4 ++--
13 files changed, 27 insertions(+), 27 deletions(-)
New commits:
commit b8db9688a4bdfbe272993ee9808c23d5d7dae879
Author: Noel Grandin
AuthorDate: Sat Aug 24 20:33:21 2019 +0200
Commit: Noel Grandin
CommitDate: Sun Aug 25 08:14:02 2019 +0200
loplugin:returnconstval in svgio
Change-Id: Idb195e43303e22ddf36a4529dd9704725c4de0e5
Reviewed-on: https://gerrit.libreoffice.org/78061
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/svgio/inc/svggradientnode.hxx b/svgio/inc/svggradientnode.hxx
index 1542796b48fc..c55074f97a10 100644
--- a/svgio/inc/svggradientnode.hxx
+++ b/svgio/inc/svggradientnode.hxx
@@ -77,25 +77,25 @@ namespace svgio
void
collectGradientEntries(drawinglayer::primitive2d::SvgGradientEntryVector&
aVector) const;
/// x1 content
-const SvgNumber getX1() const;
+SvgNumber getX1() const;
/// y1 content
-const SvgNumber getY1() const;
+SvgNumber getY1() const;
/// x2 content
-const SvgNumber getX2() const;
+SvgNumber getX2() const;
/// y2 content
-const SvgNumber getY2() const;
+SvgNumber getY2() const;
/// Cx content
-const SvgNumber getCx() const;
+SvgNumber getCx() const;
/// Cy content
-const SvgNumber getCy() const;
+SvgNumber getCy() const;
/// R content
-const SvgNumber getR() const;
+SvgNumber getR() const;
/// Fx content
const SvgNumber* getFx() const;
diff --git a/svgio/inc/svgmarkernode.hxx b/svgio/inc/svgmarkernode.hxx
index 61098a35b740..135dc3c4fea8 100644
--- a/svgio/inc/svgmarkernode.hxx
+++ b/svgio/inc/svgmarkernode.hxx
@@ -70,7 +70,7 @@ namespace svgio
const drawinglayer::primitive2d::Primitive2DContainer&
getMarkerPrimitives() const;
/// InfoProvider support for % values
-virtual const basegfx::B2DRange getCurrentViewPort() const
override;
+virtual basegfx::B2DRange getCurrentViewPort() const override;
/// viewBox content
const basegfx::B2DRange* getViewBox() const { return
mpViewBox.get(); }
diff --git a/svgio/inc/svgnode.hxx b/svgio/inc/svgnode.hxx
index 86a83e6afab6..697c8c312a38 100644
--- a/svgio/inc/svgnode.hxx
+++ b/svgio/inc/svgnode.hxx
@@ -160,7 +160,7 @@ namespace svgio
const std::vector< std::unique_ptr > & getChildren()
const { return maChildren; }
/// InfoProvider support for %, em and ex values
-virtual const basegfx::B2DRange getCurrentViewPort() const
override;
+virtual basegfx::B2DRange getCurrentViewPort() const override;
virtual double getCurrentFontSizeInherited() const override;
virtual double getCurrentXHeightInherited() const override;
diff --git a/svgio/inc/svgpatternnode.hxx b/svgio/inc/svgpatternnode.hxx
index 956c8da1812e..79dc7581c590 100644
--- a/svgio/inc/svgpatternnode.hxx
+++ b/svgio/inc/svgpatternnode.hxx
@@ -78,7 +78,7 @@ namespace svgio
const drawinglayer::primitive2d::Primitive2DContainer&
getPatternPrimitives() const;
/// InfoProvider support for % values
-virtual const basegfx::B2DRange getCurrentViewPort() const
override;
+virtual basegfx::B2DRange getCurrentViewPort() const override;
/// viewBox content
const basegfx::B2DRange* getViewBox() const;
diff --git a/svgio/inc/svgsvgnode.hxx b/svgio/inc/svgsvgnode.hxx
index defb46f7c894..feb669fe7bc5 100644
--- a/svgio/inc/svgsvgnode.hxx
+++ b/svgio/inc/svgsvgnode.hxx
@@ -69,7 +69,7 @@ namespace svgio
// The returned 'CurrentViewPort' is the viewport as it is set by
this svg element
// and as it is needed to resolve relative values in children
// The method does not check for invalid width and height
-virtual const basegfx::B2DRange getCurrentViewPort() const
override;
+virtual basegfx::B2DRange getCurrentViewPort() const override;
/// viewBox content
const basegfx::B2DRange* getViewBox() const
CppCheck Report Update
A new cppcheck report is available at : http://dev-builds.libreoffice.org/cppcheck_reports/master/ Note: The script generating this report was run at : 2019-25-08 02:47:28 with user buildslave at host vm140 as /home/buildslave/source/dev-tools/cppcheck/cppcheck-report.sh -s /home/buildslave/source/libo-core -c /home/buildslave/source/cppcheck -w /home/buildslave/tmp/www It can be found and improved here: https://gerrit.libreoffice.org/plugins/gitiles/dev-tools/+/master/cppcheck/cppcheck-report.sh ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/odbc/OTools.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3ab2e7ba46eac104738ab074a7df42e1bddd4d37 Author: Mike Kaganski AuthorDate: Sat Aug 24 23:18:37 2019 +0200 Commit: Mike Kaganski CommitDate: Sun Aug 25 01:38:19 2019 +0200 Fix build on big-endian platforms with clang Reportedly, this builds OK with gcc, but not with clang (rightfully). /tmp/usr/ports/editors/libreoffice/work/libreoffice-6.3.0.4/connectivity/source/drivers/odbc/OTools.cxx:148:21: error: arithmetic on a pointer to void _pValue += _nSize - properSize; ~~~ ^ 1 error generated. The pointer arithmetics on void* was introduced in 2012 in commit 63b6b1d6120d82c4baf5cb679d75dcc5427dbbc3. Change-Id: I78beddeda8bc516e45dd2a99dba8c7b8b1cf9255 Reviewed-on: https://gerrit.libreoffice.org/78076 Reviewed-by: Mike Kaganski Tested-by: Mike Kaganski diff --git a/connectivity/source/drivers/odbc/OTools.cxx b/connectivity/source/drivers/odbc/OTools.cxx index a4c3200c5b53..a5395aaf7ff3 100644 --- a/connectivity/source/drivers/odbc/OTools.cxx +++ b/connectivity/source/drivers/odbc/OTools.cxx @@ -145,7 +145,7 @@ void OTools::getValue( OConnection const * _pConnection, memset(_pValue, 0, _nSize); #ifdef OSL_BIGENDIAN // This is skewed in favour of integer types -_pValue += _nSize - properSize; +_pValue = static_cast(_pValue) + _nSize - properSize; #endif } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - include/xmloff sw/qa sw/source
include/xmloff/odffields.hxx |1
sw/qa/extras/ooxmlexport/data/tdf126792.odt |binary
sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx | 30 ++
sw/source/filter/ww8/docxattributeoutput.cxx |3 ++
4 files changed, 34 insertions(+)
New commits:
commit 92f527ef00fe7fa4f84e6577c7249de845be6479
Author: Tamás Zolnai
AuthorDate: Wed Aug 21 10:30:31 2019 +0200
Commit: Caolán McNamara
CommitDate: Sat Aug 24 22:36:51 2019 +0200
tdf#126792: DOCX legacy drop-downs are only supposed to hold 25 items, DOCX
Truncate item list if the MSO limit is exceeded.
Reviewed-on: https://gerrit.libreoffice.org/77844
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai
(cherry picked from commit 8d84f32d55df06c2944da78e2b779de2dba21d50)
Change-Id: I21fd63fd2b8d6c8fe76500e1cdd468d4692612c1
Reviewed-on: https://gerrit.libreoffice.org/77869
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/include/xmloff/odffields.hxx b/include/xmloff/odffields.hxx
index 27525fb39374..fd1b6b4dabfe 100644
--- a/include/xmloff/odffields.hxx
+++ b/include/xmloff/odffields.hxx
@@ -32,6 +32,7 @@
#define ODF_FORMDROPDOWN "vnd.oasis.opendocument.field.FORMDROPDOWN"
#define ODF_FORMDROPDOWN_LISTENTRY "Dropdown_ListEntry"
#define ODF_FORMDROPDOWN_RESULT "Dropdown_Selected"
+#define ODF_FORMDROPDOWN_ENTRY_COUNT_LIMIT 25
#define ODF_TOC "vnd.oasis.opendocument.field.TOC"
diff --git a/sw/qa/extras/ooxmlexport/data/tdf126792.odt
b/sw/qa/extras/ooxmlexport/data/tdf126792.odt
new file mode 100644
index ..7eb43e78a71c
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf126792.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
index b5b6b6040216..1765a28fa64f 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx
@@ -8,6 +8,9 @@
*/
#include
+#include
+#include
+#include
class Test : public SwModelTestBase
{
@@ -664,6 +667,33 @@ DECLARE_OOXMLEXPORT_TEST( testTdf66401, "tdf66401.docx")
}
}
+DECLARE_OOXMLEXPORT_TEST(testDropDownFieldEntryLimit, "tdf126792.odt" )
+{
+// In MSO, there is a limit of 25 for the items in a drop-down form field.
+// So we truncate the list of items to not exceed this limit.
+
+SwXTextDocument* pTextDoc = dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pTextDoc);
+SwDoc* pDoc = pTextDoc->GetDocShell()->GetDoc();
+IDocumentMarkAccess* pMarkAccess = pDoc->getIDocumentMarkAccess();
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), pMarkAccess->getAllMarksCount());
+
+::sw::mark::IFieldmark* pFieldmark
+ =
dynamic_cast<::sw::mark::IFieldmark*>(*pMarkAccess->getAllMarksBegin());
+CPPUNIT_ASSERT(pFieldmark);
+CPPUNIT_ASSERT_EQUAL(OUString(ODF_FORMDROPDOWN),
pFieldmark->GetFieldname());
+
+const sw::mark::IFieldmark::parameter_map_t* const pParameters =
pFieldmark->GetParameters();
+auto pListEntries = pParameters->find(ODF_FORMDROPDOWN_LISTENTRY);
+CPPUNIT_ASSERT(bool(pListEntries != pParameters->end()));
+css::uno::Sequence vListEntries;
+pListEntries->second >>= vListEntries;
+if (!mbExported)
+CPPUNIT_ASSERT_EQUAL(sal_Int32(26), vListEntries.getLength());
+else
+CPPUNIT_ASSERT_EQUAL(sal_Int32(25), vListEntries.getLength());
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 2bdbc30c7aa1..ff208c98ef22 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1840,6 +1840,9 @@ void DocxAttributeOutput::WriteFFData( const FieldInfos&
rInfos )
OUString sName, sSelected;
params.extractParam( ODF_FORMDROPDOWN_LISTENTRY, vListEntries );
+if (vListEntries.getLength() > ODF_FORMDROPDOWN_ENTRY_COUNT_LIMIT)
+vListEntries = uno::Sequence< OUString>(vListEntries.getArray(),
ODF_FORMDROPDOWN_ENTRY_COUNT_LIMIT);
+
sName = params.getName();
sal_Int32 nSelectedIndex = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/test test/source ucb/source unoxml/source writerfilter/source
include/test/table/xtablecolumns.hxx |2 +-
test/source/table/xtablecolumns.cxx |2 +-
ucb/source/ucp/webdav-neon/webdavcontent.cxx |2 +-
ucb/source/ucp/webdav-neon/webdavcontent.hxx |2 +-
unoxml/source/rdf/librdf_repository.cxx |8
writerfilter/source/dmapper/DomainMapperTableManager.cxx |4 ++--
writerfilter/source/dmapper/DomainMapperTableManager.hxx |2 +-
writerfilter/source/dmapper/DomainMapper_Impl.cxx|4 ++--
writerfilter/source/dmapper/DomainMapper_Impl.hxx|4 ++--
writerfilter/source/dmapper/FontTable.cxx|2 +-
writerfilter/source/dmapper/FontTable.hxx|2 +-
writerfilter/source/dmapper/StyleSheetTable.cxx |6 +++---
writerfilter/source/dmapper/StyleSheetTable.hxx |6 +++---
writerfilter/source/dmapper/ThemeTable.cxx |2 +-
writerfilter/source/dmapper/ThemeTable.hxx |2 +-
writerfilter/source/ooxml/OOXMLParserState.cxx |2 +-
writerfilter/source/ooxml/OOXMLParserState.hxx |2 +-
17 files changed, 27 insertions(+), 27 deletions(-)
New commits:
commit 57c9a995bafcaeb9ab00facb9b7f3ed52c7e7d2a
Author: Noel Grandin
AuthorDate: Sat Aug 24 20:35:05 2019 +0200
Commit: Noel Grandin
CommitDate: Sat Aug 24 22:12:28 2019 +0200
loplugin:returnconstval in test..writerfilter
Change-Id: Iea7d15f0a54921514cc4b71c5dc8caaa2ee573c8
Reviewed-on: https://gerrit.libreoffice.org/78063
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/test/table/xtablecolumns.hxx
b/include/test/table/xtablecolumns.hxx
index 169eac9dbc77..957d344c598f 100644
--- a/include/test/table/xtablecolumns.hxx
+++ b/include/test/table/xtablecolumns.hxx
@@ -47,7 +47,7 @@ protected:
private:
css::uno::Reference m_xSheet;
-static const OUString getCellText(const
css::uno::Reference& r_xCell);
+static OUString getCellText(const css::uno::Reference&
r_xCell);
};
} // namespace apitest
diff --git a/test/source/table/xtablecolumns.cxx
b/test/source/table/xtablecolumns.cxx
index 90c67977dd83..b338ddd0bdb4 100644
--- a/test/source/table/xtablecolumns.cxx
+++ b/test/source/table/xtablecolumns.cxx
@@ -163,7 +163,7 @@ void XTableColumns::testRemoveByIndexWithOutOfBoundIndex()
CPPUNIT_ASSERT_THROW(xTC->removeByIndex(xTC->getCount(), 1),
uno::RuntimeException);
}
-const OUString XTableColumns::getCellText(const uno::Reference&
r_xCell)
+OUString XTableColumns::getCellText(const uno::Reference&
r_xCell)
{
uno::Reference xST(r_xCell, uno::UNO_QUERY_THROW);
return xST->getString();
diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx
b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
index b360f300265a..62181772ae17 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
@@ -3664,7 +3664,7 @@ void Content::cancelCommandExecution(
}
-const OUString
+OUString
Content::getBaseURI( const std::unique_ptr< DAVResourceAccess > & rResAccess )
{
osl::Guard< osl::Mutex > aGuard( m_aMutex );
diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.hxx
b/ucb/source/ucp/webdav-neon/webdavcontent.hxx
index 2d56c02b42c3..dbe3102c744b 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.hxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.hxx
@@ -142,7 +142,7 @@ private:
bool
exchangeIdentity( const css::uno::Reference< css::ucb::XContentIdentifier
>& xNewId );
-const OUString
+OUString
getBaseURI( const std::unique_ptr< DAVResourceAccess > & rResAccess );
/// @throws css::uno::Exception
diff --git a/unoxml/source/rdf/librdf_repository.cxx
b/unoxml/source/rdf/librdf_repository.cxx
index eb15843ef25b..72e417cfd699 100644
--- a/unoxml/source/rdf/librdf_repository.cxx
+++ b/unoxml/source/rdf/librdf_repository.cxx
@@ -344,10 +344,10 @@ public:
const uno::Sequence< css::uno::Any > & i_rArguments) override;
// XNamedGraph forwards -
-const NamedGraphMap_t::iterator clearGraph_NoLock(
+NamedGraphMap_t::iterator clearGraph_NoLock(
const OUString & i_rGraphName,
bool i_Internal = false );
-const NamedGraphMap_t::iterator clearGraph_Lock(
+NamedGraphMap_t::iterator clearGraph_Lock(
const OUString & i_rGraphName,
bool i_Internal);
void addStatementGraph_NoLock(
@@ -1747,7 +1747,7 @@ void SAL_CALL librdf_Repository::initialize(
m_pWorld.get(), m_pStorage.get()), safe_librdf_free_model);
}
-const NamedGraphMap_t::iterator librdf_Repository::clearGraph_NoLock(
+NamedGraphMap_t::iterator librdf_Repository::clearGraph_NoLock(
OUString const& i_rGraphName, bool i_Internal)
//throw (uno::RuntimeException, container::NoSuchElementException,
//rdf::RepositoryExceptio
[Libreoffice-commits] core.git: 2 commits - sdext/source sd/source starmath/inc starmath/source sw/inc sw/source
sd/source/ui/sidebar/MasterPageContainer.cxx| 14 ++
sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx |4 ++--
sd/source/ui/table/TableDesignPane.cxx |2 +-
sdext/source/presenter/PresenterTheme.cxx | 10 +-
starmath/inc/document.hxx |2 +-
starmath/inc/rect.hxx |4 ++--
starmath/inc/smmod.hxx |8
starmath/inc/symbol.hxx |4 ++--
starmath/source/cfgitem.cxx | 10 +-
starmath/source/cfgitem.hxx | 10 +-
starmath/source/document.cxx|2 +-
starmath/source/rect.cxx|2 +-
starmath/source/smmod.cxx |8
starmath/source/symbol.cxx |4 ++--
sw/inc/AnnotationWin.hxx|4 ++--
sw/inc/SwStyleNameMapper.hxx|4 ++--
sw/inc/anchoreddrawobject.hxx |4 ++--
sw/inc/anchoredobject.hxx |4 ++--
sw/inc/docufld.hxx |4 ++--
sw/inc/fesh.hxx |4 ++--
sw/inc/iodetect.hxx |2 +-
sw/inc/swabstdlg.hxx|2 +-
sw/inc/swrect.hxx | 16
sw/inc/txtfld.hxx |2 +-
sw/inc/viewsh.hxx |2 +-
sw/source/core/bastyp/swrect.cxx| 12 ++--
sw/source/core/doc/DocumentListsManager.cxx |4 ++--
sw/source/core/doc/SwStyleNameMapper.cxx|6 +++---
sw/source/core/doc/dbgoutsw.cxx | 10 +-
sw/source/core/frmedt/fefly1.cxx|2 +-
sw/source/core/frmedt/feshview.cxx |2 +-
sw/source/core/inc/DocumentListsManager.hxx |4 ++--
sw/source/core/inc/flyfrm.hxx |4 ++--
sw/source/core/inc/frame.hxx|4 ++--
sw/source/core/inc/pagefrm.hxx |4 ++--
sw/source/core/inc/txtfly.hxx |4 ++--
sw/source/core/layout/anchoreddrawobject.cxx|4 ++--
sw/source/core/layout/fly.cxx |4 ++--
sw/source/core/layout/frmtool.cxx |2 +-
sw/source/core/layout/paintfrm.cxx |2 +-
sw/source/core/layout/ssfrm.cxx |4 ++--
sw/source/core/text/itrpaint.cxx|2 +-
sw/source/core/text/txtfly.cxx |4 ++--
sw/source/core/txtnode/atrfld.cxx |2 +-
sw/source/core/unocore/unosrch.cxx |4 ++--
sw/source/core/view/viewsh.cxx |2 +-
sw/source/filter/basflt/iodetect.cxx|2 +-
sw/source/filter/ww8/WW8TableInfo.cxx |4 ++--
sw/source/filter/ww8/WW8TableInfo.hxx |4 ++--
sw/source/ui/dialog/swdlgfact.cxx |2 +-
sw/source/ui/dialog/swdlgfact.hxx |2 +-
sw/source/uibase/dbui/mmconfigitem.cxx | 13 ++---
sw/source/uibase/docvw/edtwin.cxx |2 +-
sw/source/uibase/inc/mmconfigitem.hxx |4 ++--
sw/source/uibase/inc/swruler.hxx|2 +-
sw/source/uibase/misc/swruler.cxx |5 ++---
sw/source/uibase/sidebar/PageMarginControl.cxx |5 ++---
sw/source/uibase/sidebar/PageOrientationControl.cxx |5 ++---
58 files changed, 127 insertions(+), 141 deletions(-)
New commits:
commit 592c31a8fa8729259cf42440a0a26c0322a5
Author: Noel Grandin
AuthorDate: Sat Aug 24 20:33:45 2019 +0200
Commit: Noel Grandin
CommitDate: Sat Aug 24 22:12:02 2019 +0200
loplugin:returnconstval in sw
Change-Id: I15d8553bff7528f690ff92bee75d6a67037c0adf
Reviewed-on: https://gerrit.libreoffice.org/78062
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sw/inc/AnnotationWin.hxx b/sw/inc/AnnotationWin.hxx
index 2af2d9e56b37..18ebe2e7f8c1 100644
--- a/sw/inc/AnnotationWin.hxx
+++ b/sw/inc/AnnotationWin.hxx
@@ -124,8 +124,8 @@ class SAL_DLLPUBLIC_RTTI SwAnnotationWin : public
vcl::Window
voidSetScrollbar();
voidSetVirtualPosSize( const Point& aPoint, const Size&
aSize);
-const Point VirtualPos(){ return mPosSize.TopLeft(); }
-const Size VirtualSize() { return mPosSize.GetSize(); }
+Point VirtualPos(){ return mPosSize.TopLeft(); }
+SizeVirtualSize() { return mPosSize.GetSize(); }
voidShowAnchorOnly(const Point &aPoint);
[Libreoffice-commits] core.git: sal/osl sal/qa sax/source sc/inc sc/source
sal/osl/unx/file_path_helper.cxx | 17 +++--
sal/qa/rtl/doublelock/rtl_doublelocking.cxx |2 -
sax/source/fastparser/legacyfastparser.cxx |8 ++--
sc/inc/document.hxx | 12 +++---
sc/inc/textuno.hxx |2 -
sc/source/core/data/documen3.cxx |8 ++--
sc/source/core/data/document.cxx |2 -
sc/source/filter/excel/tokstack.cxx | 24 ++---
sc/source/filter/inc/tokstack.hxx| 34 +--
sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx |4 +-
sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx |4 +-
sc/source/ui/inc/CorrelationDialog.hxx |4 +-
sc/source/ui/inc/CovarianceDialog.hxx|4 +-
sc/source/ui/inc/MatrixComparisonGenerator.hxx |4 +-
sc/source/ui/inc/tabvwsh.hxx |2 -
sc/source/ui/view/tabvwshc.cxx |2 -
16 files changed, 65 insertions(+), 68 deletions(-)
New commits:
commit e0adee8341e89d478511d7b3e784941f2fd9b504
Author: Noel Grandin
AuthorDate: Sat Aug 24 20:32:19 2019 +0200
Commit: Noel Grandin
CommitDate: Sat Aug 24 22:11:15 2019 +0200
loplugin:returnconstval in sal..sc
Change-Id: I300d14d580d450ec338129918955651b9d40d5d2
Reviewed-on: https://gerrit.libreoffice.org/78059
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sal/osl/unx/file_path_helper.cxx b/sal/osl/unx/file_path_helper.cxx
index 584279cff841..a89e00bf76ed 100644
--- a/sal/osl/unx/file_path_helper.cxx
+++ b/sal/osl/unx/file_path_helper.cxx
@@ -28,14 +28,11 @@ const sal_Unicode FPH_CHAR_PATH_SEPARATOR = '/';
const sal_Unicode FPH_CHAR_DOT= '.';
const sal_Unicode FPH_CHAR_COLON = ':';
-static const OUString FPH_PATH_SEPARATOR()
-{ return OUString(FPH_CHAR_PATH_SEPARATOR); }
+static const OUStringLiteral FPH_PATH_SEPARATOR("/");
-static const OUString FPH_LOCAL_DIR_ENTRY()
-{ return OUString(FPH_CHAR_DOT); }
+static const OUStringLiteral FPH_LOCAL_DIR_ENTRY(".");
-static const OUString FPH_PARENT_DIR_ENTRY()
-{ return ".."; }
+static const OUStringLiteral FPH_PARENT_DIR_ENTRY("..");
void osl_systemPathRemoveSeparator(rtl_uString* pustrPath)
{
@@ -68,11 +65,11 @@ void osl_systemPathEnsureSeparator(rtl_uString** ppustrPath)
if ((lp > 1 && i != (lp - 1)) || ((lp < 2) && i < 0))
{
-path += FPH_PATH_SEPARATOR();
+path += FPH_PATH_SEPARATOR;
rtl_uString_assign(ppustrPath, path.pData);
}
-SAL_WARN_IF( !path.endsWith(FPH_PATH_SEPARATOR()),
+SAL_WARN_IF( !path.endsWith(FPH_PATH_SEPARATOR),
"sal.osl",
"osl_systemPathEnsureSeparator: Post condition failed");
}
@@ -147,8 +144,8 @@ bool osl_systemPathIsLocalOrParentDirectoryEntry(
osl_systemPathGetFileNameOrLastDirectoryPart(pustrPath, &dirent.pData);
-return (dirent == FPH_LOCAL_DIR_ENTRY() ||
-dirent == FPH_PARENT_DIR_ENTRY());
+return (dirent == FPH_LOCAL_DIR_ENTRY ||
+dirent == FPH_PARENT_DIR_ENTRY);
}
/** Simple iterator for a path list separated by the specified character
diff --git a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
index 384b8f59392a..d2e094d19c12 100644
--- a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
+++ b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
@@ -46,7 +46,7 @@
namespace {
struct Gregorian : public rtl::StaticWithInit {
-const OUString operator () () {
+OUString operator () () {
return CONST_TEST_STRING;
}
};
diff --git a/sax/source/fastparser/legacyfastparser.cxx
b/sax/source/fastparser/legacyfastparser.cxx
index 994835acc666..f5a4a433f8df 100644
--- a/sax/source/fastparser/legacyfastparser.cxx
+++ b/sax/source/fastparser/legacyfastparser.cxx
@@ -130,8 +130,8 @@ private:
Reference< XDocumentHandler > m_xDocumentHandler;
Reference< XFastTokenHandler > m_xTokenHandler;
rtl::Reference< NamespaceHandler > m_aNamespaceHandler;
-const OUString getNamespacePrefixFromToken( sal_Int32 nToken );
-const OUString getNameFromToken( sal_Int32 nToken );
+OUString getNamespacePrefixFromToken( sal_Int32 nToken );
+OUString getNameFromToken( sal_Int32 nToken );
static const OUString aDefaultNamespace;
static const OUString aNamespaceSeparator;
@@ -161,7 +161,7 @@ public:
const OUString CallbackDocumentHandler::aDefaultNamespace = OUString("");
const OUString CallbackDocumentHandler::aNamespaceSeparator = OUString(":");
-const OUString CallbackDocumentHandler::getNamespacePrefixFromToken( sal_Int32
nToken )
+OUString CallbackDocumentHandler::getNamespacePrefixFromToken( sal_Int32
nToken )
{
if ( ( nToken & 0x ) != 0 )
{
@@ -173,7 +173,7 @@ const OUString
Cal
[Libreoffice-commits] core.git: fpicker/source libreofficekit/qa libreofficekit/source linguistic/source package/inc package/source reportdesign/source
fpicker/source/office/iodlgimp.hxx |2 +-
libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx |2 +-
libreofficekit/qa/gtktiledviewer/gtv-helpers.cxx|2 +-
libreofficekit/qa/gtktiledviewer/gtv-helpers.hxx|4 ++--
libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx |2 +-
libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.hxx |2 +-
libreofficekit/source/gtk/lokdocview.cxx|2 +-
linguistic/source/convdicxml.cxx|2 +-
package/inc/ZipPackage.hxx |2 +-
package/source/zippackage/ZipPackage.cxx|2 +-
reportdesign/source/ui/misc/UITools.cxx |2 +-
11 files changed, 12 insertions(+), 12 deletions(-)
New commits:
commit 715e7370a160bd3a51bf5aefdd92319da239bc4e
Author: Noel Grandin
AuthorDate: Sat Aug 24 14:41:43 2019 +0200
Commit: Noel Grandin
CommitDate: Sat Aug 24 20:29:39 2019 +0200
loplugin:returnconstval in fpicker..reportdesign
Change-Id: I59c55a858b2706d1327c837abc158dceca02360e
Reviewed-on: https://gerrit.libreoffice.org/78058
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/fpicker/source/office/iodlgimp.hxx
b/fpicker/source/office/iodlgimp.hxx
index 22cd5c45ccf5..137fd1d56ad1 100644
--- a/fpicker/source/office/iodlgimp.hxx
+++ b/fpicker/source/office/iodlgimp.hxx
@@ -57,7 +57,7 @@ public:
const OUString& GetName() const { return m_aName; }
const OUString& GetType() const { return m_aType; }
-const OUString GetExtension() const{ return m_aType.getLength() >
2 ? m_aType.copy( 2 ) : OUString(); }
+OUStringGetExtension() const{ return m_aType.getLength() >
2 ? m_aType.copy( 2 ) : OUString(); }
boolisGroupSeparator() const{ return m_aType.isEmpty(); }
};
diff --git a/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx
b/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx
index 564c1de137c6..17f2ef77a1d3 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-application-window.cxx
@@ -278,7 +278,7 @@ GtkToolItem*
gtv_application_window_find_tool_by_unocommand(GtvApplicationWindow
return result;
}
-static const std::string
+static std::string
createRenderingArgsJSON(const GtvRenderingArgs* pRenderingArgs)
{
boost::property_tree::ptree aTree;
diff --git a/libreofficekit/qa/gtktiledviewer/gtv-helpers.cxx
b/libreofficekit/qa/gtktiledviewer/gtv-helpers.cxx
index 2a4784da5209..63f232b6021f 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-helpers.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-helpers.cxx
@@ -139,7 +139,7 @@ GtkWidget* GtvHelpers::createCommentBox(const
boost::property_tree::ptree& aComm
return pCommentVBox;
}
-const std::string GtvHelpers::getDirPath(const std::string& filePath)
+std::string GtvHelpers::getDirPath(const std::string& filePath)
{
int position = filePath.find_last_of('/');
const std::string dirPath = filePath.substr(0, position + 1);
diff --git a/libreofficekit/qa/gtktiledviewer/gtv-helpers.hxx
b/libreofficekit/qa/gtktiledviewer/gtv-helpers.hxx
index 9474f4c0271a..cc686bfdfdd4 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-helpers.hxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-helpers.hxx
@@ -37,10 +37,10 @@ namespace GtvHelpers
GtkWidget* createCommentBox(const boost::property_tree::ptree& aComment);
-const std::string getDirPath(const std::string& filePath);
+std::string getDirPath(const std::string& filePath);
template
-const std::vector split(const std::string& aPayload, const std::string&
aDelim, const int nItems)
+std::vector split(const std::string& aPayload, const std::string&
aDelim, const int nItems)
{
std::vector aRet;
diff --git a/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx
b/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx
index a415a8448e6c..4541a0c3706f 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.cxx
@@ -250,7 +250,7 @@ gtv_main_toolbar_add_recent_uno(GtvMainToolbar* toolbar,
const std::string& rUno
// TODO: Remove other text entries with same key
}
-const std::string
+std::string
gtv_main_toolbar_get_recent_uno_args(GtvMainToolbar* toolbar, const
std::string& rUnoCmd)
{
GtvMainToolbarPrivate& priv = getPrivate(toolbar);
diff --git a/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.hxx
b/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.hxx
index 2e43ed4c7dc7..0930228fda59 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.hxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-main-toolbar.hxx
@@ -53,7 +53,7 @@ void gtv_main_toolbar_doc_loaded(GtvMainToolbar* toolbar,
LibreOfficeKitDocument
void gtv_main_toolbar_add_rece
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - desktop/qa include/sfx2 sc/source sfx2/source
desktop/qa/desktop_lib/test_desktop_lib.cxx | 56 ++--
include/sfx2/objsh.hxx |2 +
sc/source/ui/docshell/docsh.cxx |6 +++
sc/source/ui/inc/docsh.hxx |2 +
sfx2/source/doc/objserv.cxx |1
sfx2/source/doc/objstor.cxx |7 +++
6 files changed, 69 insertions(+), 5 deletions(-)
New commits:
commit cc7eb4d345e3fede698a3f255c1938d275305c14
Author: Ashod Nakashian
AuthorDate: Thu Aug 22 09:15:15 2019 -0400
Commit: Ashod Nakashian
CommitDate: Sat Aug 24 18:28:15 2019 +0200
sc: LOK: commit cell edits before saveas
Users typically don't recognize that changes
done to a cell need to be committed (typically
by hitting RETURN) before they are saved to file.
This is especially true on the web.
This patch commits any in-flight changes before
SaveAs. This is currently done only for LOK and
unconditionally at that. This can be controlled
via a flag, if there is such a use-case.
Change-Id: I2a88b2f1df47be764058f4505561b22830d9d67a
Reviewed-on: https://gerrit.libreoffice.org/78012
Reviewed-by: Ashod Nakashian
Tested-by: Ashod Nakashian
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index 99b6c9f7806f..927fdd1ede10 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -84,6 +84,7 @@ public:
UnoApiTest::tearDown();
};
+LibLODocument_Impl* loadDocUrl(const OUString& rFileURL,
LibreOfficeKitDocumentType eType);
LibLODocument_Impl* loadDoc(const char* pName, LibreOfficeKitDocumentType
eType = LOK_DOCTYPE_TEXT);
void closeDoc();
static void callback(int nType, const char* pPayload, void* pData);
@@ -137,6 +138,7 @@ public:
void testSignDocument_PEM_PDF();
void testTextSelectionHandles();
void testDialogPaste();
+void testCalcSaveAs();
void testABI();
CPPUNIT_TEST_SUITE(DesktopLOKTest);
@@ -190,6 +192,7 @@ public:
#endif
CPPUNIT_TEST(testTextSelectionHandles);
CPPUNIT_TEST(testDialogPaste);
+CPPUNIT_TEST(testCalcSaveAs);
CPPUNIT_TEST(testABI);
CPPUNIT_TEST_SUITE_END();
@@ -235,10 +238,8 @@ static Control* GetFocusControl(vcl::Window const *
pParent)
return nullptr;
}
-LibLODocument_Impl* DesktopLOKTest::loadDoc(const char* pName,
LibreOfficeKitDocumentType eType)
+LibLODocument_Impl* DesktopLOKTest::loadDocUrl(const OUString& rFileURL,
LibreOfficeKitDocumentType eType)
{
-OUString aFileURL;
-createFileURL(OUString::createFromAscii(pName), aFileURL);
OUString aService;
switch (eType)
{
@@ -255,7 +256,7 @@ LibLODocument_Impl* DesktopLOKTest::loadDoc(const char*
pName, LibreOfficeKitDoc
CPPUNIT_ASSERT(false);
break;
}
-mxComponent = loadFromDesktop(aFileURL, aService);
+mxComponent = loadFromDesktop(rFileURL, aService);
if (!mxComponent.is())
{
CPPUNIT_ASSERT(false);
@@ -264,6 +265,13 @@ LibLODocument_Impl* DesktopLOKTest::loadDoc(const char*
pName, LibreOfficeKitDoc
return m_pDocument.get();
}
+LibLODocument_Impl* DesktopLOKTest::loadDoc(const char* pName,
LibreOfficeKitDocumentType eType)
+{
+OUString aFileURL;
+createFileURL(OUString::createFromAscii(pName), aFileURL);
+return loadDocUrl(aFileURL, eType);
+}
+
void DesktopLOKTest::closeDoc()
{
if (mxComponent.is())
@@ -1799,6 +1807,7 @@ void DesktopLOKTest::testRedlineCalc()
class ViewCallback
{
public:
+OString m_aCellFormula;
bool m_bTilesInvalidated;
tools::Rectangle m_aOwnCursor;
boost::property_tree::ptree m_aCommentCallbackResult;
@@ -1843,6 +1852,11 @@ public:
m_aCommentCallbackResult =
m_aCommentCallbackResult.get_child("comment");
}
break;
+case LOK_CALLBACK_CELL_FORMULA:
+{
+m_aCellFormula = aPayload;
+}
+break;
}
}
};
@@ -2591,6 +2605,40 @@ void DesktopLOKTest::testDialogPaste()
Scheduler::ProcessEventsToIdle();
}
+void DesktopLOKTest::testCalcSaveAs()
+{
+comphelper::LibreOfficeKit::setActive();
+
+LibLODocument_Impl* pDocument = loadDoc("sheets.ods");
+CPPUNIT_ASSERT(pDocument);
+
+// Enter some text, but don't commit.
+pDocument->pClass->postKeyEvent(pDocument, LOK_KEYEVENT_KEYINPUT, 'X', 0);
+pDocument->pClass->postKeyEvent(pDocument, LOK_KEYEVENT_KEYUP, 'X', 0);
+Scheduler::ProcessEventsToIdle();
+
+// Save as a new file.
+OUString aNewFileUrl = "file:///tmp/saveas.ods";
+pDocument->pClass->saveAs(pDocument, aNewFileUrl.toUtf8().getStr(),
nullptr, nullptr);
+closeDoc();
+
+// Load the new document and verify that the in-flight changes are saved.
+pDocument = loadDocUrl(aNewFileUrl, LOK_DOCTYPE_SPREADSHEET);
+CPPUNIT_ASSERT(pDocument);
+
+ViewCallback aView;
+
[Libreoffice-commits] core.git: desktop/source drawinglayer/source filter/source forms/source
desktop/source/deployment/gui/dp_gui_dialog2.cxx |2 -
desktop/source/deployment/misc/dp_misc.cxx|6 ++---
desktop/source/deployment/misc/dp_platform.cxx|6 ++---
desktop/source/deployment/misc/dp_resource.cxx|2 -
desktop/source/deployment/registry/component/dp_component.cxx | 12 +-
desktop/source/pkgchk/unopkg/unopkg_misc.cxx |4 +--
drawinglayer/source/tools/emfphelperdata.cxx |2 -
drawinglayer/source/tools/emfphelperdata.hxx |2 -
filter/source/xsltfilter/OleHandler.cxx |2 -
filter/source/xsltfilter/OleHandler.hxx |4 +--
forms/source/xforms/pathexpression.cxx|2 -
forms/source/xforms/pathexpression.hxx|2 -
12 files changed, 23 insertions(+), 23 deletions(-)
New commits:
commit d48d9c0f96870780be35cf98b7915fdbb4db6735
Author: Noel Grandin
AuthorDate: Sat Aug 24 14:40:17 2019 +0200
Commit: Noel Grandin
CommitDate: Sat Aug 24 18:14:37 2019 +0200
loplugin:returnconstval in desktop..forms
Change-Id: I268e352e4e3054d1c1a8e61e52d91fd99794b359
Reviewed-on: https://gerrit.libreoffice.org/78057
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 765f0939845d..f73d1ffe2a28 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -94,7 +94,7 @@ namespace dp_gui {
struct StrAllFiles : public rtl::StaticWithInit< OUString, StrAllFiles >
{
-const OUString operator () () {
+OUString operator () () {
const SolarMutexGuard guard;
std::locale loc = Translate::Create("fps");
return Translate::get(STR_FILTERNAME_ALL, loc);
diff --git a/desktop/source/deployment/misc/dp_misc.cxx
b/desktop/source/deployment/misc/dp_misc.cxx
index 568ab79d4ec1..a23855109c36 100644
--- a/desktop/source/deployment/misc/dp_misc.cxx
+++ b/desktop/source/deployment/misc/dp_misc.cxx
@@ -75,7 +75,7 @@ namespace {
struct UnoRc : public rtl::StaticWithInit<
std::shared_ptr, UnoRc> {
-const std::shared_ptr operator () () {
+std::shared_ptr operator () () {
OUString unorc( "$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/"
SAL_CONFIGFILE("louno") );
::rtl::Bootstrap::expandMacros( unorc );
std::shared_ptr< ::rtl::Bootstrap > ret(
@@ -86,10 +86,10 @@ struct UnoRc : public rtl::StaticWithInit<
};
struct OfficePipeId : public rtl::StaticWithInit {
-const OUString operator () ();
+OUString operator () ();
};
-const OUString OfficePipeId::operator () ()
+OUString OfficePipeId::operator () ()
{
OUString userPath;
::utl::Bootstrap::PathStatus aLocateResult =
diff --git a/desktop/source/deployment/misc/dp_platform.cxx
b/desktop/source/deployment/misc/dp_platform.cxx
index 74d80e9f1e9e..18ad1a8adc38 100644
--- a/desktop/source/deployment/misc/dp_platform.cxx
+++ b/desktop/source/deployment/misc/dp_platform.cxx
@@ -35,7 +35,7 @@ namespace
{
struct StrOperatingSystem :
public rtl::StaticWithInit {
-const OUString operator () () {
+ OUString operator () () {
OUString os( "$_OS" );
::rtl::Bootstrap::expandMacros( os );
return os;
@@ -44,7 +44,7 @@ namespace
struct StrCPU :
public rtl::StaticWithInit {
-const OUString operator () () {
+OUString operator () () {
OUString arch( "$_ARCH" );
::rtl::Bootstrap::expandMacros( arch );
return arch;
@@ -54,7 +54,7 @@ namespace
struct StrPlatform : public rtl::StaticWithInit<
OUString, StrPlatform> {
-const OUString operator () () {
+OUString operator () () {
OUStringBuffer buf;
buf.append( StrOperatingSystem::get() );
buf.append( '_' );
diff --git a/desktop/source/deployment/misc/dp_resource.cxx
b/desktop/source/deployment/misc/dp_resource.cxx
index c6e9d2a18e3a..a6b3285b3850 100644
--- a/desktop/source/deployment/misc/dp_resource.cxx
+++ b/desktop/source/deployment/misc/dp_resource.cxx
@@ -36,7 +36,7 @@ namespace {
struct OfficeLocale :
public rtl::StaticWithInit {
-const LanguageTag operator () () {
+LanguageTag operator () () {
OUString slang(utl::ConfigManager::getUILocale());
//fallback, the locale is currently only set when the user starts the
//office for the first time.
diff --git a/desktop/source/deployment/registry/component/dp_component.cxx
b/desktop/source/deployment/registry/component/dp_component.cxx
index 98ff6a52a888..42de7f9dd042 100644
--- a/desktop/source/deployment/registry/component/dp_component.cxx
+++ b/desktop/source/
[Libreoffice-commits] core.git: include/svl svl/source svl/unx
include/svl/svdde.hxx |4 ++--
svl/source/items/stylepool.cxx|4 ++--
svl/source/svdde/ddesvr.cxx |4 ++--
svl/unx/source/svdde/ddedummy.cxx |4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit c7799d71899c121334855c3234a9492687803b59
Author: Noel Grandin
AuthorDate: Sat Aug 24 09:23:54 2019 +0200
Commit: Noel Grandin
CommitDate: Sat Aug 24 18:14:23 2019 +0200
loplugin:returnconstval in svl
Change-Id: I55371fde92204e6405e74fb8deecbaf14707a312
Reviewed-on: https://gerrit.libreoffice.org/78053
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/svl/svdde.hxx b/include/svl/svdde.hxx
index 07b5bcfd9f73..10f6ec8f17a2 100644
--- a/include/svl/svdde.hxx
+++ b/include/svl/svdde.hxx
@@ -257,7 +257,7 @@ public:
DdeTopic( SAL_UNUSED_PARAMETER const OUString& );
virtual~DdeTopic();
-const OUString GetName() const;
+OUStringGetName() const;
voidNotifyClient( const OUString& );
boolIsSystemTopic();
@@ -302,7 +302,7 @@ public:
DdeService( const DdeService& ) = delete;
DdeService& operator= ( const DdeService& ) = delete;
-const OUString GetName() const;
+OUStringGetName() const;
short GetError() const { return nStatus; }
static DdeServices& GetServices();
diff --git a/svl/source/items/stylepool.cxx b/svl/source/items/stylepool.cxx
index 14f30f35b26a..6471212c7ff4 100644
--- a/svl/source/items/stylepool.cxx
+++ b/svl/source/items/stylepool.cxx
@@ -74,7 +74,7 @@ namespace {
const bool bSkipIgnorable );
// #i86923#
bool hasIgnorableChildren( const bool bCheckUsage ) const;
-const std::shared_ptr getItemSetOfIgnorableChild(
+std::shared_ptr getItemSetOfIgnorableChild(
const bool bSkipUnusedItemSets ) const;
};
@@ -205,7 +205,7 @@ namespace {
});
}
-const std::shared_ptr Node::getItemSetOfIgnorableChild(
+std::shared_ptr Node::getItemSetOfIgnorableChild(
const bool bSkipUnusedItemSets ) const
{
DBG_ASSERT( hasIgnorableChildren( bSkipUnusedItemSets ),
diff --git a/svl/source/svdde/ddesvr.cxx b/svl/source/svdde/ddesvr.cxx
index d64df8742259..4fffb473674e 100644
--- a/svl/source/svdde/ddesvr.cxx
+++ b/svl/source/svdde/ddesvr.cxx
@@ -451,7 +451,7 @@ DdeService::~DdeService()
}
}
-const OUString DdeService::GetName() const
+OUString DdeService::GetName() const
{
return pName->toOUString();
}
@@ -534,7 +534,7 @@ DdeTopic::~DdeTopic()
delete pName;
}
-const OUString DdeTopic::GetName() const
+OUString DdeTopic::GetName() const
{
return pName->toOUString();
}
diff --git a/svl/unx/source/svdde/ddedummy.cxx
b/svl/unx/source/svdde/ddedummy.cxx
index 2e633f895722..613bfe4ab471 100644
--- a/svl/unx/source/svdde/ddedummy.cxx
+++ b/svl/unx/source/svdde/ddedummy.cxx
@@ -197,7 +197,7 @@ bool DdeTopic::Put( SAL_UNUSED_PARAMETER const DdeData* )
return false;
}
-const OUString DdeTopic::GetName() const
+OUString DdeTopic::GetName() const
{
return OUString();
}
@@ -244,7 +244,7 @@ void DdeService::RemoveTopic( SAL_UNUSED_PARAMETER const
DdeTopic& )
{
}
-const OUString DdeService::GetName() const
+OUString DdeService::GetName() const
{
return OUString();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - include/LibreOfficeKit libreofficekit/source
include/LibreOfficeKit/LibreOfficeKitEnums.h | 103 ++
libreofficekit/source/gtk/lokdocview.cxx | 105 ---
2 files changed, 105 insertions(+), 103 deletions(-)
New commits:
commit 9039f541d96f52e367c78e1e5676fc51b8e4c9d0
Author: Ashod Nakashian
AuthorDate: Fri Aug 16 09:08:10 2019 -0400
Commit: Ashod Nakashian
CommitDate: Sat Aug 24 18:12:25 2019 +0200
LOK: move LOK callback-type-to-string helper to header
This is a very common function that is used by clients
as well as LO Core, so makes sense to have it implemented
once and updated when new callback-types are added,
all in one place.
Change-Id: Id6a1d6bcf5585d7be440b62a0c3a9c993e46e5e0
Reviewed-on: https://gerrit.libreoffice.org/77587
Tested-by: Jenkins
Reviewed-by: Ashod Nakashian
(cherry picked from commit 6c80baa5c2aa33aa39f65f6223bf380e9e4e3c94)
Reviewed-on: https://gerrit.libreoffice.org/78011
Tested-by: Ashod Nakashian
diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h
b/include/LibreOfficeKit/LibreOfficeKitEnums.h
index 2746e1c56a57..4f0d31f50817 100644
--- a/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -10,6 +10,8 @@
#ifndef INCLUDED_LIBREOFFICEKIT_LIBREOFFICEKITENUMS_H
#define INCLUDED_LIBREOFFICEKIT_LIBREOFFICEKITENUMS_H
+#include
+
#ifdef __cplusplus
extern "C"
{
@@ -697,6 +699,107 @@ typedef enum
}
LibreOfficeKitExtTextInputType;
+/// Returns the string representation of a LibreOfficeKitCallbackType
enumeration element.
+static inline const char* lokCallbackTypeToString(int nType)
+{
+switch (static_cast(nType))
+{
+case LOK_CALLBACK_INVALIDATE_TILES:
+return "LOK_CALLBACK_INVALIDATE_TILES";
+case LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR:
+return "LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR";
+case LOK_CALLBACK_TEXT_SELECTION:
+return "LOK_CALLBACK_TEXT_SELECTION";
+case LOK_CALLBACK_TEXT_SELECTION_START:
+return "LOK_CALLBACK_TEXT_SELECTION_START";
+case LOK_CALLBACK_TEXT_SELECTION_END:
+return "LOK_CALLBACK_TEXT_SELECTION_END";
+case LOK_CALLBACK_CURSOR_VISIBLE:
+return "LOK_CALLBACK_CURSOR_VISIBLE";
+case LOK_CALLBACK_VIEW_CURSOR_VISIBLE:
+return "LOK_CALLBACK_VIEW_CURSOR_VISIBLE";
+case LOK_CALLBACK_GRAPHIC_SELECTION:
+return "LOK_CALLBACK_GRAPHIC_SELECTION";
+case LOK_CALLBACK_GRAPHIC_VIEW_SELECTION:
+return "LOK_CALLBACK_GRAPHIC_VIEW_SELECTION";
+case LOK_CALLBACK_CELL_CURSOR:
+return "LOK_CALLBACK_CELL_CURSOR";
+case LOK_CALLBACK_HYPERLINK_CLICKED:
+return "LOK_CALLBACK_HYPERLINK_CLICKED";
+case LOK_CALLBACK_MOUSE_POINTER:
+return "LOK_CALLBACK_MOUSE_POINTER";
+case LOK_CALLBACK_STATE_CHANGED:
+return "LOK_CALLBACK_STATE_CHANGED";
+case LOK_CALLBACK_STATUS_INDICATOR_START:
+return "LOK_CALLBACK_STATUS_INDICATOR_START";
+case LOK_CALLBACK_STATUS_INDICATOR_SET_VALUE:
+return "LOK_CALLBACK_STATUS_INDICATOR_SET_VALUE";
+case LOK_CALLBACK_STATUS_INDICATOR_FINISH:
+return "LOK_CALLBACK_STATUS_INDICATOR_FINISH";
+case LOK_CALLBACK_SEARCH_NOT_FOUND:
+return "LOK_CALLBACK_SEARCH_NOT_FOUND";
+case LOK_CALLBACK_DOCUMENT_SIZE_CHANGED:
+return "LOK_CALLBACK_DOCUMENT_SIZE_CHANGED";
+case LOK_CALLBACK_SET_PART:
+return "LOK_CALLBACK_SET_PART";
+case LOK_CALLBACK_SEARCH_RESULT_SELECTION:
+return "LOK_CALLBACK_SEARCH_RESULT_SELECTION";
+case LOK_CALLBACK_DOCUMENT_PASSWORD:
+return "LOK_CALLBACK_DOCUMENT_PASSWORD";
+case LOK_CALLBACK_DOCUMENT_PASSWORD_TO_MODIFY:
+return "LOK_CALLBACK_DOCUMENT_PASSWORD_TO_MODIFY";
+case LOK_CALLBACK_CONTEXT_MENU:
+return "LOK_CALLBACK_CONTEXT_MENU";
+case LOK_CALLBACK_INVALIDATE_VIEW_CURSOR:
+return "LOK_CALLBACK_INVALIDATE_VIEW_CURSOR";
+case LOK_CALLBACK_TEXT_VIEW_SELECTION:
+return "LOK_CALLBACK_TEXT_VIEW_SELECTION";
+case LOK_CALLBACK_CELL_VIEW_CURSOR:
+return "LOK_CALLBACK_CELL_VIEW_CURSOR";
+case LOK_CALLBACK_CELL_ADDRESS:
+return "LOK_CALLBACK_CELL_ADDRESS";
+case LOK_CALLBACK_CELL_FORMULA:
+return "LOK_CALLBACK_CELL_FORMULA";
+case LOK_CALLBACK_UNO_COMMAND_RESULT:
+return "LOK_CALLBACK_UNO_COMMAND_RESULT";
+case LOK_CALLBACK_ERROR:
+return "LOK_CALLBACK_ERROR";
+case LOK_CALLBACK_VIEW_LOCK:
+return "LOK_CALLBACK_VIEW_LOCK";
+case LOK_CALLBACK_REDLINE_TABLE_SIZE_CHANGED:
+return "LOK_CALLBACK_REDLINE_TABLE_SIZE_CHANGED";
+case LOK_CALLBACK_REDLINE_TABLE_ENTRY_MODIFIED:
+return "LOK_CALLBACK_REDLINE_TABLE_ENTRY_MODIFIED";
+case LOK_CALLBACK_INVALIDATE_HEADER:
+return "LOK_CALLBACK_INVALIDATE_HEADER";
+case LOK_CALLBACK_COMMENT:
+return "LOK_CALLBACK_COMMENT";
+case LOK_CALLBACK_RULER_UPDATE:
+
[Libreoffice-commits] core.git: connectivity/source cui/source
connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx |2 +-
cui/source/dialogs/SignSignatureLineDialog.cxx |6 ++
cui/source/inc/SignSignatureLineDialog.hxx |2 +-
3 files changed, 4 insertions(+), 6 deletions(-)
New commits:
commit 32e22584872f1888c49c976f91f41d5edabcb45c
Author: Noel Grandin
AuthorDate: Sat Aug 24 14:39:28 2019 +0200
Commit: Noel Grandin
CommitDate: Sat Aug 24 16:12:35 2019 +0200
loplugin:returnconstval in connectivity..cui
Change-Id: Ie6444713088c14d1821640f6eb219cee3d6ee542
Reviewed-on: https://gerrit.libreoffice.org/78056
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx
b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx
index f541daad4ce3..b0d83965f2f3 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.cxx
@@ -58,7 +58,7 @@ using ::osl::MutexGuard;
namespace
{
-const std::type_index getTypeFromMysqlType(enum_field_types type)
+std::type_index getTypeFromMysqlType(enum_field_types type)
{
switch (type)
{
diff --git a/cui/source/dialogs/SignSignatureLineDialog.cxx
b/cui/source/dialogs/SignSignatureLineDialog.cxx
index 03549d14fefc..00ad09f4cbef 100644
--- a/cui/source/dialogs/SignSignatureLineDialog.cxx
+++ b/cui/source/dialogs/SignSignatureLineDialog.cxx
@@ -214,8 +214,7 @@ void SignSignatureLineDialog::Apply()
xValidGraphic, xInvalidGraphic,
m_xEditComment->get_text());
}
-const css::uno::Reference
-SignSignatureLineDialog::getSignedGraphic(bool bValid)
+css::uno::Reference
SignSignatureLineDialog::getSignedGraphic(bool bValid)
{
// Read svg and replace placeholder texts
OUString aSvgImage(getSignatureImage());
@@ -274,8 +273,7 @@ SignSignatureLineDialog::getSignedGraphic(bool bValid)
Sequence aMediaProperties(1);
aMediaProperties[0].Name = "InputStream";
aMediaProperties[0].Value <<= xInputStream;
-Reference xGraphic = xProvider->queryGraphic(aMediaProperties);
-return xGraphic;
+return xProvider->queryGraphic(aMediaProperties);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/cui/source/inc/SignSignatureLineDialog.hxx
b/cui/source/inc/SignSignatureLineDialog.hxx
index a12343c4ecd8..6bd08ff4baef 100644
--- a/cui/source/inc/SignSignatureLineDialog.hxx
+++ b/cui/source/inc/SignSignatureLineDialog.hxx
@@ -42,7 +42,7 @@ private:
OUString m_sOriginalImageBtnLabel;
void ValidateFields();
-const css::uno::Reference getSignedGraphic(bool
bValid);
+css::uno::Reference getSignedGraphic(bool bValid);
virtual void Apply() override;
DECL_LINK(clearImage, weld::Button&, void);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: UnoControls/source
UnoControls/source/controls/framecontrol.cxx|7 +++
UnoControls/source/controls/progressbar.cxx |4 ++--
UnoControls/source/controls/progressmonitor.cxx |4 ++--
UnoControls/source/controls/statusindicator.cxx |4 ++--
UnoControls/source/inc/framecontrol.hxx |4 ++--
UnoControls/source/inc/progressbar.hxx |4 ++--
UnoControls/source/inc/progressmonitor.hxx |4 ++--
UnoControls/source/inc/statusindicator.hxx |4 ++--
8 files changed, 17 insertions(+), 18 deletions(-)
New commits:
commit 0bb521f4f9a5af955c704339ffbe02475c8e48cc
Author: Noel Grandin
AuthorDate: Sat Aug 24 14:38:42 2019 +0200
Commit: Noel Grandin
CommitDate: Sat Aug 24 16:12:11 2019 +0200
loplugin:returnconstval in UnoControls
Change-Id: I6e855ee6dc2075334e92803d87e660f389b54d53
Reviewed-on: https://gerrit.libreoffice.org/78055
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/UnoControls/source/controls/framecontrol.cxx
b/UnoControls/source/controls/framecontrol.cxx
index 29545629b508..a954c112d6f1 100644
--- a/UnoControls/source/controls/framecontrol.cxx
+++ b/UnoControls/source/controls/framecontrol.cxx
@@ -250,15 +250,14 @@ void SAL_CALL FrameControl::unadvise( const Type&
aTyp
// impl but public method to register service
-const Sequence< OUString > FrameControl::impl_getStaticSupportedServiceNames()
+Sequence< OUString > FrameControl::impl_getStaticSupportedServiceNames()
{
-Sequence seqServiceNames { "com.sun.star.frame.FrameControl" };
-return seqServiceNames;
+return { "com.sun.star.frame.FrameControl" };
}
// impl but public method to register service
-const OUString FrameControl::impl_getStaticImplementationName()
+OUString FrameControl::impl_getStaticImplementationName()
{
return "stardiv.UnoControls.FrameControl";
}
diff --git a/UnoControls/source/controls/progressbar.cxx
b/UnoControls/source/controls/progressbar.cxx
index 79fd29a6c5a1..37ac9e379195 100644
--- a/UnoControls/source/controls/progressbar.cxx
+++ b/UnoControls/source/controls/progressbar.cxx
@@ -285,14 +285,14 @@ Reference< XControlModel > SAL_CALL
ProgressBar::getModel()
// impl but public method to register service
-const Sequence< OUString > ProgressBar::impl_getStaticSupportedServiceNames()
+Sequence< OUString > ProgressBar::impl_getStaticSupportedServiceNames()
{
return css::uno::Sequence();
}
// impl but public method to register service
-const OUString ProgressBar::impl_getStaticImplementationName()
+OUString ProgressBar::impl_getStaticImplementationName()
{
return "stardiv.UnoControls.ProgressBar";
}
diff --git a/UnoControls/source/controls/progressmonitor.cxx
b/UnoControls/source/controls/progressmonitor.cxx
index c510cca4e18d..f973bc89c072 100644
--- a/UnoControls/source/controls/progressmonitor.cxx
+++ b/UnoControls/source/controls/progressmonitor.cxx
@@ -522,13 +522,13 @@ void SAL_CALL ProgressMonitor::setPosSize ( sal_Int32 nX,
sal_Int32 nY, sal_Int3
}
// impl but public method to register service
-const Sequence< OUString >
ProgressMonitor::impl_getStaticSupportedServiceNames()
+Sequence< OUString > ProgressMonitor::impl_getStaticSupportedServiceNames()
{
return css::uno::Sequence();
}
// impl but public method to register service
-const OUString ProgressMonitor::impl_getStaticImplementationName()
+OUString ProgressMonitor::impl_getStaticImplementationName()
{
return "stardiv.UnoControls.ProgressMonitor";
}
diff --git a/UnoControls/source/controls/statusindicator.cxx
b/UnoControls/source/controls/statusindicator.cxx
index c1867742f0b5..7ac0cd9a4b40 100644
--- a/UnoControls/source/controls/statusindicator.cxx
+++ b/UnoControls/source/controls/statusindicator.cxx
@@ -340,14 +340,14 @@ void SAL_CALL StatusIndicator::setPosSize (
// impl but public method to register service
-const Sequence< OUString >
StatusIndicator::impl_getStaticSupportedServiceNames()
+Sequence< OUString > StatusIndicator::impl_getStaticSupportedServiceNames()
{
return css::uno::Sequence();
}
// impl but public method to register service
-const OUString StatusIndicator::impl_getStaticImplementationName()
+OUString StatusIndicator::impl_getStaticImplementationName()
{
return "stardiv.UnoControls.StatusIndicator";
}
diff --git a/UnoControls/source/inc/framecontrol.hxx
b/UnoControls/source/inc/framecontrol.hxx
index c76bc75163db..2ed78f7bddfe 100644
--- a/UnoControls/source/inc/framecontrol.hxx
+++ b/UnoControls/source/inc/framecontrol.hxx
@@ -127,9 +127,9 @@ public:
// impl but public methods to register service!
-static const css::uno::Sequence< OUString >
impl_getStaticSupportedServiceNames();
+static css::uno::Sequence< OUString >
impl_getStaticSupportedServiceNames();
-static const OUString impl_getStaticImplementationName();
+static OUString impl_getStaticImplementationName();
protected:
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/rtftok/rtfsprm.cxx |4 ++--
writerfilter/source/rtftok/rtfsprm.hxx |2 +-
writerfilter/source/rtftok/rtfvalue.cxx |2 +-
writerfilter/source/rtftok/rtfvalue.hxx |2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit e1c7cb5d2759341fc235eb41c80a0dbc9107db5c
Author: Adrien Ollier
AuthorDate: Wed Jul 24 04:14:58 2019 +0200
Commit: Noel Grandin
CommitDate: Sat Aug 24 14:28:19 2019 +0200
equality test functions are const
RTFSprms::equals and RTFValue::equals
are mutually dependent, which is insane.
Change-Id: Ib6de7954e97d5a1620ea3f8db92fe9a989ee8667
Signed-off-by: Adrien Ollier
Reviewed-on: https://gerrit.libreoffice.org/76211
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/writerfilter/source/rtftok/rtfsprm.cxx
b/writerfilter/source/rtftok/rtfsprm.cxx
index 7ede5a30e2b9..7d2de7c0bb79 100644
--- a/writerfilter/source/rtftok/rtfsprm.cxx
+++ b/writerfilter/source/rtftok/rtfsprm.cxx
@@ -374,9 +374,9 @@ RTFSprms RTFSprms::cloneAndDeduplicate(RTFSprms&
rReference, Id const nStyleType
return ret;
}
-bool RTFSprms::equals(RTFValue& rOther)
+bool RTFSprms::equals(const RTFValue& rOther) const
{
-return std::all_of(m_pSprms->begin(), m_pSprms->end(),
+return std::all_of(m_pSprms->cbegin(), m_pSprms->cend(),
[&](const std::pair& raPair)
-> bool {
return raPair.second->equals(rOther);
});
diff --git a/writerfilter/source/rtftok/rtfsprm.hxx
b/writerfilter/source/rtftok/rtfsprm.hxx
index 561f716e603b..b2eb9f25102d 100644
--- a/writerfilter/source/rtftok/rtfsprm.hxx
+++ b/writerfilter/source/rtftok/rtfsprm.hxx
@@ -75,7 +75,7 @@ public:
Iterator_t begin() { return m_pSprms->begin(); }
Iterator_t end() { return m_pSprms->end(); }
void clear();
-bool equals(RTFValue& rOther);
+bool equals(const RTFValue& rOther) const;
private:
void ensureCopyBeforeWrite();
diff --git a/writerfilter/source/rtftok/rtfvalue.cxx
b/writerfilter/source/rtftok/rtfvalue.cxx
index 15648f9dba9b..49ebfc10eef4 100644
--- a/writerfilter/source/rtftok/rtfvalue.cxx
+++ b/writerfilter/source/rtftok/rtfvalue.cxx
@@ -186,7 +186,7 @@ RTFValue* RTFValue::CloneWithSprms(RTFSprms const&
rAttributes, RTFSprms const&
m_bForceString, *m_pShape, *m_pPicture);
}
-bool RTFValue::equals(RTFValue& rOther)
+bool RTFValue::equals(const RTFValue& rOther) const
{
if (m_nValue != rOther.m_nValue)
return false;
diff --git a/writerfilter/source/rtftok/rtfvalue.hxx
b/writerfilter/source/rtftok/rtfvalue.hxx
index e2ff4e9e8fcc..8fbd49bd0a8e 100644
--- a/writerfilter/source/rtftok/rtfvalue.hxx
+++ b/writerfilter/source/rtftok/rtfvalue.hxx
@@ -73,7 +73,7 @@ public:
RTFSprms& getSprms();
RTFShape& getShape() const;
RTFPicture& getPicture() const;
-bool equals(RTFValue& rOther);
+bool equals(const RTFValue& rOther) const;
RTFValue& operator=(RTFValue const& rOther) = delete;
private:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - framework/inc framework/source include/framework include/svtools svtools/source
framework/inc/classes/actiontriggerpropertyset.hxx |2 -
framework/inc/classes/actiontriggerseparatorpropertyset.hxx|2 -
framework/inc/helper/uiconfigelementwrapperbase.hxx|2 -
framework/inc/helper/uielementwrapperbase.hxx |2 -
framework/inc/jobs/jobconst.hxx|6 +--
framework/inc/tabwin/tabwindow.hxx |2 -
framework/inc/uielement/constitemcontainer.hxx |2 -
framework/inc/uielement/rootitemcontainer.hxx |2 -
framework/source/fwe/classes/actiontriggerpropertyset.cxx | 10 +
framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx | 10 +
framework/source/fwe/classes/addonsoptions.cxx | 12
+++
framework/source/fwi/jobs/jobconst.cxx | 17
++
framework/source/fwi/uielement/constitemcontainer.cxx |9 +
framework/source/fwi/uielement/rootitemcontainer.cxx |9 +
framework/source/helper/uiconfigelementwrapperbase.cxx | 10 +
framework/source/helper/uielementwrapperbase.cxx |9 +
framework/source/jobs/jobresult.cxx|6 +--
framework/source/jobs/shelljob.cxx |2 -
framework/source/services/autorecovery.cxx |6 +--
framework/source/tabwin/tabwindow.cxx | 10 +
include/framework/addonsoptions.hxx|4 +-
include/svtools/langtab.hxx|2 -
svtools/source/misc/langtab.cxx|6 +--
23 files changed, 48 insertions(+), 94 deletions(-)
New commits:
commit d53144e9d185b7b0b41d887c689c13bf27cd9906
Author: Noel Grandin
AuthorDate: Sat Aug 24 09:23:13 2019 +0200
Commit: Noel Grandin
CommitDate: Sat Aug 24 14:25:55 2019 +0200
loplugin:returnconstval in svtools
Change-Id: I2d1d9e0ed8e109ed0be4d7fb78d93790ae41177f
Reviewed-on: https://gerrit.libreoffice.org/78052
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/svtools/langtab.hxx b/include/svtools/langtab.hxx
index a53e928c9998..9038fb24d421 100644
--- a/include/svtools/langtab.hxx
+++ b/include/svtools/langtab.hxx
@@ -42,7 +42,7 @@ public:
// Add LRE or RLE embedding characters to the string based on the
// String content (see #i78466#, #i32179#)
-SVT_DLLPUBLIC const OUString ApplyLreOrRleEmbedding( const OUString &rText );
+SVT_DLLPUBLIC OUString ApplyLreOrRleEmbedding( const OUString &rText );
#endif
diff --git a/svtools/source/misc/langtab.cxx b/svtools/source/misc/langtab.cxx
index c10561f8f87c..1e04933cd377 100644
--- a/svtools/source/misc/langtab.cxx
+++ b/svtools/source/misc/langtab.cxx
@@ -47,7 +47,7 @@ public:
SvtLanguageTableImpl();
boolHasType( const LanguageType eType ) const;
-const OUString GetString( const LanguageType eType ) const;
+OUStringGetString( const LanguageType eType ) const;
LanguageTypeGetType( const OUString& rStr ) const;
sal_uInt32 GetEntryCount() const;
LanguageTypeGetTypeAtIndex( sal_uInt32 nIndex ) const;
@@ -76,7 +76,7 @@ namespace {
struct theLanguageTable : public rtl::Static< SvtLanguageTableImpl,
theLanguageTable > {};
}
-const OUString ApplyLreOrRleEmbedding( const OUString &rText )
+OUString ApplyLreOrRleEmbedding( const OUString &rText )
{
const sal_Int32 nLen = rText.getLength();
if (nLen == 0)
@@ -207,7 +207,7 @@ bool SvtLanguageTable::HasLanguageType( const LanguageType
eType )
return theLanguageTable::get().HasType( eType );
}
-const OUString SvtLanguageTableImpl::GetString( const LanguageType eType )
const
+OUString SvtLanguageTableImpl::GetString( const LanguageType eType ) const
{
LanguageType eLang = MsLangId::getReplacementForObsoleteLanguage( eType );
sal_uInt32 nPos = FindIndex(eLang);
commit d4f9f4b2d57c4f51c026fd114934dd63f4ece13e
Author: Noel Grandin
AuthorDate: Sat Aug 24 09:22:40 2019 +0200
Commit: Noel Grandin
CommitDate: Sat Aug 24 14:25:42 2019 +0200
loplugin:returnconstval in framework
Change-Id: Id3daf68e2daac3ce7686fdc00831ce1e3a69
Reviewed-on: https://gerrit.libreoffice.org/78051
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/framework/inc/classes/actiontriggerpropertyset.hxx
b/framework/inc/classes/actiontriggerpropertyset.hxx
index 15cacb23e7cc..19a2a5e0dfd3 100644
--- a/framework/inc/classes/actiontriggerpropertyset.hxx
+++ b/framework/inc/classes/actiontriggerpropertyset.hxx
@@ -80,7 +80,7 @@ class ActionTriggerPropertySet : private cppu::BaseMutex,
virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
getPropertySetInfo() override;
[Libreoffice-commits] core.git: sw/source
sw/source/core/inc/swfont.hxx |3 +++
sw/source/core/text/guess.cxx |8 +++-
sw/source/core/text/porlay.cxx |2 +-
sw/source/core/text/portxt.cxx |3 ++-
4 files changed, 9 insertions(+), 7 deletions(-)
New commits:
commit 9ee96273a2090b63e0f579a1e9c9cef780756e6d
Author: László Németh
AuthorDate: Mon Aug 12 16:44:28 2019 +0200
Commit: László Németh
CommitDate: Sat Aug 24 11:39:26 2019 +0200
tdf#123703 strip six-em-space (U+2006) at line break
as normal (' ') and ideographic (U+3000) spaces to get
the same layout in justified paragraphs, too, with the
previous RTF import fix.
Note: this can be useful for manual kerning fixes
during editing, too.
Change-Id: I7c031b7d79a8703e4821da91fc60a752a1d15788
Reviewed-on: https://gerrit.libreoffice.org/77367
Reviewed-by: László Németh
Tested-by: László Németh
diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx
index 175c7c088e20..72b633611843 100644
--- a/sw/source/core/inc/swfont.hxx
+++ b/sw/source/core/inc/swfont.hxx
@@ -44,6 +44,9 @@ const sal_Unicode CH_BREAK = 0x0A;
const sal_Unicode CH_TAB = '\t'; // \t
const sal_Unicode CH_PAR= 0xB6; // paragraph
const sal_Unicode CH_BULLET = 0xB7; // centered dot
+const sal_Unicode CH_FULL_BLANK = 0x3000;
+const sal_Unicode CH_NB_SPACE = 0xA0;
+const sal_Unicode CH_SIX_PER_EM = 0x2006; // six-per-em space
sal_uInt16 UnMapDirection( sal_uInt16 nDir, const bool bVertFormat, const bool
bVertFormatLRBT );
diff --git a/sw/source/core/text/guess.cxx b/sw/source/core/text/guess.cxx
index 4c0af10e54cb..c28cccfb65bc 100644
--- a/sw/source/core/text/guess.cxx
+++ b/sw/source/core/text/guess.cxx
@@ -43,10 +43,7 @@ using namespace ::com::sun::star::linguistic2;
namespace{
-const sal_Unicode CH_FULL_BLANK = 0x3000;
-const sal_Unicode CH_NB_SPACE = 0xA0;
-
-bool IsBlank(sal_Unicode ch) { return ch == CH_BLANK || ch == CH_FULL_BLANK ||
ch == CH_NB_SPACE; }
+bool IsBlank(sal_Unicode ch) { return ch == CH_BLANK || ch == CH_FULL_BLANK ||
ch == CH_NB_SPACE || ch == CH_SIX_PER_EM; }
}
@@ -98,7 +95,7 @@ bool SwTextGuess::Guess( const SwTextPortion& rPor,
SwTextFormatInfo &rInf,
sal_Int32(rInf.GetIdx()) <= i; --i)
{
sal_Unicode cChar = rInf.GetText()[i];
-if ( cChar != CH_BLANK && cChar != CH_FULL_BLANK )
+if ( cChar != CH_BLANK && cChar != CH_FULL_BLANK && cChar
!= CH_SIX_PER_EM )
break;
++nSpaceCnt;
}
@@ -473,6 +470,7 @@ bool SwTextGuess::Guess( const SwTextPortion& rPor,
SwTextFormatInfo &rInf,
while( nX > rInf.GetLineStart() &&
( CH_TXTATR_BREAKWORD != cFieldChr || nX >
rInf.GetIdx() ) &&
( CH_BLANK == rInf.GetChar( --nX ) ||
+ CH_SIX_PER_EM == rInf.GetChar( nX ) ||
CH_FULL_BLANK == rInf.GetChar( nX ) ) )
nBreakPos = nX;
}
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index 07f8c4b8a608..e16619663f48 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -319,7 +319,7 @@ static bool lcl_HasOnlyBlanks(const OUString& rText,
TextFrameIndex nStt, TextFr
while ( nStt < nEnd )
{
const sal_Unicode cChar = rText[ sal_Int32(nStt++) ];
-if ( ' ' != cChar && 0x3000 != cChar )
+if ( ' ' != cChar && CH_FULL_BLANK != cChar && CH_SIX_PER_EM != cChar )
{
bBlankOnly = false;
break;
diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx
index d5f51c7e054a..f9aed8c08c6c 100644
--- a/sw/source/core/text/portxt.cxx
+++ b/sw/source/core/text/portxt.cxx
@@ -379,7 +379,8 @@ bool SwTextPortion::Format_( SwTextFormatInfo &rInf )
rInf.GetLineStart() + rInf.GetLast()->GetLen() <
rInf.GetIdx() &&
aGuess.BreakPos() == rInf.GetIdx() &&
CH_BLANK != rInf.GetChar( rInf.GetIdx() ) &&
-0x3000 != rInf.GetChar( rInf.GetIdx() ) ) )
+CH_FULL_BLANK != rInf.GetChar( rInf.GetIdx() ) &&
+CH_SIX_PER_EM != rInf.GetChar( rInf.GetIdx() ) ) )
BreakUnderflow( rInf );
// case B2
else if( rInf.GetIdx() > rInf.GetLineStart() ||
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source writerfilter/source
sw/qa/extras/rtfexport/data/tdf123703.rtf | 31 ++
sw/qa/extras/rtfexport/rtfexport3.cxx | 11 +++
sw/source/filter/ww8/wrtw8nds.cxx | 11 +++
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 16 ++-
4 files changed, 68 insertions(+), 1 deletion(-)
New commits:
commit 24b04db5a63b57a74e58a7616091437ad68548ac
Author: László Németh
AuthorDate: Thu Aug 8 18:04:47 2019 +0200
Commit: László Németh
CommitDate: Sat Aug 24 11:37:51 2019 +0200
tdf#123703 RTF import: fix length of space character sequence
A default RTF space character is longer by an extra six-per-em
space in a space sequence. To get the same layout of documents
formatted with consecutive spaces, insert six-per-em space before
every space in a space sequence. Extra spaces are removed during
the RTF export.
Note: This is a workaround to get the same layout in documents based on
RTF templates, often used for example by bussiness applications.
Instead of adding a new RTF specific core/text layout feature,
with this workaround the layout will be compatible with ODT and DOCX
documents, too. (In contrast, MSO's DOCX export messes up the document
layout silently, shortening the length of the space sequence.)
Change-Id: I620807e1d4497e86c18732e5aa3131cf817ed94a
Reviewed-on: https://gerrit.libreoffice.org/77172
Reviewed-by: László Németh
Tested-by: László Németh
diff --git a/sw/qa/extras/rtfexport/data/tdf123703.rtf
b/sw/qa/extras/rtfexport/data/tdf123703.rtf
new file mode 100644
index ..f657da198c70
--- /dev/null
+++ b/sw/qa/extras/rtfexport/data/tdf123703.rtf
@@ -0,0 +1,31 @@
+{\rtf1
+word
word2\par
+word
word2\par
+word
word2\par
+word
word2\par
+word
word2\par
+word
word2\par
+word
word2\par
+word
word2\par
+word
word2\par
+word
word2\par
+word
word2\par
+word
word2\par
+word
word2\par
+word
word2\par
+word
word2\par
+word
word2\par
+word
word2\par
+word
word2\par
+word
word2\par
+word
word2\par
+word
word2\par
+word
word2\par
+word
word2\par
+word
word2\par
+word
word2\pa
[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sw/uiconfig
sw/uiconfig/swriter/ui/insertcaption.ui |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 87c79663f8ebd08a9a1a843994fc0effcf9f Author: Caolán McNamara AuthorDate: Fri Aug 23 19:35:40 2019 +0100 Commit: Adolfo Jayme Barrientos CommitDate: Sat Aug 24 10:36:33 2019 +0200 Resolves: tdf#126693 cannot put focus into combobox entry Change-Id: I52a316e5c88a41c66ef08be1bae8fcdd10d2ab8e Reviewed-on: https://gerrit.libreoffice.org/78032 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/sw/uiconfig/swriter/ui/insertcaption.ui b/sw/uiconfig/swriter/ui/insertcaption.ui index 3a858b3e0bec..dab2087f14ca 100644 --- a/sw/uiconfig/swriter/ui/insertcaption.ui +++ b/sw/uiconfig/swriter/ui/insertcaption.ui @@ -294,7 +294,7 @@ True -False +True True ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - cui/uiconfig dbaccess/uiconfig extensions/uiconfig filter/uiconfig sc/uiconfig sd/uiconfig sfx2/uiconfig sw/uiconfig vcl/uiconfig
cui/uiconfig/ui/galleryfilespage.ui |2 +- dbaccess/uiconfig/ui/backuppage.ui|2 +- extensions/uiconfig/sabpilot/ui/datasourcepage.ui |2 +- extensions/uiconfig/sabpilot/ui/fieldlinkpage.ui |4 ++-- filter/uiconfig/ui/pdfgeneralpage.ui |2 +- filter/uiconfig/ui/xmlfiltertabpagegeneral.ui |2 +- sc/uiconfig/scalc/ui/definedatabaserangedialog.ui |2 +- sc/uiconfig/scalc/ui/textimportcsv.ui |2 +- sd/uiconfig/simpress/ui/optimpressgeneralpage.ui |5 + sd/uiconfig/simpress/ui/publishingdialog.ui |2 +- sfx2/uiconfig/ui/helpsearchpage.ui|2 +- sw/uiconfig/swriter/ui/addressblockdialog.ui |2 +- sw/uiconfig/swriter/ui/charurlpage.ui |2 +- sw/uiconfig/swriter/ui/frmurlpage.ui |2 +- sw/uiconfig/swriter/ui/mmmailbody.ui |4 ++-- sw/uiconfig/swriter/ui/mmsalutationpage.ui|2 +- sw/uiconfig/swriter/ui/optcaptionpage.ui |2 +- sw/uiconfig/swriter/ui/optfonttabpage.ui | 10 +- sw/uiconfig/swriter/ui/tocentriespage.ui |2 +- vcl/uiconfig/ui/printdialog.ui|2 +- 20 files changed, 26 insertions(+), 29 deletions(-) New commits: commit 4972b71961c1ab2143d82d9af0ac498063c63ff6 Author: Caolán McNamara AuthorDate: Fri Aug 23 20:01:33 2019 +0100 Commit: Adolfo Jayme Barrientos CommitDate: Sat Aug 24 10:34:47 2019 +0200 Related: tdf#126693 cannot put focus into combobox entry set can-focus=True in internal GtkComboBoxText GtkEntry where the GtkEntry is editable=True Change-Id: I32cc7686c3a3cb9827f05f192227c0ad39669aa5 Reviewed-on: https://gerrit.libreoffice.org/78041 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/cui/uiconfig/ui/galleryfilespage.ui b/cui/uiconfig/ui/galleryfilespage.ui index 456627d16cd1..99b5888b3d8e 100644 --- a/cui/uiconfig/ui/galleryfilespage.ui +++ b/cui/uiconfig/ui/galleryfilespage.ui @@ -53,7 +53,7 @@ 0 -False +True True diff --git a/dbaccess/uiconfig/ui/backuppage.ui b/dbaccess/uiconfig/ui/backuppage.ui index 6236a0b2b9d9..0ea91eed52f6 100644 --- a/dbaccess/uiconfig/ui/backuppage.ui +++ b/dbaccess/uiconfig/ui/backuppage.ui @@ -90,7 +90,7 @@ True -False +True diff --git a/extensions/uiconfig/sabpilot/ui/datasourcepage.ui b/extensions/uiconfig/sabpilot/ui/datasourcepage.ui index 3aa64cca58ca..ac4a90acb281 100644 --- a/extensions/uiconfig/sabpilot/ui/datasourcepage.ui +++ b/extensions/uiconfig/sabpilot/ui/datasourcepage.ui @@ -96,7 +96,7 @@ Now, just enter the name under which you want to register the data source in %PR True -False +True diff --git a/extensions/uiconfig/sabpilot/ui/fieldlinkpage.ui b/extensions/uiconfig/sabpilot/ui/fieldlinkpage.ui index 060893dacf12..3abf54171d2f 100644 --- a/extensions/uiconfig/sabpilot/ui/fieldlinkpage.ui +++ b/extensions/uiconfig/sabpilot/ui/fieldlinkpage.ui @@ -67,7 +67,7 @@ True -False +True @@ -115,7 +115,7 @@ True -False +True diff --git a/filter/uiconfig/ui/pdfgeneralpage.ui b/filter/uiconfig/ui/pdfgeneralpage.ui index 1d5173f2af0f..2f953a1d965c 100644 --- a/filter/uiconfig/ui/pdfgeneralpage.ui +++ b/filter/uiconfig/ui/pdfgeneralpage.ui @@ -256,7 +256,7 @@ -False +True True 75 DPI diff --git a/filter/uiconfig/ui/xmlfiltertabpagegeneral.ui b/filter/uiconfig/ui/xmlfiltertabpagegeneral.ui index b44d0f9fc0d9..24f6f366e85d 100644 --- a/filter/uiconfig/ui/xmlfiltertabpagegeneral.ui +++ b/filter/uiconfig/ui/xmlfiltertabpagegeneral.ui @@ -133,7 +133,7 @@ True -False +True True diff --git a/sc/uiconfig/scalc/ui/definedatabaserangedialog.ui b/sc/uiconfig/scalc/ui/definedatabaserangedialog.ui index 4cedef27471d..5f9f02d063e0 100644 --- a/sc/uiconfig/scalc/ui/definedatabaserangedialog.ui +++
[Libreoffice-commits] core.git: include/unotools unotools/source
include/unotools/localedatawrapper.hxx |2 +-
unotools/source/config/lingucfg.cxx |6 +++---
unotools/source/config/misccfg.cxx |8 +++-
unotools/source/config/syslocaleoptions.cxx |4 ++--
unotools/source/i18n/localedatawrapper.cxx |2 +-
5 files changed, 10 insertions(+), 12 deletions(-)
New commits:
commit f693d23170036bd6116458e655c2f3b34b3cd926
Author: Noel Grandin
AuthorDate: Fri Aug 23 21:00:39 2019 +0200
Commit: Noel Grandin
CommitDate: Sat Aug 24 09:03:09 2019 +0200
loplugin:returnconstval in unotools
Change-Id: I8bfc0d52c8a68268a12e3dab890402d964d48eba
Reviewed-on: https://gerrit.libreoffice.org/78036
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/unotools/localedatawrapper.hxx
b/include/unotools/localedatawrapper.hxx
index 04650e29f7b6..fd0e457943eb 100644
--- a/include/unotools/localedatawrapper.hxx
+++ b/include/unotools/localedatawrapper.hxx
@@ -211,7 +211,7 @@ public:
Indian grouping. The sal_Int32* getConstArray() can be passed directly
to the ::rtl::math::doubleToString() methods as argument for the
pGroups parameter. */
-const css::uno::Sequence< sal_Int32 > getDigitGrouping() const;
+css::uno::Sequence< sal_Int32 > getDigitGrouping() const;
// Functionality of class International methods, LocaleItem
diff --git a/unotools/source/config/lingucfg.cxx
b/unotools/source/config/lingucfg.cxx
index 70efeba7b6c5..7c7a6b700cc8 100644
--- a/unotools/source/config/lingucfg.cxx
+++ b/unotools/source/config/lingucfg.cxx
@@ -68,7 +68,7 @@ static bool lcl_SetLocale( LanguageType &rLanguage, const
uno::Any &rVal )
return bSucc;
}
-static const OUString lcl_LanguageToCfgLocaleStr( LanguageType nLanguage )
+static OUString lcl_LanguageToCfgLocaleStr( LanguageType nLanguage )
{
OUString aRes;
if (LANGUAGE_SYSTEM != nLanguage)
@@ -148,7 +148,7 @@ class SvtLinguConfigItem : public utl::ConfigItem
SvtLinguOptions aOpt;
static bool GetHdlByName( sal_Int32 &rnHdl, const OUString &rPropertyName,
bool bFullPropName = false );
-static const uno::Sequence< OUString > GetPropertyNames();
+static uno::Sequence< OUString > GetPropertyNames();
voidLoadOptions( const uno::Sequence< OUString >
&rProperyNames );
boolSaveOptions( const uno::Sequence< OUString >
&rProperyNames );
@@ -256,7 +256,7 @@ static struct NamesToHdl
{nullptr,nullptr,
-1}
};
-const uno::Sequence< OUString > SvtLinguConfigItem::GetPropertyNames()
+uno::Sequence< OUString > SvtLinguConfigItem::GetPropertyNames()
{
uno::Sequence< OUString > aNames;
diff --git a/unotools/source/config/misccfg.cxx
b/unotools/source/config/misccfg.cxx
index e8bf4023479f..4941773afb65 100644
--- a/unotools/source/config/misccfg.cxx
+++ b/unotools/source/config/misccfg.cxx
@@ -44,7 +44,7 @@ private:
boolbNotFound;
sal_Int32 nYear2000; // two digit year representation
-static const css::uno::Sequence GetPropertyNames();
+static css::uno::Sequence GetPropertyNames();
voidLoad();
virtual voidImplCommit() final override;
@@ -114,17 +114,15 @@ void SfxMiscCfg::SetYear2000( sal_Int32 nSet )
nYear2000 = nSet;
}
-const Sequence SfxMiscCfg::GetPropertyNames()
+Sequence SfxMiscCfg::GetPropertyNames()
{
-const OUString pProperties[] =
+return
{
OUString("Print/Warning/PaperSize"),
OUString("Print/Warning/PaperOrientation"),
OUString("Print/Warning/NotFound"),
OUString("DateFormat/TwoDigitYear")
};
-const Sequence< OUString > seqPropertyNames( pProperties, 4 );
-return seqPropertyNames;
}
void SfxMiscCfg::Load()
diff --git a/unotools/source/config/syslocaleoptions.cxx
b/unotools/source/config/syslocaleoptions.cxx
index 1876855d1008..f3942f5b7c4d 100644
--- a/unotools/source/config/syslocaleoptions.cxx
+++ b/unotools/source/config/syslocaleoptions.cxx
@@ -75,7 +75,7 @@ class SvtSysLocaleOptions_Impl : public utl::ConfigItem
boolm_bRODecimalSeparator;
boolm_bROIgnoreLanguageChange;
-static const Sequence< /* const */ OUString > GetPropertyNames();
+static Sequence GetPropertyNames();
voidMakeRealLocale();
voidMakeRealUILocale();
@@ -128,7 +128,7 @@ public:
#define PROPERTYHANDLE_DATEPATTERNS 4
#define PROPERTYHANDLE_IGNORELANGCHANGE 5
-const Sequence< OUString > SvtSysLocaleOptions_Impl::GetPropertyNames()
+Sequence< OUString > SvtSysLocaleOptions_Impl::GetPropertyNames()
{
return Sequence< OUString >
{
diff --git a/unotools/source/i18n/localedatawrapper.cxx
b/unotools/source/i18n/localedatawrapper.cxx
index 8a16ec556f47..ec306acf
[Libreoffice-commits] core.git: include/sfx2 sfx2/source
include/sfx2/bindings.hxx |2 +-
include/sfx2/sidebar/Theme.hxx |2 +-
sfx2/source/control/bindings.cxx |2 +-
sfx2/source/notebookbar/SfxNotebookBar.cxx |2 +-
sfx2/source/sidebar/Deck.cxx |2 +-
sfx2/source/sidebar/Theme.cxx |2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit b4e1389f7abecbd8b323d9c4653ee506054a1f85
Author: Noel Grandin
AuthorDate: Fri Aug 23 20:59:50 2019 +0200
Commit: Noel Grandin
CommitDate: Sat Aug 24 09:02:41 2019 +0200
loplugin:returnconstval in sfx2
Change-Id: I9761dbfa66ea59d5c9c0cd87740fdb8ca34008eb
Reviewed-on: https://gerrit.libreoffice.org/78034
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/sfx2/bindings.hxx b/include/sfx2/bindings.hxx
index 33b8e4a58cac..8b8cc0c7080d 100644
--- a/include/sfx2/bindings.hxx
+++ b/include/sfx2/bindings.hxx
@@ -149,7 +149,7 @@ public:
SAL_DLLPRIVATE void SetDispatchProvider_Impl( const css::uno::Reference<
css::frame::XDispatchProvider > & rFrame );
void SetActiveFrame( const css::uno::Reference<
css::frame::XFrame > & rFrame );
-const css::uno::Reference< css::frame::XFrame > GetActiveFrame() const;
+css::uno::Reference< css::frame::XFrame > GetActiveFrame() const;
// Reconfig
sal_uInt16 EnterRegistrations(const char *pFile = nullptr, int nLine
= 0);
void LeaveRegistrations( const char *pFile = nullptr, int
nLine = 0 );
diff --git a/include/sfx2/sidebar/Theme.hxx b/include/sfx2/sidebar/Theme.hxx
index 16a4798cdf9f..c0b8697d7732 100644
--- a/include/sfx2/sidebar/Theme.hxx
+++ b/include/sfx2/sidebar/Theme.hxx
@@ -130,7 +130,7 @@ public:
static Image GetImage (const ThemeItem eItem);
static Color GetColor (const ThemeItem eItem);
static const Paint& GetPaint (const ThemeItem eItem);
-static const Wallpaper GetWallpaper (const ThemeItem eItem);
+static Wallpaper GetWallpaper (const ThemeItem eItem);
static sal_Int32 GetInteger (const ThemeItem eItem);
static bool GetBoolean (const ThemeItem eItem);
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index 044f0351dc49..dfbf7c8b33b6 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -1677,7 +1677,7 @@ void SfxBindings::SetActiveFrame( const
css::uno::Reference< css::frame::XFrame
pDispatcher->GetFrame()->GetFrame().GetFrameInterface(),
css::uno::UNO_QUERY ) );
}
-const css::uno::Reference< css::frame::XFrame > SfxBindings::GetActiveFrame()
const
+css::uno::Reference< css::frame::XFrame > SfxBindings::GetActiveFrame() const
{
const css::uno::Reference< css::frame::XFrame > xFrame( pImpl->xProv,
css::uno::UNO_QUERY );
if ( xFrame.is() || !pDispatcher )
diff --git a/sfx2/source/notebookbar/SfxNotebookBar.cxx
b/sfx2/source/notebookbar/SfxNotebookBar.cxx
index 4bdce004ad91..672c949531bb 100644
--- a/sfx2/source/notebookbar/SfxNotebookBar.cxx
+++ b/sfx2/source/notebookbar/SfxNotebookBar.cxx
@@ -185,7 +185,7 @@ static utl::OConfigurationTreeRoot
lcl_getCurrentImplConfigRoot()
true);
}
-static const utl::OConfigurationNode lcl_getCurrentImplConfigNode(const
Reference& xFrame,
+static utl::OConfigurationNode lcl_getCurrentImplConfigNode(const
Reference& xFrame,
utl::OConfigurationTreeRoot const & rNotebookbarNode )
{
if (!rNotebookbarNode.isValid())
diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx
index 7e451035af34..8f57dba36b4a 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -332,7 +332,7 @@ void Deck::ShowPanel(const Panel& rPanel)
}
}
-static const OUString GetWindowClassification(const vcl::Window* pWindow)
+static OUString GetWindowClassification(const vcl::Window* pWindow)
{
const OUString& rsName (pWindow->GetText());
if (!rsName.isEmpty())
diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx
index bc6236d34bbd..a5a1ed3e94b0 100644
--- a/sfx2/source/sidebar/Theme.cxx
+++ b/sfx2/source/sidebar/Theme.cxx
@@ -94,7 +94,7 @@ const Paint& Theme::GetPaint (const ThemeItem eItem)
return rTheme.maPaints[nIndex];
}
-const Wallpaper Theme::GetWallpaper (const ThemeItem eItem)
+Wallpaper Theme::GetWallpaper (const ThemeItem eItem)
{
return GetPaint(eItem).GetWallpaper();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
