[Libreoffice-commits] core.git: xmlhelp/source
xmlhelp/source/cxxhelp/inc/tvread.hxx | 19 +++
xmlhelp/source/treeview/tvread.cxx| 27 +++
2 files changed, 14 insertions(+), 32 deletions(-)
New commits:
commit 3e8a8806df33b8ffeac6f89c10d8d56baf9a2b89
Author: Noel Grandin
AuthorDate: Fri Nov 29 15:08:19 2019 +0200
Commit: Noel Grandin
CommitDate: Sun Dec 1 08:37:44 2019 +0100
loplugin:mergeclasses treeview::TreeFileIterator
Change-Id: I9312806870b005e076fea3688f30ca86e93aeb4a
Reviewed-on: https://gerrit.libreoffice.org/84108
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/xmlhelp/source/cxxhelp/inc/tvread.hxx
b/xmlhelp/source/cxxhelp/inc/tvread.hxx
index 5f87ca5cf542..4753b9859930 100644
--- a/xmlhelp/source/cxxhelp/inc/tvread.hxx
+++ b/xmlhelp/source/cxxhelp/inc/tvread.hxx
@@ -239,18 +239,17 @@ namespace treeview {
EndReached
};
-class ExtensionIteratorBase
+class TreeFileIterator
{
public:
-ExtensionIteratorBase( const OUString& aLanguage );
-void init();
+TreeFileIterator( const OUString& aLanguage );
+OUString nextTreeFile( sal_Int32& rnFileSize );
private:
static css::uno::Reference< css::deployment::XPackage >
implGetHelpPackageFromPackage
( const css::uno::Reference< css::deployment::XPackage >& xPackage,
css::uno::Reference< css::deployment::XPackage >&
o_xParentPackageBundle );
-protected:
css::uno::Reference< css::deployment::XPackage >
implGetNextUserHelpPackage
( css::uno::Reference< css::deployment::XPackage >&
o_xParentPackageBundle );
css::uno::Reference< css::deployment::XPackage >
implGetNextSharedHelpPackage
@@ -284,18 +283,6 @@ namespace treeview {
int
m_iSharedPackage;
int
m_iBundledPackage;
-}; // end class ExtensionIteratorBase
-
-class TreeFileIterator : public ExtensionIteratorBase
-{
-public:
-TreeFileIterator( const OUString& aLanguage )
-: ExtensionIteratorBase( aLanguage )
-{}
-
-OUString nextTreeFile( sal_Int32& rnFileSize );
-
-private:
OUString expandURL( const OUString& aURL );
OUString implGetTreeFileFromPackage( sal_Int32& rnFileSize,
const css::uno::Reference< css::deployment::XPackage >& xPackage );
diff --git a/xmlhelp/source/treeview/tvread.cxx
b/xmlhelp/source/treeview/tvread.cxx
index a01dd66a51ef..922a418d401f 100644
--- a/xmlhelp/source/treeview/tvread.cxx
+++ b/xmlhelp/source/treeview/tvread.cxx
@@ -825,23 +825,18 @@ void TVChildTarget::subst( OUString& instpath )
instpath = aOptions.SubstituteVariable( instpath );
}
-// class ExtensionIteratorBase
+// class TreeFileIterator
static const char aHelpMediaType[] = "application/vnd.sun.star.help";
-ExtensionIteratorBase::ExtensionIteratorBase( const OUString& aLanguage )
+TreeFileIterator::TreeFileIterator( const OUString& aLanguage )
: m_eState( IteratorState::UserExtensions )
, m_aLanguage( aLanguage )
{
-init();
-}
-
-void ExtensionIteratorBase::init()
-{
m_xContext = ::comphelper::getProcessComponentContext();
if( !m_xContext.is() )
{
-throw RuntimeException( "ExtensionIteratorBase::init(), no
XComponentContext" );
+throw RuntimeException( "TreeFileIterator::TreeFileIterator(), no
XComponentContext" );
}
m_xSFA = ucb::SimpleFileAccess::create(m_xContext);
@@ -854,7 +849,7 @@ void ExtensionIteratorBase::init()
m_iBundledPackage = 0;
}
-Reference< deployment::XPackage >
ExtensionIteratorBase::implGetHelpPackageFromPackage
+Reference< deployment::XPackage >
TreeFileIterator::implGetHelpPackageFromPackage
( const Reference< deployment::XPackage >& xPackage, Reference<
deployment::XPackage >& o_xParentPackageBundle )
{
o_xParentPackageBundle.clear();
@@ -903,7 +898,7 @@ Reference< deployment::XPackage >
ExtensionIteratorBase::implGetHelpPackageFromP
return xHelpPackage;
}
-Reference< deployment::XPackage >
ExtensionIteratorBase::implGetNextUserHelpPackage
+Reference< deployment::XPackage > TreeFileIterator::implGetNextUserHelpPackage
( Reference< deployment::XPackage >& o_xParentPackageBundle )
{
Reference< deployment::XPackage > xHelpPackage;
@@ -926,14 +921,14 @@ Reference< deployment::XPackage >
ExtensionIteratorBase::implGetNextUserHelpPack
{
const Reference< deployment::XPackage >* pUserPackages =
m_aUserPackagesSeq.getConstArray();
Reference< deployment::XPackage > xPackage = pUserPackages[
m_iUserPackage++ ];
-OSL_ENSURE( xPackage.is(),
"ExtensionIteratorBase::implGetNextUserHelpPackage(): Invalid package" );
+OSL_ENSURE( xPackage.is(),
"TreeFileIterator::implGetNextUserHelpPackage(): Invalid packag
CppCheck Report Update
A new cppcheck report is available at : http://dev-builds.libreoffice.org/cppcheck_reports/master/ Note: The script generating this report was run at : 2019-01-12 04:22:04 with user buildslave at host vm140 as /home/buildslave/source/dev-tools/cppcheck/cppcheck-report.sh -s /home/buildslave/source/libo-core -c /home/buildslave/source/cppcheck -w /home/buildslave/tmp/www It can be found and improved here: https://gerrit.libreoffice.org/plugins/gitiles/dev-tools/+/master/cppcheck/cppcheck-report.sh ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] online.git: kit/Kit.cpp
kit/Kit.cpp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1c1989ad778b7429d6324af9af4d83fd16fa078c Author: Michael Meeks AuthorDate: Sat Nov 30 22:46:31 2019 + Commit: Michael Meeks CommitDate: Sat Nov 30 22:47:01 2019 + insert image needs fps_office component these days. Change-Id: I29a5d5a5c9c180f7cab3b008874f9f2a7ea323f0 diff --git a/kit/Kit.cpp b/kit/Kit.cpp index 101a40445..b46a0785b 100644 --- a/kit/Kit.cpp +++ b/kit/Kit.cpp @@ -2724,7 +2724,7 @@ bool globalPreinit(const std::string &loTemplate) "abp avmediagst avmediavlc cmdmail losessioninstall OGLTrans PresenterScreen " "syssh ucpftp1 ucpgio1 ucphier1 ucpimage updatecheckui updatefeed updchk" // Database - "dbaxml dbmm dbp dbu deployment firebird_sdbc fps_office mork " + "dbaxml dbmm dbp dbu deployment firebird_sdbc mork " "mysql mysqlc odbc postgresql-sdbc postgresql-sdbc-impl sdbc2 sdbt" // Java "javaloader javavm jdbc rpt rptui rptxml ", ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: kit/ChildSession.cpp
kit/ChildSession.cpp |4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
New commits:
commit 8bb64b6554b45fff8e4f47629123bf95822c46e1
Author: Michael Meeks
AuthorDate: Sat Nov 30 17:15:45 2019 +
Commit: Michael Meeks
CommitDate: Sat Nov 30 23:01:48 2019 +0100
lok: add viewId to window painting, to allow special-casing on render.
View switching should not cause the sidebar UX to re-build at all. So
pass the view-id into the render call so we can avoid this.
Change-Id: I194c1841df2cedfcdf82defb2712d20715d7ff1d
Reviewed-on: https://gerrit.libreoffice.org/84131
Reviewed-by: Michael Meeks
Tested-by: Michael Meeks
diff --git a/kit/ChildSession.cpp b/kit/ChildSession.cpp
index e254b94de..d07125a5c 100644
--- a/kit/ChildSession.cpp
+++ b/kit/ChildSession.cpp
@@ -1472,8 +1472,6 @@ bool ChildSession::renderWindow(const char* /*buffer*/,
int /*length*/, const st
{
const unsigned winId = (tokens.size() > 1 ? std::stoul(tokens[1]) : 0);
-getLOKitDocument()->setView(_viewId);
-
int startX = 0, startY = 0;
int bufferWidth = 800, bufferHeight = 600;
double dpiScale = 1.0;
@@ -1502,7 +1500,7 @@ bool ChildSession::renderWindow(const char* /*buffer*/,
int /*length*/, const st
int width = bufferWidth, height = bufferHeight;
std::string response;
const auto start = std::chrono::system_clock::now();
-getLOKitDocument()->paintWindow(winId, pixmap.data(), startX, startY,
width, height, dpiScale);
+getLOKitDocument()->paintWindow(winId, pixmap.data(), startX, startY,
width, height, dpiScale, _viewId);
const double area = width * height;
const auto duration = std::chrono::system_clock::now() - start;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/qa desktop/source include/LibreOfficeKit sfx2/source
desktop/qa/desktop_lib/test_desktop_lib.cxx |3 +-
desktop/source/lib/init.cxx | 29 ++--
include/LibreOfficeKit/LibreOfficeKit.h |9
include/LibreOfficeKit/LibreOfficeKit.hxx |7 +++---
sfx2/source/control/shell.cxx |7 ++
5 files changed, 45 insertions(+), 10 deletions(-)
New commits:
commit 71c5b374deb35993d0af3e953ff0cdfc64d76aab
Author: Michael Meeks
AuthorDate: Sat Nov 30 14:59:02 2019 +
Commit: Michael Meeks
CommitDate: Sat Nov 30 22:58:58 2019 +0100
lok: add viewId to window painting, to allow special-casing on render.
View switching should not cause the sidebar UX to re-build at all.
Particularly it should not do this when we switch view just to render
a sidebar.
Change-Id: Iec0427cdc8308fc273d73ea56dd208bfa7036471
Reviewed-on: https://gerrit.libreoffice.org/84120
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Michael Meeks
(cherry picked from commit 92814f3389de346f3ae32cddb38f079763e68ddf)
Reviewed-on: https://gerrit.libreoffice.org/84129
Tested-by: Jenkins
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index 242a539cf08e..08fa6a54ab62 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -2750,10 +2750,11 @@ void DesktopLOKTest::testABI()
CPPUNIT_ASSERT_EQUAL(documentClassOffset(55), offsetof(struct
_LibreOfficeKitDocumentClass, removeTextContext));
CPPUNIT_ASSERT_EQUAL(documentClassOffset(56), offsetof(struct
_LibreOfficeKitDocumentClass, sendDialogEvent));
CPPUNIT_ASSERT_EQUAL(documentClassOffset(57), offsetof(struct
_LibreOfficeKitDocumentClass, renderFontOrientation));
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(58), offsetof(struct
_LibreOfficeKitDocumentClass, paintWindowForView));
// Extending is fine, update this, and add new assert for the offsetof the
// new method
-CPPUNIT_ASSERT_EQUAL(documentClassOffset(58), sizeof(struct
_LibreOfficeKitDocumentClass));
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(59), sizeof(struct
_LibreOfficeKitDocumentClass));
}
CPPUNIT_TEST_SUITE_REGISTRATION(DesktopLOKTest);
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 2d8f7290a05d..8f05cc487672 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -905,6 +905,11 @@ static void doc_paintWindowDPI(LibreOfficeKitDocument*
pThis, unsigned nLOKWindo
const int nWidth, const int nHeight,
const double fDPIScale);
+static void doc_paintWindowForView(LibreOfficeKitDocument* pThis, unsigned
nLOKWindowId, unsigned char* pBuffer,
+ const int nX, const int nY,
+ const int nWidth, const int nHeight,
+ const double fDPIScale, int viewId);
+
static void doc_postWindow(LibreOfficeKitDocument* pThis, unsigned
nLOKWindowId, int nAction, const char* pData);
@@ -1022,6 +1027,7 @@ LibLODocument_Impl::LibLODocument_Impl(const
uno::Reference paintWindow = doc_paintWindow;
m_pDocumentClass->paintWindowDPI = doc_paintWindowDPI;
+m_pDocumentClass->paintWindowForView = doc_paintWindowForView;
m_pDocumentClass->postWindow = doc_postWindow;
m_pDocumentClass->resizeWindow = doc_resizeWindow;
@@ -4850,12 +4856,20 @@ static void doc_paintWindow(LibreOfficeKitDocument*
pThis, unsigned nLOKWindowId
doc_paintWindowDPI(pThis, nLOKWindowId, pBuffer, nX, nY, nWidth, nHeight,
1.0);
}
-static void doc_paintWindowDPI(LibreOfficeKitDocument* /*pThis*/, unsigned
nLOKWindowId,
+static void doc_paintWindowDPI(LibreOfficeKitDocument* pThis, unsigned
nLOKWindowId,
unsigned char* pBuffer,
const int nX, const int nY,
const int nWidth, const int nHeight,
const double fDPIScale)
{
+doc_paintWindowForView(pThis, nLOKWindowId, pBuffer, nX, nY, nWidth,
nHeight, fDPIScale, -1);
+}
+
+static void doc_paintWindowForView(LibreOfficeKitDocument* pThis, unsigned
nLOKWindowId,
+ unsigned char* pBuffer, const int nX, const
int nY,
+ const int nWidth, const int nHeight,
+ const double fDPIScale, int viewId)
+{
comphelper::ProfileZone aZone("doc_paintWindowDPI");
SolarMutexGuard aGuard;
@@ -4868,6 +4882,12 @@ static void doc_paintWindowDPI(LibreOfficeKitDocument*
/*pThis*/, unsigned nLOKW
return;
}
+// Used to avoid work in setView if set.
+comphelper::LibreOfficeKit::setDialogPainting(true);
+
+if (viewId >= 0)
+doc_setView(pThis, viewId);
+
// Setup cairo (or CoreGraphics, in the iOS case) to
[Libreoffice-commits] core.git: 2 commits - avmedia/source svx/source
avmedia/source/framework/soundhandler.cxx |9 +++--
avmedia/source/framework/soundhandler.hxx |9 ++---
svx/source/form/fmscriptingenv.cxx|3 ++-
3 files changed, 7 insertions(+), 14 deletions(-)
New commits:
commit 21c4afa6223dba58f604b4f5613b0a8a4a7d24ee
Author: Noel Grandin
AuthorDate: Fri Nov 29 15:30:48 2019 +0200
Commit: Noel Grandin
CommitDate: Sat Nov 30 21:34:29 2019 +0100
loplugin:mergeclasses SoundHandler
replace ThreadHelpBase with MutexHelper
Change-Id: If971a701261164ff4d3871eab5dfebd2c5d5b89f
Reviewed-on: https://gerrit.libreoffice.org/84111
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/avmedia/source/framework/soundhandler.cxx
b/avmedia/source/framework/soundhandler.cxx
index c98de6051796..926671f64c69 100644
--- a/avmedia/source/framework/soundhandler.cxx
+++ b/avmedia/source/framework/soundhandler.cxx
@@ -119,11 +119,8 @@ css::uno::Sequence< OUString > SAL_CALL
SoundHandler::getSupportedServiceNames()
@threadsafe yes
*//*-*/
SoundHandler::SoundHandler()
-// Init baseclasses first
-: ThreadHelpBase ( )
-, ::cppu::OWeakObject ( )
// Init member
-, m_bError( false)
+: m_bError( false)
, m_aUpdateIdle ( "avmedia SoundHandler Update" )
{
m_aUpdateIdle.SetInvokeHandler(LINK(this, SoundHandler,
implts_PlayerNotify));
@@ -168,7 +165,7 @@ void SAL_CALL SoundHandler::dispatchWithNotification(const
css::util::URL&
const
css::uno::Reference< css::frame::XDispatchResultListener >& xListener )
{
// SAFE {
-const ::osl::MutexGuard aLock( m_aLock );
+const ::osl::MutexGuard aLock( GetMutex() );
utl::MediaDescriptor aDescriptor(lDescriptor);
@@ -280,7 +277,7 @@ OUString SAL_CALL SoundHandler::detect( css::uno::Sequence<
css::beans::Property
IMPL_LINK_NOARG(SoundHandler, implts_PlayerNotify, Timer *, void)
{
// SAFE {
-::osl::ClearableMutexGuard aLock( m_aLock );
+::osl::ClearableMutexGuard aLock( GetMutex() );
if (m_xPlayer.is() && m_xPlayer->isPlaying() && m_xPlayer->getMediaTime()
< m_xPlayer->getDuration())
{
diff --git a/avmedia/source/framework/soundhandler.hxx
b/avmedia/source/framework/soundhandler.hxx
index 0cc3de24e83b..256b59b19ccf 100644
--- a/avmedia/source/framework/soundhandler.hxx
+++ b/avmedia/source/framework/soundhandler.hxx
@@ -36,17 +36,12 @@
#include
#include
#include
+#include
#include
#include
namespace avmedia{
-struct ThreadHelpBase
-{
-public:
-mutable ::osl::Mutex m_aLock;
-};
-
/*-
@short handler to detect and play sounds ("wav" and "au" only!)
@descr Register this implementation as a content handler to
detect and/or play wav- and au-sounds.
@@ -65,7 +60,7 @@ class SoundHandler : // interfaces
, public css::document::XExtendedFilterDetection
// baseclasses
// Order is necessary for right initialization!
-, private ThreadHelpBase
+, private MutexHelper
, public ::cppu::OWeakObject
{
// public methods
commit 1feed2622e99321e0893c8dc0443a534b5905691
Author: Noel Grandin
AuthorDate: Fri Nov 29 15:24:15 2019 +0200
Commit: Noel Grandin
CommitDate: Sat Nov 30 21:34:09 2019 +0100
this std::set can be o3tl::sorted_vector
Change-Id: I74a6141321dc60884789fd3d1a8a2540b662121b
Reviewed-on: https://gerrit.libreoffice.org/84110
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/svx/source/form/fmscriptingenv.cxx
b/svx/source/form/fmscriptingenv.cxx
index aa480dd3a123..4dcae395248b 100644
--- a/svx/source/form/fmscriptingenv.cxx
+++ b/svx/source/form/fmscriptingenv.cxx
@@ -41,6 +41,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -155,7 +156,7 @@ namespace svxform
// since we got rid of the notion of oneway, this is the list
// of oneway methods, autogenerated by postprocessing of
// commitdiff 90eac3e69749a9227c4b6902b1f3cef1e338c6d1
-static const std::set>
delayed_event_listeners{
+static const o3tl::sorted_vector>
delayed_event_listeners{
pair("com.sun.star.accessibility.XAccessibleComponent","grabFocus"),
pair("com.sun.star.accessibility.XAccessibleEventBroadcaster","addAccessibleEventListener"),
pair("com.sun.star.accessibility.XAccessibleEventBroadcaster","removeAccessibleEventListener"),
___
Libreoffice-commits mailing list
libreoffice-comm...@l
[Libreoffice-commits] core.git: 2 commits - compilerplugins/clang svx/source
compilerplugins/clang/mergeclasses.py |4
compilerplugins/clang/mergeclasses.results | 196 +++--
svx/source/form/fmscriptingenv.cxx | 54 ---
svx/source/form/fmundo.cxx |2
svx/source/inc/fmscriptingenv.hxx | 35 +++--
svx/source/inc/fmundo.hxx |2
6 files changed, 161 insertions(+), 132 deletions(-)
New commits:
commit 6b6609fc03d484ce1bfb18162b709704049b5ee9
Author: Noel Grandin
AuthorDate: Fri Nov 29 15:21:51 2019 +0200
Commit: Noel Grandin
CommitDate: Sat Nov 30 21:33:48 2019 +0100
loplugin:mergeclasses FormScriptingEnvironment with
IFormScriptingEnvironment
Change-Id: I334ad78681e2b7389388316881fd9f57455e875f
Reviewed-on: https://gerrit.libreoffice.org/84109
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/svx/source/form/fmscriptingenv.cxx
b/svx/source/form/fmscriptingenv.cxx
index f76f8e86f729..aa480dd3a123 100644
--- a/svx/source/form/fmscriptingenv.cxx
+++ b/svx/source/form/fmscriptingenv.cxx
@@ -71,19 +71,11 @@ namespace svxform
using ::com::sun::star::awt::XControl;
using ::com::sun::star::beans::XPropertySet;
-namespace {
-
-class FormScriptingEnvironment;
-
-}
-
//= FormScriptListener
typedef ::cppu::WeakImplHelper < XScriptListener
> FormScriptListener_Base;
-namespace {
-
/** implements the XScriptListener interface, is used by
FormScriptingEnvironment
*/
class FormScriptListener:public FormScriptListener_Base
@@ -145,37 +137,6 @@ namespace svxform
DECL_LINK( OnAsyncScriptEvent, void*, void );
};
-class FormScriptingEnvironment:
-public IFormScriptingEnvironment
-{
-private:
-typedef rtl::Reference ListenerImplementation;
-
-private:
-::osl::Mutexm_aMutex;
-ListenerImplementation m_pScriptListener;
-FmFormModel&m_rFormModel;
-boolm_bDisposed;
-
-public:
-explicit FormScriptingEnvironment( FmFormModel& _rModel );
-FormScriptingEnvironment(const FormScriptingEnvironment&) = delete;
-FormScriptingEnvironment& operator=(const FormScriptingEnvironment&) =
delete;
-
-// callback for FormScriptListener
-void doFireScriptEvent( const ScriptEvent& _rEvent, Any*
_pSynchronousResult );
-
-// IFormScriptingEnvironment
-virtual void registerEventAttacherManager( const Reference<
XEventAttacherManager >& _rxManager ) override;
-virtual void revokeEventAttacherManager( const Reference<
XEventAttacherManager >& _rxManager ) override;
-virtual void dispose() override;
-
-private:
-void impl_registerOrRevoke_throw( const Reference<
XEventAttacherManager >& _rxManager, bool _bRegister );
-};
-
-}
-
FormScriptListener::FormScriptListener( FormScriptingEnvironment*
pScriptExecutor )
:m_pScriptExecutor( pScriptExecutor )
{
@@ -906,7 +867,7 @@ namespace svxform
:m_rFormModel( _rModel )
,m_bDisposed( false )
{
-m_pScriptListener = ListenerImplementation( new FormScriptListener(
this ) );
+m_pScriptListener = new FormScriptListener( this );
// note that this is a cyclic reference between the FormScriptListener
and the FormScriptingEnvironment
// This cycle is broken up when our instance is disposed.
}
@@ -946,12 +907,6 @@ namespace svxform
impl_registerOrRevoke_throw( _rxManager, false );
}
-
-IFormScriptingEnvironment::~IFormScriptingEnvironment()
-{
-}
-
-
namespace
{
class NewStyleUNOScript
@@ -1080,13 +1035,6 @@ namespace svxform
m_pScriptListener.clear();
}
-
-PFormScriptingEnvironment createDefaultFormScriptingEnvironment(
FmFormModel& _rModel )
-{
-return new FormScriptingEnvironment( _rModel );
-}
-
-
}
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index 2552161a43f9..d887bbad661f 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -177,7 +177,7 @@ static OUString static_STR_UNDO_PROPERTY;
FmXUndoEnvironment::FmXUndoEnvironment(FmFormModel& _rModel)
:rModel( _rModel )
,m_pPropertySetCache( nullptr )
- ,m_pScriptingEnv(
::svxform::createDefaultFormScriptingEnvironment( _rModel ) )
+ ,m_pScriptingEnv( new svxform::FormScriptingEnvironment(
_rModel ) )
,m_Locks( 0 )
,bReadOnly( false )
,m_bDisposed( false )
diff --git a/svx/source/inc/fmscriptingenv.hxx
b/svx/source/inc/fmscriptingenv.hxx
index d747f038e844..ef4f29f80418 100644
--- a/svx/source/inc/fmscriptingenv.hxx
+++ b/svx/source/inc/fmscriptingenv.hxx
@@ -28,16 +28,21 @@ class FmFormModel;
namespace svxform
{
-
+class Fo
[Libreoffice-commits] core.git: compilerplugins/clang include/svx
compilerplugins/clang/unusedmethods.py |4
compilerplugins/clang/unusedmethods.results | 242 +++-
include/svx/ParaSpacingControl.hxx |4
3 files changed, 135 insertions(+), 115 deletions(-)
New commits:
commit 964dec70d0d068faa20f4b9ffac1cfd5911d81c2
Author: Noel Grandin
AuthorDate: Fri Nov 29 14:32:56 2019 +0200
Commit: Noel Grandin
CommitDate: Sat Nov 30 21:32:46 2019 +0100
loplugin:unusedmethods
Change-Id: Ie92b52eabc425a4688b6d4f7cfb547ad59f4afc4
Reviewed-on: https://gerrit.libreoffice.org/84106
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/compilerplugins/clang/unusedmethods.py
b/compilerplugins/clang/unusedmethods.py
index a8b20cfe3b2c..3df9b1e96ebe 100755
--- a/compilerplugins/clang/unusedmethods.py
+++ b/compilerplugins/clang/unusedmethods.py
@@ -157,7 +157,9 @@ for d in definitionSet:
if d[0] == "basic_ostream &" and
d[1].startswith("operator<<(basic_ostream &,int)
+cui/source/inc/cfg.hxx:337
+void SvxMenuEntriesListBox::set_dropdown(int,int)
+cui/source/inc/cfg.hxx:338
+void SvxMenuEntriesListBox::set_id(int,const class rtl::OUString &)
cui/source/inc/cfgutil.hxx:142
_Bool CuiConfigFunctionListBox::get_iter_first(class weld::TreeIter &)
const
cui/source/inc/cfgutil.hxx:144
@@ -502,15 +508,15 @@ include/drawinglayer/texture/texture.hxx:44
_Bool drawinglayer::texture::GeoTexSvx::operator!=(const class
drawinglayer::texture::GeoTexSvx &) const
include/drawinglayer/tools/primitive2dxmldump.hxx:44
void drawinglayer::tools::Primitive2dXmlDump::dump(const class
drawinglayer::primitive2d::Primitive2DContainer &,const class rtl::OUString &)
-include/editeng/editeng.hxx:459
+include/editeng/editeng.hxx:235
+_Bool EditEngine::GetDirectVertical() const
+include/editeng/editeng.hxx:237
+enum TextRotation EditEngine::GetRotation() const
+include/editeng/editeng.hxx:462
_Bool EditEngine::(anonymous)::__invoke(const class SvxFieldData *)
-include/editeng/editeng.hxx:459
-_Bool (*)(const class SvxFieldData *) EditEngine::(anonymous)::operator
bool (*)(const SvxFieldData *)() const
include/editeng/hyphenzoneitem.hxx:63
_Bool SvxHyphenZoneItem::IsPageEnd() const
-include/editeng/outliner.hxx:879
-_Bool (*)(const class SvxFieldData *) Outliner::(anonymous)::operator bool
(*)(const SvxFieldData *)() const
-include/editeng/outliner.hxx:879
+include/editeng/outliner.hxx:881
_Bool Outliner::(anonymous)::__invoke(const class SvxFieldData *)
include/filter/msfilter/mstoolbar.hxx:102
Indent::Indent(_Bool)
@@ -532,18 +538,20 @@ include/o3tl/cow_wrapper.hxx:323
type-parameter-?-? * o3tl::cow_wrapper::get()
include/o3tl/enumarray.hxx:105
typename type-parameter-?-?::value_type *
o3tl::enumarray_iterator::operator->() const
-include/o3tl/enumarray.hxx:132
+include/o3tl/enumarray.hxx:130
const typename type-parameter-?-?::value_type *
o3tl::enumarray_const_iterator::operator->() const
-include/o3tl/enumarray.hxx:135
+include/o3tl/enumarray.hxx:133
_Bool o3tl::enumarray_const_iterator::operator==(const
enumarray_const_iterator &) const
include/o3tl/safeint.hxx:79
typename enable_if::value, type-parameter-?-?>::type
o3tl::saturating_sub(type-parameter-?-?,type-parameter-?-?)
-include/o3tl/span.hxx:49
- o3tl::span::span(int (&)[N])
+include/o3tl/sorted_vector.hxx:206
+_Bool o3tl::sorted_vector::operator!=(const sorted_vector &) const
include/o3tl/span.hxx:49
o3tl::span::span(int const (&)[N])
include/o3tl/span.hxx:49
o3tl::span::span(unsigned short const (&)[N])
+include/o3tl/span.hxx:49
+ o3tl::span::span(int (&)[N])
include/o3tl/span.hxx:51
o3tl::span::span(type-parameter-?-? *,unsigned long)
include/o3tl/strong_int.hxx:86
@@ -551,8 +559,6 @@ include/o3tl/strong_int.hxx:86
include/o3tl/strong_int.hxx:112
strong_int o3tl::strong_int::operator--(int)
include/o3tl/strong_int.hxx:121
-_Bool o3tl::strong_int::anyOf(struct o3tl::strong_int,type-parameter-?-?...) const
-include/o3tl/strong_int.hxx:121
_Bool o3tl::strong_int::anyOf(struct o3tl::strong_int,type-parameter-?-?...) const
include/o3tl/strong_int.hxx:121
_Bool o3tl::strong_int::anyOf(struct o3tl::strong_int,type-parameter-?-?...) const
@@ -560,6 +566,8 @@ include/o3tl/strong_int.hxx:121
_Bool o3tl::strong_int::anyOf(struct o3tl::strong_int,type-parameter-?-?...) const
include/o3tl/strong_int.hxx:121
_Bool o3tl::strong_int::anyOf(struct o3tl::strong_int,type-parameter-?-?...) const
+include/o3tl/strong_int.hxx:121
+_Bool o3tl::strong_int::anyOf(struct o3tl::strong_int,type-parameter-?-?...) const
include/o3tl/typed_flags_set.hxx:114
typename typed_flags::Wrap operator~(typename
typed_flags::Wrap)
include/o3tl/typed_flags_set.hxx:147
@@ -622,8 +630,6 @@ include/svx/autoformathelper.hxx:145
_Bool AutoFormatBase::operator==(const class AutoFormatBase &)
include/svx/ClassificationDialog.hxx:
[Libreoffice-commits] core.git: sw/source
sw/source/core/unocore/unotbl.cxx |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit 6ed87cc5a4f755f360951550cac836e8967fc6bf Author: Justin Luth AuthorDate: Sat Oct 12 09:47:37 2019 +0300 Commit: Justin Luth CommitDate: Sat Nov 30 19:49:17 2019 +0100 related tdf#118947 sw tablestyle: no need to avoid numbered para Removed the hack that avoided applying table properties to paragraphs that had numbering/bullets applied. Most of the hackery around that happens in finishParagraph(), which runs before this, so any table properties already see all of the directly applied numbering properties. Since numbering heavily uses RES_LR_SPACE (which has multiple MemberIds), the previous inability to distinguish SET/DEFAULT per member probably caused problems, but since that happens now, it should be safe to also apply table-style properties. Change-Id: Id59a6249af55ea60255e2cef4ed9efe3d8321246 Reviewed-on: https://gerrit.libreoffice.org/81414 Tested-by: Jenkins Reviewed-by: Justin Luth diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx index 34c2b1bfb2ca..914717e83519 100644 --- a/sw/source/core/unocore/unotbl.cxx +++ b/sw/source/core/unocore/unotbl.cxx @@ -1102,8 +1102,7 @@ void SwXCell::setPropertyValue(const OUString& rPropertyName, const uno::Any& aV } bool bSet = false; -// HACK: don't check styles if numbering/bullets are turned on. Table-styles don't override numbering formatting -SwFormat* pFormatColl = pNd->GetNumRule() ? nullptr : pNd->GetFormatColl(); +SwFormat* pFormatColl = pNd->GetFormatColl(); // Manually walk through the parent properties in order to avoid the default properties. // Table-styles don't override paragraph-style formatting. //TODO: ?except for fontsize/justification if compat:overrideTableStyleFontSizeAndJustification? ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - postprocess/CustomTarget_registry.mk
postprocess/CustomTarget_registry.mk |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit 6f06f02cd89468c5e5bd7042e891ac9c08f46ed9 Author: Julien Nabet AuthorDate: Mon Nov 25 20:06:01 2019 +0100 Commit: Xisco Faulí CommitDate: Sat Nov 30 19:12:10 2019 +0100 tdf#128974: TB Addressbook not available directly as existing database (Win) When Seamonkey has been removed with: https://cgit.freedesktop.org/libreoffice/core/commit/?id=4e3086da3e9873f53b5b9e1d5e511f9f77aaf62f "Remove Seamonkey based address book driver" mork driver was erroneously skipped. Change-Id: I85822b58b12f2f2ea5233426791ed73698e67276 Reviewed-on: https://gerrit.libreoffice.org/83710 Reviewed-by: Julien Nabet Tested-by: Julien Nabet (cherry picked from commit be2a605af8c39dc4e655f7ba5702abebd608bf0d) Reviewed-on: https://gerrit.libreoffice.org/84036 Tested-by: Jenkins Reviewed-by: Xisco Faulí diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk index 579c608cf7fb..c33417c6b2a7 100644 --- a/postprocess/CustomTarget_registry.mk +++ b/postprocess/CustomTarget_registry.mk @@ -280,8 +280,7 @@ postprocess_FILES_main += \ $(call gb_XcuModuleTarget_get_target,connectivity/registry/odbc)/org/openoffice/Office/DataAccess/Drivers-odbc.xcu \ $(call gb_XcuModuleTarget_get_target,connectivity/registry/mysql_jdbc)/org/openoffice/Office/DataAccess/Drivers-mysql_jdbc.xcu postprocess_DRIVERS += dbase flat odbc mysql_jdbc -ifeq (WNT,$(OS)) -else ifeq (DBCONNECTIVITY,$(filter DBCONNECTIVITY,$(BUILD_TYPE))) +ifeq (DBCONNECTIVITY,$(filter DBCONNECTIVITY,$(BUILD_TYPE))) ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) postprocess_FILES_main += $(call gb_XcuModuleTarget_get_target,connectivity/registry/mork)/org/openoffice/Office/DataAccess/Drivers-mork.xcu postprocess_DRIVERS += mork ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - Repository.mk
Repository.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 83574bfd3071f557ea67ad831f916fe75291b1e2 Author: Andras Timar AuthorDate: Sat Nov 30 18:46:00 2019 +0100 Commit: Andras Timar CommitDate: Sat Nov 30 18:46:38 2019 +0100 [cp] Put Karla font to install packages Change-Id: Ib7defa621096812c3a3199340b2f5977f4de1a07 diff --git a/Repository.mk b/Repository.mk index c8a4afba4a51..ee8685b09c20 100644 --- a/Repository.mk +++ b/Repository.mk @@ -990,6 +990,7 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo_fonts,\ fonts_emojione_color \ fonts_gentium \ $(if $(MPL_SUBSET),,fonts_kacst) \ + fonts_karla \ fonts_liberation \ fonts_liberation_narrow \ fonts_libertineg \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - desktop/qa desktop/source include/LibreOfficeKit sfx2/source
desktop/qa/desktop_lib/test_desktop_lib.cxx |3 +-
desktop/source/lib/init.cxx | 29 ++--
include/LibreOfficeKit/LibreOfficeKit.h |9
include/LibreOfficeKit/LibreOfficeKit.hxx |7 +++---
sfx2/source/control/shell.cxx |7 ++
5 files changed, 45 insertions(+), 10 deletions(-)
New commits:
commit 92814f3389de346f3ae32cddb38f079763e68ddf
Author: Michael Meeks
AuthorDate: Sat Nov 30 14:59:02 2019 +
Commit: Michael Meeks
CommitDate: Sat Nov 30 18:14:57 2019 +0100
lok: add viewId to window painting, to allow special-casing on render.
View switching should not cause the sidebar UX to re-build at all.
Particularly it should not do this when we switch view just to render
a sidebar.
Change-Id: Iec0427cdc8308fc273d73ea56dd208bfa7036471
Reviewed-on: https://gerrit.libreoffice.org/84120
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Michael Meeks
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index f9ef935c4c62..37d6ad604cca 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -2789,10 +2789,11 @@ void DesktopLOKTest::testABI()
CPPUNIT_ASSERT_EQUAL(documentClassOffset(55), offsetof(struct
_LibreOfficeKitDocumentClass, removeTextContext));
CPPUNIT_ASSERT_EQUAL(documentClassOffset(56), offsetof(struct
_LibreOfficeKitDocumentClass, sendDialogEvent));
CPPUNIT_ASSERT_EQUAL(documentClassOffset(57), offsetof(struct
_LibreOfficeKitDocumentClass, renderFontOrientation));
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(58), offsetof(struct
_LibreOfficeKitDocumentClass, paintWindowForView));
// Extending is fine, update this, and add new assert for the offsetof the
// new method
-CPPUNIT_ASSERT_EQUAL(documentClassOffset(58), sizeof(struct
_LibreOfficeKitDocumentClass));
+CPPUNIT_ASSERT_EQUAL(documentClassOffset(59), sizeof(struct
_LibreOfficeKitDocumentClass));
}
CPPUNIT_TEST_SUITE_REGISTRATION(DesktopLOKTest);
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 9f4dfa961a20..b55fa59955f2 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -901,6 +901,11 @@ static void doc_paintWindowDPI(LibreOfficeKitDocument*
pThis, unsigned nLOKWindo
const int nWidth, const int nHeight,
const double fDPIScale);
+static void doc_paintWindowForView(LibreOfficeKitDocument* pThis, unsigned
nLOKWindowId, unsigned char* pBuffer,
+ const int nX, const int nY,
+ const int nWidth, const int nHeight,
+ const double fDPIScale, int viewId);
+
static void doc_postWindow(LibreOfficeKitDocument* pThis, unsigned
nLOKWindowId, int nAction, const char* pData);
@@ -1018,6 +1023,7 @@ LibLODocument_Impl::LibLODocument_Impl(const
uno::Reference paintWindow = doc_paintWindow;
m_pDocumentClass->paintWindowDPI = doc_paintWindowDPI;
+m_pDocumentClass->paintWindowForView = doc_paintWindowForView;
m_pDocumentClass->postWindow = doc_postWindow;
m_pDocumentClass->resizeWindow = doc_resizeWindow;
@@ -4838,12 +4844,20 @@ static void doc_paintWindow(LibreOfficeKitDocument*
pThis, unsigned nLOKWindowId
doc_paintWindowDPI(pThis, nLOKWindowId, pBuffer, nX, nY, nWidth, nHeight,
1.0);
}
-static void doc_paintWindowDPI(LibreOfficeKitDocument* /*pThis*/, unsigned
nLOKWindowId,
+static void doc_paintWindowDPI(LibreOfficeKitDocument* pThis, unsigned
nLOKWindowId,
unsigned char* pBuffer,
const int nX, const int nY,
const int nWidth, const int nHeight,
const double fDPIScale)
{
+doc_paintWindowForView(pThis, nLOKWindowId, pBuffer, nX, nY, nWidth,
nHeight, fDPIScale, -1);
+}
+
+static void doc_paintWindowForView(LibreOfficeKitDocument* pThis, unsigned
nLOKWindowId,
+ unsigned char* pBuffer, const int nX, const
int nY,
+ const int nWidth, const int nHeight,
+ const double fDPIScale, int viewId)
+{
comphelper::ProfileZone aZone("doc_paintWindowDPI");
SolarMutexGuard aGuard;
@@ -4856,6 +4870,12 @@ static void doc_paintWindowDPI(LibreOfficeKitDocument*
/*pThis*/, unsigned nLOKW
return;
}
+// Used to avoid work in setView if set.
+comphelper::LibreOfficeKit::setDialogPainting(true);
+
+if (viewId >= 0)
+doc_setView(pThis, viewId);
+
// Setup cairo (or CoreGraphics, in the iOS case) to draw with the changed
DPI scale (and return
// back to 1.0 when the painting finishes)
comphelper::ScopeGuard dpiScaleGuard([]() {
comphe
[Libreoffice-commits] core.git: basctl/source chart2/source cppcanvas/source cui/source dbaccess/source desktop/source filter/source framework/source include/comphelper include/vcl oox/source sc/sourc
basctl/source/dlged/dlgedobj.cxx | 2 chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx | 2 chart2/source/view/axes/VAxisBase.cxx | 2 chart2/source/view/axes/VAxisProperties.cxx| 4 - chart2/source/view/axes/VPolarRadiusAxis.cxx | 2 cppcanvas/source/mtfrenderer/implrenderer.cxx | 34 +- cppcanvas/source/mtfrenderer/textaction.cxx| 10 +- cppcanvas/source/tools/canvasgraphichelper.cxx | 2 cppcanvas/source/wrapper/implcanvas.cxx| 2 cui/source/options/tsaurls.cxx | 2 dbaccess/source/core/api/CRowSetDataColumn.cxx | 2 dbaccess/source/core/dataaccess/ContentHelper.cxx | 2 dbaccess/source/core/dataaccess/ModelImpl.cxx | 6 - desktop/source/app/cmdlineargs.cxx | 2 filter/source/pdf/impdialog.cxx| 2 framework/source/classes/taskcreator.cxx | 2 framework/source/services/substitutepathvars.cxx | 2 include/comphelper/configuration.hxx | 2 include/vcl/threadex.hxx | 2 oox/source/drawingml/shape.cxx | 2 oox/source/drawingml/table/tablecell.cxx | 4 - oox/source/drawingml/textparagraphproperties.cxx | 2 oox/source/drawingml/textparagraphpropertiescontext.cxx| 2 sc/source/filter/excel/xestyle.cxx | 18 ++--- sc/source/ui/unoobj/docuno.cxx | 2 sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx | 2 sfx2/source/dialog/dinfdlg.cxx | 8 +- sfx2/source/doc/SfxDocumentMetaData.cxx| 8 +- sfx2/source/sidebar/SidebarController.cxx | 18 ++--- sfx2/source/view/viewfrm.cxx | 2 slideshow/source/engine/animatedsprite.cxx | 4 - slideshow/source/engine/shapes/drawshape.cxx | 4 - svx/source/svdraw/svdobj.cxx | 4 - sw/source/core/crsr/findattr.cxx | 2 sw/source/core/frmedt/fews.cxx | 2 sw/source/core/inc/swfont.hxx | 8 +- sw/source/core/layout/atrfrm.cxx | 2 sw/source/core/layout/flowfrm.cxx | 2 sw/source/core/layout/laycache.cxx | 2 sw/source/core/layout/newfrm.cxx | 2 sw/source/core/layout/pagechg.cxx | 2 sw/source/core/layout/trvlfrm.cxx | 4 - sw/source/core/tox/tox.cxx | 2 sw/source/filter/ww8/docxattributeoutput.cxx | 2 sw/source/filter/ww8/docxtablestyleexport.cxx | 4 - sw/source/filter/ww8/rtfattributeoutput.cxx| 4 - sw/source/filter/ww8/wrtw8sty.cxx | 2 sw/source/filter/ww8/ww8graf.cxx | 10 +- sw/source/filter/xml/xmlexpit.cxx | 4 - sw/source/ui/misc/titlepage.cxx| 4 - sw/source/ui/table/tabledlg.cxx| 2 sw/source/uibase/shells/textsh1.cxx| 2 sw/source/uibase/utlui/uitool.cxx | 2 ucb/source/ucp/ext/ucpext_content.cxx | 6 - vcl/source/fontsubset/sft.cxx | 12 +-- vcl/unx/generic/window/screensaverinhibitor.cxx| 14 ++-- writerfilter/source/dmapper/DomainMapper_Impl.cxx | 4 - writerfilter/source/rtftok/rtfdocumentimpl.hxx | 2 58 files changed,
[Libreoffice-commits] core.git: 2 commits - helpcontent2 include/svx svx/source
helpcontent2 |2 +-
include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx |3 +--
svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx |4 ++--
svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx |8
svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx |6 +++---
5 files changed, 11 insertions(+), 12 deletions(-)
New commits:
commit 6ddefb080b12f54f84a8de44347a9b1816972ad3
Author: Stephan Bergmann
AuthorDate: Sat Nov 30 16:00:37 2019 +0100
Commit: Stephan Bergmann
CommitDate: Sat Nov 30 16:44:47 2019 +0100
Let getPageViewOutputDevice return const OutputDevice*
...instead of boost::optional (in preparation for
replacing
boost::optional with std::optional, which doesn't support references types
as
template arguments)
Change-Id: I02d2b617123cfa9ca0d6436c8a4104c5987f4eb5
Reviewed-on: https://gerrit.libreoffice.org/84121
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx
b/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx
index cb7773c716f3..44296b96cf1c 100644
--- a/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx
+++ b/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFSDROBJ_HXX
#include
-#include
class SdrObject;
class SdrLayerIDSet;
@@ -56,7 +55,7 @@ public:
This method cares for this, by retrieving the very original
OutputDevice.
*/
-boost::optional getPageViewOutputDevice() const;
+const OutputDevice* getPageViewOutputDevice() const;
};
}}
diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx
b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx
index 42e7a6a22675..23684f55901c 100644
--- a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx
@@ -60,12 +60,12 @@ vcl::Window* ViewObjectContactOfSdrMediaObj::getWindow()
const
{
vcl::Window* pRetval = nullptr;
-boost::optional oPageOutputDev =
getPageViewOutputDevice();
+const OutputDevice* oPageOutputDev = getPageViewOutputDevice();
if( oPageOutputDev )
{
if(OUTDEV_WINDOW == oPageOutputDev->GetOutDevType())
{
-pRetval = static_cast< vcl::Window*
>(&const_cast(oPageOutputDev.get()));
+pRetval = static_cast< vcl::Window*
>(&const_cast(*oPageOutputDev));
}
}
diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx
b/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx
index 5a614187e484..d21fddcb14b6 100644
--- a/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx
@@ -171,7 +171,7 @@ bool ViewObjectContactOfSdrObj::isPrimitiveVisible(const
DisplayInfo& rDisplayIn
return true;
}
-boost::optional
ViewObjectContactOfSdrObj::getPageViewOutputDevice() const
+const OutputDevice* ViewObjectContactOfSdrObj::getPageViewOutputDevice() const
{
ObjectContactOfPageView* pPageViewContact = dynamic_cast<
ObjectContactOfPageView* >( &GetObjectContact() );
if ( pPageViewContact )
@@ -182,11 +182,11 @@ boost::optional
ViewObjectContactOfSdrObj::getPageViewOutpu
// #i72429# / 2007-02-20 / frank.schoenheit (at) sun.com
SdrPageWindow& rPageWindow( pPageViewContact->GetPageWindow() );
if ( rPageWindow.GetOriginalPaintWindow() )
-return rPageWindow.GetOriginalPaintWindow()->GetOutputDevice();
+return &rPageWindow.GetOriginalPaintWindow()->GetOutputDevice();
-return rPageWindow.GetPaintWindow().GetOutputDevice();
+return &rPageWindow.GetPaintWindow().GetOutputDevice();
}
-return boost::optional();
+return nullptr;
}
}}
diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
index adedad499f22..f4703d348adb 100644
--- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
@@ -962,7 +962,7 @@ namespace sdr { namespace contact {
if ( pPageViewContact )
{
SdrPageViewAccess aPVAccess(
pPageViewContact->GetPageWindow().GetPageView() );
-const OutputDevice& rDevice(
m_pAntiImpl->getPageViewOutputDevice().get() );
+const OutputDevice& rDevice(
*m_pAntiImpl->getPageViewOutputDevice() );
impl_ensureControl_nothrow(
aPVAccess,
rDevice,
@@ -985,9 +985,9 @@ namespace sdr { namespace contact {
{
// do not use ObjectContact::TryToGetOutputDevice, it would not care
for the PageWindow's
// OriginalPaintWindow
-boost::optional oPageOutputDev =
m_pAntiImpl->getPageViewOutputDevice();
+const OutputDevice* oPageOutputDev =
m_pAntiImpl
[Libreoffice-commits] help.git: Branch 'libreoffice-6-4' - AllLangHelp_scalc.mk Package_html_media.mk source/media source/text
AllLangHelp_scalc.mk |4 Package_html_media.mk |1 source/media/helpimg/sc_func_opt01.svg | 174 + source/text/scalc/01/common_func.xhp |4 source/text/scalc/01/func_opt_barrier.xhp | 55 +++ source/text/scalc/01/func_opt_prob_hit.xhp | 53 +++ source/text/scalc/01/func_opt_prob_inmoney.xhp | 62 source/text/scalc/01/func_opt_touch.xhp| 89 8 files changed, 440 insertions(+), 2 deletions(-) New commits: commit 4b3a8a7bccae4787e11ab658c9feadb2bd63d294 Author: Steve Fanning AuthorDate: Sat Nov 30 12:14:44 2019 -0300 Commit: Olivier Hallot CommitDate: Sat Nov 30 16:44:43 2019 +0100 tdf#92084 Help Pages for OPT_* Calc functions Note: The OPT_* functions implemented in release 4.0 have no HID_ defined. Dummy HID contants were inserted waiting for tdf#129115. Change-Id: Iac253a86ff8cbf8fd1a222c6326abc7e0c9f4f76 Signed-off-by: Olivier Hallot Reviewed-on: https://gerrit.libreoffice.org/84123 Tested-by: Jenkins diff --git a/AllLangHelp_scalc.mk b/AllLangHelp_scalc.mk index 538b4ecad..eeca4db24 100644 --- a/AllLangHelp_scalc.mk +++ b/AllLangHelp_scalc.mk @@ -235,6 +235,10 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\ helpcontent2/source/text/scalc/01/func_workday.intl \ helpcontent2/source/text/scalc/01/func_numbervalue \ helpcontent2/source/text/scalc/01/func_now \ +helpcontent2/source/text/scalc/01/func_opt_barrier \ +helpcontent2/source/text/scalc/01/func_opt_prob_hit \ +helpcontent2/source/text/scalc/01/func_opt_prob_inmoney \ +helpcontent2/source/text/scalc/01/func_opt_touch \ helpcontent2/source/text/scalc/01/func_rawsubtract \ helpcontent2/source/text/scalc/01/func_regex \ helpcontent2/source/text/scalc/01/func_replaceb \ diff --git a/Package_html_media.mk b/Package_html_media.mk index 8f1c0078e..a9a4625fd 100644 --- a/Package_html_media.mk +++ b/Package_html_media.mk @@ -86,6 +86,7 @@ $(eval $(call gb_Package_add_files_with_dir,helpcontent2_html_media,$(LIBO_SHARE helpimg/sc_func_imsec.png \ helpimg/sc_func_imsech.png \ helpimg/sc_func_imtan.png \ +helpimg/sc_func_opt01.svg \ helpimg/sd_drawing_with_comment.png \ helpimg/sd_PresenterConsole01.png \ helpimg/sd_PresenterConsole02.png \ diff --git a/source/media/helpimg/sc_func_opt01.svg b/source/media/helpimg/sc_func_opt01.svg new file mode 100644 index 0..ed63eaef2 --- /dev/null +++ b/source/media/helpimg/sc_func_opt01.svg @@ -0,0 +1,174 @@ + + + +http://purl.org/dc/elements/1.1/"; + xmlns:cc="http://creativecommons.org/ns#"; + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"; + xmlns:svg="http://www.w3.org/2000/svg"; + xmlns="http://www.w3.org/2000/svg"; + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"; + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"; + width="82.03244mm" + height="19.987125mm" + viewBox="0 0 82.03244 19.987125" + version="1.1" + id="svg8" + inkscape:version="0.92.4 (5da689c313, 2019-01-14)" + sodipodi:docname="func_opt.svg"> + + + + + + + +image/svg+xml +http://purl.org/dc/dcmitype/StillImage"; /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/source/text/scalc/01/common_func.xhp b/source/text/scalc/01/common_func.xhp index b3803f646..7031956cb 100644 --- a/source/text/scalc/01/common_func.xhp +++ b/source/text/scalc/01/common_func.xhp @@ -16,10 +16,10 @@ -Syntax +Syntax -Example +Example diff --git a/source/text/scalc/01/func_opt_barrier.xhp b/source/text/scalc/01/func_opt_barrier.xhp new file mode 100644 index 0..805baef58 --- /dev/null +++ b/source/text/scalc/01/func_opt_barrier.xhp @@ -0,0 +1,55 @@ + + + + + + +Function OPT_BARRIER +/text/scalc/01/func_opt_barrier.xhp + + + + + +OPT_BARRIER function + + +OPT_BARRIER +Returns the pricing for a barrier option, calculated using the Black-Scholes option pricing model. + + + + +OPT_BARRIER(Spot; Volatility; Rate; Foreign Rate; Maturity; Strike; Lower Barrier; Upper Barrier; Rebate; Put or Call; In or Out; Barrier Monitoring; Greek) + + + + + +Strike is the strike price of the option and should be non-negative. + + +Rebate is the amount of money to be paid at maturity if the barrier is hit. +Put or Call is a string that defines whether the option is a put (“p”) or a call (“c”
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d59c69f4d61a0c920efca891abdb26a918f6c06d Author: Steve Fanning AuthorDate: Sat Nov 30 12:14:44 2019 -0300 Commit: Gerrit Code Review CommitDate: Sat Nov 30 16:44:43 2019 +0100 Update git submodules * Update helpcontent2 from branch 'libreoffice-6-4' - tdf#92084 Help Pages for OPT_* Calc functions Note: The OPT_* functions implemented in release 4.0 have no HID_ defined. Dummy HID contants were inserted waiting for tdf#129115. Change-Id: Iac253a86ff8cbf8fd1a222c6326abc7e0c9f4f76 Signed-off-by: Olivier Hallot Reviewed-on: https://gerrit.libreoffice.org/84123 Tested-by: Jenkins diff --git a/helpcontent2 b/helpcontent2 index 7dbb56f56f92..4b3a8a7bccae 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 7dbb56f56f92ffcdea5ccc620a0b064a7eda1dd1 +Subproject commit 4b3a8a7bccae4787e11ab658c9feadb2bd63d294 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: AllLangHelp_scalc.mk Package_html_media.mk source/media source/text
AllLangHelp_scalc.mk |4 Package_html_media.mk |1 source/media/helpimg/sc_func_opt01.svg | 174 + source/text/scalc/01/common_func.xhp |4 source/text/scalc/01/func_opt_barrier.xhp | 55 +++ source/text/scalc/01/func_opt_prob_hit.xhp | 53 +++ source/text/scalc/01/func_opt_prob_inmoney.xhp | 62 source/text/scalc/01/func_opt_touch.xhp| 89 8 files changed, 440 insertions(+), 2 deletions(-) New commits: commit d224d5be730b942c59f2942482e6704c9f51e2c3 Author: Steve Fanning AuthorDate: Sat Nov 30 12:14:44 2019 -0300 Commit: Olivier Hallot CommitDate: Sat Nov 30 16:44:27 2019 +0100 tdf#92084 Help Pages for OPT_* Calc functions Note: The OPT_* functions implemented in release 4.0 have no HID_ defined. Dummy HID contants were inserted waiting for tdf#129115. Change-Id: Iac253a86ff8cbf8fd1a222c6326abc7e0c9f4f76 Signed-off-by: Olivier Hallot Reviewed-on: https://gerrit.libreoffice.org/84122 Tested-by: Jenkins diff --git a/AllLangHelp_scalc.mk b/AllLangHelp_scalc.mk index 538b4ecad..eeca4db24 100644 --- a/AllLangHelp_scalc.mk +++ b/AllLangHelp_scalc.mk @@ -235,6 +235,10 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\ helpcontent2/source/text/scalc/01/func_workday.intl \ helpcontent2/source/text/scalc/01/func_numbervalue \ helpcontent2/source/text/scalc/01/func_now \ +helpcontent2/source/text/scalc/01/func_opt_barrier \ +helpcontent2/source/text/scalc/01/func_opt_prob_hit \ +helpcontent2/source/text/scalc/01/func_opt_prob_inmoney \ +helpcontent2/source/text/scalc/01/func_opt_touch \ helpcontent2/source/text/scalc/01/func_rawsubtract \ helpcontent2/source/text/scalc/01/func_regex \ helpcontent2/source/text/scalc/01/func_replaceb \ diff --git a/Package_html_media.mk b/Package_html_media.mk index 8f1c0078e..a9a4625fd 100644 --- a/Package_html_media.mk +++ b/Package_html_media.mk @@ -86,6 +86,7 @@ $(eval $(call gb_Package_add_files_with_dir,helpcontent2_html_media,$(LIBO_SHARE helpimg/sc_func_imsec.png \ helpimg/sc_func_imsech.png \ helpimg/sc_func_imtan.png \ +helpimg/sc_func_opt01.svg \ helpimg/sd_drawing_with_comment.png \ helpimg/sd_PresenterConsole01.png \ helpimg/sd_PresenterConsole02.png \ diff --git a/source/media/helpimg/sc_func_opt01.svg b/source/media/helpimg/sc_func_opt01.svg new file mode 100644 index 0..ed63eaef2 --- /dev/null +++ b/source/media/helpimg/sc_func_opt01.svg @@ -0,0 +1,174 @@ + + + +http://purl.org/dc/elements/1.1/"; + xmlns:cc="http://creativecommons.org/ns#"; + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"; + xmlns:svg="http://www.w3.org/2000/svg"; + xmlns="http://www.w3.org/2000/svg"; + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"; + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"; + width="82.03244mm" + height="19.987125mm" + viewBox="0 0 82.03244 19.987125" + version="1.1" + id="svg8" + inkscape:version="0.92.4 (5da689c313, 2019-01-14)" + sodipodi:docname="func_opt.svg"> + + + + + + + +image/svg+xml +http://purl.org/dc/dcmitype/StillImage"; /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/source/text/scalc/01/common_func.xhp b/source/text/scalc/01/common_func.xhp index b3803f646..7031956cb 100644 --- a/source/text/scalc/01/common_func.xhp +++ b/source/text/scalc/01/common_func.xhp @@ -16,10 +16,10 @@ -Syntax +Syntax -Example +Example diff --git a/source/text/scalc/01/func_opt_barrier.xhp b/source/text/scalc/01/func_opt_barrier.xhp new file mode 100644 index 0..805baef58 --- /dev/null +++ b/source/text/scalc/01/func_opt_barrier.xhp @@ -0,0 +1,55 @@ + + + + + + +Function OPT_BARRIER +/text/scalc/01/func_opt_barrier.xhp + + + + + +OPT_BARRIER function + + +OPT_BARRIER +Returns the pricing for a barrier option, calculated using the Black-Scholes option pricing model. + + + + +OPT_BARRIER(Spot; Volatility; Rate; Foreign Rate; Maturity; Strike; Lower Barrier; Upper Barrier; Rebate; Put or Call; In or Out; Barrier Monitoring; Greek) + + + + + +Strike is the strike price of the option and should be non-negative. + + +Rebate is the amount of money to be paid at maturity if the barrier is hit. +Put or Call is a string that defines whether the option is a put (“p”) or a call (“c”
[Libreoffice-commits] core.git: sw/source
sw/source/core/layout/paintfrm.cxx | 16
1 file changed, 12 insertions(+), 4 deletions(-)
New commits:
commit 77eec4c6c77f64eb257e0e7a5ff721f23886b883
Author: Stephan Bergmann
AuthorDate: Sat Nov 30 15:06:04 2019 +0100
Commit: Stephan Bergmann
CommitDate: Sat Nov 30 15:47:59 2019 +0100
Replace uses of boost::optional<>::get_ptr with free function
...in preparation of replacing boost::optional with std::optional, which
doesn't
have get_ptr
Change-Id: I432d6deb7cf9b892b6126245882c74ab680f2984
Reviewed-on: https://gerrit.libreoffice.org/84119
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index a7508171ecad..21c64087a460 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -4764,6 +4764,14 @@ namespace drawinglayer
} // end of namespace primitive2d
} // end of namespace drawinglayer
+namespace {
+
+editeng::SvxBorderLine const * get_ptr(boost::optional
const & opt) {
+return opt ? &*opt : nullptr;
+}
+
+}
+
void PaintCharacterBorder(
const SwFont& rFont,
const SwRect& rPaintArea,
@@ -4818,17 +4826,17 @@ void PaintCharacterBorder(
aAlignedRect.Width(), aAlignedRect.Height(),
aAlignedRect.Left(), aAlignedRect.Top()));
const svx::frame::Style aStyleTop(
-bTop ? rFont.GetAbsTopBorder(bVerticalLayout,
bVerticalLayoutLRBT).get_ptr() : nullptr,
+bTop ? get_ptr(rFont.GetAbsTopBorder(bVerticalLayout,
bVerticalLayoutLRBT)) : nullptr,
1.0);
const svx::frame::Style aStyleRight(
-bRight ? rFont.GetAbsRightBorder(bVerticalLayout,
bVerticalLayoutLRBT).get_ptr() : nullptr,
+bRight ? get_ptr(rFont.GetAbsRightBorder(bVerticalLayout,
bVerticalLayoutLRBT)) : nullptr,
1.0);
const svx::frame::Style aStyleBottom(
-bBottom ? rFont.GetAbsBottomBorder(bVerticalLayout,
bVerticalLayoutLRBT).get_ptr()
+bBottom ? get_ptr(rFont.GetAbsBottomBorder(bVerticalLayout,
bVerticalLayoutLRBT))
: nullptr,
1.0);
const svx::frame::Style aStyleLeft(
-bLeft ? rFont.GetAbsLeftBorder(bVerticalLayout,
bVerticalLayoutLRBT).get_ptr() : nullptr,
+bLeft ? get_ptr(rFont.GetAbsLeftBorder(bVerticalLayout,
bVerticalLayoutLRBT)) : nullptr,
1.0);
drawinglayer::primitive2d::Primitive2DContainer aBorderLineTarget;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - include/connectivity officecfg/registry oox/source sd/inc sd/source
include/connectivity/sqlerror.hxx|2
officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu | 15 +
oox/source/drawingml/table/tableproperties.cxx |9 +--
oox/source/drawingml/table/tablestyletextstylecontext.cxx|8 +-
sd/inc/CustomAnimationEffect.hxx |4 -
sd/source/core/CustomAnimationEffect.cxx | 32 ---
sd/source/core/EffectMigration.cxx |2
sd/source/ui/animations/CustomAnimationPane.cxx | 11 +++
sd/source/ui/func/fuconbez.cxx | 17 +
9 files changed, 79 insertions(+), 21 deletions(-)
New commits:
commit d0e040698de6a88793f4ddd3b257a3dde0644b2f
Author: Stephan Bergmann
AuthorDate: Sat Nov 30 14:01:46 2019 +0100
Commit: Stephan Bergmann
CommitDate: Sat Nov 30 15:00:29 2019 +0100
Assign bool directly to boost::optional
...instead of going via boost::optional. (In preparation of
replacing
boost::optional with std::optional, which doesn't support implicit
conversion
from std::optional to std::optional.)
Change-Id: I5dd74dd1c6346c99bd3e2a9b1156c9fce56db77c
Reviewed-on: https://gerrit.libreoffice.org/84116
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/oox/source/drawingml/table/tableproperties.cxx
b/oox/source/drawingml/table/tableproperties.cxx
index b6f9a8a59cfc..b6d8bf378127 100644
--- a/oox/source/drawingml/table/tableproperties.cxx
+++ b/oox/source/drawingml/table/tableproperties.cxx
@@ -135,11 +135,10 @@ static void SetTableStyleProperties(const
std::unique_ptr &pTableSty
pTableStyle->getBand1V().getFillProperties() = pBand1HFillProperties;
//tet bold for 1st row/last row/column
-::boost::optional< sal_Bool > textBoldStyle(true);
-pTableStyle->getFirstRow().getTextBoldStyle() = textBoldStyle;
-pTableStyle->getLastRow().getTextBoldStyle() = textBoldStyle;
-pTableStyle->getFirstCol().getTextBoldStyle() = textBoldStyle;
-pTableStyle->getLastCol().getTextBoldStyle() = textBoldStyle;
+pTableStyle->getFirstRow().getTextBoldStyle() = true;
+pTableStyle->getLastRow().getTextBoldStyle() = true;
+pTableStyle->getFirstCol().getTextBoldStyle() = true;
+pTableStyle->getLastCol().getTextBoldStyle() = true;
}
static std::unique_ptr CreateTableStyle(const OUString& styleId)
diff --git a/oox/source/drawingml/table/tablestyletextstylecontext.cxx
b/oox/source/drawingml/table/tablestyletextstylecontext.cxx
index 5b93f25d9ca3..7567ac4c8130 100644
--- a/oox/source/drawingml/table/tablestyletextstylecontext.cxx
+++ b/oox/source/drawingml/table/tablestyletextstylecontext.cxx
@@ -39,17 +39,17 @@ TableStyleTextStyleContext::TableStyleTextStyleContext(
ContextHandler2Helper co
if( rAttribs.hasAttribute( XML_b ) ) {
sal_Int32 nB = rAttribs.getToken( XML_b, XML_def );
if ( nB == XML_on )
-mrTableStylePart.getTextBoldStyle() = ::boost::optional< sal_Bool
>( true );
+mrTableStylePart.getTextBoldStyle() = true;
else if ( nB == XML_off )
-mrTableStylePart.getTextBoldStyle() = ::boost::optional< sal_Bool
>( false );
+mrTableStylePart.getTextBoldStyle() = false;
}
if( rAttribs.hasAttribute( XML_i ) ) {
sal_Int32 nI = rAttribs.getToken( XML_i, XML_def );
if ( nI == XML_on )
-mrTableStylePart.getTextItalicStyle() = ::boost::optional<
sal_Bool >( true );
+mrTableStylePart.getTextItalicStyle() = true;
else if ( nI == XML_off )
-mrTableStylePart.getTextItalicStyle() = ::boost::optional<
sal_Bool >( false );
+mrTableStylePart.getTextItalicStyle() = false;
}
}
commit d86cfcaf709638d73fcb0de5067b902dab7a7f2f
Author: Mark Hung
AuthorDate: Mon Nov 18 00:49:03 2019 +0800
Commit: Mark Hung
CommitDate: Sat Nov 30 15:00:09 2019 +0100
tdf#94947 Set preset-id for user defined motion paths.
User defined motion paths ( curve, polygon, freeform line )
did not have preset-id. Set the preset-id so that the
preset type will be highlighted in the custom animation
pane after editing.
"libo-motionpath-curve", "libo-motionpath-polygon",
and "libo-motionpath-freeform-line" are used for the three
user defined motion paths.
This patch is related to tdf#94947, though it doesn't
make the original document display correctly by guessing
the missing preset-id, but it prevent empty preset-id
to be generated when creating those three motion path
animation.
Change-Id: I50c0133bea32e022b07e5d8c0a024810844f124d
Reviewed-on: https://gerrit.libreoffice.org/83079
Tested-by: Jenkins
Reviewed-by: Mark Hung
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu
index c635e0387517..1
[Libreoffice-commits] core.git: 2 commits - compilerplugins/clang sd/inc sd/source
compilerplugins/clang/test/unnecessaryparen.cxx |2 +-
compilerplugins/clang/unnecessaryparen.cxx |4 +++-
sd/inc/CustomAnimationPreset.hxx|2 +-
sd/source/core/CustomAnimationPreset.cxx|6 +++---
4 files changed, 8 insertions(+), 6 deletions(-)
New commits:
commit b2c3528cc400bd2c10e56bd9d49e3339013ae388
Author: Stephan Bergmann
AuthorDate: Sat Nov 30 11:44:26 2019 +0100
Commit: Stephan Bergmann
CommitDate: Sat Nov 30 14:59:33 2019 +0100
...and take implicit const casts into account
...following up on 4f8a744c4fcf2c69462af19bd807fee32413158d "Make
loplugin:unnecessaryparen treat member expressions consistently"
Change-Id: I444d2995e88990c3c6fa2b912ef68032daf2cad9
Reviewed-on: https://gerrit.libreoffice.org/84112
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/compilerplugins/clang/test/unnecessaryparen.cxx
b/compilerplugins/clang/test/unnecessaryparen.cxx
index 88ed3650a09a..c33876ddae61 100644
--- a/compilerplugins/clang/test/unnecessaryparen.cxx
+++ b/compilerplugins/clang/test/unnecessaryparen.cxx
@@ -115,7 +115,7 @@ int main()
(void)nBits;
};
-struct B { operator bool(); };
+struct B { operator bool() const; };
struct N { bool operator !(); };
diff --git a/compilerplugins/clang/unnecessaryparen.cxx
b/compilerplugins/clang/unnecessaryparen.cxx
index 79085d80027e..106f2d2b3352 100644
--- a/compilerplugins/clang/unnecessaryparen.cxx
+++ b/compilerplugins/clang/unnecessaryparen.cxx
@@ -120,7 +120,9 @@ public:
// ImplicitCastExpr, so that VisitMemberExpr doesn't erroneously pick
it up (and note that
// CXXMemberCallExpr's getImplicitObjectArgument() skips past the
underlying MemberExpr):
if (auto const e1 = dyn_cast(expr->getSubExpr())) {
-if (auto const e2 =
dyn_cast(e1->getImplicitObjectArgument())) {
+if (auto const e2 = dyn_cast(
+e1->getImplicitObjectArgument()->IgnoreImpCasts()))
+{
handled_.insert(e2);
}
}
commit 93161eed833913dfef9d9e125952ffd0ff66ac13
Author: Mark Hung
AuthorDate: Mon Nov 18 00:48:06 2019 +0800
Commit: Mark Hung
CommitDate: Sat Nov 30 14:59:22 2019 +0100
sd: fix typo maEffectDiscriptorMap -> maEffectDescriptorMap;
Change-Id: Ie0e8dc67969ca680e80c544f954d3bef9adbcb33
Reviewed-on: https://gerrit.libreoffice.org/83078
Tested-by: Jenkins
Reviewed-by: Mark Hung
diff --git a/sd/inc/CustomAnimationPreset.hxx b/sd/inc/CustomAnimationPreset.hxx
index ad21b7a00d4a..220dedb9b0e3 100644
--- a/sd/inc/CustomAnimationPreset.hxx
+++ b/sd/inc/CustomAnimationPreset.hxx
@@ -118,7 +118,7 @@ private:
private:
css::uno::Reference< css::animations::XAnimationNode > mxRootNode;
-EffectDescriptorMap maEffectDiscriptorMap;
+EffectDescriptorMap maEffectDescriptorMap;
UStringMap maEffectNameMap;
UStringMap maPropertyNameMap;
diff --git a/sd/source/core/CustomAnimationPreset.cxx
b/sd/source/core/CustomAnimationPreset.cxx
index e54c67d95b5c..ed20faf74b3b 100644
--- a/sd/source/core/CustomAnimationPreset.cxx
+++ b/sd/source/core/CustomAnimationPreset.cxx
@@ -320,7 +320,7 @@ void CustomAnimationPresets::importEffects()
{
pDescriptor.reset( new CustomAnimationPreset( pEffect
) );
pDescriptor->maLabel = getUINameForPresetId(
pEffect->getPresetId() );
-maEffectDiscriptorMap[aPresetId] = pDescriptor;
+maEffectDescriptorMap[aPresetId] = pDescriptor;
}
++aIter;
@@ -450,9 +450,9 @@ void CustomAnimationPresets::importPresets( const
Reference< XMultiServiceFactor
CustomAnimationPresetPtr CustomAnimationPresets::getEffectDescriptor( const
OUString& rPresetId ) const
{
-EffectDescriptorMap::const_iterator aIter( maEffectDiscriptorMap.find(
rPresetId ) );
+EffectDescriptorMap::const_iterator aIter( maEffectDescriptorMap.find(
rPresetId ) );
-if( aIter != maEffectDiscriptorMap.end() )
+if( aIter != maEffectDescriptorMap.end() )
{
return (*aIter).second;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: instsetoo_native/inc_ooohelppack instsetoo_native/inc_openoffice instsetoo_native/inc_sdkoo
instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt |1 + instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt |1 + instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt |1 + 3 files changed, 3 insertions(+) New commits: commit b17d6452667d9be8fcbb9c84d042da66713230ea Author: Mike Kaganski AuthorDate: Sat Nov 30 12:45:56 2019 +0200 Commit: Mike Kaganski CommitDate: Sat Nov 30 14:24:14 2019 +0100 MSI: Disable creation of system restore points during installation We don't install low-level system components that have potential of ruining the system, which would be the reason to create the restore points. Some systems suffer from very long creation of the restore points, like in tdf#129087: ... MSI (s) (60:00) [09:18:54:201]: Calling SRSetRestorePoint API. dwRestorePtType: 1, dwEventType: 102, llSequenceNumber: 0, szDescription: "Removed LibreOffice 6.3 Help Pack (English (United Kingdom))". MSI (s) (60:00) [09:26:57:699]: The call to SRSetRestorePoint API succeeded. Returned status: 0, llSequenceNumber: 73. ... So let's just disable the generation of restore points, as per [1]. [1] https://docs.microsoft.com/en-us/windows/win32/msi/msifastinstall Change-Id: I452859d72284e0b2ea9a407e30a5e256a8c0a0f6 Reviewed-on: https://gerrit.libreoffice.org/84113 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt index 9a9721b0dbb2..ca9abc8110e1 100644 --- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt +++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt @@ -27,6 +27,7 @@ ISSCRIPT_VERSION_MISSING IDS_ISSCRIPT_VERSION_MISSING ISSCRIPT_VERSION_OLD IDS_ISSCRIPT_VERSION_OLD ISVROOT_PORT_NO0 Manufacturer MANUFACTURERTEMPLATE +MSIFASTINSTALL 1 PIDTemplate12345<###-%%%>@ ProductCodePRODUCTCODETEMPLATE ProductID none diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt index 03fab1ce9347..e528cac384ec 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt @@ -28,6 +28,7 @@ ISSCRIPT_VERSION_MISSING IDS_ISSCRIPT_VERSION_MISSING ISSCRIPT_VERSION_OLD IDS_ISSCRIPT_VERSION_OLD ISVROOT_PORT_NO0 Manufacturer MANUFACTURERTEMPLATE +MSIFASTINSTALL 1 MSIRESTARTMANAGERCONTROL 0 MsiUIRMOption DontUseRM PIDTemplate12345<###-%%%>@ diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt index bea6abe6af03..bd9065fd92b5 100644 --- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt +++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt @@ -28,6 +28,7 @@ ISSCRIPT_VERSION_MISSING IDS_ISSCRIPT_VERSION_MISSING ISSCRIPT_VERSION_OLD IDS_ISSCRIPT_VERSION_OLD ISVROOT_PORT_NO0 Manufacturer MANUFACTURERTEMPLATE +MSIFASTINSTALL 1 PIDTemplate12345<###-%%%>@ ProductCodePRODUCTCODETEMPLATE ProductID none ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: emfio/source
emfio/source/reader/emfreader.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 3999f7001f4059a641858741fb2d2f7b5e45f452
Author: Chris Sherlock
AuthorDate: Sat Nov 30 11:11:39 2019 +1100
Commit: Bartosz Kosiorek
CommitDate: Sat Nov 30 13:04:05 2019 +0100
tdf#129106 vcl: add SAL_INFO to show the dxArray intercharacter spacings
Change-Id: I948555cb4895390ded8b6c9b257486cdce175185
Reviewed-on: https://gerrit.libreoffice.org/84096
Tested-by: Jenkins
Reviewed-by: Bartosz Kosiorek
diff --git a/emfio/source/reader/emfreader.cxx
b/emfio/source/reader/emfreader.cxx
index ed42f904c011..77d5b58cfd00 100644
--- a/emfio/source/reader/emfreader.cxx
+++ b/emfio/source/reader/emfreader.cxx
@@ -1748,6 +1748,7 @@ namespace emfio
}
SAL_INFO("emfio", "\t\tText: " << aText);
+SAL_INFO("emfio", "\t\tDxBuffer:");
std::unique_ptr pDXAry, pDYAry;
@@ -1789,6 +1790,7 @@ namespace emfio
}
}
+SAL_INFO("emfio", "\t\t\tSpacing " << i <<
": " << nDx);
pDXAry[i] = nDx;
if (nOptions & ETO_PDY)
{
___
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 0c6b7e46629a4e7aa63d9e78c1342209298f2fc6 Author: Mike Kaganski AuthorDate: Sat Nov 30 13:34:16 2019 +0200 Commit: Gerrit Code Review CommitDate: Sat Nov 30 12:36:31 2019 +0100 Update git submodules * Update helpcontent2 from branch 'master' - Make this example click-copyable Change-Id: I38b1c3c4c5f086fcd7bea14c2f72392bba2c6102 Reviewed-on: https://gerrit.libreoffice.org/84114 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/helpcontent2 b/helpcontent2 index 9c555ed88af2..0090b4347539 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 9c555ed88af27d3187886cf8a2ae13936b62623d +Subproject commit 0090b4347539bd3e76f2f01bc249303d0eea5d40 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/scalc/01/04060109.xhp |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 0090b4347539bd3e76f2f01bc249303d0eea5d40
Author: Mike Kaganski
AuthorDate: Sat Nov 30 13:34:16 2019 +0200
Commit: Mike Kaganski
CommitDate: Sat Nov 30 12:36:31 2019 +0100
Make this example click-copyable
Change-Id: I38b1c3c4c5f086fcd7bea14c2f72392bba2c6102
Reviewed-on: https://gerrit.libreoffice.org/84114
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/source/text/scalc/01/04060109.xhp
b/source/text/scalc/01/04060109.xhp
index 0c8549426..576dff2ea 100644
--- a/source/text/scalc/01/04060109.xhp
+++ b/source/text/scalc/01/04060109.xhp
@@ -518,7 +518,8 @@
=HYPERLINK("http://www.example.org";)
displays the text "http://www.example.org"; in the cell and executes the
hyperlink http://www.example.org when clicked.
=HYPERLINK("http://www.example.org";"Click
here") displays the text "Click here" in the cell and executes the
hyperlink http://www.example.org when clicked.
- =HYPERLINK("http://www.example.org";12345) displays the number
12345 and executes the hyperlink http://www.example.org when
clicked.
+
+=HYPERLINK("http://www.example.org";12345) displays the
number 12345 and executes the hyperlink http://www.example.org when
clicked.
=HYPERLINK($B4) where cell B4 contains
http://www.example.org. The function adds
http://www.example.org to the URL of the hyperlink cell and returns the same
text which is used as formula result.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1f2c599b773b76f3915c6df2f2606348fcbe1437 Author: Christian Lohmaier AuthorDate: Wed Oct 9 16:28:53 2019 +0200 Commit: Gerrit Code Review CommitDate: Sat Nov 30 12:07:13 2019 +0100 Update git submodules * Update translations from branch 'distro/collabora/cp-6.2' - update translations for 6.2.8 rc2 and force-fix errors using pocheck Change-Id: I2341567f45e7f639212e55292e568bebe88dbd9b - update translations for 6.2.8 rc1 and force-fix errors using pocheck Change-Id: I373ede836681f1aa2f1fbf9729b52ecbe198dd79 diff --git a/translations b/translations index cf0107f2d1ff..2040c21bdbd6 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit cf0107f2d1ff7b4201af6ad7b194c64e7d3665e6 +Subproject commit 2040c21bdbd687471431d7c2c7b61b5fba5ff2d7 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - 3 commits - readlicense_oo/license sd/source vcl/unx
readlicense_oo/license/CREDITS.fodt | 2650 ++-- sd/source/ui/docshell/docshel4.cxx | 11 vcl/unx/gtk/gtksalmenu.cxx |8 3 files changed, 1352 insertions(+), 1317 deletions(-) New commits: commit d970cb94bfb86aac349c111ac0d4ff2aa273823c Author: Christian Lohmaier AuthorDate: Thu Oct 10 13:20:45 2019 +0200 Commit: Andras Timar CommitDate: Sat Nov 30 11:58:13 2019 +0100 update credits Change-Id: Ib98367116f9727f6ec54372d4cd90b657258b0d7 (cherry picked from commit 70ae1da67310a596e5bc49f1053c7ff72c84f539) diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt index d1051dbc30dc..533cc4b56527 100644 --- a/readlicense_oo/license/CREDITS.fodt +++ b/readlicense_oo/license/CREDITS.fodt @@ -1,10 +1,10 @@ http://www.w3.org/2003/g/data-view#"; xmlns:xhtml="http://www.w3.org/1999/xhtml"; xmlns:css3t="http://www.w3.org/TR/css3-text/"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:xforms="http://www.w3.org/2002/xforms"; xmlns:dom="http://www.w3.org/2001/xml-events"; xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML"; xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:oooc="http://openoffice.org/2004/calc"; xmlns:ooow="http://openoffice.org/2004/writer"; xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:tableooo="http://openoffice.org/2009/table"; xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1. 0" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:xlink="http://www.w3.org/1999/xlink"; xmlns:ooo="http://openoffice.org/2004/office"; xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:officeooo="http://openoffice.org/2009/office"; xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:drawooo="http://openoffice.org/2010/draw"; xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:rpt="http://op enoffice.org/2005/report" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.text"> - Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/6.3.1.2$Linux_X86_64 LibreOffice_project/b79626edf0065ac373bd1df5c28bd630b44242732012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA + Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/6.3.2.2$Linux_X86_64 LibreOffice_project/98b30e735bda24bc04ab42594c85f7fd8be07b9c2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA - 663 + 631 501 32440 18152 @@ -16,9 +16,9 @@ 3649 3471 501 - 663 + 631 32939 - 18814 + 18782 0 0 false @@ -114,7 +114,7 @@ true false true - 8854962 + 8913393 false false false @@ -147,8 +147,8 @@ - - + + @@ -179,7 +179,7 @@ - + @@ -225,7 +225,7 @@ - + @@ -234,14 +234,14 @@ - + - + @@ -333,24 +333,24 @@ - + - + - + - + - + @@ -414,24 +414,24 @@ - + - + - + - + - + @@ -1067,7 +1067,7 @@ Credits -1453 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2019-09-18 12:20:54. +1457 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2019-10-10 11:38:18. * marks developers whose first contributions happened after 2010-09-28. Developers committing code since 2010-09-28 @@ -1091,16 +1091,16 @@ - Caolán McNamaraC
[Libreoffice-commits] core.git: sc/source
sc/source/ui/app/inputhdl.cxx |4 1 file changed, 4 insertions(+) New commits: commit b48bcb45d7c503eeb5ec54085d3261ceba7393fd Author: Mike Kaganski AuthorDate: Sat Nov 30 08:24:55 2019 +0200 Commit: Mike Kaganski CommitDate: Sat Nov 30 11:31:56 2019 +0100 Clarify the comment Change-Id: I610057d4226616cad928eba82ce0055b37fe4e16 Reviewed-on: https://gerrit.libreoffice.org/84102 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index 2ea4ba7a6c2d..2d03cdecb5df 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -1489,6 +1489,10 @@ void completeFunction( EditView* pView, const OUString& rInsert, bool& rParInser // Since transliteration service is used to test for match, the replaced string could be // longer than rInsert, so in order to find longest match before the cursor, test whole // string from start to current cursor position (don't limit to length of rInsert) +// Disclaimer: I really don't know if a match longer than rInsert is actually possible, +// so the above is based on assumptions how "transliteration" might possibly work. If +// it's in fact impossible, an optimization would be useful to limit aSel.nStartPos to +// std::max(sal_Int32(0), aSel.nEndPos - rInsert.getLength()). aSel.nStartPos = 0; pView->SetSelection(aSel); const OUString aAll = pView->GetSelected(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/rtl
include/rtl/ustring.hxx |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit bd9d5cc4dc012e8fb8453b094cc0ff6a7a8b4a06 Author: Andrea Gelmini AuthorDate: Fri Nov 29 23:38:39 2019 +0100 Commit: Julien Nabet CommitDate: Sat Nov 30 10:20:50 2019 +0100 Fix typo Change-Id: I8d7ed542dc331d3861fcfe2fec7250b5a4bbb166 Reviewed-on: https://gerrit.libreoffice.org/84094 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/include/rtl/ustring.hxx b/include/rtl/ustring.hxx index 5919e3de6371..5f0c1032c603 100644 --- a/include/rtl/ustring.hxx +++ b/include/rtl/ustring.hxx @@ -924,7 +924,7 @@ public: This function can't be used for language specific comparison. @paramstr the object (substring) to be compared. - @paramfromIndex the index to start the comparion from. + @paramfromIndex the index to start the comparison from. The index must be greater than or equal to 0 and less or equal as the string length. @return true if str match with the characters in the string @@ -993,7 +993,7 @@ public: This function can't be used for language specific comparison. @paramstr the object (substring) to be compared. - @paramfromIndex the index to start the comparion from. + @paramfromIndex the index to start the comparison from. The index must be greater than or equal to 0 and less than or equal to the string length. @return true if str match with the characters in the string @@ -1265,7 +1265,7 @@ public: @paramasciiStrthe object (substring) to be compared. @paramasciiStrLength the length of asciiStr. - @paramfromIndex the index to start the comparion from. + @paramfromIndex the index to start the comparison from. The index must be greater than or equal to 0 and less than or equal to the string length. @return true if str match with the characters in the string @@ -1303,7 +1303,7 @@ public: @paramasciiStrthe 8-Bit ASCII character string to be compared. @paramasciiStrLength the length of the ascii string - @paramfromIndex the index to start the comparion from. + @paramfromIndex the index to start the comparison from. The index must be greater than or equal to 0 and less than or equal to the string length. @return true if str match with the characters in the string ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/qa
0 files changed New commits: commit fc3b6e39384141978500983f988c91446388bf8d Author: Andrea Gelmini AuthorDate: Fri Nov 29 23:38:45 2019 +0100 Commit: Julien Nabet CommitDate: Sat Nov 30 10:20:25 2019 +0100 Removed executable permission on file Change-Id: I32f116281f37d22d63d44f5da1010ee3ca6bd9c0 Reviewed-on: https://gerrit.libreoffice.org/84095 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/chart2/qa/extras/data/docx/tdf123206.docx b/chart2/qa/extras/data/docx/tdf123206.docx old mode 100755 new mode 100644 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source
filter/source/svg/SOTranscoder.java | 36
1 file changed, 36 deletions(-)
New commits:
commit 9aef8a8185897b502a85244afc93ad9ead97a1a8
Author: Julien Nabet
AuthorDate: Fri Nov 29 21:53:09 2019 +0100
Commit: Noel Grandin
CommitDate: Sat Nov 30 10:05:21 2019 +0100
SOTranscoder.java is unused (filter/svg)
Since 90f5ce36231551e226d4b3e2fefaa8493af692ac
svg-import-filter.diff: SVG Import Filter implementation in filter module
2010-09-14
Change-Id: Ic68e0e0c32fa26cccb0cb2092e5079ac74747794
Reviewed-on: https://gerrit.libreoffice.org/84093
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/filter/source/svg/SOTranscoder.java
b/filter/source/svg/SOTranscoder.java
deleted file mode 100644
index 691d6ced7844..
--- a/filter/source/svg/SOTranscoder.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * 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 .
- */
-
-import java.io.*;
-import org.apache.batik.transcoder.image.PNGTranscoder;
-import org.apache.batik.transcoder.TranscoderInput;
-import org.apache.batik.transcoder.TranscoderOutput;
-
-public class SOTranscoder
-{
-public static void main(String [] args) throws Exception
-{
-PNGTranscoder aTranscoder = new PNGTranscoder();
-OutputStreamaOStm = new FileOutputStream( args[ 1 ] );
-
-aTranscoder.transcode( new TranscoderInput( new File( args[ 0 ]
).toURI().toURL().toString() ), new TranscoderOutput( aOStm ) );
-
-aOStm.flush();
-aOStm.close();
-}
-}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
