[Libreoffice-commits] core.git: connectivity/source cui/source dbaccess/source unotools/source xmloff/source
connectivity/source/cpool/ZPoolCollection.cxx |2 -
cui/source/options/optinet2.cxx | 28 +++--
dbaccess/source/core/api/tablecontainer.cxx |2 -
dbaccess/source/ui/browser/brwctrlr.cxx |2 -
unotools/source/i18n/charclass.cxx | 32
unotools/source/i18n/nativenumberwrapper.cxx|9 +++---
unotools/source/i18n/textsearch.cxx |5 ++-
unotools/source/i18n/transliterationwrapper.cxx |4 +--
xmloff/source/chart/SchXMLChartContext.cxx |2 -
xmloff/source/chart/SchXMLTools.cxx |2 -
10 files changed, 46 insertions(+), 42 deletions(-)
New commits:
commit 6ee9ab65db0a993bc93bbf0140f0a4657be10657
Author: Noel
AuthorDate: Fri Oct 2 15:56:31 2020 +0200
Commit: Noel Grandin
CommitDate: Sat Oct 3 08:13:51 2020 +0200
use more TOOLS_WARN_EXCEPTION
Change-Id: Id83c478af5d04ad548c7cf4239fe2fb3ee154dc9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103861
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/connectivity/source/cpool/ZPoolCollection.cxx
b/connectivity/source/cpool/ZPoolCollection.cxx
index 629d8b7da097..53c1cea0d3c3 100644
--- a/connectivity/source/cpool/ZPoolCollection.cxx
+++ b/connectivity/source/cpool/ZPoolCollection.cxx
@@ -400,7 +400,7 @@ void SAL_CALL OPoolCollection::disposing( const
EventObject& Source )
}
catch(const Exception&)
{
-SAL_WARN("connectivity.cpool", "Exception caught");
+TOOLS_WARN_EXCEPTION("connectivity.cpool", "");
}
}
}
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 025d31d6e724..b47cd1178149 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -272,14 +272,15 @@ void SvxProxyTabPage::ReadConfigDefaults_Impl()
}
catch (const beans::UnknownPropertyException &)
{
-SAL_WARN("cui.options", "SvxProxyTabPage::ReadConfigDefaults_Impl:
UnknownPropertyException caught" );
+TOOLS_WARN_EXCEPTION("cui.options", "" );
}
-catch (const css::lang::WrappedTargetException &) {
-SAL_WARN("cui.options", "SvxProxyTabPage::ReadConfigDefaults_Impl:
WrappedTargetException caught" );
+catch (const css::lang::WrappedTargetException &)
+{
+TOOLS_WARN_EXCEPTION("cui.options", "" );
}
catch (const RuntimeException &)
{
-SAL_WARN("cui.options", "SvxProxyTabPage::ReadConfigDefaults_Impl:
RuntimeException caught" );
+TOOLS_WARN_EXCEPTION("cui.options", "" );
}
}
@@ -303,14 +304,15 @@ void SvxProxyTabPage::RestoreConfigDefaults_Impl()
}
catch (const beans::UnknownPropertyException &)
{
-SAL_WARN("cui.options", "SvxProxyTabPage::RestoreConfigDefaults_Impl:
UnknownPropertyException caught" );
+TOOLS_WARN_EXCEPTION("cui.options", "" );
}
-catch (const css::lang::WrappedTargetException &) {
-SAL_WARN("cui.options", "SvxProxyTabPage::RestoreConfigDefaults_Impl:
WrappedTargetException caught" );
+catch (const css::lang::WrappedTargetException &)
+{
+TOOLS_WARN_EXCEPTION("cui.options", "" );
}
catch (const RuntimeException &)
{
-SAL_WARN("cui.options", "SvxProxyTabPage::RestoreConfigDefaults_Impl:
RuntimeException caught" );
+TOOLS_WARN_EXCEPTION("cui.options", "" );
}
}
@@ -396,19 +398,19 @@ bool SvxProxyTabPage::FillItemSet(SfxItemSet* )
xChangesBatch->commitChanges();
}
catch (const css::lang::IllegalArgumentException &) {
-SAL_WARN("cui.options", "SvxProxyTabPage::FillItemSet:
IllegalArgumentException caught" );
+TOOLS_WARN_EXCEPTION("cui.options", "" );
}
catch (const beans::UnknownPropertyException &) {
-SAL_WARN("cui.options", "SvxProxyTabPage::FillItemSet:
UnknownPropertyException caught" );
+TOOLS_WARN_EXCEPTION("cui.options", "" );
}
catch (const beans::PropertyVetoException &) {
-SAL_WARN("cui.options", "SvxProxyTabPage::FillItemSet:
PropertyVetoException caught" );
+TOOLS_WARN_EXCEPTION("cui.options", "" );
}
catch (const css::lang::WrappedTargetException &) {
-SAL_WARN("cui.options", "SvxProxyTabPage::FillItemSet:
WrappedTargetException caught" );
+TOOLS_WARN_EXCEPTION("cui.options", "" );
}
catch (const RuntimeException &) {
-SAL_WARN("cui.options", "SvxProxyTabPage::FillItemSet:
RuntimeException caught" );
+TOOLS_WARN_EXCEPTION("cui.options", "" );
}
return bModified;
diff --git a/dbaccess/source/core/api/tablecontainer.cxx
b/dbaccess/source/core/api/tablecontainer.cxx
index 2da2c3350a91..443e78a67de7 100644
--- a/dbaccess/source/core/api/tablecontainer.cxx
+++ b/dbaccess/source/core/api/tablecontainer.cxx
@@ -77,7 +77,7 @@ namespace
}
catch(const Exception&)
{
[Libreoffice-commits] core.git: connectivity/source cui/source dbaccess/source desktop/source filter/source forms/source fpicker/source oox/source sfx2/source svl/source svtools/source svx/source sw/s
connectivity/source/drivers/dbase/DTable.cxx|3 +-
connectivity/source/drivers/file/FResultSet.cxx |3 +-
connectivity/source/drivers/hsqldb/HStorageMap.cxx |3 +-
cui/source/customize/cfg.cxx|2 -
cui/source/dialogs/AdditionsDialog.cxx | 17
cui/source/dialogs/insdlg.cxx |3 +-
dbaccess/source/core/api/CacheSet.cxx |3 +-
dbaccess/source/core/api/RowSetBase.cxx |3 +-
desktop/source/lib/init.cxx |4 +--
filter/source/pdf/pdfexport.cxx |6 ++---
forms/source/component/FormComponent.cxx|3 --
fpicker/source/office/contentenumeration.cxx|2 -
oox/source/drawingml/textparagraphpropertiescontext.cxx |5 ++--
oox/source/ppt/timenodelistcontext.cxx |3 +-
sfx2/source/config/evntconf.cxx |5 ++--
sfx2/source/doc/SfxRedactionHelper.cxx |3 +-
sfx2/source/doc/doctemplates.cxx|6 ++---
sfx2/source/doc/objserv.cxx |4 +--
svl/source/config/itemholder2.cxx |3 --
svtools/source/misc/templatefoldercache.cxx |2 -
svx/source/table/tablecontroller.cxx|3 +-
sw/source/core/unocore/unotext.cxx | 11 --
ucb/source/core/ucb.cxx |5 ++--
ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx |3 +-
ucb/source/ucp/webdav/webdavdatasupplier.cxx|3 +-
unotools/source/config/itemholder1.cxx |3 --
vcl/source/gdi/print3.cxx |3 +-
writerfilter/source/dmapper/GraphicHelpers.cxx |3 +-
xmloff/source/chart/SchXMLChartContext.cxx |8 +++
xmloff/source/text/txtvfldi.cxx |5 ++--
30 files changed, 72 insertions(+), 58 deletions(-)
New commits:
commit 547b1d054162a73d49a828bed140ab8671da2ff8
Author: Noel
AuthorDate: Fri Oct 2 16:27:46 2020 +0200
Commit: Noel Grandin
CommitDate: Sat Oct 3 08:13:29 2020 +0200
use more TOOLS_WARN_EXCEPTION
Change-Id: I8b5cde993c13e0b7c8c830b1ff698933a6b7cfd0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103863
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/connectivity/source/drivers/dbase/DTable.cxx
b/connectivity/source/drivers/dbase/DTable.cxx
index e9be4d578ed2..f4d671911739 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -28,6 +28,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -2241,7 +2242,7 @@ void ODbaseTable::alterColumn(sal_Int32 index,
}
catch(const Exception&)
{
-SAL_WARN( "connectivity.drivers","ODbaseTable::alterColumn: Exception
occurred!");
+TOOLS_WARN_EXCEPTION( "connectivity.drivers","");
throw;
}
}
diff --git a/connectivity/source/drivers/file/FResultSet.cxx
b/connectivity/source/drivers/file/FResultSet.cxx
index d7f3d6bd2090..5cf5d1ae862d 100644
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -41,6 +41,7 @@
#include
#include
#include
+#include
using namespace ::comphelper;
using namespace connectivity;
@@ -1468,7 +1469,7 @@ void OResultSet::setBoundedColumns(const OValueRefRow&
_rRow,
}
catch (Exception&)
{
-SAL_WARN( "connectivity.drivers","OResultSet::setBoundedColumns:
caught an Exception!");
+TOOLS_WARN_EXCEPTION( "connectivity.drivers","");
}
}
// in this case we got more select columns as columns exist in the table
diff --git a/connectivity/source/drivers/hsqldb/HStorageMap.cxx
b/connectivity/source/drivers/hsqldb/HStorageMap.cxx
index d10ee29a69f6..ade3133bd536 100644
--- a/connectivity/source/drivers/hsqldb/HStorageMap.cxx
+++ b/connectivity/source/drivers/hsqldb/HStorageMap.cxx
@@ -27,6 +27,7 @@
#include
#include
#include
+#include
namespace connectivity::hsqldb
{
@@ -308,7 +309,7 @@ namespace connectivity::hsqldb
}
catch(const Exception& e)
{
-SAL_WARN( "connectivity.hsqldb", "[HSQLDB-SDBC]
caught an exception while opening a stream\n"
+TOOLS_WARN_EXCEPTION( "connectivity.hsqldb",
"[HSQLDB-SDBC] caught an exception while opening a stream\n"
"Name: " << sName
<< "\nMode: 0x" << ( _nMode < 16 ? "0" : "")
<< std::hex << _nMode );
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 5418c4a9de7e..dd3c56
[Libreoffice-commits] core.git: oox/source
oox/source/export/chartexport.cxx |8
oox/source/export/drawingml.cxx|2 +-
oox/source/helper/propertymap.cxx |2 +-
oox/source/ole/axcontrol.cxx |2 +-
oox/source/ppt/pptshapecontext.cxx |3 +--
oox/source/vml/vmlshape.cxx|2 +-
6 files changed, 9 insertions(+), 10 deletions(-)
New commits:
commit 1f40a488fcf95f90fdd18c41ef7041d475cf08a2
Author: Noel
AuthorDate: Fri Oct 2 13:36:56 2020 +0200
Commit: Noel Grandin
CommitDate: Sat Oct 3 08:13:09 2020 +0200
loplugin:reducevarscope in oox
Change-Id: I6f2f91b821271415c4cec0eb1e694b00b3b2f59f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103836
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/oox/source/export/chartexport.cxx
b/oox/source/export/chartexport.cxx
index fd33d9a38bc8..0e3cff0d4a95 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -1735,15 +1735,15 @@ void ChartExport::exportGradientFill( const Reference<
XPropertySet >& xPropSet
OUString sFillGradientName;
xPropSet->getPropertyValue("FillGradientName") >>= sFillGradientName;
-awt::Gradient aGradient;
-awt::Gradient aTransparenceGradient;
uno::Reference< lang::XMultiServiceFactory > xFact( getModel(),
uno::UNO_QUERY );
try
{
uno::Reference< container::XNameAccess > xGradient(
xFact->createInstance("com.sun.star.drawing.GradientTable"), uno::UNO_QUERY );
uno::Any rGradientValue = xGradient->getByName( sFillGradientName );
+awt::Gradient aGradient;
if( rGradientValue >>= aGradient )
{
+awt::Gradient aTransparenceGradient;
mpFS->startElementNS(XML_a, XML_gradFill);
OUString sFillTransparenceGradientName;
if( (xPropSet->getPropertyValue("FillTransparenceGradientName")
>>= sFillTransparenceGradientName) && !sFillTransparenceGradientName.isEmpty())
@@ -2282,11 +2282,11 @@ void ChartExport::exportSeries( const
Reference& xChartType,
sal_Int32 nSeqIdx=0;
for( ; nSeqIdx xTempValueSeq(
aSeqCnt[nSeqIdx]->getValues() );
if( nMainSequenceIndex==-1 )
{
Reference< beans::XPropertySet > xSeqProp(
xTempValueSeq, uno::UNO_QUERY );
+OUString aRole;
if( xSeqProp.is())
xSeqProp->getPropertyValue("Role") >>= aRole;
// "main" sequence
@@ -3237,9 +3237,9 @@ void ChartExport::_exportAxis(
mAny >>= bDisplayUnits;
if(bDisplayUnits)
{
-OUString aVal;
if(GetProperty( xAxisProp, "BuiltInUnit" ))
{
+OUString aVal;
mAny >>= aVal;
if(!aVal.isEmpty())
{
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 0612fe56ed43..01f926c0c90c 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -518,7 +518,6 @@ bool DrawingML::EqualGradients( awt::Gradient aGradient1,
awt::Gradient aGradien
void DrawingML::WriteGradientFill( const Reference< XPropertySet >& rXPropSet )
{
awt::Gradient aGradient;
-awt::Gradient aTransparenceGradient;
if (!GetProperty(rXPropSet, "FillGradient"))
return;
@@ -553,6 +552,7 @@ void DrawingML::WriteGradientFill( const Reference<
XPropertySet >& rXPropSet )
}
else
{
+awt::Gradient aTransparenceGradient;
mpFS->startElementNS(XML_a, XML_gradFill, XML_rotWithShape, "0");
OUString sFillTransparenceGradientName;
if (GetProperty(rXPropSet, "FillTransparenceGradientName")
diff --git a/oox/source/helper/propertymap.cxx
b/oox/source/helper/propertymap.cxx
index aff0e66452c4..74351064a85a 100644
--- a/oox/source/helper/propertymap.cxx
+++ b/oox/source/helper/propertymap.cxx
@@ -905,9 +905,9 @@ void PropertyMap::dumpCode( const Reference< XPropertySet
>& rXPropSet )
continue;
OString name = OUStringToOString( rProp.Name, RTL_TEXTENCODING_UTF8);
-int level = 1;
try {
+int level = 1;
printLevel (level);
fprintf (stderr, "{\n");
const char* var = lclDumpAnyValueCode (rXPropSet->getPropertyValue
(rProp.Name), level + 1);
diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx
index 81fce321d0ad..59f9d62fefc1 100644
--- a/oox/source/ole/axcontrol.cxx
+++ b/oox/source/ole/axcontrol.cxx
@@ -538,7 +538,6 @@ void ControlConverter::convertToAxState( PropertySet const
& rPropSet,
sal_Int16 nState = API_STATE_DONTKNOW;
-bool bTriStateEnabled = false;
// need to use State for current state ( I think this is regardless of
whether
// control is awt or not )
rPropSet.getProperty( nState, PROP_State );
@@ -552,6 +551,7 @@ void ControlConverter::convertT
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - xmlsecurity/source
xmlsecurity/source/xmlsec/nss/nssinitializer.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0b1b1e90bffd4e8a7647cc01f5529c745ebdb121
Author: Mert Tumer
AuthorDate: Wed Sep 30 17:14:59 2020 +0300
Commit: Andras Timar
CommitDate: Fri Oct 2 22:55:12 2020 +0200
Fix libnssckbi not found error on Android
This error causes Android App to be unable to
open Password-protected documents.
Change-Id: Iacbacb1c780025752e2447db325b075c58947818
Signed-off-by: Mert Tumer
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103659
Tested-by: Andras Timar
Reviewed-by: Andras Timar
diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
index b2fd04423be9..bbdc036395f2 100644
--- a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
+++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
@@ -415,7 +415,7 @@ bool
nsscrypto_initialize(css::uno::Reference const
if (true)
#else
-#if defined SYSTEM_NSS
+#if defined SYSTEM_NSS || defined ANDROID
OUString rootModule("libnssckbi" SAL_DLLEXTENSION);
#else
OUString rootModule("${LO_LIB_DIR}/libnssckbi" SAL_DLLEXTENSION);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmlsecurity/source
xmlsecurity/source/xmlsec/nss/nssinitializer.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 16a7f98f99d334ea865b800e0b32d6fed1483942
Author: Mert Tumer
AuthorDate: Wed Sep 30 17:14:59 2020 +0300
Commit: Andras Timar
CommitDate: Fri Oct 2 22:54:07 2020 +0200
Fix libnssckbi not found error on Android
This error causes Android App to be unable to
open Password-protected documents.
Change-Id: Iacbacb1c780025752e2447db325b075c58947818
Signed-off-by: Mert Tumer
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103658
Tested-by: Jenkins
Reviewed-by: Andras Timar
diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
index 1d6dcda2f315..b8acdc059cf8 100644
--- a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
+++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
@@ -430,7 +430,7 @@ bool
nsscrypto_initialize(css::uno::Reference const
if (true)
#else
-#if defined SYSTEM_NSS
+#if defined SYSTEM_NSS || defined ANDROID
OUString rootModule("libnssckbi" SAL_DLLEXTENSION);
#else
OUString rootModule("${LO_LIB_DIR}/libnssckbi" SAL_DLLEXTENSION);
___
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.4' - xmlsecurity/source
xmlsecurity/source/xmlsec/nss/nssinitializer.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit da24149ac681555430271f264095e2d8807c55cf
Author: Mert Tumer
AuthorDate: Wed Sep 30 17:14:59 2020 +0300
Commit: Andras Timar
CommitDate: Fri Oct 2 22:53:49 2020 +0200
Fix libnssckbi not found error on Android
This error causes Android App to be unable to
open Password-protected documents.
Change-Id: Iacbacb1c780025752e2447db325b075c58947818
Signed-off-by: Mert Tumer
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103708
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
index 8c71ed12b67d..d5f95d096e91 100644
--- a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
+++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
@@ -353,7 +353,7 @@ bool
nsscrypto_initialize(css::uno::Reference const
if (true)
#else
-#if defined SYSTEM_NSS
+#if defined SYSTEM_NSS || defined ANDROID
OUString rootModule("libnssckbi" SAL_DLLEXTENSION);
#else
OUString rootModule("${LO_LIB_DIR}/libnssckbi" SAL_DLLEXTENSION);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: eventattacher/source
eventattacher/source/eventattacher.cxx |5 +
eventattacher/source/evtatt.component |2 +-
2 files changed, 2 insertions(+), 5 deletions(-)
New commits:
commit 95969a80308dbe672b387b17ec6beff60fa2efef
Author: Stephan Bergmann
AuthorDate: Fri Oct 2 14:25:15 2020 +0200
Commit: Stephan Bergmann
CommitDate: Fri Oct 2 22:29:54 2020 +0200
Use the new single-instance="true" attribute in eventattacher
Change-Id: Iea414a641d252f7af40ebcabb6f11222fe81dd45
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103854
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/eventattacher/source/eventattacher.cxx
b/eventattacher/source/eventattacher.cxx
index 4099c1bc64fb..48dac12a3a95 100644
--- a/eventattacher/source/eventattacher.cxx
+++ b/eventattacher/source/eventattacher.cxx
@@ -40,7 +40,6 @@
#include
#include
#include
-#include
namespace com::sun::star::lang { class XMultiServiceFactory; }
@@ -843,9 +842,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
eventattacher_EventAttacher(
css::uno::XComponentContext* context, css::uno::Sequence
const& )
{
-static rtl::Reference instance(new
comp_EventAttacher::EventAttacherImpl(context));
-instance->acquire();
-return static_cast(instance.get());
+return cppu::acquire(static_cast(new
comp_EventAttacher::EventAttacherImpl(context)));
}
diff --git a/eventattacher/source/evtatt.component
b/eventattacher/source/evtatt.component
index 40389217c039..8d51ca1dee7a 100644
--- a/eventattacher/source/evtatt.component
+++ b/eventattacher/source/evtatt.component
@@ -20,7 +20,7 @@
http://openoffice.org/2010/uno-components";>
+constructor="eventattacher_EventAttacher" single-instance="true">
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/ui/dbui/createaddresslistdialog.cxx |8
1 file changed, 8 insertions(+)
New commits:
commit 8c8b6c6ab7e9016ccd5c7e2a7e5216d94e6e3613
Author: Caolán McNamara
AuthorDate: Fri Oct 2 16:21:02 2020 +0100
Commit: Caolán McNamara
CommitDate: Fri Oct 2 22:20:38 2020 +0200
tdf#137209 unparent widgets in fragment dtor
Change-Id: I819514fd2b97e2cc8daad71a7f3b0b27afe6136d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103867
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx
b/sw/source/ui/dbui/createaddresslistdialog.cxx
index 26475c2a1662..3ea6f5ba58ac 100644
--- a/sw/source/ui/dbui/createaddresslistdialog.cxx
+++ b/sw/source/ui/dbui/createaddresslistdialog.cxx
@@ -47,11 +47,13 @@ struct SwAddressFragment
std::unique_ptr m_xBuilder;
std::unique_ptr m_xLabel;
std::unique_ptr m_xEntry;
+weld::Container* m_pGrid;
SwAddressFragment(weld::Container* pGrid, int nLine)
: m_xBuilder(Application::CreateBuilder(pGrid,
"modules/swriter/ui/addressfragment.ui"))
, m_xLabel(m_xBuilder->weld_label("label"))
, m_xEntry(m_xBuilder->weld_entry("entry"))
+, m_pGrid(pGrid)
{
m_xLabel->set_grid_left_attach(0);
m_xLabel->set_grid_top_attach(nLine);
@@ -59,6 +61,12 @@ struct SwAddressFragment
m_xEntry->set_grid_left_attach(1);
m_xEntry->set_grid_top_attach(nLine);
}
+
+virtual ~SwAddressFragment()
+{
+m_pGrid->move(m_xEntry.get(), nullptr);
+m_pGrid->move(m_xLabel.get(), nullptr);
+}
};
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx |7
+++
connectivity/source/drivers/mozab/bootstrap/mozbootstrap.component |2 +-
connectivity/source/drivers/postgresql/postgresql-sdbc.component |2 +-
connectivity/source/drivers/postgresql/pq_driver.cxx |7
++-
4 files changed, 7 insertions(+), 11 deletions(-)
New commits:
commit 7b10b64b0701f1609e04aa13ac551858984b7cdf
Author: Stephan Bergmann
AuthorDate: Fri Oct 2 14:28:41 2020 +0200
Commit: Stephan Bergmann
CommitDate: Fri Oct 2 22:18:22 2020 +0200
Use the new single-instance="true" attribute in connectivity
Change-Id: I0572af758a98f2b417b35960403778c8cb2edcaf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103857
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
index 62bea4e8f253..71cb17b0f4ec 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
@@ -21,7 +21,7 @@
#include
#include
#include
-#include
+#include
#include "MMozillaBootstrap.hxx"
#include "MNSProfileDiscover.hxx"
@@ -132,9 +132,8 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
connectivity_moz_MozillaBootstrap_get_implementation(
css::uno::XComponentContext* , css::uno::Sequence const&)
{
-static rtl::Reference pMozillaBootstrap(new
connectivity::mozab::MozillaBootstrap());
-pMozillaBootstrap->acquire();
-return static_cast(pMozillaBootstrap.get());
+return cppu::acquire(
+static_cast(new
connectivity::mozab::MozillaBootstrap()));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/mozab/bootstrap/mozbootstrap.component
b/connectivity/source/drivers/mozab/bootstrap/mozbootstrap.component
index 11b58c134ba8..bfc0afe389ef 100644
--- a/connectivity/source/drivers/mozab/bootstrap/mozbootstrap.component
+++ b/connectivity/source/drivers/mozab/bootstrap/mozbootstrap.component
@@ -20,7 +20,7 @@
http://openoffice.org/2010/uno-components";>
+constructor="connectivity_moz_MozillaBootstrap_get_implementation"
single-instance="true">
diff --git a/connectivity/source/drivers/postgresql/postgresql-sdbc.component
b/connectivity/source/drivers/postgresql/postgresql-sdbc.component
index 0a10aa77b826..a14ab2c96fea 100644
--- a/connectivity/source/drivers/postgresql/postgresql-sdbc.component
+++ b/connectivity/source/drivers/postgresql/postgresql-sdbc.component
@@ -11,7 +11,7 @@
http://openoffice.org/2010/uno-components";>
+constructor="connectivity_pq_sdbc_driver_get_implementation"
single-instance="true">
diff --git a/connectivity/source/drivers/postgresql/pq_driver.cxx
b/connectivity/source/drivers/postgresql/pq_driver.cxx
index e96d12c1a61f..87eb5682a2b2 100644
--- a/connectivity/source/drivers/postgresql/pq_driver.cxx
+++ b/connectivity/source/drivers/postgresql/pq_driver.cxx
@@ -35,8 +35,8 @@
/
#include
+#include
#include
-#include
#include "pq_driver.hxx"
@@ -143,10 +143,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
connectivity_pq_sdbc_driver_get_implementation(
css::uno::XComponentContext* context , css::uno::Sequence
const&)
{
-static rtl::Reference g_Driver(new
pq_sdbc_driver::Driver(context));
-
-g_Driver->acquire();
-return static_cast(g_Driver.get());
+return cppu::acquire(static_cast(new
pq_sdbc_driver::Driver(context)));
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/odfimport/data/paste-first-para-direct-format.odt |binary
sw/qa/extras/odfimport/odfimport.cxx | 28
++
sw/source/filter/xml/xmlimp.cxx|8 ++
3 files changed, 36 insertions(+)
New commits:
commit ae9fe9d7107b2e25c9316033651e49c08537c0e9
Author: Miklos Vajna
AuthorDate: Fri Oct 2 16:45:35 2020 +0200
Commit: Miklos Vajna
CommitDate: Fri Oct 2 21:38:07 2020 +0200
ODT import: copy direct para formatting for first para in insert mode
It was inconsistent that we copied the paragraph style, but not the
direct paragraph formatting from the to-be-deleted first inserted node
to the last-before-insertion node.
Change-Id: Ie5161c6314d7c1a71599bfe4eeafd3398450bd77
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103864
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/sw/qa/extras/odfimport/data/paste-first-para-direct-format.odt
b/sw/qa/extras/odfimport/data/paste-first-para-direct-format.odt
new file mode 100644
index ..866d29c5ffbb
Binary files /dev/null and
b/sw/qa/extras/odfimport/data/paste-first-para-direct-format.odt differ
diff --git a/sw/qa/extras/odfimport/odfimport.cxx
b/sw/qa/extras/odfimport/odfimport.cxx
index e14e23dba0d1..73ce92082e60 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -40,6 +40,8 @@
#include
#include
#include
+#include
+#include
#include
@@ -,5 +1113,31 @@ DECLARE_ODFIMPORT_TEST(testTdf134971, "tdf134971a.odt")
CPPUNIT_ASSERT_EQUAL(OUString("Arial"), sString);
}
+CPPUNIT_TEST_FIXTURE(Test, testPasteFirstParaDirectFormat)
+{
+// Create a new document.
+mxComponent = loadFromDesktop("private:factory/swriter",
"com.sun.star.text.TextDocument");
+{
+// Set some direct formatting on the first paragraph, but leave
paragraph adjust at its
+// default (left).
+uno::Reference xParagraph(getParagraph(1),
uno::UNO_QUERY);
+xParagraph->setPropertyValue("PageNumberOffset",
uno::makeAny(static_cast(0)));
+}
+
+// Paste from ODT.
+uno::Reference xTextDocument(mxComponent,
uno::UNO_QUERY);
+uno::Reference xText = xTextDocument->getText();
+uno::Reference
xCursor(xText->createTextCursorByRange(xText->getStart()), uno::UNO_QUERY);
+
xCursor->insertDocumentFromURL(m_directories.getURLFromSrc(mpTestDocumentPath)
+ "paste-first-para-direct-format.odt", {});
+
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected: 3 (center)
+// - Actual : 0 (left)
+// i.e. the inserted document's first paragraph's paragraph formatting was
lost.
+uno::Reference xParagraph(getParagraph(1),
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(static_cast(style::ParagraphAdjust_CENTER),
+ getProperty(xParagraph, "ParaAdjust"));
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index 00c141332a15..2d591f122e57 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -786,7 +786,15 @@ void SwXMLImport::endDocument()
if (!pTextNode->GetText().isEmpty())
pDelNd->FormatToTextAttr( pTextNode );
else
+{
pTextNode->ChgFormatColl( pDelNd->GetTextColl() );
+if (!pDelNd->GetNoCondAttr(RES_PARATR_LIST_ID,
/*bInParents=*/false))
+{
+// MergeListsAtDocumentInsertPosition() will deal with
lists below, copy
+// paragraph direct formatting otherwise.
+pDelNd->CopyCollFormat(*pTextNode);
+}
+}
pTextNode->JoinNext();
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ascii/parasc.cxx |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 098ca4e0f1e09d10cbd038ffdec75bbc9c6d133d
Author: Caolán McNamara
AuthorDate: Fri Oct 2 14:43:53 2020 +0100
Commit: Caolán McNamara
CommitDate: Fri Oct 2 21:18:27 2020 +0200
crashtesting: an odd number of bytes for RTL_TEXTENCODING_UCS2 encoding
seen with id:000316,src:000190+000204,op:splice,rep:32.doc
Change-Id: Ia4eb13ed617828f0d35bed26651a7b9e9a4b6056
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103860
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sw/source/filter/ascii/parasc.cxx
b/sw/source/filter/ascii/parasc.cxx
index a2d7bbe30508..73536d36213e 100644
--- a/sw/source/filter/ascii/parasc.cxx
+++ b/sw/source/filter/ascii/parasc.cxx
@@ -348,12 +348,13 @@ ErrCode SwASCIIParser::ReadChars()
else
{
pStt = pLastStt = reinterpret_cast(pArr.get());
-pEnd = reinterpret_cast(pArr.get() + lGCount);
+auto nChars = lGCount / 2;
+pEnd = pStt + nChars;
if( bSwapUnicode )
{
char* pF = pArr.get(), *pN = pArr.get() + 1;
-for( sal_uLong n = 0; n < lGCount; n += 2, pF += 2, pN +=
2 )
+for( sal_uLong n = 0; n < nChars; ++n, pF += 2, pN += 2 )
{
char c = *pF;
*pF = *pN;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: pyuno/source
pyuno/source/loader/pythonloader.component |2 +-
pyuno/source/loader/pyuno_loader.cxx |9 +++--
2 files changed, 4 insertions(+), 7 deletions(-)
New commits:
commit d94aa8bd603bec2027f6eed6ac63d8c1cc40e054
Author: Stephan Bergmann
AuthorDate: Fri Oct 2 14:21:27 2020 +0200
Commit: Stephan Bergmann
CommitDate: Fri Oct 2 21:12:20 2020 +0200
Use the new single-instance="true" attribute in pyuno
Change-Id: I953dcc31445fc76d219903da56b2cc264f28c220
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103848
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/pyuno/source/loader/pythonloader.component
b/pyuno/source/loader/pythonloader.component
index 4e22781a6e60..4fc4a255ca2e 100644
--- a/pyuno/source/loader/pythonloader.component
+++ b/pyuno/source/loader/pythonloader.component
@@ -20,7 +20,7 @@
http://openoffice.org/2010/uno-components";>
+constructor="pyuno_Loader_get_implementation" single-instance="true">
diff --git a/pyuno/source/loader/pyuno_loader.cxx
b/pyuno/source/loader/pyuno_loader.cxx
index db6acb04dbd8..a92a538161b1 100644
--- a/pyuno/source/loader/pyuno_loader.cxx
+++ b/pyuno/source/loader/pyuno_loader.cxx
@@ -172,9 +172,7 @@ static void prependPythonPath( const OUString &
pythonPathBootstrap )
namespace {
-struct PythonInit
-{
-PythonInit() {
+void pythonInit() {
if ( Py_IsInitialized()) // may be inited by getComponentContext() already
return;
@@ -228,7 +226,6 @@ PythonInit() {
// PyThreadAttach below.
PyThreadState_Delete(tstate);
}
-};
}
@@ -236,8 +233,8 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
pyuno_Loader_get_implementation(
css::uno::XComponentContext* ctx , css::uno::Sequence
const&)
{
-// tdf#114815 thread-safe static to init python only once
-static PythonInit s_Init;
+// tdf#114815 init python only once, via single-instace="true" in
pythonloader.component
+pythonInit();
Reference< XInterface > ret;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: avmedia/source
avmedia/source/vlc/avmediavlc.component |2 +- avmedia/source/vlc/vlcmanager.cxx |5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) New commits: commit c1152bceb7593e47fcf6dc51d9538adfb5bd3c6e Author: Stephan Bergmann AuthorDate: Fri Oct 2 14:29:23 2020 +0200 Commit: Stephan Bergmann CommitDate: Fri Oct 2 20:50:31 2020 +0200 Use the new single-instance="true" attribute in avmedia Change-Id: If3f882b4f28224d951492c26800d3009b8cb04b3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103858 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/avmedia/source/vlc/avmediavlc.component b/avmedia/source/vlc/avmediavlc.component index 595c3e8ef325..27009957141b 100644 --- a/avmedia/source/vlc/avmediavlc.component +++ b/avmedia/source/vlc/avmediavlc.component @@ -10,7 +10,7 @@ http://openoffice.org/2010/uno-components";> +constructor="com_sun_star_comp_media_Manager_VLC_get_implementation" single-instance="true"> diff --git a/avmedia/source/vlc/vlcmanager.cxx b/avmedia/source/vlc/vlcmanager.cxx index bb916013ef4f..a78dd4381f20 100644 --- a/avmedia/source/vlc/vlcmanager.cxx +++ b/avmedia/source/vlc/vlcmanager.cxx @@ -11,6 +11,7 @@ #include #include #include +#include #include #include "vlcmanager.hxx" #include "vlcplayer.hxx" @@ -127,9 +128,7 @@ com_sun_star_comp_media_Manager_VLC_get_implementation( // Experimental for now - code is neither elegant nor well tested. if (!officecfg::Office::Common::Misc::ExperimentalMode::get(context)) return nullptr; -static uno::Reference< uno::XInterface > manager( *new ::avmedia::vlc::Manager ); -manager->acquire(); -return manager.get(); +return cppu::acquire(static_cast(new ::avmedia::vlc::Manager)); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/source
desktop/source/splash/spl.component |2 +-
desktop/source/splash/unxsplash.cxx |5 +
2 files changed, 2 insertions(+), 5 deletions(-)
New commits:
commit d777da05516d25fa1f027ea81436be65b5816d70
Author: Stephan Bergmann
AuthorDate: Fri Oct 2 14:27:24 2020 +0200
Commit: Stephan Bergmann
CommitDate: Fri Oct 2 20:44:52 2020 +0200
Use the new single-instance="true" attribute in desktop
Change-Id: I8ac760a1215dbaaa76923dc07c21cc971f735412
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103856
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/desktop/source/splash/spl.component
b/desktop/source/splash/spl.component
index 204dbffa8b89..a15cbdf54492 100644
--- a/desktop/source/splash/spl.component
+++ b/desktop/source/splash/spl.component
@@ -24,7 +24,7 @@
+constructor="desktop_UnxSplash_get_implementation" single-instance="true">
diff --git a/desktop/source/splash/unxsplash.cxx
b/desktop/source/splash/unxsplash.cxx
index efee99e46023..2cf813ac2165 100644
--- a/desktop/source/splash/unxsplash.cxx
+++ b/desktop/source/splash/unxsplash.cxx
@@ -122,10 +122,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
desktop_UnxSplash_get_implementation(
css::uno::XComponentContext* , css::uno::Sequence const&)
{
-static rtl::Reference< desktop::UnxSplashScreen > m_xINSTANCE(new
desktop::UnxSplashScreen());
-
-m_xINSTANCE->acquire();
-return static_cast(m_xINSTANCE.get());
+return cppu::acquire(static_cast(new
desktop::UnxSplashScreen()));
}
/* 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: embeddedobj/source embeddedobj/util
embeddedobj/source/commonembedding/xfactory.cxx |9 +++--
embeddedobj/source/general/xcreator.cxx |6 ++
embeddedobj/source/msole/emboleobj.component |3 ++-
embeddedobj/source/msole/emboleobj.windows.component |6 --
embeddedobj/source/msole/xdialogcreator.cxx |5 ++---
embeddedobj/source/msole/xolefactory.cxx |5 ++---
embeddedobj/util/embobj.component|9 ++---
7 files changed, 21 insertions(+), 22 deletions(-)
New commits:
commit a2b256df787e76c90c110f363cf7a3b84b54947f
Author: Stephan Bergmann
AuthorDate: Fri Oct 2 14:26:51 2020 +0200
Commit: Stephan Bergmann
CommitDate: Fri Oct 2 20:43:58 2020 +0200
Use the new single-instance="true" attribute in embeddedobj
Change-Id: Icead3bb5715a08bc2a2dfbb16c074d1b19e316a9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103855
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/embeddedobj/source/commonembedding/xfactory.cxx
b/embeddedobj/source/commonembedding/xfactory.cxx
index a4ef74d08ee4..3f7cb8fde98f 100644
--- a/embeddedobj/source/commonembedding/xfactory.cxx
+++ b/embeddedobj/source/commonembedding/xfactory.cxx
@@ -24,6 +24,7 @@
#include
#include
#include
+#include
#include
#include "xfactory.hxx"
@@ -367,9 +368,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
embeddedobj_OOoEmbeddedObjectFactory_get_implementation(
css::uno::XComponentContext* context, css::uno::Sequence
const&)
{
-static rtl::Reference g_Instance(new
OOoEmbeddedObjectFactory(context));
-g_Instance->acquire();
-return static_cast(g_Instance.get());
+return cppu::acquire(static_cast(new
OOoEmbeddedObjectFactory(context)));
}
@@ -413,8 +412,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
embeddedobj_OOoSpecialEmbeddedObjectFactory_get_implementation(
css::uno::XComponentContext* context, css::uno::Sequence
const&)
{
-static rtl::Reference g_Instance(new
OOoSpecialEmbeddedObjectFactory(context));
-g_Instance->acquire();
-return static_cast(g_Instance.get());
+return cppu::acquire(static_cast(new
OOoSpecialEmbeddedObjectFactory(context)));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/embeddedobj/source/general/xcreator.cxx
b/embeddedobj/source/general/xcreator.cxx
index 9e9bb0934603..a54295895190 100644
--- a/embeddedobj/source/general/xcreator.cxx
+++ b/embeddedobj/source/general/xcreator.cxx
@@ -28,9 +28,9 @@
#include
#include
+#include
#include
#include
-#include
#include
#include
@@ -410,9 +410,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
embeddedobj_UNOEmbeddedObjectCreator_get_implementation(
css::uno::XComponentContext* context, css::uno::Sequence
const&)
{
-static rtl::Reference g_Instance(new
UNOEmbeddedObjectCreator(context));
-g_Instance->acquire();
-return static_cast(g_Instance.get());
+return cppu::acquire(static_cast(new
UNOEmbeddedObjectCreator(context)));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/embeddedobj/source/msole/emboleobj.component
b/embeddedobj/source/msole/emboleobj.component
index bf7e128f04e5..ac09d3a6d32d 100644
--- a/embeddedobj/source/msole/emboleobj.component
+++ b/embeddedobj/source/msole/emboleobj.component
@@ -20,7 +20,8 @@
http://openoffice.org/2010/uno-components";>
+ constructor="embeddedobj_OleEmbeddedObjectFactory_get_implementation"
+ single-instance="true">
diff --git a/embeddedobj/source/msole/emboleobj.windows.component
b/embeddedobj/source/msole/emboleobj.windows.component
index e41c81d33048..89b644fc79b0 100644
--- a/embeddedobj/source/msole/emboleobj.windows.component
+++ b/embeddedobj/source/msole/emboleobj.windows.component
@@ -20,12 +20,14 @@
http://openoffice.org/2010/uno-components";>
+ constructor="embeddedobj_MSOLEDialogObjectCreator_get_implementation"
+ single-instance="true">
+ constructor="embeddedobj_OleEmbeddedObjectFactory_get_implementation"
+ single-instance="true">
diff --git a/embeddedobj/source/msole/xdialogcreator.cxx
b/embeddedobj/source/msole/xdialogcreator.cxx
index 49e9c0c925e4..415039c3f1fc 100644
--- a/embeddedobj/source/msole/xdialogcreator.cxx
+++ b/embeddedobj/source/msole/xdialogcreator.cxx
@@ -35,6 +35,7 @@
#include
#include
#include
+#include
#include "xdialogcreator.hxx"
#include
@@ -323,9 +324,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
embeddedobj_MSOLEDialogObjectCreator_get_implementation(
css::uno::XComponentContext* context, css::uno::Sequence
const&)
{
-static rtl::Reference g_Instance(new
MSOLEDialogObjectCreator(context));
-g_Instance->acquire();
-return static_cast(g_Instance.get());
+return cppu::acquire(static_cast(new
MSOLEDialogObjectCreator(context)));
}
/* vim:set shiftwidth=4 so
[Libreoffice-commits] core.git: filter/source
filter/source/config/cache/configflush.cxx |6 ++
filter/source/config/cache/filterconfig1.component |2 +-
filter/source/odfflatxml/OdfFlatXml.cxx|6 ++
filter/source/odfflatxml/odfflatxml.component |2 +-
4 files changed, 6 insertions(+), 10 deletions(-)
New commits:
commit f4bf7804d5aeb35a9b0c6517997cf079ff770e9e
Author: Stephan Bergmann
AuthorDate: Fri Oct 2 14:24:38 2020 +0200
Commit: Stephan Bergmann
CommitDate: Fri Oct 2 20:44:25 2020 +0200
Use the new single-instance="true" attribute in filter
Change-Id: Id9a77324a30dec155e77616378690c47cb86536b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103853
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/filter/source/config/cache/configflush.cxx
b/filter/source/config/cache/configflush.cxx
index e0c4ca58f641..f3f114b90ca2 100644
--- a/filter/source/config/cache/configflush.cxx
+++ b/filter/source/config/cache/configflush.cxx
@@ -19,8 +19,8 @@
#include "configflush.hxx"
#include
+#include
#include
-#include
namespace filter::config{
@@ -107,9 +107,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
filter_ConfigFlush_get_implementation(
css::uno::XComponentContext* , css::uno::Sequence const&)
{
-static rtl::Reference g_Instance(new
filter::config::ConfigFlush());
-g_Instance->acquire();
-return static_cast(g_Instance.get());
+return cppu::acquire(static_cast(new
filter::config::ConfigFlush()));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/config/cache/filterconfig1.component
b/filter/source/config/cache/filterconfig1.component
index 9597348890ee..711c0e38f781 100644
--- a/filter/source/config/cache/filterconfig1.component
+++ b/filter/source/config/cache/filterconfig1.component
@@ -20,7 +20,7 @@
http://openoffice.org/2010/uno-components";>
+constructor="filter_ConfigFlush_get_implementation" single-instance="true">
#include
#include
+#include
#include
#include
-#include
#include
@@ -197,9 +197,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
filter_OdfFlatXml_get_implementation(
css::uno::XComponentContext* context, css::uno::Sequence
const&)
{
-static rtl::Reference g_Instance(new OdfFlatXml(context));
-g_Instance->acquire();
-return static_cast(g_Instance.get());
+return cppu::acquire(static_cast(new
OdfFlatXml(context)));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/odfflatxml/odfflatxml.component
b/filter/source/odfflatxml/odfflatxml.component
index 273ff4582d54..5f8bcfa9da28 100644
--- a/filter/source/odfflatxml/odfflatxml.component
+++ b/filter/source/odfflatxml/odfflatxml.component
@@ -10,7 +10,7 @@
http://openoffice.org/2010/uno-components";>
+constructor="filter_OdfFlatXml_get_implementation" single-instance="true">
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: lingucomponent/source
lingucomponent/source/hyphenator/hyphen/hyphen.component |2 +-
lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx |5 ++---
lingucomponent/source/spellcheck/macosxspell/MacOSXSpell.component |2 +-
lingucomponent/source/spellcheck/macosxspell/macspellimp.mm|5 ++---
lingucomponent/source/spellcheck/spell/spell.component |2 +-
lingucomponent/source/spellcheck/spell/sspellimp.cxx |5 ++---
lingucomponent/source/thesaurus/libnth/lnth.component |2 +-
lingucomponent/source/thesaurus/libnth/nthesimp.cxx|5 ++---
8 files changed, 12 insertions(+), 16 deletions(-)
New commits:
commit cf7638fd051773efcc78ea9610030354d4d15665
Author: Stephan Bergmann
AuthorDate: Fri Oct 2 14:23:42 2020 +0200
Commit: Stephan Bergmann
CommitDate: Fri Oct 2 20:43:22 2020 +0200
Use the new single-instance="true" attribute in lingucomponent
Change-Id: I802ee5ac618aa706b126630c8bb4e7e2e83c59f5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103852
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/lingucomponent/source/hyphenator/hyphen/hyphen.component
b/lingucomponent/source/hyphenator/hyphen/hyphen.component
index 0d775423dd5c..b9bc8b1f36ca 100644
--- a/lingucomponent/source/hyphenator/hyphen/hyphen.component
+++ b/lingucomponent/source/hyphenator/hyphen/hyphen.component
@@ -20,7 +20,7 @@
http://openoffice.org/2010/uno-components";>
+constructor="lingucomponent_Hyphenator_get_implementation"
single-instance="true">
diff --git a/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx
b/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx
index 8c7d09ac66e6..988306757a96 100644
--- a/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx
+++ b/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx
@@ -22,6 +22,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -803,9 +804,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
lingucomponent_Hyphenator_get_implementation(
css::uno::XComponentContext* , css::uno::Sequence const&)
{
-static rtl::Reference g_Instance(new Hyphenator());
-g_Instance->acquire();
-return static_cast(g_Instance.get());
+return cppu::acquire(static_cast(new Hyphenator()));
}
diff --git a/lingucomponent/source/spellcheck/macosxspell/MacOSXSpell.component
b/lingucomponent/source/spellcheck/macosxspell/MacOSXSpell.component
index f318df2abfec..b1fe7d612aa8 100644
--- a/lingucomponent/source/spellcheck/macosxspell/MacOSXSpell.component
+++ b/lingucomponent/source/spellcheck/macosxspell/MacOSXSpell.component
@@ -20,7 +20,7 @@
http://openoffice.org/2010/uno-components";>
+constructor="lingucomponent_MacSpellChecker_get_implementation"
single-instance="true">
diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm
b/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm
index c3f64635e071..74b365c71746 100644
--- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm
+++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm
@@ -23,6 +23,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -634,9 +635,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
lingucomponent_MacSpellChecker_get_implementation(
css::uno::XComponentContext* , css::uno::Sequence const&)
{
-static rtl::Reference g_Instance(new MacSpellChecker());
-g_Instance->acquire();
-return static_cast(g_Instance.get());
+return cppu::acquire(static_cast(new
MacSpellChecker()));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lingucomponent/source/spellcheck/spell/spell.component
b/lingucomponent/source/spellcheck/spell/spell.component
index 59f634eab02a..c284e13fc3a7 100644
--- a/lingucomponent/source/spellcheck/spell/spell.component
+++ b/lingucomponent/source/spellcheck/spell/spell.component
@@ -20,7 +20,7 @@
http://openoffice.org/2010/uno-components";>
+constructor="lingucomponent_SpellChecker_get_implementation"
single-instance="true">
diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx
b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
index 23bd9e014c29..051b29c60d4e 100644
--- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
@@ -25,6 +25,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -635,9 +636,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
lingucomponent_SpellChecker_get_implementation(
css::uno::XComponentContext* , css::uno::Sequence const&)
{
-static rtl::Reference g_Instance(new SpellChecker());
-g_Instance->acquire();
-return static_cast(g_Instance.get());
+return cppu::acquire(static_cast(new SpellChecker()));
}
diff --git a/lingucomponent/source/thesaurus/lib
[Libreoffice-commits] core.git: linguistic/source
linguistic/source/dlistimp.cxx |5 ++---
linguistic/source/gciterator.cxx |6 ++
linguistic/source/lng.component |8
linguistic/source/lngopt.cxx |6 ++
linguistic/source/lngsvcmgr.cxx |5 ++---
5 files changed, 12 insertions(+), 18 deletions(-)
New commits:
commit 1be81c0ae66fdb4a92ca9b4fe6691958da838866
Author: Stephan Bergmann
AuthorDate: Fri Oct 2 14:22:55 2020 +0200
Commit: Stephan Bergmann
CommitDate: Fri Oct 2 20:42:52 2020 +0200
Use the new single-instance="true" attribute in linguistic
Change-Id: I87343e3760d3e583fc6b6ad55028e51bd402b536
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103851
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx
index 03c576a820f4..3fa38b38d4a5 100644
--- a/linguistic/source/dlistimp.cxx
+++ b/linguistic/source/dlistimp.cxx
@@ -26,6 +26,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -784,9 +785,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
linguistic_DicList_get_implementation(
css::uno::XComponentContext* , css::uno::Sequence const&)
{
-static rtl::Reference g_Instance(new DicList());
-g_Instance->acquire();
-return static_cast(g_Instance.get());
+return cppu::acquire(static_cast(new DicList()));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx
index 45c13b1cfe72..19864c9d8035 100644
--- a/linguistic/source/gciterator.cxx
+++ b/linguistic/source/gciterator.cxx
@@ -48,12 +48,12 @@
#include
#include
#include
+#include
#include
#include
#include
#include
#include
-#include
#include
@@ -1174,9 +1174,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
linguistic_GrammarCheckingIterator_get_implementation(
css::uno::XComponentContext* , css::uno::Sequence const&)
{
-static rtl::Reference g_Instance(new
GrammarCheckingIterator());
-g_Instance->acquire();
-return static_cast(g_Instance.get());
+return cppu::acquire(static_cast(new
GrammarCheckingIterator()));
}
diff --git a/linguistic/source/lng.component b/linguistic/source/lng.component
index 525e02cd93e7..82622e2f005f 100644
--- a/linguistic/source/lng.component
+++ b/linguistic/source/lng.component
@@ -24,19 +24,19 @@
+constructor="linguistic_DicList_get_implementation" single-instance="true">
+constructor="linguistic_LinguProps_get_implementation"
single-instance="true">
+constructor="linguistic_LngSvcMgr_get_implementation"
single-instance="true">
+constructor="linguistic_GrammarCheckingIterator_get_implementation"
single-instance="true">
diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx
index f82124ecc07a..290b6581f8dc 100644
--- a/linguistic/source/lngopt.cxx
+++ b/linguistic/source/lngopt.cxx
@@ -23,11 +23,11 @@
#include
#include
#include
-#include
#include
#include
#include
+#include
#include
#include
@@ -427,9 +427,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
linguistic_LinguProps_get_implementation(
css::uno::XComponentContext* , css::uno::Sequence const&)
{
-static rtl::Reference g_Instance(new LinguProps());
-g_Instance->acquire();
-return static_cast(g_Instance.get());
+return cppu::acquire(static_cast(new LinguProps()));
}
diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx
index 5f25749da164..23a2e2c7cac7 100644
--- a/linguistic/source/lngsvcmgr.cxx
+++ b/linguistic/source/lngsvcmgr.cxx
@@ -42,6 +42,7 @@
#include
#include
#include
+#include
#include "lngsvcmgr.hxx"
#include
@@ -1837,9 +1838,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
linguistic_LngSvcMgr_get_implementation(
css::uno::XComponentContext* , css::uno::Sequence const&)
{
-static rtl::Reference g_Instance(new LngSvcMgr());
-g_Instance->acquire();
-return static_cast(g_Instance.get());
+return cppu::acquire(static_cast(new LngSvcMgr()));
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: package/source
package/source/xstor/xfactory.cxx|5 ++---
package/source/xstor/xstor.component |2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
New commits:
commit 00d62d03dffd41a923c5920941770d37f52fb6e0
Author: Stephan Bergmann
AuthorDate: Fri Oct 2 14:22:04 2020 +0200
Commit: Stephan Bergmann
CommitDate: Fri Oct 2 20:42:29 2020 +0200
Use the new single-instance="true" attribute in package
Change-Id: I3effdd2500de6accaa075cfc80bdd2654dc13801
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103849
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/package/source/xstor/xfactory.cxx
b/package/source/xstor/xfactory.cxx
index f398e5f2b909..89e94dc4e3d3 100644
--- a/package/source/xstor/xfactory.cxx
+++ b/package/source/xstor/xfactory.cxx
@@ -32,6 +32,7 @@
#include
#include
#include
+#include
#include
#include "xfactory.hxx"
@@ -287,9 +288,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
package_OStorageFactory_get_implementation(
css::uno::XComponentContext* context, css::uno::Sequence
const&)
{
-static rtl::Reference g_Instance(new
OStorageFactory(context));
-g_Instance->acquire();
-return static_cast(g_Instance.get());
+return cppu::acquire(static_cast(new
OStorageFactory(context)));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/package/source/xstor/xstor.component
b/package/source/xstor/xstor.component
index 550501f269f6..ff6de82b654f 100644
--- a/package/source/xstor/xstor.component
+++ b/package/source/xstor/xstor.component
@@ -20,7 +20,7 @@
http://openoffice.org/2010/uno-components";>
+constructor="package_OStorageFactory_get_implementation"
single-instance="true">
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scaddins/source
scaddins/source/datefunc/date.component |2 +-
scaddins/source/datefunc/datefunc.cxx |6 ++
scaddins/source/pricing/pricing.component |2 +-
scaddins/source/pricing/pricing.cxx |6 ++
4 files changed, 6 insertions(+), 10 deletions(-)
New commits:
commit df1fb2f78b4e979d90a3b9b7459c16eb13024a1a
Author: Stephan Bergmann
AuthorDate: Fri Oct 2 14:20:21 2020 +0200
Commit: Stephan Bergmann
CommitDate: Fri Oct 2 20:42:05 2020 +0200
Use the new single-instance="true" attribute in scaddins
Change-Id: Ic20da5a128b9225e688011b556f7927901f344f0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103847
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/scaddins/source/datefunc/date.component
b/scaddins/source/datefunc/date.component
index db67781e1476..7337d98c9388 100644
--- a/scaddins/source/datefunc/date.component
+++ b/scaddins/source/datefunc/date.component
@@ -20,7 +20,7 @@
http://openoffice.org/2010/uno-components";>
+constructor="scaddins_ScaDateAddIn_get_implementation"
single-instance="true">
diff --git a/scaddins/source/datefunc/datefunc.cxx
b/scaddins/source/datefunc/datefunc.cxx
index d4c1921d13f0..995db6235300 100644
--- a/scaddins/source/datefunc/datefunc.cxx
+++ b/scaddins/source/datefunc/datefunc.cxx
@@ -23,9 +23,9 @@
#include
#include
#include
+#include
#include
#include
-#include
#include
#include
#include
@@ -91,9 +91,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
scaddins_ScaDateAddIn_get_implementation(
css::uno::XComponentContext* , css::uno::Sequence const&)
{
-static rtl::Reference g_Instance(new ScaDateAddIn());
-g_Instance->acquire();
-return static_cast(g_Instance.get());
+return cppu::acquire(static_cast(new ScaDateAddIn()));
}
diff --git a/scaddins/source/pricing/pricing.component
b/scaddins/source/pricing/pricing.component
index fcee10771c70..fbabf1fb6243 100644
--- a/scaddins/source/pricing/pricing.component
+++ b/scaddins/source/pricing/pricing.component
@@ -20,7 +20,7 @@
http://openoffice.org/2010/uno-components";>
+constructor="scaddins_ScaPricingAddIn_get_implementation"
single-instance="true">
diff --git a/scaddins/source/pricing/pricing.cxx
b/scaddins/source/pricing/pricing.cxx
index 6cbb13256464..569e396c43da 100644
--- a/scaddins/source/pricing/pricing.cxx
+++ b/scaddins/source/pricing/pricing.cxx
@@ -29,11 +29,11 @@
#include
#include
+#include
#include
#include
#include
#include
-#include
#include
#include
@@ -93,9 +93,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
scaddins_ScaPricingAddIn_get_implementation(
css::uno::XComponentContext* , css::uno::Sequence const&)
{
-static rtl::Reference g_Instance(new ScaPricingAddIn());
-g_Instance->acquire();
-return static_cast(g_Instance.get());
+return cppu::acquire(static_cast(new
ScaPricingAddIn()));
}
// "normal" service implementation
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: shell/source
shell/source/win32/simplemail/smplmail.component |2 +-
shell/source/win32/simplemail/smplmailsuppl.cxx |6 ++
2 files changed, 3 insertions(+), 5 deletions(-)
New commits:
commit ed3eda5d752b988411616c8cd96953ae6a2fe20f
Author: Stephan Bergmann
AuthorDate: Fri Oct 2 14:19:32 2020 +0200
Commit: Stephan Bergmann
CommitDate: Fri Oct 2 20:41:23 2020 +0200
Use the new single-instance="true" attribute in shell
Change-Id: Ia8e454a65965cf99bafa795fe0bea4836ada2ee0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103846
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/shell/source/win32/simplemail/smplmail.component
b/shell/source/win32/simplemail/smplmail.component
index 6b95bd8cdc5c..32446884ddc3 100644
--- a/shell/source/win32/simplemail/smplmail.component
+++ b/shell/source/win32/simplemail/smplmail.component
@@ -20,7 +20,7 @@
http://openoffice.org/2010/uno-components";>
+constructor="shell_CSmplMailSuppl_get_implementation"
single-instance="true">
diff --git a/shell/source/win32/simplemail/smplmailsuppl.cxx
b/shell/source/win32/simplemail/smplmailsuppl.cxx
index eba930b09107..8e6cdfcd2403 100644
--- a/shell/source/win32/simplemail/smplmailsuppl.cxx
+++ b/shell/source/win32/simplemail/smplmailsuppl.cxx
@@ -18,8 +18,8 @@
*/
#include
+#include
#include
-#include
#include "smplmailsuppl.hxx"
#include "smplmailclient.hxx"
@@ -79,9 +79,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
shell_CSmplMailSuppl_get_implementation(
css::uno::XComponentContext* , css::uno::Sequence const&)
{
-static rtl::Reference g_Instance(new CSmplMailSuppl());
-g_Instance->acquire();
-return static_cast(g_Instance.get());
+return cppu::acquire(static_cast(new
CSmplMailSuppl()));
}
/* 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: 2 commits - stoc/source sw/source
stoc/source/invocation_adapterfactory/iafactory.cxx|8
stoc/source/invocation_adapterfactory/invocadapt.component |2
stoc/source/proxy_factory/proxyfac.component |2
stoc/source/proxy_factory/proxyfac.cxx | 18 -
sw/source/filter/ww8/docxattributeoutput.cxx | 46 +--
sw/source/filter/ww8/docxexport.cxx| 178 ++---
sw/source/filter/ww8/docxexport.hxx| 10
sw/source/filter/ww8/docxexportfilter.cxx |2
sw/source/filter/ww8/rtfattributeoutput.cxx| 10
sw/source/filter/ww8/rtfexport.cxx | 59 ++--
sw/source/filter/ww8/rtfexport.hxx |4
sw/source/filter/ww8/rtfexportfilter.cxx |2
sw/source/filter/ww8/wrtw8esh.cxx | 36 +-
sw/source/filter/ww8/wrtw8nds.cxx | 54 +--
sw/source/filter/ww8/wrtw8num.cxx | 10
sw/source/filter/ww8/wrtw8sty.cxx | 38 +-
sw/source/filter/ww8/wrtww8.cxx| 157 +--
sw/source/filter/ww8/wrtww8.hxx|6
sw/source/filter/ww8/wrtww8gr.cxx | 10
sw/source/filter/ww8/ww8atr.cxx| 70 ++---
20 files changed, 350 insertions(+), 372 deletions(-)
New commits:
commit ad64650bda81ba59ebd27acaf67dc0b444ac0573
Author: Stephan Bergmann
AuthorDate: Fri Oct 2 14:18:49 2020 +0200
Commit: Stephan Bergmann
CommitDate: Fri Oct 2 20:40:53 2020 +0200
Use the new single-instance="true" attribute in stoc
Change-Id: Icc0d2555bb90a5e0bf6ea828d14fb9e836dd7981
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103845
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx
b/stoc/source/invocation_adapterfactory/iafactory.cxx
index 65322c3a6234..126af1f82851 100644
--- a/stoc/source/invocation_adapterfactory/iafactory.cxx
+++ b/stoc/source/invocation_adapterfactory/iafactory.cxx
@@ -23,7 +23,6 @@
#include
#include
#include
-#include
#include
#include
@@ -33,7 +32,7 @@
#include
#include
-
+#include
#include
#include
#include
@@ -876,10 +875,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
stoc_invocation_adapter_get_implementation(
css::uno::XComponentContext* context, css::uno::Sequence
const&)
{
-static rtl::Reference g_Instance(new
stoc_invadp::FactoryImpl(context));
-
-g_Instance->acquire();
-return static_cast(g_Instance.get());
+return cppu::acquire(static_cast(new
stoc_invadp::FactoryImpl(context)));
}
diff --git a/stoc/source/invocation_adapterfactory/invocadapt.component
b/stoc/source/invocation_adapterfactory/invocadapt.component
index 9dbf20e48bad..ec1723e22a9b 100644
--- a/stoc/source/invocation_adapterfactory/invocadapt.component
+++ b/stoc/source/invocation_adapterfactory/invocadapt.component
@@ -20,7 +20,7 @@
http://openoffice.org/2010/uno-components";>
+constructor="stoc_invocation_adapter_get_implementation"
single-instance="true">
diff --git a/stoc/source/proxy_factory/proxyfac.component
b/stoc/source/proxy_factory/proxyfac.component
index eee87014ca98..b069f88dff81 100644
--- a/stoc/source/proxy_factory/proxyfac.component
+++ b/stoc/source/proxy_factory/proxyfac.component
@@ -20,7 +20,7 @@
http://openoffice.org/2010/uno-components";>
+constructor="stoc_FactoryImpl_get_implementation" single-instance="true">
diff --git a/stoc/source/proxy_factory/proxyfac.cxx
b/stoc/source/proxy_factory/proxyfac.cxx
index cecb6d917b39..b1c5597d0311 100644
--- a/stoc/source/proxy_factory/proxyfac.cxx
+++ b/stoc/source/proxy_factory/proxyfac.cxx
@@ -20,7 +20,6 @@
#include
#include
-#include
#include
#include
#include
@@ -31,6 +30,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -401,21 +401,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
stoc_FactoryImpl_get_implementation(
css::uno::XComponentContext* , css::uno::Sequence const&)
{
-Reference< XInterface > xRet;
-static osl::Mutex s_mutex;
-// note: don't use ::osl::Mutex::getGlobalMutex() here, it deadlocks
-// with getImplHelperInitMutex()
-::osl::MutexGuard guard(s_mutex);
-static WeakReference < XInterface > rwInstance;
-xRet = rwInstance;
-
-if (! xRet.is())
-{
-xRet = static_cast< ::cppu::OWeakObject * >(new FactoryImpl);
-rwInstance = xRet;
-}
-xRet->acquire();
-return xRet.get();
+return cppu::acquire(static_cast< ::cppu::OWeakObject * >(new
FactoryImpl));
}
commit 7c70a59cd02a5b6111a9c39c74c8b6cd1585c4c2
Author: Caolán McNamara
AuthorDate: Fri Oct 2 11:35:04 2020 +0100
Commit: Caolán McNamara
CommitDate: Fri Oct 2 20
[Libreoffice-commits] core.git: ucb/source
ucb/source/sorter/sortdynres.cxx|5 ++---
ucb/source/sorter/srtrs1.component |2 +-
ucb/source/ucp/cmis/cmis_provider.cxx |5 ++---
ucb/source/ucp/cmis/ucpcmis1.component |2 +-
ucb/source/ucp/ext/ucpext.component |2 +-
ucb/source/ucp/ext/ucpext_provider.cxx |5 ++---
ucb/source/ucp/ftp/ftpcontentprovider.cxx |5 ++---
ucb/source/ucp/ftp/ucpftp1.component|2 +-
ucb/source/ucp/gio/gio_provider.cxx | 16 ++--
ucb/source/ucp/gio/ucpgio.component |2 +-
ucb/source/ucp/hierarchy/hierarchydatasource.cxx|6 ++
ucb/source/ucp/hierarchy/hierarchyprovider.cxx |5 ++---
ucb/source/ucp/hierarchy/ucphier1.component |4 ++--
ucb/source/ucp/package/pkgprovider.cxx |4 +---
ucb/source/ucp/package/ucppkg1.component|2 +-
ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx |6 ++
ucb/source/ucp/tdoc/ucptdoc1.component |2 +-
17 files changed, 30 insertions(+), 45 deletions(-)
New commits:
commit d7d3c11357efb65bd9721e6fedae2486162d1a71
Author: Stephan Bergmann
AuthorDate: Fri Oct 2 14:16:57 2020 +0200
Commit: Stephan Bergmann
CommitDate: Fri Oct 2 20:40:24 2020 +0200
Use the new single-instance="true" attribute in ucb
Change-Id: I7eb38f0da1d88fd0f7ca4a1054546617b10a3502
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103843
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/ucb/source/sorter/sortdynres.cxx b/ucb/source/sorter/sortdynres.cxx
index cbacf231e233..401a3ef0afe7 100644
--- a/ucb/source/sorter/sortdynres.cxx
+++ b/ucb/source/sorter/sortdynres.cxx
@@ -20,6 +20,7 @@
#include "sortdynres.hxx"
#include
#include
+#include
#include
#include
#include
@@ -436,9 +437,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
ucb_SortedDynamicResultSetFactory_get_implementation(
css::uno::XComponentContext* context, css::uno::Sequence
const&)
{
-static rtl::Reference g_Instance(new
SortedDynamicResultSetFactory(context));
-g_Instance->acquire();
-return static_cast(g_Instance.get());
+return cppu::acquire(static_cast(new
SortedDynamicResultSetFactory(context)));
}
// SortedDynamicResultSetFactory methods.
diff --git a/ucb/source/sorter/srtrs1.component
b/ucb/source/sorter/srtrs1.component
index d3d26136002f..a96277d0b002 100644
--- a/ucb/source/sorter/srtrs1.component
+++ b/ucb/source/sorter/srtrs1.component
@@ -20,7 +20,7 @@
http://openoffice.org/2010/uno-components";>
+constructor="ucb_SortedDynamicResultSetFactory_get_implementation"
single-instance="true">
diff --git a/ucb/source/ucp/cmis/cmis_provider.cxx
b/ucb/source/ucp/cmis/cmis_provider.cxx
index 219d1f5f0d6f..b6f207b62cd3 100644
--- a/ucb/source/ucp/cmis/cmis_provider.cxx
+++ b/ucb/source/ucp/cmis/cmis_provider.cxx
@@ -9,6 +9,7 @@
#include
#include
+#include
#include
#include
#include
@@ -136,9 +137,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
ucb_cmis_ContentProvider_get_implementation(
css::uno::XComponentContext* context, css::uno::Sequence
const&)
{
-static rtl::Reference g_Instance(new
cmis::ContentProvider(context));
-g_Instance->acquire();
-return static_cast(g_Instance.get());
+return cppu::acquire(static_cast(new
cmis::ContentProvider(context)));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/cmis/ucpcmis1.component
b/ucb/source/ucp/cmis/ucpcmis1.component
index a1339fc20f16..101a892a0627 100644
--- a/ucb/source/ucp/cmis/ucpcmis1.component
+++ b/ucb/source/ucp/cmis/ucpcmis1.component
@@ -10,7 +10,7 @@
http://openoffice.org/2010/uno-components";>
+constructor="ucb_cmis_ContentProvider_get_implementation"
single-instance="true">
diff --git a/ucb/source/ucp/ext/ucpext.component
b/ucb/source/ucp/ext/ucpext.component
index 0f1b96555baf..879837e5f0b3 100644
--- a/ucb/source/ucp/ext/ucpext.component
+++ b/ucb/source/ucp/ext/ucpext.component
@@ -20,7 +20,7 @@
http://openoffice.org/2010/uno-components";>
+constructor="ucb_ext_ContentProvider_get_implementation"
single-instance="true">
diff --git a/ucb/source/ucp/ext/ucpext_provider.cxx
b/ucb/source/ucp/ext/ucpext_provider.cxx
index 717077bc8dbc..cd8141e8fe0a 100644
--- a/ucb/source/ucp/ext/ucpext_provider.cxx
+++ b/ucb/source/ucp/ext/ucpext_provider.cxx
@@ -21,6 +21,7 @@
#include "ucpext_content.hxx"
#include
+#include
#include
#include
#include
@@ -164,9 +165,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
ucb_ext_ContentProvider_get_implementation(
css::uno::XComponentContext* context, css::uno::Sequence
const&)
{
-static rtl::Reference g_Instance(new
ucb::ucp::ext::ContentProvider(context));
-g_Instance->acquire();
-return s
[Libreoffice-commits] core.git: svl/source
svl/source/fsstor/fsfactory.cxx |6 ++
svl/source/fsstor/fsstorage.component |2 +-
2 files changed, 3 insertions(+), 5 deletions(-)
New commits:
commit 8c1f608c1400d314061f96d6d63b3357da5b2786
Author: Stephan Bergmann
AuthorDate: Fri Oct 2 14:17:58 2020 +0200
Commit: Stephan Bergmann
CommitDate: Fri Oct 2 20:39:52 2020 +0200
Use the new single-instance="true" attribute in svl
Change-Id: Iedd4348f3ea896dc613e0062a1a9cb5904c8bbb0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103844
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/svl/source/fsstor/fsfactory.cxx b/svl/source/fsstor/fsfactory.cxx
index 2b596f1a7cc4..98ec1feb8c65 100644
--- a/svl/source/fsstor/fsfactory.cxx
+++ b/svl/source/fsstor/fsfactory.cxx
@@ -24,7 +24,7 @@
#include
#include
#include
-
+#include
#include
#include
@@ -155,9 +155,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
svl_FSStorageFactory_get_implementation(
css::uno::XComponentContext* context, css::uno::Sequence
const&)
{
-static rtl::Reference g_Instance(new
FSStorageFactory(context));
-g_Instance->acquire();
-return static_cast(g_Instance.get());
+return cppu::acquire(static_cast(new
FSStorageFactory(context)));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svl/source/fsstor/fsstorage.component
b/svl/source/fsstor/fsstorage.component
index 915850bab86d..7d20474b36ac 100644
--- a/svl/source/fsstor/fsstorage.component
+++ b/svl/source/fsstor/fsstorage.component
@@ -20,7 +20,7 @@
http://openoffice.org/2010/uno-components";>
+constructor="svl_FSStorageFactory_get_implementation"
single-instance="true">
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - canvas/inc canvas/Library_cairocanvas.mk canvas/Library_canvastools.mk canvas/Library_oglcanvas.mk canvas/Library_vclcanvas.mk vcl/vclplug_win.component vcl
canvas/Library_cairocanvas.mk |2 canvas/Library_canvastools.mk |2 canvas/Library_oglcanvas.mk|2 canvas/Library_vclcanvas.mk|2 canvas/inc/pch/precompiled_cairocanvas.cxx | 12 +++ canvas/inc/pch/precompiled_cairocanvas.hxx | 90 +++ canvas/inc/pch/precompiled_canvastools.cxx | 12 +++ canvas/inc/pch/precompiled_canvastools.hxx | 109 + canvas/inc/pch/precompiled_oglcanvas.cxx | 12 +++ canvas/inc/pch/precompiled_oglcanvas.hxx | 67 + canvas/inc/pch/precompiled_vclcanvas.cxx | 12 +++ canvas/inc/pch/precompiled_vclcanvas.hxx | 92 vcl/vclplug_win.component |2 vcl/win/dtrans/ftransl.cxx |6 - 14 files changed, 417 insertions(+), 5 deletions(-) New commits: commit 9947cae47cbfb53f560d537ca0be3df2e694fbba Author: Luboš Luňák AuthorDate: Fri Oct 2 11:07:32 2020 +0200 Commit: Luboš Luňák CommitDate: Fri Oct 2 20:39:36 2020 +0200 add PCHs for canvas/ Change-Id: I4773b94e0e02e8bc87dfacf1594b3759e1f93e89 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103825 Tested-by: Jenkins Reviewed-by: Luboš Luňák diff --git a/canvas/Library_cairocanvas.mk b/canvas/Library_cairocanvas.mk index 1df33507f0c2..7a587c84d941 100644 --- a/canvas/Library_cairocanvas.mk +++ b/canvas/Library_cairocanvas.mk @@ -24,6 +24,8 @@ $(eval $(call gb_Library_set_include,cairocanvas,\ -I$(SRCDIR)/canvas/inc \ )) +$(eval $(call gb_Library_set_precompiled_header,cairocanvas,canvas/inc/pch/precompiled_cairocanvas)) + $(eval $(call gb_Library_set_componentfile,cairocanvas,canvas/source/cairo/cairocanvas)) $(eval $(call gb_Library_use_sdk_api,cairocanvas)) diff --git a/canvas/Library_canvastools.mk b/canvas/Library_canvastools.mk index 90d67dfc543a..f810cab5cc50 100644 --- a/canvas/Library_canvastools.mk +++ b/canvas/Library_canvastools.mk @@ -24,6 +24,8 @@ $(eval $(call gb_Library_set_include,canvastools,\ -I$(SRCDIR)/canvas/inc \ )) +$(eval $(call gb_Library_set_precompiled_header,canvastools,canvas/inc/pch/precompiled_canvastools)) + $(eval $(call gb_Library_use_sdk_api,canvastools)) $(eval $(call gb_Library_add_defs,canvastools,\ diff --git a/canvas/Library_oglcanvas.mk b/canvas/Library_oglcanvas.mk index 20dbb7a80bed..189ebf83a999 100644 --- a/canvas/Library_oglcanvas.mk +++ b/canvas/Library_oglcanvas.mk @@ -14,6 +14,8 @@ $(eval $(call gb_Library_set_include,oglcanvas,\ -I$(SRCDIR)/canvas/inc \ )) +$(eval $(call gb_Library_set_precompiled_header,oglcanvas,canvas/inc/pch/precompiled_oglcanvas)) + $(eval $(call gb_Library_set_componentfile,oglcanvas,canvas/source/opengl/oglcanvas)) $(eval $(call gb_Library_use_sdk_api,oglcanvas)) diff --git a/canvas/Library_vclcanvas.mk b/canvas/Library_vclcanvas.mk index 27a54ba651a6..8c5f31484d56 100644 --- a/canvas/Library_vclcanvas.mk +++ b/canvas/Library_vclcanvas.mk @@ -24,6 +24,8 @@ $(eval $(call gb_Library_set_include,vclcanvas,\ -I$(SRCDIR)/canvas/inc \ )) +$(eval $(call gb_Library_set_precompiled_header,vclcanvas,canvas/inc/pch/precompiled_vclcanvas)) + $(eval $(call gb_Library_set_componentfile,vclcanvas,canvas/source/vcl/vclcanvas)) $(eval $(call gb_Library_use_externals,vclcanvas,\ diff --git a/canvas/inc/pch/precompiled_cairocanvas.cxx b/canvas/inc/pch/precompiled_cairocanvas.cxx new file mode 100644 index ..d0be1b85f787 --- /dev/null +++ b/canvas/inc/pch/precompiled_cairocanvas.cxx @@ -0,0 +1,12 @@ +/* -*- 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 "precompiled_cairocanvas.hxx" + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/inc/pch/precompiled_cairocanvas.hxx b/canvas/inc/pch/precompiled_cairocanvas.hxx new file mode 100644 index ..ee38cccdc32f --- /dev/null +++ b/canvas/inc/pch/precompiled_cairocanvas.hxx @@ -0,0 +1,90 @@ +/* -*- 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/. + */ + +/* + This file has been autogenerated by update_pch.sh. It is possible to edit it + manually (such as when an include file has been moved/renamed/removed). All such + manual changes will be rewritten by the next run of update_pch.sh (which presumably + also fixes all possible problems, so it's usually better to use it). + + Generated on 2020-10-02 1
[Libreoffice-commits] core.git: bin/lint-ui.py
bin/lint-ui.py |8
1 file changed, 8 insertions(+)
New commits:
commit 4d19361336b32585d5cd5bd5faccba4467b7d5e8
Author: Noel
AuthorDate: Fri Oct 2 12:56:09 2020 +0200
Commit: Noel Grandin
CommitDate: Fri Oct 2 19:02:20 2020 +0200
lint-ui: add check for upper in GtkAdjustment
Change-Id: I3a9859dbb4dbb0aeb2446176a239843a19d40e1e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103833
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/bin/lint-ui.py b/bin/lint-ui.py
index 5dc33eaaec2a..26c011f2637a 100755
--- a/bin/lint-ui.py
+++ b/bin/lint-ui.py
@@ -96,6 +96,14 @@ def check_radio_buttons(root):
if len(radio_underlines) < 1:
lint_assert(False, "No use_underline in GtkRadioButton with id =
'" + radio.attrib['id'] + "'", radio)
+def check_adjustments(root):
+adjustments = [element for element in root.findall('.//object') if
element.attrib['class'] == 'GtkAdjustment']
+for adjusment in adjustments:
+uppers = radio.findall("./property[@name='upper']")
+assert len(uppers) <= 1
+if len(uppers) < 1:
+lint_assert(False, "No upper in GtkAdjustment with id = '" +
radio.attrib['id'] + "'", radio)
+
def check_menu_buttons(root):
buttons = [element for element in root.findall('.//object') if
element.attrib['class'] == "GtkMenuButton"]
for button in buttons:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/qa chart2/source sw/qa
chart2/qa/extras/chart2import.cxx |4 -
chart2/source/view/charttypes/PieChart.cxx | 115 +++--
chart2/source/view/charttypes/PieChart.hxx |2
sw/qa/extras/layout/data/tdf137116.docx|binary
sw/qa/extras/layout/layout.cxx | 20 +
5 files changed, 66 insertions(+), 75 deletions(-)
New commits:
commit a91ac466e2a996a07248ec4a2518d5ba9bdf3d61
Author: Tünde Tóth
AuthorDate: Tue Sep 29 13:32:40 2020 +0200
Commit: László Németh
CommitDate: Fri Oct 2 17:01:02 2020 +0200
tdf#137116 pie chart: improve BestFit position of data labels
Regression from commit: 2e1a1054a4a98415057e72269ace9db075d3b191
(tdf#136752 pie chart: improve data label position)
Change-Id: I66943684957a220c81db7f928fbb47700b78d012
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103610
Tested-by: Jenkins
Tested-by: László Németh
Reviewed-by: László Németh
diff --git a/chart2/qa/extras/chart2import.cxx
b/chart2/qa/extras/chart2import.cxx
index 6097a8a0388f..dadc782c0af6 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -2579,8 +2579,8 @@ void Chart2ImportTest::testTdf134225()
awt::Point aLabelPosition2 = xDataPointLabel2->getPosition();
// Check the distance between the position of the 1st data point label and
the second one
-CPPUNIT_ASSERT_DOUBLES_EQUAL(1800, sal_Int32(aLabelPosition2.X -
aLabelPosition1.X), 30);
-CPPUNIT_ASSERT_DOUBLES_EQUAL(2123, sal_Int32(aLabelPosition2.Y -
aLabelPosition1.Y), 30);
+CPPUNIT_ASSERT_DOUBLES_EQUAL(1669, sal_Int32(aLabelPosition2.X -
aLabelPosition1.X), 30);
+CPPUNIT_ASSERT_DOUBLES_EQUAL(2166, sal_Int32(aLabelPosition2.Y -
aLabelPosition1.Y), 30);
#endif
}
diff --git a/chart2/source/view/charttypes/PieChart.cxx
b/chart2/source/view/charttypes/PieChart.cxx
index e2dd04f6c645..6042b0d0dbe4 100644
--- a/chart2/source/view/charttypes/PieChart.cxx
+++ b/chart2/source/view/charttypes/PieChart.cxx
@@ -389,26 +389,51 @@ void PieChart::createTextLabelShape(
* First off the routine try to place the label inside the related
pie slice,
* if this is not possible the label is placed outside.
*/
-if (!performLabelBestFitInnerPlacement(rParam, aPieLabelInfo)
-&& m_aAvailableOuterRect.getWidth())
+if (!performLabelBestFitInnerPlacement(rParam, aPieLabelInfo))
{
-double fAngleDegree
-= rParam.mfUnitCircleStartAngleDegree +
rParam.mfUnitCircleWidthAngleDegree / 2.0;
-while (fAngleDegree > 360.0)
-fAngleDegree -= 360.0;
-while (fAngleDegree < 0.0)
-fAngleDegree += 360.0;
-
-if (fAngleDegree < 67.5 || fAngleDegree >= 292.5)
-fTextMaximumFrameWidth
-= 0.8 * (m_aAvailableOuterRect.getMaxX() -
aPieLabelInfo.aFirstPosition.getX());
-else if (fAngleDegree < 112.5 || fAngleDegree >= 247.5)
-fTextMaximumFrameWidth = 0.8 *
m_aAvailableOuterRect.getWidth();
-else
-fTextMaximumFrameWidth
-= 0.8 * (aPieLabelInfo.aFirstPosition.getX() -
m_aAvailableOuterRect.getMinX());
-
-nTextMaximumFrameWidth = ceil(fTextMaximumFrameWidth);
+if (m_aAvailableOuterRect.getWidth())
+{
+double fAngleDegree = rParam.mfUnitCircleStartAngleDegree
+ + rParam.mfUnitCircleWidthAngleDegree /
2.0;
+while (fAngleDegree > 360.0)
+fAngleDegree -= 360.0;
+while (fAngleDegree < 0.0)
+fAngleDegree += 360.0;
+
+if (fAngleDegree < 67.5 || fAngleDegree >= 292.5)
+fTextMaximumFrameWidth
+= 0.8
+ * (m_aAvailableOuterRect.getMaxX() -
aPieLabelInfo.aFirstPosition.getX());
+else if (fAngleDegree < 112.5 || fAngleDegree >= 247.5)
+fTextMaximumFrameWidth = 0.8 *
m_aAvailableOuterRect.getWidth();
+else
+fTextMaximumFrameWidth
+= 0.8
+ * (aPieLabelInfo.aFirstPosition.getX() -
m_aAvailableOuterRect.getMinX());
+
+nTextMaximumFrameWidth = ceil(fTextMaximumFrameWidth);
+}
+
+nScreenValueOffsetInRadiusDirection = (m_nDimension != 3) ? 150 :
0;
+aScreenPosition2D
+=
aPolarPosHelper.getLabelScreenPositionAndAlignmentForUnitCircleValues(
+eAlignment, css::chart::DataLabelPlacement::OUTSIDE,
+rParam.mfUnitCircleStartAngleDegree,
+rParam.mfUnitCircleWidthAngleDegree,
rParam.mfUnitCircleInnerRadius,
+rParam.mfUnitCircleOuterRadius, rParam.mfLogicZ + 0.5, 0);
+aPieLabelInfo.aFirstPosition
+
[Libreoffice-commits] core.git: chart2/source
chart2/source/controller/main/ChartController_Position.cxx | 16 ++---
1 file changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 17b0eb43ac23cd82a06d54432a0ec22cffa5b3c7
Author: Balazs Varga
AuthorDate: Thu Oct 1 11:29:26 2020 +0200
Commit: László Németh
CommitDate: Fri Oct 2 16:42:20 2020 +0200
tdf#137165 chart2: fix label position in Position and Size
dialog window.
Follow-up of commit 4223ff2be69f03e571464b0b09ad0d278918631b
(tdf#48436 Chart: add CustomLabelPosition UNO API property).
Change-Id: Ie676af7b9438b928041a404fb1efac6919b30030
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103750
Tested-by: László Németh
Reviewed-by: László Németh
diff --git a/chart2/source/controller/main/ChartController_Position.cxx
b/chart2/source/controller/main/ChartController_Position.cxx
index 32c4bd78522e..52664c356257 100644
--- a/chart2/source/controller/main/ChartController_Position.cxx
+++ b/chart2/source/controller/main/ChartController_Position.cxx
@@ -114,11 +114,6 @@ void
ChartController::executeDispatch_PositionAndSize(const ::css::uno::Sequence
if( aCID.isEmpty() )
return;
-awt::Size aSelectedSize;
-ExplicitValueProvider* pProvider(
comphelper::getUnoTunnelImplementation( m_xChartView ) );
-if( pProvider )
-aSelectedSize = ToSize( pProvider->getRectangleOfObject( aCID ) );
-
ObjectType eObjectType = ObjectIdentifier::getObjectType( aCID );
UndoGuard aUndoGuard(
@@ -181,8 +176,13 @@ void
ChartController::executeDispatch_PositionAndSize(const ::css::uno::Sequence
if(pOutItemSet || pArgs)
{
-awt::Rectangle aObjectRect;
-lcl_getPositionAndSizeFromItemSet( aItemSet, aObjectRect,
aSelectedSize );
+awt::Rectangle aOldObjectRect;
+ExplicitValueProvider*
pProvider(comphelper::getUnoTunnelImplementation(
m_xChartView ));
+if( pProvider )
+aOldObjectRect = pProvider->getRectangleOfObject(aCID);
+
+awt::Rectangle aNewObjectRect;
+lcl_getPositionAndSizeFromItemSet( aItemSet, aNewObjectRect,
ToSize(aOldObjectRect) );
awt::Size aPageSize( ChartModelHelper::getPageSize( getModel() ) );
awt::Rectangle aPageRect( 0,0,aPageSize.Width,aPageSize.Height );
@@ -194,7 +194,7 @@ void ChartController::executeDispatch_PositionAndSize(const
::css::uno::Sequence
}
bool bMoved = PositionAndSizeHelper::moveObject(
m_aSelection.getSelectedCID(), getModel()
-, aObjectRect, awt::Rectangle(), aPageRect );
+, aNewObjectRect, aOldObjectRect, aPageRect );
if( bMoved || bChanged )
aUndoGuard.commit();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa
sc/qa/uitest/calc_tests/data/chartArea.ods |binary
sc/qa/uitest/chart/chartTitles.py | 42 +
2 files changed, 42 insertions(+)
New commits:
commit ec932755543a548f6d07d2909e5f18aff1c20cfd
Author: Xisco Fauli
AuthorDate: Fri Oct 2 12:33:34 2020 +0200
Commit: Xisco Fauli
CommitDate: Fri Oct 2 16:41:54 2020 +0200
uitest: sc: test chart title moves with arrow keys
Reuse one file with a chart for this test.
I just added a title to the chart
Change-Id: If73394026350c375059feb1635a7c85c0ecc150d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103831
Tested-by: Xisco Fauli
Reviewed-by: Xisco Fauli
diff --git a/sc/qa/uitest/calc_tests/data/chartArea.ods
b/sc/qa/uitest/calc_tests/data/chartArea.ods
index c7cead1a5917..d7f863c31ed4 100644
Binary files a/sc/qa/uitest/calc_tests/data/chartArea.ods and
b/sc/qa/uitest/calc_tests/data/chartArea.ods differ
diff --git a/sc/qa/uitest/chart/chartTitles.py
b/sc/qa/uitest/chart/chartTitles.py
index c6c2488bcadc..1e3ac564ffd6 100644
--- a/sc/qa/uitest/chart/chartTitles.py
+++ b/sc/qa/uitest/chart/chartTitles.py
@@ -7,6 +7,7 @@
from uitest.framework import UITestCase
from uitest.uihelper.common import get_state_as_dict
from uitest.uihelper.common import select_pos
+from uitest.uihelper.common import change_measurement_unit
from uitest.uihelper.calc import enter_text_to_cell
from libreoffice.calc.document import get_cell_by_position
from libreoffice.uno.propertyvalue import mkPropertyValues
@@ -94,5 +95,46 @@ class chartTitles(UITestCase):
xOKBtn = xDialog.getChild("ok")
self.ui_test.close_dialog_through_button(xOKBtn)
+self.ui_test.close_doc()
+
+ def test_title_move_with_arrows_keys(self):
+
+calc_doc = self.ui_test.load_file(get_url_for_data_file("chartArea.ods"))
+xCalcDoc = self.xUITest.getTopFocusWindow()
+gridwin = xCalcDoc.getChild("grid_window")
+
+change_measurement_unit(self, "Centimeter")
+
+gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT": "Object 1"}))
+gridwin.executeAction("ACTIVATE", tuple())
+xChartMainTop = self.xUITest.getTopFocusWindow()
+xChartMain = xChartMainTop.getChild("chart_window")
+
+# Select the title
+xTitle = xChartMain.getChild("CID/Title=")
+xTitle.executeAction("SELECT", tuple())
+
+self.ui_test.execute_dialog_through_action(xTitle, "COMMAND",
mkPropertyValues({"COMMAND": "TransformDialog"}))
+
+xDialog = self.xUITest.getTopFocusWindow()
+self.assertEqual("3.52",
get_state_as_dict(xDialog.getChild("MTR_FLD_POS_X"))['Value'])
+self.assertEqual("0.3",
get_state_as_dict(xDialog.getChild("MTR_FLD_POS_Y"))['Value'])
+
+xOkBtn = xDialog.getChild("ok")
+xOkBtn.executeAction("CLICK", tuple())
+
+xChartMain.executeAction("TYPE", mkPropertyValues({"KEYCODE": "UP"}))
+xChartMain.executeAction("TYPE", mkPropertyValues({"KEYCODE": "LEFT"}))
+
+self.ui_test.execute_dialog_through_action(xTitle, "COMMAND",
mkPropertyValues({"COMMAND": "TransformDialog"}))
+
+# Check the position has changed after moving the title using the arrows
keys
+xDialog = self.xUITest.getTopFocusWindow()
+self.assertEqual("3.42",
get_state_as_dict(xDialog.getChild("MTR_FLD_POS_X"))['Value'])
+self.assertEqual("0.2",
get_state_as_dict(xDialog.getChild("MTR_FLD_POS_Y"))['Value'])
+
+xOkBtn = xDialog.getChild("ok")
+xOkBtn.executeAction("CLICK", tuple())
+
self.ui_test.close_doc()
# vim: set shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa
sc/qa/uitest/chart/chartTitles.py | 16
1 file changed, 16 insertions(+)
New commits:
commit 40de76681c47fb6561a5a236a46114355a5f5072
Author: Xisco Fauli
AuthorDate: Fri Oct 2 12:14:36 2020 +0200
Commit: Xisco Fauli
CommitDate: Fri Oct 2 16:41:05 2020 +0200
uitest: chartTitles.py: assert changes in chart
Change-Id: If6f0fdf6b26f09f467a0226468f6f00e885c4f41
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103830
Tested-by: Jenkins
Tested-by: Xisco Fauli
Reviewed-by: Xisco Fauli
diff --git a/sc/qa/uitest/chart/chartTitles.py
b/sc/qa/uitest/chart/chartTitles.py
index 8b500ccba3e0..c6c2488bcadc 100644
--- a/sc/qa/uitest/chart/chartTitles.py
+++ b/sc/qa/uitest/chart/chartTitles.py
@@ -27,6 +27,13 @@ class chartTitles(UITestCase):
gridwin = xCalcDoc.getChild("grid_window")
document = self.ui_test.get_component()
+xCS =
document.Sheets[0].Charts[0].getEmbeddedObject().FirstDiagram.CoordinateSystems[0]
+
+
self.assertFalse(document.Sheets[0].Charts[0].getEmbeddedObject().HasMainTitle)
+
self.assertFalse(document.Sheets[0].Charts[0].getEmbeddedObject().HasSubTitle)
+self.assertIsNone(xCS.getAxisByDimension(0, 0).TitleObject)
+self.assertIsNone(xCS.getAxisByDimension(1, 0).TitleObject)
+
gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT": "Object 1"}))
gridwin.executeAction("ACTIVATE", tuple())
xChartMainTop = self.xUITest.getTopFocusWindow()
@@ -52,6 +59,15 @@ class chartTitles(UITestCase):
xOKBtn = xDialog.getChild("ok")
self.ui_test.close_dialog_through_button(xOKBtn)
+
self.assertTrue(document.Sheets[0].Charts[0].getEmbeddedObject().HasMainTitle)
+
self.assertTrue(document.Sheets[0].Charts[0].getEmbeddedObject().HasSubTitle)
+self.assertEqual("A",
document.Sheets[0].Charts[0].getEmbeddedObject().Title.String)
+self.assertEqual("B",
document.Sheets[0].Charts[0].getEmbeddedObject().SubTitle.String)
+self.assertEqual("C", xCS.getAxisByDimension(0,
0).TitleObject.Text[0].String)
+self.assertEqual("D", xCS.getAxisByDimension(1,
0).TitleObject.Text[0].String)
+self.assertEqual("E", xCS.getAxisByDimension(0,
1).TitleObject.Text[0].String)
+self.assertEqual("F", xCS.getAxisByDimension(1,
1).TitleObject.Text[0].String)
+
#reopen and verify InsertMenuTitles dialog
gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT": "Object 1"}))
gridwin.executeAction("ACTIVATE", tuple())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: config_host/config_locales.h.in extras/CustomTarget_autocorr.mk extras/Package_autocorr.mk extras/source i18npool/CustomTarget_collator.mk i18npool/Library_localedata_e
config_host/config_locales.h.in |1 extras/CustomTarget_autocorr.mk |3 extras/Package_autocorr.mk|1 extras/source/autocorr/lang/vro/DocumentList.xml |2 extras/source/autocorr/lang/vro/META-INF/manifest.xml |5 i18npool/CustomTarget_collator.mk |2 i18npool/Library_localedata_euro.mk |1 i18npool/source/collator/collator_unicode.cxx | 10 i18npool/source/collator/data/vro_alphanumeric.txt| 73 ++ i18npool/source/localedata/data/vro_EE.xml| 448 ++ i18npool/source/localedata/localedata.cxx |1 11 files changed, 547 insertions(+) New commits: commit 568ee718bb217f4ecbebc962557ef659b9f6e624 Author: Mihkel Tõnnov AuthorDate: Mon Sep 21 19:56:30 2020 +0200 Commit: Eike Rathke CommitDate: Fri Oct 2 16:39:32 2020 +0200 tdf#136951: Add Võro (vro-EE) locale data and rudimentary autocorrect list Change-Id: Id5a5d71b7f457d18b9d0982f9b4df95566c09be9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103122 Tested-by: Jenkins Reviewed-by: Eike Rathke diff --git a/config_host/config_locales.h.in b/config_host/config_locales.h.in index a5f1e65b7dbe..b9b6988cc891 100644 --- a/config_host/config_locales.h.in +++ b/config_host/config_locales.h.in @@ -49,6 +49,7 @@ #define WITH_LOCALE_th 0 #define WITH_LOCALE_tr 0 #define WITH_LOCALE_uk 0 +#define WITH_LOCALE_vro 0 #define WITH_LOCALE_zh 0 #define WITH_LOCALE_FOR_SCRIPT_Cyrl 0 diff --git a/extras/CustomTarget_autocorr.mk b/extras/CustomTarget_autocorr.mk index 63165f267f52..8ac2dd86502a 100644 --- a/extras/CustomTarget_autocorr.mk +++ b/extras/CustomTarget_autocorr.mk @@ -55,6 +55,7 @@ extras_AUTOCORR_LANGS := \ sv:sv-SE \ tr:tr-TR \ vi:vi-VN \ + vro:vro-EE \ zh-CN:zh-CN \ zh-TW:zh-TW \ @@ -224,6 +225,8 @@ extras_AUTOCORR_XMLFILES := \ vi/DocumentList.xml \ vi/META-INF/manifest.xml \ vi/WordExceptList.xml \ + vro/DocumentList.xml \ + vro/META-INF/manifest.xml \ zh-CN/DocumentList.xml \ zh-CN/META-INF/manifest.xml \ zh-CN/SentenceExceptList.xml \ diff --git a/extras/Package_autocorr.mk b/extras/Package_autocorr.mk index 877b26b5a235..cc14860637ee 100644 --- a/extras/Package_autocorr.mk +++ b/extras/Package_autocorr.mk @@ -55,6 +55,7 @@ $(eval $(call gb_Package_add_files,extras_autocorr,$(LIBO_SHARE_FOLDER)/autocorr acor_sv-SE.dat \ acor_tr-TR.dat \ acor_vi-VN.dat \ + acor_vro-EE.dat \ acor_zh-CN.dat \ acor_zh-TW.dat \ )) diff --git a/extras/source/autocorr/lang/vro/DocumentList.xml b/extras/source/autocorr/lang/vro/DocumentList.xml new file mode 100644 index ..81ff2ece1f55 --- /dev/null +++ b/extras/source/autocorr/lang/vro/DocumentList.xml @@ -0,0 +1,2 @@ + +http://openoffice.org/2001/block-list";> \ No newline at end of file diff --git a/extras/source/autocorr/lang/vro/META-INF/manifest.xml b/extras/source/autocorr/lang/vro/META-INF/manifest.xml new file mode 100644 index ..bd8de6e3524c --- /dev/null +++ b/extras/source/autocorr/lang/vro/META-INF/manifest.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/extras/source/autocorr/lang/vro/mimetype b/extras/source/autocorr/lang/vro/mimetype new file mode 100644 index ..e69de29bb2d1 diff --git a/i18npool/CustomTarget_collator.mk b/i18npool/CustomTarget_collator.mk index 2e64e2043dce..4cf7b953573f 100644 --- a/i18npool/CustomTarget_collator.mk +++ b/i18npool/CustomTarget_collator.mk @@ -36,6 +36,8 @@ i18npool_COTXTS := \ ne_charset.txt) \ $(call gb_Helper_optional_locale,sid, \ sid_charset.txt) \ +$(call gb_Helper_optional_locale,vro, \ +vro_alphanumeric.txt) \ $(call gb_Helper_optional_locale,zh, \ zh_charset.txt \ zh_pinyin.txt \ diff --git a/i18npool/Library_localedata_euro.mk b/i18npool/Library_localedata_euro.mk index 5a110bbe03fd..14909ac59539 100644 --- a/i18npool/Library_localedata_euro.mk +++ b/i18npool/Library_localedata_euro.mk @@ -104,6 +104,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,localedata_euro,\ CustomTarget/i18npool/localedata/localedata_tt_RU \ CustomTarget/i18npool/localedata/localedata_uk_UA \ CustomTarget/i18npool/localedata/localedata_vec_IT \ + CustomTarget/i18npool/localedata/localedata_vro_EE \ CustomTarget/i18npool/localedata/localedata_wa_BE \ )) diff --git a/i18npool/source/collator/collator_unicode.cxx b/i18npool/source/collator/collator_unicode.cxx index 39037cf2e77b..c05a9cb025c6 100644 --- a/i18npool/source/collator/collator_unicode.cxx +++ b/i18npool/source/collator/collator_unicode.cxx @@ -80,6 +80,7 @@ const sal_uInt8* get_collator_data_ln_charset(); const sal_uInt8* get_collator_data_my_dictionary()
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/tdf136850.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport11.cxx|7 +++
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 18 --
3 files changed, 23 insertions(+), 2 deletions(-)
New commits:
commit c37f2b927715ebbeffcc1d7a1e9d646f1611c4ec
Author: László Németh
AuthorDate: Fri Oct 2 12:55:04 2020 +0200
Commit: László Németh
CommitDate: Fri Oct 2 16:24:32 2020 +0200
tdf#136850 DOCX: fix change tracking in floating tables
Deleted text still reappeared as normal text in floating
tables in the case of combination with tracked paragraph
property changes.
Follow-up of commit 288db6eb47fbbd2b3ca34ffea0686d8ed8ed9be9
(tdf#132271 DOCX: import change tracking in floating tables)
and commit 464a7b0631335a8f8729512b8c27f864747f56a7
(tdf#136667 DOCX import: fix crash of floating tables).
Change-Id: I2c8f63054520ce28306c063ef638756f7d8342e9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103832
Tested-by: Jenkins
Reviewed-by: László Németh
diff --git a/sw/qa/extras/ooxmlexport/data/tdf136850.docx
b/sw/qa/extras/ooxmlexport/data/tdf136850.docx
new file mode 100644
index ..e94a66208e0d
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf136850.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index e7b996562803..e45d99c6d2d7 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -998,6 +998,13 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf136667,
"tdf136667.docx")
assertXPath(pXmlDoc, "//w:ins", 4);
}
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf136850, "tdf136850.docx")
+{
+xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
+// import change tracking in floating tables
+assertXPath(pXmlDoc, "//w:del");
+}
+
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf128156, "tdf128156.docx")
{
xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index cd985e4fd995..cd78ab36bd0a 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -6809,11 +6809,12 @@ void DomainMapper_Impl::ExecuteFrameConversion()
{
if( m_xFrameStartRange.is() && m_xFrameEndRange.is() &&
!m_bDiscardHeaderFooter )
{
+std::vector redPos, redLen;
try
{
uno::Reference< text::XTextAppendAndConvert >
xTextAppendAndConvert( GetTopTextAppend(), uno::UNO_QUERY_THROW );
// convert redline ranges to cursor movement and character length
-std::vector redPos, redLen;
+
for( size_t i = 0; i < aFramedRedlines.size(); i+=3)
{
uno::Reference< text::XTextRange > xRange;
@@ -6863,7 +6864,20 @@ void DomainMapper_Impl::ExecuteFrameConversion()
}
m_bIsActualParagraphFramed = false;
-aFramedRedlines.clear();
+
+if (redPos.size() == aFramedRedlines.size()/3)
+{
+for( sal_Int32 i = aFramedRedlines.size() - 1; i >= 0; --i)
+{
+// keep redlines of floating tables to process them in
CloseSectionGroup()
+if ( redPos[i/3] != -1 )
+{
+aFramedRedlines.erase(aFramedRedlines.begin() + i);
+}
+}
+}
+else
+aFramedRedlines.clear();
}
m_xFrameStartRange = nullptr;
m_xFrameEndRange = nullptr;
___
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/table/tablecontroller.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit e31474d71235bccee8568c4a952a8319bddf39e0
Author: Tomaž Vajngerl
AuthorDate: Fri Oct 2 12:02:42 2020 +0200
Commit: Tomaž Vajngerl
CommitDate: Fri Oct 2 16:05:56 2020 +0200
rearrange to not use pUndoObject after std::move
pGeoUndo is always nullptr in this case because of std::move, so
the SetSkipChangeLayout is never set.
Issue since: https://gerrit.libreoffice.org/c/core/+/78201
Change-Id: I4f1dcb3a25adeb0737e03aa9e9dfb193969250b6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103827
Reviewed-by: Tomaž Vajngerl
Tested-by: Tomaž Vajngerl
diff --git a/svx/source/table/tablecontroller.cxx
b/svx/source/table/tablecontroller.cxx
index b28522619bc6..f61ea7605567 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -1534,11 +1534,12 @@ void SvxTableController::changeTableEdge(const
SfxRequest& rReq)
{
auto pUndoObject =
rModel.GetSdrUndoFactory().CreateUndoGeoObject(rTableObj);
rModel.BegUndo(pUndoObject->GetComment());
-rModel.AddUndo(std::move(pUndoObject));
auto* pGeoUndo = static_cast(pUndoObject.get());
if (pGeoUndo)
pGeoUndo->SetSkipChangeLayout(true);
+
+rModel.AddUndo(std::move(pUndoObject));
}
tools::Rectangle aBoundRect;
if (rTableObj.GetUserCall())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/qa
vcl/qa/cppunit/BackendTest.cxx | 15 +--
1 file changed, 13 insertions(+), 2 deletions(-)
New commits:
commit 5ae845923499422540632456f1dafefa3ad49f4f
Author: Luboš Luňák
AuthorDate: Mon Sep 28 16:05:38 2020 +0200
Commit: Luboš Luňák
CommitDate: Fri Oct 2 15:43:14 2020 +0200
opt-out from checking vclbackendtest failures rather than opt-in
So that the default is checking, and if a VCL backend doesn't work
correctly (which is most of them now), then that should need
special-casing.
Change-Id: If55b09cfd64abe5f0efd798d91c303936ec0989b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103785
Tested-by: Jenkins
Reviewed-by: Luboš Luňák
diff --git a/vcl/qa/cppunit/BackendTest.cxx b/vcl/qa/cppunit/BackendTest.cxx
index 1342c3a5ade9..ff495b10c1de 100644
--- a/vcl/qa/cppunit/BackendTest.cxx
+++ b/vcl/qa/cppunit/BackendTest.cxx
@@ -18,6 +18,7 @@
#include
+// Run tests from visualbackendtest ('bin/run visualbackendtest').
class BackendTest : public test::BootstrapFixture
{
// if enabled - check the result images with:
@@ -72,16 +73,26 @@ public:
// This ensures that all backends return a valid name.
assert(!name.isEmpty());
(void)name;
-return false;
+return true;
}
// Check whether tests should fail depending on which backend is used
// (not all work). If you want to disable just a specific test
// for a specific backend, use something like
// 'if(SHOULD_ASSERT && aOutDevTest.getRenderBackendName() != "skia")'.
+// The macro uses opt-out rather than opt-in so that this doesn't "pass"
+// silently in case a new backend is added.
#define SHOULD_ASSERT
\
(assertBackendNameNotEmpty(aOutDevTest.getRenderBackendName())
\
- || aOutDevTest.getRenderBackendName() == "skia")
+ && aOutDevTest.getRenderBackendName() != "svp"
\
+ && aOutDevTest.getRenderBackendName() != "opengl"
\
+ && aOutDevTest.getRenderBackendName() != "qt5"
\
+ && aOutDevTest.getRenderBackendName() != "qt5svp"
\
+ && aOutDevTest.getRenderBackendName() != "gtk3svp"
\
+ && aOutDevTest.getRenderBackendName() != "aqua"
\
+ && aOutDevTest.getRenderBackendName() != "gen"
\
+ && aOutDevTest.getRenderBackendName() != "genpsp"
\
+ && aOutDevTest.getRenderBackendName() != "win")
void testDrawRectWithRectangle()
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/skia
vcl/skia/gdiimpl.cxx |5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) New commits: commit 5acdb23a413ce82a279eb4fee0ddf867e989fec8 Author: Luboš Luňák AuthorDate: Tue Sep 29 19:33:08 2020 +0200 Commit: Luboš Luňák CommitDate: Fri Oct 2 15:42:48 2020 +0200 cache Skia bitmaps if they are small but to be scaled In raster mode this still may cost a bit, especially with code that paints the same bitmap repeatedly to create tiling. Change-Id: I0b65414b418f96a8b1620c8487562b61bd87c221 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103783 Tested-by: Jenkins Reviewed-by: Luboš Luňák diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx index b6ffda221424..e194ba964c58 100644 --- a/vcl/skia/gdiimpl.cxx +++ b/vcl/skia/gdiimpl.cxx @@ -1491,9 +1491,8 @@ sk_sp SkiaSalGraphicsImpl::mergeCacheBitmaps(const SkiaSalBitmap& bitma // Probably not much point in caching of just doing a copy. if (alphaBitmap == nullptr && targetSize == bitmap.GetSize()) return image; -// Image too small to be worth caching. -if (bitmap.GetSize().Width() < 100 && bitmap.GetSize().Height() < 100 -&& targetSize.Width() < 100 && targetSize.Height() < 100) +// Image too small to be worth caching if not scaling. +if (targetSize == bitmap.GetSize() && targetSize.Width() < 100 && targetSize.Height() < 100) return image; // In some cases (tdf#134237) the target size may be very large. In that case it's // better to rely on Skia to clip and draw only the necessary, rather than prepare ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl
include/vcl/BitmapAlphaClampFilter.hxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit e9ecdfc758280189760d50ed2dfe454d3f83a0ea Author: Luboš Luňák AuthorDate: Fri Oct 2 11:07:10 2020 +0200 Commit: Luboš Luňák CommitDate: Fri Oct 2 15:41:46 2020 +0200 fix header guard Change-Id: I01e21c5ed1ffae27394ddb2b63a8c590f81325d4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103824 Tested-by: Jenkins Reviewed-by: Luboš Luňák diff --git a/include/vcl/BitmapAlphaClampFilter.hxx b/include/vcl/BitmapAlphaClampFilter.hxx index c8b111d931d1..6926c3274e6b 100644 --- a/include/vcl/BitmapAlphaClampFilter.hxx +++ b/include/vcl/BitmapAlphaClampFilter.hxx @@ -8,8 +8,8 @@ * */ -#ifndef INCLUDED_INCLUDE_VCL_BITMAPMONOCHROMEFILTER_HXX -#define INCLUDED_INCLUDE_VCL_BITMAPMONOCHROMEFILTER_HXX +#ifndef INCLUDED_INCLUDE_VCL_BITMAPALPHACLAMPFILTER_HXX +#define INCLUDED_INCLUDE_VCL_BITMAPALPHACLAMPFILTER_HXX #include ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/source
oox/source/drawingml/diagram/diagramlayoutatoms.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit a5963ebb46098be9aac32ff3d582255d97521df4
Author: Caolán McNamara
AuthorDate: Fri Oct 2 08:50:02 2020 +0100
Commit: Caolán McNamara
CommitDate: Fri Oct 2 15:12:37 2020 +0200
cid#1467667 Division or modulo by float zero
Change-Id: Ia332896190e09d6c5459ce80819c8f1263a60873
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103815
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index d1280406fedb..644c31790d64 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -321,11 +321,11 @@ void SnakeAlg::layoutShapeChildren(const
AlgAtom::ParamMap& rMap, const ShapePtr
awt::Size aCurrSize(aChildSize);
// aShapeWidths items are a portion of nMaxRowWidth. We want
the same ratio,
// based on the original parent width, ignoring the aspect
ratio request.
-double fWidthFactor = static_cast(aShapeWidths[index])
/ nMaxRowWidth;
bool bWidthsFromConstraints
= nCount >= 2 &&
rShape->getChildren()[1]->getDataNodeType() == XML_sibTrans;
-if (bWidthsFromConstraints)
+if (bWidthsFromConstraints && nMaxRowWidth)
{
+double fWidthFactor =
static_cast(aShapeWidths[index]) / nMaxRowWidth;
// We can only work from constraints if spacing is
represented by a real
// child shape.
aCurrSize.Width = rShape->getSize().Width * fWidthFactor;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/view/viewfrm.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 330f26bea4358658ac84b6d87270229fe71deb02
Author: Miklos Vajna
AuthorDate: Fri Oct 2 12:29:46 2020 +0200
Commit: Miklos Vajna
CommitDate: Fri Oct 2 15:09:22 2020 +0200
sfx2: downgrade a warning in SfxViewFrame::ChildWindowState() to info
It happens every time on startup, so it's not that useful.
Change-Id: I570b8892847f2da3dd5b52e150eb7a2802bb407b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103828
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index ccb39350f223..6dc772e0c06e 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -3233,7 +3233,7 @@ void SfxViewFrame::ChildWindowState( SfxItemSet& rState )
{
if ( !KnowsChildWindow( nSID ) )
{
-SAL_WARN("sfx.view", "SID_SIDEBAR state requested, but no task
pane child window exists for this ID!");
+SAL_INFO("sfx.view", "SID_SIDEBAR state requested, but no task
pane child window exists for this ID!");
rState.DisableItem( nSID );
}
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/filter/basflt/fltshell.cxx | 84 +-
sw/source/filter/inc/fltshell.hxx | 12 ++--
sw/source/filter/ww8/writerhelper.cxx |2
sw/source/filter/ww8/ww8par.cxx | 32 ++--
sw/source/filter/ww8/ww8par.hxx | 16 +++---
sw/source/filter/ww8/ww8par5.cxx |2
sw/source/filter/ww8/ww8par6.cxx |4 -
7 files changed, 76 insertions(+), 76 deletions(-)
New commits:
commit 792eb7a903b48a6209b2d08dd728dcf9a8096449
Author: Caolán McNamara
AuthorDate: Thu Oct 1 20:53:10 2020 +0100
Commit: Caolán McNamara
CommitDate: Fri Oct 2 14:19:32 2020 +0200
SwWW8FltAnchorStack ctor never given a null SwDoc*
and similar
Change-Id: I046be0e41b79f2fd51ebec0da20fccb17d947732
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103823
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sw/source/filter/basflt/fltshell.cxx
b/sw/source/filter/basflt/fltshell.cxx
index ceae383380af..4093ae3999be 100644
--- a/sw/source/filter/basflt/fltshell.cxx
+++ b/sw/source/filter/basflt/fltshell.cxx
@@ -51,14 +51,14 @@
using namespace com::sun::star;
-static SwContentNode* GetContentNode(SwDoc* pDoc, SwNodeIndex& rIdx, bool
bNext)
+static SwContentNode* GetContentNode(SwDoc& rDoc, SwNodeIndex& rIdx, bool
bNext)
{
SwContentNode * pCNd = rIdx.GetNode().GetContentNode();
-if(!pCNd && nullptr == (pCNd = bNext ? pDoc->GetNodes().GoNext(&rIdx)
+if(!pCNd && nullptr == (pCNd = bNext ? rDoc.GetNodes().GoNext(&rIdx)
: SwNodes::GoPrevious(&rIdx)))
{
pCNd = bNext ? SwNodes::GoPrevious(&rIdx)
- : pDoc->GetNodes().GoNext(&rIdx);
+ : rDoc.GetNodes().GoNext(&rIdx);
OSL_ENSURE(pCNd, "no ContentNode found");
}
return pCNd;
@@ -105,7 +105,7 @@ void SwFltStackEntry::SetEndPos(const SwPosition& rEndPos)
m_aPtPos.SetPos(rEndPos);
}
-bool SwFltStackEntry::MakeRegion(SwDoc* pDoc, SwPaM& rRegion, RegionMode const
eCheck,
+bool SwFltStackEntry::MakeRegion(SwDoc& rDoc, SwPaM& rRegion, RegionMode const
eCheck,
const SwFltPosition &rMkPos, const SwFltPosition &rPtPos, bool bIsParaEnd,
sal_uInt16 nWhich)
{
@@ -131,7 +131,7 @@ bool SwFltStackEntry::MakeRegion(SwDoc* pDoc, SwPaM&
rRegion, RegionMode const e
}
// The content indices always apply to the node!
rRegion.GetPoint()->nNode = rMkPos.m_nNode.GetIndex() + 1;
-SwContentNode* pCNd = GetContentNode(pDoc, rRegion.GetPoint()->nNode,
true);
+SwContentNode* pCNd = GetContentNode(rDoc, rRegion.GetPoint()->nNode,
true);
SAL_WARN_IF(pCNd->Len() < rMkPos.m_nContent, "sw.ww8",
"invalid content index " << rMkPos.m_nContent << " but text node has
only " << pCNd->Len());
@@ -145,7 +145,7 @@ bool SwFltStackEntry::MakeRegion(SwDoc* pDoc, SwPaM&
rRegion, RegionMode const e
if (n >= rNodes.Count())
return false;
rRegion.GetPoint()->nNode = n;
-pCNd = GetContentNode(pDoc, rRegion.GetPoint()->nNode, false);
+pCNd = GetContentNode(rDoc, rRegion.GetPoint()->nNode, false);
}
SAL_WARN_IF(pCNd->Len() < rPtPos.m_nContent, "sw.ww8",
"invalid content index " << rPtPos.m_nContent << " but text node has
only " << pCNd->Len());
@@ -167,14 +167,14 @@ bool SwFltStackEntry::MakeRegion(SwDoc* pDoc, SwPaM&
rRegion, RegionMode const e
return bRet;
}
-bool SwFltStackEntry::MakeRegion(SwDoc* pDoc, SwPaM& rRegion, RegionMode
eCheck) const
+bool SwFltStackEntry::MakeRegion(SwDoc& rDoc, SwPaM& rRegion, RegionMode
eCheck) const
{
-return MakeRegion(pDoc, rRegion, eCheck, m_aMkPos, m_aPtPos, bIsParaEnd,
+return MakeRegion(rDoc, rRegion, eCheck, m_aMkPos, m_aPtPos, bIsParaEnd,
pAttr->Which());
}
-SwFltControlStack::SwFltControlStack(SwDoc* pDo, sal_uLong nFieldFl)
-: nFieldFlags(nFieldFl),bHasSdOD(true), bSdODChecked(false), pDoc(pDo),
bIsEndStack(false)
+SwFltControlStack::SwFltControlStack(SwDoc& rDo, sal_uLong nFieldFl)
+: nFieldFlags(nFieldFl),bHasSdOD(true), bSdODChecked(false), rDoc(rDo),
bIsEndStack(false)
{
}
@@ -206,7 +206,7 @@ void SwFltControlStack::MoveAttrs(const SwPosition& rPos,
MoveAttrsMode eMode)
{
rEntry.m_aMkPos.m_nContent++;
OSL_ENSURE( rEntry.m_aMkPos.m_nContent
-<= pDoc->GetNodes()[nPosNd]->GetContentNode()->Len(),
+<= rDoc.GetNodes()[nPosNd]->GetContentNode()->Len(),
"Attribute ends after end of line" );
}
if (
@@ -227,7 +227,7 @@ void SwFltControlStack::MoveAttrs(const SwPosition& rPos,
MoveAttrsMode eMode)
}
rEntry.m_aPtPos.m_nContent++;
OSL_ENSURE( rEntry.m_aPtPos.m_nContent
-<= pDoc->GetNodes()[nPosNd]->GetContentNode()->Len(),
+<= rDoc.GetNodes()[nPosNd]->GetContentNode()->Len(),
[Libreoffice-commits] core.git: external/nss
external/nss/ExternalProject_nss.mk |1 external/nss/UnpackedTarball_nss.mk |1 external/nss/nss-android.patch.1 |6 - external/nss/nss-restore-manual-pre-dependencies.patch.1 | 83 +++ 4 files changed, 86 insertions(+), 5 deletions(-) New commits: commit d2f9c55e065d559de903d540da28502646714a24 Author: Jan-Marek Glogowski AuthorDate: Thu Oct 1 12:57:53 2020 +0200 Commit: Jan-Marek Glogowski CommitDate: Fri Oct 2 13:38:10 2020 +0200 nss: restore manual pre-dependency build We had some seldom build failures on Windows, with errors like: PermissionError: [WinError 32] The process cannot access the file because it is being used by another process: '/nssckmdt.h'. This happens, because of the "." / parent shell hack. Thinking about it again, it doesn't prevent the parent make to run in parallel to the "." directory make. So I tried to use a terminal match-all rule like ifneq (,$(filter .,$(DIRS))) %:: # empty terminal rule triggered $(error can't happen) endif to stop the original parent make, but that doesn't work and the $(error ...) is triggered. So AFAIK I'm out of options here and have to restore the old manual pre-dependency build variant - still much better then no parallel build. An alternative idea was to put the rest of the rules.mk in the "else" of the terminal rule, to skip all normal rules, but this still leaves out all rules from the rest of the make-files, which might result in some hard to debug errors. This reverts my upstream patch 15608:744881490c78. Change-Id: I9e2e9e1ec9f35697c7853c92f60434f514cba5ab Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103777 Tested-by: Jenkins Reviewed-by: Tor Lillqvist Reviewed-by: Jan-Marek Glogowski diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk index a7099e34e7e7..25d4995ced44 100644 --- a/external/nss/ExternalProject_nss.mk +++ b/external/nss/ExternalProject_nss.mk @@ -59,7 +59,6 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalExecuta NSPR_CONFIGURE_OPTS="--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)") \ NSDISTMODE=copy \ $(MAKE) \ - -j1 \ AR="$(AR)" \ RANLIB="$(RANLIB)" \ NMEDIT="$(NM)edit" \ diff --git a/external/nss/UnpackedTarball_nss.mk b/external/nss/UnpackedTarball_nss.mk index 7921d36078bf..fb8b8b061265 100644 --- a/external/nss/UnpackedTarball_nss.mk +++ b/external/nss/UnpackedTarball_nss.mk @@ -28,6 +28,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\ external/nss/macos-dlopen.patch.0 \ external/nss/nss.getopt.patch.0 \ external/nss/nss-win-arm64.patch \ +external/nss/nss-restore-manual-pre-dependencies.patch.1 \ $(if $(filter iOS,$(OS)), \ external/nss/nss-ios.patch) \ $(if $(filter ANDROID,$(OS)), \ diff --git a/external/nss/nss-android.patch.1 b/external/nss/nss-android.patch.1 index 7d3807f73589..0f75715e8b86 100644 --- a/external/nss/nss-android.patch.1 +++ b/external/nss/nss-android.patch.1 @@ -62,13 +62,11 @@ diff -ur nss.org/nss/Makefile nss/nss/Makefile $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) install --- nss/nss/lib/ckfw/builtins/manifest.mn.orig 2019-11-26 15:18:22.185985193 +0100 +++ nss/nss/lib/ckfw/builtins/manifest.mn 2019-11-26 15:18:29.281982387 +0100 -@@ -5,9 +5,7 @@ +@@ -5,7 +5,7 @@ CORE_DEPTH = ../../.. --DIRS = . testlib -- --testlib: . +-DIRS = testlib +DIRS = MODULE = nss diff --git a/external/nss/nss-restore-manual-pre-dependencies.patch.1 b/external/nss/nss-restore-manual-pre-dependencies.patch.1 new file mode 100644 index ..ebcc5b48c540 --- /dev/null +++ b/external/nss/nss-restore-manual-pre-dependencies.patch.1 @@ -0,0 +1,83 @@ +Revert of upstream: + +changeset: 15608:744881490c78 +user:Jan-Marek Glogowski +date:Wed May 13 19:00:40 2020 + +summary: Bug 1637083 Replace pre-dependency with shell hack r=rrelyea + +--- b/nss/coreconf/rules.mkWed May 13 19:00:40 2020 + a/nss/coreconf/rules.mkTue May 12 21:33:43 2020 + +@@ -31,21 +31,10 @@ + USE_NT_C_SYNTAX=1 + endif + +-# For whatever reason, "." can't be handled using make conditionals. +-# Based on automake's SUBDIRS "." handling. + ifdef DIRS + ifndef IGNORE_DIRS +-ifneq (,$(filter .,$(DIRS))) +-TARGETS = $(NULL) +-ALL_TRASH = $(NULL) +-endif +- + $(DIRS): ++ $(IGNORE_ERROR)@$(MAKE) -C $@ $(MAKECMDGOALS) +- $(IGNORE_ERROR)@if [ "$@" != "." ]; then \ +- $(MAKE) -C $@ $(MAKECMDGOALS) ; \ +- else \ +- IGNORE_DIRS=1 $(MAKE) -C $@ $(MAKECMDGOALS) ; \ +- fi + @$(CLICK_STOPWATCH) + en
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/numrule.hxx|2 +-
sw/source/core/doc/docnum.cxx |8
sw/source/core/doc/number.cxx |6 +++---
3 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 597a746b38c4b3cb860cc997d532029d56a9f75a
Author: Caolán McNamara
AuthorDate: Thu Oct 1 20:48:26 2020 +0100
Commit: Caolán McNamara
CommitDate: Fri Oct 2 13:19:39 2020 +0200
SwNumRule::CheckCharFormats never passed null SwDoc*
Change-Id: I9f33af6cdf02e24a2a4da0694dda3a266832c0a6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103822
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx
index a4e986a9ae9c..ae6405424518 100644
--- a/sw/inc/numrule.hxx
+++ b/sw/inc/numrule.hxx
@@ -218,7 +218,7 @@ public:
/** Tests whether the CharFormats are from the given doc
and copies them if appropriate. */
-void CheckCharFormats( SwDoc* pDoc );
+void CheckCharFormats( SwDoc& rDoc );
const OUString& GetName() const { return msName; }
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index b0a38c0f406e..5d466edbd942 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -129,7 +129,7 @@ void SwDoc::SetOutlineNumRule( const SwNumRule& rRule )
mpOutlineRule->SetAutoRule( true );
// test whether the optional CharFormats are defined in this Document
-mpOutlineRule->CheckCharFormats( this );
+mpOutlineRule->CheckCharFormats( *this );
// notify text nodes, which are registered at the outline style, about the
// changed outline style
@@ -813,7 +813,7 @@ static void lcl_ChgNumRule( SwDoc& rDoc, const SwNumRule&
rRule )
if( !nChgFormatLevel ) // Nothing has been changed?
{
const bool bInvalidateNumRule( pOld->IsContinusNum() !=
rRule.IsContinusNum() );
-pOld->CheckCharFormats( &rDoc );
+pOld->CheckCharFormats( rDoc );
pOld->SetContinusNum( rRule.IsContinusNum() );
if ( bInvalidateNumRule )
@@ -844,7 +844,7 @@ static void lcl_ChgNumRule( SwDoc& rDoc, const SwNumRule&
rRule )
if ( nChgFormatLevel & ( 1 << n ) )
pOld->Set( n, rRule.GetNumFormat( n ) );
-pOld->CheckCharFormats( &rDoc );
+pOld->CheckCharFormats( rDoc );
pOld->SetInvalidRule( true );
pOld->SetContinusNum( rRule.IsContinusNum() );
@@ -2464,7 +2464,7 @@ sal_uInt16 SwDoc::MakeNumRule( const OUString &rName,
pNew->SetPoolHlpFileId( UCHAR_MAX );
pNew->SetDefaultListId( OUString() );
}
-pNew->CheckCharFormats( this );
+pNew->CheckCharFormats( *this );
}
else
{
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index a565e22ce1fd..a75c2478320d 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -512,18 +512,18 @@ SwNumRule::~SwNumRule()
maParagraphStyleList.clear();
}
-void SwNumRule::CheckCharFormats( SwDoc* pDoc )
+void SwNumRule::CheckCharFormats( SwDoc& rDoc )
{
for(auto& rpNumFormat : maFormats)
{
if( rpNumFormat )
{
SwCharFormat* pFormat = rpNumFormat->GetCharFormat();
-if( pFormat && pFormat->GetDoc() != pDoc )
+if( pFormat && pFormat->GetDoc() != &rDoc )
{
// copy
SwNumFormat* pNew = new SwNumFormat( *rpNumFormat );
-pNew->SetCharFormat( pDoc->CopyCharFormat( *pFormat ) );
+pNew->SetCharFormat( rDoc.CopyCharFormat( *pFormat ) );
rpNumFormat.reset(pNew);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bin/lint-ui.py
bin/lint-ui.py |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit d9c763e5428379166b96a46295a1cb41120e6eea Author: Noel AuthorDate: Fri Oct 2 10:29:17 2020 +0200 Commit: Noel Grandin CommitDate: Fri Oct 2 13:08:30 2020 +0200 lint-ui: add some more valid top-level widgets Change-Id: Ifedeb65c13b5889941da5dbd7fa215f5e380e64e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103819 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/bin/lint-ui.py b/bin/lint-ui.py index fd578f72694d..5dc33eaaec2a 100755 --- a/bin/lint-ui.py +++ b/bin/lint-ui.py @@ -18,7 +18,8 @@ import re DEFAULT_WARNING_STR = 'Lint assertion failed' -POSSIBLE_TOP_LEVEL_WIDGETS = ['GtkDialog', 'GtkMessageDialog', 'GtkBox', 'GtkFrame', 'GtkGrid', 'GtkAssistant'] +POSSIBLE_TOP_LEVEL_WIDGETS = ['GtkDialog', 'GtkMessageDialog', 'GtkBox', 'GtkFrame', 'GtkGrid', +'GtkAssistant', 'GtkToolbar', 'GtkNotebook', 'GtkPopover', 'GtkWindow', 'GtkPaned', 'GtkScrolledWindow'] IGNORED_TOP_LEVEL_WIDGETS = ['GtkAdjustment', 'GtkImage', 'GtkListStore', 'GtkSizeGroup', 'GtkMenu', 'GtkTextBuffer', 'GtkTreeStore'] BORDER_WIDTH = '6' BUTTON_BOX_SPACING = '12' ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/01/0211.xhp |5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) New commits: commit d06eb1014e0243acd382ee34fcea7caaad2356aa Author: Seth Chaiklin AuthorDate: Fri Oct 2 12:51:25 2020 +0200 Commit: Seth Chaiklin CommitDate: Fri Oct 2 13:08:31 2020 +0200 tdf#91755 update URL for ICU regex documentation Change-Id: Ie5a3f8717ae8a043fe05b23b05068ba28aed8ded Reviewed-on: https://gerrit.libreoffice.org/c/help/+/103793 Reviewed-by: Seth Chaiklin Tested-by: Jenkins diff --git a/source/text/shared/01/0211.xhp b/source/text/shared/01/0211.xhp index fc57b22f8..dbc0d877c 100644 --- a/source/text/shared/01/0211.xhp +++ b/source/text/shared/01/0211.xhp @@ -38,7 +38,7 @@ concatenation, see ampersand symbol ampersand symbol, see also operators mw added "replacing;" and "tab stops;" -List of Regular Expressions +List of Regular Expressions @@ -315,7 +315,7 @@ -For a full list of supported metacharacters and syntax, see https://unicode-org.github.io/icu/"; name="ICU Regular Expressions documentation">ICU Regular Expressions documentation +For a full list of supported metacharacters and syntax, see https://unicode-org.github.io/icu/userguide/strings/regexp.html"; name="ICU Regular Expressions documentation">ICU Regular Expressions documentation Note that currently all named character class terms, [:alpha:] through [:upper:], must be enclosed in parentheses when used in a regular expression, see the examples that follow. Regular expression terms can be combined to form complex and sophisticated regular expressions for searches as show in the following examples. Examples @@ -402,7 +402,6 @@ - ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bin/lint-ui.py
bin/lint-ui.py | 60 -
1 file changed, 43 insertions(+), 17 deletions(-)
New commits:
commit 2bfcd0fa8439112c66fd82adc6f860b5d93f789b
Author: Noel
AuthorDate: Fri Oct 2 10:53:25 2020 +0200
Commit: Noel Grandin
CommitDate: Fri Oct 2 12:44:33 2020 +0200
lint-ui: put line numbers in error messages
Change-Id: I00c864684fefd1e4afb8370b6255cbe623b63523
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103821
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/bin/lint-ui.py b/bin/lint-ui.py
index 9530cb9ac7a8..fd578f72694d 100755
--- a/bin/lint-ui.py
+++ b/bin/lint-ui.py
@@ -10,6 +10,9 @@
# a consistent look for dialogs
import sys
+# Force python XML parser not faster C accelerators
+# because we can't hook the C implementation
+sys.modules['_elementtree'] = None
import xml.etree.ElementTree as ET
import re
@@ -26,9 +29,31 @@ MESSAGE_BORDER_WIDTH = '12'
IGNORED_WORDS = ['the', 'of', 'to', 'for', 'a', 'and', 'as', 'from', 'on',
'into', 'by', 'at', 'or', 'do', 'in', 'when']
-def lint_assert(predicate, warning=DEFAULT_WARNING_STR):
+# Hook the XML parser and add line number attributes
+class LineNumberingParser(ET.XMLParser):
+def _start(self, *args, **kwargs):
+# Here we assume the default XML parser which is expat
+# and copy its element position attributes into output Elements
+element = super(self.__class__, self)._start(*args, **kwargs)
+element._start_line_number = self.parser.CurrentLineNumber
+element._start_column_number = self.parser.CurrentColumnNumber
+element._start_byte_index = self.parser.CurrentByteIndex
+return element
+
+def _end(self, *args, **kwargs):
+element = super(self.__class__, self)._end(*args, **kwargs)
+element._end_line_number = self.parser.CurrentLineNumber
+element._end_column_number = self.parser.CurrentColumnNumber
+element._end_byte_index = self.parser.CurrentByteIndex
+return element
+
+
+def lint_assert(predicate, warning=DEFAULT_WARNING_STR, node=None):
if not predicate:
-print("* " + warning)
+if not(node is None):
+print(sys.argv[1] + ":" + str(node._start_line_number) + ": " +
warning)
+else:
+print(sys.argv[1] + ": " + warning)
def check_top_level_widget(element):
# check widget type
@@ -45,20 +70,22 @@ def check_top_level_widget(element):
border_width = border_width_properties[0]
if widget_type == "GtkMessageDialog":
lint_assert(border_width.text == MESSAGE_BORDER_WIDTH,
-"Top level 'border_width' property should be " +
MESSAGE_BORDER_WIDTH)
+"Top level 'border_width' property should be " +
MESSAGE_BORDER_WIDTH, border_width)
else:
lint_assert(border_width.text == BORDER_WIDTH,
-"Top level 'border_width' property should be " +
BORDER_WIDTH)
+"Top level 'border_width' property should be " +
BORDER_WIDTH, border_width)
def check_button_box_spacing(element):
spacing = element.findall("property[@name='spacing']")
lint_assert(len(spacing) > 0 and spacing[0].text == BUTTON_BOX_SPACING,
-"Button box 'spacing' should be " + BUTTON_BOX_SPACING)
+"Button box 'spacing' should be " + BUTTON_BOX_SPACING,
+element)
def check_message_box_spacing(element):
spacing = element.findall("property[@name='spacing']")
lint_assert(len(spacing) > 0 and spacing[0].text == MESSAGE_BOX_SPACING,
-"Button box 'spacing' should be " + MESSAGE_BOX_SPACING)
+"Button box 'spacing' should be " + MESSAGE_BOX_SPACING,
+element)
def check_radio_buttons(root):
radios = [element for element in root.findall('.//object') if
element.attrib['class'] == 'GtkRadioButton']
@@ -66,7 +93,7 @@ def check_radio_buttons(root):
radio_underlines = radio.findall("./property[@name='use_underline']")
assert len(radio_underlines) <= 1
if len(radio_underlines) < 1:
-lint_assert(False, "No use_underline in GtkRadioButton with id =
'" + radio.attrib['id'] + "'")
+lint_assert(False, "No use_underline in GtkRadioButton with id =
'" + radio.attrib['id'] + "'", radio)
def check_menu_buttons(root):
buttons = [element for element in root.findall('.//object') if
element.attrib['class'] == "GtkMenuButton"]
@@ -75,7 +102,7 @@ def check_menu_buttons(root):
images = button.findall("./property[@name='image']")
assert(len(labels) <= 1)
if len(labels) < 1 and len(images) < 1:
-lint_assert(False, "No label in GtkMenuButton with id = '" +
button.attrib['id'] + "'")
+lint_assert(False, "No label in GtkMenuButton with id = '" +
button.attrib['id'] + "'", button)
def check_c
[Libreoffice-commits] core.git: cui/uiconfig
cui/uiconfig/ui/additionsdialog.ui | 15 +++ 1 file changed, 7 insertions(+), 8 deletions(-) New commits: commit 14c928265ba324c0d42f5bc8af65df7666dab020 Author: Caolán McNamara AuthorDate: Fri Oct 2 09:15:01 2020 +0100 Commit: Caolán McNamara CommitDate: Fri Oct 2 12:14:28 2020 +0200 use the same gtkbuilder pattern for all gearmenus Change-Id: I743a98407f184291ad6b798bbee316d10b00bc12 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103817 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/cui/uiconfig/ui/additionsdialog.ui b/cui/uiconfig/ui/additionsdialog.ui index 3ce21025e5e8..507410467960 100644 --- a/cui/uiconfig/ui/additionsdialog.ui +++ b/cui/uiconfig/ui/additionsdialog.ui @@ -2,6 +2,11 @@ + +True +False +cmd/sc_menubar.png + True False @@ -194,21 +199,15 @@ - True True True end 1 +imageGear +True additionsmenu False - - -True -False -cmd/sc_menubar.png - - Gear Menu ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/uiconfig
cui/uiconfig/ui/menuassignpage.ui |2 -- 1 file changed, 2 deletions(-) New commits: commit 1a78b6376a49c81aa5656783bdb1d87d27105cfe Author: Noel AuthorDate: Fri Oct 2 10:21:43 2020 +0200 Commit: Noel Grandin CommitDate: Fri Oct 2 12:13:25 2020 +0200 remove some unnecessary label properties after commit 2e3afaebd027d0280b871c3515c4999b7912692a lint-ui.py check that GtkMenuButton has a label property Change-Id: I4d6df701898aa540fdfa22427b2676468c08d4cf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103818 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/cui/uiconfig/ui/menuassignpage.ui b/cui/uiconfig/ui/menuassignpage.ui index c7ba93e5253b..7081489cfe3c 100644 --- a/cui/uiconfig/ui/menuassignpage.ui +++ b/cui/uiconfig/ui/menuassignpage.ui @@ -498,7 +498,6 @@ - True True end @@ -521,7 +520,6 @@ - True True end ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - include/svl svl/source sw/source
include/svl/undo.hxx|2 +-
svl/source/undo/undo.cxx| 12
sw/source/core/undo/docundo.cxx |6 --
3 files changed, 9 insertions(+), 11 deletions(-)
New commits:
commit 3d6c7523aea5c2820f26c33688b2c9a767affc6b
Author: Xisco Fauli
AuthorDate: Thu Oct 1 16:46:11 2020 +0200
Commit: Xisco Fauli
CommitDate: Fri Oct 2 12:12:38 2020 +0200
tdf#136728: Revert "tdf#136238 speed up deleting large cross page table"
This reverts commit da5c289a9cae5d914937f235694fd5b0cb92547f.
Change-Id: Ic6a77ec2cd3b502fb4e94159a0424340850590df
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103665
Tested-by: Jenkins
Reviewed-by: Noel Grandin
(cherry picked from commit 0b3ff97d7d5a1e8471e494f4141165364203c192)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103792
Reviewed-by: Michael Stahl
diff --git a/include/svl/undo.hxx b/include/svl/undo.hxx
index 89bfb5dbbaa2..8de6231c1dc5 100644
--- a/include/svl/undo.hxx
+++ b/include/svl/undo.hxx
@@ -289,7 +289,7 @@ public:
/** removes the oldest Undo actions from the stack
*/
-voidRemoveOldestUndoActions(sal_Int32 nNumToDelete);
+voidRemoveOldestUndoAction();
void dumpAsXml(xmlTextWriterPtr pWriter) const;
diff --git a/svl/source/undo/undo.cxx b/svl/source/undo/undo.cxx
index 46c785557416..b678fba83948 100644
--- a/svl/source/undo/undo.cxx
+++ b/svl/source/undo/undo.cxx
@@ -1123,22 +1123,18 @@ bool SfxUndoManager::HasTopUndoActionMark(
UndoStackMark const i_mark )
}
-void SfxUndoManager::RemoveOldestUndoActions(sal_Int32 nNumToDelete)
+void SfxUndoManager::RemoveOldestUndoAction()
{
UndoManagerGuard aGuard( *m_xData );
-if ( ImplIsInListAction_Lock() && ( m_xData->pUndoArray->nCurUndoAction ==
1 ) )
+if ( IsInListAction() && ( m_xData->pUndoArray->nCurUndoAction == 1 ) )
{
assert(!"SfxUndoManager::RemoveOldestUndoActions: cannot remove a
not-yet-closed list action!");
return;
}
-while (nNumToDelete>0 && !m_xData->pUndoArray->maUndoActions.empty())
-{
-aGuard.markForDeletion( m_xData->pUndoArray->Remove( 0 ) );
---m_xData->pUndoArray->nCurUndoAction;
---nNumToDelete;
-}
+aGuard.markForDeletion( m_xData->pUndoArray->Remove( 0 ) );
+--m_xData->pUndoArray->nCurUndoAction;
ImplCheckEmptyActions();
}
diff --git a/sw/source/core/undo/docundo.cxx b/sw/source/core/undo/docundo.cxx
index e30c4ef72d88..61629e087bc7 100644
--- a/sw/source/core/undo/docundo.cxx
+++ b/sw/source/core/undo/docundo.cxx
@@ -535,8 +535,10 @@ void
UndoManager::AddUndoAction(std::unique_ptr pAction, bool bTr
}
// if the undo nodes array is too large, delete some actions
-if (UNDO_ACTION_LIMIT < GetUndoNodes().Count())
-RemoveOldestUndoActions(GetUndoNodes().Count() - UNDO_ACTION_LIMIT);
+while (UNDO_ACTION_LIMIT < GetUndoNodes().Count())
+{
+RemoveOldestUndoAction();
+}
}
namespace {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/source
oox/source/drawingml/diagram/diagramlayoutatoms.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit d1e98b13079b11c20808d1970d2827d1ecd7
Author: Caolán McNamara
AuthorDate: Fri Oct 2 08:52:17 2020 +0100
Commit: Caolán McNamara
CommitDate: Fri Oct 2 11:57:41 2020 +0200
cid#1467665 Division or modulo by float zero
Change-Id: I34446609f25b5fdf2c6c537a6a0f6085c707b0c6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103816
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index 156b15423a35..d1280406fedb 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -252,7 +252,8 @@ void SnakeAlg::layoutShapeChildren(const AlgAtom::ParamMap&
rMap, const ShapePtr
nRowWidth += aShapeWidths[i];
}
-if ((fShapeHeight * nRow) / nRowWidth >= fAspectRatio)
+double fTotalShapesHeight = fShapeHeight * nRow;
+if (nRowWidth && fTotalShapesHeight / nRowWidth >= fAspectRatio)
{
if (nRowWidth > nMaxRowWidth)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/source
framework/source/dispatch/popupmenudispatcher.cxx |3 -
framework/source/fwe/classes/addonmenu.cxx |2
framework/source/fwe/classes/addonsoptions.cxx |4 -
framework/source/jobs/jobexecutor.cxx |4 -
framework/source/layoutmanager/toolbarlayoutmanager.cxx | 35 +---
framework/source/services/urltransformer.cxx|6 --
framework/source/uielement/menubarmanager.cxx |5 --
framework/source/uielement/menubarmerger.cxx|3 -
framework/source/uielement/statusbarmanager.cxx |2
framework/source/uielement/subtoolbarcontroller.cxx |2
framework/source/uielement/toolbarmanager.cxx |2
framework/source/uielement/toolbarsmenucontroller.cxx |3 -
12 files changed, 26 insertions(+), 45 deletions(-)
New commits:
commit eac4526f07bdf3cce70d84fb6e3d7896e7cae61b
Author: Noel
AuthorDate: Fri Oct 2 09:36:56 2020 +0200
Commit: Noel Grandin
CommitDate: Fri Oct 2 11:21:44 2020 +0200
loplugin:reducevarscope in framework
Change-Id: I79237d68d815f9b46277a496a05b596f58b4028b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103813
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/framework/source/dispatch/popupmenudispatcher.cxx
b/framework/source/dispatch/popupmenudispatcher.cxx
index 264c74a4f034..991c8af1b555 100644
--- a/framework/source/dispatch/popupmenudispatcher.cxx
+++ b/framework/source/dispatch/popupmenudispatcher.cxx
@@ -119,7 +119,6 @@ SAL_CALL PopupMenuDispatcher::queryDispatch(
try
{
// Just use the main part of the URL for popup menu controllers
-sal_Int32 nQueryPart( 0 );
sal_Int32 nSchemePart( 0 );
OUString aBaseURL( "vnd.sun.star.popup:" );
OUString aURL( rURL.Complete );
@@ -128,7 +127,7 @@ SAL_CALL PopupMenuDispatcher::queryDispatch(
if (( nSchemePart > 0 ) &&
( aURL.getLength() > ( nSchemePart+1 )))
{
-nQueryPart = aURL.indexOf( '?', nSchemePart );
+sal_Int32 nQueryPart = aURL.indexOf( '?', nSchemePart );
if ( nQueryPart > 0 )
aBaseURL += aURL.copy( nSchemePart+1,
nQueryPart-(nSchemePart+1) );
else if ( nQueryPart == -1 )
diff --git a/framework/source/fwe/classes/addonmenu.cxx
b/framework/source/fwe/classes/addonmenu.cxx
index 86632c894be9..7e3103f17635 100644
--- a/framework/source/fwe/classes/addonmenu.cxx
+++ b/framework/source/fwe/classes/addonmenu.cxx
@@ -45,11 +45,11 @@ VclPtr AddonMenuManager::CreateAddonMenu( const
Reference< XFrame >&
{
AddonsOptions aOptions;
VclPtr pAddonMenu;
-sal_uInt16nUniqueMenuId = ADDONMENU_ITEMID_START;
const Sequence< Sequence< PropertyValue > >& rAddonMenuEntries =
aOptions.GetAddonsMenu();
if ( rAddonMenuEntries.hasElements() )
{
+sal_uInt16 nUniqueMenuId = ADDONMENU_ITEMID_START;
pAddonMenu = VclPtr::Create();
OUString aModuleIdentifier =
vcl::CommandInfoProvider::GetModuleIdentifier( rFrame );
AddonMenuManager::BuildMenu( pAddonMenu, MENU_APPEND, nUniqueMenuId,
rAddonMenuEntries, rFrame, aModuleIdentifier );
diff --git a/framework/source/fwe/classes/addonsoptions.cxx
b/framework/source/fwe/classes/addonsoptions.cxx
index 1d1a89a55873..8d2aa243f702 100644
--- a/framework/source/fwe/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@@ -1420,7 +1420,6 @@ void AddonsOptions_Impl::AppendPopupMenu( Sequence<
PropertyValue >& rTargetPopu
bool AddonsOptions_Impl::ReadToolBarItem( const OUString&
aToolBarItemNodeName, Sequence< PropertyValue >& aToolBarItem )
{
bool bResult = false;
-OUString aTitle;
OUString aURL;
OUString aAddonToolBarItemTreeNode( aToolBarItemNodeName +
m_aPathDelimiter );
@@ -1429,6 +1428,7 @@ bool AddonsOptions_Impl::ReadToolBarItem( const OUString&
aToolBarItemNodeName,
// A toolbar item must have a command URL
if (( aToolBarItemNodePropValues[ OFFSET_TOOLBARITEM_URL ] >>= aURL ) &&
!aURL.isEmpty() )
{
+OUString aTitle;
if ( aURL == SEPARATOR_URL )
{
// A separator toolbar item only needs a URL
@@ -1473,7 +1473,6 @@ bool AddonsOptions_Impl::ReadToolBarItem( const OUString&
aToolBarItemNodeName,
bool AddonsOptions_Impl::ReadNotebookBarItem( const OUString&
aNotebookBarItemNodeName, Sequence< PropertyValue >& aNotebookBarItem )
{
bool bResult = false;
-OUString aTitle;
OUString aURL;
OUString aAddonNotebookBarItemTreeNode( aNotebookBarItemNodeName +
m_aPathDelimiter );
@@ -1482,6 +1481,7 @@ bool AddonsOptions_Impl::ReadNotebookBarItem( const
OUString& aNotebookBarItemNo
[Libreoffice-commits] core.git: filter/source
filter/source/xslt/export/wordml/ooo2wordml_text.xsl |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4c5ffaf2ae8cd08a6d24bf674d203659e59f049f Author: Andrea Gelmini AuthorDate: Sat Sep 26 21:09:46 2020 +0200 Commit: Michael Stahl CommitDate: Fri Oct 2 11:06:16 2020 +0200 Fix typo in code Change-Id: Ia4736c9fec6076cbf34533d957228cc7337c3622 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103490 Tested-by: Jenkins Reviewed-by: Julien Nabet Reviewed-by: Michael Stahl diff --git a/filter/source/xslt/export/wordml/ooo2wordml_text.xsl b/filter/source/xslt/export/wordml/ooo2wordml_text.xsl index 4280aaf57b93..406c8cb91e50 100644 --- a/filter/source/xslt/export/wordml/ooo2wordml_text.xsl +++ b/filter/source/xslt/export/wordml/ooo2wordml_text.xsl @@ -355,7 +355,7 @@ - + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - dbaccess/qa dbaccess/source filter/source
dbaccess/qa/extras/dialog-save.cxx |2
dbaccess/qa/extras/empty-stdlib-save.cxx |2
dbaccess/qa/extras/nolib-save.cxx |2
dbaccess/source/core/api/SingleSelectQueryComposer.cxx |4 -
dbaccess/source/core/api/tablecontainer.cxx|3 -
dbaccess/source/core/api/viewcontainer.cxx |3 -
dbaccess/source/ui/app/AppController.cxx |3 -
dbaccess/source/ui/browser/sbagrid.cxx |2
dbaccess/source/ui/control/FieldDescControl.cxx|3 -
dbaccess/source/ui/dlg/UserAdmin.cxx |2
dbaccess/source/ui/dlg/queryfilter.cxx |2
dbaccess/source/ui/misc/UITools.cxx|2
dbaccess/source/ui/querydesign/QueryDesignView.cxx |2
dbaccess/source/ui/querydesign/querycontroller.cxx |2
filter/source/graphicfilter/eps/eps.cxx|3 -
filter/source/graphicfilter/icgm/class4.cxx|6 +-
filter/source/graphicfilter/idxf/dxf2mtf.cxx |9 +--
filter/source/graphicfilter/ios2met/ios2met.cxx| 39 ++---
filter/source/graphicfilter/itiff/ccidecom.cxx |6 --
filter/source/msfilter/escherex.cxx|9 +--
filter/source/msfilter/msdffimp.cxx| 22 -
filter/source/msfilter/mstoolbar.cxx |3 -
filter/source/msfilter/svdfppt.cxx | 12 +++--
filter/source/pdf/pdfexport.cxx|2
filter/source/svg/svgexport.cxx|2
filter/source/svg/svgwriter.cxx|9 +--
filter/source/t602/t602filter.cxx |3 -
27 files changed, 83 insertions(+), 76 deletions(-)
New commits:
commit 1b56843a77f0c86f483e96032b5b6ff2214968b0
Author: Noel
AuthorDate: Fri Oct 2 09:36:46 2020 +0200
Commit: Noel Grandin
CommitDate: Fri Oct 2 10:53:07 2020 +0200
loplugin:reducevarscope in filter
Change-Id: I665531de5b8a94c4646e2a85373a6f67a60f1c08
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103812
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/filter/source/graphicfilter/eps/eps.cxx
b/filter/source/graphicfilter/eps/eps.cxx
index 9958c946310a..61502b06c503 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -1060,10 +1060,9 @@ void PSWriter::ImplWriteActions( const GDIMetaFile&
rMtf, VirtualDevice& rVDev )
case MetaActionType::POP :
{
rVDev.Pop();
-StackMember* pGS;
if( pGDIStack )
{
-pGS = pGDIStack;
+StackMember* pGS = pGDIStack;
pGDIStack = pGS->pSucc;
aDashArray = pGS->aDashArray;
eJoinType = pGS->eJoinType;
diff --git a/filter/source/graphicfilter/icgm/class4.cxx
b/filter/source/graphicfilter/icgm/class4.cxx
index 2e3f3c439cdb..394c2ada5f89 100644
--- a/filter/source/graphicfilter/icgm/class4.cxx
+++ b/filter/source/graphicfilter/icgm/class4.cxx
@@ -362,7 +362,7 @@ void CGM::ImplDoClass4()
case 0x0d : /*Circular Arc 3 Point*/
{
-FloatPoint aStartingPoint, aIntermediatePoint, aEndingPoint,
aCenterPoint;
+FloatPoint aStartingPoint, aIntermediatePoint, aEndingPoint;
ImplGetPoint( aStartingPoint, true );
ImplGetPoint( aIntermediatePoint, true );
ImplGetPoint( aEndingPoint, true );
@@ -379,6 +379,7 @@ void CGM::ImplDoClass4()
if ( fG != 0 )
{
+FloatPoint aCenterPoint;
aCenterPoint.X = ( fD * fE - fB * fF ) / fG;
aCenterPoint.Y = ( fA * fF - fC * fE ) / fG;
double fStartAngle = ImplGetOrientation( aCenterPoint,
aStartingPoint );
@@ -435,7 +436,7 @@ void CGM::ImplDoClass4()
if ( mbFigure )
mpOutAct->CloseRegion();
-FloatPoint aStartingPoint, aIntermediatePoint, aEndingPoint,
aCenterPoint;
+FloatPoint aStartingPoint, aIntermediatePoint, aEndingPoint;
ImplGetPoint( aStartingPoint );
ImplGetPoint( aIntermediatePoint );
ImplGetPoint( aEndingPoint );
@@ -452,6 +453,7 @@ void CGM::ImplDoClass4()
if ( fG != 0 )
{
+FloatPoint aCenterPoint;
aCenterPoint.X = ( fD * fE - fB * fF ) / fG;
aCenterPoint.Y = ( fA * fF - fC * fE ) / fG;
double fStartAngle = ImplGetOrientation( aCenterPoint,
aStartingPoint );
diff --git a/filter/source/graphicfilter/idxf/dxf2mtf.cxx
b/filter/source/graphicfilter/idxf/dxf2mtf.cxx
index 898dc6159ecb..3d9e6c9ed
[Libreoffice-commits] core.git: desktop/source editeng/source emfio/source
desktop/source/app/app.cxx |2 +-
desktop/source/app/dispatchwatcher.cxx |2 +-
desktop/source/deployment/gui/dp_gui_extlistbox.cxx |2 +-
desktop/source/deployment/gui/dp_gui_service.cxx|2 +-
desktop/source/deployment/registry/help/dp_help.cxx |2 +-
desktop/source/lib/init.cxx |7 +++
desktop/source/migration/services/oo3extensionmigration.cxx |3 +--
desktop/source/splash/splash.cxx|6 ++
editeng/source/editeng/editdoc.cxx |3 +--
editeng/source/misc/svxacorr.cxx|5 ++---
editeng/source/outliner/outliner.cxx|4 ++--
editeng/source/uno/unoedprx.cxx |2 +-
editeng/source/uno/unofored.cxx |3 +--
editeng/source/uno/unotext.cxx |2 +-
emfio/source/reader/emfreader.cxx | 10 --
emfio/source/reader/wmfreader.cxx |6 ++
16 files changed, 25 insertions(+), 36 deletions(-)
New commits:
commit 268a49f473c1830be269a7db5f561e3681134bbd
Author: Noel
AuthorDate: Fri Oct 2 09:36:35 2020 +0200
Commit: Noel Grandin
CommitDate: Fri Oct 2 10:46:46 2020 +0200
loplugin:reducevarscope in desktop..emfio
Change-Id: I25ca760ae15114ada621d928997a7117401c75d1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103811
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index dd38a74aa89e..1276a2c598f2 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -632,7 +632,6 @@ OUStringDesktop::CreateErrorMsgString(
const OUString& aFileURL )
{
OUStringaMsg;
-OUStringaFilePath;
boolbFileInfo = true;
switch ( nFailureCode )
@@ -708,6 +707,7 @@ OUStringDesktop::CreateErrorMsgString(
if ( bFileInfo )
{
OUString aMsgString( aMsg );
+OUStringaFilePath;
osl::File::getSystemPathFromFileURL( aFileURL, aFilePath );
diff --git a/desktop/source/app/dispatchwatcher.cxx
b/desktop/source/app/dispatchwatcher.cxx
index 450fd0e1e207..ec566181ce52 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -216,10 +216,10 @@ void scriptCat(const Reference< XModel >& xDoc )
{
OUString &rObjectName = aObjectNames[j];
-OUString aCodeString;
try
{
Any aCode = xContainer->getByName( rObjectName );
+OUString aCodeString;
if (! (aCode >>= aCodeString ) )
std::cout << "[" << rObjectName << "] - error fetching
code\n";
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index 89aaed148346..ccf546d713b7 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -894,7 +894,6 @@ void ExtensionBox_Impl::addEventListenerOnce(
void ExtensionBox_Impl::addEntry( const uno::Reference< deployment::XPackage >
&xPackage,
bool bLicenseMissing )
{
-long nPos = 0;
PackageState eState = TheExtensionManager::getPackageState( xPackage );
bool bLocked = m_pManager->isReadOnly( xPackage );
@@ -906,6 +905,7 @@ void ExtensionBox_Impl::addEntry( const uno::Reference<
deployment::XPackage > &
{
osl::MutexGuard guard(m_entriesMutex);
+long nPos = 0;
if (m_vEntries.empty())
{
addEventListenerOnce(xPackage);
diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx
b/desktop/source/deployment/gui/dp_gui_service.cxx
index 0d0315f0daaa..fb36589e01c5 100644
--- a/desktop/source/deployment/gui/dp_gui_service.cxx
+++ b/desktop/source/deployment/gui/dp_gui_service.cxx
@@ -140,9 +140,9 @@ ServiceImpl::ServiceImpl( Sequence const& args,
m_bShowUpdateOnly( false )
{
/* if true then this service is running in a unopkg process and not in an
office process */
-std::optional unopkg;
std::optional view;
try {
+std::optional unopkg;
comphelper::unwrapArgs( args, m_parent, view, unopkg );
return;
} catch ( const css::lang::IllegalArgumentException & ) {
diff --git a/desktop/source/deployment/registry/help/dp_help.cxx
b/desktop/source/deployment/registry/help/dp_help.cxx
index 594196155db8..49be2a23f87d 100644
--- a/desktop/source/deployment/registry/help/dp_help.cxx
+++ b/desktop/source/deployment/registry/help/dp_help.cxx
@@ -507,9 +507,9 @@ void BackendImpl::implProcessHelp(
sal_U
[Libreoffice-commits] core.git: vcl/qa
vcl/qa/cppunit/skia/skia.cxx | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) New commits: commit a282c9700806bc17710e8b2186b306d2a90928ee Author: Luboš Luňák AuthorDate: Fri Oct 2 10:41:02 2020 +0200 Commit: Luboš Luňák CommitDate: Fri Oct 2 10:42:34 2020 +0200 fix SkiaTest::testDrawShaders() The left and bottom edges are actually also edges between colors in the original bitmap. Change-Id: I36eb3c234eb3a0e99cb5836e1e7f0c7c13c620fd diff --git a/vcl/qa/cppunit/skia/skia.cxx b/vcl/qa/cppunit/skia/skia.cxx index 28591d807bb1..439440962b44 100644 --- a/vcl/qa/cppunit/skia/skia.cxx +++ b/vcl/qa/cppunit/skia/skia.cxx @@ -163,11 +163,11 @@ void SkiaTest::testDrawShaders() CPPUNIT_ASSERT_EQUAL(COL_WHITE, deviceLarge->GetPixel(Point(110, 110))); // Don't test colors near the edge between the colors, smoothscaling affects them. const int diff = 3; -CPPUNIT_ASSERT_EQUAL(resultRed, deviceLarge->GetPixel(Point(50, 89 - diff))); -CPPUNIT_ASSERT_EQUAL(resultBlue, deviceLarge->GetPixel(Point(50, 90 + diff))); -CPPUNIT_ASSERT_EQUAL(resultBlue, deviceLarge->GetPixel(Point(69 - diff, 100))); -CPPUNIT_ASSERT_EQUAL(resultRed, deviceLarge->GetPixel(Point(70 + diff, 100))); -CPPUNIT_ASSERT_EQUAL(resultBlue, deviceLarge->GetPixel(Point(50, 100))); +CPPUNIT_ASSERT_EQUAL(resultRed, deviceLarge->GetPixel(Point(50 + diff, 89 - diff))); +CPPUNIT_ASSERT_EQUAL(resultBlue, deviceLarge->GetPixel(Point(50 + diff, 90 + diff))); +CPPUNIT_ASSERT_EQUAL(resultBlue, deviceLarge->GetPixel(Point(69 - diff, 100 - diff))); +CPPUNIT_ASSERT_EQUAL(resultRed, deviceLarge->GetPixel(Point(70 + diff, 100 - diff))); +CPPUNIT_ASSERT_EQUAL(resultBlue, deviceLarge->GetPixel(Point(50 + diff, 100 - diff))); device->Erase(); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: editeng/source include/editeng include/svx include/vcl svx/source vcl/inc vcl/source vcl/unx
editeng/source/editeng/impedit2.cxx | 11 -
include/editeng/editview.hxx|3
include/svx/svdedxv.hxx |1
include/svx/weldeditview.hxx|9 +
include/vcl/customweld.hxx |7
include/vcl/layout.hxx |7
include/vcl/weld.hxx| 27 +++
svx/source/dialog/weldeditview.cxx | 23 +++
svx/source/svdraw/svdedxv.cxx |7
vcl/inc/salvtables.hxx |4
vcl/source/app/customweld.cxx |6
vcl/source/app/salvtables.cxx | 13 +
vcl/source/window/layout.cxx| 17 ++
vcl/unx/gtk3/gtk3gtkinst.cxx| 261 +++-
14 files changed, 386 insertions(+), 10 deletions(-)
New commits:
commit e1ac2a940389f52e28264a623a6620a7a0d94d57
Author: Caolán McNamara
AuthorDate: Wed Sep 30 14:42:10 2020 +0100
Commit: Caolán McNamara
CommitDate: Fri Oct 2 10:37:09 2020 +0200
tdf#134566 gtk IM support for custom widgets
Change-Id: I5c731161768d09d021db5c353de816e173159096
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103764
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/editeng/source/editeng/impedit2.cxx
b/editeng/source/editeng/impedit2.cxx
index 0887005cc8b1..471159845118 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -478,11 +478,12 @@ void ImpEditEngine::Command( const CommandEvent& rCEvt,
EditView* pView )
if ( nInputEnd > rLine.GetEnd() )
nInputEnd = rLine.GetEnd();
tools::Rectangle aR2 = PaMtoEditCursor( EditPaM(
aPaM.GetNode(), nInputEnd ), GetCursorFlags::EndOfLine );
-if (vcl::Window* pWindow = pView->GetWindow())
-{
-tools::Rectangle aRect =
pView->GetImpEditView()->GetWindowPos( aR1 );
-pWindow->SetCursorRect( &aRect, aR2.Left()-aR1.Right() );
-}
+tools::Rectangle aRect =
pView->GetImpEditView()->GetWindowPos( aR1 );
+auto nExtTextInputWidth = aR2.Left() - aR1.Right();
+if (EditViewCallbacks* pEditViewCallbacks =
pView->getEditViewCallbacks())
+pEditViewCallbacks->EditViewCursorRect(aRect,
nExtTextInputWidth);
+else if (vcl::Window* pWindow = pView->GetWindow())
+pWindow->SetCursorRect(&aRect, nExtTextInputWidth);
}
}
else
diff --git a/include/editeng/editview.hxx b/include/editeng/editview.hxx
index cac588af3243..ccc2be551ca9 100644
--- a/include/editeng/editview.hxx
+++ b/include/editeng/editview.hxx
@@ -111,6 +111,9 @@ public:
// Triggered to update InputEngine context information
virtual void EditViewInputContext(const InputContext& rInputContext) = 0;
+// Triggered to update InputEngine cursor position
+virtual void EditViewCursorRect(const tools::Rectangle& rRect, int
nExtTextInputWidth) = 0;
+
// implemented if drag and drop support is wanted
virtual css::uno::Reference
GetDropTarget()
{
diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx
index 3036836a999f..ce8bf4b1f480 100644
--- a/include/svx/svdedxv.hxx
+++ b/include/svx/svdedxv.hxx
@@ -69,6 +69,7 @@ class SVXCORE_DLLPUBLIC SdrObjEditView : public
SdrGlueEditView, public EditView
virtual void EditViewSelectionChange() override;
virtual OutputDevice& EditViewOutputDevice() const override;
virtual void EditViewInputContext(const InputContext& rInputContext)
override;
+virtual void EditViewCursorRect(const tools::Rectangle& rRect, int
nExtTextInputWidth) override;
// The OverlayObjects used for visualizing active TextEdit (currently
// using TextEditOverlayObject, but not limited to it
diff --git a/include/svx/weldeditview.hxx b/include/svx/weldeditview.hxx
index 65396e342b27..d54f2c9404a7 100644
--- a/include/svx/weldeditview.hxx
+++ b/include/svx/weldeditview.hxx
@@ -25,6 +25,8 @@ class SVX_DLLPUBLIC WeldEditView : public
weld::CustomWidgetController, public E
public:
WeldEditView();
virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override;
+virtual int GetSurroundingText(OUString& rSurrounding) override;
+virtual bool DeleteSurroundingText(const Selection& rRange) override;
void SetText(const OUString& rStr) { m_xEditEngine->SetText(rStr); }
@@ -77,6 +79,13 @@ protected:
{
SetInputContext(rInputContext);
}
+
+virtual void EditViewCursorRect(const tools::Rectangle& rRect, int
nExtTextInputWidth) override
+{
+OutputDevice& rRefDevice = EditViewOutputDevice();
+SetCursorRect(rRefDevice.LogicToPixel(rRect),
+ rRefDevice.LogicToPixel(Size(nExtTextInputWidth,
0)).Width());
+}
};
#endif // INCLUDED_SVX_WELDEDITVIEW_HXX
diff --git a/include/vcl/customweld.hxx b/include/vcl/customweld.hxx
index 0b79df8d1df1..8943110261bd 100644
New Defects reported by Coverity Scan for LibreOffice
Hi,
Please find the latest report on new defect(s) introduced to LibreOffice found
with Coverity Scan.
3 new defect(s) introduced to LibreOffice found with Coverity Scan.
New defect(s) Reported-by: Coverity Scan
Showing 3 of 3 defect(s)
** CID 1467667: Incorrect expression (DIVIDE_BY_ZERO)
/oox/source/drawingml/diagram/diagramlayoutatoms.cxx: 323 in
oox::drawingml::SnakeAlg::layoutShapeChildren(const std::map, std::allocator>> &, const
std::shared_ptr &, const
std::vector> &)()
*** CID 1467667: Incorrect expression (DIVIDE_BY_ZERO)
/oox/source/drawingml/diagram/diagramlayoutatoms.cxx: 323 in
oox::drawingml::SnakeAlg::layoutShapeChildren(const std::map, std::allocator>> &, const
std::shared_ptr &, const
std::vector> &)()
317 for (auto& aCurrShape : rShape->getChildren())
318 {
319 aCurrShape->setPosition(aCurrPos);
320 awt::Size aCurrSize(aChildSize);
321 // aShapeWidths items are a portion of nMaxRowWidth. We
want the same ratio,
322 // based on the original parent width, ignoring the
aspect ratio request.
>>> CID 1467667: Incorrect expression (DIVIDE_BY_ZERO)
>>> In expression "static_cast(aShapeWidths[index]) /
>>> nMaxRowWidth", division by expression "nMaxRowWidth" which may be zero has
>>> undefined behavior.
323 double fWidthFactor =
static_cast(aShapeWidths[index]) / nMaxRowWidth;
324 bool bWidthsFromConstraints
325 = nCount >= 2 &&
rShape->getChildren()[1]->getDataNodeType() == XML_sibTrans;
326 if (bWidthsFromConstraints)
327 {
328 // We can only work from constraints if spacing is
represented by a real
** CID 1467666: Error handling issues (CHECKED_RETURN)
/sw/source/uibase/utlui/content.cxx: 3232 in SwContentTree::UpdateTracking()()
*** CID 1467666: Error handling issues (CHECKED_RETURN)
/sw/source/uibase/utlui/content.cxx: 3232 in SwContentTree::UpdateTracking()()
3226 if (!((m_bIsRoot && m_nRootType != ContentTypeId::OUTLINE) ||
3227 m_nOutlineTracking == 3 || nActPos == SwOutlineNodes::npos))
3228 {
3229 // assure outline content type is expanded
3230 // this assumes outline content type is first in treeview
3231 std::unique_ptr
xFirstEntry(m_xTreeView->make_iterator());
>>> CID 1467666: Error handling issues (CHECKED_RETURN)
>>> Calling "get_iter_first" without checking return value (as is done
>>> elsewhere 101 out of 107 times).
3232 m_xTreeView->get_iter_first(*xFirstEntry);
3233 m_xTreeView->expand_row(*xFirstEntry);
3234
3235 m_xTreeView->all_foreach([this, nActPos](weld::TreeIter&
rEntry){
3236 bool bRet = false;
3237 if (lcl_IsContent(rEntry, *m_xTreeView) &&
reinterpret_cast(
** CID 1467665: Incorrect expression (DIVIDE_BY_ZERO)
/oox/source/drawingml/diagram/diagramlayoutatoms.cxx: 255 in
oox::drawingml::SnakeAlg::layoutShapeChildren(const std::map, std::allocator>> &, const
std::shared_ptr &, const
std::vector> &)()
*** CID 1467665: Incorrect expression (DIVIDE_BY_ZERO)
/oox/source/drawingml/diagram/diagramlayoutatoms.cxx: 255 in
oox::drawingml::SnakeAlg::layoutShapeChildren(const std::map, std::allocator>> &, const
std::shared_ptr &, const
std::vector> &)()
249 {
250 break;
251 }
252
253 nRowWidth += aShapeWidths[i];
254 }
>>> CID 1467665: Incorrect expression (DIVIDE_BY_ZERO)
>>> In expression "fShapeHeight * nRow / nRowWidth", division by expression
>>> "nRowWidth" which may be zero has undefined behavior.
255 if ((fShapeHeight * nRow) / nRowWidth >= fAspectRatio)
256 {
257 if (nRowWidth > nMaxRowWidth)
258 {
259 nMaxRowWidth = nRowWidth;
260 }
To view the defects in Coverity Scan visit,
https://u15810271.ct.sendgrid.net/ls/click?upn=HRESupC-2F2Czv4BOaCWWCy7my0P0qcxCbhZ31OYv50ypSs1kiFPuCn2xFdlMIFBirii0zZ9j2-2F9F2XPBcBm2BNgi9duPy3v-2FzgFDd2LJ-2BDKI-3Dv-9t_OTq2XUZbbipYjyLSo6GRo-2FpVxQ9OzkDINu9UTS-2FQhSdO0F0jQniitrGlNxDIzPJi1ILeDWj8f8NKMEDaRBGWYhmIIAMMJCYiTZSwZ1M9a4y9-2BU9BizEY1B7pDuRiy5H2HSYY37EzcNDM1jQ1DGGev-2F8wzqcYnfv-2FafJOsLj2XH2ej-2BwDTwHnQRDoWUfLVfJ-2FHCALNOPwZeYWX0rH-2BXO6oGgUfG1lJJNvhKKkmg8
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/utlui/content.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 1709a9b9a2433032b5acf262ef506272c33d5e63
Author: Jim Raykowski
AuthorDate: Thu Oct 1 21:52:45 2020 -0800
Commit: Caolán McNamara
CommitDate: Fri Oct 2 10:30:43 2020 +0200
CID#1467666 Unchecked return value (CHECKED_RETURN)
Change-Id: I99a730c2a6badbc7341b80464941cf2c30f028c0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103786
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sw/source/uibase/utlui/content.cxx
b/sw/source/uibase/utlui/content.cxx
index ba62299111fd..fc9d457a03c0 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -3229,8 +3229,8 @@ void SwContentTree::UpdateTracking()
// assure outline content type is expanded
// this assumes outline content type is first in treeview
std::unique_ptr
xFirstEntry(m_xTreeView->make_iterator());
-m_xTreeView->get_iter_first(*xFirstEntry);
-m_xTreeView->expand_row(*xFirstEntry);
+if (m_xTreeView->get_iter_first(*xFirstEntry))
+m_xTreeView->expand_row(*xFirstEntry);
m_xTreeView->all_foreach([this, nActPos](weld::TreeIter& rEntry){
bool bRet = false;
___
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/customize/CommandCategoryListBox.cxx |2 +-
cui/source/customize/cfg.cxx|2 +-
cui/source/dialogs/about.cxx|2 +-
cui/source/dialogs/cuicharmap.cxx | 12
cui/source/dialogs/insdlg.cxx |2 +-
cui/source/options/optaboutconfig.cxx |3 +--
cui/source/options/optasian.cxx |2 +-
cui/source/options/optgdlg.cxx |4 ++--
cui/source/options/optupdt.cxx |4 ++--
cui/source/tabpages/measure.cxx |8
cui/source/tabpages/numfmt.cxx |6 +++---
cui/source/tabpages/page.cxx|3 +--
cui/source/tabpages/textattr.cxx|8
cui/source/tabpages/tpgradnt.cxx|3 +--
cui/source/tabpages/tpline.cxx |3 +--
15 files changed, 28 insertions(+), 36 deletions(-)
New commits:
commit ab6dbb228a703fb289733d285e93415521bc5202
Author: Noel
AuthorDate: Fri Oct 2 09:35:37 2020 +0200
Commit: Noel Grandin
CommitDate: Fri Oct 2 10:27:52 2020 +0200
loplugin:reducevarscope in cui
Change-Id: Iedfda307d149fe2a5a196c83d3ea02b618e7dd23
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103809
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/cui/source/customize/CommandCategoryListBox.cxx
b/cui/source/customize/CommandCategoryListBox.cxx
index d9e3f57b1352..1337c3dd48dd 100644
--- a/cui/source/customize/CommandCategoryListBox.cxx
+++ b/cui/source/customize/CommandCategoryListBox.cxx
@@ -357,11 +357,11 @@ void
CommandCategoryListBox::categorySelected(CuiConfigFunctionListBox* pFunctio
const
css::uno::Sequence>
aChildNodes = rootNode->getChildNodes();
for ( auto const & childGroup : aChildNodes )
{
-OUString sUIName;
childGroup->acquire();
if ( childGroup->hasChildNodes() )
{
+OUString sUIName;
if ( childGroup->getName() == "user" )
{
sUIName = CuiResId( RID_SVXSTR_MYMACROS );
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 29f34e3f17a0..5418c4a9de7e 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -3090,7 +3090,6 @@ bool SvxIconSelectorDialog::ImportGraphic( const
OUString& aURL )
aMediaProps[0].Name = "URL";
uno::Reference< graphic::XGraphic > xGraphic;
-css::awt::Size aSize;
aMediaProps[0].Value <<= aURL;
try
{
@@ -3103,6 +3102,7 @@ bool SvxIconSelectorDialog::ImportGraphic( const
OUString& aURL )
if ( xGraphic.is() )
{
bool bOK = true;
+css::awt::Size aSize;
a >>= aSize;
if ( 0 == aSize.Width || 0 == aSize.Height )
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 558f54b3da0e..99729ee2f10d 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -71,8 +71,8 @@ AboutDialog::AboutDialog(weld::Window *pParent)
m_pVersionLabel->set_label(GetVersionString());
OUString sbuildId = GetBuildString();
- const long nMaxChar = 25;
if (IsStringValidGitHash(sbuildId)) {
+const long nMaxChar = 25;
m_pBuildLabel->set_uri("https://gerrit.libreoffice.org/gitweb?p=core.git;a=log;h=";
+ sbuildId);
m_pBuildLabel->set_label(sbuildId.getLength() > nMaxChar ?
sbuildId.replaceAt(
diff --git a/cui/source/dialogs/cuicharmap.cxx
b/cui/source/dialogs/cuicharmap.cxx
index 5042a2079210..28260d70cf4c 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -950,8 +950,6 @@ IMPL_LINK_NOARG(SvxCharacterMap, FavClickHdl,
SvxShowCharSet*, void)
IMPL_LINK_NOARG(SvxCharacterMap, CharHighlightHdl, SvxShowCharSet*, void)
{
OUString aText;
-OUString aHexText;
-OUString aDecimalText;
sal_UCS4 cChar = m_xShowSet->GetSelectCharacter();
bool bSelect = (cChar > 0);
@@ -961,9 +959,9 @@ IMPL_LINK_NOARG(SvxCharacterMap, CharHighlightHdl,
SvxShowCharSet*, void)
// using the new UCS4 constructor
aText = OUString( &cChar, 1 );
// Get the hexadecimal code
-aHexText = OUString::number(cChar, 16).toAsciiUpperCase();
+OUString aHexText = OUString::number(cChar, 16).toAsciiUpperCase();
// Get the decimal code
-aDecimalText = OUString::number(cChar);
+OUString aDecimalText = OUString::number(cChar);
setCharName(cChar);
// Update the hex and decimal codes only if necessary
@@ -991,8 +989,6 @@ IMPL_LINK_NOARG(SvxCharacterMap, CharHighlightHdl,
SvxShowCharSet*, void)
IMPL_LINK_NOARG(SvxCharacterMap, SearchCharHighlightHdl, SvxShowCharSet*, void)
{
OUString aText;
-OUSt
[Libreoffice-commits] core.git: bin/lint-ui.py chart2/uiconfig cui/uiconfig sc/uiconfig sd/uiconfig sw/uiconfig
bin/lint-ui.py | 11 +++
chart2/uiconfig/ui/tp_3D_SceneIllumination.ui |2 ++
cui/uiconfig/ui/additionsdialog.ui |1 +
cui/uiconfig/ui/menuassignpage.ui |2 ++
sc/uiconfig/scalc/ui/scenariodialog.ui |1 +
sd/uiconfig/sdraw/ui/copydlg.ui |2 ++
sd/uiconfig/simpress/ui/customanimationeffecttab.ui |1 +
sw/uiconfig/swriter/ui/optredlinepage.ui|4
sw/uiconfig/swriter/ui/watermarkdialog.ui |1 +
9 files changed, 25 insertions(+)
New commits:
commit 2e3afaebd027d0280b871c3515c4999b7912692a
Author: Noel
AuthorDate: Thu Oct 1 16:26:59 2020 +0200
Commit: Caolán McNamara
CommitDate: Fri Oct 2 10:17:40 2020 +0200
lint-ui.py check that GtkMenuButton has a label property
Change-Id: Ib1aa8ee050d2425387ddc1080f11f0ddfc2f9236
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103770
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/bin/lint-ui.py b/bin/lint-ui.py
index 7148838c1833..9530cb9ac7a8 100755
--- a/bin/lint-ui.py
+++ b/bin/lint-ui.py
@@ -68,6 +68,15 @@ def check_radio_buttons(root):
if len(radio_underlines) < 1:
lint_assert(False, "No use_underline in GtkRadioButton with id =
'" + radio.attrib['id'] + "'")
+def check_menu_buttons(root):
+buttons = [element for element in root.findall('.//object') if
element.attrib['class'] == "GtkMenuButton"]
+for button in buttons:
+labels = button.findall("./property[@name='label']")
+images = button.findall("./property[@name='image']")
+assert(len(labels) <= 1)
+if len(labels) < 1 and len(images) < 1:
+lint_assert(False, "No label in GtkMenuButton with id = '" +
button.attrib['id'] + "'")
+
def check_check_buttons(root):
radios = [element for element in root.findall('.//object') if
element.attrib['class'] == 'GtkCheckButton']
for radio in radios:
@@ -145,6 +154,8 @@ def main():
check_radio_buttons(root)
+check_menu_buttons(root)
+
check_check_buttons(root)
check_title_labels(root)
diff --git a/chart2/uiconfig/ui/tp_3D_SceneIllumination.ui
b/chart2/uiconfig/ui/tp_3D_SceneIllumination.ui
index 3f9564e7e33c..5c7091ff26ee 100644
--- a/chart2/uiconfig/ui/tp_3D_SceneIllumination.ui
+++ b/chart2/uiconfig/ui/tp_3D_SceneIllumination.ui
@@ -253,6 +253,7 @@
12
+
True
True
False
@@ -342,6 +343,7 @@
12
+
True
True
False
diff --git a/cui/uiconfig/ui/additionsdialog.ui
b/cui/uiconfig/ui/additionsdialog.ui
index 2d9ccc3fb318..3ce21025e5e8 100644
--- a/cui/uiconfig/ui/additionsdialog.ui
+++ b/cui/uiconfig/ui/additionsdialog.ui
@@ -194,6 +194,7 @@
+
True
True
True
diff --git a/cui/uiconfig/ui/menuassignpage.ui
b/cui/uiconfig/ui/menuassignpage.ui
index 7081489cfe3c..c7ba93e5253b 100644
--- a/cui/uiconfig/ui/menuassignpage.ui
+++ b/cui/uiconfig/ui/menuassignpage.ui
@@ -498,6 +498,7 @@
+
True
True
end
@@ -520,6 +521,7 @@
+
True
True
end
diff --git a/sc/uiconfig/scalc/ui/scenariodialog.ui
b/sc/uiconfig/scalc/ui/scenariodialog.ui
index 02f4e7d8ef4c..e2545950b4ab 100644
--- a/sc/uiconfig/scalc/ui/scenariodialog.ui
+++ b/sc/uiconfig/scalc/ui/scenariodialog.ui
@@ -302,6 +302,7 @@
+
True
True
False
diff --git a/sd/uiconfig/sdraw/ui/copydlg.ui b/sd/uiconfig/sdraw/ui/copydlg.ui
index ed202c2aa2e5..b7a710d423a6 100644
--- a/sd/uiconfig/sdraw/ui/copydlg.ui
+++ b/sd/uiconfig/sdraw/ui/copydlg.ui
@@ -489,6 +489,7 @@
+
True
True
False
@@ -511,6 +512,7 @@
+
True
True
False
diff --git a/sd/uiconfig/simpress/ui/customanimationeffecttab.ui
b/sd/uiconfig/simpr
[Libreoffice-commits] core.git: sc/qa
sc/qa/uitest/chart/chartLegend.py | 43 ++
1 file changed, 43 insertions(+)
New commits:
commit 61d9d1cf56994146d514fd5bf8c3f3f6885449ea
Author: Xisco Fauli
AuthorDate: Thu Oct 1 11:52:03 2020 +0200
Commit: Xisco Fauli
CommitDate: Fri Oct 2 09:53:33 2020 +0200
uitest: sc: test chart legends move with arrow keys
Change-Id: I9fb81be8de86408c6ee13495593636effbd1cc24
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103755
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/sc/qa/uitest/chart/chartLegend.py
b/sc/qa/uitest/chart/chartLegend.py
index 414a2de09227..7e2e085d135b 100644
--- a/sc/qa/uitest/chart/chartLegend.py
+++ b/sc/qa/uitest/chart/chartLegend.py
@@ -7,6 +7,7 @@
from uitest.framework import UITestCase
from uitest.uihelper.common import get_state_as_dict
from uitest.uihelper.common import select_pos
+from uitest.uihelper.common import change_measurement_unit
from uitest.uihelper.calc import enter_text_to_cell
from libreoffice.calc.document import get_cell_by_position
from libreoffice.uno.propertyvalue import mkPropertyValues
@@ -95,4 +96,46 @@ class chartLegend(UITestCase):
xOKBtn = xDialog.getChild("ok")
self.ui_test.close_dialog_through_button(xOKBtn)
self.ui_test.close_doc()
+
+ def test_legends_move_with_arrows_keys(self):
+
+calc_doc = self.ui_test.load_file(get_url_for_data_file("dataLabels.ods"))
+xCalcDoc = self.xUITest.getTopFocusWindow()
+gridwin = xCalcDoc.getChild("grid_window")
+
+change_measurement_unit(self, "Centimeter")
+
+gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT": "Object 1"}))
+gridwin.executeAction("ACTIVATE", tuple())
+xChartMainTop = self.xUITest.getTopFocusWindow()
+xChartMain = xChartMainTop.getChild("chart_window")
+
+# Select the legends
+xLegends = xChartMain.getChild("CID/D=0:Legend=")
+xLegends.executeAction("SELECT", tuple())
+
+self.ui_test.execute_dialog_through_action(xLegends, "COMMAND",
mkPropertyValues({"COMMAND": "TransformDialog"}))
+
+xDialog = self.xUITest.getTopFocusWindow()
+self.assertEqual("4.61",
get_state_as_dict(xDialog.getChild("MTR_FLD_POS_X"))['Value'])
+self.assertEqual("1.54",
get_state_as_dict(xDialog.getChild("MTR_FLD_POS_Y"))['Value'])
+
+xOkBtn = xDialog.getChild("ok")
+xOkBtn.executeAction("CLICK", tuple())
+
+xChartMain.executeAction("TYPE", mkPropertyValues({"KEYCODE": "UP"}))
+xChartMain.executeAction("TYPE", mkPropertyValues({"KEYCODE": "LEFT"}))
+
+self.ui_test.execute_dialog_through_action(xLegends, "COMMAND",
mkPropertyValues({"COMMAND": "TransformDialog"}))
+
+# Check the position has changed after moving the label using the arrows
keys
+xDialog = self.xUITest.getTopFocusWindow()
+self.assertEqual("4.51",
get_state_as_dict(xDialog.getChild("MTR_FLD_POS_X"))['Value'])
+self.assertEqual("1.44",
get_state_as_dict(xDialog.getChild("MTR_FLD_POS_Y"))['Value'])
+
+xOkBtn = xDialog.getChild("ok")
+xOkBtn.executeAction("CLICK", tuple())
+
+self.ui_test.close_doc()
+
# vim: set shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source
cui/source/options/treeopt.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a191dc755c7e529488ab1a172a208db2c16754d3 Author: andreas kainz AuthorDate: Fri Oct 2 08:15:36 2020 +0200 Commit: Andreas Kainz CommitDate: Fri Oct 2 09:47:51 2020 +0200 tdf#137032 make tools-> options sidebar wider Change-Id: I7f41cfe4458c50b4671b227f026bbdc2b0e33b93 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103808 Tested-by: Jenkins Reviewed-by: Andreas Kainz diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 209f5d3d9384..8ec8a0b3d252 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -490,7 +490,7 @@ void OfaTreeOptionsDialog::InitWidgets() aSize.setHeight((weld::GetMinimumEditHeight() + 6) * 14); #endif xTabBox->set_size_request(aSize.Width(), aSize.Height()); -xTreeLB->set_size_request(xTreeLB->get_approximate_digit_width() * 30, aSize.Height()); +xTreeLB->set_size_request(xTreeLB->get_approximate_digit_width() * 35, aSize.Height()); } // Ctor() with Frame - ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa
sc/qa/uitest/chart/chartDataLabels.py | 41 ++
1 file changed, 41 insertions(+)
New commits:
commit 647958099600923d9ba3a57101891f62de326f4b
Author: Xisco Fauli
AuthorDate: Wed Sep 30 19:37:23 2020 +0200
Commit: Xisco Fauli
CommitDate: Fri Oct 2 09:47:00 2020 +0200
tdf#136430, tdf#136573: sc: Add UItest
Change-Id: Ieeea326c567e6ea74340b094ec1e89276110c444
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103727
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/sc/qa/uitest/chart/chartDataLabels.py
b/sc/qa/uitest/chart/chartDataLabels.py
index 378670faec51..9db1cf454766 100644
--- a/sc/qa/uitest/chart/chartDataLabels.py
+++ b/sc/qa/uitest/chart/chartDataLabels.py
@@ -7,6 +7,7 @@
from uitest.framework import UITestCase
from uitest.uihelper.common import get_state_as_dict
from uitest.uihelper.common import select_pos
+from uitest.uihelper.common import change_measurement_unit
from uitest.uihelper.calc import enter_text_to_cell
from libreoffice.calc.document import get_cell_by_position
from libreoffice.uno.propertyvalue import mkPropertyValues
@@ -320,4 +321,44 @@ class chartDataLabels(UITestCase):
self.assertEqual(xDataSeries[0].NumberFormat, xFormat)
self.ui_test.close_doc()
+ def test_tdf136573(self):
+calc_doc = self.ui_test.load_file(get_url_for_data_file("dataLabels.ods"))
+xCalcDoc = self.xUITest.getTopFocusWindow()
+gridwin = xCalcDoc.getChild("grid_window")
+
+change_measurement_unit(self, "Centimeter")
+
+gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT": "Object 1"}))
+gridwin.executeAction("ACTIVATE", tuple())
+xChartMainTop = self.xUITest.getTopFocusWindow()
+xChartMain = xChartMainTop.getChild("chart_window")
+
+# Select the first label
+xDataLabel =
xChartMain.getChild("CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=0")
+xDataLabel.executeAction("SELECT", tuple())
+
+self.ui_test.execute_dialog_through_action(xDataLabel, "COMMAND",
mkPropertyValues({"COMMAND": "TransformDialog"}))
+
+xDialog = self.xUITest.getTopFocusWindow()
+self.assertEqual("0.43",
get_state_as_dict(xDialog.getChild("MTR_FLD_POS_X"))['Value'])
+self.assertEqual("2.84",
get_state_as_dict(xDialog.getChild("MTR_FLD_POS_Y"))['Value'])
+
+xCanBtn = xDialog.getChild("cancel")
+xCanBtn.executeAction("CLICK", tuple())
+
+xChartMain.executeAction("TYPE", mkPropertyValues({"KEYCODE": "UP"}))
+xChartMain.executeAction("TYPE", mkPropertyValues({"KEYCODE": "LEFT"}))
+
+self.ui_test.execute_dialog_through_action(xDataLabel, "COMMAND",
mkPropertyValues({"COMMAND": "TransformDialog"}))
+
+# Check the position has changed after moving the label using the arrows
keys
+xDialog = self.xUITest.getTopFocusWindow()
+self.assertEqual("0.33",
get_state_as_dict(xDialog.getChild("MTR_FLD_POS_X"))['Value'])
+self.assertEqual("2.74",
get_state_as_dict(xDialog.getChild("MTR_FLD_POS_Y"))['Value'])
+
+xCanBtn = xDialog.getChild("ok")
+xCanBtn.executeAction("CLICK", tuple())
+
+self.ui_test.close_doc()
+
# vim: set shiftwidth=4 softtabstop=4 expandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/doc.hxx |2 +-
sw/source/core/doc/doc.cxx | 14 +++---
sw/source/uibase/app/docsh2.cxx |2 +-
3 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit 344ae518165cbe49b11a518212b8470a18d4d09d
Author: Caolán McNamara
AuthorDate: Thu Oct 1 20:46:14 2020 +0100
Commit: Caolán McNamara
CommitDate: Fri Oct 2 09:43:29 2020 +0200
SwDoc::Summary never called with null pExtDoc arg
Change-Id: I492e83716b84f7ad9a5e918594df42a5aec65841
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103779
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 3253ad0c118e..6d2d785dc655 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -650,7 +650,7 @@ public:
// Glossary Document
bool IsInsOnlyTextGlossary() const { return mbInsOnlyTextGlssry; }
-void Summary( SwDoc* pExtDoc, sal_uInt8 nLevel, sal_uInt8 nPara, bool
bImpress );
+void Summary(SwDoc& rExtDoc, sal_uInt8 nLevel, sal_uInt8 nPara, bool
bImpress);
void ChangeAuthorityData(const SwAuthEntry* pNewData);
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index b78cbe662ef6..a346a4c3148a 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -1219,14 +1219,14 @@ const SwFormatINetFormat* SwDoc::FindINetAttr( const
OUString& rName ) const
return nullptr;
}
-void SwDoc::Summary( SwDoc* pExtDoc, sal_uInt8 nLevel, sal_uInt8 nPara, bool
bImpress )
+void SwDoc::Summary(SwDoc& rExtDoc, sal_uInt8 nLevel, sal_uInt8 nPara, bool
bImpress)
{
const SwOutlineNodes& rOutNds = GetNodes().GetOutLineNds();
-if( !pExtDoc || rOutNds.empty() )
+if (rOutNds.empty())
return;
::StartProgress( STR_STATSTR_SUMMARY, 0, rOutNds.size(), GetDocShell() );
-SwNodeIndex aEndOfDoc( pExtDoc->GetNodes().GetEndOfContent(), -1 );
+SwNodeIndex aEndOfDoc( rExtDoc.GetNodes().GetEndOfContent(), -1 );
for( SwOutlineNodes::size_type i = 0; i < rOutNds.size(); ++i )
{
::SetProgressState( static_cast(i), GetDocShell() );
@@ -1253,10 +1253,10 @@ void SwDoc::Summary( SwDoc* pExtDoc, sal_uInt8 nLevel,
sal_uInt8 nPara, bool bIm
SwNodeRange aRange( *rOutNds[ i ], 0, *rOutNds[ i ], nEndOfs );
GetNodes().Copy_( aRange, aEndOfDoc );
}
-const SwTextFormatColls *pColl = pExtDoc->GetTextFormatColls();
+const SwTextFormatColls *pColl = rExtDoc.GetTextFormatColls();
for( SwTextFormatColls::size_type i = 0; i < pColl->size(); ++i )
(*pColl)[ i ]->ResetFormatAttr( RES_PAGEDESC, RES_BREAK );
-SwNodeIndex aIndx( pExtDoc->GetNodes().GetEndOfExtras() );
+SwNodeIndex aIndx( rExtDoc.GetNodes().GetEndOfExtras() );
++aEndOfDoc;
while( aIndx < aEndOfDoc )
{
@@ -1275,14 +1275,14 @@ void SwDoc::Summary( SwDoc* pExtDoc, sal_uInt8 nLevel,
sal_uInt8 nPara, bool bIm
!pMyColl->IsAssignedToListLevelOfOutlineStyle()
? RES_POOLCOLL_HEADLINE2
: RES_POOLCOLL_HEADLINE1 );
-pMyColl =
pExtDoc->getIDocumentStylePoolAccess().GetTextCollFromPool( nHeadLine );
+pMyColl =
rExtDoc.getIDocumentStylePoolAccess().GetTextCollFromPool( nHeadLine );
pNd->ChgFormatColl( pMyColl );
}
if( !pNd->Len() &&
pNd->StartOfSectionIndex()+2 < pNd->EndOfSectionIndex() )
{
bDelete = true;
-pExtDoc->GetNodes().Delete( aIndx );
+rExtDoc.GetNodes().Delete( aIndx );
}
}
if( !bDelete )
diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx
index 13c15a461832..fbabf863490d 100644
--- a/sw/source/uibase/app/docsh2.cxx
+++ b/sw/source/uibase/app/docsh2.cxx
@@ -756,7 +756,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
xDocSh->DoInitNew();
bool bImpress = FN_ABSTRACT_STARIMPRESS == nWhich;
-m_xDoc->Summary( pSmryDoc, nLevel, nPara, bImpress );
+m_xDoc->Summary(*pSmryDoc, nLevel, nPara, bImpress);
if( bImpress )
{
WriterRef xWrt;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: compilerplugins/clang sw/source
compilerplugins/clang/unusedmethods.results | 12
sw/source/uibase/inc/numfmtlb.hxx |7 ---
2 files changed, 19 deletions(-)
New commits:
commit 59b3a0413a742f86078da4772b2a5f4cc83e9e3c
Author: Caolán McNamara
AuthorDate: Thu Oct 1 20:41:35 2020 +0100
Commit: Caolán McNamara
CommitDate: Fri Oct 2 09:43:06 2020 +0200
drop these unused inlines
Change-Id: I566be7eaf2ee73d3dac8c137ba783eea960cb586
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103778
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/compilerplugins/clang/unusedmethods.results
b/compilerplugins/clang/unusedmethods.results
index a87d0d4ebaaf..79339f02f1d4 100644
--- a/compilerplugins/clang/unusedmethods.results
+++ b/compilerplugins/clang/unusedmethods.results
@@ -1530,18 +1530,6 @@ sw/source/core/text/txtpaint.hxx:78
DbgRect::DbgRect(class OutputDevice *,const class tools::Rectangle
&,const _Bool,class Color)
sw/source/filter/ww8/docxsdrexport.hxx:73
class sax_fastparser::FastAttributeList *
DocxSdrExport::getFlyWrapAttrList()
-sw/source/uibase/inc/numfmtlb.hxx:130
-_Bool SwNumFormatTreeView::get_value_changed_from_saved() const
-sw/source/uibase/inc/numfmtlb.hxx:131
-void SwNumFormatTreeView::save_value()
-sw/source/uibase/inc/numfmtlb.hxx:132
-void SwNumFormatTreeView::show()
-sw/source/uibase/inc/numfmtlb.hxx:133
-void SwNumFormatTreeView::hide()
-sw/source/uibase/inc/numfmtlb.hxx:139
-void SwNumFormatTreeView::set_sensitive(_Bool)
-sw/source/uibase/inc/numfmtlb.hxx:140
-void SwNumFormatTreeView::connect_changed(const class Link &)
sw/source/uibase/inc/swcont.hxx:85
_Bool SwContent::operator==(const class SwContent &) const
test/source/sheet/xsubtotalfield.cxx:28
diff --git a/sw/source/uibase/inc/numfmtlb.hxx
b/sw/source/uibase/inc/numfmtlb.hxx
index 1fedd19c1157..a5776659130a 100644
--- a/sw/source/uibase/inc/numfmtlb.hxx
+++ b/sw/source/uibase/inc/numfmtlb.hxx
@@ -127,17 +127,10 @@ public:
virtual void set_id(int nPos, const OUString& rId) override {
mxControl->set_id(nPos, rId); }
OUStringget_selected_text() const { return
mxControl->get_selected_text(); }
boolget_visible() const { return mxControl->get_visible(); }
-boolget_value_changed_from_saved() const { return
mxControl->get_value_changed_from_saved(); }
-voidsave_value() { return mxControl->save_value(); }
-voidshow() { mxControl->show(); }
-voidhide() { mxControl->hide(); }
int get_selected_index() const { return
mxControl->get_selected_index(); }
voidset_visible(bool bVisible) {
mxControl->set_visible(bVisible); }
voidselect(int nPos) { mxControl->select(nPos); }
voidconnect_row_activated(const Link&
rLink) { mxControl->connect_row_activated(rLink); }
-
-voidset_sensitive(bool bSensitive) {
mxControl->set_sensitive(bSensitive); }
-voidconnect_changed(const Link& rLink)
{ mxControl->connect_changed(rLink); }
};
#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: A "normal" client interface.
Hi Stef, On Thu, Oct 01, 2020 at 03:50:01PM +0200, Stef Bon wrote: > is there a "normal" client when connecting to a libreoffice server. > (I assume that libreoffice can work as a server). > I know there are several webclients like nextcloud and owncloud. > Is it for example possible to use the normal libreoffice program and > connect to a server > to open and edit a document? I guess the hard part of this is that nextcloud and others don't actually have access to the document, just tiles of it, i.e. bitmaps. This architecture has benefits like "your documents never leave the server" and also that there are ~no edit conflicts, but has costs like very hard integration with an existing running server. Regards, Miklos ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
ESC meeting minutes: 2020-10-01
* Present: + Stephan B, Cloph, Eike, Caolan, Gabriel, Florian, Michael W, Heiko, Ilmari, Thorsten, Olivier, Guilhem, Sophie, Mike K, Michael M, Michael S, Miklos, Xisco, Jan-Marek, Stephan F, Paolo, Daniel * Completed Action Items: + set up 1 Android CI builder and see the build turn-around time (Cloph) + jenkins builder is up, and rotates between the 4 architectures + 90 mins is the full build, 10 mins is the cached build + still gathering data * Pending Action Items: + None * Release Engineering update (Cloph) + 7.0 status + 7.0.2 rc2 was tagged yesterday, builds are in progress + 6.4 status + 6.4.7 rc2 will be tagged next week + Remotes + Android viewer * Online move (Michael M) + hopes that this is the least bad move for TDF + will have questions section at the end, is that OK? * FYI: LO now runs native on Windows ARM64 (Jan-Marek) + cross-builds on Windows x64, starts in QEMU (very slow) + can TDF provide a TB, so it won’t break again? + offer experimental installer for 7.1? + https://bugs.documentfoundation.org/show_bug.cgi?id=137143 + a side-project, but working nicely + AWS has ARM64 workers (Michael M) + if testing the cross-compilation, that can be tested on normal build infra (Cloph) + just need to install the arm64 tools in VS, and it should just work (JMux) + could even produce an installer + should we have a designed windows builder where the SDK is installed? (Thorsten) + if it’s a std part of VS, would just install it everywhere (Cloph) + a distro-config would be ideal (Thorsten) + highly preferred :-) (Cloph) + have a local commit with full configuration to please java cross-compile (JMux) + other than java, no special switches + .NET and gpg is still disabled * Documentation (Olivier) + New Help + Minor fixes in CSS (buovjaga) + Helpcontent2 + Updates, fixes, typos, maintenance (S. Chaiklin, S. Horacek, LibreOfficiant, ohallot, Jhonny_M, Travis) + Google Seasons of Doc 2020 + Progress in Calc wiki pages + Progress in Calc e-learning + Guides + Work on going. * UX Update (Heiko) + Bugzilla (topicUI) statistics 249(249) (topicUI) bugs open, 263(263) (needsUXEval) needs to be evaluated by the UXteam + Updates: BZ changes 1 week 1 month 3 months 12 months added 11(-2) 33(-3) 66(0) 173(-5) commented 109(-30) 404(3)1049(5)3789(-11) removed 2(-1) 8(2) 12(0) 58(0) resolved 17(-5) 58(9) 115(7) 413(9) + top 10 contributors: Heiko Tietze made 316 changes in 1 month, and 2198 changes in 1 year Telesto made 108 changes in 1 month, and 553 changes in 1 year BogdanB made 88 changes in 1 month, and 177 changes in 1 year Foote, V Stuart made 77 changes in 1 month, and 627 changes in 1 year Kainz, Andreas made 59 changes in 1 month, and 481 changes in 1 year Dieter Praas made 50 changes in 1 month, and 502 changes in 1 year Roman Kuznetsov made 42 changes in 1 month, and 268 changes in 1 year Thomas Lendo made 31 changes in 1 month, and 140 changes in 1 year *UNKNOWN* made 24 changes in 1 month, and 66 changes in 1 year Timur made 23 changes in 1 month, and 251 changes in 1 year * New tickets with needsUXEval Sep/25-Oct/01 + 26 new tickets + meeting about the sidebar (one initial width for all decks, ability to reduce a deck width up to the content, remove the minimized state) * Crash testing (Caolan) + 275(+271) import failure, 0(+0) export failures + https://gerrit.libreoffice.org/c/core/+/103768 + 0 coverity issues + 10 ossfuzz issues + lots of cmap fixes * Crash Reporting (Xisco) + https://crashreport.libreoffice.org/stats/version/6.4.5.2 + (+26) 1630 1604 1618 1744 1814 2208 2552 2315 1761 1162 0 + https://crashreport.libreoffice.org/stats/version/6.4.6.2 + (+110) 1674 1564 1306 1053 874 0 + https://crashreport.libreoffice.org/stats/version/7.0.0.3 + (+29) 3981 3952 4171 5084 6489 3840 788 0 + https://crashreport.libreoffice.org/stats/version/7.0.1.2 + (+1132) 5694 4561 3223 1986 0 - https://crashreport.libreoffice.org/stats/signature/sw::util::GetPoolItems(SfxItemSet%20const%20&,std::map%3Cunsigned%20short,SfxPoolItem%20const%20*,sw::util::ItemSort,std::allocator%3Cstd::pair%3Cunsigned%20short%20const%20,SfxPoolItem%20const%20*%3E%20%3E%20%3E%20&,bool) + not looking that bad, but quite some reports * Mentoring/easyhack update committer... 1 week 1 month3 months 12 months open 95(16) 140(17)141(15) 150(15) reviews 586(158) 1912(30) 4618(142)19650(70)
[Libreoffice-commits] core.git: configmgr/source
configmgr/source/configmgr.component |3 ++-
configmgr/source/defaultprovider.cxx |2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit b4ddb579eeafbcf0fd7edd346401b31d00c0aa7b
Author: Stephan Bergmann
AuthorDate: Fri Oct 2 08:10:46 2020 +0200
Commit: Stephan Bergmann
CommitDate: Fri Oct 2 09:09:00 2020 +0200
Use the new single-instance="true" attribute in configmgr
Change-Id: Ib5873aedd5c49dd2f8c099190e78de9b85fcd53a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103787
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/configmgr/source/configmgr.component
b/configmgr/source/configmgr.component
index c8b0c4f01260..ff46b6070393 100644
--- a/configmgr/source/configmgr.component
+++ b/configmgr/source/configmgr.component
@@ -28,7 +28,8 @@
+
constructor="com_sun_star_comp_configuration_DefaultProvider_get_implementation"
+single-instance="true">
diff --git a/configmgr/source/defaultprovider.cxx
b/configmgr/source/defaultprovider.cxx
index 4cc7a24d0c93..131f548a039e 100644
--- a/configmgr/source/defaultprovider.cxx
+++ b/configmgr/source/defaultprovider.cxx
@@ -34,7 +34,7 @@
com_sun_star_comp_configuration_DefaultProvider_get_implementation(
css::uno::XComponentContext* context, css::uno::Sequence
const&)
{
osl::MutexGuard guard(*configmgr::lock());
-static css::uno::Reference< css::uno::XInterface > singleton(
+css::uno::Reference< css::uno::XInterface > singleton(
configmgr::configuration_provider::createDefault(context));
singleton->acquire();
return singleton.get();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl vcl/qa vcl/source
include/vcl/filter/PDFiumLibrary.hxx |8
vcl/qa/cppunit/pdfexport/pdfexport.cxx | 437 -
vcl/source/pdf/PDFiumLibrary.cxx | 15 -
3 files changed, 241 insertions(+), 219 deletions(-)
New commits:
commit 5d20075e23c0aeea012576ae0ca72b41744b5007
Author: Miklos Vajna
AuthorDate: Thu Oct 1 21:05:58 2020 +0200
Commit: Miklos Vajna
CommitDate: Fri Oct 2 09:05:18 2020 +0200
vcl: add more PDFiumTextPage and PDFiumPage wrappers
And use it in vcl/CppunitTest_vcl_pdfexport, instead of the upstream
scopers, to standardize on a single set of pdfium wrappers.
Change-Id: Id9730697afdb2a40806892a7de347e276a12e25e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103776
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/include/vcl/filter/PDFiumLibrary.hxx
b/include/vcl/filter/PDFiumLibrary.hxx
index 8a8aae569e22..bc3314fa56f6 100644
--- a/include/vcl/filter/PDFiumLibrary.hxx
+++ b/include/vcl/filter/PDFiumLibrary.hxx
@@ -139,6 +139,9 @@ public:
~PDFiumTextPage();
FPDF_TEXTPAGE getPointer() { return mpTextPage; }
+
+int countChars();
+unsigned int getUnicode(int index);
};
class VCL_DLLPUBLIC PDFiumPage final
@@ -176,6 +179,9 @@ public:
/// Get bitmap checksum of the page, without annotations/commenting.
BitmapChecksum getChecksum();
+
+double getWidth();
+double getHeight();
};
class VCL_DLLPUBLIC PDFiumDocument final
@@ -196,6 +202,8 @@ public:
int getPageCount();
std::unique_ptr openPage(int nIndex);
+
+FPDF_DOCUMENT getPointer() { return mpPdfDocument; }
};
struct PDFiumLibrary final : public
rtl::StaticWithInit, PDFiumLibrary>
diff --git a/vcl/qa/cppunit/pdfexport/pdfexport.cxx
b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
index 94d583a0c52f..64552fed9825 100644
--- a/vcl/qa/cppunit/pdfexport/pdfexport.cxx
+++ b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
@@ -39,8 +39,8 @@
#include
#include
#include
+#include
#include
-#include
#include
#include
#include
@@ -68,7 +68,7 @@ class PdfExportTest : public test::BootstrapFixture, public
unotest::MacrosTest
utl::TempFile maTempFile;
SvMemoryStream maMemory;
// Export the document as PDF, then parse it with PDFium.
-ScopedFPDFDocument exportAndParse(const OUString& rURL, const
utl::MediaDescriptor& rDescriptor);
+std::unique_ptr exportAndParse(const OUString&
rURL, const utl::MediaDescriptor& rDescriptor);
std::shared_ptr mpPDFium;
public:
@@ -186,7 +186,7 @@ PdfExportTest::PdfExportTest()
maTempFile.EnableKillingFile();
}
-ScopedFPDFDocument PdfExportTest::exportAndParse(const OUString& rURL, const
utl::MediaDescriptor& rDescriptor)
+std::unique_ptr PdfExportTest::exportAndParse(const
OUString& rURL, const utl::MediaDescriptor& rDescriptor)
{
// Import the bugdoc and export as PDF.
mxComponent = loadFromDesktop(rURL);
@@ -198,8 +198,9 @@ ScopedFPDFDocument PdfExportTest::exportAndParse(const
OUString& rURL, const utl
// Parse the export result with pdfium.
SvFileStream aFile(maTempFile.GetURL(), StreamMode::READ);
maMemory.WriteStream(aFile);
-ScopedFPDFDocument pPdfDocument(
-FPDF_LoadMemDocument(maMemory.GetData(), maMemory.GetSize(),
/*password=*/nullptr));
+std::shared_ptr pPDFium = vcl::pdf::PDFiumLibrary::get();
+std::unique_ptr pPdfDocument
+= pPDFium->openDocument(maMemory.GetData(), maMemory.GetSize());
CPPUNIT_ASSERT(pPdfDocument);
return pPdfDocument;
}
@@ -339,26 +340,26 @@ void PdfExportTest::testTdf105461()
SvFileStream aFile(maTempFile.GetURL(), StreamMode::READ);
SvMemoryStream aMemory;
aMemory.WriteStream(aFile);
-ScopedFPDFDocument pPdfDocument(FPDF_LoadMemDocument(aMemory.GetData(),
aMemory.GetSize(), /*password=*/nullptr));
+std::shared_ptr pPDFium = vcl::pdf::PDFiumLibrary::get();
+std::unique_ptr pPdfDocument
+= pPDFium->openDocument(aMemory.GetData(), aMemory.GetSize());
CPPUNIT_ASSERT(pPdfDocument);
// The document has one page.
-CPPUNIT_ASSERT_EQUAL(1, FPDF_GetPageCount(pPdfDocument.get()));
-ScopedFPDFPage pPdfPage(FPDF_LoadPage(pPdfDocument.get(),
/*page_index=*/0));
+CPPUNIT_ASSERT_EQUAL(1, pPdfDocument->getPageCount());
+std::unique_ptr pPdfPage =
pPdfDocument->openPage(/*nIndex=*/0);
CPPUNIT_ASSERT(pPdfPage);
// Make sure there is a filled rectangle inside.
-int nPageObjectCount = FPDFPage_CountObjects(pPdfPage.get());
+int nPageObjectCount = pPdfPage->getObjectCount();
int nYellowPathCount = 0;
for (int i = 0; i < nPageObjectCount; ++i)
{
-FPDF_PAGEOBJECT pPdfPageObject = FPDFPage_GetObject(pPdfPage.get(), i);
-if (FPDFPageObj_GetType(pPdfPageObject) != FPDF_PAGEOBJ_PATH)
+std::unique_ptr pPdfPageObject =
pPdfPage->getObject(i);
+if (pPdfPageObject->getType() != FPDF_PAGEOBJ_PATH)
continue;
-unsig
