[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/formulaiter.hxx |1
sc/inc/funcdesc.hxx |1
sc/source/core/data/formulaiter.cxx |3 -
sc/source/core/data/funcdesc.cxx |3 -
sc/source/core/data/table3.cxx |4 -
sc/source/core/tool/scmatrix.cxx |3 -
sc/source/filter/dif/difimp.cxx |3 -
sc/source/filter/excel/exctools.cxx |2
sc/source/filter/excel/xeescher.cxx |1
sc/source/filter/excel/xeextlst.cxx |5 --
sc/source/filter/inc/XclExpChangeTrack.hxx |4 -
sc/source/filter/inc/dif.hxx |1
sc/source/filter/inc/excscen.hxx |1
sc/source/filter/inc/xeescher.hxx|1
sc/source/filter/inc/xeextlst.hxx|1
sc/source/filter/xcl97/XclExpChangeTrack.cxx | 10 ++--
sc/source/filter/xml/XMLDDELinksContext.cxx |5 --
sc/source/filter/xml/XMLDDELinksContext.hxx |2
sc/source/filter/xml/XMLTableHeaderFooterContext.cxx | 11 ++---
sc/source/filter/xml/XMLTableHeaderFooterContext.hxx |5 --
sc/source/filter/xml/XMLTrackedChangesContext.cxx| 39 +--
sc/source/filter/xml/xmlcondformat.cxx | 14 +++---
sc/source/filter/xml/xmlcondformat.hxx |4 -
sc/source/filter/xml/xmlnexpi.cxx| 14 ++
sc/source/filter/xml/xmlnexpi.hxx|6 --
sc/source/ui/app/inputwin.cxx| 12 +
sc/source/ui/cctrl/dpcontrol.cxx |7 ---
sc/source/ui/condformat/condformatmgr.cxx|3 -
sc/source/ui/dbgui/scuiasciiopt.cxx |3 -
sc/source/ui/inc/condformatmgr.hxx |2
sc/source/ui/inc/conflictsdlg.hxx|3 -
sc/source/ui/inc/datafdlg.hxx|1
sc/source/ui/inc/dpcontrol.hxx |3 -
sc/source/ui/inc/inputwin.hxx|4 -
sc/source/ui/inc/navipi.hxx |1
sc/source/ui/inc/prevwsh.hxx |1
sc/source/ui/inc/scuiasciiopt.hxx|1
sc/source/ui/inc/selectionstate.hxx |1
sc/source/ui/inc/sharedocdlg.hxx |1
sc/source/ui/miscdlgs/conflictsdlg.cxx |9 +---
sc/source/ui/miscdlgs/datafdlg.cxx |2
sc/source/ui/miscdlgs/sharedocdlg.cxx|5 --
sc/source/ui/navipi/navipi.cxx |2
sc/source/ui/vba/vbacharacters.cxx | 12 +
sc/source/ui/vba/vbacharacters.hxx |2
sc/source/ui/view/gridwin2.cxx |2
sc/source/ui/view/gridwin4.cxx |2
sc/source/ui/view/prevwsh.cxx|1
sc/source/ui/view/selectionstate.cxx |1
49 files changed, 74 insertions(+), 151 deletions(-)
New commits:
commit f7a011c45b0b88cb3c3ea9206cb851375266523d
Author: Noel Grandin
Date: Wed May 16 14:03:34 2018 +0200
loplugin:unusedfields in sc
Change-Id: I04aee9574b97d6120fe20be97b2c0fb8187fb260
Reviewed-on: https://gerrit.libreoffice.org/54453
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sc/inc/formulaiter.hxx b/sc/inc/formulaiter.hxx
index bbc0811cc286..6e471d7574b1 100644
--- a/sc/inc/formulaiter.hxx
+++ b/sc/inc/formulaiter.hxx
@@ -33,7 +33,6 @@ class ScFormulaCell;
class ScDetectiveRefIter
{
private:
-ScTokenArray* pCode;
formula::FormulaTokenArrayPlainIterator maIter;
ScAddress aPos;
public:
diff --git a/sc/inc/funcdesc.hxx b/sc/inc/funcdesc.hxx
index 31ad6b0d10e8..8ff400e3afbf 100644
--- a/sc/inc/funcdesc.hxx
+++ b/sc/inc/funcdesc.hxx
@@ -249,7 +249,6 @@ public:
private:
::std::vector aFunctionList; /**< List of functions */
::std::vector::iterator aFunctionListIter; /**<
position in function list */
-sal_Int32 nMaxFuncNameLen; /**< Length of longest function name */
};
/**
diff --git a/sc/source/core/data/formulaiter.cxx
b/sc/source/core/data/formulaiter.cxx
index f786042f93ff..ac5369285b49 100644
--- a/sc/source/core/data/formulaiter.cxx
+++ b/sc/source/core/data/formulaiter.cxx
@@ -26,8 +26,7 @@
using namespace formula;
ScDetectiveRefIter::ScDetectiveRefIter( ScFormulaCell* pCell ) :
-pCode(pCell->GetCode()),
-maIter(*pCode),
+maIter(*pCell->GetCode()),
aPos(pCell->aPos)
{
}
diff --git a/sc/source/core/data/funcdesc.cxx b/sc/source/core/data/funcdesc.cxx
index d4373e1170e9..5143be8de956 100644
--- a/sc/source/core/data/funcdesc.cxx
+++ b/sc/source/core/data/funcdesc.cxx
@@ -414,8 +414,9 @@ bool ScFuncDesc::compareByName(const ScFuncDesc* a, const
ScFuncDesc* b)
// class S
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/interpr2.cxx |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit 622691b89573850c35fe6c4b4f0b2f9bdb4c091d
Author: Takeshi Abe
Date: Tue May 8 16:35:49 2018 +0900
sc: Avoid looking up system clock twice to get current datetime
Change-Id: I904067260c15263f8169f095809e642d0738f6bb
Reviewed-on: https://gerrit.libreoffice.org/53957
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index db02e70710eb..7846d0d162b6 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -112,9 +112,8 @@ void ScInterpreter::ScGetActDate()
void ScInterpreter::ScGetActTime()
{
nFuncFmtType = SvNumFormatType::DATETIME;
-Date aActDate( Date::SYSTEM );
-long nDiff = aActDate - pFormatter->GetNullDate();
-tools::Time aActTime( tools::Time::SYSTEM );
+DateTime aActTime( DateTime::SYSTEM );
+long nDiff = aActTime - pFormatter->GetNullDate();
double fTime = aActTime.GetHour()/
static_cast(::tools::Time::hourPerDay) +
aActTime.GetMin() /
static_cast(::tools::Time::minutePerDay) +
aActTime.GetSec() /
static_cast(::tools::Time::secondPerDay) +
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/unocore/unostyle.cxx | 23 ---
1 file changed, 12 insertions(+), 11 deletions(-)
New commits:
commit 83a4a6286f021c99cbf94897504fc7bfe35d2a68
Author: Bjoern Michaelsen
Date: Thu May 10 10:51:42 2018 +0200
dont use SwClient/SwModify in unocore: Style
Change-Id: I8b2b7378ea21ad1fcfa607aadb0f442838a6cc27
Reviewed-on: https://gerrit.libreoffice.org/54611
Tested-by: Jenkins
Reviewed-by: Björn Michaelsen
diff --git a/sw/source/core/unocore/unostyle.cxx
b/sw/source/core/unocore/unostyle.cxx
index c1821f2b9a82..6fe6857b72d1 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -24,6 +24,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -274,7 +275,7 @@ class SwXStyle : public cppu::WeakImplHelper
css::beans::XMultiPropertyStates
>
, public SfxListener
-, public SwClient
+, public SvtListener
{
SwDoc* m_pDoc;
OUString m_sStyleName;
@@ -299,7 +300,6 @@ protected:
uno::Any GetStyleProperty_Impl(const SfxItemPropertySimpleEntry& rEntry,
const SfxItemPropertySet& rPropSet, SwStyleBase_Impl& rBase);
uno::Any GetPropertyValue_Impl(const SfxItemPropertySet* pPropSet,
SwStyleBase_Impl& rBase, const OUString& rPropertyName);
- virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew)
override;
public:
SwXStyle(SwDoc* pDoc, SfxStyleFamily eFam, bool bConditional = false);
SwXStyle(SfxStyleSheetBasePool* pPool, SfxStyleFamily eFamily, SwDoc*
pDoc, const OUString& rStyleName);
@@ -364,6 +364,8 @@ public:
//SfxListener
virtual voidNotify( SfxBroadcaster& rBC, const SfxHint& rHint )
override;
+//SvtListener
+virtual void Notify(const SfxHint&) override;
const OUString& GetStyleName() const { return m_sStyleName;}
SfxStyleFamily GetFamily() const {return m_rEntry.m_eFamily;}
@@ -374,7 +376,7 @@ public:
{
m_bIsDescriptor = false; m_pDoc = pDc;
m_pBasePool = pPool;
-StartListening(*m_pBasePool);
+SfxListener::StartListening(*m_pBasePool);
}
SwDoc*GetDoc() const { return m_pDoc; }
void Invalidate();
@@ -1289,7 +1291,7 @@ SwXStyle::SwXStyle(SwDoc* pDoc, SfxStyleFamily eFamily,
bool bConditional)
{
assert(!m_bIsConditional || m_rEntry.m_eFamily == SfxStyleFamily::Para);
// only paragraph styles are conditional
// Register ourselves as a listener to the document (via the page
descriptor)
-
pDoc->getIDocumentStylePoolAccess().GetPageDescFromPool(RES_POOLPAGE_STANDARD)->Add(this);
+
SvtListener::StartListening(pDoc->getIDocumentStylePoolAccess().GetPageDescFromPool(RES_POOLPAGE_STANDARD)->GetNotifier());
m_pPropertiesImpl = o3tl::make_unique(
aSwMapProvider.GetPropertySet(m_bIsConditional ?
PROPERTY_MAP_CONDITIONAL_PARA_STYLE :
m_rEntry.m_nPropMapType)->getPropertyMap());
}
@@ -1308,15 +1310,14 @@ SwXStyle::~SwXStyle()
{
SolarMutexGuard aGuard;
if(m_pBasePool)
-EndListening(*m_pBasePool);
+SfxListener::EndListening(*m_pBasePool);
m_pPropertiesImpl.reset();
-SwClient::EndListeningAll();
+SvtListener::EndListeningAll();
}
-void SwXStyle::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew)
+void SwXStyle::Notify(const SfxHint& rHint)
{
-ClientModify(this, pOld, pNew);
-if(!GetRegisteredIn())
+if(rHint.GetId() == SfxHintId::Dying)
{
m_pDoc = nullptr;
m_xStyleData.clear();
@@ -2766,7 +2767,7 @@ void SwXStyle::Notify(SfxBroadcaster& rBC, const SfxHint&
rHint)
if((rHint.GetId() == SfxHintId::Dying) || (rHint.GetId() ==
SfxHintId::StyleSheetErased))
{
m_pBasePool = nullptr;
-EndListening(rBC);
+SfxListener::EndListening(rBC);
}
else if(rHint.GetId() == SfxHintId::StyleSheetChanged)
{
@@ -2774,7 +2775,7 @@ void SwXStyle::Notify(SfxBroadcaster& rBC, const SfxHint&
rHint)
SfxStyleSheetBase* pOwnBase =
static_cast(rBC).Find(m_sStyleName);
if(!pOwnBase)
{
-EndListening(rBC);
+SfxListener::EndListening(rBC);
Invalidate();
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: shell/source solenv/clang-format
shell/source/tools/lngconvex/cmdline.hxx |4 +-- shell/source/tools/lngconvex/defs.hxx| 32 --- solenv/clang-format/blacklist|1 3 files changed, 2 insertions(+), 35 deletions(-) New commits: commit 5dab28cdada9a24ad2ddae1083ac977fe87cb1c1 Author: Arkadiy Illarionov Date: Sun May 20 16:57:25 2018 +0300 tdf#96099 Remove unused typedef from shell/source/tools/lngconvex Also remove empty defs.hxx Change-Id: I35f70cc13f0198623d99cfd1e294808ac90f5f02 Reviewed-on: https://gerrit.libreoffice.org/54600 Tested-by: Jenkins Reviewed-by: Tor Lillqvist diff --git a/shell/source/tools/lngconvex/cmdline.hxx b/shell/source/tools/lngconvex/cmdline.hxx index 9cbc34e5e343..04cb7101aee0 100644 --- a/shell/source/tools/lngconvex/cmdline.hxx +++ b/shell/source/tools/lngconvex/cmdline.hxx @@ -20,12 +20,12 @@ #ifndef INCLUDED_SHELL_SOURCE_TOOLS_LNGCONVEX_CMDLINE_HXX #define INCLUDED_SHELL_SOURCE_TOOLS_LNGCONVEX_CMDLINE_HXX +#include + #include #include -#include "defs.hxx" - /** Simple command line abstraction */ diff --git a/shell/source/tools/lngconvex/defs.hxx b/shell/source/tools/lngconvex/defs.hxx deleted file mode 100644 index 86745877e66e.. --- a/shell/source/tools/lngconvex/defs.hxx +++ /dev/null @@ -1,32 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_SHELL_SOURCE_TOOLS_LNGCONVEX_DEFS_HXX -#define INCLUDED_SHELL_SOURCE_TOOLS_LNGCONVEX_DEFS_HXX - -#include -#include -#include - -typedef std::vector StringList_t; - - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist index cc3dfe0e8843..90ec26ee74a6 100644 --- a/solenv/clang-format/blacklist +++ b/solenv/clang-format/blacklist @@ -13173,7 +13173,6 @@ shell/source/sessioninstall/SyncDbusSessionHelper.hxx shell/source/sessioninstall/services.cxx shell/source/tools/lngconvex/cmdline.cxx shell/source/tools/lngconvex/cmdline.hxx -shell/source/tools/lngconvex/defs.hxx shell/source/tools/lngconvex/lngconvex.cxx shell/source/tools/regsvrex/regsvrex.cxx shell/source/unix/exec/shellexec.cxx ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: osx/soffice.xcodeproj
osx/soffice.xcodeproj/project.pbxproj | 62 +++---
1 file changed, 57 insertions(+), 5 deletions(-)
New commits:
commit 0653ddb11620db917f4de97c0d6078ef55d128ed
Author: Tor Lillqvist
Date: Thu May 17 12:42:11 2018 +0300
Updates by Xcode 9.3
Change-Id: Ia9a87f3f9bdf357079c6d259d736504e0109bf57
diff --git a/osx/soffice.xcodeproj/project.pbxproj
b/osx/soffice.xcodeproj/project.pbxproj
index 770a980fcdc0..090873794b29 100644
--- a/osx/soffice.xcodeproj/project.pbxproj
+++ b/osx/soffice.xcodeproj/project.pbxproj
@@ -641,12 +641,12 @@
buildConfigurationList = BEC3D9211710B11E0030AD56 /*
Build configuration list for PBXLegacyTarget "soffice" */;
buildPhases = (
);
- buildToolPath = make;
+ buildToolPath = /usr/local/bin/make;
buildWorkingDirectory = ..;
dependencies = (
);
name = soffice;
- passBuildSettingsInEnvironment = 1;
+ passBuildSettingsInEnvironment = 0;
productName = soffice;
};
/* End PBXLegacyTarget section */
@@ -655,7 +655,7 @@
BEC3D9181710B0390030AD56 /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0460;
+ LastUpgradeCheck = 0930;
};
buildConfigurationList = BEC3D91B1710B0390030AD56 /*
Build configuration list for PBXProject "soffice" */;
compatibilityVersion = "Xcode 3.2";
@@ -677,12 +677,64 @@
BEC3D91C1710B0390030AD56 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+ CLANG_WARN_BOOL_CONVERSION = YES;
+ CLANG_WARN_COMMA = YES;
+ CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS =
YES;
+ CLANG_WARN_EMPTY_BODY = YES;
+ CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_INFINITE_RECURSION = YES;
+ CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+ CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+ CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+ CLANG_WARN_STRICT_PROTOTYPES = YES;
+ CLANG_WARN_SUSPICIOUS_MOVE = YES;
+ CLANG_WARN_UNREACHABLE_CODE = YES;
+ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+ ENABLE_STRICT_OBJC_MSGSEND = YES;
+ ENABLE_TESTABILITY = YES;
+ GCC_NO_COMMON_BLOCKS = YES;
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+ GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_UNDECLARED_SELECTOR = YES;
+ GCC_WARN_UNINITIALIZED_AUTOS = YES;
+ GCC_WARN_UNUSED_FUNCTION = YES;
+ GCC_WARN_UNUSED_VARIABLE = YES;
+ ONLY_ACTIVE_ARCH = YES;
};
name = Debug;
};
BEC3D91D1710B0390030AD56 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+ CLANG_WARN_BOOL_CONVERSION = YES;
+ CLANG_WARN_COMMA = YES;
+ CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS =
YES;
+ CLANG_WARN_EMPTY_BODY = YES;
+ CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_INFINITE_RECURSION = YES;
+ CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+ CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+ CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+ CLANG_WARN_STRICT_PROTOTYPES = YES;
+
[Libreoffice-commits] core.git: extensions/source
extensions/source/ole/unoconversionutilities.hxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 7c7b3c70e1def37ee707827e75d0afa00b0b3619 Author: Tor Lillqvist Date: Mon Feb 12 18:55:05 2018 +0200 These fields can be const Change-Id: I103f06b9c7f14ac7eff9911ab5bebc4c98e7d41f Reviewed-on: https://gerrit.libreoffice.org/54614 Tested-by: Jenkins Reviewed-by: Tor Lillqvist diff --git a/extensions/source/ole/unoconversionutilities.hxx b/extensions/source/ole/unoconversionutilities.hxx index ddc64ce666ad..6e25170741f4 100644 --- a/extensions/source/ole/unoconversionutilities.hxx +++ b/extensions/source/ole/unoconversionutilities.hxx @@ -189,8 +189,8 @@ protected: // This member determines what class is used to convert a UNO object // or struct to a COM object. It is passed along to the o2u_anyToVariant // function in the createBridge function implementation -sal_uInt8 m_nUnoWrapperClass; -sal_uInt8 m_nComWrapperClass; +const sal_uInt8 m_nUnoWrapperClass; +const sal_uInt8 m_nComWrapperClass; // The servicemanager is either a local smgr or remote when the service // com.sun.star.bridge.OleBridgeSupplierVar1 is used. This service can be ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extensions/source
extensions/source/ole/unoconversionutilities.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 79a6290969d5c1feab56158b6cf0dd0a4b52d53e Author: Tor Lillqvist Date: Mon Feb 12 18:56:10 2018 +0200 There is nothing called o2u_anyToVariant Change-Id: I7118843fde87a2d587f0e4ec99d146c379da618e diff --git a/extensions/source/ole/unoconversionutilities.hxx b/extensions/source/ole/unoconversionutilities.hxx index 6e25170741f4..9b88ce681d80 100644 --- a/extensions/source/ole/unoconversionutilities.hxx +++ b/extensions/source/ole/unoconversionutilities.hxx @@ -187,7 +187,7 @@ protected: Reference getTypeConverter(); // This member determines what class is used to convert a UNO object -// or struct to a COM object. It is passed along to the o2u_anyToVariant +// or struct to a COM object. It is passed along to the anyToVariant // function in the createBridge function implementation const sal_uInt8 m_nUnoWrapperClass; const sal_uInt8 m_nComWrapperClass; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: For contribution to Libre office Android app.
Hello Ishu, Welcome! Developers and users can contribute to the LibreOffice development in many ways and everyone is welcome in the project. Please find the steps about getting involved in LibreOffice development on our wiki page: https://wiki.documentfoundation.org/Development/GetInvolved Also note that LibreOffice developers usually hang out in the #libreoffice-dev (and #libreoffice-android particularly for Android development) IRC channel on Freenode: http://webchat.freenode.net/?channels=libreoffice-dev,libreoffice-android Cheers, Muhammet On 05/20/2018 09:54 PM, ISHU DOHARE 4-Yr B.Tech. Electronics Engg. wrote: Hello, I wanted to start contributing to Libre office. I am big fan of Libre on Ubuntu. Pls help how to get started. I have decent experience in Android ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] help.git: source/media
source/media/files/scalc/fr/pivot.ods|binary source/media/files/scalc/pt-BR/pivot.ods |binary 2 files changed New commits: commit ffe3c4dc36948c44fc17b860c3b5020131cd391c Author: Olivier Hallot Date: Mon May 21 08:44:52 2018 -0300 tdf#117593 l10n of collateral file pivot.ods Change-Id: If487dcb74a7e8c61ee152365ba56ad0c6b010ba1 Reviewed-on: https://gerrit.libreoffice.org/54626 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/media/files/scalc/fr/pivot.ods b/source/media/files/scalc/fr/pivot.ods new file mode 100644 index 0..0b8284651 Binary files /dev/null and b/source/media/files/scalc/fr/pivot.ods differ diff --git a/source/media/files/scalc/pt-BR/pivot.ods b/source/media/files/scalc/pt-BR/pivot.ods new file mode 100644 index 0..991dcb7ad Binary files /dev/null and b/source/media/files/scalc/pt-BR/pivot.ods differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 423f4ac936e8a3991e9e3f16c6f3f7c3c5d44e71 Author: Olivier Hallot Date: Mon May 21 08:44:52 2018 -0300 Updated core Project: help ffe3c4dc36948c44fc17b860c3b5020131cd391c tdf#117593 l10n of collateral file pivot.ods Change-Id: If487dcb74a7e8c61ee152365ba56ad0c6b010ba1 Reviewed-on: https://gerrit.libreoffice.org/54626 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index a9cecd08312f..ffe3c4dc3694 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit a9cecd08312f8115c657a640a05bb91f21248f0a +Subproject commit ffe3c4dc36948c44fc17b860c3b5020131cd391c ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/Ashod/cd-5.3.3.2' - 2520 commits - accessibility/inc accessibility/source avmedia/source basctl/inc basctl/source basctl/uiconfig basegfx/source basic/i
Rebased ref, commits from common ancestor:
commit 437a07db27679d33ddc0fdb716196d94fb1a39b4
Author: Ashod Nakashian
Date: Sun May 20 22:31:36 2018 -0400
sd: disable pdf import tests
Change-Id: Iaee679d2ff322c67d081185588103d5685fa970a
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 0f3bf242f8cb..4f1dd46e1bba 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -122,7 +122,7 @@ public:
void testTableBorderLineStyle();
void testBnc862510_6();
void testBnc862510_7();
-#if ENABLE_PDFIMPORT
+#if ENABLE_PDFIMPORT && defined(IMPORT_PDF_ELEMENTS)
void testPDFImport();
void testPDFImportSkipImages();
#endif
@@ -195,7 +195,7 @@ public:
CPPUNIT_TEST(testTableBorderLineStyle);
CPPUNIT_TEST(testBnc862510_6);
CPPUNIT_TEST(testBnc862510_7);
-#if ENABLE_PDFIMPORT
+#if ENABLE_PDFIMPORT && defined(IMPORT_PDF_ELEMENTS)
CPPUNIT_TEST(testPDFImport);
CPPUNIT_TEST(testPDFImportSkipImages);
#endif
@@ -1174,7 +1174,7 @@ void SdImportTest::testBnc862510_7()
xDocShRef->DoClose();
}
-#if ENABLE_PDFIMPORT
+#if ENABLE_PDFIMPORT && defined(IMPORT_PDF_ELEMENTS)
void SdImportTest::testPDFImport()
{
commit e8b81d5607d451d05de20be82f3f801991bf9d74
Author: Ashod Nakashian
Date: Tue Nov 14 09:17:59 2017 -0500
gtktiledviewer downgrade min gtk+ to 3.16
Change-Id: Ieb964ec1bbdeb632bd771db9b773f64b78107fc5
Reviewed-on: https://gerrit.libreoffice.org/44724
Reviewed-by: pranavk
Tested-by: pranavk
(cherry picked from commit a3f432a68733b6e76ecb68cf5704a59d1be1e5cb)
diff --git a/libreofficekit/qa/gtktiledviewer/gtv.ui
b/libreofficekit/qa/gtktiledviewer/gtv.ui
index af5737c6a3dc..c3296d3c9c04 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv.ui
+++ b/libreofficekit/qa/gtktiledviewer/gtv.ui
@@ -1,7 +1,7 @@
-
+
True
False
commit eba16e104b14d401c8153628c90e50bddfec9f60
Author: Ashod Nakashian
Date: Sun May 20 15:17:16 2018 -0400
svx: set the font name of imported PDF text
Change-Id: I79dde3c8983a70311de2d2a46093fac2722fb372
diff --git a/external/pdfium/edit.patch.1 b/external/pdfium/edit.patch.1
index de57d10e1be6..d0d7cb97060e 100644
--- a/external/pdfium/edit.patch.1
+++ b/external/pdfium/edit.patch.1
@@ -111,7 +111,7 @@ index fed1581..968b84a 100644
FPDFImageObj_GetImageDataDecoded(FPDF_PAGEOBJECT image_object,
void* buffer,
diff --git a/fpdfsdk/fpdf_editpage.cpp b/fpdfsdk/fpdf_editpage.cpp
-index ec29891..a52e1a9 100644
+index ec29891..9daffc0 100644
--- a/fpdfsdk/fpdf_editpage.cpp
+++ b/fpdfsdk/fpdf_editpage.cpp
@@ -12,12 +12,14 @@
@@ -137,7 +137,7 @@ index ec29891..a52e1a9 100644
#include "fpdfsdk/cpdfsdk_helpers.h"
#include "public/fpdf_formfill.h"
#include "third_party/base/logging.h"
-@@ -624,3 +627,245 @@ FPDFPageObj_SetLineCap(FPDF_PAGEOBJECT page_object, int
line_cap) {
+@@ -624,3 +627,268 @@ FPDFPageObj_SetLineCap(FPDF_PAGEOBJECT page_object, int
line_cap) {
pPageObj->SetDirty(true);
return true;
}
@@ -162,6 +162,29 @@ index ec29891..a52e1a9 100644
+ return pTxtObj->GetFontSize();
+}
+
++FPDF_EXPORT int FPDF_CALLCONV
++FPDFTextObj_GetFontName(FPDF_PAGEOBJECT text_object, char* result)
++{
++ if (!text_object)
++return 0;
++
++ CPDF_TextObject* pTxtObj = CPDFTextObjectFromFPDFPageObject(text_object);
++ CPDF_Font* pPdfFont = pTxtObj->GetFont();
++ if (!pPdfFont)
++return 0;
++
++ CFX_Font* pFont = pPdfFont->GetFont();
++ if (!pFont)
++return 0;
++
++ ByteString byte_str = pFont->GetFamilyName();
++ const size_t byte_str_len = byte_str.GetLength();
++
++ memcpy(result, byte_str.GetBuffer(byte_str_len).data(), byte_str_len);
++ result[byte_str_len] = '\0';
++ return byte_str_len;
++}
++
+FPDF_EXPORT void FPDF_CALLCONV
+FPDFTextObj_GetMatrix(FPDF_PAGEOBJECT text_object,
+ double* a,
@@ -495,7 +518,7 @@ index a14..01b74c9 100644
int index,
double* left,
diff --git a/public/fpdf_edit.h b/public/fpdf_edit.h
-index c0766a3..4351649 100644
+index c0766a3..75381bb 100644
--- a/public/fpdf_edit.h
+++ b/public/fpdf_edit.h
@@ -660,6 +660,15 @@ FPDFPageObj_GetStrokeColor(FPDF_PAGEOBJECT page_object,
@@ -551,7 +574,7 @@ index c0766a3..4351649 100644
// Create a new text object using one of the standard PDF fonts.
//
// document - handle to the document.
-@@ -971,6 +1010,125 @@ FPDFPageObj_CreateTextObj(FPDF_DOCUMENT document,
+@@ -971,6 +1010,135 @@ FPDFPageObj_CreateTextObj(FPDF_DOCUMENT document,
FPDF_FONT font,
float font_size);
@@ -564,7 +587,6 @@ index c0766a3..4351649 100644
+FPDF_EXPORT int FPDF_CALLCONV
+FPDFTextObj_CountChars(FPDF_PAGEOBJECT text_object);
+
-+
+// Get the font size of a text object.
+//
+// text_object - Handle of text
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - include/vcl vcl/source
include/vcl/floatwin.hxx |6 +++---
vcl/source/window/floatwin.cxx | 20 +++-
2 files changed, 18 insertions(+), 8 deletions(-)
New commits:
commit c04ee32ea43c6ac2c2fa0375405431b7730d78c5
Author: Jan Holesovsky
Date: Tue Mar 27 11:26:43 2018 +0200
lokdialog: For the tunneled top-level popups, provide the position in twips.
Change-Id: I7b1ca50b06c3bdf0958bb88946873c6ddf717b0e
Reviewed-on: https://gerrit.libreoffice.org/51952
Reviewed-by: pranavk
Tested-by: pranavk
Reviewed-on: https://gerrit.libreoffice.org/54630
Reviewed-by: Marco Cecchetti
Tested-by: Marco Cecchetti
diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx
index 6ebb5c84cf37..cba8d79c94cb 100644
--- a/include/vcl/floatwin.hxx
+++ b/include/vcl/floatwin.hxx
@@ -120,9 +120,9 @@ public:
SAL_DLLPRIVATE bool ImplIsFloatPopupModeWindow( const
vcl::Window* pWindow );
SAL_DLLPRIVATE void ImplSetMouseDown() { mbMouseDown = true; }
SAL_DLLPRIVATE bool ImplIsMouseDown() const { return
mbMouseDown; }
- static Point ImplCalcPos( vcl::Window* pWindow,
- const tools::Rectangle&
rRect, FloatWinPopupFlags nFlags,
- sal_uInt16& rArrangeIndex );
+ static Point ImplCalcPos(vcl::Window* pWindow,
+const tools::Rectangle& rRect,
FloatWinPopupFlags nFlags,
+sal_uInt16& rArrangeIndex,
Point* pLOKTwipsPos = nullptr);
static Point ImplConvertToAbsPos(vcl::Window*
pReference, const Point& rPos);
static tools::Rectangle ImplConvertToAbsPos(vcl::Window*
pReference, const tools::Rectangle& rRect);
SAL_DLLPRIVATE void ImplEndPopupMode( FloatWinPopupEndFlags
nFlags, const VclPtr& xFocusId );
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index a4482a29eb00..e39f1dc1f121 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -40,6 +40,7 @@ public:
VclPtr mpBox;
tools::Rectangle maItemEdgeClipRect; // used to clip the common edge
between a toolbar item and the border of this window
Point maPos; // position of the floating window wrt. parent
+Point maLOKTwipsPos; ///< absolute position of the floating window in the
document - in twips (for toplevel floating windows).
};
FloatingWindow::ImplData::ImplData()
@@ -230,9 +231,9 @@ Point FloatingWindow::CalcFloatingPosition( vcl::Window*
pWindow, const tools::R
return ImplCalcPos( pWindow, rRect, nFlags, rArrangeIndex );
}
-Point FloatingWindow::ImplCalcPos( vcl::Window* pWindow,
- const tools::Rectangle& rRect,
FloatWinPopupFlags nFlags,
- sal_uInt16& rArrangeIndex )
+Point FloatingWindow::ImplCalcPos(vcl::Window* pWindow,
+ const tools::Rectangle& rRect,
FloatWinPopupFlags nFlags,
+ sal_uInt16& rArrangeIndex, Point*
pLOKTwipsPos)
{
// get window position
Point aPos;
@@ -439,6 +440,14 @@ Point FloatingWindow::ImplCalcPos( vcl::Window* pWindow,
tools::Rectangle( e1, e2 );
}
+if (bLOKActive && pLOKTwipsPos)
+{
+if (pW->IsMapModeEnabled())
+*pLOKTwipsPos = pW->PixelToLogic(aPos, MapMode(MapUnit::MapTwip));
+else
+*pLOKTwipsPos = pW->LogicToLogic(aPos, pW->GetMapMode(),
MapMode(MapUnit::MapTwip));
+}
+
// caller expects coordinates relative to top-level win
return pW->OutputToScreenPixel( aPos );
}
@@ -621,15 +630,16 @@ void FloatingWindow::StateChanged( StateChangedType nType
)
// dialog - but maybe we'll need a separate type for this
// later
aItems.emplace_back("type", "dialog");
+aItems.emplace_back("position",
mpImplData->maLOKTwipsPos.toString()); // twips
}
else
{
SetLOKNotifier(pParent->GetLOKNotifier());
aItems.emplace_back("type", "child");
aItems.emplace_back("parentId",
OString::number(pParent->GetLOKWindowId()));
+aItems.emplace_back("position", mpImplData->maPos.toString());
// pixels
}
aItems.emplace_back("size", GetSizePixel().toString());
-aItems.emplace_back("position", mpImplData->maPos.toString());
if (!GetText().isEmpty())
aItems.emplace_back("title", GetText().toUtf8());
GetLOKNotifier()->notifyWindow(GetLOKWindowId(), "created",
aItems);
@@ -717,7 +727,7 @@ void FloatingWindow::StartPopupMode( const
tools::Rectangle& rRect, FloatWinPopu
// compute window position according to flags and a
[Libreoffice-commits] core.git: include/vcl vcl/source
include/vcl/floatwin.hxx |6 +++---
vcl/source/window/floatwin.cxx | 20 +++-
2 files changed, 18 insertions(+), 8 deletions(-)
New commits:
commit 6ede92ec3998c2d3122b32546137d1790fee70ad
Author: Jan Holesovsky
Date: Tue Mar 27 11:26:43 2018 +0200
lokdialog: For the tunneled top-level popups, provide the position in twips.
Change-Id: I7b1ca50b06c3bdf0958bb88946873c6ddf717b0e
Reviewed-on: https://gerrit.libreoffice.org/51952
Reviewed-by: pranavk
Tested-by: pranavk
Reviewed-on: https://gerrit.libreoffice.org/54628
Reviewed-by: Marco Cecchetti
Tested-by: Marco Cecchetti
diff --git a/include/vcl/floatwin.hxx b/include/vcl/floatwin.hxx
index 62739f95cb8d..7cb1e38b9914 100644
--- a/include/vcl/floatwin.hxx
+++ b/include/vcl/floatwin.hxx
@@ -121,9 +121,9 @@ public:
SAL_DLLPRIVATE bool ImplIsFloatPopupModeWindow( const
vcl::Window* pWindow );
SAL_DLLPRIVATE void ImplSetMouseDown() { mbMouseDown = true; }
SAL_DLLPRIVATE bool ImplIsMouseDown() const { return
mbMouseDown; }
- static Point ImplCalcPos( vcl::Window* pWindow,
- const tools::Rectangle&
rRect, FloatWinPopupFlags nFlags,
- sal_uInt16& rArrangeIndex );
+ static Point ImplCalcPos(vcl::Window* pWindow,
+const tools::Rectangle& rRect,
FloatWinPopupFlags nFlags,
+sal_uInt16& rArrangeIndex,
Point* pLOKTwipsPos = nullptr);
static Point ImplConvertToAbsPos(vcl::Window*
pReference, const Point& rPos);
static tools::Rectangle ImplConvertToAbsPos(vcl::Window*
pReference, const tools::Rectangle& rRect);
SAL_DLLPRIVATE void ImplEndPopupMode( FloatWinPopupEndFlags
nFlags, const VclPtr& xFocusId );
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index 1a6166dd5b92..4bffbb52b8cf 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -40,6 +40,7 @@ public:
VclPtr mpBox;
tools::Rectangle maItemEdgeClipRect; // used to clip the common edge
between a toolbar item and the border of this window
Point maPos; // position of the floating window wrt. parent
+Point maLOKTwipsPos; ///< absolute position of the floating window in the
document - in twips (for toplevel floating windows).
};
FloatingWindow::ImplData::ImplData()
@@ -229,9 +230,9 @@ Point FloatingWindow::CalcFloatingPosition( vcl::Window*
pWindow, const tools::R
return ImplCalcPos( pWindow, rRect, nFlags, rArrangeIndex );
}
-Point FloatingWindow::ImplCalcPos( vcl::Window* pWindow,
- const tools::Rectangle& rRect,
FloatWinPopupFlags nFlags,
- sal_uInt16& rArrangeIndex )
+Point FloatingWindow::ImplCalcPos(vcl::Window* pWindow,
+ const tools::Rectangle& rRect,
FloatWinPopupFlags nFlags,
+ sal_uInt16& rArrangeIndex, Point*
pLOKTwipsPos)
{
// get window position
Point aPos;
@@ -438,6 +439,14 @@ Point FloatingWindow::ImplCalcPos( vcl::Window* pWindow,
tools::Rectangle( e1, e2 );
}
+if (bLOKActive && pLOKTwipsPos)
+{
+if (pW->IsMapModeEnabled())
+*pLOKTwipsPos = pW->PixelToLogic(aPos, MapMode(MapUnit::MapTwip));
+else
+*pLOKTwipsPos = pW->LogicToLogic(aPos, pW->GetMapMode(),
MapMode(MapUnit::MapTwip));
+}
+
// caller expects coordinates relative to top-level win
return pW->OutputToScreenPixel( aPos );
}
@@ -623,15 +632,16 @@ void FloatingWindow::StateChanged( StateChangedType nType
)
// dialog - but maybe we'll need a separate type for this
// later
aItems.emplace_back("type", "dialog");
+aItems.emplace_back("position",
mpImplData->maLOKTwipsPos.toString()); // twips
}
else
{
SetLOKNotifier(pParent->GetLOKNotifier());
aItems.emplace_back("type", "child");
aItems.emplace_back("parentId",
OString::number(pParent->GetLOKWindowId()));
+aItems.emplace_back("position", mpImplData->maPos.toString());
// pixels
}
aItems.emplace_back("size", GetSizePixel().toString());
-aItems.emplace_back("position", mpImplData->maPos.toString());
if (!GetText().isEmpty())
aItems.emplace_back("title", GetText().toUtf8());
GetLOKNotifier()->notifyWindow(GetLOKWindowId(), "created",
aItems);
@@ -719,7 +729,7 @@ void FloatingWindow::StartPopupMode( const
tools::Rectangle& rRect, FloatWinPopu
// compute window position according to flags and a
[Libreoffice-commits] core.git: vcl/win
vcl/win/gdi/winlayout.cxx |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 6a54247c7dfc31aa53e6db7122e31e5498715184
Author: Khaled Hosny
Date: Sat May 19 18:31:41 2018 +0200
Partially revert "Fixup 23c5125148a8110d88385b29570bf0b7d4400458"
This reverts most of commit e8d48dd75a1bb31b5bc500bc79fb80384a09bcc6.
Hopefully it will make the Win@42 tinderbox happy again.
Change-Id: Ie5ef2c16a62e774dcd1f6005df3d86e1973dea2d
Reviewed-on: https://gerrit.libreoffice.org/54567
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx
index 656681a46a8a..95034c97372b 100644
--- a/vcl/win/gdi/winlayout.cxx
+++ b/vcl/win/gdi/winlayout.cxx
@@ -342,7 +342,7 @@ static hb_blob_t* getFontTable(hb_face_t* /*face*/,
hb_tag_t nTableTag, void* pU
hb_font_t* WinFontInstance::ImplInitHbFont()
{
assert(m_hDC);
-assert(m_hFont);
+m_hFont = static_cast(GetCurrentObject(m_hDC, OBJ_FONT));
hb_font_t* pHbFont = InitHbFont(hb_face_create_for_tables(getFontTable,
m_hFont, nullptr));
// Calculate the AverageWidthFactor, see LogicalFontInstance::GetScale().
@@ -378,7 +378,6 @@ void WinFontInstance::SetHDC(const HDC hDC)
return;
ReleaseHbFont();
m_hDC = hDC;
-m_hFont = static_cast(GetCurrentObject(m_hDC, OBJ_FONT));
}
bool WinSalGraphics::CacheGlyphs(const GenericSalLayout& rLayout)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basic/source
basic/source/runtime/dllmgr-x64.cxx |2 +-
basic/source/runtime/dllmgr-x86.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit de9620dd4539397715dab3102d256f9d634fcb23
Author: Vasily Melenchuk
Date: Mon May 21 10:58:49 2018 +0300
tdf#97231: potential crash fixed
blob2 pointer can be invalidated during marshalString() call,
because it also adds new element in data vector and thus later
access to blob2 can cause crash.
Change-Id: I2de519c363193f34b249e7250a016397b7420882
Reviewed-on: https://gerrit.libreoffice.org/54613
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/basic/source/runtime/dllmgr-x64.cxx
b/basic/source/runtime/dllmgr-x64.cxx
index 0bafdec1fb32..4450bbfa6029 100644
--- a/basic/source/runtime/dllmgr-x64.cxx
+++ b/basic/source/runtime/dllmgr-x64.cxx
@@ -319,12 +319,12 @@ ErrCode marshal(
break;
case SbxSTRING:
{
-std::vector< char > * blob2 = data.newBlob();
void * p;
ErrCode e = marshalString(variable, special, data, &p);
if (e != ERRCODE_NONE) {
return e;
}
+std::vector< char >* blob2 = data.newBlob();
add(*blob2, p, 8, 0);
add(blob, address(*blob2), 8, offset);
break;
diff --git a/basic/source/runtime/dllmgr-x86.cxx
b/basic/source/runtime/dllmgr-x86.cxx
index 576e3da1b736..63fd3bcea160 100644
--- a/basic/source/runtime/dllmgr-x86.cxx
+++ b/basic/source/runtime/dllmgr-x86.cxx
@@ -334,12 +334,12 @@ ErrCode marshal(
break;
case SbxSTRING:
{
-std::vector< char > * blob2 = data.newBlob();
void * p;
ErrCode e = marshalString(variable, special, data, &p);
if (e != ERRCODE_NONE) {
return e;
}
+std::vector< char > * blob2 = data.newBlob();
add(*blob2, p, 4, 0);
add(blob, address(*blob2), 4, offset);
break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - basic/source
basic/source/runtime/dllmgr-x64.cxx |2 +-
basic/source/runtime/dllmgr-x86.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 4b84229afc16dee4b150950463bff7e6df793ffc
Author: Vasily Melenchuk
Date: Mon May 21 10:58:49 2018 +0300
tdf#97231: potential crash fixed
blob2 pointer can be invalidated during marshalString() call,
because it also adds new element in data vector and thus later
access to blob2 can cause crash.
Change-Id: I2de519c363193f34b249e7250a016397b7420882
Reviewed-on: https://gerrit.libreoffice.org/54613
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
(cherry picked from commit de9620dd4539397715dab3102d256f9d634fcb23)
Reviewed-on: https://gerrit.libreoffice.org/54637
Tested-by: Thorsten Behrens
diff --git a/basic/source/runtime/dllmgr-x64.cxx
b/basic/source/runtime/dllmgr-x64.cxx
index b78ff5da9681..8f2b0abdef8c 100644
--- a/basic/source/runtime/dllmgr-x64.cxx
+++ b/basic/source/runtime/dllmgr-x64.cxx
@@ -319,12 +319,12 @@ SbError marshal(
break;
case SbxSTRING:
{
-std::vector< char > * blob2 = data.newBlob();
void * p;
SbError e = marshalString(variable, special, data, &p);
if (e != ERRCODE_NONE) {
return e;
}
+std::vector< char >* blob2 = data.newBlob();
add(*blob2, p, 8, 0);
add(blob, address(*blob2), 8, offset);
break;
diff --git a/basic/source/runtime/dllmgr-x86.cxx
b/basic/source/runtime/dllmgr-x86.cxx
index fd41317c6a1f..9a5f4536c7e1 100644
--- a/basic/source/runtime/dllmgr-x86.cxx
+++ b/basic/source/runtime/dllmgr-x86.cxx
@@ -334,12 +334,12 @@ SbError marshal(
break;
case SbxSTRING:
{
-std::vector< char > * blob2 = data.newBlob();
void * p;
SbError e = marshalString(variable, special, data, &p);
if (e != ERRCODE_NONE) {
return e;
}
+std::vector< char > * blob2 = data.newBlob();
add(*blob2, p, 4, 0);
add(blob, address(*blob2), 4, offset);
break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/crsr/trvlfnfl.cxx | 29 +
1 file changed, 29 insertions(+)
New commits:
commit b3b169ddd99be71afe0da19afefcb9a6173a2e79
Author: Jim Raykowski
Date: Fri May 18 13:02:29 2018 -0800
tdf#115600 Display messages in FindBar for Footnote navigation
...and make Footnote navigation wrap
Change-Id: Ie4ab6a5d34ba75119f900f46a983a031b84ab51a
Reviewed-on: https://gerrit.libreoffice.org/54556
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/sw/source/core/crsr/trvlfnfl.cxx b/sw/source/core/crsr/trvlfnfl.cxx
index a46eb7c367b5..8c2104ff6a20 100644
--- a/sw/source/core/crsr/trvlfnfl.cxx
+++ b/sw/source/core/crsr/trvlfnfl.cxx
@@ -34,6 +34,7 @@
#include
#include
#include "callnk.hxx"
+#include
bool SwCursorShell::CallCursorFN( FNCursor fnCursor )
{
@@ -180,6 +181,12 @@ bool SwCursor::GotoNextFootnoteAnchor()
const SwTextFootnote* pTextFootnote = nullptr;
size_t nPos = 0;
+if( !rFootnoteArr.size() )
+{
+SvxSearchDialogWrapper::SetSearchLabel(
SearchLabel::NavElementNotFound );
+return false;
+}
+
if( rFootnoteArr.SeekEntry( GetPoint()->nNode, &nPos ))
{
// there is a footnote with this index, so search also for the next one
@@ -220,6 +227,14 @@ bool SwCursor::GotoNextFootnoteAnchor()
else if( nPos < rFootnoteArr.size() )
pTextFootnote = rFootnoteArr[ nPos ];
+if (pTextFootnote == nullptr)
+{
+pTextFootnote = rFootnoteArr[ 0 ];
+SvxSearchDialogWrapper::SetSearchLabel( SearchLabel::EndWrapped );
+}
+else
+SvxSearchDialogWrapper::SetSearchLabel( SearchLabel::Empty );
+
bool bRet = nullptr != pTextFootnote;
if( bRet )
{
@@ -239,6 +254,12 @@ bool SwCursor::GotoPrevFootnoteAnchor()
const SwTextFootnote* pTextFootnote = nullptr;
size_t nPos = 0;
+if( !rFootnoteArr.size() )
+{
+SvxSearchDialogWrapper::SetSearchLabel(
SearchLabel::NavElementNotFound );
+return false;
+}
+
if( rFootnoteArr.SeekEntry( GetPoint()->nNode, &nPos ) )
{
// there is a footnote with this index, so search also for the next one
@@ -277,6 +298,14 @@ bool SwCursor::GotoPrevFootnoteAnchor()
else if( nPos )
pTextFootnote = rFootnoteArr[ nPos-1 ];
+if( pTextFootnote == nullptr )
+{
+pTextFootnote = rFootnoteArr[ rFootnoteArr.size() - 1 ];
+SvxSearchDialogWrapper::SetSearchLabel( SearchLabel::StartWrapped );
+}
+else
+SvxSearchDialogWrapper::SetSearchLabel( SearchLabel::Empty );
+
bool bRet = nullptr != pTextFootnote;
if( bRet )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx svx/source
include/svx/sdr/table/tablecontroller.hxx |1 +
svx/source/table/tablecontroller.cxx | 12 +++-
2 files changed, 12 insertions(+), 1 deletion(-)
New commits:
commit 7c5f1caa775e6a3d178c7dae7171d3fca2874635
Author: Daniel
Date: Thu May 17 10:23:24 2018 -0300
tdf#117581 impress: fix selection overlay after moving table
Change-Id: Ie5afa4fbddf86c6692a7ed68af9ef990c2f9f487
Reviewed-on: https://gerrit.libreoffice.org/54493
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/include/svx/sdr/table/tablecontroller.hxx
b/include/svx/sdr/table/tablecontroller.hxx
index 3a8ec322aaeb..130d57a6da3e 100644
--- a/include/svx/sdr/table/tablecontroller.hxx
+++ b/include/svx/sdr/table/tablecontroller.hxx
@@ -177,6 +177,7 @@ private:
CellPos maCursorFirstPos;
CellPos maCursorLastPos;
bool mbCellSelectionMode;
+bool mbHasJustMerged;
CellPos maMouseDownPos;
bool mbLeftButtonDown;
std::unique_ptr mpSelectionOverlay;
diff --git a/svx/source/table/tablecontroller.cxx
b/svx/source/table/tablecontroller.cxx
index 3568fa743fd7..3241f2c7d304 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -172,6 +172,7 @@ SvxTableController::SvxTableController(
SdrView& rView,
const SdrTableObj& rObj)
: mbCellSelectionMode(false)
+,mbHasJustMerged(false)
,mbLeftButtonDown(false)
,mpSelectionOverlay(nullptr)
,mrView(rView)
@@ -1820,6 +1821,8 @@ void SvxTableController::MergeRange( sal_Int32 nFirstCol,
sal_Int32 nFirstRow, s
}
xRange->merge();
+mbHasJustMerged = true;
+setSelectedCells( maCursorFirstPos, maCursorFirstPos );
if( bUndo )
rModel.EndUndo();
@@ -2144,6 +2147,11 @@ void SvxTableController::onTableModified()
void SvxTableController::updateSelectionOverlay()
{
+// There is no need to update selection overlay after merging cells
+// since the selection overlay should remain the same
+if ( mbHasJustMerged )
+return;
+
destroySelectionOverlay();
if( mbCellSelectionMode )
{
@@ -2792,9 +2800,11 @@ IMPL_LINK_NOARG(SvxTableController, UpdateHdl, void*,
void)
if( aStart != maCursorFirstPos || aEnd != maCursorLastPos )
{
setSelectedCells( aStart, aEnd );
-updateSelectionOverlay();
}
}
+
+updateSelectionOverlay();
+mbHasJustMerged = false;
}
namespace
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx svx/source
include/svx/srchdlg.hxx |2 ++
svx/source/dialog/srchdlg.cxx | 24 ++--
2 files changed, 24 insertions(+), 2 deletions(-)
New commits:
commit 813397885356c0d63271472adb7d3800e4ac2ca8
Author: manujvashist
Date: Mon Mar 12 15:38:09 2018 +0530
tdf#98544 Other Options remain expanded if any checkbox is checked.
Change-Id: I2de79da0f0a6295d4d3c294d7cf6c123fca914bc
Reviewed-on: https://gerrit.libreoffice.org/51190
Reviewed-by: Manuj Vashist
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx
index 8da9ca5eb535..e879068db4f4 100644
--- a/include/svx/srchdlg.hxx
+++ b/include/svx/srchdlg.hxx
@@ -176,6 +176,7 @@ private:
VclPtr m_pCloseBtn;
VclPtr m_pIncludeDiacritics;
VclPtr m_pIncludeKashida;
+VclPtrm_pOtherOptionsExpander;
VclPtr m_pSelectionBtn;
VclPtr m_pRegExpBtn;
VclPtr m_pWildcardBtn;
@@ -262,6 +263,7 @@ private:
voidSaveToModule_Impl();
voidApplyTransliterationFlags_Impl( TransliterationFlags
nSettings );
+boolIsOtherOptionsExpanded();
};
#endif
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 71f65c825506..6a999380ee7a 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -309,6 +309,7 @@ SvxSearchDialog::SvxSearchDialog( vcl::Window* pParent,
SfxChildWindow* pChildWi
get(m_pCloseBtn, "close");
+get(m_pOtherOptionsExpander, "OptionsExpander");
get(m_pIncludeDiacritics, "includediacritics");
get(m_pIncludeKashida, "includekashida");
get(m_pSelectionBtn, "selection");
@@ -391,6 +392,7 @@ void SvxSearchDialog::dispose()
m_pCloseBtn.clear();
m_pIncludeDiacritics.clear();
m_pIncludeKashida.clear();
+m_pOtherOptionsExpander.clear();
m_pSelectionBtn.clear();
m_pReplaceBackwardsCB.clear();
m_pRegExpBtn.clear();
@@ -612,6 +614,22 @@ void SvxSearchDialog::ApplyTransliterationFlags_Impl(
TransliterationFlags nSett
}
+bool SvxSearchDialog::IsOtherOptionsExpanded()
+{
+return m_pReplaceBackwardsCB->IsChecked() ||
+ m_pSelectionBtn->IsChecked() ||
+ m_pRegExpBtn->IsChecked() ||
+ m_pLayoutBtn->IsChecked() ||
+ m_pSimilarityBox->IsChecked() ||
+ m_pJapMatchFullHalfWidthCB->IsChecked() ||
+ m_pJapOptionsCB->IsChecked() ||
+ m_pWildcardBtn->IsChecked() ||
+ m_pNotesBtn->IsChecked() ||
+ m_pIncludeKashida->IsChecked() ||
+ m_pIncludeDiacritics->IsChecked();
+}
+
+
void SvxSearchDialog::Activate()
{
// apply possible transliteration changes of the SvxSearchItem member
@@ -806,11 +824,13 @@ void SvxSearchDialog::Init_Impl( bool bSearchPattern )
if (m_pNotesBtn->IsChecked())
m_pLayoutBtn->Disable();
m_pSimilarityBox->Check( pSearchItem->IsLevenshtein() );
-if( m_pJapOptionsCB->IsVisible() )
+if ( m_pJapOptionsCB->IsVisible() )
m_pJapOptionsCB->Check( pSearchItem->IsUseAsianOptions() );
m_pIncludeDiacritics->Check( !aOpt.IsIgnoreDiacritics_CTL() );
-if (m_pIncludeKashida->IsVisible())
+if ( m_pIncludeKashida->IsVisible() )
m_pIncludeKashida->Check( !aOpt.IsIgnoreKashida_CTL() );
+if ( SvxSearchDialog::IsOtherOptionsExpanded() )
+m_pOtherOptionsExpander->set_expanded( true );
ApplyTransliterationFlags_Impl( pSearchItem->GetTransliterationFlags() );
ShowOptionalControls_Impl();
___
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/utlui/content.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit e3ffa913e5729766803a76b765ab2bb3436c12f6
Author: Jim Raykowski
Date: Sun May 6 11:19:18 2018 -0800
Improve placement of tdf#117024/tdf#117283 patches
no need to repeatedly call so relocate the patches
Change-Id: I87f8be3c1802924e76134d3221a72b04c1a03e54
Reviewed-on: https://gerrit.libreoffice.org/53919
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/sw/source/uibase/utlui/content.cxx
b/sw/source/uibase/utlui/content.cxx
index 601c017d7f41..e9f0880f7fe3 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -3480,12 +3480,12 @@ void SwContentTree::GotoContent(SwContent* pCnt)
if( pPV )
{
pDrawView->MarkObj( pTemp, pPV );
-m_pActiveShell->EnterStdMode();
-bSel = true;
}
}
}
m_pActiveShell->GetNavigationMgr().addEntry(aPos);
+m_pActiveShell->EnterStdMode();
+bSel = true;
}
}
break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/gbuild solenv/sanitizers
solenv/gbuild/UIConfig.mk |6 +-- solenv/sanitizers/ui/cui.suppr | 53 solenv/sanitizers/ui/dbaccess.suppr | 11 + solenv/sanitizers/ui/desktop.suppr |9 solenv/sanitizers/ui/filter.suppr |2 + solenv/sanitizers/ui/modules/scalc.suppr|9 solenv/sanitizers/ui/modules/schart.suppr | 27 ++ solenv/sanitizers/ui/modules/sdraw.suppr|2 - solenv/sanitizers/ui/modules/simpress.suppr | 15 +++ solenv/sanitizers/ui/modules/smath.suppr|3 + solenv/sanitizers/ui/modules/swriter.suppr | 32 solenv/sanitizers/ui/sfx.suppr |3 + solenv/sanitizers/ui/svt.suppr |2 + solenv/sanitizers/ui/svx.suppr |8 solenv/sanitizers/ui/vcl.suppr |3 + 15 files changed, 181 insertions(+), 4 deletions(-) New commits: commit d5bb7db998c4c629ec61b9475c86c130e57787f3 Author: Samuel Thibault Date: Fri May 11 14:01:50 2018 +0200 gla11y: Enable warnings for more widgets missing a label Namely GtkSpinButton GtkSpinner GtkProgressBar Change-Id: I00c1d03cde43d23cee5e8b502a03284ac81967a5 Reviewed-on: https://gerrit.libreoffice.org/54131 Tested-by: Jenkins Reviewed-by: Thorsten Behrens diff --git a/solenv/gbuild/UIConfig.mk b/solenv/gbuild/UIConfig.mk index 154e9be51149..3203c22203c2 100644 --- a/solenv/gbuild/UIConfig.mk +++ b/solenv/gbuild/UIConfig.mk @@ -175,9 +175,9 @@ gb_UIConfig_gla11y_PARAMETERS += --disable-type no-labelled-by # Clearly need labelling gb_UIConfig_gla11y_PARAMETERS += --enable-specific no-labelled-by.GtkScale gb_UIConfig_gla11y_PARAMETERS += --enable-specific no-labelled-by.GtkEntry -#gb_UIConfig_gla11y_PARAMETERS += --enable-specific no-labelled-by.GtkSpinButton -#gb_UIConfig_gla11y_PARAMETERS += --enable-specific no-labelled-by.GtkSpinner -#gb_UIConfig_gla11y_PARAMETERS += --enable-specific no-labelled-by.GtkProgressBar +gb_UIConfig_gla11y_PARAMETERS += --enable-specific no-labelled-by.GtkSpinButton +gb_UIConfig_gla11y_PARAMETERS += --enable-specific no-labelled-by.GtkSpinner +gb_UIConfig_gla11y_PARAMETERS += --enable-specific no-labelled-by.GtkProgressBar #gb_UIConfig_gla11y_PARAMETERS += --enable-specific no-labelled-by.svxcorelo-SvxColorListBox #gb_UIConfig_gla11y_PARAMETERS += --enable-specific no-labelled-by.svxcorelo-SvxLanguageBox #gb_UIConfig_gla11y_PARAMETERS += --enable-specific no-labelled-by.sfxlo-SvxCharView diff --git a/solenv/sanitizers/ui/cui.suppr b/solenv/sanitizers/ui/cui.suppr index b0f9d263ad52..a9dcaf2ae43f 100644 --- a/solenv/sanitizers/ui/cui.suppr +++ b/solenv/sanitizers/ui/cui.suppr @@ -5,6 +5,9 @@ cui/uiconfig/ui/aboutconfigdialog.ui://GtkLabel[@id='type'] orphan-label cui/uiconfig/ui/aboutconfigdialog.ui://GtkLabel[@id='value'] orphan-label cui/uiconfig/ui/assigncomponentdialog.ui://GtkLabel[@id='label1'] orphan-label cui/uiconfig/ui/assigncomponentdialog.ui://GtkEntry[@id='methodEntry'] no-labelled-by +cui/uiconfig/ui/bitmaptabpage.ui://GtkLabel[@id='label4'] orphan-label +cui/uiconfig/ui/bitmaptabpage.ui://GtkLabel[@id='label9'] orphan-label +cui/uiconfig/ui/bitmaptabpage.ui://GtkSpinButton[@id='tileoffmtr:0%'] no-labelled-by cui/uiconfig/ui/blackorwhitelistentrydialog.ui://GtkEntry[@id='osversion'] no-labelled-by cui/uiconfig/ui/blackorwhitelistentrydialog.ui://GtkEntry[@id='platformvendor'] no-labelled-by cui/uiconfig/ui/blackorwhitelistentrydialog.ui://GtkEntry[@id='device'] no-labelled-by @@ -18,8 +21,34 @@ cui/uiconfig/ui/blackorwhitelistentrydialog.ui://GtkLabel[@id='bledittitle'] orp cui/uiconfig/ui/blackorwhitelistentrydialog.ui://GtkLabel[@id='bladdtitle'] orphan-label cui/uiconfig/ui/blackorwhitelistentrydialog.ui://GtkLabel[@id='wledittitle'] orphan-label cui/uiconfig/ui/blackorwhitelistentrydialog.ui://GtkLabel[@id='wladdtitle'] orphan-label +cui/uiconfig/ui/breaknumberoption.ui://GtkSpinButton[@id='beforebreak'] no-labelled-by +cui/uiconfig/ui/breaknumberoption.ui://GtkSpinButton[@id='afterbreak'] no-labelled-by +cui/uiconfig/ui/breaknumberoption.ui://GtkSpinButton[@id='wordlength'] no-labelled-by +cui/uiconfig/ui/colorpage.ui://GtkLabel[@id='label18'] orphan-label +cui/uiconfig/ui/colorpage.ui://GtkSpinButton[@id='R_preset-nospin'] no-labelled-by +cui/uiconfig/ui/colorpage.ui://GtkSpinButton[@id='G_preset-nospin'] no-labelled-by +cui/uiconfig/ui/colorpage.ui://GtkSpinButton[@id='B_preset-nospin'] no-labelled-by +cui/uiconfig/ui/colorpage.ui://GtkLabel[@id='label17'] orphan-label +cui/uiconfig/ui/colorpage.ui://GtkSpinButton[@id='C_preset-nospin:0%'] no-labelled-by +cui/uiconfig/ui/colorpage.ui://GtkSpinButton[@id='M_preset-nospin:0%'] no-labelled-by +cui/uiconfig/ui/colorpage.ui://GtkSpinButton[@id='Y_preset-nospin:0%'] no-labelled-by +cui/uiconfig/ui/colorpage.ui://GtkSpinButton[@id='K_preset-nospin:0%'] no-labelled-by +cui/uiconfi
[Libreoffice-commits] core.git: sw/source
sw/source/core/crsr/crstrvl.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 86d2efcaf3e66474e674f505fd6ca8062ba094cc
Author: Jim Raykowski
Date: Wed May 9 18:23:33 2018 -0800
fix navigate by previous headings does not wrap when cursor position
...is before first heading
unreported bug fix for a patch I made for tdf#115600
Change-Id: I7ccaad387c5ea344cda71d3cc1f185e590a1f586
Reviewed-on: https://gerrit.libreoffice.org/54059
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index 3864b07e9cf5..63690c02c182 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -992,7 +992,8 @@ bool SwCursorShell::GotoPrevOutline()
SwNode* pNd = &(pCursor->GetNode());
SwOutlineNodes::size_type nPos;
bool bRet = false;
-if ( rNds.GetOutLineNds().Seek_Entry(pNd, &nPos) && nPos == 0 )
+rNds.GetOutLineNds().Seek_Entry(pNd, &nPos);
+if ( nPos == 0 )
{
nPos = rNds.GetOutLineNds().size();
SvxSearchDialogWrapper::SetSearchLabel( SearchLabel::StartWrapped );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: osx/soffice.xcodeproj
osx/soffice.xcodeproj/project.pbxproj | 26 ++
1 file changed, 26 insertions(+)
New commits:
commit 40f28cbed07362d54533e4bbfe8f870b64e4
Author: Tor Lillqvist
Date: Mon May 21 17:06:22 2018 +0300
Add sal/osl/unx/file.cxx for debugging convenience
Change-Id: Ibfc8995c4d35c33fe203b9779b10a182cf5a4294
diff --git a/osx/soffice.xcodeproj/project.pbxproj
b/osx/soffice.xcodeproj/project.pbxproj
index 090873794b29..1c7dd9704e3b 100644
--- a/osx/soffice.xcodeproj/project.pbxproj
+++ b/osx/soffice.xcodeproj/project.pbxproj
@@ -15,6 +15,7 @@
BE02FCEA171335B80069F37F /* util.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = util.cxx; path
= ../jvmfwk/plugins/sunmajor/pluginlib/util.cxx; sourceTree = ""; };
BE02FCEB171335B80069F37F /* vendorbase.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
vendorbase.cxx; path = ../jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx;
sourceTree = ""; };
BE02FCEC171335B80069F37F /* vendorlist.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
vendorlist.cxx; path = ../jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx;
sourceTree = ""; };
+ BE09705E20B2E1E000A6C26A /* file.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = file.cxx; path
= ../../../../sal/osl/unx/file.cxx; sourceTree = ""; };
BE145F5C17B24BA4004CBBBA /* sunjavaplugin.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
sunjavaplugin.cxx; path =
../jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx; sourceTree = "";
};
BE2DACF1182D0CBB00A4D2F7 /* formulagroupcl.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
formulagroupcl.cxx; path = ../sc/source/core/opencl/formulagroupcl.cxx;
sourceTree = ""; };
BE2DACF2182D0CBB00A4D2F7 /* op_database.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
op_database.cxx; path = ../sc/source/core/opencl/op_database.cxx; sourceTree =
""; };
@@ -266,6 +267,30 @@
/* End PBXFileReference section */
/* Begin PBXGroup section */
+ BE09705B20B2E19A00A6C26A /* sal */ = {
+ isa = PBXGroup;
+ children = (
+ BE09705C20B2E1AC00A6C26A /* osl */,
+ );
+ path = sal;
+ sourceTree = "";
+ };
+ BE09705C20B2E1AC00A6C26A /* osl */ = {
+ isa = PBXGroup;
+ children = (
+ BE09705D20B2E1B300A6C26A /* unx */,
+ );
+ path = osl;
+ sourceTree = "";
+ };
+ BE09705D20B2E1B300A6C26A /* unx */ = {
+ isa = PBXGroup;
+ children = (
+ BE09705E20B2E1E000A6C26A /* file.cxx */,
+ );
+ path = unx;
+ sourceTree = "";
+ };
BE2DACF9182FAB3800A4D2F7 /* window */ = {
isa = PBXGroup;
children = (
@@ -623,6 +648,7 @@
BEC3D9171710B0390030AD56 = {
isa = PBXGroup;
children = (
+ BE09705B20B2E19A00A6C26A /* sal */,
BEB6E30B1FFF984200B0BDB0 /* avmedia */,
BE2DAD2B183148BE00A4D2F7 /* formula */,
BE2DAD28182FAB7900A4D2F7 /* sw */,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/source chart2/uiconfig
chart2/source/controller/dialogs/tp_ChartType.cxx | 87 ++
chart2/uiconfig/ui/smoothlinesdlg.ui | 29 ++-
2 files changed, 49 insertions(+), 67 deletions(-)
New commits:
commit 8a5d6f832d675f0c02c0946e44a2ea7e6a7b1618
Author: Caolán McNamara
Date: Mon May 21 10:41:03 2018 +0100
weld SplinePropertiesDialog
Change-Id: I1df0f2bce86da698205c5b36217f935e0e971de5
Reviewed-on: https://gerrit.libreoffice.org/54619
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx
b/chart2/source/controller/dialogs/tp_ChartType.cxx
index 7005fa80b8cb..ecd644fd8fc1 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -31,6 +31,7 @@
#include
#include
+#include
#include
namespace chart
@@ -301,50 +302,37 @@ IMPL_LINK_NOARG( GL3DResourceGroup, SettingChangedHdl,
CheckBox&, void )
m_pChangeListener->stateChanged(this);
}
-class SplinePropertiesDialog : public ModalDialog
+class SplinePropertiesDialog : public weld::GenericDialogController
{
public:
-explicit SplinePropertiesDialog( vcl::Window* pParent );
-virtual ~SplinePropertiesDialog() override { disposeOnce(); }
-virtual void dispose() override;
+explicit SplinePropertiesDialog(weld::Window* pParent);
void fillControls( const ChartTypeParameter& rParameter );
void fillParameter( ChartTypeParameter& rParameter, bool bSmoothLines );
private:
-DECL_LINK( SplineTypeListBoxHdl, ListBox&, void );
+DECL_LINK(SplineTypeListBoxHdl, weld::ComboBoxText&, void);
private:
-VclPtr m_pLB_Spline_Type;
-
-VclPtr m_pMF_SplineResolution;
-VclPtrm_pFT_SplineOrder;
-VclPtr m_pMF_SplineOrder;
+std::unique_ptr m_xLB_Spline_Type;
+std::unique_ptr m_xMF_SplineResolution;
+std::unique_ptr m_xFT_SplineOrder;
+std::unique_ptr m_xMF_SplineOrder;
};
const sal_uInt16 CUBIC_SPLINE_POS = 0;
const sal_uInt16 B_SPLINE_POS = 1;
-SplinePropertiesDialog::SplinePropertiesDialog( vcl::Window* pParent )
-: ModalDialog( pParent, "SmoothLinesDialog",
"modules/schart/ui/smoothlinesdlg.ui")
+SplinePropertiesDialog::SplinePropertiesDialog(weld::Window* pParent)
+: GenericDialogController(pParent, "modules/schart/ui/smoothlinesdlg.ui",
"SmoothLinesDialog")
+, m_xLB_Spline_Type(m_xBuilder->weld_combo_box_text("SplineTypeComboBox"))
+,
m_xMF_SplineResolution(m_xBuilder->weld_spin_button("ResolutionSpinbutton"))
+, m_xFT_SplineOrder(m_xBuilder->weld_label("PolynomialsLabel"))
+, m_xMF_SplineOrder(m_xBuilder->weld_spin_button("PolynomialsSpinButton"))
{
-get(m_pLB_Spline_Type, "SplineTypeComboBox");
-get(m_pMF_SplineResolution, "ResolutionSpinbutton");
-get(m_pFT_SplineOrder, "PolynomialsLabel");
-get(m_pMF_SplineOrder, "PolynomialsSpinButton");
-
-SetText( SchResId( STR_DLG_SMOOTH_LINE_PROPERTIES ) );
+m_xDialog->set_title(SchResId(STR_DLG_SMOOTH_LINE_PROPERTIES));
-m_pLB_Spline_Type->SetSelectHdl( LINK (this, SplinePropertiesDialog,
SplineTypeListBoxHdl ) );
-}
-
-void SplinePropertiesDialog::dispose()
-{
-m_pLB_Spline_Type.clear();
-m_pMF_SplineResolution.clear();
-m_pFT_SplineOrder.clear();
-m_pMF_SplineOrder.clear();
-ModalDialog::dispose();
+m_xLB_Spline_Type->connect_changed(LINK(this, SplinePropertiesDialog,
SplineTypeListBoxHdl));
}
void SplinePropertiesDialog::fillControls( const ChartTypeParameter&
rParameter )
@@ -352,38 +340,40 @@ void SplinePropertiesDialog::fillControls( const
ChartTypeParameter& rParameter
switch(rParameter.eCurveStyle)
{
case CurveStyle_CUBIC_SPLINES:
-m_pLB_Spline_Type->SelectEntryPos(CUBIC_SPLINE_POS);
+m_xLB_Spline_Type->set_active(CUBIC_SPLINE_POS);
break;
case CurveStyle_B_SPLINES:
-m_pLB_Spline_Type->SelectEntryPos(B_SPLINE_POS);
+m_xLB_Spline_Type->set_active(B_SPLINE_POS);
break;
default:
-m_pLB_Spline_Type->SelectEntryPos(CUBIC_SPLINE_POS);
+m_xLB_Spline_Type->set_active(CUBIC_SPLINE_POS);
break;
}
-m_pMF_SplineOrder->SetValue( rParameter.nSplineOrder );
-m_pMF_SplineResolution->SetValue( rParameter.nCurveResolution );
+m_xMF_SplineOrder->set_value( rParameter.nSplineOrder );
+m_xMF_SplineResolution->set_value( rParameter.nCurveResolution );
//dis/enabling
-m_pFT_SplineOrder->Enable(m_pLB_Spline_Type->GetSelectedEntryPos() ==
B_SPLINE_POS);
-m_pMF_SplineOrder->Enable(m_pLB_Spline_Type->GetSelectedEntryPos() ==
B_SPLINE_POS);
+m_xFT_SplineOrder->set_sensitive(m_xLB_Spline_Type->get_active() ==
B_SPLINE_POS);
+m_xMF_SplineOrder->set_sensitive(m_xLB_Spline_Type->get_active() ==
B_SPLINE_POS);
}
+
void SplinePropertiesDialog::fillParameter( ChartTypeParameter& rParameter,
bool bSmoothLines )
{
if(!b
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 03341d4e9e4341eb119d500e97de0d86804c3fcb Author: Olivier Hallot Date: Mon May 21 11:36:17 2018 -0300 Updated core Project: help 1d9b92c466b2b920ff46987d1668f4494b9f743a Fix media path for en-US Change-Id: If3a9667fa3dd8c1007132448a23e75d66279a192 Reviewed-on: https://gerrit.libreoffice.org/54640 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index ffe3c4dc3694..1d9b92c466b2 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit ffe3c4dc36948c44fc17b860c3b5020131cd391c +Subproject commit 1d9b92c466b2b920ff46987d1668f4494b9f743a ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/online_transform.xsl
help3xsl/online_transform.xsl |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1d9b92c466b2b920ff46987d1668f4494b9f743a Author: Olivier Hallot Date: Mon May 21 11:36:17 2018 -0300 Fix media path for en-US Change-Id: If3a9667fa3dd8c1007132448a23e75d66279a192 Reviewed-on: https://gerrit.libreoffice.org/54640 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/help3xsl/online_transform.xsl b/help3xsl/online_transform.xsl index 9839891ba..899526f19 100644 --- a/help3xsl/online_transform.xsl +++ b/help3xsl/online_transform.xsl @@ -1337,7 +1337,7 @@ - + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/source chart2/uiconfig
chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx | 87 +--
chart2/source/controller/inc/ChartController.hxx |1
chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx | 25 +---
chart2/source/controller/main/ChartController.cxx|9 +
chart2/source/controller/main/ChartController_Insert.cxx | 12 +-
chart2/uiconfig/ui/insertaxisdlg.ui |8 +
chart2/uiconfig/ui/insertgriddlg.ui |8 +
7 files changed, 74 insertions(+), 76 deletions(-)
New commits:
commit e4d95fa557179d787fd78211b76dd7c311940762
Author: Caolán McNamara
Date: Mon May 21 10:59:34 2018 +0100
weld SchAxisDlg
Change-Id: I18441b4fc06b69caf12dc73e5042ad2b609a7cc5
Reviewed-on: https://gerrit.libreoffice.org/54620
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
index 74f2ce9b8831..9a227f59b2f5 100644
--- a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
@@ -40,74 +40,55 @@ InsertAxisOrGridDialogData::InsertAxisOrGridDialogData()
// SchAxisDlg
-SchAxisDlg::SchAxisDlg(vcl::Window* pWindow,
+SchAxisDlg::SchAxisDlg(weld::Window* pWindow,
const InsertAxisOrGridDialogData& rInput, bool bAxisDlg)
-: ModalDialog(pWindow,
- bAxisDlg ?
- OUString("InsertAxisDialog") :
- OUString("InsertGridDialog"),
+: GenericDialogController(pWindow,
bAxisDlg ?
OUString("modules/schart/ui/insertaxisdlg.ui") :
- OUString("modules/schart/ui/insertgriddlg.ui"))
+ OUString("modules/schart/ui/insertgriddlg.ui"),
+ bAxisDlg ?
+ OString("InsertAxisDialog") :
+ OString("InsertGridDialog"))
+, m_xCbPrimaryX(m_xBuilder->weld_check_button("primaryX"))
+, m_xCbPrimaryY(m_xBuilder->weld_check_button("primaryY"))
+, m_xCbPrimaryZ(m_xBuilder->weld_check_button("primaryZ"))
+, m_xCbSecondaryX(m_xBuilder->weld_check_button("secondaryX"))
+, m_xCbSecondaryY(m_xBuilder->weld_check_button("secondaryY"))
+, m_xCbSecondaryZ(m_xBuilder->weld_check_button("secondaryZ"))
{
-get(m_pCbPrimaryX, "primaryX");
-get(m_pCbPrimaryY, "primaryY");
-get(m_pCbPrimaryZ, "primaryZ");
-get(m_pCbSecondaryX, "secondaryX");
-get(m_pCbSecondaryY, "secondaryY");
-get(m_pCbSecondaryZ, "secondaryZ");
-
if (bAxisDlg)
{
-
//todo: remove if secondary z axis are possible somewhere
-m_pCbSecondaryZ->Hide();
+m_xCbSecondaryZ->hide();
}
-m_pCbPrimaryX->Check( rInput.aExistenceList[0] );
-m_pCbPrimaryY->Check( rInput.aExistenceList[1] );
-m_pCbPrimaryZ->Check( rInput.aExistenceList[2] );
-m_pCbSecondaryX->Check( rInput.aExistenceList[3] );
-m_pCbSecondaryY->Check( rInput.aExistenceList[4] );
-m_pCbSecondaryZ->Check( rInput.aExistenceList[5] );
-
-m_pCbPrimaryX->Enable( rInput.aPossibilityList[0] );
-m_pCbPrimaryY->Enable( rInput.aPossibilityList[1] );
-m_pCbPrimaryZ->Enable( rInput.aPossibilityList[2] );
-m_pCbSecondaryX->Enable( rInput.aPossibilityList[3] );
-m_pCbSecondaryY->Enable( rInput.aPossibilityList[4] );
-m_pCbSecondaryZ->Enable( rInput.aPossibilityList[5] );
-}
-
-SchAxisDlg::~SchAxisDlg()
-{
-disposeOnce();
-}
-
-void SchAxisDlg::dispose()
-{
-m_pCbPrimaryX.clear();
-m_pCbPrimaryY.clear();
-m_pCbPrimaryZ.clear();
-m_pCbSecondaryX.clear();
-m_pCbSecondaryY.clear();
-m_pCbSecondaryZ.clear();
-ModalDialog::dispose();
+m_xCbPrimaryX->set_active( rInput.aExistenceList[0] );
+m_xCbPrimaryY->set_active( rInput.aExistenceList[1] );
+m_xCbPrimaryZ->set_active( rInput.aExistenceList[2] );
+m_xCbSecondaryX->set_active( rInput.aExistenceList[3] );
+m_xCbSecondaryY->set_active( rInput.aExistenceList[4] );
+m_xCbSecondaryZ->set_active( rInput.aExistenceList[5] );
+
+m_xCbPrimaryX->set_sensitive( rInput.aPossibilityList[0] );
+m_xCbPrimaryY->set_sensitive( rInput.aPossibilityList[1] );
+m_xCbPrimaryZ->set_sensitive( rInput.aPossibilityList[2] );
+m_xCbSecondaryX->set_sensitive( rInput.aPossibilityList[3] );
+m_xCbSecondaryY->set_sensitive( rInput.aPossibilityList[4] );
+m_xCbSecondaryZ->set_sensitive( rInput.aPossibilityList[5] );
}
-
void SchAxisDlg::getResult( InsertAxisOrGridDialogData& rOutput )
{
-rOutput.aExistenceList[0]=m_pCbPrimaryX->IsChecked();
-rOutput.aExistenceList[1]=m_pCbPrimaryY->IsChecked();
-rOutput.aExistenceList[2]=m_pCbPrimaryZ->IsChecked();
-rOutput.aExistenceList[3]=m_pCbSecondaryX->IsChecked();
-rOutput.aExistenceList[4]=m_pCbSecondaryY->IsChecked();
-rOutput.aExistenceList[5]=m_pCbSecondaryZ->IsChecked();
+rOutput.aExistenceList[0]=m_xCbPrimaryX->get_active();
+
[Libreoffice-commits] online.git: 2 commits - loleaflet/css loleaflet/src
loleaflet/css/loleaflet.css|4
loleaflet/src/control/Control.LokDialog.js |8 +++-
2 files changed, 11 insertions(+), 1 deletion(-)
New commits:
commit 32eff8dd6b15df9f541e2988a596876c95f45e84
Author: Pranav Kant
Date: Tue Mar 27 15:13:41 2018 +0200
lokdialog: Don't show the title bar when no title was provided.
Change-Id: If08dc81e88d35a924d10695a38b138f6403e58bd
Reviewed-on: https://gerrit.libreoffice.org/51955
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index eae3e4f63..bcaf442f5 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -347,6 +347,10 @@ body {
text-indent: 1px;
}
+.lokdialog_container.lokdialog_notitle .ui-dialog-titlebar {
+ display: none;
+}
+
.lokdialog_container.ui-dialog.ui-widget-content {
padding: 0px;
overflow: visible;
diff --git a/loleaflet/src/control/Control.LokDialog.js
b/loleaflet/src/control/Control.LokDialog.js
index 19e936970..61c73abbc 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -246,6 +246,10 @@ L.Control.LokDialog = L.Control.extend({
L.DomEvent.on(dialogCanvas, 'contextmenu',
L.DomEvent.preventDefault);
+ var dialogClass = 'lokdialog_container';
+ if (!title)
+ dialogClass += ' lokdialog_notitle';
+
var that = this;
$(dialogContainer).dialog({
minWidth: width,
@@ -254,7 +258,7 @@ L.Control.LokDialog = L.Control.extend({
modal: false,
closeOnEscape: true,
resizable: false,
- dialogClass: 'lokdialog_container',
+ dialogClass: dialogClass,
close: function() {
that._onDialogClose(that._toRawDlgId(strDlgId),
true);
}
commit a35def2f74c8cef11171c9065960dc3b6fdc2fbe
Author: Pranav Kant
Date: Thu Jan 18 12:27:52 2018 +0530
loleaflet: No native contextmenu options on dialog canvas
Dialogs can have their own context menu invoked upon right click. And
they already works (i.e. are tunneled properly); so, let's use them.
Change-Id: I7d504923c272227dca94058995456d89e1079c29
(cherry picked from commit 63e089ec22150524d040f544538f8455e62a1887)
Reviewed-on: https://gerrit.libreoffice.org/48087
Reviewed-by: Jan Holesovsky
Tested-by: Jan Holesovsky
diff --git a/loleaflet/src/control/Control.LokDialog.js
b/loleaflet/src/control/Control.LokDialog.js
index 4dfb1ed4f..19e936970 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -244,6 +244,8 @@ L.Control.LokDialog = L.Control.extend({
dialogCanvas.height = height;
dialogCanvas.id = strDlgId + '-canvas';
+ L.DomEvent.on(dialogCanvas, 'contextmenu',
L.DomEvent.preventDefault);
+
var that = this;
$(dialogContainer).dialog({
minWidth: width,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extensions/source
extensions/source/ole/servprov.cxx | 25 ++---
extensions/source/ole/servprov.hxx | 13 ++---
2 files changed, 16 insertions(+), 22 deletions(-)
New commits:
commit 17ad73232ff604329e6532817570cb40342857e8
Author: Tor Lillqvist
Date: Tue Feb 13 00:08:41 2018 +0200
In fact it's simpler to not have m_guid fields in these two classes at all
We can just pass the GUID as parameter to the single member function
registerClass() that needs it. This perhaps means the same class can
be used in more cases, also for objects/classes that aren't going to
be registered and don't need any GUID.
Change-Id: I28703190c52b14236c6f613dd4acbe359c075f5c
Reviewed-on: https://gerrit.libreoffice.org/54622
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist
diff --git a/extensions/source/ole/servprov.cxx
b/extensions/source/ole/servprov.cxx
index 60959ae323c4..78d59292368f 100644
--- a/extensions/source/ole/servprov.cxx
+++ b/extensions/source/ole/servprov.cxx
@@ -44,9 +44,8 @@ using namespace com::sun::star::bridge::ModelDependent;
DEFINE_GUID(OID_ServiceManager, 0x82154420, 0xfbf, 0x11d4, 0x83, 0x13, 0x0,
0x50, 0x4, 0x52, 0x6a, 0xb4);
ProviderOleWrapper::ProviderOleWrapper(const Reference&
smgr,
- const Reference&
xSFact, GUID const * pGuid)
+ const Reference&
xSFact)
: m_xSingleServiceFactory(xSFact),
- m_guid(*pGuid),
m_smgr( smgr)
{
Reference xInt =
smgr->createInstance("com.sun.star.bridge.oleautomation.BridgeSupplier");
@@ -63,14 +62,14 @@ ProviderOleWrapper::~ProviderOleWrapper()
{
}
-bool ProviderOleWrapper::registerClass()
+bool ProviderOleWrapper::registerClass(GUID const * pGuid)
{
HRESULT hresult;
o2u_attachCurrentThread();
hresult = CoRegisterClassObject(
-m_guid,
+*pGuid,
this,
CLSCTX_INPROC_SERVER | CLSCTX_LOCAL_SERVER,
REGCLS_MULTIPLEUSE,
@@ -171,11 +170,9 @@ STDMETHODIMP ProviderOleWrapper::LockServer(int /*fLock*/)
}
OneInstanceOleWrapper::OneInstanceOleWrapper( const
Reference& smgr,
- const Reference&
xInst,
- GUID const * pGuid )
+ const Reference&
xInst )
: m_refCount(0)
, m_xInst(xInst)
-, m_guid(*pGuid)
, m_factoryHandle(0)
, m_smgr(smgr)
{
@@ -192,14 +189,14 @@ OneInstanceOleWrapper::~OneInstanceOleWrapper()
{
}
-bool OneInstanceOleWrapper::registerClass()
+bool OneInstanceOleWrapper::registerClass(GUID const * pGuid)
{
HRESULT hresult;
o2u_attachCurrentThread();
hresult = CoRegisterClassObject(
-m_guid,
+*pGuid,
this,
CLSCTX_INPROC_SERVER | CLSCTX_LOCAL_SERVER,
REGCLS_MULTIPLEUSE,
@@ -617,24 +614,22 @@ css::uno::Sequence
OleServer::getSupportedServiceNames()
bool OleServer::provideService(const Reference& xSFact,
GUID const * guid)
{
-IClassFactoryWrapper* pFac = new ProviderOleWrapper( m_smgr, xSFact, guid);
+IClassFactoryWrapper* pFac = new ProviderOleWrapper( m_smgr, xSFact );
pFac->AddRef();
-
m_wrapperList.push_back(pFac);
-return pFac->registerClass();
+return pFac->registerClass(guid);
}
bool OleServer::provideInstance(const Reference& xInst, GUID const
* guid)
{
-IClassFactoryWrapper* pFac =
-new OneInstanceOleWrapper( m_smgr, xInst, guid );
+IClassFactoryWrapper* pFac = new OneInstanceOleWrapper( m_smgr, xInst );
pFac->AddRef();
m_wrapperList.push_back(pFac);
-return pFac->registerClass();
+return pFac->registerClass(guid);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/ole/servprov.hxx
b/extensions/source/ole/servprov.hxx
index d7caa9785df0..f8b6ad75d2c3 100644
--- a/extensions/source/ole/servprov.hxx
+++ b/extensions/source/ole/servprov.hxx
@@ -53,7 +53,7 @@ class IClassFactoryWrapper : public IClassFactory
{
public:
-virtual bool registerClass() = 0;
+virtual bool registerClass(GUID const * pGuid) = 0;
virtual bool deregisterClass() = 0;
protected:
@@ -79,10 +79,10 @@ class ProviderOleWrapper : public IClassFactoryWrapper
public:
ProviderOleWrapper( const Reference& smgr,
-const Reference& xSFactory,
GUID const * pGuid);
+const Reference& xSFactory);
virtual ~ProviderOleWrapper();
-bool registerClass() override;
+bool registerClass(GUID const * pGuid) override;
bool deregisterClass() override;
/* IUnknown methods */
@@ -98,7 +98,6 @@ protected:
oslInterlockedCount m_refCount;
Reference m_xSingleServiceFactory;
-const GUID m_guid;
DWORD m_factoryHandle;
Reference m_bridgeSupplier;
Reference m_sm
[Libreoffice-commits] core.git: reportdesign/source reportdesign/uiconfig
reportdesign/source/ui/dlg/DateTime.cxx | 143
reportdesign/source/ui/inc/DateTime.hxx | 39 ++---
reportdesign/source/ui/report/ReportController.cxx |4
reportdesign/uiconfig/dbreport/ui/datetimedialog.ui | 16 +-
4 files changed, 88 insertions(+), 114 deletions(-)
New commits:
commit 4da8aef20416d0e1320a1ee455e2edc2ae61f9ac
Author: Caolán McNamara
Date: Mon May 21 12:05:55 2018 +0100
weld ODateTimeDialog
Change-Id: Id93147f1d442e1e5f1cfba8ef2f9e476f4f6d728
Reviewed-on: https://gerrit.libreoffice.org/54623
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/reportdesign/source/ui/dlg/DateTime.cxx
b/reportdesign/source/ui/dlg/DateTime.cxx
index c1b4e23e01b9..69f5cd531e05 100644
--- a/reportdesign/source/ui/dlg/DateTime.cxx
+++ b/reportdesign/source/ui/dlg/DateTime.cxx
@@ -40,25 +40,20 @@ using namespace ::comphelper;
// class ODateTimeDialog
-ODateTimeDialog::ODateTimeDialog( vcl::Window* _pParent
- ,const uno::Reference<
report::XSection >& _xHoldAlive
- ,OReportController* _pController)
-: ModalDialog( _pParent, "DateTimeDialog" ,
"modules/dbreport/ui/datetimedialog.ui" )
+ODateTimeDialog::ODateTimeDialog(weld::Window* _pParent, const uno::Reference<
report::XSection >& _xHoldAlive,
+ OReportController* _pController)
+: GenericDialogController(_pParent,
"modules/dbreport/ui/datetimedialog.ui", "DateTimeDialog")
-, m_aDateControlling()
-, m_aTimeControlling()
, m_pController(_pController)
, m_xHoldAlive(_xHoldAlive)
+, m_xDate(m_xBuilder->weld_check_button("date"))
+, m_xFTDateFormat(m_xBuilder->weld_label("datelistbox_label"))
+, m_xDateListBox(m_xBuilder->weld_combo_box_text("datelistbox"))
+, m_xTime(m_xBuilder->weld_check_button("time"))
+, m_xFTTimeFormat(m_xBuilder->weld_label("timelistbox_label"))
+, m_xTimeListBox(m_xBuilder->weld_combo_box_text("timelistbox"))
+, m_xPB_OK(m_xBuilder->weld_button("ok"))
{
-get(m_pDate,"date");
-get(m_pFTDateFormat,"datelistbox_label");
-get(m_pDateListBox,"datelistbox");
-get(m_pTime,"time");
-get(m_pFTTimeFormat,"timelistbox_label");
-get(m_pTimeListBox,"timelistbox");
-get(m_pPB_OK,"ok");
-
-
try
{
SvtSysLocale aSysLocale;
@@ -71,60 +66,36 @@ ODateTimeDialog::ODateTimeDialog( vcl::Window* _pParent
{
}
-m_pDateListBox->SelectEntryPos(0);
-
-m_pTimeListBox->SelectEntryPos(0);
-
-// use nice enhancement, to toggle enable/disable if a checkbox is checked
or not
-m_aDateControlling.enableOnCheckMark( *m_pDate, *m_pFTDateFormat,
*m_pDateListBox);
-m_aTimeControlling.enableOnCheckMark( *m_pTime, *m_pFTTimeFormat,
*m_pTimeListBox);
-
-CheckBox* aCheckBoxes[] = { m_pDate,m_pTime};
-for (CheckBox* pCheckBox : aCheckBoxes)
-pCheckBox->SetClickHdl(LINK(this,ODateTimeDialog,CBClickHdl));
+m_xDateListBox->set_active(0);
+m_xTimeListBox->set_active(0);
+weld::CheckButton* aCheckBoxes[] = { m_xDate.get(), m_xTime.get() };
+for (weld::CheckButton* pCheckBox : aCheckBoxes)
+pCheckBox->connect_toggled(LINK(this,ODateTimeDialog,CBClickHdl));
}
-void ODateTimeDialog::InsertEntry(sal_Int16 _nNumberFormatId)
+void ODateTimeDialog::InsertEntry(sal_Int16 _nNumberFormatId)
+{
+const bool bTime = util::NumberFormat::TIME == _nNumberFormatId;
+weld::ComboBoxText* pListBox = m_xDateListBox.get();
+if (bTime)
+pListBox = m_xTimeListBox.get();
+
+const uno::Reference< util::XNumberFormatter> xNumberFormatter =
m_pController->getReportNumberFormatter();
+const uno::Reference< util::XNumberFormats> xFormats =
xNumberFormatter->getNumberFormatsSupplier()->getNumberFormats();
+const uno::Sequence aFormatKeys =
xFormats->queryKeys(_nNumberFormatId,m_nLocale,true);
+const sal_Int32* pIter = aFormatKeys.getConstArray();
+const sal_Int32* pEnd = pIter + aFormatKeys.getLength();
+for (;pIter != pEnd; ++pIter)
{
-const bool bTime = util::NumberFormat::TIME == _nNumberFormatId;
-ListBox* pListBox = m_pDateListBox;
-if ( bTime )
-pListBox = m_pTimeListBox;
-
-const uno::Reference< util::XNumberFormatter> xNumberFormatter =
m_pController->getReportNumberFormatter();
-const uno::Reference< util::XNumberFormats> xFormats =
xNumberFormatter->getNumberFormatsSupplier()->getNumberFormats();
-const uno::Sequence aFormatKeys =
xFormats->queryKeys(_nNumberFormatId,m_nLocale,true);
-const sal_Int32* pIter = aFormatKeys.getConstArray();
-const sal_Int32* pEnd = pIter + aFormatKeys.getLength();
-for(;pIter != pEnd;++pIter)
-{
-const sal_Int16 nPos =
pListBox->InsertEntry(getFormatStringByKey(*pIter,xFormats,bTime));
-
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/fmtrfmrk.hxx |1
sw/source/core/unocore/unorefmk.cxx | 63
2 files changed, 30 insertions(+), 34 deletions(-)
New commits:
commit 0c02f3c5d64bd6db96db0302169fb4c4b48dc27e
Author: Bjoern Michaelsen
Date: Thu May 10 10:51:42 2018 +0200
dont use SwClient/SwModify in unocore: RefMark
Change-Id: I021f410793c9debfe5e984d591144636d6793fd6
Reviewed-on: https://gerrit.libreoffice.org/54610
Tested-by: Jenkins
Reviewed-by: Björn Michaelsen
diff --git a/sw/inc/fmtrfmrk.hxx b/sw/inc/fmtrfmrk.hxx
index 9248e7353f84..b235961baf5b 100644
--- a/sw/inc/fmtrfmrk.hxx
+++ b/sw/inc/fmtrfmrk.hxx
@@ -36,6 +36,7 @@ class SwTextRefMark;
class SwFormatRefMark
: public SfxPoolItem
, public SwModify
+, public sw::BroadcasterMixin
{
friend class SwTextRefMark;
SwTextRefMark* m_pTextAttr;
diff --git a/sw/source/core/unocore/unorefmk.cxx
b/sw/source/core/unocore/unorefmk.cxx
index 8560ef0ee8e9..162cb004cd45 100644
--- a/sw/source/core/unocore/unorefmk.cxx
+++ b/sw/source/core/unocore/unorefmk.cxx
@@ -18,13 +18,16 @@
*/
#include
-#include
-
#include
-#include
#include
+#include
+#include
#include
+#include
+#include
+#include
+#include
#include
#include
@@ -39,7 +42,13 @@
#include
#include
#include
-#include
+#include
+#include
+#include
+#include
+#include
+#include
+
#include
#include
#include
@@ -47,21 +56,12 @@
#include
#include
#include
-#include
#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
using namespace ::com::sun::star;
class SwXReferenceMark::Impl
-: public SwClient
+: public SvtListener
{
private:
::osl::Mutex m_Mutex; // just for OInterfaceContainerHelper2
@@ -69,30 +69,29 @@ private:
public:
uno::WeakReference m_wThis;
::comphelper::OInterfaceContainerHelper2 m_EventListeners;
-boolm_bIsDescriptor;
-SwDoc * m_pDoc;
-const SwFormatRefMark *m_pMarkFormat;
-OUString m_sMarkName;
+bool m_bIsDescriptor;
+SwDoc* m_pDoc;
+const SwFormatRefMark* m_pMarkFormat;
+OUString m_sMarkName;
-Impl( SwDoc *const pDoc, SwFormatRefMark *const pRefMark)
-: SwClient(pRefMark)
-, m_EventListeners(m_Mutex)
+Impl(SwDoc* const pDoc, SwFormatRefMark* const pRefMark)
+: m_EventListeners(m_Mutex)
, m_bIsDescriptor(nullptr == pRefMark)
, m_pDoc(pDoc)
, m_pMarkFormat(pRefMark)
{
if (pRefMark)
{
+StartListening(pRefMark->GetNotifier());
m_sMarkName = pRefMark->GetRefName();
}
}
-boolIsValid() const { return nullptr != GetRegisteredIn(); }
-voidInsertRefMark( SwPaM & rPam, SwXTextCursor const*const pCursor );
-voidInvalidate();
+bool IsValid() const { return m_pMarkFormat; }
+void InsertRefMark( SwPaM & rPam, SwXTextCursor const*const pCursor );
+void Invalidate();
protected:
-// SwClient
-virtual voidModify( const SfxPoolItem* pOld, const SfxPoolItem *pNew)
override;
+virtual void Notify(const SfxHint&) override;
};
@@ -110,14 +109,10 @@ void SwXReferenceMark::Impl::Invalidate()
m_EventListeners.disposeAndClear(ev);
}
-void SwXReferenceMark::Impl::Modify( const SfxPoolItem* pOld, const
SfxPoolItem *pNew)
+void SwXReferenceMark::Impl::Notify(const SfxHint& rHint)
{
-ClientModify(this, pOld, pNew);
-
-if (!IsValid()) // removed => dispose
-{
+if(rHint.GetId() == SfxHintId::Dying)
Invalidate();
-}
}
SwXReferenceMark::SwXReferenceMark(
@@ -272,8 +267,8 @@ void SwXReferenceMark::Impl::InsertRefMark(SwPaM& rPam,
}
m_pMarkFormat = &pTextAttr->GetRefMark();
-
-const_cast(m_pMarkFormat)->Add(this);
+EndListeningAll();
+StartListening(const_cast(m_pMarkFormat)->GetNotifier());
}
void SAL_CALL
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/01/01100400.xhp | 38 +++-- 1 file changed, 20 insertions(+), 18 deletions(-) New commits: commit 4e45182924569adab9bc43ec174b3c4c828c7452 Author: Olivier Hallot Date: Mon May 21 09:26:51 2018 -0300 tdf#102259 formula groups at Statistics tab page Change-Id: I206139776c77e8855bd82fc5b5ffaa6c0ec60147 Reviewed-on: https://gerrit.libreoffice.org/54627 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/shared/01/01100400.xhp b/source/text/shared/01/01100400.xhp index c45e3ad56..63e0e11de 100644 --- a/source/text/shared/01/01100400.xhp +++ b/source/text/shared/01/01100400.xhp @@ -20,7 +20,7 @@ --> - + @@ -49,43 +49,45 @@ -Some statistic values can be used as variables in formulas. +Some statistic values can be used as variables in formulas. Pages: Number of pages in the file. Tables:Sheets: -Number of tables in the file. -Number of sheets in the file. +Number of tables in the file. +Number of sheets in the file. This statistic does not include tables that were inserted as OLE objects. Cells: -Number of cells with content in the file. +Number of cells with content in the file. -Images: +Formula groups: +Number of contigous ranges in a column with same formula. +Images: -Number of images in the file. This statistic does not include images that were inserted as OLE objects. +Number of images in the file. This statistic does not include images that were inserted as OLE objects. -OLE Objects: +OLE Objects: -Number of OLE objects in the file, including tables and graphics that were inserted as OLE objects. +Number of OLE objects in the file, including tables and graphics that were inserted as OLE objects. -Paragraphs: +Paragraphs: -Number of paragraphs (including blank paragraphs) in the file. +Number of paragraphs (including blank paragraphs) in the file. -Words: +Words: -Number of words (including words consisting of a single character) in the file. +Number of words (including words consisting of a single character) in the file. -Characters: +Characters: -Number of characters (including spaces) in the file. Non-printable characters are not included. +Number of characters (including spaces) in the file. Non-printable characters are not included. -Lines: +Lines: -Number of lines in the file. +Number of lines in the file. -Update +Update Updates the statistics. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit aa8ea7d8c29a92b7b866eeb47317f79416db8eb8 Author: Olivier Hallot Date: Mon May 21 09:26:51 2018 -0300 Updated core Project: help 4e45182924569adab9bc43ec174b3c4c828c7452 tdf#102259 formula groups at Statistics tab page Change-Id: I206139776c77e8855bd82fc5b5ffaa6c0ec60147 Reviewed-on: https://gerrit.libreoffice.org/54627 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 1d9b92c466b2..4e4518292456 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 1d9b92c466b2b920ff46987d1668f4494b9f743a +Subproject commit 4e45182924569adab9bc43ec174b3c4c828c7452 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/doc/DocumentFieldsManager.cxx |5 +++--
sw/source/filter/html/htmlfld.cxx|5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
New commits:
commit 338d5f14ba3e77286c3447fb0bcbf46b0627a35f
Author: Takeshi Abe
Date: Mon May 21 19:01:02 2018 +0900
sw: Ask current datetime only once
Change-Id: I99bed9a09ed1701ce441ddb0a19b5259ab37f135
Reviewed-on: https://gerrit.libreoffice.org/54621
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sw/source/core/doc/DocumentFieldsManager.cxx
b/sw/source/core/doc/DocumentFieldsManager.cxx
index b4b3c0b32d80..9d56929ff792 100644
--- a/sw/source/core/doc/DocumentFieldsManager.cxx
+++ b/sw/source/core/doc/DocumentFieldsManager.cxx
@@ -1336,8 +1336,9 @@ void DocumentFieldsManager::SetFixFields( const DateTime*
pNewDateTime )
}
else
{
-nDate = Date( Date::SYSTEM ).GetDate();
-nTime = tools::Time( tools::Time::SYSTEM ).GetTime();
+DateTime aDateTime( DateTime::SYSTEM );
+nDate = aDateTime.GetDate();
+nTime = aDateTime.GetTime();
}
SwFieldIds const aTypes[] {
diff --git a/sw/source/filter/html/htmlfld.cxx
b/sw/source/filter/html/htmlfld.cxx
index 568f36576a84..53a7b1b435ab 100644
--- a/sw/source/filter/html/htmlfld.cxx
+++ b/sw/source/filter/html/htmlfld.cxx
@@ -320,8 +320,9 @@ void SwHTMLParser::NewField()
case SwFieldIds::Time:
{
sal_uInt32 nNumFormat = 0;
-sal_Int64 nTime = tools::Time( tools::Time::SYSTEM ).GetTime();
-sal_Int32 nDate = Date( Date::SYSTEM ).GetDate();
+DateTime aDateTime( DateTime::SYSTEM );
+sal_Int64 nTime = aDateTime.GetTime();
+sal_Int32 nDate = aDateTime.GetDate();
sal_uInt16 nSub = 0;
bool bValidFormat = false;
HTMLNumFormatTableEntry * pFormatTable;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bin/check-elf-dynamic-objects
bin/check-elf-dynamic-objects |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 82e9d2e68fcb2f66b78501f3613386ac1e36aae7 Author: Michael Stahl Date: Sun May 20 13:20:44 2018 +0200 check-elf-dynamic-objects: Fedora 28 GTK+ depends on libfribidi.so.0 ... so add it to whitelists. Change-Id: Ia9f55ecfa9dcbc809827070e0ae6522f1e7ba2bf Reviewed-on: https://gerrit.libreoffice.org/54607 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/bin/check-elf-dynamic-objects b/bin/check-elf-dynamic-objects index ea2d67e31ff4..1a11e6dca223 100755 --- a/bin/check-elf-dynamic-objects +++ b/bin/check-elf-dynamic-objects @@ -68,8 +68,8 @@ openglwhitelist="libGL.so.1" giowhitelist="libgio-2.0.so.0 libgobject-2.0.so.0 libgmodule-2.0.so.0 libgthread-2.0.so.0 libglib-2.0.so.0 libdbus-glib-1.so.2 libdbus-1.so.3" gstreamer010whitelist="libgstpbutils-0.10.so.0 libgstinterfaces-0.10.so.0 libgstreamer-0.10.so.0" gstreamerwhitelist="libgstpbutils-1.0.so.0 libgstvideo-1.0.so.0 libgstbase-1.0.so.0 libgstreamer-1.0.so.0" -gtk2whitelist="libgtk-x11-2.0.so.0 libgdk-x11-2.0.so.0 libpangocairo-1.0.so.0 libatk-1.0.so.0 libcairo.so.2 libgio-2.0.so.0 libpangoft2-1.0.so.0 libpango-1.0.so.0 libfontconfig.so.1 libfreetype.so.6 libgdk_pixbuf-2.0.so.0 libgobject-2.0.so.0 libglib-2.0.so.0 libgmodule-2.0.so.0 libgthread-2.0.so.0 libdbus-glib-1.so.2 libdbus-1.so.3" -gtk3whitelist="libgtk-3.so.0 libgdk-3.so.0 libcairo-gobject.so.2 libpangocairo-1.0.so.0 libatk-1.0.so.0 libcairo.so.2 libgio-2.0.so.0 libpangoft2-1.0.so.0 libpango-1.0.so.0 libfontconfig.so.1 libfreetype.so.6 libgdk_pixbuf-2.0.so.0 libgobject-2.0.so.0 libglib-2.0.so.0 libgmodule-2.0.so.0 libgthread-2.0.so.0 libdbus-glib-1.so.2 libdbus-1.so.3" +gtk2whitelist="libgtk-x11-2.0.so.0 libgdk-x11-2.0.so.0 libpangocairo-1.0.so.0 libfribidi.so.0 libatk-1.0.so.0 libcairo.so.2 libgio-2.0.so.0 libpangoft2-1.0.so.0 libpango-1.0.so.0 libfontconfig.so.1 libfreetype.so.6 libgdk_pixbuf-2.0.so.0 libgobject-2.0.so.0 libglib-2.0.so.0 libgmodule-2.0.so.0 libgthread-2.0.so.0 libdbus-glib-1.so.2 libdbus-1.so.3" +gtk3whitelist="libgtk-3.so.0 libgdk-3.so.0 libcairo-gobject.so.2 libpangocairo-1.0.so.0 libfribidi.so.0 libatk-1.0.so.0 libcairo.so.2 libgio-2.0.so.0 libpangoft2-1.0.so.0 libpango-1.0.so.0 libfontconfig.so.1 libfreetype.so.6 libgdk_pixbuf-2.0.so.0 libgobject-2.0.so.0 libglib-2.0.so.0 libgmodule-2.0.so.0 libgthread-2.0.so.0 libdbus-glib-1.so.2 libdbus-1.so.3" kde4whitelist="libkio.so.5 libkfile.so.4 libkdeui.so.5 libkdecore.so.5 libQtNetwork.so.4 libQtGui.so.4 libQtCore.so.4 libglib-2.0.so.0" qt5whitelist="libQt5Core.so.5 libQt5Gui.so.5 libQt5Network.so.5 libQt5Widgets.so.5 libQt5X11Extras.so.5 libcairo.so.2 libglib-2.0.so.0" kf5whitelist="libKF5ConfigCore.so.5 libKF5CoreAddons.so.5 libKF5I18n.so.5 libKF5KIOCore.so.5 libKF5KIOFileWidgets.so.5 libKF5KIOWidgets.so.5 libKF5WindowSystem.so.5" ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry sd/sdi sd/source sd/uiconfig sd/UIConfig_sdraw.mk sfx2/source
officecfg/registry/data/org/openoffice/Office/UI/ToolbarMode.xcu | 96 ++ officecfg/registry/schema/org/openoffice/Office/UI/ToolbarMode.xcs |5 sd/UIConfig_sdraw.mk |4 sd/sdi/_docsh.sdi |5 sd/source/ui/docshell/docshell.cxx | 15 + sd/uiconfig/sdraw/popupmenu/notebookbar.xml| 23 ++ sd/uiconfig/sdraw/ui/notebookbar.ui|6 sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui |6 sd/uiconfig/sdraw/ui/notebookbar_groupedbar_full.ui|6 sfx2/source/notebookbar/SfxNotebookBar.cxx | 10 + 10 files changed, 173 insertions(+), 3 deletions(-) New commits: commit 24d43f21e92c0db040f549a226c0889db20621ac Author: Kshitij Pathania Date: Fri May 18 19:50:01 2018 +0530 Activated notebookbar in draw Added tabbed and two groupedbars mode of notebookbar. Change-Id: I208a365139ca6c83510a73a8ffa0260b05787793 Reviewed-on: https://gerrit.libreoffice.org/54547 Tested-by: Jenkins Reviewed-by: Szymon Kłos diff --git a/officecfg/registry/data/org/openoffice/Office/UI/ToolbarMode.xcu b/officecfg/registry/data/org/openoffice/Office/UI/ToolbarMode.xcu index 64959d508520..adf337557450 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/ToolbarMode.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/ToolbarMode.xcu @@ -10,6 +10,9 @@ notebookbar.ui + +notebookbar.ui + @@ -679,6 +682,99 @@ Arrow + + +Tabbed + + +true + + +true + + +1 + + +notebookbar.ui + + + + + + + + + + +Arrow + + +true + + + + +Groupedbar Compact + + +true + + +true + + +8 + + +notebookbar_groupedbar_compact.ui + + + + + + + + + + +Arrow + + +true + + + + +Groupedbar + + +true + + +true + + +7 + + +notebookbar_groupedbar_full.ui + + + + + + + + + + +Arrow + + +true + + diff --git a/officecfg/registry/schema/org/openoffice/Office/UI/ToolbarMode.xcs b/officecfg/registry/schema/org/openoffice/Office/UI/ToolbarMode.xcs index d641e80afb5e..f97ec55e2dc8 100644 --- a/officecfg/registry/schema/org/openoffice/Office/UI/ToolbarMode.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/UI/ToolbarMode.xcs @@ -113,6 +113,11 @@ Contains name of currently used implementation in the Impress module. + + +Contains name of currently used implementation in the Draw module. + + Contains list of toolbar mode settings for each application. diff --git a/sd/UIConfig_sdraw.mk b/sd/UIConfig_sdraw.mk index 0091db50ddd8..a172013a70dd 100644 --- a/sd/UIConfig_sdraw.mk +++ b/sd/UIConfig_sdraw.mk @@ -32,6 +32,7 @@ $(eval $(call gb_UIConfig_add_popupmenufiles,modules/sdraw,\ sd/uiconfig/sdraw/popupmenu/measure \ sd/uiconfig/sdraw/popupmenu/media \ sd/uiconfig/sdraw/popupmenu/multiselect \ + sd/uiconfig/sdraw/popupmenu/notebookbar \ sd/uiconfig/sdraw/popupmenu/oleobject \ sd/uiconfig/sdraw/popupmenu/outlinetext \ sd/uiconfig/sdraw/popupmenu/pagepanemaster \ @@ -111,6 +112,9 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/sdraw,\ sd/uiconfig/sdraw/ui/insertlayer \ sd/uiconfig/sdraw/ui/insertslidesdialog \ sd/uiconfig/sdraw/ui/namedesign \ + sd/uiconfig/sdraw/ui/notebookbar \ + sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact \ + sd/uiconfig/sdraw/ui/notebookbar_groupedbar_full \ sd/uiconfig/sdraw/ui/paranumberingtab \ sd/uiconfig/sdraw/ui/queryunlinkimagedialog \ sd/uiconfig/sdraw/ui/vectorize \ diff --git a/sd/sdi/_docsh.sdi b/sd/sdi/_docsh.sdi index ce225b38d922..29db81db02d2 100644 --- a/sd/sdi/_docsh.sdi +++ b/sd/sdi/_docsh.sdi @@ -72,5 +72,10 @@ interface DrawDocument ExecMethod = Execute
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/floatwin.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c3a4937604fc296f3f6bf4dee48f224f255b9ffc Author: Tor Lillqvist Date: Mon May 21 21:49:19 2018 +0300 loplugin:staticaccess Change-Id: I9e8accc56fc1d3b095390944a5ae2fc80bcbc05d diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx index 4bffbb52b8cf..e30fd77f5c69 100644 --- a/vcl/source/window/floatwin.cxx +++ b/vcl/source/window/floatwin.cxx @@ -444,7 +444,7 @@ Point FloatingWindow::ImplCalcPos(vcl::Window* pWindow, if (pW->IsMapModeEnabled()) *pLOKTwipsPos = pW->PixelToLogic(aPos, MapMode(MapUnit::MapTwip)); else -*pLOKTwipsPos = pW->LogicToLogic(aPos, pW->GetMapMode(), MapMode(MapUnit::MapTwip)); +*pLOKTwipsPos = OutputDevice::LogicToLogic(aPos, pW->GetMapMode(), MapMode(MapUnit::MapTwip)); } // caller expects coordinates relative to top-level win ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - include/sfx2 include/svx include/vcl sc/inc sc/source sc/uiconfig sfx2/source sfx2/uiconfig vcl/source vcl/unx
include/sfx2/checkin.hxx | 28 -
include/sfx2/tabdlg.hxx |1
include/svx/langbox.hxx |2
include/vcl/layout.hxx |3
include/vcl/scrbar.hxx |1
include/vcl/weld.hxx |2
sc/inc/scabstdlg.hxx |2
sc/source/ui/attrdlg/scdlgfact.cxx | 36 +-
sc/source/ui/attrdlg/scdlgfact.hxx | 20 +
sc/source/ui/dbgui/sortdlg.cxx |4
sc/source/ui/dbgui/sortkeydlg.cxx| 112 --
sc/source/ui/dbgui/tpsort.cxx| 528 ++-
sc/source/ui/inc/sortdlg.hxx |4
sc/source/ui/inc/sortkeydlg.hxx | 53 ---
sc/source/ui/inc/tpsort.hxx | 88 ++---
sc/source/ui/view/cellsh2.cxx|2
sc/uiconfig/scalc/ui/sortcriteriapage.ui |3
sc/uiconfig/scalc/ui/sortdialog.ui | 80 +++-
sc/uiconfig/scalc/ui/sortkey.ui | 11
sc/uiconfig/scalc/ui/sortoptionspage.ui | 26 -
sfx2/source/dialog/checkin.cxx | 30 -
sfx2/source/dialog/tabdlg.cxx| 15
sfx2/source/doc/objserv.cxx |6
sfx2/uiconfig/ui/checkin.ui | 43 +-
vcl/source/app/salvtables.cxx| 34 +
vcl/source/control/combobox.cxx | 11
vcl/source/window/layout.cxx |8
vcl/unx/gtk3/gtk3gtkinst.cxx | 12
28 files changed, 586 insertions(+), 579 deletions(-)
New commits:
commit 52eb2804bb4403e74483ee49bfcb4539065d7143
Author: Caolán McNamara
Date: Fri May 18 13:20:07 2018 +0100
weld ScSortDlg, ScTabPageSortOptions and ScTabPageSortFields
Change-Id: I103e5e3670f8c95c1f480ce0c36e08c3de74e900
Reviewed-on: https://gerrit.libreoffice.org/54541
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx
index 51e30e4c0d40..9da02d5c371e 100644
--- a/include/sfx2/tabdlg.hxx
+++ b/include/sfx2/tabdlg.hxx
@@ -244,6 +244,7 @@ private:
std::unique_ptr m_pOutSet;
std::unique_ptr< TabDlg_Impl >m_pImpl;
sal_uInt16* m_pRanges;
+OString m_sAppPageId;
DECL_DLLPRIVATE_LINK(ActivatePageHdl, const OString&, void);
DECL_DLLPRIVATE_LINK(DeactivatePageHdl, const OString&, bool);
diff --git a/include/svx/langbox.hxx b/include/svx/langbox.hxx
index 3b91701f8df9..848d93a2de72 100644
--- a/include/svx/langbox.hxx
+++ b/include/svx/langbox.hxx
@@ -157,7 +157,6 @@ private:
bool m_bLangNoneIsLangAll;
SVX_DLLPRIVATE int ImplTypeToPos(LanguageType eType) const;
-SVX_DLLPRIVATE void InsertLanguage(const LanguageType nLangType);
SVX_DLLPRIVATE void ImplClear();
DECL_LINK(ChangeHdl, weld::ComboBoxText&, void);
public:
@@ -165,6 +164,7 @@ public:
voidSetLanguageList( SvxLanguageListFlags nLangList,
bool bHasLangNone, bool bLangNoneIsLangAll = false
);
voidAddLanguages( const std::vector< LanguageType >&
rLanguageTypes, SvxLanguageListFlags nLangList );
+voidInsertLanguage(const LanguageType nLangType);
voidSelectLanguage( const LanguageType eLangType );
LanguageTypeGetSelectedLanguage() const;
voidSelectEntryPos(int nPos) { m_xControl->set_active(nPos); }
diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index 31ff24e2d2ee..6423d12488b9 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -507,10 +507,13 @@ class VCL_DLLPUBLIC VclViewport : public VclBin
public:
VclViewport(vcl::Window *pParent)
: VclBin(pParent, WB_HIDE | WB_CLIPCHILDREN)
+, m_bInitialAllocation(true)
{
}
protected:
virtual void setAllocation(const Size &rAllocation) override;
+private:
+bool m_bInitialAllocation;
};
//Enforces that its children are always the same size as itself.
diff --git a/include/vcl/scrbar.hxx b/include/vcl/scrbar.hxx
index db4d2ee9273c..5fadfb5fbe0d 100644
--- a/include/vcl/scrbar.hxx
+++ b/include/vcl/scrbar.hxx
@@ -133,6 +133,7 @@ public:
ScrollType GetType() const { return meScrollType; }
voidSetScrollHdl( const Link& rLink ) {
maScrollHdl = rLink; }
+const Link& GetScrollHdl() const { return maScrollHdl; }
voidSetEndScrollHdl( const Link& rLink ) {
maEndScrollHdl = rLink; }
const Link& GetEndScrollHdl() const { return
maEndScrollHdl; }
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 423a65922796..ace717371fdd 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -120,6 +120,8 @@ public:
= 0;
virtual int vadjustment_get_value() const = 0;
virtual void vadjustment_set_value(int value) = 0;
+virtual int vadjustment_get_upper() const = 0;
+virtual void vadjustment_set_upper(int upper) = 0;
void connect
[Libreoffice-commits] core.git: sc/qa
sc/qa/uitest/calc_tests/data/standardFilter.ods |binary
sc/qa/uitest/calc_tests/standardFilter.py | 745
2 files changed, 745 insertions(+)
New commits:
commit 9913458256effd34ab24fca166c37c0184a91f14
Author: Zdeněk Crhonek
Date: Mon May 21 15:20:38 2018 +0200
uitest - Calc standard filter
Change-Id: I578e0fa94326677ce277cd24e043c699d152a5dd
Reviewed-on: https://gerrit.libreoffice.org/54636
Tested-by: Jenkins
Reviewed-by: Zdenek Crhonek
diff --git a/sc/qa/uitest/calc_tests/data/standardFilter.ods
b/sc/qa/uitest/calc_tests/data/standardFilter.ods
new file mode 100644
index ..eee728b46e13
Binary files /dev/null and b/sc/qa/uitest/calc_tests/data/standardFilter.ods
differ
diff --git a/sc/qa/uitest/calc_tests/standardFilter.py
b/sc/qa/uitest/calc_tests/standardFilter.py
new file mode 100644
index ..8342b544eb8c
--- /dev/null
+++ b/sc/qa/uitest/calc_tests/standardFilter.py
@@ -0,0 +1,745 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# 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/.
+#
+from uitest.framework import UITestCase
+from uitest.uihelper.common import get_state_as_dict
+from uitest.uihelper.common import select_pos
+from uitest.uihelper.calc import enter_text_to_cell
+from libreoffice.calc.document import get_cell_by_position
+from libreoffice.uno.propertyvalue import mkPropertyValues
+# import org.libreoffice.unotest
+# import pathlib
+from uitest.path import get_srcdir_url
+#Bug 113979 - Paste unformated text does not ignore empty cells
+def get_url_for_data_file(file_name):
+#return
pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri()
+return get_srcdir_url() + "/sc/qa/uitest/calc_tests/data/" + file_name
+
+class standardFilter(UITestCase):
+def test_standard_filter(self):
+calc_doc =
self.ui_test.load_file(get_url_for_data_file("standardFilter.ods"))
+xCalcDoc = self.xUITest.getTopFocusWindow()
+gridwin = xCalcDoc.getChild("grid_window")
+document = self.ui_test.get_component()
+gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:C8"}))
+
+
self.ui_test.execute_modeless_dialog_through_command(".uno:DataFilterStandardFilter")
+xDialog = self.xUITest.getTopFocusWindow()
+xfield1 = xDialog.getChild("field1")
+xval1 = xDialog.getChild("val1")
+xconnect2 = xDialog.getChild("connect2")
+xfield2 = xDialog.getChild("field2")
+xval2 = xDialog.getChild("val2")
+
+props = {"TEXT": "a"}
+actionProps = mkPropertyValues(props)
+xfield1.executeAction("SELECT", actionProps)
+xval1.executeAction("TYPE", mkPropertyValues({"TEXT":"1"}))
+propsA = {"TEXT": "OR"}
+actionPropsA = mkPropertyValues(propsA)
+xconnect2.executeAction("SELECT", actionPropsA)
+props2 = {"TEXT": "b"}
+actionProps2 = mkPropertyValues(props2)
+xfield2.executeAction("SELECT", actionProps2)
+xval2.executeAction("TYPE", mkPropertyValues({"TEXT":"3"}))
+xOKBtn = xDialog.getChild("ok")
+self.ui_test.close_dialog_through_button(xOKBtn)
+#3x down - should be on row 9
+gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"}))
+gridwin.executeAction("TYPE", mkPropertyValues({"KEYCODE": "DOWN"}))
+gridwin.executeAction("TYPE", mkPropertyValues({"KEYCODE": "DOWN"}))
+gridwin.executeAction("TYPE", mkPropertyValues({"KEYCODE": "DOWN"}))
+gridWinState = get_state_as_dict(gridwin)
+self.assertEqual(gridWinState["CurrentRow"], "8")
+#reopen filter and verify
+gridwin.executeAction("TYPE", mkPropertyValues({"KEYCODE": "UP"}))
+gridwin.executeAction("TYPE", mkPropertyValues({"KEYCODE": "UP"}))
+gridwin.executeAction("TYPE", mkPropertyValues({"KEYCODE": "UP"}))
+
self.ui_test.execute_modeless_dialog_through_command(".uno:DataFilterStandardFilter")
+xDialog = self.xUITest.getTopFocusWindow()
+xfield1 = xDialog.getChild("field1")
+xval1 = xDialog.getChild("val1")
+xconnect2 = xDialog.getChild("connect2")
+xfield2 = xDialog.getChild("field2")
+xval2 = xDialog.getChild("val2")
+
+self.assertEqual(get_state_as_dict(xfield1)["SelectEntryText"], "a")
+self.assertEqual(get_state_as_dict(xfield2)["SelectEntryText"], "b")
+self.assertEqual(get_state_as_dict(xconnect2)["SelectEntryText"], "OR")
+self.assertEqual(get_state_as_dict(xval1)["Text"], "1")
+self.assertEqual(get_state_as_dict(xval2)["Text"], "3")
+xOKBtn = xDialog.getChild("ok")
+self.ui_test.close_dialog_through_button(xOKBtn)
+self.ui_test.close_doc()
+
+def test_standard_filter_copy_re
[Libreoffice-commits] core.git: sw/source
sw/source/core/doc/tblrwcl.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 137c38a1ba01c51c421f695e1558d2c1499c6627 Author: Jim Raykowski Date: Sat Apr 28 22:20:51 2018 -0800 tdf#117189 Fix table InsertRow redo Change-Id: I92ce18105550d9514b18b81080cfd0c19dfe648b Reviewed-on: https://gerrit.libreoffice.org/53618 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx index 0c589270ce24..c33b005e9a89 100644 --- a/sw/source/core/doc/tblrwcl.cxx +++ b/sw/source/core/doc/tblrwcl.cxx @@ -634,7 +634,7 @@ bool SwTable::InsertRow_( SwDoc* pDoc, const SwSelBoxes& rBoxes, pPCD->AddRowCols( *this, rBoxes, nCnt, bBehind ); pDoc->UpdateCharts( GetFrameFormat()->GetName() ); -pDoc->GetDocShell()->GetFEShell()->UpdateTableStyleFormatting(); +pDoc->GetDocShell()->GetFEShell()->UpdateTableStyleFormatting( pTableNd ); return true; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: config_host/config_features.h.in configure.ac
config_host/config_features.h.in |3 ++- configure.ac |4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) New commits: commit 92664be7f876a5f219514cf598e7b4cd39a5b9c9 Author: Tor Lillqvist Date: Tue May 22 01:45:06 2018 +0300 Fix misleading comment: We do check HAVE_FEATURE_READONLY_INSTALLSET... ...at least in a couple of places, and at least for a sandboxed macOS build that check does its job, it prevents write attempts into the app bundle. Change-Id: I6d243d3e8a4c77f03a8265125aefd75becbf0998 diff --git a/config_host/config_features.h.in b/config_host/config_features.h.in index d631ae1c0e42..c66435a12007 100644 --- a/config_host/config_features.h.in +++ b/config_host/config_features.h.in @@ -113,7 +113,8 @@ * * Prevents attempts by LibreOffice to write into its installation. That means * at least that no "system-wide" extensions can be added, if the location for - * them is the traditional one. Experimental work in progress, not actually implemented. + * them is the traditional one right in the middle of the installation. + * Probably not completely implemented. */ #define HAVE_FEATURE_READONLY_INSTALLSET 0 diff --git a/configure.ac b/configure.ac index fc07222114cb..f9202771c1b0 100644 --- a/configure.ac +++ b/configure.ac @@ -1430,8 +1430,8 @@ AC_ARG_WITH(package-version, libo_FUZZ_ARG_ENABLE(readonly-installset, AS_HELP_STRING([--enable-readonly-installset], [Prevents any attempts by LibreOffice to write into its installation. That means - at least that no "system-wide" extensions can be added. Experimental work in - progress.]), + at least that no "system-wide" extensions can be added. Partly experimental work in + progress, probably not fully implemented (but is useful for sandboxed macOS builds).]), ,) libo_FUZZ_ARG_ENABLE(postgresql-sdbc, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basic/source
basic/source/runtime/dllmgr-x64.cxx | 17 -
1 file changed, 12 insertions(+), 5 deletions(-)
New commits:
commit b9ebabd675f916a0151ec3893a59131f3a8b2a05
Author: Vasily Melenchuk
Date: Mon May 21 19:47:00 2018 +0300
tdf#97231: basic: do not use extra wrapping for string marshaling
previous approach did wrap string reference once again, making
practically "a pointer to pointer to string" so this code was not
working correctly for RegQueryValueExA WinAPI call.
String is already provided as a reference (see marshalString(), so
no reason to wrap its reference.
This approach was just copied from from dllmgr-x86.cxx plus some
minor changes to make both versions similar.
Change-Id: I85065112407de3f078265d2c76437814402eb1b3
Reviewed-on: https://gerrit.libreoffice.org/54645
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/basic/source/runtime/dllmgr-x64.cxx
b/basic/source/runtime/dllmgr-x64.cxx
index 4450bbfa6029..2c311861122a 100644
--- a/basic/source/runtime/dllmgr-x64.cxx
+++ b/basic/source/runtime/dllmgr-x64.cxx
@@ -31,6 +31,7 @@
#include
#include
+#include "runtime.hxx"
#include
#include
#include
@@ -256,9 +257,15 @@ ErrCode marshal(
std::vector< char > & blob, std::size_t offset, MarshalData & data)
{
OSL_ASSERT(variable != nullptr);
-if (!(variable->GetFlags() & SbxFlagBits::Reference)) {
-if ((variable->GetType() & SbxARRAY) == 0) {
-switch (variable->GetType()) {
+
+SbxDataType eVarType = variable->GetType();
+bool bByVal = !(variable->GetFlags() & SbxFlagBits::Reference);
+if( !bByVal && !SbiRuntime::isVBAEnabled() && eVarType == SbxSTRING )
+bByVal = true;
+
+if (bByVal) {
+if ((eVarType & SbxARRAY) == 0) {
+switch (eVarType) {
case SbxINTEGER:
add(blob, variable->GetInteger(), outer ? 8 : 2, offset);
break;
@@ -307,8 +314,8 @@ ErrCode marshal(
}
}
} else {
-if ((variable->GetType() & SbxARRAY) == 0) {
-switch (variable->GetType()) {
+if ((eVarType & SbxARRAY) == 0) {
+switch (eVarType) {
case SbxINTEGER:
case SbxLONG:
case SbxSINGLE:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - basic/source
basic/source/runtime/dllmgr-x64.cxx | 17 -
1 file changed, 12 insertions(+), 5 deletions(-)
New commits:
commit c4878f9009d41ee9b06d8d408ffcacf50fded61f
Author: Vasily Melenchuk
Date: Mon May 21 19:47:00 2018 +0300
tdf#97231: basic: do not use extra wrapping for string marshaling
previous approach did wrap string reference once again, making
practically "a pointer to pointer to string" so this code was not
working correctly for RegQueryValueExA WinAPI call.
String is already provided as a reference (see marshalString(), so
no reason to wrap its reference.
This approach was just copied from from dllmgr-x86.cxx plus some
minor changes to make both versions similar.
Reviewed-on: https://gerrit.libreoffice.org/54645
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
Conflicts:
basic/source/runtime/dllmgr-x64.cxx
Change-Id: I85065112407de3f078265d2c76437814402eb1b3
diff --git a/basic/source/runtime/dllmgr-x64.cxx
b/basic/source/runtime/dllmgr-x64.cxx
index 8f2b0abdef8c..9d95a87a8146 100644
--- a/basic/source/runtime/dllmgr-x64.cxx
+++ b/basic/source/runtime/dllmgr-x64.cxx
@@ -32,6 +32,7 @@
#include
#include
+#include "runtime.hxx"
#include
#include
#include
@@ -256,9 +257,15 @@ SbError marshal(
std::vector< char > & blob, std::size_t offset, MarshalData & data)
{
OSL_ASSERT(variable != 0);
-if (!(variable->GetFlags() & SbxFlagBits::Reference)) {
-if ((variable->GetType() & SbxARRAY) == 0) {
-switch (variable->GetType()) {
+
+SbxDataType eVarType = variable->GetType();
+bool bByVal = !(variable->GetFlags() & SbxFlagBits::Reference);
+if( !bByVal && !SbiRuntime::isVBAEnabled() && eVarType == SbxSTRING )
+bByVal = true;
+
+if (bByVal) {
+if ((eVarType & SbxARRAY) == 0) {
+switch (eVarType) {
case SbxINTEGER:
add(blob, variable->GetInteger(), outer ? 8 : 2, offset);
break;
@@ -307,8 +314,8 @@ SbError marshal(
}
}
} else {
-if ((variable->GetType() & SbxARRAY) == 0) {
-switch (variable->GetType()) {
+if ((eVarType & SbxARRAY) == 0) {
+switch (eVarType) {
case SbxINTEGER:
case SbxLONG:
case SbxSINGLE:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/doc/docfile.cxx | 276 ++--
1 file changed, 139 insertions(+), 137 deletions(-)
New commits:
commit c4409edb4e0623b17c9760af11c7bd7b29a59d76
Author: Samuel Mehrbrodt
Date: Thu May 17 11:34:37 2018 +0200
Reduce indentation by returning early on error condition
Change-Id: Iebf6eca68f0dcba87ab517952009ee6dfb4b588c
Reviewed-on: https://gerrit.libreoffice.org/54475
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 1ac4c883d30a..acd54f1fc8c4 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -3667,71 +3667,103 @@ bool SfxMedium::SignContents_Impl(const
Reference xCert, const OUS
{
bool bChanges = false;
-// the medium should be closed to be able to sign, the caller is
responsible to close it
-if ( !IsOpen() && !GetError() )
-{
-// The component should know if there was a valid document signature,
since
-// it should show a warning in this case
-uno::Reference< security::XDocumentDigitalSignatures > xSigner(
-
security::DocumentDigitalSignatures::createWithVersionAndValidSignature(
-comphelper::getProcessComponentContext(), aODFVersion,
bHasValidDocumentSignature ) );
-
-uno::Reference< embed::XStorage > xWriteableZipStor;
-// Signing is not modification of the document, as seen by the user
-// ("only a saved document can be signed"). So allow signing in the
-// "opened read-only, but not physically-read-only" case.
-if (!IsOriginallyReadOnly())
-{
-// we can reuse the temporary file if there is one already
-CreateTempFile( false );
-GetMedium_Impl();
+if (IsOpen() || GetError())
+{
+SAL_WARN("sfx.doc", "The medium must be closed by the signer!");
+return bChanges;
+}
+
+// The component should know if there was a valid document signature, since
+// it should show a warning in this case
+uno::Reference< security::XDocumentDigitalSignatures > xSigner(
+
security::DocumentDigitalSignatures::createWithVersionAndValidSignature(
+comphelper::getProcessComponentContext(), aODFVersion,
bHasValidDocumentSignature ) );
+
+uno::Reference< embed::XStorage > xWriteableZipStor;
+// Signing is not modification of the document, as seen by the user
+// ("only a saved document can be signed"). So allow signing in the
+// "opened read-only, but not physically-read-only" case.
+if (!IsOriginallyReadOnly())
+{
+// we can reuse the temporary file if there is one already
+CreateTempFile( false );
+GetMedium_Impl();
+
+try
+{
+if ( !pImpl->xStream.is() )
+throw uno::RuntimeException();
+bool bODF = GetFilter()->IsOwnFormat();
try
{
-if ( !pImpl->xStream.is() )
-throw uno::RuntimeException();
+xWriteableZipStor =
::comphelper::OStorageHelper::GetStorageOfFormatFromStream(
ZIP_STORAGE_FORMAT_STRING, pImpl->xStream );
+}
+catch (const io::IOException& rException)
+{
+if (bODF)
+SAL_WARN("sfx.doc", "ODF stream is not a zip storage: " <<
rException);
+}
-bool bODF = GetFilter()->IsOwnFormat();
-try
-{
-xWriteableZipStor =
::comphelper::OStorageHelper::GetStorageOfFormatFromStream(
ZIP_STORAGE_FORMAT_STRING, pImpl->xStream );
-}
-catch (const io::IOException& rException)
-{
-if (bODF)
-SAL_WARN("sfx.doc", "ODF stream is not a zip storage:
" << rException);
-}
+if ( !xWriteableZipStor.is() && bODF )
+throw uno::RuntimeException();
-if ( !xWriteableZipStor.is() && bODF )
+uno::Reference< embed::XStorage > xMetaInf;
+uno::Reference
xNameAccess(xWriteableZipStor, uno::UNO_QUERY);
+if (xNameAccess.is() && xNameAccess->hasByName("META-INF"))
+{
+xMetaInf = xWriteableZipStor->openStorageElement(
+"META-INF",
+embed::ElementModes::READWRITE
);
+if ( !xMetaInf.is() )
throw uno::RuntimeException();
+}
-uno::Reference< embed::XStorage > xMetaInf;
-uno::Reference
xNameAccess(xWriteableZipStor, uno::UNO_QUERY);
-if (xNameAccess.is() && xNameAccess->hasByName("META-INF"))
+if ( bScriptingContent )
+{
+// If the signature has already the document signature it will
be
[Libreoffice-commits] core.git: include/sfx2 sfx2/source
include/sfx2/docfile.hxx|2 +-
sfx2/source/doc/docfile.cxx |4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 99337b029a3f94257160077ecf11ee3c59c77b7c
Author: Samuel Mehrbrodt
Date: Thu May 17 12:33:30 2018 +0200
Rename parameter bScriptingContent -> bSignScriptingContent
Change-Id: I227e59417719625a9752e727060f5e4f5094092d
Reviewed-on: https://gerrit.libreoffice.org/54479
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/include/sfx2/docfile.hxx b/include/sfx2/docfile.hxx
index f7e34b957766..7fe4911d3c55 100644
--- a/include/sfx2/docfile.hxx
+++ b/include/sfx2/docfile.hxx
@@ -266,7 +266,7 @@ public:
SAL_DLLPRIVATE bool
SignContents_Impl(const css::uno::Reference
xCert,
const OUString& aSignatureLineId,
- bool bScriptingContent, const OUString& aODFVersion,
+ bool bSignScriptingContent, const OUString& aODFVersion,
bool bHasValidDocumentSignature);
// the following two methods must be used and make sense only during
saving currently
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 9498b287231a..76ca23eb8e1a 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -3662,7 +3662,7 @@ void SfxMedium::CreateTempFileNoCopy()
}
bool SfxMedium::SignContents_Impl(const Reference xCert, const
OUString& aSignatureLineId,
- bool bScriptingContent, const OUString&
aODFVersion,
+ bool bSignScriptingContent, const OUString&
aODFVersion,
bool bHasValidDocumentSignature)
{
bool bChanges = false;
@@ -3715,7 +3715,7 @@ bool SfxMedium::SignContents_Impl(const
Reference xCert, const OUS
throw uno::RuntimeException();
}
-if ( bScriptingContent )
+if ( bSignScriptingContent )
{
// If the signature has already the document signature it will be
removed
// after the scripting signature is inserted.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sfx2 sfx2/source
include/sfx2/objsh.hxx |1
sfx2/source/doc/docfile.cxx | 225 +++-
sfx2/source/doc/objserv.cxx | 49 +
3 files changed, 148 insertions(+), 127 deletions(-)
New commits:
commit 039117eb27a11ee61d4f099c8616861cba961702
Author: Samuel Mehrbrodt
Date: Thu May 17 12:30:01 2018 +0200
Simplify SignContents_Impl by moving readonly check to caller methods
Change-Id: I95d9b12d7e1fc715363396e10bc4adc869978c44
Reviewed-on: https://gerrit.libreoffice.org/54478
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index 680b1ed8597f..0acc4f69a45d 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -355,6 +355,7 @@ public:
/** Returns to if preparing was succesful, else false. */
bool PrepareForSigning();
+bool CheckIsReadonly(bool bSignScriptingContent);
void AfterSigning(bool bSignSuccess, bool bSignScriptingContent);
bool HasValidSignatures();
SignatureState GetDocumentSignatureState();
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index acd54f1fc8c4..9498b287231a 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -3680,61 +3680,86 @@ bool SfxMedium::SignContents_Impl(const
Reference xCert, const OUS
comphelper::getProcessComponentContext(), aODFVersion,
bHasValidDocumentSignature ) );
uno::Reference< embed::XStorage > xWriteableZipStor;
-// Signing is not modification of the document, as seen by the user
-// ("only a saved document can be signed"). So allow signing in the
-// "opened read-only, but not physically-read-only" case.
-if (!IsOriginallyReadOnly())
+
+// we can reuse the temporary file if there is one already
+CreateTempFile( false );
+GetMedium_Impl();
+
+try
{
-// we can reuse the temporary file if there is one already
-CreateTempFile( false );
-GetMedium_Impl();
+if ( !pImpl->xStream.is() )
+throw uno::RuntimeException();
+bool bODF = GetFilter()->IsOwnFormat();
try
{
-if ( !pImpl->xStream.is() )
-throw uno::RuntimeException();
+xWriteableZipStor =
::comphelper::OStorageHelper::GetStorageOfFormatFromStream(
ZIP_STORAGE_FORMAT_STRING, pImpl->xStream );
+}
+catch (const io::IOException& rException)
+{
+if (bODF)
+SAL_WARN("sfx.doc", "ODF stream is not a zip storage: " <<
rException);
+}
-bool bODF = GetFilter()->IsOwnFormat();
-try
-{
-xWriteableZipStor =
::comphelper::OStorageHelper::GetStorageOfFormatFromStream(
ZIP_STORAGE_FORMAT_STRING, pImpl->xStream );
-}
-catch (const io::IOException& rException)
-{
-if (bODF)
-SAL_WARN("sfx.doc", "ODF stream is not a zip storage: " <<
rException);
-}
+if ( !xWriteableZipStor.is() && bODF )
+throw uno::RuntimeException();
-if ( !xWriteableZipStor.is() && bODF )
+uno::Reference< embed::XStorage > xMetaInf;
+uno::Reference xNameAccess(xWriteableZipStor,
uno::UNO_QUERY);
+if (xNameAccess.is() && xNameAccess->hasByName("META-INF"))
+{
+xMetaInf = xWriteableZipStor->openStorageElement(
+"META-INF",
+embed::ElementModes::READWRITE );
+if ( !xMetaInf.is() )
throw uno::RuntimeException();
+}
+
+if ( bScriptingContent )
+{
+// If the signature has already the document signature it will be
removed
+// after the scripting signature is inserted.
+uno::Reference< io::XStream > xStream(
+xMetaInf->openStreamElement(
xSigner->getScriptingContentSignatureDefaultStreamName(),
+embed::ElementModes::READWRITE
),
+uno::UNO_SET_THROW );
-uno::Reference< embed::XStorage > xMetaInf;
-uno::Reference
xNameAccess(xWriteableZipStor, uno::UNO_QUERY);
-if (xNameAccess.is() && xNameAccess->hasByName("META-INF"))
+if ( xSigner->signScriptingContent( GetZipStorageToSign_Impl(),
xStream ) )
{
-xMetaInf = xWriteableZipStor->openStorageElement(
-"META-INF",
-embed::ElementModes::READWRITE
);
-if ( !xMetaInf.is() )
-throw uno::RuntimeException();
-}
+// remove the document signature if any
+OUString aDocSigName =
xSigner->getDocumentContentSignatureDefaultStreamName();
+if
[Libreoffice-commits] core.git: include/sfx2 sfx2/source
include/sfx2/docfile.hxx|3 +--
sfx2/source/doc/docfile.cxx |3 ++-
sfx2/source/doc/objserv.cxx |9 +++--
3 files changed, 6 insertions(+), 9 deletions(-)
New commits:
commit 13596e704e4b48e8b0892867b3f3fc351a2729f9
Author: Samuel Mehrbrodt
Date: Thu May 17 13:35:31 2018 +0200
Don't pass ODF version, just retrieve it directly
Change-Id: I19ff42c348515b17dac17abe750ee03ca53efcbf
Reviewed-on: https://gerrit.libreoffice.org/54483
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/include/sfx2/docfile.hxx b/include/sfx2/docfile.hxx
index 7fe4911d3c55..6bf4d740e079 100644
--- a/include/sfx2/docfile.hxx
+++ b/include/sfx2/docfile.hxx
@@ -266,8 +266,7 @@ public:
SAL_DLLPRIVATE bool
SignContents_Impl(const css::uno::Reference
xCert,
const OUString& aSignatureLineId,
- bool bSignScriptingContent, const OUString& aODFVersion,
- bool bHasValidDocumentSignature);
+ bool bSignScriptingContent, bool
bHasValidDocumentSignature);
// the following two methods must be used and make sense only during
saving currently
// TODO/LATER: in future the signature state should be controlled by the
medium not by the document
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 76ca23eb8e1a..093dfbe8557b 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -3662,7 +3662,7 @@ void SfxMedium::CreateTempFileNoCopy()
}
bool SfxMedium::SignContents_Impl(const Reference xCert, const
OUString& aSignatureLineId,
- bool bSignScriptingContent, const OUString&
aODFVersion,
+ bool bSignScriptingContent,
bool bHasValidDocumentSignature)
{
bool bChanges = false;
@@ -3675,6 +3675,7 @@ bool SfxMedium::SignContents_Impl(const
Reference xCert, const OUS
// The component should know if there was a valid document signature, since
// it should show a warning in this case
+OUString
aODFVersion(comphelper::OStorageHelper::GetODFVersionFromStorage(GetStorage()));
uno::Reference< security::XDocumentDigitalSignatures > xSigner(
security::DocumentDigitalSignatures::createWithVersionAndValidSignature(
comphelper::getProcessComponentContext(), aODFVersion,
bHasValidDocumentSignature ) );
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index c1b81cbf62e0..294ff9473faf 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -1556,9 +1556,8 @@ void SfxObjectShell::SignDocumentContent()
if (CheckIsReadonly(false))
return;
-OUString
aODFVersion(comphelper::OStorageHelper::GetODFVersionFromStorage(GetStorage()));
bool bSignSuccess = GetMedium()->SignContents_Impl(
-Reference(), "", false, aODFVersion,
HasValidSignatures());
+Reference(), "", false, HasValidSignatures());
AfterSigning(bSignSuccess, false);
}
@@ -1572,9 +1571,8 @@ void SfxObjectShell::SignSignatureLine(const OUString&
aSignatureLineId,
if (CheckIsReadonly(false))
return;
-OUString
aODFVersion(comphelper::OStorageHelper::GetODFVersionFromStorage(GetStorage()));
bool bSignSuccess = GetMedium()->SignContents_Impl(
-xCert, aSignatureLineId, false, aODFVersion, HasValidSignatures());
+xCert, aSignatureLineId, false, HasValidSignatures());
AfterSigning(bSignSuccess, false);
}
@@ -1592,9 +1590,8 @@ void SfxObjectShell::SignScriptingContent()
if (CheckIsReadonly(true))
return;
-OUString
aODFVersion(comphelper::OStorageHelper::GetODFVersionFromStorage(GetStorage()));
bool bSignSuccess = GetMedium()->SignContents_Impl(
-Reference(), OUString(), true, aODFVersion,
HasValidSignatures());
+Reference(), OUString(), true, HasValidSignatures());
AfterSigning(bSignSuccess, true);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source sw/qa
svx/source/xoutdev/_xoutbmp.cxx| 20 +---
sw/qa/extras/htmlexport/htmlexport.cxx |2 +-
2 files changed, 2 insertions(+), 20 deletions(-)
New commits:
commit 57cc8b2e4f93b3a93ce9ac46a2a98eb2a799faa3
Author: Samuel Mehrbrodt
Date: Fri May 18 16:26:37 2018 +0200
Fix svg to base64 conversion
This reverts part of ab14a9708d2937bc767c14542610ce91b56dda1e which had
a questionable fix by unconditionally removing the first 8 bytes of the svg
which led to svgs starting with
rsion="1.0" encoding="utf-8"?>
instead of
Change-Id: I8c4d78db1794473d20ddd77019ae81b88be0bb03
Reviewed-on: https://gerrit.libreoffice.org/54550
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx
index 1e57b09bfe3c..3fc0110ed9e7 100644
--- a/svx/source/xoutdev/_xoutbmp.cxx
+++ b/svx/source/xoutdev/_xoutbmp.cxx
@@ -393,25 +393,7 @@ bool XOutBitmap::GraphicToBase64(const Graphic& rGraphic,
OUString& rOUString)
css::uno::Sequence aOStmSeq( static_cast(aOStm.GetData()),aOStm.Tell() );
OUStringBuffer aStrBuffer;
::comphelper::Base64::encode(aStrBuffer,aOStmSeq);
-OUString aEncodedBase64Image = aStrBuffer.makeStringAndClear();
-if( aLink.GetType() == GfxLinkType::NativeSvg )
-{
- sal_Int32 ite(8);
- sal_Int32 nBufferLength(aOStmSeq.getLength());
- const sal_Int8* pBuffer = aOStmSeq.getConstArray();
- css::uno::Sequence newTempSeq = aOStmSeq;// creates
new Sequence to remove front 8 bits of garbage and encodes in base64
- sal_Int8 *pOutBuffer = newTempSeq.getArray();
- while(ite < nBufferLength)
- {
-*pOutBuffer++ = pBuffer[ite];
-ite++;
- }
- ::comphelper::Base64::encode(aStrBuffer, newTempSeq);
- aEncodedBase64Image = aStrBuffer.makeStringAndClear();
- sal_Int32 SVGFixLength = aEncodedBase64Image.getLength();
- aEncodedBase64Image = aEncodedBase64Image.replaceAt(SVGFixLength - 12,
SVGFixLength, "") + "PC9zdmc+Cg=="; // removes rear 12 bits of garbage and adds
svg closing tag in base64
-}
-rOUString = aMimeType + ";base64," + aEncodedBase64Image;
+rOUString = aMimeType + ";base64," + aStrBuffer.makeStringAndClear();
return true;
}
diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx
b/sw/qa/extras/htmlexport/htmlexport.cxx
index f7aaec10a79b..4199ffeb4092 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -280,7 +280,7 @@ DECLARE_HTMLEXPORT_TEST(testExportImageBulletList,
"tdf66822.odt")
// Encoded base64 SVG bullet should match and render on browser
assertXPath(pDoc, "/html/body/ul", 1);
-assertXPath(pDoc, "/html/body/ul", "style", "list-style-image:
url(data:image/svg+xml;base64,cnNpb249IjEuMCIgZW5jb2Rpbmc9InV0Zi04Ij8+DQo8IS0tIEdlbmVyYXRvcjogQWRvYmUgSWxsdXN0cmF0b3IgMTIuMC4xLCBTVkcgRXhwb3J0IFBsdWctSW4gLiBTVkcgVmVyc2lvbjogNi4wMCBCdWlsZCA1MTQ0OCkgIC0tPg0KPCFET0NUWVBFIHN2ZyBQVUJMSUMgIi0vL1czQy8vRFREIFNWRyAxLjEvL0VOIiAiaHR0cDovL3d3dy53My5vcmcvR3JhcGhpY3MvU1ZHLzEuMS9EVEQvc3ZnMTEuZHRkIiBbDQoJPCFFTlRJVFkgbnNfc3ZnICJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+DQoJPCFFTlRJVFkgbnNfeGxpbmsgImh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPg0KXT4NCjxzdmcgIHZlcnNpb249IjEuMSIgaWQ9IkxheWVyXzEiIHhtbG5zPSImbnNfc3ZnOyIgeG1sbnM6eGxpbms9IiZuc194bGluazsiIHdpZHRoPSIxNC4wMDgiIGhlaWdodD0iMTQuMDEiDQoJIHZpZXdCb3g9IjAgMCAxNC4wMDggMTQuMDEiIG92ZXJmbG93PSJ2aXNpYmxlIiBlbmFibGUtYmFja2dyb3VuZD0ibmV3IDAgMCAxNC4wMDggMTQuMDEiIHhtbDpzcGFjZT0icHJlc2VydmUiPg0KPGc+DQoJPHJhZGlhbEdyYWRpZW50IGlkPSJYTUxJRF80XyIgY3g9IjcuMDA0NCIgY3k9IjcuMDA0OSIgcj0iNy4wMDQ0IiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+DQoJCTxzdG9wICBvZmZzZXQ9
IjAiIHN0eWxlPSJzdG9wLWNvbG9yOiMzNURCMzUiLz4NCgkJPHN0b3AgIG9mZnNldD0iMSIgc3R5bGU9InN0b3AtY29sb3I6IzAwQTAwMCIvPg0KCTwvcmFkaWFsR3JhZGllbnQ+DQoJPGNpcmNsZSBmaWxsPSJ1cmwoI1hNTElEXzRfKSIgY3g9IjcuMDA0IiBjeT0iNy4wMDUiIHI9IjcuMDA0Ii8+DQoJPGRlZnM+DQoJCTxmaWx0ZXIgaWQ9IkFkb2JlX09wYWNpdHlNYXNrRmlsdGVyIiBmaWx0ZXJVbml0cz0idXNlclNwYWNlT25Vc2UiIHg9IjMuNDgxIiB5PSIwLjY5MyIgd2lkdGg9IjYuOTg4IiBoZWlnaHQ9IjMuODkzIj4NCgkJCTxmZUNvbG9yTWF0cml4ICB0eXBlPSJtYXRyaXgiIHZhbHVlcz0iMSAwIDAgMCAwICAwIDEgMCAwIDAgIDAgMCAxIDAgMCAgMCAwIDAgMSAwIi8+DQoJCTwvZmlsdGVyPg0KCTwvZGVmcz4NCgk8bWFzayBtYXNrVW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4PSIzLjQ4MSIgeT0iMC42OTMiIHdpZHRoPSI2Ljk4OCIgaGVpZ2h0PSIzLjg5MyIgaWQ9IlhNTElEXzVfIj4NCgkJPGcgZmlsdGVyPSJ1cmwoI0Fkb2JlX09wYWNpdHlNYXNrRmlsdGVyKSI+DQoJCQk8bGluZWFyR3JhZGllbnQgaWQ9IlhNTElEXzZfIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjcuMTIyMSIgeTE9IjAuMTAzIiB4Mj0iNy4xMjIxIiB5Mj0iNS4yMzQ0Ij4NCgkJCQk8c3RvcCAgb2Zmc2V0PSIwIiBzdHlsZT0ic3RvcC1jb2xvcjojRkZGRkZGIi8+DQoJCQkJPHN0b3AgIG9mZnNldD0iMSIgc3R5bGU9I
nN0b3AtY29sb3I6IzAwMDAwMCIvPg0KCQkJPC9saW5lYXJHcmFkaWVudD4NCgkJCTxyZWN0IHg9IjMuMTk5IiB5PSIwLjMzOSIgb3BhY2l0eT0iMC43IiBmaWxsPSJ1cmwoI1hNTElEXzZfKSIgd2lkdGg9IjcuODQ2IiBoZWlnaHQ9IjQuNjAxIi8+DQoJCTwvZz4NCgk8L21hc2s+DQoJPGVsbGlwc2Ugb
[Libreoffice-commits] core.git: cui/uiconfig
cui/uiconfig/ui/signsignatureline.ui | 24 ++-- 1 file changed, 14 insertions(+), 10 deletions(-) New commits: commit c697e7f566302d5d52c3a043d5bddd8cf65499a1 Author: Olivier Hallot Date: Sat May 19 23:11:10 2018 -0300 Place help button on the left of signature dialog Change-Id: Ic78646b7540d2eaf176b3b6c57b0225793b866bd Reviewed-on: https://gerrit.libreoffice.org/54597 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/cui/uiconfig/ui/signsignatureline.ui b/cui/uiconfig/ui/signsignatureline.ui index b7182f9c8aaf..6eb036fbc944 100644 --- a/cui/uiconfig/ui/signsignatureline.ui +++ b/cui/uiconfig/ui/signsignatureline.ui @@ -1,5 +1,5 @@ - + @@ -10,6 +10,9 @@ 0 0 dialog + + + False @@ -20,8 +23,8 @@ False end - -gtk-cancel + +gtk-help True True True @@ -31,16 +34,16 @@ True True 0 +True - -Sign + +gtk-cancel True True -True -True True +True True @@ -49,12 +52,13 @@ - -gtk-help + +Sign True True +True +True True -True True ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sal vcl/unx
include/sal/log-areas.dox |1
vcl/unx/generic/fontmanager/fontconfig.cxx | 66 ++--
vcl/unx/generic/fontmanager/fontmanager.cxx |4 -
3 files changed, 26 insertions(+), 45 deletions(-)
New commits:
commit d9cc5a1c28a98bc2d4014a14a8e931662e94e037
Author: Stephan Bergmann
Date: Fri May 18 12:08:25 2018 +0200
Turn debug fprint in vcl/unx/generic/fontmanager/ into SAL_INFO
...mapping OSL_DEBUG_LEVEL > 1 ones to "vcl.fonts" and OSL_DEBUG_LEVEL > 2
ones
to new "vcl.fonts.detail"
Change-Id: I750b4915083c4a0f9d0310a667987ff33d7fcc2a
Reviewed-on: https://gerrit.libreoffice.org/54526
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 860e23040141..8819bef136e0 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -461,6 +461,7 @@ certain functionality.
@li @c vcl.eventtesting
@li @c vcl.filter
@li @c vcl.fonts - font-specific code
+@li @c vcl.fonts.detail
@li @c vcl.gdi - the GDI part of VCL, devices, bitmaps, etc.
@li @c vcl.gdi.wndproc - Windows Procedure part of VCL
@li @c vcl.gdi.fontmetric
diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx
b/vcl/unx/generic/fontmanager/fontconfig.cxx
index e70cb6d067af..17629c09173a 100644
--- a/vcl/unx/generic/fontmanager/fontconfig.cxx
+++ b/vcl/unx/generic/fontmanager/fontconfig.cxx
@@ -470,18 +470,14 @@ static void lcl_FcFontSetRemove(FcFontSet* pFSet, int i)
void PrintFontManager::countFontconfigFonts( std::unordered_map&
o_rVisitedPaths )
{
-#if OSL_DEBUG_LEVEL > 1
int nFonts = 0;
-#endif
FontCfgWrapper& rWrapper = FontCfgWrapper::get();
FcFontSet* pFSet = rWrapper.getFontSet();
const bool bMinimalFontset = utl::ConfigManager::IsFuzzing();
if( pFSet )
{
-#if OSL_DEBUG_LEVEL > 1
-fprintf( stderr, "found %d entries in fontconfig fontset\n",
pFSet->nfont );
-#endif
+SAL_INFO("vcl.fonts", "found " << pFSet->nfont << " entries in
fontconfig fontset");
for( int i = 0; i < pFSet->nfont; i++ )
{
FcChar8* file = nullptr;
@@ -511,20 +507,17 @@ void PrintFontManager::countFontconfigFonts(
std::unordered_map& o
if( eFileRes != FcResultMatch || eFamilyRes != FcResultMatch ||
eOutRes != FcResultMatch )
continue;
-#if (OSL_DEBUG_LEVEL > 2)
-fprintf( stderr, "found font \"%s\" in file %s\n"
- " weight = %d, slant = %d, style = \"%s\"\n"
- " width = %d, spacing = %d, outline = %d, format %s\n"
- , family, file
- , eWeightRes == FcResultMatch ? weight : -1
- , eSpacRes == FcResultMatch ? slant : -1
- , eStyleRes == FcResultMatch ? (const char*) style :
""
- , eWeightRes == FcResultMatch ? width : -1
- , eSpacRes == FcResultMatch ? spacing : -1
- , eOutRes == FcResultMatch ? outline : -1
- , eFormatRes == FcResultMatch ? (const char*)format :
""
- );
-#endif
+SAL_INFO(
+"vcl.fonts.detail",
+"found font \"" << family << "\" in file " << file << ",
weight = "
+<< (eWeightRes == FcResultMatch ? weight : -1) << ", slant = "
+<< (eSpacRes == FcResultMatch ? slant : -1) << ", style = \""
+<< (eStyleRes == FcResultMatch ? reinterpret_cast(style) : "")
+<< "\", width = " << (eWeightRes == FcResultMatch ? width :
-1) << ", spacing = "
+<< (eSpacRes == FcResultMatch ? spacing : -1) << ", outline = "
+<< (eOutRes == FcResultMatch ? outline : -1) << ", format "
+<< (eFormatRes == FcResultMatch
+? reinterpret_cast(format) : ""));
//OSL_ASSERT(eOutRes != FcResultMatch || outline);
@@ -534,9 +527,7 @@ void PrintFontManager::countFontconfigFonts(
std::unordered_map& o
if (isPreviouslyDuplicateOrObsoleted(pFSet, i))
{
-#if OSL_DEBUG_LEVEL > 2
-fprintf(stderr, "Ditching %s as duplicate/obsolete\n", file);
-#endif
+SAL_INFO("vcl.fonts.detail", "Ditching " << file << " as
duplicate/obsolete");
continue;
}
@@ -548,9 +539,7 @@ void PrintFontManager::countFontconfigFonts(
std::unordered_map& o
o_rVisitedPaths[aDir] = 1;
int nDirID = getDirectoryAtom( aDir );
-#if OSL_DEBUG_LEVEL > 2
-fprintf( stderr, "file %s not cached\n", aBase.getStr() );
-#endif
+SAL_INFO("vcl.fonts.detail", "file " << aBase << " not cached");
// not known, analyze font file to get attributes
// not described by fontconfig (e.g. alias names, PSName)
if (eFormatRes != FcResultMatch)
@@ -558,9 +547,8 @@ void PrintFont
[Libreoffice-commits] core.git: sw/inc
sw/inc/SwNumberTree.hxx | 37 sw/inc/accmap.hxx | 18 + sw/inc/anchoredobject.hxx | 84 -- sw/inc/dcontact.hxx | 16 +--- sw/inc/docfunc.hxx|6 --- sw/inc/fesh.hxx |4 -- sw/inc/fmtcolfunc.hxx |8 sw/inc/format.hxx |2 - sw/inc/frmfmt.hxx |4 -- sw/inc/numrule.hxx| 27 ++ 10 files changed, 25 insertions(+), 181 deletions(-) New commits: commit 038c607e4093d5a26e37d41805def1c5d65ff32d Author: Abhyudaya Sharma Date: Fri May 18 17:28:25 2018 +0530 tdf#108523 Remove @author annotations Change-Id: Icd9cd2c17657001058f09c4042804a91b4f1d1b1 Reviewed-on: https://gerrit.libreoffice.org/54539 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt diff --git a/sw/inc/SwNumberTree.hxx b/sw/inc/SwNumberTree.hxx index 960d89335b0d..2472f160f95d 100644 --- a/sw/inc/SwNumberTree.hxx +++ b/sw/inc/SwNumberTree.hxx @@ -228,8 +228,6 @@ public: /** set level of this node precondition: node is already member of a list tree - -@author OD */ void SetLevelInListTree( const int nLevel ); @@ -286,14 +284,10 @@ public: */ void ValidateMe(); -/** - Notifies all invalid siblings of this node. -*/ +/** Notifies all invalid siblings of this node. */ void NotifyInvalidSiblings(); -/** - notification of all nodes in the list tree on certain list level -*/ +/** notification of all nodes in the list tree on certain list level */ void NotifyNodesOnListLevel( const int nListLevel ); /** Invalidation and notification of complete numbering tree @@ -325,8 +319,6 @@ public: The search for the preceding node is performed for the tree below the node. To search the complete tree, the method has been called for the root of the tree. - -@author OD */ const SwNumberTreeNode* GetPrecedingNodeOf( const SwNumberTreeNode& rNode ) const; @@ -343,9 +335,7 @@ public: #endif // DBG_UTIL protected: -/** - the children -*/ +/** the children */ tSwNumberTreeChildren mChildren; /** @@ -392,14 +382,10 @@ protected: void IsSane(bool bRecursive, std::vector rParents) const; #endif // DBG_UTIL -/** - the parent node -*/ +/** he parent node */ SwNumberTreeNode * mpParent; -/** - the number of the node -*/ +/** the number of the node */ mutable SwNumberTree::tSwNumTreeNumber mnNumber; // boolean indicating, that a node of a not counted parent node is continuing @@ -486,15 +472,10 @@ protected: */ virtual void NotifyNode() = 0; -/** - Notifies this node (NotifyNode) and all descendants. - */ +/** Notifies this node (NotifyNode) and all descendants.*/ void Notify(); -/** notification of children nodes on certain depth - -@author OD -*/ +/** notification of children nodes on certain depth */ void NotifyChildrenOnDepth( const int nDepth ); /** @@ -564,9 +545,7 @@ protected: */ virtual bool IsCountPhantoms() const = 0; -/** - Return if all descendants of this node are phantoms. - */ +/** Return if all descendants of this node are phantoms. */ bool HasOnlyPhantoms() const; bool HasPhantomCountedParent() const; diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx index 12ccb97b7111..fc7f665da383 100644 --- a/sw/inc/accmap.hxx +++ b/sw/inc/accmap.hxx @@ -134,8 +134,6 @@ class SwAccessibleMap : public ::accessibility::IAccessibleViewForwarder, which have a selection Important note: method has to used inside a mutual exclusive section - -@author OD */ SwAccessibleSelectedParas_Impl* BuildSelectedParas(); @@ -184,8 +182,6 @@ public: /** get size of a dedicated preview page -@author OD - @param _nPreviewPageNum input parameter - physical page number of page visible in the page preview @@ -225,8 +221,6 @@ public: /** invalidation CONTENT_FLOWS_FROM/_TO relation of a paragraph -@author OD - @param _rTextFrame input parameter - reference to paragraph, whose CONTENT_FLOWS_FROM/_TO has to be invalidated. @@ -238,16 +232,10 @@ public: void InvalidateParaFlowRelation( const SwTextFrame& _rTextFrame, const bool _bFrom ); -/** invalidation of text selection of a paragraph - -@author OD -*/ +/** invalidation of text selection of a paragraph */ void InvalidateParaTextSelection( const SwTextFrame& _rTextFrame ); -/** invalidation of text selection of all paragraphs - -@author OD -*/ +/** invalidation of text selection of all paragraphs */ void InvalidateTextSelectionOfAllParas(); sal_Int32 GetChildIndex( c
[Libreoffice-commits] core.git: vbahelper/source xmloff/source
vbahelper/source/vbahelper/vbaapplicationbase.cxx |9 -
xmloff/source/text/txtlists.cxx |8
2 files changed, 8 insertions(+), 9 deletions(-)
New commits:
commit 1091e786b420a964b899e9c0a9c399d07946536c
Author: Takeshi Abe
Date: Tue May 22 13:28:15 2018 +0900
vbahelper, xmloff: Ask current datetime only once
Change-Id: I930983fab11d30f0887965fe30b07c5ac6eef8ef
Reviewed-on: https://gerrit.libreoffice.org/54651
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/vbahelper/source/vbahelper/vbaapplicationbase.cxx
b/vbahelper/source/vbahelper/vbaapplicationbase.cxx
index 25e91647694b..2fb92cf5c786 100644
--- a/vbahelper/source/vbahelper/vbaapplicationbase.cxx
+++ b/vbahelper/source/vbahelper/vbaapplicationbase.cxx
@@ -78,13 +78,12 @@ public:
static double GetNow()
{
-Date aDateNow( Date::SYSTEM );
-tools::Time aTimeNow( tools::Time::SYSTEM );
- Date aRefDate( 1,1,1900 );
-long nDiffDays = aDateNow - aRefDate;
+DateTime aNow( DateTime::SYSTEM );
+Date aRefDate( 1,1,1900 );
+long nDiffDays = aNow - aRefDate;
nDiffDays += 2; // Change VisualBasic: 1.Jan.1900 == 2
-long nDiffSeconds = aTimeNow.GetHour() * 3600 + aTimeNow.GetMin() * 60
+ aTimeNow.GetSec();
+long nDiffSeconds = aNow.GetHour() * 3600 + aNow.GetMin() * 60 +
aNow.GetSec();
return static_cast(nDiffDays) +
static_cast(nDiffSeconds)/double(24*3600);
}
diff --git a/xmloff/source/text/txtlists.cxx b/xmloff/source/text/txtlists.cxx
index ff57fbe0f601..40c85cb63c9c 100644
--- a/xmloff/source/text/txtlists.cxx
+++ b/xmloff/source/text/txtlists.cxx
@@ -23,8 +23,7 @@
#include
-#include
-#include
+#include
#include
#include
@@ -198,8 +197,9 @@ OUString XMLTextListsHelper::GenerateNewListId() const
else
{
// Value of xml:id in element has to be a valid ID type
(#i92478#)
-sal_Int64 n = ::tools::Time( ::tools::Time::SYSTEM ).GetTime();
-n += Date( Date::SYSTEM ).GetDateUnsigned();
+DateTime aDateTime( DateTime::SYSTEM );
+sal_Int64 n = aDateTime.GetTime();
+n += aDateTime.GetDateUnsigned();
n += comphelper::rng::uniform_int_distribution(0,
std::numeric_limits::max());
// Value of xml:id in element has to be a valid ID type
(#i92478#)
sTmpStr += OUString::number( n );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extensions/source
extensions/source/ole/servprov.cxx | 136 -
extensions/source/ole/servprov.hxx | 45
2 files changed, 181 deletions(-)
New commits:
commit 0f2157cb1513371829d7f8c415324cffed28c377
Author: Tor Lillqvist
Date: Tue Feb 13 00:23:50 2018 +0200
Bin dead code
OleServer::provideService() was not called anywhere. That means the
ProviderOleWrapper class is unused, too. Which is good, as it seemed
to largely be identical to OneInstanceOleWrapper anyway.
Change-Id: If8782d56ed1ec1bb173cfc18be585be4c331f335
Reviewed-on: https://gerrit.libreoffice.org/54647
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist
diff --git a/extensions/source/ole/servprov.cxx
b/extensions/source/ole/servprov.cxx
index 78d59292368f..e7fcbb9823ef 100644
--- a/extensions/source/ole/servprov.cxx
+++ b/extensions/source/ole/servprov.cxx
@@ -43,132 +43,6 @@ using namespace com::sun::star::bridge::ModelDependent;
// {82154420-0FBF-11d4-8313-005004526AB4}
DEFINE_GUID(OID_ServiceManager, 0x82154420, 0xfbf, 0x11d4, 0x83, 0x13, 0x0,
0x50, 0x4, 0x52, 0x6a, 0xb4);
-ProviderOleWrapper::ProviderOleWrapper(const Reference&
smgr,
- const Reference&
xSFact)
-: m_xSingleServiceFactory(xSFact),
- m_smgr( smgr)
-{
-Reference xInt =
smgr->createInstance("com.sun.star.bridge.oleautomation.BridgeSupplier");
-
-if (xInt.is())
-{
-Any a= xInt->queryInterface( cppu::UnoType::get() );
-a >>= m_bridgeSupplier;
-
-}
-}
-
-ProviderOleWrapper::~ProviderOleWrapper()
-{
-}
-
-bool ProviderOleWrapper::registerClass(GUID const * pGuid)
-{
-HRESULT hresult;
-
-o2u_attachCurrentThread();
-
-hresult = CoRegisterClassObject(
-*pGuid,
-this,
-CLSCTX_INPROC_SERVER | CLSCTX_LOCAL_SERVER,
-REGCLS_MULTIPLEUSE,
-&m_factoryHandle);
-
-return (hresult == NOERROR);
-}
-
-bool ProviderOleWrapper::deregisterClass()
-{
-HRESULT hresult = CoRevokeClassObject(m_factoryHandle);
-
-return (hresult == NOERROR);
-}
-
-STDMETHODIMP ProviderOleWrapper::QueryInterface(REFIID riid, void FAR* FAR*
ppv)
-{
-if(IsEqualIID(riid, IID_IUnknown))
-{
-AddRef();
-*ppv = static_cast(static_cast(this));
-return NOERROR;
-}
-else if (IsEqualIID(riid, IID_IClassFactory))
-{
-AddRef();
-*ppv = static_cast(this);
-return NOERROR;
-}
-
-*ppv = nullptr;
-return ResultFromScode(E_NOINTERFACE);
-}
-
-STDMETHODIMP_(ULONG) ProviderOleWrapper::AddRef()
-{
-return osl_atomic_increment( &m_refCount);
-}
-
-STDMETHODIMP_(ULONG) ProviderOleWrapper::Release()
-{
-MutexGuard aGuard( Mutex::getGlobalMutex());
-ULONG refCount = --m_refCount;
-if (m_refCount == 0)
-{
-delete this;
-}
-
-return refCount;
-}
-
-STDMETHODIMP ProviderOleWrapper::CreateInstance(IUnknown FAR* punkOuter,
-REFIID riid,
-void FAR* FAR* ppv)
-{
-HRESULT ret = ResultFromScode(E_UNEXPECTED);
-punkOuter = nullptr;
-
-Reference xInstance;
-
-if (m_xSingleServiceFactory.is())
-{
-xInstance = m_xSingleServiceFactory->createInstance();
-
-if (xInstance.is())
-{
-Any usrAny(&xInstance, cppu::UnoType::get());
-
-sal_uInt8 arId[16];
-rtl_getGlobalProcessId( arId );
-Any oleAny = m_bridgeSupplier->createBridge(usrAny,
-
Sequence(reinterpret_cast(arId), 16),
-UNO,
-OLE);
-
-
-if (auto v = o3tl::tryAccess(oleAny))
-{
-VARIANT* pVariant = reinterpret_cast(*v);
-
-if (pVariant->vt == VT_DISPATCH)
-{
-ret = pVariant->pdispVal->QueryInterface(riid, ppv);
-}
-
-VariantClear(pVariant);
-CoTaskMemFree(pVariant);
-}
-}
-}
-
-return ret;
-}
-
-STDMETHODIMP ProviderOleWrapper::LockServer(int /*fLock*/)
-{
-return NOERROR;
-}
-
OneInstanceOleWrapper::OneInstanceOleWrapper( const
Reference& smgr,
const Reference&
xInst )
: m_refCount(0)
@@ -612,16 +486,6 @@ css::uno::Sequence
OleServer::getSupportedServiceNames()
"com.sun.star.bridge.oleautomation.ApplicationRegistration"};
}
-bool OleServer::provideService(const Reference& xSFact,
GUID const * guid)
-{
-IClassFactoryWrapper* pFac = new ProviderOleWrapper( m_smgr, xSFact );
-
-pFac->AddRef();
-m_wrapperList.push_back(pFac);
-
-return pFac->registerClass(guid);
-}
-
bool OleServer::provideInstance(const Reference& xInst, GUID const
* guid)
{
IClassFactoryWrapper* pFac = new OneInstanceOleWra
[Libreoffice-commits] core.git: vcl/inc vcl/osx
vcl/inc/osx/salinst.h |3 ++-
vcl/osx/vclnsapp.mm |8
2 files changed, 10 insertions(+), 1 deletion(-)
New commits:
commit 059872b47ed957e847a3fe63bd35793ba93c4c32
Author: Tor Lillqvist
Date: Mon May 21 17:06:38 2018 +0300
tdf#77444: Call TriggerUserEventProcessing() in a few key places
Causes the updated aAppEventList to be handled right away, and not
only when the next ten-second timed fires.
Change-Id: Idbcc67f13c8ea69cc08b6c5f832d4461579d5dc6
Reviewed-on: https://gerrit.libreoffice.org/54643
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist
diff --git a/vcl/inc/osx/salinst.h b/vcl/inc/osx/salinst.h
index 4bb86ea271db..6fcb76aec1a7 100644
--- a/vcl/inc/osx/salinst.h
+++ b/vcl/inc/osx/salinst.h
@@ -71,10 +71,11 @@ class AquaSalInstance : public SalInstance, public
SalUserEventList
bool RunInMainYield( bool bHandleAllCurrentEvents );
-virtual void TriggerUserEventProcessing() override;
virtual void ProcessEvent( SalUserEvent aEvent ) override;
public:
+virtual void TriggerUserEventProcessing() override;
+
SalYieldMutex* mpSalYieldMutex;//
Sal-Yield-Mutex
OUStringmaDefaultPrinter;
oslThreadIdentifier maMainThread;
diff --git a/vcl/osx/vclnsapp.mm b/vcl/osx/vclnsapp.mm
index 825edac6be6c..4fc869f01919 100644
--- a/vcl/osx/vclnsapp.mm
+++ b/vcl/osx/vclnsapp.mm
@@ -248,6 +248,8 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
{
const ApplicationEvent* pAppEvent = new
ApplicationEvent(ApplicationEvent::Type::Open, aFile);
AquaSalInstance::aAppEventList.push_back( pAppEvent );
+AquaSalInstance *pInst = GetSalData()->mpInstance;
+pInst->TriggerUserEventProcessing();
}
return YES;
}
@@ -276,6 +278,8 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
// [app replyToOpenOrPrint: NSApplicationDelegateReplySuccess];
const ApplicationEvent* pAppEvent = new
ApplicationEvent(ApplicationEvent::Type::Open, aFileList);
AquaSalInstance::aAppEventList.push_back( pAppEvent );
+AquaSalInstance *pInst = GetSalData()->mpInstance;
+pInst->TriggerUserEventProcessing();
}
}
@@ -286,6 +290,8 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
aFile.push_back( GetOUString( pFile ) );
const ApplicationEvent* pAppEvent = new
ApplicationEvent(ApplicationEvent::Type::Print, aFile);
AquaSalInstance::aAppEventList.push_back( pAppEvent );
+AquaSalInstance *pInst = GetSalData()->mpInstance;
+pInst->TriggerUserEventProcessing();
return YES;
}
-(NSApplicationPrintReply)application: (NSApplication *) app
printFiles:(NSArray *)files withSettings: (NSDictionary *)printSettings
showPrintPanels:(BOOL)bShowPrintPanels
@@ -305,6 +311,8 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
}
const ApplicationEvent* pAppEvent = new
ApplicationEvent(ApplicationEvent::Type::Print, aFileList);
AquaSalInstance::aAppEventList.push_back( pAppEvent );
+AquaSalInstance *pInst = GetSalData()->mpInstance;
+pInst->TriggerUserEventProcessing();
// we have no back channel here, we have to assume success
// correct handling would be NSPrintingReplyLater and then send [app
replyToOpenOrPrint]
return NSPrintingSuccess;
___
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/app/app.cxx | 24
1 file changed, 8 insertions(+), 16 deletions(-)
New commits:
commit c8c7f19073eb7c2697cfe78de9e708ddc714c42a
Author: Mike Kaganski
Date: Sun May 20 20:44:25 2018 +0300
Really don't show empty Writer document on cancelled recovery
Commit b5ad981518f4407243f89507b2561dd0b1ef28ee tried to make that,
but either didn't work on all platforms, or was broken later. Then,
commit fbe9accf36ac4c52ef5bcb84d455b4d06c317668 handled one special
case.
The problem is that cancelling recovery returns false. It's unclear
why the distinction should be done for the cancelled recovery case:
in any case, if the recovery has opened some documents, it will be
handled in the code that enumerates frames ("no default document if
a document was loaded by recovery..." comment). In other cases, we
need to honour user command line parameters (selected module), and
if none is specified, do the global default, which is currently to
show Start Center. So - let the OpenDefault() do just that.
Change-Id: I90f3581fc72628d1317e97074a4a1d352d630c7e
Reviewed-on: https://gerrit.libreoffice.org/54604
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 27fb9aa036bc..22092bac9760 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1972,10 +1972,6 @@ IMPL_LINK_NOARG(Desktop, OpenClients_Impl, void*, void)
void Desktop::OpenClients()
{
-// check if a document has been recovered - if there is one of if a
document was loaded by cmdline, no default document
-// should be created
-bool bRecovery = false;
-
const CommandLineArgs& rArgs = GetCommandLineArgs();
if (!rArgs.IsQuickstart())
@@ -2070,7 +2066,7 @@ void Desktop::OpenClients()
{
try
{
-bRecovery = impl_callRecoveryUI(
+impl_callRecoveryUI(
false , // false => force recovery instead of
emergency save
bExistsRecoveryData);
}
@@ -2079,9 +2075,6 @@ void Desktop::OpenClients()
SAL_WARN( "desktop.app", "Error during recovery" << e);
}
}
-else if (bExistsRecoveryData && bDisableRecovery &&
!rArgs.HasModuleParam())
-// prevent new Writer doc
-bRecovery = true;
Reference< XSessionManagerListener2 > xSessionListener;
try
@@ -2188,14 +2181,7 @@ void Desktop::OpenClients()
// soffice was started as tray icon ...
return;
-if ( bRecovery )
-{
-ShowBackingComponent(nullptr);
-}
-else
-{
-OpenDefault();
-}
+OpenDefault();
}
void Desktop::OpenDefault()
@@ -2228,6 +2214,12 @@ void Desktop::OpenDefault()
if ( aName.isEmpty() )
{
+if (aOpt.IsModuleInstalled(SvtModuleOptions::EModule::STARTMODULE))
+{
+ShowBackingComponent(nullptr);
+return;
+}
+
// Old way to create a default document
if ( aOpt.IsModuleInstalled( SvtModuleOptions::EModule::WRITER ) )
aName = aOpt.GetFactoryEmptyDocumentURL(
SvtModuleOptions::EFactory::WRITER );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
