[Libreoffice-commits] core.git: reportdesign/source
reportdesign/source/ui/report/ReportController.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2704d45a58b5a0f1cd8103d143f8c2059f70dfea
Author: Noel Grandin
Date: Tue May 26 08:54:02 2015 +0200
tdf#91577 - CRASH: when "Report Builder" closed
audited commit 6d0c89123f353aed80d3a8a08ef5cd1ffaa1eea9
"vclwidget: fix more places that should be wrapping in VclPtr"
and fixed up the one place that needed it.
Change-Id: Iedb56353e6a967367f38fa847efb950acc869a93
diff --git a/reportdesign/source/ui/report/ReportController.cxx
b/reportdesign/source/ui/report/ReportController.cxx
index 486c271..d5dc72a 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -339,7 +339,7 @@ void OReportController::disposing()
{
SvtViewOptions aDlgOpt(E_WINDOW,
OStringToOUString(m_pGroupsFloater->GetHelpId(), RTL_TEXTENCODING_UTF8));
aDlgOpt.SetWindowState(OStringToOUString(m_pGroupsFloater->GetWindowState(WINDOWSTATE_MASK_ALL),
RTL_TEXTENCODING_ASCII_US));
-m_pGroupsFloater = NULL;
+m_pGroupsFloater.disposeAndClear();
}
try
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: starmath/inc starmath/Library_sm.mk starmath/source
starmath/Library_sm.mk|1
starmath/inc/config.hxx | 48
starmath/inc/smmod.hxx|6 -
starmath/source/ElementsDockingWindow.cxx |1
starmath/source/cfgitem.cxx | 70 +
starmath/source/cfgitem.hxx | 13 ++-
starmath/source/config.cxx| 119 --
starmath/source/dialog.cxx|2
starmath/source/document.cxx |2
starmath/source/edit.cxx |2
starmath/source/mathmlexport.cxx |4 -
starmath/source/parse.cxx |2
starmath/source/smmod.cxx |6 -
starmath/source/symbol.cxx|1
starmath/source/unomodel.cxx |4 -
starmath/source/view.cxx |2
16 files changed, 95 insertions(+), 188 deletions(-)
New commits:
commit aad92a7ce2f74782064a69c1f3797544bd3298ee
Author: Noel Grandin
Date: Tue May 26 08:38:37 2015 +0200
loplugin:unnecessarysuperclass, merge SmMathConfig with SmConfig
Change-Id: I2c431e9f72f5dee14cf1b603b11972a2e9d88725
Reviewed-on: https://gerrit.libreoffice.org/15902
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk
index 203143f..a648b8c 100644
--- a/starmath/Library_sm.mk
+++ b/starmath/Library_sm.mk
@@ -65,7 +65,6 @@ $(eval $(call gb_Library_add_exception_objects,sm,\
starmath/source/action \
starmath/source/caret \
starmath/source/cfgitem \
-starmath/source/config \
starmath/source/cursor \
starmath/source/dialog \
starmath/source/document \
diff --git a/starmath/inc/config.hxx b/starmath/inc/config.hxx
deleted file mode 100644
index 559545b..000
--- a/starmath/inc/config.hxx
+++ /dev/null
@@ -1,48 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef INCLUDED_STARMATH_INC_CONFIG_HXX
-#define INCLUDED_STARMATH_INC_CONFIG_HXX
-
-#include
-#include
-#include "format.hxx"
-
-#include "cfgitem.hxx"
-
-
-class SfxItemSet;
-
-class SmConfig : public SmMathConfig, public SfxBroadcaster
-{
-SmFontPickList vFontPickList[7];
-
-public:
-SmConfig();
-virtual ~SmConfig();
-
-SmFontPickList & GetFontPickList(sal_uInt16 nIdent) { return
vFontPickList[nIdent]; }
-
-void ItemSetToConfig(const SfxItemSet &rSet);
-void ConfigToItemSet(SfxItemSet &rSet) const;
-};
-
-#endif
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/inc/smmod.hxx b/starmath/inc/smmod.hxx
index 59020d8..9ee0deb 100644
--- a/starmath/inc/smmod.hxx
+++ b/starmath/inc/smmod.hxx
@@ -34,9 +34,9 @@
#include
class SfxObjectFactory;
-class SmConfig;
class SmModule;
class SmSymbolManager;
+class SmMathConfig;
/*
|*
@@ -88,7 +88,7 @@ public:
class SmModule : public SfxModule, utl::ConfigurationListener
{
std::unique_ptr mpColorConfig;
-std::unique_ptr mpConfig;
+std::unique_ptr mpConfig;
std::unique_ptr mpLocSymbolData;
std::unique_ptr mpSysLocale;
VclPtrmpVirtualDev;
@@ -111,7 +111,7 @@ public:
svtools::ColorConfig & GetColorConfig();
-SmConfig * GetConfig();
+SmMathConfig * GetConfig();
SmSymbolManager & GetSymbolManager();
SmLocalizedSymbolData & GetLocSymbolData();
diff --git a/starmath/source/ElementsDockingWindow.cxx
b/starmath/source/ElementsDockingWindow.cxx
index d3fcccb..87680d2 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -21,7 +21,6 @@
#include
#include
-#include
#include
#include
diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx
index 7616043..14029a7 100644
--- a/starmath/source/cfgitem.cxx
+++ b/starmath/source/cfgitem.cxx
@@ -19,6 +19,11 @@
#include
+#include
+#include
+#include
+#include
+#include
#include
#include
@@ -1137,5 +1142,70 @@ void SmMa
[Libreoffice-commits] core.git: cui/source
cui/source/customize/cfg.cxx |6 ++
cui/source/customize/selector.cxx |1 +
cui/source/inc/cfg.hxx|4 ++--
cui/source/inc/selector.hxx | 16 +---
4 files changed, 10 insertions(+), 17 deletions(-)
New commits:
commit 01ef2044d0b2c3429eca71de6afef0241e0196f3
Author: Noel Grandin
Date: Mon May 25 15:19:52 2015 +0200
loplugin:unnecessarysuperclass, merge ImageProvider with SaveInData
Change-Id: Ib538cc10728b2dc97e173d865807754471860e0f
Reviewed-on: https://gerrit.libreoffice.org/15900
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 7eadd5a..36f3997 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -2589,8 +2589,7 @@ IMPL_LINK( SvxMenuConfigPage, AddCommandsHdl, Button *,
pButton )
// beside the menu contents list and does not obscure it
m_pSelectorDlg->SetPosPixel( m_pAddCommandsButton->GetPosPixel() );
-m_pSelectorDlg->SetImageProvider(
-static_cast< ImageProvider* >( GetSaveInData() ) );
+m_pSelectorDlg->SetImageProvider( GetSaveInData() );
m_pSelectorDlg->Show();
return 1;
@@ -4503,8 +4502,7 @@ IMPL_LINK( SvxToolbarConfigPage, AddCommandsHdl, Button
*, pButton )
LINK( this, SvxToolbarConfigPage, AddFunctionHdl ) );
}
-m_pSelectorDlg->SetImageProvider(
-static_cast< ImageProvider* >( GetSaveInData() ) );
+m_pSelectorDlg->SetImageProvider( GetSaveInData() );
m_pSelectorDlg->Show();
return 1;
diff --git a/cui/source/customize/selector.cxx
b/cui/source/customize/selector.cxx
index 781ddbf..99b17e2 100644
--- a/cui/source/customize/selector.cxx
+++ b/cui/source/customize/selector.cxx
@@ -23,6 +23,7 @@
#include
#include
#include "selector.hxx"
+#include "cfg.hxx"
#include
#include
#include
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index 73b0514..4cb324e 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -70,7 +70,7 @@ public:
void SetFrame(const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XFrame >& xFrame);
};
-class SaveInData : public ImageProvider
+class SaveInData
{
private:
@@ -138,7 +138,7 @@ public:
com::sun::star::uno::Sequence
< com::sun::star::beans::PropertyValue > m_aSeparatorSeq;
-Image GetImage( const OUString& rCommandURL ) SAL_OVERRIDE;
+Image GetImage( const OUString& rCommandURL );
virtual bool HasURL( const OUString& aURL ) = 0;
virtual bool HasSettings() = 0;
diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx
index 898314d..6d0e7da 100644
--- a/cui/source/inc/selector.hxx
+++ b/cui/source/inc/selector.hxx
@@ -32,6 +32,8 @@
#include
+class SaveInData;
+
#define SVX_CFGGROUP_FUNCTION 1
#define SVX_CFGFUNCTION_SLOT 2
#define SVX_CFGGROUP_SCRIPTCONTAINER 3
@@ -80,14 +82,6 @@ struct SvxGroupInfo_Impl
typedef boost::ptr_vector SvxGroupInfoArr_Impl;
-class ImageProvider
-{
-public:
-virtual ~ImageProvider() {}
-
-virtual Image GetImage( const OUString& rCommandURL ) = 0;
-};
-
class SvxConfigFunctionListBox : public SvTreeListBox
{
friend class SvxConfigGroupListBox;
@@ -124,7 +118,7 @@ class SvxConfigGroupListBox : public SvTreeListBox
boolm_bShowSlots;
VclPtr pFunctionListBox;
-ImageProvider* m_pImageProvider;
+SaveInData* m_pImageProvider;
::com::sun::star::uno::Reference
< ::com::sun::star::frame::XFrame > m_xFrame;
@@ -175,7 +169,7 @@ public:
voidSetFunctionListBox( SvxConfigFunctionListBox *pBox )
{ pFunctionListBox = pBox; }
-voidSetImageProvider( ImageProvider* provider )
+voidSetImageProvider( SaveInData* provider )
{ m_pImageProvider = provider; }
};
@@ -211,7 +205,7 @@ public:
voidSetAddHdl( const Link<>& rLink ) { m_aAddHdl = rLink; }
const Link<>& GetAddHdl() const { return m_aAddHdl; }
-voidSetImageProvider(ImageProvider* provider)
+voidSetImageProvider(SaveInData* provider)
{
m_pCategories->SetImageProvider(provider);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/crsrsh.hxx|8 +--
sw/source/core/crsr/BlockCursor.cxx | 29 ---
sw/source/core/crsr/BlockCursor.hxx | 63 -
sw/source/core/crsr/IBlockCursor.hxx | 86 ---
sw/source/core/crsr/crsrsh.cxx |3 -
5 files changed, 66 insertions(+), 123 deletions(-)
New commits:
commit 57e801ba568de9d1b43456e0fc3c11fd0be05fe6
Author: Noel Grandin
Date: Mon May 25 15:04:08 2015 +0200
loplugin:unnecessarysuperclass, merge IBlockCursor into SwBlockCursor
Change-Id: I3c6c0d620cf7ffb11a9ca5e1025d91e59ef66c80
Reviewed-on: https://gerrit.libreoffice.org/15898
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index 073a8df..b513fc1 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -61,7 +61,7 @@ class SwTextAttr;
class SwTableBox;
class SwTOXMark;
class SwRangeRedline;
-class IBlockCursor;
+class SwBlockCursor;
class SwContentNode;
class SwPostItField;
class SwTextField;
@@ -177,7 +177,7 @@ private:
SwShellCrsr* m_pCrsrStk; ///< stack for the cursor
SwVisCrsr *m_pVisCrsr;///< the visible cursor
-IBlockCursor *m_pBlockCrsr; ///< interface of cursor for block
(=rectangular) selection
+SwBlockCursor *m_pBlockCrsr; ///< interface of cursor for block
(=rectangular) selection
SwShellTableCrsr* m_pTableCrsr; /**< table Crsr; only in tables when the
selection lays over 2 columns */
@@ -640,8 +640,8 @@ public:
{ return (const_cast(this))->getShellCrsr( bBlock ); }
bool IsBlockMode() const { return 0 != m_pBlockCrsr; }
-const IBlockCursor* GetBlockCrsr() const { return m_pBlockCrsr; }
-IBlockCursor* GetBlockCrsr() { return m_pBlockCrsr; }
+const SwBlockCursor* GetBlockCrsr() const { return m_pBlockCrsr; }
+SwBlockCursor* GetBlockCrsr() { return m_pBlockCrsr; }
// is the Crsr in a table and is the selection over 2 columns
bool IsTableMode() const { return 0 != m_pTableCrsr; }
diff --git a/sw/source/core/crsr/BlockCursor.cxx
b/sw/source/core/crsr/BlockCursor.cxx
index 992d29b..dea4bf8 100644
--- a/sw/source/core/crsr/BlockCursor.cxx
+++ b/sw/source/core/crsr/BlockCursor.cxx
@@ -17,33 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include
#include
#include "BlockCursor.hxx"
-/** The implementation of the block cursor interface
-
-It's simply an aggregation of a SwShellCrsr and a rectangle defined by
-a start and an end point.
-*/
-class SwBlockCursor : public IBlockCursor
-{
-SwShellCrsr aCursor;
-Point *pStartPt;
-Point *pEndPt;
-
-public:
-SwBlockCursor( const SwCrsrShell& rCrsrSh, const SwPosition &rPos ) :
-aCursor( rCrsrSh, rPos ), pStartPt(0), pEndPt(0) {}
-virtual SwShellCrsr& getShellCrsr() SAL_OVERRIDE;
-virtual void setStartPoint( const Point &rPt ) SAL_OVERRIDE;
-virtual void setEndPoint( const Point &rPt ) SAL_OVERRIDE;
-virtual const Point* getStartPoint() const SAL_OVERRIDE;
-virtual const Point* getEndPoint() const SAL_OVERRIDE;
-virtual void clearPoints() SAL_OVERRIDE;
-virtual ~SwBlockCursor();
-};
-
SwBlockCursor::~SwBlockCursor()
{
delete pStartPt;
@@ -89,9 +65,4 @@ void SwBlockCursor::clearPoints()
pEndPt = 0;
}
-IBlockCursor *createBlockCursor( const SwCrsrShell& rCrsrSh, const SwPosition
&rPos )
-{
-return new SwBlockCursor( rCrsrSh, rPos );
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/crsr/BlockCursor.hxx
b/sw/source/core/crsr/BlockCursor.hxx
index b7d6ec9..17c781b 100644
--- a/sw/source/core/crsr/BlockCursor.hxx
+++ b/sw/source/core/crsr/BlockCursor.hxx
@@ -19,11 +19,70 @@
#ifndef INCLUDED_SW_SOURCE_CORE_CRSR_BLOCKCURSOR_HXX
#define INCLUDED_SW_SOURCE_CORE_CRSR_BLOCKCURSOR_HXX
-class IBlockCursor;
+#include
+
class SwCrsrShell;
struct SwPosition;
+class Point;
+
+ /** Access to the block cursor
+
+A block cursor contains a SwShellCrsr and additional information about
+the rectangle which has been created by pressing the mouse button and
+moving the mouse.
+
+It's simply an aggregation of a SwShellCrsr and a rectangle defined by
+a start and an end point.
+*/
+class SwBlockCursor
+{
+SwShellCrsr aCursor;
+Point *pStartPt;
+Point *pEndPt;
+
+public:
+SwBlockCursor( const SwCrsrShell& rCrsrSh, const SwPosition &rPos ) :
+aCursor( rCrsrSh, rPos ), pStartPt(0), pEndPt(0) {}
+/** Access to the shell cursor
+
+@return SwShellCrsr& which represents the start and end position of the
+current block selection
+*/
+SwShellCrsr& getShellCrsr();
+/** Defines the starting vertex of the block selection
+
+@param rPt
+rPt should contain the document coordinates of the mouse cursor when
+the block selection starts (MouseButtonDown)
+*/
+
[Libreoffice-commits] core.git: sw/source
sw/source/core/docnode/threadlistener.cxx |3 +
sw/source/core/inc/ithreadlistenerowner.hxx | 47
sw/source/core/inc/observablethread.hxx |2 -
sw/source/core/inc/threadlistener.hxx |9 ++---
sw/source/core/inc/threadmanager.hxx| 10 ++---
5 files changed, 13 insertions(+), 58 deletions(-)
New commits:
commit b4b48e0f0e5703021abfcafc0c6b16116daf8de3
Author: Noel Grandin
Date: Mon May 25 15:12:21 2015 +0200
loplugin:unnecessarysuperclass, merge IThreadListenerOwner with
ThreadManager
Change-Id: I338706e012d311df3cabc2b25175765c63c1b24c
Reviewed-on: https://gerrit.libreoffice.org/15899
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
diff --git a/sw/source/core/docnode/threadlistener.cxx
b/sw/source/core/docnode/threadlistener.cxx
index 6f82a83..8ba7572 100644
--- a/sw/source/core/docnode/threadlistener.cxx
+++ b/sw/source/core/docnode/threadlistener.cxx
@@ -17,12 +17,13 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include
+#include
/** helper class to observe threads
#i73788#
*/
-ThreadListener::ThreadListener( IThreadListenerOwner& rThreadListenerOwner )
+ThreadListener::ThreadListener( ThreadManager& rThreadListenerOwner )
: IFinishedThreadListener(),
mrThreadListenerOwner( rThreadListenerOwner )
{
diff --git a/sw/source/core/inc/ithreadlistenerowner.hxx
b/sw/source/core/inc/ithreadlistenerowner.hxx
deleted file mode 100644
index 5eed795..000
--- a/sw/source/core/inc/ithreadlistenerowner.hxx
+++ /dev/null
@@ -1,47 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_SW_SOURCE_CORE_INC_ITHREADLISTENEROWNER_HXX
-#define INCLUDED_SW_SOURCE_CORE_INC_ITHREADLISTENEROWNER_HXX
-
-#include
-#include
-
-/** interface class of the owner of a thread listener
-
-OD 2007-01-30 #i73788#
-*/
-class IThreadListenerOwner
-{
-public:
-inline virtual ~IThreadListenerOwner()
-{
-};
-
-virtual boost::weak_ptr< IFinishedThreadListener >
GetThreadListenerWeakRef() = 0;
-virtual void NotifyAboutFinishedThread( const oslInterlockedCount
nThreadID ) = 0;
-
-protected:
-inline IThreadListenerOwner()
-{
-};
-};
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/observablethread.hxx
b/sw/source/core/inc/observablethread.hxx
index 4282006..45dccf9 100644
--- a/sw/source/core/inc/observablethread.hxx
+++ b/sw/source/core/inc/observablethread.hxx
@@ -24,8 +24,8 @@
#include
#include
-#include
#include
+#include
/** class for an observable thread
diff --git a/sw/source/core/inc/threadlistener.hxx
b/sw/source/core/inc/threadlistener.hxx
index 4f5a181..7d39c45 100644
--- a/sw/source/core/inc/threadlistener.hxx
+++ b/sw/source/core/inc/threadlistener.hxx
@@ -20,15 +20,16 @@
#define INCLUDED_SW_SOURCE_CORE_INC_THREADLISTENER_HXX
#include
-#include
#include
+class ThreadManager;
+
/** helper class to observe threads
OD 2007-03-30 #i73788#
An instance of this class can be used to observe a thread in order to
be notified, if the thread has finished its work. The notification is
-directly forward to its owner - an instance of IThreadListenerOwner
+directly forward to its owner - an instance of ThreadManager
Note:
- A thread can only have one or none listener.
- The notification is performed via the ThreadID
@@ -37,7 +38,7 @@ class ThreadListener : public IFinishedThreadListener
{
public:
-ThreadListener( IThreadListenerOwner& rThreadListenerOwner );
+ThreadListener( ThreadManager& rThreadListenerOwner );
virtual ~ThreadListener();
void ListenToThread( const oslInterlockedCount nThreadID,
@@ -47,7 +48,7 @@ class ThreadListener : public IFinishedThreadListener
private:
-IThreadListenerOwner& mrThreadListenerOwner;
+ThreadManager& mrThreadListenerOwner;
};
#endif
diff --git a/sw/source/core/inc/threadmanager.hxx
b/sw/source/core/inc/threadmanager.hxx
index 781821
[Libreoffice-commits] core.git: svtools/source
svtools/source/contnr/fileview.cxx | 22 +-
1 file changed, 9 insertions(+), 13 deletions(-)
New commits:
commit 6ea81e0c78da567f208ff161496ade26a375e6e8
Author: Noel Grandin
Date: Mon May 25 14:40:31 2015 +0200
loplugin: unnecessarysuperclass merge HashedEntryList into
NameTranslationList
Change-Id: Idba2112b81e06ada7567dd5476a4e9d84f38ff56
Reviewed-on: https://gerrit.libreoffice.org/15897
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
diff --git a/svtools/source/contnr/fileview.cxx
b/svtools/source/contnr/fileview.cxx
index 66aeece..5d516b6 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -277,14 +277,10 @@ inline bool HashedEntry::operator <( const HashedEntry&
rRef ) const
return mnHashCode < rRef.mnHashCode;
}
-// class HashedEntryList --
-// provides a list of _unique_ Entries
-class HashedEntryList : public boost::ptr_set {};
-
// class NameTranslationEntry -
class NameTranslationEntry : public HashedEntry
-{// a fast compareble String and another String, which is used to get a
substitution for a given String
+{// a fast comparable String and another String, which is used to get a
substitution for a given String
protected:
OUStringmaTranslatedName;
public:
@@ -305,8 +301,8 @@ inline const OUString&
NameTranslationEntry::GetTranslation() const
}
// class NameTranslationList -
-
-class NameTranslationList : protected HashedEntryList
+// provides a list of _unique_ Entries
+class NameTranslationList : protected boost::ptr_set
{ // contains a list of substitutes of strings for a given folder (as URL)
// explanation of the circumstances see in remarks for Init();
protected:
@@ -314,17 +310,17 @@ protected:
HashedEntry maHashedURL;// for future purposes when
dealing with a set of cached
// NameTranslationLists
private:
-const OUString maTransFileName;
-voidInit(); // reads the translation file
and fills the (internal) list
+const OUString maTransFileName;
+voidInit(); // reads the translation file
and fills the (internal) list
public:
-NameTranslationList( const INetURLObject& rBaseURL
);
+NameTranslationList( const INetURLObject&
rBaseURL );
// rBaseURL: path to folder for
which the translation of the entries
// should be done
-using HashedEntryList::operator==;
-using HashedEntryList::operator!=;
-inline bool operator !=( const HashedEntry& rRef ) const;
+using boost::ptr_set::operator==;
+using boost::ptr_set::operator!=;
+inline bool operator!=( const HashedEntry& rRef ) const;
const OUString* Translate( const OUString& rName ) const;
// returns NULL, if rName can't be
found
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - avmedia/source basctl/source chart2/source cui/source dbaccess/source editeng/source extensions/source framework/source include/svtools include/svx include/
avmedia/source/framework/mediacontrol.cxx |2 basctl/source/dlged/dlged.cxx |2 chart2/source/controller/main/ChartWindow.cxx |6 chart2/source/controller/main/ChartWindow.hxx |6 cui/source/dialogs/cuihyperdlg.cxx|2 cui/source/factory/dlgfact.cxx|2 cui/source/factory/dlgfact.hxx|2 cui/source/options/connpooloptions.cxx|4 dbaccess/source/ui/querydesign/JoinTableView.cxx | 10 - dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx |4 dbaccess/source/ui/querydesign/QueryTableView.cxx |4 dbaccess/source/ui/querydesign/TableConnection.cxx|4 dbaccess/source/ui/querydesign/TableWindow.cxx|4 dbaccess/source/ui/querydesign/TableWindowListBox.cxx |4 dbaccess/source/ui/querydesign/TableWindowTitle.cxx |2 dbaccess/source/ui/relationdesign/RelationController.cxx |4 dbaccess/source/ui/relationdesign/RelationTableView.cxx |2 editeng/source/editeng/impedit.cxx|2 extensions/source/propctrlr/browserlistbox.cxx|6 extensions/source/propctrlr/standardcontrol.cxx |2 framework/source/helper/vclstatusindicator.cxx|2 include/svtools/scrwin.hxx|2 include/svtools/treelistbox.hxx |6 include/svx/svxdlg.hxx|2 include/vcl/window.hxx| 83 ++--- offapi/com/sun/star/awt/XWindowPeer.idl |4 reportdesign/source/core/sdr/RptObject.cxx|2 reportdesign/source/ui/misc/ColorListener.cxx |4 reportdesign/source/ui/report/ReportSection.cxx |4 reportdesign/source/ui/report/ReportWindow.cxx|7 reportdesign/source/ui/report/ScrollHelper.cxx|2 reportdesign/source/ui/report/SectionView.cxx |2 reportdesign/source/ui/report/SectionWindow.cxx | 10 - reportdesign/source/ui/report/StartMarker.cxx |2 reportdesign/source/ui/report/ViewsWindow.cxx | 16 - reportdesign/source/ui/report/dlgedfunc.cxx |2 sc/source/ui/app/inputwin.cxx |4 sc/source/ui/view/gridwin.cxx |2 sd/source/ui/view/sdwindow.cxx|2 sd/source/ui/view/viewshe2.cxx|8 sfx2/source/doc/templatedlg.cxx |4 sfx2/source/sidebar/SidebarController.cxx |2 svtools/source/brwbox/brwbox1.cxx | 18 +- svtools/source/brwbox/datwin.cxx |4 svtools/source/brwbox/datwin.hxx |6 svtools/source/contnr/imivctl1.cxx| 10 - svtools/source/contnr/ivctrl.cxx |4 svtools/source/contnr/svimpbox.cxx| 10 - svtools/source/contnr/treelistbox.cxx |6 svtools/source/control/scrwin.cxx |2 svtools/source/table/tablecontrol_impl.cxx| 18 +- svx/source/accessibility/AccessibleTextHelper.cxx |2 svx/source/dialog/frmsel.cxx |2 svx/source/sdr/overlay/overlaymanager.cxx |4 svx/source/svdraw/sdrpagewindow.cxx |2 svx/source/svdraw/sdrpaintwindow.cxx |2 svx/source/svdraw/svdglue.cxx |2 svx/source/svdraw/svdpntv.cxx |4 sw/source/core/layout/paintfrm.cxx|2 sw/source/core/view/viewsh.cxx| 12 - sw/source/ui/dbui/addresslistdialog.cxx |2 sw/source/uibase/docvw/srcedtw.cxx|3 sw/source/uibase/inc/pview.hxx|2 sw/source/uibase/inc/srcedtw.hxx |2 sw/source/uibase/uiview/pview.cxx |2 toolkit/source/awt/scrollabledialog.cxx |2 toolkit/source/awt/vclxwindow.cxx |4 vcl/source/control/button.cxx |2 vcl/source/control/edit.cxx |2 vcl/source/control/ilstbox.cxx|2 vcl/source/control/lstbox.cxx |2 vcl/source/control/slider.cxx |2 vcl/source/control/tabctrl.cxx|4 vcl/source/window/brdwin.cxx |4 vcl/source/window/men
LibreOffice Gerrit News for dev-tools on 2015-05-26
Moin! * Open changes on master for project dev-tools changed in the last 25 hours: None * Merged changes on master for project dev-tools changed in the last 25 hours: + Update master_target to 5.1 series in https://gerrit.libreoffice.org/15872 from Adolfo Jayme Barrientos * Abandoned changes on master for project dev-tools changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: None Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
LibreOffice Gerrit News for core on 2015-05-26
Moin! * Open changes on master for project core changed in the last 25 hours: + kill forgotten, unused TDEBUG token in https://gerrit.libreoffice.org/15893 from Takeshi Abe about module starmath + tdf#88276: Add background colour toolbar and sidebar buttons in https://gerrit.libreoffice.org/15841 from Katarina Behrens about module icon-themes, officecfg, sc, sd, svx * Merged changes on master for project core changed in the last 25 hours: + remove the weak_ptrs on destruction too in https://gerrit.libreoffice.org/15892 from Björn Michaelsen + SdrSnapView: initializae members in the constructor in https://gerrit.libreoffice.org/15890 from Norbert Thiebaud + Audit all PostUserEvent calls and instrument for VclPtr. in https://gerrit.libreoffice.org/15895 from Michael Meeks + QtCreator IDE integration. in https://gerrit.libreoffice.org/15804 from Michel Renon + rename "Lathe Object" to "Rotation Object" in a tooltip because the latte in https://gerrit.libreoffice.org/15873 from Stanislav Horáček + remove some unnecessary casts and convert some to const_cast in https://gerrit.libreoffice.org/15888 from Noel Grandin + macosx: work around hdiutil error -5341 on dmg packaging in https://gerrit.libreoffice.org/15884 from Norbert Thiebaud * Abandoned changes on master for project core changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: + fdo#58194 - export DOCX Automatic indent as firstLine indent in https://gerrit.libreoffice.org/15768 from Joren De Cuyper + tdf#76334 push viewbox properties to the CustomShapeProperties in https://gerrit.libreoffice.org/15753 from Joren De Cuyper + Add very initial support for Visual Studio 2015 in https://gerrit.libreoffice.org/15644 from Jesús Corrius + tdf#90494: Change gradient angle diagonally by choosing option. in https://gerrit.libreoffice.org/15180 from Heena Gupta + Rendering support for multiStop GradientFill (OOXML LINEAR) in https://gerrit.libreoffice.org/12056 from Vinaya Mandke + Resolves tdf#83365 Other: Access across spreadsheet returns Err:504 in https://gerrit.libreoffice.org/15363 from Henry Castro + tdf#46037: Exchange some uses of configurationhelper for officecfg in Wri in https://gerrit.libreoffice.org/15611 from Marcos Paulo de Souza + tdf#90494-Add new Attribute for exporting gradient angle diagonally in https://gerrit.libreoffice.org/15323 from Heena Gupta + preserve whitespaces here, tdf#88137, tdf#89254 in https://gerrit.libreoffice.org/15375 from Markus Mohrhard + add kde5 build of vcl in https://gerrit.libreoffice.org/15327 from Jonathan Riddell + added currency dropdown menu may have some erors in https://gerrit.libreoffice.org/15274 from rajat vijay + tdf#90222: replace ScaList in scaddins with a std container in https://gerrit.libreoffice.org/15012 from Pieter Adriaensen + fdo#82335. in https://gerrit.libreoffice.org/11555 from Sudarshan Rao + tdf#64575 Photo Album: Better Image Layout in https://gerrit.libreoffice.org/14912 from Enes Ateş + WIP fdo#72987 Use firebird backup format for .odb no need for rebuild ind in https://gerrit.libreoffice.org/14968 from Popa Adrian Marius + Upgrade firebird to 2.5.3 , a few patches are already applied upstream in https://gerrit.libreoffice.org/15026 from Popa Adrian Marius + Fixed all postfix operator++ and operator-- in https://gerrit.libreoffice.org/14975 from Ahmad Samir + tdf#39468 Translate German Comments - sc/source/core/data/ in https://gerrit.libreoffice.org/14866 from Christian M. Heller + tdf#49893: final fix for blank rectangle problem in https://gerrit.libreoffice.org/14584 from Vasily Melenchuk + fdo#75825-"Send Document as E-Mail" not working in https://gerrit.libreoffice.org/13786 from Charu Tyagi Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/ui/view/viewfun2.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit 3dc50a3b9afc6eec42fb9f657a4dfd236066892f
Author: Henry Castro
Date: Mon May 25 23:45:06 2015 -0400
sc LOKit callback for search not found.
Needed for signaling the user when no match was found for the searched input
Change-Id: I10089d065c26deea7cb57a9dc20f130f9afb6d99
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 5b5ec3b..49d70d8 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -1775,7 +1775,11 @@ bool ScViewFunc::SearchAndReplace( const SvxSearchItem*
pSearchItem,
GetFrameWin()->LeaveWait();
if (!bIsApi)
+{
+
rDoc.GetDrawLayer()->libreOfficeKitCallback(LOK_CALLBACK_SEARCH_NOT_FOUND,
+
pSearchItem->GetSearchString().toUtf8().getStr());
SvxSearchDialogWrapper::SetSearchLabel(SL_NotFound);
+}
break; // break 'while (TRUE)'
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx svx/source
include/svx/svdsnpv.hxx |3 -
svx/source/svdraw/svdsnpv.cxx | 66 ++
2 files changed, 29 insertions(+), 40 deletions(-)
New commits:
commit af75d7a4c99414fabbd31b9df590266d28574fb1
Author: Norbert Thiebaud
Date: Mon May 25 05:12:49 2015 -0500
SdrSnapView: initializae members in the constructor
remove ClearVars() which was only
use by the constructor
instead initialize properly things in the constructor itself
Change-Id: I20a0ea26c5dce680844f81cf85ee72e1809a7068
Reviewed-on: https://gerrit.libreoffice.org/15890
Tested-by: Jenkins
Reviewed-by: Norbert Thiebaud
diff --git a/include/svx/svdsnpv.hxx b/include/svx/svdsnpv.hxx
index fb2fc32..268171a 100644
--- a/include/svx/svdsnpv.hxx
+++ b/include/svx/svdsnpv.hxx
@@ -91,9 +91,6 @@ protected:
boolbHlplFixed : 1; // sal_True=
fixed auxiliary lines, so it isn't movable
boolbEliminatePolyPoints : 1;
-private:
-SVX_DLLPRIVATE void ClearVars();
-
protected:
// #i71538# make constructors of SdrView sub-components protected to avoid
incomplete incarnations which may get casted to SdrView
SdrSnapView(SdrModel* pModel1, OutputDevice* pOut = 0L);
diff --git a/svx/source/svdraw/svdsnpv.cxx b/svx/source/svdraw/svdsnpv.cxx
index 070f4c4..ba2cc9d 100644
--- a/svx/source/svdraw/svdsnpv.cxx
+++ b/svx/source/svdraw/svdsnpv.cxx
@@ -174,44 +174,36 @@ void ImplHelpLineOverlay::SetPosition(const
basegfx::B2DPoint& rNewPosition)
}
-void SdrSnapView::ClearVars()
+SdrSnapView::SdrSnapView(SdrModel* pModel1, OutputDevice* pOut)
+: SdrPaintView(pModel1,pOut)
+, mpPageOriginOverlay(0L)
+, mpHelpLineOverlay(0L)
+, nMagnSizPix(4)
+, nSnapAngle(1500)
+, nEliminatePolyPointLimitAngle(0)
+, eCrookMode(SDRCROOK_ROTATE)
+, bSnapEnab(true)
+, bGridSnap(true)
+, bSnapTo1Pix(true)
+, bBordSnap(true)
+, bHlplSnap(true)
+, bOFrmSnap(true)
+, bOPntSnap(false)
+, bOConSnap(true)
+, bMoveMFrmSnap(true)
+, bMoveOFrmSnap(true)
+, bMoveOPntSnap(true)
+, bMoveOConSnap(true)
+, bMoveSnapOnlyTopLeft(false)
+, bOrtho(false)
+, bBigOrtho(true)
+, bAngleSnapEnab(false)
+, bMoveOnlyDragging(false)
+, bSlantButShear(false)
+, bCrookNoContortion(false)
+, bHlplFixed(false)
+, bEliminatePolyPoints(false)
{
-nMagnSizPix=4;
-bSnapEnab=true;
-bGridSnap=true;
-bSnapTo1Pix=true;
-bBordSnap=true;
-bHlplSnap=true;
-bOFrmSnap=true;
-bOPntSnap=false;
-bOConSnap=true;
-bMoveMFrmSnap=true;
-bMoveOFrmSnap=true;
-bMoveOPntSnap=true;
-bMoveOConSnap=true;
-bMoveSnapOnlyTopLeft=false;
-bOrtho=false;
-bBigOrtho=true;
-nSnapAngle=1500;
-bAngleSnapEnab=false;
-bMoveOnlyDragging=false;
-bSlantButShear=false;
-bCrookNoContortion=false;
-eCrookMode=SDRCROOK_ROTATE;
-bHlplFixed=false;
-bEliminatePolyPoints=false;
-nEliminatePolyPointLimitAngle=0;
-
-BrkSetPageOrg();
-BrkDragHelpLine();
-}
-
-SdrSnapView::SdrSnapView(SdrModel* pModel1, OutputDevice* pOut):
-SdrPaintView(pModel1,pOut),
-mpPageOriginOverlay(0L),
-mpHelpLineOverlay(0L)
-{
-ClearVars();
}
SdrSnapView::~SdrSnapView()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Resignation from the ESC
Markus Mohrhard wrote: > I enjoyed working with many great people but I believe that the > project is developing in the wrong direction at the moment and that > I should spend my free time in a better way. > Hi Moggi, as other said earlier & better than me - many thanks for all the outstanding things you did around here! Must be some four years now that you're contributing to LibreOffice, so indeed would love to hear more details on your above comments, either in the ESC or a smaller call of your preference. All the very best, and saddened about the message, -- Thorsten signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 29 commits - sw/inc sw/qa sw/source
sw/inc/doc.hxx |7
sw/inc/docary.hxx |6
sw/inc/unochart.hxx |7
sw/inc/unocrsr.hxx | 13 +
sw/inc/unoparagraph.hxx |2
sw/inc/unotbl.hxx | 14 -
sw/inc/unotextcursor.hxx|4
sw/inc/unotxdoc.hxx |4
sw/qa/core/macros-test.cxx |2
sw/source/core/access/accpara.cxx |5
sw/source/core/attr/calbck.cxx |1
sw/source/core/attr/format.cxx |1
sw/source/core/doc/CntntIdxStore.cxx| 13 -
sw/source/core/doc/DocumentContentOperationsManager.cxx |2
sw/source/core/doc/doc.cxx | 12 -
sw/source/core/doc/doccorr.cxx | 32 +--
sw/source/core/doc/docnew.cxx | 11 +
sw/source/core/inc/unoport.hxx |5
sw/source/core/unocore/unochart.cxx | 89 -
sw/source/core/unocore/unocrsr.cxx | 43 +---
sw/source/core/unocore/unoframe.cxx | 16 -
sw/source/core/unocore/unoftn.cxx |9 -
sw/source/core/unocore/unoobj.cxx | 81 -
sw/source/core/unocore/unoobj2.cxx | 81 ++---
sw/source/core/unocore/unoparagraph.cxx |3
sw/source/core/unocore/unoport.cxx | 26 +-
sw/source/core/unocore/unoportenum.cxx | 34 ++-
sw/source/core/unocore/unoredline.cxx | 24 +-
sw/source/core/unocore/unotbl.cxx | 144 +++-
sw/source/core/unocore/unotext.cxx | 18 --
sw/source/filter/ww8/ww8par.cxx |6
sw/source/filter/ww8/ww8par.hxx |1
sw/source/uibase/inc/navmgr.hxx |9 -
sw/source/uibase/shells/grfsh.cxx |2
sw/source/uibase/uno/unotxdoc.cxx | 18 --
sw/source/uibase/wrtsh/navmgr.cxx | 37 ++--
36 files changed, 397 insertions(+), 385 deletions(-)
New commits:
commit 692c886f937c525d6bfcb541917a5114b085efa9
Author: Bjoern Michaelsen
Date: Sat May 23 13:25:12 2015 +0200
remove the weak_ptrs on destruction too
Change-Id: I65f5867c41417539a70eef15754988d9931394a4
diff --git a/sw/source/core/unocore/unocrsr.cxx
b/sw/source/core/unocore/unocrsr.cxx
index 3d3c1d1..88c627e 100644
--- a/sw/source/core/unocore/unocrsr.cxx
+++ b/sw/source/core/unocore/unocrsr.cxx
@@ -23,6 +23,7 @@
#include
#include
#include
+#include
IMPL_FIXEDMEMPOOL_NEWDEL( SwUnoCrsr )
@@ -39,7 +40,13 @@ SwUnoCrsr::~SwUnoCrsr()
SwDoc* pDoc = GetDoc();
if( !pDoc->IsInDtor() )
{
-//assert(!SwIterator(this).First());
+#ifdef DBG_UTIL
+SwIterator pClient(*this);
+assert(!pClient.First());
+#endif
+// remove the weak_ptr the document keeps to notify about document
death
+pDoc->mvUnoCrsrTbl.remove_if(
+[this](const std::weak_ptr& pWeakPtr) -> bool { return
pWeakPtr.lock().get() == this; });
}
// delete the whole ring
commit 1ef03cad1ac3d593b4ac361ef582b3fd4fc96677
Author: Bjoern Michaelsen
Date: Sat May 23 12:44:07 2015 +0200
now rename the new CreateUnoCrsr2 to CreateUnoCrsr, as the old stuff is gone
Change-Id: I82f8ed0560750d4f7bec71ea8bd3c8089b884da7
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 51ee53a..656ebb5 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1490,7 +1490,7 @@ public:
void SetOLEObjModified();
// Uno - Interfaces
-std::shared_ptr CreateUnoCrsr2( const SwPosition& rPos, bool
bTableCrsr = false );
+std::shared_ptr CreateUnoCrsr( const SwPosition& rPos, bool
bTableCrsr = false );
// FeShell - Interfaces
// !!! These assume always an existing layout !!!
@@ -1664,7 +1664,7 @@ public:
void dumpAsXml(struct _xmlTextWriter* = 0) const;
std::set GetDocColors();
-std::list< std::weak_ptr > mvUnoCrsrTbl2;
+std::list< std::weak_ptr > mvUnoCrsrTbl;
private:
// Copies master header to left / first one, if necessary - used by
ChgPageDesc().
diff --git a/sw/qa/core/macros-test.cxx b/sw/qa/core/macros-test.cxx
index fde13f4..4887199 100644
--- a/sw/qa/core/macros-test.cxx
+++ b/sw/qa/core/macros-test.cxx
@@ -440,7 +440,7 @@ void SwMacrosTest::testFindReplace()
SwDoc *const pDoc = pTextDoc->GetDocShell()->GetDoc();
SwNodeIndex aIdx(pDoc->GetNodes().GetEndOfContent(), -1);
// use a UnoCrsr so it will be corrected when deleting nodes
-auto pPaM(pDoc->CreateU
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/tiledrendering/tiledrendering.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 077cd88f2da8538e4e89bce2614d6662ccfedce2
Author: Stephan Bergmann
Date: Mon May 25 23:26:19 2015 +0200
loplugin:unreffun
Change-Id: Ib7311448e15d23b041ebb4552df80046523a32f2
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx
b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index 2990d9a..756fb9b 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -225,6 +225,7 @@ void SwTiledRenderingTest::testResetSelection()
CPPUNIT_ASSERT(!pWrtShell->IsSelFrmMode());
}
+#if !(defined WNT || defined MACOSX)
void lcl_search()
{
uno::Sequence
aPropertyValues(comphelper::InitPropertySequence(
@@ -234,6 +235,7 @@ void lcl_search()
}));
comphelper::dispatchCommand(".uno:ExecuteSearch", aPropertyValues);
}
+#endif
void SwTiledRenderingTest::testSearch()
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - dbaccess/source desktop/source extensions/source formula/source reportdesign/source scripting/source sc/source sd/source sfx2/source svtools/source svx/sour
dbaccess/source/ui/control/RelationControl.cxx|4 ++--
dbaccess/source/ui/control/TableGrantCtrl.cxx |4 ++--
dbaccess/source/ui/control/dbtreelistbox.cxx |2 +-
dbaccess/source/ui/dlg/directsql.cxx |2 +-
dbaccess/source/ui/dlg/indexdialog.cxx|2 +-
dbaccess/source/ui/querydesign/TableWindowListBox.cxx |4 ++--
dbaccess/source/ui/tabledesign/TEditControl.cxx | 10 +-
desktop/source/deployment/gui/dp_gui_dialog2.cxx |8
desktop/source/deployment/gui/dp_gui_dialog2.hxx |2 +-
extensions/source/bibliography/bibview.cxx|2 +-
extensions/source/propctrlr/formlinkdialog.cxx|2 +-
formula/source/ui/dlg/funcutl.cxx |4 ++--
reportdesign/source/ui/dlg/GroupsSorting.cxx |6 +++---
reportdesign/source/ui/report/DesignView.cxx | 10 +-
reportdesign/source/ui/report/ViewsWindow.cxx |2 ++
reportdesign/source/ui/report/propbrw.cxx |2 +-
sc/source/ui/condformat/condformatdlg.cxx |2 +-
sc/source/ui/navipi/content.cxx |2 +-
sc/source/ui/pagedlg/tphf.cxx |2 +-
sc/source/ui/view/preview.cxx |2 +-
scripting/source/vbaevents/eventhelper.cxx|3 ++-
sd/source/ui/dlg/sdtreelb.cxx |2 +-
sfx2/source/control/recentdocsviewitem.cxx|2 +-
sfx2/source/dialog/templdlg.cxx |2 +-
svtools/source/brwbox/editbrowsebox.cxx |6 +++---
svtools/source/contnr/imivctl1.cxx|4 ++--
svtools/source/contnr/svimpbox.cxx|3 ++-
svtools/source/control/ruler.cxx |6 +++---
svtools/source/control/tabbar.cxx |6 +++---
svtools/source/dialogs/addresstemplate.cxx|2 +-
svx/source/fmcomp/fmgridcl.cxx|2 +-
svx/source/fmcomp/gridctrl.cxx|6 +++---
svx/source/form/delayedevent.cxx | 14 --
svx/source/form/filtnav.cxx |2 +-
svx/source/form/fmPropBrw.cxx |2 +-
svx/source/form/navigatortree.cxx |2 +-
svx/source/gallery2/galbrws1.cxx |4 ++--
svx/source/tbxctrls/colrctrl.cxx |2 +-
sw/source/ui/config/mailconfigpage.cxx|2 +-
sw/source/ui/dbui/addresslistdialog.cxx |2 +-
sw/source/ui/dbui/mmoutputtypepage.cxx|4 ++--
sw/source/uibase/dochdl/swdtflvr.cxx |2 +-
sw/source/uibase/docvw/SidebarWin.cxx |4 ++--
sw/source/uibase/shells/textsh2.cxx |2 +-
sw/source/uibase/utlui/glbltree.cxx |3 +--
sw/source/uibase/utlui/navipi.cxx |2 +-
vcl/source/window/dialog.cxx |2 +-
47 files changed, 78 insertions(+), 89 deletions(-)
New commits:
commit 0618863375a1fab6d1c9376f161c5305c32163c3
Author: Michael Meeks
Date: Mon May 25 21:36:25 2015 +0100
tdf#91577 - fix unique_ptr conversion bugs in reportdesign.
Change-Id: Icc94ce266d567e7aad5afb5eacf0e85699ef4107
diff --git a/reportdesign/source/ui/report/DesignView.cxx
b/reportdesign/source/ui/report/DesignView.cxx
index eca7c38..9d9f0ad 100644
--- a/reportdesign/source/ui/report/DesignView.cxx
+++ b/reportdesign/source/ui/report/DesignView.cxx
@@ -139,26 +139,26 @@ void ODesignView::dispose()
if ( m_pPropWin )
{
notifySystemWindow(this,m_pPropWin,::comphelper::mem_fun(&TaskPaneList::RemoveWindow));
+m_pPropWin.disposeAndClear();
}
if ( m_pAddField )
{
SvtViewOptions aDlgOpt( E_WINDOW, OUString( UID_RPT_RPT_APP_VIEW ) );
aDlgOpt.SetWindowState(OStringToOUString(m_pAddField->GetWindowState(WINDOWSTATE_MASK_ALL),
RTL_TEXTENCODING_ASCII_US));
notifySystemWindow(this,m_pAddField,::comphelper::mem_fun(&TaskPaneList::RemoveWindow));
+m_pAddField.disposeAndClear();
}
if ( m_pReportExplorer )
{
SvtViewOptions aDlgOpt(E_WINDOW,
OStringToOUString(m_pReportExplorer->GetHelpId(), RTL_TEXTENCODING_UTF8));
aDlgOpt.SetWindowState(OStringToOUString(m_pReportExplorer->GetWindowState(WINDOWSTATE_MASK_ALL),
RTL_TEXTENCODING_ASCII_US));
notifySystemWindow(this,m_pReportExplorer,::comphelper::mem_fun(&TaskPaneList::RemoveWindow));
+m_pReportExplorer.disposeAndClear();
}
-m_aSplitWin.disposeAndClear();
+m_pTaskPane.disposeAndClear();
m_aScrollWindow.disposeAndClear();
-m_pTaskPane.clear();
-m_pReportExplorer.clear();
-m_pPropWin.clear();
-m_pAddField.clear();
+m_aSplitWin.disposeAndClear();
d
[Libreoffice-commits] core.git: 2 commits - sc/source
sc/source/filter/oox/drawingbase.cxx |7 ---
sc/source/ui/inc/gridwin.hxx |3 ++-
sc/source/ui/view/gridwin.cxx |6 +-
sc/source/ui/view/gridwin_dbgutil.cxx | 14 +-
4 files changed, 20 insertions(+), 10 deletions(-)
New commits:
commit 039eb8c314fe24e7855980dcefd90e164c3b51eb
Author: Markus Mohrhard
Date: Sat May 23 05:43:50 2015 +0200
remove hack that results in mispositioning of shapes, tdf#91266
Change-Id: Iecdd0553ec8984966b2fef5fe45d9bdd0a80dd5a
diff --git a/sc/source/filter/oox/drawingbase.cxx
b/sc/source/filter/oox/drawingbase.cxx
index 1755d2d..c07d5ea 100644
--- a/sc/source/filter/oox/drawingbase.cxx
+++ b/sc/source/filter/oox/drawingbase.cxx
@@ -238,13 +238,6 @@ EmuRectangle ShapeAnchor::calcAnchorRectEmu( const
css::awt::Size& rPageSizeHmm
break;
}
-// add 0.75 mm (27,000 EMUs) in X direction to correct display error
-if( aAnchorRect.X >= 0 )
-aAnchorRect.X += 27000;
-// remove 0.25 mm (9,000 EMUs) in Y direction to correct display error
-if( aAnchorRect.Y >= 9000 )
-aAnchorRect.Y -= 9000;
-
return aAnchorRect;
}
commit e4c42413f11745760cfeb26f915d7cf7cc922264
Author: Markus Mohrhard
Date: Sat May 23 05:43:22 2015 +0200
add dump for column width in hmm
Change-Id: I0be3bfc7e8f8085c1c8e88d535cbb4142968ad28
diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
index bfc9a9d..0c940e9 100644
--- a/sc/source/ui/inc/gridwin.hxx
+++ b/sc/source/ui/inc/gridwin.hxx
@@ -439,7 +439,8 @@ protected:
private:
#ifdef DBG_UTIL
-void dumpColumnInformation();
+void dumpColumnInformationPixel();
+void dumpColumnInformationHmm();
void dumpGraphicInformation();
#endif
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 89d9b11..7a9f81f 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -3513,12 +3513,16 @@ void ScGridWindow::KeyInput(const KeyEvent& rKEvt)
{
if (rKeyCode.GetCode() == KEY_F12)
{
-dumpColumnInformation();
+dumpColumnInformationPixel();
}
else if (rKeyCode.GetCode() == KEY_F11)
{
dumpGraphicInformation();
}
+else if (rKeyCode.GetCode() == KEY_F10)
+{
+dumpColumnInformationHmm();
+}
}
#endif
diff --git a/sc/source/ui/view/gridwin_dbgutil.cxx
b/sc/source/ui/view/gridwin_dbgutil.cxx
index 77bb398..494edfc 100644
--- a/sc/source/ui/view/gridwin_dbgutil.cxx
+++ b/sc/source/ui/view/gridwin_dbgutil.cxx
@@ -35,7 +35,7 @@ void dumpScDrawObjData(ScGridWindow& rWindow, ScDrawObjData&
rData, MapUnit eMap
}
-void ScGridWindow::dumpColumnInformation()
+void ScGridWindow::dumpColumnInformationPixel()
{
ScDocument* pDoc = pViewData->GetDocument();
SCTAB nTab = pViewData->GetTabNo();
@@ -47,6 +47,18 @@ void ScGridWindow::dumpColumnInformation()
}
}
+void ScGridWindow::dumpColumnInformationHmm()
+{
+ScDocument* pDoc = pViewData->GetDocument();
+SCTAB nTab = pViewData->GetTabNo();
+for (SCCOL nCol = 0; nCol <= 20; ++nCol)
+{
+sal_uInt16 nWidth = pDoc->GetColWidth(nCol, nTab, true);
+long nPixel = LogicToLogic(Point(nWidth, 0), MAP_TWIP,
MAP_100TH_MM).getX();
+std::cout << "Column: " << nCol << ", Width: " << nPixel << "hmm" <<
std::endl;
+}
+}
+
void ScGridWindow::dumpGraphicInformation()
{
ScDocument* pDoc = pViewData->GetDocument();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc15-open-remote-files-dialog' - svtools/source
svtools/source/dialogs/RemoteFilesDialog.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit dc29e48029ec8162bd6971e8353e66b0b8f015f7
Author: Szymon KÅos
Date: Mon May 25 22:10:35 2015 +0200
loop break
Change-Id: I8bebd2a21e14f1f012ff52b600babef6289fb52d
diff --git a/svtools/source/dialogs/RemoteFilesDialog.cxx
b/svtools/source/dialogs/RemoteFilesDialog.cxx
index 9b6a322..b69d4bd 100644
--- a/svtools/source/dialogs/RemoteFilesDialog.cxx
+++ b/svtools/source/dialogs/RemoteFilesDialog.cxx
@@ -141,6 +141,7 @@ IMPL_LINK_TYPED ( RemoteFilesDialog, EditServiceMenuHdl,
MenuButton *, pButton,
{
placesUrlsList[i] = pEditedService->GetUrl();
placesNamesList[i] = pEditedService->GetName();
+break;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc15-open-remote-files-dialog' - include/svtools svtools/source svtools/uiconfig
include/svtools/RemoteFilesDialog.hxx|4 +
svtools/source/dialogs/RemoteFilesDialog.cxx | 57 ++-
svtools/uiconfig/ui/remotefilesdialog.ui | 14 ++
3 files changed, 71 insertions(+), 4 deletions(-)
New commits:
commit 7f7675f740209caa28e5db1ecd39fc6b60dc9eb5
Author: Szymon KÅos
Date: Mon May 25 21:59:01 2015 +0200
added services edit menu entry
Change-Id: Ic73e3d632296d61d1cdb5abdb54d9a74d841570d
diff --git a/include/svtools/RemoteFilesDialog.hxx
b/include/svtools/RemoteFilesDialog.hxx
index 3ec915a..32c00aa 100644
--- a/include/svtools/RemoteFilesDialog.hxx
+++ b/include/svtools/RemoteFilesDialog.hxx
@@ -15,6 +15,7 @@
#include
#include
+#include
#include
#include
#include
@@ -45,7 +46,7 @@ private:
VclPtr m_pOpen_btn;
VclPtr m_pSave_btn;
VclPtr m_pCancel_btn;
-VclPtr m_pAddService_btn;
+VclPtr m_pAddService_btn;
VclPtr m_pServices_lb;
std::vector m_aServices;
@@ -53,6 +54,7 @@ private:
void fillServicesListbox();
DECL_LINK ( AddServiceHdl, void * );
+DECL_LINK_TYPED ( EditServiceMenuHdl, MenuButton *, void );
};
#endif // INCLUDED_SVTOOLS_REMOTEFILESDIALOG_HXX
diff --git a/svtools/source/dialogs/RemoteFilesDialog.cxx
b/svtools/source/dialogs/RemoteFilesDialog.cxx
index 28b153d..9b6a322 100644
--- a/svtools/source/dialogs/RemoteFilesDialog.cxx
+++ b/svtools/source/dialogs/RemoteFilesDialog.cxx
@@ -36,7 +36,9 @@ RemoteFilesDialog::RemoteFilesDialog(vcl::Window* pParent,
WinBits nBits)
m_pOpen_btn->Hide();
}
-m_pAddService_btn->SetClickHdl( LINK( this, RemoteFilesDialog,
AddServiceHdl) );
+m_pAddService_btn->SetMenuMode(MENUBUTTON_MENUMODE_TIMED);
+m_pAddService_btn->SetClickHdl( LINK( this, RemoteFilesDialog,
AddServiceHdl ) );
+m_pAddService_btn->SetSelectHdl( LINK( this, RemoteFilesDialog,
EditServiceMenuHdl ) );
fillServicesListbox();
}
@@ -44,6 +46,7 @@ RemoteFilesDialog::RemoteFilesDialog(vcl::Window* pParent,
WinBits nBits)
void RemoteFilesDialog::fillServicesListbox()
{
m_pServices_lb->Clear();
+m_aServices.clear();
// Load from user settings
Sequence< OUString >
placesUrlsList(officecfg::Office::Common::Misc::FilePickerPlacesUrls::get(m_context));
@@ -76,7 +79,8 @@ IMPL_LINK_NOARG ( RemoteFilesDialog, AddServiceHdl )
ScopedVclPtrInstance< PlaceEditDialog > aDlg(this);
short aRetCode = aDlg->Execute();
-switch (aRetCode) {
+switch(aRetCode)
+{
case RET_OK :
{
ServicePtr newService = aDlg->GetPlace();
@@ -110,4 +114,53 @@ IMPL_LINK_NOARG ( RemoteFilesDialog, AddServiceHdl )
return 1;
}
+IMPL_LINK_TYPED ( RemoteFilesDialog, EditServiceMenuHdl, MenuButton *,
pButton, void )
+{
+OString sIdent(pButton->GetCurItemIdent());
+if(sIdent == "edit_service" && m_pServices_lb->GetEntryCount() > 0)
+{
+unsigned int nSelected = m_pServices_lb->GetSelectEntryPos();
+ScopedVclPtrInstance< PlaceEditDialog > aDlg(this,
m_aServices[nSelected]);
+short aRetCode = aDlg->Execute();
+
+switch(aRetCode)
+{
+case RET_OK :
+{
+// load all places (with local bookmarks), edit service and
save all
+
+ServicePtr pEditedService = aDlg->GetPlace();
+
+Sequence< OUString >
placesUrlsList(officecfg::Office::Common::Misc::FilePickerPlacesUrls::get(m_context));
+Sequence< OUString >
placesNamesList(officecfg::Office::Common::Misc::FilePickerPlacesNames::get(m_context));
+
+for(int i = 0; i < placesUrlsList.getLength() && i <
placesNamesList[i].getLength(); i++)
+{
+
if(placesNamesList[i].compareTo(m_aServices[nSelected]->GetName()) == 0
+ &&
placesUrlsList[i].compareTo(m_aServices[nSelected]->GetUrl()) == 0)
+{
+placesUrlsList[i] = pEditedService->GetUrl();
+placesNamesList[i] = pEditedService->GetName();
+}
+}
+
+m_aServices[nSelected] = pEditedService;
+m_pServices_lb->RemoveEntry(nSelected);
+m_pServices_lb->InsertEntry(pEditedService->GetName(),
nSelected);
+m_pServices_lb->SelectEntryPos(nSelected);
+
+std::shared_ptr
batch(comphelper::ConfigurationChanges::create(m_context));
+
officecfg::Office::Common::Misc::FilePickerPlacesUrls::set(placesUrlsList,
batch);
+
officecfg::Office::Common::Misc::FilePickerPlacesNames::set(placesNamesList,
batch);
+batch->commit();
+break;
+}
+case RET_CANCEL :
+default :
+// Do Nothing
+break;
+};
+}
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/uiconfig/ui/remotef
[Libreoffice-commits] core.git: svx/source
svx/source/dialog/_bmpmask.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 20ddd5fe50bb2a9c62d6279ff118437fdbaf2102
Author: Michael Meeks
Date: Mon May 25 20:20:22 2015 +0100
tdf#91525 - dispose SfxControllerItem member.
Change-Id: I71b32c1db2f4695deb90412e83b9e7883e9bf1d7
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index 90d97f3..b7b7217 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -335,8 +335,6 @@ SvxBmpMaskSelectItem::SvxBmpMaskSelectItem( sal_uInt16
nId_, SvxBmpMask& rMask,
{
}
-
-
void SvxBmpMaskSelectItem::StateChanged( sal_uInt16 nSID, SfxItemState
/*eState*/,
const SfxPoolItem* pItem )
{
@@ -487,6 +485,7 @@ void SvxBmpMask::dispose()
m_pQSet4.disposeAndClear();
m_pCtlPipette.disposeAndClear();
delete pData;
+pData = NULL;
m_pTbxPipette.clear();
m_pBtnExec.clear();
m_pCbx1.clear();
@@ -503,6 +502,7 @@ void SvxBmpMask::dispose()
m_pLbColor4.clear();
m_pCbxTrans.clear();
m_pLbColorTrans.clear();
+aSelItem.dispose();
SfxDockingWindow::dispose();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
PostUserEvent clang check ? ...
Hi Noel, The old 'LINK' code is creating a bit of grief around VclPtr - since un-typed pointers are shoved through there; I've extended that and am auditing through the ~300 hits of PostUserEvent - but it'd be great to make sure I got it right ;-) and that there are no regressions. The punch-line is that if there is a 'PostUserEvent' method - it should be passed a LINK(, ...) If that ptr is non-NULL and to a VclPtr type - we need to pass a final 'true' parameter to the method to ensure that we hold a reference while we wait for the idle / user-event to be emitted to avoid problems. Is it easy / possible to add a check for that ? it'd be wonderful to have one if so =) ATB, Michael. -- michael.me...@collabora.com <><, Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sysui/desktop
sysui/desktop/menus/calc.desktop |2 +-
sysui/desktop/menus/writer.desktop |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 9a889e3505dc867de4c8e05a9c8e338c8c31945d
Author: David Tardon
Date: Mon May 25 12:25:24 2015 +0200
add mime types for Pages and Numbers
Change-Id: Ideaadd9be1b5a5c65ad6d610a71d1ceeb6263cb6
(cherry picked from commit 5c706efc9e5dbc1b166e8bbc8b1e37b2ecd2f72e)
diff --git a/sysui/desktop/menus/calc.desktop b/sysui/desktop/menus/calc.desktop
index 5aa48d2..6df6e08 100644
--- a/sysui/desktop/menus/calc.desktop
+++ b/sysui/desktop/menus/calc.desktop
@@ -22,7 +22,7 @@ Icon=calc
Type=Application
Categories=Office;Spreadsheet;X-Red-Hat-Base;X-MandrivaLinux-Office-Spreadsheets;
Exec=${UNIXBASISROOTNAME} --calc %%FILE%%
-MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/msexcel;application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroenabled.12;application/vnd.ms-excel.sheet.binary.macroenabled.12;text/csv;application/x-dbf;text/spreadsheet;application/csv;application/excel;application/tab-separated-values;application/vnd.lotus-1-2-3;application/vnd.oasis.opendocument.chart;application/vnd.oasis.opendocument.chart-template;application/x-dbase;application/x-dos_ms_excel;application/x-excel;application/x-msexcel;application/x-ms-excel;application/x-quattropro;application/x-123;text/comma-separated-values;text/tab-separated-values;text/x-comma-separated-values;text/x-csv;applica
tion/vnd.oasis.opendocument.spreadsheet-flat-xml;application/vnd.ms-works;application/clarisworks;
+MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/msexcel;application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroenabled.12;application/vnd.ms-excel.sheet.binary.macroenabled.12;text/csv;application/x-dbf;text/spreadsheet;application/csv;application/excel;application/tab-separated-values;application/vnd.lotus-1-2-3;application/vnd.oasis.opendocument.chart;application/vnd.oasis.opendocument.chart-template;application/x-dbase;application/x-dos_ms_excel;application/x-excel;application/x-msexcel;application/x-ms-excel;application/x-quattropro;application/x-123;text/comma-separated-values;text/tab-separated-values;text/x-comma-separated-values;text/x-csv;applica
tion/vnd.oasis.opendocument.spreadsheet-flat-xml;application/vnd.ms-works;application/clarisworks;application/x-iwork-numbers-sffnumbers;
Name=%PRODUCTNAME Calc
GenericName=Spreadsheet
Comment=Perform calculations, analyze information and manage lists in
spreadsheets by using Calc.
diff --git a/sysui/desktop/menus/writer.desktop
b/sysui/desktop/menus/writer.desktop
index d7f967a..0294b5d 100644
--- a/sysui/desktop/menus/writer.desktop
+++ b/sysui/desktop/menus/writer.desktop
@@ -22,7 +22,7 @@ Icon=writer
Type=Application
Categories=Office;WordProcessor;X-Red-Hat-Base;X-MandrivaLinux-Office-Wordprocessors;
Exec=${UNIXBASISROOTNAME} --writer %%FILE%%
-MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.oasis.opendocument.text-master-template;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/msword;application/vnd.ms-word;application/x-doc;application/x-hwp;application/rtf;text/rtf;application/vnd.wordperfect;application/wordperfect;application/vnd.lotus-wordpro;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12;application/vnd.ms-works;application/vnd.stardivision.writer-global;application/x-extension-txt;application/x-t602;text/plain;application/vnd.oasis.opendocument.text-flat-xml;application/x-fictionbook+xml;applicatio
n/macwriteii;application/x-aportisdoc;application/prs.plucker;application/vnd.palm;application/clarisworks;application/x-sony-bbeb;application/x-abiword;
+MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.oasis.opendocument.text-master-template;application/vnd.sun.xml.wr
[Libreoffice-commits] core.git: sysui/desktop
sysui/desktop/menus/calc.desktop |2 +-
sysui/desktop/menus/writer.desktop |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 5c706efc9e5dbc1b166e8bbc8b1e37b2ecd2f72e
Author: David Tardon
Date: Mon May 25 12:25:24 2015 +0200
add mime types for Pages and Numbers
Change-Id: Ideaadd9be1b5a5c65ad6d610a71d1ceeb6263cb6
diff --git a/sysui/desktop/menus/calc.desktop b/sysui/desktop/menus/calc.desktop
index 5aa48d2..6df6e08 100644
--- a/sysui/desktop/menus/calc.desktop
+++ b/sysui/desktop/menus/calc.desktop
@@ -22,7 +22,7 @@ Icon=calc
Type=Application
Categories=Office;Spreadsheet;X-Red-Hat-Base;X-MandrivaLinux-Office-Spreadsheets;
Exec=${UNIXBASISROOTNAME} --calc %%FILE%%
-MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/msexcel;application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroenabled.12;application/vnd.ms-excel.sheet.binary.macroenabled.12;text/csv;application/x-dbf;text/spreadsheet;application/csv;application/excel;application/tab-separated-values;application/vnd.lotus-1-2-3;application/vnd.oasis.opendocument.chart;application/vnd.oasis.opendocument.chart-template;application/x-dbase;application/x-dos_ms_excel;application/x-excel;application/x-msexcel;application/x-ms-excel;application/x-quattropro;application/x-123;text/comma-separated-values;text/tab-separated-values;text/x-comma-separated-values;text/x-csv;applica
tion/vnd.oasis.opendocument.spreadsheet-flat-xml;application/vnd.ms-works;application/clarisworks;
+MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/msexcel;application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroenabled.12;application/vnd.ms-excel.sheet.binary.macroenabled.12;text/csv;application/x-dbf;text/spreadsheet;application/csv;application/excel;application/tab-separated-values;application/vnd.lotus-1-2-3;application/vnd.oasis.opendocument.chart;application/vnd.oasis.opendocument.chart-template;application/x-dbase;application/x-dos_ms_excel;application/x-excel;application/x-msexcel;application/x-ms-excel;application/x-quattropro;application/x-123;text/comma-separated-values;text/tab-separated-values;text/x-comma-separated-values;text/x-csv;applica
tion/vnd.oasis.opendocument.spreadsheet-flat-xml;application/vnd.ms-works;application/clarisworks;application/x-iwork-numbers-sffnumbers;
Name=%PRODUCTNAME Calc
GenericName=Spreadsheet
Comment=Perform calculations, analyze information and manage lists in
spreadsheets by using Calc.
diff --git a/sysui/desktop/menus/writer.desktop
b/sysui/desktop/menus/writer.desktop
index d7f967a..0294b5d 100644
--- a/sysui/desktop/menus/writer.desktop
+++ b/sysui/desktop/menus/writer.desktop
@@ -22,7 +22,7 @@ Icon=writer
Type=Application
Categories=Office;WordProcessor;X-Red-Hat-Base;X-MandrivaLinux-Office-Wordprocessors;
Exec=${UNIXBASISROOTNAME} --writer %%FILE%%
-MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.oasis.opendocument.text-master-template;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/msword;application/vnd.ms-word;application/x-doc;application/x-hwp;application/rtf;text/rtf;application/vnd.wordperfect;application/wordperfect;application/vnd.lotus-wordpro;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12;application/vnd.ms-works;application/vnd.stardivision.writer-global;application/x-extension-txt;application/x-t602;text/plain;application/vnd.oasis.opendocument.text-flat-xml;application/x-fictionbook+xml;applicatio
n/macwriteii;application/x-aportisdoc;application/prs.plucker;application/vnd.palm;application/clarisworks;application/x-sony-bbeb;application/x-abiword;
+MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.oasis.opendocument.text-master-template;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writ
[Libreoffice-commits] dev-tools.git: ciabot/libreoffice-bugzilla2.py
ciabot/libreoffice-bugzilla2.py |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c0726a800b36120ec8383d1279a8102dd59f694b Author: Adolfo Jayme Barrientos Date: Sat May 23 04:48:49 2015 -0500 Update master_target to 5.1 series Change-Id: I3d4625e6a350160c7cfc2de7907f6e97a2399ab5 Reviewed-on: https://gerrit.libreoffice.org/15872 Reviewed-by: Joren De Cuyper Tested-by: Joren De Cuyper diff --git a/ciabot/libreoffice-bugzilla2.py b/ciabot/libreoffice-bugzilla2.py index 923a01d..7bbac82 100644 --- a/ciabot/libreoffice-bugzilla2.py +++ b/ciabot/libreoffice-bugzilla2.py @@ -33,7 +33,7 @@ import bugzilla from bugzilla import Bugzilla from bugzilla.base import _BugzillaToken -master_target = "5.0.0" +master_target = "5.1.0" bug_regex = "(?:tdf|fdo)#(\d+)" class FreedesktopBZ: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Help on Building Libreoffice
Hi, Usually I receive this kind of message when behind a company proxy that does not allow git protocol. You should try export http_proxy=http://addr_of_proxy:port_of_proxy Idem for https_proxy Then clone through http git clone http://anongit.freedesktop.org/git/libreoffice/core.git Philippe Le 25 mai 2015 13:51:09 CEST, Kismabo adwa a écrit : >Hi everybody, i want u to help me how to build libreoffice. I have >being directed by this >https://wiki.documentfoundation.org/Development/BuildingOnLinux on >how to build libreoffice I have installed git. then when i try to >clone with "git clone git://anongit.freedesktop.org/libreoffice/core >libreoffice ", i get the following error. >' >' >Cloning into 'libreoffice'... >fatal: unable to connect to anongit.freedesktop.org: >anongit.freedesktop.org: Name or service not known >' >' > >how should i solve this? > >is it possible to download the source code and copy to /.git directory >instead of running "git clone >git://anongit.freedesktop.org/libreoffice/core libreoffice " command? >i tried it as following, >i downloaded source code of libreoffice and i copied to >home/.git/libreoffice, when i run > it told me that there is no autogen.sh file. > >$ cd libreoffice >$ ./autogen.sh > >this generates "bash: /autogen.sh: No such file or directory" error. > >i couldn't even find the autogen.sh file by searching in the whole >source >code. > >...pls help me in this how to solve... > >Thanx, > > > > >___ >LibreOffice mailing list >LibreOffice@lists.freedesktop.org >http://lists.freedesktop.org/mailman/listinfo/libreoffice -- Envoyé de mon téléphone Android avec K-9 Mail. Excusez la brièveté.___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.documentfoundation.org/show_bug.cgi?id=75025 --- Comment #112 from Joel Madero --- Yes we are trying to abandon MAB and replace with severity/importance. These fields will soon be locked out for users and only be available to contributors - this is to ensure consistency and objectivity in deciding the severity/importance. We are hoping to do a test run of this in the next month or so. We have no plans on making a MAB 5 (although this may change). -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.Parts.js | 14 ++
loleaflet/src/layer/tile/TileLayer.js |9 +
2 files changed, 15 insertions(+), 8 deletions(-)
New commits:
commit bc02be98122687e2d84dec061ec5e5e640573bbd
Author: Jan Holesovsky
Date: Mon May 25 18:43:18 2015 +0200
Don't cycle the parts, stop at 0 / max.
diff --git a/loleaflet/src/control/Control.Parts.js
b/loleaflet/src/control/Control.Parts.js
index 5aa3d28..254c10b 100644
--- a/loleaflet/src/control/Control.Parts.js
+++ b/loleaflet/src/control/Control.Parts.js
@@ -29,13 +29,17 @@ L.Control.Parts = L.Control.extend({
_prevPart: function (e) {
this._map.fire('prevpart');
- this._currentPart -= 1;
+ if (this._currentPart > 0) {
+ this._currentPart -= 1;
+ }
this._updateDisabled();
},
_nextPart: function (e) {
this._map.fire('nextpart');
- this._currentPart += 1;
+ if (this._currentPart < this._parts - 1) {
+ this._currentPart += 1;
+ }
this._updateDisabled();
},
@@ -56,13 +60,15 @@ L.Control.Parts = L.Control.extend({
_updateDisabled: function () {
var className = 'leaflet-disabled';
- L.DomUtil.removeClass(this._prevPartButton, className);
- L.DomUtil.removeClass(this._nextPartButton, className);
if (this._currentPart === 0) {
L.DomUtil.addClass(this._prevPartButton, className);
+ } else {
+ L.DomUtil.removeClass(this._prevPartButton, className);
}
if (this._currentPart === this._parts - 1) {
L.DomUtil.addClass(this._nextPartButton, className);
+ } else {
+ L.DomUtil.removeClass(this._nextPartButton, className);
}
}
});
diff --git a/loleaflet/src/layer/tile/TileLayer.js
b/loleaflet/src/layer/tile/TileLayer.js
index 7f45261..db4f5c7 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -465,13 +465,14 @@ L.TileLayer = L.GridLayer.extend({
_onSwitchPart: function (e) {
if (e.type === 'prevpart') {
- this._currentPart -= 1;
- if (this._currentPart < 0) {
- this._currentPart = this._parts - 1;
+ if (this._currentPart > 0) {
+ this._currentPart -= 1;
}
}
else if (e.type === 'nextpart') {
- this._currentPart = (this._currentPart + 1) %
this._parts;
+ if (this._currentPart < this._parts - 1) {
+ this._currentPart += 1;
+ }
}
this._update();
this._pruneTiles();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bin/gbuild-to-ide Makefile.in
Makefile.in |3
bin/gbuild-to-ide | 510 +-
2 files changed, 509 insertions(+), 4 deletions(-)
New commits:
commit 237a1b79a1d5af10434c2b93cfc83c1c8e55a9d5
Author: Michel Renon
Date: Tue May 19 16:30:41 2015 +0200
QtCreator IDE integration.
First version of QtCreator IDE integration :
'make qtcreator-ide-integration' generates .pro and .pro.user files for
each subfolder of LibreOffice.
It also creates a 'lo.pro' meta project that list all other .pro files.
Developers can use use QtCreator to edit, compile and debug LibreOffice.
Change-Id: Ib05d8c36a7ca055ecd7a4db5776f4c28bf05676c
Reviewed-on: https://gerrit.libreoffice.org/15804
Tested-by: Jenkins
Reviewed-by: Björn Michaelsen
diff --git a/Makefile.in b/Makefile.in
index 61cc906..3f806c0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -370,7 +370,8 @@ $(foreach ide,\
vs2012 \
vs2013 \
vim \
- xcode, \
+ xcode \
+ qtcreator,\
$(eval $(call gb_Top_GbuildToIdeIntegration,$(ide
endif # MAKE_RESTARTS
diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index 0ec56d1..0452a9e 100755
--- a/bin/gbuild-to-ide
+++ b/bin/gbuild-to-ide
@@ -18,7 +18,7 @@ import uuid
import json
import xml.etree.ElementTree as ET
import xml.dom.minidom as minidom
-
+import traceback
class GbuildParserState:
@@ -924,6 +924,508 @@ class
VisualStudioIntegrationGenerator(IdeIntegrationGenerator):
self.write_pretty_xml(proj_node, filters_path)
+
+
+
+class QtCreatorIntegrationGenerator(IdeIntegrationGenerator):
+
+def __init__(self, gbuildparser, ide):
+IdeIntegrationGenerator.__init__(self, gbuildparser, ide)
+self.target_by_location = {}
+for target in set(self.gbuildparser.libs) |
set(self.gbuildparser.exes):
+if target.location not in self.target_by_location:
+self.target_by_location[target.location] = set()
+self.target_by_location[target.location] |= set([target])
+
+self._do_log = False # set to 'True' to activate log of
QtCreatorIntegrationGenerator
+if self._do_log:
+qtlog_path = os.path.abspath('../qtlog_.txt')
+self.qtlog = open(qtlog_path, 'w')
+
+def _log(self, message):
+if self._do_log:
+self.qtlog.write(message)
+
+def log_close(self):
+if self._do_log:
+self.qtlog.close()
+
+def generate_build_configs(self, lib_folder):
+module_folder = os.path.join(self.base_folder, lib_folder)
+xml = ""
+# In QtCreator UI, build configs are listed alphabetically,
+# so it can be different from the creation order.
+# So we prefix the names with the index.
+xml += QtCreatorIntegrationGenerator.build_configs_template % {
+'index' : '0',
+'base_folder' : module_folder,
+'arg' : "",
+'name' : "1-Build %s" % lib_folder,
+}
+xml += QtCreatorIntegrationGenerator.build_configs_template % {
+'index' : '1',
+'base_folder' : module_folder,
+'arg' : "unitcheck",
+'name' : "2-Local tests -- quick tests (unitcheck)",
+}
+xml += QtCreatorIntegrationGenerator.build_configs_template % {
+'index' : '2',
+'base_folder' : module_folder,
+'arg' : "unitcheck slowcheck",
+'name' : "3-Local tests -- slow tests (unitcheck, slowcheck)",
+}
+xml += QtCreatorIntegrationGenerator.build_configs_template % {
+'index' : '3',
+'base_folder' : module_folder,
+'arg' : "unitcheck slowcheck subsequentcheck",
+'name' : "4-Local tests -- integration tests (unitcheck,
slowcheck, subsequentcheck)",
+}
+xml += QtCreatorIntegrationGenerator.build_configs_template % {
+'index' : '4',
+'base_folder' : self.base_folder,
+'arg' : "unitcheck",
+'name' : "5-Global tests -- quick tests (unitcheck)",
+}
+xml += QtCreatorIntegrationGenerator.build_configs_template % {
+'index' : '5',
+'base_folder' : self.base_folder,
+'arg' : "unitcheck slowcheck",
+'name' : "6-Global tests -- slow tests (unitcheck, slowcheck)",
+}
+xml += QtCreatorIntegrationGenerator.build_configs_template % {
+'index' : '6',
+'base_folder' : self.base_folder,
+'arg' : "unitcheck slowcheck subsequentcheck",
+'name' : "7-Global tests -- integration tests (unitcheck,
slowcheck, subsequentcheck)",
+}
+xml += QtCreatorIntegrationGenerator.build_configs_template % {
+'index' : '7',
+'base_folder' : self.base_folder,
+'arg' : "build-nocheck",
+'name' : "8-Global build -
Re: Resignation from the ESC
Hi Markus, On Mon, 2015-05-25 at 12:02 +0200, Markus Mohrhard wrote: > so I hereby resign from the ESC effective immediately. To echo Jacobo, I'm really grateful for your frankly excellent contributions to LibreOffice, and the significant impact you made in so many places in the project. I'd love to have you attend the next ESC so we can discuss things (if you're willing). I guess that we are long overdue for re-thinking the ESC composition as well - so I'll add that to the agenda. I hope this frees up some space which helps with completing your masters thesis and hope to catch up at some conference or other in future (FOSDEM?). ATB, Michael. -- michael.me...@collabora.com <><, Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Defender Exploit:Win32/CVE-2010-3333
grep -A 1 "CVE tests" config.log configure:30975: checking whether to execute CVE tests configure:30992: result: no C:/cygwin/opt/lo/bin/make -j 2 -rs -f C:/sources/libo-core/Makefile.gbuild all [build PRL] CustomTarget/postprocess/images/sorted.lst [build PRL] CustomTarget/postprocess/images/commandimagelist.ilst [build ECH] CustomTarget/instsetoo_native/setup/version.ini [build AIN] accessories_gallery [build AIN] activexbinarytable [build AIN] activex [build AIN] activexwin64 [build AIN] base [build AIN] base_brand [build AIN] brand [build AIN] calc [build AIN] calc_brand [build AIN] draw_brand [build AIN] extensions_ct2n [build AIN] extensions_bsh [build AIN] extensions_numbertext [build AIN] extensions_rhino [build AIN] gnome [build AIN] graphicfilter [build AIN] impress [build AIN] impress_brand [build AIN] kde [build AIN] math [build AIN] math_brand [build AIN] ogltrans [build AIN] onlineupdate [build AIN] ooo [build AIN] ooobinarytable [build AIN] python [build AIN] python_scriptprovider [build AIN] python_librelogo [build AIN] postgresqlsdbc [build AIN] pdfimport [build AIN] quickstart [build AIN] reportbuilder [build AIN] sdk [build AIN] tde [build AIN] ure [build AIN] winexplorerextbinarytable [build AIN] winexplorerext [build AIN] winexplorerextnt6 [build AIN] winexplorerextwin64 [build AIN] winexplorerextwin64nt6 [build AIN] writer [build AIN] writer_brand [build AIN] xsltfilter [build SCT] scp2/source/templates/alllangmodules_base [build SCT] scp2/source/templates/alllangmodules_calc [build SCT] scp2/source/templates/alllangmodules_draw [build SCT] scp2/source/templates/alllangmodules_extensions_templates [build SCT] scp2/source/templates/alllangmodules_impress [build SCT] scp2/source/templates/alllangmodules_math [build SCT] scp2/source/templates/allhelpmodules [build SCT] scp2/source/templates/allhelpmodules_root [build SCT] scp2/source/templates/alllangmodules [build SCT] scp2/source/templates/alllangmodules_root [build SCT] scp2/source/templates/alllangmodules_writer [build SPP] scp2/source/quickstart/registryitem_quickstart [build SPP] scp2/source/quickstart/module_quickstart [build SPP] scp2/source/ooo/folder_ooo [build SPP] scp2/source/ooo/vc_redist [build SPP] scp2/source/ooo/windowscustomaction_ooo [build SPP] scp2/source/base/folderitem_base [build SPP] scp2/source/base/registryitem_base [build SPP] scp2/source/calc/folderitem_calc [build SPP] scp2/source/calc/registryitem_calc [build SPP] scp2/source/draw/folderitem_draw [build SPP] scp2/source/draw/registryitem_draw [build SPP] scp2/source/impress/folderitem_impress [build SPP] scp2/source/impress/registryitem_impress [build SPP] scp2/source/math/folderitem_math [build SPP] scp2/source/math/registryitem_math [build SPP] scp2/source/ooo/folderitem_ooo [build SPP] scp2/source/ooo/registryitem_ooo [build SPP] scp2/source/writer/folderitem_writer [build SPP] scp2/source/writer/registryitem_writer [build LOC] top level modules: libreoffice [build CUT] basebmp [build CUT] basegfx [build CUT] binaryurp_test-cache [build CUT] binaryurp_test-unmarshal [build CUT] comphelper_syntaxhighlight_test [build CUT] comphelper_test [build CUT] cppu_qa_any [build CUT] cppu_qa_recursion [build CUT] cppu_qa_reference [build CUT] cppu_qa_unotype [build CUT] cppu_test_cppumaker [build CUT] cppuhelper_cppu_ifcontainer [build CUT] cppuhelper_cppu_unourl [build CUT] desktop_version [build CUT] i18nlangtag_test_languagetag [build CUT] o3tl_tests [build CUT] odk_checkapi [build CHK] CustomTarget/odk/check/checkbin [build PYT] pyuno_pytests_ssl [build CUT] sal_osl_process [build CUT] Module_DLL [build CUT] sal_bytesequence [build CUT] sal_osl_condition [build CUT] sal_osl_module [build CUT] sal_osl_old_test_file [build CUT] sal_osl_thread [build CUT] sal_rtl_alloc [build CUT] sal_rtl_process [build CUT] sal_rtl_bootstrap [build CUT] sal_rtl_cipher [build CUT] sal_rtl_crc32 [build CUT] sal_rtl_digest [build CUT] sal_rtl_doublelock [build CUT] sal_rtl_locale [build CUT] sal_rtl_ostringbuffer [build CUT] sal_rtl_oustringbuffer [build CUT] sal_rtl_oustring [build CUT] sal_rtl_textenc [build CUT] sal_rtl_uri [build CUT] sal_rtl_strings [build CUT] sal_rtl_uuid [build CUT] sal_tcwf [build CUT] sal_types [build CUT] sal_osl_mutex [build CUT] sal_osl_profile [build CUT] sal_osl_setthreadname [build CUT] sal_rtl_math [build CUT] salhelper_testapi [build CUT] sax [build CUT] sax_attributes [build CUT] zip [build CUT] svl_lngmisc [build CUT] svl_inetcontenttype [build CUT] svl_items [build CUT] svl_itempool [build CUT] svl_notify [build CUT] tools_test [build PRL] CustomTarget/postprocess/images/images_breeze.zip [build PRL] CustomTarget/postprocess/images/images_galaxy.zip [build PRL] CustomTarget/postprocess/images/images_hicontrast.zip [build PRL] CustomTarget/postprocess/images/images_oxygen.zip [build PRL] CustomTarget/postprocess/images/images_sifr.zip [build PRL] CustomTarget/postprocess/images/images_tango.zip [build PRL] CustomTarget/postprocess/images/ima
Re: Defender Exploit:Win32/CVE-2010-3333
On Mon, 2015-05-25 at 06:24 -0700, marius adrian popa wrote: > While doing the tests after make i get the above message > with windows defender (windows 10) and realtime protection enabled hmm, what's the output of grep -A 1 "CVE tests" config.log ? If the result is "yes" then remove --enable-cve-tests from your configure line, if the result is "no" then do you have any what test in writer triggers this ? C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.documentfoundation.org/show_bug.cgi?id=75025 --- Comment #111 from Timur --- Since EoL is near, will MABs stay or not? That was useful, but seems like not the most efficient tool. There was an idea to have only Importance, but personally, I would like to see raised priority for bugs marked as regression, bisected, have-backtrace. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/tdf91261.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 19 +++
writerfilter/source/dmapper/DomainMapper.cxx | 21 -
writerfilter/source/dmapper/PropertyIds.cxx |2 ++
writerfilter/source/dmapper/PropertyIds.hxx |2 ++
writerfilter/source/dmapper/PropertyMap.cxx |5 +
writerfilter/source/dmapper/PropertyMap.hxx |2 ++
7 files changed, 46 insertions(+), 5 deletions(-)
New commits:
commit 5ad8c6c313f3d540f93742e9308a2773937b3120
Author: Mark Hung
Date: Thu May 14 23:02:21 2015 +0800
tdf#91261: DOCX import: snapGrid property of paragraphs are ignored
Fix the situation for OOXML import filter:
a) While handling DocGrid type, SnapToChars was treated as
None. Now it is implemented as described in the article:
http://linpeifeng.blogspot.tw/2007/02/text-grid-enhancement.html
Both LinesAndChars and SnapToChars will be translated to
Writer grid type "lines and characters", and set SnapToGrid
property to false or true accordingly.
b) All the imported paragraphs snap to grid because SnapToGrid was
appended to grabbag, now it allows SnapToGrid property in
paragraph and paragraph styles to be imported properly.
Reviewed-on: https://gerrit.libreoffice.org/15732
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
(cherry picked from commit b7c8c337d4ffad55fe111c9634c4c04afce78bad)
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Change-Id: I446b4c64c0ed86960896bcd61a1006c9173a757a
Reviewed-on: https://gerrit.libreoffice.org/15843
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/qa/extras/ooxmlexport/data/tdf91261.docx
b/sw/qa/extras/ooxmlexport/data/tdf91261.docx
new file mode 100644
index 000..6edb8b8
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf91261.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 5e05f6a..e43cf90 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -613,6 +613,25 @@ DECLARE_OOXMLEXPORT_TEST(testTdf88583, "tdf88583.odt")
CPPUNIT_ASSERT_EQUAL(static_cast(0x00cc00),
getProperty(getParagraph(1), "FillColor"));
}
+DECLARE_OOXMLEXPORT_TEST(testTdf91261, "tdf91261.docx")
+{
+bool snapToGrid = true;
+uno::Reference< text::XTextRange > xPara = getParagraph( 2 );
+uno::Reference< beans::XPropertySet > properties( xPara, uno::UNO_QUERY);
+properties->getPropertyValue("SnapToGrid") >>= snapToGrid ;
+CPPUNIT_ASSERT_EQUAL(false, snapToGrid);
+
+uno::Reference< beans::XPropertySet>
xStyle(getStyles("PageStyles")->getByName("Standard"), uno::UNO_QUERY);
+sal_Int16 nGridMode;
+xStyle->getPropertyValue("GridMode") >>= nGridMode;
+CPPUNIT_ASSERT_EQUAL( sal_Int16(2), nGridMode);
+
+bool bGridSnapToChars;
+xStyle->getPropertyValue("GridSnapToChars") >>= bGridSnapToChars;
+CPPUNIT_ASSERT_EQUAL(true, bGridSnapToChars);
+
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index ad477c5..e1c5954 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -918,14 +918,18 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
switch( nIntValue )
{
case NS_ooxml::LN_Value_doc_ST_DocGrid_default:
-case NS_ooxml::LN_Value_doc_ST_DocGrid_snapToChars:
-pSectionContext->SetGridType( 0 );
+pSectionContext->SetGridType(text::TextGridMode::NONE);
break;
case NS_ooxml::LN_Value_doc_ST_DocGrid_lines:
-pSectionContext->SetGridType( 1 );
+
pSectionContext->SetGridType(text::TextGridMode::LINES);
break;
case NS_ooxml::LN_Value_doc_ST_DocGrid_linesAndChars:
-pSectionContext->SetGridType( 2 );
+
pSectionContext->SetGridType(text::TextGridMode::LINES_AND_CHARS);
+pSectionContext->SetGridSnapToChars( false );
+break;
+case NS_ooxml::LN_Value_doc_ST_DocGrid_snapToChars:
+
pSectionContext->SetGridType(text::TextGridMode::LINES_AND_CHARS);
+pSectionContext->SetGridSnapToChars( true );
break;
default :
OSL_FAIL("unknown SwTextGrid value");
@@ -1983,7 +1987,14 @@ void DomainMapper::sprmWithProps( Sprm& rSprm,
PropertyMapPtr rContext )
break;
case NS_ooxml::LN_CT_PPrBase_snapToGrid:
-
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2a407768564ddf05b1b2cdd373b8e32091575acb Author: Michael Stahl Date: Wed May 20 23:51:08 2015 +0200 Updated core Project: dictionaries d472b00b2ae5a65b5088f2cf4ffc7c326287392e Lightproof: do not return invalid nBehindEndOfSentencePosition For a paragraph with a space at the end, this assertion is triggered: linguistic/source/gciterator.cxx:162: lcl_SkipWhiteSpaces: illegal arguments Cause is the loop in doProofReading that gets the last character of the paragraph and increments nStartOfNextSentencePosition even if it's already at end of the text. (regression from 080424980483bcc29a3556cf1a681c45cd5c50fc) Reviewed-on: https://gerrit.libreoffice.org/15834 Reviewed-by: László Németh Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara (cherry picked from commit 8952e8055690417e60d75e4e4adf3c85a1029e7c) Lightproof: do not return invalid nBehindEndOfSentencePosition Copy bugfix to localized Lightproof.py (cherry picked from commit cdb3172a438c7c56c4700edf7d771ede5cdf3402) Change-Id: I58bd10d168f75f9d365cb33c0ade770750ff57ef (cherry picked from commit 6fd73ad03417565305084524cf32cea089e83e87) Reviewed-on: https://gerrit.libreoffice.org/15862 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/dictionaries b/dictionaries index f7f2422..d472b00 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit f7f24221d84415f15257385c9136b85d7c071150 +Subproject commit d472b00b2ae5a65b5088f2cf4ffc7c326287392e ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Branch 'libreoffice-4-4' - en/Lightproof.py hu_HU/Lightproof.py pt_BR/Lightproof.py ru_RU/Lightproof.py
en/Lightproof.py|2 +- hu_HU/Lightproof.py |2 +- pt_BR/Lightproof.py |2 +- ru_RU/Lightproof.py |2 +- 4 files changed, 4 insertions(+), 4 deletions(-) New commits: commit d472b00b2ae5a65b5088f2cf4ffc7c326287392e Author: Michael Stahl Date: Wed May 20 23:51:08 2015 +0200 Lightproof: do not return invalid nBehindEndOfSentencePosition For a paragraph with a space at the end, this assertion is triggered: linguistic/source/gciterator.cxx:162: lcl_SkipWhiteSpaces: illegal arguments Cause is the loop in doProofReading that gets the last character of the paragraph and increments nStartOfNextSentencePosition even if it's already at end of the text. (regression from 080424980483bcc29a3556cf1a681c45cd5c50fc) Reviewed-on: https://gerrit.libreoffice.org/15834 Reviewed-by: László Németh Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara (cherry picked from commit 8952e8055690417e60d75e4e4adf3c85a1029e7c) Lightproof: do not return invalid nBehindEndOfSentencePosition Copy bugfix to localized Lightproof.py (cherry picked from commit cdb3172a438c7c56c4700edf7d771ede5cdf3402) Change-Id: I58bd10d168f75f9d365cb33c0ade770750ff57ef (cherry picked from commit 6fd73ad03417565305084524cf32cea089e83e87) Reviewed-on: https://gerrit.libreoffice.org/15862 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/en/Lightproof.py b/en/Lightproof.py index e7cde2f..3003810 100644 --- a/en/Lightproof.py +++ b/en/Lightproof.py @@ -121,7 +121,7 @@ class Lightproof( unohelper.Base, XProofreader, XServiceInfo, XServiceName, XSer if 'PYUNO_LOGLEVEL' in os.environ: print(traceback.format_exc()) -l = rText[nSuggestedSentenceEndPos:nSuggestedSentenceEndPos+1] +l = rText[aRes.nStartOfNextSentencePosition:aRes.nStartOfNextSentencePosition+1] while l == " ": aRes.nStartOfNextSentencePosition = aRes.nStartOfNextSentencePosition + 1 l = rText[aRes.nStartOfNextSentencePosition:aRes.nStartOfNextSentencePosition+1] diff --git a/hu_HU/Lightproof.py b/hu_HU/Lightproof.py index e5936b8..daeddeb 100644 --- a/hu_HU/Lightproof.py +++ b/hu_HU/Lightproof.py @@ -122,7 +122,7 @@ class Lightproof( unohelper.Base, XProofreader, XServiceInfo, XServiceName, XSer if 'PYUNO_LOGLEVEL' in os.environ: print(traceback.format_exc()) -l = rText[nSuggestedSentenceEndPos:nSuggestedSentenceEndPos+1] +l = rText[aRes.nStartOfNextSentencePosition:aRes.nStartOfNextSentencePosition+1] while l == " ": aRes.nStartOfNextSentencePosition = aRes.nStartOfNextSentencePosition + 1 l = rText[aRes.nStartOfNextSentencePosition:aRes.nStartOfNextSentencePosition+1] diff --git a/pt_BR/Lightproof.py b/pt_BR/Lightproof.py index 44f6934..8064fee 100644 --- a/pt_BR/Lightproof.py +++ b/pt_BR/Lightproof.py @@ -122,7 +122,7 @@ class Lightproof( unohelper.Base, XProofreader, XServiceInfo, XServiceName, XSer if 'PYUNO_LOGLEVEL' in os.environ: print(traceback.format_exc()) -l = rText[nSuggestedSentenceEndPos:nSuggestedSentenceEndPos+1] +l = rText[aRes.nStartOfNextSentencePosition:aRes.nStartOfNextSentencePosition+1] while l == " ": aRes.nStartOfNextSentencePosition = aRes.nStartOfNextSentencePosition + 1 l = rText[aRes.nStartOfNextSentencePosition:aRes.nStartOfNextSentencePosition+1] diff --git a/ru_RU/Lightproof.py b/ru_RU/Lightproof.py index 4af25f8..198b762 100644 --- a/ru_RU/Lightproof.py +++ b/ru_RU/Lightproof.py @@ -122,7 +122,7 @@ class Lightproof( unohelper.Base, XProofreader, XServiceInfo, XServiceName, XSer if 'PYUNO_LOGLEVEL' in os.environ: print(traceback.format_exc()) -l = rText[nSuggestedSentenceEndPos:nSuggestedSentenceEndPos+1] +l = rText[aRes.nStartOfNextSentencePosition:aRes.nStartOfNextSentencePosition+1] while l == " ": aRes.nStartOfNextSentencePosition = aRes.nStartOfNextSentencePosition + 1 l = rText[aRes.nStartOfNextSentencePosition:aRes.nStartOfNextSentencePosition+1] ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sw/source xmloff/source
sw/source/core/unocore/unoframe.cxx |2 ++ xmloff/source/style/XMLBackgroundImageContext.cxx |3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) New commits: commit 7cbcb57df49d8b0cc28c28c5a04bcac464b504fb Author: Michael Stahl Date: Fri May 22 17:58:57 2015 +0200 tdf#91140: tweak fix a bit, turns out xmloff was also passing empty URL Change-Id: Ia6e1fbe18e72c9c06915e1b437076a1f56a6c206 (cherry picked from commit 12f907da9535ae9fb28fb7ef1b05240eabf51e82) Reviewed-on: https://gerrit.libreoffice.org/15867 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index f151e36..a98d9ee 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -259,6 +259,8 @@ bool BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI const bool bFillStyleUsed(pXFillStyleItem && pXFillStyleItem->hasValue() && (pXFillStyleItem->get() != drawing::FillStyle_SOLID || !pGrURL)); +SAL_INFO_IF(pXFillStyleItem && pXFillStyleItem->hasValue() && !bFillStyleUsed, +"sw.uno", "FillBaseProperties: ignoring invalid FillStyle"); const bool bXFillStyleItemUsed( bFillStyleUsed || pXFillColorItem || diff --git a/xmloff/source/style/XMLBackgroundImageContext.cxx b/xmloff/source/style/XMLBackgroundImageContext.cxx index 18749d82..5acd951 100644 --- a/xmloff/source/style/XMLBackgroundImageContext.cxx +++ b/xmloff/source/style/XMLBackgroundImageContext.cxx @@ -389,7 +389,8 @@ void XMLBackgroundImageContext::EndElement() else if( GraphicLocation_NONE == ePos ) ePos = GraphicLocation_TILED; -aProp.maValue <<= sURL; +if (!sURL.isEmpty()) +aProp.maValue <<= sURL; aPosProp.maValue <<= ePos; aFilterProp.maValue <<= sFilter; aTransparencyProp.maValue <<= nTransparency; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sw/source
sw/source/core/unocore/unoframe.cxx | 12 +++-
1 file changed, 11 insertions(+), 1 deletion(-)
New commits:
commit 25922e2f50b27e47d0953d4a2ac51e9f6673a17a
Author: Michael Stahl
Date: Fri May 22 17:59:55 2015 +0200
tdf#90946: sw: ODF import: ignore invalid gradient-name if style SOLID
The bugdoc has a fill-gradient-name that refers to a non-existent
gradient and also draw:fill="solid"; handle this combination without
exception.
Change-Id: I2c912b28a6b1550e2e4c6c71ff8889ae1779c618
(cherry picked from commit 00eab70295cbce40368d57224c3f51c6e5f2457e)
Reviewed-on: https://gerrit.libreoffice.org/15866
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/source/core/unocore/unoframe.cxx
b/sw/source/core/unocore/unoframe.cxx
index 7168777..f151e36 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -392,7 +392,17 @@ bool
BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI
throw lang::IllegalArgumentException();
}
-bRet &= SvxShape::SetFillAttribute(XATTR_FILLGRADIENT,
aTempName, rToSet);
+bool const bSuccess = SvxShape::SetFillAttribute(
+XATTR_FILLGRADIENT, aTempName, rToSet);
+if (aXFillStyleItem.GetValue() == drawing::FillStyle_GRADIENT)
+{ // tdf#90946 ignore invalid gradient-name if SOLID
+bRet &= bSuccess;
+}
+else
+{
+SAL_INFO_IF(!bSuccess, "sw.uno",
+ "FillBaseProperties: ignoring invalid
FillGradientName");
+}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/uiconfig
svx/uiconfig/ui/docking3deffects.ui |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 394318774e5b13a3d38b29833749b63cf5dab3da Author: Stanislav Horacek Date: Sat May 23 12:29:08 2015 +0200 rename "Lathe Object" to "Rotation Object" in a tooltip because the latter is always used in other places Change-Id: I42c74cf24a900541aa866aec7bc70b1ea3162b10 Reviewed-on: https://gerrit.libreoffice.org/15873 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/svx/uiconfig/ui/docking3deffects.ui b/svx/uiconfig/ui/docking3deffects.ui index de26767..c5634b5 100644 --- a/svx/uiconfig/ui/docking3deffects.ui +++ b/svx/uiconfig/ui/docking3deffects.ui @@ -708,7 +708,7 @@ True True True -Convert to Lathe Object +Convert to Rotation Object image15 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - i18npool/source
i18npool/source/breakiterator/breakiterator_th.cxx | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
New commits:
commit 668e6353f4597b81ebfd153b6197831dac50d398
Author: Michael Stahl
Date: Fri May 22 20:53:05 2015 +0200
tdf#90809: i18npool: fix crash in Thai break iterator
endPos = nStartPos + 1 may be past the end index
invalid write of size 4
at 0x1CBBA959:
com::sun::star::i18n::BreakIterator_th::makeIndex(rtl::OUString const&, int)
(breakiterator_th.cxx:139)
by 0x1CBB4AA2:
com::sun::star::i18n::BreakIterator_CTL::previousCharacters(rtl::OUString
const&, int, com::sun::star::lang::Locale const&, short, int, int&)
(breakiterator_ctl.cxx:61)
by 0x1CBB544F:
com::sun::star::i18n::BreakIteratorImpl::previousCharacters(rtl::OUString
const&, int, com::sun::star::lang::Locale const&, short, int, int&)
(breakiteratorImpl.cxx:64)
by 0xA29D29A: ServerFontLayout::setNeedFallback(ImplLayoutArgs&, int,
bool) (gcach_layout.cxx:99)
Change-Id: I201f24cb6773b5aa1a81dea90ea906d3d4355053
(cherry picked from commit 9db629b8a1fa9b63bc320f8d47594ec82511a9c5)
Reviewed-on: https://gerrit.libreoffice.org/15869
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/i18npool/source/breakiterator/breakiterator_th.cxx
b/i18npool/source/breakiterator/breakiterator_th.cxx
index e350fdc..5b4973b 100644
--- a/i18npool/source/breakiterator/breakiterator_th.cxx
+++ b/i18npool/source/breakiterator/breakiterator_th.cxx
@@ -103,7 +103,7 @@ static sal_Int32 SAL_CALL getACell(const sal_Unicode *text,
sal_Int32 pos, sal_I
#define is_Thai(c) (0x0e00 <= c && c <= 0x0e7f) // Unicode definition for Thai
-void SAL_CALL BreakIterator_th::makeIndex(const OUString& Text, sal_Int32
nStartPos)
+void SAL_CALL BreakIterator_th::makeIndex(const OUString& Text, sal_Int32
const nStartPos)
throw(RuntimeException)
{
if (Text != cachedText) {
@@ -123,18 +123,20 @@ void SAL_CALL BreakIterator_th::makeIndex(const OUString&
Text, sal_Int32 nStart
return;
const sal_Unicode* str = cachedText.getStr();
-sal_Int32 len = cachedText.getLength(), startPos, endPos;
+sal_Int32 const len = cachedText.getLength();
-startPos = nStartPos;
+sal_Int32 startPos = nStartPos;
while (startPos > 0 && is_Thai(str[startPos-1])) startPos--;
-endPos = nStartPos+1;
+sal_Int32 endPos = std::min(len, nStartPos+1);
while (endPos < len && is_Thai(str[endPos])) endPos++;
sal_Int32 start, end, pos;
pos = start = end = startPos;
+assert(endPos <= cellIndexSize);
while (pos < endPos) {
end += getACell(str, start, endPos);
+assert(end <= cellIndexSize);
while (pos < end) {
nextCellIndex[pos] = end;
previousCellIndex[pos] = start;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/control/Control.Parts.js | 19 +++
loleaflet/src/layer/tile/TileLayer.js |4 +++-
2 files changed, 22 insertions(+), 1 deletion(-)
New commits:
commit 29d4296d12998852448be937c98247970c023483
Author: Mihai Varga
Date: Mon May 25 17:52:36 2015 +0300
Disable prev/next part buttons for the first/last part
diff --git a/loleaflet/src/control/Control.Parts.js
b/loleaflet/src/control/Control.Parts.js
index 7b7cc6f..5aa3d28 100644
--- a/loleaflet/src/control/Control.Parts.js
+++ b/loleaflet/src/control/Control.Parts.js
@@ -21,15 +21,22 @@ L.Control.Parts = L.Control.extend({
this._nextPartButton = this._createButton(options.nextPartText,
options.nextPartTitle,
partName + '-next', container, this._nextPart);
+ this._parts = options.parts;
+ this._currentPart = options.currentPart;
+ this._updateDisabled();
return container;
},
_prevPart: function (e) {
this._map.fire('prevpart');
+ this._currentPart -= 1;
+ this._updateDisabled();
},
_nextPart: function (e) {
this._map.fire('nextpart');
+ this._currentPart += 1;
+ this._updateDisabled();
},
_createButton: function (html, title, className, container, fn) {
@@ -45,6 +52,18 @@ L.Control.Parts = L.Control.extend({
.on(link, 'click', this._refocusOnMap, this);
return link;
+ },
+
+ _updateDisabled: function () {
+ var className = 'leaflet-disabled';
+ L.DomUtil.removeClass(this._prevPartButton, className);
+ L.DomUtil.removeClass(this._nextPartButton, className);
+ if (this._currentPart === 0) {
+ L.DomUtil.addClass(this._prevPartButton, className);
+ }
+ if (this._currentPart === this._parts - 1) {
+ L.DomUtil.addClass(this._nextPartButton, className);
+ }
}
});
diff --git a/loleaflet/src/layer/tile/TileLayer.js
b/loleaflet/src/layer/tile/TileLayer.js
index a181c6f..7f45261 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -122,7 +122,9 @@ L.TileLayer = L.GridLayer.extend({
this._updateMaxBounds();
this._documentInfo = textMsg;
if (this._parts === undefined && command.parts
> 1) {
-
this._map.addControl(L.control.parts({'parts':command.parts}));
+ this._map.addControl(L.control.parts({
+ 'parts': command.parts,
+ 'currentPart':
command.currentPart}));
}
this._parts = command.parts;
this._currentPart = command.currentPart;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/layer/tile/TileLayer.js |1 +
1 file changed, 1 insertion(+)
New commits:
commit 57cb4fe24386fd9191b8e18e5de3b78bebebd20e
Author: Mihai Varga
Date: Mon May 25 17:36:18 2015 +0300
Prune tiles after switching parts
diff --git a/loleaflet/src/layer/tile/TileLayer.js
b/loleaflet/src/layer/tile/TileLayer.js
index 1afc87d..a181c6f 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -472,6 +472,7 @@ L.TileLayer = L.GridLayer.extend({
this._currentPart = (this._currentPart + 1) %
this._parts;
}
this._update();
+ this._pruneTiles();
}
});
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - include/svx sd/source
include/svx/svxcommands.h |1 +
sd/source/ui/app/menuids_tmpl.src |9 +
2 files changed, 10 insertions(+)
New commits:
commit d0059698e095e06ae17cb0b3ad3d985f8f3c441d
Author: Caolán McNamara
Date: Mon May 25 15:00:47 2015 +0100
impress: right click to insert image
Change-Id: I521f074bbd500b81d74be7e0e771bd49efc29c9c
(cherry picked from commit 67c3e2abf353c4893a4680f7a5b2d8c457ef18d1)
diff --git a/include/svx/svxcommands.h b/include/svx/svxcommands.h
index df3ddee..1b02754 100644
--- a/include/svx/svxcommands.h
+++ b/include/svx/svxcommands.h
@@ -81,6 +81,7 @@
#define CMD_SID_GALLERY_FORMATS ".uno:InsertGalleryPic"
#define CMD_SID_GRID_USE".uno:GridUse"
#define CMD_SID_GRID_VISIBLE".uno:GridVisible"
+#define CMD_SID_INSERT_GRAPHIC ".uno:InsertGraphic"
#define CMD_SID_INSERT_POSTIT ".uno:InsertAnnotation"
#define CMD_SID_EDIT_POSTIT ".uno:InsertAnnotation"
#define CMD_SID_REPLYTO_POSTIT ".uno:ReplyToAnnotation"
diff --git a/sd/source/ui/app/menuids_tmpl.src
b/sd/source/ui/app/menuids_tmpl.src
index cea91ed..9ed590a 100644
--- a/sd/source/ui/app/menuids_tmpl.src
+++ b/sd/source/ui/app/menuids_tmpl.src
@@ -35,6 +35,14 @@
Text [ en-US ] = "~Distribution..." ; \
};
+#define MN_INSERT_GRAPHIC \
+MenuItem\
+{\
+Identifier = SID_INSERT_GRAPHIC; \
+HelpId = CMD_SID_INSERT_GRAPHIC; \
+Text [ en-US ] = "Insert I~mage..." ; \
+};
+
#define MN_CAPTUREPOINT \
MenuItem\
{\
@@ -168,6 +176,7 @@
#define MN_SLIDE_MENU \
MN_SELECT_BACKGROUND\
+MN_INSERT_GRAPHIC\
MN_FORMAT_SLIDE\
MenuItem\
{\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - include/svx sd/source vbahelper/source
include/svx/svxcommands.h|1 +
sd/source/ui/app/menuids_tmpl.src|9 +
vbahelper/source/msforms/vbacontrol.cxx |4 ++--
vbahelper/source/msforms/vbacontrols.cxx |2 +-
vbahelper/source/msforms/vbalistcontrolhelper.hxx|2 +-
vbahelper/source/msforms/vbamultipage.cxx|2 +-
vbahelper/source/msforms/vbanewfont.hxx |2 +-
vbahelper/source/vbahelper/vbacommandbarcontrols.cxx |2 +-
vbahelper/source/vbahelper/vbadocumentsbase.cxx |2 +-
9 files changed, 18 insertions(+), 8 deletions(-)
New commits:
commit 67c3e2abf353c4893a4680f7a5b2d8c457ef18d1
Author: Caolán McNamara
Date: Mon May 25 15:00:47 2015 +0100
impress: right click to insert image
Change-Id: I521f074bbd500b81d74be7e0e771bd49efc29c9c
diff --git a/include/svx/svxcommands.h b/include/svx/svxcommands.h
index df3ddee..1b02754 100644
--- a/include/svx/svxcommands.h
+++ b/include/svx/svxcommands.h
@@ -81,6 +81,7 @@
#define CMD_SID_GALLERY_FORMATS ".uno:InsertGalleryPic"
#define CMD_SID_GRID_USE".uno:GridUse"
#define CMD_SID_GRID_VISIBLE".uno:GridVisible"
+#define CMD_SID_INSERT_GRAPHIC ".uno:InsertGraphic"
#define CMD_SID_INSERT_POSTIT ".uno:InsertAnnotation"
#define CMD_SID_EDIT_POSTIT ".uno:InsertAnnotation"
#define CMD_SID_REPLYTO_POSTIT ".uno:ReplyToAnnotation"
diff --git a/sd/source/ui/app/menuids_tmpl.src
b/sd/source/ui/app/menuids_tmpl.src
index cea91ed..9ed590a 100644
--- a/sd/source/ui/app/menuids_tmpl.src
+++ b/sd/source/ui/app/menuids_tmpl.src
@@ -35,6 +35,14 @@
Text [ en-US ] = "~Distribution..." ; \
};
+#define MN_INSERT_GRAPHIC \
+MenuItem\
+{\
+Identifier = SID_INSERT_GRAPHIC; \
+HelpId = CMD_SID_INSERT_GRAPHIC; \
+Text [ en-US ] = "Insert I~mage..." ; \
+};
+
#define MN_CAPTUREPOINT \
MenuItem\
{\
@@ -168,6 +176,7 @@
#define MN_SLIDE_MENU \
MN_SELECT_BACKGROUND\
+MN_INSERT_GRAPHIC\
MN_FORMAT_SLIDE\
MenuItem\
{\
commit c0fe0578273cfb2be404223531d96615fe3c2867
Author: Caolán McNamara
Date: Mon May 25 12:36:55 2015 +0100
cppcheck: noExplicitConstructor
Change-Id: Ic323f07196d8a0d106d9ddf73a06db377c23fb98
diff --git a/vbahelper/source/msforms/vbacontrol.cxx
b/vbahelper/source/msforms/vbacontrol.cxx
index 56bc102..cdfc8a7 100644
--- a/vbahelper/source/msforms/vbacontrol.cxx
+++ b/vbahelper/source/msforms/vbacontrol.cxx
@@ -99,7 +99,7 @@ class ScVbaControlListener: public cppu::WeakImplHelper1<
lang::XEventListener >
private:
ScVbaControl *pControl;
public:
-ScVbaControlListener( ScVbaControl *pTmpControl );
+explicit ScVbaControlListener( ScVbaControl *pTmpControl );
virtual ~ScVbaControlListener();
virtual void SAL_CALL disposing( const lang::EventObject& rEventObject )
throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE;
};
@@ -776,7 +776,7 @@ class ControlProviderImpl : public ControlProvider_BASE
{
uno::Reference< uno::XComponentContext > m_xCtx;
public:
-ControlProviderImpl( const uno::Reference< uno::XComponentContext >& xCtx
) : m_xCtx( xCtx ) {}
+explicit ControlProviderImpl( const uno::Reference< uno::XComponentContext
>& xCtx ) : m_xCtx( xCtx ) {}
virtual uno::Reference< msforms::XControl > SAL_CALL createControl( const
uno::Reference< drawing::XControlShape >& xControl, const uno::Reference<
frame::XModel >& xDocOwner ) throw (uno::RuntimeException, std::exception)
SAL_OVERRIDE;
};
diff --git a/vbahelper/source/msforms/vbacontrols.cxx
b/vbahelper/source/msforms/vbacontrols.cxx
index 85a7bd4..ce70d05 100644
--- a/vbahelper/source/msforms/vbacontrols.cxx
+++ b/vbahelper/source/msforms/vbacontrols.cxx
@@ -82,7 +82,7 @@ private:
}
}
public:
-ControlArrayWrapper( const uno::Reference< awt::XControl >& xDialog )
+explicit ControlArrayWrapper( const uno::Reference< awt::XControl >&
xDialog )
{
try
{
diff --git a/vbahelper/source/msforms/vbalistcontrolhelper.hxx
b/vbahelper/source/msforms/vbalistcontrolhelper.hxx
index 3c895bd..ad580f4 100644
--- a/vbahelper/source/msforms/vbalistcontrolhelper.hxx
+++ b/vbahelper/source/msforms/vbalistcontrolhelper.hxx
@@ -27,7 +27,7 @@ class ListControlHelper
css::uno::Reference< css::beans::XPropertySet > m_xProps;
public:
-ListControlHelper( const css::uno::Reference< css::beans::XPropertySet >&
rxControl ) : m_xProps( rxControl ){}
+explicit ListControlHelper( const css::uno::Reference<
css::beans::XPropertySet >& rxControl ) : m_xProps( rxControl ){}
virtual ~ListControlHelper() {}
void SAL_CALL AddItem( const css::uno::Any& pvargItem, const
css::uno::Any& pvargIndex ) throw (css::uno::RuntimeException);
void SAL_CALL remov
[Libreoffice-commits] online.git: loleaflet/src
loleaflet/src/layer/tile/TileLayer.js | 174 +++---
1 file changed, 163 insertions(+), 11 deletions(-)
New commits:
commit bcdf048d6d2cd089ef5fdb1b8b3af0eb0e214682
Author: Mihai Varga
Date: Mon May 25 16:54:29 2015 +0300
Merge adjacent selection rectangles into a single polygon
+ the document is scrolled to the average center of the rectangles
if that is out of the viewing area
diff --git a/loleaflet/src/layer/tile/TileLayer.js
b/loleaflet/src/layer/tile/TileLayer.js
index 8875565..1afc87d 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -152,21 +152,32 @@ L.TileLayer = L.GridLayer.extend({
this._clearSelections();
if (strTwips != null) {
this._map.fire('searchfound');
+ var rectangles = [];
+ var selectionCenter = new L.Point(0,0);
for (var i = 0; i < strTwips.length; i += 4) {
var topLeftTwips = new
L.Point(parseInt(strTwips[i]), parseInt(strTwips[i+1]));
var offset = new
L.Point(parseInt(strTwips[i+2]), parseInt(strTwips[i+3]));
+ var topRightTwips =
topLeftTwips.add(new L.Point(offset.x, 0));
+ var bottomLeftTwips =
topLeftTwips.add(new L.Point(0, offset.y));
var bottomRightTwips =
topLeftTwips.add(offset);
- var bounds = new L.LatLngBounds(
-
this._twipsToLatLng(topLeftTwips),
-
this._twipsToLatLng(bottomRightTwips));
- if
(!this._map.getBounds().contains(bounds.getCenter())) {
- var center =
this._map.project(bounds.getCenter());
- center =
center.subtract(this._map.getSize().divideBy(2));
- center.x = center.x < 0 ? 0 :
center.x;
- center.y = center.y < 0 ? 0 :
center.y;
-
$('#scroll-container').mCustomScrollbar('scrollTo', [center.y, center.x]);
- }
- var selection = new L.Rectangle(bounds,
{
+ rectangles.push([bottomLeftTwips,
bottomRightTwips, topLeftTwips, topRightTwips]);
+ selectionCenter =
selectionCenter.add(topLeftTwips);
+ selectionCenter =
selectionCenter.add(offset.divideBy(2));
+ }
+ // average of all rectangles' centers
+ selectionCenter =
selectionCenter.divideBy(strTwips.length / 4);
+ selectionCenter =
this._twipsToLatLng(selectionCenter);
+ if
(!this._map.getBounds().contains(selectionCenter)) {
+ var center =
this._map.project(selectionCenter);
+ center =
center.subtract(this._map.getSize().divideBy(2));
+ center.x = center.x < 0 ? 0 : center.x;
+ center.y = center.y < 0 ? 0 : center.y;
+
$('#scroll-container').mCustomScrollbar('scrollTo', [center.y, center.x]);
+ }
+
+ var polygons =
this._rectanglesToPolygons(rectangles);
+ for (var i = 0; i < polygons.length; i++) {
+ var selection = new
L.Polygon(polygons[i], {
fillColor: '#43ACE8',
fillOpacity: 0.25,
weight: 2,
@@ -256,6 +267,147 @@ L.TileLayer = L.GridLayer.extend({
}
},
+ _rectanglesToPolygons: function(rectangles) {
+ // algorithm found here
http://stackoverflow.com/questions/13746284/merging-multiple-adjacent-rectangles-into-one-polygon
+ var eps = 20;
+ // Glue rectangles if the space between them is less then eps
+ for (var i = 0; i < rectangles.length - 1; i++) {
+ for (var j = i + 1; j < rectangles.length; j++) {
+ for (var k = 0; k < rectangles[i].length; k++) {
+ for (var l = 0; l <
rectangles[j].length; l++) {
+ if
Defender Exploit:Win32/CVE-2010-3333
While doing the tests after make i get the above message with windows defender (windows 10) and realtime protection enabled http://www.microsoft.com/security/portal/threat/encyclopedia/entry.aspx?name=Exploit%3aWin32%2fCVE-2010-&threatid=2147641438 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 79167] UI: Opening the new "navigate by" for choosing the object to go back&forth opens the "big" navigation window, too
https://bugs.documentfoundation.org/show_bug.cgi?id=79167 Matthew Francis changed: What|Removed |Added See Also||https://bugs.documentfounda ||tion.org/show_bug.cgi?id=91 ||592 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - officecfg/registry sw/uiconfig
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu | 18 -- sw/uiconfig/swriter/menubar/menubar.xml |5 ++ 2 files changed, 20 insertions(+), 3 deletions(-) New commits: commit fb145a7a618f554daa8198a0fa5ec3b2c51a9244 Author: Yousuf Philips Date: Fri May 22 15:22:34 2015 +0400 tdf#90882 Add table insert uno commands to menu bar and fix labels Change-Id: I4f5f2daeb27b8ba486abc685e42596030de6d2d1 Reviewed-on: https://gerrit.libreoffice.org/15863 Reviewed-by: Yousuf Philips Tested-by: Yousuf Philips (cherry picked from commit 54b9bdc7b14b75f93a043c9af60ae605e57b194d) Reviewed-on: https://gerrit.libreoffice.org/15881 Reviewed-by: Joren De Cuyper Tested-by: Joren De Cuyper diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu index 68c2e12..a991676 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu @@ -1121,9 +1121,12 @@ 1 - + - Insert Rows Below + Insert Rows Above + + + Rows ~Above 1 @@ -1131,7 +1134,10 @@ - Insert Rows After + Insert Rows Below + + + Rows ~Below 1 @@ -1149,6 +1155,9 @@ Insert Columns Left + + Columns ~Left + 1 @@ -1157,6 +1166,9 @@ Insert Columns Right + + Columns R~ight + 1 diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml index dc79449..33f54de 100644 --- a/sw/uiconfig/swriter/menubar/menubar.xml +++ b/sw/uiconfig/swriter/menubar/menubar.xml @@ -397,7 +397,12 @@ + + + + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - icon-themes/galaxy officecfg/registry sw/uiconfig
icon-themes/galaxy/cmd/lc_resetattributes.png |binary officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |3 sw/uiconfig/swriter/toolbar/basicshapes.xml | 20 ++--- sw/uiconfig/swriter/toolbar/bezierobjectbar.xml | 11 +- sw/uiconfig/swriter/toolbar/calloutshapes.xml |3 sw/uiconfig/swriter/toolbar/drawbar.xml | 39 ++ sw/uiconfig/swriter/toolbar/drawtextobjectbar.xml |6 - sw/uiconfig/swriter/toolbar/graphicobjectbar.xml| 10 +- sw/uiconfig/swriter/toolbar/standardbar.xml |3 sw/uiconfig/swriter/toolbar/tableobjectbar.xml |4 - sw/uiconfig/swriter/toolbar/textobjectbar.xml |4 + 11 files changed, 63 insertions(+), 40 deletions(-) New commits: commit 79ebc1b02ede836626e1df0a09e8960aba06aff3 Author: Yousuf Philips Date: Fri May 22 14:15:41 2015 +0400 tdf#81475 Additional improvements to Writer's toolbars Change-Id: Ibf64cecd88faca1dce7f081a630faabd0ee76046 Reviewed-on: https://gerrit.libreoffice.org/15860 Reviewed-by: Yousuf Philips Tested-by: Yousuf Philips (cherry picked from commit 89f7a5670ae0b21c8a80f73d27b5bc1181021373) Reviewed-on: https://gerrit.libreoffice.org/15864 Reviewed-by: Joren De Cuyper Tested-by: Joren De Cuyper diff --git a/icon-themes/galaxy/cmd/lc_resetattributes.png b/icon-themes/galaxy/cmd/lc_resetattributes.png new file mode 100644 index 000..13cf0ad Binary files /dev/null and b/icon-themes/galaxy/cmd/lc_resetattributes.png differ diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu index 87e9234..68c2e12 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu @@ -954,6 +954,9 @@ Clear ~Direct Formatting + + 1 + diff --git a/sw/uiconfig/swriter/toolbar/basicshapes.xml b/sw/uiconfig/swriter/toolbar/basicshapes.xml index e0ff214..17a56ad 100644 --- a/sw/uiconfig/swriter/toolbar/basicshapes.xml +++ b/sw/uiconfig/swriter/toolbar/basicshapes.xml @@ -22,25 +22,27 @@ - - + + + + + + + + - - - - - - + - \ No newline at end of file + + diff --git a/sw/uiconfig/swriter/toolbar/bezierobjectbar.xml b/sw/uiconfig/swriter/toolbar/bezierobjectbar.xml index 0a6024f..1a5179c 100644 --- a/sw/uiconfig/swriter/toolbar/bezierobjectbar.xml +++ b/sw/uiconfig/swriter/toolbar/bezierobjectbar.xml @@ -18,20 +18,21 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> http://openoffice.org/2001/toolbar"; xmlns:xlink="http://www.w3.org/1999/xlink"; toolbar:id="toolbar"> - + - - + + + + - - \ No newline at end of file + diff --git a/sw/uiconfig/swriter/toolbar/calloutshapes.xml b/sw/uiconfig/swriter/toolbar/calloutshapes.xml index 7bf4756..e894bc1 100644 --- a/sw/uiconfig/swriter/toolbar/calloutshapes.xml +++ b/sw/uiconfig/swriter/toolbar/calloutshapes.xml @@ -22,7 +22,8 @@ + - \ No newline at end of file + diff --git a/sw/uiconfig/swriter/toolbar/drawbar.xml b/sw/uiconfig/swriter/toolbar/drawbar.xml index e3ab05e..4bce3dd 100644 --- a/sw/uiconfig/swriter/toolbar/drawbar.xml +++ b/sw/uiconfig/swriter/toolbar/drawbar.xml @@ -21,32 +21,43 @@ - - - - - + + - - - - - - + + + + + + + + + + + + + + + - + - + + - + + + + + diff --git a/sw/uiconfig/swriter/toolbar/drawtextobjectbar.xml b/sw/uiconfig/swriter/toolbar/drawtextobjectbar.xml index 22ef280..23c2786 100644 --- a/sw/uiconfig/swriter/toolbar/drawtextobjectbar.xml +++ b/sw/uiconfig/swriter/toolbar/drawtextobjectbar.xml @@ -52,13 +52,13 @@ - - - + + + diff --git a/sw/uiconfig/swriter/toolbar/graphicobjectbar.xml b/sw/uiconfig/swriter/toolbar/graphicobjectbar.xml index a41a1df..84b8be2 100644 --- a/sw/uiconfig/swriter/toolbar/graphicobjectbar.xml +++ b/sw/uiconfig/swriter/toolbar/graphicobjectbar.xml @@ -22,15 +22,17 @@ - - - + - + + + + + diff --git a/sw/uiconfig/swriter/toolbar/standardbar.xml b/sw/uiconfig/swriter/toolbar/standardbar.xml index 4910fb8..9366b92 100644 --- a/sw/uiconfig/swriter/toolbar/standardbar.xml +++ b/sw/uiconfig/swriter/toolbar/standardbar.xml @@ -49,11 +49,10 @@ - - + diff --git a/sw/uiconfig/swriter/toolbar/tableobjectbar.xml b/sw/uiconfig/swriter/toolbar/tableobjectbar.xml index 48fa579..ec8fcd6 100644 --- a/sw/uiconfig/swriter/toolbar/tableobjectbar.xml +++ b/sw/uiconfig/swr
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - cui/uiconfig instsetoo_native/util odk/docs odk/examples odk/index.html odk/index_online.html postprocess/CustomTarget_registry.mk
cui/uiconfig/ui/aboutdialog.ui |2 +- instsetoo_native/util/openoffice.lst.in|8 odk/docs/install.html |2 +- odk/docs/tools.html|2 +- odk/examples/DevelopersGuide/examples.html |2 +- odk/examples/examples.html |2 +- odk/index.html |2 +- odk/index_online.html |2 +- postprocess/CustomTarget_registry.mk |2 +- 9 files changed, 12 insertions(+), 12 deletions(-) New commits: commit e76702c405784c0fb57fed33a5a1490418c5ca4b Author: Julien Nabet Date: Sat May 23 00:55:40 2015 +0200 tdf#91469: convert links in help/about to https Change-Id: I1274f75a49a999285488e99713782956e2287249 Reviewed-on: https://gerrit.libreoffice.org/15870 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos Tested-by: Adolfo Jayme Barrientos (cherry picked from commit ffa560e0dec34d71f4593b7bf23ad50321548c60) Reviewed-on: https://gerrit.libreoffice.org/15877 Reviewed-by: Joren De Cuyper Tested-by: Joren De Cuyper diff --git a/cui/uiconfig/ui/aboutdialog.ui b/cui/uiconfig/ui/aboutdialog.ui index 18bc8ff..3796d9a 100644 --- a/cui/uiconfig/ui/aboutdialog.ui +++ b/cui/uiconfig/ui/aboutdialog.ui @@ -259,7 +259,7 @@ False True -http://www.libreoffice.org/about-us/credits/ +https://www.libreoffice.org/about-us/credits/ False diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in index 46176a9..d05f8ab 100644 --- a/instsetoo_native/util/openoffice.lst.in +++ b/instsetoo_native/util/openoffice.lst.in @@ -69,7 +69,7 @@ LibreOffice CHANGETARGETDIR 1 PATCHCODEFILE ooo_patchcodes.txt STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/ -STARTCENTER_INFO_URL http://www.libreoffice.org/ +STARTCENTER_INFO_URL https://www.libreoffice.org/ STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/ DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/ STARTCENTER_HIDE_EXTERNAL_LINKS 0 @@ -122,7 +122,7 @@ LibreOffice_Dev CODEFILENAME codes_ooodev.txt LOCALUSERDIR $ORIGIN/.. STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/ -STARTCENTER_INFO_URL http://www.libreoffice.org/ +STARTCENTER_INFO_URL https://www.libreoffice.org/ STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/ DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/ STARTCENTER_HIDE_EXTERNAL_LINKS 0 @@ -164,7 +164,7 @@ LibreOffice_SDK CHANGETARGETDIR 1 DONTUSESTARTMENUFOLDER 1 STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/ -STARTCENTER_INFO_URL http://www.libreoffice.org/ +STARTCENTER_INFO_URL https://www.libreoffice.org/ STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/ DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/ STARTCENTER_HIDE_EXTERNAL_LINKS 0 @@ -210,7 +210,7 @@ LibreOffice_Dev_SDK CHANGETARGETDIR 1 DONTUSESTARTMENUFOLDER 1 STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/ -STARTCENTER_INFO_URL http://www.libreoffice.org/ +STARTCENTER_INFO_URL https://www.libreoffice.org/ STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/ DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/ STARTCENTER_HIDE_EXTERNAL_LINKS 0 diff --git a/odk/docs/install.html b/odk/docs/install.html index f0ec388..5d4a592 100644 --- a/odk/docs/install.html +++ b/odk/docs/install.html @@ -514,7 +514,7 @@ Foundation. The Document Foundation acknowledges all community members, please find more info - http://www.libreoffice.org/about-us/credits/"; target="_blank">at our website. + https://www.libreoffice.org/about-us/credits/"; target="_blank">at our website. http://www.documentfoundation.org/privacy"; target="_blank">Privacy Policy | diff --git a/odk/docs/tools.html b/odk/docs/tools.html index 235aaf1..ced7036 100644 --- a/odk/docs/tools.html +++ b/odk/docs/tools.html @@ -911,7 +911,7 @@ types the specified types depend on. based on Apache OpenOffice, which is Copyright 2011, The Apache Software Foundation. -The Document Foundation acknowledges all community members, please find more info http://www.libreoffice.org/about-us/credits/"; target="_blank
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - svx/source
svx/source/gallery2/GalleryControl.cxx |7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
New commits:
commit c37448c13c343d96a5902d3746203573faafa731
Author: Julien Nabet
Date: Sun May 24 16:18:32 2015 +0200
tdf#91534: Writer crash using Gallery icon in sidebar
test mpBrowser1 if not NULL + reorder the disposeAndClear calls
(must be reverse order compared to the order of Create calls)
Cherry-picked from 9be6c22ebc225db4d1be7bb0100a2407e9a8eb0c
Change-Id: Ia5481430791d9ab73e63d49a0ef0d5e0a6016605
Reviewed-on: https://gerrit.libreoffice.org/15885
Reviewed-by: Joren De Cuyper
Tested-by: Joren De Cuyper
diff --git a/svx/source/gallery2/GalleryControl.cxx
b/svx/source/gallery2/GalleryControl.cxx
index 6f87d31..66440e7 100644
--- a/svx/source/gallery2/GalleryControl.cxx
+++ b/svx/source/gallery2/GalleryControl.cxx
@@ -74,9 +74,9 @@ GalleryControl::~GalleryControl()
void GalleryControl::dispose()
{
-mpSplitter.disposeAndClear();
-mpBrowser1.disposeAndClear();
mpBrowser2.disposeAndClear();
+mpBrowser1.disposeAndClear();
+mpSplitter.disposeAndClear();
vcl::Window::dispose();
}
@@ -217,7 +217,8 @@ bool GalleryControl::GalleryKeyInput( const KeyEvent&
rKEvt, vcl::Window* )
void GalleryControl::GetFocus()
{
Window::GetFocus();
-mpBrowser1->GrabFocus();
+if (mpBrowser1)
+mpBrowser1->GrabFocus();
}
void GalleryControl::ThemeSelectionHasChanged()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Help on Building Libreoffice
Hi everybody, i want u to help me how to build libreoffice. I have being directed by this https://wiki.documentfoundation.org/Development/BuildingOnLinux on how to build libreoffice I have installed git. then when i try to clone with "git clone git://anongit.freedesktop.org/libreoffice/core libreoffice ", i get the following error. ' ' Cloning into 'libreoffice'... fatal: unable to connect to anongit.freedesktop.org: anongit.freedesktop.org: Name or service not known ' ' how should i solve this? is it possible to download the source code and copy to /.git directory instead of running "git clone git://anongit.freedesktop.org/libreoffice/core libreoffice " command? i tried it as following, i downloaded source code of libreoffice and i copied to home/.git/libreoffice, when i run it told me that there is no autogen.sh file. $ cd libreoffice $ ./autogen.sh this generates "bash: /autogen.sh: No such file or directory" error. i couldn't even find the autogen.sh file by searching in the whole source code. ...pls help me in this how to solve... Thanx, ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sw/qa sw/source
sw/qa/extras/ooxmlexport/data/hyperlink-field.odt |binary
sw/qa/extras/ooxmlexport/ooxmlexport5.cxx |8
sw/source/filter/ww8/docxattributeoutput.cxx | 10 +-
3 files changed, 13 insertions(+), 5 deletions(-)
New commits:
commit d40c30e4e42e7c020486644a1340966f59241cbb
Author: Caolán McNamara
Date: Mon May 25 11:06:46 2015 +0100
fix assert on export of ooo40760-1.sxw to docx
and a pile more
Change-Id: I7334233c789bb0ed7a60387ef7d84dd34ab5a187
(cherry picked from commit 3185b6c8caf97afa602c864f588d079cbbe04038)
diff --git a/sw/qa/extras/ooxmlexport/data/hyperlink-field.odt
b/sw/qa/extras/ooxmlexport/data/hyperlink-field.odt
new file mode 100644
index 000..0c265cf
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/hyperlink-field.odt
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
index 47589f6..f97d6a3 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
@@ -270,6 +270,14 @@ DECLARE_OOXMLEXPORT_TEST(testOldComplexMergeTableInTable,
"ooo96040-2.odt")
return;
}
+DECLARE_OOXMLEXPORT_TEST(testHyperlinkContainingPlaceholderField,
"hyperlink-field.odt")
+{
+xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+
+if (!pXmlDoc)
+ return;
+}
+
DECLARE_OOXMLEXPORT_TEST(testTablePreferredWidth, "tablePreferredWidth.docx")
{
xmlDocPtr pXmlDoc = parseExport("word/document.xml");
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 7ee225c..6b10ae4 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1058,11 +1058,6 @@ void DocxAttributeOutput::EndRun()
{
StartField_Impl( *pIt );
-if ( m_pHyperlinkAttrList )
-{
-m_nFieldsInHyperlink++;
-}
-
// Remove the field from the stack if only the start has to be
written
// Unknown fields should be removed too
if ( !pIt->bClose || ( pIt->eType == ww::eUNKNOWN ) )
@@ -1070,6 +1065,11 @@ void DocxAttributeOutput::EndRun()
pIt = m_Fields.erase( pIt );
continue;
}
+
+if ( m_pHyperlinkAttrList )
+{
+m_nFieldsInHyperlink++;
+}
}
++pIt;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 5 commits - canvas/source comphelper/source dbaccess/source include/comphelper include/tools sw/qa sw/source tools/source unusedcode.easy vcl/android vcl/generic vcl/he
canvas/source/directx/dx_devicehelper.cxx | 10 --- canvas/source/directx/dx_devicehelper.hxx |3 - canvas/source/directx/dx_spritedevicehelper.cxx | 12 canvas/source/directx/dx_spritedevicehelper.hxx |3 - canvas/source/vcl/devicehelper.cxx|6 -- canvas/source/vcl/devicehelper.hxx|1 comphelper/source/misc/accimplaccess.cxx | 13 dbaccess/source/ui/inc/TableDesignControl.hxx |4 - dbaccess/source/ui/tabledesign/TableDesignControl.cxx | 11 --- include/comphelper/accimplaccess.hxx |3 - include/tools/color.hxx | 10 --- sw/qa/extras/ooxmlexport/data/hyperlink-field.odt |binary sw/qa/extras/ooxmlexport/ooxmlexport5.cxx |8 ++ sw/source/filter/ww8/docxattributeoutput.cxx | 10 +-- tools/source/generic/color.cxx| 28 -- unusedcode.easy |3 - vcl/android/androidinst.cxx |4 - vcl/generic/fontmanager/fontsubst.cxx |2 vcl/generic/glyphs/gcach_ftyp.hxx |2 vcl/generic/glyphs/gcach_layout.cxx |2 vcl/generic/print/bitmap_gfx.cxx |6 +- vcl/generic/print/genpspgraphics.cxx |8 +- vcl/generic/print/prtsetup.hxx|4 - vcl/generic/print/text_gfx.cxx|2 vcl/headless/headlessinst.cxx |4 - vcl/headless/svpdata.cxx |2 vcl/headless/svptextrender.cxx|2 vcl/opengl/salbmp.cxx |6 +- vcl/osx/documentfocuslistener.hxx |2 vcl/qa/cppunit/dndtest.cxx|8 +- vcl/qa/cppunit/lifecycle.cxx |5 - vcl/qa/cppunit/timer.cxx |6 +- vcl/quartz/salbmp.cxx |6 +- vcl/source/app/IconThemeInfo.cxx |2 vcl/source/app/IconThemeScanner.cxx |2 vcl/source/app/IconThemeSelector.cxx |2 vcl/source/app/session.cxx|2 vcl/source/app/svmain.cxx |2 vcl/source/bitmap/bitmapscalesuper.cxx|2 vcl/source/control/quickselectionengine.cxx |2 vcl/source/edit/textundo.hxx |6 +- vcl/source/edit/textview.cxx |4 - vcl/source/edit/vclmedit.cxx |2 vcl/source/filter/FilterConfigCache.hxx |2 vcl/source/filter/graphicfilter.cxx |2 vcl/source/filter/igif/decode.hxx |2 vcl/source/filter/igif/gifread.hxx|2 vcl/source/filter/ixbm/xbmread.hxx| 12 ++-- vcl/source/filter/ixpm/xpmread.hxx|2 vcl/source/filter/wmf/emfwr.hxx |2 vcl/source/filter/wmf/winmtf.hxx |6 +- vcl/source/fontsubset/sft.cxx |2 vcl/source/gdi/bmpfast.cxx|2 vcl/source/gdi/pdfextoutdevdata.cxx |2 vcl/source/gdi/pdfwriter_impl.cxx | 10 +-- vcl/source/window/layout.cxx |2 vcl/source/window/menubarwindow.hxx |2 vcl/source/window/mnemonicengine.cxx |2 vcl/source/window/openglwin.cxx |2 vcl/source/window/scrwnd.hxx |2 vcl/unx/generic/app/i18n_status.cxx |4 - vcl/unx/generic/app/randrwrapper.cxx |4 - vcl/unx/generic/app/wmadaptor.cxx |4 - vcl/unx/generic/dtrans/X11_selection.hxx |2 vcl/unx/generic/gdi/gcach_xpeer.hxx |2 vcl/unx/generic/gdi/gdiimpl.hxx |2 vcl/unx/generic/gdi/openglx11cairotextrender.hxx |2 vcl/unx/generic/gdi/x11cairotextrender.hxx|2 vcl/unx/generic/printer/ppdparser.cxx |2 vcl/unx/gtk/a11y/atklistener.
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - svx/source
svx/source/dialog/charmap.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit 5d08e3736e94bf916c12c2eb3e17602a693c4c97
Author: Tomaž Vajngerl
Date: Mon May 25 19:57:26 2015 +0900
tdf#91582 initialize charmap when selecting in SvxShowCharSet
Change-Id: I3f73eef349e65a1d2d283d1116729694c1f40ed9
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index 104161d..c334d3f 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -647,6 +647,9 @@ void SvxShowCharSet::SelectIndex( int nNewIndex, bool
bFocus )
void SvxShowCharSet::SelectCharacter( sal_UCS4 cNew, bool bFocus )
{
+if (mpFontCharMap == nullptr)
+RecalculateFont(*this);
+
// get next available char of current font
sal_UCS4 cNext = mpFontCharMap->GetNextChar( (cNew > 0) ? cNew - 1 : cNew
);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
QtCreator for LibreOffice - first integration
Hi, I worked on using QtCreator IDE for LibreOffice : https://gerrit.libreoffice.org/15804 Thanks to Arnaud who finalized the gerrit validation. Here is an album of screenshots (similar to Bjoern's video with KDevelop) : http://imgur.com/0z53TxF,qhImiuH,PhZlDZv,stXNCr7,2z03uah,NZYfoIi,mdF4xlT,WX8zNl2 1 : Opening QtCreator with 'sw' project file 2 : In the locator (ctrl+k), you can search classes 3 : After choosing "SwInsertBookmarDlg" in locator 4 : There are others way to view code, here is the Class View (but I still don't know how to open the ClassView on a specific class from the source code panel) 5 : Here are the predefined build settings 6 : To debug, just add a breakpoint in the code 7 : Then start the debugger (the green triangle with a bug) : QtCreator launches LibreOffice 8 : As soon as the breakpoint is reached, QtCreator is back to front with all graphical tools to debug Tip : the default behavior for the green triangle buttons (run /debug) is to execute 'make' before 'run' or 'debug'. But there are menus items 'run without deploy' and 'debug without deploy' that allows to run/debug last compiled version if you have already modified source code. My next task is to enhance the debugger to have better display of specific LibreOffice objects (specially OUString) Feedback and suggestions are welcomed, Cheers, Michel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: filter/source include/svx sc/source sd/source svx/source sw/source
filter/source/msfilter/svdfppt.cxx |4 ++--
include/svx/svdpntv.hxx | 13 -
sc/source/ui/drawfunc/fuconrec.cxx |2 --
sd/source/ui/app/sdxfer.cxx |4 ++--
sd/source/ui/func/fuconrec.cxx |2 --
svx/source/svdraw/sdrpagewindow.cxx |4 ++--
svx/source/svdraw/svdcrtv.cxx |2 +-
svx/source/svdraw/svdoashp.cxx |2 +-
svx/source/svdraw/svdocirc.cxx |2 +-
svx/source/svdraw/svdorect.cxx |4 ++--
svx/source/svdraw/svdotxdr.cxx |2 +-
svx/source/svdraw/svdpage.cxx |4 ++--
sw/source/core/draw/dflyobj.cxx |2 +-
sw/source/core/draw/dview.cxx |2 +-
sw/source/core/text/porfly.cxx |2 +-
sw/source/uibase/docvw/edtdd.cxx|2 +-
16 files changed, 18 insertions(+), 35 deletions(-)
New commits:
commit d3714207b1d8cc323a639a942121b6c1aa4cd61b
Author: Noel Grandin
Date: Mon May 25 11:03:10 2015 +0200
remove some unnecessary casts and convert some to const_cast
Change-Id: I590a87c832bc59947ae04e52d3ac5ea71574bb11
Reviewed-on: https://gerrit.libreoffice.org/15888
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/filter/source/msfilter/svdfppt.cxx
b/filter/source/msfilter/svdfppt.cxx
index 4536cda..75faa09 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -2582,7 +2582,7 @@ bool SdrPowerPointImport::SeekToShape( SvStream& rSt,
void* pClientData, sal_uIn
DffRecordList* pCList = maShapeRecords.pCList;
// we got a backup of the current position
if ( pCList )
nCurrent = pCList->nCurrent;
-if ( ((SdrEscherImport*)this
)->maShapeRecords.SeekToContent( rSt, DFF_msofbtClientData,
SEEK_FROM_CURRENT_AND_RESTART ) )
+if (
const_cast(this)->maShapeRecords.SeekToContent( rSt,
DFF_msofbtClientData, SEEK_FROM_CURRENT_AND_RESTART ) )
{
sal_uInt32 nStreamPos = rSt.Tell();
PPTTextObj aTextObj( rSt,
(SdrPowerPointImport&)*this, rPersistEntry, NULL );
@@ -2615,7 +2615,7 @@ bool SdrPowerPointImport::SeekToShape( SvStream& rSt,
void* pClientData, sal_uIn
}
if ( pCList )
// restoring
pCList->nCurrent = nCurrent;
-((SdrEscherImport*)this )->maShapeRecords.pCList =
pCList;
+
const_cast(this)->maShapeRecords.pCList = pCList;
}
}
}
diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx
index 1b36032..ee4ba06c 100644
--- a/include/svx/svdpntv.hxx
+++ b/include/svx/svdpntv.hxx
@@ -334,21 +334,8 @@ public:
virtual void HideSdrPage();
// Iterieren ueber alle angemeldeten PageViews
-// sal_uInt16 GetPageViewCount() const { return sal_uInt16(aPagV.Count()); }
-// SdrPageView* GetPageViewByIndex(sal_uInt16 nPvNum) const { return
((SdrPageView*)aPagV.GetObject(nPvNum)); }
SdrPageView* GetSdrPageView() const { return mpPageView; }
-// Pageview einer bestimmten Seite ermitteln
-// SdrPageView* GetPageViewByPage(const SdrPage* pPage) const;
-// sal_uInt16 GetIndexByPageView(const SdrPageView* pPV) const;
-
-// Test, ob eine Seite getroffen
-// SdrPageView* HitPage(const Point& rPnt) const;
-
-// Die Seite, die dem Punkt am naechsten ist. Liefert nur NULL,
-// wenn absolut keine Seite angemeldet ist.
-// SdrPageView* GetPageViewByPosition(const Point& rPnt) const;
-
// Eine SdrView kann auf mehreren Fenstern gleichzeitig abgebiltet sein:
virtual void AddWindowToPaintView(OutputDevice* pNewWin);
virtual void DeleteWindowFromPaintView(OutputDevice* pOldWin);
diff --git a/sc/source/ui/drawfunc/fuconrec.cxx
b/sc/source/ui/drawfunc/fuconrec.cxx
index e933227..a39f12fc 100644
--- a/sc/source/ui/drawfunc/fuconrec.cxx
+++ b/sc/source/ui/drawfunc/fuconrec.cxx
@@ -267,8 +267,6 @@ SdrObject* FuConstRectangle::CreateDefaultObject(const
sal_uInt16 nID, const Rec
// don't set default text, start edit mode instead
// (Edit mode is started in ScTabViewShell::ExecDraw,
because
// it must be handled by FuText)
-// String aText(ScResId(STR_CAPTION_DEFAULT_TEXT));
-// ((SdrCaptionObj*)pObj)->SetText(aText);
static_cast(pObj)->SetLogicRect(aRect);
static_cast(pObj)->SetTailPos(
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index f90cac3..27c72a3 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -268,7 +268,7 @@ void SdTransferable::CreateData()
mpSdViewIntern->EndListening(*mpSdDrawDocumentIntern );
mpSdViewIntern->hideMark
[Libreoffice-commits] core.git: svx/source
svx/source/dialog/charmap.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit 78e4b913d1bdcef83f66249fb5006803f28f96d1
Author: Tomaž Vajngerl
Date: Mon May 25 19:57:26 2015 +0900
tdf#91582 initialize charmap when selecting in SvxShowCharSet
Change-Id: I3f73eef349e65a1d2d283d1116729694c1f40ed9
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index 104161d..c334d3f 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -647,6 +647,9 @@ void SvxShowCharSet::SelectIndex( int nNewIndex, bool
bFocus )
void SvxShowCharSet::SelectCharacter( sal_UCS4 cNew, bool bFocus )
{
+if (mpFontCharMap == nullptr)
+RecalculateFont(*this);
+
// get next available char of current font
sal_UCS4 cNext = mpFontCharMap->GetNextChar( (cNew > 0) ? cNew - 1 : cNew
);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Resignation from the ESC
Hi Markus, I just want to thank your great contributions to LibreOffice. It's been a pleasure to meet you and spend time at conferences and hackfests. I wish you good luck in your future projects! -- Jacobo Aragunde Software Engineer at Igalia El 25/05/15 a las 12:02, Markus Mohrhard escribió: > Hey, > > so I hereby resign from the ESC effective immediately. > > I would like to announce as well that I will finish my current projects > (this includes of course mentoring my GSoC students, the OpenGL text > work based on glyphy and some smaller items) and after that return my > commit rights. I enjoyed working with many great people but I believe > that the project is developing in the wrong direction at the moment and > that I should spend my free time in a better way. > > Regards, > Markus > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: solenv/bin
solenv/bin/modules/installer/simplepackage.pm |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 896cd639125e00967640daea4f716786829e0b87
Author: Norbert Thiebaud
Date: Sat May 23 15:18:22 2015 -0500
macosx: work around hdiutil error -5341 on dmg packaging
Change-Id: Iddd265fca9769d9afac67d37877bd3a99068f368
Reviewed-on: https://gerrit.libreoffice.org/15884
Tested-by: Jenkins
Reviewed-by: Norbert Thiebaud
diff --git a/solenv/bin/modules/installer/simplepackage.pm
b/solenv/bin/modules/installer/simplepackage.pm
index d70394e..ac33798 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -423,7 +423,7 @@ sub create_package
}
}
-$systemcall = "cd $localtempdir && hdiutil create -srcfolder $folder
$archive -ov -fs HFS+ -volname \"$volume_name\" -format UDBZ";
+$systemcall = "cd $localtempdir && hdiutil create -megabytes 1500
-srcfolder $folder $archive -ov -fs HFS+ -volname \"$volume_name\" -format
UDBZ";
if (( $ref ne "" ) && ( $$ref ne "" )) {
$systemcall .= " && hdiutil unflatten $archive && Rez -a $$ref -o
$archive && hdiutil flatten $archive &&";
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Resignation from the ESC
Hey, so I hereby resign from the ESC effective immediately. I would like to announce as well that I will finish my current projects (this includes of course mentoring my GSoC students, the OpenGL text work based on glyphy and some smaller items) and after that return my commit rights. I enjoyed working with many great people but I believe that the project is developing in the wrong direction at the moment and that I should spend my free time in a better way. Regards, Markus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - vcl/source
vcl/source/app/settings.cxx | 13 +
1 file changed, 13 insertions(+)
New commits:
commit 5397a8ad5306a670355824f703da702f7401524a
Author: Jan Holesovsky
Date: Mon May 25 11:39:42 2015 +0200
tdf#90127: Read icon theme from the config when called too early.
Change-Id: I150cafde6b103cf1a80232113b7a3d11cfdb
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index ff49e02..0f1a4b7 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -3026,6 +3026,19 @@ StyleSettings::SetIconTheme(const OUString& theme)
OUString
StyleSettings::DetermineIconTheme() const
{
+if (mxData->mIconTheme.isEmpty())
+{
+// read from the configuration, or fallback to what the desktop wants
+uno::Reference
xContext(comphelper::getProcessComponentContext());
+if (xContext.is())
+{
+mxData->mIconTheme =
officecfg::Office::Common::Misc::SymbolStyle::get(xContext);
+
+if (mxData->mIconTheme.isEmpty() || mxData->mIconTheme == "auto")
+mxData->mIconTheme = GetAutomaticallyChosenIconTheme();
+}
+}
+
OUString r = mxData->mIconThemeSelector->SelectIconTheme(
mxData->mIconThemeScanner->GetFoundIconThemes(),
mxData->mIconTheme
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - cui/source include/svtools svtools/source vcl/source
cui/source/options/optgdlg.cxx|8 ++---
include/svtools/miscopt.hxx |1
svtools/source/config/miscopt.cxx | 57 ++
vcl/source/app/settings.cxx | 13
4 files changed, 33 insertions(+), 46 deletions(-)
New commits:
commit 55c6bd93e9c02b2160b82c0d489d05ba31a0f13c
Author: Jan Holesovsky
Date: Mon May 25 11:39:42 2015 +0200
tdf#90127: Read icon theme from the config when called too early.
Change-Id: I150cafde6b103cf1a80232113b7a3d11cfdb
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 15eca7d..5e67ba9c 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -3028,6 +3028,19 @@ StyleSettings::SetIconTheme(const OUString& theme)
OUString
StyleSettings::DetermineIconTheme() const
{
+if (mxData->mIconTheme.isEmpty())
+{
+// read from the configuration, or fallback to what the desktop wants
+uno::Reference
xContext(comphelper::getProcessComponentContext());
+if (xContext.is())
+{
+mxData->mIconTheme =
officecfg::Office::Common::Misc::SymbolStyle::get(xContext);
+
+if (mxData->mIconTheme.isEmpty() || mxData->mIconTheme == "auto")
+mxData->mIconTheme = GetAutomaticallyChosenIconTheme();
+}
+}
+
OUString r = mxData->mIconThemeSelector->SelectIconTheme(
mxData->mIconThemeScanner->GetFoundIconThemes(),
mxData->mIconTheme
commit 4163bde70568d6d5dd7144293484f797e8df9e63
Author: Jan Holesovsky
Date: Mon May 25 11:08:13 2015 +0200
related tdf#90127: Simplify setting of the 'auto' icon theme.
Change-Id: I9aedfd0b7943517b5444195b63140132dd728d57
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 893ab53..b82189f 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -789,10 +789,10 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* )
if( nStyleLB_InitialSelection != nStyleLB_NewSelection )
{
// 0 means choose style automatically
-if (nStyleLB_NewSelection == 0) {
-aMiscOptions.SetIconThemeAutomatically();
-}
-else {
+if (nStyleLB_NewSelection == 0)
+aMiscOptions.SetIconTheme("auto");
+else
+{
sal_uInt16 pos = m_pIconStyleLB->GetSelectEntryPos();
const vcl::IconThemeInfo& iconThemeId =
mInstalledIconThemes.at(pos-1);
aMiscOptions.SetIconTheme(iconThemeId.GetThemeId());
diff --git a/include/svtools/miscopt.hxx b/include/svtools/miscopt.hxx
index 28cd67c..6e321d2 100644
--- a/include/svtools/miscopt.hxx
+++ b/include/svtools/miscopt.hxx
@@ -78,7 +78,6 @@ class SVT_DLLPUBLIC SvtMiscOptions: public
utl::detail::Options
OUStringGetIconTheme() const;
voidSetIconTheme(const OUString&);
-voidSetIconThemeAutomatically();
boolIconThemeWasSetAutomatically();
sal_Int16 GetToolboxStyle() const;
diff --git a/svtools/source/config/miscopt.cxx
b/svtools/source/config/miscopt.cxx
index e3384e5..48adb6f 100644
--- a/svtools/source/config/miscopt.cxx
+++ b/svtools/source/config/miscopt.cxx
@@ -179,11 +179,6 @@ class SvtMiscOptions_Impl : public ConfigItem
bool IconThemeWasSetAutomatically()
{return m_bIconThemeWasSetAutomatically;}
-/** Set the icon theme automatically by detecting the best theme for
the desktop environment.
- * The parameter setModified controls whether SetModified() will be
called.
- */
-void SetIconThemeAutomatically(SetModifiedFlag = SET_MODIFIED);
-
// translate to VCL settings ( "0" = 3D, "1" = FLAT )
inline sal_Int16 GetToolboxStyle()
{ return m_nToolboxStyle ? VCL_TOOLBOX_STYLE_FLAT : 0; }
@@ -333,18 +328,11 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl()
case PROPERTYHANDLE_SYMBOLSTYLE :
{
OUString aIconTheme;
-if( seqValues[nProperty] >>= aIconTheme ) {
-if (aIconTheme == "auto") {
-SetIconThemeAutomatically(DONT_SET_MODIFIED);
-}
-else {
-SetIconTheme(aIconTheme, DONT_SET_MODIFIED);
-}
-}
+if (seqValues[nProperty] >>= aIconTheme)
+SetIconTheme(aIconTheme, DONT_SET_MODIFIED);
else
-{
OSL_FAIL("Wrong type of \"Misc\\SymbolStyle\"!" );
-}
+
m_bIsSymbolsStyleRO = seqRO[nProperty];
break;
}
@@ -462,17 +450,10 @@ void SvtMiscOptions_Impl::Load( const Sequence< OUString
>& rPropertyNames )
break;
case PROPERTYHANDLE_SYMBOLSTYLE : {
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/docxattributeoutput.cxx | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 677484ce014df4b76dbd24526ea5c74f6bd044d5
Author: Caolán McNamara
Date: Mon May 25 10:42:09 2015 +0100
Var starts with r but is not reference
Change-Id: I3458b4d8f4f28d38a1b1a979544412d1e526dec4
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 7ee225c..3694f3f 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -2871,9 +2871,9 @@ void DocxAttributeOutput::TableCellProperties(
ww8::WW8TableNodeInfoInner::Point
FSEND );
// Horizontal spans
-const SwWriteTableRows& aRows = m_xTableWrt->GetRows( );
-SwWriteTableRow *pRow = aRows[ nRow ];
-const SwWriteTableCells rTableCells = pRow->GetCells();
+const SwWriteTableRows& rRows = m_xTableWrt->GetRows( );
+SwWriteTableRow *pRow = rRows[ nRow ];
+const SwWriteTableCells& rTableCells = pRow->GetCells();
if (nCell < rTableCells.size() )
{
const SwWriteTableCell& rCell = rTableCells[nCell];
@@ -3622,8 +3622,8 @@ void DocxAttributeOutput::TableVerticalCell(
ww8::WW8TableNodeInfoInner::Pointer
}
}
-const SwWriteTableRows& aRows = m_xTableWrt->GetRows( );
-SwWriteTableRow *pRow = aRows[ pTableTextNodeInfoInner->getRow( ) ];
+const SwWriteTableRows& rRows = m_xTableWrt->GetRows( );
+SwWriteTableRow *pRow = rRows[ pTableTextNodeInfoInner->getRow( ) ];
sal_uInt32 nCell = pTableTextNodeInfoInner->getCell();
const SwWriteTableCells& rTableCells = pRow->GetCells();
if (nCell < rTableCells.size() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - vcl/source
vcl/source/window/floatwin.cxx |4
vcl/source/window/winproc.cxx |8
2 files changed, 12 deletions(-)
New commits:
commit c4bae028efbd32c8938c3a6051d58c1f202d5b8a
Author: Caolán McNamara
Date: Sat May 23 09:21:50 2015 +0100
Resolves: tdf#90155 don't hide+show window before initial show completes
Change-Id: I16f6fb4ef025f2e464ca581fc348e8dd18981285
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index f9abdf6..468d8cc 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -637,10 +637,6 @@ void FloatingWindow::SetTitleType( FloatWinTitleType
nTitle )
void FloatingWindow::StartPopupMode( const Rectangle& rRect,
FloatWinPopupFlags nFlags )
{
-// avoid flickering
-if ( IsVisible() )
-Show( false, ShowFlags::NoFocusChange );
-
if ( IsRollUp() )
RollDown();
commit 768d445c1fd8a104a6c5e80ce93af99860ec6dc7
Author: Caolán McNamara
Date: Fri May 22 17:30:44 2015 +0100
gtk3: why close popups when losing focus
I don't see why we want to do this, and it causes trouble with the gtk3
vclplug
and the undo popup and color popup where gtk is giving us a "losing focus"
signal even though those windows have the "don't ask for input focus" bit
set.
Change-Id: I500ca253cc43c35dda55ee0301fdcaafbd212e2d
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index ff1252b..493147f 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -1912,14 +1912,6 @@ static void ImplHandleLoseFocus( vcl::Window* pWindow )
pSVData->maWinData.mpTrackWin->EndTracking(
TrackingEventFlags::Cancel );
}
-// here we always terminate the popupmode, also when NOFOCUSCLOSE
-// is set, such that we do not show windows during the switch
-if ( pSVData->maWinData.mpFirstFloat )
-{
-if ( !(pSVData->maWinData.mpFirstFloat->GetPopupModeFlags() &
FloatWinPopupFlags::NoAppFocusClose) )
-pSVData->maWinData.mpFirstFloat->EndPopupMode(
FloatWinPopupEndFlags::Cancel | FloatWinPopupEndFlags::CloseAll );
-}
-
pWindow->ImplGetWindowImpl()->mpFrameData->mbHasFocus = false;
// execute Focus-Events after a delay, such that SystemChildWindows
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl vcl/source
include/vcl/slider.hxx|3 ++-
vcl/source/control/slider.cxx | 11 +++
2 files changed, 13 insertions(+), 1 deletion(-)
New commits:
commit 3fad26e5dd6b04a521a96a618473ed08c12b9f9c
Author: Noel Grandin
Date: Mon May 25 11:13:36 2015 +0200
loplugin:vclwidgets
Change-Id: I4292b8838b39dbf199da3cfa0f161bae1c75e9e4
diff --git a/include/vcl/slider.hxx b/include/vcl/slider.hxx
index 203554f..8e609cd 100644
--- a/include/vcl/slider.hxx
+++ b/include/vcl/slider.hxx
@@ -81,7 +81,8 @@ private:
public:
Slider( vcl::Window* pParent, WinBits nStyle = WB_HORZ );
-
+virtual ~Slider();
+virtual voiddispose() SAL_OVERRIDE;
virtual voidMouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
virtual voidMouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE;
virtual voidTracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE;
diff --git a/vcl/source/control/slider.cxx b/vcl/source/control/slider.cxx
index 6fe7110..4c5e8e6 100644
--- a/vcl/source/control/slider.cxx
+++ b/vcl/source/control/slider.cxx
@@ -82,6 +82,17 @@ Slider::Slider( vcl::Window* pParent, WinBits nStyle ) :
ImplInit( pParent, nStyle );
}
+Slider::~Slider()
+{
+disposeOnce();
+}
+
+void Slider::dispose()
+{
+mpLinkedField.clear();
+Control::dispose();
+}
+
void Slider::ImplInitSettings()
{
vcl::Window* pParent = GetParent();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 4 commits - cui/source dbaccess/source desktop/source extensions/source framework/source include/sfx2 include/vcl sc/source sd/source sfx2/source svtools/source sw/sour
cui/source/customize/macropg.cxx|2
cui/source/inc/headertablistbox.hxx |2
dbaccess/source/ui/app/AppDetailPageHelper.cxx |2
dbaccess/source/ui/control/FieldDescControl.cxx | 10 +-
dbaccess/source/ui/querydesign/JoinTableView.cxx|4
dbaccess/source/ui/relationdesign/RelationTableView.cxx |2
desktop/source/deployment/gui/dp_gui_service.cxx|4
desktop/source/deployment/gui/dp_gui_theextmgr.cxx |4
desktop/source/deployment/gui/dp_gui_theextmgr.hxx |2
extensions/source/propctrlr/browserline.cxx |8 -
extensions/source/propctrlr/browserline.hxx |2
extensions/source/propctrlr/browserlistbox.cxx |4
extensions/source/update/ui/updatecheckui.cxx |4
framework/source/classes/menumanager.cxx|2
framework/source/helper/statusindicatorfactory.cxx |2
framework/source/layoutmanager/layoutmanager.cxx|2
framework/source/layoutmanager/toolbarlayoutmanager.cxx | 12 +-
framework/source/loadenv/loadenv.cxx|2
framework/source/tabwin/tabwindow.cxx |4
framework/source/uielement/menubarmanager.cxx |2
framework/source/uielement/progressbarwrapper.cxx |2
include/sfx2/childwin.hxx |2
include/vcl/window.hxx | 74 +++-
sc/source/ui/inc/reffact.hxx|2
sd/source/ui/animations/CustomAnimationDialog.cxx |2
sd/source/ui/presenter/PresenterHelper.cxx |2
sfx2/source/appl/childwin.cxx |2
sfx2/source/appl/workwin.cxx|8 -
sfx2/source/dialog/dockwin.cxx |4
sfx2/source/inet/inettbc.cxx|2
sfx2/source/menu/virtmenu.cxx |2
sfx2/source/toolbox/tbxitem.cxx |2
svtools/source/toolpanel/drawerlayouter.cxx |4
sw/source/uibase/docvw/HeaderFooterWin.cxx |2
toolkit/source/awt/vclxcontainer.cxx|4
toolkit/source/awt/vclxtopwindow.cxx|2
vcl/README.lifecycle|2
vcl/inc/window.h|3
vcl/source/app/help.cxx |2
vcl/source/window/brdwin.cxx|2
vcl/source/window/btndlg.cxx|2
vcl/source/window/dialog.cxx|2
vcl/source/window/dockmgr.cxx | 16 +--
vcl/source/window/dockwin.cxx | 10 +-
vcl/source/window/event.cxx |8 -
vcl/source/window/floatwin.cxx |8 -
vcl/source/window/menufloatingwindow.cxx|2
vcl/source/window/stacking.cxx | 40
vcl/source/window/syschild.cxx |4
vcl/source/window/syswin.cxx|2
vcl/source/window/window.cxx| 20 ++--
vcl/source/window/window2.cxx |2
vcl/source/window/winproc.cxx |6 -
vcl/source/window/wrkwin.cxx|2
vcl/unx/generic/app/i18n_status.cxx |4
vcl/workben/vcldemo.cxx |2
56 files changed, 182 insertions(+), 149 deletions(-)
New commits:
commit c7efb51e31a4eea48ffed291e5c7fb907b1811e4
Author: Noel Grandin
Date: Mon May 25 10:30:37 2015 +0200
convert TOTOP constants to scoped enum
Change-Id: I85ba631ba298f1034dc5b6a04a5ff3d509c41bcb
diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx
b/desktop/source/deployment/gui/dp_gui_service.cxx
index f07042d..3e720b5 100644
--- a/desktop/source/deployment/gui/dp_gui_service.cxx
+++ b/desktop/source/deployment/gui/dp_gui_service.cxx
@@ -270,12 +270,12 @@ void ServiceImpl::startExecuteModal(
if ( bCloseDialog )
myExtMgr->Close();
else
-myExtMgr->ToTop( TOTOP_RESTOREWHENMIN );
+myExtMgr->ToTop( ToTopFlags::RestoreWhenMin );
}
else
{
myExtMgr->Show();
-myExtMgr->ToTop( TOTOP_RESTOREWHENMIN );
+myExtMgr->ToTop( ToTopFlags::RestoreWhenMin );
}
}
diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
index ccf0b54..d04c356 100644
--- a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
+++ b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
@@ -148,7 +148,7 @@ void TheExtensionManager::S
[Libreoffice-commits] core.git: include/vcl vcl/source
include/vcl/slider.hxx|4 ++--
vcl/source/control/slider.cxx |2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit acf5049188e1be0ededc70f9bbedaa0032610680
Author: Tomaž Vajngerl
Date: Mon May 25 16:48:38 2015 +0900
use VclPtr for linked numeric field in slider
Change-Id: If46d0409e9aceed9c35cea818271699abdf407e1
diff --git a/include/vcl/slider.hxx b/include/vcl/slider.hxx
index 9a96f3a..203554f 100644
--- a/include/vcl/slider.hxx
+++ b/include/vcl/slider.hxx
@@ -53,7 +53,7 @@ private:
boolmbCalcSize;
boolmbFullDrag;
-NumericField* mpLinkedField;
+VclPtr mpLinkedField;
Link<> maSlideHdl;
Link<> maEndSlideHdl;
@@ -116,7 +116,7 @@ public:
SizeCalcWindowSizePixel();
-voidSetLinkedField(NumericField* pField);
+voidSetLinkedField(VclPtr pField);
voidSetSlideHdl( const Link<>& rLink ) { maSlideHdl = rLink; }
const Link<>& GetSlideHdl() const { return maSlideHdl;}
diff --git a/vcl/source/control/slider.cxx b/vcl/source/control/slider.cxx
index 4f0c7e1..6fe7110 100644
--- a/vcl/source/control/slider.cxx
+++ b/vcl/source/control/slider.cxx
@@ -870,7 +870,7 @@ void Slider::Resize()
Invalidate();
}
-void Slider::SetLinkedField(NumericField* pField)
+void Slider::SetLinkedField(VclPtr pField)
{
ImplSetFieldLink(Link<>());
mpLinkedField = pField;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - vcl/inc vcl/source
vcl/inc/ilstbox.hxx |8 +-
vcl/source/control/combobox.cxx |2
vcl/source/control/ilstbox.cxx | 135 +++-
vcl/source/control/lstbox.cxx |6 -
vcl/source/window/split.cxx | 16 ++--
vcl/source/window/status.cxx|6 -
6 files changed, 57 insertions(+), 116 deletions(-)
New commits:
commit 0359a59b6dec4a3c1e8fdc6e51d179fd6db4aad7
Author: Tomaž Vajngerl
Date: Mon May 25 16:29:20 2015 +0900
forward RenderCOntext to UserDraw, remove obsolete draw call
Change-Id: I29dcc22a6840e7104bdf68d050b616c8e06226fa
diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx
index a3273ec..b9669d7 100644
--- a/vcl/source/window/status.cxx
+++ b/vcl/source/window/status.cxx
@@ -462,7 +462,7 @@ void StatusBar::ImplDrawItem(vcl::RenderContext&
rRenderContext, bool bOffScreen
}
else
{
-UserDrawEvent aODEvt(this, aTextRect, pItem->mnId);
+UserDrawEvent aODEvt(&rRenderContext, aTextRect, pItem->mnId);
UserDraw(aODEvt);
}
}
@@ -505,8 +505,7 @@ void StatusBar::ImplDrawItem(vcl::RenderContext&
rRenderContext, bool bOffScreen
}
}
-const OutputDevice* pOutDev = GetOutDev();
-if (!pOutDev->ImplIsRecordLayout())
+if (!rRenderContext.ImplIsRecordLayout())
CallEventListeners(VCLEVENT_STATUSBAR_DRAWITEM,
reinterpret_cast(pItem->mnId));
}
@@ -1260,7 +1259,6 @@ void StatusBar::SetItemData( sal_uInt16 nItemId, void*
pNewData )
Update();
Rectangle aRect = ImplGetItemRectPos(nPos);
Invalidate(aRect);
-ImplDrawItem(*this, true, nPos, false, false);
Flush();
}
}
commit dd0996f7b230e76f35cc3464b85dd46e90098c3d
Author: Tomaž Vajngerl
Date: Mon May 25 16:18:23 2015 +0900
use RenderContext in user draw, use ApplySettings
Change-Id: I6cc22677000459a5f19bfb207007f5c246f187e0
diff --git a/vcl/inc/ilstbox.hxx b/vcl/inc/ilstbox.hxx
index 8a5bca2..363483e 100644
--- a/vcl/inc/ilstbox.hxx
+++ b/vcl/inc/ilstbox.hxx
@@ -564,11 +564,11 @@ private:
boolmbInUserDraw : 1;
boolmbEdgeBlending : 1;
-void ImplDraw( bool bLayout = false );
+void ImplDraw(vcl::RenderContext& rRenderContext, bool bLayout = false);
protected:
virtual void FillLayoutData() const SAL_OVERRIDE;
-public:
+public:
ImplWin( vcl::Window* pParent, WinBits nWinStyle = 0 );
virtual voidMouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
@@ -598,7 +598,8 @@ public:
voidEnableUserDraw( bool bUserDraw ){ mbUserDrawEnabled =
bUserDraw; }
boolIsUserDrawEnabled() const { return
mbUserDrawEnabled; }
-voidDrawEntry( bool bDrawImage, bool bDrawText, bool
bDrawTextAtImagePos = false, bool bLayout = false );
+void DrawEntry(vcl::RenderContext& rRenderContext, bool bDrawImage, bool
bDrawText,
+ bool bDrawTextAtImagePos = false, bool bLayout = false);
bool GetEdgeBlending() const { return mbEdgeBlending; }
void SetEdgeBlending(bool bNew) { mbEdgeBlending = bNew; }
@@ -606,7 +607,6 @@ public:
virtual voidShowFocus(const Rectangle& rRect) SAL_OVERRIDE;
using Control::ImplInitSettings;
-void ImplInitSettings( bool bFont, bool bForeground, bool bBackground );
virtual void ApplySettings(vcl::RenderContext& rRenderContext)
SAL_OVERRIDE;
};
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 59656c9..f16fd05 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -1131,7 +1131,7 @@ void ComboBox::GetMaxVisColumnsAndLines( sal_uInt16&
rnCols, sal_uInt16& rnLines
void ComboBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
sal_uLong nFlags )
{
-mpImplLB->GetMainWindow()->ImplInitSettings( true, true, true );
+mpImplLB->GetMainWindow()->ApplySettings(*pDev);
Point aPos = pDev->LogicToPixel( rPos );
Size aSize = pDev->LogicToPixel( rSize );
diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index 28e5889..5bdc36b 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -502,7 +502,7 @@ ImplListBoxWindow::ImplListBoxWindow( vcl::Window* pParent,
WinBits nWinStyle )
SetTextFillColor();
SetBackground( Wallpaper( GetSettings().GetStyleSettings().GetFieldColor()
) );
-ImplInitSettings( true, true, true );
+ApplySettings(*this);
ImplCalcMetrics();
}
@@ -537,35 +537,6 @@ void ImplListBoxWindow::ApplySettings(vcl::RenderContext&
rRenderContext)
rRenderContext.SetBackground(rStyleSettings.GetFieldColor());
}
-void ImplListBoxWindow::ImplInitSettings(bool bFont, bool bForeground, bool
bBackground)
-{
-const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
-
-if (b
