[Libreoffice-commits] core.git: include/test offapi/com sc/inc sc/qa sc/source sw/inc sw/PythonTest_sw_python.mk sw/qa sw/source test/source
include/test/style/xstyleloader.hxx |1
offapi/com/sun/star/style/XStyleLoader.idl |3 +
sc/inc/tablink.hxx |9 ++--
sc/qa/extras/scstylefamiliesobj.cxx |1
sc/source/ui/docshell/tablink.cxx |5 ++
sc/source/ui/unoobj/styleuno.cxx| 22 ++-
sw/PythonTest_sw_python.mk |1
sw/inc/docsh.hxx|3 -
sw/inc/shellio.hxx |7 +++
sw/qa/python/testdocuments/xstyleloader.odt |binary
sw/qa/python/xstyleloader.py| 56
sw/source/core/unocore/unostyle.cxx | 24 ++--
sw/source/uibase/app/docsh2.cxx |5 +-
test/source/style/xstyleloader.cxx | 30 +++
14 files changed, 154 insertions(+), 13 deletions(-)
New commits:
commit 0322a41224a7264bbe03a068647ab093bcc88f90
Author: Samuel Mehrbrodt
AuthorDate: Wed Dec 18 15:01:38 2019 +0100
Commit: Samuel Mehrbrodt
CommitDate: Mon Dec 23 08:21:14 2019 +0100
XStyleLoader::loadStylesFromURL Allow loading from stream
Change-Id: Iab0c301096118203466dd91c724c25f1283a0488
Reviewed-on: https://gerrit.libreoffice.org/85392
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/include/test/style/xstyleloader.hxx
b/include/test/style/xstyleloader.hxx
index 4077d30327d0..ca34a72cf4b3 100644
--- a/include/test/style/xstyleloader.hxx
+++ b/include/test/style/xstyleloader.hxx
@@ -32,6 +32,7 @@ public:
// XStyleLoader
void testLoadStylesFromURL();
+void testLoadStylesFromStream();
// XStyleLoader2
void testLoadStylesFromDocument();
diff --git a/offapi/com/sun/star/style/XStyleLoader.idl
b/offapi/com/sun/star/style/XStyleLoader.idl
index a695b79dde21..2899f23d61b2 100644
--- a/offapi/com/sun/star/style/XStyleLoader.idl
+++ b/offapi/com/sun/star/style/XStyleLoader.idl
@@ -38,8 +38,10 @@ published interface XStyleLoader:
com::sun::star::uno::XInterface
defined in this document are loaded.
@param URL
The directory and the filename from document with the styles
+ You can also load from stream. Use "private:stream" as the URL
and the InputStream parameter below.
@param aOptions
Specifies which of the Style families the method should load.
+
The sequence has the following, optional
items:
boolean LoadCellStyles
@@ -48,6 +50,7 @@ published interface XStyleLoader:
com::sun::star::uno::XInterface
boolean LoadPageStyles
boolean LoadNumberingStyles
boolean OverwriteStyles
+ com::sun::star::io::XInputStream InputStream (since LibreOffice
6.5)
As the default, all supported style families are loaded and existing
styles are overwritten.
*/
diff --git a/sc/inc/tablink.hxx b/sc/inc/tablink.hxx
index 7038bd345fae..eb5e2f665696 100644
--- a/sc/inc/tablink.hxx
+++ b/sc/inc/tablink.hxx
@@ -82,10 +82,11 @@ private:
SfxMedium* pMedium;
public:
-ScDocumentLoader( const OUString& rFileName,
- OUString& rFilterName, OUString&
rOptions,
- sal_uInt32 nRekCnt = 0,
weld::Window* pInteractionParent = nullptr );
-~ScDocumentLoader();
+ScDocumentLoader(const OUString& rFileName, OUString& rFilterName,
OUString& rOptions,
+ sal_uInt32 nRekCnt = 0, weld::Window* pInteractionParent
= nullptr,
+ css::uno::Reference xInputStream
+ = css::uno::Reference());
+~ScDocumentLoader();
ScDocument* GetDocument();
ScDocShell* GetDocShell() { return pDocShell; }
boolIsError() const;
diff --git a/sc/qa/extras/scstylefamiliesobj.cxx
b/sc/qa/extras/scstylefamiliesobj.cxx
index 26cbce051de5..991334d192b7 100644
--- a/sc/qa/extras/scstylefamiliesobj.cxx
+++ b/sc/qa/extras/scstylefamiliesobj.cxx
@@ -70,6 +70,7 @@ public:
// XStyleLoader
CPPUNIT_TEST(testLoadStylesFromDocument);
+CPPUNIT_TEST(testLoadStylesFromStream);
CPPUNIT_TEST(testLoadStylesFromURL);
CPPUNIT_TEST_SUITE_END();
diff --git a/sc/source/ui/docshell/tablink.cxx
b/sc/source/ui/docshell/tablink.cxx
index 6d43206f4c0a..9ef612caa161 100644
--- a/sc/source/ui/docshell/tablink.cxx
+++ b/sc/source/ui/docshell/tablink.cxx
@@ -514,7 +514,8 @@ SfxMedium* ScDocumentLoader::CreateMedium( const OUString&
rFileName, std::share
ScDocumentLoader::ScDocumentLoader(const OUString& rFileName,
OUString& rFilterName, OUString& rOptions,
- sal_uInt32 nRekCnt, weld::Window*
pInteractionParent)
+ sal_uInt32 nRekCnt, weld::Window*
pInteractionParent,
+ css::u
[Libreoffice-commits] core.git: framework/inc framework/source
framework/inc/properties.h |1 -
framework/source/loadenv/loadenv.cxx | 34 ++
2 files changed, 10 insertions(+), 25 deletions(-)
New commits:
commit f3e0595fcba689b07f6419c2fb540731a3aadecf
Author: Julien Nabet
AuthorDate: Sun Dec 22 17:05:22 2019 +0100
Commit: Noel Grandin
CommitDate: Mon Dec 23 07:41:49 2019 +0100
tdf#46037: use officecfg/Setup
+ replace define OFFICEFACTORY_PROPNAME_ASCII_WINDOWATTRIBUTES used once
Change-Id: I0930dc8a2d8df76b93e634a594cbfdf4a4cd634b
Reviewed-on: https://gerrit.libreoffice.org/85706
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/framework/inc/properties.h b/framework/inc/properties.h
index 8cb35b1ac5f7..5977b7b760bb 100644
--- a/framework/inc/properties.h
+++ b/framework/inc/properties.h
@@ -119,7 +119,6 @@ namespace framework{
/** properties for office module config (Setup.xcu) */
-#define OFFICEFACTORY_PROPNAME_ASCII_WINDOWATTRIBUTES
"ooSetupFactoryWindowAttributes"
#define OFFICEFACTORY_PROPNAME_ASCII_UINAME "ooSetupFactoryUIName"
#define OFFICEFACTORY_PROPNAME_ASCII_ICON "ooSetupFactoryIcon"
diff --git a/framework/source/loadenv/loadenv.cxx
b/framework/source/loadenv/loadenv.cxx
index 96e9b6f2a970..89c64e10a15c 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -35,10 +35,13 @@
#include
#include
#include
+#include
#include
+#include
#include
#include
+#include
#include
#include
#include
@@ -915,21 +918,15 @@ bool LoadEnv::impl_furtherDocsAllowed()
try
{
-css::uno::Any aVal = ::comphelper::ConfigurationHelper::readDirectKey(
-xContext,
-"org.openoffice.Office.Common/",
-"Misc",
-"MaxOpenDocuments",
-::comphelper::EConfigurationModes::ReadOnly);
+o3tl::optional
x(officecfg::Office::Common::Misc::MaxOpenDocuments::get(xContext));
// NIL means: count of allowed documents = infinite !
-// => return sal_True
-if ( ! aVal.hasValue())
+// => return true
+if ( !x)
bAllowed = true;
else
{
-sal_Int32 nMaxOpenDocuments = 0;
-aVal >>= nMaxOpenDocuments;
+sal_Int32 nMaxOpenDocuments(*x);
css::uno::Reference< css::frame::XFramesSupplier > xDesktop(
css::frame::Desktop::create(xContext),
@@ -1687,14 +1684,7 @@ void LoadEnv::impl_makeFrameWindowVisible(const
css::uno::Reference< css::awt::X
bool bForceFrontAndFocus(false);
if ( !preview )
{
-css::uno::Any const a =
-::comphelper::ConfigurationHelper::readDirectKey(
- xContext,
- "org.openoffice.Office.Common/View",
- "NewDocumentHandling",
- "ForceFocusAndToFront",
- ::comphelper::EConfigurationModes::ReadOnly);
-a >>= bForceFrontAndFocus;
+bForceFrontAndFocus =
officecfg::Office::Common::View::NewDocumentHandling::ForceFocusAndToFront::get(xContext);
}
if( pWindow->IsVisible() && (bForceFrontAndFocus || bForceToFront) )
@@ -1765,11 +1755,7 @@ void LoadEnv::impl_applyPersistentWindowState(const
css::uno::Reference< css::aw
OUString sModule =
lProps.getUnpackedValueOrDefault(FILTER_PROPNAME_ASCII_DOCUMENTSERVICE,
OUString());
// get access to the configuration of this office module
-css::uno::Reference< css::container::XNameAccess >
xModuleCfg(::comphelper::ConfigurationHelper::openConfig(
-
xContext,
-
"/org.openoffice.Setup/Office/Factories",
-
::comphelper::EConfigurationModes::ReadOnly),
-
css::uno::UNO_QUERY_THROW);
+css::uno::Reference< css::container::XNameAccess >
xModuleCfg(officecfg::Setup::Office::Factories::get(xContext));
// read window state from the configuration
// and apply it on the window.
@@ -1778,7 +1764,7 @@ void LoadEnv::impl_applyPersistentWindowState(const
css::uno::Reference< css::aw
// Don't look for persistent window attributes when used through
LibreOfficeKit
if( !comphelper::LibreOfficeKit::isActive() )
-comphelper::ConfigurationHelper::readRelativeKey(xModuleCfg,
sModule, OFFICEFACTORY_PROPNAME_ASCII_WINDOWATTRIBUTES) >>= sWindowState;
+comphelper::ConfigurationHelper::readRelativeKey(xModuleCfg,
sModule, "ooSetupFactoryWindowAttributes") >>= sWindowState;
if (!s
[Libreoffice-commits] core.git: include/oox oox/Library_oox.mk oox/source
include/oox/ole/vbaproject.hxx |2 -
oox/Library_oox.mk |5 +++-
oox/source/ole/vbaproject.cxx | 42 +
3 files changed, 11 insertions(+), 38 deletions(-)
New commits:
commit 276a90c6b3fb046df13ae85dcdec5f28f23ee527
Author: Julien Nabet
AuthorDate: Sun Dec 22 20:21:31 2019 +0100
Commit: Noel Grandin
CommitDate: Mon Dec 23 07:41:13 2019 +0100
tdf#46037: remove configurationhelper in oox/vbaproject
Change-Id: I431216749e70f531a26432cb25909ff3c7fb3de5
Reviewed-on: https://gerrit.libreoffice.org/85715
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/oox/ole/vbaproject.hxx b/include/oox/ole/vbaproject.hxx
index e72c356f1864..d158819a06ef 100644
--- a/include/oox/ole/vbaproject.hxx
+++ b/include/oox/ole/vbaproject.hxx
@@ -66,7 +66,7 @@ public:
boolisExportVba() const;
private:
-css::uno::Reference< css::uno::XInterface >
+css::uno::Reference< css::uno::XComponentContext >
mxConfigAccess;
};
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index cc235b87e360..543907996687 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -11,7 +11,10 @@ $(eval $(call gb_Library_Library,oox))
$(eval $(call
gb_Library_set_precompiled_header,oox,oox/inc/pch/precompiled_oox))
-$(eval $(call gb_Library_use_custom_headers,oox,oox/generated))
+$(eval $(call gb_Library_use_custom_headers,oox,\
+ oox/generated \
+ officecfg/registry \
+))
$(eval $(call gb_Library_set_include,oox,\
$$(INCLUDE) \
diff --git a/oox/source/ole/vbaproject.cxx b/oox/source/ole/vbaproject.cxx
index bf31f2a2350f..afc787cba19d 100644
--- a/oox/source/ole/vbaproject.cxx
+++ b/oox/source/ole/vbaproject.cxx
@@ -30,13 +30,13 @@
#include
#include
#include
-#include
#include
#include
#include
#include
#include
#include
+#include
#include
#include
#include
@@ -62,39 +62,9 @@ using namespace ::com::sun::star::script;
using namespace ::com::sun::star::script::vba;
using namespace ::com::sun::star::uno;
-using ::comphelper::ConfigurationHelper;
-
-namespace {
-
-bool lclReadConfigItem( const Reference< XInterface >& rxConfigAccess, const
OUString& rItemName )
+VbaFilterConfig::VbaFilterConfig( const Reference< XComponentContext >&
rxContext, const OUString& /* rConfigCompName */)
+ : mxConfigAccess(rxContext)
{
-// some applications do not support all configuration items, assume
'false' in this case
-try
-{
-Any aItem = ConfigurationHelper::readRelativeKey( rxConfigAccess,
"Filter/Import/VBA", rItemName );
-return aItem.has< bool >() && aItem.get< bool >();
-}
-catch(const Exception& )
-{
-}
-return false;
-}
-
-} // namespace
-
-VbaFilterConfig::VbaFilterConfig( const Reference< XComponentContext >&
rxContext, const OUString& rConfigCompName )
-{
-OSL_ENSURE( rxContext.is(), "VbaFilterConfig::VbaFilterConfig - missing
component context" );
-if( rxContext.is() ) try
-{
-OSL_ENSURE( !rConfigCompName.isEmpty(),
"VbaFilterConfig::VbaFilterConfig - invalid configuration component name" );
-OUString aConfigPackage = "org.openoffice.Office." + rConfigCompName;
-mxConfigAccess = ConfigurationHelper::openConfig( rxContext,
aConfigPackage, comphelper::EConfigurationModes::ReadOnly );
-}
-catch(const Exception& )
-{
-}
-OSL_ENSURE( mxConfigAccess.is(), "VbaFilterConfig::VbaFilterConfig -
cannot open configuration" );
}
VbaFilterConfig::~VbaFilterConfig()
@@ -103,17 +73,17 @@ VbaFilterConfig::~VbaFilterConfig()
bool VbaFilterConfig::isImportVba() const
{
-return lclReadConfigItem( mxConfigAccess, "Load" );
+return
officecfg::Office::Calc::Filter::Import::VBA::Load::get(mxConfigAccess);
}
bool VbaFilterConfig::isImportVbaExecutable() const
{
-return lclReadConfigItem( mxConfigAccess, "Executable" );
+return
officecfg::Office::Calc::Filter::Import::VBA::Executable::get(mxConfigAccess);
}
bool VbaFilterConfig::isExportVba() const
{
-return lclReadConfigItem( mxConfigAccess, "Save" );
+return
officecfg::Office::Calc::Filter::Import::VBA::Save::get(mxConfigAccess);
}
VbaMacroAttacherBase::VbaMacroAttacherBase( const OUString& rMacroName ) :
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - include/svl include/svtools include/svx svl/qa svl/source svtools/qa svtools/source svx/source
include/svl/PasswordHelper.hxx|2
include/svtools/htmlout.hxx | 10 +-
include/svtools/parhtml.hxx |2
include/svtools/ruler.hxx |2
include/svtools/unoevent.hxx |2
include/svx/sdr/contact/objectcontactofpageview.hxx |2
include/svx/shapepropertynotifier.hxx |2
include/svx/svdview.hxx |2
svl/qa/unit/lockfiles/test_lockfiles.cxx |2
svl/source/crypto/cryptosign.cxx |6 -
svl/source/fsstor/fsfactory.cxx |2
svl/source/misc/PasswordHelper.cxx| 18 ++--
svl/source/misc/inettype.cxx |6 -
svl/source/misc/lngmisc.cxx |2
svl/source/misc/lockfilecommon.cxx|4 -
svl/source/numbers/zformat.cxx|2
svl/source/passwordcontainer/passwordcontainer.cxx|8 +-
svtools/qa/unit/testHtmlWriter.cxx|2
svtools/source/config/fontsubstconfig.cxx | 12 +--
svtools/source/dialogs/addresstemplate.cxx|8 +-
svtools/source/dialogs/insdlg.cxx |4 -
svtools/source/svhtml/htmlout.cxx | 38 +-
svtools/source/svhtml/parhtml.cxx |2
svtools/source/svrtf/parrtf.cxx |8 +-
svtools/source/svrtf/rtfout.cxx |8 +-
svtools/source/svrtf/svparser.cxx |4 -
svtools/source/uno/miscservices.cxx |2
svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx |2
svx/source/dialog/hexcolorcontrol.cxx |2
svx/source/dialog/rubydialog.cxx | 10 +-
svx/source/form/fmcontrollayout.cxx |2
svx/source/form/fmdocumentclassification.cxx |2
svx/source/form/fmsrccfg.cxx |6 -
svx/source/form/fmtextcontrolshell.cxx|2
svx/source/form/fmvwimp.cxx |2
svx/source/form/formcontrolfactory.cxx|4 -
svx/source/gallery2/galtheme.cxx |2
svx/source/sdr/contact/objectcontactofpageview.cxx|2
svx/source/svdraw/svdotxat.cxx|2
svx/source/svdraw/svdview.cxx |2
svx/source/table/tablertfexporter.cxx |2
svx/source/tbxctrls/Palette.cxx |4 -
svx/source/tbxctrls/tbcontrl.cxx |2
svx/source/unodialogs/textconversiondlgs/services.cxx |2
svx/source/unodraw/unoshap2.cxx |4 -
45 files changed, 108 insertions(+), 108 deletions(-)
New commits:
commit 3f8fc1a384cafdb61a2cfc654d1641f81d58bb34
Author: Noel Grandin
AuthorDate: Sun Dec 22 21:01:59 2019 +0200
Commit: Noel Grandin
CommitDate: Mon Dec 23 07:40:35 2019 +0100
sal_Char->char in svx
Change-Id: If7fb907575640b95399419beee5af6cfbd5fafb2
Reviewed-on: https://gerrit.libreoffice.org/85714
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/svx/sdr/contact/objectcontactofpageview.hxx
b/include/svx/sdr/contact/objectcontactofpageview.hxx
index 020b454cce87..3d4623de2812 100644
--- a/include/svx/sdr/contact/objectcontactofpageview.hxx
+++ b/include/svx/sdr/contact/objectcontactofpageview.hxx
@@ -48,7 +48,7 @@ namespace sdr
// basic constructor, used from SdrPageView.
explicit ObjectContactOfPageView(SdrPageWindow& rPageWindow,
- const sal_Char *pDebugName);
+ const char *pDebugName);
virtual ~ObjectContactOfPageView() override;
// LazyInvalidate request. This is used from the VOCs to mark that
they
diff --git a/include/svx/shapepropertynotifier.hxx
b/include/svx/shapepropertynotifier.hxx
index d49aad3c7c60..90fa7700a54a 100644
--- a/include/svx/shapepropertynotifier.hxx
+++ b/include/svx/shapepropertynotifier.hxx
@@ -69,7 +69,7 @@ namespace svx
class SVX_DLLPUBLIC PropertyValueProvider :public IPropertyValueProvider
{
public:
-PropertyValueProvider( ::cppu::OWeakObject& _rContext, const sal_Char*
_pAsciiPropertyName )
+PropertyValueProvider( ::cppu::OWeakObject& _rContext, const char*
_pAsciiPropertyName )
:m_rContext(
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - vcl/unx
vcl/unx/gtk3/gtk3gtkinst.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 3bab9a619cf6de58ce6eef211b1f7d3846993f82
Author: Caolán McNamara
AuthorDate: Sun Dec 22 14:10:15 2019 +
Commit: Adolfo Jayme Barrientos
CommitDate: Mon Dec 23 06:16:00 2019 +0100
ensure toolbar image widget is visible
Change-Id: If9144ab5f3c32570fda1da38e3c5fd076293205f
Reviewed-on: https://gerrit.libreoffice.org/85710
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index fb7c06b31003..766c13fb440c 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -7134,10 +7134,12 @@ public:
GtkToolItem* pItem = gtk_toolbar_get_nth_item(m_pToolbar, nIndex);
GtkWidget* pImage = nullptr;
+
if (GdkPixbuf* pixbuf = getPixbuf(rIcon))
{
pImage = gtk_image_new_from_pixbuf(pixbuf);
g_object_unref(pixbuf);
+gtk_widget_show(pImage);
}
gtk_tool_button_set_icon_widget(GTK_TOOL_BUTTON(pItem), pImage);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/qa
sd/qa/unit/import-tests.cxx | 17 + 1 file changed, 17 insertions(+) New commits: commit 2aa76522881bd92ddc4daeaabcb30a6938291afc Author: Ashod Nakashian AuthorDate: Sun Dec 22 21:01:42 2019 -0500 Commit: Ashod Nakashian CommitDate: Mon Dec 23 04:06:33 2019 +0100 sd: explain ENABLE_PDFIMPORT-guarded tests Change-Id: I60a27cf1c994a157f23bf140fc0b9aca8bb8caa9 Reviewed-on: https://gerrit.libreoffice.org/85725 Tested-by: Jenkins Reviewed-by: Ashod Nakashian diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx index 773e86cdc5a7..1fbde60d3cb1 100644 --- a/sd/qa/unit/import-tests.cxx +++ b/sd/qa/unit/import-tests.cxx @@ -1222,6 +1222,23 @@ void SdImportTest::testBnc862510_7() } #if ENABLE_PDFIMPORT +// These tests use the old PDF-importing logic, which imports PDF elements as +// SD elements. This suffered many issues, and therefore wasn't ideal. +// The old PDF importer relied on an open-source project (xpdf) with an +// incompatible license (gpl), which has to be interfaced via an out-of-process +// library wrapper process. The resulting imported document was inaccurate +// and often very slow and with large memory footprint. +// Instead, PDFium offers state-of-the-art PDF importing logic, +// which is well-maintained and renders PDFs into images with high accuracy. +// So, the idea is to import PDFs as images using PDFium, which has a very +// high quality (and is much faster) than importing individual editable elements. +// So that's the "new" way of importing. +// The user then breaks the image to editable elements (which is not perfect, +// but very close to the old way), only :wif they need editing ability. +// PDFium should overall be better, and where it isn't, we just need to improve it. +// So these tests aren't really useful anymore. They should be modified to do +// import+break and then check the results. But that isn't straight-forward and +// currently await volunteering time to implement. #if HAVE_FEATURE_PDFIUM void SdImportTest::testPDFImportShared() ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/floatwin.cxx |8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
New commits:
commit cf98c4b48881b283cc31bfcde678e2f30bb63ba1
Author: Ashod Nakashian
AuthorDate: Wed Dec 18 10:20:56 2019 -0500
Commit: Ashod Nakashian
CommitDate: Mon Dec 23 02:29:50 2019 +0100
sfx2: tolerate missing LOKNotifier on FloatingWindow hide
It seems the assumption is that if we get to hide state
then we must have initialized properly and set a LOKNotifier.
But this seems not to always hold, for whatever reason.
Here we are more forgiving if we don't have LOKNotifier.
Change-Id: Id21ec83489776f34228dd31f63e711b0dd77af55
Reviewed-on: https://gerrit.libreoffice.org/85401
Reviewed-by: Michael Meeks
Tested-by: Jenkins CollaboraOffice
(cherry picked from commit 25d8db8598ac54fe3ef1d6f40076ff19db87cd2f)
Reviewed-on: https://gerrit.libreoffice.org/85686
Tested-by: Jenkins
Reviewed-by: Ashod Nakashian
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index 8f18936d0ff0..a010533c79aa 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -666,9 +666,11 @@ void FloatingWindow::StateChanged( StateChangedType nType )
}
else if (!IsVisible() && nType == StateChangedType::Visible)
{
-assert(GetLOKNotifier());
-GetLOKNotifier()->notifyWindow(GetLOKWindowId(), "close");
-ReleaseLOKNotifier();
+if (const vcl::ILibreOfficeKitNotifier* pNotifier =
GetLOKNotifier())
+{
+pNotifier->notifyWindow(GetLOKWindowId(), "close");
+ReleaseLOKNotifier();
+}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/bin
solenv/bin/native-code.py |9 + 1 file changed, 9 insertions(+) New commits: commit f2648e6bc6a7200087e58fa84c7a14d2a27c45c5 Author: Michael Meeks AuthorDate: Wed Dec 18 13:30:23 2019 + Commit: Ashod Nakashian CommitDate: Mon Dec 23 02:00:42 2019 +0100 mobile: add components needed for long-press context menu popups. Change-Id: Id0d3c4216122cc1d91d082bbaca308fe844951de Reviewed-on: https://gerrit.libreoffice.org/85386 Tested-by: Jenkins CollaboraOffice Reviewed-by: Michael Meeks (cherry picked from commit 1be7094e8854b6d10db1d6ca4f4f940572a7722d) Reviewed-on: https://gerrit.libreoffice.org/85685 Tested-by: Jenkins Reviewed-by: Ashod Nakashian diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py index ef08aa6c618f..44452da614e5 100755 --- a/solenv/bin/native-code.py +++ b/solenv/bin/native-code.py @@ -167,12 +167,19 @@ core_constructor_list = [ "com_sun_star_comp_framework_Frame_get_implementation", "com_sun_star_comp_framework_GlobalAcceleratorConfiguration_get_implementation", "com_sun_star_comp_framework_JobExecutor_get_implementation", +"com_sun_star_comp_framework_jobs_JobDispatch_get_implementation", "com_sun_star_comp_framework_LayoutManager_get_implementation", "com_sun_star_comp_framework_ModuleManager_get_implementation", "com_sun_star_comp_framework_ModuleUIConfigurationManager_get_implementation", "com_sun_star_comp_framework_ModuleUIConfigurationManagerSupplier_get_implementation", "com_sun_star_comp_framework_PathSettings_get_implementation", "com_sun_star_comp_framework_PathSubstitution_get_implementation", +"com_sun_star_comp_framework_ObjectMenuController_get_implementation", + "com_sun_star_comp_framework_PopupMenuControllerFactory_get_implementation", +"com_sun_star_comp_framework_ControlMenuController_get_implementation", +"com_sun_star_comp_framework_ThesaurusMenuController_get_implementation", +"com_sun_star_comp_framework_ToolbarAsMenuController_get_implementation", +"com_sun_star_comp_framework_ResourceMenuController_get_implementation", "com_sun_star_comp_framework_StatusIndicatorFactory_get_implementation", "com_sun_star_comp_framework_TaskCreator_get_implementation", "com_sun_star_comp_framework_ToolBarControllerFactory_get_implementation", @@ -226,6 +233,7 @@ core_constructor_list = [ "com_sun_star_comp_graphic_GraphicProvider_get_implementation", # svx/util/svx.component "com_sun_star_comp_svx_NumberingToolBoxControl_get_implementation", +"com_sun_star_comp_svx_SmartTagMenuController_get_implementation", "com_sun_star_drawing_EnhancedCustomShapeEngine_get_implementation", "com_sun_star_drawing_SvxShapeCollection_get_implementation", "com_sun_star_svx_FontHeightToolBoxController_get_implementation", @@ -259,6 +267,7 @@ core_constructor_list = [ "stardiv_Toolkit_UnoDateFieldControl_get_implementation", "stardiv_Toolkit_UnoSpinButtonModel_get_implementation", "stardiv_Toolkit_VCLXPointer_get_implementation", +"stardiv_Toolkit_VCLXPopupMenu_get_implementation", "stardiv_Toolkit_VCLXToolkit_get_implementation", # uui/util/uui.component "com_sun_star_comp_uui_UUIInteractionHandler_get_implementation", ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/floatwin.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 15df500cb0a7166eb20104b254db963f74cb5144 Author: Ashod Nakashian AuthorDate: Wed Dec 18 07:30:14 2019 -0500 Commit: Ashod Nakashian CommitDate: Mon Dec 23 02:00:13 2019 +0100 vcl: don't use null window in FloatingWindow HitTest Change-Id: I551f31cf30c7a58642becebe0256684055d0703a Reviewed-on: https://gerrit.libreoffice.org/85383 Reviewed-by: Ashod Nakashian Tested-by: Ashod Nakashian (cherry picked from commit 65685bac09a4320602f4dda5151d247c5a83a75c) Reviewed-on: https://gerrit.libreoffice.org/85402 Tested-by: Jenkins diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx index d846cba8ddd4..8f18936d0ff0 100644 --- a/vcl/source/window/floatwin.cxx +++ b/vcl/source/window/floatwin.cxx @@ -522,6 +522,8 @@ FloatingWindow* FloatingWindow::ImplFloatHitTest( vcl::Window* pReference, const // use the border window to have the exact position vcl::Window *pBorderWin = pWin->GetWindow( GetWindowType::Border ); +if (!pBorderWin) +break; // the top-left corner in output coordinates ie (0,0) tools::Rectangle devRect( pBorderWin->ImplOutputToUnmirroredAbsoluteScreenPixel( tools::Rectangle( Point(), pBorderWin->GetSizePixel()) ) ) ; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/source
desktop/source/lib/init.cxx | 21 ++---
1 file changed, 18 insertions(+), 3 deletions(-)
New commits:
commit 924c28f355d91bbd7615b98f93c7ae055b43fe00
Author: Michael Meeks
AuthorDate: Wed Dec 18 13:31:58 2019 +
Commit: Ashod Nakashian
CommitDate: Mon Dec 23 01:59:45 2019 +0100
lok: catch and log exceptions during key / mouse event emission.
Change-Id: I2be8219f6b2648f3f0192caeccf8e8b037634dc2
Reviewed-on: https://gerrit.libreoffice.org/85387
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Michael Meeks
(cherry picked from commit 46fbc12dac86579708695fddeaf4a3a2f8098955)
Reviewed-on: https://gerrit.libreoffice.org/85684
Tested-by: Jenkins
Reviewed-by: Ashod Nakashian
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index afd63dd1f118..b80980994c5a 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3222,7 +3222,15 @@ static void doc_postKeyEvent(LibreOfficeKitDocument*
pThis, int nType, int nChar
return;
}
-pDoc->postKeyEvent(nType, nCharCode, nKeyCode);
+try
+{
+pDoc->postKeyEvent(nType, nCharCode, nKeyCode);
+}
+catch (const uno::Exception& exception)
+{
+SetLastExceptionMsg(exception.Message);
+SAL_INFO("lok", "Failed to postKeyEvent " << exception.Message);
+}
}
static void doc_postWindowExtTextInputEvent(LibreOfficeKitDocument* pThis,
unsigned nWindowId, int nType, const char* pText)
@@ -3703,8 +3711,15 @@ static void doc_postMouseEvent(LibreOfficeKitDocument*
pThis, int nType, int nX,
SetLastExceptionMsg("Document doesn't support tiled rendering");
return;
}
-
-pDoc->postMouseEvent(nType, nX, nY, nCount, nButtons, nModifier);
+try
+{
+pDoc->postMouseEvent(nType, nX, nY, nCount, nButtons, nModifier);
+}
+catch (const uno::Exception& exception)
+{
+SetLastExceptionMsg(exception.Message);
+SAL_INFO("lok", "Failed to postMouseEvent " << exception.Message);
+}
}
static void doc_postWindowMouseEvent(LibreOfficeKitDocument* /*pThis*/,
unsigned nLOKWindowId, int nType, int nX, int nY, int nCount, int nButtons, int
nModifier)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: comphelper/source desktop/qa include/comphelper include/vcl vcl/source
comphelper/source/misc/lok.cxx |5 +
desktop/qa/data/sheet_with_image.ods|binary
desktop/qa/desktop_lib/test_desktop_lib.cxx | 76
include/comphelper/lok.hxx |2
include/vcl/settings.hxx|1
vcl/source/app/settings.cxx |5 +
6 files changed, 89 insertions(+)
New commits:
commit 42f60e67e53c75d8a2eee9586d6ae8245ea984da
Author: Ashod Nakashian
AuthorDate: Tue Jul 23 19:11:36 2019 -0400
Commit: Ashod Nakashian
CommitDate: Mon Dec 23 01:58:11 2019 +0100
desktop: unit-test to check SpellDialog works in multiple views
Unfortunately, this isn't fully functional, but
didn't want to lose the effort. The problem is
that there is no proper config for languages
in the unit-tests. So even when we set the
language explicitly, it still doesn't apply
to the SpellCheckerDispatcher, which is
where it matters. This seems to be because
the config is not properly propagated and
broadcast. Below is the stacktrace as
works on desktop. During the unittest
the Broadcaster has no change listener
for LngSvcMgr, so SpellCheckerDispatcher::SetServiceList
doesn't get called.
#0 0x7f47f3fed7e6 in
SpellCheckerDispatcher::SetServiceList(com::sun::star::lang::Locale const&,
com::sun::star::uno::Sequence const&)
(this=0x5589de40e7a0, rLocale=..., rSvcImplNames=uno::Sequence of
length 1 = {...}) at /home/ash/prj/master/linguistic/source/spelldsp.cxx:795
#1 0x7f47f3fcc0ad in
LngSvcMgr::Notify(com::sun::star::uno::Sequence const&)
(this=0x5589de43b4e0, rPropertyNames=uno::Sequence of length 4 = {...})
at /home/ash/prj/master/linguistic/source/lngsvcmgr.cxx:826
#2 0x7f47fa2d3c8d in
utl::ConfigItem::CallNotify(com::sun::star::uno::Sequence
const&) (this=0x5589de43b530, rPropertyNames=uno::Sequence of length 4 = {...})
at /home/ash/prj/master/unotools/source/config/configitem.cxx:181
#3 0x7f47fa2d3946 in
utl::ConfigChangeListener_Impl::changesOccurred(com::sun::star::util::ChangesEvent
const&) (this=0x5589de464b90, rEvent=...)
at /home/ash/prj/master/unotools/source/config/configitem.cxx:143
#4 0x7f47e273bb61 in configmgr::Broadcaster::send()
(this=0x7ffcc604c5b0) at
/home/ash/prj/master/configmgr/source/broadcaster.cxx:182
#5 0x7f47e277f002 in configmgr::RootAccess::commitChanges()
(this=0x5589dd557400) at
/home/ash/prj/master/configmgr/source/rootaccess.cxx:171
#6 0x7f47fa2d80e3 in
utl::ConfigItem::ReplaceSetProperties(rtl::OUString const&,
com::sun::star::uno::Sequence const&)
(this=0x5589dd5571b0, rNode="ServiceManager/SpellCheckerList",
rValues=uno::Sequence of length 4 = {...}) at
/home/ash/prj/master/unotools/source/config/configitem.cxx:1025
#7 0x7f47fa339983 in
SvtLinguConfig::ReplaceSetProperties(rtl::OUString const&,
com::sun::star::uno::Sequence const&)
(this=0x7ffcc604cb40, rNode="ServiceManager/SpellCheckerList",
rValues=uno::Sequence of length 4 = {...}) at
/home/ash/prj/master/unotools/source/config/lingucfg.cxx:847
#8 0x7f47f3fcb88f in LngSvcMgr::UpdateAll() (this=0x5589de43b4e0) at
/home/ash/prj/master/linguistic/source/lngsvcmgr.cxx:765
#9 0x7f47f3fc9caa in LngSvcMgr::LngSvcMgr() (this=0x5589de43b4e0) at
/home/ash/prj/master/linguistic/source/lngsvcmgr.cxx:438
#10 0x7f47f3fd3baf in
LngSvcMgr_CreateInstance(com::sun::star::uno::Reference
const&) ()
at /home/ash/prj/master/linguistic/source/lngsvcmgr.cxx:1967
#11 0x7f4800e9656b in
cppu::OSingleFactoryHelper::createInstanceEveryTime(com::sun::star::uno::Reference
const&) (this=0x5589de3ccfc8, xContext=
uno::Reference to (cppu::ComponentContext *) 0x5589dbcca630) at
/home/ash/prj/master/cppuhelper/source/factory.cxx:149
#12 0x7f4800e96790 in
cppu::OSingleFactoryHelper::createInstanceWithContext(com::sun::star::uno::Reference
const&)
(this=0x5589de3ccfc8, xContext=uno::Reference to
(cppu::ComponentContext *) 0x5589dbcca630) at
/home/ash/prj/master/cppuhelper/source/factory.cxx:175
#13 0x7f4800e97107 in
cppu::OFactoryComponentHelper::createInstanceWithContext(com::sun::star::uno::Reference
const&)
(this=0x5589de3ccf60, xContext=uno::Reference to
(cppu::ComponentContext *) 0x5589dbcca630) at
/home/ash/prj/master/cppuhelper/source/factory.cxx:374
#14 0x7f4800eebc8f in
cppuhelper::ServiceManager::Data::Implementation::createInstance(com::sun::star::uno::Reference
const&, bool)
(this=0x5589dbd2f030, context=uno::Reference to
(cppu::ComponentContext *) 0x5589dbcca630, singletonRequest=false) at
/home/ash/prj/master/cppuhelper/source/servicemanager.cxx:667
#15 0x7f4800eee587 in
cppuhelper::ServiceManager::createInstanceWithContext(rtl::OUString const&,
com::sun::star::uno::Reference const&)
(t
[Libreoffice-commits] core.git: sc/source
sc/source/ui/view/spelldialog.cxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit 43305a977d28d3e00e60d140d3877a6f369fc1a9
Author: Ashod Nakashian
AuthorDate: Sat Aug 10 12:26:40 2019 -0400
Commit: Ashod Nakashian
CommitDate: Mon Dec 23 00:54:11 2019 +0100
sc: clear the spell checking markers after applying corrections
Change-Id: Ia3fc3b5a21d21b9b945ce72f397350a57859f107
(cherry picked from commit afa5f2b0edb43b36b1b4f0ab8f70ecbe638435e5)
Reviewed-on: https://gerrit.libreoffice.org/85006
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Michael Meeks
(cherry picked from commit e1ca2b989bf4d124588c35f7f4a0bc3da3c1f58e)
Reviewed-on: https://gerrit.libreoffice.org/85682
Tested-by: Jenkins
Reviewed-by: Ashod Nakashian
diff --git a/sc/source/ui/view/spelldialog.cxx
b/sc/source/ui/view/spelldialog.cxx
index d9780959a5c3..e742b073bff8 100644
--- a/sc/source/ui/view/spelldialog.cxx
+++ b/sc/source/ui/view/spelldialog.cxx
@@ -92,7 +92,12 @@ void ScSpellDialogChildWindow::ApplyChangedSentence( const
svx::SpellPortions& r
{
if( mxEngine.get() && mpViewData )
if( EditView* pEditView = mpViewData->GetSpellingView() )
+{
mxEngine->ApplyChangedSentence( *pEditView, rChanged, bRecheck );
+
+// Reset the spell checking results to clear the markers.
+mpViewData->GetActiveWin()->ResetAutoSpell();
+}
}
void ScSpellDialogChildWindow::GetFocus()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/undo/undoblk3.cxx |4 1 file changed, 4 insertions(+) New commits: commit 4844a3e0e2ce63c142fd49634d8fe7c9d359f022 Author: Ashod Nakashian AuthorDate: Sat Aug 10 11:33:58 2019 -0400 Commit: Ashod Nakashian CommitDate: Mon Dec 23 00:53:40 2019 +0100 sc: correctly update spelling markers on undo/redo (cherry picked from commit 62eb6210895b24855b077fb0d89f182beac4a43c) Reviewed-on: https://gerrit.libreoffice.org/85005 Tested-by: Jenkins CollaboraOffice Reviewed-by: Michael Meeks (cherry picked from commit a05fd0eb30767471c6d20c93e0fb8b3ff7c7eaee) Change-Id: I946cede7967f454813f717273c4114d31167c8c6 Reviewed-on: https://gerrit.libreoffice.org/85681 Tested-by: Jenkins Reviewed-by: Ashod Nakashian diff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxx index 4e8add1ee461..68aeede027ef 100644 --- a/sc/source/ui/undo/undoblk3.cxx +++ b/sc/source/ui/undo/undoblk3.cxx @@ -1234,6 +1234,10 @@ void ScUndoConversion::DoChange( ScDocument* pRefDoc, const ScAddress& rCursorPo pRefDoc->CopyToDocument( 0, 0, 0, rDoc.MaxCol(), rDoc.MaxRow(), nTabCount-1, InsertDeleteFlags::CONTENTS, bMulti, rDoc, &aMarkData ); + +// Reset the spell checking results to re-check on paint, otherwise +// we show the previous spelling markers (or lack thereof on misspellings). +ScDocShell::GetViewData()->GetActiveWin()->ResetAutoSpell(); pDocShell->PostPaintGridAll(); } else ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/qa include/sfx2 sc/source sd/source sfx2/source sw/source
desktop/qa/data/2slides.odp |binary
include/sfx2/childwin.hxx |6 +++---
sc/source/ui/app/scdll.cxx|5 -
sd/source/ui/app/sddll.cxx|5 -
sfx2/source/appl/workwin.cxx |3 +++
sw/source/uibase/app/swmodule.cxx |5 -
6 files changed, 18 insertions(+), 6 deletions(-)
New commits:
commit c9829f585103f3daa9749c5b0f479297edd42042
Author: Ashod Nakashian
AuthorDate: Sat Jul 27 23:35:13 2019 -0400
Commit: Ashod Nakashian
CommitDate: Mon Dec 23 00:52:34 2019 +0100
LOK: spelldialog: don't create the dialog when loading new views
By default dialogs/decks are re-created when a new view is
created/attached, if they are visible. For the spell checker
this is unexpected, as the user doesn't expect to be doing
spell checking upon loading a document, just because another
user was at the time spell checking. Currently the suppression
is for LOK only.
This also adds support to suppress the recreation of any
dialog by flagging it with the SfxChildWindowFlags::NEVERCLONE
flag upon invoking RegisterChildWindow.
(cherry picked from commit e3fb48fe4f84b5609730c64fdb49b1bd7ddd1f96)
Reviewed-on: https://gerrit.libreoffice.org/85004
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Michael Meeks
(cherry picked from commit e573919cd8561a81d967c1a4566c5733dd44b7b1)
Change-Id: I7d71c664f1b2804910c96eeb0431164d48b5679b
Reviewed-on: https://gerrit.libreoffice.org/85680
Tested-by: Jenkins
Reviewed-by: Ashod Nakashian
diff --git a/desktop/qa/data/2slides.odp b/desktop/qa/data/2slides.odp
index 8be376f5b548..0e3f8758ffc9 100644
Binary files a/desktop/qa/data/2slides.odp and b/desktop/qa/data/2slides.odp
differ
diff --git a/include/sfx2/childwin.hxx b/include/sfx2/childwin.hxx
index 68279262d11d..054f1ff0a0f5 100644
--- a/include/sfx2/childwin.hxx
+++ b/include/sfx2/childwin.hxx
@@ -47,13 +47,13 @@ enum class SfxChildWindowFlags
TASK= 0x10, // ChildWindow inside the Task
CANTGETFOCUS= 0x20, // ChildWindow can not get focus
ALWAYSAVAILABLE = 0x40, // ChildWindow is never disabled
-NEVERHIDE = 0x80 // ChildWindow is can always made
-// visible/is visible
+NEVERHIDE = 0x80, // ChildWindow is always visible
+NEVERCLONE = 0x100, // ChildWindow is not recreated in new view
};
namespace o3tl
{
-template<> struct typed_flags :
is_typed_flags {};
+template<> struct typed_flags :
is_typed_flags {};
}
diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx
index 59faba24ece2..45129b81b089 100644
--- a/sc/source/ui/app/scdll.cxx
+++ b/sc/source/ui/app/scdll.cxx
@@ -22,6 +22,7 @@
#include
#include
+#include
#include
#include
#include
@@ -238,7 +239,9 @@ void ScDLL::Init()
SvxHlinkDlgWrapper ::RegisterChildWindow(false, pMod);
SvxFontWorkChildWindow ::RegisterChildWindow(false, pMod);
SvxIMapDlgChildWindow ::RegisterChildWindow(false, pMod);
-ScSpellDialogChildWindow::RegisterChildWindow(false, pMod);
+ScSpellDialogChildWindow::RegisterChildWindow(
+false, pMod, comphelper::LibreOfficeKit::isActive() ?
SfxChildWindowFlags::NEVERCLONE
+:
SfxChildWindowFlags::NONE);
ScValidityRefChildWin::RegisterChildWindow(false, pMod);
sc::SearchResultsDlgWrapper::RegisterChildWindow(false, pMod);
diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx
index 8098c5d6c31c..55d306e53925 100644
--- a/sd/source/ui/app/sddll.cxx
+++ b/sd/source/ui/app/sddll.cxx
@@ -84,6 +84,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -165,7 +166,9 @@ void SdDLL::RegisterControllers(SdModule* pMod)
SvxBmpMaskChildWindow::RegisterChildWindow(false, pMod);
SvxIMapDlgChildWindow::RegisterChildWindow(false, pMod);
SvxHlinkDlgWrapper::RegisterChildWindow(false, pMod);
-::sd::SpellDialogChildWindow::RegisterChildWindow(false, pMod);
+::sd::SpellDialogChildWindow::RegisterChildWindow(
+false, pMod, comphelper::LibreOfficeKit::isActive() ?
SfxChildWindowFlags::NEVERCLONE
+:
SfxChildWindowFlags::NONE);
#if HAVE_FEATURE_AVMEDIA
::avmedia::MediaPlayer::RegisterChildWindow(false, pMod);
#endif
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index cb9680b94ae0..3c505a364c07 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -1283,6 +1283,9 @@ void SfxWorkWindow::UpdateChildWindows_Impl()
else
bCreate = true;
+if (pCW->aInfo.nFlags & SfxChildWindowFlags::NEVERCLONE)
+pCW->bCreate = bCreate = false; // Don't create and
remember that we haven't created.
+
// Currently, no w
Re: Notification on OLE object insertion
Hello Julien, thanks for the idea. From the documentation I think the XStateChangeListener will only notify me if I have already registered it on an OLE object. Maybe I am wrong? I am already successfully using a DocumentEventListener on the OLE object. But it only catches changes and deletion of the object. My problem is that the application does not know when a new OLE object is created by the user and inserted. I need to get notified about that so that I can install the DocumentEventListener, which will then notify about future changes and deletion. Jan -- Sent from: http://document-foundation-mail-archive.969070.n3.nabble.com/Dev-f1639786.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/source
vcl/source/app/help.cxx | 19 +--
1 file changed, 13 insertions(+), 6 deletions(-)
New commits:
commit 0b7b2026b0e0a07931da933d5a144d2c00113538
Author: Michael Meeks
AuthorDate: Wed Dec 11 23:58:08 2019 +
Commit: Ashod Nakashian
CommitDate: Sun Dec 22 22:21:08 2019 +0100
lok: avoid crash cleaning up help-windows with multiple views.
Change-Id: Ic57018396de7730d9fa4fb3b4803a221cb9678da
Reviewed-on: https://gerrit.libreoffice.org/84999
Reviewed-by: Michael Meeks
Tested-by: Michael Meeks
(cherry picked from commit 435659fd7e401353fc114246813b811190362293)
Reviewed-on: https://gerrit.libreoffice.org/85350
Tested-by: Jenkins
Reviewed-by: Ashod Nakashian
diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx
index 8f8efdd38eb5..b5a7cb4cc057 100644
--- a/vcl/source/app/help.cxx
+++ b/vcl/source/app/help.cxx
@@ -562,13 +562,20 @@ void ImplDestroyHelpWindow( bool bUpdateHideTime )
void ImplDestroyHelpWindow(ImplSVHelpData& rHelpData, bool bUpdateHideTime)
{
VclPtr pHelpWin = rHelpData.mpHelpWin;
-if ( pHelpWin )
+if( pHelpWin )
{
-vcl::Window * pWindow = pHelpWin->GetParent()->ImplGetFrameWindow();
-// find out screen area covered by system help window
-tools::Rectangle aInvRect( pHelpWin->GetWindowExtentsRelative( pWindow
) );
-if( pHelpWin->IsVisible() )
-pWindow->Invalidate( aInvRect );
+vcl::Window * pParent = pHelpWin->GetParent();
+if( pParent )
+{
+VclPtr pWindow( pParent->ImplGetFrameWindow() );
+if( pWindow )
+{
+// find out screen area covered by system help window
+tools::Rectangle aInvRect( pHelpWin->GetWindowExtentsRelative(
pWindow ) );
+if( pHelpWin->IsVisible() )
+pWindow->Invalidate( aInvRect );
+}
+}
rHelpData.mpHelpWin = nullptr;
rHelpData.mbKeyboardHelp = false;
pHelpWin->Hide();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/outdev/rect.cxx |5 + 1 file changed, 5 insertions(+) New commits: commit 24e7208306fa1c60eb0a0cee5c49b6454cad9df3 Author: Michael Meeks AuthorDate: Thu Nov 7 14:11:35 2019 + Commit: Ashod Nakashian CommitDate: Sun Dec 22 22:20:30 2019 +0100 Drawing calc grid misses pixels on bottom and right; fix. Don't attempt to offset empty rectangles causing serious problems. Change-Id: I6fcac11f5f5e03f7edc0662cf4e06e7f8a109f00 Reviewed-on: https://gerrit.libreoffice.org/82220 Tested-by: Jenkins CollaboraOffice Reviewed-by: Michael Meeks (cherry picked from commit fb974bc968b3a1a95f8e621776076522ec719dc6) Reviewed-on: https://gerrit.libreoffice.org/84993 Tested-by: Jenkins Reviewed-by: Ashod Nakashian diff --git a/vcl/source/outdev/rect.cxx b/vcl/source/outdev/rect.cxx index ecbeb12fbfee..4cced0f9b7e9 100644 --- a/vcl/source/outdev/rect.cxx +++ b/vcl/source/outdev/rect.cxx @@ -232,6 +232,11 @@ void OutputDevice::DrawGrid( const tools::Rectangle& rRect, const Size& rDist, D if( mbOutputClipped ) return; +// FIXME: seems we have an off-by-one around the border +// here with the cairo / svp backend at least. +aDstRect.AdjustRight(1); +aDstRect.AdjustBottom(1); + const long nDistX = std::max( rDist.Width(), 1L ); const long nDistY = std::max( rDist.Height(), 1L ); long nX = ( rRect.Left() >= aDstRect.Left() ) ? rRect.Left() : ( rRect.Left() + ( ( aDstRect.Left() - rRect.Left() ) / nDistX ) * nDistX ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/qa include/sfx2 sc/source sfx2/source
desktop/qa/desktop_lib/test_desktop_lib.cxx | 61
include/sfx2/objsh.hxx |2
sc/source/ui/docshell/docsh.cxx |6 ++
sc/source/ui/inc/docsh.hxx |2
sfx2/source/doc/objserv.cxx |1
sfx2/source/doc/objstor.cxx |7 +++
6 files changed, 71 insertions(+), 8 deletions(-)
New commits:
commit 9b3c7c81299590d6d845f7437f6ab16db0219929
Author: Ashod Nakashian
AuthorDate: Thu Aug 22 09:15:15 2019 -0400
Commit: Ashod Nakashian
CommitDate: Sun Dec 22 22:14:41 2019 +0100
sc: LOK: commit cell edits before saveas
Users typically don't recognize that changes
done to a cell need to be committed (typically
by hitting RETURN) before they are saved to file.
This is especially true on the web.
This patch commits any in-flight changes before
SaveAs. This is currently done only for LOK and
unconditionally at that. This can be controlled
via a flag, if there is such a use-case.
Reviewed-on: https://gerrit.libreoffice.org/78012
Reviewed-by: Ashod Nakashian
Tested-by: Ashod Nakashian
(cherry picked from commit cc7eb4d345e3fede698a3f255c1938d275305c14)
Reviewed-on: https://gerrit.libreoffice.org/78455
Reviewed-by: Andras Timar
Tested-by: Andras Timar
(cherry picked from commit e867404fbe7e0ff0d6f2573292c19b3a178a412d)
Change-Id: I2a88b2f1df47be764058f4505561b22830d9d67a
Reviewed-on: https://gerrit.libreoffice.org/82102
Tested-by: Jenkins
Reviewed-by: Ashod Nakashian
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index 178d42f335c0..2649c0cb0d40 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -75,7 +75,6 @@ public:
comphelper::LibreOfficeKit::setActive(true);
UnoApiTest::setUp();
-
mxDesktop.set(frame::Desktop::create(comphelper::getComponentContext(getMultiServiceFactory(;
SfxApplication::GetOrCreate();
};
@@ -85,11 +84,13 @@ public:
if (m_pDocument)
m_pDocument->pClass->registerCallback(m_pDocument.get(), nullptr,
nullptr);
closeDoc();
+
UnoApiTest::tearDown();
comphelper::LibreOfficeKit::setActive(false);
};
+LibLODocument_Impl* loadDocUrl(const OUString& rFileURL,
LibreOfficeKitDocumentType eType);
LibLODocument_Impl* loadDoc(const char* pName, LibreOfficeKitDocumentType
eType = LOK_DOCTYPE_TEXT);
void closeDoc();
static void callback(int nType, const char* pPayload, void* pData);
@@ -147,6 +148,7 @@ public:
void testDialogPaste();
void testShowHideDialog();
void testDialogInput();
+void testCalcSaveAs();
void testABI();
CPPUNIT_TEST_SUITE(DesktopLOKTest);
@@ -204,6 +206,7 @@ public:
CPPUNIT_TEST(testDialogPaste);
CPPUNIT_TEST(testShowHideDialog);
CPPUNIT_TEST(testDialogInput);
+CPPUNIT_TEST(testCalcSaveAs);
CPPUNIT_TEST(testABI);
CPPUNIT_TEST_SUITE_END();
@@ -249,10 +252,8 @@ static Control* GetFocusControl(vcl::Window const *
pParent)
return nullptr;
}
-LibLODocument_Impl* DesktopLOKTest::loadDoc(const char* pName,
LibreOfficeKitDocumentType eType)
+LibLODocument_Impl* DesktopLOKTest::loadDocUrl(const OUString& rFileURL,
LibreOfficeKitDocumentType eType)
{
-OUString aFileURL;
-createFileURL(OUString::createFromAscii(pName), aFileURL);
OUString aService;
switch (eType)
{
@@ -269,7 +270,7 @@ LibLODocument_Impl* DesktopLOKTest::loadDoc(const char*
pName, LibreOfficeKitDoc
CPPUNIT_ASSERT(false);
break;
}
-mxComponent = loadFromDesktop(aFileURL, aService);
+mxComponent = loadFromDesktop(rFileURL, aService);
if (!mxComponent.is())
{
CPPUNIT_ASSERT(false);
@@ -278,6 +279,13 @@ LibLODocument_Impl* DesktopLOKTest::loadDoc(const char*
pName, LibreOfficeKitDoc
return m_pDocument.get();
}
+LibLODocument_Impl* DesktopLOKTest::loadDoc(const char* pName,
LibreOfficeKitDocumentType eType)
+{
+OUString aFileURL;
+createFileURL(OUString::createFromAscii(pName), aFileURL);
+return loadDocUrl(aFileURL, eType);
+}
+
void DesktopLOKTest::closeDoc()
{
if (mxComponent.is())
@@ -905,7 +913,7 @@ void DesktopLOKTest::testTrackChanges()
pDocument->pClass->registerCallback(pDocument, &DesktopLOKTest::callback,
this);
Scheduler::ProcessEventsToIdle();
-// Enable track changes and assert that both views get notified.
+// Enable trak changes and assert that both views get notified.
m_nTrackChanges = 0;
pDocument->pClass->postUnoCommand(pDocument, ".uno:TrackChanges", nullptr,
false);
Scheduler::ProcessEventsToIdle();
@@ -1833,6 +1841,7 @@ class ViewCallback
LibLODocument_Impl* mpDocument;
int mnView;
public:
+OString m_aCellFormula;
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - sd/source
sd/source/ui/func/fupage.cxx |9 +++--
1 file changed, 3 insertions(+), 6 deletions(-)
New commits:
commit 52a1cadbdf82ddc7a8ef550627e59d5f8f15c195
Author: Aron Budea
AuthorDate: Sun Dec 22 08:10:25 2019 +0100
Commit: Ashod Nakashian
CommitDate: Sun Dec 22 22:10:37 2019 +0100
tdf#128449 Set graphic when setting background in Impress
Regression from 905e6bd3ae0ca5c5ac7083430d7aa126c6526fd7
Change-Id: If0510967a339b6b46da2b7f798f478a46bd10b48
Reviewed-on: https://gerrit.libreoffice.org/85688
Tested-by: Jenkins
Reviewed-by: Ashod Nakashian
(cherry picked from commit 8304c671b19365e61d88a9133631775846a172a5)
Reviewed-on: https://gerrit.libreoffice.org/85705
Tested-by: Jenkins CollaboraOffice
diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx
index 15a8c5156cee..88c4449a0fde 100644
--- a/sd/source/ui/func/fupage.cxx
+++ b/sd/source/ui/func/fupage.cxx
@@ -303,8 +303,6 @@ const SfxItemSet* FuPage::ExecuteDialog(vcl::Window*
pParent, SfxRequest& rReq)
}
else if (nId == SID_SELECT_BACKGROUND)
{
-OUString aFileName;
-OUString aFilterName;
Graphic aGraphic;
ErrCode nError = ERRCODE_GRFILTER_OPENERROR;
@@ -313,7 +311,8 @@ const SfxItemSet* FuPage::ExecuteDialog(vcl::Window*
pParent, SfxRequest& rReq)
if (pArgs && pArgs->GetItemState(SID_SELECT_BACKGROUND, true, &pItem)
== SfxItemState::SET)
{
-aFileName = static_cast(pItem)->GetValue();
+OUString aFileName(static_cast(pItem)->GetValue());
+OUString aFilterName;
if (pArgs->GetItemState(FN_PARAM_FILTER, true, &pItem) ==
SfxItemState::SET)
aFilterName = static_cast(pItem)->GetValue();
@@ -326,11 +325,9 @@ const SfxItemSet* FuPage::ExecuteDialog(vcl::Window*
pParent, SfxRequest& rReq)
SvxOpenGraphicDialog aDlg(SdResId(STR_SET_BACKGROUND_PICTURE),
pParent);
nError = aDlg.Execute();
-if (nError != ERRCODE_NONE)
+if (nError == ERRCODE_NONE)
{
nError = aDlg.GetGraphic(aGraphic);
-aFileName = aDlg.GetPath();
-aFilterName = aDlg.GetDetectedFilter();
}
}
___
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/fupage.cxx |9 +++--
1 file changed, 3 insertions(+), 6 deletions(-)
New commits:
commit 44b4a697826814bf5223a407a5373809a18436f8
Author: Aron Budea
AuthorDate: Sun Dec 22 08:10:25 2019 +0100
Commit: Ashod Nakashian
CommitDate: Sun Dec 22 22:10:24 2019 +0100
tdf#128449 Set graphic when setting background in Impress
Regression from 905e6bd3ae0ca5c5ac7083430d7aa126c6526fd7
Change-Id: If0510967a339b6b46da2b7f798f478a46bd10b48
Reviewed-on: https://gerrit.libreoffice.org/85688
Tested-by: Jenkins
Reviewed-by: Ashod Nakashian
(cherry picked from commit 8304c671b19365e61d88a9133631775846a172a5)
Reviewed-on: https://gerrit.libreoffice.org/85704
Tested-by: Jenkins CollaboraOffice
diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx
index a8f31373d8fb..b73f91e5ccde 100644
--- a/sd/source/ui/func/fupage.cxx
+++ b/sd/source/ui/func/fupage.cxx
@@ -304,8 +304,6 @@ const SfxItemSet* FuPage::ExecuteDialog(weld::Window*
pParent, SfxRequest& rReq)
}
else if (nId == SID_SELECT_BACKGROUND)
{
-OUString aFileName;
-OUString aFilterName;
Graphic aGraphic;
ErrCode nError = ERRCODE_GRFILTER_OPENERROR;
@@ -314,7 +312,8 @@ const SfxItemSet* FuPage::ExecuteDialog(weld::Window*
pParent, SfxRequest& rReq)
if (pArgs && pArgs->GetItemState(SID_SELECT_BACKGROUND, true, &pItem)
== SfxItemState::SET)
{
-aFileName = static_cast(pItem)->GetValue();
+OUString aFileName(static_cast(pItem)->GetValue());
+OUString aFilterName;
if (pArgs->GetItemState(FN_PARAM_FILTER, true, &pItem) ==
SfxItemState::SET)
aFilterName = static_cast(pItem)->GetValue();
@@ -327,11 +326,9 @@ const SfxItemSet* FuPage::ExecuteDialog(weld::Window*
pParent, SfxRequest& rReq)
SvxOpenGraphicDialog aDlg(SdResId(STR_SET_BACKGROUND_PICTURE),
pParent);
nError = aDlg.Execute();
-if (nError != ERRCODE_NONE)
+if (nError == ERRCODE_NONE)
{
nError = aDlg.GetGraphic(aGraphic);
-aFileName = aDlg.GetPath();
-aFilterName = aDlg.GetDetectedFilter();
}
}
___
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' - sd/source
sd/source/ui/func/fupage.cxx |9 +++--
1 file changed, 3 insertions(+), 6 deletions(-)
New commits:
commit cfe24288e43779019bf755dfdff9163e0be2e4e2
Author: Aron Budea
AuthorDate: Sun Dec 22 08:10:25 2019 +0100
Commit: Ashod Nakashian
CommitDate: Sun Dec 22 22:10:08 2019 +0100
tdf#128449 Set graphic when setting background in Impress
Regression from 905e6bd3ae0ca5c5ac7083430d7aa126c6526fd7
Change-Id: If0510967a339b6b46da2b7f798f478a46bd10b48
Reviewed-on: https://gerrit.libreoffice.org/85688
Tested-by: Jenkins
Reviewed-by: Ashod Nakashian
(cherry picked from commit 8304c671b19365e61d88a9133631775846a172a5)
Reviewed-on: https://gerrit.libreoffice.org/85703
diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx
index 7c2654e0bba0..95dc91b232f2 100644
--- a/sd/source/ui/func/fupage.cxx
+++ b/sd/source/ui/func/fupage.cxx
@@ -293,8 +293,6 @@ const SfxItemSet* FuPage::ExecuteDialog(weld::Window*
pParent, const SfxRequest&
}
else if (nId == SID_SELECT_BACKGROUND)
{
-OUString aFileName;
-OUString aFilterName;
Graphic aGraphic;
ErrCode nError = ERRCODE_GRFILTER_OPENERROR;
@@ -303,7 +301,8 @@ const SfxItemSet* FuPage::ExecuteDialog(weld::Window*
pParent, const SfxRequest&
if (pArgs && pArgs->GetItemState(SID_SELECT_BACKGROUND, true, &pItem)
== SfxItemState::SET)
{
-aFileName = static_cast(pItem)->GetValue();
+OUString aFileName(static_cast(pItem)->GetValue());
+OUString aFilterName;
if (pArgs->GetItemState(FN_PARAM_FILTER, true, &pItem) ==
SfxItemState::SET)
aFilterName = static_cast(pItem)->GetValue();
@@ -316,11 +315,9 @@ const SfxItemSet* FuPage::ExecuteDialog(weld::Window*
pParent, const SfxRequest&
SvxOpenGraphicDialog aDlg(SdResId(STR_SET_BACKGROUND_PICTURE),
pParent);
nError = aDlg.Execute();
-if (nError != ERRCODE_NONE)
+if (nError == ERRCODE_NONE)
{
nError = aDlg.GetGraphic(aGraphic);
-aFileName = aDlg.GetPath();
-aFilterName = aDlg.GetDetectedFilter();
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: toolkit/inc UnoControls/inc unoxml/inc writerfilter/inc writerperfect/inc
UnoControls/inc/multiplexer.hxx |6 ++
toolkit/inc/helper/scrollabledialog.hxx |2 +-
toolkit/inc/helper/unowrapper.hxx|2 +-
unoxml/inc/mouseevent.hxx|2 +-
unoxml/inc/mutationevent.hxx |2 +-
writerfilter/inc/ooxml/QNameToString.hxx |2 +-
writerperfect/inc/DirectoryStream.hxx|2 +-
writerperfect/inc/DocumentHandler.hxx|2 +-
writerperfect/inc/WPFTEncodingDialog.hxx |2 +-
writerperfect/inc/WPXSvInputStream.hxx |2 +-
10 files changed, 11 insertions(+), 13 deletions(-)
New commits:
commit 6ef3027ff9a5ee48e9fe2b8817eeabe444d6ec05
Author: Noel Grandin
AuthorDate: Sun Dec 22 19:45:05 2019 +0200
Commit: Noel Grandin
CommitDate: Sun Dec 22 20:30:38 2019 +0100
loplugin:finalclasses in UnoControls..writerperfect
Change-Id: I751c9a45503326dfdaeb471967a688a95d4fa090
Reviewed-on: https://gerrit.libreoffice.org/85711
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/UnoControls/inc/multiplexer.hxx b/UnoControls/inc/multiplexer.hxx
index dda3013a3600..640435ad520e 100644
--- a/UnoControls/inc/multiplexer.hxx
+++ b/UnoControls/inc/multiplexer.hxx
@@ -39,7 +39,7 @@ namespace com::sun::star::awt { struct WindowEvent; }
namespace unocontrols {
-class OMRCListenerMultiplexerHelper : public css::awt::XFocusListener
+class OMRCListenerMultiplexerHelper final : public css::awt::XFocusListener
, public css::awt::XWindowListener
, public css::awt::XKeyListener
, public css::awt::XMouseListener
@@ -198,9 +198,7 @@ public:
virtual void SAL_CALL windowDeactivated( const css::lang::EventObject&
aEvent ) override;
-// protected methods
-
-protected:
+private:
/**
@short Remove the listener from the peer.
diff --git a/toolkit/inc/helper/scrollabledialog.hxx
b/toolkit/inc/helper/scrollabledialog.hxx
index 14bc87ab027c..6dce324dbccb 100644
--- a/toolkit/inc/helper/scrollabledialog.hxx
+++ b/toolkit/inc/helper/scrollabledialog.hxx
@@ -26,7 +26,7 @@
namespace toolkit
{
-class ScrollableDialog : public Dialog
+class ScrollableDialog final : public Dialog
{
public:
enum ScrollBarVisibility { None, Vert, Hori, Both };
diff --git a/toolkit/inc/helper/unowrapper.hxx
b/toolkit/inc/helper/unowrapper.hxx
index c095ef2f4f8b..cfb890584c61 100644
--- a/toolkit/inc/helper/unowrapper.hxx
+++ b/toolkit/inc/helper/unowrapper.hxx
@@ -32,7 +32,7 @@
-class UnoWrapper : public UnoWrapperBase
+class UnoWrapper final : public UnoWrapperBase
{
private:
css::uno::Reference< css::awt::XToolkit> mxToolkit;
diff --git a/unoxml/inc/mouseevent.hxx b/unoxml/inc/mouseevent.hxx
index 3f6788e89f13..abbf1ff2c82e 100644
--- a/unoxml/inc/mouseevent.hxx
+++ b/unoxml/inc/mouseevent.hxx
@@ -32,7 +32,7 @@ namespace DOM { namespace events {
typedef ::cppu::ImplInheritanceHelper< CUIEvent,
css::xml::dom::events::XMouseEvent >
CMouseEvent_Base;
-class CMouseEvent
+class CMouseEvent final
: public CMouseEvent_Base
{
sal_Int32 m_screenX;
diff --git a/unoxml/inc/mutationevent.hxx b/unoxml/inc/mutationevent.hxx
index 5499b5a93633..68145b270b3e 100644
--- a/unoxml/inc/mutationevent.hxx
+++ b/unoxml/inc/mutationevent.hxx
@@ -37,7 +37,7 @@ namespace DOM { namespace events {
typedef ::cppu::ImplInheritanceHelper< CEvent,
css::xml::dom::events::XMutationEvent >
CMutationEvent_Base;
-class CMutationEvent
+class CMutationEvent final
: public CMutationEvent_Base
{
css::uno::Reference< css::xml::dom::XNode > m_relatedNode;
diff --git a/writerfilter/inc/ooxml/QNameToString.hxx
b/writerfilter/inc/ooxml/QNameToString.hxx
index 3508a5f4229e..c076047e13a4 100644
--- a/writerfilter/inc/ooxml/QNameToString.hxx
+++ b/writerfilter/inc/ooxml/QNameToString.hxx
@@ -29,7 +29,7 @@
namespace writerfilter
{
-class QNameToString : public virtual SvRefBase
+class QNameToString final : public virtual SvRefBase
{
typedef tools::SvRef Pointer_t;
typedef std::map < Id, std::string > Map;
diff --git a/writerperfect/inc/DirectoryStream.hxx
b/writerperfect/inc/DirectoryStream.hxx
index 6747c8707109..1f9f32303cac 100644
--- a/writerperfect/inc/DirectoryStream.hxx
+++ b/writerperfect/inc/DirectoryStream.hxx
@@ -32,7 +32,7 @@ class XContent;
namespace writerperfect
{
-class WRITERPERFECT_DLLPUBLIC DirectoryStream : public
librevenge::RVNGInputStream
+class WRITERPERFECT_DLLPUBLIC DirectoryStream final : public
librevenge::RVNGInputStream
{
struct Impl;
diff --git a/writerperfect/inc/DocumentHandler.hxx
b/writerperfect/inc/DocumentHandler.hxx
index ab7b15dd6aab..d14bb273557f 100644
--- a/writerperfect/inc/DocumentHandler.hxx
+++ b/writerperfect/inc/DocumentHandler.hxx
@@ -47,7 +47,7 @@ class XDocumentHandler;
namespace writerperfect
{
-class WRITERPERFECT_DLLPUBLIC DocumentHandler : public OdfDocumentHandle
[SOLVED] Re: Build failure with fatal error: officecfg/Setup.hxx: No such file or directory
Fixed with: diff --git a/framework/Library_fwm.mk b/framework/Library_fwm.mk index 7c979f5a3c5d..c671daab0b9b 100644 --- a/framework/Library_fwm.mk +++ b/framework/Library_fwm.mk @@ -21,6 +21,10 @@ $(eval $(call gb_Library_Library,fwm)) $(eval $(call gb_Library_set_componentfile,fwm,framework/util/fwm)) +$(eval $(call gb_Library_use_custom_headers,fwm,\ + officecfg/registry \ +)) + $(eval $(call gb_Library_set_include,fwm,\ -I$(SRCDIR)/framework/inc \ -I$(SRCDIR)/framework/source/inc \ Sorry for the noise -- Sent from: http://document-foundation-mail-archive.969070.n3.nabble.com/Dev-f1639786.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - writerfilter/CppunitTest_writerfilter_dmapper.mk writerfilter/Module_writerfilter.mk writerfilter/qa writerfilter/source
writerfilter/CppunitTest_writerfilter_dmapper.mk |
48 ++
writerfilter/Module_writerfilter.mk |
1
writerfilter/qa/cppunittests/dmapper/DomainMapperTableHandler.cxx|
76 ++
writerfilter/qa/cppunittests/dmapper/data/1cell-insidev-rightborder.docx
|binary
writerfilter/source/dmapper/DomainMapperTableHandler.cxx |
3
5 files changed, 127 insertions(+), 1 deletion(-)
New commits:
commit fdc331d7ec0d4d9e6c074eb295d803686946e5ac
Author: Miklos Vajna
AuthorDate: Thu Dec 19 17:54:08 2019 +0100
Commit: Caolán McNamara
CommitDate: Sun Dec 22 20:00:44 2019 +0100
DOCX table import: fix interaction of 1-cell rows and "inside" vertical
borders
The interesting part of the bugdoc was:
- table style wants visible borders
- table direct formatting clears left and right borders
- 1st row of the table has 1 cell (2 cells in fact, but they are
merged)
Fix the "inside" vertical border handling, so that the first cell gets
these vertical borders as a right border only in case there are multiple
cells.
(cherry picked from commit fd92740a86ab8e71e77d947d1d7dabc51a8d0794)
Change-Id: Id847109ecfa95d1745abe62ddf36c4936b730855
Reviewed-on: https://gerrit.libreoffice.org/85574
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/writerfilter/CppunitTest_writerfilter_dmapper.mk
b/writerfilter/CppunitTest_writerfilter_dmapper.mk
new file mode 100644
index ..fbb302297c94
--- /dev/null
+++ b/writerfilter/CppunitTest_writerfilter_dmapper.mk
@@ -0,0 +1,48 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,writerfilter_dmapper))
+
+$(eval $(call gb_CppunitTest_use_externals,writerfilter_dmapper,\
+ boost_headers \
+))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,writerfilter_dmapper, \
+writerfilter/qa/cppunittests/dmapper/DomainMapperTableHandler \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,writerfilter_dmapper, \
+comphelper \
+cppu \
+oox \
+sal \
+test \
+unotest \
+))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,writerfilter_dmapper))
+
+$(eval $(call gb_CppunitTest_use_ure,writerfilter_dmapper))
+$(eval $(call gb_CppunitTest_use_vcl,writerfilter_dmapper))
+
+$(eval $(call gb_CppunitTest_use_rdb,writerfilter_dmapper,services))
+
+$(eval $(call gb_CppunitTest_use_custom_headers,writerfilter_dmapper,\
+ officecfg/registry \
+))
+
+$(eval $(call gb_CppunitTest_use_configuration,writerfilter_dmapper))
+
+# we need to explicitly depend on library writerfilter because it is not
implied
+# by a link relation
+$(call gb_CppunitTest_get_target,writerfilter_dmapper) : $(call
gb_Library_get_target,writerfilter)
+
+# vim: set noet sw=4 ts=4:
diff --git a/writerfilter/Module_writerfilter.mk
b/writerfilter/Module_writerfilter.mk
index 2fcb9e691078..b1d2157c4f64 100644
--- a/writerfilter/Module_writerfilter.mk
+++ b/writerfilter/Module_writerfilter.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_Module_add_targets,writerfilter,\
$(eval $(call gb_Module_add_slowcheck_targets,writerfilter,\
CppunitTest_writerfilter_rtftok \
CppunitTest_writerfilter_misc \
+CppunitTest_writerfilter_dmapper \
))
# vim: set noet sw=4 ts=4:
diff --git a/writerfilter/qa/cppunittests/dmapper/DomainMapperTableHandler.cxx
b/writerfilter/qa/cppunittests/dmapper/DomainMapperTableHandler.cxx
new file mode 100644
index ..c3b52060646b
--- /dev/null
+++ b/writerfilter/qa/cppunittests/dmapper/DomainMapperTableHandler.cxx
@@ -0,0 +1,76 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+
+#include
+
+using namespace ::com::sun::star;
+
+namespace
+{
+/// Tests for writerfilter/source/dmapper/DomainMapperTableHandler.cxx.
+class Test : public test::BootstrapFixture, public unotest::MacrosTest
+{
+private:
+uno::Reference mxComponentContext;
+uno::Reference mxComponent;
+
+public:
+void setUp() override;
+void tearDown() override;
+uno::Reference& getComponent() { return mxComponent; }
+
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/generic/dtrans/X11_selection.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 16e6c3908aec61e0907639557c0329c1aed905f1
Author: Julien Nabet
AuthorDate: Sun Dec 22 13:24:20 2019 +0100
Commit: Julien Nabet
CommitDate: Sun Dec 22 20:00:26 2019 +0100
cppcheck: SelectionManager::m_EndThreadPipe not initialized in ctr
Change-Id: If34bd7c414f662504f76d8f0f8549d729817fc7c
Reviewed-on: https://gerrit.libreoffice.org/85692
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx
b/vcl/unx/generic/dtrans/X11_selection.cxx
index 54340ba23606..c9513b060056 100644
--- a/vcl/unx/generic/dtrans/X11_selection.cxx
+++ b/vcl/unx/generic/dtrans/X11_selection.cxx
@@ -274,6 +274,8 @@ SelectionManager::SelectionManager() :
m_bShutDown( false )
{
memset(&m_aDropEnterEvent, 0, sizeof(m_aDropEnterEvent));
+m_EndThreadPipe[0] = 0;
+m_EndThreadPipe[1] = 0;
m_aDragRunning.reset();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/source compilerplugins/clang cui/source extensions/source include/svtools include/vcl svtools/source vcl/source
chart2/source/view/inc/VSeriesPlotter.hxx | 11
compilerplugins/clang/unusedmethods.results | 258 ++--
cui/source/inc/backgrnd.hxx | 79 --
extensions/source/propctrlr/inspectorhelpwindow.cxx | 18 -
extensions/source/propctrlr/inspectorhelpwindow.hxx |2
include/svtools/inettbc.hxx |4
include/svtools/valueset.hxx|9
include/vcl/treelistbox.hxx |1
svtools/source/control/inettbc.cxx | 33 --
svtools/source/control/valueset.cxx | 21 -
vcl/source/treelist/treelistbox.cxx |5
11 files changed, 129 insertions(+), 312 deletions(-)
New commits:
commit a62a139c4f33b4e981851dac961cfc41f23f896f
Author: Noel Grandin
AuthorDate: Sun Dec 22 19:19:01 2019 +0200
Commit: Noel Grandin
CommitDate: Sun Dec 22 19:28:07 2019 +0100
loplugin:unusedmethods
Change-Id: Iad97bdbcbec4cbbccf3df9b9d682e744b0c1982e
Reviewed-on: https://gerrit.libreoffice.org/85709
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/chart2/source/view/inc/VSeriesPlotter.hxx
b/chart2/source/view/inc/VSeriesPlotter.hxx
index cd7466e250ce..0d24901e33d1 100644
--- a/chart2/source/view/inc/VSeriesPlotter.hxx
+++ b/chart2/source/view/inc/VSeriesPlotter.hxx
@@ -58,17 +58,6 @@ public:
{
m_aNumberFormatMap[tFullAxisIndex(nDimIndex,nAxisIndex)] = nFormatKey;
}
-bool hasFormat( sal_Int32 nDimIndex, sal_Int32 nAxisIndex ) const
-{
-return (m_aNumberFormatMap.find(tFullAxisIndex(nDimIndex,nAxisIndex))
!=m_aNumberFormatMap.end());
-}
-sal_Int32 getFormat( sal_Int32 nDimIndex, sal_Int32 nAxisIndex ) const
-{
-tNumberFormatMap::const_iterator aIt =
m_aNumberFormatMap.find(tFullAxisIndex(nDimIndex,nAxisIndex));
-if( aIt !=m_aNumberFormatMap.end() )
-return aIt->second;
-return 0;
-}
private:
typedef std::pair< sal_Int32, sal_Int32 > tFullAxisIndex;
diff --git a/compilerplugins/clang/unusedmethods.results
b/compilerplugins/clang/unusedmethods.results
index 6f1bbdc9307e..17b6cda32b75 100644
--- a/compilerplugins/clang/unusedmethods.results
+++ b/compilerplugins/clang/unusedmethods.results
@@ -30,17 +30,21 @@ canvas/source/vcl/impltools.hxx:103
vclcanvas::tools::LocalGuard::LocalGuard()
chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx:77
void
chart::ThreeD_SceneIllumination_TabPage::LinkStubfillControlsFromModel(void
*,void *)
+chart2/source/view/inc/VSeriesPlotter.hxx:61
+_Bool chart::AxesNumberFormats::hasFormat(int,int) const
+chart2/source/view/inc/VSeriesPlotter.hxx:65
+int chart::AxesNumberFormats::getFormat(int,int) const
connectivity/source/drivers/evoab2/NResultSetMetaData.hxx:51
class com::sun::star::uno::Reference
connectivity::evoab::OEvoabResultSetMetaData::operator Reference()
connectivity/source/drivers/firebird/Driver.hxx:65
const class com::sun::star::uno::Reference &
connectivity::firebird::FirebirdDriver::getContext() const
-connectivity/source/drivers/firebird/Util.hxx:70
+connectivity/source/drivers/firebird/Util.hxx:68
connectivity::firebird::ColumnTypeInfo::ColumnTypeInfo(short,const class
rtl::OUString &)
-connectivity/source/drivers/firebird/Util.hxx:75
+connectivity/source/drivers/firebird/Util.hxx:73
short connectivity::firebird::ColumnTypeInfo::getType() const
-connectivity/source/drivers/firebird/Util.hxx:76
+connectivity/source/drivers/firebird/Util.hxx:74
short connectivity::firebird::ColumnTypeInfo::getSubType() const
-connectivity/source/drivers/firebird/Util.hxx:78
+connectivity/source/drivers/firebird/Util.hxx:76
const class rtl::OUString &
connectivity::firebird::ColumnTypeInfo::getCharacterSet() const
connectivity/source/drivers/mork/mork_helper.cxx:37
int main(int,char **)
@@ -48,9 +52,9 @@
connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx:96
type-parameter-?-?
connectivity::mysqlc::OPreparedResultSet::safelyRetrieveValue(const int)
connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx:97
type-parameter-?-?
connectivity::mysqlc::OPreparedResultSet::retrieveValue(const int)
-connectivity/source/inc/dbase/dindexnode.hxx:70
+connectivity/source/inc/dbase/dindexnode.hxx:67
_Bool connectivity::dbase::ONDXKey::operator<(const class
connectivity::dbase::ONDXKey &) const
-connectivity/source/inc/java/sql/Connection.hxx:63
+connectivity/source/inc/java/sql/Connection.hxx:61
class rtl::OUString
connectivity::java_sql_Connection::transFormPreparedStatement(const class
rtl::OUString &)
connectivity/source/inc/OColumn.hxx:103
_Bool connectivity::OColumn::isReadOnly() const
@@ -70,8 +74,66 @@ connectivity/source/inc/OTypeInfo.hxx:46
_Bool connectivity::OTypeInfo::operator==(const struct
connectivity::OTypeInfo &) const
connectivity/source/inc/OType
[Libreoffice-commits] core.git: 2 commits - chart2/source compilerplugins/clang cui/source extensions/source include/svtools include/vcl scaddins/source scripting/source sdext/source svtools/source vc
chart2/source/view/inc/VSeriesPlotter.hxx |2
chart2/source/view/main/ChartView.cxx |1
compilerplugins/clang/unusedfields.only-used-in-constructor.results | 208
--
compilerplugins/clang/unusedfields.readonly.results | 102 ++--
compilerplugins/clang/unusedfields.untouched.results| 184
compilerplugins/clang/unusedfields.writeonly.results| 144
+++---
cui/source/inc/backgrnd.hxx | 32 -
extensions/source/propctrlr/browserpage.hxx |4
extensions/source/propctrlr/propertyeditor.cxx |1
include/svtools/inettbc.hxx |4
include/vcl/field.hxx |6
include/vcl/headbar.hxx |1
scaddins/source/analysis/analysis.cxx |6
scaddins/source/analysis/analysishelper.cxx | 10
scaddins/source/analysis/analysishelper.hxx |8
scaddins/source/datefunc/datefunc.cxx |6
scaddins/source/datefunc/datefunc.hxx |2
scaddins/source/pricing/pricing.cxx |6
scaddins/source/pricing/pricing.hxx |2
scripting/source/basprov/basprov.cxx|2
scripting/source/dlgprov/dlgprov.cxx|2
scripting/source/protocolhandler/scripthandler.cxx |2
scripting/source/provider/MasterScriptProvider.cxx |2
scripting/source/stringresource/stringresource.cxx |4
scripting/source/stringresource/stringresource.hxx |2
sdext/source/pdfimport/odf/odfemitter.cxx |2
sdext/source/pdfimport/pdfparse/pdfentries.cxx | 46 +-
sdext/source/pdfimport/pdfparse/pdfparse.cxx|2
sdext/source/pdfimport/services.cxx |8
sdext/source/pdfimport/test/outputwrap.hxx |2
sdext/source/pdfimport/tree/imagecontainer.cxx |2
sdext/source/pdfimport/wrapper/wrapper.cxx | 12
sdext/source/presenter/PresenterComponent.cxx |2
sdext/source/presenter/PresenterHelpView.cxx|6
svtools/source/control/inettbc.cxx |9
vcl/source/control/field.cxx| 46 --
vcl/source/treelist/headbar.cxx |2
writerfilter/source/dmapper/DomainMapper.cxx|5
writerfilter/source/dmapper/DomainMapper.hxx|1
writerfilter/source/dmapper/DomainMapper_Impl.cxx |3
writerfilter/source/dmapper/DomainMapper_Impl.hxx |4
writerfilter/source/dmapper/StyleSheetTable.cxx |5
42 files changed, 373 insertions(+), 527 deletions(-)
New commits:
commit 38d9e38981a8ade60bb627b00197ecd28fb9158e
Author: Noel Grandin
AuthorDate: Sun Dec 22 19:03:02 2019 +0200
Commit: Noel Grandin
CommitDate: Sun Dec 22 19:27:55 2019 +0100
loplugin:unusedfields
Change-Id: Ib2314f23efe953398ed0a5e88305842c812e18bb
Reviewed-on: https://gerrit.libreoffice.org/85708
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/chart2/source/view/inc/VSeriesPlotter.hxx
b/chart2/source/view/inc/VSeriesPlotter.hxx
index 7b799eb9c4bf..cd7466e250ce 100644
--- a/chart2/source/view/inc/VSeriesPlotter.hxx
+++ b/chart2/source/view/inc/VSeriesPlotter.hxx
@@ -241,7 +241,6 @@ public:
// Methods for number formats and color schemes
void setNumberFormatsSupplier( const css::uno::Reference<
css::util::XNumberFormatsSupplier > & xNumFmtSupplier );
-void setAxesNumberFormats( const AxesNumberFormats& rAxesNumberFormats ) {
m_aAxesNumberFormats = rAxesNumberFormats; };
void setColorScheme( const css::uno::Reference< css::chart2::XColorScheme
>& xColorScheme );
@@ -427,7 +426,6 @@ protected:
Date m_aNullDate;
std::unique_ptr< NumberFormatterWrapper > m_apNumberFormatterWrapper;
-AxesNumberFormats m_aAxesNumberFormats;//direct
numberformats on axes, if empty ask the data series instead
css::uno::Reference< css::chart2::XColorScheme >m_xColorScheme;
diff --git a/chart2/source/view/main/ChartView.cxx
b/chart2/source/view/main/ChartView.cxx
index 7e8f470d458b..187b4abda18a 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -765,7 +765,6 @@ void SeriesPlotterCo
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk3/gtk3gtkinst.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 935763841f8f4423a5afca5da15c874bee02e0d5
Author: Caolán McNamara
AuthorDate: Sun Dec 22 14:10:15 2019 +
Commit: Caolán McNamara
CommitDate: Sun Dec 22 18:40:50 2019 +0100
ensure toolbar image widget is visible
Change-Id: If9144ab5f3c32570fda1da38e3c5fd076293205f
Reviewed-on: https://gerrit.libreoffice.org/85695
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index d8d3e09c6640..152893cad43f 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -7189,10 +7189,12 @@ public:
GtkToolItem* pItem = gtk_toolbar_get_nth_item(m_pToolbar, nIndex);
GtkWidget* pImage = nullptr;
+
if (GdkPixbuf* pixbuf = getPixbuf(rIcon))
{
pImage = gtk_image_new_from_pixbuf(pixbuf);
g_object_unref(pixbuf);
+gtk_widget_show(pImage);
}
gtk_tool_button_set_icon_widget(GTK_TOOL_BUTTON(pItem), pImage);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Build failure with fatal error: officecfg/Setup.hxx: No such file or directory
Hello, I'm giving a try at tdf#46037 "Clean up uses of comphelper/configurationhelper.hxx" I've already submitted 2 patches but I got a pb with a file. Just adding #include in framework/source/jobs/helponstartup.cxx I got this build failure: /home/julien/lo/libreoffice/framework/source/jobs/helponstartup.cxx:24:10: fatal error: officecfg/Setup.hxx: No such file or directory 24 | #include | ^ compilation terminated. make[1]: *** [/home/julien/lo/libreoffice/solenv/gbuild/LinkTarget.mk:296: /home/julien/lo/libreoffice/workdir/CxxObject/framework/source/jobs/helponstartup.o] Error 1 I also changed framework/Library_fwm.mk to copycat framework/Library_fwk.mk (except gb_Library_add_exception_objects part of course) I did a make framework.clean && make framework.build => same results. Any idea? Julien -- Sent from: http://document-foundation-mail-archive.969070.n3.nabble.com/Dev-f1639786.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - include/sfx2 sfx2/source shell/source slideshow/source sot/source starmath/inc starmath/source starmath/visual-editor-todo stoc/source stoc/test store/sourc
include/sfx2/frmhtmlw.hxx |8
include/sfx2/viewfac.hxx|2 +-
sfx2/source/appl/impldde.cxx|2 +-
sfx2/source/bastyp/frmhtml.cxx |6 +++---
sfx2/source/bastyp/frmhtmlw.cxx | 12 ++--
sfx2/source/control/unoctitm.cxx|2 +-
sfx2/source/doc/SfxDocumentMetaData.cxx |6 +++---
sfx2/source/view/viewfac.cxx|2 +-
shell/source/backends/localebe/localebecdef.cxx |2 +-
shell/source/backends/macbe/macbecdef.cxx |2 +-
shell/source/backends/wininetbe/wininetbecdef.cxx |2 +-
shell/source/cmdmail/cmdmailentry.cxx |2 +-
shell/source/sessioninstall/services.cxx|4 ++--
shell/source/unix/exec/shellexec.cxx|2 +-
shell/source/unix/exec/shellexecentry.cxx |2 +-
shell/source/win32/SysShentry.cxx |2 +-
shell/source/win32/simplemail/smplmailentry.cxx |2 +-
slideshow/source/engine/opengl/TransitionerImpl.cxx |2 +-
slideshow/source/engine/slideshowimpl.cxx |2 +-
slideshow/source/engine/smilfunctionparser.cxx |2 +-
sot/source/sdstor/stgole.cxx|2 +-
sot/source/sdstor/storinfo.cxx |2 +-
starmath/inc/token.hxx |4 ++--
starmath/source/mathmlexport.cxx|8
starmath/source/mathmlexport.hxx|6 +++---
starmath/source/mathmlimport.cxx|8
starmath/source/mathmlimport.hxx|8
starmath/source/mathtype.cxx|2 +-
starmath/source/parse.cxx |4 ++--
starmath/source/register.cxx|2 +-
starmath/visual-editor-todo |2 +-
stoc/source/invocation/invocation.cxx |2 +-
stoc/source/invocation_adapterfactory/iafactory.cxx |2 +-
stoc/source/javaloader/javaloader.cxx |2 +-
stoc/source/javavm/javavm.cxx |2 +-
stoc/source/namingservice/namingservice.cxx |2 +-
stoc/source/proxy_factory/proxyfac.cxx |2 +-
stoc/test/testsmgr_cpnt.cxx |2 +-
store/source/stordata.hxx |6 +++---
store/source/stordir.cxx|4 ++--
40 files changed, 69 insertions(+), 69 deletions(-)
New commits:
commit 8b550895b3007eecfbcf02573d8eb5ed57a45c62
Author: Noel Grandin
AuthorDate: Sun Dec 22 17:01:45 2019 +0200
Commit: Noel Grandin
CommitDate: Sun Dec 22 18:04:41 2019 +0100
sal_Char->char in sot..store
Change-Id: Ia133c1a7549d81f2e88e34ab7e6c9ea578c745ae
Reviewed-on: https://gerrit.libreoffice.org/85702
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sot/source/sdstor/stgole.cxx b/sot/source/sdstor/stgole.cxx
index 62c586a20773..3ae8fe4209ec 100644
--- a/sot/source/sdstor/stgole.cxx
+++ b/sot/source/sdstor/stgole.cxx
@@ -114,7 +114,7 @@ bool StgCompObjStream::Load()
// higher bits are ignored
sal_uLong nStrLen = ::std::min( nLen1, sal_Int32(0xFFFE) );
-std::unique_ptr p(new sal_Char[ nStrLen+1 ]);
+std::unique_ptr p(new char[ nStrLen+1 ]);
p[nStrLen] = 0;
if (ReadBytes( p.get(), nStrLen ) == nStrLen)
{
diff --git a/sot/source/sdstor/storinfo.cxx b/sot/source/sdstor/storinfo.cxx
index adbcba212828..d8480e86a459 100644
--- a/sot/source/sdstor/storinfo.cxx
+++ b/sot/source/sdstor/storinfo.cxx
@@ -36,7 +36,7 @@ SotClipboardFormatId ReadClipboardFormat( SvStream & rStm )
if( nLen > 0 )
{
// get a string name
-std::unique_ptr p(new( ::std::nothrow ) sal_Char[ nLen ]);
+std::unique_ptr p(new( ::std::nothrow ) char[ nLen ]);
if (p && rStm.ReadBytes(p.get(), nLen) ==
static_cast(nLen))
{
nFormat = SotExchange::RegisterFormatName(OUString(p.get(),
nLen-1, RTL_TEXTENCODING_ASCII_US));
diff --git a/starmath/inc/token.hxx b/starmath/inc/token.hxx
index 8abe85e61858..786b4ff31d75 100644
--- a/starmath/inc/token.hxx
+++ b/starmath/inc/token.hxx
@@ -121,14 +121,14 @@ struct SmToken
SmToken();
SmToken(SmTokenType eTokenType,
sal_Unicode cMath,
-const sal_Char* pText,
+const char* pText,
TG nTokenGroup = TG::NONE,
sal_uInt16 nTokenLevel = 0);
};
struct SmTokenTableEntry
{
-const sal_Char* pIdent;
+const char* pIdent;
SmTokenType const eType;
sal_Unicode const cMathChar;
TG const nGroup;
diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx
index bfeab01c6284..6a8120c605a1 100644
[Libreoffice-commits] core.git: 2 commits - compilerplugins/clang xmloff/inc xmlsecurity/inc
compilerplugins/clang/finalclasses.py|3
xmloff/inc/AttributeContainerHandler.hxx |2
xmloff/inc/DomBuilderContext.hxx |2
xmloff/inc/MetaExportComponent.hxx |4
xmloff/inc/PageMasterImportContext.hxx |4
xmloff/inc/SchXMLAutoStylePoolP.hxx |2
xmloff/inc/SchXMLImport.hxx |3
xmloff/inc/StyleMap.hxx |2
xmloff/inc/XMLBackgroundImageContext.hxx |2
xmloff/inc/XMLBasicExportFilter.hxx |2
xmloff/inc/XMLBitmapLogicalSizePropertyHandler.hxx |2
xmloff/inc/XMLBitmapRepeatOffsetPropertyHandler.hxx |2
xmloff/inc/XMLChartPropertySetMapper.hxx | 10 -
xmloff/inc/XMLChartStyleContext.hxx |3
xmloff/inc/XMLClipPropertyHandler.hxx|2
xmloff/inc/XMLEmbeddedObjectImportContext.hxx|2
xmloff/inc/XMLFillBitmapSizePropertyHandler.hxx |2
xmloff/inc/XMLFootnoteConfigurationImportContext.hxx |2
xmloff/inc/XMLImageMapContext.hxx|2
xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx |2
xmloff/inc/XMLIsPercentagePropertyHandler.hxx|2
xmloff/inc/XMLLineNumberingImportContext.hxx |4
xmloff/inc/XMLNumberStylesImport.hxx |2
xmloff/inc/XMLPercentOrMeasurePropertyHandler.hxx|2
xmloff/inc/XMLRectangleMembersHandler.hxx|2
xmloff/inc/XMLReplacementImageContext.hxx|2
xmloff/inc/XMLScriptContextFactory.hxx |2
xmloff/inc/XMLScriptExportHandler.hxx|2
xmloff/inc/XMLStarBasicContextFactory.hxx|2
xmloff/inc/XMLStarBasicExportHandler.hxx |2
xmloff/inc/XMLStringBufferImportContext.hxx |2
xmloff/inc/XMLTextColumnsContext.hxx |2
xmloff/inc/XMLTextColumnsPropertyHandler.hxx |2
xmloff/inc/XMLTextHeaderFooterContext.hxx|2
xmloff/inc/animationimport.hxx |2
xmloff/inc/animimp.hxx |2
xmloff/inc/propimp0.hxx |8 -
xmloff/inc/txtfldi.hxx | 116 +++
xmloff/inc/txtvfldi.hxx | 40 ++---
xmloff/inc/xmltabi.hxx |2
xmloff/inc/xmlversion.hxx| 12 -
xmlsecurity/inc/framework/saxeventkeeperimpl.hxx |2
xmlsecurity/inc/framework/signaturecreatorimpl.hxx |2
xmlsecurity/inc/framework/signatureverifierimpl.hxx |2
xmlsecurity/inc/framework/xmlsignaturetemplateimpl.hxx |2
xmlsecurity/inc/gpg/SEInitializer.hxx|2
xmlsecurity/inc/gpg/xmlsignature_gpgimpl.hxx |2
xmlsecurity/inc/macrosecurity.hxx|2
xmlsecurity/inc/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx |2
xmlsecurity/inc/xmlsignaturehelper2.hxx |2
xmlsecurity/inc/xsecctl.hxx |2
51 files changed, 140 insertions(+), 147 deletions(-)
New commits:
commit e7f16852b96d0ccaaa8a5e2cdc55a0d77679d97c
Author: Noel Grandin
AuthorDate: Sun Dec 22 17:22:49 2019 +0200
Commit: Noel Grandin
CommitDate: Sun Dec 22 18:04:13 2019 +0100
loplugin:finalclasses in xmloff
Change-Id: I389824999e8e24c27e5d6f36180ae0fd8032c482
Reviewed-on: https://gerrit.libreoffice.org/85699
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/xmloff/inc/AttributeContainerHandler.hxx
b/xmloff/inc/AttributeContainerHandler.hxx
index 4cdeccaaf1eb..1d6a26ae199e 100644
--- a/xmloff/inc/AttributeContainerHandler.hxx
+++ b/xmloff/inc/AttributeContainerHandler.hxx
@@ -25,7 +25,7 @@
/**
PropertyHandler for the XML-data-type:
*/
-class XMLAttributeContainerHandler : public XMLPropertyHandler
+class XMLAttributeContainerHandler final : public XMLPropertyHandler
{
public:
virtual ~XMLAttributeContainerHandler() override;
diff --git a/xmloff/inc/DomBuilderContext.hxx b/xmloff/inc/DomBuilderContext.hxx
index 0df0f6de135d..cf73d6e7d608 100644
--- a/xmloff/inc/DomBuilderContext.hxx
+++ b/xmloff/inc/DomBuilderContext.hxx
@@ -41,7 +41,7 @@ class SvXMLImportContext;
/**
* DomBuilderContext creates a DOM tree suitable for in-memory processing of
* XML data from a sequence of SAX events */
-class DomBuilderContext : public SvXMLImportContext
+class DomBuilderContext final : public SvXMLImportContext
{
css::uno::Reference mxNode;
diff --git a/xmloff/inc/MetaExportComponent.hxx
b/xmloff/inc/MetaExportComponent.hxx
index 34278d87631a..e9ac444666cc 10
[Libreoffice-commits] core.git: sc/source
sc/source/ui/view/spelldialog.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit 778327126025a14243e2bdf6d2e6adc29943cd64
Author: Ashod Nakashian
AuthorDate: Sat Jul 27 20:35:14 2019 -0400
Commit: Ashod Nakashian
CommitDate: Sun Dec 22 16:24:05 2019 +0100
sc: spelldialog: lock before resetting the editview
Painting also resets the view and that can happen
asynchronously. When the spelldialog gets focus
it resets the editview if it detects it has changed,
which happens when, for example, another view is created.
(cherry picked from commit d91d940ad0319e0cc6e0080a903ac0a7e9f6ba88)
Reviewed-on: https://gerrit.libreoffice.org/85003
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Michael Meeks
(cherry picked from commit 550c0a666e119c911b311c96f9185c11d8465dcb)
Change-Id: Ib23e332e4ba069e05787d1cc03ae23fe657b12c8
Reviewed-on: https://gerrit.libreoffice.org/85679
Tested-by: Jenkins
Reviewed-by: Ashod Nakashian
diff --git a/sc/source/ui/view/spelldialog.cxx
b/sc/source/ui/view/spelldialog.cxx
index 21a459259f66..d9780959a5c3 100644
--- a/sc/source/ui/view/spelldialog.cxx
+++ b/sc/source/ui/view/spelldialog.cxx
@@ -34,6 +34,7 @@
#include
#include
#include
+#include
SFX_IMPL_CHILDWINDOW_WITHID( ScSpellDialogChildWindow, SID_SPELL_DIALOG )
@@ -96,6 +97,8 @@ void ScSpellDialogChildWindow::ApplyChangedSentence( const
svx::SpellPortions& r
void ScSpellDialogChildWindow::GetFocus()
{
+SolarMutexGuard aGuard;
+
if( IsSelectionChanged() )
{
Reset();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - editeng/source svx/source
editeng/source/editeng/impedit.cxx |6 +-
svx/source/dialog/hdft.cxx | 79 +++--
2 files changed, 46 insertions(+), 39 deletions(-)
New commits:
commit 2f8b3ef21cb66470c2774a5dc0cccbaf7d22681c
Author: Ashod Nakashian
AuthorDate: Wed Jul 24 13:16:35 2019 -0400
Commit: Ashod Nakashian
CommitDate: Sun Dec 22 16:23:44 2019 +0100
editeng: detect invalid paragraphs when drawing
This prevents live-lock (endless loop) in case
the paragraphs are invalid.
Change-Id: I77cc7818dabc8e518bd7ca3f5161d46ba3fe50b4
(cherry picked from commit deab77cb71c01171d0f8284339627ed33798c3a1)
Reviewed-on: https://gerrit.libreoffice.org/85002
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Michael Meeks
(cherry picked from commit 3592d49eff0d063b26250ce32eea138af3108b79)
Reviewed-on: https://gerrit.libreoffice.org/85678
Tested-by: Jenkins
Reviewed-by: Ashod Nakashian
diff --git a/editeng/source/editeng/impedit.cxx
b/editeng/source/editeng/impedit.cxx
index 2c398703bc74..6107f950608a 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -272,8 +272,10 @@ void ImpEditView::DrawSelectionXOR( EditSelection aTmpSel,
vcl::Region* pRegion,
ContentNode* pStartNode = aTmpSel.Min().GetNode();
ContentNode* pEndNode = aTmpSel.Max().GetNode();
-sal_Int32 nStartPara = pEditEngine->GetEditDoc().GetPos( pStartNode );
-sal_Int32 nEndPara = pEditEngine->GetEditDoc().GetPos( pEndNode );
+const sal_Int32 nStartPara = pEditEngine->GetEditDoc().GetPos(pStartNode);
+const sal_Int32 nEndPara = pEditEngine->GetEditDoc().GetPos(pEndNode);
+if (nStartPara == EE_PARA_NOT_FOUND || nEndPara == EE_PARA_NOT_FOUND)
+return;
for ( sal_Int32 nPara = nStartPara; nPara <= nEndPara; nPara++ )
{
ParaPortion* pTmpPortion =
pEditEngine->GetParaPortions().SafeGetObject( nPara );
commit 11efaea7639016ab39d53e191381444791f9
Author: Ashod Nakashian
AuthorDate: Sun May 26 14:59:53 2019 -0400
Commit: Ashod Nakashian
CommitDate: Sun Dec 22 16:23:17 2019 +0100
svx: LOK: convert background child-dialogs to async
(cherry picked from commit 625a8c33bd95b4068838caef19af28c5404c59ce)
Reviewed-on: https://gerrit.libreoffice.org/83633
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Ashod Nakashian
(cherry picked from commit 46a1c0a733f1e664823dcb483796dbcc8a743f4a)
Change-Id: I682ab039ce3732aa973e0fe371c191f1ca1b9ef7
Reviewed-on: https://gerrit.libreoffice.org/85677
Tested-by: Jenkins
Reviewed-by: Ashod Nakashian
diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index c936e91ee740..b92dc46e8deb 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -624,54 +624,59 @@ IMPL_LINK_NOARG(SvxHFPage, BackgroundHdl, weld::Button&,
void)
*pBBSet,
mbEnableDrawingLayerFillStyles));
-if(RET_OK == pDlg->Execute() && pDlg->GetOutputItemSet())
-{
-SfxItemIter aIter(*pDlg->GetOutputItemSet());
-
-for (const SfxPoolItem* pItem = aIter.GetCurItem(); pItem; pItem =
aIter.NextItem())
+pDlg->StartExecuteAsync([&](sal_Int32 nResult) {
+if (nResult == RET_OK && pDlg->GetOutputItemSet())
{
-if(!IsInvalidItem(pItem))
-{
-pBBSet->Put(*pItem);
-}
-}
+SfxItemIter aIter(*pDlg->GetOutputItemSet());
-{
-drawinglayer::attribute::SdrAllFillAttributesHelperPtr
aFillAttributes;
-
-if(mbEnableDrawingLayerFillStyles)
+for (const SfxPoolItem* pItem = aIter.GetCurItem(); pItem; pItem =
aIter.NextItem())
{
-// create FillAttributes directly from DrawingLayer FillStyle
entries
-aFillAttributes.reset(new
drawinglayer::attribute::SdrAllFillAttributesHelper(*pBBSet));
+if(!IsInvalidItem(pItem))
+{
+pBBSet->Put(*pItem);
+}
}
-else
+
{
-const sal_uInt16 nWhich = GetWhich(SID_ATTR_BRUSH);
+drawinglayer::attribute::SdrAllFillAttributesHelperPtr
aFillAttributes;
-if(pBBSet->GetItemState(nWhich) == SfxItemState::SET)
+if (mbEnableDrawingLayerFillStyles)
{
-// create FillAttributes from SvxBrushItem
-const SvxBrushItem& rItem = static_cast< const
SvxBrushItem& >(pBBSet->Get(nWhich));
-SfxItemSet aTempSet(*pBBSet->GetPool(),
svl::Items{});
-
-setSvxBrushItemAsFillAttributesToTargetSet(rItem,
aTempSet);
-aFillAttributes.reset(new
drawinglayer::attribute::SdrAllFillAttributesHelper(aTempSet));
+// create FillAttributes directly from DrawingLayer
FillStyle entries
+
[Libreoffice-commits] core.git: sd/source
sd/source/ui/view/Outliner.cxx | 40 ++--
1 file changed, 22 insertions(+), 18 deletions(-)
New commits:
commit d33378691500f02c8004645dadd403c2a72e4fee
Author: Ashod Nakashian
AuthorDate: Sat May 25 12:15:00 2019 -0400
Commit: Ashod Nakashian
CommitDate: Sun Dec 22 16:22:57 2019 +0100
sd: LOK: don't access null dispatcher
With SpellDialog invoked from multiple views
the dispatcher can indeed be null in some cases.
(cherry picked from commit b18c12f4dbe91379cef795d559c2d84341e32a75)
Reviewed-on: https://gerrit.libreoffice.org/83631
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Ashod Nakashian
(cherry picked from commit 188ff24ee209d4f5f8ec6a6ae82241e56f0be6d5)
Change-Id: Ic2950e70383a77d63438341fac174d369748b36a
Reviewed-on: https://gerrit.libreoffice.org/85676
Tested-by: Jenkins
Reviewed-by: Ashod Nakashian
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index d3bd66724c7b..e67d823e9a11 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -1402,29 +1402,33 @@ void SdOutliner::EnterEditMode (bool bGrabFocus)
// Make FuText the current function.
SfxUInt16Item aItem (SID_TEXTEDIT, 1);
std::shared_ptr pViewShell (mpWeakViewShell.lock());
-pViewShell->GetDispatcher()->ExecuteList(SID_TEXTEDIT,
-SfxCallMode::SYNCHRON | SfxCallMode::RECORD, { &aItem });
-
-if (mpView->IsTextEdit())
+if (pViewShell && pViewShell->GetDispatcher())
{
-// end text edition before starting it again
-mpView->SdrEndTextEdit();
-}
+pViewShell->GetDispatcher()->ExecuteList(
+SID_TEXTEDIT, SfxCallMode::SYNCHRON | SfxCallMode::RECORD,
{&aItem});
-// To be consistent with the usual behaviour in the Office the text
-// object that is put into edit mode would have also to be selected.
-// Starting the text edit mode is not enough so we do it here by
-// hand.
-mpView->UnmarkAllObj (pPV);
-mpView->MarkObj (mpSearchSpellTextObj, pPV);
+if (mpView->IsTextEdit())
+{
+// end text edition before starting it again
+mpView->SdrEndTextEdit();
+}
-mpSearchSpellTextObj->setActiveText( mnText );
+// To be consistent with the usual behaviour in the Office the text
+// object that is put into edit mode would have also to be selected.
+// Starting the text edit mode is not enough so we do it here by
+// hand.
+mpView->UnmarkAllObj(pPV);
+mpView->MarkObj(mpSearchSpellTextObj, pPV);
-// Turn on the edit mode for the text object.
-mpView->SdrBeginTextEdit(mpSearchSpellTextObj, pPV, mpWindow, true, this,
pOutlinerView, true, true, bGrabFocus);
+mpSearchSpellTextObj->setActiveText(mnText);
-SetUpdateMode(true);
-mbFoundObject = true;
+// Turn on the edit mode for the text object.
+mpView->SdrBeginTextEdit(mpSearchSpellTextObj, pPV, mpWindow, true,
this,
+pOutlinerView, true, true, bGrabFocus);
+
+SetUpdateMode(true);
+mbFoundObject = true;
+}
}
ESelection SdOutliner::GetSearchStartPosition() const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/uno/unotxdoc.cxx |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 0a2dae2b4d23425e5c2b499d4981bb501a99ca77 Author: Ashod Nakashian AuthorDate: Sun Nov 10 16:45:10 2019 -0500 Commit: Ashod Nakashian CommitDate: Sun Dec 22 16:22:15 2019 +0100 sw: SwView can be null when setting clipboard Change-Id: I8a0e59f6ceec4bf89e5eed0813157297efb56af1 Reviewed-on: https://gerrit.libreoffice.org/82405 Reviewed-by: Ashod Nakashian Tested-by: Ashod Nakashian Tested-by: Jenkins CollaboraOffice (cherry picked from commit cea0eb9cac478f247fb156563e0a99b07d5a34dc) Reviewed-on: https://gerrit.libreoffice.org/85675 Tested-by: Jenkins diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx index 91bc50b079a8..cc53e58ae758 100644 --- a/sw/source/uibase/uno/unotxdoc.cxx +++ b/sw/source/uibase/uno/unotxdoc.cxx @@ -3189,7 +3189,9 @@ void SwXTextDocument::setClipboard(const uno::ReferenceGetView()->GetEditWin().SetClipboard(xClipboard); +SwView* pView = pDocShell->GetView(); +if (pView) +pView->GetEditWin().SetClipboard(xClipboard); } bool SwXTextDocument::isMimeTypeSupported() ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/func/fupage.cxx |9 +++--
1 file changed, 3 insertions(+), 6 deletions(-)
New commits:
commit 8304c671b19365e61d88a9133631775846a172a5
Author: Aron Budea
AuthorDate: Sun Dec 22 08:10:25 2019 +0100
Commit: Ashod Nakashian
CommitDate: Sun Dec 22 16:18:07 2019 +0100
tdf#128449 Set graphic when setting background in Impress
Regression from 905e6bd3ae0ca5c5ac7083430d7aa126c6526fd7
Change-Id: If0510967a339b6b46da2b7f798f478a46bd10b48
Reviewed-on: https://gerrit.libreoffice.org/85688
Tested-by: Jenkins
Reviewed-by: Ashod Nakashian
diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx
index 7c2654e0bba0..95dc91b232f2 100644
--- a/sd/source/ui/func/fupage.cxx
+++ b/sd/source/ui/func/fupage.cxx
@@ -293,8 +293,6 @@ const SfxItemSet* FuPage::ExecuteDialog(weld::Window*
pParent, const SfxRequest&
}
else if (nId == SID_SELECT_BACKGROUND)
{
-OUString aFileName;
-OUString aFilterName;
Graphic aGraphic;
ErrCode nError = ERRCODE_GRFILTER_OPENERROR;
@@ -303,7 +301,8 @@ const SfxItemSet* FuPage::ExecuteDialog(weld::Window*
pParent, const SfxRequest&
if (pArgs && pArgs->GetItemState(SID_SELECT_BACKGROUND, true, &pItem)
== SfxItemState::SET)
{
-aFileName = static_cast(pItem)->GetValue();
+OUString aFileName(static_cast(pItem)->GetValue());
+OUString aFilterName;
if (pArgs->GetItemState(FN_PARAM_FILTER, true, &pItem) ==
SfxItemState::SET)
aFilterName = static_cast(pItem)->GetValue();
@@ -316,11 +315,9 @@ const SfxItemSet* FuPage::ExecuteDialog(weld::Window*
pParent, const SfxRequest&
SvxOpenGraphicDialog aDlg(SdResId(STR_SET_BACKGROUND_PICTURE),
pParent);
nError = aDlg.Execute();
-if (nError != ERRCODE_NONE)
+if (nError == ERRCODE_NONE)
{
nError = aDlg.GetGraphic(aGraphic);
-aFileName = aDlg.GetPath();
-aFilterName = aDlg.GetDetectedFilter();
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sc/inc sc/qa sc/source sd/qa sd/source
sc/inc/miscuno.hxx |4 - sc/qa/unit/opencl-test.cxx |4 - sc/source/core/data/dpobject.cxx |4 - sc/source/core/data/global.cxx |2 sc/source/core/data/sheetevents.cxx |2 sc/source/core/data/tabprotection.cxx|2 sc/source/core/inc/cellkeytranslator.hxx |6 - sc/source/core/tool/addincol.cxx |2 sc/source/core/tool/addinhelpid.cxx |4 - sc/source/core/tool/adiasync.cxx |2 sc/source/core/tool/autoform.cxx |2 sc/source/core/tool/callform.cxx | 12 +-- sc/source/core/tool/cellkeytranslator.cxx|8 +- sc/source/core/tool/compiler.cxx | 12 +-- sc/source/core/tool/editutil.cxx |4 - sc/source/core/tool/interpr1.cxx |2 sc/source/core/tool/interpr2.cxx |6 - sc/source/core/tool/interpr4.cxx |6 - sc/source/core/tool/interpr7.cxx |2 sc/source/core/tool/parclass.cxx |2 sc/source/core/tool/rangenam.cxx |2 sc/source/filter/dif/difexp.cxx | 12 +-- sc/source/filter/excel/tokstack.cxx |2 sc/source/filter/excel/xeescher.cxx |2 sc/source/filter/excel/xestring.cxx | 10 +- sc/source/filter/excel/xiescher.cxx |2 sc/source/filter/excel/xistream.cxx |2 sc/source/filter/excel/xlchart.cxx | 40 +- sc/source/filter/excel/xlescher.cxx |4 - sc/source/filter/excel/xlstyle.cxx | 20 ++--- sc/source/filter/excel/xltools.cxx |4 - sc/source/filter/ftools/fapihelper.cxx |2 sc/source/filter/ftools/ftools.cxx |2 sc/source/filter/html/htmlexp.cxx| 16 ++-- sc/source/filter/html/htmlpars.cxx |4 - sc/source/filter/inc/drawingfragment.hxx |2 sc/source/filter/inc/eeparser.hxx|6 - sc/source/filter/inc/fapihelper.hxx |2 sc/source/filter/inc/htmlexp.hxx |6 - sc/source/filter/inc/lotform.hxx |2 sc/source/filter/inc/lotimpop.hxx|4 - sc/source/filter/inc/numberformatsbuffer.hxx |2 sc/source/filter/inc/qproform.hxx|4 - sc/source/filter/inc/tool.h |2 sc/source/filter/inc/xestring.hxx|6 - sc/source/filter/inc/xlchart.hxx |2 sc/source/filter/inc/xlformula.hxx |2 sc/source/filter/lotus/filter.cxx|2 sc/source/filter/lotus/lotform.cxx | 12 +-- sc/source/filter/lotus/lotimpop.cxx |4 - sc/source/filter/lotus/op.cxx| 18 ++-- sc/source/filter/lotus/optab.cxx |2 sc/source/filter/lotus/tool.cxx |4 - sc/source/filter/oox/defnamesbuffer.cxx |2 sc/source/filter/oox/drawingfragment.cxx |2 sc/source/filter/oox/formulabase.cxx |8 +- sc/source/filter/oox/numberformatsbuffer.cxx |8 +- sc/source/filter/oox/pagesettings.cxx|4 - sc/source/filter/oox/stylesbuffer.cxx|2 sc/source/filter/orcus/orcusfiltersimpl.cxx |2 sc/source/filter/qpro/qproform.cxx |8 +- sc/source/filter/rtf/eeimpars.cxx|4 - sc/source/filter/rtf/rtfexp.cxx |4 - sc/source/filter/xcl97/xcl97rec.cxx |2 sc/source/filter/xml/XMLConverter.cxx|2 sc/source/filter/xml/xmlexprt.cxx|2 sc/source/ui/dbgui/asciiopt.cxx
[Libreoffice-commits] online.git: 2 commits - loleaflet/src
loleaflet/src/control/Control.Menubar.js | 38 +++---
loleaflet/src/map/handler/Map.StateChanges.js |4 +-
2 files changed, 37 insertions(+), 5 deletions(-)
New commits:
commit 05f8befe1c90a0dd3a2c730ee95ecd6e57a3313e
Author: Tamás Zolnai
AuthorDate: Sun Dec 22 13:54:40 2019 +0100
Commit: Tamás Zolnai
CommitDate: Sun Dec 22 15:33:53 2019 +0100
Header and Footer menu options only show All in Android
Add styles to the insertion mobile wizard.
Change-Id: I7086a04b58999b7fe29cdb61f7488e34c241801f
Reviewed-on: https://gerrit.libreoffice.org/85694
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tamás Zolnai
diff --git a/loleaflet/src/control/Control.Menubar.js
b/loleaflet/src/control/Control.Menubar.js
index e27e24efd..ede42fcfa 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -816,8 +816,25 @@ L.Control.Menubar = L.Control.extend({
var pageStyles = e.commandValues['HeaderFooter'];
for (var iterator in pageStyles) {
style = pageStyles[iterator];
-
$menuHeader.append(this._createUnoMenuItem(_(style), constHeader +
encodeURIComponent(style) + constArg, style));
-
$menuFooter.append(this._createUnoMenuItem(_(style), constFooter +
encodeURIComponent(style) + constArg, style));
+ if (!L.Browser.mobile) {
+
$menuHeader.append(this._createUnoMenuItem(_(style), constHeader +
encodeURIComponent(style) + constArg, style));
+
$menuFooter.append(this._createUnoMenuItem(_(style), constFooter +
encodeURIComponent(style) + constArg, style));
+ } else {
+ var docType = this._map.getDocType();
+ var target =
this.options['mobileInsertMenu'][docType];
+
+ var findFunction = function(item) {
+ return item.name === _(style);
+ };
+
+ var foundMenu =
this._findSubMenuByName(target, _UNO('.uno:InsertPageHeader', 'text'))
+ if (foundMenu &&
foundMenu.menu.find(findFunction) === undefined)
+ foundMenu.menu.push({name:
_(style), tag: style, uno: constHeader + encodeURIComponent(style) + constArg});
+
+ foundMenu =
this._findSubMenuByName(target, _UNO('.uno:InsertPageFooter', 'text'))
+ if (foundMenu &&
foundMenu.menu.find(findFunction) === undefined)
+ foundMenu.menu.push({name:
_(style), tag: style, uno: constFooter + encodeURIComponent(style) + constArg});
+ }
}
}
},
@@ -1492,7 +1509,22 @@ L.Control.Menubar = L.Control.extend({
}
}
return menuStructure;
- }
+ },
+
+ _findSubMenuByName: function(menuTarget, nameString) {
+ if (menuTarget.name === nameString)
+ return menuTarget;
+
+ if (menuTarget.menu)
+ {
+ for (var i = 0; i < menuTarget.menu.length; i++) {
+ var foundItem =
this._findSubMenuByName(menuTarget.menu[i], nameString);
+ if (foundItem)
+ return foundItem;
+ }
+ }
+ return null;
+ },
});
L.control.menubar = function (options) {
commit 544b5ffe41f9a2ceca81ef91e91417bc3f394bbc
Author: Tamás Zolnai
AuthorDate: Fri Dec 20 17:49:27 2019 +0100
Commit: Tamás Zolnai
CommitDate: Sun Dec 22 15:33:46 2019 +0100
Fix state of InsertPageHeader / InsertPageFooter
Change-Id: Iee359cdd8d4706d4cf8f7d5cc3363808c3fdb066
Reviewed-on: https://gerrit.libreoffice.org/85693
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tamás Zolnai
diff --git a/loleaflet/src/map/handler/Map.StateChanges.js
b/loleaflet/src/map/handler/Map.StateChanges.js
index 6afcd642c..a6b5d3f81 100644
--- a/loleaflet/src/map/handler/Map.StateChanges.js
+++ b/loleaflet/src/map/handler/Map.StateChanges.js
@@ -30,9 +30,9 @@ L.Map.StateChangeHandler = L.Handler.extend({
var slideMasterPageItem =
this._map['stateChangeHandler'].getItemValue('.uno:SlideMasterPage');
var state;
- if (typeof(e.state == 'object')) {
+ if (typeof(e.state) == 'object') {
state = e.state;
- } else if (typeof(e.state == 'stri
[Libreoffice-commits] cppunit.git: 2 commits - doc/cookbook.dox doc/Money.dox doc/other_documentation.dox examples/ClockerPlugIn examples/cppunittest examples/DumperPlugIn examples/examples.dsw exampl
INSTALL-WIN32.txt |9 doc/Money.dox |2 doc/cookbook.dox |2 doc/other_documentation.dox|2 examples/ClockerPlugIn/ClockerPlugIn.dsp | 229 examples/ClockerPlugIn/Makefile.am |2 examples/DumperPlugIn/DumperPlugIn.dsp | 108 - examples/DumperPlugIn/Makefile.am |2 examples/Makefile.am |2 examples/ReadMe.txt|4 examples/cppunittest/CppUnitTestMain.dsp | 546 - examples/cppunittest/CppUnitTestMain.dsw | 59 --- examples/cppunittest/CppUnitTestPlugIn.dsp | 396 - examples/cppunittest/Makefile.am |2 examples/examples.dsw | 194 -- examples/hierarchy/Makefile.am |2 examples/hierarchy/hierarchy.dsp | 119 -- examples/hierarchy/hierarchy.dsw | 44 -- examples/money/Makefile.am |2 examples/money/money.dsp | 136 --- examples/money/money.dsw | 29 - examples/simple/Makefile.am|2 examples/simple/simple.dsp | 104 - examples/simple/simple_plugin.dsp | 118 -- 24 files changed, 16 insertions(+), 2099 deletions(-) New commits: commit 57f0b5697252fa238027fdd3052774055b69060b Author: David Tardon AuthorDate: Sat Dec 21 11:40:25 2019 +0100 Commit: Markus Mohrhard CommitDate: Sun Dec 22 14:48:30 2019 +0100 drop project files for old versions of MSVC Change-Id: I36ceddb5a8a1f8e96b36a2e851338366cda1808d Reviewed-on: https://gerrit.libreoffice.org/85662 Reviewed-by: Markus Mohrhard Tested-by: Markus Mohrhard diff --git a/examples/ClockerPlugIn/ClockerPlugIn.dsp b/examples/ClockerPlugIn/ClockerPlugIn.dsp deleted file mode 100644 index 6d9245a..000 --- a/examples/ClockerPlugIn/ClockerPlugIn.dsp +++ /dev/null @@ -1,229 +0,0 @@ -# Microsoft Developer Studio Project File - Name="ClockerPlugIn" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=ClockerPlugIn - Win32 Debug NtTimer -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "ClockerPlugIn.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "ClockerPlugIn.mak" CFG="ClockerPlugIn - Win32 Debug NtTimer" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "ClockerPlugIn - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "ClockerPlugIn - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "ClockerPlugIn - Win32 Debug NtTimer" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "ClockerPlugIn - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CLOCKERPLUGIN_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GR /GX /Zd /O2 /I "..\..\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CPPUNIT_DLL" /FD /c -# SUBTRACT CPP /YX -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x40c /d "NDEBUG" -# ADD RSC /l 0x40c /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib cppunit_dll.lib /nologo /dll /machine:I386 /out:"../../lib/ClockerPlugIn.dll" /libpath:"../../lib/" - -!ELSEIF "$(CFG)" == "ClockerPlugIn - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP
Re: Guidelines for contribution
On Sat, 21 Dec 2019 at 21:52, Ilmari Lauhakangas < ilmari.lauhakan...@libreoffice.org> wrote: > krish agarwal kirjoitti 21.12.2019 klo 12.55: > > Dear Sir/Madam, > > I was going through the projects this organization was doing and it > > really caught my attention. > > I would like to start contributing and work on similar projects. > > A little guidance in the start to know the community better and > > instructions to contribute would be greatly appreciated. > > Which project in particular awakened your interest? > > Good one. I also thought that the email looked as if he/she had sent the exact same wording to all organizations that have participated in GSoC in the past. It would be nice if GSoC hopefuls attempted at least a bit to try to convince us that they actually are interested in our project in particular. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: drawinglayer/source
drawinglayer/source/tools/emfppen.cxx | 14 +-
drawinglayer/source/tools/emfppen.hxx |8
2 files changed, 21 insertions(+), 1 deletion(-)
New commits:
commit 494e6a082c0186d7e54bc718439f79ed29471614
Author: Chris Sherlock
AuthorDate: Tue Dec 10 11:37:06 2019 +1100
Commit: Bartosz Kosiorek
CommitDate: Sun Dec 22 10:23:26 2019 +0100
drawinglayer: improve logging - LineJoinTypeToString()
Change-Id: Ib6ae6350fe61b3c0d787ad19ff55baa6487d63da
Reviewed-on: https://gerrit.libreoffice.org/84835
Tested-by: Jenkins
Reviewed-by: Bartosz Kosiorek
diff --git a/drawinglayer/source/tools/emfppen.cxx
b/drawinglayer/source/tools/emfppen.cxx
index 14d1951c9fa9..dc78d1140e5e 100644
--- a/drawinglayer/source/tools/emfppen.cxx
+++ b/drawinglayer/source/tools/emfppen.cxx
@@ -136,6 +136,18 @@ namespace emfplushelper
return "";
}
+static OUString LineJoinTypeToString(sal_uInt32 jointype)
+{
+switch (jointype)
+{
+case LineJoinTypeMiter: return "LineJoinTypeMiter";
+case LineJoinTypeBevel: return "LineJoinTypeBevel";
+case LineJoinTypeRound: return "LineJoinTypeRound";
+case LineJoinTypeMiterClipped: return "LineJoinTypeMiterClipped";
+}
+return "";
+}
+
/// Convert stroke caps between EMF+ and rendering API
sal_Int8 EMFPPen::lcl_convertStrokeCap(sal_uInt32 nEmfStroke)
{
@@ -213,7 +225,7 @@ namespace emfplushelper
if (penDataFlags & PenDataJoin)
{
s.ReadInt32(lineJoin);
-SAL_WARN("drawinglayer", "EMF+\t\t TODO PenDataJoin: 0x" <<
std::hex << lineJoin);
+SAL_WARN("drawinglayer", "EMF+\t\tTODO PenDataJoin: " <<
LineJoinTypeToString(lineJoin) << " (0x" << std::hex << lineJoin << ")");
}
else
{
diff --git a/drawinglayer/source/tools/emfppen.hxx
b/drawinglayer/source/tools/emfppen.hxx
index 7f255fd7b172..6a528ecc8ced 100644
--- a/drawinglayer/source/tools/emfppen.hxx
+++ b/drawinglayer/source/tools/emfppen.hxx
@@ -69,6 +69,14 @@ namespace emfplushelper
LineCapTypeCustom = 0x00FF
};
+enum LineJoinType
+{
+LineJoinTypeMiter = 0x,
+LineJoinTypeBevel = 0x0001,
+LineJoinTypeRound = 0x0002,
+LineJoinTypeMiterClipped = 0x0003
+};
+
struct EMFPCustomLineCap;
struct EMFPPen : public EMFPBrush
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: drawinglayer/source
drawinglayer/source/tools/emfppen.cxx | 23 +--
drawinglayer/source/tools/emfppen.hxx | 15 +++
2 files changed, 36 insertions(+), 2 deletions(-)
New commits:
commit 2d5442dd1181ad0d261fe642a483383df6500848
Author: Chris Sherlock
AuthorDate: Tue Dec 10 11:24:16 2019 +1100
Commit: Bartosz Kosiorek
CommitDate: Sun Dec 22 10:22:29 2019 +0100
drawinglayer: improve logging - LineCapTypeToString()
Change-Id: If8314cab56a44b6045501490ed027f8c88bd6619
Reviewed-on: https://gerrit.libreoffice.org/84834
Tested-by: Jenkins
Reviewed-by: Bartosz Kosiorek
diff --git a/drawinglayer/source/tools/emfppen.cxx
b/drawinglayer/source/tools/emfppen.cxx
index fa0ea00d503d..14d1951c9fa9 100644
--- a/drawinglayer/source/tools/emfppen.cxx
+++ b/drawinglayer/source/tools/emfppen.cxx
@@ -117,6 +117,25 @@ namespace emfplushelper
return sFlags;
}
+static OUString LineCapTypeToString(sal_uInt32 linecap)
+{
+switch (linecap)
+{
+case LineCapTypeFlat: return "LineCapTypeFlat";
+case LineCapTypeSquare: return "LineCapTypeSquare";
+case LineCapTypeRound: return "LineCapTypeRound";
+case LineCapTypeTriangle: return "LineCapTypeTriangle";
+case LineCapTypeNoAnchor: return "LineCapTypeNoAnchor";
+case LineCapTypeSquareAnchor: return "LineCapTypeSquareAnchor";
+case LineCapTypeRoundAnchor: return "LineCapTypeRoundAchor";
+case LineCapTypeDiamondAnchor: return "LineCapTypeDiamondAnchor";
+case LineCapTypeArrowAnchor: return "LineCapTypeArrowAnchor";
+case LineCapTypeAnchorMask: return "LineCapTypeAnchorMask";
+case LineCapTypeCustom: return "LineCapTypeCustom";
+}
+return "";
+}
+
/// Convert stroke caps between EMF+ and rendering API
sal_Int8 EMFPPen::lcl_convertStrokeCap(sal_uInt32 nEmfStroke)
{
@@ -174,7 +193,7 @@ namespace emfplushelper
if (penDataFlags & PenDataStartCap)
{
s.ReadInt32(startCap);
-SAL_INFO("drawinglayer", "EMF+\t\tstartCap: 0x" << std::hex <<
startCap);
+SAL_INFO("drawinglayer", "EMF+\t\tstartCap: " <<
LineCapTypeToString(startCap) << " (0x" << std::hex << startCap << ")");
}
else
{
@@ -184,7 +203,7 @@ namespace emfplushelper
if (penDataFlags & PenDataEndCap)
{
s.ReadInt32(endCap);
-SAL_INFO("drawinglayer", "EMF+\t\tendCap: 0x" << std::hex <<
endCap);
+SAL_INFO("drawinglayer", "EMF+\t\tendCap: " <<
LineCapTypeToString(endCap) << " (0x" << std::hex << startCap << ")");
}
else
{
diff --git a/drawinglayer/source/tools/emfppen.hxx
b/drawinglayer/source/tools/emfppen.hxx
index ecc6f1c83dc3..7f255fd7b172 100644
--- a/drawinglayer/source/tools/emfppen.hxx
+++ b/drawinglayer/source/tools/emfppen.hxx
@@ -54,6 +54,21 @@ namespace emfplushelper
const sal_uInt32 EmfPlusPenDataCustomStartCap = 0x0800;
const sal_uInt32 EmfPlusPenDataCustomEndCap = 0x01000;
+enum LineCapType
+{
+LineCapTypeFlat = 0x,
+LineCapTypeSquare = 0x0001,
+LineCapTypeRound = 0x0002,
+LineCapTypeTriangle = 0x0003,
+LineCapTypeNoAnchor = 0x0010,
+LineCapTypeSquareAnchor = 0x0011,
+LineCapTypeRoundAnchor = 0x0012,
+LineCapTypeDiamondAnchor = 0x0013,
+LineCapTypeArrowAnchor = 0x0014,
+LineCapTypeAnchorMask = 0x00F0,
+LineCapTypeCustom = 0x00FF
+};
+
struct EMFPCustomLineCap;
struct EMFPPen : public EMFPBrush
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
