[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/bitmap3.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 817b6e6f97ed50d28b1ff37db8357d37b505
Author: Noel Grandin
AuthorDate: Fri Dec 20 09:02:52 2019 +0200
Commit: Noel Grandin
CommitDate: Sat Dec 21 08:56:17 2019 +0100
improve warning message
Change-Id: Ib85b7f32fdb0179ed36ce55daeabfa14224dd790
Reviewed-on: https://gerrit.libreoffice.org/85645
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx
index 87f858de7732..68d590bc6eeb 100644
--- a/vcl/source/gdi/bitmap3.cxx
+++ b/vcl/source/gdi/bitmap3.cxx
@@ -886,7 +886,7 @@ void Bitmap::AdaptBitCount(Bitmap& rNew) const
}
default:
{
-OSL_ENSURE(false, "BitDepth adaptation failed (!)");
+SAL_WARN("vcl", "BitDepth adaptation failed, from " <<
rNew.GetBitCount() << " to " << GetBitCount());
break;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/text/XMLSectionSourceImportContext.cxx | 52 +--
xmloff/source/text/XMLSectionSourceImportContext.hxx |6 +-
2 files changed, 18 insertions(+), 40 deletions(-)
New commits:
commit ccdcc25a085299bda45bc5ea4b3594e856f2d315
Author: Noel Grandin
AuthorDate: Fri Dec 20 15:12:15 2019 +0200
Commit: Noel Grandin
CommitDate: Sat Dec 21 08:29:31 2019 +0100
convert XMLSectionSourceImportContext to FastParser APIs
Change-Id: I488d0e521a445055a33a7972d78005047b2c5b2f
Reviewed-on: https://gerrit.libreoffice.org/85647
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/xmloff/source/text/XMLSectionSourceImportContext.cxx
b/xmloff/source/text/XMLSectionSourceImportContext.cxx
index 2ae4e671f7c0..82e01979ab0c 100644
--- a/xmloff/source/text/XMLSectionSourceImportContext.cxx
+++ b/xmloff/source/text/XMLSectionSourceImportContext.cxx
@@ -32,6 +32,7 @@
using ::com::sun::star::beans::XPropertySet;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::xml::sax::XAttributeList;
+using ::com::sun::star::xml::sax::XFastAttributeList;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::text;
@@ -52,54 +53,31 @@
XMLSectionSourceImportContext::~XMLSectionSourceImportContext()
{
}
-namespace {
-enum XMLSectionSourceToken
-{
-XML_TOK_SECTION_XLINK_HREF,
-XML_TOK_SECTION_TEXT_FILTER_NAME,
-XML_TOK_SECTION_TEXT_SECTION_NAME
-};
-
-}
-
-static const SvXMLTokenMapEntry aSectionSourceTokenMap[] =
-{
-{ XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_SECTION_XLINK_HREF },
-{ XML_NAMESPACE_TEXT, XML_FILTER_NAME, XML_TOK_SECTION_TEXT_FILTER_NAME },
-{ XML_NAMESPACE_TEXT, XML_SECTION_NAME,
-XML_TOK_SECTION_TEXT_SECTION_NAME },
-XML_TOKEN_MAP_END
-};
-
-void XMLSectionSourceImportContext::StartElement(
-const Reference & xAttrList)
+void XMLSectionSourceImportContext::startFastElement(sal_Int32 /*nElement*/,
+const Reference & xAttrList)
{
-static const SvXMLTokenMap aTokenMap(aSectionSourceTokenMap);
OUString sURL;
OUString sFilterName;
OUString sSectionName;
-sal_Int16 nLength = xAttrList->getLength();
-for(sal_Int16 nAttr = 0; nAttr < nLength; nAttr++)
-{
-OUString sLocalName;
-sal_uInt16 nPrefix = GetImport().GetNamespaceMap().
-GetKeyByAttrName( xAttrList->getNameByIndex(nAttr),
- &sLocalName );
+sax_fastparser::FastAttributeList *pAttribList =
+sax_fastparser::FastAttributeList::castToFastAttributeList(
xAttrList );
-switch (aTokenMap.Get(nPrefix, sLocalName))
+for (auto &aIter : *pAttribList)
+{
+switch (aIter.getToken())
{
-case XML_TOK_SECTION_XLINK_HREF:
-sURL = xAttrList->getValueByIndex(nAttr);
+case XML_ELEMENT(XLINK, XML_HREF):
+sURL = aIter.toString();
break;
-case XML_TOK_SECTION_TEXT_FILTER_NAME:
-sFilterName = xAttrList->getValueByIndex(nAttr);
+case XML_ELEMENT(TEXT, XML_FILTER_NAME):
+sFilterName = aIter.toString();
break;
-case XML_TOK_SECTION_TEXT_SECTION_NAME:
-sSectionName = xAttrList->getValueByIndex(nAttr);
+case XML_ELEMENT(TEXT, XML_SECTION_NAME):
+sSectionName = aIter.toString();
break;
default:
@@ -127,7 +105,7 @@ void XMLSectionSourceImportContext::StartElement(
}
}
-void XMLSectionSourceImportContext::EndElement()
+void XMLSectionSourceImportContext::endFastElement(sal_Int32 /*nElement*/)
{
// this space intentionally left blank.
}
diff --git a/xmloff/source/text/XMLSectionSourceImportContext.hxx
b/xmloff/source/text/XMLSectionSourceImportContext.hxx
index 865e9753ff6f..838375ff7e78 100644
--- a/xmloff/source/text/XMLSectionSourceImportContext.hxx
+++ b/xmloff/source/text/XMLSectionSourceImportContext.hxx
@@ -45,10 +45,10 @@ public:
protected:
-virtual void StartElement(
-const css::uno::Reference & xAttrList)
override;
+virtual void SAL_CALL startFastElement(sal_Int32 nElement,
+const css::uno::Reference &
xAttrList) override;
-virtual void EndElement() override;
+virtual void SAL_CALL endFastElement(sal_Int32 nElement) override;
};
#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/xmloff sc/source xmloff/source
include/xmloff/xmlstyle.hxx |4 --
sc/source/filter/xml/XMLTrackedChangesContext.cxx | 20 --
xmloff/source/core/DocumentSettingsContext.cxx | 11
xmloff/source/style/xmlnumfi.cxx| 22
xmloff/source/style/xmlstyle.cxx|7 -
xmloff/source/style/xmltabi.cxx | 12
xmloff/source/text/XMLSectionSourceDDEImportContext.cxx |9 --
xmloff/source/text/XMLSectionSourceDDEImportContext.hxx |5 ---
xmloff/source/text/XMLSectionSourceImportContext.cxx|9 --
xmloff/source/text/XMLSectionSourceImportContext.hxx|5 ---
10 files changed, 104 deletions(-)
New commits:
commit a445b24d1eef6b81db962894d4c3990e1067f4ad
Author: Noel Grandin
AuthorDate: Fri Dec 20 14:35:44 2019 +0200
Commit: Noel Grandin
CommitDate: Sat Dec 21 08:25:23 2019 +0100
remove unnecessary CreateChildContext methods
that do the same as the base class method
Change-Id: I5048edf9d5fa40bb4ebdd96d9b13c303fb061945
Reviewed-on: https://gerrit.libreoffice.org/85646
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/xmloff/xmlstyle.hxx b/include/xmloff/xmlstyle.hxx
index bf0e77098ced..a18070f6a747 100644
--- a/include/xmloff/xmlstyle.hxx
+++ b/include/xmloff/xmlstyle.hxx
@@ -99,10 +99,6 @@ public:
virtual ~SvXMLStyleContext() override;
-virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
-const OUString& rLocalName,
-const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList
) override;
-
virtual void StartElement(
const css::uno::Reference< css::xml::sax::XAttributeList > & xAttrList
) override;
diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.cxx
b/sc/source/filter/xml/XMLTrackedChangesContext.cxx
index 2b0e2afa0171..4374f90362e3 100644
--- a/sc/source/filter/xml/XMLTrackedChangesContext.cxx
+++ b/sc/source/filter/xml/XMLTrackedChangesContext.cxx
@@ -266,9 +266,6 @@ public:
const
css::uno::Reference& xAttrList,
ScXMLChangeTrackingImportHelper*
pChangeTrackingImportHelper);
-virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
-const OUString& rLocalName,
-const
css::uno::Reference& xAttrList ) override;
virtual void EndElement() override;
};
@@ -279,9 +276,6 @@ public:
const
css::uno::Reference& xAttrList,
ScXMLChangeTrackingImportHelper*
pChangeTrackingImportHelper);
-virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
-const OUString& rLocalName,
-const
css::uno::Reference& xAttrList ) override;
virtual void EndElement() override;
};
@@ -1183,13 +1177,6 @@
ScXMLInsertionCutOffContext::ScXMLInsertionCutOffContext( ScXMLImport& rImport,
pChangeTrackingImportHelper->SetInsertionCutOff(nID, nPosition);
}
-SvXMLImportContextRef ScXMLInsertionCutOffContext::CreateChildContext(
sal_uInt16 nPrefix,
- const OUString& rLocalName,
- const
css::uno::Reference& /* xAttrList */ )
-{
-return new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
-}
-
void ScXMLInsertionCutOffContext::EndElement()
{
}
@@ -1241,13 +1228,6 @@ ScXMLMovementCutOffContext::ScXMLMovementCutOffContext(
ScXMLImport& rImport,
pChangeTrackingImportHelper->AddMoveCutOff(nID, nStartPosition,
nEndPosition);
}
-SvXMLImportContextRef ScXMLMovementCutOffContext::CreateChildContext(
sal_uInt16 nPrefix,
- const OUString& rLocalName,
- const
css::uno::Reference& /* xAttrList */ )
-{
-return new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
-}
-
void ScXMLMovementCutOffContext::EndElement()
{
}
diff --git a/xmloff/source/core/DocumentSettingsContext.cxx
b/xmloff/source/core/DocumentSettingsContext.cxx
index 087bf2d34b4b..13bb5e1214db 100644
--- a/xmloff/source/core/DocumentSettingsContext.cxx
+++ b/xmloff/source/core/DocumentSettingsContext.cxx
@@ -152,9 +152,6 @@ public:
const OUString& rItemName,
XMLConfigBaseContext* pBaseContext);
-virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
-const OUString& rLocalName,
-const css::uno::Reference<
css::xml::sax::XAttributeList>& xAttrList ) override;
virtual void Characters( const OUStr
[Libreoffice-commits] core.git: basic/inc basic/source
basic/inc/sbxbase.hxx |4 basic/source/classes/errobject.cxx | 12 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) New commits: commit 3ebf6a090b227c0097ff8668fe023e7bdbdadc5d Author: Mike Kaganski AuthorDate: Fri Dec 20 12:49:04 2019 +0300 Commit: Mike Kaganski CommitDate: Sat Dec 21 08:12:38 2019 +0100 Avoid crash in shutdown when accessing already destroyed BASIC_DLL ... as seen in https://ci.libreoffice.org/job/gerrit_linux_gcc_release/48425/console The problem was that SbxErrObject::getErrObject created a static object which called GetSbxData_Impl() in its destructor, which in turn accessed BASIC_DLL, which was invalidated by deleting BasicDLL objects either in SfxApplication::~SfxApplication or in MacroSnippet::~MacroSnippet, thus already invalid when static was destroyed. So fix this by creating the global error object in the SbxAppData, not as function-local static, so that its lifetime is limited to the data. The crash happened also on Windows, but was somehow masked (possibly by custom error handler?), with this call stack: sblo.dll!std::unique_ptr>::operator*() Line 1886 at C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.24.28314\include\memory(1886) sblo.dll!GetSbxData_Impl() Line 110 at C:\lo\src\core\basic\source\runtime\basrdll.cxx(110) sblo.dll!SbxBase::GetError() Line 96 at C:\lo\src\core\basic\source\sbx\sbxbase.cxx(96) sblo.dll!SbxValue::Put(const SbxValues & rVal) Line 414 at C:\lo\src\core\basic\source\sbx\sbxvalue.cxx(414) sblo.dll!SbxValue::Clear() Line 179 at C:\lo\src\core\basic\source\sbx\sbxvalue.cxx(179) sblo.dll!SbxValue::~SbxValue() Line 139 at C:\lo\src\core\basic\source\sbx\sbxvalue.cxx(139) sblo.dll!SbxVariable::~SbxVariable() Line 125 at C:\lo\src\core\basic\source\sbx\sbxvar.cxx(125) sblo.dll!SbxProperty::~SbxProperty() Line 861 at C:\lo\src\core\basic\source\sbx\sbxobj.cxx(861) sblo.dll!SbUnoProperty::~SbUnoProperty() Line 2591 at C:\lo\src\core\basic\source\classes\sbunoobj.cxx(2591) sblo.dll!SbUnoProperty::`vbase destructor'() sblo.dll!SbUnoProperty::`scalar deleting destructor'(unsigned int) tllo.dll!SvRefBase::ReleaseRef() Line 163 at C:\lo\src\core\include\tools\ref.hxx(163) sblo.dll!tools::SvRef::~SvRef() Line 56 at C:\lo\src\core\include\tools\ref.hxx(56) sblo.dll!SbxVarEntry::~SbxVarEntry() sblo.dll!SbxVarEntry::`scalar deleting destructor'(unsigned int) sblo.dll!std::_Default_allocator_traits>::destroy(std::allocator & __formal, SbxVarEntry * const _Ptr) Line 677 at C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.24.28314\include\xmemory(677) sblo.dll!std::_Destroy_range>(SbxVarEntry * _First, SbxVarEntry * const _Last, std::allocator & _Al) Line 951 at C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.24.28314\include\xmemory(951) sblo.dll!std::vector>::_Destroy(SbxVarEntry * _First, SbxVarEntry * _Last) Line 1616 at C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.24.28314\include\vector(1616) sblo.dll!std::vector>::_Tidy() Line 1698 at C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.24.28314\include\vector(1698) sblo.dll!std::vector>::~vector>() Line 674 at C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.24.28314\include\vector(674) sblo.dll!SbxArray::~SbxArray() Line 75 at C:\lo\src\core\basic\source\sbx\sbxarray.cxx(75) sblo.dll!SbxArray::`vbase destructor'() sblo.dll!SbxArray::`vector deleting destructor'(unsigned int) tllo.dll!SvRefBase::ReleaseRef() Line 163 at C:\lo\src\core\include\tools\ref.hxx(163) sblo.dll!tools::SvRef::~SvRef() Line 56 at C:\lo\src\core\include\tools\ref.hxx(56) sblo.dll!SbxObject::~SbxObject() Line 111 at C:\lo\src\core\basic\source\sbx\sbxobj.cxx(111) sblo.dll!SbUnoObject::~SbUnoObject() Line 2387 at C:\lo\src\core\basic\source\classes\sbunoobj.cxx(2387) sblo.dll!SbxErrObject::~SbxErrObject() Line 183 at C:\lo\src\core\basic\source\classes\errobject.cxx(183) sblo.dll!SbxErrObject::`vbase destructor'() sblo.dll!SbxErrObject::`scalar deleting destructor'(unsigned int) tllo.dll!SvRefBase::ReleaseRef() Line 163 at C:\lo\src\core\include\tools\ref.hxx(163) sblo.dll!tools::SvRef::~SvRef() Line 56 at C:\lo\src\core\include\tools\ref.hxx(56) sblo.dll!`SbxErrObject::getErrObject'::`2'::`dynamic atexit destructor for 'pGlobErr''() ucrtbased.dll!_execute_onexit_table::__l2::() Line 206 at minkerne
[Libreoffice-commits] core.git: editeng/source vcl/unx
editeng/source/misc/unolingu.cxx |1 +
vcl/unx/generic/print/genpspgraphics.cxx |4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 77729d03c8bbad19e6cb2151fb2f1244c06aca1a
Author: Alex Henrie
AuthorDate: Fri Dec 20 21:33:49 2019 -0700
Commit: Noel Grandin
CommitDate: Sat Dec 21 07:29:23 2019 +0100
Fix compilation with `make -- dbglevel=3`
Change-Id: I95125fd3c882a828e77724ecac492e216b7da09c
Reviewed-on: https://gerrit.libreoffice.org/85643
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx
index 43462bda6df5..8352e431ba5f 100644
--- a/editeng/source/misc/unolingu.cxx
+++ b/editeng/source/misc/unolingu.cxx
@@ -21,6 +21,7 @@
#include
#include
#include
+#include
#include
#include
#include
diff --git a/vcl/unx/generic/print/genpspgraphics.cxx
b/vcl/unx/generic/print/genpspgraphics.cxx
index 8f1adf73e632..221525514b34 100644
--- a/vcl/unx/generic/print/genpspgraphics.cxx
+++ b/vcl/unx/generic/print/genpspgraphics.cxx
@@ -828,9 +828,9 @@ FontAttributes GenPspGraphics::Info2FontAttributes( const
psp::FastPrintFontInfo
aDFA.AddMapName(alias);
#if OSL_DEBUG_LEVEL > 2
-if( aDFA.HasMapNames() )
+if( aDFA.GetMapNames().getLength() > 0 )
{
-SAL_INFO( "vcl.fonts", "using alias names " << aDFA.GetAliasNames() <<
" for font family " << aDFA.GetFamilyName() );
+SAL_INFO( "vcl.fonts", "using alias names " << aDFA.GetMapNames() << "
for font family " << aDFA.GetFamilyName() );
}
#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svtools/source vcl/source
svtools/source/config/accessibilityoptions.cxx |4
vcl/source/app/settings.cxx|9 -
2 files changed, 12 insertions(+), 1 deletion(-)
New commits:
commit 6c3f6fc13a9d6d112253f895d45ea4c9aaab6607
Author: Tor Lillqvist
AuthorDate: Fri Dec 20 17:32:25 2019 +0200
Commit: Tor Lillqvist
CommitDate: Sat Dec 21 05:03:56 2019 +0200
tdf#126966: Make the colour swatches larger on iOS
We reduce the number of swatches per row from 12 to 4 and increase
their size suitably so that the thing still fits in the sidebar in the
iOS app on an iPad in portrait orientation.
Change-Id: Ie81e5b54e88a02c6866de27448b5be72e97d9a16
Reviewed-on: https://gerrit.libreoffice.org/85620
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tor Lillqvist
(cherry picked from commit 18af8dc6a038d1e76274de7abc55ffa06b39a6c8)
diff --git a/svtools/source/config/accessibilityoptions.cxx
b/svtools/source/config/accessibilityoptions.cxx
index 6cd499a08e6d..315a0333b7b7 100644
--- a/svtools/source/config/accessibilityoptions.cxx
+++ b/svtools/source/config/accessibilityoptions.cxx
@@ -261,6 +261,9 @@ sal_Int16
SvtAccessibilityOptions_Impl::GetListBoxMaximumLineCount() const
sal_Int16 SvtAccessibilityOptions_Impl::GetColorValueSetColumnCount() const
{
+#ifdef IOS
+return 4;
+#else
css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg,
css::uno::UNO_QUERY);
sal_Int16 nRet = 12;
@@ -275,6 +278,7 @@ sal_Int16
SvtAccessibilityOptions_Impl::GetColorValueSetColumnCount() const
}
return nRet;
+#endif
}
bool SvtAccessibilityOptions_Impl::GetPreviewUsesCheckeredBackground() const
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index bf50a8150d47..900dd98d34ff 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
/*
* This file is part of the LibreOffice project.
*
@@ -472,8 +472,15 @@ ImplStyleData::ImplStyleData() :
maEdgeBlendingTopLeftColor(Color(0xC0, 0xC0, 0xC0)),
maEdgeBlendingBottomRightColor(Color(0x40, 0x40, 0x40)),
mnListBoxMaximumLineCount(25),
+// For some reason this isn't actually the column count that gets used, at
least on iOS, but
+// instead what
SvtAccessibilityOptions_Impl::GetColorValueSetColumnCount() in
+// svtools/source/config/accessibilityoptions.cxx returns.
mnColorValueSetColumnCount(12),
+#ifdef IOS
+maListBoxPreviewDefaultLogicSize(Size(30, 30)),
+#else
maListBoxPreviewDefaultLogicSize(Size(15, 7)),
+#endif
maListBoxPreviewDefaultPixelSize(Size(0, 0)), // on-demand calculated in
GetListBoxPreviewDefaultPixelSize(),
mbPreviewUsesCheckeredBackground(true)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/tbxctrls/tbxcolor.cxx |7 ++-
1 file changed, 2 insertions(+), 5 deletions(-)
New commits:
commit a1fa83a56694e12471006d510d02cd80be0a2034
Author: Tor Lillqvist
AuthorDate: Fri Dec 20 16:36:31 2019 +0200
Commit: Tor Lillqvist
CommitDate: Sat Dec 21 05:03:08 2019 +0200
Get rid of two pointless #defines
Change-Id: I7479f4f1c440bba1dd9f922c4df32ab877e0a803
Reviewed-on: https://gerrit.libreoffice.org/85619
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tor Lillqvist
(cherry picked from commit 83fedc02f2d831774c12d60097a99e968b56dc5e)
diff --git a/svx/source/tbxctrls/tbxcolor.cxx b/svx/source/tbxctrls/tbxcolor.cxx
index 5336f070aadf..3a17e38820a4 100644
--- a/svx/source/tbxctrls/tbxcolor.cxx
+++ b/svx/source/tbxctrls/tbxcolor.cxx
@@ -34,11 +34,8 @@ namespace svx
using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::beans;
-#define TOOLBAR_RESNAME "private:resource/toolbar/"
-#define PROPNAME_LAYOUTMANAGER "LayoutManager"
-
ToolboxAccess::ToolboxAccess( const OUString& rToolboxName ) :
-m_sToolboxResName ( TOOLBAR_RESNAME )
+m_sToolboxResName ( "private:resource/toolbar/" )
{
m_sToolboxResName += rToolboxName;
@@ -50,7 +47,7 @@ namespace svx
Reference< XFrame > xFrame =
SfxViewFrame::Current()->GetFrame().GetFrameInterface();
Reference< XPropertySet > xFrameProps( xFrame, UNO_QUERY );
if ( xFrameProps.is() )
-xFrameProps->getPropertyValue( PROPNAME_LAYOUTMANAGER )
>>= m_xLayouter;
+xFrameProps->getPropertyValue( "LayoutManager" ) >>=
m_xLayouter;
}
catch ( Exception const & )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: ios/Mobile.xcodeproj
ios/Mobile.xcodeproj/project.pbxproj | 100 +++
1 file changed, 100 insertions(+)
New commits:
commit 948069632d58c0cd980deb1025810550ecf12952
Author: Tor Lillqvist
AuthorDate: Sat Dec 21 03:36:28 2019 +0200
Commit: Tor Lillqvist
CommitDate: Sat Dec 21 03:37:41 2019 +0200
Add source files from svx/source/tbxctrls and svtools/source/config
... to iOS project, for breakpointing convenience.
Change-Id: I3652afe8b833dbe3ec5aff006ef58424626a15a8
diff --git a/ios/Mobile.xcodeproj/project.pbxproj
b/ios/Mobile.xcodeproj/project.pbxproj
index f2df6f51c..7d7563578 100644
--- a/ios/Mobile.xcodeproj/project.pbxproj
+++ b/ios/Mobile.xcodeproj/project.pbxproj
@@ -418,6 +418,44 @@
BE5EB5DB2140480B00E0826C /* ICU.dat */ = {isa =
PBXFileReference; lastKnownFileType = file; name = ICU.dat; path =
../../../ICU.dat; sourceTree = ""; };
BE636210215101D000F4237E /* WebSocketHandler.hpp */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path
= WebSocketHandler.hpp; sourceTree = ""; };
BE6362C12153B5B500F4237E /* MobileCoreServices.framework */ =
{isa = PBXFileReference; lastKnownFileType = wrapper.framework; name =
MobileCoreServices.framework; path =
System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; };
+ BE7E5B7623AD07BE00F9462A /* SvxPresetListBox.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
SvxPresetListBox.cxx; path =
"../../ios-device/svx/source/tbxctrls/SvxPresetListBox.cxx"; sourceTree =
""; };
+ BE7E5B7723AD07BE00F9462A /* tbxcolor.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = tbxcolor.cxx;
path = "../../ios-device/svx/source/tbxctrls/tbxcolor.cxx"; sourceTree =
""; };
+ BE7E5B7823AD07BE00F9462A /* tbxdrctl.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = tbxdrctl.cxx;
path = "../../ios-device/svx/source/tbxctrls/tbxdrctl.cxx"; sourceTree =
""; };
+ BE7E5B7923AD07BE00F9462A /* fillctrl.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fillctrl.cxx;
path = "../../ios-device/svx/source/tbxctrls/fillctrl.cxx"; sourceTree =
""; };
+ BE7E5B7A23AD07BE00F9462A /* colrctrl.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = colrctrl.cxx;
path = "../../ios-device/svx/source/tbxctrls/colrctrl.cxx"; sourceTree =
""; };
+ BE7E5B7B23AD07BE00F9462A /* grafctrl.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = grafctrl.cxx;
path = "../../ios-device/svx/source/tbxctrls/grafctrl.cxx"; sourceTree =
""; };
+ BE7E5B7C23AD07BE00F9462A /* bulletsnumbering.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
bulletsnumbering.cxx; path =
"../../ios-device/svx/source/tbxctrls/bulletsnumbering.cxx"; sourceTree =
""; };
+ BE7E5B7D23AD07BE00F9462A /* extrusioncontrols.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
extrusioncontrols.cxx; path =
"../../ios-device/svx/source/tbxctrls/extrusioncontrols.cxx"; sourceTree =
""; };
+ BE7E5B7E23AD07BE00F9462A /* formatpaintbrushctrl.cxx */ = {isa
= PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
formatpaintbrushctrl.cxx; path =
"../../ios-device/svx/source/tbxctrls/formatpaintbrushctrl.cxx"; sourceTree =
""; };
+ BE7E5B7F23AD07BE00F9462A /* lboxctrl.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = lboxctrl.cxx;
path = "../../ios-device/svx/source/tbxctrls/lboxctrl.cxx"; sourceTree =
""; };
+ BE7E5B8023AD07BE00F9462A /* layctrl.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = layctrl.cxx;
path = "../../ios-device/svx/source/tbxctrls/layctrl.cxx"; sourceTree =
""; };
+ BE7E5B8123AD07BE00F9462A /* itemwin.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = itemwin.cxx;
path = "../../ios-device/svx/source/tbxctrls/itemwin.cxx"; sourceTree =
""; };
+ BE7E5B8223AD07BE00F9462A /* SvxColorValueSet.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
SvxColorValueSet.cxx; path =
"../../ios-device/svx/source/tbxctrls/SvxColorValueSet.cxx"; sourceTree =
""; };
+ BE7E5B8323AD07BE00F9462A /* linectrl.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = linectrl.cxx;
path = "../../ios-device/svx/source/tbxctrls/linectrl.cxx"; sourceTree =
""; };
+ BE7E5B8423AD07BE00F9462A /* extrusioncontrols.hxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name =
extrusioncontrols.hxx; path =
"../../ios-device/svx/source/tbxctrls/extrusioncontrols.hxx"; sourceT
[Libreoffice-commits] core.git: i18nutil/source
i18nutil/source/utility/casefolding.cxx| 17 +++---
i18nutil/source/utility/casefolding_data.h | 33 +
2 files changed, 46 insertions(+), 4 deletions(-)
New commits:
commit 209fc9fd7fa433947af0bf86e210d73fa7f5a045
Author: Alex Henrie
AuthorDate: Fri Dec 20 09:23:06 2019 -0700
Commit: Eike Rathke
CommitDate: Fri Dec 20 23:21:14 2019 +0100
Add case table for Deseret and Osage
For characters like these that are in Unicode's Supplementary
Multilingual Plane, only the low surrogate changes when changing case.
Change-Id: I2c4e9880b4c41a6ecfc333bb2710cf1db3f80da7
Reviewed-on: https://gerrit.libreoffice.org/85621
Tested-by: Jenkins
Reviewed-by: Eike Rathke
diff --git a/i18nutil/source/utility/casefolding.cxx
b/i18nutil/source/utility/casefolding.cxx
index 0b01565a4466..cf3a716701e3 100644
--- a/i18nutil/source/utility/casefolding.cxx
+++ b/i18nutil/source/utility/casefolding.cxx
@@ -24,6 +24,7 @@
#include
#include
#include
+#include
using namespace com::sun::star::lang;
using namespace com::sun::star::uno;
@@ -91,13 +92,21 @@ const Mapping& casefolding::getConditionalValue(const
sal_Unicode* str, sal_Int3
Mapping casefolding::getValue(const sal_Unicode* str, sal_Int32 pos, sal_Int32
len, Locale const & aLocale, MappingType nMappingType)
{
-Mapping dummy = { 0, 1, { 0, 0, 0 } };
-sal_Int16 address = CaseMappingIndex[str[pos] >> 8];
+Mapping dummy = { 0, 1, { str[pos], 0, 0 } };
+
+sal_uInt32 c;
+if (pos > 0 && rtl::isHighSurrogate(str[pos-1]) &&
rtl::isLowSurrogate(str[pos])) {
+c = rtl::combineSurrogates(str[pos-1], str[pos]);
+if (c >= SAL_N_ELEMENTS(CaseMappingIndex) * 256)
+return dummy;
+} else {
+c = str[pos];
+}
-dummy.map[0] = str[pos];
+sal_Int16 address = CaseMappingIndex[c >> 8];
if (address >= 0) {
-address = (address << 8) + (str[pos] & 0xFF);
+address = (address << 8) + (c & 0xFF);
if (static_cast(CaseMappingValue[address].type) &
nMappingType) {
MappingType type =
static_cast(CaseMappingValue[address].type);
if (type & MappingType::NotValue) {
diff --git a/i18nutil/source/utility/casefolding_data.h
b/i18nutil/source/utility/casefolding_data.h
index 1cd912b2200d..20c5cc714103 100644
--- a/i18nutil/source/utility/casefolding_data.h
+++ b/i18nutil/source/utility/casefolding_data.h
@@ -56,6 +56,7 @@ static const sal_Int8 CaseMappingIndex[] = {
-1, -1, -1, -1, -1, -1, -1, -1, // e800 - efff
-1, -1, -1, -1, -1, -1, -1, -1, // f000 - f7ff
-1, -1, -1, 0x0b, -1, -1, -1, 0x0c, // f800 -
+ -1, -1, -1, -1, 0x0d, -1, -1, -1, // 1 - 107ff
};
@@ -489,6 +490,38 @@ static const Value CaseMappingValue[] = {
{0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00,
0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, // fff0 - fff7
{0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00,
0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, // fff8 -
+{0x6a, 0xDC28}, {0x6a, 0xDC29}, {0x6a, 0xDC2A}, {0x6a, 0xDC2B}, {0x6a,
0xDC2C}, {0x6a, 0xDC2D}, {0x6a, 0xDC2E}, {0x6a, 0xDC2F}, // 10400 - 10407
+{0x6a, 0xDC30}, {0x6a, 0xDC31}, {0x6a, 0xDC32}, {0x6a, 0xDC33}, {0x6a,
0xDC34}, {0x6a, 0xDC35}, {0x6a, 0xDC36}, {0x6a, 0xDC37}, // 10408 - 1040f
+{0x6a, 0xDC38}, {0x6a, 0xDC39}, {0x6a, 0xDC3A}, {0x6a, 0xDC3B}, {0x6a,
0xDC3C}, {0x6a, 0xDC3D}, {0x6a, 0xDC3E}, {0x6a, 0xDC3F}, // 10410 - 10417
+{0x6a, 0xDC40}, {0x6a, 0xDC41}, {0x6a, 0xDC42}, {0x6a, 0xDC43}, {0x6a,
0xDC44}, {0x6a, 0xDC45}, {0x6a, 0xDC46}, {0x6a, 0xDC47}, // 10418 - 1041f
+{0x6a, 0xDC48}, {0x6a, 0xDC49}, {0x6a, 0xDC4A}, {0x6a, 0xDC4B}, {0x6a,
0xDC4C}, {0x6a, 0xDC4D}, {0x6a, 0xDC4E}, {0x6a, 0xDC4F}, // 10420 - 10427
+{0x15, 0xDC00}, {0x15, 0xDC01}, {0x15, 0xDC02}, {0x15, 0xDC03}, {0x15,
0xDC04}, {0x15, 0xDC05}, {0x15, 0xDC06}, {0x15, 0xDC07}, // 10428 - 1042f
+{0x15, 0xDC08}, {0x15, 0xDC09}, {0x15, 0xDC0A}, {0x15, 0xDC0B}, {0x15,
0xDC0C}, {0x15, 0xDC0D}, {0x15, 0xDC0E}, {0x15, 0xDC0F}, // 10430 - 10437
+{0x15, 0xDC10}, {0x15, 0xDC11}, {0x15, 0xDC12}, {0x15, 0xDC13}, {0x15,
0xDC14}, {0x15, 0xDC15}, {0x15, 0xDC16}, {0x15, 0xDC17}, // 10438 - 1043f
+{0x15, 0xDC18}, {0x15, 0xDC19}, {0x15, 0xDC1A}, {0x15, 0xDC1B}, {0x15,
0xDC1C}, {0x15, 0xDC1D}, {0x15, 0xDC1E}, {0x15, 0xDC1F}, // 10440 - 10447
+{0x15, 0xDC20}, {0x15, 0xDC21}, {0x15, 0xDC22}, {0x15, 0xDC23}, {0x15,
0xDC24}, {0x15, 0xDC25}, {0x15, 0xDC26}, {0x15, 0xDC27}, // 10448 - 1044f
+{0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00,
0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, // 10450 - 10457
+{0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, {0x00,
0x}, {0x00, 0x}, {0x00, 0x}, {0x00, 0x}, // 10458 - 1045f
+
[Libreoffice-commits] core.git: Changes to 'refs/tags/cib-6.1-8'
Tag 'cib-6.1-8' created by Thorsten Behrens at 2019-12-20 22:03 + Release LibreOffice powered by CIB 6.1-8 -BEGIN PGP SIGNATURE- iQKTBAABCgB9FiEEHp/al2IcD3tw8LrPZ7OyyFo1BNkFAl39RSNfFIAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDFF OUZEQTk3NjIxQzBGN0I3MEYwQkFDRjY3QjNCMkM4NUEzNTA0RDkACgkQZ7OyyFo1 BNmZhQ/7Bzl6w52WQiuyfQTGXHWpns4tyB6xRrmzbwZW6YltGIXw8l40TD3DS4N9 ciZ0KwDlgNua/Dn4LyQCTFtLGyxj9Nc8SsH1CPE1eGQ9vWl4T4cBnji/8bnErgky rw9RUwDjNa4FyQpYaBkLtKAZmILxDe6hOQUHDzT9h3VWsPvPtN/ncM9aaoICM7b4 +8Ahwk/tES7pvAhyaU5ZjqQKDVogh3CqumIhHKxk2a7pwvRU2PHu5xlkylNkW+Ex yQ/vB1fB91Cx1S0zwFCTVYilG40RzbljYTIDJANrGyzMoaKaAhY/eggrgBljiRqS lZ7nJMytWUswRaitnzeLyxatS+GVXzr2yC8NyHipYj9Y7s2lEET676HSv9o8oVK8 X0vFdbM4pe879zxJ0PX1CHaTg9HNcA1baisLmV0CeNVZR3WZEccW2Am1igK1k7hp Qp9u39ZQx3n3Pm3JpNSc+vZl5wDwKKBag5n+kNIE6LqIIV5hd1jlOzw7wWB/1B7V ePJzod/DM3e6g8dIxgEErpfMhfMjMfeJPXijXcqLbZdc4vOg/maKvJYen2wXn5pm f3h45wWX44ffssjpS/7tD+bCMoKmkRYUexOy137WCkNPTM3EIvhXoNm3KQbrnD9S 5tvFiqjrNJu4SF+kZP+iWGLpgPG9yt/IIX374vqBxtKwdDSzsDY= =AIFE -END PGP SIGNATURE- Changes since cib-6.1-7-24: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/sidebar/PageOrientationControl.cxx |8
1 file changed, 8 insertions(+)
New commits:
commit aeab5bfa024f7d15099730fa536d78b5a7a7ea01
Author: Muhammet Kara
AuthorDate: Fri Dec 20 20:35:00 2019 +0300
Commit: Muhammet Kara
CommitDate: Fri Dec 20 22:56:56 2019 +0100
tdf#129526: Prevent accidental toggling of page orientation
Change-Id: I3145cb34ec782c1aa60fe864a6ec7c195185ad18
Reviewed-on: https://gerrit.libreoffice.org/85637
Tested-by: Jenkins
Reviewed-by: Muhammet Kara
diff --git a/sw/source/uibase/sidebar/PageOrientationControl.cxx
b/sw/source/uibase/sidebar/PageOrientationControl.cxx
index 0d9844efef36..9d9caa418b1d 100644
--- a/sw/source/uibase/sidebar/PageOrientationControl.cxx
+++ b/sw/source/uibase/sidebar/PageOrientationControl.cxx
@@ -114,6 +114,14 @@ void PageOrientationControl::ExecuteOrientationChange(
const bool bLandscape )
SfxViewFrame::Current()->GetBindings().GetDispatcher()->QueryState(SID_ATTR_PAGE_SIZE,
pItem);
mpPageSizeItem.reset( static_cast(pItem->Clone()) );
+// Prevent accidental toggling of page orientation
+if ((mpPageSizeItem->GetWidth() > mpPageSizeItem->GetHeight()) ==
bLandscape)
+{
+if ( mxUndoManager.is() )
+mxUndoManager->leaveUndoContext();
+return;
+}
+
SfxViewFrame::Current()->GetBindings().GetDispatcher()->QueryState(SID_ATTR_PAGE_LRSPACE,
pItem);
mpPageLRMarginItem.reset( static_cast(pItem->Clone())
);
___
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/uiconfig
sc/source/ui/inc/tpformula.hxx |4 ++
sc/source/ui/optdlg/tpformula.cxx | 51 +
sc/uiconfig/scalc/ui/optformula.ui |3 ++
3 files changed, 36 insertions(+), 22 deletions(-)
New commits:
commit be6b44e566050b06d80a1d2f3bdfd15dfb148fee
Author: Caolán McNamara
AuthorDate: Fri Dec 20 10:40:53 2019 +
Commit: Eike Rathke
CommitDate: Fri Dec 20 22:56:05 2019 +0100
Resolves: tdf#129501 cannot change formula separators in options
Change-Id: I5cf5736f8ad3d5e28f2c31ffa88dafac59df8a8e
Reviewed-on: https://gerrit.libreoffice.org/85588
Tested-by: Jenkins
Reviewed-by: Eike Rathke
diff --git a/sc/source/ui/inc/tpformula.hxx b/sc/source/ui/inc/tpformula.hxx
index 4de05560cfd3..3cda79900d0e 100644
--- a/sc/source/ui/inc/tpformula.hxx
+++ b/sc/source/ui/inc/tpformula.hxx
@@ -43,9 +43,11 @@ private:
void LaunchCustomCalcSettings();
bool IsValidSeparator(const OUString& rSep) const;
-bool IsValidSeparatorSet() const;
DECL_LINK( ButtonHdl, weld::Button&, void );
+DECL_LINK( SepInsertTextHdl, OUString&, bool );
+DECL_LINK( ColSepInsertTextHdl, OUString&, bool );
+DECL_LINK( RowSepInsertTextHdl, OUString&, bool );
DECL_LINK( SepModifyHdl, weld::Entry&, void );
DECL_LINK( SepEditOnFocusHdl, weld::Widget&, void );
diff --git a/sc/source/ui/optdlg/tpformula.cxx
b/sc/source/ui/optdlg/tpformula.cxx
index b4825149ae58..5bf50dea60b9 100644
--- a/sc/source/ui/optdlg/tpformula.cxx
+++ b/sc/source/ui/optdlg/tpformula.cxx
@@ -56,6 +56,10 @@ ScTpFormulaOptions::ScTpFormulaOptions(weld::Container*
pPage, weld::DialogContr
mxBtnCustomCalcCustom->connect_clicked(aLink2);
mxBtnCustomCalcDetails->connect_clicked(aLink2);
+mxEdSepFuncArg->connect_insert_text(LINK( this, ScTpFormulaOptions,
SepInsertTextHdl ));
+mxEdSepArrayCol->connect_insert_text(LINK( this, ScTpFormulaOptions,
ColSepInsertTextHdl ));
+mxEdSepArrayRow->connect_insert_text(LINK( this, ScTpFormulaOptions,
RowSepInsertTextHdl ));
+
Link aLink = LINK( this, ScTpFormulaOptions,
SepModifyHdl );
mxEdSepFuncArg->connect_changed(aLink);
mxEdSepArrayCol->connect_changed(aLink);
@@ -94,7 +98,9 @@ void ScTpFormulaOptions::OnFocusSeparatorInput(weld::Entry*
pEdit)
// Make sure the entire text is selected.
pEdit->select_region(0, -1);
-maOldSepValue = pEdit->get_text();
+OUString sSepValue = pEdit->get_text();
+if (!sSepValue.isEmpty())
+maOldSepValue = sSepValue;
}
void ScTpFormulaOptions::UpdateCustomCalcRadioButtons(bool bDefault)
@@ -161,14 +167,6 @@ bool ScTpFormulaOptions::IsValidSeparator(const OUString&
rSep) const
return true;
}
-bool ScTpFormulaOptions::IsValidSeparatorSet() const
-{
-// Make sure the column and row separators are different.
-OUString aColStr = mxEdSepArrayCol->get_text();
-OUString aRowStr = mxEdSepArrayRow->get_text();
-return aColStr != aRowStr;
-}
-
IMPL_LINK( ScTpFormulaOptions, ButtonHdl, weld::Button&, rBtn, void )
{
if (&rBtn == mxBtnSepReset.get())
@@ -181,21 +179,32 @@ IMPL_LINK( ScTpFormulaOptions, ButtonHdl, weld::Button&,
rBtn, void )
LaunchCustomCalcSettings();
}
-IMPL_LINK( ScTpFormulaOptions, SepModifyHdl, weld::Entry&, rEdit, void )
+IMPL_LINK(ScTpFormulaOptions, SepInsertTextHdl, OUString&, rTest, bool)
{
-OUString aStr = rEdit.get_text();
-if (aStr.getLength() > 1)
-{
-// In case the string is more than one character long, only grab the
-// first character.
-aStr = aStr.copy(0, 1);
-rEdit.set_text(aStr);
-}
-
-if ((!IsValidSeparator(aStr) || !IsValidSeparatorSet()) &&
!maOldSepValue.isEmpty())
+if (!IsValidSeparator(rTest) && !maOldSepValue.isEmpty())
// Invalid separator. Restore the old value.
-rEdit.set_text(maOldSepValue);
+rTest = maOldSepValue;
+return true;
+}
+IMPL_LINK(ScTpFormulaOptions, RowSepInsertTextHdl, OUString&, rTest, bool)
+{
+// Invalid separator or same as ColStr - Restore the old value.
+if ((!IsValidSeparator(rTest) || rTest == mxEdSepArrayCol->get_text()) &&
!maOldSepValue.isEmpty())
+rTest = maOldSepValue;
+return true;
+}
+
+IMPL_LINK(ScTpFormulaOptions, ColSepInsertTextHdl, OUString&, rTest, bool)
+{
+// Invalid separator or same as RowStr - Restore the old value.
+if ((!IsValidSeparator(rTest) || rTest == mxEdSepArrayRow->get_text()) &&
!maOldSepValue.isEmpty())
+rTest = maOldSepValue;
+return true;
+}
+
+IMPL_LINK( ScTpFormulaOptions, SepModifyHdl, weld::Entry&, rEdit, void )
+{
OnFocusSeparatorInput(&rEdit);
}
diff --git a/sc/uiconfig/scalc/ui/optformula.ui
b/sc/uiconfig/scalc/ui/optformula.ui
index 8b8f2a8dfa6f..ceae62e26a70 100644
--- a/sc/uiconfig/scalc/ui/optformula.ui
+++ b/sc/uiconfig/scalc/ui/optformula.ui
@@ -357,6 +357,7 @@
True
True
+
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - svx/source
svx/source/stbctrls/selctrl.cxx | 13 +
1 file changed, 13 insertions(+)
New commits:
commit 0c21bf2b46b71816337fa4aba04e41126a08cd8e
Author: Aditya
AuthorDate: Wed Dec 18 21:19:50 2019 +0530
Commit: Eike Rathke
CommitDate: Fri Dec 20 22:53:28 2019 +0100
tdf#122280: Hide Block selection mode from Calc
Currently, the Block Selection Mode in pop-up menu is dysfunctional
in Calc. It is unreachable - when the user tries to choose "Block
selection" from the pop-up menu that lies in the status bar, it
shifts back to "Standard selection".
Hide the Block Selection mode from Calc, simply because it is
dysfunctional and useless.
Change-Id: Ib8618b7f0281de13a5f6ef9d35b67330f43c4318
Reviewed-on: https://gerrit.libreoffice.org/84142
Tested-by: Jenkins
Reviewed-by: Eike Rathke
(cherry picked from commit 1e94d803f7a70027d03f1303c19818ca2de0d67f)
Reviewed-on: https://gerrit.libreoffice.org/85629
diff --git a/svx/source/stbctrls/selctrl.cxx b/svx/source/stbctrls/selctrl.cxx
index 1e97e160f289..9f6fc1135148 100644
--- a/svx/source/stbctrls/selctrl.cxx
+++ b/svx/source/stbctrls/selctrl.cxx
@@ -31,6 +31,8 @@
#include
#include
+#include
+#include
SFX_IMPL_STATUSBAR_CONTROL(SvxSelectionModeControl, SfxUInt16Item);
@@ -46,6 +48,7 @@ public:
OUString GetItemTextForState(sal_uInt16 nState) { return
m_xMenu->GetItemText(state_to_id(nState)); }
sal_uInt16 GetState() const { return
id_to_state(m_xMenu->GetCurItemIdent()); }
sal_uInt16 Execute(vcl::Window* pWindow, const Point& rPopupPos) { return
m_xMenu->Execute(pWindow, rPopupPos); }
+void HideSelectionType(const OString& rIdent) {
m_xMenu->HideItem(m_xMenu->GetItemId(rIdent)); }
};
sal_uInt16 SelectionTypePopup::id_to_state(const OString& rIdent)
@@ -108,6 +111,16 @@ bool SvxSelectionModeControl::MouseButtonDown( const
MouseEvent& rEvt )
SelectionTypePopup aPop(mnState);
StatusBar& rStatusbar = GetStatusBar();
+// Check if Calc is opened; if true, hide block selection mode tdf#122280
+const css::uno::Reference < css::frame::XModel > xModel =
m_xFrame->getController()->getModel();
+css::uno::Reference< css::lang::XServiceInfo > xServices( xModel,
css::uno::UNO_QUERY );
+if ( xServices.is() )
+{
+bool bSpecModeCalc =
xServices->supportsService("com.sun.star.sheet.SpreadsheetDocument");
+if (bSpecModeCalc)
+aPop.HideSelectionType("block");
+}
+
if (rEvt.IsMiddle() && aPop.Execute(&rStatusbar, rEvt.GetPosPixel()))
{
sal_uInt16 nNewState = aPop.GetState();
___
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 - configure.ac external/neon
Rebased ref, commits from common ancestor:
commit 5b64e4e64bf2696b164e59da7372ebb0aecab8b2
Author: Thorsten Behrens
AuthorDate: Fri Dec 20 22:17:33 2019 +0100
Commit: Thorsten Behrens
CommitDate: Fri Dec 20 22:17:33 2019 +0100
Bump version to 6.1.7.8
Change-Id: I1237c4502d5b7f46fc510fce00377c8cce8dbcf0
diff --git a/configure.ac b/configure.ac
index 92ef5852cc86..6bd8da094b2e 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 powered by
CIB],[6.1.7.7],[],[],[https://libreoffice.cib.eu/])
+AC_INIT([LibreOffice powered by
CIB],[6.1.7.8],[],[],[https://libreoffice.cib.eu/])
AC_PREREQ([2.59])
commit 56a7cf2a4c54f535b185d76497e591433bdb654e
Author: Thorsten Behrens
AuthorDate: Fri Dec 20 07:03:47 2019 +0100
Commit: Thorsten Behrens
CommitDate: Fri Dec 20 22:09:32 2019 +0100
tdf#129519 Fix crash during WebDAV lock refresh
- NeonSession is shared amongst several files (if on the same server
instance)
- there's explicit code in DAVSessionFactory::createDAVSession()
to share sessions for same host/target
- so then after a while, locks get refreshed, and session timeout
hits
- first lock -> no prob, ne_auth.c:ah_post_send() has
auth_challenge() failing, returning error, which puts that lock
into m_aRemoveDeferred list
- _but_ ah_post_send() then does a clean_session(), and the next
lock refresh from the same session hits NULLPTR session host
-> so let's delay any sspi_host cleanup until session object gets
freed, instead of just cleaned
Change-Id: Ie257310c47913aef9fcfec92c1722d64b28c4f89
Reviewed-on: https://gerrit.libreoffice.org/85614
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/external/neon/UnpackedTarball_neon.mk
b/external/neon/UnpackedTarball_neon.mk
index dacf425fa80f..74ac2eb38c97 100644
--- a/external/neon/UnpackedTarball_neon.mk
+++ b/external/neon/UnpackedTarball_neon.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,neon,\
external/neon/ubsan.patch \
external/neon/neon_fix_lock_token_on_if.patch \
external/neon/neon_fix_lock_timeout_windows.patch \
+ external/neon/neon_fix_sspi_session_timeout.patch \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/neon/neon_fix_sspi_session_timeout.patch
b/external/neon/neon_fix_sspi_session_timeout.patch
new file mode 100644
index ..5003fda35022
--- /dev/null
+++ b/external/neon/neon_fix_sspi_session_timeout.patch
@@ -0,0 +1,22 @@
+--- src/ne_auth.c~ 2019-12-05 15:38:50.246997951 +0100
src/ne_auth.c 2019-12-20 06:54:31.555836285 +0100
+@@ -300,8 +300,6 @@
+ sess->sspi_token = NULL;
+ ne_sspi_destroy_context(sess->sspi_context);
+ sess->sspi_context = NULL;
+-if (sess->sspi_host) ne_free(sess->sspi_host);
+-sess->sspi_host = NULL;
+ #endif
+ #ifdef HAVE_NTLM
+ if (sess->ntlm_context) {
+@@ -1599,6 +1597,10 @@
+ }
+
+ clean_session(sess);
++#ifdef HAVE_SSPI
++if (sess->sspi_host) ne_free(sess->sspi_host);
++sess->sspi_host = NULL;
++#endif
+ ne_free(sess);
+ }
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/neon
external/neon/UnpackedTarball_neon.mk |1 +
external/neon/neon_fix_sspi_session_timeout.patch | 22 ++
2 files changed, 23 insertions(+)
New commits:
commit df52a213277827a16793791fecc33139582c84c2
Author: Thorsten Behrens
AuthorDate: Fri Dec 20 07:03:47 2019 +0100
Commit: Thorsten Behrens
CommitDate: Fri Dec 20 22:07:45 2019 +0100
tdf#129519 Fix crash during WebDAV lock refresh
- NeonSession is shared amongst several files (if on the same server
instance)
- there's explicit code in DAVSessionFactory::createDAVSession()
to share sessions for same host/target
- so then after a while, locks get refreshed, and session timeout
hits
- first lock -> no prob, ne_auth.c:ah_post_send() has
auth_challenge() failing, returning error, which puts that lock
into m_aRemoveDeferred list
- _but_ ah_post_send() then does a clean_session(), and the next
lock refresh from the same session hits NULLPTR session host
-> so let's delay any sspi_host cleanup until session object gets
freed, instead of just cleaned
Change-Id: Ie257310c47913aef9fcfec92c1722d64b28c4f89
Reviewed-on: https://gerrit.libreoffice.org/85614
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/external/neon/UnpackedTarball_neon.mk
b/external/neon/UnpackedTarball_neon.mk
index dacf425fa80f..74ac2eb38c97 100644
--- a/external/neon/UnpackedTarball_neon.mk
+++ b/external/neon/UnpackedTarball_neon.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,neon,\
external/neon/ubsan.patch \
external/neon/neon_fix_lock_token_on_if.patch \
external/neon/neon_fix_lock_timeout_windows.patch \
+ external/neon/neon_fix_sspi_session_timeout.patch \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/neon/neon_fix_sspi_session_timeout.patch
b/external/neon/neon_fix_sspi_session_timeout.patch
new file mode 100644
index ..5003fda35022
--- /dev/null
+++ b/external/neon/neon_fix_sspi_session_timeout.patch
@@ -0,0 +1,22 @@
+--- src/ne_auth.c~ 2019-12-05 15:38:50.246997951 +0100
src/ne_auth.c 2019-12-20 06:54:31.555836285 +0100
+@@ -300,8 +300,6 @@
+ sess->sspi_token = NULL;
+ ne_sspi_destroy_context(sess->sspi_context);
+ sess->sspi_context = NULL;
+-if (sess->sspi_host) ne_free(sess->sspi_host);
+-sess->sspi_host = NULL;
+ #endif
+ #ifdef HAVE_NTLM
+ if (sess->ntlm_context) {
+@@ -1599,6 +1597,10 @@
+ }
+
+ clean_session(sess);
++#ifdef HAVE_SSPI
++if (sess->sspi_host) ne_free(sess->sspi_host);
++sess->sspi_host = NULL;
++#endif
+ ne_free(sess);
+ }
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: forms/source
forms/source/component/Button.hxx |6 +- forms/source/component/CheckBox.hxx |6 +- forms/source/component/Columns.hxx|5 + forms/source/component/cachedrowset.hxx |6 +- forms/source/component/clickableimage.hxx |6 +- 5 files changed, 5 insertions(+), 24 deletions(-) New commits: commit 1c7fb79ad1c9356424ff1ed489cc2ac04cc1d68d Author: Onur Yilmaz AuthorDate: Thu Dec 19 03:24:31 2019 +0300 Commit: Muhammet Kara CommitDate: Fri Dec 20 21:10:29 2019 +0100 tdf#124176: Use pragma once instead of include guards Change-Id: I083ae8efad8bdf116ef98038fa1e15037655aba9 Reviewed-on: https://gerrit.libreoffice.org/85459 Tested-by: Jenkins Reviewed-by: Muhammet Kara diff --git a/forms/source/component/Button.hxx b/forms/source/component/Button.hxx index 341ea2dc2c00..fa77e4abd3a7 100644 --- a/forms/source/component/Button.hxx +++ b/forms/source/component/Button.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_BUTTON_HXX -#define INCLUDED_FORMS_SOURCE_COMPONENT_BUTTON_HXX +#pragma once #include "clickableimage.hxx" #include @@ -192,7 +191,4 @@ private: } // namespace frm - -#endif // INCLUDED_FORMS_SOURCE_COMPONENT_BUTTON_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/component/CheckBox.hxx b/forms/source/component/CheckBox.hxx index ea2e633a28ca..7f4ab7103153 100644 --- a/forms/source/component/CheckBox.hxx +++ b/forms/source/component/CheckBox.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_CHECKBOX_HXX -#define INCLUDED_FORMS_SOURCE_COMPONENT_CHECKBOX_HXX +#pragma once #include "refvaluecomponent.hxx" @@ -74,7 +73,4 @@ public: } - -#endif // INCLUDED_FORMS_SOURCE_COMPONENT_CHECKBOX_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/component/Columns.hxx b/forms/source/component/Columns.hxx index 2db0bfb2218a..c24ca8a013de 100644 --- a/forms/source/component/Columns.hxx +++ b/forms/source/component/Columns.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_COLUMNS_HXX -#define INCLUDED_FORMS_SOURCE_COMPONENT_COLUMNS_HXX +#pragma once #include #include @@ -198,6 +197,4 @@ DECL_COLUMN(FormattedFieldColumn) } // namespace frm -#endif // INCLUDED_FORMS_SOURCE_COMPONENT_COLUMNS_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/component/cachedrowset.hxx b/forms/source/component/cachedrowset.hxx index 03dd635c724e..9e61e57596e0 100644 --- a/forms/source/component/cachedrowset.hxx +++ b/forms/source/component/cachedrowset.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_CACHEDROWSET_HXX -#define INCLUDED_FORMS_SOURCE_COMPONENT_CACHEDROWSET_HXX +#pragma once #include #include @@ -78,7 +77,4 @@ namespace frm } // namespace frm - -#endif // INCLUDED_FORMS_SOURCE_COMPONENT_CACHEDROWSET_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/forms/source/component/clickableimage.hxx b/forms/source/component/clickableimage.hxx index 30342d060601..d4a5065e0383 100644 --- a/forms/source/component/clickableimage.hxx +++ b/forms/source/component/clickableimage.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_FORMS_SOURCE_COMPONENT_CLICKABLEIMAGE_HXX -#define INCLUDED_FORMS_SOURCE_COMPONENT_CLICKABLEIMAGE_HXX +#pragma once #include #include @@ -275,7 +274,4 @@ namespace frm } // namespace frm - -#endif // INCLUDED_FORMS_SOURCE_COMPONENT_CLICKABLEIMAGE_HXX - /* 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: cui/source
cui/source/options/optjava.hxx|6 ++ cui/source/options/optjsearch.hxx |6 +- 2 files changed, 3 insertions(+), 9 deletions(-) New commits: commit 186fdf0d20162568891763f08e7f99a38535a699 Author: Sıla Genç AuthorDate: Fri Dec 20 16:00:58 2019 +0300 Commit: Muhammet Kara CommitDate: Fri Dec 20 21:01:53 2019 +0100 tdf#124176: Use pragma once instead of include guards Change-Id: I88d5517d42b6c5b6809f062a789e7dd85394f6db Reviewed-on: https://gerrit.libreoffice.org/85601 Tested-by: Jenkins Reviewed-by: Muhammet Kara diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx index ffefecce2d47..01cd15210f44 100644 --- a/cui/source/options/optjava.hxx +++ b/cui/source/options/optjava.hxx @@ -16,8 +16,8 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CUI_SOURCE_OPTIONS_OPTJAVA_HXX -#define INCLUDED_CUI_SOURCE_OPTIONS_OPTJAVA_HXX + +#pragma once #include @@ -204,6 +204,4 @@ public: voidSetClassPath( const OUString& _rPath ); }; -#endif // INCLUDED_CUI_SOURCE_OPTIONS_OPTJAVA_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optjsearch.hxx b/cui/source/options/optjsearch.hxx index 8b2d68ddcf4d..f0da350ae651 100644 --- a/cui/source/options/optjsearch.hxx +++ b/cui/source/options/optjsearch.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CUI_SOURCE_OPTIONS_OPTJSEARCH_HXX -#define INCLUDED_CUI_SOURCE_OPTIONS_OPTJSEARCH_HXX +#pragma once #include #include @@ -69,7 +68,4 @@ public: voidSetTransliterationFlags( TransliterationFlags nSettings ); }; - -#endif - /* 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: cui/source
cui/source/options/dbregisterednamesconfig.hxx |7 +-- cui/source/options/dbregistersettings.hxx |5 + 2 files changed, 2 insertions(+), 10 deletions(-) New commits: commit 0d34eb78fd5fe72d9e10438b41e76fe45cb2c2df Author: Selim Şeker AuthorDate: Thu Dec 19 01:50:53 2019 +0300 Commit: Muhammet Kara CommitDate: Fri Dec 20 20:59:08 2019 +0100 tdf#124176: Use pragma once instead of include guards Change-Id: I626d4a08161a6c81b4bb014d847f0c05d90fda35 Reviewed-on: https://gerrit.libreoffice.org/85449 Tested-by: Jenkins Reviewed-by: Muhammet Kara diff --git a/cui/source/options/dbregisterednamesconfig.hxx b/cui/source/options/dbregisterednamesconfig.hxx index 48311d031913..9decf7e11399 100644 --- a/cui/source/options/dbregisterednamesconfig.hxx +++ b/cui/source/options/dbregisterednamesconfig.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CUI_SOURCE_OPTIONS_DBREGISTEREDNAMESCONFIG_HXX -#define INCLUDED_CUI_SOURCE_OPTIONS_DBREGISTEREDNAMESCONFIG_HXX +#pragma once class SfxItemSet; @@ -36,8 +35,4 @@ namespace svx } - -#endif // INCLUDED_CUI_SOURCE_OPTIONS_DBREGISTEREDNAMESCONFIG_HXX - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/dbregistersettings.hxx b/cui/source/options/dbregistersettings.hxx index ce1322a101db..9146afe7b1d3 100644 --- a/cui/source/options/dbregistersettings.hxx +++ b/cui/source/options/dbregistersettings.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CUI_SOURCE_OPTIONS_DBREGISTERSETTINGS_HXX -#define INCLUDED_CUI_SOURCE_OPTIONS_DBREGISTERSETTINGS_HXX +#pragma once #include @@ -77,6 +76,4 @@ namespace svx } -#endif // INCLUDED_CUI_SOURCE_OPTIONS_DBREGISTERSETTINGS_HXX - /* 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: accessibility/source
accessibility/source/inc/floatingwindowaccessible.hxx |5 + 1 file changed, 1 insertion(+), 4 deletions(-) New commits: commit 7cf98c89c19e68b369a296d55c2e9bdf1b42d356 Author: Ayhan Yalçınsoy AuthorDate: Fri Dec 20 21:12:36 2019 +0300 Commit: Muhammet Kara CommitDate: Fri Dec 20 20:57:30 2019 +0100 tdf#124176:Use pragma once instead of include guards Change-Id: I7f71f0142759362fcfb30364694e3f4fc590274c Reviewed-on: https://gerrit.libreoffice.org/85551 Tested-by: Jenkins Reviewed-by: Muhammet Kara diff --git a/accessibility/source/inc/floatingwindowaccessible.hxx b/accessibility/source/inc/floatingwindowaccessible.hxx index 94670742e69c..1a7cb4008458 100644 --- a/accessibility/source/inc/floatingwindowaccessible.hxx +++ b/accessibility/source/inc/floatingwindowaccessible.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_ACCESSIBILITY_SOURCE_INC_FLOATINGWINDOWACCESSIBLE_HXX -#define INCLUDED_ACCESSIBILITY_SOURCE_INC_FLOATINGWINDOWACCESSIBLE_HXX +#pragma once #include @@ -30,6 +29,4 @@ public: virtual void FillAccessibleRelationSet( utl::AccessibleRelationSetHelper& rRelationSet ) override; }; -#endif // INCLUDED_ACCESSIBILITY_SOURCE_INC_FLOATINGWINDOWACCESSIBLE_HXX - /* 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: scripting/source
scripting/source/dlgprov/DialogModelProvider.hxx |5 + scripting/source/dlgprov/dlgevtatt.hxx |6 +- scripting/source/dlgprov/dlgprov.hxx |6 +- 3 files changed, 3 insertions(+), 14 deletions(-) New commits: commit 0cc5185147402f6c5a4ff8e1256aa8348a04f75e Author: Kemal Ayhan AuthorDate: Thu Dec 19 01:48:45 2019 +0300 Commit: Muhammet Kara CommitDate: Fri Dec 20 20:56:37 2019 +0100 tdf#124176: Use pragma once instead of include guards Change-Id: I4a045b450a5779bdd357a05a0efd4da7d521682d Reviewed-on: https://gerrit.libreoffice.org/85448 Tested-by: Jenkins Reviewed-by: Muhammet Kara diff --git a/scripting/source/dlgprov/DialogModelProvider.hxx b/scripting/source/dlgprov/DialogModelProvider.hxx index 7f938bc90ad1..d9a41ef64e86 100644 --- a/scripting/source/dlgprov/DialogModelProvider.hxx +++ b/scripting/source/dlgprov/DialogModelProvider.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SCRIPTING_SOURCE_DLGPROV_DIALOGMODELPROVIDER_HXX -#define INCLUDED_SCRIPTING_SOURCE_DLGPROV_DIALOGMODELPROVIDER_HXX +#pragma once #include #include @@ -85,6 +84,4 @@ private: }; } // closing anonymous implementation namespace -#endif // INCLUDED_SCRIPTING_SOURCE_DLGPROV_DIALOGMODELPROVIDER_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/scripting/source/dlgprov/dlgevtatt.hxx b/scripting/source/dlgprov/dlgevtatt.hxx index 73a60706556d..2adcd03baa7a 100644 --- a/scripting/source/dlgprov/dlgevtatt.hxx +++ b/scripting/source/dlgprov/dlgevtatt.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SCRIPTING_SOURCE_DLGPROV_DLGEVTATT_HXX -#define INCLUDED_SCRIPTING_SOURCE_DLGPROV_DLGEVTATT_HXX +#pragma once #include #include @@ -128,7 +127,4 @@ namespace dlgprov } // namespace dlgprov - -#endif // SCRIPTING_DLGEVT_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/scripting/source/dlgprov/dlgprov.hxx b/scripting/source/dlgprov/dlgprov.hxx index df3d37a7118c..fb5957619e08 100644 --- a/scripting/source/dlgprov/dlgprov.hxx +++ b/scripting/source/dlgprov/dlgprov.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SCRIPTING_SOURCE_DLGPROV_DLGPROV_HXX -#define INCLUDED_SCRIPTING_SOURCE_DLGPROV_DLGPROV_HXX +#pragma once #include #include @@ -156,7 +155,4 @@ css::uno::Sequence< OUString > _getSupportedServiceNames(); } // namespace comp_DialogModelProvider - -#endif // INCLUDED_SCRIPTING_SOURCE_DLGPROV_DLGPROV_HXX - /* 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] online.git: wsd/LOOLWSD.cpp
wsd/LOOLWSD.cpp |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 35831935d8cc9a2135c3462157cb14a21b13d067
Author: Marco Cecchetti
AuthorDate: Thu Dec 19 14:49:12 2019 +0100
Commit: Marco Cecchetti
CommitDate: Fri Dec 20 20:32:42 2019 +0100
wsd: disable unsupported code on mobile
Change-Id: I5d51a536e32bdf3262f3d39dda8ddb3152fa4460
Reviewed-on: https://gerrit.libreoffice.org/85633
Reviewed-by: Marco Cecchetti
Tested-by: Marco Cecchetti
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 3a597c4a1..3efed76e9 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -3475,7 +3475,7 @@ int LOOLWSD::innerMain()
if (timeSinceStartMs > UnitWSD::get().getTimeoutMilliSeconds())
UnitWSD::get().timeout();
-#if ENABLE_DEBUG
+#if ENABLE_DEBUG && !MOBILEAPP
if (careerSpanMs > 0 && timeSinceStartMs > careerSpanMs)
{
LOG_INF(timeSinceStartMs << " milliseconds gone, finishing as
requested. Setting ShutdownRequestFlag.");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/js
loleaflet/js/global.js |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit fa4bd903390aa010950f658637bf2d00a98947df
Author: Marco Cecchetti
AuthorDate: Thu Dec 19 14:49:59 2019 +0100
Commit: Marco Cecchetti
CommitDate: Fri Dec 20 20:33:09 2019 +0100
loleaflet: check if LOCALIZATIONS is defined on mobile app
Change-Id: I066670f3bde7f028ae01624a3b475bc0939f2c31
Reviewed-on: https://gerrit.libreoffice.org/85634
Reviewed-by: Marco Cecchetti
Tested-by: Marco Cecchetti
diff --git a/loleaflet/js/global.js b/loleaflet/js/global.js
index b582afd16..b3b619f8c 100644
--- a/loleaflet/js/global.js
+++ b/loleaflet/js/global.js
@@ -85,7 +85,7 @@
// In the mobile app case we can't use the stuff from
l10n-for-node, as that assumes HTTP.
if (window.ThisIsAMobileApp) {
// We use another approach just for iOS for now.
- if (window.LOCALIZATIONS.hasOwnProperty(string)) {
+ if (window.LOCALIZATIONS &&
window.LOCALIZATIONS.hasOwnProperty(string)) {
// window.postMobileDebug('_(' + string + '):
YES: ' + window.LOCALIZATIONS[string]);
var result = window.LOCALIZATIONS[string];
if (window.LANG === 'de-CH') {
___
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.2' - bridges/source
bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 21a33d9c7045efeae819a91b12cd35d0a161848f
Author: Stephan Bergmann
AuthorDate: Wed Dec 18 15:42:41 2019 +0100
Commit: Jan Holesovsky
CommitDate: Fri Dec 20 20:18:07 2019 +0100
Silence -Werror,-Wuninitialized
...as seen with "Android (5220042 based on r346389c) clang version 8.0.7
(https://android.googlesource.com/toolchain/clang
b55f2d4ebfd35bf643d27dbca1bb228957008617)
(https://android.googlesource.com/toolchain/llvm
3c393fe7a7e13b0fba4ac75a01aa683d7a5b11cd) (based on LLVM 8.0.7svn)", warning
about functionIndex, vtableOffset, and indirectRet being used
"uninitialized"
(but which is as intended, carrying over the values those registers have
upon
entry to the function)
Change-Id: I443fe2e8bf7c25a5bd2bfd99c245d430be65f445
Reviewed-on: https://gerrit.libreoffice.org/85400
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
Reviewed-on: https://gerrit.libreoffice.org/85632
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
diff --git a/bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx
b/bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx
index d11a11b0c965..f9396321cb14 100644
--- a/bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx
@@ -313,6 +313,7 @@ struct aarch64_va_list {
};
#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wuninitialized"
#pragma GCC diagnostic ignored "-Wvolatile-register-var"
extern "C" void vtableSlotCall(
unsigned long gpr0, unsigned long gpr1, unsigned long gpr2,
___
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.2' - bridges/source
bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx |7 -
bridges/source/cpp_uno/gcc3_linux_aarch64/abi.hxx | 117 +-
bridges/source/cpp_uno/gcc3_linux_aarch64/uno2cpp.cxx |4
3 files changed, 92 insertions(+), 36 deletions(-)
New commits:
commit 365c4da04d457666bb58014259c42bcde2b89bc5
Author: Stephan Bergmann
AuthorDate: Tue Dec 17 23:33:28 2019 +0100
Commit: Jan Holesovsky
CommitDate: Fri Dec 20 20:17:44 2019 +0100
tdf#128671: Rely on unwind.h, declare what's missing from cxxabi.h
...for gcc3_linux_aarch64, similar to what
128deeae81a6f802bfb79b8f0fa8c4b10729f7db "cxxabi.h is not specific to GCC"
et al
did for gcc3_linux_x86-64
Change-Id: Iee9980842c0e5f6f49642407339a67e865f8be9c
Reviewed-on: https://gerrit.libreoffice.org/85344
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
Reviewed-on: https://gerrit.libreoffice.org/85631
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
diff --git a/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
b/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
index 6335d0c5c8a2..462efc7b41d1 100644
--- a/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
@@ -24,7 +24,6 @@
#include
#include
-#include
#include
#include
@@ -135,8 +134,8 @@ std::type_info * getRtti(typelib_TypeDescription const &
type) {
}
extern "C" void _GLIBCXX_CDTOR_CALLABI deleteException(void * exception) {
-abi_aarch64::__cxa_exception * header =
-static_cast(exception) - 1;
+__cxxabiv1::__cxa_exception * header =
+static_cast<__cxxabiv1::__cxa_exception *>(exception) - 1;
OUString unoName(toUnoName(header->exceptionType->name()));
typelib_TypeDescription * td = 0;
typelib_typedescription_getByName(&td, unoName.pData);
@@ -224,7 +223,7 @@ StructKind getStructKind(typelib_CompoundTypeDescription
const * type) {
namespace abi_aarch64 {
void mapException(
-__cxa_exception * exception, std::type_info const * type, uno_Any * any,
uno_Mapping * mapping)
+__cxxabiv1::__cxa_exception * exception, std::type_info const * type,
uno_Any * any, uno_Mapping * mapping)
{
assert(exception != 0);
assert(type != nullptr);
diff --git a/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.hxx
b/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.hxx
index 50c5f1f21a37..e3dc9b5872a7 100644
--- a/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.hxx
@@ -22,55 +22,114 @@
#include
+#include
#include
#include
+#include
+#ifndef _GLIBCXX_CDTOR_CALLABI // new in GCC 4.7 cxxabi.h
+#define _GLIBCXX_CDTOR_CALLABI
+#endif
+#include
+
+#include
#include
#include
#include
-namespace abi_aarch64 {
-
-// Following declarations from libstdc++-v3/libsupc++/unwind-cxx.h and
-// lib/gcc/*-*-*/*/include/unwind.h:
-
-struct _Unwind_Exception
-{
-unsigned exception_class __attribute__((__mode__(__DI__)));
-void * exception_cleanup;
-unsigned private_1 __attribute__((__mode__(__word__)));
-unsigned private_2 __attribute__((__mode__(__word__)));
-} __attribute__((__aligned__));
+#if !HAVE_CXXABI_H_CLASS_TYPE_INFO
+// ,
+// libstdc++-v3/libsupc++/cxxabi.h:
+namespace __cxxabiv1 {
+class __class_type_info: public std::type_info {
+public:
+explicit __class_type_info(char const * n): type_info(n) {}
+~__class_type_info() override;
+};
+}
+#endif
-struct __cxa_exception
-{
-std::type_info *exceptionType;
-void (*exceptionDestructor)(void *);
+#if !HAVE_CXXABI_H_SI_CLASS_TYPE_INFO
+// ,
+// libstdc++-v3/libsupc++/cxxabi.h:
+namespace __cxxabiv1 {
+class __si_class_type_info: public __class_type_info {
+public:
+__class_type_info const * __base_type;
+explicit __si_class_type_info(
+char const * n, __class_type_info const *base):
+__class_type_info(n), __base_type(base) {}
+~__si_class_type_info() override;
+};
+}
+#endif
+#if !HAVE_CXXABI_H_CXA_EXCEPTION
+// ,
+// libcxxabi/src/cxa_exception.hpp:
+namespace __cxxabiv1 {
+struct __cxa_exception {
+#if defined _LIBCPPABI_VERSION // detect libc++abi
+#if defined __LP64__ || LIBCXXABI_ARM_EHABI
+std::size_t referenceCount;
+#endif
+#endif
+std::type_info * exceptionType;
+void (* exceptionDestructor)(void *);
void (*unexpectedHandler)(); // std::unexpected_handler dropped from C++17
std::terminate_handler terminateHandler;
-
-__cxa_exception *nextException;
-
+__cxa_exception * nextException;
int handlerCount;
-
int handlerSwitchValue;
-const unsigned char *actionRecord;
-const unsigned char *languageSpecificData;
-void *catchTemp;
-void *adjustedPtr;
-
+char const * actionRecord;
+char const * languageSpecificData;
+vo
[Libreoffice-commits] online.git: common/SigUtil.cpp common/SigUtil.hpp kit/ChildSession.cpp wsd/DocumentBroker.cpp wsd/README
common/SigUtil.cpp | 15 +++
common/SigUtil.hpp |3 +++
kit/ChildSession.cpp | 10 ++
wsd/DocumentBroker.cpp |9 -
wsd/README |4
5 files changed, 40 insertions(+), 1 deletion(-)
New commits:
commit 92909810136db2494e2700c6c5ff172339f759fd
Author: Henry Castro
AuthorDate: Wed Dec 18 16:28:14 2019 -0400
Commit: Henry Castro
CommitDate: Fri Dec 20 19:57:47 2019 +0100
wsd: debug: add env variable "PAUSEFORDEBUGGER" to attach debugger
It is painful to check and search manually the PID to attach the LOKit
process when exists several pre-spawned waiting to load a document.
This patch helps to attach the debugger when the LOKit process is about
to load a document then send the "signal SIGUSR1" to resume it.
Change-Id: I3b15bd522c6ef3ef57dc3453b457dcf91f2661b9
Reviewed-on: https://gerrit.libreoffice.org/85430
Reviewed-by: Michael Meeks
Tested-by: Henry Castro
Reviewed-by: Henry Castro
diff --git a/common/SigUtil.cpp b/common/SigUtil.cpp
index f511aca60..8fe38b721 100644
--- a/common/SigUtil.cpp
+++ b/common/SigUtil.cpp
@@ -331,6 +331,10 @@ namespace SigUtil
}
}
+static
+void handleDebuggerSignal(const int /*signal*/)
+{}
+
void setUserSignals()
{
struct sigaction action;
@@ -342,6 +346,17 @@ namespace SigUtil
sigaction(SIGUSR1, &action, nullptr);
}
+void setDebuggerSignal()
+{
+struct sigaction action;
+
+sigemptyset(&action.sa_mask);
+action.sa_flags = 0;
+action.sa_handler = handleDebuggerSignal;
+
+sigaction(SIGUSR1, &action, nullptr);
+}
+
/// Kill the given pid with SIGTERM. Returns true when the pid does not
exist any more.
bool killChild(const int pid)
{
diff --git a/common/SigUtil.hpp b/common/SigUtil.hpp
index 95371f3a1..a0da03142 100644
--- a/common/SigUtil.hpp
+++ b/common/SigUtil.hpp
@@ -59,6 +59,9 @@ namespace SigUtil
/// Trap generally useful signals
void setUserSignals();
+/// Trap to unpause the process
+void setDebuggerSignal();
+
/// Requests the server to initiate graceful shutdown.
/// Shutting down is a multi-stage process, because
/// it can be requested via signals.
diff --git a/kit/ChildSession.cpp b/kit/ChildSession.cpp
index 45ee614e4..cf65a51b9 100644
--- a/kit/ChildSession.cpp
+++ b/kit/ChildSession.cpp
@@ -24,6 +24,7 @@
#include
#include
#include
+#include
#if !MOBILEAPP
#include
#include
@@ -606,6 +607,15 @@ bool ChildSession::loadDocument(const char * /*buffer*/,
int /*length*/, const s
std::unique_lock lock(Mutex);
+#ifdef ENABLE_DEBUG
+if (std::getenv("PAUSEFORDEBUGGER"))
+{
+std::cerr << getDocURL() << " paused waiting for a debugger to attach:
" << Poco::Process::id() << std::endl;
+SigUtil::setDebuggerSignal();
+pause();
+}
+#endif
+
const bool loaded = _docManager->onLoad(getId(),
getJailedFilePathAnonym(), renderOpts, doctemplate);
if (!loaded || _viewId < 0)
{
diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index fecea32bc..7e163e769 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -283,7 +283,14 @@ void DocumentBroker::pollThread()
auto lastBWUpdateTime = std::chrono::steady_clock::now();
auto lastClipboardHashUpdateTime = std::chrono::steady_clock::now();
-const int limit_load_secs =
LOOLWSD::getConfigValue("per_document.limit_load_secs", 100);
+const int limit_load_secs =
+#ifdef ENABLE_DEBUG
+// paused waiting for a debugger to attach
+// ignore load time out
+std::getenv("PAUSEFORDEBUGGER") ? -1 :
+#endif
+LOOLWSD::getConfigValue("per_document.limit_load_secs", 100);
+
const auto loadDeadline = std::chrono::steady_clock::now() +
std::chrono::seconds(limit_load_secs);
#endif
auto last30SecCheckTime = std::chrono::steady_clock::now();
diff --git a/wsd/README b/wsd/README
index 25d17db43..e56b970c6 100644
--- a/wsd/README
+++ b/wsd/README
@@ -240,6 +240,8 @@ limit the amount of concurrently running processes.
When the crash happens too early, you also want to
export SLEEPFORDEBUGGER=
+or
+export PAUSEFORDEBUGGER=1
so that you have time to attach to the process.
@@ -261,6 +263,8 @@ Use the ps command to find out exactly the path to use.
Set LOOL_DEBUG=1 to trap SIGSEGV and SEGBUS and prompt for debugger.
+if you choose PAUSEFORDEBUGGER send the signal SIGUSR1 to resume the process
+
In order to run and debug one unit test, set CPPUNIT_TEST_NAME to something
non-empty:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] cppunit.git: 3 commits - configure.ac include/cppunit NEWS
NEWS | 21 +++ configure.ac |2 - include/cppunit/extensions/TestSuiteBuilderContext.h |4 +-- 3 files changed, 24 insertions(+), 3 deletions(-) New commits: commit 81cbaa728f595aa25819206dca6f71338686ad9e Author: Markus Mohrhard AuthorDate: Sat Dec 21 02:56:17 2019 +0800 Commit: Markus Mohrhard CommitDate: Sat Dec 21 02:56:17 2019 +0800 next version is going to be 1.15.1 diff --git a/configure.ac b/configure.ac index 21e3249..18a9966 100644 --- a/configure.ac +++ b/configure.ac @@ -7,7 +7,7 @@ AC_PREREQ([2.65]) # m4_define([cppunit_version_major],[1]) m4_define([cppunit_version_minor],[15]) -m4_define([cppunit_version_micro],[0]) +m4_define([cppunit_version_micro],[1]) m4_define([cppunit_version],[cppunit_version_major.cppunit_version_minor.cppunit_version_micro]) m4_define([cppunit_interface_age], [0]) m4_define([cppunit_binary_age], [0]) commit 8ed8126ec0c9ddd95c2d86ef81a95f6b405e05af Author: Markus Mohrhard AuthorDate: Sat Dec 21 02:55:41 2019 +0800 Commit: Markus Mohrhard CommitDate: Sat Dec 21 02:55:41 2019 +0800 add NEWS for 1.15.0 and 1.15.1 diff --git a/NEWS b/NEWS index f8ef782..88d06bd 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,24 @@ + New in CppUnit 1.15.0: + - + +* Portability: + + - Fix Wdefaulted-function-deleted warning with clang + + New in CppUnit 1.15.0: + - + + - Report (un)signed character as intergers + + - add CPPUNIT_TEST_FIXTURE() + + - add message_to_string trait to allow custom string formatters + +* Portability: + - Fix build with gcc 9 + + - Fix various compiler warnings + New in CppUnit 1.14.0: - commit 834f3a287387bd6230c98b0c5375aff568c75e02 Author: Markus Mohrhard AuthorDate: Sat Dec 21 02:44:08 2019 +0800 Commit: Markus Mohrhard CommitDate: Sat Dec 21 02:44:08 2019 +0800 fix -Wdefaulted-function-deleted error diff --git a/include/cppunit/extensions/TestSuiteBuilderContext.h b/include/cppunit/extensions/TestSuiteBuilderContext.h index 12d157e..04f4b9b 100644 --- a/include/cppunit/extensions/TestSuiteBuilderContext.h +++ b/include/cppunit/extensions/TestSuiteBuilderContext.h @@ -42,8 +42,8 @@ public: TestSuiteBuilderContextBase(TestSuiteBuilderContextBase const &) = default; TestSuiteBuilderContextBase(TestSuiteBuilderContextBase &&) = default; - TestSuiteBuilderContextBase & operator =(TestSuiteBuilderContextBase const &) = default; - TestSuiteBuilderContextBase & operator =(TestSuiteBuilderContextBase &&) = default; + TestSuiteBuilderContextBase & operator =(TestSuiteBuilderContextBase const &) = delete; + TestSuiteBuilderContextBase & operator =(TestSuiteBuilderContextBase &&) = delete; /*! \brief Adds a test to the fixture suite. * ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: editeng/source
editeng/source/editeng/editdbg.hxx |5 +
editeng/source/editeng/editobj2.hxx |5 +
editeng/source/editeng/editsel.hxx |5 +
editeng/source/editeng/editstt2.hxx |5 +
editeng/source/editeng/editundo.hxx |6 +-
editeng/source/editeng/eehtml.hxx |5 +
6 files changed, 6 insertions(+), 25 deletions(-)
New commits:
commit d0b69965012a711c0b181bf359c8b27a782be2c3
Author: Batuhan Görkem Benzer
AuthorDate: Fri Dec 20 08:16:27 2019 -0500
Commit: Muhammet Kara
CommitDate: Fri Dec 20 19:39:07 2019 +0100
tdf#124176: Use pragma once instead of include guards
Change-Id: I4d291de9a331923877160293c217c2ce8b15294d
Reviewed-on: https://gerrit.libreoffice.org/85603
Tested-by: Jenkins
Reviewed-by: Muhammet Kara
diff --git a/editeng/source/editeng/editdbg.hxx
b/editeng/source/editeng/editdbg.hxx
index f3d8347caa6b..9c2fa5004791 100644
--- a/editeng/source/editeng/editdbg.hxx
+++ b/editeng/source/editeng/editdbg.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_EDITENG_SOURCE_EDITENG_EDITDBG_HXX
-#define INCLUDED_EDITENG_SOURCE_EDITENG_EDITDBG_HXX
+#pragma once
#include
#include
@@ -37,6 +36,4 @@ public:
static void ShowEditEngineData( EditEngine* pEditEngine, bool
bInfoBox = true );
};
-#endif // INCLUDED_EDITENG_SOURCE_EDITENG_EDITDBG_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/source/editeng/editobj2.hxx
b/editeng/source/editeng/editobj2.hxx
index f217e4beb948..b7d045d459f4 100644
--- a/editeng/source/editeng/editobj2.hxx
+++ b/editeng/source/editeng/editobj2.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_EDITENG_SOURCE_EDITENG_EDITOBJ2_HXX
-#define INCLUDED_EDITENG_SOURCE_EDITENG_EDITOBJ2_HXX
+#pragma once
#include
#include
@@ -277,6 +276,4 @@ public:
#endif
};
-#endif // INCLUDED_EDITENG_SOURCE_EDITENG_EDITOBJ2_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/source/editeng/editsel.hxx
b/editeng/source/editeng/editsel.hxx
index f59a9ea05880..8d2adfb670f3 100644
--- a/editeng/source/editeng/editsel.hxx
+++ b/editeng/source/editeng/editsel.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_EDITENG_SOURCE_EDITENG_EDITSEL_HXX
-#define INCLUDED_EDITENG_SOURCE_EDITENG_EDITSEL_HXX
+#pragma once
#include
@@ -56,6 +55,4 @@ public:
voidSetCurView( EditView* pNewView );
};
-#endif // INCLUDED_EDITENG_SOURCE_EDITENG_EDITSEL_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/source/editeng/editstt2.hxx
b/editeng/source/editeng/editstt2.hxx
index 48d5f1e81da6..4474df8b429b 100644
--- a/editeng/source/editeng/editstt2.hxx
+++ b/editeng/source/editeng/editstt2.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_EDITENG_SOURCE_EDITENG_EDITSTT2_HXX
-#define INCLUDED_EDITENG_SOURCE_EDITENG_EDITSTT2_HXX
+#pragma once
#include
@@ -94,6 +93,4 @@ public:
{ return bool( nControlBits & EEControlBits::ULSPACESUMMATION
); }
};
-#endif // INCLUDED_EDITENG_SOURCE_EDITENG_EDITSTT2_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/source/editeng/editundo.hxx
b/editeng/source/editeng/editundo.hxx
index b22cbb5dea67..43d2a0d3b911 100644
--- a/editeng/source/editeng/editundo.hxx
+++ b/editeng/source/editeng/editundo.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_EDITENG_SOURCE_EDITENG_EDITUNDO_HXX
-#define INCLUDED_EDITENG_SOURCE_EDITENG_EDITUNDO_HXX
+#pragma once
#include
#include
@@ -286,7 +285,4 @@ public:
virtual voidRedo() override;
};
-
-#endif // INCLUDED_EDITENG_SOURCE_EDITENG_EDITUNDO_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/source/editeng/eehtml.hxx
b/editeng/source/editeng/eehtml.hxx
index 4c68f0dcc69f..8a7394d25e59 100644
--- a/editeng/source/editeng/eehtml.hxx
+++ b/editeng/source/editeng/eehtml.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_EDITENG_SOURCE_EDITENG_EEHTML_HXX
-#define INCLUDED_EDITENG_SOURCE_EDITENG_EEHTML_HXX
+#pragma once
#include
#include
@@ -81,6 +80,4 @@ public:
typedef tools::SvRef EditHTMLParserRef;
-#endif // INCLUDED_EDITENG_SOURCE_EDITENG_EEHTML_HXX
-
/* 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: sc/uiconfig
sc/uiconfig/scalc/menubar/menubar.xml |2 -- 1 file changed, 2 deletions(-) New commits: commit 24939a5b43b9fe889c3aace027c668666ff61987 Author: Markus Mohrhard AuthorDate: Fri Dec 20 02:56:20 2019 +0800 Commit: Markus Mohrhard CommitDate: Fri Dec 20 19:38:53 2019 +0100 the data provider feature is not ready for production Change-Id: Idca4b9dbde4fed2524c186851cb44d95953181ec Reviewed-on: https://gerrit.libreoffice.org/85541 Reviewed-by: Markus Mohrhard Tested-by: Markus Mohrhard diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml index d1d8069b50e2..d029db790622 100644 --- a/sc/uiconfig/scalc/menubar/menubar.xml +++ b/sc/uiconfig/scalc/menubar/menubar.xml @@ -642,8 +642,6 @@ - - ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extensions/source
extensions/source/scanner/grid.hxx|5 +
extensions/source/scanner/sane.hxx|5 +
extensions/source/scanner/sanedlg.hxx |6 +-
extensions/source/scanner/scanner.hxx |5 +
extensions/source/scanner/twain32shim.hxx |5 +
5 files changed, 5 insertions(+), 21 deletions(-)
New commits:
commit 9f749e97854009697d4263960c966313d3dd19d2
Author: Tolunay Dündar
AuthorDate: Thu Dec 19 19:59:37 2019 +0300
Commit: Muhammet Kara
CommitDate: Fri Dec 20 19:35:23 2019 +0100
tdf#124176: Use pragma once instead of include guards
Change-Id: Ic035497bd07633bd4af02a8fe69ac701d4a45492
Reviewed-on: https://gerrit.libreoffice.org/85537
Tested-by: Jenkins
Reviewed-by: Muhammet Kara
diff --git a/extensions/source/scanner/grid.hxx
b/extensions/source/scanner/grid.hxx
index 51345cca5917..1f3a0f191cca 100644
--- a/extensions/source/scanner/grid.hxx
+++ b/extensions/source/scanner/grid.hxx
@@ -16,8 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_EXTENSIONS_SOURCE_SCANNER_GRID_HXX
-#define INCLUDED_EXTENSIONS_SOURCE_SCANNER_GRID_HXX
+#pragma once
#include
#include
@@ -49,6 +48,4 @@ public:
double* getNewYValues();
};
-#endif // INCLUDED_EXTENSIONS_SOURCE_SCANNER_GRID_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/scanner/sane.hxx
b/extensions/source/scanner/sane.hxx
index 19cff7a32f58..135fe8872048 100644
--- a/extensions/source/scanner/sane.hxx
+++ b/extensions/source/scanner/sane.hxx
@@ -16,8 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_EXTENSIONS_SOURCE_SCANNER_SANE_HXX
-#define INCLUDED_EXTENSIONS_SOURCE_SCANNER_SANE_HXX
+#pragma once
#include
#include
@@ -179,6 +178,4 @@ inline Link Sane::SetReloadOptionsHdl( const
Link& rLink
return aRet;
}
-#endif // INCLUDED_EXTENSIONS_SOURCE_SCANNER_SANE_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/scanner/sanedlg.hxx
b/extensions/source/scanner/sanedlg.hxx
index 00e3f59da53a..ad87667bf13a 100644
--- a/extensions/source/scanner/sanedlg.hxx
+++ b/extensions/source/scanner/sanedlg.hxx
@@ -16,8 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_EXTENSIONS_SOURCE_SCANNER_SANEDLG_HXX
-#define INCLUDED_EXTENSIONS_SOURCE_SCANNER_SANEDLG_HXX
+#pragma once
#include
#include
@@ -108,7 +107,4 @@ public:
bool getDoScan() const { return doScan;}
};
-
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/scanner/scanner.hxx
b/extensions/source/scanner/scanner.hxx
index 854bb07e8db4..da3b9d7b80c4 100644
--- a/extensions/source/scanner/scanner.hxx
+++ b/extensions/source/scanner/scanner.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_EXTENSIONS_SOURCE_SCANNER_SCANNER_HXX
-#define INCLUDED_EXTENSIONS_SOURCE_SCANNER_SCANNER_HXX
+#pragma once
#include
#include
@@ -89,6 +88,4 @@ public:
/// @throws Exception
Reference< XInterface > ScannerManager_CreateInstance( const Reference<
css::lang::XMultiServiceFactory >& rxFactory );
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/scanner/twain32shim.hxx
b/extensions/source/scanner/twain32shim.hxx
index b72df438d596..9f42f0a4d5dc 100644
--- a/extensions/source/scanner/twain32shim.hxx
+++ b/extensions/source/scanner/twain32shim.hxx
@@ -8,8 +8,7 @@
*
*/
-#ifndef INCLUDED_EXTENSIONS_SOURCE_SCANNER_TWAIN32SHIM_HXX
-#define INCLUDED_EXTENSIONS_SOURCE_SCANNER_TWAIN32SHIM_HXX
+#pragma once
#include
#include
@@ -65,6 +64,4 @@ void ThrowWin32Error(const char* sFunc, DWORD nWin32Error)
void ThrowLastError(const char* sFunc) { ThrowWin32Error(sFunc,
GetLastError()); }
-#endif
-
/* 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: vcl/CppunitTest_vcl_outdev.mk vcl/qa vcl/source
vcl/CppunitTest_vcl_outdev.mk |1 +
vcl/qa/cppunit/outdev.cxx | 15 +++
vcl/source/window/bufferdevice.cxx |1 +
vcl/source/window/bufferdevice.hxx |2 +-
4 files changed, 18 insertions(+), 1 deletion(-)
New commits:
commit 4b191691fb33db96d90a27ae2a09f290d45029bc
Author: Miklos Vajna
AuthorDate: Fri Dec 20 18:05:35 2019 +0100
Commit: Miklos Vajna
CommitDate: Fri Dec 20 19:31:18 2019 +0100
tdf#127022 vcl: fix Windows RTL menu bar
Regression from commit e8d5b8beb5958147235ff955ed38c47b51d860ff
(tdf#113714 vcl menu bar window: avoid flicker, 2019-05-20), the problem
was that while the original render context has RTL set up correctly, the
intermediate virtual device had it disabled all the time.
Change-Id: Ic063c4a6c0537891c0bfceb8927edb97cf1c6e86
Reviewed-on: https://gerrit.libreoffice.org/85624
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/vcl/CppunitTest_vcl_outdev.mk b/vcl/CppunitTest_vcl_outdev.mk
index f15d2e26d17d..65fd6b5fa17e 100644
--- a/vcl/CppunitTest_vcl_outdev.mk
+++ b/vcl/CppunitTest_vcl_outdev.mk
@@ -12,6 +12,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,vcl_outdev))
$(eval $(call gb_CppunitTest_set_include,vcl_outdev,\
$$(INCLUDE) \
-I$(SRCDIR)/vcl/inc \
+-I$(SRCDIR)/vcl/source/window \
))
$(eval $(call gb_CppunitTest_add_exception_objects,vcl_outdev, \
diff --git a/vcl/qa/cppunit/outdev.cxx b/vcl/qa/cppunit/outdev.cxx
index 8b2dd7c3a841..2f42412e75aa 100644
--- a/vcl/qa/cppunit/outdev.cxx
+++ b/vcl/qa/cppunit/outdev.cxx
@@ -16,6 +16,7 @@
#include
#include
#include
+#include
#include
@@ -32,6 +33,7 @@ public:
void testGetReadableFontColorWindow();
void testDrawTransformedBitmapEx();
void testDrawTransformedBitmapExFlip();
+void testRTL();
CPPUNIT_TEST_SUITE(VclOutdevTest);
CPPUNIT_TEST(testVirtualDevice);
@@ -42,6 +44,7 @@ public:
CPPUNIT_TEST(testGetReadableFontColorWindow);
CPPUNIT_TEST(testDrawTransformedBitmapEx);
CPPUNIT_TEST(testDrawTransformedBitmapExFlip);
+CPPUNIT_TEST(testRTL);
CPPUNIT_TEST_SUITE_END();
};
@@ -254,6 +257,18 @@ void VclOutdevTest::testDrawTransformedBitmapExFlip()
CPPUNIT_ASSERT_EQUAL_MESSAGE(ss.str(), COL_BLACK, Color(aColor));
}
+void VclOutdevTest::testRTL()
+{
+ScopedVclPtrInstance pWindow(nullptr, WB_APP | WB_STDWORK);
+pWindow->EnableRTL();
+vcl::RenderContext& rRenderContext = *pWindow;
+vcl::BufferDevice pBuffer(pWindow, rRenderContext);
+
+// Without the accompanying fix in place, this test would have failed,
because the RTL status
+// from pWindow was not propagated to pBuffer.
+CPPUNIT_ASSERT(pBuffer->IsRTLEnabled());
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(VclOutdevTest);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/vcl/source/window/bufferdevice.cxx
b/vcl/source/window/bufferdevice.cxx
index d1480588d48f..0092d1ab97e4 100644
--- a/vcl/source/window/bufferdevice.cxx
+++ b/vcl/source/window/bufferdevice.cxx
@@ -20,6 +20,7 @@ BufferDevice::BufferDevice(const VclPtr&
pWindow, vcl::RenderContex
m_pBuffer->SetTextColor(rRenderContext.GetTextColor());
m_pBuffer->DrawOutDev(Point(0, 0), pWindow->GetOutputSizePixel(), Point(0,
0),
pWindow->GetOutputSizePixel(), rRenderContext);
+m_pBuffer->EnableRTL(rRenderContext.IsRTLEnabled());
}
BufferDevice::~BufferDevice()
diff --git a/vcl/source/window/bufferdevice.hxx
b/vcl/source/window/bufferdevice.hxx
index 26bf28e615fa..5f2471cd26d9 100644
--- a/vcl/source/window/bufferdevice.hxx
+++ b/vcl/source/window/bufferdevice.hxx
@@ -16,7 +16,7 @@
namespace vcl
{
/// Buffers drawing on a vcl::RenderContext using a VirtualDevice.
-class BufferDevice
+class VCL_DLLPUBLIC BufferDevice
{
ScopedVclPtr m_pBuffer;
VclPtr m_pWindow;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/xmloff sw/source xmloff/source
include/xmloff/xmlictxt.hxx |6 --
sw/source/filter/xml/xmlimp.cxx |2 +-
xmloff/source/core/xmlictxt.cxx |3 +++
xmloff/source/core/xmlimp.cxx |4 ++--
4 files changed, 10 insertions(+), 5 deletions(-)
New commits:
commit 813118bfbb453f812be9e1a30f84908b4e0bfb51
Author: Noel Grandin
AuthorDate: Fri Dec 20 14:34:56 2019 +0200
Commit: Noel Grandin
CommitDate: Fri Dec 20 19:26:18 2019 +0100
add checks to optional fields in SvXMLImportContext
so when I convert ImportContext to FastParser APIs I don't accidentally
rely on data that is not there
Change-Id: If4700c7902e11f98a57542943f6a198822689df8
Reviewed-on: https://gerrit.libreoffice.org/85622
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/xmloff/xmlictxt.hxx b/include/xmloff/xmlictxt.hxx
index 8dc67dac0227..5ab75bce286e 100644
--- a/include/xmloff/xmlictxt.hxx
+++ b/include/xmloff/xmlictxt.hxx
@@ -51,6 +51,7 @@ class XMLOFF_DLLPUBLIC SvXMLImportContext : public
css::xml::sax::XFastContextHa
SvXMLImport& mrImport;
sal_uInt16 mnPrefix;
OUString maLocalName;
+bool mbPrefixAndLocalNameFilledIn;
std::unique_ptr m_pRewindMap;
SAL_DLLPRIVATE std::unique_ptr TakeRewindMap() { return
std::move(m_pRewindMap); }
@@ -63,8 +64,9 @@ protected:
public:
-sal_uInt16 GetPrefix() const { return mnPrefix; }
-const OUString& GetLocalName() const { return maLocalName; }
+bool IsPrefixFilledIn() const { return mnPrefix != 0; }
+sal_uInt16 GetPrefix() const { assert(mbPrefixAndLocalNameFilledIn &&
"those fields not filled, probably fast-parser context"); return mnPrefix; }
+const OUString& GetLocalName() const { assert(mbPrefixAndLocalNameFilledIn
&& "those fields not filled, probably fast-parser context"); return
maLocalName; }
/** A contexts constructor does anything that is required if an element
* starts. Namespace processing has been done already.
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index ebbd220e65a1..6b9a18327714 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -244,7 +244,7 @@ SvXMLImportContextRef
SwXMLDocContext_Impl::CreateChildContext(
break;
case XML_TOK_DOC_AUTOSTYLES:
// don't use the autostyles from the styles-document for the progress
-if ( ! IsXMLToken( GetLocalName(), XML_DOCUMENT_STYLES ) )
+if ( !IsPrefixFilledIn() || ! IsXMLToken( GetLocalName(),
XML_DOCUMENT_STYLES ) )
GetSwImport().GetProgressBarHelper()->Increment
( PROGRESS_BAR_STEP );
pContext = GetSwImport().CreateStylesContext( rLocalName, xAttrList,
diff --git a/xmloff/source/core/xmlictxt.cxx b/xmloff/source/core/xmlictxt.cxx
index 092b1845c18c..b05a76b39969 100644
--- a/xmloff/source/core/xmlictxt.cxx
+++ b/xmloff/source/core/xmlictxt.cxx
@@ -32,13 +32,16 @@ SvXMLImportContext::SvXMLImportContext( SvXMLImport& rImp,
sal_uInt16 nPrfx,
, mrImport(rImp)
, mnPrefix(nPrfx)
, maLocalName(rLName)
+, mbPrefixAndLocalNameFilledIn(true)
{
+assert(!rLName.isEmpty());
}
SvXMLImportContext::SvXMLImportContext( SvXMLImport& rImp )
: m_nRefCount(0)
, mrImport(rImp)
, mnPrefix(0)
+, mbPrefixAndLocalNameFilledIn(false)
{
}
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 9c1f806a999c..578bef43a82c 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -729,7 +729,7 @@ void SAL_CALL SvXMLImport::startElement( const OUString&
rName,
if(!maContexts.empty())
{
xContext = maContexts.top()->CreateChildContext(nPrefix, aLocalName,
xAttrList);
-SAL_WARN_IF( !xContext.is() || (xContext->GetPrefix() != nPrefix),
"xmloff.core",
+SAL_WARN_IF( xContext.is() && xContext->IsPrefixFilledIn() &&
(xContext->GetPrefix() != nPrefix), "xmloff.core",
"SvXMLImport::startElement: created context has wrong prefix"
);
}
else
@@ -782,7 +782,7 @@ rName
#ifdef DBG_UTIL
// Non product only: check if endElement call matches startELement
call.
-if (!xContext->GetLocalName().isEmpty()) // prefix+localname are only
valid in the non-FastParser case
+if (xContext->IsPrefixFilledIn()) // prefix+localname are only valid
in the non-FastParser case
{
OUString aLocalName;
sal_uInt16 nPrefix =
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/inc
sc/inc/sc.hrc | 23 +-- 1 file changed, 9 insertions(+), 14 deletions(-) New commits: commit e5f4aff517a674d12dd125601cc508feef854c15 Author: Noel Grandin AuthorDate: Wed Dec 18 10:04:31 2019 +0200 Commit: Noel Grandin CommitDate: Fri Dec 20 19:26:04 2019 +0100 loplugin:duplicate-defines these are duplicated in sfx2/sfxsids.hrc, with no easy way to de-duplicate them without making stuff much harder to understand, so wrap them in conditional defines Change-Id: I83f53a224e83ba808acc03e116dd416a4291d77b Reviewed-on: https://gerrit.libreoffice.org/85557 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc index ccd4ad2da3b1..f13b1fb78ab4 100644 --- a/sc/inc/sc.hrc +++ b/sc/inc/sc.hrc @@ -25,11 +25,15 @@ // areas +#ifndef SC_VIEW_START // duplicated in sfx2/sfxsids.hrc #define SC_VIEW_START (SID_SC_START) +#endif // SC_VIEW_END (SID_SC_START + 99) #define SC_MESSAGE_START(SID_SC_START + 100) // SC_MESSAGE_END (SID_SC_START + 199) +#ifndef SC_FUNCTION_START // duplicated in sfx2/sfxsids.hrc #define SC_FUNCTION_START (SID_SC_START + 200) +#endif // SC_FUNCTION_END (SID_SC_START + 299) #define SC_PARAM_START (SID_SC_START + 300) // SC_PARAM_END(SID_SC_START + 399) @@ -243,9 +247,13 @@ #define SID_OPEN_CALC (SC_FUNCTION_START + 4) #define SID_CONVERT_FORMULA_TO_VALUE(SC_FUNCTION_START + 5) +#ifndef FILE_MENU_END // duplicated in sfx2/sfxsids.hrc #define FILE_MENU_END (SC_FUNCTION_START + 20) +#endif +#ifndef EDIT_MENU_START // duplicated in sfx2/sfxsids.hrc #define EDIT_MENU_START (FILE_MENU_END) +#endif #define FID_DELETE_CELL (EDIT_MENU_START + 2) #define FID_DELETE_TABLE(EDIT_MENU_START + 3) #define FID_FILL_TO_BOTTOM (EDIT_MENU_START + 4) @@ -458,22 +466,9 @@ #define SID_PREVIEW_END (SID_PREVIEW_START+20) //from sfx: #define SID_KEYFUNC_START (SID_PREVIEW_END+5) -#define SID_CURSORDOWN_SEL (SID_KEYFUNC_START + 0) -#define SID_CURSORUP_SEL(SID_KEYFUNC_START + 1) -#define SID_CURSORLEFT_SEL (SID_KEYFUNC_START + 2) -#define SID_CURSORRIGHT_SEL (SID_KEYFUNC_START + 3) -#define SID_CURSORPAGEDOWN_SEL (SID_KEYFUNC_START + 4) -#define SID_CURSORPAGEUP_SEL(SID_KEYFUNC_START + 5) - +// from SID_KEYFUNC_START + 0 to SID_KEYFUNC_START + 13 are defined in include/sfx2/sfxsids.hrc #define SID_CURSORPAGELEFT_ (SID_KEYFUNC_START + 6) -#define SID_CURSORPAGELEFT_SEL (SID_KEYFUNC_START + 7) #define SID_CURSORPAGERIGHT_(SID_KEYFUNC_START + 8) -#define SID_CURSORPAGERIGHT_SEL (SID_KEYFUNC_START + 9) - -#define SID_CURSORTOPOFFILE_SEL (SID_KEYFUNC_START + 10) -#define SID_CURSORENDOFFILE_SEL (SID_KEYFUNC_START + 11) -#define SID_CURSORHOME_SEL (SID_KEYFUNC_START + 12) -#define SID_CURSOREND_SEL (SID_KEYFUNC_START + 13) #define SID_CURSORBLKUP (SID_KEYFUNC_START + 14) #define SID_CURSORBLKDOWN (SID_KEYFUNC_START + 15) #define SID_CURSORBLKLEFT (SID_KEYFUNC_START + 16) ___ 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.2' - svtools/source vcl/source
svtools/source/config/accessibilityoptions.cxx |4
vcl/source/app/settings.cxx|9 -
2 files changed, 12 insertions(+), 1 deletion(-)
New commits:
commit 18af8dc6a038d1e76274de7abc55ffa06b39a6c8
Author: Tor Lillqvist
AuthorDate: Fri Dec 20 17:32:25 2019 +0200
Commit: Tor Lillqvist
CommitDate: Fri Dec 20 18:58:05 2019 +0100
tdf#126966: Make the colour swatches larger on iOS
We reduce the number of swatches per row from 12 to 4 and increase
their size suitably so that the thing still fits in the sidebar in the
iOS app on an iPad in portrait orientation.
Change-Id: Ie81e5b54e88a02c6866de27448b5be72e97d9a16
Reviewed-on: https://gerrit.libreoffice.org/85620
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tor Lillqvist
diff --git a/svtools/source/config/accessibilityoptions.cxx
b/svtools/source/config/accessibilityoptions.cxx
index 6953d1399bfb..168e781093c9 100644
--- a/svtools/source/config/accessibilityoptions.cxx
+++ b/svtools/source/config/accessibilityoptions.cxx
@@ -263,6 +263,9 @@ sal_Int16
SvtAccessibilityOptions_Impl::GetListBoxMaximumLineCount() const
sal_Int16 SvtAccessibilityOptions_Impl::GetColorValueSetColumnCount() const
{
+#ifdef IOS
+return 4;
+#else
css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg,
css::uno::UNO_QUERY);
sal_Int16 nRet = 12;
@@ -277,6 +280,7 @@ sal_Int16
SvtAccessibilityOptions_Impl::GetColorValueSetColumnCount() const
}
return nRet;
+#endif
}
bool SvtAccessibilityOptions_Impl::GetPreviewUsesCheckeredBackground() const
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 31efba0d1eac..7e15ab5bb4b8 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
/*
* This file is part of the LibreOffice project.
*
@@ -476,8 +476,15 @@ ImplStyleData::ImplStyleData() :
maEdgeBlendingTopLeftColor(Color(0xC0, 0xC0, 0xC0)),
maEdgeBlendingBottomRightColor(Color(0x40, 0x40, 0x40)),
mnListBoxMaximumLineCount(25),
+// For some reason this isn't actually the column count that gets used, at
least on iOS, but
+// instead what
SvtAccessibilityOptions_Impl::GetColorValueSetColumnCount() in
+// svtools/source/config/accessibilityoptions.cxx returns.
mnColorValueSetColumnCount(12),
+#ifdef IOS
+maListBoxPreviewDefaultLogicSize(Size(30, 30)),
+#else
maListBoxPreviewDefaultLogicSize(Size(15, 7)),
+#endif
maListBoxPreviewDefaultPixelSize(Size(0, 0)), // on-demand calculated in
GetListBoxPreviewDefaultPixelSize(),
mbPreviewUsesCheckeredBackground(true)
{
___
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.2' - svx/source
svx/source/tbxctrls/tbxcolor.cxx |7 ++-
1 file changed, 2 insertions(+), 5 deletions(-)
New commits:
commit 83fedc02f2d831774c12d60097a99e968b56dc5e
Author: Tor Lillqvist
AuthorDate: Fri Dec 20 16:36:31 2019 +0200
Commit: Tor Lillqvist
CommitDate: Fri Dec 20 18:55:05 2019 +0100
Get rid of two pointless #defines
Change-Id: I7479f4f1c440bba1dd9f922c4df32ab877e0a803
Reviewed-on: https://gerrit.libreoffice.org/85619
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tor Lillqvist
diff --git a/svx/source/tbxctrls/tbxcolor.cxx b/svx/source/tbxctrls/tbxcolor.cxx
index 7112f7dada98..3b7f3e04e999 100644
--- a/svx/source/tbxctrls/tbxcolor.cxx
+++ b/svx/source/tbxctrls/tbxcolor.cxx
@@ -33,11 +33,8 @@ namespace svx
using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::beans;
-#define TOOLBAR_RESNAME "private:resource/toolbar/"
-#define PROPNAME_LAYOUTMANAGER "LayoutManager"
-
ToolboxAccess::ToolboxAccess( const OUString& rToolboxName ) :
-m_sToolboxResName ( TOOLBAR_RESNAME )
+m_sToolboxResName ( "private:resource/toolbar/" )
{
m_sToolboxResName += rToolboxName;
@@ -49,7 +46,7 @@ namespace svx
Reference< XFrame > xFrame =
SfxViewFrame::Current()->GetFrame().GetFrameInterface();
Reference< XPropertySet > xFrameProps( xFrame, UNO_QUERY );
if ( xFrameProps.is() )
-xFrameProps->getPropertyValue( PROPNAME_LAYOUTMANAGER )
>>= m_xLayouter;
+xFrameProps->getPropertyValue( "LayoutManager" ) >>=
m_xLayouter;
}
catch ( Exception& )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source sc/uiconfig solenv/sanitizers
sc/source/ui/formdlg/dwfunctr.cxx| 115 +--
sc/source/ui/inc/dwfunctr.hxx| 17 ++--
sc/uiconfig/scalc/ui/functionpanel.ui| 86 ++-
solenv/sanitizers/ui/modules/scalc.suppr |4 -
4 files changed, 127 insertions(+), 95 deletions(-)
New commits:
commit ddd1d219beb74f55eefbccc3ab8a8883dd0b4b69
Author: Caolán McNamara
AuthorDate: Fri Dec 20 13:21:13 2019 +
Commit: Caolán McNamara
CommitDate: Fri Dec 20 18:02:40 2019 +0100
weld ScFunctionWin
Change-Id: I9cb15dcb188354ebf6ba382a2f8109a3ae27be0d
Reviewed-on: https://gerrit.libreoffice.org/85606
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sc/source/ui/formdlg/dwfunctr.cxx
b/sc/source/ui/formdlg/dwfunctr.cxx
index f62eb242de05..dd7be33c9070 100644
--- a/sc/source/ui/formdlg/dwfunctr.cxx
+++ b/sc/source/ui/formdlg/dwfunctr.cxx
@@ -46,38 +46,31 @@
#/
ScFunctionWin::ScFunctionWin(vcl::Window* pParent, const
css::uno::Reference &rFrame)
-: PanelLayout(pParent, "FunctionPanel",
"modules/scalc/ui/functionpanel.ui", rFrame)
+: PanelLayout(pParent, "FunctionPanel",
"modules/scalc/ui/functionpanel.ui", rFrame, true)
+, xCatBox(m_xBuilder->weld_combo_box("category"))
+, xFuncList(m_xBuilder->weld_tree_view("funclist"))
+, xInsertButton(m_xBuilder->weld_button("insert"))
+, xFiFuncDesc(m_xBuilder->weld_label("funcdesc"))
, xConfigListener(new
comphelper::ConfigurationListener("/org.openoffice.Office.Calc/Formula/Syntax"))
,
xConfigChange(std::make_unique(xConfigListener,
this))
, pFuncDesc(nullptr)
{
-get(aCatBox, "category");
-get(aFuncList, "funclist");
-aFuncList->set_height_request(10 * aFuncList->GetTextHeight());
-get(aInsertButton, "insert");
-get(aFiFuncDesc, "funcdesc");
+xFuncList->set_size_request(-1, xFuncList->get_height_rows(10));
InitLRUList();
-aFiFuncDesc->SetUpdateMode(true);
nArgs=0;
-aCatBox->SetDropDownLineCount(9);
-vcl::Font aFont=aFiFuncDesc->GetFont();
-aFont.SetColor(COL_BLACK);
-aFiFuncDesc->SetFont(aFont);
-aFiFuncDesc->SetBackground( GetBackground() ); //! never transparent?
-aFiFuncDesc->set_height_request(5 * aFiFuncDesc->GetTextHeight());
+xFiFuncDesc->set_size_request(-1, 5 * xFiFuncDesc->get_text_height());
-Link aLink=LINK( this, ScFunctionWin, SelHdl);
-aCatBox->SetSelectHdl(aLink);
-aFuncList->SetSelectHdl(aLink);
+xCatBox->connect_changed(LINK( this, ScFunctionWin, SelComboHdl));
+xFuncList->connect_changed(LINK( this, ScFunctionWin, SelTreeHdl));
-aFuncList->SetDoubleClickHdl(LINK( this, ScFunctionWin, SetSelectionHdl));
-aInsertButton->SetClickHdl(LINK( this, ScFunctionWin,
SetSelectionClickHdl));
+xFuncList->connect_row_activated(LINK( this, ScFunctionWin,
SetRowActivatedHdl));
+xInsertButton->connect_clicked(LINK( this, ScFunctionWin,
SetSelectionClickHdl));
-aCatBox->SelectEntryPos(0);
+xCatBox->set_active(0);
-SelHdl(*aCatBox);
+SelComboHdl(*xCatBox);
}
/*
@@ -107,10 +100,10 @@ void ScFunctionWin::dispose()
xConfigListener->dispose();
xConfigListener.clear();
}
-aCatBox.clear();
-aFuncList.clear();
-aInsertButton.clear();
-aFiFuncDesc.clear();
+xCatBox.reset();
+xFuncList.reset();
+xInsertButton.reset();
+xFiFuncDesc.reset();
PanelLayout::dispose();
}
@@ -133,9 +126,9 @@ void ScFunctionWin::InitLRUList()
ScFunctionMgr* pFuncMgr = ScGlobal::GetStarCalcFunctionMgr();
pFuncMgr->fillLastRecentlyUsedFunctions(aLRUList);
-sal_Int32 nSelPos = aCatBox->GetSelectedEntryPos();
+sal_Int32 nSelPos = xCatBox->get_active();
-if(nSelPos == 0)
+if (nSelPos == 0)
UpdateFunctionList();
}
@@ -178,25 +171,20 @@ void ScFunctionWin::UpdateLRUList()
void ScFunctionWin::SetDescription()
{
-aFiFuncDesc->SetText( EMPTY_OUSTRING );
+xFiFuncDesc->set_label(EMPTY_OUSTRING);
const ScFuncDesc* pDesc =
- static_cast(aFuncList->GetEntryData(
-aFuncList->GetSelectedEntryPos() ));
+ reinterpret_cast(xFuncList->get_selected_id().toInt64());
if (pDesc)
{
pDesc->initArgumentInfo(); // full argument info is needed
-OUStringBuffer aBuf(aFuncList->GetSelectedEntry());
+OUStringBuffer aBuf(xFuncList->get_selected_text());
aBuf.append(":\n\n");
aBuf.append(pDesc->GetParamList());
aBuf.append("\n\n");
aBuf.append(*pDesc->mxFuncDesc);
-aFiFuncDesc->SetText(aBuf.makeStringAndClear());
-aFiFuncDesc->StateChanged(StateChangedType::Text);
-aFiFuncDesc->Invalidate();
-aFiFuncDesc->Update();
-
+xF
[Libreoffice-commits] core.git: svx/source
svx/source/stbctrls/selctrl.cxx | 13 +
1 file changed, 13 insertions(+)
New commits:
commit 1e94d803f7a70027d03f1303c19818ca2de0d67f
Author: Aditya
AuthorDate: Wed Dec 18 21:19:50 2019 +0530
Commit: Eike Rathke
CommitDate: Fri Dec 20 18:00:45 2019 +0100
tdf#122280: Hide Block selection mode from Calc
Currently, the Block Selection Mode in pop-up menu is dysfunctional
in Calc. It is unreachable - when the user tries to choose "Block
selection" from the pop-up menu that lies in the status bar, it
shifts back to "Standard selection".
Hide the Block Selection mode from Calc, simply because it is
dysfunctional and useless.
Change-Id: Ib8618b7f0281de13a5f6ef9d35b67330f43c4318
Reviewed-on: https://gerrit.libreoffice.org/84142
Tested-by: Jenkins
Reviewed-by: Eike Rathke
diff --git a/svx/source/stbctrls/selctrl.cxx b/svx/source/stbctrls/selctrl.cxx
index 6bb61c549c02..7d8ec66ff8ca 100644
--- a/svx/source/stbctrls/selctrl.cxx
+++ b/svx/source/stbctrls/selctrl.cxx
@@ -31,6 +31,8 @@
#include
#include
+#include
+#include
SFX_IMPL_STATUSBAR_CONTROL(SvxSelectionModeControl, SfxUInt16Item);
@@ -48,6 +50,7 @@ public:
OUString GetItemTextForState(sal_uInt16 nState) { return
m_xMenu->GetItemText(state_to_id(nState)); }
sal_uInt16 GetState() const { return
id_to_state(m_xMenu->GetCurItemIdent()); }
sal_uInt16 Execute(vcl::Window* pWindow, const Point& rPopupPos) { return
m_xMenu->Execute(pWindow, rPopupPos); }
+void HideSelectionType(const OString& rIdent) {
m_xMenu->HideItem(m_xMenu->GetItemId(rIdent)); }
};
}
@@ -112,6 +115,16 @@ bool SvxSelectionModeControl::MouseButtonDown( const
MouseEvent& rEvt )
SelectionTypePopup aPop(mnState);
StatusBar& rStatusbar = GetStatusBar();
+// Check if Calc is opened; if true, hide block selection mode tdf#122280
+const css::uno::Reference < css::frame::XModel > xModel =
m_xFrame->getController()->getModel();
+css::uno::Reference< css::lang::XServiceInfo > xServices( xModel,
css::uno::UNO_QUERY );
+if ( xServices.is() )
+{
+bool bSpecModeCalc =
xServices->supportsService("com.sun.star.sheet.SpreadsheetDocument");
+if (bSpecModeCalc)
+aPop.HideSelectionType("block");
+}
+
if (rEvt.IsMiddle() && aPop.Execute(&rStatusbar, rEvt.GetPosPixel()))
{
sal_uInt16 nNewState = aPop.GetState();
___
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' - sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/tdf87569_drawingml.docx |binary
sw/qa/extras/ooxmlexport/data/tdf87569_vml.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport14.cxx| 20 ++
writerfilter/source/dmapper/DomainMapper.cxx | 15 +
writerfilter/source/dmapper/GraphicImport.cxx |9
5 files changed, 44 insertions(+)
New commits:
commit b83d394a16a9a93b314f20ea8fb2ccbb99d9d07f
Author: Bakos Attila
AuthorDate: Sat Dec 14 12:36:13 2019 +0100
Commit: László Németh
CommitDate: Fri Dec 20 17:59:14 2019 +0100
tdf#87569 tdf#109411 DOCX import: fix shape anchor in tables
Import "relative from page" horizontal setting of
VML and DrawingML shapes as "relative from column"
in tables, just as MSO handles it.
Change-Id: If71f2e52bbba324a98651e701feaeb99acfefc48
Reviewed-on: https://gerrit.libreoffice.org/85141
Tested-by: Jenkins
Reviewed-by: László Németh
Reviewed-on: https://gerrit.libreoffice.org/85572
diff --git a/sw/qa/extras/ooxmlexport/data/tdf87569_drawingml.docx
b/sw/qa/extras/ooxmlexport/data/tdf87569_drawingml.docx
new file mode 100644
index ..7f00a46e2cc6
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/tdf87569_drawingml.docx differ
diff --git a/sw/qa/extras/ooxmlexport/data/tdf87569_vml.docx
b/sw/qa/extras/ooxmlexport/data/tdf87569_vml.docx
new file mode 100644
index ..0223ad71d4e2
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf87569_vml.docx
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
index 1c4d89028fbd..2271aa413dd6 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
@@ -15,6 +15,7 @@
#include
#include
#include
+#include
class Test : public SwModelTestBase
{
@@ -31,6 +32,25 @@ protected:
}
};
+DECLARE_OOXMLEXPORT_TEST(testTdf87569v, "tdf87569_vml.docx")
+{
+//the original tdf87569 sample has vml shapes...
+uno::Reference xShapeProperties(getShape(1),
uno::UNO_QUERY);
+sal_Int16 nValue;
+xShapeProperties->getPropertyValue("HoriOrientRelation") >>= nValue;
+CPPUNIT_ASSERT_EQUAL_MESSAGE("tdf87569_vml: The Shape is not in the
table!",
+ text::RelOrientation::FRAME, nValue);
+}
+
+DECLARE_OOXMLEXPORT_TEST(testTdf87569d, "tdf87569_drawingml.docx")
+{
+//if the original tdf87569 sample is upgraded it will have drawingml
shapes...
+uno::Reference xShapeProperties(getShape(1),
uno::UNO_QUERY);
+sal_Int16 nValue;
+xShapeProperties->getPropertyValue("HoriOrientRelation") >>= nValue;
+CPPUNIT_ASSERT_EQUAL_MESSAGE("tdf87569_drawingml: The Shape is not in the
table!",
+ text::RelOrientation::FRAME, nValue);
+}
DECLARE_OOXMLEXPORT_TEST(testTdf120315, "tdf120315.docx")
{
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 16d42193ac6a..5417b6a05e0b 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -3035,6 +3035,21 @@ void
DomainMapper::lcl_startShape(uno::Reference const& xShape)
m_pImpl->PushPendingShape(xShape);
m_pImpl->SetIsFirstParagraphInShape(true);
+
+//tdf#87569: Fix table layout with correcting anchoring
+//If anchored object is in table, Word calculates its position from cell
border
+//instead of page (what is set in the sample document)
+if (m_pImpl->m_nTableDepth > 0) //if we had a table
+{
+uno::Reference xShapePropSet(xShape,
uno::UNO_QUERY);
+sal_Int16 nCurrentHorOriRel; //A temp variable for storaging the
current setting
+xShapePropSet->getPropertyValue("HoriOrientRelation") >>=
nCurrentHorOriRel;
+//and the correction:
+if (nCurrentHorOriRel == text::RelOrientation::PAGE_FRAME)
+xShapePropSet->setPropertyValue("HoriOrientRelation",
+
uno::makeAny(text::RelOrientation::FRAME));
+}
+
}
void DomainMapper::lcl_endShape( )
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx
b/writerfilter/source/dmapper/GraphicImport.cxx
index 33275d9f0d55..da2b9ce04ef4 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -860,6 +860,15 @@ void GraphicImport::lcl_attribute(Id nName, Value& rValue)
if (nRotation)
xShapeProps->setPropertyValue("RotateAngle",
uno::makeAny(nRotation));
}
+
+//tdf#109411 If anchored object is in table, Word
calculates its position from cell border
+//instead of page (what is set in the sample document)
+if (m_pImpl->rDomainMapper.IsInTable() &&
+m_pImpl->n
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/rtfexport/data/tdf129513.rtf |4
sw/qa/extras/rtfexport/rtfexport5.cxx | 11 +++
writerfilter/source/rtftok/rtfdispatchflag.cxx |1 -
3 files changed, 15 insertions(+), 1 deletion(-)
New commits:
commit 989043b0644354b92fd17e4194897c2eb0935031
Author: Mike Kaganski
AuthorDate: Fri Dec 20 16:07:00 2019 +0300
Commit: Mike Kaganski
CommitDate: Fri Dec 20 17:56:44 2019 +0100
tdf#129513: drop incorrect and redundant erasure of paragraph sprm
It was introduced in commit 2499397cb39330dabeb8b7b3e0d7eb6213a0d8f4
"avoid sending duplicated paragraph flags", and supposedly was meant
to avoid having duplicating sprms in the collected properties, when
new properties were pushed back at that time. Using specific sprm id
was likely a mistake (nParam should have been used instead).
Now the new sprm is added using RTFSprms::set with eOverwrite having
default value of RTFOverwrite::YES, which takes care to avoid dupes,
so the call to erase is redundant.
This reverts commit 2499397cb39330dabeb8b7b3e0d7eb6213a0d8f4.
Change-Id: Ied19f6feb41bd17ef317812d4d295ca0542a5843
Reviewed-on: https://gerrit.libreoffice.org/85602
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/sw/qa/extras/rtfexport/data/tdf129513.rtf
b/sw/qa/extras/rtfexport/data/tdf129513.rtf
new file mode 100644
index ..cc39953491d9
--- /dev/null
+++ b/sw/qa/extras/rtfexport/data/tdf129513.rtf
@@ -0,0 +1,4 @@
+{\rtf1
+\trowd\cellx2000\pard\intbl\pagebb
+In table
+\cell\row\pard\par }
\ No newline at end of file
diff --git a/sw/qa/extras/rtfexport/rtfexport5.cxx
b/sw/qa/extras/rtfexport/rtfexport5.cxx
index 3b6af8c6801f..24553a0c2538 100644
--- a/sw/qa/extras/rtfexport/rtfexport5.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport5.cxx
@@ -1164,6 +1164,17 @@ DECLARE_RTFEXPORT_TEST(testTdf128320, "tdf128320.odt")
CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), nPos);
}
+DECLARE_RTFEXPORT_TEST(testTdf129513, "tdf129513.rtf")
+{
+// \pagebb after \intbl must not reset the "in table" flag
+CPPUNIT_ASSERT_EQUAL(2, getParagraphs());
+// Make sure the first paragraph is imported in table
+uno::Reference xTable(getParagraphOrTable(1),
uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTable->getCellNames().getLength());
+uno::Reference xCell(xTable->getCellByName("A1"),
uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_EQUAL(OUString("In table"), xCell->getString());
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/rtftok/rtfdispatchflag.cxx
b/writerfilter/source/rtftok/rtfdispatchflag.cxx
index 0c39866cd8df..894716b2897c 100644
--- a/writerfilter/source/rtftok/rtfdispatchflag.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchflag.cxx
@@ -431,7 +431,6 @@ RTFError RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
if (nParam >= 0)
{
auto pValue = new RTFValue(1);
-m_aStates.top().getParagraphSprms().erase(NS_ooxml::LN_inTbl);
m_aStates.top().getParagraphSprms().set(nParam, pValue);
return RTFError::OK;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/accessibilitycheck' - 4 commits - include/svx include/tools svx/source svx/uiconfig sw/qa sw/source tools/source vcl/inc vcl/Library_vcl.mk vcl/source
include/svx/AccessibilityCheck.hxx | 23 +
include/svx/AccessibilityCheckDialog.hxx | 14 -
include/tools/XmlWriter.hxx |2
svx/source/dialog/AccessibilityCheckDialog.cxx | 18 +
svx/uiconfig/ui/accessibilitycheckentry.ui | 14 +
sw/qa/core/accessibilitycheck/AccessibilityCheckTest.cxx |6
sw/source/core/access/AccessibilityCheck.cxx | 99 +++-
sw/source/core/inc/AccessibilityCheck.hxx| 12 +
tools/source/xml/XmlWriter.cxx | 11
vcl/Library_vcl.mk |1
vcl/inc/pdf/XmpMetadata.hxx | 48
vcl/source/gdi/pdfwriter_impl.cxx| 150 ++--
vcl/source/gdi/pdfwriter_impl.hxx|4
vcl/source/pdf/XmpMetadata.cxx | 175 +++
14 files changed, 380 insertions(+), 197 deletions(-)
New commits:
commit adf3e5cb73cdd0846ad17c22cdf48b646ca51b0a
Author: Tomaž Vajngerl
AuthorDate: Fri Dec 20 12:12:35 2019 +0100
Commit: Tomaž Vajngerl
CommitDate: Fri Dec 20 12:12:35 2019 +0100
acc. check: add "goto" button to see the acc. issue in document
This adds the UI for the goto functionality to the UI, but
currently no goto implementation to jump to the specific issue
area in the document is written.
Change-Id: I5b326a000e62231c491c179b1ff8accde15e1e98
diff --git a/include/svx/AccessibilityCheck.hxx
b/include/svx/AccessibilityCheck.hxx
index db66ccb24fd4..ba4b01d9d6a5 100644
--- a/include/svx/AccessibilityCheck.hxx
+++ b/include/svx/AccessibilityCheck.hxx
@@ -37,6 +37,7 @@ public:
{
}
virtual ~AccessibilityCheckResult() {}
+virtual void gotoIssue() const = 0;
};
class SVX_DLLPUBLIC AccessibilityCheckResultCollection
diff --git a/include/svx/AccessibilityCheckDialog.hxx
b/include/svx/AccessibilityCheckDialog.hxx
index 4b602a911a42..10a9a1803ad6 100644
--- a/include/svx/AccessibilityCheckDialog.hxx
+++ b/include/svx/AccessibilityCheckDialog.hxx
@@ -27,6 +27,7 @@ private:
std::unique_ptr m_xBuilder;
std::unique_ptr m_xContainer;
std::unique_ptr m_xLabel;
+std::unique_ptr m_xGotoButton;
std::shared_ptr const&
m_rAccessibilityCheckResult;
@@ -35,6 +36,8 @@ public:
weld::Container* pParent, weld::Window* pDialog,
std::shared_ptr const&
rAccessibilityCheckResult);
weld::Widget* get_widget() const { return m_xContainer.get(); }
+
+DECL_LINK(GotoButtonClicked, weld::Button&, void);
};
class SVX_DLLPUBLIC AccessibilityCheckDialog final : public
weld::GenericDialogController
diff --git a/svx/source/dialog/AccessibilityCheckDialog.cxx
b/svx/source/dialog/AccessibilityCheckDialog.cxx
index f6add929e351..e88ca36ebb89 100644
--- a/svx/source/dialog/AccessibilityCheckDialog.cxx
+++ b/svx/source/dialog/AccessibilityCheckDialog.cxx
@@ -20,12 +20,19 @@ AccessibilityCheckEntry::AccessibilityCheckEntry(
, m_xBuilder(Application::CreateBuilder(pParent,
"svx/ui/accessibilitycheckentry.ui"))
, m_xContainer(m_xBuilder->weld_container("accessibilityCheckEntryBox"))
, m_xLabel(m_xBuilder->weld_label("accessibilityCheckEntryLabel"))
+,
m_xGotoButton(m_xBuilder->weld_button("accessibilityCheckEntryGotoButton"))
, m_rAccessibilityCheckResult(rAccessibilityCheckResult)
{
m_xLabel->set_label(m_rAccessibilityCheckResult->m_aIssueText);
+m_xGotoButton->connect_clicked(LINK(this, AccessibilityCheckEntry,
GotoButtonClicked));
m_xContainer->show();
}
+IMPL_LINK_NOARG(AccessibilityCheckEntry, GotoButtonClicked, weld::Button&,
void)
+{
+m_rAccessibilityCheckResult->gotoIssue();
+}
+
AccessibilityCheckDialog::AccessibilityCheckDialog(
weld::Window* pParent,
AccessibilityCheckResultCollection const&
rAccessibilityCheckResultCollection)
diff --git a/svx/uiconfig/ui/accessibilitycheckentry.ui
b/svx/uiconfig/ui/accessibilitycheckentry.ui
index bfd013491e51..4a4633eb3f14 100644
--- a/svx/uiconfig/ui/accessibilitycheckentry.ui
+++ b/svx/uiconfig/ui/accessibilitycheckentry.ui
@@ -10,7 +10,9 @@
True
False
+True
True
+0
False
@@ -19,7 +21,17 @@
-
+
+Goto
Issue
+True
+True
+True
+
+
+False
+False
+1
+
diff --git a/sw/source/core/inc/AccessibilityCheck.hxx
b/sw/source/core/inc/AccessibilityCheck.hxx
index 0ce80bf49f45..05a88a3a4975 100644
--- a/sw/source/core/inc/AccessibilityCheck.hxx
+++ b/sw/source/core/inc/AccessibilityCheck.hxx
@@ -24,6 +24,8 @@ public:
: svx::AccessibilityCheckResult(eIssueID)
{
}
+
+void gotoIssue() const override {}
};
class SW_DLLPUBLIC AccessibilityCheck final : public svx::AccessibilityCheck
commit 8dc74a8f95
[Libreoffice-commits] core.git: chart2/source sd/source
chart2/source/controller/sidebar/ChartTypePanel.hxx |4
sd/source/ui/table/TableDesignPane.cxx |1 -
2 files changed, 5 deletions(-)
New commits:
commit 270facec104ed1e0e4503de9391a29ae4c8b7dfd
Author: Caolán McNamara
AuthorDate: Fri Dec 20 12:35:31 2019 +
Commit: Caolán McNamara
CommitDate: Fri Dec 20 17:40:46 2019 +0100
unneeded forward declares
Change-Id: I734f53439c30c80fb45d3b7e4281887d636b90c6
Reviewed-on: https://gerrit.libreoffice.org/85600
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/chart2/source/controller/sidebar/ChartTypePanel.hxx
b/chart2/source/controller/sidebar/ChartTypePanel.hxx
index 867d3003541b..7882bdc0a14d 100644
--- a/chart2/source/controller/sidebar/ChartTypePanel.hxx
+++ b/chart2/source/controller/sidebar/ChartTypePanel.hxx
@@ -22,7 +22,6 @@
#include
#include
#include
-//#include
#include "ChartSidebarModifyListener.hxx"
#include
#include
@@ -47,9 +46,6 @@ namespace weld
class CustomWeld;
}
-class ListBox;
-class ValueSet;
-
namespace chart
{
class ChartController;
diff --git a/sd/source/ui/table/TableDesignPane.cxx
b/sd/source/ui/table/TableDesignPane.cxx
index a9204c29c3df..90ec60845e31 100644
--- a/sd/source/ui/table/TableDesignPane.cxx
+++ b/sd/source/ui/table/TableDesignPane.cxx
@@ -28,7 +28,6 @@
#include
#include
#include
-#include
#include
#include
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extras/source include/svtools sd/source sd/uiconfig solenv/bin
extras/source/glade/libreoffice-catalog.xml.in |3
include/svtools/valueset.hxx |4 +
sd/source/ui/table/TableDesignPane.cxx | 92 -
sd/source/ui/table/TableDesignPane.hxx | 30
sd/uiconfig/simpress/ui/tabledesignpanel.ui| 25 +-
solenv/bin/native-code.py |1
6 files changed, 91 insertions(+), 64 deletions(-)
New commits:
commit a9f116527351a2e3fccee6152afb58c89226d0b2
Author: Caolán McNamara
AuthorDate: Fri Dec 20 12:02:33 2019 +
Commit: Caolán McNamara
CommitDate: Fri Dec 20 17:40:33 2019 +0100
weld TableDesignPane
Change-Id: Ia5a83df5e509f899ec9248272c9b9fb43df7
Reviewed-on: https://gerrit.libreoffice.org/85599
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/extras/source/glade/libreoffice-catalog.xml.in
b/extras/source/glade/libreoffice-catalog.xml.in
index 318bee73db31..0b645e40484a 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -86,9 +86,6 @@
-
get(m_pValueSet, "previews");
-m_pValueSet->SetStyle(m_pValueSet->GetStyle() | WB_NO_DIRECTSELECT |
WB_FLATVALUESET | WB_ITEMBORDER);
-m_pValueSet->SetExtraSpacing(8);
-m_pValueSet->setModal(false);
-m_pValueSet->SetColor();
-m_pValueSet->SetSelectHdl (LINK(this, TableDesignWidget, implValueSetHdl));
+m_xValueSet->SetStyle(m_xValueSet->GetStyle() | WB_NO_DIRECTSELECT |
WB_FLATVALUESET | WB_ITEMBORDER);
+m_xValueSet->SetExtraSpacing(8);
+m_xValueSet->setModal(false);
+m_xValueSet->SetColor();
+m_xValueSet->SetSelectHdl(LINK(this, TableDesignWidget, implValueSetHdl));
for (sal_uInt16 i = CB_HEADER_ROW; i <= CB_BANDED_COLUMNS; ++i)
{
-pParent->get(m_aCheckBoxes[i], OString(gPropNames[i].data,
gPropNames[i].size));
-m_aCheckBoxes[i]->SetClickHdl( LINK( this, TableDesignWidget,
implCheckBoxHdl ) );
+m_aCheckBoxes[i] =
rBuilder.weld_check_button(OString(gPropNames[i].data, gPropNames[i].size));
+m_aCheckBoxes[i]->connect_toggled(LINK(this, TableDesignWidget,
implCheckBoxHdl));
}
// get current controller and initialize listeners
@@ -141,7 +142,7 @@ static SfxDispatcher* getDispatcher( ViewShellBase const &
rBase )
return nullptr;
}
-IMPL_LINK_NOARG(TableDesignWidget, implValueSetHdl, ValueSet*, void)
+IMPL_LINK_NOARG(TableDesignWidget, implValueSetHdl, SvtValueSet*, void)
{
ApplyStyle();
}
@@ -151,7 +152,7 @@ void TableDesignWidget::ApplyStyle()
try
{
OUString sStyleName;
-sal_Int32 nIndex = static_cast< sal_Int32 >(
m_pValueSet->GetSelectedItemId() ) - 1;
+sal_Int32 nIndex = static_cast< sal_Int32 >(
m_xValueSet->GetSelectedItemId() ) - 1;
if( (nIndex >= 0) && (nIndex < mxTableFamily->getCount()) )
{
@@ -196,7 +197,7 @@ void TableDesignWidget::ApplyStyle()
}
}
-IMPL_LINK_NOARG(TableDesignWidget, implCheckBoxHdl, Button*, void)
+IMPL_LINK_NOARG(TableDesignWidget, implCheckBoxHdl, weld::ToggleButton&, void)
{
ApplyOptions();
FillDesignPreviewControl();
@@ -217,7 +218,7 @@ void TableDesignWidget::ApplyOptions()
for( sal_uInt16 i = CB_HEADER_ROW; i <= CB_BANDED_COLUMNS; ++i )
{
-aReq.AppendItem( SfxBoolItem( gParamIds[i],
m_aCheckBoxes[i]->IsChecked() ) );
+aReq.AppendItem( SfxBoolItem( gParamIds[i],
m_aCheckBoxes[i]->get_active() ) );
}
SdrView* pView = mrBase.GetDrawView();
@@ -279,12 +280,12 @@ void TableDesignWidget::onSelectionChanged()
void TableValueSet::Resize()
{
-ValueSet::Resize();
+SvtValueSet::Resize();
// Calculate the number of rows and columns.
if( GetItemCount() <= 0 )
return;
-Size aValueSetSize = GetSizePixel();
+Size aValueSetSize = GetOutputSizePixel();
Image aImage = GetItemImage(GetItemId(0));
Size aItemSize = aImage.GetSizePixel();
@@ -314,13 +315,13 @@ void TableValueSet::Resize()
}
}
-TableValueSet::TableValueSet(Window *pParent, WinBits nStyle)
-: ValueSet(pParent, nStyle)
+TableValueSet::TableValueSet(std::unique_ptr
pScrolledWindow)
+: SvtValueSet(std::move(pScrolledWindow))
, m_bModal(false)
{
}
-void TableValueSet::DataChanged( const DataChangedEvent& /*rDCEvt*/ )
+void TableValueSet::StyleUpdated()
{
updateSettings();
}
@@ -329,14 +330,12 @@ void TableValueSet::updateSettings()
{
if( !m_bModal )
{
-SetBackground( GetSettings().GetStyleSettings().GetWindowColor() );
-SetColor( GetSettings().GetStyleSettings().GetWindowColor() );
+Color aColor =
Application::GetSettings().GetStyleSettings().GetWindowColor();
+SetColor(aColor);
SetExtraSpacing(8);
}
}
-VCL_BUILDER_FACTORY_CONSTRUCTOR(TableValueSet, WB_TABSTOP)
-
void TableDesignWidget::updateControls()
{
static const bool gDefaults[CB_C
Sıla Genç license statement
All of my past & future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sd/source
sd/source/ui/inc/RemoteServer.hxx |2 --
sd/source/ui/remotecontrol/BufferedStreamSocket.hxx |1 -
sd/source/ui/remotecontrol/Communicator.hxx |1 -
sd/source/ui/remotecontrol/ZeroconfService.hxx |2 --
4 files changed, 6 deletions(-)
New commits:
commit 44c025aa1ec366109163f6816ffabdc26f6cff00
Author: Noel Grandin
AuthorDate: Wed Dec 18 14:15:44 2019 +0200
Commit: Noel Grandin
CommitDate: Fri Dec 20 17:27:45 2019 +0100
loplugin:duplicate-defines
the same define in 4 different files, but not actually used anywhere
Change-Id: Ia50e6f357f1439d387cdd3d1f143e020500b9cd6
Reviewed-on: https://gerrit.libreoffice.org/85567
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sd/source/ui/inc/RemoteServer.hxx
b/sd/source/ui/inc/RemoteServer.hxx
index cd8fa1a0ad24..0258eaada128 100644
--- a/sd/source/ui/inc/RemoteServer.hxx
+++ b/sd/source/ui/inc/RemoteServer.hxx
@@ -27,8 +27,6 @@ namespace com { namespace sun { namespace star { namespace
uno { template
#include
-#define CHARSET RTL_TEXTENCODING_UTF8
#define MAX_LINE_LENGTH 2
namespace sd
diff --git a/sd/source/ui/remotecontrol/Communicator.hxx
b/sd/source/ui/remotecontrol/Communicator.hxx
index e32598912899..4026808e68ac 100644
--- a/sd/source/ui/remotecontrol/Communicator.hxx
+++ b/sd/source/ui/remotecontrol/Communicator.hxx
@@ -18,7 +18,6 @@ namespace com { namespace sun { namespace star { namespace
uno { template https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/inc
sd/inc/app.hrc |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit f7817d988c6251fd42433c1f4886b7f8270a24ff Author: Noel Grandin AuthorDate: Wed Dec 18 14:16:02 2019 +0200 Commit: Noel Grandin CommitDate: Fri Dec 20 17:03:36 2019 +0100 loplugin:duplicate-defines Change-Id: Ic98501b755fee242bf40d4e60b2116fe500522e6 Reviewed-on: https://gerrit.libreoffice.org/85568 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc index 9c4f8f73a0a0..450bc35195fa 100644 --- a/sd/inc/app.hrc +++ b/sd/inc/app.hrc @@ -155,7 +155,7 @@ #define SID_STATUS_PAGE (SID_SD_START+86) #define SID_STATUS_LAYOUT (SID_SD_START+87) #define SID_STATUS_SELMODE (SID_SD_START+88) -#define SID_MODIFIED TypedWhichId(SID_SD_START+89) +// In sfxsids.hrc: SID_MODIFIED TypedWhichId(SID_SD_START+89) #define SID_OBJECT_CROOK_ROTATE (SID_SD_START+90) #define SID_OBJECT_CROOK_SLANT (SID_SD_START+91) #define SID_OBJECT_CROOK_STRETCH(SID_SD_START+92) @@ -165,7 +165,7 @@ // In svxids.hrc: SID_ENTER_GROUP (SID_SD_START+96) // In svxids.hrc: SID_LEAVE_GROUP (SID_SD_START+97) // In svxids.hrc: SID_SIZE_PAGE_WIDTH (SID_SD_START+98) -#define SID_SIZE_OPTIMAL(SID_SD_START+99) +// In sfxsids.hrc: SID_SIZE_OPTIMAL (SID_SD_START+99) #define SID_OBJECT_TRANSPARENCE (SID_SD_START+100) #define SID_OBJECT_GRADIENT (SID_SD_START+101) // FREE ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/unocore/unosett.cxx | 21 ++---
1 file changed, 10 insertions(+), 11 deletions(-)
New commits:
commit 339d10ba07604c5b9e6bf6e26f7e059eeda36b36
Author: Noel Grandin
AuthorDate: Wed Dec 18 11:16:57 2019 +0200
Commit: Noel Grandin
CommitDate: Fri Dec 20 17:03:19 2019 +0100
loplugin:duplicate-defines
WID_NUMBERING_TYPE was duplicated, so just move all of the WIDs
together, so it's easier to see when they overlap
Change-Id: I5c61efc40f52fae88a3bfa950e50af325155c849
Reviewed-on: https://gerrit.libreoffice.org/85564
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sw/source/core/unocore/unosett.cxx
b/sw/source/core/unocore/unosett.cxx
index b7658b949927..0cddeacbf68c 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -107,6 +107,16 @@ namespace
#define WID_END_NOTICE 9
#define WID_BEGIN_NOTICE10
#define WID_ANCHOR_CHARACTER_STYLE 11
+#define WID_NUM_ON 12
+#define WID_SEPARATOR_INTERVAL 13
+#define WID_NUMBER_POSITION 14
+#define WID_DISTANCE15
+#define WID_INTERVAL16
+#define WID_SEPARATOR_TEXT 17
+#define WID_COUNT_EMPTY_LINES 18
+#define WID_COUNT_LINES_IN_FRAMES 19
+#define WID_RESTART_AT_EACH_PAGE20
+
static const SfxItemPropertySet* GetFootnoteSet()
{
@@ -164,17 +174,6 @@ static const SfxItemPropertySet* GetNumberingRulesSet()
return &aNumberingRulesSet_Impl;
}
-#define WID_NUM_ON 0
-#define WID_SEPARATOR_INTERVAL 1
-#define WID_NUMBERING_TYPE 2
-#define WID_NUMBER_POSITION 3
-#define WID_DISTANCE4
-#define WID_INTERVAL5
-#define WID_SEPARATOR_TEXT 6
-#define WID_COUNT_EMPTY_LINES 8
-#define WID_COUNT_LINES_IN_FRAMES 9
-#define WID_RESTART_AT_EACH_PAGE10
-
static const SfxItemPropertySet* GetLineNumberingSet()
{
static const SfxItemPropertyMapEntry aLineNumberingMap_Impl[] =
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/uiconfig sd/UIConfig_simpress.mk
sd/UIConfig_simpress.mk |1 sd/uiconfig/simpress/ui/tabledesignpanelhorizontal.ui | 142 -- 2 files changed, 143 deletions(-) New commits: commit db51c684d1cab3d5317f42af4bc8c84f91f541f3 Author: Caolán McNamara AuthorDate: Fri Dec 20 11:59:43 2019 + Commit: Caolán McNamara CommitDate: Fri Dec 20 17:00:48 2019 +0100 unused tabledesignpanelhorizontal.ui since... commit 3df141b2084d3abc1587ef24d2b371b779bb3d50 Date: Fri Apr 12 12:19:04 2019 +0200 loplugin:unusedmethods Change-Id: I216a0cb15169c13561d62b132fc0940dc96ba6e0 Reviewed-on: https://gerrit.libreoffice.org/85596 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/sd/UIConfig_simpress.mk b/sd/UIConfig_simpress.mk index b5e62f9b67d8..aecdecff39ed 100644 --- a/sd/UIConfig_simpress.mk +++ b/sd/UIConfig_simpress.mk @@ -151,7 +151,6 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/simpress,\ sd/uiconfig/simpress/ui/slidetransitionspanel \ sd/uiconfig/simpress/ui/slidetransitionspanelhorizontal \ sd/uiconfig/simpress/ui/tabledesignpanel \ - sd/uiconfig/simpress/ui/tabledesignpanelhorizontal \ sd/uiconfig/simpress/ui/templatedialog \ )) diff --git a/sd/uiconfig/simpress/ui/tabledesignpanelhorizontal.ui b/sd/uiconfig/simpress/ui/tabledesignpanelhorizontal.ui deleted file mode 100644 index 63fc87ea8fd8.. --- a/sd/uiconfig/simpress/ui/tabledesignpanelhorizontal.ui +++ /dev/null @@ -1,142 +0,0 @@ - - - - - - -True -False -True -vertical -12 - - -70 -True -False - - -True -False -True - - -False -True -0 - - - - -True -False -True -6 -6 -True - - -_Header row -True -True -False -True -0 -True - - -0 -0 - - - - -Tot_al row -True -True -False -True -0 -True - - -0 -1 - - - - -_Banded rows -True -True -False -True -0 -True - - -1 -0 - - - - -Ba_nded columns -True -True -False -True -0 -True - - -1 -1 - - - - -Fi_rst column -True -True -False -True -0 -True - - -2 -0 - - - - -_Last column -True -True -False -True -0 -True - - -2 -1 - - - - -False -True -1 - - - - -False -True -0 - - - - ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extras/source solenv/bin svtools/source
extras/source/glade/libreoffice-catalog.xml.in |3 ---
solenv/bin/native-code.py |1 -
svtools/source/control/valueset.cxx|4
3 files changed, 8 deletions(-)
New commits:
commit 17ba74220dd387f09725b113eac23dc0e3303b17
Author: Caolán McNamara
AuthorDate: Fri Dec 20 11:32:12 2019 +
Commit: Caolán McNamara
CommitDate: Fri Dec 20 16:53:35 2019 +0100
no svtlo-ValueSet used in .ui anymore
Change-Id: I1c80b45d4b2a1f4906a6fb4af88dda479afc1b59
Reviewed-on: https://gerrit.libreoffice.org/85595
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/extras/source/glade/libreoffice-catalog.xml.in
b/extras/source/glade/libreoffice-catalog.xml.in
index 7d013169a633..318bee73db31 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -83,9 +83,6 @@
-
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 1058ed2ce2af..8b5dee4022d0 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -510,7 +510,6 @@ custom_widgets = [
'SwNavHelpToolBox',
'TableValueSet',
'TemplateDefaultView',
-'ValueSet',
]
def get_constructor_guard(constructor):
diff --git a/svtools/source/control/valueset.cxx
b/svtools/source/control/valueset.cxx
index 946c27a6d957..8df48ebf6a9a 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -20,7 +20,6 @@
#include
#include
#include
-#include
#include
#include
#include
@@ -98,9 +97,6 @@ ValueSet::ValueSet( vcl::Window* pParent, WinBits nWinStyle )
:
ImplInitSettings( true, true, true );
}
-
-VCL_BUILDER_FACTORY_CONSTRUCTOR(ValueSet, WB_TABSTOP)
-
ValueSet::~ValueSet()
{
disposeOnce();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svtools svtools/source svx/source svx/uiconfig
include/svtools/valueset.hxx |3
svtools/source/control/valueset.cxx |8 ++
svx/source/inc/DefaultShapesPanel.hxx| 41 ++
svx/source/sidebar/shapes/DefaultShapesPanel.cxx | 88 ++-
svx/uiconfig/ui/defaultshapespanel.ui| 35 +
5 files changed, 110 insertions(+), 65 deletions(-)
New commits:
commit 1af23f2679b34f0631cf77d457ed4da3836ab214
Author: Caolán McNamara
AuthorDate: Fri Dec 20 11:30:07 2019 +
Commit: Caolán McNamara
CommitDate: Fri Dec 20 16:53:21 2019 +0100
weld DefaultShapesPanel
Change-Id: I7bdd1e15f525fad99394f4ca4360bf7e1339b33a
Reviewed-on: https://gerrit.libreoffice.org/85594
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx
index eb3ad8d80cf8..cc56488e4c01 100644
--- a/include/svtools/valueset.hxx
+++ b/include/svtools/valueset.hxx
@@ -429,7 +429,7 @@ private:
sal_uInt16 mnFirstLine;
sal_uInt16 mnSpacing;
DrawFrameStyle mnFrameStyle;
-Color const maColor;
+Color maColor;
OUStringmaText;
WinBits mnStyle;
Link maDoubleClickHdl;
@@ -553,6 +553,7 @@ public:
void* GetItemData( sal_uInt16 nItemId ) const;
voidSetItemText( sal_uInt16 nItemId, const OUString& rStr );
OUStringGetItemText( sal_uInt16 nItemId ) const;
+voidSetColor( const Color& rColor );
boolIsColor() const
{
return maColor.GetTransparency() == 0;
diff --git a/svtools/source/control/valueset.cxx
b/svtools/source/control/valueset.cxx
index 6b8802ac159a..946c27a6d957 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -3981,4 +3981,12 @@ Image SvtValueSet::GetItemImage(sal_uInt16 nItemId) const
return Image();
}
+void SvtValueSet::SetColor(const Color& rColor)
+{
+maColor = rColor;
+mbFormat = true;
+if (IsReallyVisible() && IsUpdateMode())
+Invalidate();
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/inc/DefaultShapesPanel.hxx
b/svx/source/inc/DefaultShapesPanel.hxx
index 6c7f7c99735e..1b3f036dabcb 100644
--- a/svx/source/inc/DefaultShapesPanel.hxx
+++ b/svx/source/inc/DefaultShapesPanel.hxx
@@ -19,13 +19,10 @@
#ifndef INCLUDED_SVX_SOURCE_INC_DEFAULTSHAPESPANEL_HXX
#define INCLUDED_SVX_SOURCE_INC_DEFAULTSHAPESPANEL_HXX
-#include
#include
-
-#include
#include
-#include
#include
+#include
#include "ShapesUtil.hxx"
using namespace css;
@@ -50,25 +47,35 @@ public:
virtual void dispose() override;
private:
-VclPtr mpLineArrowSet;
-VclPtr mpCurveSet;
-VclPtr mpConnectorSet;
-VclPtr mpBasicShapeSet;
-VclPtr mpSymbolShapeSet;
-VclPtr mpBlockArrowSet;
-VclPtr mpFlowchartSet;
-VclPtr mpCalloutSet;
-VclPtr mpStarSet;
-VclPtr mp3DObjectSet;
+std::unique_ptr mxLineArrowSet;
+std::unique_ptr mxLineArrowSetWin;
+std::unique_ptr mxCurveSet;
+std::unique_ptr mxCurveSetWin;
+std::unique_ptr mxConnectorSet;
+std::unique_ptr mxConnectorSetWin;
+std::unique_ptr mxBasicShapeSet;
+std::unique_ptr mxBasicShapeSetWin;
+std::unique_ptr mxSymbolShapeSet;
+std::unique_ptr mxSymbolShapeSetWin;
+std::unique_ptr mxBlockArrowSet;
+std::unique_ptr mxBlockArrowSetWin;
+std::unique_ptr mxFlowchartSet;
+std::unique_ptr mxFlowchartSetWin;
+std::unique_ptr mxCalloutSet;
+std::unique_ptr mxCalloutSetWin;
+std::unique_ptr mxStarSet;
+std::unique_ptr mxStarSetWin;
+std::unique_ptr mx3DObjectSet;
+std::unique_ptr mx3DObjectSetWin;
+
Reference< XFrame > mxFrame;
-std::map, std::map> mpShapesSetMap;
+std::map> mpShapesSetMap;
void populateShapes();
void Initialize();
-DECL_LINK( ShapeSelectHdl, ValueSet*, void );
+DECL_LINK( ShapeSelectHdl, SvtValueSet*, void );
};
-
} } // end of namespace sd::sidebar
#endif
diff --git a/svx/source/sidebar/shapes/DefaultShapesPanel.cxx
b/svx/source/sidebar/shapes/DefaultShapesPanel.cxx
index 09685b182251..04c855169296 100644
--- a/svx/source/sidebar/shapes/DefaultShapesPanel.cxx
+++ b/svx/source/sidebar/shapes/DefaultShapesPanel.cxx
@@ -28,20 +28,30 @@ namespace svx { namespace sidebar {
DefaultShapesPanel::DefaultShapesPanel (
vcl::Window* pParent,
const css::uno::Reference& rxFrame)
-: PanelLayout(pParent, "DefaultShapesPanel",
"svx/ui/defaultshapespanel.ui", rxFrame),
-SvxShapeCommandsMap(),
-mxFrame(rxFrame)
+: PanelLayout(pParent, "DefaultShapesPanel",
"svx/ui/defaultshapespanel.ui", rxFrame, true)
+, SvxShapeCommandsMap()
+, mxLineArrowSet(new SvtValueSet(nullptr))
+, mxLineArrowSetWin(new wel
[Libreoffice-commits] core.git: solenv/sanitizers sw/source sw/uiconfig
solenv/sanitizers/ui/modules/swriter.suppr |3 -
sw/source/uibase/sidebar/ThemePanel.cxx| 55 +++
sw/source/uibase/sidebar/ThemePanel.hxx| 20 ++-
sw/uiconfig/swriter/ui/sidebartheme.ui | 80 +
4 files changed, 108 insertions(+), 50 deletions(-)
New commits:
commit 8c0a015f7f4a007b1cb6ac293838d75741f8ae0a
Author: Caolán McNamara
AuthorDate: Fri Dec 20 10:59:50 2019 +
Commit: Caolán McNamara
CommitDate: Fri Dec 20 16:40:34 2019 +0100
weld ThemePanel
Change-Id: I5eca63762e5e243ae791e15655fac60cc9437aa5
Reviewed-on: https://gerrit.libreoffice.org/85591
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/solenv/sanitizers/ui/modules/swriter.suppr
b/solenv/sanitizers/ui/modules/swriter.suppr
index c02c0c77d3cb..9fad88ba117b 100644
--- a/solenv/sanitizers/ui/modules/swriter.suppr
+++ b/solenv/sanitizers/ui/modules/swriter.suppr
@@ -207,9 +207,6 @@
sw/uiconfig/swriter/ui/selectaddressdialog.ui://GtkLabel[@id='connecting'] orpha
sw/uiconfig/swriter/ui/selecttabledialog.ui://GtkLabel[@id='select']
orphan-label
sw/uiconfig/swriter/ui/sidebarwrap.ui://GtkLabel[@id='label1'] orphan-label
sw/uiconfig/swriter/ui/sidebarwrap.ui://GtkLabel[@id='customlabel']
orphan-label
-sw/uiconfig/swriter/ui/sidebartheme.ui://GtkLabel[@id='label1'] orphan-label
-sw/uiconfig/swriter/ui/sidebartheme.ui://GtkTreeView[@id='listbox_fonts']
no-labelled-by
-sw/uiconfig/swriter/ui/sidebartheme.ui://GtkLabel[@id='label2'] orphan-label
sw/uiconfig/swriter/ui/spellmenu.ui://GtkMenuItem[@id='spelldialog']
button-no-label
sw/uiconfig/swriter/ui/spellmenu.ui://GtkMenuItem[@id='correctdialog']
button-no-label
sw/uiconfig/swriter/ui/statisticsinfopage.ui://GtkLabel[@id='nopages']
orphan-label
diff --git a/sw/source/uibase/sidebar/ThemePanel.cxx
b/sw/source/uibase/sidebar/ThemePanel.cxx
index 499863889217..d2f6e64cd08b 100644
--- a/sw/source/uibase/sidebar/ThemePanel.cxx
+++ b/sw/source/uibase/sidebar/ThemePanel.cxx
@@ -426,25 +426,24 @@ VclPtr ThemePanel::Create (vcl::Window*
pParent,
ThemePanel::ThemePanel(vcl::Window* pParent,
const css::uno::Reference& rxFrame)
-: PanelLayout(pParent, "ThemePanel", "modules/swriter/ui/sidebartheme.ui",
rxFrame)
+: PanelLayout(pParent, "ThemePanel", "modules/swriter/ui/sidebartheme.ui",
rxFrame, true)
+, mxListBoxFonts(m_xBuilder->weld_tree_view("listbox_fonts"))
+, mxValueSetColors(new SvtValueSet(nullptr))
+, mxValueSetColorsWin(new weld::CustomWeld(*m_xBuilder, "valueset_colors",
*mxValueSetColors))
+, mxApplyButton(m_xBuilder->weld_button("apply"))
, maColorSets()
{
-get(mpListBoxFonts, "listbox_fonts");
-get(mpValueSetColors, "valueset_colors");
-get(mpApplyButton, "apply");
+mxValueSetColors->SetColCount(2);
+mxValueSetColors->SetLineCount(3);
-mpValueSetColors->SetColCount(2);
-mpValueSetColors->SetLineCount(4);
-
-mpApplyButton->SetClickHdl(LINK(this, ThemePanel, ClickHdl));
-mpListBoxFonts->SetDoubleClickHdl(LINK(this, ThemePanel, DoubleClickHdl));
-mpValueSetColors->SetDoubleClickHdl(LINK(this, ThemePanel,
DoubleClickValueSetHdl));
+mxApplyButton->connect_clicked(LINK(this, ThemePanel, ClickHdl));
+mxListBoxFonts->connect_row_activated(LINK(this, ThemePanel,
DoubleClickHdl));
+mxValueSetColors->SetDoubleClickHdl(LINK(this, ThemePanel,
DoubleClickValueSetHdl));
std::vector aFontSets = initFontSets();
for (const FontSet & rFontSet : aFontSets)
-{
-mpListBoxFonts->InsertEntry(rFontSet.maName);
-}
+mxListBoxFonts->append_text(rFontSet.maName);
+mxListBoxFonts->set_size_request(-1,
mxListBoxFonts->get_height_rows(aFontSets.size()));
maColorSets.init();
@@ -455,8 +454,12 @@ ThemePanel::ThemePanel(vcl::Window* pParent,
const OUString& aName = rColorSet.getName();
BitmapEx aPreview = GenerateColorPreview(rColorSet);
-mpValueSetColors->InsertItem(i, Image(aPreview), aName);
+
+sal_uInt16 nId = i + 1;
+mxValueSetColors->InsertItem(nId, Image(aPreview), aName);
}
+
+mxValueSetColors->SetOptimalSize();
}
ThemePanel::~ThemePanel()
@@ -466,33 +469,39 @@ ThemePanel::~ThemePanel()
void ThemePanel::dispose()
{
-mpListBoxFonts.clear();
-mpValueSetColors.clear();
-mpApplyButton.clear();
+mxListBoxFonts.reset();
+mxValueSetColorsWin.reset();
+mxValueSetColors.reset();
+mxApplyButton.reset();
PanelLayout::dispose();
}
-IMPL_LINK_NOARG(ThemePanel, ClickHdl, Button*, void)
+IMPL_LINK_NOARG(ThemePanel, ClickHdl, weld::Button&, void)
{
DoubleClickHdl();
}
-IMPL_LINK_NOARG(ThemePanel, DoubleClickValueSetHdl, ValueSet*, void)
+
+IMPL_LINK_NOARG(ThemePanel, DoubleClickValueSetHdl, SvtValueSet*, void)
{
DoubleClickHdl();
}
-IMPL_LINK_NOARG(ThemePanel, DoubleClickHdl, ListBox&, void)
+
+IMPL_L
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1d273e238d0f1cbb193811d30d2569b0d02d1dc3 Author: Eike Rathke AuthorDate: Fri Dec 20 16:18:41 2019 +0100 Commit: Gerrit Code Review CommitDate: Fri Dec 20 16:30:19 2019 +0100 Update git submodules * Update helpcontent2 from branch 'master' - Correct displayed error strings Trailing ! exclamation mark was omitted for most. Add #NUM! error string. Cell does not contain the error string but displays it. Use same wording for all "special" cases. Change-Id: Ia04163cf2d0436ee395784e553a88e239a9a95d5 Reviewed-on: https://gerrit.libreoffice.org/85616 Reviewed-by: Eike Rathke Tested-by: Jenkins diff --git a/helpcontent2 b/helpcontent2 index 360b08083df3..8e68f0fed48b 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 360b08083df38a025a2fdbb1dfbcddd1b4ec174c +Subproject commit 8e68f0fed48b0f79beefc5f784d4db848ee87f72 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/scalc/05/0214.xhp | 16 1 file changed, 8 insertions(+), 8 deletions(-) New commits: commit 8e68f0fed48b0f79beefc5f784d4db848ee87f72 Author: Eike Rathke AuthorDate: Fri Dec 20 16:18:41 2019 +0100 Commit: Eike Rathke CommitDate: Fri Dec 20 16:30:19 2019 +0100 Correct displayed error strings Trailing ! exclamation mark was omitted for most. Add #NUM! error string. Cell does not contain the error string but displays it. Use same wording for all "special" cases. Change-Id: Ia04163cf2d0436ee395784e553a88e239a9a95d5 Reviewed-on: https://gerrit.libreoffice.org/85616 Reviewed-by: Eike Rathke Tested-by: Jenkins diff --git a/source/text/scalc/05/0214.xhp b/source/text/scalc/05/0214.xhp index 271507824..b0cc44743 100644 --- a/source/text/scalc/05/0214.xhp +++ b/source/text/scalc/05/0214.xhp @@ -231,10 +231,10 @@ - 519#VALUE + 519#VALUE! - No result (#VALUE is in the cell rather than Err:519!) + No result (instead of Err:519 cell displays #VALUE!) The formula yields a value that does not correspond to the definition; or a cell that is referenced in the formula contains text instead of a number.i63264 @@ -253,13 +253,13 @@ - 521 + 521#NULL! - Internal syntax error + Internal syntax error (instead of Err:521 cell displays #NULL!) - No result. + No code or no result. @@ -287,10 +287,10 @@ - 524#REF + 524#REF! -invalid references (instead of Err:524 cell contains #REF) +invalid references (instead of Err:524 cell displays #REF!) @@ -302,7 +302,7 @@ 525#NAME? -invalid names (instead of Err:525 cell contains #NAME?) +invalid names (instead of Err:525 cell displays #NAME?) An identifier could not be evaluated, for example, no valid reference, no valid domain name, no column/row label, no macro, incorrect decimal divider, add-in not found. ___ 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.2' - vcl/headless
vcl/headless/svpgdi.cxx |8
1 file changed, 8 insertions(+)
New commits:
commit a0b5a544686b57aff17dedd5e08ab05bc16d0fce
Author: Jan Holesovsky
AuthorDate: Fri Dec 20 15:27:50 2019 +0100
Commit: Jan Holesovsky
CommitDate: Fri Dec 20 16:03:50 2019 +0100
android: Make the Calc input bar working on the Android device too.
Thanks to Marco Ceccheti! - he's found what was wrong there.
Change-Id: I45500f7f55ced60965a42ad6cb8032481594b409
Reviewed-on: https://gerrit.libreoffice.org/85612
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 73d610d59ebf..8baf93d67693 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -2265,14 +2265,21 @@ GlyphCache& SvpSalGraphics::getPlatformGlyphCache()
void dl_cairo_surface_set_device_scale(cairo_surface_t *surface, double
x_scale, double y_scale)
{
+#ifdef ANDROID
+cairo_surface_set_device_scale(surface, x_scale, y_scale);
+#else
static auto func = reinterpret_cast(
dlsym(nullptr, "cairo_surface_set_device_scale"));
if (func)
func(surface, x_scale, y_scale);
+#endif
}
void dl_cairo_surface_get_device_scale(cairo_surface_t *surface, double*
x_scale, double* y_scale)
{
+#ifdef ANDROID
+cairo_surface_get_device_scale(surface, x_scale, y_scale);
+#else
static auto func = reinterpret_cast(
dlsym(nullptr, "cairo_surface_get_device_scale"));
if (func)
@@ -2284,6 +2291,7 @@ void dl_cairo_surface_get_device_scale(cairo_surface_t
*surface, double* x_scale
if (y_scale)
*y_scale = 1.0;
}
+#endif
}
/* 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: sc/source sc/uiconfig
sc/source/ui/inc/tpformula.hxx |4 ++
sc/source/ui/optdlg/tpformula.cxx | 51 +
sc/uiconfig/scalc/ui/optformula.ui |3 ++
3 files changed, 36 insertions(+), 22 deletions(-)
New commits:
commit aad738a6bb1155365321ac6bf119aaedd4e749ec
Author: Caolán McNamara
AuthorDate: Fri Dec 20 10:40:53 2019 +
Commit: Caolán McNamara
CommitDate: Fri Dec 20 16:01:17 2019 +0100
Resolves: tdf#129501 cannot change formula separators in options
Change-Id: I5cf5736f8ad3d5e28f2c31ffa88dafac59df8a8e
Reviewed-on: https://gerrit.libreoffice.org/85587
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sc/source/ui/inc/tpformula.hxx b/sc/source/ui/inc/tpformula.hxx
index 4de05560cfd3..3cda79900d0e 100644
--- a/sc/source/ui/inc/tpformula.hxx
+++ b/sc/source/ui/inc/tpformula.hxx
@@ -43,9 +43,11 @@ private:
void LaunchCustomCalcSettings();
bool IsValidSeparator(const OUString& rSep) const;
-bool IsValidSeparatorSet() const;
DECL_LINK( ButtonHdl, weld::Button&, void );
+DECL_LINK( SepInsertTextHdl, OUString&, bool );
+DECL_LINK( ColSepInsertTextHdl, OUString&, bool );
+DECL_LINK( RowSepInsertTextHdl, OUString&, bool );
DECL_LINK( SepModifyHdl, weld::Entry&, void );
DECL_LINK( SepEditOnFocusHdl, weld::Widget&, void );
diff --git a/sc/source/ui/optdlg/tpformula.cxx
b/sc/source/ui/optdlg/tpformula.cxx
index b4825149ae58..5bf50dea60b9 100644
--- a/sc/source/ui/optdlg/tpformula.cxx
+++ b/sc/source/ui/optdlg/tpformula.cxx
@@ -56,6 +56,10 @@ ScTpFormulaOptions::ScTpFormulaOptions(weld::Container*
pPage, weld::DialogContr
mxBtnCustomCalcCustom->connect_clicked(aLink2);
mxBtnCustomCalcDetails->connect_clicked(aLink2);
+mxEdSepFuncArg->connect_insert_text(LINK( this, ScTpFormulaOptions,
SepInsertTextHdl ));
+mxEdSepArrayCol->connect_insert_text(LINK( this, ScTpFormulaOptions,
ColSepInsertTextHdl ));
+mxEdSepArrayRow->connect_insert_text(LINK( this, ScTpFormulaOptions,
RowSepInsertTextHdl ));
+
Link aLink = LINK( this, ScTpFormulaOptions,
SepModifyHdl );
mxEdSepFuncArg->connect_changed(aLink);
mxEdSepArrayCol->connect_changed(aLink);
@@ -94,7 +98,9 @@ void ScTpFormulaOptions::OnFocusSeparatorInput(weld::Entry*
pEdit)
// Make sure the entire text is selected.
pEdit->select_region(0, -1);
-maOldSepValue = pEdit->get_text();
+OUString sSepValue = pEdit->get_text();
+if (!sSepValue.isEmpty())
+maOldSepValue = sSepValue;
}
void ScTpFormulaOptions::UpdateCustomCalcRadioButtons(bool bDefault)
@@ -161,14 +167,6 @@ bool ScTpFormulaOptions::IsValidSeparator(const OUString&
rSep) const
return true;
}
-bool ScTpFormulaOptions::IsValidSeparatorSet() const
-{
-// Make sure the column and row separators are different.
-OUString aColStr = mxEdSepArrayCol->get_text();
-OUString aRowStr = mxEdSepArrayRow->get_text();
-return aColStr != aRowStr;
-}
-
IMPL_LINK( ScTpFormulaOptions, ButtonHdl, weld::Button&, rBtn, void )
{
if (&rBtn == mxBtnSepReset.get())
@@ -181,21 +179,32 @@ IMPL_LINK( ScTpFormulaOptions, ButtonHdl, weld::Button&,
rBtn, void )
LaunchCustomCalcSettings();
}
-IMPL_LINK( ScTpFormulaOptions, SepModifyHdl, weld::Entry&, rEdit, void )
+IMPL_LINK(ScTpFormulaOptions, SepInsertTextHdl, OUString&, rTest, bool)
{
-OUString aStr = rEdit.get_text();
-if (aStr.getLength() > 1)
-{
-// In case the string is more than one character long, only grab the
-// first character.
-aStr = aStr.copy(0, 1);
-rEdit.set_text(aStr);
-}
-
-if ((!IsValidSeparator(aStr) || !IsValidSeparatorSet()) &&
!maOldSepValue.isEmpty())
+if (!IsValidSeparator(rTest) && !maOldSepValue.isEmpty())
// Invalid separator. Restore the old value.
-rEdit.set_text(maOldSepValue);
+rTest = maOldSepValue;
+return true;
+}
+IMPL_LINK(ScTpFormulaOptions, RowSepInsertTextHdl, OUString&, rTest, bool)
+{
+// Invalid separator or same as ColStr - Restore the old value.
+if ((!IsValidSeparator(rTest) || rTest == mxEdSepArrayCol->get_text()) &&
!maOldSepValue.isEmpty())
+rTest = maOldSepValue;
+return true;
+}
+
+IMPL_LINK(ScTpFormulaOptions, ColSepInsertTextHdl, OUString&, rTest, bool)
+{
+// Invalid separator or same as RowStr - Restore the old value.
+if ((!IsValidSeparator(rTest) || rTest == mxEdSepArrayRow->get_text()) &&
!maOldSepValue.isEmpty())
+rTest = maOldSepValue;
+return true;
+}
+
+IMPL_LINK( ScTpFormulaOptions, SepModifyHdl, weld::Entry&, rEdit, void )
+{
OnFocusSeparatorInput(&rEdit);
}
diff --git a/sc/uiconfig/scalc/ui/optformula.ui
b/sc/uiconfig/scalc/ui/optformula.ui
index 8b8f2a8dfa6f..ceae62e26a70 100644
--- a/sc/uiconfig/scalc/ui/optformula.ui
+++ b/sc/uiconfig/scalc/ui/optformula.ui
@@ -357,6 +357,7 @@
True
[Libreoffice-commits] core.git: solenv/sanitizers
solenv/sanitizers/ui/modules/scalc.suppr |1 - 1 file changed, 1 deletion(-) New commits: commit 7af4ef92fd0445408c5a4eb41ed3ed63e0593685 Author: Caolán McNamara AuthorDate: Fri Dec 20 10:08:39 2019 + Commit: Caolán McNamara CommitDate: Fri Dec 20 16:00:19 2019 +0100 unused suppression Change-Id: Iff565625d766d8c030479f694b47c855150b394f Reviewed-on: https://gerrit.libreoffice.org/85585 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/solenv/sanitizers/ui/modules/scalc.suppr b/solenv/sanitizers/ui/modules/scalc.suppr index 1f5c72e6be46..dd73f5f56d5e 100644 --- a/solenv/sanitizers/ui/modules/scalc.suppr +++ b/solenv/sanitizers/ui/modules/scalc.suppr @@ -183,7 +183,6 @@ sc/uiconfig/scalc/ui/scenariodialog.ui://GtkEntry[@id='name'] no-labelled-by sc/uiconfig/scalc/ui/scenariodialog.ui://GtkLabel[@id='alttitle'] orphan-label sc/uiconfig/scalc/ui/scenariodialog.ui://GtkLabel[@id='createdft'] orphan-label sc/uiconfig/scalc/ui/scenariodialog.ui://GtkLabel[@id='onft'] orphan-label -sc/uiconfig/scalc/ui/scgeneralpage.ui://GtkLabel[@id='label6'] orphan-label sc/uiconfig/scalc/ui/searchresults.ui://GtkLabel[@id='lbSearchResults'] orphan-label sc/uiconfig/scalc/ui/sharedocumentdlg.ui://GtkLabel[@id='warning'] orphan-label sc/uiconfig/scalc/ui/showchangesdialog.ui://GtkEntry[@id='range'] no-labelled-by ___ 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.2' - sal/osl
sal/osl/unx/file.cxx | 69 ---
1 file changed, 60 insertions(+), 9 deletions(-)
New commits:
commit cc20571fcde14814d6b41582f111042c66435a2d
Author: Michael Meeks
AuthorDate: Fri Dec 20 14:46:36 2019 +
Commit: Jan Holesovsky
CommitDate: Fri Dec 20 15:58:13 2019 +0100
android: very nasty WIP in-memory cache.
Change-Id: I5ea340c731f76da7e468e1227090d29dbf7fd939
Reviewed-on: https://gerrit.libreoffice.org/85610
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index 9f888579e3a9..576b9bbcf89c 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -815,6 +815,28 @@ static oslFileError openMemoryAsFile(void *address, size_t
size, oslFileHandle *
#define OPEN_CREATE_FLAGS ( O_CREAT | O_RDWR )
#endif
+/*
+ * Reading files from /assets/ on Android is really slow; we should cache
+ * small files, particularly sidebar data we need rapidly.
+ */
+#ifdef ANDROID
+struct ACacheEntry {
+OString aFilePath;
+OString aData;
+};
+static size_t nHitCacheEntry = 0;
+static ACacheEntry aHitCache[16];
+// static ACacheEntry aMissCache[32];
+
+ACacheEntry *aCacheFind(ACacheEntry *pCache, int size, const char *cpFilePath)
+{
+for (int i = 0; i < size; ++i)
+if (!strcmp(pCache[i].aFilePath.getStr(), cpFilePath))
+return pCache + i;
+return nullptr;
+}
+#endif
+
oslFileError openFilePath(const char *cpFilePath, oslFileHandle* pHandle,
sal_uInt32 uFlags,
mode_t mode)
{
@@ -828,21 +850,50 @@ oslFileError openFilePath(const char *cpFilePath,
oslFileHandle* pHandle, sal_uI
{
void* address;
size_t size;
-AAssetManager* mgr = lo_get_native_assetmgr();
-AAsset* asset = AAssetManager_open(mgr, cpFilePath +
sizeof("/assets/")-1, AASSET_MODE_BUFFER);
-if (!asset)
+ACacheEntry *pHit;
+
+pHit = aCacheFind(aHitCache, SAL_N_ELEMENTS(aHitCache), cpFilePath);
+if (pHit)
+{
+size = pHit->aData.getLength();
+address = malloc(sizeof(char)*size);
+memcpy(address, pHit->aData.getStr(), size);
+}
+// FIXME: make a proper cache class [!]
+/*else if (pHit = aCacheFind(aMissCache, SAL_N_ELEMENTS(aMissCache),
cpFilePath))
{
address = NULL;
errno = ENOENT;
-__android_log_print(ANDROID_LOG_ERROR,"libo:sal/osl/unx/file",
"failed to open %s", cpFilePath);
+__android_log_print(ANDROID_LOG_ERROR,"libo:sal/osl/unx/file",
"failed to open via miss cache %s", cpFilePath);
return osl_File_E_NOENT;
-}
+} */
else
{
-size = AAsset_getLength(asset);
-address = malloc(sizeof(char)*size);
-AAsset_read(asset,address,size);
-AAsset_close(asset);
+AAssetManager* mgr = lo_get_native_assetmgr();
+AAsset* asset = AAssetManager_open(mgr, cpFilePath +
sizeof("/assets/")-1, AASSET_MODE_BUFFER);
+if (!asset)
+{
+address = NULL;
+errno = ENOENT;
+__android_log_print(ANDROID_LOG_ERROR,"libo:sal/osl/unx/file",
"failed to open %s", cpFilePath);
+// FIXME: populate aMissCache[
+return osl_File_E_NOENT;
+}
+else
+{
+size = AAsset_getLength(asset);
+address = malloc(sizeof(char)*size);
+AAsset_read(asset,address,size);
+AAsset_close(asset);
+
+if (size < 50 * 1024)
+{
+size_t nIdx = nHitCacheEntry % SAL_N_ELEMENTS(aHitCache);
+aHitCache[nIdx].aFilePath = OString(cpFilePath,
strlen(cpFilePath));
+aHitCache[nIdx].aData = OString((char *)address, size);
+nHitCacheEntry++;
+}
+}
}
if (uFlags & osl_File_OpenFlag_Write)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source sw/uiconfig
sw/source/uibase/sidebar/StylePresetsPanel.cxx | 25 +
sw/source/uibase/sidebar/StylePresetsPanel.hxx |5 ++-
sw/uiconfig/swriter/ui/sidebarstylepresets.ui | 36 +
3 files changed, 37 insertions(+), 29 deletions(-)
New commits:
commit 1bae6297723af8e5a601a6ddf6134ca5b62a558e
Author: Caolán McNamara
AuthorDate: Fri Dec 20 09:18:17 2019 +
Commit: Caolán McNamara
CommitDate: Fri Dec 20 15:50:42 2019 +0100
weld StylePresetsPanel
Change-Id: I827819c8891de828013ce8a38d5acf9e7fec3985
Reviewed-on: https://gerrit.libreoffice.org/85584
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/source/uibase/sidebar/StylePresetsPanel.cxx
b/sw/source/uibase/sidebar/StylePresetsPanel.cxx
index 0ab90e10d08b..2e83338d6f1a 100644
--- a/sw/source/uibase/sidebar/StylePresetsPanel.cxx
+++ b/sw/source/uibase/sidebar/StylePresetsPanel.cxx
@@ -156,13 +156,13 @@ VclPtr StylePresetsPanel::Create
(vcl::Window* pParent,
StylePresetsPanel::StylePresetsPanel(vcl::Window* pParent,
const css::uno::Reference&
rxFrame)
-: PanelLayout(pParent, "StylePresetsPanel",
"modules/swriter/ui/sidebarstylepresets.ui", rxFrame)
+: PanelLayout(pParent, "StylePresetsPanel",
"modules/swriter/ui/sidebarstylepresets.ui", rxFrame, true)
+, mxValueSet(new SvtValueSet(nullptr))
+, mxValueSetWin(new weld::CustomWeld(*m_xBuilder, "valueset", *mxValueSet))
{
-get(mpValueSet, "valueset");
+mxValueSet->SetColCount(2);
-mpValueSet->SetColCount(2);
-
-mpValueSet->SetDoubleClickHdl(LINK(this, StylePresetsPanel,
DoubleClickHdl));
+mxValueSet->SetDoubleClickHdl(LINK(this, StylePresetsPanel,
DoubleClickHdl));
RefreshList();
}
@@ -181,10 +181,12 @@ void StylePresetsPanel::RefreshList()
OUString aName = aTemplates.GetName(i,j);
OUString aURL = aTemplates.GetPath(i,j);
BitmapEx aPreview = CreatePreview(aURL, aName);
-mpValueSet->InsertItem(j, Image(aPreview), aName);
+sal_uInt16 nId = j + 1;
+mxValueSet->InsertItem(nId, Image(aPreview), aName);
maTemplateEntries.push_back(std::make_unique(aURL));
-mpValueSet->SetItemData(j, maTemplateEntries.back().get());
+mxValueSet->SetItemData(nId, maTemplateEntries.back().get());
}
+mxValueSet->SetOptimalSize();
}
}
}
@@ -196,15 +198,16 @@ StylePresetsPanel::~StylePresetsPanel()
void StylePresetsPanel::dispose()
{
-mpValueSet.disposeAndClear();
+mxValueSetWin.reset();
+mxValueSet.reset();
PanelLayout::dispose();
}
-IMPL_LINK_NOARG(StylePresetsPanel, DoubleClickHdl, ValueSet*, void)
+IMPL_LINK_NOARG(StylePresetsPanel, DoubleClickHdl, SvtValueSet*, void)
{
-sal_Int32 nItemId = mpValueSet->GetSelectedItemId();
-TemplateEntry* pEntry =
static_cast(mpValueSet->GetItemData(nItemId));
+sal_Int32 nItemId = mxValueSet->GetSelectedItemId();
+TemplateEntry* pEntry =
static_cast(mxValueSet->GetItemData(nItemId));
SwDocShell* pDocSh = static_cast(SfxObjectShell::Current());
if (pDocSh)
diff --git a/sw/source/uibase/sidebar/StylePresetsPanel.hxx
b/sw/source/uibase/sidebar/StylePresetsPanel.hxx
index b392f9cb077e..abb3fae568e5 100644
--- a/sw/source/uibase/sidebar/StylePresetsPanel.hxx
+++ b/sw/source/uibase/sidebar/StylePresetsPanel.hxx
@@ -52,11 +52,12 @@ private:
virtual ~StylePresetsPanel() override;
virtual void dispose() override;
-VclPtr mpValueSet;
+std::unique_ptr mxValueSet;
+std::unique_ptr mxValueSetWin;
std::vector> maTemplateEntries;
-DECL_LINK(DoubleClickHdl, ValueSet*, void);
+DECL_LINK(DoubleClickHdl, SvtValueSet*, void);
};
}} // end of namespace sw::sidebar
diff --git a/sw/uiconfig/swriter/ui/sidebarstylepresets.ui
b/sw/uiconfig/swriter/ui/sidebarstylepresets.ui
index 170df5515cea..3258fe2ba7f5 100644
--- a/sw/uiconfig/swriter/ui/sidebarstylepresets.ui
+++ b/sw/uiconfig/swriter/ui/sidebarstylepresets.ui
@@ -1,8 +1,7 @@
-
+
-
True
False
@@ -19,13 +18,28 @@
6
6
-
+
True
True
True
-False
-
-
+True
+never
+never
+in
+
+
+True
+False
+
+
+True
+True
+GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK |
GDK_STRUCTURE_MASK
+True
+True
+
+
+
[Libreoffice-commits] core.git: test/source
test/source/screenshot_test.cxx |1 -
1 file changed, 1 deletion(-)
New commits:
commit b950943bc5181bb055578676870523626b46aa12
Author: Caolán McNamara
AuthorDate: Fri Dec 20 09:06:45 2019 +
Commit: Caolán McNamara
CommitDate: Fri Dec 20 15:35:41 2019 +0100
sidebarwrap is conforming now
Change-Id: Idca7964555a3ede2842473ec47752095d612bff2
Reviewed-on: https://gerrit.libreoffice.org/85576
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/test/source/screenshot_test.cxx b/test/source/screenshot_test.cxx
index 34e491741af8..b1bdf7d98ddf 100644
--- a/test/source/screenshot_test.cxx
+++ b/test/source/screenshot_test.cxx
@@ -202,7 +202,6 @@ void ScreenshotTest::dumpDialogToPath(const OString&
rUIXMLDescription)
{
bool bNonConforming = rUIXMLDescription ==
"modules/swriter/ui/sidebarstylepresets.ui" ||
rUIXMLDescription ==
"modules/swriter/ui/sidebartheme.ui" ||
- rUIXMLDescription ==
"modules/swriter/ui/sidebarwrap.ui" ||
rUIXMLDescription ==
"modules/swriter/ui/notebookbar.ui" ||
rUIXMLDescription ==
"modules/scalc/ui/sidebaralignment.ui" ||
rUIXMLDescription ==
"modules/scalc/ui/sidebarcellappearance.ui" ||
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/tbxctrls/tbxcolorupdate.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2fdd5dd95777c8352d390beed11f4a969f0baadf
Author: Tor Lillqvist
AuthorDate: Fri Dec 20 16:17:13 2019 +0200
Commit: Tor Lillqvist
CommitDate: Fri Dec 20 16:23:10 2019 +0200
tdf#126966: Tweak to get the "color bar" below text color controls to show
up
(In iOS-only code, for now.)
No idea where the size that the thing has to fit inside comes from;
possibly one could alternatively have made that larger?
(cherry picked from commit 4de843ee0de7f9211f536dc6c4ee0d05bf26cc52)
Change-Id: Ifc1bec4c08c279403127056ecc61db4b80c03f96
diff --git a/svx/source/tbxctrls/tbxcolorupdate.cxx
b/svx/source/tbxctrls/tbxcolorupdate.cxx
index 9465e9aad2f6..547ae1c42757 100644
--- a/svx/source/tbxctrls/tbxcolorupdate.cxx
+++ b/svx/source/tbxctrls/tbxcolorupdate.cxx
@@ -93,7 +93,7 @@ namespace svx
if (!mbWideButton)
{
// usually the normal size is 16
-const long nIOSSize = 40;
+const long nIOSSize = 32;
if (aItemSize.getWidth() < nIOSSize)
{
aItemSize.setWidth(nIOSSize);
___
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.2' - svx/source
svx/source/tbxctrls/tbxcolorupdate.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 4de843ee0de7f9211f536dc6c4ee0d05bf26cc52
Author: Tor Lillqvist
AuthorDate: Fri Dec 20 16:17:13 2019 +0200
Commit: Tor Lillqvist
CommitDate: Fri Dec 20 16:17:13 2019 +0200
tdf#126966: Tweak to get the "color bar" below text color controls to show
up
No idea where the size that the thing has to fit inside comes from;
possibly one could alternatively have made that larger?
Change-Id: Ifc1bec4c08c279403127056ecc61db4b80c03f96
diff --git a/svx/source/tbxctrls/tbxcolorupdate.cxx
b/svx/source/tbxctrls/tbxcolorupdate.cxx
index 77385d58e400..7f9ca3c84eaf 100644
--- a/svx/source/tbxctrls/tbxcolorupdate.cxx
+++ b/svx/source/tbxctrls/tbxcolorupdate.cxx
@@ -93,7 +93,7 @@ namespace svx
if (!mbWideButton)
{
// usually the normal size is 16
-const long nIOSSize = 40;
+const long nIOSSize = 32;
if (aItemSize.getWidth() < nIOSSize)
{
aItemSize.setWidth(nIOSSize);
___
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/filter/inc/worksheethelper.hxx |4
sc/source/filter/oox/commentsbuffer.cxx |7 +++
sc/source/filter/oox/worksheethelper.cxx |5 +
3 files changed, 16 insertions(+)
New commits:
commit 543fd1b9f8e05988d4c45602f4247566c352ee81
Author: Noel Grandin
AuthorDate: Thu Dec 19 15:07:46 2019 +0200
Commit: Noel Grandin
CommitDate: Fri Dec 20 15:14:54 2019 +0100
tdf#129228 speedup load xls file with lots of comments
by locking the underlying SdrModel while the comments are added, so we
avoid the reformatting that happends when the model is unlocked
Takes the time from 3m30 to 1m for me.
Change-Id: Ibc3d2b1ded548d5eee7715d9a655a0af61b0eb2b
Reviewed-on: https://gerrit.libreoffice.org/85523
Tested-by: Jenkins
Reviewed-by: Noel Grandin
(cherry picked from commit f2f5d74067705b7c64f8fb510952d7cece417627)
Reviewed-on: https://gerrit.libreoffice.org/85579
diff --git a/sc/source/filter/inc/worksheethelper.hxx
b/sc/source/filter/inc/worksheethelper.hxx
index 8f135e05ea9c..e3a2a955b22a 100644
--- a/sc/source/filter/inc/worksheethelper.hxx
+++ b/sc/source/filter/inc/worksheethelper.hxx
@@ -27,6 +27,7 @@
#include "formulabase.hxx"
struct ScDataBarFormatData;
+class ScDocument;
namespace com { namespace sun { namespace star {
namespace awt { struct Point; }
@@ -294,6 +295,9 @@ public:
void setCellFormulaValue(
const ScAddress& rAddress, const OUString& rValueStr, sal_Int32
nCellType );
+ScDocument& getScDocument();
+
+
private:
WorksheetGlobals& mrSheetGlob;
};
diff --git a/sc/source/filter/oox/commentsbuffer.cxx
b/sc/source/filter/oox/commentsbuffer.cxx
index c3c60c3f5a6d..43b133aad4fe 100644
--- a/sc/source/filter/oox/commentsbuffer.cxx
+++ b/sc/source/filter/oox/commentsbuffer.cxx
@@ -34,6 +34,8 @@
#include
#include
#include
+#include
+#include
namespace oox {
namespace xls {
@@ -221,7 +223,12 @@ CommentRef CommentsBuffer::createComment()
void CommentsBuffer::finalizeImport()
{
+// keep the model locked to avoid repeated reformatting in the model
+auto pModel = getScDocument().GetDrawLayer();
+bool bWasLocked = pModel->isLocked();
+pModel->setLock(true);
maComments.forEachMem( &Comment::finalizeImport );
+pModel->setLock(bWasLocked);
}
} // namespace xls
diff --git a/sc/source/filter/oox/worksheethelper.cxx
b/sc/source/filter/oox/worksheethelper.cxx
index a567435fcc28..eb18fb1dd1d5 100644
--- a/sc/source/filter/oox/worksheethelper.cxx
+++ b/sc/source/filter/oox/worksheethelper.cxx
@@ -1363,6 +1363,11 @@ WorksheetHelper::WorksheetHelper( WorksheetGlobals&
rSheetGlob ) :
{
}
+ScDocument& WorksheetHelper::getScDocument()
+{
+return getDocImport().getDoc();
+}
+
/*static*/ WorksheetGlobalsRef WorksheetHelper::constructGlobals( const
WorkbookHelper& rHelper,
const ISegmentProgressBarRef& rxProgressBar, WorksheetType eSheetType,
SCTAB nSheet )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/uiconfig sw/UIConfig_swriter.mk test/source
sw/UIConfig_swriter.mk|1 sw/qa/unit/data/sw-dialogs-test.txt |1 sw/qa/unit/data/sw-dialogs-test_2.txt |1 sw/uiconfig/swriter/ui/sidebarpage.ui | 131 -- test/source/screenshot_test.cxx |1 5 files changed, 135 deletions(-) New commits: commit 29d800cbed481cd4b79376ecdd985092ec180ded Author: Caolán McNamara AuthorDate: Fri Dec 20 09:04:03 2019 + Commit: Caolán McNamara CommitDate: Fri Dec 20 15:00:53 2019 +0100 remove unused sidebarpage.ui since... commit 292560a957498bed70b625c992ec6bcf631dceb3 Date: Mon Oct 17 13:23:23 2016 +0200 loplugin:unusedmethods Change-Id: I3a954cbeef459195247d22e17d2a0377f516f307 Reviewed-on: https://gerrit.libreoffice.org/85575 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk index 65de527c3b89..339c7774d528 100644 --- a/sw/UIConfig_swriter.mk +++ b/sw/UIConfig_swriter.mk @@ -251,7 +251,6 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\ sw/uiconfig/swriter/ui/selectblockdialog \ sw/uiconfig/swriter/ui/selectindexdialog \ sw/uiconfig/swriter/ui/selecttabledialog \ - sw/uiconfig/swriter/ui/sidebarpage \ sw/uiconfig/swriter/ui/pageformatpanel \ sw/uiconfig/swriter/ui/pagestylespanel \ sw/uiconfig/swriter/ui/pageheaderpanel \ diff --git a/sw/qa/unit/data/sw-dialogs-test.txt b/sw/qa/unit/data/sw-dialogs-test.txt index 54fa2761b575..4a077f3278cc 100644 --- a/sw/qa/unit/data/sw-dialogs-test.txt +++ b/sw/qa/unit/data/sw-dialogs-test.txt @@ -175,7 +175,6 @@ modules/swriter/ui/selectautotextdialog.ui modules/swriter/ui/selectblockdialog.ui modules/swriter/ui/selectindexdialog.ui modules/swriter/ui/selecttabledialog.ui -modules/swriter/ui/sidebarpage.ui modules/swriter/ui/sidebarstylepresets.ui modules/swriter/ui/sidebartheme.ui modules/swriter/ui/sidebarwrap.ui diff --git a/sw/qa/unit/data/sw-dialogs-test_2.txt b/sw/qa/unit/data/sw-dialogs-test_2.txt index a36bbdca3dae..9384a0a20591 100644 --- a/sw/qa/unit/data/sw-dialogs-test_2.txt +++ b/sw/qa/unit/data/sw-dialogs-test_2.txt @@ -44,7 +44,6 @@ modules/swriter/ui/selectautotextdialog.ui modules/swriter/ui/selectblockdialog.ui modules/swriter/ui/selectindexdialog.ui modules/swriter/ui/selecttabledialog.ui -modules/swriter/ui/sidebarpage.ui modules/swriter/ui/sidebarstylepresets.ui modules/swriter/ui/sidebartheme.ui modules/swriter/ui/sidebarwrap.ui diff --git a/sw/uiconfig/swriter/ui/sidebarpage.ui b/sw/uiconfig/swriter/ui/sidebarpage.ui deleted file mode 100644 index d70a3e442dbe.. --- a/sw/uiconfig/swriter/ui/sidebarpage.ui +++ /dev/null @@ -1,131 +0,0 @@ - - - - - - -True -False -True -True - - -True -False -True -6 -6 -6 -True - - -True -False -center - - -True -False -True -Orientation -.uno:Orientation -True - - -False -True - - - - -1 -0 - - - - -True -False -False - - -True -False -True -Size -.uno:AttributePageSize -toolbutton3 -True - - -False -True - - - - -0 -0 - - - - -True -False -end -False - - -True -False -True -Columns -.uno:PageColumnType -toolbutton4 -True - - -False -True - - - - -3 -0 - - - - -True -False -center - - -True -False -True -Margin -.uno:PageMargin -toolbutton2 -True - - -False -True - - - - -2 -0 - - - - -0 -0 - - - - diff --git a/test/source/screenshot_test.cxx b/test/source/screenshot_test.cxx index ad63f98b8809.
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8e54d361d948278d69147a687561bfd1303da139 Author: Olivier Hallot AuthorDate: Fri Dec 20 10:33:22 2019 -0300 Commit: Gerrit Code Review CommitDate: Fri Dec 20 14:39:48 2019 +0100 Update git submodules * Update helpcontent2 from branch 'master' - tdf#129505 Add localized images for impress remote Community is invited to supply their own localized images. Default is en-US Change-Id: I8c179473df279a9a686068dc17afa060ac675125 Reviewed-on: https://gerrit.libreoffice.org/85605 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 6707900d671e..360b08083df3 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 6707900d671ea0fec291453f034188132ae43547 +Subproject commit 360b08083df38a025a2fdbb1dfbcddd1b4ec174c ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Yiğit Demiralp license statement
All of my past & future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: reportdesign/source
reportdesign/source/filter/xml/xmlExport.hxx |2 --
1 file changed, 2 deletions(-)
New commits:
commit 627d757f8d912833cb2b62432e2d3c488e4f553b
Author: Noel Grandin
AuthorDate: Wed Dec 18 14:19:16 2019 +0200
Commit: Noel Grandin
CommitDate: Fri Dec 20 13:54:04 2019 +0100
loplugin:duplicate-defines
already in reportdesign/source/filter/xml/xmlEnums.hxx
Change-Id: I323b8d778a673a7dd82ca758133d955afc694b3a
Reviewed-on: https://gerrit.libreoffice.org/85570
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/reportdesign/source/filter/xml/xmlExport.hxx
b/reportdesign/source/filter/xml/xmlExport.hxx
index 97355c888158..f45b8e65171d 100644
--- a/reportdesign/source/filter/xml/xmlExport.hxx
+++ b/reportdesign/source/filter/xml/xmlExport.hxx
@@ -57,8 +57,6 @@ using namespace css::io;
using namespace css::xml::sax;
-#define PROGRESS_BAR_STEP 20
-
class ORptExport : public SvXMLExport
{
public:
___
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/unit/helper/qahelper.hxx |7 +--
sc/qa/unit/helper/scqahelperdllapi.h | 23 +++
sc/qa/unit/helper/xpath.hxx |7 +--
3 files changed, 25 insertions(+), 12 deletions(-)
New commits:
commit 5687a2ec116071a5062fc8ae5494f6c351c9e4ac
Author: Noel Grandin
AuthorDate: Wed Dec 18 10:26:29 2019 +0200
Commit: Noel Grandin
CommitDate: Fri Dec 20 13:45:59 2019 +0100
loplugin:duplicate-defines
move these into their own file, the way we do elsewhere
Change-Id: Ib97e09c80537e31d795a8c66a6dfb06b350ff0e2
Reviewed-on: https://gerrit.libreoffice.org/85560
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sc/qa/unit/helper/qahelper.hxx b/sc/qa/unit/helper/qahelper.hxx
index 3e8e5d455484..4cf5ddea1a40 100644
--- a/sc/qa/unit/helper/qahelper.hxx
+++ b/sc/qa/unit/helper/qahelper.hxx
@@ -20,6 +20,7 @@
#include
#include
+#include "scqahelperdllapi.h"
#include
#include
@@ -30,12 +31,6 @@
namespace utl { class TempFile; }
-#if defined(SCQAHELPER_DLLIMPLEMENTATION)
-#define SCQAHELPER_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
-#else
-#define SCQAHELPER_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
-#endif
-
#define ODS_FORMAT_TYPE (SfxFilterFlags::IMPORT | SfxFilterFlags::EXPORT
| SfxFilterFlags::TEMPLATE | SfxFilterFlags::OWN | SfxFilterFlags::DEFAULT |
SfxFilterFlags::ENCRYPTION | SfxFilterFlags::PASSWORDTOMODIFY)
#define XLS_FORMAT_TYPE (SfxFilterFlags::IMPORT | SfxFilterFlags::EXPORT
| SfxFilterFlags::ALIEN | SfxFilterFlags::ENCRYPTION |
SfxFilterFlags::PASSWORDTOMODIFY | SfxFilterFlags::PREFERED)
#define XLSX_FORMAT_TYPE (SfxFilterFlags::IMPORT | SfxFilterFlags::EXPORT
| SfxFilterFlags::ALIEN | SfxFilterFlags::STARONEFILTER |
SfxFilterFlags::PREFERED)
diff --git a/sc/qa/unit/helper/scqahelperdllapi.h
b/sc/qa/unit/helper/scqahelperdllapi.h
new file mode 100644
index ..216ccc0146f1
--- /dev/null
+++ b/sc/qa/unit/helper/scqahelperdllapi.h
@@ -0,0 +1,23 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * 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/.
+ */
+
+#ifndef INCLUDED_SC_QA_UNIT_HELPER_DLLAPI_H
+#define INCLUDED_SC_QA_UNIT_HELPER_DLLAPI_H
+
+#include
+
+#if defined(SCQAHELPER_DLLIMPLEMENTATION)
+#define SCQAHELPER_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+#define SCQAHELPER_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/qa/unit/helper/xpath.hxx b/sc/qa/unit/helper/xpath.hxx
index 39813bea85cd..16d0fec07f25 100644
--- a/sc/qa/unit/helper/xpath.hxx
+++ b/sc/qa/unit/helper/xpath.hxx
@@ -14,6 +14,7 @@
#include
#include
+#include "scqahelperdllapi.h"
#include
@@ -23,12 +24,6 @@ namespace utl { class TempFile; }
class ScDocShell;
class SvStream;
-#if defined(SCQAHELPER_DLLIMPLEMENTATION)
-#define SCQAHELPER_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
-#else
-#define SCQAHELPER_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
-#endif
-
using namespace com::sun::star;
class ScBootstrapFixture;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: reportdesign/inc
reportdesign/inc/strings.hrc |5 -
1 file changed, 5 deletions(-)
New commits:
commit 638a76630f06910f29359ae983c41e19dbcb725e
Author: Noel Grandin
AuthorDate: Wed Dec 18 14:18:25 2019 +0200
Commit: Noel Grandin
CommitDate: Fri Dec 20 13:35:11 2019 +0100
loplugin:duplicate-defines
duplicates in same file
Change-Id: I9ff404656620b28da13b6658f9a60e2e920aa953
Reviewed-on: https://gerrit.libreoffice.org/85569
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/reportdesign/inc/strings.hrc b/reportdesign/inc/strings.hrc
index 0856156447d0..87eae041d6e4 100644
--- a/reportdesign/inc/strings.hrc
+++ b/reportdesign/inc/strings.hrc
@@ -169,13 +169,8 @@
#define RID_STR_FUNCTIONS NC_("RID_STR_FUNCTIONS",
"Functions")
#define RID_STR_GROUPS NC_("RID_STR_GROUPS", "Groups")
-#define RID_STR_DETAIL NC_("RID_STR_DETAIL", "Detail")
-#define RID_STR_PAGE_HEADER NC_("RID_STR_PAGE_HEADER", "Page
Header")
-#define RID_STR_PAGE_FOOTER NC_("RID_STR_PAGE_FOOTER", "Page
Footer")
#define RID_STR_GROUP_HEADERNC_("RID_STR_GROUP_HEADER", "Group
Header")
#define RID_STR_GROUP_FOOTERNC_("RID_STR_GROUP_FOOTER", "Group
Footer")
-#define RID_STR_REPORT_HEADER NC_("RID_STR_REPORT_HEADER",
"Report Header")
-#define RID_STR_REPORT_FOOTER NC_("RID_STR_REPORT_FOOTER",
"Report Footer")
#define RID_STR_ERROR_WRONG_ARGUMENT
NC_("RID_STR_ERROR_WRONG_ARGUMENT", "You tried to set an illegal argument.
Please have a look at '#1' for valid arguments.")
#define RID_STR_ARGUMENT_IS_NULLNC_("RID_STR_ARGUMENT_IS_NULL",
"The element is invalid.")
#define RID_STR_FIXEDTEXT NC_("RID_STR_FIXEDTEXT", "Label
field")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/unoprnms.hxx |9 - sw/source/core/access/accpara.cxx |1 + 2 files changed, 1 insertion(+), 9 deletions(-) New commits: commit 104007387c8bd68bcf1a3f876df9e993948f37da Author: Noel Grandin AuthorDate: Wed Dec 18 11:17:25 2019 +0200 Commit: Noel Grandin CommitDate: Fri Dec 20 13:33:53 2019 +0100 loplugin:duplicate-defines already defined in include/editeng/unoprnms.hxx Change-Id: I65457d8a98861e5164722b04b4f9acef9c1385a6 Reviewed-on: https://gerrit.libreoffice.org/85565 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx index 5d4035aada55..fdcc88442bc4 100644 --- a/sw/inc/unoprnms.hxx +++ b/sw/inc/unoprnms.hxx @@ -83,9 +83,6 @@ #define UNO_NAME_CHAR_FONT_FAMILY "CharFontFamily" #define UNO_NAME_CHAR_FONT_CHAR_SET "CharFontCharSet" #define UNO_NAME_CHAR_FONT_PITCH "CharFontPitch" -#define UNO_NAME_CHAR_POSTURE "CharPosture" -#define UNO_NAME_CHAR_WEIGHT "CharWeight" -#define UNO_NAME_CHAR_HEIGHT "CharHeight" #define UNO_NAME_CHAR_LOCALE "CharLocale" #define UNO_NAME_CHAR_FONT_NAME_ASIAN "CharFontNameAsian" #define UNO_NAME_CHAR_FONT_STYLE_NAME_ASIAN "CharFontStyleNameAsian" @@ -106,12 +103,10 @@ #define UNO_NAME_CHAR_HEIGHT_COMPLEX "CharHeightComplex" #define UNO_NAME_CHAR_LOCALE_COMPLEX "CharLocaleComplex" #define UNO_NAME_CHAR_AUTO_KERNING "CharAutoKerning" -#define UNO_NAME_CHAR_UNDERLINE "CharUnderline" #define UNO_NAME_CHAR_UNDERLINE_COLOR "CharUnderlineColor" #define UNO_NAME_CHAR_UNDERLINE_HAS_COLOR "CharUnderlineHasColor" #define UNO_NAME_CHAR_ESCAPEMENT "CharEscapement" #define UNO_NAME_CHAR_CASE_MAP "CharCaseMap" -#define UNO_NAME_CHAR_SHADOWED "CharShadowed" #define UNO_NAME_CHAR_STRIKEOUT "CharStrikeout" #define UNO_NAME_CHAR_CROSSED_OUT "CharCrossedOut" #define UNO_NAME_CHAR_NO_HYPHENATION "CharNoHyphenation" @@ -123,7 +118,6 @@ #define UNO_NAME_CHAR_PROP_HEIGHT_COMPLEX "CharPropHeightComplex" #define UNO_NAME_CHAR_DIFF_HEIGHT_COMPLEX "CharDiffHeightComplex" #define UNO_NAME_CHAR_ESCAPEMENT_HEIGHT "CharEscapementHeight" -#define UNO_NAME_CHAR_COLOR "CharColor" #define UNO_NAME_HIDE_TAB_LEADER_AND_PAGE_NUMBERS "HideTabLeaderAndPageNumber" #define UNO_NAME_TAB_IN_TOC "TabInTOC" #define UNO_NAME_TOC_BOOKMARK "TOCBookmark" @@ -148,7 +142,6 @@ #define UNO_NAME_BEGIN_NOTICE "BeginNotice" #define UNO_NAME_FRAME_STYLE_NAME "FrameStyleName" #define UNO_NAME_NUMBERING_STYLE_NAME "NumberingStyleName" -#define UNO_NAME_NUMBERING_LEVEL "NumberingLevel" #define UNO_NAME_NUMBERING_START_VALUE "NumberingStartValue" #define UNO_NAME_NUMBERING_IS_NUMBER "NumberingIsNumber" #define UNO_NAME_COUNT_LINES_IN_FRAMES "CountLinesInFrames" @@ -281,7 +274,6 @@ #define UNO_NAME_PARA_SPLIT "ParaSplit" #define UNO_NAME_NUMBER_FORMAT "NumberFormat" #define UNO_NAME_NUMBERING_TYPE "NumberingType" -#define UNO_NAME_NUMBERING_RULES "NumberingRules" #define UNO_NAME_OFFSET "Offset" #define UNO_NAME_ON "On" #define UNO_NAME_OPAQUE "Opaque" @@ -547,7 +539,6 @@ #define UNO_NAME_GAMMA "Gamma" #define UNO_NAME_GRAPHIC_IS_INVERTED "GraphicIsInverted" #define UNO_NAME_TRANSPARENCY "Transparency" -#define UNO_NAME_GRAPHIC_COLOR_MODE "GraphicColorMode" #define UNO_NAME_REDLINE_AUTHOR "RedlineAuthor" #define UNO_NAME_REDLINE_DATE_TIME "RedlineDateTime" #define UNO_NAME_REDLINE_COMMENT "RedlineComment" diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx index 1df390906ce9..331cc1a7c2fd 100644 --- a/sw/source/core/access/accpara.cxx +++ b/sw/source/core/access/accpara.cxx @@ -72,6 +72,7 @@ #include #include #include +#include #include #include #include ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/CODE-4.2.0-2'
Tag 'CODE-4.2.0-2' created by Andras Timar at 2019-12-20 12:32 + CODE-4.2.0-2 Changes since co-6.2-2-22: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/CODE-4.2.0-2'
Tag 'CODE-4.2.0-2' created by Andras Timar at 2019-12-20 12:32 + CODE-4.2.0-2 Changes since co-6.2-2-2: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/CODE-4.2.0-2'
Tag 'CODE-4.2.0-2' created by Andras Timar at 2019-12-20 12:32 + CODE-4.2.0-2 Changes since co-6.2-2: Andras Timar (1): Use Italian dictionaries for it-CH locale as well --- it_IT/dictionaries.xcu |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/CODE-4.2.0-2'
Tag 'CODE-4.2.0-2' created by Andras Timar at 2019-12-20 12:32 + CODE-4.2.0-2 Changes since co-6.2-2: Pedro Silva (1): [cp] Update CSS for Search button --- help3xsl/default.css | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Changes to 'refs/tags/CODE-4.2.0-2'
Tag 'CODE-4.2.0-2' created by Andras Timar at 2019-12-20 12:30 + CODE-4.2.0-2 Changes since CODE-4.2.0-1-47: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sw/inc sw/source
sw/inc/cmdid.h | 15 --- sw/source/filter/html/swhtml.cxx |1 + sw/source/filter/html/swhtml.hxx |1 - 3 files changed, 9 insertions(+), 8 deletions(-) New commits: commit ee6ce44b4227a9a84b962b458e2209b39e26dc73 Author: Noel Grandin AuthorDate: Wed Dec 18 11:56:00 2019 +0200 Commit: Noel Grandin CommitDate: Fri Dec 20 13:28:50 2019 +0100 loplugin:duplicate-defines already defined in wrthtml.hxx, randomly chose a place to keep it Change-Id: I8aa1d20bee04a5c1e5919b593e6befddb593f18a Reviewed-on: https://gerrit.libreoffice.org/85566 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index ddafcc9f0cee..845ca782f394 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -106,6 +106,7 @@ #include #include "htmlnum.hxx" #include "swhtml.hxx" +#include "wrthtml.hxx" #include #include #include diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx index d4f9876e3ab6..c8d58de80b6a 100644 --- a/sw/source/filter/html/swhtml.hxx +++ b/sw/source/filter/html/swhtml.hxx @@ -55,7 +55,6 @@ struct SwPending; class SvxCSS1PropertyInfo; struct ImplSVEvent; -#define HTML_PARSPACE (MM50) #define HTML_CJK_PARSPACE (MM50/2) #define HTML_CTL_PARSPACE (MM50/2) commit c3f9eba777a508f4fb0bfd5cbe2cbfb399366caa Author: Noel Grandin AuthorDate: Wed Dec 18 10:43:59 2019 +0200 Commit: Noel Grandin CommitDate: Fri Dec 20 13:28:38 2019 +0100 loplugin:duplicate-defines Change-Id: I38694d03dbe2e5d8eba94e2d2a490db7b91efaad Reviewed-on: https://gerrit.libreoffice.org/85563 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h index f382e820cf0b..30663dbbe670 100644 --- a/sw/inc/cmdid.h +++ b/sw/inc/cmdid.h @@ -21,24 +21,25 @@ #define INCLUDED_SW_INC_CMDID_H #include +#include #include #define FN_FILE SID_SW_START -#define FN_EDIT (SID_SW_START + 100) +//#define FN_EDIT (SID_SW_START + 100) defined in svxids.hrc #define FN_VIEW (SID_SW_START + 200) -#define FN_INSERT (SID_SW_START + 300) -#define FN_FORMAT (SID_SW_START + 400) -#define FN_EXTRA(SID_SW_START + 600) -#define FN_SELECTION(SID_SW_START + 900) +//#define FN_INSERT (SID_SW_START + 300) defined in svxids.hrc +//#define FN_FORMAT (SID_SW_START + 400) defined in svxids.hrc +//#define FN_EXTRA(SID_SW_START + 600) defined in svxids.hrc +//#define FN_SELECTION(SID_SW_START + 900) defined in svxids.hrc #define FN_QUERY(SID_SW_START + 1000) #define FN_ENVELP (SID_SW_START + 1050) #define FN_PARAM(SID_SW_START + 1100) #define FN_STAT (SID_SW_START + 1180) -#define FN_PGPREVIEW(SID_SW_START + 1250) +//#define FN_PGPREVIEW(SID_SW_START + 1250) defined in svxids.hrc #define FN_FRAME(SID_SW_START + 1300) #define FN_INSERT2 (SID_SW_START + 1400) #define FN_FORMAT2 (SID_SW_START + 1600) -#define FN_EDIT2(SID_SW_START + 1800) +//#define FN_EDIT2(SID_SW_START + 1800) defined in svxids.hrc #define FN_QUERY2 (SID_SW_START + 2000) #define FN_EXTRA2 (SID_SW_START + 2200) #define FN_PARAM2 (SID_SW_START + 2400) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
HELP: Problem with XModifyListener
Hi Team, I am developing an extension for LibreOffice in Java and facing a strange issue with XModifyListener. I wanted to capture cell data change event and implemented XModifyListener in my application. i do some formatting of the cell if modified. Problem here is - it seems like "*modified()*" method of XModifyListener gets called even when the sheet is changed. So even if sheet is changed, my cell is getting the formatting which is not required. is there a way i can get the type of the event whether it is a sheetChange or CellChange or etc Please suggest, i am a kind of stuck in this from long time. -- Best Regards, Harish Kumar.B ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/layer/tile/TileLayer.js |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit a7791ceb0f8bfb376b59ccdd0d50c7d5745b31fe
Author: Michael Meeks
AuthorDate: Fri Dec 20 11:40:32 2019 +
Commit: Michael Meeks
CommitDate: Fri Dec 20 13:15:34 2019 +0100
focus: try to get focus to agree with the browser.
Setting _isFocused on the wrong object - still plenty of
unpleasant focus issues to solve however.
Change-Id: I519c495cca6624f2cd6f63c38b23cf5be07db10e
Reviewed-on: https://gerrit.libreoffice.org/85593
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Michael Meeks
diff --git a/loleaflet/src/layer/tile/TileLayer.js
b/loleaflet/src/layer/tile/TileLayer.js
index 0a3d848b0..8d31a7647 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -1115,7 +1115,7 @@ L.TileLayer = L.GridLayer.extend({
.openOn(this._map);
}
- if (!this._map._isFocused && (modifierViewId === this._viewId)
&& (this._map.getWinId === 0) && (this._map._permission === 'edit')) {
+ if (!this._isFocused && (modifierViewId === this._viewId) &&
(this._map.getWinId === 0) && (this._map._permission === 'edit')) {
// Regain cursor if we had been out of focus and now
have input.
// (only if it is our own cursor and the input is
actually not
// going into a dialog)
@@ -2090,7 +2090,7 @@ L.TileLayer = L.GridLayer.extend({
}
this._map._textInput.showCursor();
- if (this._map._isFocused && !L.Browser.mobile) {
+ if (this._isFocused /* && !L.Browser.mobile */) {
// On mobile, this is causing some key input to get
lost.
this._map.focus();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/inc
sw/inc/unoprnms.hxx |1 - 1 file changed, 1 deletion(-) New commits: commit d83b9f18c695dfec47293f9673cb810554e18de9 Author: Noel Grandin AuthorDate: Wed Dec 18 10:43:47 2019 +0200 Commit: Noel Grandin CommitDate: Fri Dec 20 12:46:41 2019 +0100 loplugin:duplicate-defines duplicate in same file Change-Id: I2268acd050bb5b7a35300f92b99b3803666c7ecb Reviewed-on: https://gerrit.libreoffice.org/85562 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx index fa20045add15..5d4035aada55 100644 --- a/sw/inc/unoprnms.hxx +++ b/sw/inc/unoprnms.hxx @@ -388,7 +388,6 @@ #define UNO_NAME_HEADER_HEIGHT "HeaderHeight" #define UNO_NAME_HEADER_IS_ON "HeaderIsOn" #define UNO_NAME_FOOTER_BACK_COLOR "FooterBackColor" -#define UNO_NAME_FOOTER_GRAPHIC "FooterBackGraphic" #define UNO_NAME_FOOTER_BACK_TRANSPARENT "FooterBackTransparent" #define UNO_NAME_FOOTER_LEFT_BORDER "FooterLeftBorder" #define UNO_NAME_FOOTER_RIGHT_BORDER "FooterRightBorder" ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/app/scmod.cxx |5 +
sc/source/ui/unoobj/appluno.cxx |4
sc/source/ui/view/viewfunc.cxx |4
3 files changed, 1 insertion(+), 12 deletions(-)
New commits:
commit 5f69e451a01e92ff37bc26805b0bbf3663f60575
Author: Noel Grandin
AuthorDate: Wed Dec 18 10:26:54 2019 +0200
Commit: Noel Grandin
CommitDate: Fri Dec 20 12:44:06 2019 +0100
loplugin:duplicate-defines
just include the header file which has a shared definition
Change-Id: I7412cc2c87ab1c757a82ac3f307a3a07c3289980
Reviewed-on: https://gerrit.libreoffice.org/85561
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index dfc13e4a0b8f..ac15258da6a3 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -87,6 +87,7 @@
#include
#include
#include
+#include
#define ShellClass_ScModule
#include
@@ -683,10 +684,6 @@ const ScDocOptions& ScModule::GetDocOptions()
return *m_pDocCfg;
}
-#ifndef LRU_MAX
-#define LRU_MAX 10
-#endif
-
void ScModule::InsertEntryToLRUList(sal_uInt16 nFIndex)
{
if(nFIndex != 0)
diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx
index a2c9c2c9e227..a0628fb8e132 100644
--- a/sc/source/ui/unoobj/appluno.cxx
+++ b/sc/source/ui/unoobj/appluno.cxx
@@ -42,10 +42,6 @@
using namespace com::sun::star;
-// Number of last used functions, which are saved
-//! Combine define with funcpage.hxx and dwfunctr.hxx !!!
-#define LRU_MAX 10
-
// Special value for zoom
//! somewhere central
#define SC_ZOOMVAL_OPTIMAL (-1)
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index 34ab3558c791..7d5e99686ca6 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -275,10 +275,6 @@ bool ScViewFunc::SelectionEditable( bool*
pOnlyNotBecauseOfMatrix /* = NULL */ )
return bRet;
}
-#ifndef LRU_MAX
-#define LRU_MAX 10
-#endif
-
static bool lcl_FunctionKnown( sal_uInt16 nOpCode )
{
const ScFunctionList* pFuncList = ScGlobal::GetStarCalcFunctionList();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/inc
sc/inc/unonames.hxx |2 -- 1 file changed, 2 deletions(-) New commits: commit 137131842f34de41eddfa5c17768c26b30ef9404 Author: Noel Grandin AuthorDate: Wed Dec 18 10:06:54 2019 +0200 Commit: Noel Grandin CommitDate: Fri Dec 20 12:37:56 2019 +0100 loplugin:duplicate-defines duplicates in same file Change-Id: I3f700bf3d7641f544f007a2a662a414a579156e4 Reviewed-on: https://gerrit.libreoffice.org/85559 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/sc/inc/unonames.hxx b/sc/inc/unonames.hxx index 6fb5051ec249..9a71377ff116 100644 --- a/sc/inc/unonames.hxx +++ b/sc/inc/unonames.hxx @@ -621,7 +621,6 @@ // data pilot descriptor #define SC_UNO_DP_IGNORE_EMPTYROWS "IgnoreEmptyRows" -#define SC_UNO_DP_REPEATEMPTY "RepeatIfEmpty" #define SC_UNO_DP_DRILLDOWN"DrillDownOnDoubleClick" #define SC_UNO_DP_SHOWFILTER "ShowFilterButton" #define SC_UNO_DP_IMPORTDESC "ImportDescriptor" @@ -677,7 +676,6 @@ #define SC_UNONAME_ROLE "Role" #define SC_UNONAME_HIDDENVALUES "HiddenValues" #define SC_UNONAME_INCLUDEHIDDENCELLS "IncludeHiddenCells" -#define SC_UNONAME_HIDDENVALUES "HiddenValues" #define SC_UNONAME_USE_INTERNAL_DATA_PROVIDER "UseInternalDataProvider" #define SC_UNONAME_HAS_STRING_LABEL "HasStringLabel" #define SC_UNONAME_TIME_BASED "TimeBased" ___ 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.2' - sfx2/source
sfx2/source/view/viewsh.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 3b4be91f44492d7ec7658684f130b4f1779e70d9
Author: Henry Castro
AuthorDate: Wed Dec 18 21:17:29 2019 -0400
Commit: Henry Castro
CommitDate: Fri Dec 20 12:36:09 2019 +0100
lok: ReleaseLOKNotifier only if view shell is assigned to a view frame
There is an interesting case with the dialog SwMultiTOXTabDialog
it creates a temporary frame-controller-view and when closing
the dialog the LOKNotifier was already released, and of course
the "close" message is not sent to the client side.
Change-Id: Ie6877d077f8fad3e5893be9e1d5f7a337a38c9c8
Reviewed-on: https://gerrit.libreoffice.org/85461
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Henry Castro
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index 0a6fc164081d..1a022e49f7b2 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -1110,7 +1110,7 @@ SfxViewShell::~SfxViewShell()
}
vcl::Window* pFrameWin = GetViewFrame()->GetWindow().GetFrameWindow();
-if (pFrameWin && pFrameWin->GetLOKNotifier())
+if (pFrameWin && pFrameWin->GetLOKNotifier() == this)
pFrameWin->ReleaseLOKNotifier();
}
@@ -1119,7 +1119,7 @@ bool SfxViewShell::PrepareClose
bool bUI // TRUE: Allow Dialog and so on, FALSE: silent-mode
)
{
-if (GetViewFrame()->GetWindow().GetLOKNotifier())
+if (GetViewFrame()->GetWindow().GetLOKNotifier() == this)
GetViewFrame()->GetWindow().ReleaseLOKNotifier();
SfxPrinter *pPrinter = GetPrinter();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/qa
oox/qa/unit/drawingml.cxx |5 - 1 file changed, 5 deletions(-) New commits: commit ffa83824886c325b7a75100ae403efd6e5e9bda7 Author: Miklos Vajna AuthorDate: Thu Dec 19 21:04:59 2019 +0100 Commit: Miklos Vajna CommitDate: Fri Dec 20 12:33:40 2019 +0100 CppunitTest_oox_drawingml: remove unneeded includes Change-Id: I33c524a3991fc3de226ebee3cc98ced18fb74886 Reviewed-on: https://gerrit.libreoffice.org/85547 Tested-by: Jenkins Reviewed-by: Miklos Vajna diff --git a/oox/qa/unit/drawingml.cxx b/oox/qa/unit/drawingml.cxx index e3c455c04867..f7fa171ff1ab 100644 --- a/oox/qa/unit/drawingml.cxx +++ b/oox/qa/unit/drawingml.cxx @@ -12,15 +12,10 @@ #include #include -#include #include #include -#include #include -#include -#include -#include #include #include ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - include/svx svx/source sw/inc
include/svx/sidebar/LinePropertyPanelBase.hxx |2 --
svx/source/sidebar/line/LinePropertyPanel.hxx |2 --
svx/source/sidebar/line/LineWidthPopup.cxx|2 +-
sw/inc/unoprnms.hxx |1 -
4 files changed, 1 insertion(+), 6 deletions(-)
New commits:
commit c8334639bfbacd85288571e2650b3341aa38bbbd
Author: Noel Grandin
AuthorDate: Wed Dec 18 10:04:46 2019 +0200
Commit: Noel Grandin
CommitDate: Fri Dec 20 12:27:18 2019 +0100
loplugin:duplicate-defines
duplicate in same file
Change-Id: If3b285595859f1bd8f5e04ca3b81e6727a7d633d
Reviewed-on: https://gerrit.libreoffice.org/85558
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx
index d324be62bf0a..fa20045add15 100644
--- a/sw/inc/unoprnms.hxx
+++ b/sw/inc/unoprnms.hxx
@@ -375,7 +375,6 @@
#define UNO_NAME_FOOTER_TEXT_LEFT "FooterTextLeft"
#define UNO_NAME_FOOTER_TEXT_RIGHT "FooterTextRight"
#define UNO_NAME_HEADER_BACK_COLOR "HeaderBackColor"
-#define UNO_NAME_HEADER_GRAPHIC "HeaderBackGraphic"
#define UNO_NAME_HEADER_BACK_TRANSPARENT "HeaderBackTransparent"
#define UNO_NAME_HEADER_LEFT_BORDER "HeaderLeftBorder"
#define UNO_NAME_HEADER_RIGHT_BORDER "HeaderRightBorder"
commit 337665f7e45258fac57ab034f500672eb5aaec2f
Author: Noel Grandin
AuthorDate: Wed Dec 18 09:21:41 2019 +0200
Commit: Noel Grandin
CommitDate: Fri Dec 20 12:27:11 2019 +0100
loplugin:duplicate-defines
only used in one place, so just inline it
Change-Id: I198dd22888beab4c7b72e053943d337c9123a03a
Reviewed-on: https://gerrit.libreoffice.org/85554
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/svx/sidebar/LinePropertyPanelBase.hxx
b/include/svx/sidebar/LinePropertyPanelBase.hxx
index d12ddbdc7b53..c19061877cef 100644
--- a/include/svx/sidebar/LinePropertyPanelBase.hxx
+++ b/include/svx/sidebar/LinePropertyPanelBase.hxx
@@ -44,8 +44,6 @@ class ListBox;
class ToolBox;
class FloatingWindow;
-#define SIDEBAR_LINE_WIDTH_GLOBAL_VALUE "PopupPanel_LineWidth"
-
namespace sfx2 { namespace sidebar {
class SidebarToolBox;
diff --git a/svx/source/sidebar/line/LinePropertyPanel.hxx
b/svx/source/sidebar/line/LinePropertyPanel.hxx
index be8406a3c8c9..5ad1c850cd26 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.hxx
+++ b/svx/source/sidebar/line/LinePropertyPanel.hxx
@@ -43,8 +43,6 @@ class ListBox;
class ToolBox;
class FloatingWindow;
-#define SIDEBAR_LINE_WIDTH_GLOBAL_VALUE "PopupPanel_LineWidth"
-
namespace svx
{
namespace sidebar
diff --git a/svx/source/sidebar/line/LineWidthPopup.cxx
b/svx/source/sidebar/line/LineWidthPopup.cxx
index 8df03806ad1e..d4964d3642e6 100644
--- a/svx/source/sidebar/line/LineWidthPopup.cxx
+++ b/svx/source/sidebar/line/LineWidthPopup.cxx
@@ -174,7 +174,7 @@ void LineWidthPopup::SetWidthSelect(long lValue, bool
bValuable, MapUnit eMapUni
m_bVSFocus = true;
m_xVSWidth->SetSelItem(0);
m_eMapUnit = eMapUnit;
-SvtViewOptions aWinOpt( EViewType::Window, SIDEBAR_LINE_WIDTH_GLOBAL_VALUE
);
+SvtViewOptions aWinOpt( EViewType::Window, "PopupPanel_LineWidth" );
if (aWinOpt.Exists())
{
css::uno::Sequence aSeq =
aWinOpt.GetUserData();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: lotuswordpro/inc
lotuswordpro/inc/lwpfoundry.hxx |1 -
1 file changed, 1 deletion(-)
New commits:
commit 75a665874afa5b12a0e3e84d61baf286786578f1
Author: Noel Grandin
AuthorDate: Wed Dec 18 09:20:55 2019 +0200
Commit: Noel Grandin
CommitDate: Fri Dec 20 12:21:06 2019 +0100
loplugin:duplicate-defines
already defined in lwpobjtags.hxx
Change-Id: I6ef609c82a38d5b6503dbec2ac3f34def99590f6
Reviewed-on: https://gerrit.libreoffice.org/85552
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/lotuswordpro/inc/lwpfoundry.hxx b/lotuswordpro/inc/lwpfoundry.hxx
index ae91294885b2..a625ac6ff50f 100644
--- a/lotuswordpro/inc/lwpfoundry.hxx
+++ b/lotuswordpro/inc/lwpfoundry.hxx
@@ -75,7 +75,6 @@ class LwpBookMark;
#include
#include
-#define TAG_USER_VERSION0x72655655UL// "UVer"
class LwpVersionManager
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/filter/xml/xmlExport.hxx |2 --
1 file changed, 2 deletions(-)
New commits:
commit 1b374c5bbb038b1d4c63a65b6ebcf8e0c244ea6f
Author: Noel Grandin
AuthorDate: Wed Dec 18 09:39:47 2019 +0200
Commit: Noel Grandin
CommitDate: Fri Dec 20 12:12:46 2019 +0100
loplugin:duplicate-defines
already defined in xmlEnums.hxx
Change-Id: I1840249c9e08721a3654d2c5eb4e4fa6468bf8d6
Reviewed-on: https://gerrit.libreoffice.org/85556
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/dbaccess/source/filter/xml/xmlExport.hxx
b/dbaccess/source/filter/xml/xmlExport.hxx
index dd795e3b8529..a1b9a2ed29e7 100644
--- a/dbaccess/source/filter/xml/xmlExport.hxx
+++ b/dbaccess/source/filter/xml/xmlExport.hxx
@@ -56,8 +56,6 @@ using namespace ::com::sun::star::text;
using namespace ::com::sun::star::io;
using namespace ::com::sun::star::xml::sax;
-#define PROGRESS_BAR_STEP 20
-
class ODBExport : public SvXMLExport
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - extensions/inc lotuswordpro/source
extensions/inc/helpids.h |1 lotuswordpro/source/filter/lwpbackgroundstuff.hxx | 75 -- 2 files changed, 1 insertion(+), 75 deletions(-) New commits: commit 5281a51fec425b06839a37e99036504c5c3f1d12 Author: Noel Grandin AuthorDate: Wed Dec 18 09:24:34 2019 +0200 Commit: Noel Grandin CommitDate: Fri Dec 20 12:12:26 2019 +0100 loplugin:duplicate-defines already in lwpstyledef.hxx Change-Id: I693982c50b3eebd47a843840dc01036e269b4e0e Reviewed-on: https://gerrit.libreoffice.org/8 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/lotuswordpro/source/filter/lwpbackgroundstuff.hxx b/lotuswordpro/source/filter/lwpbackgroundstuff.hxx index 424cc44950c1..442913713ec5 100644 --- a/lotuswordpro/source/filter/lwpbackgroundstuff.hxx +++ b/lotuswordpro/source/filter/lwpbackgroundstuff.hxx @@ -60,80 +60,7 @@ #ifndef INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPBACKGROUNDSTUFF_HXX #define INCLUDED_LOTUSWORDPRO_SOURCE_FILTER_LWPBACKGROUNDSTUFF_HXX #include - -/* background patterns */ -#define BACK_TRANSPARENT0 -#define BACK_FILL 1 -#define BACK_PATTERN2 -#define BACK_10PCTDOTS 3 -#define BACK_30PCTDOTS 4 -#define BACK_50PCTDOTS 5 -#define BACK_75PCTDOTS 6 -#define BACK_90PCTDOTS 7 -#define BACK_90PCTINVDOTS 8 -#define BACK_75PCTINVDOTS 9 -#define BACK_50PCTINVDOTS 10 -#define BACK_30PCTINVDOTS 11 -#define BACK_10PCTINVDOTS 12 -#define BACK_MARBLES13 -#define BACK_STARRYNIGHT14 -#define BACK_DIAGTHICK 15 -#define BACK_DIAGTHIN 16 -#define BACK_DIAGDOUBLE 17 -#define BACK_DIAGDOUBLENARROW 18 -#define BACK_DIAGTRIPLE 19 -#define BACK_DIAGSINGLEWIDE 20 -#define BACK_DIAGTHICKINV 21 -#define BACK_DIAGTHININV22 -#define BACK_DIAGDOUBLEINV 23 -#define BACK_DIAGDOUBLENARROWINV 24 -#define BACK_DIAGTRIPLEINV 25 -#define BACK_DIAGSINGLEWIDEINV 26 -#define BACK_CHAINLINKSMALLINV 27 -#define BACK_CHAINLINKSMALL 28 -#define BACK_CHAINLINKMEDIUM29 -#define BACK_CHAINLINKLARGE 30 -#define BACK_HORZSTRIPE131 -#define BACK_HORZSTRIPE232 -#define BACK_HORZSTRIPE333 -#define BACK_HORZSTRIPE434 -#define BACK_VERTSTRIPE135 -#define BACK_VERTSTRIPE236 -#define BACK_VERTSTRIPE337 -#define BACK_VERTSTRIPE438 -#define BACK_GRIDSMALL 39 -#define BACK_GRIDMEDIUM 40 -#define BACK_GRIDLARGE 41 -#define BACK_BOXDOT 42 -#define BACK_GOLFGREEN 43 -#define BACK_DITZ 44 -#define BACK_HORZWEAVE 45 -#define BACK_APPLEPIE 46 -#define BACK_BRICK 47 -#define BACK_DIAGBRICK 48 -#define BACK_CHECKER1 49 -#define BACK_CHECKER2 50 -#define BACK_CHECKER3 51 -#define BACK_CHECKER4 52 -#define BACK_CHECKER5 53 -#define BACK_SNOWFLAKE 54 -#define BACK_MARGARITA 55 -#define BACK_SIDEHARP 56 -#define BACK_SCALES 57 -#define BACK_TAYLOR 58 -#define BACK_BUBBLES59 -#define BACK_ARGYLE 60 -#define BACK_INDIAN161 -#define BACK_INDIAN362 -#define BACK_PEACHPIE 63 -#define BACK_GRADIENT1 64 -#define BACK_GRADIENT2 65 -#define BACK_GRADIENT3 66 -#define BACK_GRADIENT4 67 -#define BACK_GRADIENT5 68 -#define BACK_GRADIENT6 69 -#define BACK_GRADIENT7 70 -#define BACK_GRADIENT8 71 +#include "lwpstyledef.hxx" class XFBGImage; class LwpBackgroundStuff commit 7cf32b3b1e28b78009e6358cacd47f09b76d6796 Author: Noel Grandin AuthorDate: Wed Dec 18 09:21:16 2019 +0200 Commit: Noel Grandin CommitDate: Fri Dec 20 12:12:14 2019 +0100 loplugin:duplicate-defines duplicate in same file Change-Id: I08d713fa48bd603def0d87844bb8d6cbf327ffdc Reviewed-on: https://gerrit.libreoffice.org/85553 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/extensions/inc/helpids.h b/extensions/inc/helpids.h index 4b3d430b022e..1f55a0fd1995 100644 --- a/extensions/inc/helpids.h +++ b/extensions/inc/helpids.h @@ -158,7 +158,6 @@ #define HID_PROP_SPIN "EXTENSIONS_HID_PROP_SPIN" #define HID_PROP_STRICTFORMAT "EXTENSIONS_HID_PROP_STRICTFORMAT" #define HID_PROP_SHOWTHOUSANDSEP "EXTENSIONS_HID_PROP_SHOWTHOUSANDSEP" -#define HID_PROP_VERTICAL_ALIGN "EXTENSIONS_HID_PROP_VERTICAL_ALIGN" #define HID_PROP_PRINTABLE "EXTENSIONS_HID_PROP_PRINTABLE" #define HID_PROP_TARGET_URL "EXTENSIONS_HID_PROP_TARGET_URL" #define HID_PROP_TARGET_FRAME "EXTENSIONS_HID_PROP_TARGET_FRAME" ___ Libreoffice-commits mailing list libreoffice-
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/appl/workwin.cxx |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit fd603be25f4c86b5a17658a35f3be548252d912f Author: Marco Cecchetti AuthorDate: Thu Dec 19 12:22:59 2019 +0100 Commit: Tor Lillqvist CommitDate: Fri Dec 20 13:02:35 2019 +0200 tdf#129394: Create formula bar also in non-DESKTOP case Having SfxWorkWindow::bIsFullScreen set to true prevented the formula bar from being created. Change-Id: I17196aae270e67ab1eb960dd42f4ebb4e0ae86b1 Reviewed-on: https://gerrit.libreoffice.org/85522 Tested-by: Jenkins CollaboraOffice Reviewed-by: Tor Lillqvist (cherry picked from commit da91403315f76ae36da6db6729f5b2a2870e3aa2) diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx index c6d1da362a89..cb9680b94ae0 100644 --- a/sfx2/source/appl/workwin.cxx +++ b/sfx2/source/appl/workwin.cxx @@ -459,11 +459,10 @@ SfxWorkWindow::SfxWorkWindow( vcl::Window *pWin, SfxFrame *pFrm, SfxFrame* pMast bDockingAllowed(true), bInternalDockingAllowed(true), bAllChildrenVisible(true), -#if HAVE_FEATURE_DESKTOP bIsFullScreen( false ), +#if HAVE_FEATURE_DESKTOP bShowStatusBar( true ), #else -bIsFullScreen( sal_True ), bShowStatusBar( sal_False ), #endif m_nLock( 0 ), ___ 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.2' - sfx2/source
sfx2/source/appl/workwin.cxx |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit da91403315f76ae36da6db6729f5b2a2870e3aa2 Author: Marco Cecchetti AuthorDate: Thu Dec 19 12:22:59 2019 +0100 Commit: Tor Lillqvist CommitDate: Fri Dec 20 11:54:28 2019 +0100 tdf#129394: Create formula bar also in non-DESKTOP case Having SfxWorkWindow::bIsFullScreen set to true prevented the formula bar from being created. Change-Id: I17196aae270e67ab1eb960dd42f4ebb4e0ae86b1 Reviewed-on: https://gerrit.libreoffice.org/85522 Tested-by: Jenkins CollaboraOffice Reviewed-by: Tor Lillqvist diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx index 09d4a268397a..c7f84f557e7e 100644 --- a/sfx2/source/appl/workwin.cxx +++ b/sfx2/source/appl/workwin.cxx @@ -460,11 +460,10 @@ SfxWorkWindow::SfxWorkWindow( vcl::Window *pWin, SfxFrame *pFrm, SfxFrame* pMast bDockingAllowed(true), bInternalDockingAllowed(true), bAllChildrenVisible(true), -#if HAVE_FEATURE_DESKTOP bIsFullScreen( false ), +#if HAVE_FEATURE_DESKTOP bShowStatusBar( true ), #else -bIsFullScreen( sal_True ), bShowStatusBar( sal_False ), #endif m_nLock( 0 ), ___ 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.2' - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a3684b8408583d183ca829fc898d6c84fc7dd4e2 Author: Pedro Silva AuthorDate: Fri Dec 20 11:52:57 2019 +0100 Commit: Gerrit Code Review CommitDate: Fri Dec 20 11:53:23 2019 +0100 Update git submodules * Update helpcontent2 from branch 'distro/collabora/cp-6.2' - [cp] Update CSS for Search button Change-Id: I31d73820814c8587edbb75fdb26aaba62e6375aa diff --git a/helpcontent2 b/helpcontent2 index ed403e60c4ce..630c355b9bb5 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit ed403e60c4ce64e952c8f95c0f0db291cff2d1af +Subproject commit 630c355b9bb5f94ac9bd98d98f066730ae94fb2a ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Branch 'distro/collabora/cp-6.2' - help3xsl/default.css
help3xsl/default.css | 11 ++-
1 file changed, 6 insertions(+), 5 deletions(-)
New commits:
commit 630c355b9bb5f94ac9bd98d98f066730ae94fb2a
Author: Pedro Silva
AuthorDate: Fri Dec 20 11:52:57 2019 +0100
Commit: Andras Timar
CommitDate: Fri Dec 20 11:53:10 2019 +0100
[cp] Update CSS for Search button
Change-Id: I31d73820814c8587edbb75fdb26aaba62e6375aa
diff --git a/help3xsl/default.css b/help3xsl/default.css
index a4110e4a9..025f8a657 100644
--- a/help3xsl/default.css
+++ b/help3xsl/default.css
@@ -597,16 +597,17 @@ li.disabled a {
margin: 40px auto 0 auto;
}
.xapian-omega-search-button {
-background-color: #5c3de2;
-border: 3px solid #5c3de2;
+background: none;
+border: none;
border-radius: 8px;
-color: white;
-padding: 5px 30px;
+color: #5c3de2;
+padding: 0px 12px;
text-align: center;
text-decoration: none;
display: inline-block;
font-size: 24px;
-margin: 4px 10px;
+margin: 0px 10px;
+vertical-align: middle;
cursor: pointer;
}
.modules {
___
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.2' - writerfilter/CppunitTest_writerfilter_dmapper.mk writerfilter/Module_writerfilter.mk writerfilter/qa writerfilter/source
writerfilter/CppunitTest_writerfilter_dmapper.mk |
48 ++
writerfilter/Module_writerfilter.mk |
1
writerfilter/qa/cppunittests/dmapper/DomainMapperTableHandler.cxx|
76 ++
writerfilter/qa/cppunittests/dmapper/data/1cell-insidev-rightborder.docx
|binary
writerfilter/source/dmapper/DomainMapperTableHandler.cxx |
3
5 files changed, 127 insertions(+), 1 deletion(-)
New commits:
commit 56a3e2fa93fbd78a01c2830351fdcbf20c4b8375
Author: Miklos Vajna
AuthorDate: Thu Dec 19 17:54:08 2019 +0100
Commit: Miklos Vajna
CommitDate: Fri Dec 20 11:14:01 2019 +0100
DOCX table import: fix interaction of 1-cell rows and "inside" vertical
borders
The interesting part of the bugdoc was:
- table style wants visible borders
- table direct formatting clears left and right borders
- 1st row of the table has 1 cell (2 cells in fact, but they are
merged)
Fix the "inside" vertical border handling, so that the first cell gets
these vertical borders as a right border only in case there are multiple
cells.
(cherry picked from commit fd92740a86ab8e71e77d947d1d7dabc51a8d0794)
Change-Id: Id847109ecfa95d1745abe62ddf36c4936b730855
Reviewed-on: https://gerrit.libreoffice.org/85578
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Miklos Vajna
diff --git a/writerfilter/CppunitTest_writerfilter_dmapper.mk
b/writerfilter/CppunitTest_writerfilter_dmapper.mk
new file mode 100644
index ..fbb302297c94
--- /dev/null
+++ b/writerfilter/CppunitTest_writerfilter_dmapper.mk
@@ -0,0 +1,48 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, 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/.
+#
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,writerfilter_dmapper))
+
+$(eval $(call gb_CppunitTest_use_externals,writerfilter_dmapper,\
+ boost_headers \
+))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,writerfilter_dmapper, \
+writerfilter/qa/cppunittests/dmapper/DomainMapperTableHandler \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,writerfilter_dmapper, \
+comphelper \
+cppu \
+oox \
+sal \
+test \
+unotest \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,writerfilter_dmapper))
+
+$(eval $(call gb_CppunitTest_use_ure,writerfilter_dmapper))
+$(eval $(call gb_CppunitTest_use_vcl,writerfilter_dmapper))
+
+$(eval $(call gb_CppunitTest_use_rdb,writerfilter_dmapper,services))
+
+$(eval $(call gb_CppunitTest_use_custom_headers,writerfilter_dmapper,\
+ officecfg/registry \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,writerfilter_dmapper))
+
+# we need to explicitly depend on library writerfilter because it is not
implied
+# by a link relation
+$(call gb_CppunitTest_get_target,writerfilter_dmapper) : $(call
gb_Library_get_target,writerfilter)
+
+# vim: set noet sw=4 ts=4:
diff --git a/writerfilter/Module_writerfilter.mk
b/writerfilter/Module_writerfilter.mk
index 2fcb9e691078..b1d2157c4f64 100644
--- a/writerfilter/Module_writerfilter.mk
+++ b/writerfilter/Module_writerfilter.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_Module_add_targets,writerfilter,\
$(eval $(call gb_Module_add_slowcheck_targets,writerfilter,\
CppunitTest_writerfilter_rtftok \
CppunitTest_writerfilter_misc \
+CppunitTest_writerfilter_dmapper \
))
# vim: set noet sw=4 ts=4:
diff --git a/writerfilter/qa/cppunittests/dmapper/DomainMapperTableHandler.cxx
b/writerfilter/qa/cppunittests/dmapper/DomainMapperTableHandler.cxx
new file mode 100644
index ..c3b52060646b
--- /dev/null
+++ b/writerfilter/qa/cppunittests/dmapper/DomainMapperTableHandler.cxx
@@ -0,0 +1,76 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * 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/.
+ */
+
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+
+#include
+
+using namespace ::com::sun::star;
+
+namespace
+{
+/// Tests for writerfilter/source/dmapper/DomainMapperTableHandler.cxx.
+class Test : public test::BootstrapFixture, public unotest::MacrosTest
+{
+private:
+uno::Reference mxComponentContext;
+uno::Reference mxComponent;
+
+public:
+void setUp() override;
+void tearDown() override;
+uno::Reference& getComponent() { return mxComponent; }
+};
+
+void Test::setU
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/tdf123262_textFootnoteSeparators.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport5.cxx | 18
++
writerfilter/source/dmapper/DomainMapper.cxx| 28
+++---
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 14
-
writerfilter/source/dmapper/DomainMapper_Impl.hxx | 18
--
5 files changed, 52 insertions(+), 26 deletions(-)
New commits:
commit acb9d901009d026cb48e6a8b94e6200f05110504
Author: Justin Luth
AuthorDate: Fri Nov 29 22:10:27 2019 +0300
Commit: Miklos Vajna
CommitDate: Fri Dec 20 10:58:33 2019 +0100
tdf#123262 writerfilter: completely ignore footnote separators
... except for processing enough to observe the separator exists.
For each footnote reference, the entire footnote.xml file is
parsed every time. The text in the "separator" footnote was
being added to every footnote. The normal case where this is just
a single paragraph was already handled, but this patch generalizes
everything to handle cases of actual text or multiple paragraphs.
Not every footnote has a type, so we can't depend on that to turn
ignoringText ON/OFF. Every footnote has an ID, but theoretically
the ID could be processed before or after the type, and it has
no idea which type it is. Finally, the skipped text has no idea
how many times/paragaphs it needs to skip. So a three-way
control was needed to handle on/used/off. As a safeguard, finishing
the footnote.xml parse (PopFootOrEndnote) ensures that
ignoring won't be left on in the unlikely case that
the separator is the last footnote.
Change-Id: Ia30ca8d3a36417a4691e3b2e1c978720be017030
Reviewed-on: https://gerrit.libreoffice.org/82172
Tested-by: Jenkins
Reviewed-by: Justin Luth
Reviewed-by: Miklos Vajna
diff --git
a/sw/qa/extras/ooxmlexport/data/tdf123262_textFootnoteSeparators.docx
b/sw/qa/extras/ooxmlexport/data/tdf123262_textFootnoteSeparators.docx
new file mode 100644
index ..ceccb767e27e
Binary files /dev/null and
b/sw/qa/extras/ooxmlexport/data/tdf123262_textFootnoteSeparators.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
index b0f2cd7dd98c..8e394f7a445c 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
@@ -526,6 +526,24 @@ DECLARE_OOXMLEXPORT_TEST(testFDO79062, "fdo79062.docx")
CPPUNIT_ASSERT_EQUAL_MESSAGE( "Paragraph starts with W(87), not tab(9)",
u'W', sFootnotePara[0] );
}
+DECLARE_OOXMLEXPORT_TEST(testTdf123262_textFootnoteSeparators,
"tdf123262_textFootnoteSeparators.docx")
+{
+//Everything easily fits on one page
+CPPUNIT_ASSERT_EQUAL_MESSAGE( "Number of Pages", 1, getPages() );
+
+uno::Reference xFootnotesSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Reference xFootnotes =
xFootnotesSupplier->getFootnotes();
+uno::Reference xFootnoteText(xFootnotes->getByIndex(0),
uno::UNO_QUERY);
+
+// The text in the separator footnote should not be added to the footnotes
+OUString sText = " Microsoft Office.";
+CPPUNIT_ASSERT_EQUAL(sText, xFootnoteText->getString());
+
+// Ensure that paragraph markers are not lost.
+xFootnoteText.set(xFootnotes->getByIndex(1), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL_MESSAGE( "Number of paragraphs in second footnote",
2, getParagraphs(xFootnoteText) );
+}
+
DECLARE_OOXMLEXPORT_TEST(testfdo79668,"fdo79668.docx")
{
// fdo#79668: Document was Crashing on DebugUtil build while Saving
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index ccbe8d8d197b..2c2d33febd8e 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1078,9 +1078,20 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
}
break;
case NS_ooxml::LN_CT_FtnEdn_type:
-// This is the "separator" footnote, ignore its linebreak.
+// This is the "separator" footnote, ignore its linebreaks/text.
if (static_cast(nIntValue) ==
NS_ooxml::LN_Value_doc_ST_FtnEdn_separator)
-m_pImpl->SeenFootOrEndnoteSeparator();
+m_pImpl->SetSkipFootnoteState( SkipFootnoteSeparator::ON );
+else
+m_pImpl->SetSkipFootnoteState( SkipFootnoteSeparator::OFF );
+break;
+case NS_ooxml::LN_CT_FtnEdn_id:
+{
+SkipFootnoteSeparator eSkip = m_pImpl->GetSkipFootnoteState();
+if ( eSkip == SkipFootnoteSeparator::ON )
+m_pImpl->SetSkipFootnoteState( SkipFootnoteSeparator::SKIPPING
);
+else if ( eSkip == SkipFootnoteSeparator::SKIPPING )
+m_pImpl->SetSkipFootnoteState( SkipFootnoteSeparator::OFF );
+}
break;
case
[Libreoffice-commits] core.git: vcl/source
vcl/source/control/edit.cxx |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 10d345faa087fa49692f38bb2ece22560f423ba7
Author: Arnaud Versini
AuthorDate: Sun Dec 8 11:42:35 2019 +0100
Commit: Miklos Vajna
CommitDate: Fri Dec 20 10:56:00 2019 +0100
tdf#83248: Use the right text color when printing fields
Change-Id: I81167207a35d524660b9a1d6740cfce551489c4a
Reviewed-on: https://gerrit.libreoffice.org/84707
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 41d5ea4a42e6..ddf942f76c15 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -1727,7 +1727,6 @@ void Edit::Draw( OutputDevice* pDev, const Point& rPos,
const Size& rSize, DrawF
Point aPos = pDev->LogicToPixel( rPos );
Size aSize = pDev->LogicToPixel( rSize );
vcl::Font aFont = GetDrawPixelFont( pDev );
-OutDevType eOutDevType = pDev->GetOutDevType();
pDev->Push();
pDev->SetMapMode();
@@ -1754,7 +1753,7 @@ void Edit::Draw( OutputDevice* pDev, const Point& rPos,
const Size& rSize, DrawF
}
// Content
-if ( ( nFlags & DrawFlags::Mono ) || ( eOutDevType == OUTDEV_PRINTER ) )
+if ( nFlags & DrawFlags::Mono )
pDev->SetTextColor( COL_BLACK );
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/doc/tblafmt.cxx |8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) New commits: commit 43f983d08d66520536980339f33ef44d5eec35f6 Author: Justin Luth AuthorDate: Wed Nov 27 12:52:38 2019 +0300 Commit: Miklos Vajna CommitDate: Fri Dec 20 10:52:42 2019 +0100 tdf#115026 sw tableAutoFormat: don't clear break/keep If a table style HAS defined a page-break or keep-with-next-paragraph, then apply it when applying the style. But if the format just has a default non-break/non-keep attribute, then don't apply that. Kinda seems artificial/arbitrary, but it looks difficult to change the break/keep property to be an optional component. If it was optional, then it would be fine to take a defined non-break and apply it, but since it is a mandatory value, just ignore the default state. Yes, this means that applying one style can introduce a break/keep, but applying a different style cannot remove it. None of the build-in styles has either of these properties set. Since there is no way to identify direct formatting, assuming the user intentionally set these is the better policy by far... I didn't do the same thing with shadow/collapsing borders etc. Those seem more like table style properties than these two flow items. I still couldn't get the unit test to work. I got access to the created document by removing EnableKillingFile from swmodelbase, and from that I can see that the autoformat is not affecting the table with RestoreTableProperties. I assume the Break is overwritten during the table creation process because I can see the background being applied in that case, but still no Break. Change-Id: Ia2a4ff8a19158b1ea5d74ec3a21c688c53d66724 Reviewed-on: https://gerrit.libreoffice.org/83879 Tested-by: Jenkins Reviewed-by: Justin Luth Reviewed-by: Miklos Vajna diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx index ae7c3e6fadbb..58756cce6d7f 100644 --- a/sw/source/core/doc/tblafmt.cxx +++ b/sw/source/core/doc/tblafmt.cxx @@ -684,11 +684,13 @@ void SwTableAutoFormat::RestoreTableProperties(SwTable &table) const SfxItemSet rSet(pDoc->GetAttrPool(), aTableSetRange); -rSet.Put(*m_aBreak); +if ( m_aBreak->GetBreak() != SvxBreak::NONE ) +rSet.Put(*m_aBreak); rSet.Put(m_aPageDesc); rSet.Put(SwFormatLayoutSplit(m_bLayoutSplit)); rSet.Put(SfxBoolItem(RES_COLLAPSING_BORDERS, m_bCollapsingBorders)); -rSet.Put(*m_aKeepWithNextPara); +if ( m_aKeepWithNextPara->GetValue() ) +rSet.Put(*m_aKeepWithNextPara); rSet.Put(*m_aShadow); pFormat->SetFormatAttr(rSet); @@ -881,7 +883,7 @@ OUString SwTableAutoFormat::GetTableTemplateCellSubName(const SwBoxAutoFormat& r * +---+ * 4 | | | | | | | * +---+ - * 5 | LRSC| LR | LRENC| | | LRENC | + * 5 | LRSC| LR | LREC | | | LRENC | * +---+---+---+---+---+---+ * ODD = 1, 3, 5, ... * EVEN = 2, 4, 6, ... ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/scalc/01/func_opt_barrier.xhp |6 +++--- source/text/scalc/01/func_opt_prob_hit.xhp |6 +++--- source/text/scalc/01/func_opt_prob_inmoney.xhp | 14 +++--- source/text/scalc/01/func_opt_touch.xhp| 18 +- 4 files changed, 22 insertions(+), 22 deletions(-) New commits: commit 6707900d671ea0fec291453f034188132ae43547 Author: Olivier Hallot AuthorDate: Wed Dec 18 22:49:15 2019 +0100 Commit: Olivier Hallot CommitDate: Fri Dec 20 10:52:21 2019 +0100 Proper use of ; in OPT_* examples Change-Id: Iec0e1b4112f9d91a397566c8ff51969b6c15f8a7 Reviewed-on: https://gerrit.libreoffice.org/85439 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/scalc/01/func_opt_barrier.xhp b/source/text/scalc/01/func_opt_barrier.xhp index 805baef58..5b0a90086 100644 --- a/source/text/scalc/01/func_opt_barrier.xhp +++ b/source/text/scalc/01/func_opt_barrier.xhp @@ -27,7 +27,7 @@ -OPT_BARRIER(Spot; Volatility; Rate; Foreign Rate; Maturity; Strike; Lower Barrier; Upper Barrier; Rebate; Put or Call; In or Out; Barrier Monitoring; Greek) +OPT_BARRIER(Spot; Volatility; Rate; Foreign Rate; Maturity; Strike; LowerBarrier; UpperBarrier; Rebate; PutCall; InOut; BarrierMonitoring; Greek) @@ -42,8 +42,8 @@ -=OPT_BARRIER(30,0.2,0.06,0,1,40,25,0,0,"c","o","c") returns the value 0.4243. -=OPT_BARRIER(50,0.4,0.05,0,0.5,65,0,80,0,"p","o","c","e") returns the value 10.1585. +=OPT_BARRIER(30;0.2;0.06;0;1;40;25;0;0;"c";"o";"c") returns the value 0.4243. +=OPT_BARRIER(50;0.4;0.05;0;0.5;65;0;80;0;"p";"o";"c";"e") returns the value 10.1585. diff --git a/source/text/scalc/01/func_opt_prob_hit.xhp b/source/text/scalc/01/func_opt_prob_hit.xhp index a6d861cd4..fd2f6477b 100644 --- a/source/text/scalc/01/func_opt_prob_hit.xhp +++ b/source/text/scalc/01/func_opt_prob_hit.xhp @@ -31,7 +31,7 @@ -OPT_PROB_HIT(Spot; Volatility; Drift; Maturity; Lower Barrier; Upper Barrier) +OPT_PROB_HIT(Spot; Volatility; Drift; Maturity; LowerBarrier; UpperBarrier) Drift is the annual stock price percentage drift rate (µ in the above formula). The value is expressed as a decimal (for example, enter 15% as 0.15). @@ -40,8 +40,8 @@ -=OPT_PROB_HIT(30,0.2,0.3,1,0,40) returns the value 0.6119. -=OPT_PROB_HIT(70,0.3,0.1,0.5,60,0) returns the value 0.4239. +=OPT_PROB_HIT(30;0.2;0.3;1;0;40) returns the value 0.6119. +=OPT_PROB_HIT(70;0.3;0.1;0.5;60;0) returns the value 0.4239. diff --git a/source/text/scalc/01/func_opt_prob_inmoney.xhp b/source/text/scalc/01/func_opt_prob_inmoney.xhp index 763b2e871..0cbedf6dd 100644 --- a/source/text/scalc/01/func_opt_prob_inmoney.xhp +++ b/source/text/scalc/01/func_opt_prob_inmoney.xhp @@ -20,20 +20,20 @@ OPT_PROB_INMONEY function - + OPT_PROB_INMONEY Returns the probability that an asset will end up between two barrier levels at maturity, assuming that the stock price can be modeled as a process S that follows the stochastic differential equation, as follows. OPT_PROB_INMONEY equation µ is the asset’s percentage drift, vol is the percentage volatility of the stock, and dW is a random sample drawn from a normal distribution with a zero mean. W is a Wiener process or Brownian motion. -If the optional Strike and Put or Call arguments are included, then +If the optional Strike and PutCall arguments are included, then -For a call option, the function returns the probability that the asset will end up between Strike and Upper Barrier. +For a call option, the function returns the probability that the asset will end up between Strike and UpperBarrier. -For a put option, the function returns the probability that the asset will end up between Lower Barrier and Strike. +For a put option, the function returns the probability that the asset will end up between LowerBarrier and Strike. The function ignores the possibility of knock-out before maturity. @@ -41,7 +41,7 @@ -OPT_PROB_INMONEY(Spot; Volatility; Drift; Maturity; Lower Barrier; Upper Barrier; Strike; Put or Call) +OPT_PROB_INMONEY(Spot; Volatility; Drift; Maturity; LowerBarrier; UpperBarrier; Strike; PutCall) @@ -49,8 +49,8 @@ -=OPT_PROB_INMONEY(30,0.2,0.1,1,0,50) returns the value 0.9844. -=OPT_PROB_INMONEY(70,0.3,0.15,1,60,0,80,"p") returns the value 0.3440. +=OPT_PROB_INMONEY(30;0.2;0.1;1;0;50) returns the value 0.9844. +=OPT_PROB_INMONEY(70;0.3;0.15;1;60;0;80;"p") returns the value 0.
[Libreoffice-commits] core.git: 2 commits - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 76454e4d360bdc8466d46cc5d14613750fc7b327 Author: Olivier Hallot AuthorDate: Wed Dec 18 22:49:15 2019 +0100 Commit: Gerrit Code Review CommitDate: Fri Dec 20 10:52:21 2019 +0100 Update git submodules * Update helpcontent2 from branch 'master' - Proper use of ; in OPT_* examples Change-Id: Iec0e1b4112f9d91a397566c8ff51969b6c15f8a7 Reviewed-on: https://gerrit.libreoffice.org/85439 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index f47f09987e7f..6707900d671e 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit f47f09987e7f23035c7439a0e1c266ab4d5980b1 +Subproject commit 6707900d671ea0fec291453f034188132ae43547 commit dc27bd01570563a893174abec4dd9460db22a1ba Author: Olivier Hallot AuthorDate: Fri Dec 20 06:47:12 2019 -0300 Commit: Gerrit Code Review CommitDate: Fri Dec 20 10:51:59 2019 +0100 Update git submodules * Update helpcontent2 from branch 'master' - Add screenshot for Impress General Option page Adjust screenshot for Presenter Console too Change-Id: I84d0df90e26315ca57670e2ad6334ba69bece9c2 Reviewed-on: https://gerrit.libreoffice.org/85580 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 59036b344e71..f47f09987e7f 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 59036b344e71e7d7b2d4c032ab5112c71be10f50 +Subproject commit f47f09987e7f23035c7439a0e1c266ab4d5980b1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: AllLangHelp_shared.mk Package_html_media.mk source/media source/text
AllLangHelp_shared.mk |1 Package_html_media.mk |5 - source/media/screenshots/modules/simpress/ui/optimpressgeneralpage/OptSavePage.png |binary source/media/screenshots/modules/simpress/ui/optimpressgeneralpage/af/OptSavePage.png |binary source/media/screenshots/modules/simpress/ui/optimpressgeneralpage/am/OptSavePage.png |binary source/media/screenshots/modules/simpress/ui/optimpressgeneralpage/ar/OptSavePage.png |binary source/media/screenshots/modules/simpress/ui/optimpressgeneralpage/as/OptSavePage.png |binary source/media/screenshots/modules/simpress/ui/optimpressgeneralpage/ast/OptSavePage.png |binary source/media/screenshots/modules/simpress/ui/optimpressgeneralpage/be/OptSavePage.png |binary source/media/screenshots/modules/simpress/ui/optimpressgeneralpage/bg/OptSavePage.png |binary source/media/screenshots/modules/simpress/ui/optimpressgeneralpage/bn-IN/OptSavePage.png |binary source/media/screenshots/modules/simpress/ui/optimpressgeneralpage/bn/OptSavePage.png |binary source/media/screenshots/modules/simpress/ui/optimpressgeneralpage/bo/OptSavePage.png |binary source/media/screenshots/modules/simpress/ui/optimpressgeneralpage/br/OptSavePage.png |binary source/media/screenshots/modules/simpress/ui/optimpressgeneralpage/brx/OptSavePage.png |binary source/media/screenshots/modules/simpress/ui/optimpressgeneralpage/bs/OptSavePage.png |binary source/media/screenshots/modules/simpress/ui/optimpressgeneralpage/ca-valencia/OptSavePage.png |binary source/media/screenshots/modules/simpress/ui/optimpressgeneralpage/ca/OptSavePage.png |binary source/media/screenshots/modules/simpress/ui/optimpressgeneralpage/cs/OptSavePage.png |binary source/media/screenshots/modules/simpress/ui/optimpressgeneralpage/cy/OptSavePage.png |binary source/media/screenshots/modules/simpress/ui/optimpressgeneralpage/da/OptSavePage.png |binary source/media/screenshots/modules/simpress/ui/optimpressgeneralpage/de/OptSavePage.png |binary source/media/screenshots/modules/simpress/ui/optimpressgeneralpage/dgo/OptSavePage.png |binary source/media/screenshots/modules/simpress/ui/optimpressgeneralpage/dsb/OptSavePage.png |binary source/media/screenshots/modules/simpress/ui/optimpressgeneralpage/dz/OptSavePage.png |binary source/media/screenshots/modules/simpress/ui/optimpressgeneralpage/el/OptSavePage.png |binary source/media/screenshots/modules/simpress/ui/optimpressgeneralpage/en-GB/OptSavePage.png |binary source/media/screenshots/modules/simpress/ui/optimpressgeneralpage/en-ZA/OptSavePage.png |binary source/media/screenshots/modules/simpress/ui/optimpressgeneralpage/eo/OptSavePage.png |binary source/media/screenshots/modules/simpress/ui/optimpressgeneralpage/es/OptSavePage.png |binary source/media/screenshots/modules/simpress/ui/optimpressgeneralpage/et/OptSavePage.png |binary source/media/screenshots/modules/simpress/ui/optimpressgeneralpage/eu/OptSavePage.png |binary source/media/screenshots/modules/simpress/ui/optimpressgeneralpage/fa/OptSavePage.png |binary source/media/screenshots/modules/simpress/ui/optimpressgeneralpage/fi/OptSavePage.png |binary source/media/screenshots/modules/simpress/ui/optimpressgeneralpage/fr/OptSavePage.png |binary source/media/screenshots/modules/simpress/ui/optimpressgeneralpage/fy/OptSavePage.png |binary source/media/screenshots/modules/simpress/ui/optimpressgeneralpage/ga/OptSavePage.png |binary source/media/screenshots/modules/simpress/ui/optimpressgeneralpage/gd/OptSavePage.png |binary source/media/screenshots/modules/simpress/ui/optimpressgeneralpage/gl/OptSavePage.png |binary source/media/screenshots/modules/simpress/ui/optimpressgeneralpage/gu/OptSavePage.png |binary source/media/screenshots/modules/simpress/ui/optimpressgeneralpage/gug/OptSavePage.png |binary source/media/screenshots/modules/simpress/ui/optimpressgeneralpage/he/OptSavePage.png |binary source/media/screenshots/modules/simpress/ui/optimpressgeneralpage/hi/OptSavePage.png |binary source/media/screenshots/modules/simpress/ui/optimpressgeneralpage/hr/OptSavePage.png |binary source/media/screenshots/modules/simpress/ui/optimpressgeneralpage/hsb/OptSavePage.png |binary source/media/screenshots/modules/simpress/ui/optimpressgeneralpage/hu/OptSavePage.png |binary source/media/screenshots/modules/simpress/ui/optimpressgeneralpage/id/OptSavePage.png |binary source/media/scr
Problem with XModifyListener
Hi Team, I am developing an extension for LibreOffice in Java and facing a strange issue with XModifyListener. I wanted to capture cell data change event and implemented XModifyListener in my application. i do some formatting of the cell if modified. Problem here is - it seems like "*modified()*" method of XModifyListener gets called even when the sheet is changed. So even if sheet is changed, my cell is getting the formatting which is not required. is there a way i can get the type of the event whether it is a sheetChange or CellChange or etc Please suggest, i am a kind of stuck in this from long time. -- Best Regards, Harish Kumar.B ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - slideshow/Library_slideshow.mk slideshow/source
slideshow/Library_slideshow.mk |4
slideshow/source/engine/effectrewinder.cxx |7 ++-
2 files changed, 10 insertions(+), 1 deletion(-)
New commits:
commit 46b3635facf318d50ba806b8ef9124984d8523c3
Author: Gülşah Köse
AuthorDate: Wed Dec 18 15:06:38 2019 +0300
Commit: Miklos Vajna
CommitDate: Fri Dec 20 10:49:19 2019 +0100
tdf#125949 Check hardware acceleration on slideshow.
Follow up commit for 8eb2d2972583b909a249f5b0f22a9b1fbf533d24
Allows animation if hardware acceleration disabled.
Change-Id: I7997936435134e36e2bf3d3d54ff1bf157cb205c
Reviewed-on: https://gerrit.libreoffice.org/85380
Tested-by: Jenkins
Reviewed-by: Gülşah Köse
(cherry picked from commit 3e88fc6b0eef06e1e12fcfe765e3092c6c06ce5c)
Reviewed-on: https://gerrit.libreoffice.org/85482
Reviewed-by: Miklos Vajna
diff --git a/slideshow/Library_slideshow.mk b/slideshow/Library_slideshow.mk
index d1526754a1fb..9f41d23ffd08 100644
--- a/slideshow/Library_slideshow.mk
+++ b/slideshow/Library_slideshow.mk
@@ -35,6 +35,10 @@ $(eval $(call gb_Library_use_externals,slideshow,\
))
endif
+$(eval $(call gb_Library_use_custom_headers,slideshow,\
+ officecfg/registry \
+))
+
$(eval $(call gb_Library_use_sdk_api,slideshow))
$(eval $(call gb_Library_use_libraries,slideshow,\
diff --git a/slideshow/source/engine/effectrewinder.cxx
b/slideshow/source/engine/effectrewinder.cxx
index 5db91ff9a621..d8889024108b 100644
--- a/slideshow/source/engine/effectrewinder.cxx
+++ b/slideshow/source/engine/effectrewinder.cxx
@@ -30,6 +30,9 @@
#include
#include
#include
+
+#include
+
using ::com::sun::star::uno::Reference;
using namespace ::com::sun::star;
@@ -346,7 +349,9 @@ bool EffectRewinder::notifyAnimationStart (const
AnimationNodeSharedPtr& rpNode)
{
Reference xNode (rpNode->getXAnimationNode());
-if(xNode.is() && hasBlockedAnimation(xNode) )
+if( xNode.is() &&
+!officecfg::Office::Canvas::ForceSafeServiceImpl::get() &&
+hasBlockedAnimation(xNode) )
skipSingleMainSequenceEffects();
// This notification is only relevant for us when the rpNode belongs to
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/IwyuFilter_sw.yaml sw/source
sw/IwyuFilter_sw.yaml | 50 sw/source/filter/ascii/ascatr.cxx |4 - sw/source/filter/ascii/parasc.cxx |9 sw/source/filter/ascii/wrtasc.cxx |1 sw/source/filter/basflt/docfact.cxx |5 -- sw/source/filter/basflt/fltini.cxx | 17 sw/source/filter/basflt/fltshell.cxx| 32 --- sw/source/filter/basflt/iodetect.cxx|1 sw/source/filter/basflt/shellio.cxx |3 - sw/source/filter/docx/swdocxreader.cxx |9 sw/source/filter/html/SwAppletImpl.cxx |2 sw/source/filter/html/css1atr.cxx |4 - sw/source/filter/html/htmlatr.cxx |5 -- sw/source/filter/html/htmlbas.cxx |5 -- sw/source/filter/html/htmlcss1.cxx |5 -- sw/source/filter/html/htmlctxt.cxx |2 sw/source/filter/html/htmldrawreader.cxx|8 --- sw/source/filter/html/htmldrawwriter.cxx| 13 -- sw/source/filter/html/htmlfld.cxx |2 sw/source/filter/html/htmlfldw.cxx |2 sw/source/filter/html/htmlfly.cxx |8 --- sw/source/filter/html/htmlflywriter.cxx |3 - sw/source/filter/html/htmlform.cxx |3 - sw/source/filter/html/htmlforw.cxx |7 --- sw/source/filter/html/htmlgrin.cxx |6 -- sw/source/filter/html/htmlnumreader.cxx |4 - sw/source/filter/html/htmlnumwriter.cxx | 11 - sw/source/filter/html/htmlplug.cxx |4 - sw/source/filter/html/htmlsect.cxx |7 --- sw/source/filter/html/htmltab.cxx |1 sw/source/filter/html/parcss1.cxx |5 -- sw/source/filter/html/svxcss1.cxx |1 sw/source/filter/html/swhtml.cxx|6 -- sw/source/filter/html/wrthtml.cxx |4 - sw/source/filter/writer/writer.cxx |3 - sw/source/filter/writer/wrt_fn.cxx |1 sw/source/filter/writer/wrtswtbl.cxx|1 sw/source/filter/ww8/WW8FFData.cxx |1 sw/source/filter/ww8/WW8Sttbf.cxx |4 - sw/source/filter/ww8/WW8TableInfo.cxx |2 sw/source/filter/ww8/docxattributeoutput.cxx|9 sw/source/filter/ww8/docxexport.cxx |8 --- sw/source/filter/ww8/docxexportfilter.cxx |4 - sw/source/filter/ww8/styles.cxx |3 - sw/source/filter/ww8/writerhelper.cxx |5 -- sw/source/filter/ww8/writerwordglue.cxx |3 - sw/source/filter/ww8/wrtw8esh.cxx | 23 ++- sw/source/filter/ww8/wrtw8nds.cxx | 11 - sw/source/filter/ww8/wrtw8num.cxx |6 -- sw/source/filter/ww8/wrtw8sty.cxx |6 -- sw/source/filter/ww8/wrtww8.cxx | 11 - sw/source/filter/ww8/wrtww8gr.cxx | 11 - sw/source/filter/ww8/ww8atr.cxx |5 -- sw/source/filter/ww8/ww8glsy.cxx|3 - sw/source/filter/ww8/ww8graf.cxx| 19 - sw/source/filter/ww8/ww8graf2.cxx |8 --- sw/source/filter/ww8/ww8par.cxx |9 sw/source/filter/ww8/ww8par2.cxx|7 --- sw/source/filter/ww8/ww8par3.cxx|2 sw/source/filter/ww8/ww8par4.cxx| 10 sw/source/filter/ww8/ww8par5.cxx| 12 - sw/source/filter/ww8/ww8par6.cxx|6 -- sw/source/filter/ww8/ww8scan.cxx|2 sw/source/filter/ww8/ww8toolbar.cxx |3 - sw/source/filter/xml/XMLRedlineImportHelper.cxx |2 sw/source/filter/xml/swxml.cxx |8 --- sw/source/filter/xml/wrtxml.cxx |4 - sw/source/filter/xml/xmlbrsh.cxx|4 - sw/source/filter/xml/xmlexp.cxx |9 sw/source/filter/xml/xmlexpit.cxx |2 sw/source/filter/xml/xmlfmt.cxx | 12 - sw/source/filter/xml/xmlfonte.cxx |1 sw/source/filter/xml/xmlimp.cxx | 14 -- sw/source/filter/xml/xmlimpit.cxx |4 - sw/source/filter/xml/xmliteme.cxx |8 --- sw/source/filter/xml/xmlitemi.cxx | 15 +-- sw/source/filter/xml/xmlithlp.cxx | 20 +++-- sw/source/filter/xml/xmlmeta.cxx|6 -- sw/source/filter/xml/xmlscript.cxx |2 sw/source/filter/xml/xmltble.cxx|4 - sw/source/filter/xml/xmltbli.cxx|1 sw/source/filter/xml/xmltexte.cxx |5 -- sw/source/filter/xml/xmltexti.cxx |2 83 files changed, 89 insertions(+), 481 dele
[Libreoffice-commits] core.git: editeng/inc editeng/IwyuFilter_editeng.yaml editeng/qa editeng/source
editeng/IwyuFilter_editeng.yaml | 29 editeng/inc/editdoc.hxx |2 editeng/inc/edtspell.hxx|3 - editeng/inc/eerdll2.hxx |1 editeng/inc/unomodel.hxx|1 editeng/qa/unit/core-test.cxx |2 editeng/source/accessibility/AccessibleComponentBase.cxx|6 -- editeng/source/accessibility/AccessibleContextBase.cxx |2 editeng/source/accessibility/AccessibleEditableTextPara.cxx |6 -- editeng/source/accessibility/AccessibleHyperlink.hxx|4 - editeng/source/accessibility/AccessibleImageBullet.cxx |4 - editeng/source/accessibility/AccessibleParaManager.cxx |4 - editeng/source/accessibility/AccessibleStaticTextBase.cxx |3 - editeng/source/editeng/editdbg.hxx |2 editeng/source/editeng/editdoc.cxx |2 editeng/source/editeng/editeng.cxx | 13 - editeng/source/editeng/editobj.cxx | 15 -- editeng/source/editeng/editobj2.hxx |1 editeng/source/editeng/editundo.hxx |1 editeng/source/editeng/editview.cxx |5 -- editeng/source/editeng/edtspell.cxx |3 - editeng/source/editeng/eehtml.cxx |1 editeng/source/editeng/eeobj.cxx|3 - editeng/source/editeng/eerdll.cxx |3 - editeng/source/editeng/eertfpar.hxx |1 editeng/source/editeng/fieldupdater.cxx |1 editeng/source/editeng/impedit.cxx |3 - editeng/source/editeng/impedit.hxx |8 --- editeng/source/editeng/impedit2.cxx | 10 editeng/source/editeng/impedit3.cxx |7 -- editeng/source/editeng/impedit4.cxx |2 editeng/source/editeng/impedit5.cxx |2 editeng/source/editeng/textconv.cxx |3 - editeng/source/editeng/textconv.hxx |5 -- editeng/source/items/bulitem.cxx|5 -- editeng/source/items/flditem.cxx|1 editeng/source/items/frmitems.cxx | 21 editeng/source/items/justifyitem.cxx|4 - editeng/source/items/numitem.cxx|7 -- editeng/source/items/paperinf.cxx |2 editeng/source/items/paraitem.cxx |5 -- editeng/source/items/svxfont.cxx|1 editeng/source/items/textitem.cxx | 20 editeng/source/items/writingmodeitem.cxx|4 - editeng/source/items/xmlcnitm.cxx |2 editeng/source/misc/SvXMLAutoCorrectExport.cxx |2 editeng/source/misc/SvXMLAutoCorrectExport.hxx |3 - editeng/source/misc/SvXMLAutoCorrectTokenHandler.cxx|1 editeng/source/misc/acorrcfg.cxx|1 editeng/source/misc/forbiddencharacterstable.cxx|3 - editeng/source/misc/hangulhanja.cxx |2 editeng/source/misc/splwrap.cxx |3 - editeng/source/misc/svxacorr.cxx| 10 editeng/source/misc/txtrange.cxx|2 editeng/source/misc/unolingu.cxx| 13 - editeng/source/outliner/outleeng.cxx|6 -- editeng/source/outliner/outlin2.cxx |7 -- editeng/source/outliner/outliner.cxx|9 --- editeng/source/outliner/outlobj.cxx |7 -- editeng/source/outliner/outlundo.cxx|8 --- editeng/source/outliner/outlundo.hxx|1 editeng/source/outliner/outlvw.cxx |4 - editeng/source/outliner/overflowingtxt.cxx |4 - editeng/source/outliner/paralist.cxx|2 editeng/source/outliner/paralist.hxx|1 editeng/source/rtf/rtfitem.cxx | 15 -- editeng/source/rtf/svxrtf.cxx |4 - editeng/source/uno/UnoForbiddenCharsTable.cxx |1 editeng/source/uno/unoedprx.cxx |8 --- editeng/source/uno/unofdesc.cxx |2 editeng/source/uno/unofield.cxx
[Libreoffice-commits] core.git: svgio/inc svgio/IwyuFilter_svgio.yaml svgio/qa svgio/source
svgio/IwyuFilter_svgio.yaml |2 ++ svgio/inc/svganode.hxx|1 + svgio/inc/svgcirclenode.hxx |1 + svgio/inc/svgclippathnode.hxx |1 + svgio/inc/svgellipsenode.hxx |1 + svgio/inc/svggnode.hxx|1 + svgio/inc/svgimagenode.hxx|1 + svgio/inc/svglinenode.hxx |1 + svgio/inc/svgmasknode.hxx |1 + svgio/inc/svgnode.hxx |3 +-- svgio/inc/svgpathnode.hxx |2 ++ svgio/inc/svgpatternnode.hxx |1 + svgio/inc/svgpolynode.hxx |1 + svgio/inc/svgrectnode.hxx |1 + svgio/inc/svgstyleattributes.hxx |2 +- svgio/inc/svgsymbolnode.hxx |1 - svgio/inc/svgtextnode.hxx |1 + svgio/inc/svgtextpathnode.hxx |1 - svgio/inc/svgtools.hxx|4 ++-- svgio/inc/svgtspannode.hxx|1 - svgio/inc/svgusenode.hxx |1 + svgio/qa/cppunit/SvgImportTest.cxx|1 - svgio/qa/cppunit/SvgRead.cxx | 20 +--- svgio/source/svgreader/svgcharacternode.cxx |1 - svgio/source/svgreader/svgcirclenode.cxx |1 + svgio/source/svgreader/svgellipsenode.cxx |1 + svgio/source/svgreader/svgimagenode.cxx |2 -- svgio/source/svgreader/svglinenode.cxx|2 +- svgio/source/svgreader/svgnode.cxx|1 - svgio/source/svgreader/svgpolynode.cxx|2 +- svgio/source/svgreader/svgrectnode.cxx|1 + svgio/source/svgreader/svgstyleattributes.cxx |1 - svgio/source/svgreader/svgsymbolnode.cxx |2 -- svgio/source/svgreader/svgtextnode.cxx|2 -- svgio/source/svgreader/svgtextpathnode.cxx|2 -- svgio/source/svgreader/svgtools.cxx |2 +- svgio/source/svgreader/svgvisitor.cxx |3 --- svgio/source/svguno/xsvgparser.cxx|2 -- svgio/source/svguno/xsvgparser.hxx|1 - 39 files changed, 28 insertions(+), 48 deletions(-) New commits: commit aa7a23f4f71853b7a256435404b7f73ddefc061e Author: Gabor Kelemen AuthorDate: Mon Dec 16 18:54:31 2019 +0100 Commit: Miklos Vajna CommitDate: Fri Dec 20 10:31:39 2019 +0100 tdf#42949 Fix IWYU warnings in svgio/ Found with bin/find-unneeded-includes Only removal proposals are dealt with here. Change-Id: I66cde1ea02569cd8244b23be16a5550cac8adf12 Reviewed-on: https://gerrit.libreoffice.org/85237 Tested-by: Jenkins Reviewed-by: Miklos Vajna diff --git a/svgio/IwyuFilter_svgio.yaml b/svgio/IwyuFilter_svgio.yaml new file mode 100644 index ..c8d76fb67a7d --- /dev/null +++ b/svgio/IwyuFilter_svgio.yaml @@ -0,0 +1,2 @@ +--- +assumeFilename: svgio/source/svgreader/svgdocument.cxx diff --git a/svgio/inc/svganode.hxx b/svgio/inc/svganode.hxx index 1af4316c7222..7da88306f277 100644 --- a/svgio/inc/svganode.hxx +++ b/svgio/inc/svganode.hxx @@ -22,6 +22,7 @@ #include "svgnode.hxx" #include "svgstyleattributes.hxx" +#include #include namespace svgio diff --git a/svgio/inc/svgcirclenode.hxx b/svgio/inc/svgcirclenode.hxx index 87105da64b42..7ae0f6751f4c 100644 --- a/svgio/inc/svgcirclenode.hxx +++ b/svgio/inc/svgcirclenode.hxx @@ -22,6 +22,7 @@ #include "svgnode.hxx" #include "svgstyleattributes.hxx" +#include #include namespace svgio diff --git a/svgio/inc/svgclippathnode.hxx b/svgio/inc/svgclippathnode.hxx index 5f88c4ff..1aeca2655967 100644 --- a/svgio/inc/svgclippathnode.hxx +++ b/svgio/inc/svgclippathnode.hxx @@ -22,6 +22,7 @@ #include "svgnode.hxx" #include "svgstyleattributes.hxx" +#include #include namespace svgio diff --git a/svgio/inc/svgellipsenode.hxx b/svgio/inc/svgellipsenode.hxx index 4960e4b50d5c..dfc2e9273152 100644 --- a/svgio/inc/svgellipsenode.hxx +++ b/svgio/inc/svgellipsenode.hxx @@ -22,6 +22,7 @@ #include "svgnode.hxx" #include "svgstyleattributes.hxx" +#include #include namespace svgio diff --git a/svgio/inc/svggnode.hxx b/svgio/inc/svggnode.hxx index 760887b3df02..8810659da221 100644 --- a/svgio/inc/svggnode.hxx +++ b/svgio/inc/svggnode.hxx @@ -22,6 +22,7 @@ #include "svgnode.hxx" #include "svgstyleattributes.hxx" +#include #include namespace svgio diff --git a/svgio/inc/svgimagenode.hxx b/svgio/inc/svgimagenode.hxx index 8295de58734e..f9a971a5f4cc 100644 --- a/svgio/inc/svgimagenode.hxx +++ b/svgio/inc/svgimagenode.hxx @@ -22,6 +22,7 @@ #include "svgnode.hxx" #include "svgstyleattributes.hxx" +#include #include namespace svgio diff --git a/svgio/inc/svglinenode.hxx b/svgio/inc/svglinenode.hxx index 54abc7d0e59a..ab7ab577ab9b 100644 --- a/svgio/inc/svglinenode.hxx +++ b/svgio/inc/svglinenode.hxx @@ -22,6 +22,7 @@ #include "s
