[Libreoffice-commits] core.git: sc/source
sc/source/ui/unoobj/eventuno.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 7dd588423cb098eca774463ef4854f2750d7c123
Author: Stephan Bergmann
Date: Sat Jan 13 12:50:07 2018 +0100
Use = for initialization
...so that an automatic loplugin:cstylecast rewrite (with a to-be-committed
enhanced loplugin) won't rewrite that to illegal and -Werror,-Wvexing-parse
uno::Sequence aNames(int(ScSheetEventId::COUNT));
Change-Id: I6bb0d7de8d382ad71b1510ce4a604d732899ccee
Reviewed-on: https://gerrit.libreoffice.org/47866
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/sc/source/ui/unoobj/eventuno.cxx b/sc/source/ui/unoobj/eventuno.cxx
index 15c792428e64..26284a705fe2 100644
--- a/sc/source/ui/unoobj/eventuno.cxx
+++ b/sc/source/ui/unoobj/eventuno.cxx
@@ -146,7 +146,7 @@ uno::Any SAL_CALL ScSheetEventsObj::getByName( const
OUString& aName )
uno::Sequence SAL_CALL ScSheetEventsObj::getElementNames()
{
SolarMutexGuard aGuard;
-uno::Sequence aNames((int)ScSheetEventId::COUNT);
+auto aNames = uno::Sequence((int)ScSheetEventId::COUNT);
for (sal_Int32 nEvent=0; nEvent<(int)ScSheetEventId::COUNT; ++nEvent)
aNames[nEvent] = ScSheetEvents::GetEventName((ScSheetEventId)nEvent);
return aNames;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: wsd/ClientSession.cpp wsd/DocumentBroker.cpp wsd/DocumentBroker.hpp wsd/LOOLWSD.cpp wsd/TestStubs.cpp
wsd/ClientSession.cpp |9 +++--
wsd/DocumentBroker.cpp | 29 +
wsd/DocumentBroker.hpp |2 +-
wsd/LOOLWSD.cpp|2 +-
wsd/TestStubs.cpp |2 +-
5 files changed, 23 insertions(+), 21 deletions(-)
New commits:
commit d53ce5511dfe7989954f5ec4f882799607a6b662
Author: Ashod Nakashian
Date: Sun Jan 14 11:16:10 2018 -0500
wsd: const and cosmetics
Non-functional changes.
Change-Id: I7c52386e2f870d29fd62c6dae6f37f4a58c2396b
Reviewed-on: https://gerrit.libreoffice.org/47882
Reviewed-by: Ashod Nakashian
Tested-by: Ashod Nakashian
diff --git a/wsd/ClientSession.cpp b/wsd/ClientSession.cpp
index 5b0881bf..9fdf8ba7 100644
--- a/wsd/ClientSession.cpp
+++ b/wsd/ClientSession.cpp
@@ -586,8 +586,7 @@ bool ClientSession::handleKitToClientMessage(const char*
buffer, const int lengt
}
// Save to Storage and log result.
-std::string id = getId();
-docBroker->saveToStorage(id, success, result);
+docBroker->saveToStorage(getId(), success, result);
if (!isCloseFrame())
forwardToClient(payload);
@@ -714,8 +713,7 @@ bool ClientSession::handleKitToClientMessage(const char*
buffer, const int lengt
LOG_TRC("Removing save-as ClientSession after conversion.");
// Remove us.
-std::string id = getId();
-docBroker->removeSession(id);
+docBroker->removeSession(getId());
// Now terminate.
docBroker->stop();
@@ -876,8 +874,7 @@ void ClientSession::onDisconnect()
// We issue a force-save when last editable (non-readonly) session is
going away
// and defer destroying the last session and the docBroker.
-std::string id = getId();
-docBroker->removeSession(id, true);
+docBroker->removeSession(getId(), true);
}
catch (const UnauthorizedRequestException& exc)
{
diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 97ef771f..deb2cfc9 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -177,7 +177,7 @@ void DocumentBroker::startThread()
_poll->startThread();
}
-void DocumentBroker::assertCorrectThread()
+void DocumentBroker::assertCorrectThread() const
{
_poll->assertCorrectThread();
}
@@ -226,15 +226,15 @@ void DocumentBroker::pollThread()
_childProcess->setDocumentBroker(shared_from_this());
LOG_INF("Doc [" << _docKey << "] attached to child [" <<
_childProcess->getPid() << "].");
-auto last30SecCheckTime = std::chrono::steady_clock::now();
-
static const bool AutoSaveEnabled = !std::getenv("LOOL_NO_AUTOSAVE");
static const size_t IdleDocTimeoutSecs = LOOLWSD::getConfigValue(
"per_document.idle_timeout_secs", 3600);
+
// Used to accumulate B/W deltas.
uint64_t adminSent = 0;
uint64_t adminRecv = 0;
auto lastBWUpdateTime = std::chrono::steady_clock::now();
+auto last30SecCheckTime = std::chrono::steady_clock::now();
// Main polling loop goodness.
while (!_stop && _poll->continuePolling() && !TerminationFlag)
@@ -254,7 +254,7 @@ void DocumentBroker::pollThread()
// connection drop transiently reduces
this.
(sent > adminSent ? (sent - adminSent):
uint64_t(0)),
(recv > adminRecv ? (recv - adminRecv):
uint64_t(0)));
-LOG_INF("Doc [" << _docKey << "] added sent: " << sent << " recv:
" << recv << " bytes to totals");
+LOG_DBG("Doc [" << _docKey << "] added sent: " << sent << " recv:
" << recv << " bytes to totals");
adminSent = sent;
adminRecv = recv;
}
@@ -263,7 +263,7 @@ void DocumentBroker::pollThread()
std::chrono::duration_cast
(now - _lastSaveRequestTime).count() <= COMMAND_TIMEOUT_MS)
{
-// We are saving, nothing more to do but wait.
+// We are saving, nothing more to do but wait (until we save or we
timeout).
continue;
}
@@ -668,6 +668,7 @@ bool DocumentBroker::saveToStorage(const std::string&
sessionId,
LOG_TRC("Document will be saved forcefully to storage.");
_storage->forceSave();
}
+
const bool res = saveToStorageInternal(sessionId, success, result);
// If marked to destroy, or session is disconnected, remove.
@@ -1071,14 +1072,18 @@ size_t DocumentBroker::removeSessionInternal(const
std::string& id)
// Remove. The caller must have a reference to the session
// in question, lest we destroy from underneith them.
_sessions.erase(it);
-
const auto count = _sessions.size();
-LOG_TRC("Removed " << (readonly ? "readonly" : "non-readonly") <<
-
[Libreoffice-commits] core.git: sal/osl
sal/osl/unx/security.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b89c5c111b1fafdb2b0e4fd1d8bad0a864a670bc
Author: Noel Grandin
Date: Mon Jan 15 08:59:49 2018 +0200
fix android build
Change-Id: Id53f9d2a5adf126db9abeab620bb92b8720425f7
diff --git a/sal/osl/unx/security.cxx b/sal/osl/unx/security.cxx
index bdd9db6b7b94..9b76060f40a2 100644
--- a/sal/osl/unx/security.cxx
+++ b/sal/osl/unx/security.cxx
@@ -263,7 +263,7 @@ static bool osl_psz_getHomeDir(oslSecurity Security,
sal_Char* pszDirectory, sal
OUSTRING_TO_OSTRING_CVTFLAGS);
if (pStrValue && pStrValue->length > 0)
{
-sal_Int32 nCopy = (sal_Int32)std::min(nMax-1,
pStrValue->length) ;
+sal_Int32 nCopy = (sal_Int32)std::min(nMax-1,
pStrValue->length) ;
strncpy (pszDirectory, pStrValue->buffer, nCopy);
pszDirectory[nCopy] = '\0';
bRet = (std::size_t)pStrValue->length < nMax;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/inc vcl/source
vcl/inc/toolbox.h |4 ++--
vcl/source/window/toolbox2.cxx |4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit bfaf85248c49249366434208ca7b71cbf6d930c1
Author: Noel Grandin
Date: Fri Jan 12 08:34:03 2018 +0200
loplugin:useuniqueptr in ImplToolBoxPrivateData
Change-Id: I5a88f6052899c9dcea818084aefcb63b0460cf2d
Reviewed-on: https://gerrit.libreoffice.org/47838
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/vcl/inc/toolbox.h b/vcl/inc/toolbox.h
index 18f94aeb5f5e..f908cc5bdf52 100644
--- a/vcl/inc/toolbox.h
+++ b/vcl/inc/toolbox.h
@@ -111,13 +111,13 @@ struct ToolBoxLayoutData : public ControlLayoutData
struct ImplToolBoxPrivateData
{
-vcl::ToolBoxLayoutData* m_pLayoutData;
+std::unique_ptr m_pLayoutData;
ToolBox::ImplToolItems m_aItems;
ImplToolBoxPrivateData();
~ImplToolBoxPrivateData();
-void ImplClearLayoutData() { delete m_pLayoutData; m_pLayoutData =
nullptr; }
+void ImplClearLayoutData() { m_pLayoutData.reset(); }
// called when dropdown items are clicked
Link maDropdownClickHdl;
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index 43142586d970..23d5971518d2 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -70,7 +70,7 @@ ImplToolBoxPrivateData::ImplToolBoxPrivateData() :
ImplToolBoxPrivateData::~ImplToolBoxPrivateData()
{
-delete m_pLayoutData;
+m_pLayoutData.reset();
mpMenu.disposeAndClear();
}
@@ -1457,7 +1457,7 @@ void ToolBox::ImplUpdateInputEnable()
void ToolBox::ImplFillLayoutData()
{
-mpData->m_pLayoutData = new ToolBoxLayoutData;
+mpData->m_pLayoutData.reset(new ToolBoxLayoutData);
ImplToolItems::size_type nCount = mpData->m_aItems.size();
for( ImplToolItems::size_type i = 0; i < nCount; i++ )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/splitwin.cxx | 19 ++-
1 file changed, 6 insertions(+), 13 deletions(-)
New commits:
commit 2849b82894f4325021162605fb911bcb27fb8fca
Author: Noel Grandin
Date: Fri Jan 12 08:33:52 2018 +0200
loplugin:useuniqueptr in ImplSplitSet
Change-Id: Ibade5376c545fe5281ac171385bbb2aa02627512
Reviewed-on: https://gerrit.libreoffice.org/47837
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx
index 23b11f52ffe4..5e8c26c094eb 100644
--- a/vcl/source/window/splitwin.cxx
+++ b/vcl/source/window/splitwin.cxx
@@ -85,8 +85,8 @@ public:
~ImplSplitSet();
std::vector< ImplSplitItem > mvItems;
-Wallpaper* mpWallpaper;
-Bitmap* mpBitmap;
+std::unique_ptr mpWallpaper;
+std::unique_ptr mpBitmap;
longmnLastSize;
longmnSplitSize;
sal_uInt16 mnId;
@@ -128,15 +128,8 @@ ImplSplitSet::ImplSplitSet() :
ImplSplitSet::~ImplSplitSet()
{
-if ( mpWallpaper ) {
-delete mpWallpaper;
-mpWallpaper = nullptr;
-}
-
-if ( mpBitmap ) {
-delete mpBitmap;
-mpBitmap = nullptr;
-}
+mpWallpaper.reset();
+mpBitmap.reset();
}
/** Check whether the given size is inside the valid range defined by
@@ -944,7 +937,7 @@ void SplitWindow::ImplDrawBack(vcl::RenderContext&
rRenderContext, ImplSplitSet*
mnDX - mnRightBorder - 1,
mnDY - mnBottomBorder - 1);
-ImplDrawBack(rRenderContext, aRect, pSet->mpWallpaper,
pSet->mpBitmap);
+ImplDrawBack(rRenderContext, aRect, pSet->mpWallpaper.get(),
pSet->mpBitmap.get());
}
}
@@ -958,7 +951,7 @@ void SplitWindow::ImplDrawBack(vcl::RenderContext&
rRenderContext, ImplSplitSet*
Point aPoint(rItems[i].mnLeft, rItems[i].mnTop);
Size aSize(rItems[i].mnWidth, rItems[i].mnHeight);
tools::Rectangle aRect(aPoint, aSize);
-ImplDrawBack(rRenderContext, aRect, pSet->mpWallpaper,
pSet->mpBitmap);
+ImplDrawBack(rRenderContext, aRect, pSet->mpWallpaper.get(),
pSet->mpBitmap.get());
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: compilerplugins/clang include/vcl vcl/source
compilerplugins/clang/test/useuniqueptr.cxx | 12
compilerplugins/clang/useuniqueptr.cxx |5 +
include/vcl/cursor.hxx |3 ++-
vcl/source/window/cursor.cxx| 15 +--
4 files changed, 24 insertions(+), 11 deletions(-)
New commits:
commit 397d5cbc3c04da7693e2e1f3e99b0d8e431bfff2
Author: Noel Grandin
Date: Fri Jan 12 08:22:39 2018 +0200
loplugin:useuniqueptr in Cursor
Change-Id: I5de300709409311b7a1d451ee1d314596cf2e879
Reviewed-on: https://gerrit.libreoffice.org/47836
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/compilerplugins/clang/test/useuniqueptr.cxx
b/compilerplugins/clang/test/useuniqueptr.cxx
index 43002ec59a68..ddd30c73ae62 100644
--- a/compilerplugins/clang/test/useuniqueptr.cxx
+++ b/compilerplugins/clang/test/useuniqueptr.cxx
@@ -112,4 +112,16 @@ class Foo9 {
delete m_pbar3; // expected-error {{unconditional call to delete
on a member, should be using std::unique_ptr [loplugin:useuniqueptr]}}
}
};
+// no warning expected
+class Foo10 {
+XXX* m_pbar1;
+~Foo10()
+{
+if (m_pbar1 != getOther())
+{
+delete m_pbar1;
+}
+}
+XXX* getOther() { return nullptr; }
+};
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/compilerplugins/clang/useuniqueptr.cxx
b/compilerplugins/clang/useuniqueptr.cxx
index 99ef6928533e..c14d5fc5a57b 100644
--- a/compilerplugins/clang/useuniqueptr.cxx
+++ b/compilerplugins/clang/useuniqueptr.cxx
@@ -88,6 +88,8 @@ void UseUniquePtr::CheckForUnconditionalDelete(const
CXXDestructorDecl* destruct
{
if (!isa(binaryOp->getLHS()->IgnoreImpCasts()))
continue;
+if
(!isa(binaryOp->getRHS()->IgnoreImpCasts()))
+continue;
}
else
continue;
@@ -109,6 +111,9 @@ void UseUniquePtr::CheckForUnconditionalDelete(const
CXXDestructorDecl* destruct
}
}
+/**
+ * Check the delete expression in a destructor.
+ */
void UseUniquePtr::CheckDeleteExpr(const CXXDestructorDecl* destructorDecl,
const CXXDeleteExpr* deleteExpr)
{
const ImplicitCastExpr* pCastExpr =
dyn_cast(deleteExpr->getArgument());
diff --git a/include/vcl/cursor.hxx b/include/vcl/cursor.hxx
index b5c547f68463..0a0deb3e84bc 100644
--- a/include/vcl/cursor.hxx
+++ b/include/vcl/cursor.hxx
@@ -25,6 +25,7 @@
#include
#include
#include
+#include
class Timer;
struct ImplCursorData;
@@ -44,7 +45,7 @@ namespace vcl
class VCL_DLLPUBLIC Cursor
{
private:
-ImplCursorData* mpData;
+std::unique_ptr mpData;
VclPtr mpWindow; // only for shadow cursor
longmnSlant;
SizemaSize;
diff --git a/vcl/source/window/cursor.cxx b/vcl/source/window/cursor.cxx
index 9f4d4a872d07..bfdfe67464e8 100644
--- a/vcl/source/window/cursor.cxx
+++ b/vcl/source/window/cursor.cxx
@@ -151,7 +151,7 @@ void vcl::Cursor::ImplDraw()
mpData->maPixSize.Width() =
pWindow->GetSettings().GetStyleSettings().GetCursorSize();
// calculate output area and display
-ImplCursorInvert( mpData );
+ImplCursorInvert( mpData.get() );
mpData->mbCurVisible = true;
}
}
@@ -160,7 +160,7 @@ void vcl::Cursor::ImplRestore()
{
assert( mpData && mpData->mbCurVisible );
-ImplCursorInvert( mpData );
+ImplCursorInvert( mpData.get() );
mpData->mbCurVisible = false;
}
@@ -185,7 +185,7 @@ void vcl::Cursor::ImplDoShow( bool bDrawDirect, bool
bRestore )
{
if ( !mpData )
{
-mpData = new ImplCursorData;
+mpData.reset( new ImplCursorData );
mpData->mbCurVisible = false;
mpData->maTimer.SetInvokeHandler( LINK( this, Cursor,
ImplTimerHdl ) );
mpData->maTimer.SetDebugName( "vcl ImplCursorData maTimer" );
@@ -333,13 +333,8 @@ vcl::Cursor::Cursor( const Cursor& rCursor ) :
vcl::Cursor::~Cursor()
{
-if ( mpData )
-{
-if ( mpData->mbCurVisible )
-ImplRestore();
-
-delete mpData;
-}
+if (mpData && mpData->mbCurVisible)
+ImplRestore();
}
void vcl::Cursor::SetStyle( sal_uInt16 nStyle )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcompiler/inc helpcompiler/source
helpcompiler/inc/BasCodeTagger.hxx|3 ++-
helpcompiler/source/BasCodeTagger.cxx |6 +-
2 files changed, 3 insertions(+), 6 deletions(-)
New commits:
commit a2f86708a5740ce9fd2a3a6ab69685d8fb53dd6c
Author: Noel Grandin
Date: Fri Jan 12 08:22:09 2018 +0200
loplugin:useuniqueptr in BasicCodeTagger
Change-Id: I85b7d5b3030d4b3ec5318e4ee6793927c1f16355
Reviewed-on: https://gerrit.libreoffice.org/47835
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/helpcompiler/inc/BasCodeTagger.hxx
b/helpcompiler/inc/BasCodeTagger.hxx
index 7d485b166805..228f86fd6a18 100644
--- a/helpcompiler/inc/BasCodeTagger.hxx
+++ b/helpcompiler/inc/BasCodeTagger.hxx
@@ -14,6 +14,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -30,7 +31,7 @@ class L10N_DLLPUBLIC BasicCodeTagger
private:
xmlDocPtr m_pDocument;
std::vector m_BasicCodeContainerTags;
-LibXmlTreeWalker *m_pXmlTreeWalker;
+std::unique_ptr m_pXmlTreeWalker;
SyntaxHighlighter m_Highlighter;
bool m_bTaggingCompleted;
void tagParagraph( xmlNodePtr paragraph );
diff --git a/helpcompiler/source/BasCodeTagger.cxx
b/helpcompiler/source/BasCodeTagger.cxx
index 215ea49996f6..f59c1d268e0d 100644
--- a/helpcompiler/source/BasCodeTagger.cxx
+++ b/helpcompiler/source/BasCodeTagger.cxx
@@ -62,8 +62,6 @@ BasicCodeTagger::BasicCodeTagger( xmlDocPtr rootDoc ):
BasicCodeTagger::~BasicCodeTagger()
{
-if ( m_pXmlTreeWalker != nullptr )
- delete m_pXmlTreeWalker;
}
//!Gathers all the tag nodes from xml tree.
/*!
@@ -75,9 +73,7 @@ void BasicCodeTagger::getBasicCodeContainerNodes()
m_BasicCodeContainerTags.clear();
-if ( m_pXmlTreeWalker != nullptr )
- delete m_pXmlTreeWalker;
-m_pXmlTreeWalker = new LibXmlTreeWalker( m_pDocument );
+m_pXmlTreeWalker.reset(new LibXmlTreeWalker( m_pDocument ));
currentNode = m_pXmlTreeWalker->currentNode();
if ( !( xmlStrcmp( currentNode->name, reinterpret_cast("bascode") ) ) )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: comphelper/source cppu/source registry/source
comphelper/source/misc/instancelocker.cxx |8 --
comphelper/source/misc/instancelocker.hxx |3 +-
cppu/source/typelib/typelib.cxx | 18 ++-
registry/source/reflread.cxx | 35 ++
4 files changed, 17 insertions(+), 47 deletions(-)
New commits:
commit 215254415fc32b754eb948a5c374b14366773afb
Author: Noel Grandin
Date: Thu Jan 11 16:04:13 2018 +0200
loplugin:useuniqueptr in comphelper,cppu,registry
Change-Id: Ib353d901827e417498fe4f8e397f1a57c61a9736
Reviewed-on: https://gerrit.libreoffice.org/47794
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/comphelper/source/misc/instancelocker.cxx
b/comphelper/source/misc/instancelocker.cxx
index 76d2cd1a761a..ec0b27f4180b 100644
--- a/comphelper/source/misc/instancelocker.cxx
+++ b/comphelper/source/misc/instancelocker.cxx
@@ -58,12 +58,6 @@ OInstanceLocker::~OInstanceLocker()
catch ( uno::RuntimeException& )
{}
}
-
-if ( m_pListenersContainer )
-{
-delete m_pListenersContainer;
-m_pListenersContainer = nullptr;
-}
}
// XComponent
@@ -96,7 +90,7 @@ void SAL_CALL OInstanceLocker::addEventListener( const
uno::Reference< lang::XEv
throw lang::DisposedException(); // TODO
if ( !m_pListenersContainer )
-m_pListenersContainer = new ::comphelper::OInterfaceContainerHelper2(
m_aMutex );
+m_pListenersContainer.reset( new
::comphelper::OInterfaceContainerHelper2( m_aMutex ) );
m_pListenersContainer->addInterface( xListener );
}
diff --git a/comphelper/source/misc/instancelocker.hxx
b/comphelper/source/misc/instancelocker.hxx
index cb6d229fc2dd..fb6581317006 100644
--- a/comphelper/source/misc/instancelocker.hxx
+++ b/comphelper/source/misc/instancelocker.hxx
@@ -33,6 +33,7 @@
#include
#include
#include
+#include
class OLockListener;
@@ -47,7 +48,7 @@ class OInstanceLocker : public ::cppu::WeakImplHelper<
css::lang::XComponent,
rtl::Reference< OLockListener > m_xLockListener;
-::comphelper::OInterfaceContainerHelper2* m_pListenersContainer; // list
of listeners
+std::unique_ptr<::comphelper::OInterfaceContainerHelper2>
m_pListenersContainer; // list of listeners
bool m_bDisposed;
bool m_bInitialized;
diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx
index 9bdd27c257ec..bf44d6a850dc 100644
--- a/cppu/source/typelib/typelib.cxx
+++ b/cppu/source/typelib/typelib.cxx
@@ -173,11 +173,11 @@ struct TypeDescriptor_Init_Impl
{
//sal_Bool bDesctructorCalled;
// all type description references
-WeakMap_Impl * pWeakMap;
+std::unique_ptr pWeakMap;
// all type description callbacks
std::unique_ptr pCallbacks;
// A cache to hold descriptions
-TypeDescriptionList_Impl * pCache;
+std::unique_ptr pCache;
// The mutex to guard all type library accesses
std::unique_ptr pMutex;
@@ -253,8 +253,6 @@ TypeDescriptor_Init_Impl::~TypeDescriptor_Init_Impl()
typelib_typedescription_release( *aIt );
++aIt;
}
-delete pCache;
-pCache = nullptr;
}
if( pWeakMap )
@@ -304,8 +302,6 @@ TypeDescriptor_Init_Impl::~TypeDescriptor_Init_Impl()
++aIt;
}
#endif
-delete pWeakMap;
-pWeakMap = nullptr;
}
#if OSL_DEBUG_LEVEL > 0
SAL_INFO_IF( nTypeDescriptionCount, "cppu.typelib", "nTypeDescriptionCount
is not zero" );
@@ -504,7 +500,7 @@ bool complete(typelib_TypeDescription ** ppTypeDescr, bool
initTables) {
// insert into the chache
MutexGuard aGuard( rInit.getMutex() );
if( !rInit.pCache )
-rInit.pCache = new TypeDescriptionList_Impl;
+rInit.pCache.reset( new TypeDescriptionList_Impl );
if( static_cast(rInit.pCache->size()) >= nCacheSize )
{
typelib_typedescription_release( rInit.pCache->front() );
@@ -1560,7 +1556,7 @@ extern "C" void SAL_CALL typelib_typedescription_register(
{
pTDR = reinterpret_cast(*ppNewDescription);
if( !rInit.pWeakMap )
-rInit.pWeakMap = new WeakMap_Impl;
+rInit.pWeakMap.reset( new WeakMap_Impl );
// description is the weak itself, so register it
(*rInit.pWeakMap)[pTDR->pTypeName->buffer] = pTDR;
@@ -2001,7 +1997,7 @@ extern "C" void SAL_CALL
typelib_typedescription_getByName(
// insert into the chache
MutexGuard aGuard( rInit.getMutex() );
if( !rInit.pCache )
-rInit.pCache = new TypeDescriptionList_Impl;
+rInit.pCache.reset( new TypeDescriptionList_Impl );
if( static_cast(rInit.pCache->size()) >= nCacheSize
)
{
typelib_typedescription_release( rInit.pCache->front() );
@@ -2059,7 +2055,7 @@ ex
[Libreoffice-commits] core.git: basic/source connectivity/source cppu/source cui/source editeng/source embeddedobj/source filter/source formula/source framework/source hwpfilter/source i18npool/source
basic/source/sbx/sbxscan.cxx |2 +- connectivity/source/drivers/firebird/Blob.cxx |4 ++-- connectivity/source/drivers/firebird/PreparedStatement.cxx |6 +++--- connectivity/source/drivers/postgresql/pq_resultset.cxx|2 +- cppu/source/typelib/typelib.cxx|2 +- cui/source/tabpages/numpages.cxx |2 +- editeng/source/uno/unoedhlp.cxx|2 +- editeng/source/uno/unotext2.cxx|4 ++-- embeddedobj/source/commonembedding/embedobj.cxx|4 ++-- embeddedobj/source/msole/ownview.cxx |2 +- filter/source/msfilter/escherex.cxx|2 +- filter/source/msfilter/svdfppt.cxx |8 formula/source/ui/dlg/parawin.cxx |4 ++-- framework/source/uielement/recentfilesmenucontroller.cxx |2 +- hwpfilter/source/hwpread.cxx |6 +++--- i18npool/source/breakiterator/breakiterator_ctl.cxx|4 ++-- i18npool/source/breakiterator/xdictionary.cxx |2 +- i18npool/source/search/levdis.cxx | 10 +- i18npool/source/search/textsearch.cxx |4 ++-- i18npool/source/transliteration/textToPronounce_zh.cxx |2 +- i18npool/source/transliteration/transliteration_Ignore.cxx |4 +--- include/basegfx/numeric/ftools.hxx |2 +- libreofficekit/source/gtk/lokdocview.cxx |2 +- linguistic/source/misc.cxx |3 +-- lotuswordpro/source/filter/explode.cxx |2 +- lotuswordpro/source/filter/lwptable.cxx|2 +- onlineupdate/source/update/updater/bspatch.cxx |2 +- oox/source/crypto/AgileEngine.cxx |2 +- oox/source/ole/vbaexport.cxx |2 +- opencl/source/opencl_device.cxx|3 ++- package/source/zipapi/XUnbufferedStream.cxx|2 +- registry/source/reflwrit.cxx |5 +++-- sal/osl/unx/profile.cxx|2 +- sal/osl/unx/security.cxx |2 +- sal/osl/w32/profile.cxx|2 +- sal/rtl/alloc_cache.cxx|3 ++- sal/rtl/alloc_global.cxx |2 +- sal/rtl/cipher.cxx |3 ++- sal/rtl/math.cxx |2 +- sal/rtl/ustring.cxx|2 +- sc/inc/address.hxx |6 +++--- sc/source/core/data/dpfilteredcache.cxx|2 +- sc/source/core/data/table6.cxx |4 ++-- sc/source/core/opencl/op_spreadsheet.cxx |2 +- sc/source/core/tool/compiler.cxx |2 +- sc/source/core/tool/dbdata.cxx |2 +- sc/source/core/tool/interpr3.cxx |2 +- sc/source/core/tool/reftokenhelper.cxx |2 +- sc/source/core/tool/scmatrix.cxx |2 +- sc/source/filter/lotus/lotimpop.cxx|2 +- sc/source/filter/lotus/op.cxx | 10 +- sc/source/filter/qpro/qpro.cxx |2 +- sc/source/filter/xml/xmlcelli.cxx |8 sc/source/ui/view/tabview2.cxx |4 ++-- sd/source/filter/eppt/pptexsoundcollection.cxx |2 +- sdext/source/pdfimport/filterdet.cxx |2 +- slideshow/source/engine/opengl/TransitionImpl.cxx |4 ++-- slideshow/source/engine/transitions/spiralwipe.cxx |2 +- starmath/source/view.cxx |2 +- starmath/source/visitors.cxx |2 +- svx/source/gallery2/galbrws2.cxx |2 +- svx/source/svdraw/svdedtv2.cxx |8 svx/source/svdraw/svdoashp.cxx |2 +- sw/qa/core/Test-BigPtrArray.cxx|2 +- sw/source/core/crsr/crsrsh.cxx |2 +- sw/source/core/table/swnewtable.cxx|4 ++-- sw/source/core/text/EnhancedPDFExportHelper.cxx|2 +- sw/source/core/text/itratr.cxx |2 +- sw/source/core/text/itrtxt.hxx |2 +- sw/source/core/undo/unnum.cxx |2 +- sw/source/filter/html/h
[Libreoffice-commits] core.git: ucb/source
ucb/source/ucp/webdav-neon/ContentProperties.hxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 80fb8d406ced47e6a2089f0c8ba5c103d2fec91f Author: Andrea Gelmini Date: Sun Jan 14 23:51:00 2018 +0100 Fix typos Change-Id: I4c5965438eb28b853ce4ea826139faab567415e1 Reviewed-on: https://gerrit.libreoffice.org/47873 Tested-by: Jenkins Reviewed-by: Jens Carl diff --git a/ucb/source/ucp/webdav-neon/ContentProperties.hxx b/ucb/source/ucp/webdav-neon/ContentProperties.hxx index 0606d94b6d24..49996c9f53e4 100644 --- a/ucb/source/ucp/webdav-neon/ContentProperties.hxx +++ b/ucb/source/ucp/webdav-neon/ContentProperties.hxx @@ -92,7 +92,7 @@ public: // Maps the UCB property names contained in rProps with their DAV property // counterparts, if possible. All unmappable properties will be included // unchanged in resulting vector. -// The vector filles by this method can directly be handed over to +// The vector filled by this method can directly be handed over to // DAVResourceAccess::PROPFIND. The result from PROPFIND // (vector< DAVResource >) can be used to create a ContentProperties // instance which can map DAV properties back to UCB properties. @@ -102,7 +102,7 @@ public: // Maps the UCB property names contained in rProps with their HTTP header // counterparts, if possible. All unmappable properties will be included // unchanged in resulting vector. -// The vector filles by this method can directly be handed over to +// The vector filled by this method can directly be handed over to // DAVResourceAccess::HEAD. The result from HEAD (vector< DAVResource >) // can be used to create a ContentProperties instance which can map header // names back to UCB properties. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/filter/eppt/pptx-text.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7a6df88f2579c4fcfa81eb27f6db9e8e21c9a6f8 Author: Stephan Bergmann Date: Sat Jan 13 16:34:48 2018 +0100 Use = for initialization ...so that an automatic loplugin:cstylecast rewrite (with a to-be-committed enhanced loplugin) won't rewrite that to -Werror,-Wvexing-parse al_Int16 nTmp( sal_Int16(style::ParagraphAdjust_LEFT) ); Change-Id: I27a8b8fea129f9f1d755499bf204a7c8f2b35976 Reviewed-on: https://gerrit.libreoffice.org/47868 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx index 13837d7eceed..cda37dff9ea2 100644 --- a/sd/source/filter/eppt/pptx-text.cxx +++ b/sd/source/filter/eppt/pptx-text.cxx @@ -1124,7 +1124,7 @@ void ParagraphObj::ImplGetParagraphValues( PPTExBulletProvider* pBuProv, bool bG if ( ImplGetPropertyValue( "ParaTabStops", bGetPropStateValue ) ) maTabStop = *o3tl::doAccess>(mAny); -sal_Int16 eTextAdjust( (sal_Int16)css::style::ParagraphAdjust_LEFT ); +sal_Int16 eTextAdjust = (sal_Int16)css::style::ParagraphAdjust_LEFT; if ( GetPropertyValue( aAny, mXPropSet, "ParaAdjust", bGetPropStateValue ) ) aAny >>= eTextAdjust; switch ( (css::style::ParagraphAdjust)eTextAdjust ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/source
oox/source/export/drawingml.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7f68bd63afb46576216a3396a116f899aa794515 Author: Stephan Bergmann Date: Sat Jan 13 12:56:00 2018 +0100 Use = for initialization ...so that an automatic loplugin:cstylecast rewrite (with a to-be-committed enhanced loplugin) won't rewrite that to -Werror,-Wvexing-parse sal_Int16 nTmp( sal_Int16(style::ParagraphAdjust_LEFT) ); Change-Id: I62072864cb879ca3d45bf941d3dfabdd1c2cabd0 Reviewed-on: https://gerrit.libreoffice.org/47867 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index 3b5b4e699a5e..36787c932a0a 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -2145,7 +2145,7 @@ void DrawingML::WriteParagraphProperties( const Reference< XTextContent >& rPara sal_Int16 nLevel = -1; GET( nLevel, NumberingLevel ); -sal_Int16 nTmp( (sal_Int16)style::ParagraphAdjust_LEFT ); +sal_Int16 nTmp = (sal_Int16)style::ParagraphAdjust_LEFT; GET( nTmp, ParaAdjust ); style::ParagraphAdjust nAlignment = (style::ParagraphAdjust)nTmp; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: lotuswordpro/source
lotuswordpro/source/filter/lwpbulletstylemgr.cxx | 13 ++---
lotuswordpro/source/filter/lwpbulletstylemgr.hxx |2 +-
lotuswordpro/source/filter/lwpfribptr.cxx|8
lotuswordpro/source/filter/lwppara.cxx | 10 +-
lotuswordpro/source/filter/lwppara.hxx |2 +-
5 files changed, 17 insertions(+), 18 deletions(-)
New commits:
commit 594a21fd5e13bc4626e22bf06d85822d6de9eebf
Author: Caolán McNamara
Date: Sun Jan 14 20:48:50 2018 +
ofz#5301 Direct-leak
Change-Id: Id9b876e89dd186782c0168229840f721a8b3720c
diff --git a/lotuswordpro/source/filter/lwpbulletstylemgr.cxx
b/lotuswordpro/source/filter/lwpbulletstylemgr.cxx
index 9692eedb7fa3..4b97c6551e6e 100644
--- a/lotuswordpro/source/filter/lwpbulletstylemgr.cxx
+++ b/lotuswordpro/source/filter/lwpbulletstylemgr.cxx
@@ -110,7 +110,7 @@ OUString LwpBulletStyleMgr::RegisterBulletStyle(LwpPara*
pPara, LwpBulletOverrid
LwpPara* pBulletPara = pSilverBullet->GetBulletPara();
if (!pBulletPara)
{
-assert(false);
+SAL_WARN("lwp", "missing bullet para");
return OUString();
}
@@ -245,7 +245,7 @@ OUString LwpBulletStyleMgr::RegisterBulletStyle(LwpPara*
pPara, LwpBulletOverrid
//Create nested XFList and XFItems and then add it to XFContentContainer(pCont)
//Return the inner XFItem created.
-XFContentContainer* LwpBulletStyleMgr::AddBulletList(
+rtl::Reference LwpBulletStyleMgr::AddBulletList(
XFContentContainer* pCont, bool bIsOrdered,
const OUString& rStyleName, sal_Int16 nLevel, bool bIsBulletSkiped)
{
@@ -256,13 +256,12 @@ XFContentContainer* LwpBulletStyleMgr::AddBulletList(
//todo: need judge here.
bool bContinue = m_bContinue;
-XFList* theList;
-XFList* prevList = nullptr;
+rtl::Reference prevList;
XFListItem* theItem;
XFListItem* InnerItem = nullptr;
for (sal_Int8 nC = nLevel-1; nC >= 0; nC--)
{
-theList = new XFList();
+rtl::Reference theList(new XFList);
theItem = new XFListItem();
theList->Add(theItem);
@@ -284,7 +283,7 @@ XFContentContainer* LwpBulletStyleMgr::AddBulletList(
if (nC == 0 && pCont)
{
theList->SetStyleName(rStyleName);
-pCont->Add(theList);
+pCont->Add(theList.get());
}
if ((nC == nLevel-1) && bIsBulletSkiped)
@@ -301,7 +300,7 @@ XFContentContainer* LwpBulletStyleMgr::AddBulletList(
if(prevList)
{
-theItem->Add(prevList);
+theItem->Add(prevList.get());
}
prevList = theList;
}
diff --git a/lotuswordpro/source/filter/lwpbulletstylemgr.hxx
b/lotuswordpro/source/filter/lwpbulletstylemgr.hxx
index 7dce7eb165c6..78754a75b355 100644
--- a/lotuswordpro/source/filter/lwpbulletstylemgr.hxx
+++ b/lotuswordpro/source/filter/lwpbulletstylemgr.hxx
@@ -84,7 +84,7 @@ public:
LwpIndentOverride const * pIndent);
inline void SetFoundry(LwpFoundry* pFoundry);
inline void SetContinueFlag(bool bFlag);
-XFContentContainer* AddBulletList(XFContentContainer* pCont, bool
bIsOrdered,
+rtl::Reference AddBulletList(XFContentContainer*
pCont, bool bIsOrdered,
const OUString& rStyleName, sal_Int16 nLevel, bool bIsBulletSkiped);
inline void SetCurrentSilverBullet(const LwpObjectID& rNewID);
diff --git a/lotuswordpro/source/filter/lwpfribptr.cxx
b/lotuswordpro/source/filter/lwpfribptr.cxx
index d56f0aba06ed..0cad23dfbe2f 100644
--- a/lotuswordpro/source/filter/lwpfribptr.cxx
+++ b/lotuswordpro/source/filter/lwpfribptr.cxx
@@ -240,10 +240,10 @@ void LwpFribPtr::XFConvert()
break;
case FRIB_TAG_COLBREAK:
{
-XFParagraph *pPara = new XFParagraph();
-pPara->SetStyleName(pFrib->GetStyleName());
-SetXFPara(pPara);
-m_pPara->AddXFContent(pPara);
+rtl::Reference xPara(new XFParagraph);
+xPara->SetStyleName(pFrib->GetStyleName());
+SetXFPara(xPara.get());
+m_pPara->AddXFContent(xPara.get());
}
break;
case FRIB_TAG_LINEBREAK:
diff --git a/lotuswordpro/source/filter/lwppara.cxx
b/lotuswordpro/source/filter/lwppara.cxx
index af39a79bea70..0c9c59d6fd2d 100644
--- a/lotuswordpro/source/filter/lwppara.cxx
+++ b/lotuswordpro/source/filter/lwppara.cxx
@@ -278,10 +278,10 @@ void LwpPara::XFConvert(XFContentContainer* pCont)
if (m_bHasBullet && m_pSilverBullet)
{
-XFContentContainer* pListItem = AddBulletList(m_pXFContainer);
-if (pListItem)
+rtl::Reference xListItem =
AddBulletList(m_pXFContainer);
+if (xListItem)
{
-pListItem->Add(pPara);
+xListItem->Add(pPara);
}
}
else if (m_pXFContainer)
@@ -879,13 +879,13 @@ LwpBulletStyleMgr* LwpPara::GetBulletStyleMgr()
return nullptr;
}
-XFContentContainer* LwpPara::AddBulletList(XFC
[Libreoffice-commits] core.git: lotuswordpro/source
lotuswordpro/source/filter/lwpparastyle.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit f172d5ee4813e94c5c7f678a636985d0f76e872a Author: Caolán McNamara Date: Sun Jan 14 20:25:31 2018 + ofz#5302 Integer-overflow Change-Id: I837a795385e900099ad781a7d5a7be1985f379fe diff --git a/lotuswordpro/source/filter/lwpparastyle.cxx b/lotuswordpro/source/filter/lwpparastyle.cxx index 651de9b73d13..9ebf5e7b3303 100644 --- a/lotuswordpro/source/filter/lwpparastyle.cxx +++ b/lotuswordpro/source/filter/lwpparastyle.cxx @@ -453,9 +453,9 @@ void LwpParaStyle::ApplyIndent(LwpPara* pPara, XFParaStyle* pParaStyle, LwpInden sal_Int32 Amount = pParentIndent->GetMAll(); if (relative == LwpIndentOverride::RELATIVE_FIRST) -Amount += pParentIndent->GetMFirst(); +Amount = o3tl::saturating_add(Amount, pParentIndent->GetMFirst()); else if (relative == LwpIndentOverride::RELATIVE_REST) -Amount += pParentIndent->GetMRest(); +Amount = o3tl::saturating_add(Amount, pParentIndent->GetMRest()); pTotalIndent->SetMAll(o3tl::saturating_add(Amount, pTotalIndent->GetMAll())); pTotalIndent->SetMRight(o3tl::saturating_add(pParentIndent->GetMRight(), pTotalIndent->GetMRight())); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/html/htmltab.cxx | 110 ++
1 file changed, 53 insertions(+), 57 deletions(-)
New commits:
commit 7dbea5f8ab421c8b31316aed6cff67ddb35dcb43
Author: Caolán McNamara
Date: Sun Jan 14 16:02:05 2018 +
ofz#5294 Indirect-leak
Change-Id: Ie183f1fcf3ac3358f5960382ec043a9250876679
Reviewed-on: https://gerrit.libreoffice.org/47864
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/source/filter/html/htmltab.cxx
b/sw/source/filter/html/htmltab.cxx
index 0c8c72659f3e..889ac46c3419 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -450,7 +450,7 @@ class HTMLTable
HTMLTableRules m_eRules; // frame in the table
bool m_bTopCaption; // Caption of the table
-void InitCtor( const HTMLTableOptions *pOptions );
+void InitCtor(const HTMLTableOptions& rOptions);
// Correction of the Row-Spans for all cells above the chosen cell and the
cell itself for the indicated content. The chosen cell gets the Row-Span 1
void FixRowSpan( sal_uInt16 nRow, sal_uInt16 nCol, const HTMLTableCnts
*pCnts );
@@ -518,10 +518,10 @@ public:
bool m_bFirstCell;// is there a cell created already?
-HTMLTable( SwHTMLParser* pPars, HTMLTable *pTopTab,
- bool bParHead, bool bHasParentSec,
- bool bHasToFly,
- const HTMLTableOptions *pOptions );
+HTMLTable(SwHTMLParser* pPars, HTMLTable *pTopTab,
+ bool bParHead, bool bHasParentSec,
+ bool bHasToFly,
+ const HTMLTableOptions& rOptions);
~HTMLTable();
@@ -900,7 +900,7 @@ inline SwFrameFormat *HTMLTableColumn::GetFrameFormat( bool
bBorderLine,
return aFrameFormats[GetFrameFormatIdx(bBorderLine,eVertOrient)];
}
-void HTMLTable::InitCtor( const HTMLTableOptions *pOptions )
+void HTMLTable::InitCtor(const HTMLTableOptions& rOptions)
{
m_pResizeDrawObjects = nullptr;
m_pDrawObjectPrcWidths = nullptr;
@@ -927,9 +927,9 @@ void HTMLTable::InitCtor( const HTMLTableOptions *pOptions )
m_nLeftMargin = 0;
m_nRightMargin = 0;
-const Color& rBorderColor = pOptions->aBorderColor;
+const Color& rBorderColor = rOptions.aBorderColor;
-long nBorderOpt = static_cast(pOptions->nBorder);
+long nBorderOpt = static_cast(rOptions.nBorder);
long nPWidth = nBorderOpt==USHRT_MAX ? NETSCAPE_DFLT_BORDER
: nBorderOpt;
long nPHeight = nBorderOpt==USHRT_MAX ? 0 : nBorderOpt;
@@ -942,7 +942,7 @@ void HTMLTable::InitCtor( const HTMLTableOptions *pOptions )
if( nBorderOpt==USHRT_MAX )
nPWidth = 0;
-if ( pOptions->nCellSpacing != 0 )
+if ( rOptions.nCellSpacing != 0 )
{
m_aTopBorderLine.SetBorderLineStyle(SvxBorderLineStyle::DOUBLE);
}
@@ -956,7 +956,7 @@ void HTMLTable::InitCtor( const HTMLTableOptions *pOptions )
}
else
{
-if ( pOptions->nCellSpacing != 0 )
+if ( rOptions.nCellSpacing != 0 )
{
m_aLeftBorderLine.SetBorderLineStyle(SvxBorderLineStyle::DOUBLE);
}
@@ -965,7 +965,7 @@ void HTMLTable::InitCtor( const HTMLTableOptions *pOptions )
}
m_aRightBorderLine = m_aLeftBorderLine;
-if( pOptions->nCellSpacing != 0 )
+if( rOptions.nCellSpacing != 0 )
{
m_aBorderLine.SetBorderLineStyle(SvxBorderLineStyle::DOUBLE);
m_aBorderLine.SetWidth( DEF_LINE_WIDTH_0 );
@@ -994,8 +994,8 @@ void HTMLTable::InitCtor( const HTMLTableOptions *pOptions )
m_nCellSpacing = SwHTMLParser::ToTwips( m_nCellSpacing );
}
-nPWidth = pOptions->nHSpace;
-nPHeight = pOptions->nVSpace;
+nPWidth = rOptions.nHSpace;
+nPHeight = rOptions.nVSpace;
SvxCSS1Parser::PixelToTwip( nPWidth, nPHeight );
m_nHSpace = static_cast(nPWidth);
m_nVSpace = static_cast(nPHeight);
@@ -1003,47 +1003,47 @@ void HTMLTable::InitCtor( const HTMLTableOptions
*pOptions )
m_bColSpec = false;
m_xBackgroundBrush.reset(m_pParser->CreateBrushItem(
-pOptions->bBGColor ? &(pOptions->aBGColor) : nullptr,
-pOptions->aBGImage, aEmptyOUStr, aEmptyOUStr,
aEmptyOUStr));
+rOptions.bBGColor ? &(rOptions.aBGColor) : nullptr,
+rOptions.aBGImage, aEmptyOUStr, aEmptyOUStr, aEmptyOUStr));
m_pContext = nullptr;
m_xParentContents.reset();
-m_aId = pOptions->aId;
-m_aClass = pOptions->aClass;
-m_aStyle = pOptions->aStyle;
-m_aDir = pOptions->aDir;
+m_aId = rOptions.aId;
+m_aClass = rOptions.aClass;
+m_aStyle = rOptions.aStyle;
+m_aDir = rOptions.aDir;
}
-HTMLTable::HTMLTable( SwHTMLParser* pPars, HTMLTable *pTopTab,
- bool bParHead,
- bool bHasParentSec, bool bHasToFlw,
- const HTMLTable
[Libreoffice-commits] core.git: Branch 'private/bansan/chardraw' - cui/uiconfig
cui/uiconfig/ui/specialcharacters.ui | 28 ++-- 1 file changed, 14 insertions(+), 14 deletions(-) New commits: commit 95412fb81060f9483406ca7fd50de8cf8fa684a3 Author: Vincent Le Garrec Date: Sun Jan 14 21:14:56 2018 +0100 Sort lines according to top_attach Change-Id: Ic03e086800f90a201f26b4ec754a7ffefc92e3cb diff --git a/cui/uiconfig/ui/specialcharacters.ui b/cui/uiconfig/ui/specialcharacters.ui index 91411e893f12..09a18b37b90a 100644 --- a/cui/uiconfig/ui/specialcharacters.ui +++ b/cui/uiconfig/ui/specialcharacters.ui @@ -202,6 +202,20 @@ + +True +False +False +word +center +False + + +0 +1 + + + True False @@ -306,20 +320,6 @@ 2 - - -True -False -False -word -center -False - - -0 -1 - - 1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - distro-configs/CPLinux-LOKit.conf
distro-configs/CPLinux-LOKit.conf |1 + 1 file changed, 1 insertion(+) New commits: commit 8c4d8bc4654d8809ff0f431dc930d6167d86158c Author: Andras Timar Date: Sun Jan 14 21:11:15 2018 +0100 Disable libgltf for Online Change-Id: Ibe376f891a3607fdfdd3dd5d492491b1afb3cb09 diff --git a/distro-configs/CPLinux-LOKit.conf b/distro-configs/CPLinux-LOKit.conf index b75102952b0b..45e8e0deef76 100644 --- a/distro-configs/CPLinux-LOKit.conf +++ b/distro-configs/CPLinux-LOKit.conf @@ -41,6 +41,7 @@ --disable-sdremote-bluetooth --disable-postgresql-sdbc --disable-firebird-sdbc +--disable-gltf --disable-collada --enable-ext-numbertext --disable-ext-ct2n ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'private/bansan/chardraw'
New branch 'private/bansan/chardraw' available with the following commits: ___ 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-5.3' - distro-configs/CPLinux-LOKit.conf
distro-configs/CPLinux-LOKit.conf |1 + 1 file changed, 1 insertion(+) New commits: commit 6a9bddb3b813b67a0766868446cbe450f331ec2d Author: Andras Timar Date: Sun Jan 14 20:39:14 2018 +0100 Disable collada for Online Change-Id: I601e9e1ad17fcdcfae410bcab354426805bc7ee3 diff --git a/distro-configs/CPLinux-LOKit.conf b/distro-configs/CPLinux-LOKit.conf index 05e089dc7abc..b75102952b0b 100644 --- a/distro-configs/CPLinux-LOKit.conf +++ b/distro-configs/CPLinux-LOKit.conf @@ -41,6 +41,7 @@ --disable-sdremote-bluetooth --disable-postgresql-sdbc --disable-firebird-sdbc +--disable-collada --enable-ext-numbertext --disable-ext-ct2n --enable-epm ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Saurav Chirania license statement
All of my past & future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sd/uiconfig
sd/uiconfig/simpress/ui/sidebarslidebackground.ui | 60 -- 1 file changed, 1 insertion(+), 59 deletions(-) New commits: commit 1f497913901972fd51c222a5824c21f6bda5c0db Author: Katarina Behrens Date: Wed Jan 10 18:06:32 2018 +0100 Fix Tab key cycle through slide background panel Remove empty widget container, lot of garbage placeholders and redundant adjustment. Regression from commit fba28df77d7e98663d1cf77ac206f8799fce4108 Oh dear, how could I possibly have reviewed this in? Change-Id: I25af642afad094faba5b0ba1e37cfbf1a954e52f Reviewed-on: https://gerrit.libreoffice.org/47720 Tested-by: Jenkins Reviewed-by: Katarina Behrens (cherry picked from commit aa957dffaa40a7d4f34ec90ea50779532bdc9540) Reviewed-on: https://gerrit.libreoffice.org/47840 Reviewed-by: Yousuf Philips diff --git a/sd/uiconfig/simpress/ui/sidebarslidebackground.ui b/sd/uiconfig/simpress/ui/sidebarslidebackground.ui index 55783273dfe7..868741e5dc06 100644 --- a/sd/uiconfig/simpress/ui/sidebarslidebackground.ui +++ b/sd/uiconfig/simpress/ui/sidebarslidebackground.ui @@ -3,11 +3,6 @@ - -100 -1 -10 - True False @@ -278,63 +273,10 @@ 1 -16 +12 - -True -False -vertical - - - - - -2 -0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/source
oox/source/vml/vmlshape.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 6dc995f3dd6a8c74d6c9e248abe71f4fde4b3606
Author: Caolán McNamara
Date: Sun Jan 14 14:58:13 2018 +
ofz#5293 Null-dereference READ
Change-Id: Ie2f9127a903a07e26cf64672476cdfcc1f247eae
Reviewed-on: https://gerrit.libreoffice.org/47862
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index 112016d0849c..5e91bafe3f53 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -1410,9 +1410,11 @@ Reference< XShape > GroupShape::implConvertAndInsert(
const Reference< XShapes >
{
}
+uno::Reference xPropertySet;
if (!maTypeModel.maEditAs.isEmpty())
+xPropertySet = uno::Reference(xGroupShape,
uno::UNO_QUERY);
+if (xPropertySet.is())
{
-uno::Reference xPropertySet(xGroupShape,
uno::UNO_QUERY);
uno::Sequence aGrabBag;
xPropertySet->getPropertyValue("InteropGrabBag") >>= aGrabBag;
beans::PropertyValue aPair;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/source connectivity/source desktop/source forms/source include/connectivity solenv/bin sw/qa sw/source
chart2/source/tools/ObjectIdentifier.cxx |4 ++--
connectivity/source/drivers/dbase/DTable.cxx |2 +-
desktop/source/lib/init.cxx |4 ++--
forms/source/component/DatabaseForm.cxx |4 ++--
include/connectivity/sqliterator.hxx |2 +-
solenv/bin/modules/installer/scriptitems.pm |2 +-
sw/qa/extras/ooxmlexport/ooxmlexport4.cxx|6 +++---
sw/source/core/unocore/swunohelper.cxx |6 +++---
sw/source/filter/ww8/docxattributeoutput.cxx |4 ++--
9 files changed, 17 insertions(+), 17 deletions(-)
New commits:
commit 866fc4ddd3145f08d9cf2bce3cba7e3844c4f76d
Author: Andrea Gelmini
Date: Sun Jan 14 13:42:52 2018 +0100
Fix typos
Change-Id: Icc5fc590a6a90e30afa5f61028d4dd0279fbe120
Reviewed-on: https://gerrit.libreoffice.org/47861
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/chart2/source/tools/ObjectIdentifier.cxx
b/chart2/source/tools/ObjectIdentifier.cxx
index f93d03015cd3..54ba3dd910b7 100644
--- a/chart2/source/tools/ObjectIdentifier.cxx
+++ b/chart2/source/tools/ObjectIdentifier.cxx
@@ -636,7 +636,7 @@ OUString ObjectIdentifier::createParticleForLegend(
ChartModel& rModel )
OUStringBuffer aRet;
Reference< XDiagram > xDiagram( rModel.getFirstDiagram() );
-//todo: if more than one diagram is implemeted, find the correct diagram
which is owner of the given legend
+//todo: if more than one diagram is implemented, find the correct diagram
which is owner of the given legend
aRet.append( ObjectIdentifier::createParticleForDiagram() );
aRet.append(":");
@@ -652,7 +652,7 @@ OUString ObjectIdentifier::createParticleForLegend(
OUStringBuffer aRet;
Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( xChartModel
) );
-//todo: if more than one diagram is implemeted, find the correct diagram
which is owner of the given legend
+//todo: if more than one diagram is implemented, find the correct diagram
which is owner of the given legend
aRet.append( ObjectIdentifier::createParticleForDiagram() );
aRet.append(":");
diff --git a/connectivity/source/drivers/dbase/DTable.cxx
b/connectivity/source/drivers/dbase/DTable.cxx
index d1b751dc7e9e..eef8df9bb5e7 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -667,7 +667,7 @@ void ODbaseTable::refreshIndexes()
for (sal_uInt16 nKey = 0; nKey < nKeyCnt; nKey++)
{
-// Refences the key an index-file?
+// References the key an index-file?
aKeyName = aInfFile.GetKeyName( nKey );
//...if yes, add the index list of the table
if (aKeyName.startsWith("NDX"))
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 7190b030ea9a..5688dab671f6 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -946,7 +946,7 @@ void CallbackFlushHandler::queue(const int type, const
char* data)
if (rcNew.m_nPart == -1)
{
-// Don't merge unless fully overlaped.
+// Don't merge unless fully overlapped.
SAL_INFO("lok", "New " << rcNew.toString()
<< " has " << rcOld.toString() << "?");
if
(rcNew.m_aRectangle.IsInside(rcOld.m_aRectangle))
{
@@ -956,7 +956,7 @@ void CallbackFlushHandler::queue(const int type, const
char* data)
}
else if (rcOld.m_nPart == -1)
{
-// Don't merge unless fully overlaped.
+// Don't merge unless fully overlapped.
SAL_INFO("lok", "Old " << rcOld.toString()
<< " has " << rcNew.toString() << "?");
if
(rcOld.m_aRectangle.IsInside(rcNew.m_aRectangle))
{
diff --git a/forms/source/component/DatabaseForm.cxx
b/forms/source/component/DatabaseForm.cxx
index 70608e16db6a..6b623752a684 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -3254,7 +3254,7 @@ void SAL_CALL ODatabaseForm::executeWithCompletion( const
Reference< XInteractio
if ( !impl_approveRowChange_throw( event, true, aGuard ) )
return;
-// we're loaded and somebody want's to execute ourself -> this means a
reload
+// we're loaded and somebody wants to execute ourself -> this means a
reload
reload_impl(false, _rxHandler);
}
}
@@ -3280,7 +3280,7 @@ void SAL_CALL ODatabaseForm::execute()
if ( !impl_approveRowChange_throw( event, true, aGuard ) )
return;
-// we're loaded and somebody want's to e
[Libreoffice-commits] core.git: fpicker/source framework/source include/framework include/osl include/ucbhelper include/unotools jurt/com libreofficekit/qa qadevOOo/tests sfx2/source svx/source vcl/un
fpicker/source/win32/filepicker/FilterContainer.hxx |2 +-
framework/source/dispatch/loaddispatcher.cxx |4 ++--
framework/source/inc/loadenv/loadenv.hxx | 10 +-
framework/source/jobs/job.cxx| 10 +-
framework/source/services/substitutepathvars.cxx |2 +-
framework/source/uielement/addonstoolbarmanager.cxx |2 +-
include/framework/framelistanalyzer.hxx |2 +-
include/osl/pipe_decl.hxx|2 +-
include/ucbhelper/interceptedinteraction.hxx |2 +-
include/unotools/mediadescriptor.hxx |2 +-
jurt/com/sun/star/comp/loader/FactoryHelper.java |4 ++--
libreofficekit/qa/unit/tiledrendering.cxx|2 +-
qadevOOo/tests/java/ifc/sdb/_XSingleSelectQueryAnalyzer.java |4 ++--
sfx2/source/doc/printhelper.cxx |4 ++--
svx/source/inc/docrecovery.hxx |2 +-
vcl/unx/generic/app/i18n_ic.cxx |2 +-
wizards/com/sun/star/wizards/document/OfficeDocument.java|2 +-
wizards/com/sun/star/wizards/document/OfficeDocument.py |2 +-
18 files changed, 30 insertions(+), 30 deletions(-)
New commits:
commit a452643b431803b613919871abf1a81de6de3464
Author: Andrea Gelmini
Date: Sun Jan 14 12:42:46 2018 +0100
Fix typos
Change-Id: I2b4988e1d81fe60f7699362480cd739d2620c053
Reviewed-on: https://gerrit.libreoffice.org/47856
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/fpicker/source/win32/filepicker/FilterContainer.hxx
b/fpicker/source/win32/filepicker/FilterContainer.hxx
index ffbe327f6463..89c3987aca45 100644
--- a/fpicker/source/win32/filepicker/FilterContainer.hxx
+++ b/fpicker/source/win32/filepicker/FilterContainer.hxx
@@ -26,7 +26,7 @@
#include
-// helper class, only useable by OFilterContainer
+// helper class, only usable by OFilterContainer
class CFilterContainer
diff --git a/framework/source/dispatch/loaddispatcher.cxx
b/framework/source/dispatch/loaddispatcher.cxx
index 81141c347aae..5d1b7346fade 100644
--- a/framework/source/dispatch/loaddispatcher.cxx
+++ b/framework/source/dispatch/loaddispatcher.cxx
@@ -82,7 +82,7 @@ css::uno::Any LoadDispatcher::impl_dispatch( const
css::util::URL& rURL,
// may a dispatch request before is still in progress (?!).
// Then we should wait a little bit and block this new request.
// In case we run into the timeout, we should reject this new request
-// and return "FAILED" as result. Otherwhise we can start this new
operation.
+// and return "FAILED" as result. Otherwise we can start this new
operation.
if (!m_aLoader.waitWhileLoading(2000)) // => 2 sec.
{
if (xListener.is())
@@ -98,7 +98,7 @@ css::uno::Any LoadDispatcher::impl_dispatch( const
css::util::URL& rURL,
css::frame::DispatchResultEvent(xThis,
css::frame::DispatchResultState::FAILURE, css::uno::Any()));
}
-// OK ... now the internal loader seems to be useable for new requests
+// OK ... now the internal loader seems to be usable for new requests
// and our owner frame seems to be valid for such operations.
// Initialize it with all new but needed properties and start the loading.
css::uno::Reference< css::lang::XComponent > xComponent;
diff --git a/framework/source/inc/loadenv/loadenv.hxx
b/framework/source/inc/loadenv/loadenv.hxx
index 87743974ae51..ca8999f889a9 100644
--- a/framework/source/inc/loadenv/loadenv.hxx
+++ b/framework/source/inc/loadenv/loadenv.hxx
@@ -369,7 +369,7 @@ public:
close the frame if it was created before in case loading
failed.
@throw A LoadEnvException only in cases, where an internal error
indicates,
-that the complete load environment seems to be not useable in
general.
+that the complete load environment seems to be not usable in
general.
In such cases a RuntimeException would be to hard for the
outside code :-)
@throw A RuntimeException in case any internal process indicates, that
@@ -454,7 +454,7 @@ private:
and could be activated successfully. An empty reference
otherwise.
@throw A LoadEnvException only in cases, where an internal error
indicates,
-that the complete load environment seems to be not useable in
general.
+that the complete load environment seems to be not usable in
general.
In such cases a RuntimeException would be to hard for the
outside code :-)
@throw A RuntimeException in case any internal process indicates, that
@@ -462,7 +462,7 @@ private:
*/
css::uno::Reference< css::frame::XFrame > impl_searchAlreadyLoaded();
-/** @short search for any
[Libreoffice-commits] core.git: bean/native framework/qa framework/source odk/examples sfx2/source uui/source vbahelper/source
bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
|2 +-
framework/qa/complex/dispatches/checkdispatchapi.java
|2 +-
framework/source/accelerators/presethandler.cxx
|2 +-
framework/source/accelerators/storageholder.cxx
|6 +++---
framework/source/dispatch/closedispatcher.cxx
|4 ++--
framework/source/dispatch/dispatchprovider.cxx
|2 +-
framework/source/fwe/xml/saxnamespacefilter.cxx
|2 +-
framework/source/fwi/jobs/configaccess.cxx
|2 +-
framework/source/jobs/jobdata.cxx
| 10 +-
framework/source/jobs/joburl.cxx
|2 +-
framework/source/layoutmanager/layoutmanager.cxx
|2 +-
framework/source/services/pathsettings.cxx
|2 +-
framework/source/uielement/popuptoolbarcontroller.cxx
|4 ++--
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/CustomizeView.java
|6 +++---
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java
|4 ++--
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusView.java
|2 +-
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/windows/nativeview.c
|2 +-
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java
|2 +-
sfx2/source/bastyp/fltfnc.cxx
|2 +-
sfx2/source/dialog/backingcomp.cxx
|2 +-
uui/source/iahndl.cxx
|2 +-
vbahelper/source/vbahelper/vbadocumentbase.cxx
|2 +-
22 files changed, 33 insertions(+), 33 deletions(-)
New commits:
commit cfffb09b3d6d46c500e3be3fe601a4ff6944d40e
Author: Andrea Gelmini
Date: Sun Jan 14 12:50:47 2018 +0100
Fix typos
Change-Id: I2a578961837076ebce3c1fb2681b0785d1d490ac
Reviewed-on: https://gerrit.libreoffice.org/47857
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
b/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
index d425d5e065e8..dd19fe7931b8 100644
--- a/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
+++ b/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
@@ -126,7 +126,7 @@ JNIEXPORT jlong JNICALL
Java_com_sun_star_comp_beans_LocalOfficeWindow_getNative
awt.FreeDrawingSurface(ds);
/* Register own window procedure
- Do it one times only! Otherwhise
+ Do it one times only! Otherwise
multiple instances will be registered
and calls on such construct produce
a stack overflow.
diff --git a/framework/qa/complex/dispatches/checkdispatchapi.java
b/framework/qa/complex/dispatches/checkdispatchapi.java
index 32786e858364..cceabb4f436c 100644
--- a/framework/qa/complex/dispatches/checkdispatchapi.java
+++ b/framework/qa/complex/dispatches/checkdispatchapi.java
@@ -193,7 +193,7 @@ public class checkdispatchapi
@Test public void checkInterceptorLifeTime() throws Exception
{
// Note: It's important for the following test, that aInterceptor will
be hold alive by the uno reference
-// xInterceptor. Otherwhise we can't check some internal states of
aInterceptor at the end of this method, because
+// xInterceptor. Otherwise we can't check some internal states of
aInterceptor at the end of this method, because
// it was already killed .-)
Interceptor aInterceptor = new Interceptor(m_xMSF);
diff --git a/framework/source/accelerators/presethandler.cxx
b/framework/source/accelerators/presethandler.cxx
index 3d6047dadaae..b5b309150fd6 100644
--- a/framework/source/accelerators/presethandler.cxx
+++ b/framework/source/accelerators/presethandler.cxx
@@ -761,7 +761,7 @@ css::uno::Reference< css::embed::XStorage >
PresetHandler::impl_openLocalizedPat
// it doesn't matter, if there is a locale fallback or not
// If creation of storages is allowed, we do it anyway.
-// Otherwhise we have no acc config at all, which can make other trouble.
+// Otherwise we have no acc config at all, which can make other trouble.
OUString sLocalizedPath;
sLocalizedPath = sPath;
sLocalizedPath += "/";
diff
Re: University practical exercise about LibreOffice
Are you the guy who has asked about this in the developer IRC channel? I think you were given this pointer already, but I repeat it here for posterity: http://laputan.org/mud/ --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: oox/source
oox/source/vml/vmlshape.cxx | 18 +-
1 file changed, 9 insertions(+), 9 deletions(-)
New commits:
commit fa014ee6e13d182cb5830698558284e7caffa5f9
Author: Caolán McNamara
Date: Sun Jan 14 14:55:17 2018 +
fix indent
Change-Id: Ic806f41607c201d9b68074244203c6020d4985c7
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index 8dfadd766f19..112016d0849c 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -1418,18 +1418,18 @@ Reference< XShape > GroupShape::implConvertAndInsert(
const Reference< XShapes >
beans::PropertyValue aPair;
aPair.Name = "mso-edit-as";
aPair.Value <<= maTypeModel.maEditAs;
- if (aGrabBag.hasElements())
- {
+if (aGrabBag.hasElements())
+{
sal_Int32 nLength = aGrabBag.getLength();
aGrabBag.realloc(nLength + 1);
aGrabBag[nLength] = aPair;
- }
- else
- {
- aGrabBag.realloc(1);
- aGrabBag[0] = aPair;
- }
- xPropertySet->setPropertyValue("InteropGrabBag",
uno::makeAny(aGrabBag));
+}
+else
+{
+aGrabBag.realloc(1);
+aGrabBag[0] = aPair;
+}
+xPropertySet->setPropertyValue("InteropGrabBag",
uno::makeAny(aGrabBag));
}
// Make sure group shapes are inline as well, unless there is an explicit
different style.
PropertySet aPropertySet(xGroupShape);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/arealink.hxx|4 +--
sc/source/ui/docshell/arealink.cxx | 43 +
2 files changed, 18 insertions(+), 29 deletions(-)
New commits:
commit d04f9f5659d21a4b48ff66424db60b5b0536f06e
Author: Caolán McNamara
Date: Sat Jan 13 21:32:11 2018 +
drop AreaLink_Impl
Change-Id: Ib171eb330be3a64b9688f880b2075fbd09875a20
Reviewed-on: https://gerrit.libreoffice.org/47845
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sc/inc/arealink.hxx b/sc/inc/arealink.hxx
index 5391d320ce09..9c8c33b9fff0 100644
--- a/sc/inc/arealink.hxx
+++ b/sc/inc/arealink.hxx
@@ -27,13 +27,13 @@
#include
class SfxObjectShell;
-struct AreaLink_Impl;
+class ScDocShell;
class Dialog;
class SC_DLLPUBLIC ScAreaLink : public ::sfx2::SvBaseLink, public
ScRefreshTimer
{
private:
-std::unique_ptr pImpl;
+ScDocShell* m_pDocSh;
OUStringaFileName;
OUStringaFilterName;
OUStringaOptions;
diff --git a/sc/source/ui/docshell/arealink.cxx
b/sc/source/ui/docshell/arealink.cxx
index b3a6b7ca3d61..cc98d0744adc 100644
--- a/sc/source/ui/docshell/arealink.cxx
+++ b/sc/source/ui/docshell/arealink.cxx
@@ -46,14 +46,6 @@
#include
#include
-struct AreaLink_Impl
-{
-ScDocShell* m_pDocSh;
-VclPtr m_pDialog;
-
-AreaLink_Impl() : m_pDocSh( nullptr ), m_pDialog() {}
-};
-
ScAreaLink::ScAreaLink( SfxObjectShell* pShell, const OUString& rFile,
const OUString& rFilter, const OUString& rOpt,
@@ -61,7 +53,7 @@ ScAreaLink::ScAreaLink( SfxObjectShell* pShell, const
OUString& rFile,
sal_uLong nRefresh ) :
::sfx2::SvBaseLink(SfxLinkUpdateMode::ONCALL,SotClipboardFormatId::SIMPLE_FILE),
ScRefreshTimer ( nRefresh ),
-pImpl ( new AreaLink_Impl() ),
+m_pDocSh(static_cast(pShell)),
aFileName (rFile),
aFilterName (rFilter),
aOptions(rOpt),
@@ -72,9 +64,8 @@ ScAreaLink::ScAreaLink( SfxObjectShell* pShell, const
OUString& rFile,
bDoInsert (true)
{
OSL_ENSURE(dynamic_cast< const ScDocShell *>( pShell ) != nullptr,
"ScAreaLink with wrong ObjectShell");
-pImpl->m_pDocSh = static_cast< ScDocShell* >( pShell );
SetRefreshHandler( LINK( this, ScAreaLink, RefreshHdl ) );
-SetRefreshControl(
&pImpl->m_pDocSh->GetDocument().GetRefreshTimerControlAddress() );
+SetRefreshControl(
&m_pDocSh->GetDocument().GetRefreshTimerControlAddress() );
}
ScAreaLink::~ScAreaLink()
@@ -91,19 +82,17 @@ void ScAreaLink::Edit(vcl::Window* pParent, const
Link& /* rEn
ScopedVclPtr
pDlg(pFact->CreateScLinkedAreaDlg(pParent));
OSL_ENSURE(pDlg, "Dialog create fail!");
pDlg->InitFromOldLink( aFileName, aFilterName, aOptions, aSourceArea,
GetRefreshDelay() );
-pImpl->m_pDialog = pDlg;
if ( pDlg->Execute() == RET_OK )
{
-aOptions = pImpl->m_pDialog->GetOptions();
-Refresh( pImpl->m_pDialog->GetURL(), pImpl->m_pDialog->GetFilter(),
- pImpl->m_pDialog->GetSource(), pImpl->m_pDialog->GetRefresh()
);
+aOptions = pDlg->GetOptions();
+Refresh( pDlg->GetURL(), pDlg->GetFilter(),
+ pDlg->GetSource(), pDlg->GetRefresh() );
// copy source data from members (set in Refresh) into link name for
dialog
OUString aNewLinkName;
sfx2::MakeLnkName( aNewLinkName, nullptr, aFileName, aSourceArea,
&aFilterName );
SetName( aNewLinkName );
}
-pImpl->m_pDialog.clear();// dialog is deleted with parent
}
::sfx2::SvBaseLink::UpdateResult ScAreaLink::DataChanged(
@@ -115,7 +104,7 @@ void ScAreaLink::Edit(vcl::Window* pParent, const
Link& /* rEn
if (bInCreate)
return SUCCESS;
-sfx2::LinkManager*
pLinkManager=pImpl->m_pDocSh->GetDocument().GetLinkManager();
+sfx2::LinkManager* pLinkManager=m_pDocSh->GetDocument().GetLinkManager();
if (pLinkManager!=nullptr)
{
OUString aFile, aArea, aFilter;
@@ -149,11 +138,11 @@ void ScAreaLink::Closed()
{
// delete link: Undo
-ScDocument& rDoc = pImpl->m_pDocSh->GetDocument();
+ScDocument& rDoc = m_pDocSh->GetDocument();
bool bUndo (rDoc.IsUndoEnabled());
if (bAddUndo && bUndo)
{
-pImpl->m_pDocSh->GetUndoManager()->AddUndoAction( new
ScUndoRemoveAreaLink( pImpl->m_pDocSh,
+m_pDocSh->GetUndoManager()->AddUndoAction( new ScUndoRemoveAreaLink(
m_pDocSh,
aFileName,
aFilterName, aOptions,
aSourceArea,
aDestArea, GetRefreshDelay() ) );
@@ -240,14 +229,14 @@ bool ScAreaLink::Refresh( const OUString& rNewFile, const
OUString& rNewFilter,
if (rNewFile.isEmpty() || rNewFilter.isEmpty())
return false;
-OUString aNewUrl( ScGlobal::GetAbsDocName( rNewFile, pImpl->m_pDocSh ) );
+O
[Libreoffice-commits] core.git: filter/source
filter/source/graphicfilter/idxf/dxf2mtf.cxx | 13 -
filter/source/graphicfilter/idxf/dxfentrd.cxx | 36 ++
filter/source/graphicfilter/idxf/dxfentrd.hxx | 11 +--
3 files changed, 38 insertions(+), 22 deletions(-)
New commits:
commit b1e1b0950ecc4bf7323bd494ef33de1ae31fedf0
Author: Caolán McNamara
Date: Sat Jan 13 21:22:08 2018 +
ofz#5276 oom
Change-Id: I5eba89e0f242b316bd59779601dc1f12b8ce3b87
Reviewed-on: https://gerrit.libreoffice.org/47844
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/filter/source/graphicfilter/idxf/dxf2mtf.cxx
b/filter/source/graphicfilter/idxf/dxf2mtf.cxx
index 862ed03e3a20..9d034c579c9a 100644
--- a/filter/source/graphicfilter/idxf/dxf2mtf.cxx
+++ b/filter/source/graphicfilter/idxf/dxf2mtf.cxx
@@ -531,13 +531,13 @@ void DXF2GDIMetaFile::DrawPolyLineEntity(const
DXFPolyLineEntity & rE, const DXF
void DXF2GDIMetaFile::DrawLWPolyLineEntity(const DXFLWPolyLineEntity & rE,
const DXFTransform & rTransform )
{
-sal_Int32 i, nPolySize = rE.nCount;
-if ( nPolySize && rE.pP )
+sal_Int32 nPolySize = rE.aP.size();
+if (nPolySize)
{
tools::Polygon aPoly( static_cast(nPolySize));
-for ( i = 0; i < nPolySize; i++ )
+for (sal_Int32 i = 0; i < nPolySize; ++i)
{
-rTransform.Transform( rE.pP[ static_cast(i) ], aPoly[
static_cast(i) ] );
+rTransform.Transform( rE.aP[ static_cast(i) ], aPoly[
static_cast(i) ] );
}
if ( SetLineAttribute( rE ) )
{
@@ -562,11 +562,10 @@ void DXF2GDIMetaFile::DrawHatchEntity(const
DXFHatchEntity & rE, const DXFTransf
const DXFBoundaryPathData& rPathData = rE.pBoundaryPathData[ j ];
if ( rPathData.bIsPolyLine )
{
-sal_Int32 i;
-for( i = 0; i < rPathData.nPointCount; i++ )
+for (const auto& a : rPathData.aP)
{
Point aPt;
-rTransform.Transform( rPathData.pP[ i ], aPt );
+rTransform.Transform(a, aPt);
aPtAry.push_back( aPt );
}
}
diff --git a/filter/source/graphicfilter/idxf/dxfentrd.cxx
b/filter/source/graphicfilter/idxf/dxfentrd.cxx
index 3c313a915be7..7a9074a0a770 100644
--- a/filter/source/graphicfilter/idxf/dxfentrd.cxx
+++ b/filter/source/graphicfilter/idxf/dxfentrd.cxx
@@ -423,7 +423,7 @@ void DXFLWPolyLineEntity::EvaluateGroup( DXFGroupReader &
rDGR )
nCount = rDGR.GetI();
// limit alloc to max reasonable size based on remaining data in
stream
if (nCount > 0 && static_cast(nCount) <=
rDGR.remainingSize())
-pP.reset( new DXFVector[ nCount ] );
+aP.reserve(nCount);
else
nCount = 0;
}
@@ -434,14 +434,21 @@ void DXFLWPolyLineEntity::EvaluateGroup( DXFGroupReader &
rDGR )
case 41: fEndWidth = rDGR.GetF(); break;
case 10:
{
-if ( pP && ( nIndex < nCount ) )
-pP[ nIndex ].fx = rDGR.GetF();
+if (nIndex < nCount)
+{
+aP.resize(nIndex+1);
+aP[nIndex].fx = rDGR.GetF();
+}
}
break;
case 20:
{
-if ( pP && ( nIndex < nCount ) )
-pP[ nIndex++ ].fy = rDGR.GetF();
+if (nIndex < nCount)
+{
+aP.resize(nIndex+1);
+aP[nIndex].fy = rDGR.GetF();
+++nIndex;
+}
}
break;
default: DXFBasicEntity::EvaluateGroup(rDGR);
@@ -548,10 +555,10 @@ bool DXFEdgeTypeSpline::EvaluateGroup( DXFGroupReader &
rDGR )
}
DXFBoundaryPathData::DXFBoundaryPathData() :
+nPointCount( 0 ),
nFlags( 0 ),
nHasBulgeFlag( 0 ),
nIsClosedFlag( 0 ),
-nPointCount( 0 ),
fBulge( 0.0 ),
nSourceBoundaryObjects( 0 ),
nEdgeCount( 0 ),
@@ -583,7 +590,7 @@ bool DXFBoundaryPathData::EvaluateGroup( DXFGroupReader &
rDGR )
nPointCount = rDGR.GetI();
// limit alloc to max reasonable size based on remaining data
in stream
if (nPointCount > 0 && static_cast(nPointCount) <=
rDGR.remainingSize())
-pP.reset( new DXFVector[ nPointCount ] );
+aP.reserve(nPointCount);
else
nPointCount = 0;
}
@@ -594,14 +601,21 @@ bool DXFBoundaryPathData::EvaluateGroup( DXFGroupReader &
rDGR )
case 42 : fBulge = rDGR.GetF(); break;
case 10:
{
-if ( pP && ( nPointIndex < nPointCount ) )
-pP[ nPointIndex ].fx = rDGR.GetF();
+if (nPointIndex < nPointCount)
+{
+aP.resize(nPointIndex+1);
+aP[nPointIndex].fx
[Libreoffice-commits] core.git: sd/qa
sd/qa/unit/export-tests.cxx | 79 +---
1 file changed, 61 insertions(+), 18 deletions(-)
New commits:
commit 3fe8a90c164ad4b8e5f0e1998c1cf59186658362
Author: Tomaž Vajngerl
Date: Sun Jan 14 14:45:58 2018 +0900
change testN821567 to work on more import/export filters
- rename the test to something sensible
- comment the test use case
- change the test to cover more import/export filters
Change-Id: Ib9be1148d239d99e70e62efaafb69daf25c72164
Reviewed-on: https://gerrit.libreoffice.org/47852
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index 44099cbac91b..8bc274400520 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -76,7 +76,7 @@ using namespace css::animations;
class SdExportTest : public SdModelTestBaseXML
{
public:
-void testN821567();
+void testBackgroundImage();
void testMediaEmbedding();
void testFdo84043();
void testTdf97630();
@@ -96,7 +96,7 @@ public:
CPPUNIT_TEST_SUITE(SdExportTest);
-CPPUNIT_TEST(testN821567);
+CPPUNIT_TEST(testBackgroundImage);
CPPUNIT_TEST(testMediaEmbedding);
CPPUNIT_TEST(testFdo84043);
CPPUNIT_TEST(testTdf97630);
@@ -144,27 +144,70 @@ public:
};
-void SdExportTest::testN821567()
+void SdExportTest::testBackgroundImage()
{
-OUString bgImage;
-::sd::DrawDocShellRef xDocShRef = loadURL(
m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/n821567.pptx"), PPTX );
+// Initial bug: N821567
-xDocShRef = saveAndReload( xDocShRef.get(), ODP );
-uno::Reference< drawing::XDrawPagesSupplier > xDoc(
-xDocShRef->GetDoc()->getUnoModel(), uno::UNO_QUERY_THROW );
-CPPUNIT_ASSERT_EQUAL_MESSAGE( "not exactly one page",
static_cast(1), xDoc->getDrawPages()->getCount() );
-uno::Reference< drawing::XDrawPage > xPage( getPage( 0, xDocShRef ) );
+// Check if Slide background image is imported from PPTX and exported to
PPTX, PPT and ODP correctly
-uno::Reference< beans::XPropertySet > xPropSet( xPage, uno::UNO_QUERY );
-uno::Any aAny = xPropSet->getPropertyValue( "Background" );
-if(aAny.hasValue())
+OUString bgImageName;
+sd::DrawDocShellRef xDocShRef =
loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/n821567.pptx"),
PPTX);
+
+// Check that imported background image from PPTX exists
+{
+uno::Reference
xDoc(xDocShRef->GetDoc()->getUnoModel(), uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("not exactly one page",
static_cast(1), xDoc->getDrawPages()->getCount());
+uno::Reference xPage(getPage(0, xDocShRef));
+
+uno::Reference xPropertySet(xPage,
uno::UNO_QUERY);
+uno::Any aAny = xPropertySet->getPropertyValue("Background");
+if (aAny.has>())
+{
+uno::Reference xBackgroundPropSet;
+aAny >>= xBackgroundPropSet;
+aAny = xBackgroundPropSet->getPropertyValue("FillBitmapName");
+aAny >>= bgImageName;
+}
+CPPUNIT_ASSERT_MESSAGE("Slide Background is not imported from PPTX
correctly", !bgImageName.isEmpty());
+}
+
+// Save as PPTX, reload and check again so we make sure exporting to PPTX
is working correctly
+{
+xDocShRef = saveAndReload(xDocShRef.get(), PPTX);
+uno::Reference
xDoc(xDocShRef->GetDoc()->getUnoModel(), uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("not exactly one page",
static_cast(1), xDoc->getDrawPages()->getCount());
+uno::Reference xPage(getPage(0, xDocShRef));
+
+uno::Reference xPropertySet(xPage,
uno::UNO_QUERY);
+uno::Any aAny = xPropertySet->getPropertyValue("Background");
+if (aAny.hasValue())
+{
+uno::Reference xBackgroundPropSet;
+aAny >>= xBackgroundPropSet;
+aAny = xBackgroundPropSet->getPropertyValue("FillBitmapName");
+aAny >>= bgImageName;
+}
+CPPUNIT_ASSERT_MESSAGE("Slide Background is not exported to PPTX
correctly", !bgImageName.isEmpty());
+}
+
+// Save as ODP, reload and check again so we make sure exporting and
importing to ODP is working correctly
{
-uno::Reference< beans::XPropertySet > aXBackgroundPropSet;
-aAny >>= aXBackgroundPropSet;
-aAny = aXBackgroundPropSet->getPropertyValue( "FillBitmapName" );
-aAny >>= bgImage;
+xDocShRef = saveAndReload(xDocShRef.get(), ODP);
+uno::Reference
xDoc(xDocShRef->GetDoc()->getUnoModel(), uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("not exactly one page",
static_cast(1), xDoc->getDrawPages()->getCount());
+uno::Reference xPage(getPage(0, xDocShRef));
+
+uno::Reference xPropertySet(xPage,
uno::UNO_QUERY);
+uno::Any aAny = xPropertySet->getPropertyValue("Background");
+if (aAny.hasValue())
+{
+
[Libreoffice-commits] core.git: include/xmloff svx/source xmloff/source
include/xmloff/ImageStyle.hxx| 19
svx/source/xml/xmlxtimp.cxx |1
xmloff/source/core/xmlexp.cxx|2 -
xmloff/source/style/FillStyleContext.cxx |1
xmloff/source/style/ImageStyle.cxx | 36 ++-
5 files changed, 12 insertions(+), 47 deletions(-)
New commits:
commit 640a7c791b4665c16be7ad8f5f7dda30dcc88eda
Author: Tomaž Vajngerl
Date: Mon Jan 8 12:52:04 2018 +0900
xmloff: XmlImageStyle class is pointless as the methods are static
When used, we instantiate the XmlImageStyle class but all its
methods are static, so instantioation is completely pointless.
So change XmlImageStyle to a namespace and static method to
functions.
Change-Id: I6385bd7eeb08c627cb8e48b79a6820372cf94a65
Reviewed-on: https://gerrit.libreoffice.org/47851
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/include/xmloff/ImageStyle.hxx b/include/xmloff/ImageStyle.hxx
index 2fd3f0167583..80f873d386fc 100644
--- a/include/xmloff/ImageStyle.hxx
+++ b/include/xmloff/ImageStyle.hxx
@@ -31,23 +31,14 @@ class SvXMLUnitConverter;
class SvXMLExport;
class SvXMLImport;
-class XMLOFF_DLLPUBLIC XMLImageStyle
+namespace XMLImageStyle
{
-public:
-XMLImageStyle();
-~XMLImageStyle();
-static void exportXML( const OUString& rStrName, const css::uno::Any&
rValue, SvXMLExport& rExport );
-static void importXML( const css::uno::Reference<
css::xml::sax::XAttributeList >& xAttrList, css::uno::Any& rValue, OUString&
rStrName, SvXMLImport& rImport );
+XMLOFF_DLLPUBLIC void exportXML(OUString const & rStrName, css::uno::Any const
& rValue, SvXMLExport& rExport);
+XMLOFF_DLLPUBLIC bool
importXML(css::uno::Reference const & xAttrList,
+css::uno::Any& rValue, OUString& rStrName,
SvXMLImport& rImport);
-private:
-
-SAL_DLLPRIVATE static void ImpExportXML( const OUString& rStrName, const
css::uno::Any& rValue,
- SvXMLExport& rExport );
-SAL_DLLPRIVATE static bool ImpImportXML( const css::uno::Reference<
css::xml::sax::XAttributeList >& xAttrList,
- css::uno::Any& rValue, OUString& rStrName,
- SvXMLImport& rImport );
-};
+}
#endif // INCLUDED_XMLOFF_IMAGESTYLE_HXX
diff --git a/svx/source/xml/xmlxtimp.cxx b/svx/source/xml/xmlxtimp.cxx
index 207912fca311..14b4156dd14b 100644
--- a/svx/source/xml/xmlxtimp.cxx
+++ b/svx/source/xml/xmlxtimp.cxx
@@ -275,7 +275,6 @@ void SvxXMLTableImportContext::importBitmap( const
uno::Reference< XAttributeLis
{
try
{
-XMLImageStyle aImageStyle;
XMLImageStyle::importXML( xAttrList, rAny, rName, GetImport() );
}
catch (const Exception&)
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 2a0ecb11f25a..796390f2b1e1 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -1609,8 +1609,6 @@ void SvXMLExport::ExportStyles_( bool )
uno::Reference< container::XNameAccess > xBitmap(
xFact->createInstance("com.sun.star.drawing.BitmapTable"), uno::UNO_QUERY );
if( xBitmap.is() )
{
-XMLImageStyle aImageStyle;
-
if( xBitmap->hasElements() )
{
uno::Sequence< OUString > aNamesSeq (
xBitmap->getElementNames() );
diff --git a/xmloff/source/style/FillStyleContext.cxx
b/xmloff/source/style/FillStyleContext.cxx
index 15bf47a5d6b8..89c73965749f 100644
--- a/xmloff/source/style/FillStyleContext.cxx
+++ b/xmloff/source/style/FillStyleContext.cxx
@@ -125,7 +125,6 @@ XMLBitmapStyleContext::XMLBitmapStyleContext( SvXMLImport&
rImport, sal_uInt16 n
: SvXMLStyleContext(rImport, nPrfx, rLName, xAttrList)
{
// start import
-XMLImageStyle aBitmapStyle;
XMLImageStyle::importXML( xAttrList, maAny, maStrName, rImport );
}
diff --git a/xmloff/source/style/ImageStyle.cxx
b/xmloff/source/style/ImageStyle.cxx
index 2a648f3084d9..d4be8a0a2a1f 100644
--- a/xmloff/source/style/ImageStyle.cxx
+++ b/xmloff/source/style/ImageStyle.cxx
@@ -22,7 +22,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
@@ -30,9 +30,8 @@
#include
#include
-using namespace ::com::sun::star;
-
-using namespace ::xmloff::token;
+using namespace css;
+using namespace xmloff::token;
enum SvXMLTokenMapAttrs
{
@@ -44,21 +43,7 @@ enum SvXMLTokenMapAttrs
XML_TOK_IMAGE_ACTUATE
};
-
-XMLImageStyle::XMLImageStyle()
-{
-}
-
-XMLImageStyle::~XMLImageStyle()
-{
-}
-
-void XMLImageStyle::exportXML( const OUString& rStrName, const css::uno::Any&
rValue, SvXMLExport& rExport )
-{
-ImpExportXML( rStrName, rValue, rExport );
-}
-
-void XMLImageStyle::ImpExportXML( const OUString& rStrName, const uno::Any&
rValue, SvXMLExport& rExport )
+void XMLImageStyle::exportXML(OUString const & rStrName, uno::Any const &
rValue, Sv
[Libreoffice-commits] core.git: sw/source
sw/source/core/doc/docredln.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 61618210f87f57ae21cc39530c9f777d76002a12 Author: Andrea Gelmini Date: Sun Jan 14 12:04:07 2018 +0100 Fix typo Change-Id: Ibab7a1b98e35e6e6f282f83e361f067708e1fdc1 Reviewed-on: https://gerrit.libreoffice.org/47854 Reviewed-by: Julien Nabet Tested-by: Julien Nabet diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx index d073d21f5cb5..c8e1caa04e6b 100644 --- a/sw/source/core/doc/docredln.cxx +++ b/sw/source/core/doc/docredln.cxx @@ -396,7 +396,7 @@ void SwRedlineTable::LOKRedlineNotification(RedlineNotification nType, SwRangeRe // When this notify method is called text invalidation is not done yet // Calling FillRects updates the text area so invalidation will not run on the correct rects -// So we need to do an own invalidation here. It invalidates text frames continging the redlining +// So we need to do an own invalidation here. It invalidates text frames containing the redlining SwDoc* pDoc = pRedline->GetDoc(); SwViewShell* pSh; if( pDoc && !pDoc->IsInDtor() && ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/view/tabvwshf.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 1d71f886d6760e5b3eeb4a0f9aaaead0816a45aa
Author: Julien Nabet
Date: Sun Jan 14 10:20:09 2018 +0100
tdf#114992: fix crash in deleting sheet
See bt:
https://bugs.documentfoundation.org/attachment.cgi?id=139087
Change-Id: Iee72385a8e5400436da72fe5e18b8cdfccad193d
Reviewed-on: https://gerrit.libreoffice.org/47850
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard
diff --git a/sc/source/ui/view/tabvwshf.cxx b/sc/source/ui/view/tabvwshf.cxx
index 3cbe8c83aa8f..f315b6cbe89f 100644
--- a/sc/source/ui/view/tabvwshf.cxx
+++ b/sc/source/ui/view/tabvwshf.cxx
@@ -612,7 +612,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
{
const ScDPObject& rDPObj = (*pDPs)[i];
const ScSheetSourceDesc* pSheetSourceDesc
= rDPObj.GetSheetDesc();
-if
(pSheetSourceDesc->GetSourceRange().aStart.Tab() == nSelTab)
+if (pSheetSourceDesc &&
pSheetSourceDesc->GetSourceRange().aStart.Tab() == nSelTab)
bTabWithPivotTable = true;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: wizards/com
wizards/com/sun/star/wizards/common/HelpIds.java | 70 +- wizards/com/sun/star/wizards/report/ReportWizard.java |2 2 files changed, 37 insertions(+), 35 deletions(-) New commits: commit 18b45de3f9aaab82349784a86521b43d7d99d174 Author: Gabor Kelemen Date: Tue Dec 12 00:18:09 2017 +0100 Fix HIDs in Java based Table/Query/Report wizards Some HIDs were a bit off in these wizards - Report Wizard 'Grouping' page - Table Wizard 'Set primary key' page - Query Wizard 'Grouping' page All these contain a subclass of a FieldSelection. Due to the implementation of HID handling there, we need 4 consecutive HIDs in HelpIds.java for the buttons cmdMoveSelected, cmdMoveAll, cmdRemoveSelected and cmdRemoveAll. Above pages contain subclasses without the MoveAll and RemoveAll buttons so we need empty placeholders in their places to cater for the assumptions of the parent class. This also means that HID numbers must be adjusted a bit, and in ReportWizard.java we need to shift the base HID number of the Sorting page that follows the Grouping page. Change-Id: I944dd4f781aff2c0b0cfd99c3386001506c01440 Reviewed-on: https://gerrit.libreoffice.org/46270 Tested-by: Jenkins Reviewed-by: Andras Timar diff --git a/wizards/com/sun/star/wizards/common/HelpIds.java b/wizards/com/sun/star/wizards/common/HelpIds.java index de87206d2bac..2c1ae4fc7d5b 100644 --- a/wizards/com/sun/star/wizards/common/HelpIds.java +++ b/wizards/com/sun/star/wizards/common/HelpIds.java @@ -163,24 +163,24 @@ public class HelpIds PropertyNames.EMPTY_STRING, "HID:WIZARDS_HID_DLGREPORT_2_GROUPING",// HID:34340 "HID:WIZARDS_HID_DLGREPORT_2_CMDGROUP",// HID:34341 -"HID:WIZARDS_HID_DLGREPORT_2_CMDUNGROUP",// HID:34342 -"HID:WIZARDS_HID_DLGREPORT_2_PREGROUPINGDEST",// HID:34343 -"HID:WIZARDS_HID_DLGREPORT_2_CMDMOVEUPGROUP",// HID:34344 -"HID:WIZARDS_HID_DLGREPORT_2_CMDMOVEDOWNGROUP",// HID:34345 -"HID:WIZARDS_HID_DLGREPORT_3_SORT1",// HID:34346 -"HID:WIZARDS_HID_DLGREPORT_3_OPTASCEND1",// HID:34347 -"HID:WIZARDS_HID_DLGREPORT_3_OPTDESCEND1",// HID:34348 -"HID:WIZARDS_HID_DLGREPORT_3_SORT2",// HID:34349 -"HID:WIZARDS_HID_DLGREPORT_3_OPTASCEND2",// HID:34350 -"HID:WIZARDS_HID_DLGREPORT_3_OPTDESCEND2",// HID:34351 -"HID:WIZARDS_HID_DLGREPORT_3_SORT3",// HID:34352 -"HID:WIZARDS_HID_DLGREPORT_3_OPTASCEND3",// HID:34353 -"HID:WIZARDS_HID_DLGREPORT_3_OPTDESCEND3",// HID:34354 -"HID:WIZARDS_HID_DLGREPORT_3_SORT4",// HID:34355 -"HID:WIZARDS_HID_DLGREPORT_3_OPTASCEND4",// HID:34356 -"HID:WIZARDS_HID_DLGREPORT_3_OPTDESCEND4",// HID:34357 -PropertyNames.EMPTY_STRING, -PropertyNames.EMPTY_STRING, +PropertyNames.EMPTY_STRING, // HID:34342 empty, no moveall button +"HID:WIZARDS_HID_DLGREPORT_2_CMDUNGROUP",// HID:34343 +PropertyNames.EMPTY_STRING, // HID:34344 empty, no removeall button +"HID:WIZARDS_HID_DLGREPORT_2_PREGROUPINGDEST",// HID:34345 +"HID:WIZARDS_HID_DLGREPORT_2_CMDMOVEUPGROUP",// HID:34346 +"HID:WIZARDS_HID_DLGREPORT_2_CMDMOVEDOWNGROUP",// HID:34347 +"HID:WIZARDS_HID_DLGREPORT_3_SORT1",// HID:34348 +"HID:WIZARDS_HID_DLGREPORT_3_OPTASCEND1",// HID:34349 +"HID:WIZARDS_HID_DLGREPORT_3_OPTDESCEND1",// HID:34350 +"HID:WIZARDS_HID_DLGREPORT_3_SORT2",// HID:34351 +"HID:WIZARDS_HID_DLGREPORT_3_OPTASCEND2",// HID:34352 +"HID:WIZARDS_HID_DLGREPORT_3_OPTDESCEND2",// HID:34353 +"HID:WIZARDS_HID_DLGREPORT_3_SORT3",// HID:34354 +"HID:WIZARDS_HID_DLGREPORT_3_OPTASCEND3",// HID:34355 +"HID:WIZARDS_HID_DLGREPORT_3_OPTDESCEND3",// HID:34356 +"HID:WIZARDS_HID_DLGREPORT_3_SORT4",// HID:34357 +"HID:WIZARDS_HID_DLGREPORT_3_OPTASCEND4",// HID:34358 +"HID:WIZARDS_HID_DLGREPORT_3_OPTDESCEND4",// HID:34359 PropertyNames.EMPTY_STRING, PropertyNames.EMPTY_STRING, "HID:WIZARDS_HID_DLGREPORT_4_TITLE",// HID:34362 @@ -695,12 +695,12 @@ public class HelpIds PropertyNames.EMPTY_STRING, "HID:WIZARDS_HID_QUERYWIZARD_LSTFILTERFIELDS",// HID:40915 "HID:WIZARDS_HID_QUERYWIZARD_CMDFILTERMOVESELECTED",// HID:40916 -"HID:WIZARDS_HID_QUERYWIZARD_CMDFILTERREMOVESELECTED",// HID:40917 -"HID:WIZARDS_HID_QUERYWIZARD_LSTFILTERSELFIELDS",// HID:40918 -"HID:WIZARDS_HID_QUERYWIZARD_CMDFILTERMOVEUP",// HID:40919 -"HID:WIZARDS_HID_QUERYWIZARD_CMDFILTERMOVEDOWN",// HID:40920 -PropertyNames.EMPTY_STRING, -PropertyNames.EMPTY_STRING, +PropertyNames.EMPTY_STRING, // HID:40917 empty, no moveall button +"H
[Libreoffice-commits] core.git: solenv/bin
solenv/bin/hrcex |2 +- solenv/bin/uiex |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 674b1c924966b4a3b6027509a6ab682e7c5aaaea Author: Gabor Kelemen Date: Sat Dec 16 08:59:12 2017 +0100 Save full file path to pot files As requested here: http://nabble.documentfoundation.org/libreoffice-l10n-Pootle-source-file-paths-not-available-anymore-td4229127.html This adds the full source file path in case of .hrc and .ui files to the generated pot, relatie to srcdir. So instead of personalization.hrc:31 we can have cui/inc/personalization.hrc:31 for better context for translators. Since this is only in comment this will not change the translated status of strings. TODO: the other file formats we use are not affected by this. Change-Id: Id436d66698c93e07c46bf9c20601c5b480eadd0b Reviewed-on: https://gerrit.libreoffice.org/46591 Tested-by: Jenkins Reviewed-by: Andras Timar diff --git a/solenv/bin/hrcex b/solenv/bin/hrcex index 2a657290ed88..8e897ea1fca3 100755 --- a/solenv/bin/hrcex +++ b/solenv/bin/hrcex @@ -30,6 +30,6 @@ with open(ofile, "a") as output: keyid = entry.msgctxt + '|' + entry.msgid print >> output, '#. ' + polib.genKeyId(keyid) location = entry.occurrences[0][0] -location = os.path.basename(location) +location = os.path.relpath(location, os.environ['SRCDIR']) entry.occurrences[0] = location, entry.occurrences[0][1] print >> output, entry diff --git a/solenv/bin/uiex b/solenv/bin/uiex index 0f086a20c6c7..bade6149c382 100755 --- a/solenv/bin/uiex +++ b/solenv/bin/uiex @@ -30,6 +30,6 @@ with open(ofile, "a") as output: keyid = entry.msgctxt + '|' + entry.msgid print >> output, '#. ' + polib.genKeyId(keyid) location = entry.occurrences[0][0] -location = os.path.basename(location) +location = os.path.relpath(location, os.environ['SRCDIR']) entry.occurrences[0] = location, entry.occurrences[0][1] print >> output, entry ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
University practical exercise about LibreOffice
Hi, I am a post-degree student at the University of A Coruña (Galicia, Spain) and we have to do a practical exercise about design in an open-source project, and we have selected LibreOffice in order to do that. We have sent a mail to the design mailing list at first, but they told us that you would answer my quetions in a better way. We have downloaded the code of the project core and we would be interested in know more about the main architectural and design patterns you are using in the module called "android", and how do you have implemented them in the code. Moreover, I would be very grateful if you could lend me some documentation about the development methodology you are using. Thank you very much in advance. Adrián López Martínez Software Engineer in A Coruña ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: ios/CustomTarget_iOS_setup.mk
ios/CustomTarget_iOS_setup.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e16668e16441406db20f2adf587a9e1fed75b9aa Author: jan Iversen Date: Sun Jan 14 12:27:22 2018 +0100 iOS, typo Change-Id: I59db4b822a7d0f697f887f99805893e9adb54667 diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk index ab303a837efd..28636c7f0759 100644 --- a/ios/CustomTarget_iOS_setup.mk +++ b/ios/CustomTarget_iOS_setup.mk @@ -20,7 +20,7 @@ $(call gb_CustomTarget_get_target,ios/iOS_setup): $(IOSGEN)/native-code.h #- Generate dynamic files --- -$(IOSGEN)/native-code.h: $(WORKDIR)/ios $(BUILDDIR)/config_host.mk \ +$(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \ $(SRCDIR)/ios/CustomTarget_iOS_setup.mk \ $(SRCDIR)/solenv/bin/native-code.py $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ENV,2) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: ios/CustomTarget_iOS_setup.mk ios/StaticLibrary_iOSkit.mk
ios/CustomTarget_iOS_setup.mk | 20 ++-- ios/StaticLibrary_iOSkit.mk |2 ++ 2 files changed, 8 insertions(+), 14 deletions(-) New commits: commit 35020496e22317715140278a4b4cc974e48889da Author: jan Iversen Date: Sun Jan 14 12:24:44 2018 +0100 iOS, static library depeneds on setup added dependency to static library Change-Id: Ib0d7f7eec1f34ff275600cc9e825fa606f1ef40d diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk index 20b58c7623e5..ab303a837efd 100644 --- a/ios/CustomTarget_iOS_setup.mk +++ b/ios/CustomTarget_iOS_setup.mk @@ -17,29 +17,21 @@ $(eval $(call gb_CustomTarget_CustomTarget,ios/iOS_setup)) $(call gb_CustomTarget_get_target,ios/iOS_setup): $(IOSGEN)/native-code.h -#- build - -.PHONY: FORCE -FORCE: +#- Generate dynamic files --- +$(IOSGEN)/native-code.h: $(WORKDIR)/ios $(BUILDDIR)/config_host.mk \ + $(SRCDIR)/ios/CustomTarget_iOS_setup.mk \ +$(SRCDIR)/solenv/bin/native-code.py + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ENV,2) -$(WORKDIR)/ios: - $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRE,2) + # prepare directories mkdir -p $(IOSGEN) $(IOSRES) $(IOSRES)/services \ $(IOSRES)/share/config $(IOSRES)/share/filter $(IOSRES)/program \ $(IOSGEN)/simulator \ $(IOSGEN)/debug \ $(IOSGEN)/release \ $(IOSGEN) $(WORKDIR)/ios; - - - -#- Generate dynamic files --- -$(IOSGEN)/native-code.h: $(WORKDIR)/ios $(BUILDDIR)/config_host.mk \ - $(SRCDIR)/ios/CustomTarget_iOS_setup.mk \ -$(SRCDIR)/solenv/bin/native-code.py - $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ENV,2) - # generate file with call declarations $(SRCDIR)/solenv/bin/native-code.py \ -C -g core -g writer -g calc -g draw -g edit \ diff --git a/ios/StaticLibrary_iOSkit.mk b/ios/StaticLibrary_iOSkit.mk index f36ef856a8dc..a543e494a344 100644 --- a/ios/StaticLibrary_iOSkit.mk +++ b/ios/StaticLibrary_iOSkit.mk @@ -23,4 +23,6 @@ $(eval $(call gb_StaticLibrary_add_cobjects,iOS_kitBridge,\ ios/source/LibreOfficeKit \ )) +$(call gb_StaticLibrary_get_target,ios/iOS_kitBridge): $(call gb_CustomTarget_get_target,ios/iOS_setup) + # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - ios/source ios/StaticLibrary_iOSkit.mk Makefile.in
Makefile.in |3 +++ ios/StaticLibrary_iOSkit.mk |5 - ios/source/LibreOfficeKit.c |2 +- 3 files changed, 4 insertions(+), 6 deletions(-) New commits: commit 73259891a3fa77497b76b8378a795c83944d74e4 Author: jan Iversen Date: Sun Jan 14 12:02:29 2018 +0100 iOS changed reference to native-code.h Change-Id: Icadbdc4463ffb9591353e820f66474c65efd12cf diff --git a/ios/StaticLibrary_iOSkit.mk b/ios/StaticLibrary_iOSkit.mk index 67f8b086cfcf..f36ef856a8dc 100644 --- a/ios/StaticLibrary_iOSkit.mk +++ b/ios/StaticLibrary_iOSkit.mk @@ -19,11 +19,6 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,iOS_kitBridge)) -$(eval $(call gb_StaticLibrary_set_include,iOS_kitBridge,\ -$$(INCLUDE) \ --I$(SRCDIR)/ios/generated \ -)) - $(eval $(call gb_StaticLibrary_add_cobjects,iOS_kitBridge,\ ios/source/LibreOfficeKit \ )) diff --git a/ios/source/LibreOfficeKit.c b/ios/source/LibreOfficeKit.c index b403b356d171..1868ae7b21fa 100644 --- a/ios/source/LibreOfficeKit.c +++ b/ios/source/LibreOfficeKit.c @@ -15,7 +15,7 @@ #include // generated by solenv/bin/native-code.py: -#include "native-code.h" +#include "../generated/native-code.h" // pointers to our instance commit 0ff9e57e0f4ee7a5bf846ae61fc97012434d3be8 Author: jan Iversen Date: Sun Jan 14 12:01:13 2018 +0100 iOS updated "make clean" make clean now knows how to clean the iOS special part Change-Id: If132172d95823754f0983241a8121d143fcc3007 diff --git a/Makefile.in b/Makefile.in index 006c98c3f41a..1ccb676795fa 100644 --- a/Makefile.in +++ b/Makefile.in @@ -174,6 +174,9 @@ clean-host: rm -fr $(TESTINSTALLDIR) rm -fr $(INSTDIR) rm -fr $(WORKDIR) +ifeq ($(OS),IOS) + rm -fr $(SRCDIR)/ios/generated +endif clean-build: ifneq ($(CROSS_COMPILING),) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
