[Libreoffice-commits] core.git: connectivity/qa connectivity/source
connectivity/qa/connectivity/commontools/FValue_test.cxx |4 +-
connectivity/qa/connectivity/mork/DriverTest.cxx |4 +-
connectivity/source/commontools/paramwrapper.cxx |6 +--
connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx |5 ---
connectivity/source/drivers/evoab2/NResultSet.cxx |4 +-
connectivity/source/drivers/evoab2/NStatement.cxx |4 +-
connectivity/source/drivers/file/FStatement.cxx|8 +
connectivity/source/drivers/firebird/Driver.cxx| 12
+--
connectivity/source/drivers/hsqldb/HConnection.cxx |4 +-
connectivity/source/drivers/hsqldb/HStorageMap.cxx | 10
+-
connectivity/source/drivers/hsqldb/HTools.cxx |4 +-
connectivity/source/drivers/hsqldb/HView.cxx |4 +-
connectivity/source/drivers/jdbc/ConnectionLog.cxx |8 ++---
connectivity/source/drivers/jdbc/ContextClassLoader.cxx|4 +-
connectivity/source/drivers/mork/MConnection.cxx |4 +-
connectivity/source/drivers/mork/MDatabaseMetaData.cxx |5 ---
connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx |5 ---
connectivity/source/drivers/mysql_jdbc/YTable.cxx |5 ---
connectivity/source/drivers/mysqlc/mysqlc_driver.cxx |5 ---
connectivity/source/drivers/odbc/ORealDriver.cxx |5 ---
connectivity/source/drivers/writer/WCatalog.cxx|5 ---
connectivity/source/drivers/writer/WConnection.cxx |5 ---
connectivity/source/drivers/writer/WDatabaseMetaData.cxx |5 ---
connectivity/source/drivers/writer/WDriver.cxx |5 ---
connectivity/source/drivers/writer/WTable.cxx | 16
+-
connectivity/source/drivers/writer/WTables.cxx |5 ---
connectivity/source/sdbcx/VDescriptor.cxx |5 ---
27 files changed, 45 insertions(+), 111 deletions(-)
New commits:
commit b43f64f430bc19c07f6b5d457a9168de5fb9de69
Author: Noel Grandin
AuthorDate: Wed Jan 15 08:45:55 2020 +0200
Commit: Noel Grandin
CommitDate: Wed Jan 15 08:43:46 2020 +0100
clang-tidy modernize-concat-nested-namespace in connectivity
Change-Id: Id18966cc44c012730a872ebfa93f2b468cefff38
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86823
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/connectivity/qa/connectivity/commontools/FValue_test.cxx
b/connectivity/qa/connectivity/commontools/FValue_test.cxx
index 036fbbc3ca5f..b6f0e36588ad 100644
--- a/connectivity/qa/connectivity/commontools/FValue_test.cxx
+++ b/connectivity/qa/connectivity/commontools/FValue_test.cxx
@@ -24,7 +24,7 @@
using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::uno;
-namespace connectivity { namespace commontools {
+namespace connectivity::commontools {
class FValueTest: public test::BootstrapFixture
{
@@ -359,7 +359,7 @@ void FValueTest::test_bool_creation()
CPPUNIT_TEST_SUITE_REGISTRATION(FValueTest);
-}}
+}
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/connectivity/qa/connectivity/mork/DriverTest.cxx
b/connectivity/qa/connectivity/mork/DriverTest.cxx
index 1ce3b981a238..e2f28494 100644
--- a/connectivity/qa/connectivity/mork/DriverTest.cxx
+++ b/connectivity/qa/connectivity/mork/DriverTest.cxx
@@ -16,7 +16,7 @@ using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::uno;
-namespace connectivity { namespace mork {
+namespace connectivity::mork {
class MorkDriverTest: public test::BootstrapFixture
@@ -194,6 +194,6 @@ void MorkDriverTest::test_select_list_table_joe_doe_5()
CPPUNIT_TEST_SUITE_REGISTRATION(MorkDriverTest);
-}}
+}
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/connectivity/source/commontools/paramwrapper.cxx
b/connectivity/source/commontools/paramwrapper.cxx
index 92c78e319276..e56cf9e24f01 100644
--- a/connectivity/source/commontools/paramwrapper.cxx
+++ b/connectivity/source/commontools/paramwrapper.cxx
@@ -33,9 +33,7 @@
#define PROPERTY_ID_VALUE 1000
-namespace dbtools
-{
-namespace param
+namespace dbtools::param
{
@@ -349,7 +347,7 @@ namespace param
}
-} } // namespace dbtools::param
+} // namespace dbtools::param
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
index 85673db40afe..6045b0f3123c 100644
--- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
@@ -44,9 +44,7 @@ namespace
}
}
-namespace connectivity
-{
-namespace evoab
+namespace conne
[Libreoffice-commits] core.git: cppuhelper/source unotools/source
cppuhelper/source/interfacecontainer.cxx |2 +-
unotools/source/misc/eventlisteneradapter.cxx |3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 3a0c4574449fc2313306c4e0e39bb7416cc20657
Author: Noel Grandin
AuthorDate: Wed Jan 15 08:42:05 2020 +0200
Commit: Noel Grandin
CommitDate: Wed Jan 15 08:27:52 2020 +0100
convert OSL_ASSERT to assert
and fix the one place triggering it
Change-Id: I87ec57c6a92ed89fdacfcb0d650525eaeaa266b9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86822
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/cppuhelper/source/interfacecontainer.cxx
b/cppuhelper/source/interfacecontainer.cxx
index 7b97c315343d..eac0683329bb 100644
--- a/cppuhelper/source/interfacecontainer.cxx
+++ b/cppuhelper/source/interfacecontainer.cxx
@@ -221,7 +221,7 @@ sal_Int32 OInterfaceContainerHelper::addInterface( const
Reference &
sal_Int32 OInterfaceContainerHelper::removeInterface( const
Reference & rListener )
{
-OSL_ASSERT( rListener.is() );
+assert( rListener.is() );
MutexGuard aGuard( rMutex );
if( bInUse )
copyAndResetInUse();
diff --git a/unotools/source/misc/eventlisteneradapter.cxx
b/unotools/source/misc/eventlisteneradapter.cxx
index c9f6b6f73ee9..d9736905de81 100644
--- a/unotools/source/misc/eventlisteneradapter.cxx
+++ b/unotools/source/misc/eventlisteneradapter.cxx
@@ -74,7 +74,8 @@ namespace utl
{
if (m_xComponent.is())
{
-m_xComponent->removeEventListener(m_xKeepMeAlive);
+if (m_xKeepMeAlive.is())
+m_xComponent->removeEventListener(m_xKeepMeAlive);
m_xComponent.clear();
m_xKeepMeAlive.clear();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sal/osl
sal/osl/unx/readwrite_helper.cxx | 34 ++
sal/osl/unx/readwrite_helper.hxx |8 +---
2 files changed, 27 insertions(+), 15 deletions(-)
New commits:
commit aaa4c83768aee2b78182c1c40b6bdf810773
Author: Stephan Bergmann
AuthorDate: Tue Jan 14 19:55:56 2020 +0100
Commit: Stephan Bergmann
CommitDate: Wed Jan 15 08:15:35 2020 +0100
Clean up safeRead/Write
...using more appropriate parameter types, replacing cheesy OSL_ASSERT
overflow
checks with cap_ssize_t, and replacing one remaining good OSL_ASSERT in
safeWrite with assert.
Change-Id: I6105ba5135216333e68003458be7ca28f1715a51
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86807
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/sal/osl/unx/readwrite_helper.cxx b/sal/osl/unx/readwrite_helper.cxx
index c920f339aa61..49c44c2c097b 100644
--- a/sal/osl/unx/readwrite_helper.cxx
+++ b/sal/osl/unx/readwrite_helper.cxx
@@ -7,20 +7,32 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+#include
+
+#include
+#include
+#include
+#include
+
#include "readwrite_helper.hxx"
-#include
#include "system.hxx"
-bool safeWrite(int fd, void* data, sal_uInt32 dataSize)
+namespace {
+
+std::size_t cap_ssize_t(std::size_t value) {
+return std::min(value, std::size_t(std::numeric_limits::max()));
+}
+
+}
+
+bool safeWrite(int fd, void* data, std::size_t dataSize)
{
-sal_Int32 nToWrite = dataSize;
+auto nToWrite = dataSize;
unsigned char* dataToWrite = static_cast(data);
-// Check for overflow as we convert a signed to an unsigned.
-OSL_ASSERT(dataSize == static_cast(nToWrite));
while ( nToWrite ) {
-sal_Int32 nWritten = write(fd, dataToWrite, nToWrite);
+auto nWritten = write(fd, dataToWrite, cap_ssize_t(nToWrite));
if ( nWritten < 0 ) {
if ( errno == EINTR )
continue;
@@ -29,7 +41,7 @@ bool safeWrite(int fd, void* data, sal_uInt32 dataSize)
}
-OSL_ASSERT(nWritten > 0);
+assert(nWritten > 0);
nToWrite -= nWritten;
dataToWrite += nWritten;
}
@@ -37,15 +49,13 @@ bool safeWrite(int fd, void* data, sal_uInt32 dataSize)
return true;
}
-bool safeRead( int fd, void* buffer, sal_uInt32 count )
+bool safeRead( int fd, void* buffer, std::size_t count )
{
-sal_Int32 nToRead = count;
+auto nToRead = count;
unsigned char* bufferForReading = static_cast(buffer);
-// Check for overflow as we convert a signed to an unsigned.
-OSL_ASSERT(count == static_cast(nToRead));
while ( nToRead ) {
-sal_Int32 nRead = read(fd, bufferForReading, nToRead);
+auto nRead = read(fd, bufferForReading, cap_ssize_t(nToRead));
if ( nRead < 0 ) {
// We were interrupted before reading, retry.
if (errno == EINTR)
diff --git a/sal/osl/unx/readwrite_helper.hxx b/sal/osl/unx/readwrite_helper.hxx
index 9ffebe5c112d..d73ce56457cb 100644
--- a/sal/osl/unx/readwrite_helper.hxx
+++ b/sal/osl/unx/readwrite_helper.hxx
@@ -10,14 +10,16 @@
#ifndef INCLUDED_SAL_OSL_UNX_READWRITE_HELPER_HXX
#define INCLUDED_SAL_OSL_UNX_READWRITE_HELPER_HXX
-#include
+#include
-bool safeWrite( int fd, void* data, sal_uInt32 dataSize );
+#include
+
+bool safeWrite( int fd, void* data, std::size_t dataSize );
// This function *will* read |count| bytes from |fd|, busy looping
// if needed. Don't use it when you don't know if you can request enough
// data. It will return sal_False for any partial transfer or error.
-bool safeRead( int fd, void* buffer, sal_uInt32 count );
+bool safeRead( int fd, void* buffer, std::size_t count );
#endif
___
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/uielement/toolbarmodemenucontroller.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit aaad28f8873e8ffa92f4e1340707f45b2737f20e Author: Roman Kuznetsov AuthorDate: Sat Jan 11 20:03:15 2020 +0100 Commit: Roman Kuznetsov CommitDate: Wed Jan 15 07:28:00 2020 +0100 tdf#125089 Fix shoowing a separator in View-User interfaces submenus for non EN GUI Change-Id: I8761560e48f781ed516494984fc5a86c72019ad0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86619 Reviewed-by: Mike Kaganski Tested-by: Mike Kaganski Reviewed-by: Roman Kuznetsov diff --git a/framework/source/uielement/toolbarmodemenucontroller.cxx b/framework/source/uielement/toolbarmodemenucontroller.cxx index 218f50c7e7a3..15596a091335 100644 --- a/framework/source/uielement/toolbarmodemenucontroller.cxx +++ b/framework/source/uielement/toolbarmodemenucontroller.cxx @@ -130,11 +130,12 @@ void ToolbarModeMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu > OUString aCommandArg = comphelper::getString( aModeNode.getNodeValue( "CommandArg" ) ); long nPosition = comphelper::getINT32( aModeNode.getNodeValue( "MenuPosition" ) ); bool isExperimental = comphelper::getBOOL( aModeNode.getNodeValue( "IsExperimental" ) ); +bool hasNotebookbar = comphelper::getBOOL( aModeNode.getNodeValue( "HasNotebookbar" ) ); // Allow Notebookbar only in experimental mode if ( isExperimental && !aMiscOptions.IsExperimentalMode() ) continue; -if(aLabel == "Sidebar" || aLabel == "Standard Toolbar" || aLabel == "Single Toolbar") +if (!hasNotebookbar) nCountToolbar++; m_xPopupMenu->insertItem( nReadIndex+1, aLabel, css::awt::MenuItemStyle::RADIOCHECK, nPosition ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/qa sd/source
sd/qa/unit/import-tests.cxx |4 ++-- sd/source/core/annotations/Annotation.cxx |2 +- sd/source/core/drawdoc.cxx |4 ++-- sd/source/core/drawdoc4.cxx |2 +- sd/source/core/text/textapi.cxx |2 +- sd/source/core/undoanim.cxx |2 +- sd/source/filter/eppt/pptx-animations.cxx |5 + sd/source/filter/eppt/pptx-epptooxml.cxx |5 + sd/source/ui/animations/SlideTransitionPane.cxx |5 + sd/source/ui/framework/configuration/ChangeRequestQueue.cxx |4 ++-- sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx |4 ++-- sd/source/ui/framework/configuration/Configuration.cxx |4 ++-- sd/source/ui/framework/configuration/ConfigurationClassifier.cxx |4 ++-- sd/source/ui/framework/configuration/ConfigurationController.cxx |4 ++-- sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx |4 ++-- sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx |4 ++-- sd/source/ui/framework/configuration/ConfigurationTracer.cxx |4 ++-- sd/source/ui/framework/configuration/ConfigurationUpdater.cxx |4 ++-- sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx |4 ++-- sd/source/ui/framework/configuration/ResourceFactoryManager.cxx |4 ++-- sd/source/ui/framework/configuration/ResourceId.cxx |4 ++-- sd/source/ui/framework/configuration/UpdateRequest.cxx |4 ++-- sd/source/ui/framework/factories/BasicPaneFactory.cxx |4 ++-- sd/source/ui/framework/factories/BasicToolBarFactory.cxx |4 ++-- sd/source/ui/framework/factories/BasicViewFactory.cxx |4 ++-- sd/source/ui/framework/factories/ChildWindowPane.cxx |4 ++-- sd/source/ui/framework/factories/FrameWindowPane.cxx |4 ++-- sd/source/ui/framework/factories/FullScreenPane.cxx |4 ++-- sd/source/ui/framework/factories/Pane.cxx |4 ++-- sd/source/ui/framework/factories/PresentationFactory.cxx |4 ++-- sd/source/ui/framework/factories/ViewShellWrapper.cxx |4 ++-- sd/source/ui/framework/module/CenterViewFocusModule.cxx |4 ++-- sd/source/ui/framework/module/DrawModule.cxx |4 ++-- sd/source/ui/framework/module/ImpressModule.cxx |4 ++-- sd/source/ui/framework/module/ModuleController.cxx |4 ++-- sd/source/ui/framework/module/PresentationModule.cxx |4 ++-- sd/source/ui/framework/module/ShellStackGuard.cxx |4 ++-- sd/source/ui/framework/module/SlideSorterModule.cxx |4 ++-- sd/source/ui/framework/module/ToolBarModule.cxx |4 ++-- sd/source/ui/framework/module/ViewTabBarModule.cxx |4 ++-- sd/source/ui/framework/tools/FrameworkHelper.cxx |4 ++-- sd/source/ui/presenter/CanvasUpdateRequester.cxx |4 ++-- sd/source/ui/presenter/PresenterCanvas.cxx |4 ++-- sd/source/ui/presenter/PresenterHelper.cxx |4 ++-- sd/source/ui/presenter/PresenterPreviewCache.cxx |6 +++--- sd/source/ui/presenter/PresenterTextView.cxx |4 ++-- sd/source/ui/presenter/SlideRenderer.cxx |4 ++-- sd/source/ui/sidebar/AllMasterPagesSelector.cxx |4 ++-- sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx |4 ++-- sd/source/ui/sidebar/CustomAnimationPanel.cxx |4 ++-- sd/source/ui/sidebar/DocumentHelper.cxx |4 ++-- sd/source/ui/sidebar/LayoutMenu.cxx |4 ++-- sd/source/ui/sidebar/MasterPageContainer.cxx |4 ++-- sd/source/ui/sideb
[Libreoffice-commits] core.git: 3 commits - codemaker/source comphelper/source configmgr/source oox/source sc/qa sc/source
codemaker/source/commoncpp/commoncpp.cxx |4 ++-- codemaker/source/commonjava/commonjava.cxx |4 ++-- codemaker/source/cppumaker/dependencies.cxx |4 ++-- codemaker/source/cppumaker/dumputils.cxx |4 ++-- comphelper/source/misc/automationinvokedzone.cxx |5 + comphelper/source/misc/comphelper_module.cxx |4 ++-- comphelper/source/misc/comphelper_services.cxx |4 ++-- comphelper/source/misc/lok.cxx |7 +-- comphelper/source/misc/random.cxx|5 + comphelper/source/misc/servicedecl.cxx |4 +--- comphelper/source/misc/string.cxx|4 ++-- comphelper/source/misc/xmlsechelper.cxx |5 + comphelper/source/streaming/memorystream.cxx |2 +- comphelper/source/xml/xmltools.cxx |5 + configmgr/source/configurationprovider.cxx |4 ++-- configmgr/source/configurationregistry.cxx |8 configmgr/source/dconf.cxx |4 ++-- configmgr/source/defaultprovider.cxx |4 ++-- configmgr/source/readonlyaccess.cxx |4 ++-- configmgr/source/readwriteaccess.cxx |4 ++-- configmgr/source/update.cxx |4 ++-- configmgr/source/xmldata.cxx |6 +- oox/source/core/binarycodec.cxx |4 +--- oox/source/core/contexthandler.cxx |4 +--- oox/source/core/contexthandler2.cxx |4 +--- oox/source/core/fastparser.cxx |4 +--- oox/source/core/fasttokenhandler.cxx |4 +--- oox/source/core/filterbase.cxx |4 +--- oox/source/core/filterdetect.cxx |4 +--- oox/source/core/fragmenthandler.cxx |4 +--- oox/source/core/fragmenthandler2.cxx |4 +--- oox/source/core/recordparser.cxx |4 +--- oox/source/core/relations.cxx|4 +--- oox/source/core/relationshandler.cxx |4 +--- oox/source/core/xmlfilterbase.cxx|4 +--- oox/source/crypto/AgileEngine.cxx|4 +--- oox/source/crypto/CryptTools.cxx |4 +--- oox/source/crypto/DocumentDecryption.cxx |4 +--- oox/source/crypto/DocumentEncryption.cxx |4 +--- oox/source/crypto/Standard2007Engine.cxx |4 +--- oox/source/docprop/docprophandler.cxx|4 +--- oox/source/docprop/ooxmldocpropimport.cxx|4 +--- oox/source/drawingml/ThemeOverrideFragmentHandler.cxx|4 +--- oox/source/drawingml/chart/axiscontext.cxx |6 +- oox/source/drawingml/chart/axisconverter.cxx |6 +- oox/source/drawingml/chart/axismodel.cxx |6 +- oox/source/drawingml/chart/chartcontextbase.cxx |6 +- oox/source/drawingml/chart/chartconverter.cxx|6 +- oox/source/drawingml/chart/chartdrawingfragment.cxx |6 +- oox/source/drawingml/chart/chartspaceconverter.cxx |6 +- oox/source/drawingml/chart/chartspacefragment.cxx|6 +- oox/source/drawingml/chart/chartspacemodel.cxx |6 +- oox/source/drawingml/chart/converterbase.cxx |6 +- oox/source/drawingml/chart/datasourcecontext.cxx |6 +- oox/source/drawingml/chart/datasourceconverter.cxx |6 +- oox/source/drawingml/chart/datasourcemodel.cxx |6 +- oox/source/drawingml/chart/modelbase.cxx |6 +- oox/source/drawingml/chart/objectformatter.cxx |6 +- oox/source/drawingml/chart/plotareacontext.cxx |6 +- oox/source/drawingml/chart/plotareaconverter.cxx |6 +- oox/source/drawingml/chart/plotareamodel.cxx |6 +- oox/source/drawingml/chart/seriescontext.cxx |6 +- oox/source/drawingml/chart/seriesconverter.cxx |6 +- oox/source/drawingml/chart/seriesmodel.cxx |6 +- oox/source/drawingml/chart/titlecontext.cxx |6 +- oox/source/drawingml/chart/titleconverter.cxx|6 +- oox/source/drawingml/chart/titlemodel.cxx
[Libreoffice-commits] core.git: 2 commits - cppcanvas/source cppuhelper/source cppu/qa cppu/source sw/source
cppcanvas/source/mtfrenderer/bitmapaction.cxx |5 -- cppcanvas/source/mtfrenderer/cachedprimitivebase.cxx |5 -- cppcanvas/source/mtfrenderer/implrenderer.cxx |5 -- cppcanvas/source/mtfrenderer/lineaction.cxx |5 -- cppcanvas/source/mtfrenderer/mtftools.cxx |5 -- cppcanvas/source/mtfrenderer/pointaction.cxx |5 -- cppcanvas/source/mtfrenderer/polypolyaction.cxx |5 -- cppcanvas/source/mtfrenderer/textaction.cxx |5 -- cppcanvas/source/mtfrenderer/textlineshelper.cxx |5 -- cppcanvas/source/mtfrenderer/transparencygroupaction.cxx |5 -- cppcanvas/source/tools/canvasgraphichelper.cxx|6 -- cppcanvas/source/tools/tools.cxx |5 -- cppcanvas/source/wrapper/implbitmap.cxx |6 -- cppcanvas/source/wrapper/implbitmapcanvas.cxx |5 -- cppcanvas/source/wrapper/implcanvas.cxx |5 -- cppcanvas/source/wrapper/implcustomsprite.cxx |5 -- cppcanvas/source/wrapper/implpolypolygon.cxx |5 -- cppcanvas/source/wrapper/implsprite.cxx |5 -- cppcanvas/source/wrapper/implspritecanvas.cxx |5 -- cppu/qa/cppumaker/test_cppumaker.cxx |4 - cppu/qa/test_unotype.cxx |6 +- cppu/source/helper/purpenv/helper_purpenv_Environment.cxx |4 - cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx |4 - cppu/source/uno/loadmodule.cxx|4 - cppuhelper/source/compat.cxx |4 - cppuhelper/source/macro_expander.cxx |8 +-- cppuhelper/source/weak.cxx| 14 - sw/source/core/crsr/annotationmark.cxx|4 - sw/source/core/crsr/bookmrk.cxx |8 +-- sw/source/core/crsr/crossrefbookmark.cxx |4 - sw/source/core/crsr/overlayrangesoutline.cxx |7 -- sw/source/core/doc/CntntIdxStore.cxx |4 - sw/source/core/doc/docbm.cxx |4 - sw/source/core/draw/dcontact.cxx | 14 + sw/source/core/draw/dflyobj.cxx | 35 -- sw/source/core/layout/legacyitem.cxx |5 -- sw/source/core/layout/paintfrm.cxx|7 -- sw/source/core/text/itrform2.cxx |4 - sw/source/filter/ww8/ww8par.cxx |5 -- sw/source/ui/vba/wordvbahelper.cxx|8 --- sw/source/uibase/docvw/AnchorOverlayObject.cxx|4 - sw/source/uibase/docvw/AnnotationMenuButton.cxx |4 - sw/source/uibase/docvw/AnnotationWin.cxx |4 - sw/source/uibase/docvw/AnnotationWin2.cxx |4 - sw/source/uibase/docvw/OverlayRanges.cxx |7 -- sw/source/uibase/docvw/ShadowOverlayObject.cxx|4 - sw/source/uibase/docvw/SidebarScrollBar.cxx |5 -- sw/source/uibase/docvw/SidebarTxtControl.cxx |4 - sw/source/uibase/docvw/SidebarTxtControlAcc.cxx |4 - sw/source/uibase/docvw/SidebarWinAcc.cxx |4 - sw/source/uibase/docvw/frmsidebarwincontainer.cxx |4 - sw/source/uibase/sidebar/PageColumnControl.cxx|4 - sw/source/uibase/sidebar/PageFooterPanel.cxx |4 - sw/source/uibase/sidebar/PageFormatPanel.cxx |4 - sw/source/uibase/sidebar/PageHeaderPanel.cxx |4 - sw/source/uibase/sidebar/PageMarginControl.cxx|4 - sw/source/uibase/sidebar/PageOrientationControl.cxx |4 - sw/source/uibase/sidebar/PageSizeControl.cxx |4 - sw/source/uibase/sidebar/PageStylesPanel.cxx |4 - sw/source/uibase/sidebar/StylePresetsPanel.cxx|4 - sw/source/uibase/sidebar/TableEditPanel.cxx |5 -- sw/source/uibase/sidebar/ThemePanel.cxx |4 - sw/source/uibase/sidebar/WrapPropertyPanel.cxx|4 - sw/source/uibase/wrtsh/select.cxx |4 - 64 files changed, 118 insertions(+), 237 deletions(-) New commits: commit 248ddbc4e9191c7f980fc8d6df6337fc535faab0 Author: Noel Grandin AuthorDate: Tue Jan 14 16:26:23 2020 +0200 Commit: Noel Grandin CommitDate: Wed Jan 15 06:58:12 2020 +0100 clang-tidy modernize-concat-nested-namespace in cppcanvas..cppuhelper Change-Id: I0bb4ea91288a15fb590d077fb390c53be8b50400 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86801 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/cppcanvas/source/mtfrenderer/bitmapaction.cxx b/cppcanvas/source/mtfr
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - svx/uiconfig
svx/uiconfig/ui/sidebararea.ui |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a83165b0f06944f4e929455e89d3144f1d2979d3 Author: Henry Castro AuthorDate: Tue Jan 14 13:59:43 2020 -0400 Commit: Henry Castro CommitDate: Wed Jan 15 02:17:18 2020 +0100 lok: ui: increase the 'step-increment' property to 5 Change-Id: I1090a9f6435619f095ca22ef401c5e1bc9741d06 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86798 Tested-by: Jenkins CollaboraOffice Reviewed-by: Henry Castro diff --git a/svx/uiconfig/ui/sidebararea.ui b/svx/uiconfig/ui/sidebararea.ui index ec9166c72388..0c5b8b533cbf 100644 --- a/svx/uiconfig/ui/sidebararea.ui +++ b/svx/uiconfig/ui/sidebararea.ui @@ -5,7 +5,7 @@ 100 -1 +5 10 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 147af9e2cf7f937ed83ab00574b6a418a2cb629e Author: Stanislav Horacek AuthorDate: Wed Jan 15 01:08:34 2020 +0100 Commit: Gerrit Code Review CommitDate: Wed Jan 15 01:08:34 2020 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 69896de636113d0bae2b1c44316f2c50b643f524 - fix typo in explanation of regular expression example Change-Id: I35103839b29ea98ee0295dbbe71712b9c041a807 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/86816 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/helpcontent2 b/helpcontent2 index 5a44291fac8f..69896de63611 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 5a44291fac8fe16731bf0dff05ed40ae582f3461 +Subproject commit 69896de636113d0bae2b1c44316f2c50b643f524 ___ 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 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 69896de636113d0bae2b1c44316f2c50b643f524 Author: Stanislav Horacek AuthorDate: Tue Jan 14 23:25:56 2020 +0100 Commit: Adolfo Jayme Barrientos CommitDate: Wed Jan 15 01:08:34 2020 +0100 fix typo in explanation of regular expression example Change-Id: I35103839b29ea98ee0295dbbe71712b9c041a807 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/86816 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/source/text/shared/01/0211.xhp b/source/text/shared/01/0211.xhp index 36df46fb5..956599ac6 100644 --- a/source/text/shared/01/0211.xhp +++ b/source/text/shared/01/0211.xhp @@ -397,7 +397,7 @@ ruc specifies the characters "ruc", ) ends the group, tion specifies the characters "tion", -/b specifies that the match must end at a word boundary. +\b specifies that the match must end at a word boundary. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/cib_contract138c' - 2 commits - configure.ac sc/source
configure.ac |2 +-
sc/source/filter/xml/xmlimprt.cxx | 19 ---
2 files changed, 1 insertion(+), 20 deletions(-)
New commits:
commit e27f7c3b74bbb11c9b188659821308b0072a24ef
Author: Thorsten Behrens
AuthorDate: Wed Jan 15 00:23:18 2020 +0100
Commit: Thorsten Behrens
CommitDate: Wed Jan 15 00:25:31 2020 +0100
Release 6.2.9.1
Change-Id: I317a54be07a33fb66ce6236528ae7e8db43974ca
diff --git a/configure.ac b/configure.ac
index 7231d74cbdaf..a6c7f84e13e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
# several non-alphanumeric characters, those are split off and used only for
the
# ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no
idea.
-AC_INIT([LibreOffice],[6.2.9.0],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.2.9.1],[],[],[http://documentfoundation.org/])
AC_PREREQ([2.59])
commit 7fd4bd293ff9c9271a67bee99cf1aebbe49c81bc
Author: Thorsten Behrens
AuthorDate: Wed Jan 15 00:24:35 2020 +0100
Commit: Thorsten Behrens
CommitDate: Wed Jan 15 00:25:31 2020 +0100
Revert tdf#62268: allow row height recalculation on document load
This reverts part of commit 1e55a47e89a9d9d6cf9cb3993484022aaf2c097b
During document load rows with style:use-optimal-row-height="true"
should recalculate it's height.
Change-Id: I091069839555f899644b355cc3a9f031e304dc83
diff --git a/sc/source/filter/xml/xmlimprt.cxx
b/sc/source/filter/xml/xmlimprt.cxx
index 6179192b1641..15cf8ad670cf 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -1795,25 +1795,6 @@ void SAL_CALL ScXMLImport::endDocument()
}
}
-// There are rows with optimal height which need to be updated
-if (pDoc && !maRecalcRowRanges.empty())
-{
-bool bLockHeight = pDoc->IsAdjustHeightLocked();
-if (bLockHeight)
-{
-pDoc->UnlockAdjustHeight();
-}
-
-ScSizeDeviceProvider
aProv(static_cast(pDoc->GetDocumentShell()));
-ScDocRowHeightUpdater aUpdater(*pDoc, aProv.GetDevice(),
aProv.GetPPTX(), aProv.GetPPTY(), &maRecalcRowRanges);
-aUpdater.update();
-
-if (bLockHeight)
-{
-pDoc->LockAdjustHeight();
-}
-}
-
aTables.FixupOLEs();
}
if (GetModel().is())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/util
sd/util/sdfilt.component |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f687c41f76fb0452d667a01f4fb0ff90bf2aa937 Author: Stephan Bergmann AuthorDate: Tue Jan 14 17:03:34 2020 +0100 Commit: Stephan Bergmann CommitDate: Tue Jan 14 22:26:39 2020 +0100 prefix is unused when all implementations have constructors ...which is the case here since 5d0901a75e7ef96dc722b5277450cc18ad163f7b "sd pptm: Add a separate PPTM filter." Change-Id: I4318681da9971cac4df083f9170f3a0f9fd26f75 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86780 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/sd/util/sdfilt.component b/sd/util/sdfilt.component index 134a79f2d30a..5e4bab20b7d1 100644 --- a/sd/util/sdfilt.component +++ b/sd/util/sdfilt.component @@ -8,6 +8,6 @@ * --> http://openoffice.org/2010/uno-components";> +xmlns="http://openoffice.org/2010/uno-components";> ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source
filter/source/msfilter/msdffimp.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 40887f38441e8e3371e80773c5bac2a5a22854ed Author: Caolán McNamara AuthorDate: Tue Jan 14 20:29:00 2020 + Commit: Caolán McNamara CommitDate: Tue Jan 14 22:16:38 2020 +0100 ofz#20087 Invalid-enum-value Change-Id: I32966a6b3973a0db9e186260225ded216607efbc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86809 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index cea6d7168b85..7b5142788b08 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -4816,7 +4816,7 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r pRet->SetMergedItemSet(aSet); // connectors -MSO_ConnectorStyle eConnectorStyle = static_cast(GetPropertyValue( DFF_Prop_cxstyle, mso_cxstyleStraight )); +auto eConnectorStyle = GetPropertyValue(DFF_Prop_cxstyle, mso_cxstyleStraight); static_cast(pRet)->ConnectToNode(true, nullptr); static_cast(pRet)->ConnectToNode(false, nullptr); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: compilerplugins/clang
compilerplugins/clang/redundantcast.cxx |9 -
1 file changed, 8 insertions(+), 1 deletion(-)
New commits:
commit a0b220b3a6946e54136c47acab587c3993dae6fa
Author: Stephan Bergmann
AuthorDate: Tue Jan 14 19:52:56 2020 +0100
Commit: Stephan Bergmann
CommitDate: Tue Jan 14 21:41:23 2020 +0100
Avoid loplugin:redundantcast from within qWarning macro
...as seen with qt5-qtbase-devel-5.13.2-1.fc31.x86_64:
> vcl/unx/gtk3_kde5/kde5_filepicker_ipc.cxx:367:5: error: redundant
static_cast from 'const char [65]' to 'const char *' [loplugin:redundantcast]
> qWarning() << "unhandled command " << static_cast(command);
> ^~~~
> /usr/include/qt5/QtCore/qlogging.h:167:33: note: expanded from macro
'qWarning'
> #define qWarning QMessageLogger(QT_MESSAGELOG_FILE, QT_MESSAGELOG_LINE,
QT_MESSAGELOG_FUNC).warning
> ^~
> /usr/include/qt5/QtCore/qlogging.h:156:30: note: expanded from macro
'QT_MESSAGELOG_FILE'
> #define QT_MESSAGELOG_FILE static_cast(__FILE__)
> ^~~
Change-Id: I9578b07cfd1a2de570ae2ab5842d65ef708f5d6a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86802
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/compilerplugins/clang/redundantcast.cxx
b/compilerplugins/clang/redundantcast.cxx
index 1f7765b8978d..862410c6484d 100644
--- a/compilerplugins/clang/redundantcast.cxx
+++ b/compilerplugins/clang/redundantcast.cxx
@@ -155,6 +155,12 @@ private:
bool visitBinOp(BinaryOperator const * expr);
void visitAssign(QualType lhs, Expr const * rhs);
bool isOverloadedFunction(FunctionDecl const * decl);
+
+bool isInIgnoredMacroBody(Expr const * expr) {
+auto const loc = compat::getBeginLoc(expr);
+return compiler.getSourceManager().isMacroBodyExpansion(loc)
+&& ignoreLocation(compiler.getSourceManager().getSpellingLoc(loc));
+}
};
bool RedundantCast::VisitImplicitCastExpr(const ImplicitCastExpr * expr) {
@@ -435,7 +441,8 @@ bool
RedundantCast::VisitCXXStaticCastExpr(CXXStaticCastExpr const * expr) {
|| loplugin::isSamePathname(
fn, SRCDIR
"/sal/qa/rtl/strings/test_oustring_concat.cxx")
|| loplugin::isSamePathname(
- fn, SRCDIR
"/sal/qa/rtl/strings/test_oustring_stringliterals.cxx")))
+ fn, SRCDIR
"/sal/qa/rtl/strings/test_oustring_stringliterals.cxx")
+ || isInIgnoredMacroBody(expr)))
{
report(
DiagnosticsEngine::Warning, "redundant static_cast from %0
to %1",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sfx2 officecfg/registry sc/source sd/source sfx2/source sfx2/util sw/source
include/sfx2/charmapcontrol.hxx |1
include/sfx2/emojicontrol.hxx |8 +-
include/sfx2/emojipopup.hxx | 18 +++-
officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu | 11 ++
sc/source/ui/app/scdll.cxx |2
sd/source/ui/app/sddll.cxx |2
sfx2/source/control/emojicontrol.cxx| 10 +-
sfx2/source/control/emojipopup.cxx | 37
+++---
sfx2/util/sfx.component |4 +
sw/source/uibase/app/swmodule.cxx |2
10 files changed, 64 insertions(+), 31 deletions(-)
New commits:
commit e5701af7c4226341776ed12c4bc5b24469a2599d
Author: Caolán McNamara
AuthorDate: Tue Jan 14 17:17:35 2020 +
Commit: Caolán McNamara
CommitDate: Tue Jan 14 21:27:41 2020 +0100
rework SfxEmojiControl to be a PopupWindowController
Change-Id: Ia3262e5b54257d5556c500f440806ac2df9886cf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86794
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/include/sfx2/charmapcontrol.hxx b/include/sfx2/charmapcontrol.hxx
index 83230a458af6..31a7ce5937e7 100644
--- a/include/sfx2/charmapcontrol.hxx
+++ b/include/sfx2/charmapcontrol.hxx
@@ -22,7 +22,6 @@
#include
#include
-#include
#include
#include
#include
diff --git a/include/sfx2/emojicontrol.hxx b/include/sfx2/emojicontrol.hxx
index 4026a31954ab..33d0e021bbe1 100644
--- a/include/sfx2/emojicontrol.hxx
+++ b/include/sfx2/emojicontrol.hxx
@@ -13,21 +13,21 @@
#include
#include
#include
-#include
+#include
#define TAB_FONT_SIZE 15
namespace com::sun::star::frame { class XFrame; }
+class EmojiPopup;
class EmojiView;
class ThumbnailViewItem;
enum class FILTER_CATEGORY;
-class SfxEmojiControl final : public SfxPopupWindow
+class SfxEmojiControl final : public svtools::ToolbarPopup
{
public:
-explicit SfxEmojiControl(sal_uInt16 nId, vcl::Window* pParent,
- const css::uno::Reference< css::frame::XFrame >&
rFrame);
+explicit SfxEmojiControl(EmojiPopup* pControl, vcl::Window* pParent);
virtual ~SfxEmojiControl() override;
diff --git a/include/sfx2/emojipopup.hxx b/include/sfx2/emojipopup.hxx
index ee98e12e93b8..a5a9b0934504 100644
--- a/include/sfx2/emojipopup.hxx
+++ b/include/sfx2/emojipopup.hxx
@@ -20,18 +20,24 @@
#ifndef INCLUDED_SFX2_INC_EMOJIPOPUP_HXX
#define INCLUDED_SFX2_INC_EMOJIPOPUP_HXX
-#include
+#include
#include
-class SFX2_DLLPUBLIC EmojiPopup final : public SfxToolBoxControl
+class SFX2_DLLPUBLIC EmojiPopup final : public svt::PopupWindowController
{
public:
-SFX_DECL_TOOLBOX_CONTROL();
-
-EmojiPopup(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx);
+EmojiPopup(const css::uno::Reference&
rContext);
virtual ~EmojiPopup() override;
-virtual VclPtr CreatePopupWindow() override;
+using svt::ToolboxController::createPopupWindow;
+virtual VclPtr createPopupWindow( vcl::Window* pParent )
override;
+
+// XServiceInfo
+virtual OUString SAL_CALL getImplementationName() override;
+virtual css::uno::Sequence SAL_CALL getSupportedServiceNames()
override;
+
+// XInitialization
+virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any
>& rArguments ) override;
};
#endif
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
index 924de434b281..07d0da5103fc 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
@@ -1360,6 +1360,17 @@
com.sun.star.comp.svx.CharacterSpacingToolBoxControl
+
+
+ .uno:EmojiControl
+
+
+
+
+
+ com.sun.star.comp.sfx2.InsertEmojiToolBoxControl
+
+
.uno:CharmapControl
diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx
index fd23b78cf7e3..d3a1bbdc1035 100644
--- a/sc/source/ui/app/scdll.cxx
+++ b/sc/source/ui/app/scdll.cxx
@@ -172,8 +172,6 @@ void ScDLL::Init()
SvxCTLTextTbxCtrl::RegisterControl(SID_ATTR_PARA_LEFT_TO_RIGHT, pMod);
SvxCTLTextTbxCtrl::RegisterControl(SID_ATTR_PARA_RIGHT_TO_LEFT, pMod);
-EmojiPopup::RegisterControl(SID_EMOJI_CONTROL, pMod );
-
// Media Controller
#if HAVE_FEATURE_AVMEDIA
::avmedia::MediaToolBoxControl::RegisterControl( SID_AVMEDIA_TOOLBOX, pMod
);
diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx
index 5cfa2930a9de..e990d56053c9 100644
--- a/sd/source/ui/app/sddll.cxx
+++ b/sd/source/ui/app/sddll.cxx
@@ -221,8 +221,6 @@ void SdDLL::RegisterControllers(SdModule* pMod)
[Libreoffice-commits] core.git: 2 commits - officecfg/registry sw/inc sw/source sw/uiconfig sw/util
officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu | 11 ++
sw/inc/PageOrientationPopup.hxx | 20 ++--
sw/source/uibase/app/swmodule.cxx |1
sw/source/uibase/sidebar/PageOrientationControl.cxx | 37 ++-
sw/source/uibase/sidebar/PageOrientationControl.hxx | 17 +--
sw/source/uibase/sidebar/PageOrientationPopup.cxx | 48
--
sw/uiconfig/swriter/ui/pagemargincontrol.ui |1
sw/uiconfig/swriter/ui/pageorientationcontrol.ui| 38 +++
sw/util/sw.component|4
9 files changed, 108 insertions(+), 69 deletions(-)
New commits:
commit 22bf6e323465bd38b38fc026d801bb470e3f9d5c
Author: Caolán McNamara
AuthorDate: Tue Jan 14 17:00:02 2020 +
Commit: Caolán McNamara
CommitDate: Tue Jan 14 21:27:04 2020 +0100
weld PageOrientationControl
Change-Id: I4b8b5e9a467396a97531c915613d84a361163775
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86789
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sw/inc/PageOrientationPopup.hxx b/sw/inc/PageOrientationPopup.hxx
index 5b0f3927b950..2b97bba36352 100644
--- a/sw/inc/PageOrientationPopup.hxx
+++ b/sw/inc/PageOrientationPopup.hxx
@@ -28,6 +28,7 @@ public:
PageOrientationPopup(const
css::uno::Reference& rContext);
virtual ~PageOrientationPopup() override;
+virtual std::unique_ptr weldPopupWindow() override;
using svt::ToolboxController::createPopupWindow;
virtual VclPtr createPopupWindow( vcl::Window* pParent )
override;
diff --git a/sw/source/uibase/sidebar/PageOrientationControl.cxx
b/sw/source/uibase/sidebar/PageOrientationControl.cxx
index f002a3bd9e40..b52b789c1c15 100644
--- a/sw/source/uibase/sidebar/PageOrientationControl.cxx
+++ b/sw/source/uibase/sidebar/PageOrientationControl.cxx
@@ -27,7 +27,6 @@
#include
#include
#include
-#include
#include
namespace {
@@ -50,36 +49,27 @@ namespace {
namespace sw { namespace sidebar {
-PageOrientationControl::PageOrientationControl(PageOrientationPopup* pControl,
vcl::Window* pParent)
-: ToolbarPopup(pControl->getFrameInterface(), pParent,
"PageOrientationControl", "modules/swriter/ui/pageorientationcontrol.ui" )
+PageOrientationControl::PageOrientationControl(PageOrientationPopup* pControl,
weld::Widget* pParent)
+: WeldToolbarPopup(pControl->getFrameInterface(), pParent,
"modules/swriter/ui/pageorientationcontrol.ui", "PageOrientationControl")
+, m_xPortrait(m_xBuilder->weld_button("portrait"))
+, m_xLandscape(m_xBuilder->weld_button("landscape"))
+, m_xControl(pControl)
, mpPageItem( new SvxPageItem(SID_ATTR_PAGE) )
, mpPageSizeItem( new SvxSizeItem(SID_ATTR_PAGE_SIZE) )
, mpPageLRMarginItem( new SvxLongLRSpaceItem( 0, 0, SID_ATTR_PAGE_LRSPACE
) )
, mpPageULMarginItem( new SvxLongULSpaceItem( 0, 0, SID_ATTR_PAGE_ULSPACE
) )
{
-get(m_pPortrait, "portrait");
-get(m_pLandscape, "landscape");
-
-m_pPortrait->SetClickHdl( LINK( this,
PageOrientationControl,ImplOrientationHdl ) );
-m_pLandscape->SetClickHdl( LINK( this,
PageOrientationControl,ImplOrientationHdl ) );
+m_xPortrait->connect_clicked( LINK( this,
PageOrientationControl,ImplOrientationHdl ) );
+m_xLandscape->connect_clicked( LINK( this,
PageOrientationControl,ImplOrientationHdl ) );
}
-PageOrientationControl::~PageOrientationControl()
+void PageOrientationControl::GrabFocus()
{
-disposeOnce();
+m_xPortrait->grab_focus();
}
-void PageOrientationControl::dispose()
+PageOrientationControl::~PageOrientationControl()
{
-m_pPortrait.disposeAndClear();
-m_pLandscape.disposeAndClear();
-
-mpPageItem.reset();
-mpPageLRMarginItem.reset();
-mpPageULMarginItem.reset();
-mpPageSizeItem.reset();
-
-ToolbarPopup::dispose();
}
void PageOrientationControl::ExecuteMarginLRChange(
@@ -189,14 +179,14 @@ void PageOrientationControl::ExecuteOrientationChange(
const bool bLandscape )
mxUndoManager->leaveUndoContext();
}
-IMPL_LINK(PageOrientationControl, ImplOrientationHdl, Button*, pControl, void)
+IMPL_LINK(PageOrientationControl, ImplOrientationHdl, weld::Button&, rControl,
void)
{
-if ( pControl == m_pPortrait.get() )
+if (&rControl == m_xPortrait.get())
ExecuteOrientationChange( false );
else
ExecuteOrientationChange( true );
-EndPopupMode();
+m_xControl->EndPopupMode();
}
} } // end of namespace sw::sidebar
diff --git a/sw/source/uibase/sidebar/PageOrientationControl.hxx
b/sw/source/uibase/sidebar/PageOrientationControl.hxx
index af844bbc8e5b..206242de77f5 100644
--- a/sw/source/uibase/sidebar/PageOrientationControl.hxx
+++ b/sw/source/uibase/sidebar/PageOrientationControl.hxx
@@ -25,21 +25,21 @@
#include
#include
-class Button;
class PageOrientationPopup;
namespace sw { na
[Libreoffice-commits] core.git: solenv/sanitizers sw/inc sw/source sw/uiconfig
solenv/sanitizers/ui/modules/swriter.suppr | 11
sw/inc/PageMarginPopup.hxx |1
sw/source/uibase/sidebar/PageMarginControl.cxx | 244 +---
sw/source/uibase/sidebar/PageMarginControl.hxx | 51 +---
sw/source/uibase/sidebar/PageMarginPopup.cxx| 14 -
sw/source/uibase/sidebar/PageOrientationControl.cxx |1
sw/uiconfig/swriter/ui/pagemargincontrol.ui | 105 +---
7 files changed, 219 insertions(+), 208 deletions(-)
New commits:
commit 0b87cacaedf47c49065df284f8d10d40d664f9bd
Author: Caolán McNamara
AuthorDate: Tue Jan 14 16:33:52 2020 +
Commit: Caolán McNamara
CommitDate: Tue Jan 14 21:26:21 2020 +0100
weld PageMarginControl
Change-Id: Ie0af7bf21a8804620746fe42ad009717db65bf24
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86783
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/solenv/sanitizers/ui/modules/swriter.suppr
b/solenv/sanitizers/ui/modules/swriter.suppr
index 661023b6ce0e..119f86201364 100644
--- a/solenv/sanitizers/ui/modules/swriter.suppr
+++ b/solenv/sanitizers/ui/modules/swriter.suppr
@@ -171,16 +171,7 @@
sw/uiconfig/swriter/ui/notebookbar_groups.ui://GtkLabel[@id='formatgrouplabel']
sw/uiconfig/swriter/ui/notebookbar_groups.ui://GtkLabel[@id='insertgrouplabel']
orphan-label
sw/uiconfig/swriter/ui/notebookbar_groups.ui://GtkLabel[@id='tablegrouplabel']
orphan-label
sw/uiconfig/swriter/ui/notebookbar_groups.ui://GtkLabel[@id='imagegrouplabel']
orphan-label
-sw/uiconfig/swriter/ui/pagemargincontrol.ui://GtkLabel[@id='label4']
orphan-label
-sw/uiconfig/swriter/ui/pagemargincontrol.ui://GtkLabel[@id='label5']
orphan-label
-sw/uiconfig/swriter/ui/pagemargincontrol.ui://GtkLabel[@id='leftLabel']
orphan-label
-sw/uiconfig/swriter/ui/pagemargincontrol.ui://GtkLabel[@id='innerLabel']
orphan-label
-sw/uiconfig/swriter/ui/pagemargincontrol.ui://GtkLabel[@id='rightLabel']
orphan-label
-sw/uiconfig/swriter/ui/pagemargincontrol.ui://GtkLabel[@id='outerLabel']
orphan-label
-sw/uiconfig/swriter/ui/pagemargincontrol.ui://GtkSpinButton[@id='left:0cm']
no-labelled-by
-sw/uiconfig/swriter/ui/pagemargincontrol.ui://GtkSpinButton[@id='right:0cm']
no-labelled-by
-sw/uiconfig/swriter/ui/pagemargincontrol.ui://GtkSpinButton[@id='top:0cm']
no-labelled-by
-sw/uiconfig/swriter/ui/pagemargincontrol.ui://GtkSpinButton[@id='bottom:0cm']
no-labelled-by
+sw/uiconfig/swriter/ui/pagemargincontrol.ui://GtkSpinButton[@id='hidden']
no-labelled-by
sw/uiconfig/swriter/ui/pagesizecontrol.ui://GtkSpinButton[@id='metric']
no-labelled-by
sw/uiconfig/swriter/ui/printmonitordialog.ui://GtkLabel[@id='docname']
orphan-label
sw/uiconfig/swriter/ui/printmonitordialog.ui://GtkLabel[@id='printing']
orphan-label
diff --git a/sw/inc/PageMarginPopup.hxx b/sw/inc/PageMarginPopup.hxx
index 3a31544b74a1..c4ec2e634066 100644
--- a/sw/inc/PageMarginPopup.hxx
+++ b/sw/inc/PageMarginPopup.hxx
@@ -28,6 +28,7 @@ public:
PageMarginPopup(const css::uno::Reference&
rContext);
virtual ~PageMarginPopup() override;
+virtual std::unique_ptr weldPopupWindow() override;
using svt::ToolboxController::createPopupWindow;
virtual VclPtr createPopupWindow( vcl::Window* pParent )
override;
diff --git a/sw/source/uibase/sidebar/PageMarginControl.cxx
b/sw/source/uibase/sidebar/PageMarginControl.cxx
index 587f0262ff13..0241e034989a 100644
--- a/sw/source/uibase/sidebar/PageMarginControl.cxx
+++ b/sw/source/uibase/sidebar/PageMarginControl.cxx
@@ -94,8 +94,18 @@ namespace
namespace sw { namespace sidebar {
-PageMarginControl::PageMarginControl(PageMarginPopup* pControl, vcl::Window*
pParent)
-: ToolbarPopup(pControl->getFrameInterface(), pParent,
"PageMarginControl", "modules/swriter/ui/pagemargincontrol.ui")
+PageMarginControl::PageMarginControl(PageMarginPopup* pControl, weld::Widget*
pParent)
+: WeldToolbarPopup(pControl->getFrameInterface(), pParent,
"modules/swriter/ui/pagemargincontrol.ui", "PageMarginControl")
+, m_xLeft(m_xBuilder->weld_label("leftLabel"))
+, m_xRight(m_xBuilder->weld_label("rightLabel"))
+, m_xInner(m_xBuilder->weld_label("innerLabel"))
+, m_xOuter(m_xBuilder->weld_label("outerLabel"))
+, m_xLeftMarginEdit(m_xBuilder->weld_metric_spin_button("left",
FieldUnit::CM))
+, m_xRightMarginEdit(m_xBuilder->weld_metric_spin_button("right",
FieldUnit::CM))
+, m_xTopMarginEdit(m_xBuilder->weld_metric_spin_button("top",
FieldUnit::CM))
+, m_xBottomMarginEdit(m_xBuilder->weld_metric_spin_button("bottom",
FieldUnit::CM))
+, m_xWidthHeightField(m_xBuilder->weld_metric_spin_button("hidden",
FieldUnit::CM))
+, m_xControl(pControl)
, m_nPageLeftMargin(0)
, m_nPageRightMargin(0)
, m_nPageTopMargin(0)
@@ -110,6 +120,12 @@ PageMarginControl::PageMarginControl(PageMarginPopup*
pControl, vcl::Window* pPa
, m_bUserCustomMirrored( false )
, m_bCustomValuesUsed( false )
{
+
[Libreoffice-commits] core.git: include/svtools solenv/clang-format svtools/inc svtools/source
solenv/clang-format/blacklist |2 +- svtools/inc/svmedit2.hxx |1 - svtools/source/contnr/DocumentInfoPreview.cxx |2 +- svtools/source/edit/svmedit2.cxx |2 +- 4 files changed, 3 insertions(+), 4 deletions(-) New commits: commit 2c80cf671ead686300ea0ece491435c0c67dfc77 Author: Caolán McNamara AuthorDate: Tue Jan 14 15:32:01 2020 + Commit: Caolán McNamara CommitDate: Tue Jan 14 21:25:19 2020 +0100 svmedit2.hxx doesn't need to be a public header Change-Id: I8f193478eb74b544a075b477fbeed5dc5b55402e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86781 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist index eae0f3714d25..34b66374ca7e 100644 --- a/solenv/clang-format/blacklist +++ b/solenv/clang-format/blacklist @@ -6952,7 +6952,6 @@ include/svtools/soerr.hxx include/svtools/statusbarcontroller.hxx include/svtools/stringtransfer.hxx include/svtools/svmedit.hxx -include/svtools/svmedit2.hxx include/svtools/svparser.hxx include/svtools/svtdllapi.h include/svtools/svtresid.hxx @@ -13612,6 +13611,7 @@ svl/unx/source/svdde/ddedummy.cxx svtools/inc/pch/precompiled_svt.cxx svtools/inc/pch/precompiled_svt.hxx svtools/inc/strings.hxx +svtools/inc/svmedit2.hxx svtools/inc/table/defaultinputhandler.hxx svtools/inc/table/gridtablerenderer.hxx svtools/inc/table/tablecontrol.hxx diff --git a/include/svtools/svmedit2.hxx b/svtools/inc/svmedit2.hxx similarity index 98% rename from include/svtools/svmedit2.hxx rename to svtools/inc/svmedit2.hxx index 6387bbd42921..896d13009284 100644 --- a/include/svtools/svmedit2.hxx +++ b/svtools/inc/svmedit2.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SVTOOLS_SVMEDIT2_HXX #define INCLUDED_SVTOOLS_SVMEDIT2_HXX -#include #include class TextAttrib; diff --git a/svtools/source/contnr/DocumentInfoPreview.cxx b/svtools/source/contnr/DocumentInfoPreview.cxx index dd40b569477a..93b8b27e5790 100644 --- a/svtools/source/contnr/DocumentInfoPreview.cxx +++ b/svtools/source/contnr/DocumentInfoPreview.cxx @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/svtools/source/edit/svmedit2.cxx b/svtools/source/edit/svmedit2.cxx index 4687d2535867..fde13f6c7f51 100644 --- a/svtools/source/edit/svmedit2.cxx +++ b/svtools/source/edit/svmedit2.cxx @@ -18,7 +18,7 @@ */ -#include +#include #include #include ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry sw/inc sw/source sw/util
officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu | 11 ++
sw/inc/PageMarginPopup.hxx | 19 +++--
sw/source/uibase/app/swmodule.cxx |1
sw/source/uibase/sidebar/PageMarginControl.cxx |7 +
sw/source/uibase/sidebar/PageMarginControl.hxx |8 +-
sw/source/uibase/sidebar/PageMarginPopup.cxx| 38
+++---
sw/util/sw.component|4 +
7 files changed, 65 insertions(+), 23 deletions(-)
New commits:
commit 776797b6a46fa545a661cc81f51a2be555ecd7fe
Author: Caolán McNamara
AuthorDate: Tue Jan 14 15:56:36 2020 +
Commit: Caolán McNamara
CommitDate: Tue Jan 14 21:25:50 2020 +0100
rework PageMarginPopup to be a PopupWindowController
Change-Id: I60a66b9be14f79cd2968f4bd3d91740137ee9d85
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86782
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
index 228fff941557..e2b1a8c9382d 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
@@ -1206,6 +1206,17 @@
lo.writer.PageColumnToolBoxControl
+
+
+ .uno:PageMargin
+
+
+
+
+
+ lo.writer.PageMarginToolBoxControl
+
+
.uno:FindText
diff --git a/sw/inc/PageMarginPopup.hxx b/sw/inc/PageMarginPopup.hxx
index d06dc3364069..3a31544b74a1 100644
--- a/sw/inc/PageMarginPopup.hxx
+++ b/sw/inc/PageMarginPopup.hxx
@@ -19,21 +19,26 @@
#ifndef INCLUDED_SW_INC_PAGEMARGINPOPUP_HXX
#define INCLUDED_SW_INC_PAGEMARGINPOPUP_HXX
-#include
+#include
#include "swdllapi.h"
-class PageMarginPopup final : public SfxToolBoxControl
+class PageMarginPopup final : public svt::PopupWindowController
{
public:
-SFX_DECL_TOOLBOX_CONTROL();
-
-PageMarginPopup(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx);
+PageMarginPopup(const css::uno::Reference&
rContext);
virtual ~PageMarginPopup() override;
-virtual VclPtr CreatePopupWindow() override;
+using svt::ToolboxController::createPopupWindow;
+virtual VclPtr createPopupWindow( vcl::Window* pParent )
override;
+
+// XServiceInfo
+virtual OUString SAL_CALL getImplementationName() override;
+virtual css::uno::Sequence SAL_CALL getSupportedServiceNames()
override;
+
+// XInitialization
+virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any
>& rArguments ) override;
};
#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/app/swmodule.cxx
b/sw/source/uibase/app/swmodule.cxx
index 9355dcb3f0ec..88a0a53fdf39 100644
--- a/sw/source/uibase/app/swmodule.cxx
+++ b/sw/source/uibase/app/swmodule.cxx
@@ -279,7 +279,6 @@ void SwDLL::RegisterControls()
svx::ParaLeftSpacingControl::RegisterControl(SID_ATTR_PARA_LEFTSPACE,
pMod);
svx::ParaRightSpacingControl::RegisterControl(SID_ATTR_PARA_RIGHTSPACE,
pMod);
svx::ParaFirstLineSpacingControl::RegisterControl(SID_ATTR_PARA_FIRSTLINESPACE,
pMod);
-PageMarginPopup::RegisterControl(SID_ATTR_PAGE_MARGIN, pMod);
PageOrientationPopup::RegisterControl(SID_ATTR_PAGE_ORIENTATION, pMod);
SvxClipBoardControl::RegisterControl(SID_PASTE, pMod );
diff --git a/sw/source/uibase/sidebar/PageMarginControl.cxx
b/sw/source/uibase/sidebar/PageMarginControl.cxx
index 69aa012d7340..587f0262ff13 100644
--- a/sw/source/uibase/sidebar/PageMarginControl.cxx
+++ b/sw/source/uibase/sidebar/PageMarginControl.cxx
@@ -37,6 +37,7 @@
#include
#include
+#include
#include
#include
@@ -93,8 +94,8 @@ namespace
namespace sw { namespace sidebar {
-PageMarginControl::PageMarginControl( sal_uInt16 nId, vcl::Window* pParent )
-: SfxPopupWindow( nId, pParent, "PageMarginControl",
"modules/swriter/ui/pagemargincontrol.ui" )
+PageMarginControl::PageMarginControl(PageMarginPopup* pControl, vcl::Window*
pParent)
+: ToolbarPopup(pControl->getFrameInterface(), pParent,
"PageMarginControl", "modules/swriter/ui/pagemargincontrol.ui")
, m_nPageLeftMargin(0)
, m_nPageRightMargin(0)
, m_nPageTopMargin(0)
@@ -255,7 +256,7 @@ void PageMarginControl::dispose()
m_pWidthHeightField.disposeAndClear();
m_pContainer.disposeAndClear();
-SfxPopupWindow::dispose();
+ToolbarPopup::dispose();
}
void PageMarginControl::SetMetricFieldMaxValues( const Size& rPageSize )
diff --git a/sw/source/uibase/sidebar/PageMarginControl.hxx
b/sw/source/uibase/sidebar/PageMarginControl.hxx
index fe54b4ecf7dd..77f4cdb01593 100644
--- a/sw/source/uibase/sidebar/PageMarginControl.hxx
+++ b/sw/source/uibase/sidebar/PageMarginC
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - writerfilter/source
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 16 +---
writerfilter/source/dmapper/DomainMapper_Impl.hxx |2 +-
2 files changed, 10 insertions(+), 8 deletions(-)
New commits:
commit d8dc16940b71acb0f4d3eda0a716dd4c37f00d37
Author: Michael Stahl
AuthorDate: Tue Jan 14 16:46:58 2020 +0100
Commit: Xisco Faulí
CommitDate: Tue Jan 14 21:20:39 2020 +0100
tdf#129805 writerfilter: fix import of nested generic field
The problem was that the end of the outer nested generic field did not
call PopFieldmark(), so the end of the field was at the end of the
document.
(regression from f610f9b611fe9f206b872ed06f7e859d688385fc)
Change-Id: If5928b14dd35f7dd509370c2b8eef4c31bd149dc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86785
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit cf226535f9903a048b1c105b180ae3a50a776e68)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86797
Reviewed-by: Xisco Faulí
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 0f79bb73334e..4bf56a553924 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -257,7 +257,7 @@ DomainMapper_Impl::DomainMapper_Impl(
m_bStartedTOC(false),
m_bStartIndex(false),
m_bStartBibliography(false),
-m_bStartGenericField(false),
+m_nStartGenericField(0),
m_bTextInserted(false),
m_sCurrentPermId(0),
m_pLastSectionContext( ),
@@ -1870,7 +1870,7 @@ void DomainMapper_Impl::appendTextPortion( const
OUString& rString, const Proper
}
else
{
-if (m_bStartTOC || m_bStartIndex || m_bStartBibliography ||
m_bStartGenericField)
+if (m_bStartTOC || m_bStartIndex || m_bStartBibliography ||
m_nStartGenericField != 0)
{
if (IsInHeaderFooter() && !m_bStartTOCHeaderFooter)
{
@@ -1882,8 +1882,10 @@ void DomainMapper_Impl::appendTextPortion( const
OUString& rString, const Proper
uno::Reference< text::XTextCursor > xTOCTextCursor =
xTextAppend->getEnd()->getText( )->createTextCursor( );
assert(xTOCTextCursor.is());
xTOCTextCursor->gotoEnd(false);
-if (m_bStartGenericField)
+if (m_nStartGenericField != 0)
+{
xTOCTextCursor->goLeft(1, false);
+}
xTextRange = xTextAppend->insertTextPortion(rString,
aValues, xTOCTextCursor);
SAL_WARN_IF(!xTextRange.is(), "writerfilter.dmapper",
"insertTextPortion failed");
if (!xTextRange.is())
@@ -1891,7 +1893,7 @@ void DomainMapper_Impl::appendTextPortion( const
OUString& rString, const Proper
m_bTextInserted = true;
xTOCTextCursor->gotoRange(xTextRange->getEnd(), true);
mxTOCTextCursor = xTOCTextCursor;
-if (!m_bStartGenericField)
+if (m_nStartGenericField == 0)
{
m_aTextAppendStack.push(TextAppendContext(xTextAppend, xTOCTextCursor));
}
@@ -5320,7 +5322,7 @@ void DomainMapper_Impl::CloseFieldCommand()
InsertFieldmark(m_aTextAppendStack, xFormField,
pContext->GetStartRange(),
pContext->GetFieldId());
xFormField->setFieldType(ODF_UNHANDLED);
-m_bStartGenericField = true;
+++m_nStartGenericField;
pContext->SetFormField( xFormField );
uno::Reference const
xNameCont(xFormField->getParameters());
// note: setting the code to empty string is *required* in
@@ -5736,9 +5738,9 @@ void DomainMapper_Impl::PopFieldContext()
}
}
}
-else if(m_bStartGenericField)
+else if (m_nStartGenericField != 0)
{
-m_bStartGenericField = false;
+--m_nStartGenericField;
PopFieldmark(m_aTextAppendStack, xCrsr,
pContext->GetFieldId());
if(m_bTextInserted)
{
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 207fae7750ea..483f8f92715c 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -467,7 +467,7 @@ private:
bool
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk3_kde5/kde5_filepicker.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit a504edb024bb2cbe07e98a0df42efdb2f1a2135b
Author: Stephan Bergmann
AuthorDate: Tue Jan 14 19:46:47 2020 +0100
Commit: Stephan Bergmann
CommitDate: Tue Jan 14 20:44:07 2020 +0100
Silence -Werror,-Wdeprecated-declarations for now
...as seen with qt5-qtbase-devel-5.13.2-1.fc31.x86_64:
> vcl/unx/gtk3_kde5/kde5_filepicker.cxx:233:18: error:
'setConfirmOverwrite' is deprecated: Use setOption(DontConfirmOverwrite,
!enabled) instead [-Werror,-Wdeprecated-declarations]
> _dialog->setConfirmOverwrite(true);
> ^
> /usr/include/qt5/QtWidgets/qfiledialog.h:174:5: note:
'setConfirmOverwrite' has been explicitly marked deprecated here
> QT_DEPRECATED_X("Use setOption(DontConfirmOverwrite, !enabled)
instead")
> ^
Change-Id: I322dda4353a69746cc80afade8206c3cecee8a96
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86799
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/vcl/unx/gtk3_kde5/kde5_filepicker.cxx
b/vcl/unx/gtk3_kde5/kde5_filepicker.cxx
index 064c696953cb..27043053c3da 100644
--- a/vcl/unx/gtk3_kde5/kde5_filepicker.cxx
+++ b/vcl/unx/gtk3_kde5/kde5_filepicker.cxx
@@ -230,7 +230,9 @@ void KDE5FilePicker::initialize(bool saveDialog)
if (saveDialog)
{
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
_dialog->setConfirmOverwrite(true);
+SAL_WNODEPRECATED_DECLARATIONS_POP
_dialog->setFileMode(QFileDialog::AnyFile);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: compilerplugins/clang
compilerplugins/clang/duplicate-defines.cxx | 15 ---
1 file changed, 12 insertions(+), 3 deletions(-)
New commits:
commit b5ed969212e267445e2e2e076321f52b1374b6d2
Author: Noel Grandin
AuthorDate: Wed Dec 18 14:28:58 2019 +0200
Commit: Noel Grandin
CommitDate: Tue Jan 14 20:24:22 2020 +0100
update and enable loplugin:duplicate-defines
Change-Id: I713b9985b2a69fe3c84069f19c772969e2631e46
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85571
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/compilerplugins/clang/duplicate-defines.cxx
b/compilerplugins/clang/duplicate-defines.cxx
index 21caf90a96dd..ba4a69d2f867 100644
--- a/compilerplugins/clang/duplicate-defines.cxx
+++ b/compilerplugins/clang/duplicate-defines.cxx
@@ -73,12 +73,21 @@ void DuplicateDefines::MacroDefined(const Token&
rMacroNameTok, const MacroDirec
return;
if (aMacroName == "rtl")
return;
-// we replicate this macro in all the .hrc files
-if (aMacroName == "NC_")
+// we replicate these macros in all the .hrc files
+if (aMacroName == "NC_" || aMacroName == "NNC_")
return;
// TODO no obvious fix for these
if (aMacroName == "FID_SEARCH_NOW" || aMacroName == "FID_SVX_START" ||
aMacroName == "FN_PARAM")
return;
+// ignore for now, requires adding too many includes to sw/
+if (aMacroName == "MM50")
+return;
+
+// ignore for now, we have the same define in svx and sw, but I can't
remove one of them because
+// they reference strings in different resource bundles
+if (aMacroName == "STR_UNDO_COL_DELETE" || aMacroName ==
"STR_UNDO_ROW_DELETE"
+|| aMacroName == "STR_TABLE_NUMFORMAT" || aMacroName == "STR_DELETE")
+return;
if (!m_aDefMap.emplace(aMacroName, Entry{ aLoc }).second)
{
@@ -99,7 +108,7 @@ void DuplicateDefines::MacroUndefined(const Token&
rMacroNameTok, const MacroDef
m_aDefMap.erase(aMacroName);
}
-loplugin::Plugin::Registration X("duplicatedefines", false);
+loplugin::Plugin::Registration X("duplicatedefines", true);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Error During Building Libre Office on windows 10
while running $ make 2>&1 | tee build.log i am getting a errors.Here is a part of error log.Don't know how to resolve this. Failures !!! Run: 94 Failure total: 1 Failures: 0 Errors: 1 warn:vcl.schedule.deinit:16088:408:vcl/source/app/scheduler.cxx:175: DeInit task: Timer a: 1 p: 1 drawinglayer ImpTimedRefDev destroy mpVirDev 18ms (05398090) warn:vcl.schedule.deinit:16088:408:vcl/source/app/scheduler.cxx:175: DeInit task: Timer a: 1 p: 1 graphic::Manager maSwapOutTimer 1ms (5BA41B30) warn:vcl.schedule.deinit:16088:408:vcl/source/app/scheduler.cxx:196: DeInit active tasks: 2 (ignored: 0) warn:fwk.desktop:16088:408:framework/source/services/desktop.cxx:1060: Desktop disposed before terminating it Error: a unit test failed, please do one of: make CppunitTest_sw_rtfimport CPPUNITTRACE=TRUE # which is a shortcut for the following line make CppunitTest_sw_rtfimport CPPUNITTRACE="'C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/Common7/IDE/devenv.exe' /debugexe" # for interactive debugging in Visual Studio make CppunitTest_sw_rtfimport CPPUNITTRACE="drmemory -free_max_frames 20" # for memory checking (install Dr.Memory first, and put it to your PATH) You can limit the execution to just one particular test by: make CppunitTest_sw_rtfimport CPPUNIT_TEST_NAME="testXYZ" ...above mentioned params... make[1]: *** [C:/cygwin/home/HP/lode/dev/core/solenv/gbuild/CppunitTest.mk:114: C:/cygwin/home/HP/lode/dev/core/workdir/CppunitTest/sw_rtfimport.test] Error 1 make[1]: *** Waiting for unfinished jobs C:/cygwin/home/HP/lode/dev/core/sw/qa/extras/layout/layout.cxx(2192): error C2065: 'Diff': undeclared identifier C:/cygwin/home/HP/lode/dev/core/sw/qa/extras/layout/layout.cxx(2192): error C2146: syntax error: missing ';' before identifier 'view' C:/cygwin/home/HP/lode/dev/core/sw/qa/extras/layout/layout.cxx(2217): error C2065: 'pXmlDoc': undeclared identifier C:/cygwin/home/HP/lode/dev/core/sw/qa/extras/layout/layout.cxx(): error C2065: 'pXmlDoc': undeclared identifier C:/cygwin/home/HP/lode/dev/core/sw/qa/extras/layout/layout.cxx(2236): error C2374: 'xMetaFile': redefinition; multiple initialization C:/cygwin/home/HP/lode/dev/core/sw/qa/extras/layout/layout.cxx(2233): note: see declaration of 'xMetaFile' C:/cygwin/home/HP/lode/dev/core/sw/qa/extras/layout/layout.cxx(2237): error C2086: 'MetafileXmlDump dumper': redefinition C:/cygwin/home/HP/lode/dev/core/sw/qa/extras/layout/layout.cxx(2234): note: see declaration of 'dumper' C:/cygwin/home/HP/lode/dev/core/sw/qa/extras/layout/layout.cxx(2238): error C2100: illegal indirection C:/cygwin/home/HP/lode/dev/core/sw/qa/extras/layout/layout.cxx(2253): error C2059: syntax error: '=' C:/cygwin/home/HP/lode/dev/core/sw/qa/extras/layout/layout.cxx(2259): error C2065: 'pXmlDoc': undeclared identifier C:/cygwin/home/HP/lode/dev/core/sw/qa/extras/layout/layout.cxx(2263): error C2065: 'nYTop': undeclared identifier C:/cygwin/home/HP/lode/dev/core/sw/qa/extras/layout/layout.cxx(2263): error C2660: 'CppUnit::assertDoubleEquals': function does not take 4 arguments C:\cygwin\home\HP\lode\dev\core\workdir\UnpackedTarball\cppunit\include\cppunit/TestAssert.h(181): note: see declaration of 'CppUnit::assertDoubleEquals' make[1]: *** [C:/cygwin/home/HP/lode/dev/core/solenv/gbuild/LinkTarget.mk:296: C:/cygwin/home/HP/lode/dev/core/workdir/CxxObject/sw/qa/extras/layout/layout.o] Error 2 make: *** [Makefile:282: build] Error 2 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] online.git: Branch 'feature/cypress_integration' - 8 commits - cypress_test/cypress.json cypress_test/data cypress_test/.eslintignore cypress_test/.gitignore cypress_test/integra
cypress_test/.eslintignore |2 cypress_test/.gitignore |3 cypress_test/Makefile.am | 56 + cypress_test/README | 15 cypress_test/cypress.json|4 cypress_test/data/desktop/simple.odt |binary cypress_test/data/mobile/empty.odt |binary cypress_test/integration_tests/desktop/example_desktop_test_spec.js | 50 - cypress_test/integration_tests/desktop/example_desktop_test_spec2.js | 50 - cypress_test/integration_tests/mobile/toolbar_spec.js| 392 +- cypress_test/package.json|4 cypress_test/plugins/index.js| 13 cypress_test/plugins/tasks.js| 19 13 files changed, 357 insertions(+), 251 deletions(-) New commits: commit 504cc5296478aee08d53ec3b2bd04e9ea98c4bad Author: Tamás Zolnai AuthorDate: Tue Jan 14 19:37:17 2020 +0100 Commit: Tamás Zolnai CommitDate: Tue Jan 14 19:40:41 2020 +0100 cypress: Introduce make rules for running group of tests. It can handle dependencies and can use environment variables. Change-Id: Ib386cb7019d85b3dbd6c28417b3a481944b18aca diff --git a/cypress_test/Makefile.am b/cypress_test/Makefile.am index 5af4c338e..529939da9 100644 --- a/cypress_test/Makefile.am +++ b/cypress_test/Makefile.am @@ -7,11 +7,34 @@ MOBILE_USER_AGENT = "cypress mobile test" if HAVE_LO_PATH check-local: @JAILS_PATH@ @npm install - @echo "Checking for loleaflet JS errors..." - @NODE_PATH=$(abs_srcdir)/node_modules $(NODE) node_modules/eslint/bin/eslint.js $(abs_srcdir) \ - --ignore-path $(abs_srcdir)/.eslintignore --config $(abs_top_srcdir)/loleaflet/.eslintrc + $(call run_JS_error_check) + $(call start_loolwsd) + $(call run_desktop_tests) + $(call run_mobile_tests) + @pkill loolwsd || true + +check-desktop: @JAILS_PATH@ + @npm install + $(call run_JS_error_check) + $(call start_loolwsd) + $(call run_desktop_tests) + @pkill loolwsd || true + +check-mobile: @JAILS_PATH@ + @npm install + $(call run_JS_error_check) + $(call start_loolwsd) + $(call run_mobile_tests) + @pkill loolwsd || true +define run_JS_error_check + @echo "Checking for cypress JS errors..." + @NODE_PATH=$(abs_srcdir)/node_modules $(NODE) node_modules/eslint/bin/eslint.js $(abs_srcdir) \ + --ignore-path $(abs_srcdir)/.eslintignore --config $(abs_top_srcdir)/loleaflet/.eslintrc @echo +endef + +define start_loolwsd @pkill loolwsd || true @echo "Launching loolwsd for testing.." @fc-cache "@LO_PATH@"/share/fonts/truetype @@ -25,6 +48,10 @@ check-local: @JAILS_PATH@ --o:logging.file[@enable]=true --o:logging.level=trace > /dev/null 2>&1 & @sleep 10 @echo +endef + +define run_desktop_tests + @echo @echo "Running cypress desktop tests..." @echo $(CYPRESS_BINARY) run --browser chrome \ @@ -32,6 +59,9 @@ check-local: @JAILS_PATH@ --headless \ --env DATA_FOLDER=$(abs_srcdir)/data/desktop/,WORKDIR=$(abs_srcdir)/workdir/desktop/ || \ (pkill loolwsd && false) +endef + +define run_mobile_tests @echo @echo "Running cypress mobile tests..." @echo @@ -40,7 +70,8 @@ check-local: @JAILS_PATH@ --headless \ --env DATA_FOLDER=$(abs_srcdir)/data/mobile/,WORKDIR=$(abs_srcdir)/workdir/mobile/ || \ (pkill loolwsd && false) - @pkill loolwsd || true +endef + endif clean-local: diff --git a/cypress_test/README b/cypress_test/README index 86f1c77b2..c5841b9dc 100644 --- a/cypress_test/README +++ b/cypress_test/README @@ -20,11 +20,11 @@ command under cypress_test\ folder. To run all desktop tests: -npm run cyrun_desktop +make check-desktop To run all mobile tests: -npm run cyrun_mobile +make check-mobile To run one specific test suit of desktop tests: commit 2f81c9ebb91ed1d3106a239fdc5ae0180d5e302e Author: Tamás Zolnai AuthorDate: Tue Jan 14 19:14:18 2020 +0100 Commit: Tamás Zolnai CommitDate: Tue Jan 14 19:36:16 2020 +0100 cypress: Use eslint to check coding conventions during build. Use loleaflet's config file to have the same conventions under cypress_test folder too. Update test code to pass esling check. Change-Id: Iade932e6d3cd8941b5fc0897c56c68d2493f0dce diff --git a/cypress_test/.eslintignore b/cypress_test/.eslintignore new file mode 100644 index 0
[Libreoffice-commits] core.git: basctl/source
basctl/source/basicide/baside2b.cxx | 24 +---
1 file changed, 9 insertions(+), 15 deletions(-)
New commits:
commit 9f7ac479ff134d0f9ce65f6f8681e5e7664f357b
Author: Mike Kaganski
AuthorDate: Tue Jan 14 12:19:15 2020 +0300
Commit: Mike Kaganski
CommitDate: Tue Jan 14 19:26:31 2020 +0100
tdf#129360: don't try to use uninitialized objects
And also don't forget to re-initialize member list of watch item.
Another old bug masked by hacks removed in commit
62f3f3d92aa204eaaa063b30d7ade44df501b997. E.g., previously in code
Type t1
var1
var2
End Type
Type t2
var1
var2
var3
End Type
Sub test
Dim v1 As t1, v2 As t2, v
v = v1
v = v2
End Sub
breaking on line 'v = v1', expanding v in Watch, and stepping to next
line, didn't update the children count. After the change, this surfaced,
and now fixed.
Change-Id: Ia47f5363a2fc62042701ff14d084870d1cced392
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86792
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/basctl/source/basicide/baside2b.cxx
b/basctl/source/basicide/baside2b.cxx
index c6c954d36013..7449ba41f197 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -2492,21 +2492,16 @@ void WatchTreeListBox::UpdateWatches( bool
bBasicStopped )
{
if ( pItem->mpObject.is() &&
!pItem->maMemberList.empty() )
{
-bool bObjChanged = false; // Check if member list
has changed
+createAllObjectProperties(pObj);
SbxArray* pProps = pObj->GetProperties();
const sal_uInt32 nPropCount =
getCorrectedPropCount(pProps);
-for( sal_uInt32 i = 0 ; i < nPropCount ; i++ )
+// Check if member list has changed
+bCollapse = pItem->maMemberList.size() !=
nPropCount;
+for( sal_uInt32 i = 0 ; !bCollapse && i <
nPropCount ; i++ )
{
SbxVariable* pVar_ = pProps->Get32( i );
if( pItem->maMemberList[i] != pVar_->GetName()
)
-{
-bObjChanged = true;
-break;
-}
-}
-if( bObjChanged )
-{
-bCollapse = true;
+bCollapse = true;
}
}
@@ -2520,8 +2515,6 @@ void WatchTreeListBox::UpdateWatches( bool bBasicStopped )
if( pItem->mpObject.is() )
{
bCollapse = true;
-pItem->clearWatchItem();
-
implEnableChildren( pEntry, false );
}
}
@@ -2531,8 +2524,6 @@ void WatchTreeListBox::UpdateWatches( bool bBasicStopped )
if( pItem->mpObject.is() )
{
bCollapse = true;
-pItem->clearWatchItem();
-
implEnableChildren( pEntry, false );
}
@@ -2565,6 +2556,7 @@ void WatchTreeListBox::UpdateWatches( bool bBasicStopped )
if( bCollapse )
{
implCollapseModifiedObjectEntry( pEntry, this );
+pItem->clearWatchItem();
}
}
@@ -2573,8 +2565,10 @@ void WatchTreeListBox::UpdateWatches( bool bBasicStopped
)
if( pItem->mpObject.is() || pItem->mpArray.is() )
{
implCollapseModifiedObjectEntry( pEntry, this );
-pItem->mpObject = nullptr;
+pItem->mpObject.clear();
+pItem->mpArray.clear();
}
+pItem->clearWatchItem();
}
SvHeaderTabListBox::SetEntryText( aWatchStr, pEntry, ITEM_ID_VALUE-1 );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - sd/source
sd/source/ui/func/fuolbull.cxx | 15 +--
1 file changed, 9 insertions(+), 6 deletions(-)
New commits:
commit fb842a3daf5c6b9dcbf88a57bf7bf24d87ffbcca
Author: Noel Grandin
AuthorDate: Wed Jan 16 08:56:44 2019 +0200
Commit: Aron Budea
CommitDate: Tue Jan 14 19:15:49 2020 +0100
fix crash in draw Format->Bullets and Numbering dialog
regression from
commit a2b78c131db2bbe3555a89dfae32aefcd00949f5
make Format->Bullets and Numbering dialog async
Change-Id: Ia726612a492e644f5e40e78a3b537c5ed539aef8
Reviewed-on: https://gerrit.libreoffice.org/66423
Reviewed-by: Katarina Behrens
Tested-by: Jenkins
(cherry picked from commit 84acbfd2ef8a895d8689fccfffce03df02240b4e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86784
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Aron Budea
Tested-by: Aron Budea
diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx
index 14dc697e71be..e695eaad8c70 100644
--- a/sd/source/ui/func/fuolbull.cxx
+++ b/sd/source/ui/func/fuolbull.cxx
@@ -95,20 +95,23 @@ void FuOutlineBullet::DoExecute( SfxRequest& rReq )
std::shared_ptr xRequest(new SfxRequest(rReq));
rReq.Ignore(); // the 'old' request is not relevant any more
-pDlg->StartExecuteAsync([this, pDlg, xRequest](sal_Int32 nResult){
+// do not capture this, because this will go way before the dialog
finishes executing
+auto pView = mpView;
+auto pViewShell = mpViewShell;
+pDlg->StartExecuteAsync([pView, pViewShell, pDlg, xRequest](sal_Int32
nResult){
if( nResult == RET_OK )
{
SfxItemSet aSet( *pDlg->GetOutputItemSet() );
-OutlinerView* pOLV = mpView->GetTextEditOutlinerView();
+OutlinerView* pOLV = pView->GetTextEditOutlinerView();
std::unique_ptr> aGuard;
-if (OutlineView* pView = dynamic_cast(mpView))
+if (OutlineView* pOutlineView = dynamic_cast(pView))
{
-pOLV = pView->GetViewByWindow(mpViewShell->GetActiveWindow());
-aGuard.reset(new OutlineViewModelChangeGuard(*pView));
+pOLV =
pOutlineView->GetViewByWindow(pViewShell->GetActiveWindow());
+aGuard.reset(new OutlineViewModelChangeGuard(*pOutlineView));
}
if( pOLV )
@@ -118,7 +121,7 @@ void FuOutlineBullet::DoExecute( SfxRequest& rReq )
/* not direct to pOlView; therefore, SdDrawView::SetAttributes can
catch
changes to master page and redirect to a template */
-mpView->SetAttributes(*xRequest->GetArgs());
+pView->SetAttributes(*xRequest->GetArgs());
}
pDlg->disposeOnce();
});
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 16 +---
writerfilter/source/dmapper/DomainMapper_Impl.hxx |2 +-
2 files changed, 10 insertions(+), 8 deletions(-)
New commits:
commit cf226535f9903a048b1c105b180ae3a50a776e68
Author: Michael Stahl
AuthorDate: Tue Jan 14 16:46:58 2020 +0100
Commit: Michael Stahl
CommitDate: Tue Jan 14 18:56:13 2020 +0100
tdf#129805 writerfilter: fix import of nested generic field
The problem was that the end of the outer nested generic field did not
call PopFieldmark(), so the end of the field was at the end of the
document.
(regression from f610f9b611fe9f206b872ed06f7e859d688385fc)
Change-Id: If5928b14dd35f7dd509370c2b8eef4c31bd149dc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86785
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 3bc15298442f..75b6133e312c 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -261,7 +261,7 @@ DomainMapper_Impl::DomainMapper_Impl(
m_bStartedTOC(false),
m_bStartIndex(false),
m_bStartBibliography(false),
-m_bStartGenericField(false),
+m_nStartGenericField(0),
m_bTextInserted(false),
m_sCurrentPermId(0),
m_pLastSectionContext( ),
@@ -1878,7 +1878,7 @@ void DomainMapper_Impl::appendTextPortion( const
OUString& rString, const Proper
}
else
{
-if (m_bStartTOC || m_bStartIndex || m_bStartBibliography ||
m_bStartGenericField)
+if (m_bStartTOC || m_bStartIndex || m_bStartBibliography ||
m_nStartGenericField != 0)
{
if (IsInHeaderFooter() && !m_bStartTOCHeaderFooter)
{
@@ -1890,15 +1890,17 @@ void DomainMapper_Impl::appendTextPortion( const
OUString& rString, const Proper
uno::Reference< text::XTextCursor > xTOCTextCursor =
xTextAppend->getEnd()->getText( )->createTextCursor( );
assert(xTOCTextCursor.is());
xTOCTextCursor->gotoEnd(false);
-if (m_bStartGenericField)
+if (m_nStartGenericField != 0)
+{
xTOCTextCursor->goLeft(1, false);
+}
xTextRange = xTextAppend->insertTextPortion(rString,
aValues, xTOCTextCursor);
SAL_WARN_IF(!xTextRange.is(), "writerfilter.dmapper",
"insertTextPortion failed");
if (!xTextRange.is())
throw uno::Exception("insertTextPortion failed",
nullptr);
m_bTextInserted = true;
xTOCTextCursor->gotoRange(xTextRange->getEnd(), true);
-if (!m_bStartGenericField)
+if (m_nStartGenericField == 0)
{
m_aTextAppendStack.push(TextAppendContext(xTextAppend, xTOCTextCursor));
}
@@ -5390,7 +5392,7 @@ void DomainMapper_Impl::CloseFieldCommand()
InsertFieldmark(m_aTextAppendStack, xFormField,
pContext->GetStartRange(),
pContext->GetFieldId());
xFormField->setFieldType(ODF_UNHANDLED);
-m_bStartGenericField = true;
+++m_nStartGenericField;
pContext->SetFormField( xFormField );
uno::Reference const
xNameCont(xFormField->getParameters());
// note: setting the code to empty string is *required* in
@@ -5806,9 +5808,9 @@ void DomainMapper_Impl::PopFieldContext()
}
}
}
-else if(m_bStartGenericField)
+else if (m_nStartGenericField != 0)
{
-m_bStartGenericField = false;
+--m_nStartGenericField;
PopFieldmark(m_aTextAppendStack, xCrsr,
pContext->GetFieldId());
if(m_bTextInserted)
{
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 6340b2da34d0..2a512eb44f8e 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -472,7 +472,7 @@ private:
bool
m_bStartedTOC;
bool
m_bStartIndex;
bool
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4-0' - sc/source
sc/source/core/data/table2.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 6515ee03560f8d21f006fa75ffd2dbd4bc15fdc2 Author: Noel Grandin AuthorDate: Mon Jan 13 15:03:10 2020 +0200 Commit: Noel Grandin CommitDate: Tue Jan 14 18:10:19 2020 +0100 tdf#129908 Crash at Data > Group and outlone > AutoOutline regression from commit 7282014e362a1529a36c88eb308df8ed359c2cfa tdf#50916 Makes numbers of columns dynamic. Change-Id: Ie0eff58c7db5a3c85cfea480ca1fea5767fd8cfb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86683 Tested-by: Jenkins Reviewed-by: Noel Grandin (cherry picked from commit b56e0d7f7fb9f1ca9295ac2ba540a3cf778324b9) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86763 Reviewed-by: Xisco Faulí Tested-by: Xisco Faulí Reviewed-by: Michael Stahl diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx index 4c36c7b63494..c35c92ad9be9 100644 --- a/sc/source/core/data/table2.cxx +++ b/sc/source/core/data/table2.cxx @@ -3700,6 +3700,8 @@ void ScTable::DoAutoOutline( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SC bool bFound; ScRange aRef; +nEndCol = ClampToAllocatedColumns(nEndCol); + StartOutlineTable(); // Rows ___ 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
chart2/qa/extras/PivotChartTest.cxx |4 ++-- chart2/source/controller/chartapiwrapper/AreaWrapper.cxx |5 + chart2/source/controller/chartapiwrapper/AxisWrapper.cxx |5 + chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx |5 + chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx |5 + chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx |5 + chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx |5 + chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx |5 + chart2/source/controller/chartapiwrapper/GridWrapper.cxx |5 + chart2/source/controller/chartapiwrapper/LegendWrapper.cxx |5 + chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx |5 + chart2/source/controller/chartapiwrapper/TitleWrapper.cxx |5 + chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx |5 + chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx |5 + chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx |6 +- chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx |5 + chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx |5 + chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx |5 + chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx |5 + chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx |5 + chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx |5 + chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx |5 + chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx |5 + chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx |5 + chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx |5 + chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx |5 + chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx |7 ++- chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx |5 + chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx |5 + chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx |2 +- chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx |2 +- chart2/source/controller/dialogs/dlg_ObjectProperties.cxx |4 ++-- chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx |4 ++-- chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx |4 ++-- chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx |4 ++-- chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx |5 + chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx |3 +-- chart2/source/controller/itemsetwrapper/ItemConverter.cxx |4 ++-- chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx |5 + chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx |4 ++-- chart2/source/controller/itemsetwrapper/MultipleItemConverter.cxx |4 ++-- chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx |5 + chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx |4 ++-- chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx |5 + chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx |5 + chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx |4 ++-- chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx |3 +-- chart2/source/controller/main/ToolbarController.cxx |2 +- chart2/source/controller/main/UndoActions.cxx |5 + chart2/source/controller/sidebar/Chart2PanelFactory.cxx |4 ++-- chart2/source/controller/sidebar/ChartAreaPanel.cxx |4 ++-- chart2/source/contro
[Libreoffice-commits] core.git: vcl/source
vcl/source/treelist/transfer2.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d038e27a98097c40af8bee3e7f24bad715742e91 Author: Andrea Gelmini AuthorDate: Tue Jan 14 09:23:09 2020 +0100 Commit: Andrea Gelmini CommitDate: Tue Jan 14 17:57:08 2020 +0100 Fix typo Change-Id: Ib7906754443db7260b1ef797b9b668be7fda2cc6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86738 Tested-by: Jenkins Reviewed-by: Andrea Gelmini diff --git a/vcl/source/treelist/transfer2.cxx b/vcl/source/treelist/transfer2.cxx index fbb4c2a82768..349b69609910 100644 --- a/vcl/source/treelist/transfer2.cxx +++ b/vcl/source/treelist/transfer2.cxx @@ -468,7 +468,7 @@ Reference GetSystemClipboard() // single-instance service (sysdtrans_component_getFactory, // dtrans/source/win32/clipb/wcbentry.cxx) that needs timely disposing to join a spawned thread // (done in DeInitVCL, vcl/source/app/svmain.cxx), while on other platforms it is implemented as -// a mutli-instance service (ClipboardFactory, vcl/source/components/dtranscomp.cxx) so we +// a multi-instance service (ClipboardFactory, vcl/source/components/dtranscomp.cxx) so we // should not hold on to a single instance here: #if defined _WIN32 DBG_TESTSOLARMUTEX(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: android/lib loleaflet/src wsd/protocol.txt
android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java | 26
++
loleaflet/src/control/Control.MobileWizard.js|5 +
loleaflet/src/core/Socket.js |5 +
wsd/protocol.txt |6 ++
4 files changed, 42 insertions(+)
New commits:
commit 0a35e432ff17b1a80065c36d56069393bfba6bea
Author: Jan Holesovsky
AuthorDate: Tue Jan 14 16:49:36 2020 +0100
Commit: Michael Meeks
CommitDate: Tue Jan 14 17:44:28 2020 +0100
android: When the mobile-wizard is open, the Back button should go a level
up.
Without this, we were closing the document, which was very annoying.
Change-Id: I1e841da28c92c0e01284c2d7e2d4dbc6762bfffd
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/86779
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Michael Meeks
diff --git
a/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
b/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
index 713032122..030f35357 100644
--- a/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
+++ b/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java
@@ -99,6 +99,9 @@ public class LOActivity extends AppCompatActivity {
private Handler nativeHandler;
private Looper nativeLooper;
+/** In case the mobile-wizard is visible, we have to intercept the
Android's Back button. */
+private boolean mMobileWizardVisible = false;
+
private ValueCallback valueCallback;
public static final int REQUEST_SELECT_FILE = 555;
@@ -448,6 +451,18 @@ public class LOActivity extends AppCompatActivity {
}
}
+@Override
+public void onBackPressed() {
+if (mMobileWizardVisible)
+{
+// just return one level up in the mobile-wizard (or close it)
+callFakeWebsocketOnMessage("'mobile: mobilewizardback'");
+return;
+}
+
+super.onBackPressed();
+}
+
private void loadDocument() {
// setup the LOOLWSD
ApplicationInfo applicationInfo = getApplicationInfo();
@@ -596,6 +611,17 @@ public class LOActivity extends AppCompatActivity {
});
return false;
}
+case "MOBILEWIZARD": {
+switch (messageAndParam[1]) {
+case "show":
+mMobileWizardVisible = true;
+break;
+case "hide":
+mMobileWizardVisible = false;
+break;
+}
+return false;
+}
}
return true;
}
diff --git a/loleaflet/src/control/Control.MobileWizard.js
b/loleaflet/src/control/Control.MobileWizard.js
index f186a2412..7b91d1a94 100644
--- a/loleaflet/src/control/Control.MobileWizard.js
+++ b/loleaflet/src/control/Control.MobileWizard.js
@@ -27,6 +27,7 @@ L.Control.MobileWizard = L.Control.extend({
map.on('mobilewizard', this._onMobileWizard, this);
map.on('closemobilewizard', this._hideWizard, this);
map.on('showwizardsidebar', this._showWizardSidebar, this);
+ map.on('mobilewizardback', this.goLevelUp, this);
this._setupBackButton();
},
@@ -58,6 +59,8 @@ L.Control.MobileWizard = L.Control.extend({
_showWizard: function() {
$('#mobile-wizard').show();
$('#toolbar-down').hide();
+ if (window.ThisIsTheAndroidApp)
+ window.postMobileMessage('MOBILEWIZARD show');
},
_showWizardSidebar: function() {
@@ -72,6 +75,8 @@ L.Control.MobileWizard = L.Control.extend({
if (this.map._permission === 'edit') {
$('#toolbar-down').show();
}
+ if (window.ThisIsTheAndroidApp)
+ window.postMobileMessage('MOBILEWIZARD hide');
this.map.showSidebar = false;
this._isActive = false;
diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index 653b71366..a65133d4c 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -755,6 +755,11 @@ L.Socket = L.Class.extend({
vex.closeAll();
}
}
+ else if (window.ThisIsAMobileApp &&
textMsg.startsWith('mobile:')) {
+ // allow passing some events easily from the mobile app
+ var mobileEvent = textMsg.substring('mobile: '.length);
+ this._map.fire(mobileEvent);
+ }
else if (!textMsg.startsWith('tile:') &&
!textMsg.startsWith('renderfont:') && !textMsg.startsWith('windowpaint:')) {
// log the tile msg separately as we need th
[Libreoffice-commits] core.git: cui/source include/vcl sfx2/source vcl/source
cui/source/dialogs/SpellDialog.cxx |6 ++---
include/vcl/edit.hxx |5
include/vcl/specialchars.hxx | 43 +
sfx2/source/appl/appinit.cxx |4 +--
vcl/source/control/edit.cxx| 16 -
vcl/source/edit/vclmedit.cxx |9 ---
6 files changed, 63 insertions(+), 20 deletions(-)
New commits:
commit 2863247598b8d85e9a284575e9b657f360d21c4d
Author: Caolán McNamara
AuthorDate: Tue Jan 14 15:08:03 2020 +
Commit: Caolán McNamara
CommitDate: Tue Jan 14 17:34:47 2020 +0100
move [G|S]etGetSpecialCharsFunction into its own header
so the whole of edit.hxx doesn't need to be included just to set that
detail
Change-Id: I467add023ca59c1ffdccbafb21843cb153ba6a40
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86769
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/source/dialogs/SpellDialog.cxx
b/cui/source/dialogs/SpellDialog.cxx
index 44bca8f89a5b..fd47ab92d728 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -40,7 +40,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
@@ -1501,9 +1501,9 @@ IMPL_LINK(SentenceEditWindow_Impl, ToolbarHdl, const
OString&, rCurItemId, void)
}
else if (rCurItemId == "insert")
{
-if (Edit::GetGetSpecialCharsFunction())
+if (vcl::GetGetSpecialCharsFunction())
{
-OUString aChars =
Edit::GetGetSpecialCharsFunction()(GetDrawingArea(),
m_xEditEngine->GetStandardFont(0));
+OUString aChars =
vcl::GetGetSpecialCharsFunction()(GetDrawingArea(),
m_xEditEngine->GetStandardFont(0));
if (!aChars.isEmpty())
{
ESelection aCurrentSelection(m_xEditView->GetSelection());
diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx
index 2606eb27b9d0..a5f12d44f7b0 100644
--- a/include/vcl/edit.hxx
+++ b/include/vcl/edit.hxx
@@ -50,8 +50,6 @@ struct Impl_IMEInfos;
#define EDIT_NOLIMITSAL_MAX_INT32
-typedef OUString (*FncGetSpecialChars)( weld::Widget* pWin, const vcl::Font&
rFont );
-
class Timer;
class VCL_DLLPUBLIC Edit : public Control, public
vcl::unohelper::DragAndDropClient
@@ -238,9 +236,6 @@ public:
// shows a warning box saying "text too long, truncated"
static void ShowTruncationWarning(weld::Widget* pParent);
-static void SetGetSpecialCharsFunction( FncGetSpecialChars
fn );
-static FncGetSpecialChars GetGetSpecialCharsFunction();
-
VclPtr CreatePopupMenu();
virtual OUString GetSurroundingText() const override;
diff --git a/include/vcl/specialchars.hxx b/include/vcl/specialchars.hxx
new file mode 100644
index ..d310a92a6e0d
--- /dev/null
+++ b/include/vcl/specialchars.hxx
@@ -0,0 +1,43 @@
+/* -*- 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 incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_VCL_SPECIAL_CHARS_HXX
+#define INCLUDED_VCL_SPECIAL_CHARS_HXX
+
+namespace vcl
+{
+class Font;
+}
+
+namespace weld
+{
+class Widget;
+}
+
+typedef OUString (*FncGetSpecialChars)(weld::Widget* pWin, const vcl::Font&
rFont);
+
+namespace vcl
+{
+void VCL_DLLPUBLIC SetGetSpecialCharsFunction(FncGetSpecialChars fn);
+FncGetSpecialChars VCL_DLLPUBLIC GetGetSpecialCharsFunction();
+};
+
+#endif // INCLUDED_VCL_SPECIAL_CHARS_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx
index 5ae244d8e049..472a72e56223 100644
--- a/sfx2/source/appl/appinit.cxx
+++ b/sfx2/source/appl/appinit.cxx
@@ -36,7 +36,7 @@
#include
#include
-#include
+#include
#include
#include
@@ -238,7 +238,7 @@ void SfxApplication::Initialize_Impl()
{
SolarMutexGuard aGuard;
// Set special characters callback on vcl edit control
-Edit::SetGetSpecialCharsFunction(&SfxGetSpecialCharsForEdit);
+vcl::SetGetSpecialCharsFunction(&SfxGetSpecialCharsForEdit);
}
}
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/ed
[Libreoffice-commits] core.git: svx/inc svx/source
svx/inc/pch/precompiled_svx.hxx | 14 +++--- svx/inc/pch/precompiled_svxcore.hxx |8 ++-- svx/source/tbxctrls/layctrl.cxx |6 ++ 3 files changed, 19 insertions(+), 9 deletions(-) New commits: commit 5c093e7e1505e787a5781446aed8add83bf7f55d Author: Caolán McNamara AuthorDate: Tue Jan 14 14:51:40 2020 + Commit: Caolán McNamara CommitDate: Tue Jan 14 17:27:06 2020 +0100 remove unneeded includes and update pch Change-Id: I361eeb1090e4ad9e77681e756ccd25edce3f5a3e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86768 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx index 55710e3fa399..fd54e6804165 100644 --- a/svx/inc/pch/precompiled_svx.hxx +++ b/svx/inc/pch/precompiled_svx.hxx @@ -13,7 +13,7 @@ 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 2019-12-04 09:33:31 using: + Generated on 2020-01-14 14:50:22 using: ./bin/update_pch svx svx --cutoff=3 --exclude:system --exclude:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -78,6 +78,7 @@ #include #include #include +#include #include #include #include @@ -97,24 +98,25 @@ #include #include #include -#include #include #include #include #include +#include #include #include #include #include #include -#include #include #include #include #include #include #include +#include #include +#include #include #include #include @@ -213,6 +215,7 @@ #include #include #include +#include #include #include #include @@ -300,6 +303,8 @@ #include #include #include +#include +#include #include #include #include @@ -314,6 +319,7 @@ #include #include #include +#include #include #include #include @@ -324,6 +330,7 @@ #include #include #include +#include #include #include #include @@ -351,6 +358,7 @@ #include #include #include +#include #include #include #include diff --git a/svx/inc/pch/precompiled_svxcore.hxx b/svx/inc/pch/precompiled_svxcore.hxx index eeeb473d20ca..e1dc18dadb0b 100644 --- a/svx/inc/pch/precompiled_svxcore.hxx +++ b/svx/inc/pch/precompiled_svxcore.hxx @@ -13,7 +13,7 @@ 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 2019-12-04 09:34:08 using: + Generated on 2020-01-14 14:50:28 using: ./bin/update_pch svx svxcore --cutoff=7 --exclude:system --include:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: @@ -105,7 +105,6 @@ #include #include #include -#include #include #include #include @@ -138,6 +137,7 @@ #include #include #include +#include #include #include #include @@ -299,6 +299,9 @@ #include #include #include +#include +#include +#include #include #include #include @@ -332,6 +335,7 @@ #include #include #include +#include #include #include #include diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx index c20e12316306..b9640f16f6a6 100644 --- a/svx/source/tbxctrls/layctrl.cxx +++ b/svx/source/tbxctrls/layctrl.cxx @@ -18,13 +18,11 @@ */ #include -#include -#include -#include -#include #include #include +#include #include +#include #include #include #include ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx svx/source svx/uiconfig
include/svx/layctrl.hxx |1
svx/source/tbxctrls/layctrl.cxx | 166 +++-
svx/uiconfig/ui/tablewindow.ui |2
3 files changed, 82 insertions(+), 87 deletions(-)
New commits:
commit 084549285b1683b0efd6f4301e6350f95bded729
Author: Caolán McNamara
AuthorDate: Tue Jan 14 14:48:04 2020 +
Commit: Caolán McNamara
CommitDate: Tue Jan 14 16:42:20 2020 +0100
weld TableWindow
Change-Id: If3b0f363b8f1f70d7d044a8e75def3fbab3d5e97
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86766
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/include/svx/layctrl.hxx b/include/svx/layctrl.hxx
index e56a95ddc1c8..c66c5e671ac0 100644
--- a/include/svx/layctrl.hxx
+++ b/include/svx/layctrl.hxx
@@ -29,6 +29,7 @@ public:
SvxTableToolBoxControl(const
css::uno::Reference& rContext);
virtual ~SvxTableToolBoxControl() override;
+virtual std::unique_ptr weldPopupWindow() override;
using svt::ToolboxController::createPopupWindow;
virtual VclPtr createPopupWindow( vcl::Window* pParent )
override;
diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx
index e93b02f6428d..c20e12316306 100644
--- a/svx/source/tbxctrls/layctrl.cxx
+++ b/svx/source/tbxctrls/layctrl.cxx
@@ -50,11 +50,12 @@
SFX_IMPL_TOOLBOX_CONTROL(SvxColumnsToolBoxControl,SfxUInt16Item);
namespace {
-class TableWindow final : public svtools::ToolbarPopup
+class TableWindow final : public WeldToolbarPopup
{
private:
-VclPtr aTableButton;
-VclPtr aDrawingArea;
+std::unique_ptr mxTableButton;
+std::unique_ptr mxDrawingArea;
+::Color aFontColor;
::Color aLineColor;
::Color aFillColor;
::Color aHighlightFillColor;
@@ -73,21 +74,23 @@ private:
long mnTableWidth;
long mnTableHeight;
-DECL_LINK( SelectHdl, Button*, void );
+DECL_LINK(SelectHdl, weld::Button&, void);
public:
-TableWindow( SvxTableToolBoxControl* pControl, vcl::Window* pParent,
- const OUString&rCmd,
- const OUString&rText );
-virtual ~TableWindow() override;
-virtual voiddispose() override;
+TableWindow( SvxTableToolBoxControl* pControl, weld::Widget* pParent,
+ const OUString& rCmd);
+virtual void GrabFocus() override
+{
+mxDrawingArea->grab_focus();
+}
DECL_LINK(KeyInputHdl, const KeyEvent& rKEvt, bool);
DECL_LINK(MouseMoveHdl, const MouseEvent&, bool);
DECL_LINK(MouseButtonUpHdl, const MouseEvent&, bool);
+DECL_STATIC_LINK(TableWindow, MouseButtonDownHdl, const MouseEvent&, bool);
+DECL_LINK(ResizeHdl, const Size&, void);
typedef std::pair
target_and_area;
DECL_LINK(PaintHdl, target_and_area, void);
-virtual boolEventNotify( NotifyEvent& rNEvt ) override;
private:
voidUpdate( long nNewCol, long nNewLine );
@@ -102,22 +105,21 @@ const long TableWindow::TABLE_CELLS_HORIZ = 10;
const long TableWindow::TABLE_CELLS_VERT = 15;
-IMPL_LINK_NOARG(TableWindow, SelectHdl, Button*, void)
+IMPL_LINK_NOARG(TableWindow, SelectHdl, weld::Button&, void)
{
CloseAndShowTableDialog();
}
-TableWindow::TableWindow( SvxTableToolBoxControl* pControl, vcl::Window*
pParent, const OUString& rCmd,
- const OUString& rText )
-: ToolbarPopup(pControl->getFrameInterface(), pParent, "TableWindow",
"svx/ui/tablewindow.ui")
-, aTableButton(get("moreoptions"))
-, aDrawingArea(get("table"))
+TableWindow::TableWindow(SvxTableToolBoxControl* pControl, weld::Widget*
pParent, const OUString& rCmd)
+: WeldToolbarPopup(pControl->getFrameInterface(), pParent,
"svx/ui/tablewindow.ui", "TableWindow")
+, mxTableButton(m_xBuilder->weld_button("moreoptions"))
+, mxDrawingArea(m_xBuilder->weld_drawing_area("table"))
, nCol( 0 )
, nLine( 0 )
, maCommand( rCmd )
, mxControl(pControl)
{
-float fScaleFactor = GetDPIScaleFactor();
+float fScaleFactor = mxDrawingArea->get_ref_device().GetDPIScaleFactor();
mnTableCellWidth = 15 * fScaleFactor;
mnTableCellHeight = 15 * fScaleFactor;
@@ -127,52 +129,26 @@ TableWindow::TableWindow( SvxTableToolBoxControl*
pControl, vcl::Window* pParent
const StyleSettings& rStyles =
Application::GetSettings().GetStyleSettings();
svtools::ColorConfig aColorConfig;
-
+aFontColor = aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor;
aLineColor = rStyles.GetShadowColor();
aFillColor = rStyles.GetWindowColor();
aHighlightFillColor = rStyles.GetHighlightColor();
-aBackgroundColor =
aDrawingArea->GetSettings().GetStyleSettings().GetFaceColor();
-
-aDrawingArea->SetBackground( aBackgroundColor );
-vcl::Font aFont = aDrawingArea->GetFont();
-aFont.SetColor( aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor );
-
[Libreoffice-commits] core.git: cppuhelper/source
cppuhelper/source/shlib.cxx | 11 ---
1 file changed, 4 insertions(+), 7 deletions(-)
New commits:
commit 35fbf454055a18c8431808b955b54f2cf3200bb0
Author: Stephan Bergmann
AuthorDate: Tue Jan 14 15:27:56 2020 +0100
Commit: Stephan Bergmann
CommitDate: Tue Jan 14 16:31:57 2020 +0100
Remove unused prefix="direct" feature
It got introduced with b6cebf4a3e2997e6489bba77b358b306f8f435ce "Allow UNO
component libraries to have each implementation in its own function", then
ae3a0c8da50b36db395984637f5ad74d3b4887bc "Add .component https://gerrit.libreoffice.org/c/core/+/86765
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx
index c5979e642393..89ce8b8554db 100644
--- a/cppuhelper/source/shlib.cxx
+++ b/cppuhelper/source/shlib.cxx
@@ -255,20 +255,19 @@ void cppuhelper::detail::loadSharedLibComponentFactory(
if (curEnv.get() != env.get()) {
std::abort();//TODO
}
-OUString name(prefix == "direct" ? implementation : uri);
SAL_INFO("cppuhelper.shlib", "prefix=" << prefix << " implementation="
<< implementation << " uri=" << uri);
lib_to_factory_mapping const * map = lo_get_factory_map();
component_getFactoryFunc fp = 0;
for (int i = 0; map[i].name != 0; ++i) {
-if (name.equalsAscii(map[i].name)) {
+if (uri.equalsAscii(map[i].name)) {
fp = map[i].component_getFactory_function;
break;
}
}
if (fp == 0) {
-SAL_WARN("cppuhelper", "unknown factory name \"" << name << "\"");
+SAL_WARN("cppuhelper", "unknown factory name \"" << uri << "\"");
throw css::loader::CannotActivateFactoryException(
-"unknown factory name \"" + name + "\"",
+"unknown factory name \"" + uri + "\"",
css::uno::Reference());
}
*factory = invokeComponentFactory(
@@ -301,9 +300,7 @@ void cppuhelper::detail::loadSharedLibComponentFactory(
if (constructor.isEmpty()) {
OUString sym;
SAL_INFO("cppuhelper.shlib", "prefix=" << prefix << " implementation="
<< implementation << " uri=" << uri);
-if (prefix == "direct") {
-sym = implementation.replace('.', '_') + "_" COMPONENT_GETFACTORY;
-} else if (!prefix.isEmpty()) {
+if (!prefix.isEmpty()) {
sym = prefix + "_" COMPONENT_GETFACTORY;
} else {
sym = COMPONENT_GETFACTORY;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx officecfg/registry sd/source svx/source svx/uiconfig svx/UIConfig_svx.mk svx/util sw/source
include/svx/layctrl.hxx | 23 -
officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu | 22 +
sd/source/ui/app/sddll.cxx |1
svx/UIConfig_svx.mk |1
svx/source/tbxctrls/layctrl.cxx | 220
--
svx/uiconfig/ui/tablewindow.ui | 58 ++
svx/util/svx.component |4
sw/source/uibase/app/swmodule.cxx |2
8 files changed, 205 insertions(+), 126 deletions(-)
New commits:
commit 1e5edbc5ac1be50c68a670879bd9c64514cf2f58
Author: Caolán McNamara
AuthorDate: Tue Jan 14 13:00:21 2020 +
Commit: Caolán McNamara
CommitDate: Tue Jan 14 16:25:20 2020 +0100
rework SvxTableToolBoxControl as PopupWindowController
and refactor its drawing into a DrawingArea widget
Change-Id: Iecaef02fcfaa04b3096d80c3fc2648690a190bd9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86762
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/include/svx/layctrl.hxx b/include/svx/layctrl.hxx
index cdc99c3c3f8a..e56a95ddc1c8 100644
--- a/include/svx/layctrl.hxx
+++ b/include/svx/layctrl.hxx
@@ -20,23 +20,24 @@
#define INCLUDED_SVX_LAYCTRL_HXX
#include
+#include
#include
-class SVX_DLLPUBLIC SvxTableToolBoxControl final : public SfxToolBoxControl
+class SVX_DLLPUBLIC SvxTableToolBoxControl final : public
svt::PopupWindowController
{
-private:
-boolbEnabled;
-
public:
-virtual VclPtr CreatePopupWindow() override;
-virtual voidStateChanged( sal_uInt16 nSID,
- SfxItemState eState,
- const SfxPoolItem* pState )
override;
+SvxTableToolBoxControl(const
css::uno::Reference& rContext);
+virtual ~SvxTableToolBoxControl() override;
-SFX_DECL_TOOLBOX_CONTROL();
+using svt::ToolboxController::createPopupWindow;
+virtual VclPtr createPopupWindow( vcl::Window* pParent )
override;
-SvxTableToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx
);
-virtual ~SvxTableToolBoxControl() override;
+// XServiceInfo
+virtual OUString SAL_CALL getImplementationName() override;
+virtual css::uno::Sequence SAL_CALL getSupportedServiceNames()
override;
+
+// XInitialization
+virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any
>& rArguments ) override;
};
class SVX_DLLPUBLIC SvxColumnsToolBoxControl final : public SfxToolBoxControl
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
index 4505585ab748..228fff941557 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
@@ -965,6 +965,28 @@
com.sun.star.comp.svx.NumberingToolBoxControl
+
+
+ .uno:InsertTable
+
+
+
+
+
+ com.sun.star.comp.svx.TableToolBoxControl
+
+
+
+
+ .uno:ShowMultiplePages
+
+
+
+
+
+ com.sun.star.comp.svx.TableToolBoxControl
+
+
.uno:ExtrusionDirectionFloater
diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx
index 0e63a002a6f6..5cfa2930a9de 100644
--- a/sd/source/ui/app/sddll.cxx
+++ b/sd/source/ui/app/sddll.cxx
@@ -220,7 +220,6 @@ void SdDLL::RegisterControllers(SdModule* pMod)
#endif
XmlSecStatusBarControl::RegisterControl( SID_SIGNATURE, pMod );
SdTemplateControl::RegisterControl( SID_STATUS_LAYOUT, pMod );
-SvxTableToolBoxControl::RegisterControl(SID_INSERT_TABLE, pMod );
SvxTbxCtlDraw::RegisterControl(SID_INSERT_DRAW, pMod );
EmojiPopup::RegisterControl(SID_EMOJI_CONTROL, pMod );
diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk
index f81460e52571..9aab9fc7f467 100644
--- a/svx/UIConfig_svx.mk
+++ b/svx/UIConfig_svx.mk
@@ -102,6 +102,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/sidebarstylespanel \
svx/uiconfig/ui/sidebartextpanel \
svx/uiconfig/ui/stylemenu \
+ svx/uiconfig/ui/tablewindow \
svx/uiconfig/ui/textcharacterspacingcontrol \
svx/uiconfig/ui/textcontrolchardialog \
svx/uiconfig/ui/textcontrolparadialog \
diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx
index 14289e2fd704..e93b02f6428d 100644
--- a/svx/source/tbxctrls/layctrl.cxx
+++ b/svx/source/tbxctrls/layctrl.cxx
@@ -19,6 +19,7 @@
#include
#include
+#include
#include
#include
#include
@@ -34,6 +35,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -4
[Libreoffice-commits] core.git: sw/inc
sw/inc/pch/precompiled_sw.hxx | 41 +--- sw/inc/pch/precompiled_swui.hxx |6 - 2 files changed, 15 insertions(+), 32 deletions(-) New commits: commit 440aac4e8c89029d6e7c09cd2a97d71674ed920a Author: Caolán McNamara AuthorDate: Tue Jan 14 11:51:08 2020 + Commit: Caolán McNamara CommitDate: Tue Jan 14 16:24:59 2020 +0100 update pch Change-Id: I5beb99f417b7a29fb0b985e01e4ac56565a3852d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86761 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx index b0837ccab492..3e2c13b5950f 100644 --- a/sw/inc/pch/precompiled_sw.hxx +++ b/sw/inc/pch/precompiled_sw.hxx @@ -13,7 +13,7 @@ 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 2019-12-04 09:34:32 using: + Generated on 2020-01-14 11:50:23 using: ./bin/update_pch sw sw --cutoff=7 --exclude:system --exclude:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -24,12 +24,12 @@ #include #include #include -#include #include #include #include #include #include +#include #include #include #include @@ -69,7 +69,6 @@ #include #include #include -#include #include #include #include @@ -85,9 +84,7 @@ #include #include #include -#include #include -#include #include #include #include @@ -100,7 +97,6 @@ #include #include #include -#include #include #include #include @@ -141,6 +137,7 @@ #include #include #include +#include #include #include #include @@ -149,11 +146,9 @@ #include #include #include -#include #include #include #include -#include #include #include #include @@ -166,7 +161,6 @@ #include #include #include -#include #include #include #include @@ -183,6 +177,8 @@ #include #include #include +#include +#include #include #include #include @@ -209,6 +205,8 @@ #include #include #include +#include +#include #include #include #include @@ -229,7 +227,6 @@ #include #include #include -#include #include #include #include @@ -268,20 +265,18 @@ #include #include #include -#include #include #include #include +#include #include #include #include #include #include -#include #include #include #include -#include #include #include #include @@ -304,7 +299,6 @@ #include #include #include -#include #include #include #include @@ -339,30 +333,22 @@ #include #include #include -#include #include #include #include #include #include #include -#include #include #include -#include #include -#include -#include #include #include #include -#include #include #include #include #include -#include -#include #include #include #include @@ -381,6 +367,7 @@ #include #include #include +#include #include #include #include @@ -394,6 +381,7 @@ #include #include #include +#include #include #include #include @@ -407,7 +395,6 @@ #include #include #include -#include #include #include #include @@ -510,7 +497,6 @@ #include #include #include -#include #include #include #include @@ -533,11 +519,8 @@ #include #include #include -#include #include #include -#include -#include #include #include #include @@ -546,7 +529,6 @@ #include #include #include -#include #include #include #include @@ -565,10 +547,8 @@ #include #include #include -#include #include #include -#include #include #include #include @@ -580,7 +560,6 @@ #include #include #include -#include #include #include #include diff --git a/sw/inc/pch/precompiled_swui.hxx b/sw/inc/pch/precompiled_swui.hxx index d9e37e724536..4a7b9755c3d9 100644 --- a/sw/inc/pch/precompiled_swui.hxx +++ b/sw/inc/pch/precompiled_swui.hxx @@ -13,7 +13,7 @@ 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 2019-12-03 09:24:24 using: + Generated on 2020-01-14 11:50:28 using: ./bin/update_pch sw swui --cutoff=3 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -313,6 +313,9 @@ #include #include #include +#include +#include +#include #include #include #include @@ -403,6 +406,7 @@ #include #include #include +#include #include #include #include ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/xmloff svx/source xmloff/source
include/xmloff/xmltoken.hxx|6 ++
svx/source/inc/xmlxtimp.hxx|5 -
svx/source/xml/xmlxtimp.cxx| 108 ++---
xmloff/source/core/xmltoken.cxx|6 ++
xmloff/source/style/ImageStyle.cxx |2
xmloff/source/token/tokens.txt |6 ++
6 files changed, 86 insertions(+), 47 deletions(-)
New commits:
commit f88dfa135950acdd51d3f9693720507bc35b5a5a
Author: Noel Grandin
AuthorDate: Tue Jan 14 12:04:53 2020 +0200
Commit: Noel Grandin
CommitDate: Tue Jan 14 15:49:28 2020 +0100
use FastParser APIs in SvxXMLXTableImport
Change-Id: I744943bdcdecc10219898d23038eb5d0c2dfb5d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85479
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index 1175958548ff..f6695d54de3e 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -314,6 +314,7 @@ namespace xmloff { namespace token {
XML_BIBLIOGRAPHY_TYPE,
XML_BIND_STYLES_TO_CONTENT,
XML_BITMAP,
+XML_BITMAP_TABLE,
XML_BLACK,
XML_BLEND,
XML_BLINKING,
@@ -435,6 +436,7 @@ namespace xmloff { namespace token {
XML_COLOR_MODE,
XML_COLOR_SCALE,
XML_COLOR_SCALE_ENTRY,
+XML_COLOR_TABLE,
XML_COLUMN,
XML_COLUMN_COUNT,
XML_COLUMN_GAP,
@@ -546,6 +548,7 @@ namespace xmloff { namespace token {
XML_DASH,
XML_DASH_DOT,
XML_DASH_DOT_DOT,
+XML_DASH_TABLE,
XML_DASHED,
XML_DATA,
XML_DATA_BAR,
@@ -930,6 +933,7 @@ namespace xmloff { namespace token {
XML_GRADIENT_BORDER,
XML_GRADIENT_STEP_COUNT,
XML_GRADIENT_STYLE,
+XML_GRADIENT_TABLE,
XML_GRADIENTSTYLE_AXIAL,
XML_GRADIENTSTYLE_ELLIPSOID,
XML_GRADIENTSTYLE_LINEAR,
@@ -956,6 +960,7 @@ namespace xmloff { namespace token {
XML_HATCH,
XML_HATCH_DISTANCE,
XML_HATCH_STYLE,
+XML_HATCH_TABLE,
XML_HATCHSTYLE_DOUBLE,
XML_HATCHSTYLE_SINGLE,
XML_HATCHSTYLE_TRIPLE,
@@ -1197,6 +1202,7 @@ namespace xmloff { namespace token {
XML_MARKER_START,
XML_MARKER_START_CENTER,
XML_MARKER_START_WIDTH,
+XML_MARKER_TABLE,
XML_MAROON,
XML_MASTER_PAGE,
XML_MASTER_PAGE_NAME,
diff --git a/svx/source/inc/xmlxtimp.hxx b/svx/source/inc/xmlxtimp.hxx
index 600b32f23adc..e52e8b0178f3 100644
--- a/svx/source/inc/xmlxtimp.hxx
+++ b/svx/source/inc/xmlxtimp.hxx
@@ -45,9 +45,8 @@ public:
const css::uno::Reference<
css::container::XNameContainer >& xTable,
bool *bOptLoadedFromStorage ) throw();
protected:
-virtual SvXMLImportContext *CreateDocumentContext( sal_uInt16 nPrefix,
- const OUString& rLocalName,
- const css::uno::Reference<
css::xml::sax::XAttributeList >& xAttrList ) override;
+virtual SvXMLImportContext *CreateFastContext( sal_Int32 Element,
+const ::css::uno::Reference< ::css::xml::sax::XFastAttributeList >&
xAttrList ) override;
private:
const css::uno::Reference< css::container::XNameContainer > & mrTable;
diff --git a/svx/source/xml/xmlxtimp.cxx b/svx/source/xml/xmlxtimp.cxx
index 548f3c7009aa..8bd042570309 100644
--- a/svx/source/xml/xmlxtimp.cxx
+++ b/svx/source/xml/xmlxtimp.cxx
@@ -52,6 +52,7 @@
#include
#include
+#include
#include
@@ -72,10 +73,15 @@ enum class SvxXMLTableImportContextEnum { Color, Marker,
Dash, Hatch, Gradient,
class SvxXMLTableImportContext : public SvXMLImportContext
{
public:
-SvxXMLTableImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const
OUString& rLName, SvxXMLTableImportContextEnum eContext, const uno::Reference<
XNameContainer >& xTable,
+SvxXMLTableImportContext( SvXMLImport& rImport,
SvxXMLTableImportContextEnum eContext, const uno::Reference< XNameContainer >&
xTable,
bool bOOoFormat );
-virtual SvXMLImportContextRef CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList )
override;
+virtual void SAL_CALL startFastElement( sal_Int32 /*nElement*/,
+const css::uno::Reference< css::xml::sax::XFastAttributeList
>& ) override {}
+
+virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL
+createFastChildContext(sal_Int32 Element,
+const css::uno::Reference< css::xml::sax::XFastAttributeList > &
Attribs) override;
protected:
void importColor( const uno::Reference< XAttributeList >& xAttrList, Any&
rAny, OUString& rName );
@@ -93,27 +99,36 @@ private:
}
-SvxXMLTableImportContext::SvxXMLTableImportContext( SvXMLImport& rImport,
sal_uInt16 nPrfx, const OUString& rLName, SvxXMLTableImportContextEnum
eContext
[Libreoffice-commits] core.git: basic/source bridges/source canvas/source
basic/source/basmgr/vbahelper.cxx|4 +---
bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx |4 ++--
bridges/source/cpp_uno/shared/bridge.cxx |4 ++--
bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx |4 ++--
bridges/source/cpp_uno/shared/types.cxx |4 ++--
bridges/source/cpp_uno/shared/unointerfaceproxy.cxx |4 ++--
bridges/source/cpp_uno/shared/vtables.cxx|4 ++--
canvas/source/tools/canvastools.cxx |8 ++--
canvas/source/tools/elapsedtime.cxx |4 +---
canvas/source/tools/verifyinput.cxx |8 ++--
canvas/source/vcl/impltools.cxx |5 +
11 files changed, 19 insertions(+), 34 deletions(-)
New commits:
commit 9a578e9861d930782fd9432e79741d3378a30589
Author: Noel Grandin
AuthorDate: Tue Jan 14 15:21:05 2020 +0200
Commit: Noel Grandin
CommitDate: Tue Jan 14 15:49:03 2020 +0100
clang-tidy modernize-concat-nested-namespace in basic..canvas
Change-Id: I74a575e6ca7829ee252c0e315fc337ea223c944f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86758
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/basic/source/basmgr/vbahelper.cxx
b/basic/source/basmgr/vbahelper.cxx
index 93b401bf9ed0..c0827dd92a24 100644
--- a/basic/source/basmgr/vbahelper.cxx
+++ b/basic/source/basmgr/vbahelper.cxx
@@ -29,8 +29,7 @@
#include
#include
-namespace basic {
-namespace vba {
+namespace basic::vba {
using namespace ::com::sun::star;
@@ -183,7 +182,6 @@ void registerCurrentDirectory( const uno::Reference<
frame::XModel >& rxModel, c
}
-} // namespace vba
} // namespace basic
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
index 80cae5ad699b..496702120ab4 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx
@@ -300,7 +300,7 @@ static void cpp_call(
}
-namespace bridges { namespace cpp_uno { namespace shared {
+namespace bridges::cpp_uno::shared {
void unoInterfaceProxyDispatch(
uno_Interface * pUnoI, const typelib_TypeDescription * pMemberDescr,
@@ -432,6 +432,6 @@ void unoInterfaceProxyDispatch(
}
}
-} } }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/shared/bridge.cxx
b/bridges/source/cpp_uno/shared/bridge.cxx
index 186d89aa1956..007373448bb3 100644
--- a/bridges/source/cpp_uno/shared/bridge.cxx
+++ b/bridges/source/cpp_uno/shared/bridge.cxx
@@ -31,7 +31,7 @@
#include
#include
-namespace bridges { namespace cpp_uno { namespace shared {
+namespace bridges::cpp_uno::shared {
void freeMapping(uno_Mapping * pMapping)
{
@@ -205,6 +205,6 @@ Bridge::~Bridge()
(*pCppEnv->aBase.release)( &pCppEnv->aBase );
}
-} } }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx
b/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx
index 29b035fec3ab..e4ee7800a385 100644
--- a/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx
+++ b/bridges/source/cpp_uno/shared/cppinterfaceproxy.cxx
@@ -29,7 +29,7 @@
#include
#include
-namespace bridges { namespace cpp_uno { namespace shared {
+namespace bridges::cpp_uno::shared {
void freeCppInterfaceProxy(uno_ExtEnvironment * pEnv, void * pInterface)
{
@@ -138,6 +138,6 @@ CppInterfaceProxy *
CppInterfaceProxy::castInterfaceToProxy(void * pInterface)
static_cast< char * >(pInterface) - offset);
}
-} } }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/shared/types.cxx
b/bridges/source/cpp_uno/shared/types.cxx
index a22e3307173f..61dc3dabec88 100644
--- a/bridges/source/cpp_uno/shared/types.cxx
+++ b/bridges/source/cpp_uno/shared/types.cxx
@@ -23,7 +23,7 @@
#include
#include
-namespace bridges { namespace cpp_uno { namespace shared {
+namespace bridges::cpp_uno::shared {
bool isSimpleType(typelib_TypeClass typeClass) {
return typeClass <= typelib_TypeClass_DOUBLE
@@ -112,6 +112,6 @@ bool relatesToInterfaceType(typelib_TypeDescription const *
type) {
return false;
}
-} } }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/bridges/source/cpp_uno/shared/unointerfaceproxy.cxx
b/bridges/source/cpp_uno/shared/unointerfaceproxy.cxx
index 42037afe6e54..c3c560acb7de 100644
--- a/bridges/source/cpp_uno/shared/unointerfaceproxy.cxx
+++ b/bridges/source/cpp_uno/shared/unointerfaceproxy.cxx
@@ -25,7 +25,7 @@
#include
#include
-namespace bridges { namespace cpp_uno { namespace shared {
+namespace bridges::cpp_uno::shared {
void freeUnoInterfaceProxy(uno_ExtEnvironment * pEnv, void * pProxy)
{
@@ -120,6 +120,6 @@ UnoInterfaceProxy::UnoInterfaceProxy(
UnoInterfaceProxy::~UnoInterfaceProxy()
{}
-} } }
[Libreoffice-commits] core.git: sw/source
sw/source/filter/html/wrthtml.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 03fd45dce6afa83fc1fcbcd890edb36affd61981 Author: Miklos Vajna AuthorDate: Tue Jan 14 10:44:34 2020 +0100 Commit: Miklos Vajna CommitDate: Tue Jan 14 15:32:33 2020 +0100 sw html filter: rework Yoda-style comments Change-Id: Ia71769f19298331c674120a3d413b85201a03e6d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86747 Reviewed-by: Miklos Vajna Tested-by: Jenkins diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx index 0aae69b16f93..744da9ec6257 100644 --- a/sw/source/filter/html/wrthtml.cxx +++ b/sw/source/filter/html/wrthtml.cxx @@ -1052,7 +1052,7 @@ const SwPageDesc *SwHTMLWriter::MakeHeader( sal_uInt16 &rHeaderAttrs ) } // and now ... the BASIC and JavaScript! -if( m_pDoc->GetDocShell() ) // only with DocShell BASIC is possible +if( m_pDoc->GetDocShell() ) // BASIC is possible only in case we have a DocShell OutBasic(*this); DecIndentLevel(); // indent content of @@ -1094,7 +1094,7 @@ const SwPageDesc *SwHTMLWriter::MakeHeader( sal_uInt16 &rHeaderAttrs ) OutCSS1_BodyTagStyleOpt( *this, rItemSet ); } // append events -if( m_pDoc->GetDocShell() ) // only with DocShell BASIC is possible +if( m_pDoc->GetDocShell() ) // BASIC is possible only in case we have a DocShell OutBasicBodyEvents(); Strm().WriteChar( '>' ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0-29' - vcl/source
vcl/source/window/paint.cxx |6 +-
vcl/source/window/window2.cxx |5 +++--
2 files changed, 8 insertions(+), 3 deletions(-)
New commits:
commit 1ba5340970b56e271f9e72935c9d7d2c54eb
Author: Michael Meeks
AuthorDate: Fri Jan 10 12:42:30 2020 +
Commit: Jan Holesovsky
CommitDate: Tue Jan 14 15:29:29 2020 +0100
lok: avoid emission storms of un-necessary invalidations.
Common when constructing widgets with VclBuilder - which avoids
the 'Show' detection Pranav introduced in 8de98e61fbc.
This saves ~80% of the ~100k mostly bogus calls I get to:
desktop::CallbackFlushHandler::processWindowEvent when opening
and closing a few windows.
Change-Id: Ie508d6e19274472b85543275aee33f078ddcbbb2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86537
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index 6fd447cbce70..7d031fcc1b2a 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -1218,6 +1218,10 @@ void Window::LogicInvalidate(const tools::Rectangle*
pRectangle)
if (comphelper::LibreOfficeKit::isDialogPainting() ||
!comphelper::LibreOfficeKit::isActive())
return;
+Size aSize = GetSizePixel();
+if (aSize.getWidth() <= 0 || aSize.getHeight() <= 0)
+return;
+
if (const vcl::ILibreOfficeKitNotifier* pNotifier = GetLOKNotifier())
{
// In case we are routing the window, notify the client
@@ -1226,7 +1230,7 @@ void Window::LogicInvalidate(const tools::Rectangle*
pRectangle)
aPayload.push_back(std::make_pair(OString("rectangle"),
pRectangle->toString()));
else
{
-const tools::Rectangle aRect(Point(0, 0), GetSizePixel());
+const tools::Rectangle aRect(Point(0, 0), aSize);
aPayload.push_back(std::make_pair(OString("rectangle"),
aRect.toString()));
}
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 214226a9ae4f..7729f42db6b7 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -1406,10 +1406,11 @@ void Window::queue_resize(StateChangedType eReason)
if (pBorderWindow)
pBorderWindow->Resize();
}
-
if (VclPtr pParent = GetParentWithLOKNotifier())
{
-if (!pParent->IsInInitShow())
+Size aSize = GetSizePixel();
+if (aSize.getWidth() > 0 && aSize.getHeight() > 0 &&
+!pParent->IsInInitShow())
LogicInvalidate(nullptr);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/inc include/svtools
framework/inc/classes/actiontriggercontainer.hxx |2 +- framework/inc/classes/actiontriggerpropertyset.hxx|2 +- framework/inc/classes/actiontriggerseparatorpropertyset.hxx |2 +- framework/inc/classes/imagewrapper.hxx|2 +- framework/inc/classes/rootactiontriggercontainer.hxx |2 +- framework/inc/dispatch/closedispatcher.hxx|2 +- framework/inc/dispatch/dispatchinformationprovider.hxx|2 +- framework/inc/dispatch/dispatchprovider.hxx |5 ++--- framework/inc/dispatch/interceptionhelper.hxx |4 ++-- framework/inc/dispatch/mailtodispatcher.hxx |2 +- framework/inc/dispatch/oxt_handler.hxx|2 +- framework/inc/dispatch/servicehandler.hxx |2 +- framework/inc/dispatch/startmoduledispatcher.hxx |2 +- framework/inc/dispatch/systemexec.hxx |2 +- framework/inc/helper/dockingareadefaultacceptor.hxx |2 +- framework/inc/helper/mischelper.hxx |6 +++--- framework/inc/helper/ocomponentaccess.hxx |6 ++ framework/inc/helper/persistentwindowstate.hxx|2 +- framework/inc/helper/statusindicator.hxx |2 +- framework/inc/helper/statusindicatorfactory.hxx |5 ++--- framework/inc/helper/tagwindowasmodified.hxx |2 +- framework/inc/helper/titlebarupdate.hxx |2 +- framework/inc/helper/vclstatusindicator.hxx |2 +- framework/inc/helper/wakeupthread.hxx |2 +- framework/inc/interaction/quietinteraction.hxx|2 +- framework/inc/jobs/helponstartup.hxx |2 +- framework/inc/jobs/job.hxx|2 +- framework/inc/jobs/shelljob.hxx |2 +- framework/inc/recording/dispatchrecorder.hxx |2 +- framework/inc/recording/dispatchrecordersupplier.hxx |2 +- framework/inc/services/desktop.hxx|9 ++--- framework/inc/services/mediatypedetectionhelper.hxx |2 +- framework/inc/services/uriabbreviation.hxx|2 +- framework/inc/tabwin/tabwinfactory.hxx|2 +- framework/inc/uiconfiguration/graphicnameaccess.hxx |2 +- framework/inc/uiconfiguration/imagemanager.hxx|2 +- framework/inc/uiconfiguration/moduleimagemanager.hxx |2 +- framework/inc/uielement/FixedImageToolbarController.hxx |6 ++ framework/inc/uielement/FixedTextToolbarController.hxx|5 ++--- framework/inc/uielement/addonstoolbarwrapper.hxx |2 +- framework/inc/uielement/buttontoolbarcontroller.hxx |2 +- framework/inc/uielement/comboboxtoolbarcontroller.hxx |5 ++--- framework/inc/uielement/constitemcontainer.hxx|2 +- framework/inc/uielement/dropdownboxtoolbarcontroller.hxx |5 ++--- framework/inc/uielement/edittoolbarcontroller.hxx |5 ++--- framework/inc/uielement/fontmenucontroller.hxx|2 +- framework/inc/uielement/fontsizemenucontroller.hxx|2 +- framework/inc/uielement/footermenucontroller.hxx |2 +- framework/inc/uielement/generictoolbarcontroller.hxx |2 +- framework/inc/uielement/imagebuttontoolbarcontroller.hxx |5 ++--- framework/inc/uielement/itemcontainer.hxx |2 +- framework/inc/uielement/langselectionmenucontroller.hxx |2 +- framework/inc/uielement/macrosmenucontroller.hxx |2 +- framework/inc/uielement/menubarwrapper.hxx|2 +- framework/inc/uielement/newmenucontroller.hxx |2 +- framework/inc/uielement/progressbarwrapper.hxx|2 +- framework/inc/uielement/spinfieldtoolbarcontroller.hxx|5 ++--- framework/inc/uielement/statusbaritem.hxx |2 +- framework/inc/uielement/statusbarwrapper.hxx |2 +- framework/inc/uielement/statusindicatorinterfacewrapper.hxx |2 +- framework/inc/uielement/styletoolbarcontroller.hxx|4 ++-- framework/inc/uielement/togglebuttontoolbarcontroller.hxx |5 ++--- framework/inc/uielement/toolbarmodemenucontroller.hxx |2 +- framework/inc/uielement/toolbarsmenucontroller.hxx|2 +- framework/inc/uielement/toolbarwrapper.hxx|7 ++- framework/inc/uifactory/configurationaccessfactorymanager.hxx |2 +- framework/inc/uifactory/factoryconfiguration.hxx |2 +- framework/inc/xml/acceleratorconfigurationreader.hxx
[Libreoffice-commits] core.git: avmedia/source
avmedia/source/gstreamer/gstframegrabber.cxx |3 +--
avmedia/source/gstreamer/gstmanager.cxx |3 +--
avmedia/source/gstreamer/gstplayer.cxx |3 +--
avmedia/source/gstreamer/gstwindow.cxx |3 +--
avmedia/source/viewer/mediaevent_impl.cxx|3 +--
avmedia/source/viewer/mediawindow_impl.cxx |3 +--
avmedia/source/vlc/vlcframegrabber.cxx |4 +---
avmedia/source/vlc/vlcmanager.cxx|4 +---
avmedia/source/vlc/vlcplayer.cxx |4 +---
avmedia/source/vlc/vlcwindow.cxx |4 +---
avmedia/source/vlc/wrapper/Common.cxx|8 +---
avmedia/source/vlc/wrapper/EventHandler.cxx |8 +---
avmedia/source/vlc/wrapper/EventManager.cxx |8 +---
avmedia/source/vlc/wrapper/Instance.cxx |8 +---
avmedia/source/vlc/wrapper/Media.cxx |8 +---
avmedia/source/vlc/wrapper/Player.cxx|8 +---
16 files changed, 16 insertions(+), 66 deletions(-)
New commits:
commit af4f3bd896bb554b71972da5379a490b869f24bb
Author: Noel Grandin
AuthorDate: Tue Jan 14 15:11:02 2020 +0200
Commit: Noel Grandin
CommitDate: Tue Jan 14 15:19:16 2020 +0100
clang-tidy modernize-concat-nested-namespace in avmedia
Change-Id: I2ac6de9e56bf94b81602bd841383d937b3d7e908
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86756
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/avmedia/source/gstreamer/gstframegrabber.cxx
b/avmedia/source/gstreamer/gstframegrabber.cxx
index bc183d563332..496a447103ec 100644
--- a/avmedia/source/gstreamer/gstframegrabber.cxx
+++ b/avmedia/source/gstreamer/gstframegrabber.cxx
@@ -36,7 +36,7 @@
using namespace ::com::sun::star;
-namespace avmedia { namespace gstreamer {
+namespace avmedia::gstreamer {
void FrameGrabber::disposePipeline()
{
@@ -171,7 +171,6 @@ uno::Sequence< OUString > SAL_CALL
FrameGrabber::getSupportedServiceNames()
return { AVMEDIA_GST_FRAMEGRABBER_SERVICENAME };
}
-} // namespace gstreamer
} // namespace avmedia
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/gstreamer/gstmanager.cxx
b/avmedia/source/gstreamer/gstmanager.cxx
index 0f4f055e4f59..0414437dfe3b 100644
--- a/avmedia/source/gstreamer/gstmanager.cxx
+++ b/avmedia/source/gstreamer/gstmanager.cxx
@@ -29,7 +29,7 @@
using namespace ::com::sun::star;
-namespace avmedia { namespace gstreamer {
+namespace avmedia::gstreamer {
Manager::Manager()
{
@@ -66,7 +66,6 @@ uno::Sequence< OUString > SAL_CALL
Manager::getSupportedServiceNames( )
return { AVMEDIA_GST_MANAGER_SERVICENAME };
}
-} // namespace gstreamer
} // namespace avmedia
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/gstreamer/gstplayer.cxx
b/avmedia/source/gstreamer/gstplayer.cxx
index 703ddcddc849..3ded8831b789 100644
--- a/avmedia/source/gstreamer/gstplayer.cxx
+++ b/avmedia/source/gstreamer/gstplayer.cxx
@@ -53,7 +53,7 @@
using namespace ::com::sun::star;
-namespace avmedia { namespace gstreamer {
+namespace avmedia::gstreamer {
namespace {
@@ -925,7 +925,6 @@ uno::Sequence< OUString > SAL_CALL
Player::getSupportedServiceNames()
return { AVMEDIA_GST_PLAYER_SERVICENAME };
}
-} // namespace gstreamer
} // namespace avmedia
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/gstreamer/gstwindow.cxx
b/avmedia/source/gstreamer/gstwindow.cxx
index 98a6c78738bf..5c91cce1e920 100644
--- a/avmedia/source/gstreamer/gstwindow.cxx
+++ b/avmedia/source/gstreamer/gstwindow.cxx
@@ -29,7 +29,7 @@
using namespace ::com::sun::star;
-namespace avmedia { namespace gstreamer {
+namespace avmedia::gstreamer {
// Window
@@ -188,7 +188,6 @@ uno::Sequence< OUString > SAL_CALL
Window::getSupportedServiceNames( )
return { AVMEDIA_GST_WINDOW_SERVICENAME };
}
-} // namespace gstreamer
} // namespace avmedia
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/viewer/mediaevent_impl.cxx
b/avmedia/source/viewer/mediaevent_impl.cxx
index 100bb0d83466..c90d12c32729 100644
--- a/avmedia/source/viewer/mediaevent_impl.cxx
+++ b/avmedia/source/viewer/mediaevent_impl.cxx
@@ -25,7 +25,7 @@
using namespace ::com::sun::star;
-namespace avmedia { namespace priv {
+namespace avmedia::priv {
MediaEventListenersImpl::MediaEventListenersImpl( vcl::Window& rEventWindow ) :
mpNotifyWindow( &rEventWindow )
@@ -169,7 +169,6 @@ void SAL_CALL MediaEventListenersImpl::focusLost( const
css::awt::FocusEvent& )
}
-} // namespace priv
} // namespace avmedia
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx
b/avmedia/source/viewer/mediawindow_impl.cxx
index 70cc871854d6..9d2245b0a274 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -49,7 +49,7 @@
#endif
using namespace ::com::sun::star;
-names
[Libreoffice-commits] core.git: svx/source
svx/source/items/numfmtsh.cxx |2 +-
svx/source/svdraw/svdpage.cxx |4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 18b03440b4dca084274a02d16a8a1545d629a4c1
Author: Mesut Çifci
AuthorDate: Mon Jan 13 23:46:45 2020 +0300
Commit: Michael Stahl
CommitDate: Tue Jan 14 15:13:24 2020 +0100
tdf#75280: Convert inappropriate use of sal_uIntPtr to better integer types
Change-Id: I583e5758b999e2800e1372af3a6490b3b64fe96e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86717
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx
index 8f39c009351f..f950eb0afd86 100644
--- a/svx/source/items/numfmtsh.cxx
+++ b/svx/source/items/numfmtsh.cxx
@@ -375,7 +375,7 @@ void SvxNumberFormatShell::MakePreviewString(const
OUString& rFormatStr, OUStrin
{
rpFontColor = nullptr;
-sal_uIntPtr nExistingFormat = pFormatter->GetEntryKey(rFormatStr,
eCurLanguage);
+sal_uInt32 nExistingFormat = pFormatter->GetEntryKey(rFormatStr,
eCurLanguage);
if (nExistingFormat == NUMBERFORMAT_ENTRY_NOT_FOUND)
{
// real preview - not implemented in NumberFormatter for text formats
diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index c93d70627f3a..8012cf7258d2 100644
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -212,7 +212,7 @@ void SdrObjList::CopyObjects(const SdrObjList& rSrcList)
SdrEdgeObj* pDstEdge=dynamic_cast(
pEdgeObjTmp );
if (pDstEdge!=nullptr) {
if (pSrcNode1!=nullptr) {
-sal_uIntPtr nDstNode1=pSrcNode1->GetOrdNum();
+sal_uInt32 nDstNode1=pSrcNode1->GetOrdNum();
SdrObject* pDstNode1=GetObj(nDstNode1);
if (pDstNode1!=nullptr) { // else we get an error!
pDstEdge->ConnectToNode(true,pDstNode1);
@@ -221,7 +221,7 @@ void SdrObjList::CopyObjects(const SdrObjList& rSrcList)
}
}
if (pSrcNode2!=nullptr) {
-sal_uIntPtr nDstNode2=pSrcNode2->GetOrdNum();
+sal_uInt32 nDstNode2=pSrcNode2->GetOrdNum();
SdrObject* pDstNode2=GetObj(nDstNode2);
if (pDstNode2!=nullptr) { // else the node was
probably not selected
pDstEdge->ConnectToNode(false,pDstNode2);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basegfx/source
basegfx/source/color/bcolortools.cxx |4 ++--
basegfx/source/matrix/b2dhommatrixtools.cxx |7 ++-
basegfx/source/matrix/b3dhommatrixtools.cxx |5 +
basegfx/source/polygon/b2dlinegeometry.cxx|7 ++-
basegfx/source/polygon/b2dpolygonclipper.cxx |7 ++-
basegfx/source/polygon/b2dpolygoncutandtouch.cxx |7 ++-
basegfx/source/polygon/b2dpolygontools.cxx|7 ++-
basegfx/source/polygon/b2dpolygontriangulator.cxx |7 ++-
basegfx/source/polygon/b2dpolypolygoncutter.cxx |7 ++-
basegfx/source/polygon/b2dpolypolygontools.cxx|7 ++-
basegfx/source/polygon/b2dsvgpolypolygon.cxx |5 +
basegfx/source/polygon/b2dtrapezoid.cxx | 21 ++---
basegfx/source/polygon/b3dpolygontools.cxx|7 ++-
basegfx/source/polygon/b3dpolypolygontools.cxx|7 ++-
basegfx/source/tools/b2dclipstate.cxx |5 +
basegfx/source/tools/canvastools.cxx |9 ++---
basegfx/source/tools/keystoplerp.cxx |5 +
basegfx/source/tools/numbertools.cxx |4 ++--
basegfx/source/tools/stringconversiontools.cxx|7 ++-
basegfx/source/tools/tools.cxx|5 +
basegfx/source/tools/unopolypolygon.cxx |5 +
basegfx/source/tools/zoomtools.cxx|5 +
22 files changed, 41 insertions(+), 109 deletions(-)
New commits:
commit f8554b5053d17d39f71eca246e4ad7264f4998a8
Author: Noel Grandin
AuthorDate: Tue Jan 14 15:11:29 2020 +0200
Commit: Noel Grandin
CommitDate: Tue Jan 14 15:12:05 2020 +0100
clang-tidy modernize-concat-nested-namespace in basegfx
Change-Id: I79b5b135c00b31152ff37de3485dcbb955ca1071
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86757
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/basegfx/source/color/bcolortools.cxx
b/basegfx/source/color/bcolortools.cxx
index 42e326af11a4..14f5e35780af 100644
--- a/basegfx/source/color/bcolortools.cxx
+++ b/basegfx/source/color/bcolortools.cxx
@@ -21,7 +21,7 @@
#include
#include
-namespace basegfx { namespace utils
+namespace basegfx::utils
{
BColor rgb2hsl(const BColor& rRGBColor)
{
@@ -189,6 +189,6 @@ namespace basegfx { namespace utils
}
}
-} } // end of namespace basegfx
+} // end of namespace basegfx
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basegfx/source/matrix/b2dhommatrixtools.cxx
b/basegfx/source/matrix/b2dhommatrixtools.cxx
index 2c831854761b..6cf751fc8b87 100644
--- a/basegfx/source/matrix/b2dhommatrixtools.cxx
+++ b/basegfx/source/matrix/b2dhommatrixtools.cxx
@@ -22,9 +22,7 @@
#include
-namespace basegfx
-{
-namespace utils
+namespace basegfx::utils
{
void createSinCosOrthogonal(double& o_rSin, double& o_rCos, double
fRadiant)
{
@@ -454,7 +452,6 @@ namespace basegfx
{
return B2DTuple(rMatrix.get(0, nCol), rMatrix.get(1, nCol));
}
-} // end of namespace utils
-} // end of namespace basegfx
+} // end of namespace basegfx
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basegfx/source/matrix/b3dhommatrixtools.cxx
b/basegfx/source/matrix/b3dhommatrixtools.cxx
index d6b9d32ef773..f8860df4acf6 100644
--- a/basegfx/source/matrix/b3dhommatrixtools.cxx
+++ b/basegfx/source/matrix/b3dhommatrixtools.cxx
@@ -20,9 +20,7 @@
#include
#include
-namespace basegfx
-{
-namespace utils
+namespace basegfx::utils
{
B3DHomMatrix UnoHomogenMatrixToB3DHomMatrix(const
com::sun::star::drawing::HomogenMatrix& rMatrixIn)
{
@@ -68,7 +66,6 @@ void B3DHomMatrixToUnoHomogenMatrix(const B3DHomMatrix&
rMatrixIn,
rMatrixOut.Line4.Column3 = rMatrixIn.get(3, 2);
rMatrixOut.Line4.Column4 = rMatrixIn.get(3, 3);
}
-} // end of namespace tools
} // end of namespace basegfx
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basegfx/source/polygon/b2dlinegeometry.cxx
b/basegfx/source/polygon/b2dlinegeometry.cxx
index 91769a833ff5..1ae29f2a6047 100644
--- a/basegfx/source/polygon/b2dlinegeometry.cxx
+++ b/basegfx/source/polygon/b2dlinegeometry.cxx
@@ -32,9 +32,7 @@
#include
#include
-namespace basegfx
-{
-namespace utils
+namespace basegfx::utils
{
B2DPolyPolygon createAreaGeometryForLineStartEnd(
const B2DPolygon& rCandidate,
@@ -126,8 +124,7 @@ namespace basegfx
return aRetval;
}
-} // end of namespace utils
-} // end of namespace basegfx
+} // end of namespace basegfx
namespace basegfx
{
diff --git a/basegfx/source/polygon/b2dpolygonclipper.cxx
b/basegfx/source/polygon/b2dpolygonclipper.cxx
index 043f2c9bdfe3..13a569575b02 100644
--- a/basegfx/source/polygon/b2dpolygonclipper.cxx
+++ b/basegfx/source/polygon/b2dpolygonclipper.cxx
@@ -26,9 +26,7 @@
#include
#include
-namespace basegfx
-{
-
XHP Editor available for test and improvements
Hello The Help editor (AKA XHP Editor) is making its debut for testing and improvements in https://newdesign.libreoffice.org/xhpeditor/index.php Source code is in dev-tools/help3/xhpeditor Partial (WIP) instructions are in the wiki page https://wiki.documentfoundation.org/DocumentationHelpEditor Kind regards -- Olivier Hallot LibreOffice Documentation Coordinator Comunidade LibreOffice Rio de Janeiro - Brasil - Local Time: UTC-03:00 http://tdf.io/joinus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: officecfg/registry sw/inc sw/source sw/util
officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu | 11 ++
sw/inc/PageColumnPopup.hxx | 18 +++-
sw/source/uibase/app/swmodule.cxx |1
sw/source/uibase/sidebar/PageColumnControl.cxx |7 +
sw/source/uibase/sidebar/PageColumnControl.hxx |8 +-
sw/source/uibase/sidebar/PageColumnPopup.cxx| 38
+++---
sw/util/sw.component|4 +
7 files changed, 65 insertions(+), 22 deletions(-)
New commits:
commit 85307c10d3ca4d7c9ed3fa1ca3700a6330b09da8
Author: Caolán McNamara
AuthorDate: Tue Jan 14 11:30:55 2020 +
Commit: Caolán McNamara
CommitDate: Tue Jan 14 14:34:46 2020 +0100
rework PageColumnPopup to be a PopupWindowController
Change-Id: I00d0ce6001f2eb3076c699bca7c64a72b94716c9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86751
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
index f01223dc1d6a..4505585ab748 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
@@ -1173,6 +1173,17 @@
lo.writer.PageSizeToolBoxControl
+
+
+ .uno:PageColumnType
+
+
+
+
+
+ lo.writer.PageColumnToolBoxControl
+
+
.uno:FindText
diff --git a/sw/inc/PageColumnPopup.hxx b/sw/inc/PageColumnPopup.hxx
index b0df45df4a96..a16b2893c807 100644
--- a/sw/inc/PageColumnPopup.hxx
+++ b/sw/inc/PageColumnPopup.hxx
@@ -19,18 +19,24 @@
#ifndef INCLUDED_SW_INC_PAGECOLUMNPOPUP_HXX
#define INCLUDED_SW_INC_PAGECOLUMNPOPUP_HXX
-#include
+#include
#include "swdllapi.h"
-class PageColumnPopup final : public SfxToolBoxControl
+class PageColumnPopup final : public svt::PopupWindowController
{
public:
-SFX_DECL_TOOLBOX_CONTROL();
-
-PageColumnPopup(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx);
+PageColumnPopup(const css::uno::Reference&
rContext);
virtual ~PageColumnPopup() override;
-virtual VclPtr CreatePopupWindow() override;
+using svt::ToolboxController::createPopupWindow;
+virtual VclPtr createPopupWindow( vcl::Window* pParent )
override;
+
+// XServiceInfo
+virtual OUString SAL_CALL getImplementationName() override;
+virtual css::uno::Sequence SAL_CALL getSupportedServiceNames()
override;
+
+// XInitialization
+virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any
>& rArguments ) override;
};
#endif
diff --git a/sw/source/uibase/app/swmodule.cxx
b/sw/source/uibase/app/swmodule.cxx
index 613dda8d345f..508dd07fdc8a 100644
--- a/sw/source/uibase/app/swmodule.cxx
+++ b/sw/source/uibase/app/swmodule.cxx
@@ -281,7 +281,6 @@ void SwDLL::RegisterControls()
svx::ParaFirstLineSpacingControl::RegisterControl(SID_ATTR_PARA_FIRSTLINESPACE,
pMod);
PageMarginPopup::RegisterControl(SID_ATTR_PAGE_MARGIN, pMod);
PageOrientationPopup::RegisterControl(SID_ATTR_PAGE_ORIENTATION, pMod);
-PageColumnPopup::RegisterControl(SID_ATTR_PAGE_COLUMN, pMod);
SvxClipBoardControl::RegisterControl(SID_PASTE, pMod );
SvxUndoRedoControl::RegisterControl(SID_UNDO, pMod );
diff --git a/sw/source/uibase/sidebar/PageColumnControl.cxx
b/sw/source/uibase/sidebar/PageColumnControl.cxx
index 6532472e5a9e..a7ee125ce33d 100644
--- a/sw/source/uibase/sidebar/PageColumnControl.cxx
+++ b/sw/source/uibase/sidebar/PageColumnControl.cxx
@@ -19,6 +19,7 @@
#include
#include "PageColumnControl.hxx"
+#include
#include
@@ -30,8 +31,8 @@
namespace sw { namespace sidebar {
-PageColumnControl::PageColumnControl( sal_uInt16 nId, vcl::Window* pParent )
-: SfxPopupWindow( nId, pParent, "PageColumnControl",
"modules/swriter/ui/pagecolumncontrol.ui" )
+PageColumnControl::PageColumnControl(PageColumnPopup* pControl, vcl::Window*
pParent)
+: ToolbarPopup(pControl->getFrameInterface(), pParent,
"PageColumnControl", "modules/swriter/ui/pagecolumncontrol.ui" )
{
get( m_pMoreButton, "moreoptions" );
@@ -89,7 +90,7 @@ void PageColumnControl::dispose()
m_pLeft.disposeAndClear();
m_pRight.disposeAndClear();
m_pMoreButton.disposeAndClear();
-SfxPopupWindow::dispose();
+ToolbarPopup::dispose();
}
void PageColumnControl::ExecuteColumnChange( const sal_uInt16 nColumnType )
diff --git a/sw/source/uibase/sidebar/PageColumnControl.hxx
b/sw/source/uibase/sidebar/PageColumnControl.hxx
index 974d0632ab6f..a5a6ec3ef95b 100644
--- a/sw/source/uibase/sidebar/PageColumnControl.hxx
+++ b/sw/source/uibase/sidebar/PageColumnControl.hxx
@@ -19,15 +19,17 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_SIDEBAR_PAGECOLUMNCONTROL_HXX
#define INCL
[Libreoffice-commits] core.git: sw/inc sw/source sw/uiconfig
sw/inc/PageColumnPopup.hxx |1
sw/source/uibase/sidebar/PageColumnControl.cxx | 82 ++-
sw/source/uibase/sidebar/PageColumnControl.hxx | 27 ++---
sw/source/uibase/sidebar/PageColumnPopup.cxx | 14 ++
sw/uiconfig/swriter/ui/pagecolumncontrol.ui| 135 +
sw/uiconfig/swriter/ui/pagesizecontrol.ui | 21 ++-
6 files changed, 149 insertions(+), 131 deletions(-)
New commits:
commit bcc6b77164134a1ea84f8ac2f5b8e6afa02e4228
Author: Caolán McNamara
AuthorDate: Tue Jan 14 11:47:42 2020 +
Commit: Caolán McNamara
CommitDate: Tue Jan 14 14:35:02 2020 +0100
weld PageColumnControl
Change-Id: I943191b63d32cf5027a587c23fc73bbb2e7d730e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86753
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sw/inc/PageColumnPopup.hxx b/sw/inc/PageColumnPopup.hxx
index a16b2893c807..18665fef9a50 100644
--- a/sw/inc/PageColumnPopup.hxx
+++ b/sw/inc/PageColumnPopup.hxx
@@ -28,6 +28,7 @@ public:
PageColumnPopup(const css::uno::Reference&
rContext);
virtual ~PageColumnPopup() override;
+virtual std::unique_ptr weldPopupWindow() override;
using svt::ToolboxController::createPopupWindow;
virtual VclPtr createPopupWindow( vcl::Window* pParent )
override;
diff --git a/sw/source/uibase/sidebar/PageColumnControl.cxx
b/sw/source/uibase/sidebar/PageColumnControl.cxx
index a7ee125ce33d..c8f5e3db2f11 100644
--- a/sw/source/uibase/sidebar/PageColumnControl.cxx
+++ b/sw/source/uibase/sidebar/PageColumnControl.cxx
@@ -31,11 +31,11 @@
namespace sw { namespace sidebar {
-PageColumnControl::PageColumnControl(PageColumnPopup* pControl, vcl::Window*
pParent)
-: ToolbarPopup(pControl->getFrameInterface(), pParent,
"PageColumnControl", "modules/swriter/ui/pagecolumncontrol.ui" )
+PageColumnControl::PageColumnControl(PageColumnPopup* pControl, weld::Widget*
pParent)
+: WeldToolbarPopup(pControl->getFrameInterface(), pParent,
"modules/swriter/ui/pagecolumncontrol.ui", "PageColumnControl")
+, m_xMoreButton(m_xBuilder->weld_button("moreoptions"))
+, m_xControl(pControl)
{
-get( m_pMoreButton, "moreoptions" );
-
bool bLandscape = false;
const SfxPoolItem *pItem;
if ( SfxViewFrame::Current() )
@@ -46,51 +46,43 @@ PageColumnControl::PageColumnControl(PageColumnPopup*
pControl, vcl::Window* pPa
if ( bLandscape )
{
-get(m_pOneColumn, "column1L");
-get(m_pTwoColumns, "column2L");
-get(m_pThreeColumns, "column3L");
-get(m_pLeft, "columnleftL");
-get(m_pRight, "columnrightL");
+m_xOneColumn = m_xBuilder->weld_button("column1L");
+m_xTwoColumns = m_xBuilder->weld_button("column2L");
+m_xThreeColumns = m_xBuilder->weld_button("column3L");
+m_xLeft = m_xBuilder->weld_button("columnleftL");
+m_xRight = m_xBuilder->weld_button("columnrightL");
}
else
{
-get(m_pOneColumn, "column1");
-get(m_pTwoColumns, "column2");
-get(m_pThreeColumns, "column3");
-get(m_pLeft, "columnleft");
-get(m_pRight, "columnright");
+m_xOneColumn = m_xBuilder->weld_button("column1");
+m_xTwoColumns = m_xBuilder->weld_button( "column2");
+m_xThreeColumns = m_xBuilder->weld_button("column3");
+m_xLeft = m_xBuilder->weld_button("columnleft");
+m_xRight = m_xBuilder->weld_button("columnright");
}
-m_pOneColumn->Show();
-m_pTwoColumns->Show();
-m_pThreeColumns->Show();
-m_pLeft->Show();
-m_pRight->Show();
+m_xOneColumn->show();
+m_xTwoColumns->show();
+m_xThreeColumns->show();
+m_xLeft->show();
+m_xRight->show();
-m_pOneColumn->SetClickHdl( LINK( this, PageColumnControl,
ColumnButtonClickHdl_Impl ) );
-m_pTwoColumns->SetClickHdl( LINK( this, PageColumnControl,
ColumnButtonClickHdl_Impl ) );
-m_pThreeColumns->SetClickHdl( LINK( this, PageColumnControl,
ColumnButtonClickHdl_Impl ) );
-m_pLeft->SetClickHdl( LINK( this, PageColumnControl,
ColumnButtonClickHdl_Impl ) );
-m_pRight->SetClickHdl( LINK( this, PageColumnControl,
ColumnButtonClickHdl_Impl ) );
+m_xOneColumn->connect_clicked( LINK( this, PageColumnControl,
ColumnButtonClickHdl_Impl ) );
+m_xTwoColumns->connect_clicked( LINK( this, PageColumnControl,
ColumnButtonClickHdl_Impl ) );
+m_xThreeColumns->connect_clicked( LINK( this, PageColumnControl,
ColumnButtonClickHdl_Impl ) );
+m_xLeft->connect_clicked( LINK( this, PageColumnControl,
ColumnButtonClickHdl_Impl ) );
+m_xRight->connect_clicked( LINK( this, PageColumnControl,
ColumnButtonClickHdl_Impl ) );
-m_pMoreButton->SetClickHdl( LINK( this, PageColumnControl,
MoreButtonClickHdl_Impl ) );
-m_pMoreButton->GrabFocus();
+m_xMoreButton->connect_clicked( LINK( this, PageColumnControl,
MoreButtonClickHdl_Impl ) );
}
-PageColumnControl::~PageColumnControl()
[Libreoffice-commits] online.git: loleaflet/css
loleaflet/css/spreadsheet-mobile.css | 14 --
1 file changed, 8 insertions(+), 6 deletions(-)
New commits:
commit 4da29f64227098fcbea3f01c7d701bdfd2aae049
Author: Pedro Pinto Silva
AuthorDate: Tue Jan 14 14:31:03 2020 +0100
Commit: Pedro Pinto da Silva
CommitDate: Tue Jan 14 14:34:19 2020 +0100
Mobile: Spreadsheet: Readonly mode: Adjust top positions from frame and
document
- account for moz vs webkit intricacies
- account for newest spreadsheet formula implementation
Change-Id: If5ae4159bf5b5cea82771b085f8e7e90f97e0804
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/86760
Reviewed-by: Pedro Pinto da Silva
Tested-by: Pedro Pinto da Silva
diff --git a/loleaflet/css/spreadsheet-mobile.css
b/loleaflet/css/spreadsheet-mobile.css
index eef8baeac..83b1e5f59 100644
--- a/loleaflet/css/spreadsheet-mobile.css
+++ b/loleaflet/css/spreadsheet-mobile.css
@@ -2,10 +2,10 @@
@-moz-document url-prefix() {
#spreadsheet-row-column-frame.readonly {
- top: 39px !important;
+ top: 36px !important;
}
#document-container.spreadsheet-document.readonly {
- top: 59px !important;
+ top: 56px !important;
}
#spreadsheet-row-column-frame {
top: 75px !important
@@ -22,15 +22,17 @@
bottom: 0;
}
+ #spreadsheet-row-column-frame.readonly {
+ top: 37px !important;
+ }
+ #document-container.spreadsheet-document.readonly {
+ top: 57px !important;
+ }
#spreadsheet-row-column-frame {
top: 73px;
bottom: 36px;
}
- #spreadsheet-row-column-frame.readonly {
- top: 30px;
- }
-
.spreadsheet-tab{
background-color: #eaf5ff;
color: #4c4c4c;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - oox/CppunitTest_oox_shape.mk oox/Module_oox.mk oox/qa oox/source
oox/CppunitTest_oox_shape.mk| 45 +++
oox/Module_oox.mk |1
oox/qa/unit/data/multiple-group-shapes.docx |binary
oox/qa/unit/shape.cxx | 84
oox/source/shape/ShapeContextHandler.cxx|1
5 files changed, 131 insertions(+)
New commits:
commit 0424ae2df464cbcf8997a85b53daeaded462b429
Author: Miklos Vajna
AuthorDate: Mon Jan 13 20:08:54 2020 +0100
Commit: Michael Stahl
CommitDate: Tue Jan 14 14:24:59 2020 +0100
tdf#129516 DOCX import: fix incorrect z-order with textboxes
Commit 3272c1eb5563f3bda2caa24f32b1018372622109 (related tdf#100074:
prepare group shapes text input via writerfilter, 2018-10-01) tweaked
the oox code, so that later it'll be able to call back to writerfilter
to parse group shape text. That makes sense, but it also removed the
reset of the group shape context, which means that two subsequent group
shapes are now imported as a single group shape with a merged child
list.
Reset the group shape context again when writerfilter asks for the
XShape from oox. If this causes a problem for the above scenario later,
then it could be considered to handle this in
ShapeContextHandler::endFastElement().
(cherry picked from commit 5960c6f4ca9dd6ab4b4081d3be7253468cd212c4)
Change-Id: I14f7f0bab2c66c8430313d5b2daffe3160a58c27
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86746
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/oox/CppunitTest_oox_shape.mk b/oox/CppunitTest_oox_shape.mk
new file mode 100644
index ..9ae7bbd634cd
--- /dev/null
+++ b/oox/CppunitTest_oox_shape.mk
@@ -0,0 +1,45 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,oox_shape))
+
+$(eval $(call gb_CppunitTest_use_externals,oox_shape,\
+ boost_headers \
+))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,oox_shape, \
+oox/qa/unit/shape \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,oox_shape, \
+comphelper \
+cppu \
+oox \
+sal \
+test \
+unotest \
+utl \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,oox_shape))
+
+$(eval $(call gb_CppunitTest_use_ure,oox_shape))
+$(eval $(call gb_CppunitTest_use_vcl,oox_shape))
+
+$(eval $(call gb_CppunitTest_use_rdb,oox_shape,services))
+
+$(eval $(call gb_CppunitTest_use_custom_headers,oox_shape,\
+ officecfg/registry \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,oox_shape))
+
+# vim: set noet sw=4 ts=4:
diff --git a/oox/Module_oox.mk b/oox/Module_oox.mk
index 6bcc596c14ab..540b9a8d2ba0 100644
--- a/oox/Module_oox.mk
+++ b/oox/Module_oox.mk
@@ -27,6 +27,7 @@ $(eval $(call gb_Module_add_check_targets,oox,\
CppunitTest_oox_crypto \
CppunitTest_oox_mathml \
CppunitTest_oox_vml \
+ CppunitTest_oox_shape \
))
# vim: set noet sw=4 ts=4:
diff --git a/oox/qa/unit/data/multiple-group-shapes.docx
b/oox/qa/unit/data/multiple-group-shapes.docx
new file mode 100644
index ..c751bcdf650b
Binary files /dev/null and b/oox/qa/unit/data/multiple-group-shapes.docx differ
diff --git a/oox/qa/unit/shape.cxx b/oox/qa/unit/shape.cxx
new file mode 100644
index ..27d26aa91b57
--- /dev/null
+++ b/oox/qa/unit/shape.cxx
@@ -0,0 +1,84 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+using namespace ::com::sun::star;
+
+char const DATA_DIRECTORY[] = "/oox/qa/unit/data/";
+
+/// oox shape tests.
+class OoxShapeTest : public test::BootstrapFixture, public unotest::MacrosTest
+{
+private:
+uno::Reference mxComponentContext;
+uno::Reference mxComponent;
+
+public:
+void setUp() override;
+void tearDown() override;
+uno::Reference& getComponent() { return mxComponent; }
+void load(const OUString& rURL);
+};
+
+void OoxShapeTest::setUp()
+{
+test::BootstrapFixture::setUp();
+
+
mxComponentContext.set(comphelper::getComponentContext(getMultiServiceFactory()));
+mxDesktop.set(frame::Desktop::create(m
[Libreoffice-commits] core.git: accessibility/inc
accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx |3 +--
accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx |4 ++--
accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx|3 +--
accessibility/inc/extended/accessibleeditbrowseboxcell.hxx |8 +++-
accessibility/inc/helper/listboxhelper.hxx |2 +-
accessibility/inc/standard/vclxaccessiblefixedhyperlink.hxx|3 +--
accessibility/inc/standard/vclxaccessibleheaderbar.hxx |2 +-
accessibility/inc/standard/vclxaccessiblemenuseparator.hxx |2 +-
accessibility/inc/standard/vclxaccessiblepopupmenu.hxx |3 +--
accessibility/inc/standard/vclxaccessibleradiobutton.hxx |3 +--
accessibility/inc/standard/vclxaccessiblescrollbar.hxx |3 +--
accessibility/inc/standard/vclxaccessibletabpagewindow.hxx |3 +--
accessibility/inc/standard/vclxaccessibletextfield.hxx |5 ++---
13 files changed, 17 insertions(+), 27 deletions(-)
New commits:
commit a41fe32ba989cad3b6e2e20793b3fff469230eb6
Author: Noel Grandin
AuthorDate: Tue Jan 14 10:27:30 2020 +0200
Commit: Noel Grandin
CommitDate: Tue Jan 14 14:06:10 2020 +0100
loplugin:finalclasses in accessibility
Change-Id: If9314712090bc2494f86afa8f0c25038f8307278
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86742
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx
b/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx
index 800d3957b48a..0ad34ba18ede 100644
--- a/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx
@@ -30,14 +30,13 @@ namespace accessibility
css::accessibility::XAccessibleValue
> AccessibleCheckBoxCell_BASE;
-class AccessibleCheckBoxCell : public AccessibleBrowseBoxCell
+class AccessibleCheckBoxCell final : public AccessibleBrowseBoxCell
,public AccessibleCheckBoxCell_BASE
{
private:
TriState m_eState;
bool m_bIsTriState;
-protected:
virtual ~AccessibleCheckBoxCell() override {}
virtual ::utl::AccessibleStateSetHelper* implCreateStateSetHelper()
override;
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx
b/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx
index 0a2d10686598..2987483ff65c 100644
--- a/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx
@@ -22,7 +22,7 @@
namespace accessibility
{
-class AccessibleBrowseBoxHeaderCell : public BrowseBoxAccessibleElement
+class AccessibleBrowseBoxHeaderCell final : public
BrowseBoxAccessibleElement
{
sal_Int32 m_nColumnRowId;
public:
@@ -61,7 +61,7 @@ namespace accessibility
*/
::utl::AccessibleStateSetHelper* implCreateStateSetHelper() override;
-protected:
+private:
virtual tools::Rectangle implGetBoundingBox() override;
virtual tools::Rectangle implGetBoundingBoxOnScreen() override;
diff --git a/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx
b/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx
index d6029b54531d..6823fa67eb7a 100644
--- a/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx
+++ b/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx
@@ -29,14 +29,13 @@ namespace accessibility
> AccessibleTextHelper_BASE;
// implementation of a table cell of BrowseBox
-class AccessibleBrowseBoxTableCell :public AccessibleBrowseBoxCell
+class AccessibleBrowseBoxTableCell final : public AccessibleBrowseBoxCell
,public AccessibleTextHelper_BASE
,public
::comphelper::OCommonAccessibleText
{
private:
sal_Int32 m_nOffset;
-protected:
// OCommonAccessibleText
virtual OUStringimplGetText() final override;
virtual css::lang::Locale implGetLocale() override;
diff --git a/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx
b/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx
index fb3c2036904a..6d827ac13a05 100644
--- a/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx
+++ b/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx
@@ -28,7 +28,7 @@ namespace accessibility
// = EditBrowseBoxTableCell
-class EditBrowseBoxTableCell:public AccessibleBrowseBoxCell
+class EditBrowseBoxTableCell final : public AccessibleBrowseBoxCell
,public
::comphelper::OAccessibleContextWrapperHelper
{
public:
@@ -42,10 +42,9 @@
[Libreoffice-commits] core.git: include/svx solenv/sanitizers svx/source sw/inc sw/source sw/uiconfig
include/svx/sidebar/ValueSetWithTextControl.hxx |6 -
solenv/sanitizers/ui/modules/swriter.suppr |1
svx/source/sidebar/tools/ValueSetWithTextControl.cxx | 18 ++-
sw/inc/PageSizePopup.hxx |1
sw/source/uibase/sidebar/PageSizeControl.cxx | 114 ---
sw/source/uibase/sidebar/PageSizeControl.hxx | 25 +---
sw/source/uibase/sidebar/PageSizePopup.cxx | 14 ++
sw/uiconfig/swriter/ui/pagesizecontrol.ui| 77 +---
8 files changed, 148 insertions(+), 108 deletions(-)
New commits:
commit 53d2a0390473319555f244f0ac3cf9a44b5ac7a0
Author: Caolán McNamara
AuthorDate: Tue Jan 14 10:48:18 2020 +
Commit: Caolán McNamara
CommitDate: Tue Jan 14 13:45:44 2020 +0100
weld PageSizePopup
Change-Id: I989e2a6337f368ec388290f1e4af329865af9ec7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86749
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/include/svx/sidebar/ValueSetWithTextControl.hxx
b/include/svx/sidebar/ValueSetWithTextControl.hxx
index a7c6641f519b..6fed356191db 100644
--- a/include/svx/sidebar/ValueSetWithTextControl.hxx
+++ b/include/svx/sidebar/ValueSetWithTextControl.hxx
@@ -33,10 +33,12 @@ namespace svx { namespace sidebar {
Especially, used for sidebar related controls.
*/
-class SVX_DLLPUBLIC ValueSetWithTextControl final : public ValueSet
+class SVX_DLLPUBLIC ValueSetWithTextControl final : public SvtValueSet
{
public:
-ValueSetWithTextControl(Window* pParent, WinBits nBits);
+ValueSetWithTextControl();
+
+virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override;
void AddItem(
const OUString& rItemText,
diff --git a/solenv/sanitizers/ui/modules/swriter.suppr
b/solenv/sanitizers/ui/modules/swriter.suppr
index 9fad88ba117b..661023b6ce0e 100644
--- a/solenv/sanitizers/ui/modules/swriter.suppr
+++ b/solenv/sanitizers/ui/modules/swriter.suppr
@@ -181,6 +181,7 @@
sw/uiconfig/swriter/ui/pagemargincontrol.ui://GtkSpinButton[@id='left:0cm'] no-l
sw/uiconfig/swriter/ui/pagemargincontrol.ui://GtkSpinButton[@id='right:0cm']
no-labelled-by
sw/uiconfig/swriter/ui/pagemargincontrol.ui://GtkSpinButton[@id='top:0cm']
no-labelled-by
sw/uiconfig/swriter/ui/pagemargincontrol.ui://GtkSpinButton[@id='bottom:0cm']
no-labelled-by
+sw/uiconfig/swriter/ui/pagesizecontrol.ui://GtkSpinButton[@id='metric']
no-labelled-by
sw/uiconfig/swriter/ui/printmonitordialog.ui://GtkLabel[@id='docname']
orphan-label
sw/uiconfig/swriter/ui/printmonitordialog.ui://GtkLabel[@id='printing']
orphan-label
sw/uiconfig/swriter/ui/printmonitordialog.ui://GtkLabel[@id='printer']
orphan-label
diff --git a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
index 5b1e74d2dff9..c26a3220089b 100644
--- a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
+++ b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
@@ -26,15 +26,25 @@
#include
#include
#include
+#include
namespace svx { namespace sidebar {
-ValueSetWithTextControl::ValueSetWithTextControl(Window* pParent, WinBits
nBits)
-: ValueSet( pParent, nBits )
+ValueSetWithTextControl::ValueSetWithTextControl()
+: SvtValueSet(nullptr)
{
-SetColCount();
}
+void ValueSetWithTextControl::SetDrawingArea(weld::DrawingArea* pDrawingArea)
+{
+SvtValueSet::SetDrawingArea(pDrawingArea);
+
+Size aSize(250, 300);
+pDrawingArea->set_size_request(aSize.Width(), aSize.Height());
+SetOutputSizePixel(aSize);
+
+SetColCount();
+}
void ValueSetWithTextControl::AddItem(
const OUString& rItemText,
@@ -88,7 +98,7 @@ void ValueSetWithTextControl::UserDraw( const UserDrawEvent&
rUDEvt )
}
else
{
-aFont.SetColor(
GetSettings().GetStyleSettings().GetFieldTextColor() );
+aFont.SetColor(
Application::GetSettings().GetStyleSettings().GetFieldTextColor() );
}
tools::Rectangle aStrRect = aRect;
diff --git a/sw/inc/PageSizePopup.hxx b/sw/inc/PageSizePopup.hxx
index 5f7354bb3da1..497f76dce24a 100644
--- a/sw/inc/PageSizePopup.hxx
+++ b/sw/inc/PageSizePopup.hxx
@@ -28,6 +28,7 @@ public:
PageSizePopup(const css::uno::Reference&
rContext);
virtual ~PageSizePopup() override;
+virtual std::unique_ptr weldPopupWindow() override;
using svt::ToolboxController::createPopupWindow;
virtual VclPtr createPopupWindow( vcl::Window* pParent )
override;
diff --git a/sw/source/uibase/sidebar/PageSizeControl.cxx
b/sw/source/uibase/sidebar/PageSizeControl.cxx
index dc33541466b9..2bc18689dd4b 100644
--- a/sw/source/uibase/sidebar/PageSizeControl.cxx
+++ b/sw/source/uibase/sidebar/PageSizeControl.cxx
@@ -70,27 +70,20 @@ namespace
namespace sw { namespace sidebar {
-PageSizeControl::PageSizeControl(PageSizePopup* pControl, vcl::Window* pParent)
-: ToolbarPopup(pControl->getFrameInterface(), pPar
[Libreoffice-commits] core.git: oox/inc
oox/inc/drawingml/ThemeOverrideFragmentHandler.hxx|2
oox/inc/drawingml/chart/axiscontext.hxx | 10 ++--
oox/inc/drawingml/chart/axisconverter.hxx |4 -
oox/inc/drawingml/chart/chartcontextbase.hxx |4 -
oox/inc/drawingml/chart/chartdrawingfragment.hxx |2
oox/inc/drawingml/chart/chartspaceconverter.hxx |2
oox/inc/drawingml/chart/chartspacefragment.hxx|2
oox/inc/drawingml/chart/converterbase.hxx |2
oox/inc/drawingml/chart/datasourcecontext.hxx |6 +-
oox/inc/drawingml/chart/datasourceconverter.hxx |4 -
oox/inc/drawingml/chart/plotareacontext.hxx |8 +--
oox/inc/drawingml/chart/plotareaconverter.hxx |8 +--
oox/inc/drawingml/chart/seriescontext.hxx | 30 +++---
oox/inc/drawingml/chart/seriesconverter.hxx | 14 +++---
oox/inc/drawingml/chart/titlecontext.hxx |8 +--
oox/inc/drawingml/chart/titleconverter.hxx|6 +-
oox/inc/drawingml/chart/typegroupcontext.hxx | 18
oox/inc/drawingml/chart/typegroupconverter.hxx|4 -
oox/inc/drawingml/clrschemecontext.hxx|6 +-
oox/inc/drawingml/colorchoicecontext.hxx |2
oox/inc/drawingml/customshapegeometry.hxx |6 +-
oox/inc/drawingml/guidcontext.hxx |2
oox/inc/drawingml/misccontexts.hxx| 18
oox/inc/drawingml/scene3dcontext.hxx |6 +-
oox/inc/drawingml/table/tablebackgroundstylecontext.hxx |2
oox/inc/drawingml/table/tablecontext.hxx |2
oox/inc/drawingml/table/tablepartstylecontext.hxx |2
oox/inc/drawingml/table/tablerowcontext.hxx |2
oox/inc/drawingml/table/tablestylecellstylecontext.hxx|2
oox/inc/drawingml/table/tablestylecontext.hxx |2
oox/inc/drawingml/table/tablestylelistfragmenthandler.hxx |2
oox/inc/drawingml/table/tablestyletextstylecontext.hxx|2
oox/inc/drawingml/textfield.hxx |2
oox/inc/drawingml/textfieldcontext.hxx|2
oox/inc/drawingml/themeelementscontext.hxx|2
35 files changed, 98 insertions(+), 98 deletions(-)
New commits:
commit f076e09e7222ade29e73b839579178ac5f134778
Author: Noel Grandin
AuthorDate: Tue Jan 14 10:44:05 2020 +0200
Commit: Noel Grandin
CommitDate: Tue Jan 14 13:38:15 2020 +0100
loplugin:finalclasses in oox
Change-Id: I5d69ed1ba551a51b3a8124d5b9f0e565023e7404
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86743
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/oox/inc/drawingml/ThemeOverrideFragmentHandler.hxx
b/oox/inc/drawingml/ThemeOverrideFragmentHandler.hxx
index 266a88c2ad6a..dc5ce5a61366 100644
--- a/oox/inc/drawingml/ThemeOverrideFragmentHandler.hxx
+++ b/oox/inc/drawingml/ThemeOverrideFragmentHandler.hxx
@@ -17,7 +17,7 @@ namespace drawingml {
class Theme;
-class ThemeOverrideFragmentHandler : public ::oox::core::FragmentHandler2
+class ThemeOverrideFragmentHandler final : public ::oox::core::FragmentHandler2
{
public:
explicitThemeOverrideFragmentHandler(
diff --git a/oox/inc/drawingml/chart/axiscontext.hxx
b/oox/inc/drawingml/chart/axiscontext.hxx
index 4544bedf45e3..5db36b914131 100644
--- a/oox/inc/drawingml/chart/axiscontext.hxx
+++ b/oox/inc/drawingml/chart/axiscontext.hxx
@@ -31,7 +31,7 @@ struct AxisDispUnitsModel;
/** Handler for a value axis display units context (c:dispUnits element).
*/
-class AxisDispUnitsContext : public ContextBase< AxisDispUnitsModel >
+class AxisDispUnitsContext final : public ContextBase< AxisDispUnitsModel >
{
public:
explicitAxisDispUnitsContext(
::oox::core::ContextHandler2Helper& rParent, AxisDispUnitsModel& rModel );
@@ -58,7 +58,7 @@ public:
/** Handler for a category axis context (c:catAx element).
*/
-class CatAxisContext : public AxisContextBase
+class CatAxisContext final : public AxisContextBase
{
public:
explicitCatAxisContext( ::oox::core::ContextHandler2Helper&
rParent, AxisModel& rModel );
@@ -70,7 +70,7 @@ public:
/** Handler for a date axis context (c:dateAx element).
*/
-class DateAxisContext : public AxisContextBase
+class DateAxisContext final : public AxisContextBase
{
public:
explicitDateAxisContext( ::oox::core::ContextHandler2Helper&
rParent, AxisModel& rModel );
@@ -82,7 +82,7 @@ public:
/** Handler for a series axis context (c:serAx element).
*/
-class SerAxisContext : public AxisContextBase
+class SerAxisContext final : public AxisContextBase
{
public:
explicitSerAxisContext( ::oox::core::ContextHandler2Helper&
rParent, AxisModel& rModel
[Libreoffice-commits] core.git: extras/Module_extras.mk extras/Package_resource_fonts.mk Repository.mk vcl/quartz vcl/unx vcl/win
Repository.mk |1
extras/Module_extras.mk|1
extras/Package_resource_fonts.mk | 16 +++
vcl/quartz/salgdi.cxx |4 ++
vcl/unx/generic/fontmanager/helper.cxx | 16 +++
vcl/win/gdi/salfont.cxx| 45 +++--
6 files changed, 58 insertions(+), 25 deletions(-)
New commits:
commit 25f4cc12fb59284392914c93a0ae6ad199ecc069
Author: Mike Kaganski
AuthorDate: Mon Jan 13 03:32:31 2020 +0300
Commit: Thorsten Behrens
CommitDate: Tue Jan 14 13:29:59 2020 +0100
tdf#128226: make OpenSymbol font an internal resource
OpenSymbol is crucial for Math; so it is not just some font that
could be used if present, but part of program resources. As such,
it must be available with other program resources, and not depend
on user preferences, like uninstallation of the font from system.
This patch puts it into program/resource/common/fonts, and adds
that path to the paths used for private fonts. This is in addition
to share/fonts/truetype, which is optional, and is usually absent
on most Linux and Windows installations (on Linux, it is usually
in a separate package installing it to system fonts; on Windows,
it is also installed to system by MSI).
Change-Id: Ibf5e12e70dacb62b965035645fc53e9d83cd8793
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86649
Reviewed-by: Andras Timar
Reviewed-by: Rene Engelhard
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
diff --git a/Repository.mk b/Repository.mk
index 03628e958f72..88941099db72 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -965,6 +965,7 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
helpcontent2_html_icon-themes \
helpcontent2_html_static \
) \
+ resource_fonts \
))
$(eval $(call gb_Helper_register_packages_for_install,ooo_fonts,\
diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk
index 01bf26695377..534fb2814de2 100644
--- a/extras/Module_extras.mk
+++ b/extras/Module_extras.mk
@@ -25,6 +25,7 @@ $(eval $(call gb_Module_add_targets,extras,\
Package_database \
Package_databasebiblio \
Package_fonts \
+ Package_resource_fonts \
Package_gallbullets \
Package_gallhtmlexpo \
Package_gallmytheme \
diff --git a/extras/Package_resource_fonts.mk b/extras/Package_resource_fonts.mk
new file mode 100644
index ..e90e46dfddd4
--- /dev/null
+++ b/extras/Package_resource_fonts.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Package_Package,resource_fonts,$(call
gb_CustomTarget_get_workdir,extras/fonts)))
+
+$(eval $(call gb_Package_use_customtarget,resource_fonts,extras/fonts))
+
+$(eval $(call
gb_Package_add_file,resource_fonts,$(LIBO_SHARE_RESOURCE_FOLDER)/common/fonts/opens___.ttf,opens___.ttf))
+
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx
index 000141123d7e..83aebe2abc82 100644
--- a/vcl/quartz/salgdi.cxx
+++ b/vcl/quartz/salgdi.cxx
@@ -323,6 +323,10 @@ static void AddLocalTempFontDirs()
OUString aBrandStr( "$BRAND_BASE_DIR" );
rtl_bootstrap_expandMacros( &aBrandStr.pData );
+
+// internal font resources, required for normal operation, like OpenSymbol
+AddTempFontDir( aBrandStr + "/" LIBO_SHARE_RESOURCE_FOLDER
"/common/fonts/" );
+
AddTempFontDir( aBrandStr + "/" LIBO_SHARE_FOLDER "/fonts/truetype/" );
}
diff --git a/vcl/unx/generic/fontmanager/helper.cxx
b/vcl/unx/generic/fontmanager/helper.cxx
index c586dcce7d7f..c28753e33b35 100644
--- a/vcl/unx/generic/fontmanager/helper.cxx
+++ b/vcl/unx/generic/fontmanager/helper.cxx
@@ -182,21 +182,25 @@ OUString const & psp::getFontPath()
OUString aConfigPath( getOfficePath( whichOfficePath::ConfigPath ) );
OUString aInstallationRootPath( getOfficePath(
whichOfficePath::InstallationRootPath ) );
OUString aUserPath( getOfficePath( whichOfficePath::UserPath ) );
+if (!aInstallationRootPath.isEmpty())
+{
+// internal font resources, required for normal operation, like
OpenSymbol
+aPathBuffer.append(aInstallationRootPath
+ + "/" LIBO_SHARE_RESOURCE_FOLDER
"/common/fonts;");
+}
if( !aConfigPath.isEmpty() )
{
// #i53530# Path from CustomDataUrl will completely
-// replace net and user paths if the path exists
-aPathBuffer.append(aConfigPath);
-aPathBuffer.append("/" LIBO_SHARE_FOLDER "/fonts");
+//
[Libreoffice-commits] core.git: basic/inc chart2/inc desktop/inc editeng/inc emfio/inc
basic/inc/sbstdobj.hxx|2 -
chart2/inc/ChartModel.hxx |2 -
chart2/inc/ChartView.hxx |2 -
desktop/inc/app.hxx |2 -
desktop/inc/lib/init.hxx |2 -
editeng/inc/editattr.hxx | 48 +++---
editeng/inc/editdoc.hxx |4 +--
editeng/inc/edtspell.hxx |3 --
editeng/inc/unomodel.hxx |2 -
emfio/inc/mtftools.hxx|6 ++---
10 files changed, 36 insertions(+), 37 deletions(-)
New commits:
commit 4e0a6e43f48ef2d39433bdd8af3b6fd1906e2940
Author: Noel Grandin
AuthorDate: Tue Jan 14 10:22:10 2020 +0200
Commit: Noel Grandin
CommitDate: Tue Jan 14 13:25:07 2020 +0100
loplugin:finalclasses in basic..emfio
Change-Id: I1b0df1a6cb5b8db9db09cb1d55d932459ab16d81
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86741
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/basic/inc/sbstdobj.hxx b/basic/inc/sbstdobj.hxx
index 456c6809a07a..965940c8ddcd 100644
--- a/basic/inc/sbstdobj.hxx
+++ b/basic/inc/sbstdobj.hxx
@@ -25,7 +25,7 @@
#include
#include
-class SbStdFactory : public SbxFactory
+class SbStdFactory final : public SbxFactory
{
public:
SbStdFactory();
diff --git a/chart2/inc/ChartModel.hxx b/chart2/inc/ChartModel.hxx
index 969e29435862..fe9cc2c7fe89 100644
--- a/chart2/inc/ChartModel.hxx
+++ b/chart2/inc/ChartModel.hxx
@@ -105,7 +105,7 @@ typedef cppu::WeakImplHelper<
class UndoManager;
class ChartView;
-class OOO_DLLPUBLIC_CHARTTOOLS ChartModel : public impl::ChartModel_Base
+class OOO_DLLPUBLIC_CHARTTOOLS ChartModel final : public impl::ChartModel_Base
{
private:
diff --git a/chart2/inc/ChartView.hxx b/chart2/inc/ChartView.hxx
index 7993743919fd..266ff6b6a8f9 100644
--- a/chart2/inc/ChartView.hxx
+++ b/chart2/inc/ChartView.hxx
@@ -78,7 +78,7 @@ struct TimeBasedInfo
* The View is not responsible to handle single user events (that is instead
* done by the ChartWindow).
*/
-class ChartView : public ::cppu::WeakImplHelper<
+class ChartView final : public ::cppu::WeakImplHelper<
css::lang::XInitialization
,css::lang::XServiceInfo
,css::datatransfer::XTransferable
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index 2fc67ab92c14..04b5a57cdae3 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -47,7 +47,7 @@ namespace desktop
class CommandLineArgs;
class Lockfile;
struct ConvertData;
-class Desktop : public Application
+class Desktop final : public Application
{
int doShutdown();
diff --git a/desktop/inc/lib/init.hxx b/desktop/inc/lib/init.hxx
index befb378f430d..420b0d481583 100644
--- a/desktop/inc/lib/init.hxx
+++ b/desktop/inc/lib/init.hxx
@@ -70,7 +70,7 @@ namespace desktop {
static RectangleAndPart Create(const std::string& rPayload);
};
-class DESKTOP_DLLPUBLIC CallbackFlushHandler : public Idle
+class DESKTOP_DLLPUBLIC CallbackFlushHandler final : public Idle
{
public:
explicit CallbackFlushHandler(LibreOfficeKitDocument* pDocument,
LibreOfficeKitCallback pCallback, void* pData);
diff --git a/editeng/inc/editattr.hxx b/editeng/inc/editattr.hxx
index 80f6ce156e62..7c9215d22544 100644
--- a/editeng/inc/editattr.hxx
+++ b/editeng/inc/editattr.hxx
@@ -151,7 +151,7 @@ inline void EditCharAttrib::Collaps( sal_Int32 nDiff )
-class EditCharAttribFont: public EditCharAttrib
+class EditCharAttribFont final : public EditCharAttrib
{
public:
EditCharAttribFont( const SvxFontItem& rAttr, sal_Int32 nStart, sal_Int32
nEnd );
@@ -161,7 +161,7 @@ public:
-class EditCharAttribWeight : public EditCharAttrib
+class EditCharAttribWeight final : public EditCharAttrib
{
public:
EditCharAttribWeight( const SvxWeightItem& rAttr, sal_Int32 nStart,
sal_Int32 nEnd );
@@ -170,7 +170,7 @@ public:
};
-class EditCharAttribItalic : public EditCharAttrib
+class EditCharAttribItalic final : public EditCharAttrib
{
public:
EditCharAttribItalic( const SvxPostureItem& rAttr, sal_Int32 nStart,
sal_Int32 nEnd );
@@ -180,7 +180,7 @@ public:
-class EditCharAttribShadow : public EditCharAttrib
+class EditCharAttribShadow final : public EditCharAttrib
{
public:
EditCharAttribShadow( const SvxShadowedItem& rAttr, sal_Int32 nStart,
sal_Int32 nEnd );
@@ -190,7 +190,7 @@ public:
-class EditCharAttribEscapement : public EditCharAttrib
+class EditCharAttribEscapement final : public EditCharAttrib
{
public:
EditCharAttribEscapement( const SvxEscapementItem& rAttr, sal_Int32
nStart, sal_Int32 nEnd );
@@ -200,7 +200,7 @@ public:
-class EditCharAttribOutline : public EditCharAttrib
+class EditCharAttribOutline final : public EditCharAttrib
{
public:
EditCharAttribOutline( const SvxContourItem& rAttr, sal_Int32 nStart,
sal_Int32 nEnd );
@@ -210,7 +210,7 @@ public:
-class EditCharAttribStrikeout : public EditCharAttrib
+class EditCharAttribStrikeout final : public EditCharAttrib
{
public:
EditCharAttribStrikeout( cons
[Libreoffice-commits] core.git: 2 commits - officecfg/registry svx/source sw/inc sw/source sw/util vcl/unx
officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu | 11 ++
svx/source/sidebar/text/TextCharacterSpacingControl.cxx |1
svx/source/sidebar/text/TextUnderlineControl.cxx|1
sw/inc/PageSizePopup.hxx| 18 +++-
sw/source/uibase/app/swmodule.cxx |1
sw/source/uibase/sidebar/PageSizeControl.cxx|8 +-
sw/source/uibase/sidebar/PageSizeControl.hxx| 11 +-
sw/source/uibase/sidebar/PageSizePopup.cxx | 38
+++---
sw/util/sw.component|4 +
vcl/unx/gtk3/gtk3gtkinst.cxx|1
10 files changed, 68 insertions(+), 26 deletions(-)
New commits:
commit 3afc718eddcd81232392d46fccc24b8ec626c8df
Author: Caolán McNamara
AuthorDate: Tue Jan 14 10:06:30 2020 +
Commit: Caolán McNamara
CommitDate: Tue Jan 14 13:14:36 2020 +0100
rework PageSizePopup to be a PopupWindowController
Change-Id: Ib8a0acbceca607b0820437d66e18c7cd8c16904e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86748
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
index 829f9f17c4e8..f01223dc1d6a 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
@@ -1162,6 +1162,17 @@
lo.writer.MMExcludeEntryController
+
+
+ .uno:AttributePageSize
+
+
+
+
+
+ lo.writer.PageSizeToolBoxControl
+
+
.uno:FindText
diff --git a/sw/inc/PageSizePopup.hxx b/sw/inc/PageSizePopup.hxx
index 5315863bf2b2..5f7354bb3da1 100644
--- a/sw/inc/PageSizePopup.hxx
+++ b/sw/inc/PageSizePopup.hxx
@@ -19,18 +19,24 @@
#ifndef INCLUDED_SW_INC_PAGESIZEPOPUP_HXX
#define INCLUDED_SW_INC_PAGESIZEPOPUP_HXX
-#include
+#include
#include "swdllapi.h"
-class PageSizePopup final : public SfxToolBoxControl
+class PageSizePopup final : public svt::PopupWindowController
{
public:
-SFX_DECL_TOOLBOX_CONTROL();
-
-PageSizePopup(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx);
+PageSizePopup(const css::uno::Reference&
rContext);
virtual ~PageSizePopup() override;
-virtual VclPtr CreatePopupWindow() override;
+using svt::ToolboxController::createPopupWindow;
+virtual VclPtr createPopupWindow( vcl::Window* pParent )
override;
+
+// XServiceInfo
+virtual OUString SAL_CALL getImplementationName() override;
+virtual css::uno::Sequence SAL_CALL getSupportedServiceNames()
override;
+
+// XInitialization
+virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any
>& rArguments ) override;
};
#endif
diff --git a/sw/source/uibase/app/swmodule.cxx
b/sw/source/uibase/app/swmodule.cxx
index dd596895786e..613dda8d345f 100644
--- a/sw/source/uibase/app/swmodule.cxx
+++ b/sw/source/uibase/app/swmodule.cxx
@@ -282,7 +282,6 @@ void SwDLL::RegisterControls()
PageMarginPopup::RegisterControl(SID_ATTR_PAGE_MARGIN, pMod);
PageOrientationPopup::RegisterControl(SID_ATTR_PAGE_ORIENTATION, pMod);
PageColumnPopup::RegisterControl(SID_ATTR_PAGE_COLUMN, pMod);
-PageSizePopup::RegisterControl(SID_ATTR_PAGE_SIZE, pMod);
SvxClipBoardControl::RegisterControl(SID_PASTE, pMod );
SvxUndoRedoControl::RegisterControl(SID_UNDO, pMod );
diff --git a/sw/source/uibase/sidebar/PageSizeControl.cxx
b/sw/source/uibase/sidebar/PageSizeControl.cxx
index cd38ccf29953..dc33541466b9 100644
--- a/sw/source/uibase/sidebar/PageSizeControl.cxx
+++ b/sw/source/uibase/sidebar/PageSizeControl.cxx
@@ -39,6 +39,8 @@
#include
#include
+#include
+
namespace
{
FieldUnit lcl_GetFieldUnit()
@@ -68,8 +70,8 @@ namespace
namespace sw { namespace sidebar {
-PageSizeControl::PageSizeControl( sal_uInt16 nId, vcl::Window* pParent )
-: SfxPopupWindow( nId, pParent, "PageSizeControl",
"modules/swriter/ui/pagesizecontrol.ui" )
+PageSizeControl::PageSizeControl(PageSizePopup* pControl, vcl::Window* pParent)
+: ToolbarPopup(pControl->getFrameInterface(), pParent, "PageSizeControl",
"modules/swriter/ui/pagesizecontrol.ui")
, maPaperList()
{
get(maMoreButton, "moreoptions");
@@ -200,7 +202,7 @@ void PageSizeControl::dispose()
maMoreButton.disposeAndClear();
maWidthHeightField.disposeAndClear();
maContainer.disposeAndClear();
-SfxPopupWindow::dispose();
+ToolbarPopup::dispose();
}
void PageSizeControl::ExecuteSizeChange( const Paper ePaper )
diff --git a/sw/source/uibase/sidebar/PageSizeControl.hxx
b/sw/source/uibase/sidebar/PageSizeControl.hxx
index e67f624998e4..695140f6a4f6 100644
--- a/sw/source/uibase/sidebar
[Libreoffice-commits] online.git: loleaflet/css
loleaflet/css/spreadsheet.css |7 +--
1 file changed, 1 insertion(+), 6 deletions(-)
New commits:
commit 4162d892e00398be9667f7beff93c6cd215d3cae
Author: Pedro Pinto Silva
AuthorDate: Tue Jan 14 13:04:36 2020 +0100
Commit: Pedro Pinto da Silva
CommitDate: Tue Jan 14 13:11:06 2020 +0100
Remove changes introduced in 85362 because :
- it was causing improper behaviour when multiselecting
- there is always a cell (svg path) that is been set always with diferent
stroke color even when multiple cells are selected and so CSS shouldn't be
modified but instead, probably, JS bits
Change-Id: Ie8f11f14f5ffc958f646332c7fe2bc810b34d808
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/86755
Reviewed-by: Pedro Pinto da Silva
Tested-by: Pedro Pinto da Silva
diff --git a/loleaflet/css/spreadsheet.css b/loleaflet/css/spreadsheet.css
index 010890f35..542d99a57 100644
--- a/loleaflet/css/spreadsheet.css
+++ b/loleaflet/css/spreadsheet.css
@@ -202,12 +202,7 @@
.spreadsheet-header-row-resize {
cursor: row-resize;
}
-.spreadsheet-document .leaflet-zoom-animated > path:nth-child(2){
- stroke: none !important;
-}
-.spreadsheet-document .leaflet-zoom-animated:hover > path:nth-child(2){
- stroke: none !important;
-}
+
.spreadsheet-cell-resize-marker {
margin-left: 0px;
margin-top: 0px;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.LokDialog.js |3 +++
1 file changed, 3 insertions(+)
New commits:
commit f0d6b619e98a399dd667cbdb9000700046795e59
Author: Ashod Nakashian
AuthorDate: Tue Jan 14 06:46:17 2020 -0500
Commit: Michael Meeks
CommitDate: Tue Jan 14 13:02:40 2020 +0100
leaflet: give focus to the dialog on open
Change-Id: I715025123edf2bcf0564b5ce43c16b5595daed5b
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/86754
Reviewed-by: Michael Meeks
Tested-by: Michael Meeks
diff --git a/loleaflet/src/control/Control.LokDialog.js
b/loleaflet/src/control/Control.LokDialog.js
index 2abdc0246..a0e9ff9b8 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -1026,6 +1026,9 @@ L.Control.LokDialog = L.Control.extend({
if (parentId in that._dialogs) {
// We might have closed the dialog by the time
we render.
that._dialogs[parentId].isPainting = false;
+ if (!that._isSidebar(parentId)) {
+ that.focus(parentId);
+ }
}
};
img.src = imgData;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: kit/Kit.cpp
kit/Kit.cpp | 17 ++---
1 file changed, 6 insertions(+), 11 deletions(-)
New commits:
commit 4619ac73ffb31ce7f3bb30accb5a5be116529bff
Author: Ashod Nakashian
AuthorDate: Wed Jan 8 03:37:47 2020 -0500
Commit: Michael Meeks
CommitDate: Tue Jan 14 13:01:05 2020 +0100
wsd: minor cleanup
Change-Id: I2c062e1f7d309c8d1c54e6d0e8ca4c40f288d09d
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/86723
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Michael Meeks
diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index a8855f1c3..78eea14eb 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -1854,27 +1854,22 @@ private:
}
public:
-bool hasQueued()
-{
-return !_tileQueue->isEmpty();
-}
-
void drainQueue(const std::chrono::steady_clock::time_point &now)
{
try
{
-while (hasQueued())
+while (!_tileQueue->isEmpty())
{
-const TileQueue::Payload input = _tileQueue->pop();
-
-LOG_TRC("Kit Recv " <<
LOOLProtocol::getAbbreviatedMessage(input));
-
if (_stop || SigUtil::getTerminationFlag())
{
-LOG_INF("_stop or TerminationFlag is set, breaking out of
loop");
+LOG_INF("_stop or TerminationFlag is set, breaking
Document::drainQueue of loop");
break;
}
+const TileQueue::Payload input = _tileQueue->pop();
+
+LOG_TRC("Kit Recv " <<
LOOLProtocol::getAbbreviatedMessage(input));
+
const std::vector tokens =
LOOLProtocol::tokenize(input.data(), input.size());
if (tokens[0] == "eof")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx
include/svx/svxdlg.hxx |6 --
1 file changed, 6 deletions(-)
New commits:
commit 93be108f5270cc2b0fe19d23d7819970e69a8535
Author: Noel Grandin
AuthorDate: Tue Jan 14 08:41:50 2020 +0200
Commit: Noel Grandin
CommitDate: Tue Jan 14 12:57:29 2020 +0100
AbstractSvxHlinkDlgMarkWnd is unused
since
commit 74713b34a36577f19eb3194246de73fa4f2bb741
Date: Wed May 25 09:05:21 2016 +0200
loplugin:unusedmethods
Change-Id: I0c70c169fff9e377688483c65ca6beb67ff06046
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86739
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/svx/svxdlg.hxx b/include/svx/svxdlg.hxx
index 36d56e87acdd..2fce5d60b1b5 100644
--- a/include/svx/svxdlg.hxx
+++ b/include/svx/svxdlg.hxx
@@ -132,12 +132,6 @@ public:
virtual OUString GetName() const = 0;
};
-class AbstractSvxHlinkDlgMarkWnd : public VclAbstractDialog
-{
-protected:
-virtual ~AbstractSvxHlinkDlgMarkWnd() override = default;
-};
-
class AbstractSvxSearchSimilarityDialog :public VclAbstractDialog
{
protected:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source svx/source sw/source
sc/source/ui/formdlg/dwfunctr.cxx |1 - sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx |4 svx/source/sidebar/graphic/GraphicPropertyPanel.cxx |2 -- svx/source/sidebar/line/LinePropertyPanel.hxx |4 svx/source/sidebar/line/LinePropertyPanelBase.cxx |2 -- svx/source/sidebar/paragraph/ParaPropertyPanel.cxx |2 -- sw/source/uibase/sidebar/PageStylesPanel.hxx|2 -- 7 files changed, 17 deletions(-) New commits: commit 9e224ed49b47efc0695647494f5ba6a6b866aa61 Author: Caolán McNamara AuthorDate: Tue Jan 14 09:35:39 2020 + Commit: Caolán McNamara CommitDate: Tue Jan 14 12:34:33 2020 +0100 remove some unneeded includes Change-Id: Ic7add88f04fb53960c4d76414fb655cb4e5040b7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86745 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx index dd7be33c9070..8897ba8583be 100644 --- a/sc/source/ui/formdlg/dwfunctr.cxx +++ b/sc/source/ui/formdlg/dwfunctr.cxx @@ -21,7 +21,6 @@ #include #include #include -#include #include #include diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx index a1d3c4eb7461..98dd424f1a97 100644 --- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx +++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx @@ -21,10 +21,6 @@ #include #include #include -#include -#include -#include -#include #include #include #include diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx index 2675016afabb..9709834ef5ec 100644 --- a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx +++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx @@ -21,8 +21,6 @@ #include #include #include -#include -#include #include #include #include diff --git a/svx/source/sidebar/line/LinePropertyPanel.hxx b/svx/source/sidebar/line/LinePropertyPanel.hxx index 5ad1c850cd26..c7296cab94e0 100644 --- a/svx/source/sidebar/line/LinePropertyPanel.hxx +++ b/svx/source/sidebar/line/LinePropertyPanel.hxx @@ -20,13 +20,9 @@ #define INCLUDED_SVX_SOURCE_SIDEBAR_LINE_LINEPROPERTYPANEL_HXX #include -#include #include #include #include -#include -#include -#include #include #include #include diff --git a/svx/source/sidebar/line/LinePropertyPanelBase.cxx b/svx/source/sidebar/line/LinePropertyPanelBase.cxx index 743a74e453ad..75d84db0a6a5 100644 --- a/svx/source/sidebar/line/LinePropertyPanelBase.cxx +++ b/svx/source/sidebar/line/LinePropertyPanelBase.cxx @@ -41,8 +41,6 @@ #include #include #include -#include -#include #include #include #include diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx index ebc6f2d9ce87..b14ca89aebdf 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx @@ -24,8 +24,6 @@ #include #include #include -#include -#include #include #include #include diff --git a/sw/source/uibase/sidebar/PageStylesPanel.hxx b/sw/source/uibase/sidebar/PageStylesPanel.hxx index a3b7efde6337..bed8786a37fd 100644 --- a/sw/source/uibase/sidebar/PageStylesPanel.hxx +++ b/sw/source/uibase/sidebar/PageStylesPanel.hxx @@ -28,8 +28,6 @@ #include -#include -#include #include #include #include ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: ios/Mobile.xcodeproj
ios/Mobile.xcodeproj/project.pbxproj | 250 +++
1 file changed, 250 insertions(+)
New commits:
commit 7254183877a211f6926b46a6793200da19224af0
Author: Tor Lillqvist
AuthorDate: Tue Jan 14 13:20:47 2020 +0200
Commit: Tor Lillqvist
CommitDate: Tue Jan 14 13:21:04 2020 +0200
Add some source files from sd for easier breakpointing
Change-Id: I2797b8fb8fbeebe73b6536a27733ad5fe2123d50
diff --git a/ios/Mobile.xcodeproj/project.pbxproj
b/ios/Mobile.xcodeproj/project.pbxproj
index 7d7563578..4018f67e9 100644
--- a/ios/Mobile.xcodeproj/project.pbxproj
+++ b/ios/Mobile.xcodeproj/project.pbxproj
@@ -326,6 +326,115 @@
BE34D1FE219076CF00815297 /* output2.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = output2.cxx;
path = "../../ios-device/sc/source/ui/view/output2.cxx"; sourceTree =
""; };
BE34D1FF219076CF00815297 /* formatsh.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = formatsh.cxx;
path = "../../ios-device/sc/source/ui/view/formatsh.cxx"; sourceTree =
""; };
BE34D200219076CF00815297 /* dbfunc3.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dbfunc3.cxx;
path = "../../ios-device/sc/source/ui/view/dbfunc3.cxx"; sourceTree =
""; };
+ BE3C8B2723CC8E93008302F8 /* PreviewValueSet.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
PreviewValueSet.cxx; path =
"../../ios-device/sd/source/ui/sidebar/PreviewValueSet.cxx"; sourceTree =
""; };
+ BE3C8B2823CC8E93008302F8 /* TableDesignPanel.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
TableDesignPanel.cxx; path =
"../../ios-device/sd/source/ui/sidebar/TableDesignPanel.cxx"; sourceTree =
""; };
+ BE3C8B2923CC8E93008302F8 /* DocumentHelper.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
DocumentHelper.cxx; path =
"../../ios-device/sd/source/ui/sidebar/DocumentHelper.cxx"; sourceTree =
""; };
+ BE3C8B2A23CC8E93008302F8 /* MasterPageContainer.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
MasterPageContainer.cxx; path =
"../../ios-device/sd/source/ui/sidebar/MasterPageContainer.cxx"; sourceTree =
""; };
+ BE3C8B2B23CC8E93008302F8 /* PanelFactory.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
PanelFactory.cxx; path =
"../../ios-device/sd/source/ui/sidebar/PanelFactory.cxx"; sourceTree =
""; };
+ BE3C8B2C23CC8E93008302F8 /* AllMasterPagesSelector.cxx */ =
{isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
AllMasterPagesSelector.cxx; path =
"../../ios-device/sd/source/ui/sidebar/AllMasterPagesSelector.cxx"; sourceTree
= ""; };
+ BE3C8B2D23CC8E93008302F8 /* MasterPageObserver.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
MasterPageObserver.cxx; path =
"../../ios-device/sd/source/ui/sidebar/MasterPageObserver.cxx"; sourceTree =
""; };
+ BE3C8B2E23CC8E93008302F8 /* SlideBackground.hxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name =
SlideBackground.hxx; path =
"../../ios-device/sd/source/ui/sidebar/SlideBackground.hxx"; sourceTree =
""; };
+ BE3C8B2F23CC8E93008302F8 /* CurrentMasterPagesSelector.cxx */ =
{isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
CurrentMasterPagesSelector.cxx; path =
"../../ios-device/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx";
sourceTree = ""; };
+ BE3C8B3023CC8E93008302F8 /* CustomAnimationPanel.cxx */ = {isa
= PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
CustomAnimationPanel.cxx; path =
"../../ios-device/sd/source/ui/sidebar/CustomAnimationPanel.cxx"; sourceTree =
""; };
+ BE3C8B3123CC8E93008302F8 /* NavigatorWrapper.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
NavigatorWrapper.cxx; path =
"../../ios-device/sd/source/ui/sidebar/NavigatorWrapper.cxx"; sourceTree =
""; };
+ BE3C8B3223CC8E93008302F8 /* ISidebarReceiver.hxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name =
ISidebarReceiver.hxx; path =
"../../ios-device/sd/source/ui/sidebar/ISidebarReceiver.hxx"; sourceTree =
""; };
+ BE3C8B3323CC8E93008302F8 /* MasterPageContainer.hxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name =
MasterPageContainer.hxx; path =
"../../ios-device/sd/source/ui/sidebar/MasterPageContainer.hxx"; sourceTree =
""; };
+ BE3C8B3423CC8E93008302F8 /* LayoutMenu.hxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = LayoutMenu.hxx;
path = "../../ios-device/sd/source/ui/sidebar/LayoutMenu.hxx"; sourceTree =
""; };
+
[Libreoffice-commits] core.git: include/sfx2 include/svtools sfx2/source sfx2/uiconfig solenv/sanitizers
include/sfx2/charmapcontrol.hxx| 37 ++---
include/sfx2/charmappopup.hxx |1
include/svtools/toolbarmenu.hxx|7 -
sfx2/source/control/charmapcontrol.cxx | 219 +++--
sfx2/source/dialog/charmappopup.cxx| 15 +-
sfx2/uiconfig/ui/charmapcontrol.ui | 180 +++
solenv/sanitizers/ui/sfx.suppr | 32
7 files changed, 241 insertions(+), 250 deletions(-)
New commits:
commit 1c6728a7b52439ed09ed1576517b8037479de1a6
Author: Caolán McNamara
AuthorDate: Mon Jan 13 08:50:56 2020 +
Commit: Caolán McNamara
CommitDate: Tue Jan 14 12:15:37 2020 +0100
weld SfxCharmapCtrl
Change-Id: I36bb2d1b23fdb5afa4e5ab85e6989a95474e874e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86678
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/include/sfx2/charmapcontrol.hxx b/include/sfx2/charmapcontrol.hxx
index e6a8f672eef8..83230a458af6 100644
--- a/include/sfx2/charmapcontrol.hxx
+++ b/include/sfx2/charmapcontrol.hxx
@@ -25,37 +25,38 @@
#include
#include
#include
-#include
#include
class CharmapPopup;
namespace com::sun::star::frame { class XFrame; }
-class SfxCharmapCtrl final : public svtools::ToolbarPopup
+class SfxCharmapCtrl final : public WeldToolbarPopup
{
public:
-explicit SfxCharmapCtrl(CharmapPopup* pControl, vcl::Window* pParent);
-
+explicit SfxCharmapCtrl(CharmapPopup* pControl, weld::Widget* pParent);
virtual ~SfxCharmapCtrl() override;
-virtual void dispose() override;
-
-virtual bool EventNotify( NotifyEvent& rNEvt ) override;
+virtual void GrabFocus() override;
private:
-VclPtr m_pRecentCharView[16];
-VclPtr m_pFavCharView[16];
-std::deque maRecentCharList;
-std::deque maRecentCharFontList;
-std::deque maFavCharList;
-std::deque maFavCharFontList;
-VclPtr maDlgBtn;
-bool mbNeedsInit = true;
+rtl::Reference m_xControl;
+
+ScopedVclPtr m_xVirDev;
+
+std::deque m_aRecentCharList;
+std::deque m_aRecentCharFontList;
+std::deque m_aFavCharList;
+std::deque m_aFavCharFontList;
+
+SvxCharView m_aRecentCharView[16];
+SvxCharView m_aFavCharView[16];
+std::unique_ptr m_xDlgBtn;
+std::unique_ptr m_xRecentCharView[16];
+std::unique_ptr m_xFavCharView[16];
-DECL_LINK(CharClickHdl, SvxCharViewControl*, void);
-DECL_STATIC_LINK(SfxCharmapCtrl, FocusHdl, Control&, void);
-DECL_LINK(OpenDlgHdl, Button*, void);
+DECL_LINK(CharClickHdl, SvxCharView*, void);
+DECL_LINK(OpenDlgHdl, weld::Button&, void);
voidgetFavCharacterList();
voidupdateFavCharControl();
diff --git a/include/sfx2/charmappopup.hxx b/include/sfx2/charmappopup.hxx
index a691327104b6..4bf25fd674c3 100644
--- a/include/sfx2/charmappopup.hxx
+++ b/include/sfx2/charmappopup.hxx
@@ -31,6 +31,7 @@ public:
using svt::ToolboxController::createPopupWindow;
virtual VclPtr createPopupWindow( vcl::Window* pParent )
override;
+virtual std::unique_ptr weldPopupWindow() override;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() override;
diff --git a/include/svtools/toolbarmenu.hxx b/include/svtools/toolbarmenu.hxx
index d583482628ce..b11b89380774 100644
--- a/include/svtools/toolbarmenu.hxx
+++ b/include/svtools/toolbarmenu.hxx
@@ -178,12 +178,11 @@ public:
// is activated, so ToolbarPopupContainer is that widget and the
// contents of the on-demand created WeldToolbarPopup is placed
// within the ToolbarPopupContainer
-class SVT_DLLPUBLIC ToolbarPopupContainer
+class SVT_DLLPUBLIC ToolbarPopupContainer final
{
private:
DECL_LINK(FocusHdl, weld::Widget&, void);
-protected:
std::unique_ptr m_xBuilder;
std::unique_ptr m_xTopLevel;
std::unique_ptr m_xContainer;
@@ -199,9 +198,9 @@ public:
void unsetPopover();
};
-class SVT_DLLPUBLIC InterimToolbarPopup : public svtools::ToolbarPopup
+class SVT_DLLPUBLIC InterimToolbarPopup final : public svtools::ToolbarPopup
{
-protected:
+private:
VclPtr m_xBox;
std::unique_ptr m_xBuilder;
std::unique_ptr m_xContainer;
diff --git a/sfx2/source/control/charmapcontrol.cxx
b/sfx2/source/control/charmapcontrol.cxx
index fe44619b2f3a..152aa78c8ad2 100644
--- a/sfx2/source/control/charmapcontrol.cxx
+++ b/sfx2/source/control/charmapcontrol.cxx
@@ -26,58 +26,83 @@
using namespace css;
-SfxCharmapCtrl::SfxCharmapCtrl(CharmapPopup* pControl, vcl::Window* pParent)
-: ToolbarPopup(pControl->getFrameInterface(), pParent, "charmapctrl",
"sfx/ui/charmapcontrol.ui")
+SfxCharmapCtrl::SfxCharmapCtrl(CharmapPopup* pControl, weld::Widget* pParent)
+: WeldToolbarPopup(pControl->getFrameInterface(), pParent,
"sfx/ui/charmapcontrol.ui", "charmapctrl")
+, m_xControl(pControl)
+, m_xVirDev(VclPtr::Create())
+, m_aRecentCharView{SvxCharView(m_xVirDev),
+
[Libreoffice-commits] core.git: 2 commits - external/skia extras/source include/sfx2 sfx2/source solenv/bin
external/skia/Library_skia.mk | 10 -
external/skia/UnpackedTarball_skia.mk |1
external/skia/msvc-vectorcall-sse.patch.1 | 25 +++
extras/source/glade/libreoffice-catalog.xml.in |3
include/sfx2/charwin.hxx | 32 ---
sfx2/source/control/charwin.cxx| 205 -
solenv/bin/native-code.py |1
7 files changed, 27 insertions(+), 250 deletions(-)
New commits:
commit 51882d9ec5a139bc7bc282ebf4ab03ada9ff2694
Author: Luboš Luňák
AuthorDate: Mon Jan 13 13:33:41 2020 +0100
Commit: Luboš Luňák
CommitDate: Tue Jan 14 12:16:09 2020 +0100
fix Skia CPU instruction set support (tdf#129546)
It was a mistake to compile the SkOpts.cpp file with the highest
CPU set available. I got confused by what SK_CPU_SSE_LEVEL means.
That setting is the lowest set supported, so we should leave
it at whatever Skia's SkPreConfig.h detects it to be from the actual
compiler flags (the ones used for building everything).
SkOpts::init() does runtime checks only for sets _lower_ than what
SK_CPU_SSE_LEVEL says, so by compiling the file with the highest set
all these runtime checks got disabled and it was assumed that
the set defined by SK_CPU_SSE_LEVEL is always available.
Change-Id: I839370645a9cafbede2d37017b9332cc739fc317
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86682
Tested-by: Jenkins
Reviewed-by: Luboš Luňák
diff --git a/external/skia/Library_skia.mk b/external/skia/Library_skia.mk
index ecebc4a4fe14..9a619a9d51dd 100644
--- a/external/skia/Library_skia.mk
+++ b/external/skia/Library_skia.mk
@@ -208,6 +208,7 @@ $(eval $(call
gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/core/SkNormalFlatSource \
UnpackedTarball/skia/src/core/SkNormalMapSource \
UnpackedTarball/skia/src/core/SkNormalSource \
+UnpackedTarball/skia/src/core/SkOpts \
UnpackedTarball/skia/src/core/SkOverdrawCanvas \
UnpackedTarball/skia/src/core/SkPaint \
UnpackedTarball/skia/src/core/SkPaintPriv \
@@ -815,15 +816,6 @@ $(eval $(call
gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/src/opts/SkOpts_ssse3, $(CXXFLAGS_INTRINSICS_SSSE3) \
))
-# Compile this file with the best intrinsics available.
-$(eval $(call gb_Library_add_generated_exception_objects,skia,\
-UnpackedTarball/skia/src/core/SkOpts, \
-$(CXXFLAGS_INTRINSICS_SSSE3) \
-$(CXXFLAGS_INTRINSICS_SSE41) $(CXXFLAGS_INTRINSICS_SSE42) \
-$(CXXFLAGS_INTRINSICS_AVX) \
-$(CXXFLAGS_INTRINSICS_AVX2) $(CXXFLAGS_INTRINSICS_F16C)
$(CXXFLAGS_INTRINSICS_FMA) \
-))
-
$(eval $(call gb_Library_add_generated_exception_objects,skia,\
UnpackedTarball/skia/tools/gpu/vk/VkTestUtils \
UnpackedTarball/skia/tools/sk_app/GLWindowContext \
diff --git a/external/skia/UnpackedTarball_skia.mk
b/external/skia/UnpackedTarball_skia.mk
index e050b9832d6b..6ad0bdc455dc 100644
--- a/external/skia/UnpackedTarball_skia.mk
+++ b/external/skia/UnpackedTarball_skia.mk
@@ -26,6 +26,7 @@ skia_patches := \
Wdeprecated-copy-dtor.patch.0 \
fix-msvc.patch.1 \
fix-gcc-x86.patch.1\
+msvc-vectorcall-sse.patch.1 \
$(eval $(call gb_UnpackedTarball_set_patchlevel,skia,1))
diff --git a/external/skia/msvc-vectorcall-sse.patch.1
b/external/skia/msvc-vectorcall-sse.patch.1
new file mode 100644
index ..f06dca41cff3
--- /dev/null
+++ b/external/skia/msvc-vectorcall-sse.patch.1
@@ -0,0 +1,25 @@
+From 9a75d6249ed5c5eff36d70db2a9b87000437fc09 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?=
+Date: Mon, 13 Jan 2020 14:34:12 +0100
+Subject: [PATCH] MSVC's __vectorcall does not work with /arch:SSE
+
+---
+ src/opts/SkRasterPipeline_opts.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/opts/SkRasterPipeline_opts.h
b/src/opts/SkRasterPipeline_opts.h
+index 692530828f..7f2b473d82 100644
+--- a/src/opts/SkRasterPipeline_opts.h
b/src/opts/SkRasterPipeline_opts.h
+@@ -1047,7 +1047,7 @@ static const size_t N = sizeof(F) / sizeof(float);
+ // TODO: crashes during compilation :(
+ #define ABI __attribute__((sysv_abi))
+ #define JUMPER_NARROW_STAGES 0
+-#elif defined(_MSC_VER)
++#elif defined(_MSC_VER) && SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE2
+ // Even if not vectorized, this lets us pass {r,g,b,a} as registers,
+ // instead of {b,a} on the stack. Narrow stages work best for
__vectorcall.
+ #define ABI __vectorcall
+--
+2.16.4
+
commit 3888b5ec27c0f1de283e05a6daf0196553b4
Author: Caolán McNamara
AuthorDate: Mon Jan 13 11:53:28 2020 +
Commit: Caolán McNamara
CommitDate: Tue Jan 14 12:15:56 2020 +0100
SvxCharViewControl is newly unused
Change-Id: I8319f6498b6c2adf74c94c76d78aa02cabc01c64
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86689
Tested-by: Jenkins
Reviewed-b
[Libreoffice-commits] core.git: include/sfx2 include/svtools officecfg/registry sc/source sd/source sfx2/source sfx2/util svtools/source sw/source
include/sfx2/charmapcontrol.hxx |8 +-
include/sfx2/charmappopup.hxx | 19 +++-
include/svtools/popupwindowcontroller.hxx | 10 ++
officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu | 11 ++
sc/source/ui/app/scdll.cxx |1
sd/source/ui/app/sddll.cxx |1
sfx2/source/control/charmapcontrol.cxx | 12 +--
sfx2/source/dialog/charmappopup.cxx | 39
++
sfx2/util/sfx.component |4 +
svtools/source/uno/popupwindowcontroller.cxx|2
sw/source/uibase/app/swmodule.cxx |2
11 files changed, 72 insertions(+), 37 deletions(-)
New commits:
commit 94c1f5cfb96a826220b64608cf0ada76d3bdde31
Author: Caolán McNamara
AuthorDate: Mon Jan 13 09:14:39 2020 +
Commit: Caolán McNamara
CommitDate: Tue Jan 14 11:51:06 2020 +0100
rework SfxCharmapCtrl to be a PopupWindowController
With MSVC, the changes to include/sfx2/charmappopup.hxx would cause spurious
> isvt.lib(svtlo.dll) : error LNK2005: "public: virtual class
com::sun::star::uno::Any __cdecl cppu::ImplInheritanceHelper::queryInterface(class
com::sun::star::uno::Type const &)"
(?queryInterface@?$ImplInheritanceHelper@VToolboxController@svt@@VXServiceInfo@lang@star@sun@com@@@cppu@@UAA?AVAny@uno@star@sun@com@@ABVType@4567@@Z)
already defined in classificationcontroller.o
> isvt.lib(svtlo.dll) : error LNK2005: "public: virtual void __cdecl
cppu::ImplInheritanceHelper::acquire(void)"
(?acquire@?$ImplInheritanceHelper@VToolboxController@svt@@VXServiceInfo@lang@star@sun@com@@@cppu@@UAAXXZ)
already defined in classificationcontroller.o
> isvt.lib(svtlo.dll) : error LNK2005: "public: virtual void __cdecl
cppu::ImplInheritanceHelper::release(void)"
(?release@?$ImplInheritanceHelper@VToolboxController@svt@@VXServiceInfo@lang@star@sun@com@@@cppu@@UAAXXZ)
already defined in classificationcontroller.o
when linking Library_sfx (and which appears to be unrelated to the
(implicit)
/INCREMENTAL since 9739c37d8ad7c6fca269709674a6975fa7ebd191 "enable
incremental
linking on windows"), which requires the HACK in
include/svtools/popupwindowcontroller.hxx.
Change-Id: I74c4318e6216001f18d0cf5ed63e78ba2ab13cd3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86664
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/include/sfx2/charmapcontrol.hxx b/include/sfx2/charmapcontrol.hxx
index 4c0501c0abfd..e6a8f672eef8 100644
--- a/include/sfx2/charmapcontrol.hxx
+++ b/include/sfx2/charmapcontrol.hxx
@@ -24,16 +24,18 @@
#include
#include
#include
+#include
#include
#include
+class CharmapPopup;
+
namespace com::sun::star::frame { class XFrame; }
-class SfxCharmapCtrl final : public SfxPopupWindow
+class SfxCharmapCtrl final : public svtools::ToolbarPopup
{
public:
-explicit SfxCharmapCtrl(sal_uInt16 nId, vcl::Window* pParent,
-const css::uno::Reference< css::frame::XFrame >&
rFrame);
+explicit SfxCharmapCtrl(CharmapPopup* pControl, vcl::Window* pParent);
virtual ~SfxCharmapCtrl() override;
diff --git a/include/sfx2/charmappopup.hxx b/include/sfx2/charmappopup.hxx
index d896acd45e45..a691327104b6 100644
--- a/include/sfx2/charmappopup.hxx
+++ b/include/sfx2/charmappopup.hxx
@@ -20,19 +20,24 @@
#ifndef INCLUDED_SFX2_INC_CHARMAPPOPUP_HXX
#define INCLUDED_SFX2_INC_CHARMAPPOPUP_HXX
-#include
+#include
#include
-class SFX2_DLLPUBLIC CharmapPopup final : public SfxToolBoxControl
+class SFX2_DLLPUBLIC CharmapPopup final : public svt::PopupWindowController
{
public:
-SFX_DECL_TOOLBOX_CONTROL();
-
-CharmapPopup(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx);
+CharmapPopup(const css::uno::Reference&
rContext);
virtual ~CharmapPopup() override;
-virtual VclPtr CreatePopupWindow() override;
-virtual void SAL_CALL execute( sal_Int16 /*KeyModifier*/ ) override;
+using svt::ToolboxController::createPopupWindow;
+virtual VclPtr createPopupWindow( vcl::Window* pParent )
override;
+
+// XServiceInfo
+virtual OUString SAL_CALL getImplementationName() override;
+virtual css::uno::Sequence SAL_CALL getSupportedServiceNames()
override;
+
+// XInitialization
+virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any
>& rArguments ) override;
};
#endif
diff --git a/include/svtools/popupwindowcontroller.hxx
b/include/svtools/popupwindowcontroller.hxx
index f1df441a4979..88317cb9de3d 100644
--- a/include/svtools/popupwindowcontroller.hxx
+++ b/include/svtools/popupwindowcontroller.hxx
@@ -40,8 +40,14 @@ namespace svt
{
class PopupWindowControllerImpl;
-class SVT_DLLPUBLIC PopupWindowController : pub
[Libreoffice-commits] core.git: extras/source
extras/source/autocorr/lang/pt/DocumentList.xml | 15 +++ 1 file changed, 15 insertions(+) New commits: commit 9bb9fb43a69dd7c0afe864caadb8bb9d45207479 Author: Marco A.G.Pinto AuthorDate: Tue Jan 14 08:20:20 2020 +0100 Commit: Andras Timar CommitDate: Tue Jan 14 11:10:55 2020 +0100 [pt_PT] Added 15 words to autocorrect Change-Id: I0d7c606581c00588334c628419e5a1fff09f1c40 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86735 Tested-by: Jenkins Reviewed-by: Andras Timar diff --git a/extras/source/autocorr/lang/pt/DocumentList.xml b/extras/source/autocorr/lang/pt/DocumentList.xml index a4eb286b9fee..a4d1815c0b8f 100644 --- a/extras/source/autocorr/lang/pt/DocumentList.xml +++ b/extras/source/autocorr/lang/pt/DocumentList.xml @@ -270,6 +270,8 @@ + + @@ -399,6 +401,8 @@ + + @@ -609,8 +613,10 @@ + + @@ -1250,6 +1256,8 @@ + + @@ -1493,6 +1501,8 @@ + + @@ -1912,6 +1922,8 @@ + + @@ -2200,6 +2212,8 @@ + + @@ -2392,6 +2406,7 @@ + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/vector/vector-5.4' - sw/qa sw/source
sw/qa/extras/htmlexport/data/reqif-chinese.odt |binary
sw/qa/extras/htmlexport/htmlexport.cxx | 22 ++
sw/source/filter/html/htmlatr.cxx | 10 +-
sw/source/filter/html/htmlbas.cxx |3 ++-
sw/source/filter/html/htmlfldw.cxx |5 ++---
sw/source/filter/html/htmlflywriter.cxx|2 +-
sw/source/filter/html/htmlforw.cxx |6 +++---
sw/source/filter/html/htmlftn.cxx |4 ++--
sw/source/filter/html/wrthtml.cxx |4 ++--
sw/source/filter/html/wrthtml.hxx |2 +-
10 files changed, 40 insertions(+), 18 deletions(-)
New commits:
commit ed3d2080f011a934541d7e6202b76fec3ddcac61
Author: Miklos Vajna
AuthorDate: Mon Jan 13 17:07:34 2020 +0100
Commit: Miklos Vajna
CommitDate: Tue Jan 14 10:44:53 2020 +0100
sw reqif-xhtml export: fix non-well-formed output on Chinese text
And also search for the '"<" OOO_something' pattern, and fix up all
cases where we forgot to call GetNamespace() when opening an element.
(cherry picked from commit 186ef501a305d452da1f36aa51106dba181dc324)
Conflicts:
sw/source/filter/html/htmlbas.cxx
sw/source/filter/html/htmlfldw.cxx
sw/source/filter/html/htmlflywriter.cxx
sw/source/filter/html/htmlforw.cxx
sw/source/filter/html/htmlftn.cxx
sw/source/filter/html/wrthtml.cxx
Change-Id: I015e807c1ad0f96c7c4aaa97f7f61ae134cf3754
diff --git a/sw/qa/extras/htmlexport/data/reqif-chinese.odt
b/sw/qa/extras/htmlexport/data/reqif-chinese.odt
new file mode 100644
index ..b99c57caee10
Binary files /dev/null and b/sw/qa/extras/htmlexport/data/reqif-chinese.odt
differ
diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx
b/sw/qa/extras/htmlexport/htmlexport.cxx
index 91a20f9c0ab1..47288ae65ced 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -781,6 +781,28 @@ CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest,
testRTFOLEMimeType)
aType);
}
+CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testChinese)
+{
+// Load a document with Chinese text in it.
+OUString aURL = m_directories.getURLFromSrc(DATA_DIRECTORY) +
"reqif-chinese.odt";
+mxComponent = loadFromDesktop(aURL, "com.sun.star.text.TextDocument", {});
+
+// Export it.
+uno::Reference xStorable(mxComponent, uno::UNO_QUERY);
+uno::Sequence aStoreProperties = {
+comphelper::makePropertyValue("FilterName", OUString("HTML
(StarWriter)")),
+comphelper::makePropertyValue("FilterOptions",
OUString("xhtmlns=reqif-xhtml")),
+};
+xStorable->storeToURL(maTempFile.GetURL(), aStoreProperties);
+SvMemoryStream aStream;
+HtmlExportTest::wrapFragment(maTempFile, aStream);
+xmlDocPtr pDoc = parseXmlStream(&aStream);
+
+// Without the accompanying fix in place, this test would have failed as
the output was not
+// well-formed.
+CPPUNIT_ASSERT(pDoc);
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/html/htmlatr.cxx
b/sw/source/filter/html/htmlatr.cxx
index e9764e79c0b5..807396ace498 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -780,7 +780,7 @@ void OutHTML_SwFormat( Writer& rWrt, const SwFormat&
rFormat,
// The align=... attribute does behave strange in netscape
// if there are controls in a paragraph, because the control and
// all text behind the control does not recognize this attribute.
-OString sOut = "<" OOO_STRING_SVTOOLS_HTML_division;
+OString sOut = "<" + rHWrt.GetNamespace() +
OOO_STRING_SVTOOLS_HTML_division;
rWrt.Strm().WriteOString( sOut );
rHWrt.m_bTextAttr = false;
@@ -2652,7 +2652,7 @@ static Writer& OutHTML_SvxColor( Writer& rWrt, const
SfxPoolItem& rHt )
}
else
{
-OString sOut = "<" OOO_STRING_SVTOOLS_HTML_font " "
+OString sOut = "<" + rHTMLWrt.GetNamespace() +
OOO_STRING_SVTOOLS_HTML_font " "
OOO_STRING_SVTOOLS_HTML_O_color "=";
rWrt.Strm().WriteOString( sOut );
HTMLOutFuncs::Out_Color( rWrt.Strm(), aColor ).WriteChar( '>' );
@@ -2712,7 +2712,7 @@ static Writer& OutHTML_SvxFont( Writer& rWrt, const
SfxPoolItem& rHt )
}
else
{
-OString sOut = "<" OOO_STRING_SVTOOLS_HTML_font " "
+OString sOut = "<" + rHTMLWrt.GetNamespace() +
OOO_STRING_SVTOOLS_HTML_font " "
OOO_STRING_SVTOOLS_HTML_O_face "=\"";
rWrt.Strm().WriteOString( sOut );
HTMLOutFuncs::Out_String( rWrt.Strm(), aNames,
rHTMLWrt.m_eDestEnc, &rHTMLWrt.m_aNonConvertableCharacters )
@@ -2752,7 +2752,7 @@ static Writer& OutHTML_SvxFontHeight( Writer& rWrt, const
SfxPoolItem& rHt )
}
else
{
-
[Libreoffice-commits] core.git: oox/source sw/qa sw/source
oox/source/export/drawingml.cxx |2 -
oox/source/shape/WpsContext.cxx |8 ++-
sw/qa/extras/ooxmlexport/data/tdf128304.odt |binary
sw/qa/extras/ooxmlexport/ooxmlexport13.cxx | 29 +++-
sw/source/filter/ww8/docxsdrexport.cxx |2 -
5 files changed, 33 insertions(+), 8 deletions(-)
New commits:
commit b203b9c83dc8465dcd92fb6b029a2f28c724
Author: Mark Hung
AuthorDate: Fri Dec 13 07:23:35 2019 +0800
Commit: Miklos Vajna
CommitDate: Tue Jan 14 10:23:19 2020 +0100
tdf#128304 export TB_RL writing mode as eaVirt
and import eaVirt to TextWritingMode instead of TextPreRotateAngle
(-90) degree of CustomShapeGeometry. CJK text in TB_RL writing mode
are upright in Writer. It corresponds to eaVirt by its defintion.
Change-Id: I2a8bc6676ad6af06b06e023adaa2f201a028d426
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86637
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 087c51da5541..8c9f641b5d4f 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -2692,7 +2692,7 @@ void DrawingML::WriteText( const Reference< XInterface >&
rXIface, const OUStrin
if( ( mAny >>= eMode ) && eMode == WritingMode_TB_RL )
{
-sWritingMode = "vert";
+sWritingMode = "eaVert";
bVertical = true;
}
}
diff --git a/oox/source/shape/WpsContext.cxx b/oox/source/shape/WpsContext.cxx
index cf637eae0606..863621b3931c 100644
--- a/oox/source/shape/WpsContext.cxx
+++ b/oox/source/shape/WpsContext.cxx
@@ -18,6 +18,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -57,7 +58,12 @@ oox::core::ContextHandlerRef
WpsContext::onCreateContext(sal_Int32 nElementToken
uno::Reference xServiceInfo(mxShape,
uno::UNO_QUERY);
uno::Reference xPropertySet(mxShape,
uno::UNO_QUERY);
sal_Int32 nVert = rAttribs.getToken(XML_vert, XML_horz);
-if (nVert != XML_horz)
+if (nVert == XML_eaVert)
+{
+xPropertySet->setPropertyValue("TextWritingMode",
+
uno::makeAny(text::WritingMode_TB_RL));
+}
+else if (nVert != XML_horz)
{
// Get the existing rotation of the shape.
drawing::HomogenMatrix3 aMatrix;
diff --git a/sw/qa/extras/ooxmlexport/data/tdf128304.odt
b/sw/qa/extras/ooxmlexport/data/tdf128304.odt
new file mode 100644
index ..6c5cbd1200aa
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf128304.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
index 18e957bbcb09..81687683ec63 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport13.cxx
@@ -11,6 +11,7 @@
#include
#include
+#include
#include
#include
#include
@@ -639,12 +640,10 @@ DECLARE_OOXMLEXPORT_TEST(testTbrlFrameVml,
"tbrl-frame-vml.docx")
if (mbExported)
{
-// DML import: creates a TextBox.
+// DML import: creates a TextBox, eaVert read back as TB_RL in
TextWritingMode
-comphelper::SequenceAsHashMap
aGeometry(xTextFrame->getPropertyValue("CustomShapeGeometry"));
-// Without the accompanying fix in place, this test would have failed
with 'Expected: -90;
-// Actual: 0', i.e. the tblr writing mode was lost during DML export
of a TextFrame.
-CPPUNIT_ASSERT_EQUAL(static_cast(-90),
aGeometry["TextPreRotateAngle"].get());
+auto eMode = getProperty(xTextFrame,
"TextWritingMode");
+CPPUNIT_ASSERT_EQUAL(text::WritingMode::WritingMode_TB_RL, eMode);
}
else
{
@@ -993,6 +992,26 @@ DECLARE_OOXMLEXPORT_TEST(testTdf127579, "tdf127579.odt")
assertXPath(pXmlDoc,
"/w:document/w:body/w:p/w:hyperlink/w:r/w:rPr/w:rStyle", "val", "InternetLink");
}
+DECLARE_OOXMLEXPORT_TEST(testTdf128304, "tdf128304.odt")
+{
+css::text::WritingMode eMode;
+uno::Reference xProps1(getShape(1), uno::UNO_QUERY);
+CPPUNIT_ASSERT(xProps1->getPropertyValue("TextWritingMode") >>= eMode);
+CPPUNIT_ASSERT_EQUAL(css::text::WritingMode::WritingMode_TB_RL, eMode);
+
+uno::Reference xProps2(getShape(2), uno::UNO_QUERY);
+CPPUNIT_ASSERT(xProps1->getPropertyValue("TextWritingMode") >>= eMode);
+CPPUNIT_ASSERT_EQUAL(css::text::WritingMode::WritingMode_TB_RL, eMode);
+
+uno::Reference xProps3(getShape(3), uno::UNO_QUERY);
+CPPUNIT_ASSERT(xProps1->getPropertyValue("TextWritingMode") >>= eMode);
+CPPUNIT_ASSERT_EQUAL(css::text::WritingMode::WritingMode_TB_RL, eMode);
+
+uno::Reference xProps4(getShape(4), uno::UNO_QUERY);
+CPPUNIT_ASSERT(xProps1->getPropertyValue("TextWritingMode")
[Libreoffice-commits] core.git: connectivity/IwyuFilter_connectivity.yaml connectivity/qa connectivity/source
connectivity/IwyuFilter_connectivity.yaml | 71 ++ connectivity/qa/connectivity/mork/DriverTest.cxx|4 connectivity/source/commontools/CommonTools.cxx |7 connectivity/source/commontools/ConnectionWrapper.cxx |4 connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx |9 - connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx |5 connectivity/source/commontools/FValue.cxx |1 connectivity/source/commontools/RowFunctionParser.cxx |2 connectivity/source/commontools/TColumnsHelper.cxx |5 connectivity/source/commontools/TConnection.cxx |1 connectivity/source/commontools/TIndexColumns.cxx |2 connectivity/source/commontools/TKeyColumns.cxx |2 connectivity/source/commontools/TTableHelper.cxx|4 connectivity/source/commontools/dbconversion.cxx|1 connectivity/source/commontools/dbexception.cxx |1 connectivity/source/commontools/dbmetadata.cxx |1 connectivity/source/commontools/dbtools.cxx |2 connectivity/source/commontools/dbtools2.cxx|2 connectivity/source/commontools/filtermanager.cxx |1 connectivity/source/commontools/formattedcolumnvalue.cxx|1 connectivity/source/commontools/parameters.cxx |2 connectivity/source/commontools/sqlerror.cxx|1 connectivity/source/cpool/ZConnectionPool.cxx |2 connectivity/source/cpool/ZConnectionWrapper.cxx|4 connectivity/source/cpool/ZPooledConnection.cxx |3 connectivity/source/drivers/calc/CConnection.cxx|2 connectivity/source/drivers/calc/CDatabaseMetaData.cxx |7 connectivity/source/drivers/calc/CTable.cxx | 10 - connectivity/source/drivers/calc/CTables.cxx|1 connectivity/source/drivers/component/CColumns.cxx |1 connectivity/source/drivers/component/CDatabaseMetaData.cxx |6 connectivity/source/drivers/component/CResultSet.cxx|1 connectivity/source/drivers/component/CTable.cxx| 26 --- connectivity/source/drivers/dbase/DColumns.cxx |1 connectivity/source/drivers/dbase/DConnection.cxx |1 connectivity/source/drivers/dbase/DDatabaseMetaData.cxx |3 connectivity/source/drivers/dbase/DIndex.cxx|4 connectivity/source/drivers/dbase/DIndexColumns.cxx |1 connectivity/source/drivers/dbase/DResultSet.cxx|1 connectivity/source/drivers/dbase/DTable.cxx|7 connectivity/source/drivers/dbase/DTables.cxx |5 connectivity/source/drivers/dbase/dindexnode.cxx|2 connectivity/source/drivers/evoab2/NColumns.cxx |2 connectivity/source/drivers/evoab2/NConnection.cxx |1 connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx|4 connectivity/source/drivers/evoab2/NDriver.cxx |5 connectivity/source/drivers/evoab2/NPreparedStatement.cxx |4 connectivity/source/drivers/evoab2/NResultSet.cxx |7 connectivity/source/drivers/evoab2/NResultSetMetaData.cxx |1 connectivity/source/drivers/evoab2/NStatement.cxx |1 connectivity/source/drivers/evoab2/NTable.cxx |2 connectivity/source/drivers/evoab2/NTables.cxx |8 - connectivity/source/drivers/file/FColumns.cxx |2 connectivity/source/drivers/file/FConnection.cxx|4 connectivity/source/drivers/file/FDatabaseMetaData.cxx |5 connectivity/source/drivers/file/FDriver.cxx|1 connectivity/source/drivers/file/FPreparedStatement.cxx |2 connectivity/source/drivers/file/FResultSet.cxx |8 - connectivity/source/drivers/file/FStatement.cxx |2 connectivity/source/drivers/file/FTable.cxx |2 connectivity/source/drivers/file/FTables.cxx|7 connectivity/source/drivers/file/f
[Libreoffice-commits] core.git: vcl/qt5
vcl/qt5/Qt5System.cxx |9 -
1 file changed, 8 insertions(+), 1 deletion(-)
New commits:
commit ea10986a0939cacd34e8d3e026579c8ce3e6ac6c
Author: Noel Grandin
AuthorDate: Tue Jan 14 09:23:53 2020 +0200
Commit: Noel Grandin
CommitDate: Tue Jan 14 10:19:25 2020 +0100
Silence -Werror,-Wdeprecated-declarations for now
...as seen with qt5 5.13.2-1.fc31
/home/noel/libo2/vcl/qt5/Qt5System.cxx:18:83: error: 'screenCount' is
deprecated: Use QGuiApplication::screens()
[-Werror,-Wdeprecated-declarations]
^
/home/noel/libo2/vcl/qt5/Qt5System.cxx:22:44: error: 'screenGeometry' is
deprecated: Use QGuiApplication::screens()
[-Werror,-Wdeprecated-declarations]
QRect qRect = QApplication::desktop()->screenGeometry(nScreen);
^
Change-Id: I73385b56f58284fedf5acbfb914177e06f3512d1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86736
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/vcl/qt5/Qt5System.cxx b/vcl/qt5/Qt5System.cxx
index 283fe58dc84d..4e00a0dd6283 100644
--- a/vcl/qt5/Qt5System.cxx
+++ b/vcl/qt5/Qt5System.cxx
@@ -15,11 +15,18 @@
#include
#include
-unsigned int Qt5System::GetDisplayScreenCount() { return
QApplication::desktop()->screenCount(); }
+unsigned int Qt5System::GetDisplayScreenCount()
+{
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
+return QApplication::desktop()->screenCount();
+SAL_WNODEPRECATED_DECLARATIONS_POP
+}
tools::Rectangle Qt5System::GetDisplayScreenPosSizePixel(unsigned int nScreen)
{
+SAL_WNODEPRECATED_DECLARATIONS_PUSH
QRect qRect = QApplication::desktop()->screenGeometry(nScreen);
+SAL_WNODEPRECATED_DECLARATIONS_POP
return toRectangle(qRect);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/libstaroffice
external/libstaroffice/0001-text-send-lastname-should-be-text-sender-lastname.patch.1
| 26 ++
external/libstaroffice/UnpackedTarball_libstaroffice.mk
|3 +
2 files changed, 29 insertions(+)
New commits:
commit cdd824029edf880650afa46cb439049c7b9f9a93
Author: Caolán McNamara
AuthorDate: Mon Jan 13 19:42:15 2020 +
Commit: Caolán McNamara
CommitDate: Tue Jan 14 09:55:51 2020 +0100
crashtesting: libstaroffice should use sender-lastname not send-lastname
https://github.com/fosnola/libstaroffice/pull/7
Change-Id: Id4fe0bd016cf57d1b48055775d03cfc859ac557b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86715
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git
a/external/libstaroffice/0001-text-send-lastname-should-be-text-sender-lastname.patch.1
b/external/libstaroffice/0001-text-send-lastname-should-be-text-sender-lastname.patch.1
new file mode 100644
index ..8bb967201f40
--- /dev/null
+++
b/external/libstaroffice/0001-text-send-lastname-should-be-text-sender-lastname.patch.1
@@ -0,0 +1,26 @@
+From ae4dc7ea2a45a7ae560a0c399c7d8a720f670996 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?=
+Date: Mon, 13 Jan 2020 20:04:38 +
+Subject: [PATCH] text:send-lastname should be text:sender-lastname
+
+as detected by LibreOffice crashtesting
+---
+ src/lib/SWFieldManager.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/lib/SWFieldManager.cxx b/src/lib/SWFieldManager.cxx
+index 81f423b..071e20c 100644
+--- a/src/lib/SWFieldManager.cxx
b/src/lib/SWFieldManager.cxx
+@@ -293,7 +293,7 @@ bool Field::send(STOFFListenerPtr &listener, StarState
&state) const
+ else if (m_type==30) {
+ if (m_subType>=0 && m_subType<=16) {
+ char const *wh[]= {
+-"text:sender-company", "text:sender-firstname", "text:send-lastname",
"text:sender-initials", "text:sender-street",
++"text:sender-company", "text:sender-firstname",
"text:sender-lastname", "text:sender-initials", "text:sender-street",
+ "text:sender-country", "text:sender-postal-code", "text:sender-city",
"text:sender-title", "text:sender-position",
+ "text:sender-phone-private", "text:sender-phone-work",
"text:sender-fax", "text:sender-email", "text:sender-state-or-province",
+ "text:sender-lastname" /*father name*/, "text:sender-street" /*
appartement*/
+--
+2.24.1
+
diff --git a/external/libstaroffice/UnpackedTarball_libstaroffice.mk
b/external/libstaroffice/UnpackedTarball_libstaroffice.mk
index 0e51f67625ac..db499cba64d2 100644
--- a/external/libstaroffice/UnpackedTarball_libstaroffice.mk
+++ b/external/libstaroffice/UnpackedTarball_libstaroffice.mk
@@ -31,9 +31,12 @@ endif
# * external/libstaroffice/0001-Fix-equality-operator-arguments.patch.1 is
upstream at
# "Fix equality operator
arguments":
+# * external/0001-text-send-lastname-should-be-text-sender-lastname.patch.1 is
upstream at
+# "text:send-lastname
should be text:sender-lastname":
$(eval $(call gb_UnpackedTarball_add_patches,libstaroffice,\
external/libstaroffice/0001-add-missing-include-for-std-max.patch.1 \
external/libstaroffice/0001-Fix-equality-operator-arguments.patch.1 \
+
external/libstaroffice/0001-text-send-lastname-should-be-text-sender-lastname.patch.1
\
))
# vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sd/source stoc/source sw/source toolkit/source
sd/source/filter/ppt/propread.cxx | 13 +++--
stoc/source/typeconv/convert.cxx |3 +--
sw/source/core/layout/dumpfilter.cxx |3 +--
toolkit/source/controls/grid/sortablegriddatamodel.cxx |3 +--
toolkit/source/controls/roadmapentry.cxx |3 +--
5 files changed, 15 insertions(+), 10 deletions(-)
New commits:
commit a62b421440de305a910d4ace4c146012f9f25e14
Author: Caolán McNamara
AuthorDate: Mon Jan 13 16:31:37 2020 +
Commit: Caolán McNamara
CommitDate: Tue Jan 14 09:55:29 2020 +0100
ofz#20066 Timeout
Change-Id: Idd0ac51279c99e17c6f890096c7b6daf1b1802ed
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86703
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sd/source/filter/ppt/propread.cxx
b/sd/source/filter/ppt/propread.cxx
index 1aaf42064a8c..6a8416343d6d 100644
--- a/sd/source/filter/ppt/propread.cxx
+++ b/sd/source/filter/ppt/propread.cxx
@@ -17,12 +17,13 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include
#include "propread.hxx"
#include
#include
#include
+#include
#include
+#include
PropEntry::PropEntry( sal_uInt32 nId, const sal_uInt8* pBuf, sal_uInt32
nBufSize ) :
mnId( nId ),
@@ -348,7 +349,9 @@ void Section::Read( SotStorageStream *pStrm )
bool bVariant = ( nPropType == VT_VARIANT );
-for (sal_uInt32 i = 0; nPropSize && ( i < nVectorCount ); ++i)
+o3tl::sorted_vector aVisitedOffsets;
+
+for (sal_uInt32 i = 0; nPropSize && i < nVectorCount &&
pStrm->good(); ++i)
{
if ( bVariant )
{
@@ -427,6 +430,12 @@ void Section::Read( SotStorageStream *pStrm )
nOffset = nPropOfs + nSecOfs + nPropSize;
if (!checkSeek(*pStrm, nOffset))
break;
+// inserts returns false if an equivalent element
already existed
+if (!aVisitedOffsets.insert(nOffset).second)
+{
+SAL_WARN("sd.filter", "loop in Section::Read
property list");
+break;
+}
}
}
else
commit edc748c9be3037a88c0f37ace160946e4fbd2a2d
Author: Mesut Çifci
AuthorDate: Tue Jan 14 00:19:58 2020 +0300
Commit: Stephan Bergmann
CommitDate: Tue Jan 14 09:55:15 2020 +0100
tdf#88205 Adapt uses of css::uno::Sequence to use initializer_list ctor
Change-Id: I42b59c9d22edb987c55aace700934fdab95f83f7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86719
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/stoc/source/typeconv/convert.cxx b/stoc/source/typeconv/convert.cxx
index 37d6c63e3d4b..97cb4bebd62c 100644
--- a/stoc/source/typeconv/convert.cxx
+++ b/stoc/source/typeconv/convert.cxx
@@ -251,8 +251,7 @@ sal_Bool TypeConverter_Impl::supportsService(const
OUString& ServiceName)
// XServiceInfo
Sequence< OUString > TypeConverter_Impl::getSupportedServiceNames()
{
-Sequence< OUString > seqNames { "com.sun.star.script.Converter" };
-return seqNames;
+return { "com.sun.star.script.Converter" };
}
diff --git a/sw/source/core/layout/dumpfilter.cxx
b/sw/source/core/layout/dumpfilter.cxx
index 7e26bceb4397..2ba71faf74d9 100644
--- a/sw/source/core/layout/dumpfilter.cxx
+++ b/sw/source/core/layout/dumpfilter.cxx
@@ -148,8 +148,7 @@ namespace sw
uno::Sequence< OUString > LayoutDumpFilter::getSupportedServiceNames()
{
-uno::Sequence aSeq { "com.sun.star.document.ExportFilter" };
-return aSeq;
+return { "com.sun.star.document.ExportFilter" };
}
} // Namespace sw
diff --git a/toolkit/source/controls/grid/sortablegriddatamodel.cxx
b/toolkit/source/controls/grid/sortablegriddatamodel.cxx
index 6219cc5c06b5..711c7c23fa8d 100644
--- a/toolkit/source/controls/grid/sortablegriddatamodel.cxx
+++ b/toolkit/source/controls/grid/sortablegriddatamodel.cxx
@@ -878,8 +878,7 @@ void lcl_clear( STLCONTAINER& i_container )
Sequence< OUString > SAL_CALL
SortableGridDataModel::getSupportedServiceNames( )
{
-Sequence< OUString > aServiceNames {
"com.sun.star.awt.grid.SortableGridDataModel" };
-return aServiceNames;
+return { "com.sun.star.awt.grid.SortableGridDataModel" };
}
diff --git a/toolkit/source/controls/roadmapentry.cxx
b/toolkit/source/controls/roadmapentry.cxx
index d4580cd8c029..b79a23b2aa15 100644
--- a/toolkit/source/controls/roadmapentry.cxx
+++ b/toolkit/source/controls/roadmapentry.cxx
@@ -85,8 +85,7 @@ sal_Bool SAL_CALL ORoadmapEntry::supportsService( const
OUString& ServiceName )
css::uno::Sequence< OUString > SAL_CALL
ORoadmapEntry::getSupportedServiceNames( )
{
-css::uno::Sequence aRet { "com.sun.star.awt.Roadmap
[Libreoffice-commits] core.git: sw/source
sw/source/ui/misc/docfnote.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 2b3c96a03f2e3c12148ec00c93f06e093d384db9 Author: Heiko Tietze AuthorDate: Mon Jan 13 11:09:58 2020 +0100 Commit: Heiko Tietze CommitDate: Tue Jan 14 09:44:31 2020 +0100 Related tdf#129836 - Alphabetize styles in the footnotes/endnotes dialog Page and paragraph dropdowns were missing in Ie9bc4f63412dabd6032f0a9b7225384823f2f39a Change-Id: Ied25eeb1360718315190104213172da594e4b05c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/8 Reviewed-by: Heiko Tietze Tested-by: Heiko Tietze diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx index 9542740f5979..a4a101c77535 100644 --- a/sw/source/ui/misc/docfnote.cxx +++ b/sw/source/ui/misc/docfnote.cxx @@ -171,6 +171,7 @@ void SwEndNoteOptionPage::Reset( const SfxItemSet* ) m_xParaTemplBox->append_text(pStyle->GetName()); pStyle = pStyleSheetPool->Next(); } +m_xParaTemplBox->make_sorted(); OUString sStr; SwStyleNameMapper::FillUIName( static_cast< sal_uInt16 >(bEndNote ? RES_POOLCOLL_ENDNOTE @@ -205,6 +206,7 @@ void SwEndNoteOptionPage::Reset( const SfxItemSet* ) if (m_xPageTemplBox->find_text(rPageDesc.GetName()) == -1) m_xPageTemplBox->append_text(rPageDesc.GetName()); } +m_xPageTemplBox->make_sorted(); m_xPageTemplBox->set_active_text(pInf->GetPageDesc(*pSh->GetDoc())->GetName()); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/uiconfig
vcl/uiconfig/ui/printdialog.ui | 911 + 1 file changed, 486 insertions(+), 425 deletions(-) New commits: commit 96b4bf352b1dc43637080719c91eef61fef74bf8 Author: Heiko Tietze AuthorDate: Thu Jan 9 11:17:25 2020 +0100 Commit: Heiko Tietze CommitDate: Tue Jan 14 09:42:57 2020 +0100 Resolves tdf#127782 - New Print dialog is too high Expander added Change-Id: Iea41f9cf335b75210de0acf5688fddd5e3dd3dbb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86478 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui index 215e7d82f686..fc98a18a89a9 100644 --- a/vcl/uiconfig/ui/printdialog.ui +++ b/vcl/uiconfig/ui/printdialog.ui @@ -502,7 +502,7 @@ 0 0 -3 +2 @@ -534,7 +534,6 @@ 1 1 -2 @@ -553,7 +552,7 @@ 0 2 -3 +2 @@ -572,191 +571,207 @@ 0 3 -3 - - - - -False -start -_From which print: -True -printextrabox - - -0 -6 - - - - -False -True - - -1 -6 2 - -True -False -start -Paper _sides: -True -sidesbox - - -0 -7 - - - - -True -False -True - - Print on one side (simplex) - Print on both sides (duplex long edge) - Print on both sides (duplex short edge) - - - -1 -7 -2 - - - - -True -False -start -_Number of copies: -True -copycount - - -
[Libreoffice-commits] core.git: vcl/inc vcl/source vcl/uiconfig
vcl/inc/printdlg.hxx |4
vcl/source/window/printdlg.cxx |9 +
vcl/uiconfig/ui/printdialog.ui |2 --
3 files changed, 13 insertions(+), 2 deletions(-)
New commits:
commit fa412876add97cab38d404723c49d35775f8efea
Author: Caolán McNamara
AuthorDate: Fri Jan 10 17:27:04 2020 +
Commit: Heiko Tietze
CommitDate: Tue Jan 14 09:43:11 2020 +0100
Related: tdf#127782 resize the print dialog to its optimum size...
after expander is activated
Change-Id: I3f87243f0502829e048173987c8998898d351adf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86575
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx
index 9facdcf9e620..4b6772a17eb8 100644
--- a/vcl/inc/printdlg.hxx
+++ b/vcl/inc/printdlg.hxx
@@ -186,6 +186,8 @@ namespace vcl
std::unique_ptr mxNupOrderWin;
/// border around each page
std::unique_ptr mxBorderCB;
+std::unique_ptr mxRangeExpander;
+std::unique_ptr mxLayoutExpander;
std::unique_ptr mxCustom;
OUString const maPrintToFileText;
@@ -234,6 +236,8 @@ namespace vcl
DECL_LINK( UIOption_SpinModifyHdl, weld::SpinButton&, void );
DECL_LINK( UIOption_EntryModifyHdl, weld::Entry&, void );
+DECL_LINK( ExpandHdl, weld::Expander&, void );
+
css::beans::PropertyValue* getValueForWindow(weld::Widget*) const;
void preparePreview( bool i_bMayUseCache );
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index b42a1ce41213..cbba1ac3f562 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -566,6 +566,8 @@ PrintDialog::PrintDialog(weld::Window* i_pWindow, const
std::shared_ptrweld_check_button("bordercb"))
+, mxRangeExpander(m_xBuilder->weld_expander("exRangeExpander"))
+, mxLayoutExpander(m_xBuilder->weld_expander("exLayoutExpander"))
, mxCustom(m_xBuilder->weld_widget("customcontents"))
, maPrintToFileText( VclResId( SV_PRINT_TOFILE_TXT ) )
, maDefPrtText( VclResId( SV_PRINT_DEFPRT_TXT ) )
@@ -695,9 +697,16 @@ PrintDialog::PrintDialog(weld::Window* i_pWindow, const
std::shared_ptrconnect_value_changed( LINK( this, PrintDialog,
MetricSpinModifyHdl ) );
mxSheetMarginEdt->connect_value_changed( LINK( this, PrintDialog,
MetricSpinModifyHdl ) );
+mxRangeExpander->connect_expanded(LINK( this, PrintDialog, ExpandHdl));
+mxLayoutExpander->connect_expanded(LINK( this, PrintDialog, ExpandHdl));
+
updateNupFromPages();
}
+IMPL_LINK_NOARG(PrintDialog, ExpandHdl, weld::Expander&, void)
+{
+m_xDialog->resize_to_request();
+}
PrintDialog::~PrintDialog()
{
diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui
index fc98a18a89a9..d4de5956f3cc 100644
--- a/vcl/uiconfig/ui/printdialog.ui
+++ b/vcl/uiconfig/ui/printdialog.ui
@@ -596,7 +596,6 @@
True
True
True
-True
True
@@ -875,7 +874,6 @@
True
True
True
-True
True
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/uiconfig
filter/uiconfig/ui/pdfgeneralpage.ui | 92 +++ 1 file changed, 50 insertions(+), 42 deletions(-) New commits: commit e5e0cfe18f75ee22f72f2058be0706ede52ce28f Author: andreas kainz AuthorDate: Mon Jan 13 22:42:28 2020 +0100 Commit: andreas_kainz CommitDate: Tue Jan 14 09:00:16 2020 +0100 pdf export dialog update general tab alignment update Change-Id: I78dd99e3ca79322553b7bf1788f628a3e0aba305 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86720 Tested-by: Jenkins Reviewed-by: andreas_kainz diff --git a/filter/uiconfig/ui/pdfgeneralpage.ui b/filter/uiconfig/ui/pdfgeneralpage.ui index c366f438a3c7..9f469063edb5 100644 --- a/filter/uiconfig/ui/pdfgeneralpage.ui +++ b/filter/uiconfig/ui/pdfgeneralpage.ui @@ -36,7 +36,7 @@ True False -3 +6 6 @@ -46,6 +46,7 @@ False start True +0 True True @@ -64,6 +65,7 @@ start center True +0 True all @@ -83,6 +85,7 @@ False start True +0 True all @@ -96,7 +99,6 @@ True True -start True 5 @@ -195,6 +197,7 @@ False start True +0 True True @@ -204,23 +207,6 @@ 2 - - -_JPEG compression -True -True -False -start -True -True -losslesscompress - - -0 -1 -2 - - _Reduce image resolution @@ -229,6 +215,7 @@ False start True +0 True @@ -236,7 +223,7 @@ 0 -3 +2 @@ -264,37 +251,62 @@ 1 -3 +2 True False -6 True True -start +True True adjustment1 -1 +0 0 + + +1 +1 + + + + +True +False +3 + + +_JPEG compression +True +True +False +start +True +True +losslesscompress + + +False +True +0 + + True False -
